dbus: make more cgroup attributes runtime settable

[elogind.git] / man / systemd-system.conf.xml

diff --git a/man/systemd-system.conf.xml b/man/systemd-system.conf.xml
index eaa770b4b1ef0fdc1b03ee7a1a5938d0c2b67553..48d02269cc404b6e54b6985f0e3528d19bf2338b 100644 (file)
--- a/man/systemd-system.conf.xml
+++ b/man/systemd-system.conf.xml
@@ -155,7 +155,7 @@
                                 this option is changed, and make sure
                                 the new configuration file is included
                                 in it. Otherwise the initrd might
                                 this option is changed, and make sure
                                 the new configuration file is included
                                 in it. Otherwise the initrd might

-                                mount the controller hierachies in a
+                                mount the controller hierarchies in a

                                 different configuration than intended,
                                 and the main system cannot remount
                                 them anymore.</para></listitem>
                                 different configuration than intended,
                                 and the main system cannot remount
                                 them anymore.</para></listitem>


@@ -262,6 +262,28 @@
                                 too.</para></listitem>
                         </varlistentry>
 
                                 too.</para></listitem>
                         </varlistentry>
 

+                        <varlistentry>
+                                <term><varname>DefaultEnvironment=</varname></term>
+
+                                <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>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>
                                 <term><varname>DefaultLimitCPU=</varname></term>
                                 <term><varname>DefaultLimitFSIZE=</varname></term>
                         <varlistentry>
                                 <term><varname>DefaultLimitCPU=</varname></term>
                                 <term><varname>DefaultLimitFSIZE=</varname></term>


@@ -302,7 +324,8 @@
                   <title>See Also</title>
                   <para>
                           <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
                   <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>
 
                   </para>
         </refsect1>