[systemd-devel] [PATCH] man: wording and grammar updates
Jan Engelhardt
jengelh at inai.de
Thu Sep 12 12:12:49 PDT 2013
This is a recurring submission and includes corrections to various
issue spotted. I guess I can just skip over reporting ubiquitous
comma placement fixes…
Highligts in this particular commit:
- the "unsigned" type qualifier is completed to form a full type
"unsigned int"
- alphabetic -> lexicographic (that way we automatically define how
numbers get sorted)
---
man/binfmt.d.xml | 4 +--
man/localectl.xml | 2 +-
man/machine-info.xml | 8 ++---
man/modules-load.d.xml | 2 +-
man/os-release.xml | 24 ++++++-------
man/runlevel.xml | 2 +-
man/sd-daemon.xml | 2 +-
man/sd_booted.xml | 2 +-
man/sd_is_fifo.xml | 2 +-
man/sd_journal_add_match.xml | 12 +++----
man/sd_journal_get_catalog.xml | 6 ++--
man/sd_journal_get_data.xml | 4 +--
man/sd_journal_get_fd.xml | 4 +--
man/sd_journal_get_usage.xml | 2 +-
man/sd_journal_open.xml | 2 +-
man/sd_journal_print.xml | 4 +--
man/sd_journal_seek_head.xml | 12 +++----
man/sd_listen_fds.xml | 18 +++++-----
man/sd_login_monitor_new.xml | 4 +--
man/sd_notify.xml | 8 ++---
man/sd_pid_get_session.xml | 4 +--
man/sd_readahead.xml | 2 +-
man/sd_seat_get_active.xml | 6 ++--
man/sd_session_is_active.xml | 6 ++--
man/sd_uid_get_state.xml | 6 ++--
man/sysctl.d.xml | 4 +--
man/systemctl.xml | 16 ++++-----
man/systemd-activate.xml | 4 +--
man/systemd-analyze.xml | 4 +--
man/systemd-ask-password.xml | 4 +--
man/systemd-cat.xml | 8 ++---
man/systemd-cgls.xml | 8 ++---
man/systemd-cgtop.xml | 6 ++--
man/systemd-cryptsetup-generator.xml | 4 +--
man/systemd-delta.xml | 2 +-
man/systemd-detect-virt.xml | 6 ++--
man/systemd-fsck at .service.xml | 2 +-
man/systemd-fstab-generator.xml | 2 +-
man/systemd-journald.service.xml | 2 +-
man/systemd-machine-id-setup.xml | 4 +--
man/systemd-notify.xml | 6 ++--
man/systemd-nspawn.xml | 8 ++---
man/systemd-suspend.service.xml | 2 +-
man/systemd-system.conf.xml | 8 ++---
man/systemd-tmpfiles.xml | 6 ++--
man/systemd.automount.xml | 10 +++---
man/systemd.device.xml | 4 +--
man/systemd.exec.xml | 70 ++++++++++++++++++------------------
man/systemd.kill.xml | 6 ++--
man/systemd.mount.xml | 6 ++--
man/systemd.path.xml | 8 ++---
man/systemd.preset.xml | 6 ++--
man/systemd.service.xml | 62 ++++++++++++++++----------------
man/systemd.socket.xml | 16 ++++-----
man/systemd.special.xml | 4 +--
man/systemd.swap.xml | 4 +--
man/systemd.time.xml | 4 +--
man/systemd.timer.xml | 2 +-
man/systemd.unit.xml | 64 ++++++++++++++++-----------------
man/systemd.xml | 18 +++++-----
man/timedatectl.xml | 16 ++++-----
man/tmpfiles.d.xml | 24 ++++++-------
62 files changed, 289 insertions(+), 289 deletions(-)
diff --git a/man/binfmt.d.xml b/man/binfmt.d.xml
index 165a8a9..94f97e0 100644
--- a/man/binfmt.d.xml
+++ b/man/binfmt.d.xml
@@ -88,10 +88,10 @@
administrator, who may use this logic to override the
configuration files installed from vendor
packages. All files are sorted by their filename in
- alphabetical order, regardless in which of the
+ lexicographic order, regardless in which of the
directories they reside. If multiple files specify
the same binary type name, the entry in the file with
- the alphabetically latest name will be applied.</para>
+ the lexicographically latest name will be applied.</para>
<para>If the administrator wants to disable a
configuration file supplied by the vendor, the
diff --git a/man/localectl.xml b/man/localectl.xml
index a3e07f6..ad4f3d4 100644
--- a/man/localectl.xml
+++ b/man/localectl.xml
@@ -136,7 +136,7 @@
<listitem><para>If
<command>set-keymap</command> or
<command>set-x11-keymap</command> is
- invoked and this option is passed then
+ invoked and this option is passed, then
the keymap will not be converted from
the console to X11, or X11 to console,
respectively.</para></listitem>
diff --git a/man/machine-info.xml b/man/machine-info.xml
index 7f396aa..ddf8f8b 100644
--- a/man/machine-info.xml
+++ b/man/machine-info.xml
@@ -94,13 +94,13 @@
<term><varname>PRETTY_HOSTNAME=</varname></term>
<listitem><para>A pretty
- human-readable UTF8 machine identifier
+ human-readable UTF-8 machine identifier
string. This should contain a name
like <literal>Lennart's
Laptop</literal> which is useful to
present to the user and does not
suffer by the syntax limitations of
- internet domain names. If possible the
+ internet domain names. If possible, the
internet hostname as configured in
<filename>/etc/hostname</filename>
should be kept similar to this
@@ -109,7 +109,7 @@
an Internet hostname of
<literal>lennarts-computer</literal>
might be a good choice. If this
- parameter is not set an application
+ parameter is not set, an application
should fall back to the Internet host
name for presentation
purposes.</para></listitem>
@@ -122,7 +122,7 @@
this machine according to the <ulink
url="http://standards.freedesktop.org/icon-naming-spec/icon-naming-spec-latest.html">XDG
Icon Naming Specification</ulink>. If
- this parameter is not set an
+ this parameter is not set, an
application should fall back to
<literal>computer</literal> or a
similar icon name.</para></listitem>
diff --git a/man/modules-load.d.xml b/man/modules-load.d.xml
index 0d104c5..33c466f 100644
--- a/man/modules-load.d.xml
+++ b/man/modules-load.d.xml
@@ -90,7 +90,7 @@
packages.</para>
<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
<filename>/dev/null</filename> in
<filename>/etc/modules-load.d/</filename> bearing the
diff --git a/man/os-release.xml b/man/os-release.xml
index 045dd08..c1dd62f 100644
--- a/man/os-release.xml
+++ b/man/os-release.xml
@@ -62,7 +62,7 @@
list of environment-like shell-compatible variable
assignments. It is possible to source the
configuration from shell scripts, however, beyond mere
- variable assignments no shell features are supported
+ variable assignments, no shell features are supported
(this means variable expansion is explicitly not
supported), allowing applications to read the file
without implementing a shell compatible execution
@@ -72,7 +72,7 @@
a-z, 0-9. All strings should be in UTF-8 format, and
non-printable characters should not be used. If double
or single quotes or backslashes are to be used within
- variable assignments they should be escaped with
+ variable assignments, they should be escaped with
backslashes, following shell style. It is not
supported to concatenate multiple individually quoted
strings. Lines beginning with "#" shall be ignored as
@@ -110,7 +110,7 @@
<listitem><para>A string identifying
the operating system, without a
version component, and suitable for
- presentation to the user. If not set
+ presentation to the user. If not set,
defaults to
<literal>NAME=Linux</literal>. Example:
<literal>NAME=Fedora</literal> or
@@ -143,7 +143,7 @@
excluding any version information and
suitable for processing by scripts or
usage in generated filenames. If not
- set defaults to
+ set, defaults to
<literal>ID=linux</literal>. Example:
<literal>ID=fedora</literal> or
<literal>ID=debian</literal>.</para></listitem>
@@ -155,7 +155,7 @@
<listitem><para>A space-separated list
of operating system identifiers in the
same syntax as the
- <varname>ID=</varname> setting. Should
+ <varname>ID=</varname> setting. It should
list identifiers of operating systems
that are closely related to the local
operating system in regards to
@@ -165,8 +165,8 @@
OS is a derivative from. An
OS should generally only list other OS
identifiers it itself is a derivative
- from, and not any OSes that
- are derived from it, but symmetric
+ of, and not any OSes that
+ are derived from it, though symmetric
relationships are possible. Build
scripts and similar should check this
variable if they need to identify the
@@ -179,11 +179,11 @@
closest. This field is
optional. Example: for an operating
system with
- <literal>ID=centos</literal> an
+ <literal>ID=centos</literal>, an
assignment of <literal>ID_LIKE="rhel
fedora"</literal> would be
appropriate. For an operating system
- with <literal>ID=ubuntu</literal> an
+ with <literal>ID=ubuntu</literal>, an
assignment of
<literal>ID_LIKE=debian</literal> is
appropriate.</para></listitem>
@@ -213,7 +213,7 @@
presentation to the user. May or may
not contain a release code name or OS
version of some kind, as suitable. If
- not set defaults to
+ not set, defaults to
<literal>PRETTY_NAME="Linux"</literal>. Example:
<literal>PRETTY_NAME="Fedora 17 (Beefy
Miracle)"</literal>.</para></listitem>
@@ -290,7 +290,7 @@
<literal>tel:</literal>. Only one URL
shall be listed in each setting. If
multiple resources need to be
- referenced it is recommended to
+ referenced, it is recommended to
provide an online landing page linking
all available resources. Examples:
<literal>HOME_URL="https://fedoraproject.org/"</literal>
@@ -332,7 +332,7 @@
<para>Note that operating system vendors may choose
not to provide version information, for example to
- accommodate for rolling releases. In this case VERSION
+ accommodate for rolling releases. In this case, VERSION
and VERSION_ID may be unset. Applications should not
rely on these fields to be set.</para>
diff --git a/man/runlevel.xml b/man/runlevel.xml
index 6d9fe85..5efb340 100644
--- a/man/runlevel.xml
+++ b/man/runlevel.xml
@@ -111,7 +111,7 @@
<term><varname>$PREVLEVEL</varname></term>
<listitem><para>If
- <varname>$PREVLEVEL</varname> is set
+ <varname>$PREVLEVEL</varname> is set,
<command>runlevel</command> will print
this value as previous runlevel and
ignore utmp.</para></listitem>
diff --git a/man/sd-daemon.xml b/man/sd-daemon.xml
index 136415f..6e804e1 100644
--- a/man/sd-daemon.xml
+++ b/man/sd-daemon.xml
@@ -99,7 +99,7 @@
conjunction with STDERR-based logging as implemented
by systemd. If a systemd service definition file is
configured with <varname>StandardError=syslog</varname>
- or <varname>StandardError=kmsg</varname> these
+ or <varname>StandardError=kmsg</varname>, these
prefixes can be used to encode a log level in lines
printed. This is similar to the kernel
<function>printk()</function>-style logging. See
diff --git a/man/sd_booted.xml b/man/sd_booted.xml
index 84af8fb..64c0cd9 100644
--- a/man/sd_booted.xml
+++ b/man/sd_booted.xml
@@ -111,7 +111,7 @@
<para>If the reference implementation is used as
drop-in files and -DDISABLE_SYSTEMD is set during
- compilation this function will always return 0 and
+ compilation, this function will always return 0 and
otherwise become a NOP.</para>
</refsect1>
diff --git a/man/sd_is_fifo.xml b/man/sd_is_fifo.xml
index a790c37..2bc860c 100644
--- a/man/sd_is_fifo.xml
+++ b/man/sd_is_fifo.xml
@@ -160,7 +160,7 @@
<para>On failure, these calls return a negative
errno-style error code. If the file descriptor is of
- the specified type and bound to the specified address
+ the specified type and bound to the specified address,
a positive return value is returned, otherwise
zero.</para>
</refsect1>
diff --git a/man/sd_journal_add_match.xml b/man/sd_journal_add_match.xml
index d02285f..b6c7b06 100644
--- a/man/sd_journal_add_match.xml
+++ b/man/sd_journal_add_match.xml
@@ -94,11 +94,11 @@
only of 0-9, A-Z and the underscore. It may not begin
with two underscores or be the empty string. The value
part may be any value, including binary. If a match is
- applied only entries with this field set will be
+ applied, only entries with this field set will be
iterated. Multiple matches may be active at the same
- time: if they apply to different fields only entries
- with both fields set like this will be iterated, if
- they apply to the same fields only entries where the
+ time: If they apply to different fields, only entries
+ with both fields set like this will be iterated. If
+ they apply to the same fields, only entries where the
field takes one of the specified values will be
iterated. Well known fields are documented in
<citerefentry><refentrytitle>systemd.journal-fields</refentrytitle><manvolnum>7</manvolnum></citerefentry>. Whenever
@@ -110,7 +110,7 @@
<para><function>sd_journal_add_disjunction()</function>
may be used to insert a disjunction (i.e. logical OR)
- in the match list. If this call is invoked all
+ in the match list. If this call is invoked, all
previously added matches since the last invocation of
<function>sd_journal_add_disjunction()</function> or
<function>sd_journal_add_conjunction()</function> are
@@ -123,7 +123,7 @@
<para><function>sd_journal_add_conjunction()</function>
may be used to insert a conjunction (i.e. logical AND)
- in the match list. If this call is invoked all
+ in the match list. If this call is invoked, all
previously added matches since the last invocation of
<function>sd_journal_add_conjunction()</function> are
combined in an AND with all matches added afterwards,
diff --git a/man/sd_journal_get_catalog.xml b/man/sd_journal_get_catalog.xml
index 53ca308..4a7e0a1 100644
--- a/man/sd_journal_get_catalog.xml
+++ b/man/sd_journal_get_catalog.xml
@@ -80,8 +80,8 @@
field names in the catalog entry text enclosed in "@"
will be replaced by the respective field values of the
current entry. If a field name referenced in the
- message catalog entry does not exist it the current
- journal entry the "@" will be removed but the field
+ message catalog entry does not exist, in the current
+ journal entry, the "@" will be removed, but the field
name otherwise left untouched.</para>
<para><function>sd_journal_get_catalog_for_message_id()</function>
@@ -104,7 +104,7 @@
and
<function>sd_journal_get_catalog_for_message_id()</function>
return 0 on success or a negative errno-style error
- code. If no matching message catalog entry is found
+ code. If no matching message catalog entry is found,
-ENOENT is returned.</para>
<para>On successful return, <parameter>ret</parameter>
diff --git a/man/sd_journal_get_data.xml b/man/sd_journal_get_data.xml
index 460b709..0e1111e 100644
--- a/man/sd_journal_get_data.xml
+++ b/man/sd_journal_get_data.xml
@@ -179,9 +179,9 @@
<para><function>sd_journal_get_data()</function>
returns 0 on success or a negative errno-style error
code. If the current entry does not include the
- specified field -ENOENT is returned. If
+ specified field, -ENOENT is returned. If
<citerefentry><refentrytitle>sd_journal_next</refentrytitle><manvolnum>3</manvolnum></citerefentry>
- has not been called at least once -EADDRNOTAVAIL is
+ has not been called at least once, -EADDRNOTAVAIL is
returned. <function>sd_journal_enumerate_data()</function>
returns a positive integer if the next field has been
read, 0 when no more fields are known, or a negative
diff --git a/man/sd_journal_get_fd.xml b/man/sd_journal_get_fd.xml
index c4387b0..764f716 100644
--- a/man/sd_journal_get_fd.xml
+++ b/man/sd_journal_get_fd.xml
@@ -137,8 +137,8 @@
<varname>timeout_usec</varname>. See
<citerefentry><refentrytitle>clock_gettime</refentrytitle><manvolnum>2</manvolnum></citerefentry>
for details about
- <constant>CLOCK_MONOTONIC</constant>. If there's no
- timeout to wait for this will fill in
+ <constant>CLOCK_MONOTONIC</constant>. If there is no
+ timeout to wait for, this will fill in
<constant>(uint64_t) -1</constant> instead. Note that
<function>poll()</function> takes a relative timeout
in milliseconds rather than an absolute timeout in
diff --git a/man/sd_journal_get_usage.xml b/man/sd_journal_get_usage.xml
index 50953f5..180d8b2 100644
--- a/man/sd_journal_get_usage.xml
+++ b/man/sd_journal_get_usage.xml
@@ -67,7 +67,7 @@
determines the total disk space currently used by
journal files (in bytes). If
<constant>SD_JOURNAL_LOCAL_ONLY</constant> was passed
- when opening the journal this value will only reflect
+ when opening the journal, this value will only reflect
the size of journal files of the local host, otherwise
of all hosts.</para>
</refsect1>
diff --git a/man/sd_journal_open.xml b/man/sd_journal_open.xml
index 28d164a..bb3703d 100644
--- a/man/sd_journal_open.xml
+++ b/man/sd_journal_open.xml
@@ -146,7 +146,7 @@
<para>When opening the journal only journal files
accessible to the calling user will be opened. If
- journal files are not accessible to the caller this
+ journal files are not accessible to the caller, this
will be silently ignored.</para>
<para>See
diff --git a/man/sd_journal_print.xml b/man/sd_journal_print.xml
index 1437342..e61a648 100644
--- a/man/sd_journal_print.xml
+++ b/man/sd_journal_print.xml
@@ -166,7 +166,7 @@
readable representation of the current error code
stored in
<citerefentry><refentrytitle>errno</refentrytitle><manvolnum>3</manvolnum></citerefentry>. If
- the message string is passed as <constant>NULL</constant> or empty string
+ the message string is passed as <constant>NULL</constant> or empty string,
only the error string representation will be written,
prefixed with nothing. An additional journal field
ERRNO= is included in the entry containing the numeric
@@ -189,7 +189,7 @@ sd_journal_send("MESSAGE=Hello World, this is PID %lu!", (unsigned long) getpid(
<para>Note that these calls implicitly add fields for
the source file, function name and code line where
invoked. This is implemented with macros. If this is
- not desired it can be turned off by defining
+ not desired, it can be turned off by defining
SD_JOURNAL_SUPPRESS_LOCATION before including
<filename>sd-journal.h</filename>.</para>
diff --git a/man/sd_journal_seek_head.xml b/man/sd_journal_seek_head.xml
index c4e6409..03de30a 100644
--- a/man/sd_journal_seek_head.xml
+++ b/man/sd_journal_seek_head.xml
@@ -111,30 +111,30 @@
(wallclock) timestamp,
i.e. <constant>CLOCK_REALTIME</constant>. Note that
the realtime clock is not necessarily monotonic. If a
- realtime timestamp is ambiguous it is not defined
+ realtime timestamp is ambiguous, it is not defined
which position is sought to.</para>
<para><function>sd_journal_seek_cursor()</function>
seeks to the entry located at the specified cursor
- string. For details on cursors see
+ string. For details on cursors, see
<citerefentry><refentrytitle>sd_journal_get_cursor</refentrytitle><manvolnum>3</manvolnum></citerefentry>. If
no entry matching the specified cursor is found the
call will seek to the next closest entry (in terms of
time) instead. To verify whether the newly selected
- entry actually matches the cursor use
+ entry actually matches the cursor, use
<citerefentry><refentrytitle>sd_journal_test_cursor</refentrytitle><manvolnum>3</manvolnum></citerefentry>.</para>
<para>Note that these calls do not actually make any
entry the new current entry, this needs to be done in
a separate step with a subsequent
<citerefentry><refentrytitle>sd_journal_next</refentrytitle><manvolnum>3</manvolnum></citerefentry>
- invocation (or a similar call). Only then entry data
+ invocation (or a similar call). Only then, entry data
may be retrieved via
<citerefentry><refentrytitle>sd_journal_get_data</refentrytitle><manvolnum>3</manvolnum></citerefentry>. If
no entry exists that matches exactly the specified
- seek address the next closest is sought to. If
+ seek address, the next closest is sought to. If
<citerefentry><refentrytitle>sd_journal_next</refentrytitle><manvolnum>3</manvolnum></citerefentry>
- is used the closest following entry will be sought to,
+ is used, the closest following entry will be sought to,
if
<citerefentry><refentrytitle>sd_journal_previous</refentrytitle><manvolnum>3</manvolnum></citerefentry>
is used the closest preceding entry is sought
diff --git a/man/sd_listen_fds.xml b/man/sd_listen_fds.xml
index c9b3997..240300d 100644
--- a/man/sd_listen_fds.xml
+++ b/man/sd_listen_fds.xml
@@ -70,7 +70,7 @@
activation logic.</para>
<para>If the <parameter>unset_environment</parameter>
- parameter is non-zero
+ parameter is non-zero,
<function>sd_listen_fds()</function> will unset the
<varname>$LISTEN_FDS</varname>/<varname>$LISTEN_PID</varname>
environment variables before returning (regardless
@@ -83,16 +83,16 @@
<para>If a daemon receives more than one file
descriptor, they will be passed in the same order as
configured in the systemd socket definition
- file. Nonetheless it is recommended to verify the
+ file. Nonetheless, it is recommended to verify the
correct socket types before using them. To simplify
- this checking the functions
+ this checking, the functions
<citerefentry><refentrytitle>sd_is_fifo</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
<citerefentry><refentrytitle>sd_is_socket</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
<citerefentry><refentrytitle>sd_is_socket_inet</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
<citerefentry><refentrytitle>sd_is_socket_unix</refentrytitle><manvolnum>3</manvolnum></citerefentry>
- are provided. In order to maximize flexibility it is
+ are provided. In order to maximize flexibility, it is
recommended to make these checks as loose as possible
- without allowing incorrect setups. i.e. often the
+ without allowing incorrect setups. i.e. often, the
actual port number a socket is bound to matters little
for the service to work, hence it should not be
verified. On the other hand, whether a socket is a
@@ -112,7 +112,7 @@
<varname>$LISTEN_FDS</varname>/<varname>$LISTEN_PID</varname>
was not set or was not correctly set for this daemon and
hence no file descriptors were received, 0 is
- returned. Otherwise the number of file descriptors
+ returned. Otherwise, the number of file descriptors
passed is returned. The application may find them
starting with file descriptor SD_LISTEN_FDS_START,
i.e. file descriptor 3.</para>
@@ -132,11 +132,11 @@
<para>Internally, this function checks whether the
<varname>$LISTEN_PID</varname> environment variable
equals the daemon PID. If not, it returns
- immediately. Otherwise it parses the number passed in
+ immediately. Otherwise, it parses the number passed in
the <varname>$LISTEN_FDS</varname> environment
variable, then sets the FD_CLOEXEC flag for the parsed
number of file descriptors starting from
- SD_LISTEN_FDS_START. Finally it returns the parsed
+ SD_LISTEN_FDS_START. Finally, it returns the parsed
number.</para>
<para>For details about the algorithm check the
@@ -160,7 +160,7 @@
<para>If the reference implementation is used as
drop-in files and -DDISABLE_SYSTEMD is set during
- compilation this function will always return 0 and
+ compilation, this function will always return 0 and
otherwise become a NOP.</para>
</refsect1>
diff --git a/man/sd_login_monitor_new.xml b/man/sd_login_monitor_new.xml
index e93f93f..909a3d9 100644
--- a/man/sd_login_monitor_new.xml
+++ b/man/sd_login_monitor_new.xml
@@ -129,7 +129,7 @@
object. Whenever an event causes the monitor to wake
up the event loop via the file descriptor this
function needs to be called to reset the wake-up
- state. If this call is not invoked the file descriptor
+ state. If this call is not invoked, the file descriptor
will immediately wake up the event loop again.</para>
<para><function>sd_login_monitor_get_fd()</function>
@@ -167,7 +167,7 @@
<varname>timeout_usec</varname>. See
<citerefentry><refentrytitle>clock_gettime</refentrytitle><manvolnum>2</manvolnum></citerefentry>
for details about
- <constant>CLOCK_MONOTONIC</constant>. If there's no
+ <constant>CLOCK_MONOTONIC</constant>. If there is no
timeout to wait for this will fill in
<constant>(uint64_t) -1</constant> instead. Note that
<function>poll()</function> takes a relative timeout
diff --git a/man/sd_notify.xml b/man/sd_notify.xml
index fc0f2f6..55965ff 100644
--- a/man/sd_notify.xml
+++ b/man/sd_notify.xml
@@ -77,7 +77,7 @@
notification.</para>
<para>If the <parameter>unset_environment</parameter>
- parameter is non-zero <function>sd_notify()</function>
+ parameter is non-zero, <function>sd_notify()</function>
will unset the <varname>$NOTIFY_SOCKET</varname>
environment variable before returning (regardless
whether the function call itself succeeded or
@@ -197,7 +197,7 @@
errno-style error code. If
<varname>$NOTIFY_SOCKET</varname> was not set and
hence no status data could be sent, 0 is returned. If
- the status was sent these functions return with a
+ the status was sent, these functions return with a
positive return value. In order to support both, init
systems that implement this scheme and those which
do not, it is generally recommended to ignore the return
@@ -220,7 +220,7 @@
<constant>AF_UNIX</constant> socket referenced in the
<varname>$NOTIFY_SOCKET</varname> environment
variable. If the first character of
- <varname>$NOTIFY_SOCKET</varname> is <literal>@</literal> the string is
+ <varname>$NOTIFY_SOCKET</varname> is <literal>@</literal>, the string is
understood as Linux abstract namespace socket. The
datagram is accompanied by the process credentials of
the sending daemon, using SCM_CREDENTIALS.</para>
@@ -246,7 +246,7 @@
<para>If the reference implementation is used as
drop-in files and -DDISABLE_SYSTEMD is set during
- compilation these functions will always return 0 and
+ compilation, these functions will always return 0 and
otherwise become a NOP.</para>
</refsect1>
diff --git a/man/sd_pid_get_session.xml b/man/sd_pid_get_session.xml
index ecd22f7..e5c7709 100644
--- a/man/sd_pid_get_session.xml
+++ b/man/sd_pid_get_session.xml
@@ -165,14 +165,14 @@
call after use.</para>
<para>If the <varname>pid</varname> parameter of any
- of these functions is passed as 0 the operation is
+ of these functions is passed as 0, the operation is
executed for the calling process.</para>
</refsect1>
<refsect1>
<title>Return Value</title>
- <para>On success these calls return 0 or a positive
+ <para>On success, these calls return 0 or a positive
integer. On failure, these calls return a negative
errno-style error code.</para>
</refsect1>
diff --git a/man/sd_readahead.xml b/man/sd_readahead.xml
index c26d5c6..bb01bcf 100644
--- a/man/sd_readahead.xml
+++ b/man/sd_readahead.xml
@@ -142,7 +142,7 @@
details about the reference implementation see
<citerefentry><refentrytitle>sd-readahead</refentrytitle><manvolnum>3</manvolnum></citerefentry></para>
- <para>If -DDISABLE_SYSTEMD is set during compilation
+ <para>If -DDISABLE_SYSTEMD is set during compilation,
this function will always return 0 and otherwise
become a NOP.</para>
</refsect1>
diff --git a/man/sd_seat_get_active.xml b/man/sd_seat_get_active.xml
index 3c26fb1..1610d3e 100644
--- a/man/sd_seat_get_active.xml
+++ b/man/sd_seat_get_active.xml
@@ -65,7 +65,7 @@
<paramdef>const char* <parameter>seat</parameter></paramdef>
<paramdef>char*** <parameter>sessions</parameter></paramdef>
<paramdef>uid_t** <parameter>uid</parameter></paramdef>
- <paramdef>unsigned* <parameter>n_uids</parameter></paramdef>
+ <paramdef>unsigned int* <parameter>n_uids</parameter></paramdef>
</funcprototype>
<funcprototype>
@@ -133,7 +133,7 @@
<para>If the <varname>seat</varname> parameter of any
of these functions is passed as
- <constant>NULL</constant> the operation is executed
+ <constant>NULL</constant>, the operation is executed
for the seat of the session of the calling process, if
there is any.</para>
</refsect1>
@@ -146,7 +146,7 @@
returns 0 or a positive integer. On success
<function>sd_seat_get_sessions()</function> returns
the number of entries in the session identifier
- array. If the test succeeds
+ array. If the test succeeds,
<function>sd_seat_can_multi_session</function>,
<function>sd_seat_can_tty</function> and
<function>sd_seat_can_graphical</function> return a
diff --git a/man/sd_session_is_active.xml b/man/sd_session_is_active.xml
index 9362fbc..293ce71 100644
--- a/man/sd_session_is_active.xml
+++ b/man/sd_session_is_active.xml
@@ -116,7 +116,7 @@
<funcprototype>
<funcdef>int <function>sd_session_get_vt</function></funcdef>
<paramdef>const char* <parameter>session</parameter></paramdef>
- <paramdef>unsigned* <parameter>vt</parameter></paramdef>
+ <paramdef>unsigned int* <parameter>vt</parameter></paramdef>
</funcprototype>
</funcsynopsis>
</refsynopsisdiv>
@@ -217,7 +217,7 @@
<para>If the <varname>session</varname> parameter of
any of these functions is passed as
- <constant>NULL</constant> the operation is executed
+ <constant>NULL</constant>, the operation is executed
for the session the calling process is a member of, if
there is any.</para>
</refsect1>
@@ -225,7 +225,7 @@
<refsect1>
<title>Return Value</title>
- <para>If the test succeeds
+ <para>If the test succeeds,
<function>sd_session_is_active()</function> returns a
positive integer, if it fails 0. On success
<function>sd_session_get_state()</function>,
diff --git a/man/sd_uid_get_state.xml b/man/sd_uid_get_state.xml
index ba614f9..d4d23f4 100644
--- a/man/sd_uid_get_state.xml
+++ b/man/sd_uid_get_state.xml
@@ -111,7 +111,7 @@
or active on a specific seat. Accepts a Unix user
identifier and a seat identifier string as
parameters. The <parameter>require_active</parameter>
- parameter is a boolean value. If non-zero (true) this
+ parameter is a boolean value. If non-zero (true), this
function will test if the user is active (i.e. has a
session that is in the foreground and accepting user
input) on the specified seat, otherwise (false) only
@@ -133,7 +133,7 @@
<citerefentry><refentrytitle>free</refentrytitle><manvolnum>3</manvolnum></citerefentry>
call after use, including all the strings
referenced. If the string array parameter is passed as
- <constant>NULL</constant> the array will not be filled in, but the return
+ <constant>NULL</constant>, the array will not be filled in, but the return
code still indicates the number of current
sessions. Note that instead of an empty array <constant>NULL</constant> may
be returned and should be considered equivalent to an
@@ -154,7 +154,7 @@
<para>On success
<function>sd_uid_get_state()</function> returns 0 or a
- positive integer. If the test succeeds
+ positive integer. If the test succeeds,
<function>sd_uid_is_on_seat()</function> returns a
positive integer, if it fails
0. <function>sd_uid_get_sessions()</function> and
diff --git a/man/sysctl.d.xml b/man/sysctl.d.xml
index 155427c..854864c 100644
--- a/man/sysctl.d.xml
+++ b/man/sysctl.d.xml
@@ -89,10 +89,10 @@
administrator, who may use this logic to override the
configuration files installed by vendor packages. All
configuration files are sorted by their filename in
- alphabetical order, regardless in which of the
+ lexicographic order, regardless in which of the
directories they reside. If multiple files specify the
same variable name, the entry in the file with the
- alphabetically latest name will be applied. It is
+ lexicographically latest name will be applied. It is
recommended to prefix all filenames with a two-digit
number and a dash, to simplify the ordering of the
files.</para>
diff --git a/man/systemctl.xml b/man/systemctl.xml
index 1642a47..b043581 100644
--- a/man/systemctl.xml
+++ b/man/systemctl.xml
@@ -566,7 +566,7 @@ kobject-uevent 1 systemd-udevd-kernel.socket systemd-udevd.service
their configuration. Note that this will reload the
service-specific configuration, not the unit configuration
file of systemd. If you want systemd to reload the
- configuration file of a unit use the
+ configuration file of a unit, use the
<command>daemon-reload</command> command. In other words:
for the example case of Apache, this will reload Apache's
<filename>httpd.conf</filename> in the web server, not the
@@ -692,12 +692,12 @@ kobject-uevent 1 systemd-udevd-kernel.socket systemd-udevd.service
<listitem>
<para>Show properties of one or more units, jobs, or the
- manager itself. If no argument is specified properties of
- the manager will be shown. If a unit name is specified
+ manager itself. If no argument is specified, properties of
+ the manager will be shown. If a unit name is specified,
properties of the unit is shown, and if a job id is
- specified properties of the job is shown. By default, empty
+ specified, properties of the job is shown. By default, empty
properties are suppressed. Use <option>--all</option> to
- show those too. To select specific properties to show use
+ show those too. To select specific properties to show, use
<option>--property=</option>. This command is intended to be
used whenever computer-parsable output is required. Use
<command>status</command> if you are looking for formatted
@@ -1075,7 +1075,7 @@ kobject-uevent 1 systemd-udevd-kernel.socket systemd-udevd.service
<listitem>
<para>Reload systemd manager configuration. This will reload
all unit files and recreate the entire dependency
- tree. While the daemon is reloaded, all sockets systemd
+ tree. While the daemon is being reloaded, all sockets systemd
listens on on behalf of user configuration will stay
accessible.</para> <para>This command should not be confused
with the <command>load</command> or
@@ -1089,9 +1089,9 @@ kobject-uevent 1 systemd-udevd-kernel.socket systemd-udevd.service
<para>Reexecute the systemd manager. This will serialize the
manager state, reexecute the process and deserialize the
state again. This command is of little use except for
- debugging and package upgrades. Sometimes it might be
+ debugging and package upgrades. Sometimes, it might be
helpful as a heavy-weight <command>daemon-reload</command>.
- While the daemon is reexecuted, all sockets systemd listening
+ While the daemon is being reexecuted, all sockets systemd listening
on behalf of user configuration will stay accessible.
</para>
</listitem>
diff --git a/man/systemd-activate.xml b/man/systemd-activate.xml
index b62cf44..d48774d 100644
--- a/man/systemd-activate.xml
+++ b/man/systemd-activate.xml
@@ -123,8 +123,8 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
<listitem><para>Add this variable to the environment of the
launched process. If <replaceable>VAR</replaceable> is
- followed by <literal>=</literal> assume that it is a
- variable–value pair. Otherwise obtain the value from the
+ followed by <literal>=</literal>, assume that it is a
+ variable–value pair. Otherwise, obtain the value from the
environment of <command>systemd-activate</command> itself.
</para></listitem>
</varlistentry>
diff --git a/man/systemd-analyze.xml b/man/systemd-analyze.xml
index 6037709..aefbfc8 100644
--- a/man/systemd-analyze.xml
+++ b/man/systemd-analyze.xml
@@ -206,12 +206,12 @@
<command>dot</command> command (see
above), selects which dependencies are
shown in the dependency graph. If
- <option>--order</option> is passed
+ <option>--order</option> is passed,
only dependencies of type
<varname>After=</varname> or
<varname>Before=</varname> are
shown. If <option>--require</option>
- is passed only dependencies of type
+ is passed, only dependencies of type
<varname>Requires=</varname>,
<varname>RequiresOverridable=</varname>,
<varname>Requisite=</varname>,
diff --git a/man/systemd-ask-password.xml b/man/systemd-ask-password.xml
index 563f9d5..8af328d 100644
--- a/man/systemd-ask-password.xml
+++ b/man/systemd-ask-password.xml
@@ -90,7 +90,7 @@
url="http://www.freedesktop.org/wiki/Software/systemd/PasswordAgents">systemd
Password Agent Specification</ulink>.</para>
- <para>If a password is queried on a TTY the user may
+ <para>If a password is queried on a TTY, the user may
press TAB to hide the asterisks normally shown for
each character typed. Pressing Backspace as first key
achieves the same effect.</para>
@@ -145,7 +145,7 @@
<varlistentry>
<term><option>--accept-cached</option></term>
- <listitem><para>If passed accept
+ <listitem><para>If passed, accept
cached passwords, i.e. passwords
previously typed in.</para></listitem>
</varlistentry>
diff --git a/man/systemd-cat.xml b/man/systemd-cat.xml
index 876ebfa..ffb1dfd 100644
--- a/man/systemd-cat.xml
+++ b/man/systemd-cat.xml
@@ -65,11 +65,11 @@
pass the output the previous pipeline element
generates to the journal.</para>
- <para>If no parameter is passed
+ <para>If no parameter is passed,
<command>systemd-cat</command> will write
everything it reads from standard input (STDIN) to the journal.</para>
- <para>If parameters are passed they are executed as
+ <para>If parameters are passed, they are executed as
command line with standard output (STDOUT) and standard
error output (STDERR) connected to the journal, so
that all it writes is stored in the journal.</para>
@@ -102,7 +102,7 @@
<listitem><para>Specify a short string
that is used to identify the logging
- tool. If not specified no identifying
+ tool. If not specified, no identification
string is written to the journal.</para></listitem>
</varlistentry>
@@ -141,7 +141,7 @@
<listitem><para>Controls whether lines
read are parsed for syslog priority
level prefixes. If enabled (the
- default) a line prefixed with a
+ default), a line prefixed with a
priority prefix such as
<literal><5></literal> is logged
at priority 5
diff --git a/man/systemd-cgls.xml b/man/systemd-cgls.xml
index 2877f22..fcaf894 100644
--- a/man/systemd-cgls.xml
+++ b/man/systemd-cgls.xml
@@ -60,19 +60,19 @@
<para><command>systemd-cgls</command> recursively
shows the contents of the selected Linux control group
- hierarchy in a tree. If arguments are specified shows
+ hierarchy in a tree. If arguments are specified, shows
all member processes of the specified control groups
plus all their subgroups and their members. The
control groups may either be specified by their full
file paths or are assumed in the systemd control group
hierarchy. If no argument is specified and the current
working directory is beneath the control group mount
- point <filename>/sys/fs/cgroup</filename> shows the contents
+ point <filename>/sys/fs/cgroup</filename>, shows the contents
of the control group the working directory refers
- to. Otherwise the full systemd control group hierarchy
+ to. Otherwise, the full systemd control group hierarchy
is shown.</para>
- <para>By default empty control groups are not
+ <para>By default, empty control groups are not
shown.</para>
</refsect1>
diff --git a/man/systemd-cgtop.xml b/man/systemd-cgtop.xml
index e765172..0e9e5e6 100644
--- a/man/systemd-cgtop.xml
+++ b/man/systemd-cgtop.xml
@@ -79,7 +79,7 @@
group in the <literal>cpuacct</literal> hierarchy, but
not in <literal>memory</literal> nor
<literal>blkio</literal>. If resource monitoring for
- these resources is required it is recommended to add
+ these resources is required, it is recommended to add
<literal>blkio</literal> and <literal>memory</literal>
to the <varname>DefaultControllers=</varname> setting
in <filename>/etc/systemd/system.conf</filename> (see
@@ -197,8 +197,8 @@
tree traversal depth. Specifies how
deep <command>systemd-cgtop</command>
shall traverse the control group
- hierarchies. If 0 is specified only
- the root group is monitored, for 1
+ hierarchies. If 0 is specified, only
+ the root group is monitored. For 1,
only the first level of control groups
is monitored, and so on. Defaults to
3.</para></listitem>
diff --git a/man/systemd-cryptsetup-generator.xml b/man/systemd-cryptsetup-generator.xml
index 7950032..215ac2d 100644
--- a/man/systemd-cryptsetup-generator.xml
+++ b/man/systemd-cryptsetup-generator.xml
@@ -80,7 +80,7 @@
<listitem><para>Takes a boolean
argument. Defaults to
<literal>yes</literal>. If
- <literal>no</literal> disables the
+ <literal>no</literal>, disables the
generator
entirely. <varname>rd.luks=</varname>
is honored only by initial RAM disk
@@ -97,7 +97,7 @@
<listitem><para>Takes a boolean
argument. Defaults to
<literal>yes</literal>. If
- <literal>no</literal> causes the
+ <literal>no</literal>, causes the
generator to ignore any devices
configured in
<filename>/etc/crypttab</filename>
diff --git a/man/systemd-delta.xml b/man/systemd-delta.xml
index 0c7a54a..413ebd8 100644
--- a/man/systemd-delta.xml
+++ b/man/systemd-delta.xml
@@ -163,7 +163,7 @@
<listitem><para>When showing modified
files, when a file is overridden show a
diff as well. This option takes a
- boolean argument. If omitted it defaults
+ boolean argument. If omitted, it defaults
to <option>true</option>.</para></listitem>
</varlistentry>
diff --git a/man/systemd-detect-virt.xml b/man/systemd-detect-virt.xml
index f21493df..69785ce 100644
--- a/man/systemd-detect-virt.xml
+++ b/man/systemd-detect-virt.xml
@@ -75,10 +75,10 @@
<varname>lxc-libvirt</varname>,
<varname>systemd-nspawn</varname>.</para>
- <para>If multiple virtualization solutions are used
+ <para>If multiple virtualization solutions are used,
only the "innermost" is detected and identified. That
means if both VM virtualization and container
- virtualization are used in conjunction only the latter
+ virtualization are used in conjunction, only the latter
will be identified (unless <option>--vm</option> is
passed).</para>
</refsect1>
@@ -138,7 +138,7 @@
<refsect1>
<title>Exit status</title>
- <para>If a virtualization technology is detected 0 is
+ <para>If a virtualization technology is detected, 0 is
returned, a non-zero code otherwise.</para>
</refsect1>
diff --git a/man/systemd-fsck at .service.xml b/man/systemd-fsck at .service.xml
index 4d6464c..e934352 100644
--- a/man/systemd-fsck at .service.xml
+++ b/man/systemd-fsck at .service.xml
@@ -66,7 +66,7 @@
<para><filename>systemd-fsck</filename> will
forward file system checking progress to the
- console. If a file system check fails emergency mode
+ console. If a file system check fails, emergency mode
is activated, by isolating to
<filename>emergency.target</filename>.</para>
</refsect1>
diff --git a/man/systemd-fstab-generator.xml b/man/systemd-fstab-generator.xml
index 4bd25bf..9ca16c7 100644
--- a/man/systemd-fstab-generator.xml
+++ b/man/systemd-fstab-generator.xml
@@ -90,7 +90,7 @@
<listitem><para>Takes a boolean
argument. Defaults to
<literal>yes</literal>. If
- <literal>no</literal> causes the
+ <literal>no</literal>, causes the
generator to ignore any mounts or swaps
configured in
<filename>/etc/fstab</filename>. <varname>rd.fstab=</varname>
diff --git a/man/systemd-journald.service.xml b/man/systemd-journald.service.xml
index 5634dd0..2f877f5 100644
--- a/man/systemd-journald.service.xml
+++ b/man/systemd-journald.service.xml
@@ -77,7 +77,7 @@
necessary. All objects stored in the journal can be up
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/</filename> is volatile, log data is
lost at reboot. To make the data persistent, it
diff --git a/man/systemd-machine-id-setup.xml b/man/systemd-machine-id-setup.xml
index 25fb63a..fef76bc 100644
--- a/man/systemd-machine-id-setup.xml
+++ b/man/systemd-machine-id-setup.xml
@@ -69,12 +69,12 @@
initialized.</para>
<para>If a valid D-Bus machine ID is already
- configured for the system the D-Bus machine ID is
+ configured for the system, the D-Bus machine ID is
copied and used to initialize the machine ID in
<filename>/etc/machine-id</filename>.</para>
<para>If run inside a KVM virtual machine and a UUID
- is passed via the <option>-uuid</option> option this
+ is passed via the <option>-uuid</option> option, this
UUID is used to initialize the machine ID instead of a
randomly generated one. The caller must ensure that the
UUID passed is sufficiently unique and is different
diff --git a/man/systemd-notify.xml b/man/systemd-notify.xml
index b03492c..a769346 100644
--- a/man/systemd-notify.xml
+++ b/man/systemd-notify.xml
@@ -119,7 +119,7 @@
<listitem><para>Inform the init system
about the main PID of the
daemon. Takes a PID as argument. If
- the argument is omitted the PID of the
+ the argument is omitted, the PID of the
process that invoked
<command>systemd-notify</command> is
used. This is equivalent to
@@ -148,10 +148,10 @@
<listitem><para>Returns 0 if the
system was booted up with systemd,
non-zero otherwise. If this option is
- passed no message is sent. This option
+ passed, no message is sent. This option
is hence unrelated to the other
options. For details about the
- semantics of this option see
+ semantics of this option, see
<citerefentry><refentrytitle>sd_booted</refentrytitle><manvolnum>3</manvolnum></citerefentry>.</para></listitem>
</varlistentry>
diff --git a/man/systemd-nspawn.xml b/man/systemd-nspawn.xml
index 6264e48..7d450f9 100644
--- a/man/systemd-nspawn.xml
+++ b/man/systemd-nspawn.xml
@@ -151,7 +151,7 @@
containers. We hence recommend turning it off entirely
by booting with <literal>audit=0</literal> on the
kernel command line, or by turning it off at kernel
- build time. If auditing is enabled in the kernel
+ build time. If auditing is enabled in the kernel,
operating systems booted in an nspawn container might
refuse log-in attempts.</para>
</refsect1>
@@ -192,7 +192,7 @@
<listitem><para>Directory to use as
file system root for the namespace
- container. If omitted the current
+ container. If omitted, the current
directory will be
used.</para></listitem>
</varlistentry>
@@ -233,7 +233,7 @@
host, and is used to initialize the
container's hostname (which the
container can choose to override,
- however). If not specified the last
+ however). If not specified, the last
component of the root directory of the
container is used.</para></listitem>
</varlistentry>
@@ -308,7 +308,7 @@
<listitem><para>Control whether the
container's journal shall be made
- visible to the host system. If enabled
+ visible to the host system. If enabled,
allows viewing the container's journal
files from the host (but not vice
versa). Takes one of
diff --git a/man/systemd-suspend.service.xml b/man/systemd-suspend.service.xml
index 9b08f04..4abc278 100644
--- a/man/systemd-suspend.service.xml
+++ b/man/systemd-suspend.service.xml
@@ -96,7 +96,7 @@
<filename>/usr/lib/systemd/system-sleep/</filename>
are intended for local use only and should be
considered hacks. If applications want to be notified
- of system suspend/hibernation and resume there are
+ of system suspend/hibernation and resume, there are
much nicer interfaces available.</para>
<para>Note that
diff --git a/man/systemd-system.conf.xml b/man/systemd-system.conf.xml
index a67b158..c52e590 100644
--- a/man/systemd-system.conf.xml
+++ b/man/systemd-system.conf.xml
@@ -133,7 +133,7 @@
<listitem><para>Configures controllers
that shall be mounted in a single
- hierarchy. By default systemd will
+ hierarchy. By default, systemd will
mount all controllers which are
enabled in the kernel in individual
hierarchies, with the exception of
@@ -154,7 +154,7 @@
necessary to rebuild the initrd if
this option is changed, and make sure
the new configuration file is included
- in it. Otherwise the initrd might
+ in it. Otherwise, the initrd might
mount the controller hierarchies in a
different configuration than intended,
and the main system cannot remount
@@ -175,7 +175,7 @@
<literal>d</literal>,
<literal>w</literal>). If
<varname>RuntimeWatchdogSec=</varname>
- is set to a non-zero value the
+ is set to a non-zero value, the
watchdog hardware
(<filename>/dev/watchdog</filename>)
will be programmed to automatically
@@ -220,7 +220,7 @@
Capabilities listed will be included
in the bounding set, all others are
removed. If the list of capabilities
- is prefixed with ~ all but the listed
+ is prefixed with ~, all but the listed
capabilities will be included, the
effect of the assignment
inverted. Note that this option also
diff --git a/man/systemd-tmpfiles.xml b/man/systemd-tmpfiles.xml
index 403592d..281ab3c 100644
--- a/man/systemd-tmpfiles.xml
+++ b/man/systemd-tmpfiles.xml
@@ -94,7 +94,7 @@
<varlistentry>
<term><option>--create</option></term>
- <listitem><para>If this option is passed all
+ <listitem><para>If this option is passed, all
files and directories marked with f,
F, d, D in the configuration files are
created. Files and directories marked with z,
@@ -105,7 +105,7 @@
<varlistentry>
<term><option>--clean</option></term>
<listitem><para>If this option is
- passed all files and directories with
+ passed, all files and directories with
an age parameter configured will be
cleaned up.</para></listitem>
</varlistentry>
@@ -113,7 +113,7 @@
<varlistentry>
<term><option>--remove</option></term>
<listitem><para>If this option is
- passed all files and directories marked
+ passed, all files and directories marked
with r, R in the configuration files
are removed.</para></listitem>
</varlistentry>
diff --git a/man/systemd.automount.xml b/man/systemd.automount.xml
index adba75a..3410512 100644
--- a/man/systemd.automount.xml
+++ b/man/systemd.automount.xml
@@ -93,7 +93,7 @@
file systems.</para>
<para>If an automount point is beneath another mount
- point in the file system hierarchy a dependency
+ point in the file system hierarchy, a dependency
between both units is created automatically.</para>
</refsect1>
@@ -110,7 +110,7 @@
<citerefentry><refentrytitle>systemd.mount</refentrytitle><manvolnum>5</manvolnum></citerefentry>.</para>
<para>If an automount point is configured in both
- <filename>/etc/fstab</filename> and a unit file the
+ <filename>/etc/fstab</filename> and a unit file, the
configuration in the latter takes precedence.</para>
</refsect1>
@@ -129,9 +129,9 @@
<term><varname>Where=</varname></term>
<listitem><para>Takes an absolute path
of a directory of the automount
- point. If the automount point is not
- existing at time that the automount
- point is installed it is created. This
+ point. If the automount point does not
+ exist at time that the automount
+ point is installed, it is created. This
string must be reflected in the unit
filename. (See above.) This option is
mandatory.</para></listitem>
diff --git a/man/systemd.device.xml b/man/systemd.device.xml
index e3cf071..96ebe89 100644
--- a/man/systemd.device.xml
+++ b/man/systemd.device.xml
@@ -124,11 +124,11 @@
<varlistentry>
<term><varname>SYSTEMD_READY=</varname></term>
- <listitem><para>If set to 0 systemd
+ <listitem><para>If set to 0, systemd
will consider this device unplugged
even if it shows up in the udev
tree. If this property is unset or set
- to 1 the device will be considered
+ to 1, the device will be considered
plugged the moment it shows up in the
udev tree. This property has no
influence on the behavior when a
diff --git a/man/systemd.exec.xml b/man/systemd.exec.xml
index ff8b812..5721dc1 100644
--- a/man/systemd.exec.xml
+++ b/man/systemd.exec.xml
@@ -110,7 +110,7 @@
<listitem><para>Takes an absolute
directory path. Sets the working
directory for executed processes. If
- not set defaults to the root directory
+ not set, defaults to the root directory
when systemd is running as a system
instance and the respective user's
home directory if run as
@@ -125,7 +125,7 @@
directory for executed processes, with
the
<citerefentry><refentrytitle>chroot</refentrytitle><manvolnum>2</manvolnum></citerefentry>
- system call. If this is used it must
+ system call. If this is used, it must
be ensured that the process and all
its auxiliary files are available in
the <function>chroot()</function>
@@ -254,7 +254,7 @@
<term><varname>CPUSchedulingResetOnFork=</varname></term>
<listitem><para>Takes a boolean
- argument. If true elevated CPU
+ argument. If true, elevated CPU
scheduling priorities and policies
will be reset when the executed
processes fork, and can hence not leak
@@ -273,7 +273,7 @@
be specified more than once in which
case the specificed CPU affinity masks
are merged. If the empty string is
- assigned the mask is reset, all
+ assigned, the mask is reset, all
assignments prior to this will have no
effect. See
<citerefentry><refentrytitle>sched_setaffinity</refentrytitle><manvolnum>2</manvolnum></citerefentry>
@@ -301,15 +301,15 @@
option may be specified more than once
in which case all listed variables
will be set. If the same variable is
- set twice the later setting will
+ set twice, the later setting will
override the earlier setting. If the
empty string is assigned to this
- option the list of environment
+ option, the list of environment
variables is reset, all prior
assignments have no effect.
Variable expansion is not performed
inside the strings, however, specifier
- expansion is possible. $ character has
+ expansion is possible. The $ character has
no special meaning.
If you need to assign a value containing spaces
to a variable, use double quotes (")
@@ -353,7 +353,7 @@
specified more than once in which case
all specified files are read. If the
empty string is assigned to this
- option the list of file to read is
+ option, the list of file to read is
reset, all prior assignments have no
effect.</para>
@@ -364,7 +364,7 @@
with
<varname>Environment=</varname>. If
the same variable is set twice from
- these files the files will be read in
+ these files, the files will be read in
the order they are specified and the
later setting will override the
earlier setting.</para></listitem>
@@ -380,19 +380,19 @@
<option>tty-force</option>,
<option>tty-fail</option> or
<option>socket</option>. If
- <option>null</option> is selected
+ <option>null</option> is selected,
standard input will be connected to
<filename>/dev/null</filename>,
i.e. all read attempts by the process
will result in immediate EOF. If
- <option>tty</option> is selected
+ <option>tty</option> is selected,
standard input is connected to a TTY
(as configured by
<varname>TTYPath=</varname>, see
below) and the executed process
becomes the controlling process of the
terminal. If the terminal is already
- being controlled by another process the
+ being controlled by another process, the
executed process waits until the current
controlling process releases the
terminal.
@@ -414,7 +414,7 @@
file (see
<citerefentry><refentrytitle>systemd.socket</refentrytitle><manvolnum>5</manvolnum></citerefentry>
for details) specifies a single socket
- only. If this option is set standard
+ only. If this option is set, standard
input will be connected to the socket
the service was activated from, which
is primarily useful for compatibility
@@ -439,19 +439,19 @@
<option>kmsg+console</option>,
<option>journal+console</option> or
<option>socket</option>. If set to
- <option>inherit</option> the file
+ <option>inherit</option>, the file
descriptor of standard input is
duplicated for standard output. If set
- to <option>null</option> standard
+ to <option>null</option>, standard
output will be connected to
<filename>/dev/null</filename>,
i.e. everything written to it will be
- lost. If set to <option>tty</option>
+ lost. If set to <option>tty</option>,
standard output will be connected to a
tty (as configured via
<varname>TTYPath=</varname>, see
below). If the TTY is used for output
- only the executed process will not
+ only, the executed process will not
become the controlling process of the
terminal, and will not fail or wait
for other processes to release the
@@ -538,7 +538,7 @@
<listitem><para>If the terminal
device specified with
<varname>TTYPath=</varname> is a
- virtual console terminal try to
+ virtual console terminal, try to
deallocate the TTY before and after
execution. This ensures that the
screen and scrollback buffer is
@@ -549,7 +549,7 @@
<term><varname>SyslogIdentifier=</varname></term>
<listitem><para>Sets the process name
to prefix log lines sent to syslog or
- the kernel log buffer with. If not set
+ the kernel log buffer with. If not set,
defaults to the process name of the
executed process. This option is only
useful when
@@ -693,13 +693,13 @@
<varlistentry>
<term><varname>PAMName=</varname></term>
<listitem><para>Sets the PAM service
- name to set up a session as. If set
+ name to set up a session as. If set,
the executed process will be
registered as a PAM session under the
specified service name. This is only
useful in conjunction with the
<varname>User=</varname> setting. If
- not set no PAM session will be opened
+ not set, no PAM session will be opened
for the executed processes. See
<citerefentry><refentrytitle>pam</refentrytitle><manvolnum>8</manvolnum></citerefentry>
for details.</para></listitem>
@@ -708,7 +708,7 @@
<varlistentry>
<term><varname>TCPWrapName=</varname></term>
<listitem><para>If this is a
- socket-activated service this sets the
+ socket-activated service, this sets the
tcpwrap service name to check the
permission for the current connection
with. This is only useful in
@@ -718,7 +718,7 @@
socket types (e.g. datagram/UDP) and
on processes unrelated to socket-based
activation. If the tcpwrap
- verification fails daemon start-up
+ verification fails, daemon start-up
will fail and the connection is
terminated. See
<citerefentry><refentrytitle>tcpd</refentrytitle><manvolnum>8</manvolnum></citerefentry>
@@ -747,7 +747,7 @@
Capabilities listed will be included
in the bounding set, all others are
removed. If the list of capabilities
- is prefixed with <literal>~</literal>
+ is prefixed with <literal>~</literal>,
all but the listed capabilities will
be included, the effect of the
assignment inverted. Note that this
@@ -756,7 +756,7 @@
permitted and inheritable capability
sets, on top of what
<varname>Capabilities=</varname>
- does. If this option is not used the
+ does. If this option is not used, the
capability bounding set is not
modified on process execution, hence
no limits on the capabilities of the
@@ -764,11 +764,11 @@
appear more than once in which case
the bounding sets are merged. If the
empty string is assigned to this
- option the bounding set is reset to
+ option, the bounding set is reset to
the empty capability set, and all
prior settings have no effect. If set
to <literal>~</literal> (without any
- further argument) the bounding set is
+ further argument), the bounding set is
reset to the full set of available
capabilities, also undoing any
previous settings.</para></listitem>
@@ -789,7 +789,7 @@
option may appear more than once in
which case the secure bits are
ORed. If the empty string is assigned
- to this option the bits are reset to
+ to this option, the bits are reset to
0.</para></listitem>
</varlistentry>
@@ -846,7 +846,7 @@
directories listed will have limited
access from within the namespace. If
the empty string is assigned to this
- option the specific list is reset, and
+ option, the specific list is reset, and
all prior assignments have no
effect.</para>
<para>Paths in
@@ -863,7 +863,7 @@
<term><varname>PrivateTmp=</varname></term>
<listitem><para>Takes a boolean
- argument. If true sets up a new file
+ argument. If true, sets up a new file
system namespace for the executed
processes and mounts private
<filename>/tmp</filename> and
@@ -886,7 +886,7 @@
<term><varname>PrivateNetwork=</varname></term>
<listitem><para>Takes a boolean
- argument. If true sets up a new
+ argument. If true, sets up a new
network namespace for the executed
processes and configures only the
loopback network device
@@ -928,7 +928,7 @@
entries must be created and cleared
before and after execution. If the
configured string is longer than four
- characters it is truncated and the
+ characters, it is truncated and the
terminal four characters are
used. This setting interprets %I style
string replacements. This setting is
@@ -976,11 +976,11 @@
termination with the
<constant>SIGSYS</constant> signal
(whitelisting). If the first character
- of the list is <literal>~</literal>
+ of the list is <literal>~</literal>,
the effect is inverted: only the
listed system calls will result in
immediate process termination
- (blacklisting). If this option is used
+ (blacklisting). If this option is used,
<varname>NoNewPrivileges=yes</varname>
is implied. This feature makes use of
the Secure Computing Mode 2 interfaces
@@ -997,7 +997,7 @@
option may be specified more than once
in which case the filter masks are
merged. If the empty string is
- assigned the filter is reset, all
+ assigned, the filter is reset, all
prior assignments will have no
effect.</para></listitem>
</varlistentry>
diff --git a/man/systemd.kill.xml b/man/systemd.kill.xml
index ab3d28f..1b10fba 100644
--- a/man/systemd.kill.xml
+++ b/man/systemd.kill.xml
@@ -94,16 +94,16 @@
<option>none</option>.</para>
<para>If set to
- <option>control-group</option> all
+ <option>control-group</option>, all
remaining processes in the control
group of this unit will be terminated
on unit stop (for services: after the
stop command is executed, as
configured with
<varname>ExecStop=</varname>). If set
- to <option>process</option> only the
+ to <option>process</option>, only the
main process itself is killed. If set
- to <option>none</option> no process is
+ to <option>none</option>, no process is
killed. In this case only the stop
command will be executed on unit
stop, but no process be killed
diff --git a/man/systemd.mount.xml b/man/systemd.mount.xml
index 9aac94e..e5b5c3c 100644
--- a/man/systemd.mount.xml
+++ b/man/systemd.mount.xml
@@ -151,7 +151,7 @@
<citerefentry><refentrytitle>systemd.automount</refentrytitle><manvolnum>5</manvolnum></citerefentry>
for details. If
<option>x-systemd.device-timeout=</option> is
- specified it may be used to configure how long systemd
+ specified, it may be used to configure how long systemd
should wait for a device to show up before giving up
on an entry from
<filename>/etc/fstab</filename>. Specify a time in
@@ -161,9 +161,9 @@
<para>If a mount point is configured in both
<filename>/etc/fstab</filename> and a unit file that
- is stored below <filename>/usr</filename> the former
+ is stored below <filename>/usr</filename>, the former
will take precedence. If the unit file is stored below
- <filename>/etc</filename> it will take
+ <filename>/etc</filename>, it will take
precedence. This means: native unit files take
precedence over traditional configuration files, but
this is superseded by the rule that configuration in
diff --git a/man/systemd.path.xml b/man/systemd.path.xml
index 8c782b8..8d86fca 100644
--- a/man/systemd.path.xml
+++ b/man/systemd.path.xml
@@ -120,7 +120,7 @@
<varname>PathExists=</varname> may be
used to watch the mere existence of a
file or directory. If the file
- specified exists the configured unit
+ specified exists, the configured unit
is
activated. <varname>PathExistsGlob=</varname>
works similar, but checks for the
@@ -151,7 +151,7 @@
combined, of the same and of different
types, to watch multiple paths. If the
empty string is assigned to any of
- these options the list of paths to
+ these options, the list of paths to
watch is reset, and any prior
assignments of these options will not
have any effect.</para>
@@ -199,7 +199,7 @@
<term><varname>MakeDirectory=</varname></term>
<listitem><para>Takes a boolean
- argument. If true the directories to
+ argument. If true, the directories to
watch are created before
watching. This option is ignored for
<varname>PathExists=</varname>
@@ -211,7 +211,7 @@
<listitem><para>If
<varname>MakeDirectory=</varname> is
- enabled use the mode specified here to
+ enabled, use the mode specified here to
create the directories in
question. Takes an access mode in
octal notation. Defaults to
diff --git a/man/systemd.preset.xml b/man/systemd.preset.xml
index 8af7d40..16db8cd 100644
--- a/man/systemd.preset.xml
+++ b/man/systemd.preset.xml
@@ -86,7 +86,7 @@
<para>If no preset files exist, <command>systemctl
preset</command> will enable all units that are
installed by default. If this is not desired and all
- units shall rather be disabled it is necessary to ship
+ units shall rather be disabled, it is necessary to ship
a preset file with a single, catchall
"<filename>disable *</filename>" line. (See example 1,
below.)</para>
@@ -125,10 +125,10 @@
<filename>/etc/</filename> are reserved for the local
administrator, who may use this logic to override the
preset files installed by vendor packages. All preset
- files are sorted by their filename in alphabetical
+ files are sorted by their filename in lexicographic
order, regardless in which of the directories they
reside. If multiple files specify the same unit name,
- the entry in the file with the alphabetically earliest
+ the entry in the file with the lexicographically earliest
name will be applied. It is recommended to prefix all
filenames with a two-digit number and a dash, to simplify
the ordering of the files.</para>
diff --git a/man/systemd.service.xml b/man/systemd.service.xml
index 1eb5f39..8eda85f 100644
--- a/man/systemd.service.xml
+++ b/man/systemd.service.xml
@@ -140,13 +140,13 @@
<para>If set to
<option>simple</option> (the default
value if <varname>BusName=</varname>
- is not specified) it is expected that
+ is not specified), it is expected that
the process configured with
<varname>ExecStart=</varname> is the
main process of the service. In this
mode, if the process offers
functionality to other processes on
- the system its communication channels
+ the system, its communication channels
should be installed before the daemon
is started up (e.g. sockets set up by
systemd, via socket activation), as
@@ -154,14 +154,14 @@
starting follow-up units.</para>
<para>If set to
- <option>forking</option> it is
+ <option>forking</option>, it is
expected that the process configured
with <varname>ExecStart=</varname>
will call <function>fork()</function>
as part of its start-up. The parent process is
expected to exit when start-up is
complete and all communication
- channels set up. The child continues
+ channels are set up. The child continues
to run as the main daemon
process. This is the behavior of
traditional UNIX daemons. If this
@@ -210,7 +210,7 @@
starting up. systemd will proceed
starting follow-up units after this
notification message has been sent. If
- this option is used
+ this option is used,
<varname>NotifyAccess=</varname> (see
below) should be set to open access to
the notification socket provided by
@@ -220,7 +220,7 @@
<option>main</option>. Note that
currently
<varname>Type=</varname><option>notify</option>
- won't work if used in combination with
+ will not work if used in combination with
<varname>PrivateNetwork=</varname><option>yes</option>.</para>
<para>Behavior of
@@ -262,7 +262,7 @@
guessing algorithm might come to
incorrect conclusions if a daemon
consists of more than one process. If
- the main PID cannot be determined
+ the main PID cannot be determined,
failure detection and automatic
restarting of a service will not work
reliably. Defaults to
@@ -327,7 +327,7 @@
<filename>.desktop</filename> files.
Lone semicolons may be escaped as
<literal>\;</literal>. If the empty
- string is assigned to this option the
+ string is assigned to this option, the
list of commands to start is reset,
prior assignments of this option will
have no effect.</para>
@@ -383,19 +383,19 @@
executed process, followed by the
further arguments specified. If the
absolute filename is prefixed with
- <literal>-</literal> an exit code of
+ <literal>-</literal>, an exit code of
the command normally considered a
failure (i.e. non-zero exit status or
abnormal exit due to signal) is ignored
and considered success. If both
<literal>-</literal> and
- <literal>@</literal> are used they
+ <literal>@</literal> are used, they
can appear in either order.</para>
<para>Note that this setting does not
directly support shell command
lines. If shell command lines are to
- be used they need to be passed
+ be used, they need to be passed
explicitly to a shell implementation
of some kind. Example:</para>
<programlisting>ExecStart=/bin/sh -c 'dmesg | tac'
@@ -471,7 +471,7 @@
<varname>KillMode=</varname> setting
(see
<citerefentry><refentrytitle>systemd.kill</refentrytitle><manvolnum>5</manvolnum></citerefentry>). If
- this option is not specified the
+ this option is not specified, the
process is terminated right-away when
service stop is requested. Specifier
and environment variable substitution
@@ -567,11 +567,11 @@
regularly with "WATCHDOG=1" (i.e. the
"keep-alive ping"). If the time
between two such calls is larger than
- the configured time then the service
+ the configured time, then the service
is placed in a failure state. By
setting <varname>Restart=</varname> to
<option>on-failure</option> or
- <option>always</option> the service
+ <option>always</option>, the service
will be automatically restarted. The
time configured here will be passed to
the executed service process in the
@@ -580,7 +580,7 @@
daemons to automatically enable the
keep-alive pinging logic if watchdog
support is enabled for the service. If
- this option is used
+ this option is used,
<varname>NotifyAccess=</varname> (see
below) should be set to open access to
the notification socket provided by
@@ -621,9 +621,9 @@
<option>on-watchdog</option>,
<option>on-abort</option>, or
<option>always</option>. If set to
- <option>no</option> (the default) the
+ <option>no</option> (the default), the
service will not be restarted. If set to
- <option>on-success</option> it will be
+ <option>on-success</option>, it will be
restarted only when the service process
exits cleanly.
In this context, a clean exit means
@@ -631,7 +631,7 @@
<constant>SIGHUP</constant>, <constant>SIGINT</constant>, <constant>SIGTERM</constant>, or <constant>SIGPIPE</constant>, and
additionally, exit statuses and signals
specified in <varname>SuccessExitStatus=</varname>.
- If set to <option>on-failure</option>
+ If set to <option>on-failure</option>,
the service will be restarted when the
process exits with an nonzero exit code,
is terminated by a signal (including on
@@ -639,17 +639,17 @@
service reload) times out, and when the
configured watchdog timeout is triggered.
If set to
- <option>on-abort</option> the service
+ <option>on-abort</option>, the service
will be restarted only if the service
process exits due to an uncaught
signal not specified as a clean exit
status.
If set to
- <option>on-watchdog</option> the service
+ <option>on-watchdog</option>, the service
will be restarted only if the watchdog
timeout for the service expires.
If set to
- <option>always</option> the service
+ <option>always</option>, the service
will be restarted regardless whether
it exited cleanly or not, got
terminated abnormally by a signal or
@@ -682,7 +682,7 @@
appear more than once in which case
the list of successful exit statuses
is merged. If the empty string is
- assigned to this option the list is
+ assigned to this option, the list is
reset, all prior assignments of this
option will have no
effect.</para></listitem>
@@ -712,7 +712,7 @@
option may appear more than once in
which case the list of restart preventing
statuses is merged. If the empty
- string is assigned to this option the
+ string is assigned to this option, the
list is reset, all prior assignments
of this option will have no
effect.</para></listitem>
@@ -790,13 +790,13 @@
<option>none</option> (the default),
<option>main</option> or
<option>all</option>. If
- <option>none</option> no daemon status
+ <option>none</option>, no daemon status
updates are accepted from the service
processes, all status update messages
- are ignored. If <option>main</option>
+ are ignored. If <option>main</option>,
only service updates sent from the
main process of the service are
- accepted. If <option>all</option> all
+ accepted. If <option>all</option>, all
services updates from all members of
the service's control group are
accepted. This option should be set to
@@ -805,8 +805,8 @@
<varname>Type=notify</varname> or
<varname>WatchdogSec=</varname> (see
above). If those options are used but
- <varname>NotifyAccess=</varname> not
- configured it will be implicitly set
+ <varname>NotifyAccess=</varname> is not
+ configured, it will be implicitly set
to
<option>main</option>.</para></listitem>
</varlistentry>
@@ -841,7 +841,7 @@
<para>This option may appear more than
once, in which case the list of socket
units is merged. If the empty string
- is assigned to this option the list of
+ is assigned to this option, the list of
sockets is reset, all prior uses of
this setting will have no
effect.</para></listitem>
@@ -852,12 +852,12 @@
<term><varname>StartLimitBurst=</varname></term>
<listitem><para>Configure service
- start rate limiting. By default
+ start rate limiting. By default,
services which are started more often
than 5 times within 10s are not
permitted to start any more times
until the 10s interval ends. With
- these two options this rate limiting
+ these two options, this rate limiting
may be modified. Use
<varname>StartLimitInterval=</varname>
to configure the checking interval
diff --git a/man/systemd.socket.xml b/man/systemd.socket.xml
index 1fc28c5..419a38c 100644
--- a/man/systemd.socket.xml
+++ b/man/systemd.socket.xml
@@ -96,7 +96,7 @@
<filename>foo.socket</filename> needs a matching
service <filename>foo.service</filename> if
<option>Accept=false</option> is set. If
- <option>Accept=true</option> is set a service template
+ <option>Accept=true</option> is set, a service template
file <filename>foo at .service</filename> must exist from
which services are instantiated for each incoming
connection.</para>
@@ -164,17 +164,17 @@
family.</para>
<para>If the address starts with an at
- symbol (<literal>@</literal>) it is read as abstract
+ symbol (<literal>@</literal>), it is read as abstract
namespace socket in the
<constant>AF_UNIX</constant>
family. The <literal>@</literal> is
replaced with a
<constant>NUL</constant> character
- before binding. For details see
+ before binding. For details, see
<citerefentry><refentrytitle>unix</refentrytitle><manvolnum>7</manvolnum></citerefentry>.</para>
<para>If the address string is a
- single number it is read as port
+ single number, it is read as port
number to listen on via
IPv6. Depending on the value of
<varname>BindIPv6Only=</varname> (see below) this
@@ -184,13 +184,13 @@
</para>
<para>If the address string is a
- string in the format v.w.x.y:z it is
+ string in the format v.w.x.y:z, it is
read as IPv4 specifier for listening
on an address v.w.x.y on a port
z.</para>
<para>If the address string is a
- string in the format [x]:y it is read
+ string in the format [x]:y, it is read
as IPv6 address x on a port y. Note
that this might make the service
available via IPv4, too, depending on
@@ -303,7 +303,7 @@
<option>ipv6-only</option>, they will
be accessible via IPv6 only. If
<option>default</option> (which is the
- default, surprise!) the system wide
+ default, surprise!), the system wide
default setting is used, as controlled
by
<filename>/proc/sys/net/ipv6/bindv6only</filename>,
@@ -330,7 +330,7 @@
<term><varname>BindToDevice=</varname></term>
<listitem><para>Specifies a network
interface name to bind this socket
- to. If set traffic will only be
+ to. If set, traffic will only be
accepted from the specified network
interfaces. This controls the
SO_BINDTODEVICE socket option (see
diff --git a/man/systemd.special.xml b/man/systemd.special.xml
index 4d06607..863a029 100644
--- a/man/systemd.special.xml
+++ b/man/systemd.special.xml
@@ -939,7 +939,7 @@
<varname>Wants=</varname> type
dependency. If the unit wants
to be pulled in by the first
- remote mount showing up it
+ remote mount showing up, it
should use
<filename>network-online.target</filename>
(see above).</para>
@@ -1012,7 +1012,7 @@
manager should start this
unit. If systemd receives
<constant>SIGTERM</constant> or <constant>SIGINT</constant> when running
- as user service daemon it will
+ as user service daemon, it will
start this unit.</para>
<para>Normally, this pulls in
diff --git a/man/systemd.swap.xml b/man/systemd.swap.xml
index 5e339ea..18ef5b0 100644
--- a/man/systemd.swap.xml
+++ b/man/systemd.swap.xml
@@ -114,7 +114,7 @@
for details about the conversion.</para>
<para>If a swap device or file is configured in both
- <filename>/etc/fstab</filename> and a unit file the
+ <filename>/etc/fstab</filename> and a unit file, the
configuration in the latter takes precedence.</para>
<para>Unless the <option>noauto</option> option is set
@@ -175,7 +175,7 @@
<listitem><para>Configures the time to
wait for the swapon command to
finish. If a command does not exit
- within the configured time the swap
+ within the configured time, the swap
will be considered failed and be shut
down again. All commands still running
will be terminated forcibly via
diff --git a/man/systemd.time.xml b/man/systemd.time.xml
index 3d13b57..f438fa5 100644
--- a/man/systemd.time.xml
+++ b/man/systemd.time.xml
@@ -157,7 +157,7 @@
time span. Correspondingly, a time span that is prefixed
with <literal>-</literal> is evaluated to the current
time minus the specified time span. Instead of
- prefixing the time span with <literal>-</literal> it
+ prefixing the time span with <literal>-</literal>, it
may also be suffixed with a space and the word
<literal>ago</literal>.</para>
@@ -231,7 +231,7 @@
<para>Either time or date specification may be
omitted, in which case the current day and 00:00:00 is
implied, respectively. If the second component is not
- specified <literal>:00</literal> is assumed.</para>
+ specified, <literal>:00</literal> is assumed.</para>
<para>Timezone names may not be specified.</para>
diff --git a/man/systemd.timer.xml b/man/systemd.timer.xml
index fa67d59..659bc81 100644
--- a/man/systemd.timer.xml
+++ b/man/systemd.timer.xml
@@ -128,7 +128,7 @@
combined of the same and of different
types. For example, by combining
<varname>OnBootSec=</varname> and
- <varname>OnUnitActiveSec=</varname> it is
+ <varname>OnUnitActiveSec=</varname>, it is
possible to define a timer that
elapses in regular intervals and
activates a specific service each
diff --git a/man/systemd.unit.xml b/man/systemd.unit.xml
index 1714157..d61426a 100644
--- a/man/systemd.unit.xml
+++ b/man/systemd.unit.xml
@@ -126,9 +126,9 @@
<para>Unit files may contain additional options on top
of those listed here. If systemd encounters an unknown
- option it will write a warning log message but
+ option, it will write a warning log message but
continue loading the unit. If an option is prefixed
- with <option>X-</option> it is ignored completely by
+ with <option>X-</option>, it is ignored completely by
systemd. Applications may use this to include
additional information in the unit files.</para>
@@ -136,7 +136,7 @@
written in various formats. For positive settings the
strings <option>1</option>, <option>yes</option>,
<option>true</option> and <option>on</option> are
- equivalent. For negative settings the strings
+ equivalent. For negative settings, the strings
<option>0</option>, <option>no</option>,
<option>false</option> and <option>off</option> are
equivalent.</para>
@@ -160,14 +160,14 @@
space character. This may be used to wrap long lines.</para>
<para>Along with a unit file
- <filename>foo.service</filename> the directory
+ <filename>foo.service</filename>, the directory
<filename>foo.service.wants/</filename> may exist. All
unit files symlinked from such a directory are
implicitly added as dependencies of type
<varname>Wanted=</varname> to the unit. This is useful
to hook units into the start-up of other units,
without having to modify their unit files. For details
- about the semantics of <varname>Wanted=</varname> see
+ about the semantics of <varname>Wanted=</varname>, see
below. The preferred way to create symlinks in the
<filename>.wants/</filename> directory of a unit file
is with the <command>enable</command> command of the
@@ -179,7 +179,7 @@
<filename>.requires/</filename> in this case.</para>
<para>Along with a unit file
- <filename>foo.service</filename> a directory
+ <filename>foo.service</filename>, a directory
<filename>foo.service.d/</filename> may exist. All
files with the suffix <literal>.conf</literal> from
this directory will be parsed after the file itself is
@@ -206,7 +206,7 @@
file system namespace. Example: a device unit
<filename>dev-sda.device</filename> refers to a device
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
result is usable as part of a filename. Basically,
given a path, "/" is replaced by "-", and all
@@ -219,7 +219,7 @@
<para>Optionally, units may be instantiated from a
template file at runtime. This allows creation of
multiple units from a single configuration file. If
- systemd looks for a unit configuration file it will
+ systemd looks for a unit configuration file, it will
first search for the literal unit name in the
filesystem. If that yields no success and the unit
name contains an <literal>@</literal> character, systemd will look for a
@@ -238,7 +238,7 @@
configuration options. See below for details.</para>
<para>If a unit file is empty (i.e. has the file size
- 0) or is symlinked to <filename>/dev/null</filename>
+ 0) or is symlinked to <filename>/dev/null</filename>,
its configuration will not be loaded and it appears
with a load state of <literal>masked</literal>, and
cannot be activated. Use this as an effective way to
@@ -461,7 +461,7 @@
the start-up was pulled in indirectly
by some dependency or automatic
start-up of units that is not
- requested by the user this dependency
+ requested by the user, this dependency
must be fulfilled and otherwise the
transaction fails. Hence, this option
may be used to configure dependencies
@@ -624,7 +624,7 @@
type <varname>After=</varname> or
<varname>Before=</varname>. If two
units have no ordering dependencies
- between them they are shut down
+ between them, they are shut down
or started up simultaneously, and
no ordering takes
place. </para></listitem>
@@ -672,12 +672,12 @@
<term><varname>OnFailureIsolate=</varname></term>
<listitem><para>Takes a boolean
- argument. If <option>true</option> the
+ argument. If <option>true</option>, the
unit listed in
<varname>OnFailure=</varname> will be
enqueued in isolation mode, i.e. all
units that are not its dependency will
- be stopped. If this is set only a
+ be stopped. If this is set, only a
single unit may be listed in
<varname>OnFailure=</varname>. Defaults
to
@@ -688,7 +688,7 @@
<term><varname>IgnoreOnIsolate=</varname></term>
<listitem><para>Takes a boolean
- argument. If <option>true</option>
+ argument. If <option>true</option>,
this unit will not be stopped when
isolating another unit. Defaults to
<option>false</option>.</para></listitem>
@@ -698,7 +698,7 @@
<term><varname>IgnoreOnSnapshot=</varname></term>
<listitem><para>Takes a boolean
- argument. If <option>true</option>
+ argument. If <option>true</option>,
this unit will not be included in
snapshots. Defaults to
<option>true</option> for device and
@@ -710,7 +710,7 @@
<term><varname>StopWhenUnneeded=</varname></term>
<listitem><para>Takes a boolean
- argument. If <option>true</option>
+ argument. If <option>true</option>,
this unit will be stopped when it is
no longer used. Note that in order to
minimize the work to be executed,
@@ -729,10 +729,10 @@
<term><varname>RefuseManualStop=</varname></term>
<listitem><para>Takes a boolean
- argument. If <option>true</option>
+ argument. If <option>true</option>,
this unit can only be activated
or deactivated indirectly. In
- this case explicit start-up
+ this case, explicit start-up
or termination requested by the
user is denied, however if it is
started or stopped as a
@@ -752,10 +752,10 @@
<term><varname>AllowIsolate=</varname></term>
<listitem><para>Takes a boolean
- argument. If <option>true</option>
+ argument. If <option>true</option>,
this unit may be used with the
<command>systemctl isolate</command>
- command. Otherwise this will be
+ command. Otherwise, this will be
refused. It probably is a good idea to
leave this disabled except for target
units that shall be used similar to
@@ -769,7 +769,7 @@
<term><varname>DefaultDependencies=</varname></term>
<listitem><para>Takes a boolean
- argument. If <option>true</option>
+ argument. If <option>true</option>,
(the default), a few default
dependencies will implicitly be
created for the unit. The actual
@@ -799,7 +799,7 @@
<listitem><para>When clients are
waiting for a job of this unit to
complete, time out after the specified
- time. If this time limit is reached
+ time. If this time limit is reached,
the job will be cancelled, the unit
however will not change state or even
enter the <literal>failed</literal>
@@ -841,7 +841,7 @@
<listitem><para>Before starting a unit
verify that the specified condition is
- true. If it is not true the starting
+ true. If it is not true, the starting
of the unit will be skipped, however
all ordering dependencies of it are
still respected. A failing condition
@@ -856,7 +856,7 @@
a file existence condition is
checked before a unit is started. If
the specified absolute path name does
- not exist the condition will
+ not exist, the condition will
fail. If the absolute path name passed
to
<varname>ConditionPathExists=</varname>
@@ -966,7 +966,7 @@
<varname>systemd-nspawn</varname> to
test against a specific
implementation. If multiple
- virtualization technologies are nested
+ virtualization technologies are nested,
only the innermost is considered. The
test may be negated by prepending an
exclamation mark.</para>
@@ -1016,12 +1016,12 @@
battery powered at the time of
activation of the unit. This takes a
boolean argument. If set to
- <varname>true</varname> the condition
+ <varname>true</varname>, the condition
will hold only if at least one AC
connector of the system is connected
to a power source, or if no AC
connectors are known. Conversely, if
- set to <varname>false</varname> the
+ set to <varname>false</varname>, the
condition will hold only if there is
at least one AC connector known and
all AC connectors are disconnected
@@ -1032,30 +1032,30 @@
be used to add a constant condition
check value to the unit. It takes a
boolean argument. If set to
- <varname>false</varname> the condition
+ <varname>false</varname>, the condition
will always fail, otherwise
succeed.</para>
<para>If multiple conditions are
- specified the unit will be executed if
+ specified, the unit will be executed if
all of them apply (i.e. a logical AND
is applied). Condition checks can be
prefixed with a pipe symbol (|) in
which case a condition becomes a
triggering condition. If at least one
triggering condition is defined for a
- unit then the unit will be executed if
+ unit, then the unit will be executed if
at least one of the triggering
conditions apply and all of the
non-triggering conditions. If you
prefix an argument with the pipe
- symbol and an exclamation mark the
+ symbol and an exclamation mark, the
pipe symbol must be passed first, the
exclamation second. Except for
<varname>ConditionPathIsSymbolicLink=</varname>,
all path checks follow symlinks. If
any of these options is assigned the
- empty string the list of conditions is
+ empty string, the list of conditions is
reset completely, all previous
condition settings (of any kind) will
have no effect.</para></listitem>
diff --git a/man/systemd.xml b/man/systemd.xml
index 47d6438..97ef768 100644
--- a/man/systemd.xml
+++ b/man/systemd.xml
@@ -136,7 +136,7 @@
<term><option>--unit=</option></term>
<listitem><para>Set default unit to
- activate on startup. If not specified
+ activate on startup. If not specified,
defaults to
<filename>default.target</filename>.</para></listitem>
</varlistentry>
@@ -233,7 +233,7 @@
<listitem><para>Highlight important
log messages. Argument is a boolean
- value. If the argument is omitted it
+ value. If the argument is omitted, it
defaults to
<option>true</option>.</para></listitem>
</varlistentry>
@@ -429,7 +429,7 @@
<filename>multi-user.target</filename> (for limited
console-only boots for use in embedded or server
environments, or similar; a subset of
- graphical.target). However it is at the discretion of
+ graphical.target). However, it is at the discretion of
the administrator to configure it as an alias to any
other target unit. See
<citerefentry><refentrytitle>systemd.special</refentrytitle><manvolnum>7</manvolnum></citerefentry>
@@ -1030,9 +1030,9 @@
<term><varname>systemd.dump_core=</varname></term>
<listitem><para>Takes a boolean
- argument. If <option>true</option>
+ argument. If <option>true</option>,
systemd dumps core when it
- crashes. Otherwise no core dump is
+ crashes. Otherwise, no core dump is
created. Defaults to
<option>true</option>.</para></listitem>
</varlistentry>
@@ -1041,9 +1041,9 @@
<term><varname>systemd.crash_shell=</varname></term>
<listitem><para>Takes a boolean
- argument. If <option>true</option>
+ argument. If <option>true</option>,
systemd spawns a shell when it
- crashes. Otherwise no shell is
+ crashes. Otherwise, no shell is
spawned. Defaults to
<option>false</option>, for security
reasons, as the shell is not protected
@@ -1065,7 +1065,7 @@
<term><varname>systemd.confirm_spawn=</varname></term>
<listitem><para>Takes a boolean
- argument. If <option>true</option>
+ argument. If <option>true</option>,
asks for confirmation when spawning
processes. Defaults to
<option>false</option>.</para></listitem>
@@ -1075,7 +1075,7 @@
<term><varname>systemd.show_status=</varname></term>
<listitem><para>Takes a boolean
- argument. If <option>true</option>
+ argument. If <option>true</option>,
shows terse service status updates on
the console during bootup. Defaults to
<option>true</option>, unless
diff --git a/man/timedatectl.xml b/man/timedatectl.xml
index 9aade29..be0ad3f 100644
--- a/man/timedatectl.xml
+++ b/man/timedatectl.xml
@@ -122,10 +122,10 @@
<listitem><para>If
<command>set-local-rtc</command> is
- invoked and this option is passed the
+ invoked and this option is passed, the
system clock is synchronized from the
RTC again, taking the new setting into
- account. Otherwise the RTC is
+ account. Otherwise, the RTC is
synchronized from the system
clock.</para></listitem>
</varlistentry>
@@ -161,7 +161,7 @@
timezones can be listed with
<command>list-timezones</command>. If
the RTC is configured to be in the
- local time this will also update the
+ local time, this will also update the
RTC time. This call will alter the
<filename>/etc/localtime</filename>
symlink. See
@@ -184,17 +184,17 @@
<term><command>set-local-rtc [BOOL]</command></term>
<listitem><para>Takes a boolean
- argument. If <literal>0</literal> the
+ argument. If <literal>0</literal>, the
system is configured to maintain the
- RTC in universal time, if
- <literal>1</literal> it will maintain
+ RTC in universal time. If
+ <literal>1</literal>, it will maintain
the RTC in local time instead. Note
that maintaining the RTC in the local
timezone is not fully supported and
will create various problems with time
zone changes and daylight saving
- adjustments. If at all possible use
- RTC in UTC. Note that invoking this
+ adjustments. If at all possible, keep the
+ RTC in UTC mode. Note that invoking this
will also synchronize the RTC from the
system clock, unless
<option>--adjust-system-clock</option> is
diff --git a/man/tmpfiles.d.xml b/man/tmpfiles.d.xml
index 2872cc0..cdc87c9 100644
--- a/man/tmpfiles.d.xml
+++ b/man/tmpfiles.d.xml
@@ -79,14 +79,14 @@
administrator, who may use this logic to override the
configuration files installed by vendor packages. All
configuration files are sorted by their filename in
- alphabetical order, regardless in which of the
+ lexicographic order, regardless in which of the
directories they reside. If multiple files specify the
- same path, the entry in the file with the alphabetically
+ same path, the entry in the file with the lexicographically
earliest name will be applied, all all other conflicting
entries logged as errors.</para>
<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
<filename>/dev/null</filename> in
<filename>/etc/tmpfiles.d/</filename> bearing the
@@ -238,10 +238,10 @@ L /tmp/foobar - - - - /dev/null</programlisting>
<para>The file access mode to use when
creating this file or directory. If omitted or
- when set to - the default is used: 0755 for
+ when set to -, the default is used: 0755 for
directories, 0644 for all other file
- objects. For z, Z lines if omitted or when set
- to - the file access mode will not be
+ objects. For z, Z lines, if omitted or when set
+ to -, the file access mode will not be
modified. This parameter is ignored for x, r,
R, L lines.</para>
</refsect2>
@@ -252,8 +252,8 @@ L /tmp/foobar - - - - /dev/null</programlisting>
<para>The user and group to use for this file
or directory. This may either be a numeric
user/group ID or a user or group name. If
- omitted or when set to - the default 0 (root)
- is used. For z, Z lines when omitted or when set to -
+ omitted or when set to -, the default 0 (root)
+ is used. For z, Z lines, when omitted or when set to -,
the file ownership will not be modified.
These parameters are ignored for x, r, R, L lines.</para>
</refsect2>
@@ -263,7 +263,7 @@ L /tmp/foobar - - - - /dev/null</programlisting>
<para>The date field, when set, is used to
decide what files to delete when cleaning. If
a file or directory is older than the current
- time minus the age field it is deleted. The
+ time minus the age field, it is deleted. The
field format is a series of integers each
followed by one of the following
postfixes for the respective time units:</para>
@@ -280,7 +280,7 @@ L /tmp/foobar - - - - /dev/null</programlisting>
<term><varname>us</varname></term></varlistentry>
</variablelist>
- <para>If multiple integers and units are specified the time
+ <para>If multiple integers and units are specified, the time
values are summed up. If an integer is given without a unit,
s is assumed.
</para>
@@ -289,11 +289,11 @@ L /tmp/foobar - - - - /dev/null</programlisting>
unconditionally.</para>
<para>The age field only applies to lines starting with
- d, D and x. If omitted or set to - no automatic clean-up
+ d, D and x. If omitted or set to -, no automatic clean-up
is done.</para>
<para>If the age field starts with a tilde
- character (~) the clean-up is only applied to
+ character (~), the clean-up is only applied to
files and directories one level inside the
directory specified, but not the files and
directories immediately inside it.</para>
--
1.8.2
More information about the systemd-devel
mailing list