X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=man%2Fsystemd-system.conf.xml;h=a67b158996c2fe85ffe3eb2aab12d02f5d5f8fe0;hp=588685540774d08a5d6499301641c65643268bb4;hb=60211b35070a20ed0e78a83f39619139d56f7745;hpb=97d0e5f83ba4dd713170f802b90149b7325bc992

diff --git a/man/systemd-system.conf.xml b/man/systemd-system.conf.xml
index 588685540..a67b15899 100644
--- a/man/systemd-system.conf.xml
+++ b/man/systemd-system.conf.xml
@@ -112,8 +112,8 @@
                                 addition to the
                                 <literal>name=systemd</literal> named
                                 hierarchy. Defaults to
-                                <literal>cpu</literal>. Takes a space
-                                separated list of controller
+                                <literal>cpu</literal>. Takes a
+                                space-separated list of controller
                                 names. Pass the empty string to ensure
                                 that systemd does not touch any
                                 hierarchies but its own.</para>
@@ -138,8 +138,8 @@
                                 enabled in the kernel in individual
                                 hierarchies, with the exception of
                                 those listed in this setting. Takes a
-                                space separated list of comma
-                                separated controller names, in order
+                                space-separated list of comma-separated
+                                controller names, in order
                                 to allow multiple joined
                                 hierarchies. Defaults to
                                 'cpu,cpuacct'. Pass an empty string to
@@ -150,7 +150,7 @@
                                 <para>Note that this option is only
                                 applied once, at very early boot. If
                                 you use an initial RAM disk (initrd)
-                                that uses systemd it might hence be
+                                that uses systemd, it might hence be
                                 necessary to rebuild the initrd if
                                 this option is changed, and make sure
                                 the new configuration file is included
@@ -214,9 +214,8 @@
                                 capability bounding set for PID 1 and
                                 its children. See
                                 <citerefentry><refentrytitle>capabilities</refentrytitle><manvolnum>7</manvolnum></citerefentry>
-                                for details. Takes a whitespace
-                                separated list of capability names as
-                                read by
+                                for details. Takes a whitespace-separated
+                                list of capability names as read by
                                 <citerefentry><refentrytitle>cap_from_name</refentrytitle><manvolnum>3</manvolnum></citerefentry>.
                                 Capabilities listed will be included
                                 in the bounding set, all others are
@@ -265,22 +264,23 @@
                         <varlistentry>
                                 <term><varname>DefaultEnvironment=</varname></term>
 
-                                <listitem><para>Sets systemd manager
-                                environment variables for executed
-                                processes. Takes a space-separated
-                                list of variable assignments.
-                                </para>
+                                <listitem><para>Sets manager
+                                environment variables passed to all
+                                executed processes. Takes a
+                                space-separated list of variable
+                                assignments. See
+                                <citerefentry><refentrytitle>environ</refentrytitle><manvolnum>7</manvolnum></citerefentry>
+                                for details about environment
+                                variables.</para>
 
                                 <para>Example:
-                                <programlisting>Environment="VAR1=word1 word2" VAR2=word3 "VAR3=word 5 6"</programlisting>
-                                gives three variables <literal>VAR1</literal>,
-                                <literal>VAR2</literal>, <literal>VAR3</literal>.
-                                </para>
 
-                                <para>
-                                See
-                                <citerefentry><refentrytitle>environ</refentrytitle><manvolnum>7</manvolnum></citerefentry>
-                                for details about environment variables.</para></listitem>
+                                <programlisting>DefaultEnvironment="VAR1=word1 word2" VAR2=word3 "VAR3=word 5 6"</programlisting>
+
+                                Sets three variables
+                                <literal>VAR1</literal>,
+                                <literal>VAR2</literal>,
+                                <literal>VAR3</literal>.</para></listitem>
                         </varlistentry>
 
                         <varlistentry>
@@ -323,7 +323,8 @@
                   <title>See Also</title>
                   <para>
                           <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-                          <citerefentry><refentrytitle>systemd.directives</refentrytitle><manvolnum>7</manvolnum></citerefentry>
+                          <citerefentry><refentrytitle>systemd.directives</refentrytitle><manvolnum>7</manvolnum></citerefentry>,
+                          <citerefentry><refentrytitle>environ</refentrytitle><manvolnum>7</manvolnum></citerefentry>
                   </para>
         </refsect1>