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

diff --git a/man/systemd.conf.xml b/man/systemd.conf.xml
index 804a50ead..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,7 +118,7 @@
                         </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