chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
LICENSE.LGPL2.1: update license
[elogind.git]
/
man
/
systemd.conf.xml
diff --git
a/man/systemd.conf.xml
b/man/systemd.conf.xml
index 804a50ead615f365ab373aff2bd65714b57c594f..a6be932c73ad64137c61d54fbaee26800afdf634 100644
(file)
--- a/
man/systemd.conf.xml
+++ b/
man/systemd.conf.xml
@@
-44,7
+44,7
@@
<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>
@@
-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>
@@
-118,7
+118,7
@@
</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
<listitem><para>Configures controllers
that shall be mounted in a single
@@
-201,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
-
e
ffects the respective capabilities in
+
a
ffects 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
@@
-220,7
+220,7
@@
<listitem><para>Sets the timer slack
in nanoseconds for PID 1 which is then
inherited to all executed processes,
<listitem><para>Sets the timer slack
in nanoseconds for PID 1 which is then
inherited to all executed processes,
- unless overriden individually, for
+ unless overrid
d
en individually, for
example with the
<varname>TimerSlackNSec=</varname>
setting in service units (for details
example with the
<varname>TimerSlackNSec=</varname>
setting in service units (for details
@@
-264,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
+ overrid
d
en 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,