[systemd-commits] 3 commits - DISTRO_PORTING LICENSE.LGPL2.1 man/daemon.xml man/journalctl.xml man/journald.conf.xml man/kernel-command-line.xml
Kay Sievers
kay at kemper.freedesktop.org
Fri Nov 30 05:04:22 PST 2012
DISTRO_PORTING | 6 +--
LICENSE.LGPL2.1 | 81 ++++++++++++++++++++------------------------
man/daemon.xml | 2 -
man/journalctl.xml | 2 -
man/journald.conf.xml | 4 +-
man/kernel-command-line.xml | 2 -
6 files changed, 46 insertions(+), 51 deletions(-)
New commits:
commit 2ab38e24e548e0215596687e4916f5c47dc935a2
Author: Ramkumar Ramachandra <artagnon at gmail.com>
Date: Fri Nov 30 00:36:57 2012 +0530
man: fix some spelling mistakes
diff --git a/man/daemon.xml b/man/daemon.xml
index 197138e..0d29e7a 100644
--- a/man/daemon.xml
+++ b/man/daemon.xml
@@ -122,7 +122,7 @@
first child, so that only the second
child (the actual daemon process)
stays around. This ensures that the
- daemon process is reparented to
+ daemon process is re-parented to
init/PID 1, as all daemons should
be.</para></listitem>
diff --git a/man/journalctl.xml b/man/journalctl.xml
index 471c945..959ae1e 100644
--- a/man/journalctl.xml
+++ b/man/journalctl.xml
@@ -362,7 +362,7 @@
the time part is omitted, 00:00:00 is
assumed. If only the seconds component
is omitted, :00 is assumed. If the
- date component is ommitted, the
+ date component is omitted, the
current day is assumed. Alternatively
the strings
<literal>yesterday</literal>,
diff --git a/man/journald.conf.xml b/man/journald.conf.xml
index 86c9869..30523c5 100644
--- a/man/journald.conf.xml
+++ b/man/journald.conf.xml
@@ -183,8 +183,8 @@
messages is generated. This rate
limiting is applied per-service, so
that two services which log do not
- interfere with each other's
- limit. Defaults to 200 messages in
+ interfere with each others'
+ limits. Defaults to 200 messages in
10s. The time specification for
<varname>RateLimitInterval=</varname>
may be specified in the following
diff --git a/man/kernel-command-line.xml b/man/kernel-command-line.xml
index 27f0d40..154d399 100644
--- a/man/kernel-command-line.xml
+++ b/man/kernel-command-line.xml
@@ -64,7 +64,7 @@
and
<citerefentry><refentrytitle>bootparam</refentrytitle><manvolnum>7</manvolnum></citerefentry>.</para>
- <para>For command line paramaters understood by the
+ <para>For command line parameters understood by the
initial RAM disk, please see
<citerefentry><refentrytitle>dracut.cmdline</refentrytitle><manvolnum>7</manvolnum></citerefentry>,
or the documentation of the specific initrd
commit 7830fcd836fb1e8901a534da9ae733109eeba9c4
Author: Ramkumar Ramachandra <artagnon at gmail.com>
Date: Fri Nov 30 00:36:56 2012 +0530
DISTRO_PORTING: correct location of hostname-setup.c
f33d3ec1 (move more common files to shared/ and add them to shared.la,
2012-04-12) moved src/hostname-setup.c to src/shared/hostname-setup.c,
but did not update DISTRO_PORTING accordingly. Fix this.
diff --git a/DISTRO_PORTING b/DISTRO_PORTING
index 2b08bf8..a6ae043 100644
--- a/DISTRO_PORTING
+++ b/DISTRO_PORTING
@@ -9,9 +9,9 @@ HOWTO:
insensitively) and you should be able to find the places where
you need to add/change things.
- 1) Patch src/hostname-setup.c so that systemd knows where to
- read your host name from. You might also want to update
- status_welcome() in util.c.
+ 1) Patch src/shared/hostname-setup.c so that systemd knows
+ where to read your host name from. You might also want to
+ update status_welcome() in util.c.
2) Check the unit files in units/ if they match your
distribution. Most likely you will have to make additions to
commit 6126a412dbc7628cbc94660e57bd6915e842c2d4
Author: Ramkumar Ramachandra <artagnon at gmail.com>
Date: Fri Nov 30 00:36:55 2012 +0530
LICENSE.LGPL2.1: update license
Update the license with the copy found on
http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt
diff --git a/LICENSE.LGPL2.1 b/LICENSE.LGPL2.1
index 89d4489..5cbfcb5 100644
--- a/LICENSE.LGPL2.1
+++ b/LICENSE.LGPL2.1
@@ -3,7 +3,7 @@
Version 2.1, February 1999
Copyright (C) 1991, 1999 Free Software Foundation, Inc.
- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
@@ -23,8 +23,7 @@ specially designated software packages--typically libraries--of the
Free Software Foundation and other authors who decide to use it. You
can use it too, but we suggest you first think carefully about whether
this license or the ordinary General Public License is the better
-strategy to use in any particular case, based on the explanations
-below.
+strategy to use in any particular case, based on the explanations below.
When we speak of free software, we are referring to freedom of use,
not price. Our General Public Licenses are designed to make sure that
@@ -57,7 +56,7 @@ modified by someone else and passed on, the recipients should know
that what they have is not the original version, so that the original
author's reputation will not be affected by problems that might be
introduced by others.
-^L
+
Finally, software patents pose a constant threat to the existence of
any free program. We wish to make sure that a company cannot
effectively restrict the users of a free program by obtaining a
@@ -89,9 +88,9 @@ libraries. However, the Lesser license provides advantages in certain
special circumstances.
For example, on rare occasions, there may be a special need to
-encourage the widest possible use of a certain library, so that it
-becomes a de-facto standard. To achieve this, non-free programs must
-be allowed to use the library. A more frequent case is that a free
+encourage the widest possible use of a certain library, so that it becomes
+a de-facto standard. To achieve this, non-free programs must be
+allowed to use the library. A more frequent case is that a free
library does the same job as widely used non-free libraries. In this
case, there is little to gain by limiting the free library to free
software only, so we use the Lesser General Public License.
@@ -113,7 +112,7 @@ modification follow. Pay close attention to the difference between a
"work based on the library" and a "work that uses the library". The
former contains code derived from the library, whereas the latter must
be combined with the library in order to run.
-^L
+
GNU LESSER GENERAL PUBLIC LICENSE
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
@@ -138,8 +137,8 @@ included without limitation in the term "modification".)
"Source code" for a work means the preferred form of the work for
making modifications to it. For a library, complete source code means
all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control
-compilation and installation of the library.
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
Activities other than copying, distribution and modification are not
covered by this License; they are outside its scope. The act of
@@ -218,7 +217,7 @@ instead of to this License. (If a newer version than version 2 of the
ordinary GNU General Public License has appeared, then you can specify
that version instead if you wish.) Do not make any other change in
these notices.
-^L
+
Once this change is made in a given copy, it is irreversible for
that copy, so the ordinary GNU General Public License applies to all
subsequent copies and derivative works made from that copy.
@@ -269,7 +268,7 @@ Library will still fall under Section 6.)
distribute the object code for the work under the terms of Section 6.
Any executables containing that work also fall under Section 6,
whether or not they are linked directly with the Library itself.
-^L
+
6. As an exception to the Sections above, you may also combine or
link a "work that uses the Library" with the Library to produce a
work containing portions of the Library, and distribute that work
@@ -305,10 +304,10 @@ of these things:
the user installs one, as long as the modified version is
interface-compatible with the version that the work was made with.
- c) Accompany the work with a written offer, valid for at least
- three years, to give the same user the materials specified in
- Subsection 6a, above, for a charge no more than the cost of
- performing this distribution.
+ c) Accompany the work with a written offer, valid for at
+ least three years, to give the same user the materials
+ specified in Subsection 6a, above, for a charge no more
+ than the cost of performing this distribution.
d) If distribution of the work is made by offering access to copy
from a designated place, offer equivalent access to copy the above
@@ -331,7 +330,7 @@ restrictions of other proprietary libraries that do not normally
accompany the operating system. Such a contradiction means you cannot
use both them and the Library together in an executable that you
distribute.
-^L
+
7. You may place library facilities that are a work based on the
Library side-by-side in a single library together with other library
facilities not covered by this License, and distribute such a combined
@@ -372,7 +371,7 @@ subject to these terms and conditions. You may not impose any further
restrictions on the recipients' exercise of the rights granted herein.
You are not responsible for enforcing compliance by third parties with
this License.
-^L
+
11. If, as a consequence of a court judgment or allegation of patent
infringement or for any other reason (not limited to patent issues),
conditions are imposed on you (whether by court order, agreement or
@@ -386,10 +385,9 @@ all those who receive copies directly or indirectly through you, then
the only way you could satisfy both it and this License would be to
refrain entirely from distribution of the Library.
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply, and the section as a whole is intended to apply in other
-circumstances.
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
It is not the purpose of this section to induce you to infringe any
patents or other property right claims or to contest validity of any
@@ -407,11 +405,11 @@ be a consequence of the rest of this License.
12. If the distribution and/or use of the Library is restricted in
certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License
-may add an explicit geographical distribution limitation excluding those
-countries, so that distribution is permitted only in or among
-countries not thus excluded. In such case, this License incorporates
-the limitation as if written in the body of this License.
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded. In such case, this License incorporates the limitation as if
+written in the body of this License.
13. The Free Software Foundation may publish revised and/or new
versions of the Lesser General Public License from time to time.
@@ -425,7 +423,7 @@ conditions either of that version or of any later version published by
the Free Software Foundation. If the Library does not specify a
license version number, you may choose any version ever published by
the Free Software Foundation.
-^L
+
14. If you wish to incorporate parts of the Library into other free
programs whose distribution conditions are incompatible with these,
write to the author to ask for permission. For software which is
@@ -459,21 +457,19 @@ SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
DAMAGES.
END OF TERMS AND CONDITIONS
-^L
+
How to Apply These Terms to Your New Libraries
If you develop a new library, and you want it to be of the greatest
possible use to the public, we recommend making it free software that
everyone can redistribute and change. You can do so by permitting
-redistribution under these terms (or, alternatively, under the terms
-of the ordinary General Public License).
-
- To apply these terms, attach the following notices to the library.
-It is safest to attach them to the start of each source file to most
-effectively convey the exclusion of warranty; and each file should
-have at least the "copyright" line and a pointer to where the full
-notice is found.
+redistribution under these terms (or, alternatively, under the terms of the
+ordinary General Public License).
+ To apply these terms, attach the following notices to the library. It is
+safest to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
<one line to give the library's name and a brief idea of what it does.>
Copyright (C) <year> <name of author>
@@ -490,17 +486,16 @@ notice is found.
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Also add information on how to contact you by electronic and paper mail.
-You should also get your employer (if you work as a programmer) or
-your school, if any, to sign a "copyright disclaimer" for the library,
-if necessary. Here is a sample; alter the names:
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the library, if
+necessary. Here is a sample; alter the names:
Yoyodyne, Inc., hereby disclaims all copyright interest in the
- library `Frob' (a library for tweaking knobs) written by James
- Random Hacker.
+ library `Frob' (a library for tweaking knobs) written by James Random Hacker.
<signature of Ty Coon>, 1 April 1990
Ty Coon, President of Vice
More information about the systemd-commits
mailing list