X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=man%2Fsysctl.d.xml;h=69e96ee9e580aaf963602aa2fccd84beb56323f6;hp=20f2e24820e53e2d38225a5e5593c526a1a12dc4;hb=44ded3abc28620279633f51a05f2416e5aa3e8e2;hpb=19c5f19d69bb5f520fa7213239490c55de06d99d

diff --git a/man/sysctl.d.xml b/man/sysctl.d.xml
index 20f2e2482..69e96ee9e 100644
--- a/man/sysctl.d.xml
+++ b/man/sysctl.d.xml
@@ -7,16 +7,16 @@
   Copyright 2011 Lennart Poettering
 
   systemd is free software; you can redistribute it and/or modify it
-  under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or
+  under the terms of the GNU Lesser General Public License as published by
+  the Free Software Foundation; either version 2.1 of the License, or
   (at your option) any later version.
 
   systemd is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
+  Lesser General Public License for more details.
 
-  You should have received a copy of the GNU General Public License
+  You should have received a copy of the GNU Lesser General Public License
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 -->
 <refentry id="sysctl.d">
@@ -54,19 +54,21 @@
         <refsect1>
                 <title>Description</title>
 
-		<para><command>systemd</command> uses configuration
-		files from the above directories to configure
-		<citerefentry><refentrytitle>sysctl</refentrytitle><manvolnum>8</manvolnum></citerefentry>
-		kernel parameters during boot.</para>
+                <para>At boot,
+                <citerefentry><refentrytitle>systemd-sysctl.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>
+                reads configuration files from the above directories
+                to configure
+                <citerefentry><refentrytitle>sysctl</refentrytitle><manvolnum>8</manvolnum></citerefentry>
+                kernel parameters.</para>
         </refsect1>
 
         <refsect1>
-		<title>Configuration Format</title>
+                <title>Configuration Format</title>
 
-		<para>The configuration files contain a list of
-		variable assignments, separated by newlines. Empty
-		lines and lines whose first non-whitespace character
-		is # or ; are ignored.</para>
+                <para>The configuration files contain a list of
+                variable assignments, separated by newlines. Empty
+                lines and lines whose first non-whitespace character
+                is # or ; are ignored.</para>
 
                 <para>Note that both / and . are accepted as label
                 separators within sysctl variable
@@ -75,30 +77,30 @@
                 entirely equivalent.</para>
 
                 <para>Each configuration file shall be named in the
-                style of <filename>&lt;program&gt;.conf</filename>.
-                Files in <filename>/run/</filename> override files
-                with the same name in <filename>/usr/lib/</filename>.
-                Files in <filename>/etc</filename> override files with
-                the same name in <filename>/run/</filename> and
-                <filename>/usr/lib/</filename>. Packages should
-                install their configuration files in
+                style of <filename><replaceable>program</replaceable>.conf</filename>.
+                Files in <filename>/etc/</filename> override files
+                with the same name in <filename>/usr/lib/</filename>
+                and <filename>/run/</filename>.  Files in
+                <filename>/run/</filename> override files with the same
+                name in <filename>/usr/lib/</filename>. Packages
+                should install their configuration files in
                 <filename>/usr/lib/</filename>. Files in
                 <filename>/etc/</filename> are reserved for the local
                 administrator, who may use this logic to override the
-                configuration installed by vendor packages. All
-                configuration files are sorted by their name in
+                configuration files installed by vendor packages. All
+                configuration files are sorted by their filename in
                 alphabetical order, regardless in which of the
                 directories they reside, to guarantee that a specific
                 configuration file takes precedence over another file
-                with an alphabetically earlier name, if both files
+                with an alphabetically later name, if both files
                 contain the same variable setting.</para>
 
                 <para>If the administrator wants to disable a
-                configuration file supplied by the vendor the
+                configuration file supplied by the vendor, the
                 recommended way is to place a symlink to
                 <filename>/dev/null</filename> in
-                <filename>/etc/sysctl.d</filename> carrying with the
-                same name.</para>
+                <filename>/etc/sysctl.d/</filename> bearing the
+                same filename.</para>
         </refsect1>
 
         <refsect1>
@@ -115,6 +117,8 @@ kernel.domainname=example.com</programlisting>
                 <title>See Also</title>
                 <para>
                         <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+                        <citerefentry><refentrytitle>systemd-sysctl.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
+                        <citerefentry><refentrytitle>systemd-delta</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
                         <citerefentry><refentrytitle>sysctl</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
                         <citerefentry><refentrytitle>sysctl.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>
                 </para>