X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fsystemd-system.conf.xml;h=a7dfc0329c6891e62875cf56521d9eb315a39924;hb=8d0cfd6c8858d4f32d1eda122eb5a61e96e6ac54;hp=c33e010e36e00afb3efc33949c4ad5565b9dc2bc;hpb=d3b1c5083359faa6cfca81810cf87ef70d0290f6;p=elogind.git

diff --git a/man/systemd-system.conf.xml b/man/systemd-system.conf.xml
index c33e010e3..a7dfc0329 100644
--- a/man/systemd-system.conf.xml
+++ b/man/systemd-system.conf.xml
@@ -99,7 +99,7 @@
                                 <listitem><para>Configures the initial
                                 CPU affinity for the init
                                 process. Takes a space-separated list
-                                of CPU indexes.</para></listitem>
+                                of CPU indices.</para></listitem>
                         </varlistentry>
 
                         <varlistentry>
@@ -216,21 +216,21 @@
 
                                 <listitem><para>Takes a
                                 space-separated list of architecture
-                                identifiers. Selects of which
+                                identifiers. Selects from which
                                 architectures system calls may be
                                 invoked on this system. This may be
                                 used as an effective way to disable
                                 invocation of non-native binaries
                                 system-wide, for example to prohibit
-                                execution of 32bit x86 binaries on
-                                64bit x86-64 systems. This option
-                                operates system wide, and acts
+                                execution of 32-bit x86 binaries on
+                                64-bit x86-64 systems. This option
+                                operates system-wide, and acts
                                 similar to the
                                 <varname>SystemCallArchitectures=</varname>
                                 setting of unit files, see
                                 <citerefentry><refentrytitle>systemd.exec</refentrytitle><manvolnum>5</manvolnum></citerefentry>
                                 for details. This setting defaults to
-                                the empty list in which case no
+                                the empty list, in which case no
                                 filtering of system calls based on
                                 architecture is applied. Known
                                 architecture identifiers are
@@ -249,7 +249,7 @@
                                 execution of any non-native
                                 binaries. When a binary executes a
                                 system call of an architecture that is
-                                not listed in this setting it will be
+                                not listed in this setting, it will be
                                 immediately terminated with the SIGSYS
                                 signal.</para></listitem>
                         </varlistentry>
@@ -285,14 +285,14 @@
                                 <term><varname>DefaultRestartSec=</varname></term>
 
                                 <listitem><para>Configures the default
-                                time-outs for starting and stopping of
+                                timeouts for starting and stopping of
                                 units, as well as the default time to
                                 sleep between automatic restarts of
                                 units, as configured per-unit in
                                 <varname>TimeoutStartSec=</varname>,
                                 <varname>TimeoutStopSec=</varname> and
                                 <varname>RestartSec=</varname> (for
-                                service units, see
+                                services, see
                                 <citerefentry><refentrytitle>systemd.service</refentrytitle><manvolnum>5</manvolnum></citerefentry>
                                 for details on the per-unit
                                 settings). For non-service units,
@@ -301,18 +301,20 @@
                                 <varname>TimeoutSec=</varname> value.
                                 </para></listitem>
                         </varlistentry>
+
                         <varlistentry>
                                 <term><varname>DefaultStartLimitInterval=</varname></term>
                                 <term><varname>DefaultStartLimitBurst=</varname></term>
 
-                                <listitem><para>Configure the default start rate
-                                limiting, as configured per-service by
-                                <varname>StartLimitInterval=</varname> and
+                                <listitem><para>Configure the default
+                                unit start rate limiting, as
+                                configured per-service by
+                                <varname>StartLimitInterval=</varname>
+                                and
                                 <varname>StartLimitBurst=</varname>. See
                                 <citerefentry><refentrytitle>systemd.service</refentrytitle><manvolnum>5</manvolnum></citerefentry>
                                 for details on the per-service
-                                settings).
-                                </para></listitem>
+                                settings.</para></listitem>
                         </varlistentry>
 
                         <varlistentry>
@@ -337,6 +339,23 @@
                                 <literal>VAR3</literal>.</para></listitem>
                         </varlistentry>
 
+                        <varlistentry>
+                                <term><varname>DefaultCPUAccounting=</varname></term>
+                                <term><varname>DefaultBlockIOAccounting=</varname></term>
+                                <term><varname>DefaultMemoryAccounting=</varname></term>
+
+                                <listitem><para>Configure the default
+                                resource accounting settings, as
+                                configured per-unit by
+                                <varname>CPUAccounting=</varname>,
+                                <varname>BlockIOAccounting=</varname>
+                                and
+                                <varname>MemoryAccounting=</varname>. See
+                                <citerefentry><refentrytitle>systemd.resource-control</refentrytitle><manvolnum>5</manvolnum></citerefentry>
+                                for details on the per-unit
+                                settings.</para></listitem>
+                        </varlistentry>
+
                         <varlistentry>
                                 <term><varname>DefaultLimitCPU=</varname></term>
                                 <term><varname>DefaultLimitFSIZE=</varname></term>