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

diff --git a/man/systemd.conf.xml b/man/systemd.conf.xml
index fb038eaf6..a550c2c71 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>
@@ -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