man: explain a bit more detailed what happens on suspend

[elogind.git] / man / systemd.conf.xml

diff --git a/man/systemd.conf.xml b/man/systemd.conf.xml
index 2659f9ab7bbbcf0cf8ce19f3d83b48414fe6a3a0..a6be932c73ad64137c61d54fbaee26800afdf634 100644 (file)
--- a/man/systemd.conf.xml
+++ b/man/systemd.conf.xml
@@ -44,12 +44,12 @@
 
         <refnamediv>
                 <refname>systemd.conf</refname>
 
         <refnamediv>
                 <refname>systemd.conf</refname>

-                <refpurpose>systemd manager configuration file</refpurpose>
+                <refpurpose>System and service manager configuration file</refpurpose>

         </refnamediv>
 
         <refsynopsisdiv>
         </refnamediv>
 
         <refsynopsisdiv>

-                <para><filename>system.conf</filename></para>
-                <para><filename>user.conf</filename></para>
+                <para><filename>/etc/systemd/system.conf</filename></para>
+                <para><filename>/etc/systemd/user.conf</filename></para>

         </refsynopsisdiv>
 
         <refsect1>
         </refsynopsisdiv>
 
         <refsect1>


@@ -69,7 +69,7 @@
                 <para>All options are configured in the
                 <literal>[Manager]</literal> section:</para>
 
                 <para>All options are configured in the
                 <literal>[Manager]</literal> section:</para>
 

-                <variablelist>
+                <variablelist class='systemd-directives'>

 
                         <varlistentry>
                                 <term><varname>LogLevel=</varname></term>
 
                         <varlistentry>
                                 <term><varname>LogLevel=</varname></term>


@@ -79,7 +79,6 @@
                                 <term><varname>DumpCore=yes</varname></term>
                                 <term><varname>CrashShell=no</varname></term>
                                 <term><varname>ShowStatus=yes</varname></term>
                                 <term><varname>DumpCore=yes</varname></term>
                                 <term><varname>CrashShell=no</varname></term>
                                 <term><varname>ShowStatus=yes</varname></term>

-                                <term><varname>SysVConsole=yes</varname></term>

                                 <term><varname>CrashChVT=1</varname></term>
                                 <term><varname>DefaultStandardOutput=journal</varname></term>
                                 <term><varname>DefaultStandardError=inherit</varname></term>
                                 <term><varname>CrashChVT=1</varname></term>
                                 <term><varname>DefaultStandardOutput=journal</varname></term>
                                 <term><varname>DefaultStandardError=inherit</varname></term>


@@ -119,14 +118,14 @@
                         </varlistentry>
 
                         <varlistentry>
                         </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
 
                                 <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
                                 those listed in this setting. Takes a
                                 space separated list of comma
                                 separated controller names, in order


@@ -202,7 +201,7 @@
                                 capabilities will be included, the
                                 effect of the assignment
                                 inverted. Note that this option also
                                 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
                                 the effective, permitted and
                                 inheritable capability sets. The
                                 capability bounding set may also be


@@ -215,6 +214,30 @@
                                 are lost for good.</para></listitem>
                         </varlistentry>
 
                                 are lost for good.</para></listitem>
                         </varlistentry>
 

+                        <varlistentry>
+                                <term><varname>TimerSlackNSec=</varname></term>
+
+                                <listitem><para>Sets the timer slack
+                                in nanoseconds for PID 1 which is then
+                                inherited to all executed processes,
+                                unless overridden individually, for
+                                example with the
+                                <varname>TimerSlackNSec=</varname>
+                                setting in service units (for details
+                                see
+                                <citerefentry><refentrytitle>systemd.exec</refentrytitle><manvolnum>5</manvolnum></citerefentry>). The
+                                timer slack controls the accuracy of
+                                wake-ups triggered by timers. See
+                                <citerefentry><refentrytitle>prctl</refentrytitle><manvolnum>2</manvolnum></citerefentry>
+                                for more information. Note that in
+                                contrast to most other time span
+                                definitions this parameter takes an
+                                integer value in nano-seconds if no
+                                unit is specified. The usual time
+                                units are understood
+                                too.</para></listitem>
+                        </varlistentry>
+

                         <varlistentry>
                                 <term><varname>DefaultLimitCPU=</varname></term>
                                 <term><varname>DefaultLimitFSIZE=</varname></term>
                         <varlistentry>
                                 <term><varname>DefaultLimitCPU=</varname></term>
                                 <term><varname>DefaultLimitFSIZE=</varname></term>


@@ -241,7 +264,7 @@
                                 <varname>infinity</varname> to
                                 configure no limit on a specific
                                 resource. These settings may be
                                 <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,
                                 using the corresponding LimitXXX=
                                 directives. Note that these resource
                                 limits are only defaults for units,