From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 23 Jul 2018 09:05:40 +0000 (+0200)
Subject: man: document CPUAffinity= in system.conf in more detail
X-Git-Tag: v240~898
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d68c0833eac6d46a3ed83f0ba7a049fe24291226;p=thirdparty%2Fsystemd.git

man: document CPUAffinity= in system.conf in more detail

Fixes: #9692
---

diff --git a/man/systemd-system.conf.xml b/man/systemd-system.conf.xml
index 4cdd85f9fff..a9116ea08fd 100644
--- a/man/systemd-system.conf.xml
+++ b/man/systemd-system.conf.xml
@@ -99,11 +99,11 @@
       <varlistentry>
         <term><varname>CPUAffinity=</varname></term>
 
-        <listitem><para>Configures the initial CPU affinity for the
-        init process. Takes a list of CPU indices or ranges separated
-        by either whitespace or commas. CPU ranges are specified by
-        the lower and upper CPU indices separated by a
-        dash.</para></listitem>
+        <listitem><para>Configures the CPU affinity for the service manager as well as the default CPU affinity for all
+        forked off processes. Takes a list of CPU indices or ranges separated by either whitespace or commas. CPU
+        ranges are specified by the lower and upper CPU indices separated by a dash. Individual services may override
+        the CPU affinity for their processes with the <varname>CPUAffinity=</varname> setting in unit files, see
+        <citerefentry><refentrytitle>systemd.exec</refentrytitle><manvolnum>5</manvolnum></citerefentry>.</para></listitem>
       </varlistentry>
 
       <varlistentry>