X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=man%2Fsystemd.conf.xml;h=54a8398d43f6a98985a83e3a3eac31f104ffa616;hp=6759f978148b5f3f6a8a837aa4dff08ed1ad7cfa;hb=28dbc1e80b0db09313f11e44f218138aefd646c8;hpb=af2d49f70bcff20efaf2d69aecaf4b3e898ff1fa

diff --git a/man/systemd.conf.xml b/man/systemd.conf.xml
index 6759f9781..54a8398d4 100644
--- a/man/systemd.conf.xml
+++ b/man/systemd.conf.xml
@@ -85,7 +85,7 @@
                                 <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
@@ -112,6 +112,21 @@
                                 whether this job is left to some other
                                 system script.</para></listitem>
                         </varlistentry>
+
+                        <varlistentry>
+                                <term><varname>DefaultControllers=cpu</varname></term>
+
+                                <listitem><para>Configures in which
+                                cgroup controller hierarchies to
+                                create per-service cgroups
+                                automatically, in addition to the
+                                name=systemd named hierarchy. Defaults
+                                to 'cpu'. Takes a space separated list
+                                of controller names. Pass an empty
+                                string to ensure that systemd does not
+                                touch any hierarchies but its
+                                own.</para></listitem>
+                        </varlistentry>
                 </variablelist>
         </refsect1>