X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fsystemd.conf.xml;h=a6be932c73ad64137c61d54fbaee26800afdf634;hb=669b04a492e33601e6c34a40bc96ad9ffa11c5a2;hp=fb038eaf6d9b65d7929e357926df0189ef455ca8;hpb=4aa6e7782a1b693a8e4fa1d84c87dd76fe1e536d;p=elogind.git

diff --git a/man/systemd.conf.xml b/man/systemd.conf.xml
index fb038eaf6..a6be932c7 100644
--- a/man/systemd.conf.xml
+++ b/man/systemd.conf.xml
@@ -44,7 +44,7 @@
 
         <refnamediv>
                 <refname>systemd.conf</refname>
-                <refpurpose>systemd manager configuration file</refpurpose>
+                <refpurpose>System and service manager configuration file</refpurpose>
         </refnamediv>
 
         <refsynopsisdiv>
@@ -69,7 +69,7 @@
                 <para>All options are configured in the
                 <literal>[Manager]</literal> section:</para>
 
-                <variablelist>
+                <variablelist class='systemd-directives'>
 
                         <varlistentry>
                                 <term><varname>LogLevel=</varname></term>
@@ -118,14 +118,14 @@
                         </varlistentry>
 
                         <varlistentry>
-                                <term><varname>JoinControllers=cpu,cpuacct</varname></term>
+                                <term><varname>JoinControllers=cpu,cpuacct,cpuset net_cls,netprio</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
+                                hierarchies, with the exception of
                                 those listed in this setting. Takes a
                                 space separated list of comma
                                 separated controller names, in order
@@ -201,7 +201,7 @@
                                 capabilities will be included, the
                                 effect of the assignment
                                 inverted. Note that this option also
-                                effects the respective capabilities in
+                                affects the respective capabilities in
                                 the effective, permitted and
                                 inheritable capability sets. The
                                 capability bounding set may also be
@@ -220,7 +220,7 @@
                                 <listitem><para>Sets the timer slack
                                 in nanoseconds for PID 1 which is then
                                 inherited to all executed processes,
-                                unless overriden individually, for
+                                unless overridden individually, for
                                 example with the
                                 <varname>TimerSlackNSec=</varname>
                                 setting in service units (for details
@@ -264,7 +264,7 @@
                                 <varname>infinity</varname> to
                                 configure no limit on a specific
                                 resource. These settings may be
-                                overriden in individual units
+                                overridden in individual units
                                 using the corresponding LimitXXX=
                                 directives. Note that these resource
                                 limits are only defaults for units,