shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-01-11 05:17:44 +03:00
Code

man: improve grammar and word formatting in numerous man pages

Browse Source 
Use proper grammar, word usage, adjective hyphenation, commas,
capitalization, spelling, etc.

To improve readability, some run-on sentences or sentence fragments were
revised.

[zj: remove the space from 'file name', 'host name', and 'time zone'.]
This commit is contained in:
Jason St. John 2013-06-27 21:51:44 +02:00 committed by Zbigniew Jędrzejewski-Szmek
parent 6824690f14
commit e9dd9f9547
53 changed files with 345 additions and 348 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
catalog/systemd.catalog
View File

@ -138,7 +138,7 @@ Subject: Time zone change to @TIMEZONE@
Defined-By: systemd Defined-By: systemd
Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
The system time zone has been changed to @TIMEZONE@. The system timezone has been changed to @TIMEZONE@.
-- b07a249cd024414a82dd00cd181378ff -- b07a249cd024414a82dd00cd181378ff
Subject: System start-up is now complete Subject: System start-up is now complete

4
man/binfmt.d.xml
View File

@ -94,11 +94,11 @@
with an alphabetically later name.</para> with an alphabetically later name.</para>
<para>If the administrator wants to disable a <para>If the administrator wants to disable a
configuration file supplied by the vendor the configuration file supplied by the vendor, the
recommended way is to place a symlink to recommended way is to place a symlink to
<filename>/dev/null</filename> in <filename>/dev/null</filename> in
<filename>/etc/binfmt.d/</filename> bearing the <filename>/etc/binfmt.d/</filename> bearing the
same file name.</para> same filename.</para>
</refsect1> </refsect1>
<refsect1> <refsect1>

14
man/hostname.xml
View File

@ -44,7 +44,7 @@
<refnamediv> <refnamediv>
<refname>hostname</refname> <refname>hostname</refname>
<refpurpose>Local host name configuration file</refpurpose> <refpurpose>Local hostname configuration file</refpurpose>
</refnamediv> </refnamediv>
<refsynopsisdiv> <refsynopsisdiv>
@ -59,17 +59,17 @@
during boot, with the during boot, with the
<citerefentry><refentrytitle>sethostname</refentrytitle><manvolnum>2</manvolnum></citerefentry> <citerefentry><refentrytitle>sethostname</refentrytitle><manvolnum>2</manvolnum></citerefentry>
system call. It should contain a single system call. It should contain a single
newline-terminated host name string. The newline-terminated hostname string. The
host name may be a free-form string up to 64 characters hostname may be a free-form string up to 64 characters
in length, however it is recommended that it consists in length; however, it is recommended that it consists
only of 7bit ASCII lower-case characters and no spaces or dots, only of 7-bit ASCII lower-case characters and no spaces or dots,
and limits itself to the format allowed for DNS domain and limits itself to the format allowed for DNS domain
name labels, even though this is not a name labels, even though this is not a
strict requirement.</para> strict requirement.</para>
<para>Depending on the operating system other <para>Depending on the operating system, other
configuration files might be checked for configuration configuration files might be checked for configuration
of the host name as well, however only as fallback.</para> of the hostname as well, however only as fallback.</para>
<para>You may use <para>You may use
<citerefentry><refentrytitle>hostnamectl</refentrytitle><manvolnum>1</manvolnum></citerefentry> <citerefentry><refentrytitle>hostnamectl</refentrytitle><manvolnum>1</manvolnum></citerefentry>

48
man/hostnamectl.xml
View File

@ -60,9 +60,9 @@
query and change the system hostname and related query and change the system hostname and related
settings.</para> settings.</para>
<para>This tool distinguishes three different host <para>This tool distinguishes three different
names: the high-level "pretty" hostname which might hostnames: the high-level "pretty" hostname which
include all kinds of special characters might include all kinds of special characters
(e.g. "Lennart's Laptop"), the static hostname which (e.g. "Lennart's Laptop"), the static hostname which
is used to initialize the kernel hostname at boot is used to initialize the kernel hostname at boot
(e.g. "lennarts-laptop"), and the transient hostname (e.g. "lennarts-laptop"), and the transient hostname
@ -77,10 +77,10 @@
and transient hostnames are limited to the usually and transient hostnames are limited to the usually
accepted characters of internet domain names.</para> accepted characters of internet domain names.</para>
<para>The static host name is stored in <para>The static hostname is stored in
<filename>/etc/hostname</filename>, see <filename>/etc/hostname</filename>, see
<citerefentry><refentrytitle>hostname</refentrytitle><manvolnum>5</manvolnum></citerefentry> <citerefentry><refentrytitle>hostname</refentrytitle><manvolnum>5</manvolnum></citerefentry>
for more information. The pretty host name, chassis for more information. The pretty hostname, chassis
type and icon name are stored in type and icon name are stored in
<filename>/etc/machine-info</filename>, see <filename>/etc/machine-info</filename>, see
<citerefentry><refentrytitle>machine-id</refentrytitle><manvolnum>5</manvolnum></citerefentry>.</para> <citerefentry><refentrytitle>machine-id</refentrytitle><manvolnum>5</manvolnum></citerefentry>.</para>
@ -143,8 +143,8 @@
<listitem><para>If <listitem><para>If
<command>set-hostname</command> is <command>set-hostname</command> is
invoked and one or more of these invoked and one or more of these
options are passed only the selected options are passed, only the selected
hostnames is hostname(s) is/are
updated.</para></listitem> updated.</para></listitem>
</varlistentry> </varlistentry>
</variablelist> </variablelist>
@ -164,34 +164,34 @@
<term><command>set-hostname [NAME]</command></term> <term><command>set-hostname [NAME]</command></term>
<listitem><para>Set the system <listitem><para>Set the system
hostname. By default this will alter hostname. By default, this will alter
the pretty, the static, and the the pretty, the static, and the
transient hostname alike, however if transient hostname alike; however, if
one or more of one or more of
<option>--static</option>, <option>--static</option>,
<option>--transient</option>, <option>--transient</option>,
<option>--pretty</option> are used <option>--pretty</option> are used,
only the selected hostnames are only the selected hostnames are
changed. If the pretty hostname is changed. If the pretty hostname is
being set, and static or transient are being set, and static or transient are
being set as well the specified host being set as well, the specified
name will be simplified in regards to hostname will be simplified in regards
the character set used before the to the character set used before the
latter are updated. This is done by latter are updated. This is done by
replacing spaces by "-" and removing replacing spaces with "-" and removing
special characters. This ensures that special characters. This ensures that
the pretty and the static hostname the pretty and the static hostname are
are always closely related while still always closely related while still
following the validity rules of the following the validity rules of the
specific name. This simplification of specific name. This simplification of
the hostname string is not done if the hostname string is not done if
only the transient and/or static host only the transient and/or static
names are set, and the pretty host hostnames are set, and the pretty
name is left untouched. Pass the empty hostname is left untouched. Pass the
string "" as hostname to reset the empty string "" as the hostname to
selected hostnames to their default reset the selected hostnames to their
(usually default (usually "localhost").
"localhost").</para></listitem> </para></listitem>
</varlistentry> </varlistentry>
<varlistentry> <varlistentry>
@ -206,7 +206,7 @@
Naming Specification</ulink>. Pass an Naming Specification</ulink>. Pass an
empty string to this operation to empty string to this operation to
reset the icon name to the default reset the icon name to the default
value which is determined from chassis value, which is determined from chassis
type (see below) and possibly other type (see below) and possibly other
parameters.</para></listitem> parameters.</para></listitem>
</varlistentry> </varlistentry>

2
man/kernel-install.xml
View File

@ -67,7 +67,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
located in the directory <filename>/usr/lib/kernel/install.d/</filename> located in the directory <filename>/usr/lib/kernel/install.d/</filename>
and the local administration directory <filename>/etc/kernel/install.d/</filename>. and the local administration directory <filename>/etc/kernel/install.d/</filename>.
All files are collectively sorted and executed in lexical order, regardless of the directory in All files are collectively sorted and executed in lexical order, regardless of the directory in
which they live. However, files with identical file names replace each other. which they live. However, files with identical filenames replace each other.
Files in <filename>/etc/kernel/install.d/</filename> take precedence over files with the same name Files in <filename>/etc/kernel/install.d/</filename> take precedence over files with the same name
in <filename>/usr/lib/kernel/install.d/</filename>. This can be used to override a system-supplied in <filename>/usr/lib/kernel/install.d/</filename>. This can be used to override a system-supplied
executables with a local file if needed; a symbolic link in <filename>/etc/kernel/install.d/</filename> executables with a local file if needed; a symbolic link in <filename>/etc/kernel/install.d/</filename>

12
man/localtime.xml
View File

@ -51,7 +51,7 @@
<refnamediv> <refnamediv>
<refname>localtime</refname> <refname>localtime</refname>
<refpurpose>Local time zone configuration file</refpurpose> <refpurpose>Local timezone configuration file</refpurpose>
</refnamediv> </refnamediv>
<refsynopsisdiv> <refsynopsisdiv>
@ -62,24 +62,24 @@
<title>Description</title> <title>Description</title>
<para>The <filename>/etc/localtime</filename> file <para>The <filename>/etc/localtime</filename> file
configures the system-wide time zone of the local configures the system-wide timezone of the local
system that is used by applications for presentation system that is used by applications for presentation
to the user. It should be an absolute or relative to the user. It should be an absolute or relative
symbolic link pointing to symbolic link pointing to
<filename>/usr/share/zoneinfo/</filename>, followed by <filename>/usr/share/zoneinfo/</filename>, followed by
a time zone identifier such as a timezone identifier such as
<literal>Europe/Berlin</literal> or <literal>Europe/Berlin</literal> or
<literal>Etc/UTC</literal>. The resulting link should <literal>Etc/UTC</literal>. The resulting link should
lead to the corresponding binary lead to the corresponding binary
<citerefentry><refentrytitle>tzfile</refentrytitle><manvolnum>5</manvolnum></citerefentry> <citerefentry><refentrytitle>tzfile</refentrytitle><manvolnum>5</manvolnum></citerefentry>
time zone data for the configured time zone.</para> timezone data for the configured timezone.</para>
<para>As the time zone identifier is extracted from <para>As the timezone identifier is extracted from
the symlink target name of the symlink target name of
<filename>/etc/localtime</filename> this file may not <filename>/etc/localtime</filename> this file may not
be a normal file or hardlink.</para> be a normal file or hardlink.</para>
<para>The time zone may be overridden for individual <para>The timezone may be overridden for individual
programs by using the TZ environment variable. See programs by using the TZ environment variable. See
<citerefentry><refentrytitle>environ</refentrytitle><manvolnum>7</manvolnum></citerefentry>.</para> <citerefentry><refentrytitle>environ</refentrytitle><manvolnum>7</manvolnum></citerefentry>.</para>

30
man/loginctl.xml
View File

@ -144,7 +144,7 @@
<option>all</option> to select whether <option>all</option> to select whether
to kill only the leader process of the to kill only the leader process of the
session or all processes of the session or all processes of the
session. If omitted defaults to session. If omitted, defaults to
<option>all</option>.</para></listitem> <option>all</option>.</para></listitem>
</varlistentry> </varlistentry>
@ -157,8 +157,8 @@
<command>kill-user</command>, choose <command>kill-user</command>, choose
which signal to send to selected which signal to send to selected
processes. Must be one of the well processes. Must be one of the well
known signal specifiers such as known signal specifiers, such as
SIGTERM, SIGINT or SIGSTOP. If omitted SIGTERM, SIGINT or SIGSTOP. If omitted,
defaults to defaults to
<option>SIGTERM</option>.</para></listitem> <option>SIGTERM</option>.</para></listitem>
</varlistentry> </varlistentry>
@ -308,10 +308,10 @@
<listitem><para>Show properties of one <listitem><para>Show properties of one
or more users or the manager or more users or the manager
itself. If no argument is specified itself. If no argument is specified,
properties of the manager will be properties of the manager will be
shown. If a user is specified shown. If a user is specified,
properties of the user is shown. By properties of the user are shown. By
default, empty properties are default, empty properties are
suppressed. Use <option>--all</option> suppressed. Use <option>--all</option>
to show those too. To select specific to show those too. To select specific
@ -332,9 +332,9 @@
<listitem><para>Enable/disable user <listitem><para>Enable/disable user
lingering for one or more users. If lingering for one or more users. If
enabled for a specific user a user enabled for a specific user, a user
manager is spawned for him/her at manager is spawned for him/her at
boot, and kept around after boot and kept around after
logouts. This allows users who aren't logouts. This allows users who aren't
logged in to run long-running logged in to run long-running
services.</para></listitem> services.</para></listitem>
@ -386,14 +386,14 @@
<listitem><para>Show properties of one <listitem><para>Show properties of one
or more seats or the manager or more seats or the manager
itself. If no argument is specified itself. If no argument is specified,
properties of the manager will be properties of the manager will be
shown. If a seat is specified shown. If a seat is specified,
properties of the seat are shown. By properties of the seat are shown. By
default, empty properties are default, empty properties are
suppressed. Use <option>--all</option> suppressed. Use <option>--all</option>
to show those too. To select specific to show those too. To select specific
properties to show use properties to show, use
<option>--property=</option>. This <option>--property=</option>. This
command is intended to be used command is intended to be used
whenever computer-parsable output is whenever computer-parsable output is
@ -411,13 +411,13 @@
one or more devices to a seat. The one or more devices to a seat. The
devices should be specified via device devices should be specified via device
paths in the <filename>/sys</filename> paths in the <filename>/sys</filename>
file system. To create a new seat file system. To create a new seat,
attach at least one graphics card to a attach at least one graphics card to a
previously unused seat name. Seat previously unused seat name. Seat
names may consist only of a-z, A-Z, names may consist only of a-z, A-Z,
0-9, "-" and "_" and must be prefixed 0-9, "-" and "_" and must be prefixed
with "seat". To drop assignment of a with "seat". To drop assignment of a
device to a specific seat just device to a specific seat, just
reassign it to a different seat, or reassign it to a different seat, or
use use
<command>flush-devices</command>.</para></listitem> <command>flush-devices</command>.</para></listitem>
@ -429,8 +429,8 @@
<listitem><para>Removes all device <listitem><para>Removes all device
assignments previously created with assignments previously created with
<command>attach</command>. After this <command>attach</command>. After this
call only automatically generated call, only automatically generated
seats will remain and all seat seats will remain, and all seat
hardware is assigned to hardware is assigned to
them.</para></listitem> them.</para></listitem>
</varlistentry> </varlistentry>

26
man/logind.conf.xml
View File

@ -184,10 +184,10 @@
<term><varname>KillExcludeUsers=</varname></term> <term><varname>KillExcludeUsers=</varname></term>
<listitem><para>These settings take <listitem><para>These settings take
space separated lists of user names space-separated lists of usernames
that influence the effect of that influence the effect of
<varname>KillUserProcesses=</varname>. If <varname>KillUserProcesses=</varname>. If
not empty only processes of users not empty, only processes of users
listed in listed in
<varname>KillOnlyUsers</varname> will <varname>KillOnlyUsers</varname> will
be killed when they log out be killed when they log out
@ -210,12 +210,12 @@
users logging in are added to, in users logging in are added to, in
addition to the addition to the
<literal>name=systemd</literal> named <literal>name=systemd</literal> named
hierarchy. These settings take space hierarchy. These settings take
separated lists of controller space-separated lists of controller
names. Pass the empty string to ensure names. Pass the empty string to ensure
that logind does not touch any that logind does not touch any
hierarchies but systemd's own. When hierarchies but systemd's own. When
logging in user sessions will get logging in, user sessions will get
private control groups in all private control groups in all
hierarchies listed in hierarchies listed in
<varname>Controllers=</varname> and be <varname>Controllers=</varname> and be
@ -228,8 +228,8 @@
<literal>cpu</literal>. Note that for <literal>cpu</literal>. Note that for
all controllers that are not listed in all controllers that are not listed in
either <varname>Controllers=</varname> either <varname>Controllers=</varname>
nor or
<varname>ResetControllers=</varname> <varname>ResetControllers=</varname>,
newly created sessions will be part of newly created sessions will be part of
the control groups of the system the control groups of the system
service that created the service that created the
@ -269,11 +269,11 @@
<literal>hibernate</literal>, <literal>hibernate</literal>,
<literal>hybrid-sleep</literal> and <literal>hybrid-sleep</literal> and
<literal>lock</literal>. If <literal>lock</literal>. If
<literal>ignore</literal> logind will <literal>ignore</literal>, logind will
never handle these keys. If never handle these keys. If
<literal>lock</literal> all running <literal>lock</literal>, all running
sessions will be screen sessions will be screen-locked; otherwise,
locked. Otherwise the specified action the specified action
will be taken in the respective will be taken in the respective
event. Only input devices with the event. Only input devices with the
<literal>power-switch</literal> udev <literal>power-switch</literal> udev
@ -301,10 +301,10 @@
sleep keys and the lid switch are sleep keys and the lid switch are
subject to inhibitor locks. These subject to inhibitor locks. These
settings take boolean arguments. If settings take boolean arguments. If
<literal>off</literal> the inhibitor <literal>off</literal>, the inhibitor
locks taken by applications in order locks taken by applications in order
to block the requested operation are to block the requested operation are
respected, if <literal>on</literal> respected, if <literal>on</literal>,
the requested operation is executed in the requested operation is executed in
any any
case. <varname>PowerKeyIgnoreInhibited=</varname>, case. <varname>PowerKeyIgnoreInhibited=</varname>,

20
man/machine-id.xml
View File

@ -55,12 +55,12 @@
<title>Description</title> <title>Description</title>
<para>The <filename>/etc/machine-id</filename> file <para>The <filename>/etc/machine-id</filename> file
contains the unique machine id of the local system contains the unique machine ID of the local system
that is set during installation. The machine ID is a that is set during installation. The machine ID is a
single newline-terminated, hexadecimal, lowercase 32 single newline-terminated, hexadecimal, 32-character,
character machine ID string. (When decoded from lowercase machine ID string. When decoded from
hexadecimal this corresponds with a 16 byte/128 bit hexadecimal, this corresponds with a 16-byte/128-bit
string.)</para> string.</para>
<para>The machine ID is usually generated from a <para>The machine ID is usually generated from a
random source during system installation and stays random source during system installation and stays
@ -69,7 +69,7 @@
boot if it is found to be empty.</para> boot if it is found to be empty.</para>
<para>The machine ID does not change based on user <para>The machine ID does not change based on user
configuration, or when hardware is replaced.</para> configuration or when hardware is replaced.</para>
<para>This machine ID adheres to the same format and <para>This machine ID adheres to the same format and
logic as the D-Bus machine ID.</para> logic as the D-Bus machine ID.</para>
@ -77,10 +77,10 @@
<para>Programs may use this ID to identify the host <para>Programs may use this ID to identify the host
with a globally unique ID in the network, which does with a globally unique ID in the network, which does
not change even if the local network configuration not change even if the local network configuration
changes. Due to this and its greater length it is changes. Due to this and its greater length, it is
a more useful replacement for the a more useful replacement for the
<citerefentry><refentrytitle>gethostid</refentrytitle><manvolnum>3</manvolnum></citerefentry> <citerefentry><refentrytitle>gethostid</refentrytitle><manvolnum>3</manvolnum></citerefentry>
call POSIX specifies.</para> call that POSIX specifies.</para>
<para>The <para>The
<citerefentry><refentrytitle>systemd-machine-id-setup</refentrytitle><manvolnum>1</manvolnum></citerefentry> <citerefentry><refentrytitle>systemd-machine-id-setup</refentrytitle><manvolnum>1</manvolnum></citerefentry>
@ -94,8 +94,8 @@
<para>Note that the machine ID historically is not an <para>Note that the machine ID historically is not an
OSF UUID as defined by <ulink OSF UUID as defined by <ulink
url="http://tools.ietf.org/html/rfc4122">RFC url="http://tools.ietf.org/html/rfc4122">RFC
4122</ulink>, nor a Microsoft GUID. Starting with 4122</ulink>, nor a Microsoft GUID; however, starting with
systemd v30 newly generated machine IDs however do systemd v30, newly generated machine IDs do
qualify as v4 UUIDs.</para> qualify as v4 UUIDs.</para>
<para>In order to maintain compatibility with existing <para>In order to maintain compatibility with existing

4
man/machine-info.xml
View File

@ -101,12 +101,12 @@
present to the user and does not present to the user and does not
suffer by the syntax limitations of suffer by the syntax limitations of
internet domain names. If possible the internet domain names. If possible the
internet host name as configured in internet hostname as configured in
<filename>/etc/hostname</filename> <filename>/etc/hostname</filename>
should be kept similar to this should be kept similar to this
one. Example: if this value is one. Example: if this value is
<literal>Lennart's Computer</literal> <literal>Lennart's Computer</literal>
an Internet host name of an Internet hostname of
<literal>lennarts-computer</literal> <literal>lennarts-computer</literal>
might be a good choice. If this might be a good choice. If this
parameter is not set an application parameter is not set an application

2
man/modules-load.d.xml
View File

@ -94,7 +94,7 @@
recommended way is to place a symlink to recommended way is to place a symlink to
<filename>/dev/null</filename> in <filename>/dev/null</filename> in
<filename>/etc/modules-load.d/</filename> bearing the <filename>/etc/modules-load.d/</filename> bearing the
same file name.</para> same filename.</para>
</refsect1> </refsect1>
<refsect1> <refsect1>

14
man/nss-myhostname.xml
View File

@ -45,7 +45,7 @@
<refnamediv> <refnamediv>
<refname>nss-myhostname</refname> <refname>nss-myhostname</refname>
<refpurpose>Provide host name resolution for the locally <refpurpose>Provide hostname resolution for the locally
configured system hostname.</refpurpose> configured system hostname.</refpurpose>
</refnamediv> </refnamediv>
@ -58,17 +58,17 @@
<para><command>nss-myhostname</command> is a plugin for the GNU Name Service Switch <para><command>nss-myhostname</command> is a plugin for the GNU Name Service Switch
(NSS) functionality of the GNU C Library (<command>glibc</command>) (NSS) functionality of the GNU C Library (<command>glibc</command>)
providing host name resolution for the locally configured system providing hostname resolution for the locally configured system
hostname as returned by hostname as returned by
<citerefentry><refentrytitle>gethostname</refentrytitle><manvolnum>2</manvolnum></citerefentry>. <citerefentry><refentrytitle>gethostname</refentrytitle><manvolnum>2</manvolnum></citerefentry>.
Various software relies on an always resolvable local host name. When Various software relies on an always-resolvable local hostname. When
using dynamic hostnames this is usually achieved by patching using dynamic hostnames, this is usually achieved by patching
<filename>/etc/hosts</filename> at the same time as changing the host <filename>/etc/hosts</filename> at the same time as changing the host
name. This however is not ideal since it requires a writable name. This however is not ideal since it requires a writable
<filename>/etc</filename> file system and is fragile because the file <filename>/etc</filename> file system and is fragile because the file
might be edited by the administrator at the same time. <command>nss-myhostname</command> might be edited by the administrator at the same time. <command>nss-myhostname</command>
simply returns all locally configure public IP addresses, or -- if none simply returns all locally configured public IP addresses, or, if none
are configured -- the IPv4 address 127.0.0.2 (which is on the local are configured, the IPv4 address 127.0.0.2 (which is on the local
loopback) and the IPv6 address ::1 (which is the local host) for loopback) and the IPv6 address ::1 (which is the local host) for
whatever system hostname is configured locally. Patching whatever system hostname is configured locally. Patching
<filename>/etc/hosts</filename> is thus no longer necessary.</para> <filename>/etc/hosts</filename> is thus no longer necessary.</para>
@ -116,7 +116,7 @@ $ getent ahosts `hostname`
127.0.0.2 RAW 127.0.0.2 RAW
</programlisting> </programlisting>
<para>In this case the local host name is <varname>omega</varname>.</para> <para>In this case the local hostname is <varname>omega</varname>.</para>
</refsect1> </refsect1>

4
man/os-release.xml
View File

@ -142,7 +142,7 @@
identifying the operating system, identifying the operating system,
excluding any version information and excluding any version information and
suitable for processing by scripts or suitable for processing by scripts or
usage in generated file names. If not usage in generated filenames. If not
set defaults to set defaults to
<literal>ID=linux</literal>. Example: <literal>ID=linux</literal>. Example:
<literal>ID=fedora</literal> or <literal>ID=fedora</literal> or
@ -199,7 +199,7 @@
system version, excluding any OS name system version, excluding any OS name
information or release code name, and information or release code name, and
suitable for processing by scripts or suitable for processing by scripts or
usage in generated file names. This usage in generated filenames. This
field is optional. Example: field is optional. Example:
<literal>VERSION_ID=17</literal> or <literal>VERSION_ID=17</literal> or
<literal>VERSION_ID=11.04</literal>.</para></listitem> <literal>VERSION_ID=11.04</literal>.</para></listitem>

34
man/pam_systemd.xml
View File

@ -131,13 +131,13 @@
<varlistentry> <varlistentry>
<term><option>kill-only-users=</option></term> <term><option>kill-only-users=</option></term>
<listitem><para>Takes a comma <listitem><para>Takes a comma-separated
separated list of user names or list of usernames or
numeric user ids as argument. If this numeric user IDs as argument. If this
option is used the effect of the option is used, the effect of the
<option>kill-session-processes=</option> options <option>kill-session-processes=</option> options
will apply only to the listed will apply only to the listed
users. If this option is not used the users. If this option is not used, the
option applies to all local option applies to all local
users. Note that users. Note that
<option>kill-exclude-users=</option> <option>kill-exclude-users=</option>
@ -149,13 +149,13 @@
<varlistentry> <varlistentry>
<term><option>kill-exclude-users=</option></term> <term><option>kill-exclude-users=</option></term>
<listitem><para>Takes a comma <listitem><para>Takes a comma-separated
separated list of user names or list of usernames or
numeric user ids as argument. Users numeric user IDs as argument. Users
listed in this argument will not be listed in this argument will not be
subject to the effect of subject to the effect of
<option>kill-session-processes=</option>. Note <option>kill-session-processes=</option>.
that this option takes precedence Note that this option takes precedence
over over
<option>kill-only-users=</option>, and <option>kill-only-users=</option>, and
hence whatever is listed for hence whatever is listed for
@ -169,8 +169,8 @@
<varlistentry> <varlistentry>
<term><option>controllers=</option></term> <term><option>controllers=</option></term>
<listitem><para>Takes a comma <listitem><para>Takes a comma-separated
separated list of control group list of control group
controllers in which hierarchies a controllers in which hierarchies a
user/session control group will be user/session control group will be
created by default for each user created by default for each user
@ -183,8 +183,8 @@
<varlistentry> <varlistentry>
<term><option>reset-controllers=</option></term> <term><option>reset-controllers=</option></term>
<listitem><para>Takes a comma <listitem><para>Takes a comma-separated
separated list of control group list of control group
controllers in which hierarchies the controllers in which hierarchies the
logged in processes will be reset to logged in processes will be reset to
the root control the root control
@ -222,7 +222,7 @@
configured system-wide in configured system-wide in
<citerefentry><refentrytitle>logind.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>. The <citerefentry><refentrytitle>logind.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>. The
former kills processes of a session as soon as it former kills processes of a session as soon as it
ends, the latter kills processes as soon as the last ends; the latter kills processes as soon as the last
session of the user ends.</para> session of the user ends.</para>
<para>If the options are omitted they default to <para>If the options are omitted they default to
@ -250,7 +250,7 @@
<term><varname>$XDG_SESSION_ID</varname></term> <term><varname>$XDG_SESSION_ID</varname></term>
<listitem><para>A session identifier, <listitem><para>A session identifier,
suitable to be used in file names. The suitable to be used in filenames. The
string itself should be considered string itself should be considered
opaque, although often it is just the opaque, although often it is just the
audit session ID as reported by audit session ID as reported by
@ -281,7 +281,7 @@
applications should not rely on this applications should not rely on this
behavior and must be able to deal with behavior and must be able to deal with
stale files. To store session-private stale files. To store session-private
data in this directory the user should data in this directory, the user should
include the value of <varname>$XDG_SESSION_ID</varname> include the value of <varname>$XDG_SESSION_ID</varname>
in the filename. This directory shall in the filename. This directory shall
be used for runtime file system be used for runtime file system

28
man/sd-id128.xml
View File

@ -50,7 +50,7 @@
<refname>SD_ID128_FORMAT_STR</refname> <refname>SD_ID128_FORMAT_STR</refname>
<refname>SD_ID128_FORMAT_VAL</refname> <refname>SD_ID128_FORMAT_VAL</refname>
<refname>sd_id128_equal</refname> <refname>sd_id128_equal</refname>
<refpurpose>APIs for processing 128 bit IDs</refpurpose> <refpurpose>APIs for processing 128-bit IDs</refpurpose>
</refnamediv> </refnamediv>
<refsynopsisdiv> <refsynopsisdiv>
@ -68,12 +68,12 @@
<title>Description</title> <title>Description</title>
<para><filename>sd-id128.h</filename> provides APIs to <para><filename>sd-id128.h</filename> provides APIs to
process and generate 128 bit ID values. The 128 bit ID process and generate 128-bit ID values. The 128-bit ID
values processed and generated by these APIs are a values processed and generated by these APIs are a
generalization of OSF UUIDs as defined by <ulink generalization of OSF UUIDs as defined by <ulink
url="http://tools.ietf.org/html/rfc4122">RFC url="http://tools.ietf.org/html/rfc4122">RFC
4122</ulink>, though use a simpler string 4122</ulink> but use a simpler string
formatting. These functions impose no structure on the format. These functions impose no structure on the
used IDs, much unlike OSF UUIDs or Microsoft GUIDs, used IDs, much unlike OSF UUIDs or Microsoft GUIDs,
but are fully compatible with those types of IDs. but are fully compatible with those types of IDs.
</para> </para>
@ -85,7 +85,7 @@
for more information about the implemented for more information about the implemented
functions.</para> functions.</para>
<para>A 128 bit ID is implemented as the following <para>A 128-bit ID is implemented as the following
union type:</para> union type:</para>
<programlisting>typedef union sd_id128 { <programlisting>typedef union sd_id128 {
@ -93,26 +93,26 @@
uint64_t qwords[2]; uint64_t qwords[2];
} sd_id128_t;</programlisting> } sd_id128_t;</programlisting>
<para>This union type allows accessing the 128 bit ID <para>This union type allows accessing the 128-bit ID
as 16 separate bytes or two 64 bit words. It is generally as 16 separate bytes or two 64-bit words. It is generally
safer to access the ID components by their 8 bit array safer to access the ID components by their 8-bit array
to avoid endianness issues. This union is intended to to avoid endianness issues. This union is intended to
be passed call-by-value (as opposed to be passed call-by-value (as opposed to
call-by-reference) and may be directly manipulated by call-by-reference) and may be directly manipulated by
clients.</para> clients.</para>
<para>A couple of macros are defined to denote and <para>A couple of macros are defined to denote and
decode 128 bit IDs:</para> decode 128-bit IDs:</para>
<para><function>SD_ID128_MAKE()</function> may be used <para><function>SD_ID128_MAKE()</function> may be used
to denote a constant 128 bit ID in source code. A to denote a constant 128-bit ID in source code. A
commonly used idiom is to assign a name to a 128 bit commonly used idiom is to assign a name to a 128-bit
ID using this macro:</para> ID using this macro:</para>
<programlisting>#define SD_MESSAGE_COREDUMP SD_ID128_MAKE(fc,2e,22,bc,6e,e6,47,b6,b9,07,29,ab,34,a2,50,b1)</programlisting> <programlisting>#define SD_MESSAGE_COREDUMP SD_ID128_MAKE(fc,2e,22,bc,6e,e6,47,b6,b9,07,29,ab,34,a2,50,b1)</programlisting>
<para><function>SD_ID128_CONST_STR()</function> may be <para><function>SD_ID128_CONST_STR()</function> may be
used to convert constant 128bit IDs into constant used to convert constant 128-bit IDs into constant
strings for output. The following example code will strings for output. The following example code will
output the string output the string
"fc2e22bc6ee647b6b90729ab34a250b1":</para> "fc2e22bc6ee647b6b90729ab34a250b1":</para>
@ -122,7 +122,7 @@
<para><function>SD_ID128_FORMAT_STR</function> and <para><function>SD_ID128_FORMAT_STR</function> and
<function>SD_ID128_FORMAT_VAL()</function> may be used <function>SD_ID128_FORMAT_VAL()</function> may be used
to format a 128 bit ID in a to format a 128-bit ID in a
<citerefentry><refentrytitle>printf</refentrytitle><manvolnum>3</manvolnum></citerefentry> <citerefentry><refentrytitle>printf</refentrytitle><manvolnum>3</manvolnum></citerefentry>
format string, as shown in the following format string, as shown in the following
example:</para> example:</para>
@ -134,7 +134,7 @@
return 0; return 0;
}</programlisting> }</programlisting>
<para>Use <function>sd_id128_equal()</function> to compare two 128 bit IDs:</para> <para>Use <function>sd_id128_equal()</function> to compare two 128-bit IDs:</para>
<programlisting>int main(int argc, char *argv[]) { <programlisting>int main(int argc, char *argv[]) {
sd_id128_t a, b, c; sd_id128_t a, b, c;

10
man/sd_id128_get_machine.xml
View File

@ -45,7 +45,7 @@
<refnamediv> <refnamediv>
<refname>sd_id128_get_machine</refname> <refname>sd_id128_get_machine</refname>
<refname>sd_id128_get_boot</refname> <refname>sd_id128_get_boot</refname>
<refpurpose>Retrieve 128 bit IDs</refpurpose> <refpurpose>Retrieve 128-bit IDs</refpurpose>
</refnamediv> </refnamediv>
<refsynopsisdiv> <refsynopsisdiv>
@ -92,10 +92,10 @@
<function>sd_id128_get_boot()</function> always returns <function>sd_id128_get_boot()</function> always returns
a UUID v4 compatible a UUID v4 compatible
ID. <function>sd_id128_get_machine()</function> will ID. <function>sd_id128_get_machine()</function> will
also return a UUID v4 compatible ID on new also return a UUID v4-compatible ID on new
installations, but might not on older. It is possible installations but might not on older. It is possible
to convert the machine ID into an UUID v4 compatible to convert the machine ID into a UUID v4-compatible
one. For more information see one. For more information, see
<citerefentry><refentrytitle>machine-id</refentrytitle><manvolnum>5</manvolnum></citerefentry>.</para> <citerefentry><refentrytitle>machine-id</refentrytitle><manvolnum>5</manvolnum></citerefentry>.</para>
<para>For more information about the <para>For more information about the

13
man/sd_id128_randomize.xml
View File

@ -44,7 +44,7 @@
<refnamediv> <refnamediv>
<refname>sd_id128_randomize</refname> <refname>sd_id128_randomize</refname>
<refpurpose>Generate 128 bit IDs</refpurpose> <refpurpose>Generate 128-bit IDs</refpurpose>
</refnamediv> </refnamediv>
<refsynopsisdiv> <refsynopsisdiv>
@ -63,7 +63,7 @@
<title>Description</title> <title>Description</title>
<para><function>sd_id128_randomize()</function> <para><function>sd_id128_randomize()</function>
generates a new randomized 128 bit ID and returns it generates a new randomized 128-bit ID and returns it
in <parameter>ret</parameter>. Every invocation in <parameter>ret</parameter>. Every invocation
returns a new randomly generated ID. This uses the returns a new randomly generated ID. This uses the
<filename>/dev/urandom</filename> kernel random number <filename>/dev/urandom</filename> kernel random number
@ -71,16 +71,15 @@
<para>Note that <para>Note that
<function>sd_id128_randomize()</function> always returns <function>sd_id128_randomize()</function> always returns
a UUID v4 compatible a UUID v4-compatible ID.</para>
ID.</para>
<para>For more information about the <para>For more information about the
<literal>sd_id128_t</literal> type see <literal>sd_id128_t</literal> type, see
<citerefentry><refentrytitle>sd-id128</refentrytitle><manvolnum>3</manvolnum></citerefentry>.</para> <citerefentry><refentrytitle>sd-id128</refentrytitle><manvolnum>3</manvolnum></citerefentry>.</para>
<para><citerefentry><refentrytitle>journalctl</refentrytitle><manvolnum>1</manvolnum></citerefentry>'s <para><citerefentry><refentrytitle>journalctl</refentrytitle><manvolnum>1</manvolnum></citerefentry>'s
<option>--new-id</option> option may be used as <option>--new-id</option> option may be used as a
command line front-end for command-line front-end for
<function>sd_id128_randomize()</function>.</para> <function>sd_id128_randomize()</function>.</para>
</refsect1> </refsect1>

20
man/sd_id128_to_string.xml
View File

@ -45,7 +45,7 @@
<refnamediv> <refnamediv>
<refname>sd_id128_to_string</refname> <refname>sd_id128_to_string</refname>
<refname>sd_id128_from_string</refname> <refname>sd_id128_from_string</refname>
<refpurpose>Format or parse 128 bit IDs as strings</refpurpose> <refpurpose>Format or parse 128-bit IDs as strings</refpurpose>
</refnamediv> </refnamediv>
<refsynopsisdiv> <refsynopsisdiv>
@ -69,7 +69,7 @@
<title>Description</title> <title>Description</title>
<para><function>sd_id128_to_string()</function> <para><function>sd_id128_to_string()</function>
formats a 128 bit ID as character string. It expects formats a 128-bit ID as a character string. It expects
the ID and a string array capable of storing 33 the ID and a string array capable of storing 33
characters. The ID will be formatted as 32 lowercase characters. The ID will be formatted as 32 lowercase
hexadecimal digits and be terminated by a NUL hexadecimal digits and be terminated by a NUL
@ -78,10 +78,10 @@
<para><function>sd_id128_from_string()</function> <para><function>sd_id128_from_string()</function>
implements the reverse operation: it takes a 33 implements the reverse operation: it takes a 33
character string with 32 hexadecimal digits character string with 32 hexadecimal digits
(either lowercase or uppercase, terminated by NUL) and parses them back into an 128 (either lowercase or uppercase, terminated by NUL) and
bit ID returned in parses them back into a 128-bit ID returned in
<parameter>ret</parameter>. Alternatively, this call <parameter>ret</parameter>. Alternatively, this call
can also parse a 37 character string with a 128bit ID can also parse a 37-character string with a 128-bit ID
formatted as RFC UUID.</para> formatted as RFC UUID.</para>
<para>For more information about the <para>For more information about the
@ -89,9 +89,9 @@
<citerefentry><refentrytitle>sd-id128</refentrytitle><manvolnum>3</manvolnum></citerefentry>. Note <citerefentry><refentrytitle>sd-id128</refentrytitle><manvolnum>3</manvolnum></citerefentry>. Note
that these calls operate the same way on all that these calls operate the same way on all
architectures, i.e. the results do not depend on architectures, i.e. the results do not depend on
endianess.</para> endianness.</para>
<para>When formatting a 128 bit ID into a string it is <para>When formatting a 128-bit ID into a string, it is
often easier to use a format string for often easier to use a format string for
<citerefentry><refentrytitle>printf</refentrytitle><manvolnum>3</manvolnum></citerefentry>. This <citerefentry><refentrytitle>printf</refentrytitle><manvolnum>3</manvolnum></citerefentry>. This
is easily done using the is easily done using the
@ -106,9 +106,9 @@
<para><function>sd_id128_to_string()</function> always <para><function>sd_id128_to_string()</function> always
succeeds and returns a pointer to the string array succeeds and returns a pointer to the string array
passed in. <function>sd_id128_from_string</function> passed in. <function>sd_id128_from_string</function>
returns 0 on success (in which case returns 0 on success, in which case
<parameter>ret</parameter> is filled in), or a negative <parameter>ret</parameter> is filled in, or a negative
errno-style error code.</para> errno-style error code.</para>
</refsect1> </refsect1>

20
man/sd_is_fifo.xml
View File

@ -109,14 +109,14 @@
called to check whether the specified file descriptor called to check whether the specified file descriptor
refers to a socket. If the refers to a socket. If the
<parameter>family</parameter> parameter is not <parameter>family</parameter> parameter is not
<constant>AF_UNSPEC</constant> it is checked whether <constant>AF_UNSPEC</constant>, it is checked whether
the socket is of the specified family (AF_UNIX, the socket is of the specified family (AF_UNIX,
<constant>AF_INET</constant>, ...). If the <constant>AF_INET</constant>, ...). If the
<parameter>type</parameter> parameter is not 0 it is <parameter>type</parameter> parameter is not 0, it is
checked whether the socket is of the specified type checked whether the socket is of the specified type
(<constant>SOCK_STREAM</constant>, (<constant>SOCK_STREAM</constant>,
<constant>SOCK_DGRAM</constant>, ...). If the <constant>SOCK_DGRAM</constant>, ...). If the
<parameter>listening</parameter> parameter is positive <parameter>listening</parameter> parameter is positive,
it is checked whether the socket is in accepting mode, it is checked whether the socket is in accepting mode,
i.e. <function>listen()</function> has been called for i.e. <function>listen()</function> has been called for
it. If <parameter>listening</parameter> is 0, it is it. If <parameter>listening</parameter> is 0, it is
@ -135,14 +135,14 @@
<constant>AF_INET6</constant>.</para> <constant>AF_INET6</constant>.</para>
<para><function>sd_is_socket_unix()</function> is <para><function>sd_is_socket_unix()</function> is
similar to <function>sd_is_socket()</function>, but similar to <function>sd_is_socket()</function> but
optionally checks the <constant>AF_UNIX</constant> path the socket is bound optionally checks the <constant>AF_UNIX</constant> path the socket is bound
to, unless the <parameter>path</parameter> parameter to, unless the <parameter>path</parameter> parameter
is <constant>NULL</constant>. For normal file system <constant>AF_UNIX</constant> sockets set is <constant>NULL</constant>. For normal file system <constant>AF_UNIX</constant> sockets,
the <parameter>length</parameter> parameter to 0. For set the <parameter>length</parameter> parameter to 0. For
Linux abstract namespace sockets set the Linux abstract namespace sockets, set the
<parameter>length</parameter> to the size of the <parameter>length</parameter> to the size of the
address, including the initial 0 byte and set address, including the initial 0 byte, and set the
<parameter>path</parameter> to the initial 0 byte of <parameter>path</parameter> to the initial 0 byte of
the socket address.</para> the socket address.</para>
@ -170,7 +170,7 @@
<para>These functions are provided by the reference <para>These functions are provided by the reference
implementation of APIs for new-style daemons and implementation of APIs for new-style daemons and
distributed with the systemd package. The algorithms distributed with the systemd package. The algorithms
they implement are simple, and can easily be they implement are simple, and they can easily be
reimplemented in daemons if it is important to support reimplemented in daemons if it is important to support
this interface without using the reference this interface without using the reference
implementation.</para> implementation.</para>
@ -180,7 +180,7 @@
<filename>getsockname()</filename> to check the file <filename>getsockname()</filename> to check the file
descriptor type and where it is bound to.</para> descriptor type and where it is bound to.</para>
<para>For details about the algorithms check the <para>For details about the algorithms, check the
liberally licensed reference implementation sources: liberally licensed reference implementation sources:
<ulink url="http://cgit.freedesktop.org/systemd/systemd/plain/src/libsystemd-daemon/sd-daemon.c"/> <ulink url="http://cgit.freedesktop.org/systemd/systemd/plain/src/libsystemd-daemon/sd-daemon.c"/>
and <ulink and <ulink

6
man/sd_journal_get_cutoff_realtime_usec.xml
View File

@ -77,7 +77,7 @@
gets the realtime (wallclock) timestamps of the first gets the realtime (wallclock) timestamps of the first
and last entries accessible in the journal. It takes and last entries accessible in the journal. It takes
three arguments: the journal context object and two three arguments: the journal context object and two
pointers to 64 Bit unsigned integers to store the pointers to 64-bit unsigned integers to store the
timestamps in. The timestamps are in microseconds timestamps in. The timestamps are in microseconds
since the epoch, since the epoch,
i.e. <constant>CLOCK_REALTIME</constant>. Either one i.e. <constant>CLOCK_REALTIME</constant>. Either one
@ -88,8 +88,8 @@
<para><function>sd_journal_get_cutoff_monotonic_usec()</function> <para><function>sd_journal_get_cutoff_monotonic_usec()</function>
gets the monotonic timestamps of the first and last gets the monotonic timestamps of the first and last
entries accessible in the journal. It takes three entries accessible in the journal. It takes three
arguments: the journal context object, a 128 Bit arguments: the journal context object, a 128-bit
identifier for the boot, and two pointers to 64 Bit identifier for the boot, and two pointers to 64-bit
unsigned integers to store the timestamps. The unsigned integers to store the timestamps. The
timestamps are in microseconds since boot-up of the timestamps are in microseconds since boot-up of the
specific boot, specific boot,

20
man/sd_journal_get_realtime_usec.xml
View File

@ -73,27 +73,27 @@
<para><function>sd_journal_get_realtime_usec()</function> <para><function>sd_journal_get_realtime_usec()</function>
gets the realtime (wallclock) timestamp of the gets the realtime (wallclock) timestamp of the
current journal entry. It takes two arguments: the current journal entry. It takes two arguments: the
journal context object and a pointer to a 64 Bit journal context object and a pointer to a 64-bit
unsigned integer to store the timestamp in. The unsigned integer to store the timestamp in. The
timestamp is in microseconds since the epoch, timestamp is in microseconds since the epoch,
i.e. <constant>CLOCK_REALTIME</constant>.</para> i.e. <constant>CLOCK_REALTIME</constant>.</para>
<para><function>sd_journal_get_monotonic_usec()</function> <para><function>sd_journal_get_monotonic_usec()</function>
gets the monotonic timestamp of the current journal gets the monotonic timestamp of the current journal
entry. It takes three arguments: the journal context entry. It takes three arguments: the journal context
object, a pointer to a 64 Bit unsigned integer to object, a pointer to a 64-bit unsigned integer to
store the timestamp in as well as a 128 Bit ID buffer store the timestamp in, as well as a 128-bit ID buffer
to store the boot ID of the monotonic timestamp to store the boot ID of the monotonic timestamp.
in. The timestamp is in microseconds since boot-up of The timestamp is in microseconds since boot-up of
the specific boot, the specific boot,
i.e. <constant>CLOCK_MONOTONIC</constant>. Since the i.e. <constant>CLOCK_MONOTONIC</constant>. Since the
monotonic clock begins new with every reboot it only monotonic clock begins new with every reboot, it only
defines a well-defined point in time when used defines a well-defined point in time when used
together with an identifier identifying the boot, see together with an identifier identifying the boot. See
<citerefentry><refentrytitle>sd_id128_get_boot</refentrytitle><manvolnum>3</manvolnum></citerefentry> <citerefentry><refentrytitle>sd_id128_get_boot</refentrytitle><manvolnum>3</manvolnum></citerefentry>
for more information. If the boot ID parameter is for more information. If the boot ID parameter is
passed <constant>NULL</constant> the function will passed <constant>NULL</constant>, the function will
fail if the monotonic timestamp of the current entry fail if the monotonic timestamp of the current entry
is not of the current system boot.</para> is not of the current system boot.</para>

2
man/sd_journal_print.xml
View File

@ -202,7 +202,7 @@ sd_journal_send("MESSAGE=Hello World, this is PID %lu!", (unsigned long) getpid(
chronological ordering between the two streams cannot chronological ordering between the two streams cannot
be guaranteed. Using be guaranteed. Using
<function>sd_journal_print()</function> has the <function>sd_journal_print()</function> has the
benefit of logging source code line, file names, and benefit of logging source code line, filenames, and
functions as meta data along all entries, and functions as meta data along all entries, and
guaranteeing chronological ordering with structured guaranteeing chronological ordering with structured
log entries that are generated via log entries that are generated via

2
man/sd_journal_stream_fd.xml
View File

@ -67,7 +67,7 @@
<para><function>sd_journal_stream_fd()</function> may <para><function>sd_journal_stream_fd()</function> may
be used to create a log stream file descriptor. Log be used to create a log stream file descriptor. Log
messages written to this file descriptor as simple messages written to this file descriptor as simple
newline separated text strings are written to the newline-separated text strings are written to the
journal. This file descriptor can be used internally journal. This file descriptor can be used internally
by applications or be made STDOUT/STDERR of other by applications or be made STDOUT/STDERR of other
processes executed.</para> processes executed.</para>

4
man/sysctl.d.xml
View File

@ -96,11 +96,11 @@
contain the same variable setting.</para> contain the same variable setting.</para>
<para>If the administrator wants to disable a <para>If the administrator wants to disable a
configuration file supplied by the vendor the configuration file supplied by the vendor, the
recommended way is to place a symlink to recommended way is to place a symlink to
<filename>/dev/null</filename> in <filename>/dev/null</filename> in
<filename>/etc/sysctl.d/</filename> bearing the <filename>/etc/sysctl.d/</filename> bearing the
same file name.</para> same filename.</para>
</refsect1> </refsect1>
<refsect1> <refsect1>

4
man/systemctl.xml
View File

@ -92,7 +92,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
<term><option>--type=</option></term> <term><option>--type=</option></term>
<listitem> <listitem>
<para>The argument should be a comma separated list of unit <para>The argument should be a comma-separated list of unit
types such as <option>service</option> and types such as <option>service</option> and
<option>socket</option>, or unit load states such as <option>socket</option>, or unit load states such as
<option>loaded</option> and <option>masked</option> <option>loaded</option> and <option>masked</option>
@ -732,7 +732,7 @@ kobject-uevent 1 systemd-udevd-kernel.socket systemd-udevd.service
names such as <literal>cpu.shares</literal>. This will names such as <literal>cpu.shares</literal>. This will
output the current values of the specified attributes, output the current values of the specified attributes,
separated by new-lines. For attributes that take list of separated by new-lines. For attributes that take list of
items the output will be new-line separated, too. This items the output will be new-line-separated, too. This
operation will always try to retrieve the data in question operation will always try to retrieve the data in question
from the kernel first, and if that is not available use the from the kernel first, and if that is not available use the
configured values instead. Instead of low-level control configured values instead. Instead of low-level control

22
man/systemd-analyze.xml
View File

@ -95,7 +95,7 @@
prints the time spent in the kernel before prints the time spent in the kernel before
userspace has been reached, the time spent in the userspace has been reached, the time spent in the
initial RAM disk (initrd) before normal system initial RAM disk (initrd) before normal system
userspace has been reached and the time normal system userspace has been reached, and the time normal system
userspace took to initialize. Note that these userspace took to initialize. Note that these
measurements simply measure the time passed up to the measurements simply measure the time passed up to the
point where all system services have been spawned, but point where all system services have been spawned, but
@ -111,7 +111,7 @@
of another service to complete.</para> of another service to complete.</para>
<para><command>systemd-analyze critical-chain [<replaceable>UNIT...</replaceable>]</command> <para><command>systemd-analyze critical-chain [<replaceable>UNIT...</replaceable>]</command>
prints a tree of the time critical chain of units prints a tree of the time-critical chain of units
(for each of the specified <replaceable>UNIT</replaceable>s (for each of the specified <replaceable>UNIT</replaceable>s
or for the default target otherwise). or for the default target otherwise).
The time after the unit is active or started is printed The time after the unit is active or started is printed
@ -135,7 +135,7 @@
dot | dot -Tsvg > systemd.svg</command> to generate a dot | dot -Tsvg > systemd.svg</command> to generate a
graphical dependency tree. Unless graphical dependency tree. Unless
<option>--order</option> or <option>--require</option> <option>--order</option> or <option>--require</option>
is passed the generated graph will show both ordering is passed, the generated graph will show both ordering
and requirement dependencies. Optional pattern and requirement dependencies. Optional pattern
globbing style specifications globbing style specifications
(e.g. <filename>*.target</filename>) may be given at (e.g. <filename>*.target</filename>) may be given at
@ -143,7 +143,7 @@
any of these patterns match either the origin or any of these patterns match either the origin or
destination node.</para> destination node.</para>
<para>If no command is passed <command>systemd-analyze <para>If no command is passed, <command>systemd-analyze
time</command> is implied.</para> time</command> is implied.</para>
</refsect1> </refsect1>
@ -191,7 +191,7 @@
<varname>RequisiteOverridable=</varname>, <varname>RequisiteOverridable=</varname>,
<varname>Wants=</varname> and <varname>Wants=</varname> and
<varname>Conflicts=</varname> are <varname>Conflicts=</varname> are
shown. If neither is passed, shows shown. If neither is passed, this shows
dependencies of all these dependencies of all these
types.</para></listitem> types.</para></listitem>
</varlistentry> </varlistentry>
@ -203,16 +203,16 @@
<listitem><para>When used in <listitem><para>When used in
conjunction with the conjunction with the
<command>dot</command> command (see <command>dot</command> command (see
above), selects which relationships above), this selects which relationships
are shown in the dependency graph. are shown in the dependency graph.
They both require They both require
<citerefentry><refentrytitle>glob</refentrytitle><manvolnum>7</manvolnum></citerefentry> <citerefentry><refentrytitle>glob</refentrytitle><manvolnum>7</manvolnum></citerefentry>
patterns as arguments, which are patterns as arguments, which are
matched against lefthand and matched against left-hand and
righthand, respectively, nodes of a right-hand, respectively, nodes of a
relationship. Each of these can be relationship. Each of these can be
used more than once which means a used more than once, which means a
unit name must match one of given unit name must match one of the given
values.</para></listitem> values.</para></listitem>
</varlistentry> </varlistentry>
@ -226,7 +226,7 @@
latest unit in the same level. The unit of latest unit in the same level. The unit of
<replaceable>timespan</replaceable> is seconds <replaceable>timespan</replaceable> is seconds
unless specified with a different unit, unless specified with a different unit,
i.e. "50ms".</para></listitem> e.g. "50ms".</para></listitem>
</varlistentry> </varlistentry>
</variablelist> </variablelist>

8
man/systemd-hostnamed.service.xml
View File

@ -45,7 +45,7 @@
<refnamediv> <refnamediv>
<refname>systemd-hostnamed.service</refname> <refname>systemd-hostnamed.service</refname>
<refname>systemd-hostnamed</refname> <refname>systemd-hostnamed</refname>
<refpurpose>Hostname bus mechanism</refpurpose> <refpurpose>Host name bus mechanism</refpurpose>
</refnamediv> </refnamediv>
<refsynopsisdiv> <refsynopsisdiv>
@ -57,14 +57,14 @@
<title>Description</title> <title>Description</title>
<para><filename>systemd-hostnamed</filename> is a system <para><filename>systemd-hostnamed</filename> is a system
service that may be used as mechanism to change the service that may be used as a mechanism to change the
system hostname. <filename>systemd-hostnamed</filename> is system's hostname. <filename>systemd-hostnamed</filename> is
automatically activated on request and terminates automatically activated on request and terminates
itself when it is unused.</para> itself when it is unused.</para>
<para>The tool <para>The tool
<citerefentry><refentrytitle>hostnamectl</refentrytitle><manvolnum>1</manvolnum></citerefentry> <citerefentry><refentrytitle>hostnamectl</refentrytitle><manvolnum>1</manvolnum></citerefentry>
is a command line client to this service.</para> is a command-line client to this service.</para>
<para>See the <ulink <para>See the <ulink
url="http://www.freedesktop.org/wiki/Software/systemd/hostnamed"> url="http://www.freedesktop.org/wiki/Software/systemd/hostnamed">

16
man/systemd-inhibit.xml
View File

@ -101,8 +101,8 @@
<varlistentry> <varlistentry>
<term><option>--what=</option></term> <term><option>--what=</option></term>
<listitem><para>Takes a colon <listitem><para>Takes a colon-separated
separated list of one or more list of one or more
operations to inhibit: operations to inhibit:
<literal>shutdown</literal>, <literal>shutdown</literal>,
<literal>sleep</literal>, <literal>sleep</literal>,
@ -124,9 +124,9 @@
<varlistentry> <varlistentry>
<term><option>--who=</option></term> <term><option>--who=</option></term>
<listitem><para>Takes a short human <listitem><para>Takes a short,
readable descriptive string for the human-readable descriptive string for the
program taking the lock. If not passed program taking the lock. If not passed,
defaults to the command line defaults to the command line
string.</para></listitem> string.</para></listitem>
</varlistentry> </varlistentry>
@ -134,8 +134,8 @@
<varlistentry> <varlistentry>
<term><option>--why=</option></term> <term><option>--why=</option></term>
<listitem><para>Takes a short human <listitem><para>Takes a short,
readable descriptive string for the human-readable descriptive string for the
reason for taking the lock. Defaults reason for taking the lock. Defaults
to "Unknown reason".</para></listitem> to "Unknown reason".</para></listitem>
</varlistentry> </varlistentry>
@ -155,7 +155,7 @@
<literal>delay</literal> is used, the <literal>delay</literal> is used, the
lock can only delay the requested lock can only delay the requested
operations for a limited time. If the operations for a limited time. If the
time elapses the lock is ignored and time elapses, the lock is ignored and
the operation executed. The time limit the operation executed. The time limit
may be specified in may be specified in
<citerefentry><refentrytitle>systemd-logind.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>. Note <citerefentry><refentrytitle>systemd-logind.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>. Note

16
man/systemd-journald.service.xml
View File

@ -73,14 +73,14 @@
</para> </para>
<para>Log data collected by the journal is primarily <para>Log data collected by the journal is primarily
text based but can also include binary data where text-based but can also include binary data where
necessary. All objects stored in the journal can be up necessary. All objects stored in the journal can be up
to 2^64-1 bytes in size.</para> to 2^64-1 bytes in size.</para>
<para>By default the journal stores log data in <para>By default the journal stores log data in
<filename>/run/log/journal/</filename>. Since <filename>/run/log/journal/</filename>. Since
<filename>/run/</filename> is volatile log data is <filename>/run/</filename> is volatile, log data is
lost at reboot. To make the data persistent it lost at reboot. To make the data persistent, it
is sufficient to create is sufficient to create
<filename>/var/log/journal/</filename> where <filename>/var/log/journal/</filename> where
<filename>systemd-journald</filename> will then store <filename>systemd-journald</filename> will then store
@ -89,8 +89,8 @@
<para><filename>systemd-journald</filename> will <para><filename>systemd-journald</filename> will
forward all received log messages to the <constant>AF_UNIX</constant> forward all received log messages to the <constant>AF_UNIX</constant>
<constant>SOCK_DGRAM</constant> socket <constant>SOCK_DGRAM</constant> socket
<filename>/run/systemd/journal/syslog</filename> (if it exists) which <filename>/run/systemd/journal/syslog</filename>, if it exists, which
may be used by UNIX syslog daemons to process the data may be used by Unix syslog daemons to process the data
further.</para> further.</para>
<para>See <para>See
@ -161,15 +161,15 @@
<refsect1> <refsect1>
<title>Access Control</title> <title>Access Control</title>
<para>Journal files are by default owned and readable <para>Journal files are, by default, owned and readable
by the <literal>systemd-journal</literal> system group by the <literal>systemd-journal</literal> system group
(but not writable). Adding a user to this group thus but are not writable. Adding a user to this group thus
enables her/him to read the journal files.</para> enables her/him to read the journal files.</para>
<para>By default, each logged in user will get her/his <para>By default, each logged in user will get her/his
own set of journal files in own set of journal files in
<filename>/var/log/journal/</filename>. These files <filename>/var/log/journal/</filename>. These files
will not be owned by the user however, in order to will not be owned by the user, however, in order to
avoid that the user can write to them avoid that the user can write to them
directly. Instead, file system ACLs are used to ensure directly. Instead, file system ACLs are used to ensure
the user gets read access only.</para> the user gets read access only.</para>

4
man/systemd-modules-load.service.xml
View File

@ -77,8 +77,8 @@
<term><varname>modules-load=</varname></term> <term><varname>modules-load=</varname></term>
<term><varname>rd.modules-load=</varname></term> <term><varname>rd.modules-load=</varname></term>
<listitem><para>Takes a comma <listitem><para>Takes a comma-separated
separated list of kernel modules to list of kernel modules to
statically load during early boot. The statically load during early boot. The
option prefixed with option prefixed with
<literal>rd.</literal> is read by the <literal>rd.</literal> is read by the

6
man/systemd-nspawn.xml
View File

@ -242,7 +242,7 @@
<varlistentry> <varlistentry>
<term><option>--uuid=</option></term> <term><option>--uuid=</option></term>
<listitem><para>Set the specified uuid <listitem><para>Set the specified UUID
for the container. The init system for the container. The init system
will initialize will initialize
<filename>/etc/machine-id</filename> <filename>/etc/machine-id</filename>
@ -274,7 +274,7 @@
<term><option>--read-only</option></term> <term><option>--read-only</option></term>
<listitem><para>Mount the root file <listitem><para>Mount the root file
system read only for the system read-only for the
container.</para></listitem> container.</para></listitem>
</varlistentry> </varlistentry>
@ -283,7 +283,7 @@
<listitem><para>List one or more <listitem><para>List one or more
additional capabilities to grant the additional capabilities to grant the
container. Takes a comma separated container. Takes a comma-separated
list of capability names, see list of capability names, see
<citerefentry><refentrytitle>capabilities</refentrytitle><manvolnum>7</manvolnum></citerefentry> <citerefentry><refentrytitle>capabilities</refentrytitle><manvolnum>7</manvolnum></citerefentry>
for more information. Note that the for more information. Note that the

26
man/systemd-readahead-replay.service.xml
View File

@ -72,7 +72,7 @@
time. <filename>systemd-readahead-replay.service</filename> time. <filename>systemd-readahead-replay.service</filename>
is a service that replays this access data collected is a service that replays this access data collected
at the subsequent boot. Since disks tend to be at the subsequent boot. Since disks tend to be
magnitudes slower than RAM this is intended to improve magnitudes slower than RAM, this is intended to improve
boot speeds by pre-loading early at boot all data on boot speeds by pre-loading early at boot all data on
disk that is known to be read for the complete boot disk that is known to be read for the complete boot
process.</para> process.</para>
@ -80,9 +80,9 @@
<para><filename>systemd-readahead-done.service</filename> <para><filename>systemd-readahead-done.service</filename>
is executed a short while after boot completed and signals is executed a short while after boot completed and signals
<filename>systemd-readahead-collect.service</filename> <filename>systemd-readahead-collect.service</filename>
to end data collection. On this signal this service to end data collection. On this signal, this service
will then sort the collected disk accesses and store will then sort the collected disk accesses and store
information about them disk in information about them in
<filename>/.readahead</filename>.</para> <filename>/.readahead</filename>.</para>
<para>Normally, both <para>Normally, both
@ -92,17 +92,17 @@
are activated at boot so that access patterns from the are activated at boot so that access patterns from the
preceding boot are replayed and new data collected preceding boot are replayed and new data collected
for the subsequent boot. However, on read-only media for the subsequent boot. However, on read-only media
where the collected data cannot be stored it might where the collected data cannot be stored, it might
be a good idea to disable be a good idea to disable
<filename>systemd-readahead-collect.service</filename>.</para> <filename>systemd-readahead-collect.service</filename>.</para>
<para>On rotating media, when replaying disk accesses <para>On rotating media, when replaying disk accesses
at early boot at early boot,
<filename>systemd-readahead-replay.service</filename> <filename>systemd-readahead-replay.service</filename>
will order read requests by their location on disk. On will order read requests by their location on disk. On
non-rotating media, they will be ordered by their non-rotating media, they will be ordered by their
original access timestamp. If the file system supports original access timestamp. If the file system supports
it it,
<filename>systemd-readahead-collect.service</filename> <filename>systemd-readahead-collect.service</filename>
will also defragment and rearrange files on disk to will also defragment and rearrange files on disk to
optimize subsequent boot times.</para> optimize subsequent boot times.</para>
@ -136,7 +136,7 @@
<term><option>--file-size-max=</option></term> <term><option>--file-size-max=</option></term>
<listitem><para>Maximum size of files <listitem><para>Maximum size of files
(in bytes) to read ahead. Only valid in bytes to read ahead. Only valid
for the <command>collect</command> for the <command>collect</command>
and <command>replay</command> and <command>replay</command>
commands.</para></listitem> commands.</para></listitem>
@ -145,8 +145,8 @@
<varlistentry> <varlistentry>
<term><option>--timeout=</option></term> <term><option>--timeout=</option></term>
<listitem><para>Maximum time (in usec) <listitem><para>Maximum time in microseconds
to to spend collecting data. Only valid to spend collecting data. Only valid
for the <command>collect</command> for the <command>collect</command>
command.</para></listitem> command.</para></listitem>
</varlistentry> </varlistentry>
@ -164,7 +164,7 @@
[<replaceable>DIRECTORY</replaceable>]</command></term> [<replaceable>DIRECTORY</replaceable>]</command></term>
<listitem> <listitem>
<para>Collect read-ahead data on <para>Collect read-ahead data on
early boot. When terminating it will early boot. When terminating, it will
write out a pack file to the indicated write out a pack file to the indicated
directory containing the read-ahead directory containing the read-ahead
data. </para> data. </para>
@ -186,9 +186,9 @@
<listitem> <listitem>
<para>Dumps the content of the <para>Dumps the content of the
read-ahead pack file to the read-ahead pack file to the
terminal. The output lists terminal. For each file, the
approximately for each file output lists approximately how
how much will be read-ahead by much will be read ahead by
the <command>replay</command> the <command>replay</command>
command.</para> command.</para>
</listitem> </listitem>

15
man/systemd-system.conf.xml
View File

@ -112,8 +112,8 @@
addition to the addition to the
<literal>name=systemd</literal> named <literal>name=systemd</literal> named
hierarchy. Defaults to hierarchy. Defaults to
<literal>cpu</literal>. Takes a space <literal>cpu</literal>. Takes a
separated list of controller space-separated list of controller
names. Pass the empty string to ensure names. Pass the empty string to ensure
that systemd does not touch any that systemd does not touch any
hierarchies but its own.</para> hierarchies but its own.</para>
@ -138,8 +138,8 @@
enabled in the kernel in individual enabled in the kernel in individual
hierarchies, with the exception of hierarchies, with the exception of
those listed in this setting. Takes a those listed in this setting. Takes a
space separated list of comma space-separated list of comma-separated
separated controller names, in order controller names, in order
to allow multiple joined to allow multiple joined
hierarchies. Defaults to hierarchies. Defaults to
'cpu,cpuacct'. Pass an empty string to 'cpu,cpuacct'. Pass an empty string to
@ -150,7 +150,7 @@
<para>Note that this option is only <para>Note that this option is only
applied once, at very early boot. If applied once, at very early boot. If
you use an initial RAM disk (initrd) you use an initial RAM disk (initrd)
that uses systemd it might hence be that uses systemd, it might hence be
necessary to rebuild the initrd if necessary to rebuild the initrd if
this option is changed, and make sure this option is changed, and make sure
the new configuration file is included the new configuration file is included
@ -214,9 +214,8 @@
capability bounding set for PID 1 and capability bounding set for PID 1 and
its children. See its children. See
<citerefentry><refentrytitle>capabilities</refentrytitle><manvolnum>7</manvolnum></citerefentry> <citerefentry><refentrytitle>capabilities</refentrytitle><manvolnum>7</manvolnum></citerefentry>
for details. Takes a whitespace for details. Takes a whitespace-separated
separated list of capability names as list of capability names as read by
read by
<citerefentry><refentrytitle>cap_from_name</refentrytitle><manvolnum>3</manvolnum></citerefentry>. <citerefentry><refentrytitle>cap_from_name</refentrytitle><manvolnum>3</manvolnum></citerefentry>.
Capabilities listed will be included Capabilities listed will be included
in the bounding set, all others are in the bounding set, all others are

4
man/systemd-timedated.service.xml
View File

@ -57,7 +57,7 @@
<title>Description</title> <title>Description</title>
<para><filename>systemd-timedated</filename> is a <para><filename>systemd-timedated</filename> is a
system service that may be used as mechanism to change system service that may be used as a mechanism to change
the system clock and timezone, as well as to the system clock and timezone, as well as to
enable/disable NTP time enable/disable NTP time
synchronization. <filename>systemd-timedated</filename> synchronization. <filename>systemd-timedated</filename>
@ -66,7 +66,7 @@
<para>The tool <para>The tool
<citerefentry><refentrytitle>timedatectl</refentrytitle><manvolnum>1</manvolnum></citerefentry> <citerefentry><refentrytitle>timedatectl</refentrytitle><manvolnum>1</manvolnum></citerefentry>
is a command line client to this service.</para> is a command-line client to this service.</para>
<para>See the <ulink <para>See the <ulink
url="http://www.freedesktop.org/wiki/Software/systemd/timedated"> url="http://www.freedesktop.org/wiki/Software/systemd/timedated">

2
man/systemd-tmpfiles.xml
View File

@ -76,7 +76,7 @@
<para>If invoked with no arguments, it applies all <para>If invoked with no arguments, it applies all
directives from all configuration files. If one or directives from all configuration files. If one or
more file names are passed on the command line, only more filenames are passed on the command line, only
the directives in these files are applied. If only the directives in these files are applied. If only
the basename of a configuration file is specified, the basename of a configuration file is specified,
all configuration directories as specified in <citerefentry> all configuration directories as specified in <citerefentry>

2
man/systemd.automount.xml
View File

@ -133,7 +133,7 @@
existing at time that the automount existing at time that the automount
point is installed it is created. This point is installed it is created. This
string must be reflected in the unit string must be reflected in the unit
file name. (See above.) This option is filename. (See above.) This option is
mandatory.</para></listitem> mandatory.</para></listitem>
</varlistentry> </varlistentry>

31
man/systemd.exec.xml
View File

@ -129,7 +129,7 @@
<listitem><para>Sets the supplementary <listitem><para>Sets the supplementary
Unix groups the processes are executed Unix groups the processes are executed
as. This takes a space separated list as. This takes a space-separated list
of group names or IDs. This option may of group names or IDs. This option may
be specified more than once in which be specified more than once in which
case all listed groups are set as case all listed groups are set as
@ -312,7 +312,7 @@
<varname>Environment=</varname> but <varname>Environment=</varname> but
reads the environment variables from a reads the environment variables from a
text file. The text file should text file. The text file should
contain new-line separated variable contain new-line-separated variable
assignments. Empty lines and lines assignments. Empty lines and lines
starting with ; or # will be ignored, starting with ; or # will be ignored,
which may be used for commenting. A line which may be used for commenting. A line
@ -324,7 +324,7 @@
double quotes (").</para> double quotes (").</para>
<para>The argument passed should be an <para>The argument passed should be an
absolute file name or wildcard absolute filename or wildcard
expression, optionally prefixed with expression, optionally prefixed with
"-", which indicates that if the file "-", which indicates that if the file
does not exist it won't be read and no does not exist it won't be read and no
@ -717,9 +717,8 @@
capability bounding set for the capability bounding set for the
executed process. See executed process. See
<citerefentry><refentrytitle>capabilities</refentrytitle><manvolnum>7</manvolnum></citerefentry> <citerefentry><refentrytitle>capabilities</refentrytitle><manvolnum>7</manvolnum></citerefentry>
for details. Takes a whitespace for details. Takes a whitespace-separated
separated list of capability names as list of capability names as read by
read by
<citerefentry><refentrytitle>cap_from_name</refentrytitle><manvolnum>3</manvolnum></citerefentry>, <citerefentry><refentrytitle>cap_from_name</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
e.g. <constant>CAP_SYS_ADMIN</constant>, e.g. <constant>CAP_SYS_ADMIN</constant>,
<constant>CAP_DAC_OVERRIDE</constant>, <constant>CAP_DAC_OVERRIDE</constant>,
@ -986,7 +985,7 @@
<listitem><para>Control access to <listitem><para>Control access to
specific device nodes by the executed processes. Takes two specific device nodes by the executed processes. Takes two
space separated strings: a device node space-separated strings: a device node
path (such as path (such as
<filename>/dev/null</filename>) <filename>/dev/null</filename>)
followed by a combination of r, w, m followed by a combination of r, w, m
@ -1011,7 +1010,7 @@
processes. Takes either a single processes. Takes either a single
weight value (between 10 and 1000) to weight value (between 10 and 1000) to
set the default block IO weight, or a set the default block IO weight, or a
space separated pair of a file path space-separated pair of a file path
and a weight value to specify the and a weight value to specify the
device specific weight value (Example: device specific weight value (Example:
"/dev/sda 500"). The file path may be "/dev/sda 500"). The file path may be
@ -1037,8 +1036,8 @@
<listitem><para>Set the per-device <listitem><para>Set the per-device
overall block IO bandwidth limit for overall block IO bandwidth limit for
the executed processes. Takes a space the executed processes. Takes a
separated pair of a file path and a space-separated pair of a file path and a
bandwidth value (in bytes per second) bandwidth value (in bytes per second)
to specify the device specific to specify the device specific
bandwidth. The file path may be bandwidth. The file path may be
@ -1185,9 +1184,9 @@
<term><varname>IgnoreSIGPIPE=</varname></term> <term><varname>IgnoreSIGPIPE=</varname></term>
<listitem><para>Takes a boolean <listitem><para>Takes a boolean
argument. If true causes SIGPIPE to be argument. If true, causes SIGPIPE to be
ignored in the executed ignored in the executed
process. Defaults to true, since process. Defaults to true because
SIGPIPE generally is useful only in SIGPIPE generally is useful only in
shell pipelines.</para></listitem> shell pipelines.</para></listitem>
</varlistentry> </varlistentry>
@ -1196,7 +1195,7 @@
<term><varname>NoNewPrivileges=</varname></term> <term><varname>NoNewPrivileges=</varname></term>
<listitem><para>Takes a boolean <listitem><para>Takes a boolean
argument. If true ensures that the argument. If true, ensures that the
service process and all its children service process and all its children
can never gain new privileges. This can never gain new privileges. This
option is more powerful than the respective option is more powerful than the respective
@ -1211,9 +1210,9 @@
<varlistentry> <varlistentry>
<term><varname>SystemCallFilter=</varname></term> <term><varname>SystemCallFilter=</varname></term>
<listitem><para>Takes a space <listitem><para>Takes a space-separated
separated list of system call list of system call
names. If this setting is used all names. If this setting is used, all
system calls executed by the unit system calls executed by the unit
process except for the listed ones process except for the listed ones
will result in immediate process will result in immediate process

40
man/systemd.journal-fields.xml
View File

@ -72,7 +72,7 @@
<varlistentry> <varlistentry>
<term><varname>MESSAGE=</varname></term> <term><varname>MESSAGE=</varname></term>
<listitem> <listitem>
<para>The human readable <para>The human-readable
message string for this message string for this
entry. This is supposed to be entry. This is supposed to be
the primary text shown to the the primary text shown to the
@ -87,16 +87,16 @@
<varlistentry> <varlistentry>
<term><varname>MESSAGE_ID=</varname></term> <term><varname>MESSAGE_ID=</varname></term>
<listitem> <listitem>
<para>A 128bit message <para>A 128-bit message
identifier ID for recognizing identifier ID for recognizing
certain message types, if this certain message types, if this
is desirable. This should is desirable. This should
contain a 128bit id formatted contain a 128-bit ID formatted
as lower-case hexadecimal as a lower-case hexadecimal
string, without any separating string, without any separating
dashes or suchlike. This is dashes or suchlike. This is
recommended to be a UUID recommended to be a
compatible ID, but this is not UUID-compatible ID, but this is not
enforced, and formatted enforced, and formatted
differently. Developers can differently. Developers can
generate a new ID for this generate a new ID for this
@ -113,7 +113,7 @@
0 (<literal>emerg</literal>) 0 (<literal>emerg</literal>)
and 7 and 7
(<literal>debug</literal>) (<literal>debug</literal>)
formatted as decimal formatted as a decimal
string. This field is string. This field is
compatible with syslog's compatible with syslog's
priority concept.</para> priority concept.</para>
@ -128,7 +128,7 @@
<para>The code location <para>The code location
generating this message, if generating this message, if
known. Contains the source known. Contains the source
file name, the line number and filename, the line number and
the function name.</para> the function name.</para>
</listitem> </listitem>
</varlistentry> </varlistentry>
@ -141,7 +141,7 @@
any. Contains the numeric any. Contains the numeric
value of value of
<citerefentry><refentrytitle>errno</refentrytitle><manvolnum>3</manvolnum></citerefentry> <citerefentry><refentrytitle>errno</refentrytitle><manvolnum>3</manvolnum></citerefentry>
formatted as decimal formatted as a decimal
string.</para> string.</para>
</listitem> </listitem>
</varlistentry> </varlistentry>
@ -179,7 +179,7 @@
<para>The process, user and <para>The process, user and
group ID of the process the group ID of the process the
journal entry originates from journal entry originates from
formatted as decimal formatted as a decimal
string.</para> string.</para>
</listitem> </listitem>
</varlistentry> </varlistentry>
@ -246,8 +246,8 @@
any is known that is different any is known that is different
from the reception time of the from the reception time of the
journal. This is the time in journal. This is the time in
usec since the epoch UTC microseconds since the epoch UTC,
formatted as decimal formatted as a decimal
string.</para> string.</para>
</listitem> </listitem>
</varlistentry> </varlistentry>
@ -258,7 +258,7 @@
<para>The kernel boot ID for <para>The kernel boot ID for
the boot the message was the boot the message was
generated in, formatted as generated in, formatted as
128bit hexadecimal a 128-bit hexadecimal
string.</para> string.</para>
</listitem> </listitem>
</varlistentry> </varlistentry>
@ -457,7 +457,7 @@
JSON Format</ulink>, the addresses of journal entries JSON Format</ulink>, the addresses of journal entries
are serialized into fields prefixed with double are serialized into fields prefixed with double
underscores. Note that these aren't proper fields when underscores. Note that these aren't proper fields when
stored in the journal, but addressing meta data of stored in the journal but for addressing meta data of
entries. They cannot be written as part of structured entries. They cannot be written as part of structured
log entries via calls such as log entries via calls such as
<citerefentry><refentrytitle>sd_journal_send</refentrytitle><manvolnum>3</manvolnum></citerefentry>. They <citerefentry><refentrytitle>sd_journal_send</refentrytitle><manvolnum>3</manvolnum></citerefentry>. They
@ -486,11 +486,11 @@
(<constant>CLOCK_REALTIME</constant>) (<constant>CLOCK_REALTIME</constant>)
at the point in time the entry at the point in time the entry
was received by the journal, was received by the journal,
in usec since the epoch UTC in microseconds since the epoch
formatted as decimal UTC, formatted as a decimal
string. This has different string. This has different
properties from properties from
<literal>_SOURCE_REALTIME_TIMESTAMP=</literal> <literal>_SOURCE_REALTIME_TIMESTAMP=</literal>,
as it is usually a bit later as it is usually a bit later
but more likely to be monotonic. but more likely to be monotonic.
</para> </para>
@ -504,10 +504,10 @@
(<constant>CLOCK_MONOTONIC</constant>) (<constant>CLOCK_MONOTONIC</constant>)
at the point in time the entry at the point in time the entry
was received by the journal in was received by the journal in
usec formatted as decimal microseconds, formatted as a decimal
string. To be useful as an string. To be useful as an
address for the entry this address for the entry, this
should be combined with with should be combined with with the
boot ID in <literal>_BOOT_ID=</literal>. boot ID in <literal>_BOOT_ID=</literal>.
</para> </para>
</listitem> </listitem>

10
man/systemd.mount.xml
View File

@ -206,14 +206,14 @@
the mount point does not exist at the the mount point does not exist at the
time of mounting, it is created. This time of mounting, it is created. This
string must be reflected in the unit string must be reflected in the unit
file name. (See above.) This option is filename. (See above.) This option is
mandatory.</para></listitem> mandatory.</para></listitem>
</varlistentry> </varlistentry>
<varlistentry> <varlistentry>
<term><varname>Type=</varname></term> <term><varname>Type=</varname></term>
<listitem><para>Takes a string for the <listitem><para>Takes a string for the
filesystem type. See file system type. See
<citerefentry><refentrytitle>mount</refentrytitle><manvolnum>8</manvolnum></citerefentry> <citerefentry><refentrytitle>mount</refentrytitle><manvolnum>8</manvolnum></citerefentry>
for details. This setting is for details. This setting is
optional.</para></listitem> optional.</para></listitem>
@ -223,8 +223,8 @@
<term><varname>Options=</varname></term> <term><varname>Options=</varname></term>
<listitem><para>Mount options to use <listitem><para>Mount options to use
when mounting. This takes a comma when mounting. This takes a
separated list of options. This comma-separated list of options. This
setting is optional.</para></listitem> setting is optional.</para></listitem>
</varlistentry> </varlistentry>
@ -245,7 +245,7 @@
<listitem><para>Configures the time to <listitem><para>Configures the time to
wait for the mount command to wait for the mount command to
finish. If a command does not exit finish. If a command does not exit
within the configured time the mount within the configured time, the mount
will be considered failed and be shut will be considered failed and be shut
down again. All commands still running down again. All commands still running
will be terminated forcibly via will be terminated forcibly via

14
man/systemd.preset.xml
View File

@ -109,7 +109,7 @@
by default, <literal>disable</literal> to disable by default, <literal>disable</literal> to disable
units by default.</para> units by default.</para>
<para>If multiple lines apply to a unit name the <para>If multiple lines apply to a unit name, the
first matching one takes precedence over all first matching one takes precedence over all
others.</para> others.</para>
@ -131,14 +131,14 @@
precedence over another file with an alphabetically precedence over another file with an alphabetically
earlier name, if both files contain lines that apply earlier name, if both files contain lines that apply
to the same unit names. It is recommended to prefix to the same unit names. It is recommended to prefix
all file names with two-digit number, to simplify all filenames with two-digit number, to simplify
ordering.</para> ordering.</para>
<para>If the administrator wants to disable a preset <para>If the administrator wants to disable a preset
file supplied by the vendor the recommended way is to file supplied by the vendor, the recommended way is to
place a symlink to <filename>/dev/null</filename> in place a symlink to <filename>/dev/null</filename> in
<filename>/etc/systemd/system-preset/</filename> <filename>/etc/systemd/system-preset/</filename>
bearing the same file name.</para> bearing the same filename.</para>
</refsect1> </refsect1>
<refsect1> <refsect1>
@ -150,8 +150,8 @@
<programlisting>disable *</programlisting> <programlisting>disable *</programlisting>
</example> </example>
<para>This disables all units. Due to the file name <para>This disables all units. Due to the filename
prefix <literal>99-</literal> it will be read last and prefix <literal>99-</literal>, it will be read last and
hence can easily be overridden by spin or hence can easily be overridden by spin or
administrator preset policy or suchlike.</para> administrator preset policy or suchlike.</para>
@ -187,7 +187,7 @@ disable *</programlisting>
<para>This enables three specific services and <para>This enables three specific services and
disables all others. This is useful for administrators disables all others. This is useful for administrators
to specifically select the units to enable, and to specifically select the units to enable, and
disable all others. Due to the file name prefix disable all others. Due to the filename prefix
<literal>00-</literal> it will be read early and hence <literal>00-</literal> it will be read early and hence
overrides all other preset policy files.</para> overrides all other preset policy files.</para>
</refsect1> </refsect1>

2
man/systemd.service.xml
View File

@ -375,7 +375,7 @@
<literal>argv[0]</literal> to the <literal>argv[0]</literal> to the
executed process, followed by the executed process, followed by the
further arguments specified. If the further arguments specified. If the
absolute file name is prefixed with absolute filename is prefixed with
<literal>-</literal> an exit code of <literal>-</literal> an exit code of
the command normally considered a the command normally considered a
failure (i.e. non-zero exit status or failure (i.e. non-zero exit status or

16
man/systemd.socket.xml
View File

@ -387,8 +387,8 @@
<citerefentry><refentrytitle>close</refentrytitle><manvolnum>2</manvolnum></citerefentry> <citerefentry><refentrytitle>close</refentrytitle><manvolnum>2</manvolnum></citerefentry>
on the received socket before on the received socket before
exiting. However, it must not unlink exiting. However, it must not unlink
the socket from a filesystem. It the socket from a file system. It
should note invoke should not invoke
<citerefentry><refentrytitle>shutdown</refentrytitle><manvolnum>2</manvolnum></citerefentry> <citerefentry><refentrytitle>shutdown</refentrytitle><manvolnum>2</manvolnum></citerefentry>
on sockets it got with on sockets it got with
<varname>Accept=false</varname>, but <varname>Accept=false</varname>, but
@ -412,7 +412,7 @@
are coming in, they will be refused are coming in, they will be refused
until at least one existing connection until at least one existing connection
is terminated. This setting has no is terminated. This setting has no
effect for sockets configured with effect on sockets configured with
<option>Accept=false</option> or datagram <option>Accept=false</option> or datagram
sockets. Defaults to sockets. Defaults to
64.</para></listitem> 64.</para></listitem>
@ -516,7 +516,7 @@
respectively, i.e. the security label respectively, i.e. the security label
of the FIFO, or the security label for of the FIFO, or the security label for
the incoming or outgoing connections the incoming or outgoing connections
of the socket, respectively. See of the socket, respectively. See
<ulink <ulink
url="https://www.kernel.org/doc/Documentation/security/Smack.txt">Smack.txt</ulink> url="https://www.kernel.org/doc/Documentation/security/Smack.txt">Smack.txt</ulink>
for details.</para></listitem> for details.</para></listitem>
@ -527,7 +527,7 @@
<listitem><para>Takes an integer <listitem><para>Takes an integer
value. Controls the pipe buffer size value. Controls the pipe buffer size
of FIFOs configured in this socket of FIFOs configured in this socket
unit. See unit. See
<citerefentry><refentrytitle>fcntl</refentrytitle><manvolnum>2</manvolnum></citerefentry> <citerefentry><refentrytitle>fcntl</refentrytitle><manvolnum>2</manvolnum></citerefentry>
for details.</para></listitem> for details.</para></listitem>
</varlistentry> </varlistentry>
@ -598,7 +598,7 @@
socket option, which allows <constant>AF_UNIX</constant> socket option, which allows <constant>AF_UNIX</constant>
sockets to receive the security sockets to receive the security
context of the sending process in an context of the sending process in an
ancillary message. Defaults to ancillary message. Defaults to
<option>false</option>.</para></listitem> <option>false</option>.</para></listitem>
</varlistentry> </varlistentry>
@ -622,7 +622,7 @@
before or after the listening before or after the listening
sockets/FIFOs are created and sockets/FIFOs are created and
bound, respectively. The first token of the command bound, respectively. The first token of the command
line must be an absolute file name, line must be an absolute filename,
then followed by arguments for the then followed by arguments for the
process. Multiple command lines may be process. Multiple command lines may be
specified following the same scheme as specified following the same scheme as
@ -701,7 +701,7 @@
</para> </para>
<para> <para>
For more extensive descriptions see the "Systemd for Developers" series: For more extensive descriptions see the "systemd for Developers" series:
<ulink url="http://0pointer.de/blog/projects/socket-activation.html">Socket Activation</ulink>, <ulink url="http://0pointer.de/blog/projects/socket-activation.html">Socket Activation</ulink>,
<ulink url="http://0pointer.de/blog/projects/socket-activation2.html">Socket Activation, part II</ulink>, <ulink url="http://0pointer.de/blog/projects/socket-activation2.html">Socket Activation, part II</ulink>,
<ulink url="http://0pointer.de/blog/projects/inetd.html">Converting inetd Services</ulink>, <ulink url="http://0pointer.de/blog/projects/inetd.html">Converting inetd Services</ulink>,

62
man/systemd.time.xml
View File

@ -50,16 +50,16 @@
<refsect1> <refsect1>
<title>Description</title> <title>Description</title>
<para>In systemd timestamps, timespans, and calendar <para>In systemd, timestamps, time spans, and calendar
events are displayed and may be specified in closely events are displayed and may be specified in closely
related syntaxes.</para> related syntaxes.</para>
</refsect1> </refsect1>
<refsect1> <refsect1>
<title>Displaying Timespans</title> <title>Displaying Time Spans</title>
<para>Timespans refer to time durations. On display <para>Time spans refer to time durations. On display,
systemd will present timespans as a space separated systemd will present time spans as a space-separated
series of time values each suffixed by a time series of time values each suffixed by a time
unit.</para> unit.</para>
@ -70,10 +70,10 @@
</refsect1> </refsect1>
<refsect1> <refsect1>
<title>Parsing Timespans</title> <title>Parsing Time Spans</title>
<para>When parsing systemd will accept the same <para>When parsing, systemd will accept the same
timespan syntax. Separating spaces may be omitted. The time span syntax. Separating spaces may be omitted. The
following time units are understood:</para> following time units are understood:</para>
<itemizedlist> <itemizedlist>
@ -92,9 +92,9 @@
are assumed, but some exceptions exist and are marked are assumed, but some exceptions exist and are marked
as such. In a few cases <literal>ns</literal>, as such. In a few cases <literal>ns</literal>,
<literal>nsec</literal> is accepted too, where the <literal>nsec</literal> is accepted too, where the
granularity of the timespan allows for this.</para> granularity of the time span allows for this.</para>
<para>Examples for valid timespan specifications:</para> <para>Examples for valid time span specifications:</para>
<programlisting>2 h <programlisting>2 h
2hours 2hours
@ -108,12 +108,12 @@
<title>Displaying Timestamps</title> <title>Displaying Timestamps</title>
<para>Timestamps refer to specific, unique points in <para>Timestamps refer to specific, unique points in
time. On display systemd will format these in the time. On display, systemd will format these in the
local timezone as follows:</para> local timezone as follows:</para>
<programlisting>Fri 2012-11-23 23:02:15 CET</programlisting> <programlisting>Fri 2012-11-23 23:02:15 CET</programlisting>
<para>The week day is printed according to the locale <para>The weekday is printed according to the locale
choice of the user.</para> choice of the user.</para>
</refsect1> </refsect1>
@ -123,10 +123,10 @@
<para>When parsing systemd will accept a similar <para>When parsing systemd will accept a similar
timestamp syntax, but excluding any timezone timestamp syntax, but excluding any timezone
specification (this limitation might be removed specification (this limitation might be removed
eventually). The week day specification is optional, eventually). The weekday specification is optional,
but when the week day is specified it must either be but when the weekday is specified it must either be
in the abbreviated (<literal>Wed</literal>) or in the abbreviated (<literal>Wed</literal>) or
non-abbreviated (<literal>Wednesday</literal>) english non-abbreviated (<literal>Wednesday</literal>) English
language form (case doesn't matter), and is not language form (case doesn't matter), and is not
subject to the locale choice of the user. Either the subject to the locale choice of the user. Either the
date, or the time part may be omitted, in which case date, or the time part may be omitted, in which case
@ -136,11 +136,11 @@
specified in full or may be abbreviated (omitting the specified in full or may be abbreviated (omitting the
century).</para> century).</para>
<para>A timestamp is considered invalid if a week day <para>A timestamp is considered invalid if a weekday
is specified and the date does not actually match the is specified and the date does not actually match the
specified day of the week.</para> specified day of the week.</para>
<para>When parsing systemd will also accept a few <para>When parsing, systemd will also accept a few
special placeholders instead of timestamps: special placeholders instead of timestamps:
<literal>now</literal> may be used to refer to the <literal>now</literal> may be used to refer to the
current time (or of the invocation of the command current time (or of the invocation of the command
@ -150,14 +150,14 @@
current day, the day before or the next day, current day, the day before or the next day,
respectively.</para> respectively.</para>
<para>When parsing systemd will also accept relative <para>When parsing, systemd will also accept relative
time specifications. A timespan (see above) that is time specifications. A time span (see above) that is
prefixed with <literal>+</literal> is evaluated to the prefixed with <literal>+</literal> is evaluated to the
current time plus the specified current time plus the specified
timespan. Correspondingly a timespan that is prefix time span. Correspondingly, a time span that is prefixed
with <literal>-</literal> is evaluated to the current with <literal>-</literal> is evaluated to the current
time minus the specified timespan. Instead of time minus the specified time span. Instead of
prefixing the timespan with <literal>-</literal> it prefixing the time span with <literal>-</literal> it
may also be suffixed with a space and the word may also be suffixed with a space and the word
<literal>ago</literal>.</para> <literal>ago</literal>.</para>
@ -182,10 +182,10 @@
<para>Note that timestamps printed by systemd will not <para>Note that timestamps printed by systemd will not
be parsed correctly by systemd, as the timezone be parsed correctly by systemd, as the timezone
specification is not accepted, and printing timestamps specification is not accepted, and printing timestamps
is subject to locale settings for the week day while is subject to locale settings for the weekday while
parsing only accepts english week day names.</para> parsing only accepts English weekday names.</para>
<para>In some cases systemd will display a relative <para>In some cases, systemd will display a relative
timestamp (relative to the current time, or the time timestamp (relative to the current time, or the time
of invocation of the command) instead or in addition of invocation of the command) instead or in addition
to an absolute timestamp as described above. A to an absolute timestamp as described above. A
@ -208,17 +208,17 @@
<para>The above refers to 11:12:13 of the first or <para>The above refers to 11:12:13 of the first or
fifth day of any month of the year 2012, given that it fifth day of any month of the year 2012, given that it
is a thursday or friday.</para> is a Thursday or Friday.</para>
<para>The weekday specification is optional. If <para>The weekday specification is optional. If
specified it should consist of one or more english specified, it should consist of one or more English
language week day names, either in the abbreviated language weekday names, either in the abbreviated
(Wed) or non-abbreviated (Wednesday) form (case does (Wed) or non-abbreviated (Wednesday) form (case does
not matter), separated by commas. Specifying two week not matter), separated by commas. Specifying two weekdays
days separated by "-" refers to a range of continuous separated by "-" refers to a range of continuous
week days. "," and "-" may be combined freely.</para> weekdays. "," and "-" may be combined freely.</para>
<para>In the date and time specifications any <para>In the date and time specifications, any
component may be specified as "*" in which case any component may be specified as "*" in which case any
value will match. Alternatively, each component can be value will match. Alternatively, each component can be
specified as list of values separated by specified as list of values separated by

2
man/systemd.timer.xml
View File

@ -160,7 +160,7 @@
monotonic clock stops too.</para> monotonic clock stops too.</para>
<para>If the empty string is assigned <para>If the empty string is assigned
to any of these options the list of to any of these options, the list of
timers is reset, and all prior timers is reset, and all prior
assignments will have no assignments will have no
effect.</para></listitem> effect.</para></listitem>

26
man/systemd.unit.xml
View File

@ -182,7 +182,7 @@
directive.</para> directive.</para>
<para>If a line starts with <option>.include</option> <para>If a line starts with <option>.include</option>
followed by a file name, the specified file will be followed by a filename, the specified file will be
parsed at this point. Make sure that the file that is parsed at this point. Make sure that the file that is
included has the appropriate section headers before included has the appropriate section headers before
any directives.</para> any directives.</para>
@ -200,7 +200,7 @@
with the device node <filename noindex='true'>/dev/sda</filename> in with the device node <filename noindex='true'>/dev/sda</filename> in
the file system namespace. If this applies a special the file system namespace. If this applies a special
way to escape the path name is used, so that the way to escape the path name is used, so that the
result is usable as part of a file name. Basically, result is usable as part of a filename. Basically,
given a path, "/" is replaced by "-", and all given a path, "/" is replaced by "-", and all
unprintable characters and the "-" are replaced by unprintable characters and the "-" are replaced by
C-style "\x20" escapes. The root directory "/" is C-style "\x20" escapes. The root directory "/" is
@ -382,7 +382,7 @@
<varlistentry> <varlistentry>
<term><varname>Documentation=</varname></term> <term><varname>Documentation=</varname></term>
<listitem><para>A space separated list <listitem><para>A space-separated list
of URIs referencing documentation for of URIs referencing documentation for
this unit or its this unit or its
configuration. Accepted are only URIs configuration. Accepted are only URIs
@ -393,7 +393,7 @@
<literal>info:</literal>, <literal>info:</literal>,
<literal>man:</literal>. For more <literal>man:</literal>. For more
information about the syntax of these information about the syntax of these
URIs see URIs, see
<citerefentry><refentrytitle>uri</refentrytitle><manvolnum>7</manvolnum></citerefentry>. The <citerefentry><refentrytitle>uri</refentrytitle><manvolnum>7</manvolnum></citerefentry>. The
URIs should be listed in order of URIs should be listed in order of
relevance, starting with the most relevance, starting with the most
@ -405,7 +405,7 @@
option may be specified more than once option may be specified more than once
in which case the specified list of in which case the specified list of
URIs is merged. If the empty string is URIs is merged. If the empty string is
assigned to this option the list is assigned to this option, the list is
reset and all prior assignments will reset and all prior assignments will
have no effect.</para></listitem> have no effect.</para></listitem>
</varlistentry> </varlistentry>
@ -669,8 +669,8 @@
<varlistentry> <varlistentry>
<term><varname>RequiresMountsFor=</varname></term> <term><varname>RequiresMountsFor=</varname></term>
<listitem><para>Takes a space <listitem><para>Takes a space-separated
separated list of absolute paths. Automatically list of absolute paths. Automatically
adds dependencies of type adds dependencies of type
<varname>Requires=</varname> and <varname>Requires=</varname> and
<varname>After=</varname> for all <varname>After=</varname> for all
@ -1007,11 +1007,11 @@
<para><varname>ConditionHost=</varname> <para><varname>ConditionHost=</varname>
may be used to match against the may be used to match against the
host name or machine ID of the hostname or machine ID of the
host. This either takes a host name host. This either takes a hostname
string (optionally with shell style string (optionally with shell style
globs) which is tested against the globs) which is tested against the
locally set host name as returned by locally set hostname as returned by
<citerefentry><refentrytitle>gethostname</refentrytitle><manvolnum>2</manvolnum></citerefentry>, <citerefentry><refentrytitle>gethostname</refentrytitle><manvolnum>2</manvolnum></citerefentry>,
or a machine ID formatted as string or a machine ID formatted as string
(see (see
@ -1108,7 +1108,7 @@
time, time,
<command>systemctl enable</command> <command>systemctl enable</command>
will create symlinks from these names will create symlinks from these names
to the unit file name.</para></listitem> to the unit filename.</para></listitem>
</varlistentry> </varlistentry>
<varlistentry> <varlistentry>
@ -1207,7 +1207,7 @@
</row> </row>
<row> <row>
<entry><literal>%f</literal></entry> <entry><literal>%f</literal></entry>
<entry>Unescaped file name</entry> <entry>Unescaped filename</entry>
<entry>This is either the unescaped instance name (if applicable) with <filename>/</filename> prepended (if applicable), or the prefix name similarly prepended with <filename>/</filename>.</entry> <entry>This is either the unescaped instance name (if applicable) with <filename>/</filename> prepended (if applicable), or the prefix name similarly prepended with <filename>/</filename>.</entry>
</row> </row>
<row> <row>
@ -1263,7 +1263,7 @@
<row> <row>
<entry><literal>%H</literal></entry> <entry><literal>%H</literal></entry>
<entry>Host name</entry> <entry>Host name</entry>
<entry>The host name of the running system.</entry> <entry>The hostname of the running system.</entry>
</row> </row>
<row> <row>
<entry><literal>%%</literal></entry> <entry><literal>%%</literal></entry>

2
man/systemd.xml
View File

@ -473,7 +473,7 @@
<para>Systemd contains native implementations of <para>Systemd contains native implementations of
various tasks that need to be executed as part of the various tasks that need to be executed as part of the
boot process. For example, it sets the host name or boot process. For example, it sets the hostname or
configures the loopback network device. It also sets configures the loopback network device. It also sets
up and mounts various API file systems, such as up and mounts various API file systems, such as
<filename>/sys</filename> or <filename>/sys</filename> or

6
man/timedatectl.xml
View File

@ -158,7 +158,7 @@
<listitem><para>Set the system time <listitem><para>Set the system time
zone to the specified value. Available zone to the specified value. Available
time zones can be listed with timezones can be listed with
<command>list-timezones</command>. If <command>list-timezones</command>. If
the RTC is configured to be in the the RTC is configured to be in the
local time this will also update the local time this will also update the
@ -176,7 +176,7 @@
<listitem><para>List available time <listitem><para>List available time
zones, one per line. Entries from the zones, one per line. Entries from the
list can be set as the system list can be set as the system
time zone with timezone with
<command>set-timezone</command>.</para></listitem> <command>set-timezone</command>.</para></listitem>
</varlistentry> </varlistentry>
@ -190,7 +190,7 @@
<literal>1</literal> it will maintain <literal>1</literal> it will maintain
the RTC in local time instead. Note the RTC in local time instead. Note
that maintaining the RTC in the local that maintaining the RTC in the local
time zone is not fully supported and timezone is not fully supported and
will create various problems with time will create various problems with time
zone changes and daylight saving zone changes and daylight saving
adjustments. If at all possible use adjustments. If at all possible use

2
man/tmpfiles.d.xml
View File

@ -89,7 +89,7 @@
recommended way is to place a symlink to recommended way is to place a symlink to
<filename>/dev/null</filename> in <filename>/dev/null</filename> in
<filename>/etc/tmpfiles.d/</filename> bearing the <filename>/etc/tmpfiles.d/</filename> bearing the
same file name.</para> same filename.</para>
<para>The configuration format is one line per path <para>The configuration format is one line per path
containing action, path, mode, ownership, age and argument containing action, path, mode, ownership, age and argument

2
man/udev.xml
View File

@ -61,7 +61,7 @@
and the local administration directory <filename>/etc/udev/rules.d</filename>. and the local administration directory <filename>/etc/udev/rules.d</filename>.
All rules files are collectively sorted and processed in lexical order, All rules files are collectively sorted and processed in lexical order,
regardless of the directories in which they live. However, files with regardless of the directories in which they live. However, files with
identical file names replace each other. Files in <filename>/etc</filename> identical filenames replace each other. Files in <filename>/etc</filename>
have the highest priority, files in <filename>/run</filename> take precedence have the highest priority, files in <filename>/run</filename> take precedence
over files with the same name in <filename>/lib</filename>. This can be over files with the same name in <filename>/lib</filename>. This can be
used to override a system-supplied rules file with a local file if needed; used to override a system-supplied rules file with a local file if needed;

4
src/core/main.c
View File

@ -1345,10 +1345,10 @@ int main(int argc, char *argv[]) {
*/ */
hwclock_reset_timezone(); hwclock_reset_timezone();
/* Tell the kernel our time zone */ /* Tell the kernel our timezone */
r = hwclock_set_timezone(NULL); r = hwclock_set_timezone(NULL);
if (r < 0) if (r < 0)
log_error("Failed to set the kernel's time zone, ignoring: %s", strerror(-r)); log_error("Failed to set the kernel's timezone, ignoring: %s", strerror(-r));
} }
} }

2
src/shared/hwclock.c
View File

@ -151,7 +151,7 @@ int hwclock_reset_timezone(void) {
/* /*
* The very first time we set the kernel's timezone, it will warp * The very first time we set the kernel's timezone, it will warp
* the clock. Do a dummy call here, so the time warping is sealed * the clock. Do a dummy call here, so the time warping is sealed
* and we set only the time zone with next call. * and we set only the timezone with next call.
*/ */
if (settimeofday(tv_null, &tz) < 0) if (settimeofday(tv_null, &tz) < 0)
return -errno; return -errno;

2
src/timedate/timedatectl.c
View File

@ -198,7 +198,7 @@ static void print_status_info(StatusInfo *i) {
if (i->local_rtc) if (i->local_rtc)
fputs("\n" ANSI_HIGHLIGHT_ON fputs("\n" ANSI_HIGHLIGHT_ON
"Warning: The RTC is configured to maintain time in the local time zone. This\n" "Warning: The RTC is configured to maintain time in the local timezone. This\n"
" mode is not fully supported and will create various problems with time\n" " mode is not fully supported and will create various problems with time\n"
" zone changes and daylight saving adjustments. If at all possible use\n" " zone changes and daylight saving adjustments. If at all possible use\n"
" RTC in UTC, by calling 'timedatectl set-local-rtc 0'" ANSI_HIGHLIGHT_OFF ".\n", stdout); " RTC in UTC, by calling 'timedatectl set-local-rtc 0'" ANSI_HIGHLIGHT_OFF ".\n", stdout);

4
src/timedate/timedated.c
View File

@ -662,7 +662,7 @@ static DBusHandlerResult timedate_message_handler(
return bus_send_error_reply(connection, message, NULL, r); return bus_send_error_reply(connection, message, NULL, r);
} }
/* 2. Tell the kernel our time zone */ /* 2. Tell the kernel our timezone */
hwclock_set_timezone(NULL); hwclock_set_timezone(NULL);
if (tz.local_rtc) { if (tz.local_rtc) {
@ -719,7 +719,7 @@ static DBusHandlerResult timedate_message_handler(
return bus_send_error_reply(connection, message, NULL, r); return bus_send_error_reply(connection, message, NULL, r);
} }
/* 2. Tell the kernel our time zone */ /* 2. Tell the kernel our timezone */
hwclock_set_timezone(NULL); hwclock_set_timezone(NULL);
/* 3. Synchronize clocks */ /* 3. Synchronize clocks */