X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=man%2Fsystemd.conf.xml;h=56490ef442d7a2626e70d30a5264030245546b07;hp=32eae2b8e0a98587b179564d11e1a5bdbf8d7b24;hb=8ab49c12dcab02d9d83e63a93676d4fc8f709516;hpb=06d4c99ab3d479c1a7c087a87e82fe01626128f6

diff --git a/man/systemd.conf.xml b/man/systemd.conf.xml
index 32eae2b8e..56490ef44 100644
--- a/man/systemd.conf.xml
+++ b/man/systemd.conf.xml
@@ -81,11 +81,13 @@
                                 <term><varname>ShowStatus=yes</varname></term>
                                 <term><varname>SysVConsole=yes</varname></term>
                                 <term><varname>CrashChVT=1</varname></term>
+                                <term><varname>DefaultStandardOutput=null</varname></term>
+                                <term><varname>DefaultStandardError=inherit</varname></term>
 
                                 <listitem><para>Configures various
                                 parameters of basic manager
                                 operation. These options may be
-                                overriden by the respective command
+                                overridden by the respective command
                                 line arguments. See
                                 <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>
                                 for details about these command line
@@ -121,12 +123,32 @@
                                 create per-service cgroups
                                 automatically, in addition to the
                                 name=systemd named hierarchy. Defaults
-                                to 'cpu'. Takes a space seperated list
+                                to 'cpu'. Takes a space separated list
                                 of controller names. Pass an empty
                                 string to ensure that systemd does not
-                                touch any hiearchies but its
+                                touch any hierarchies but its
                                 own.</para></listitem>
                         </varlistentry>
+
+                        <varlistentry>
+                                <term><varname>JoinControllers=cpu,cpuacct</varname></term>
+
+                                <listitem><para>Configures controllers
+                                that shall be mounted in a single
+                                hierarchy. By default systemd will
+                                mount all controllers which are
+                                enabled in the kernel in individual
+                                hierachies, with the exception of
+                                those listed in this setting. Takes a
+                                space separated list of comma
+                                separated controller names, in order
+                                to allow multiple joined
+                                hierarchies. Defaults to
+                                'cpu,cpuacct'. Pass an empty string to
+                                ensure that systemd mounts all
+                                controllers in separate
+                                hierarchies.</para></listitem>
+                        </varlistentry>
                 </variablelist>
         </refsect1>