[systemd-commits] 4 commits - man/binfmt.d.xml man/daemon.xml man/halt.xml man/hostnamectl.xml man/journalctl.xml man/journald.conf.xml man/loginctl.xml man/sd_booted.xml man/sd_bus_message_get_cookie.xml man/sd_bus_request_name.xml man/sd-daemon.xml man/sd_get_seats.xml man/sd_id128_get_machine.xml man/sd_id128_randomize.xml man/sd_id128_to_string.xml man/sd_is_fifo.xml man/sd_journal_add_match.xml man/sd_journal_get_catalog.xml man/sd_journal_get_cursor.xml man/sd_journal_get_cutoff_realtime_usec.xml man/sd_journal_get_data.xml man/sd_journal_get_fd.xml man/sd_journal_get_realtime_usec.xml man/sd_journal_get_usage.xml man/sd_journal_next.xml man/sd_journal_print.xml man/sd_journal_query_unique.xml man/sd_journal_seek_head.xml man/sd_journal_stream_fd.xml man/sd-journal.xml man/sd_listen_fds.xml man/sd_login_monitor_new.xml man/sd-login.xml man/sd_notify.xml man/sd_pid_get_session.xml man/sd_readahead.xml man/sd-readahead.xml man/sd_seat_get_active.xml man/sd_session_is_active.xml man/sd_uid _get_state.xml man/sd_watchdog_enabled.xml man/shutdown.xml man/sysctl.d.xml man/systemctl.xml man/systemd-analyze.xml man/systemd-ask-password.xml man/systemd-cat.xml man/systemd-cgls.xml man/systemd-cgtop.xml man/systemd-coredumpctl.xml man/systemd-delta.xml man/systemd.device.xml man/systemd.exec.xml man/systemd-getty-generator.xml man/systemd-halt.service.xml man/systemd-machine-id-setup.xml man/systemd.mount.xml man/systemd-networkd.service.xml man/systemd-notify.xml man/systemd.preset.xml man/systemd.service.xml man/systemd.socket.xml man/systemd.special.xml man/systemd.swap.xml man/systemd.timer.xml man/systemd-tmpfiles.xml man/systemd-tty-ask-password-agent.xml man/systemd.unit.xml man/systemd.xml man/telinit.xml man/timedatectl.xml man/tmpfiles.d.xml man/udev.xml TODO
Zbigniew Jędrzejewski-Szmek
zbyszek at kemper.freedesktop.org
Wed Dec 25 19:48:54 PST 2013
TODO | 13 +++--------
man/binfmt.d.xml | 4 +--
man/daemon.xml | 2 -
man/halt.xml | 2 -
man/hostnamectl.xml | 2 -
man/journalctl.xml | 6 ++---
man/journald.conf.xml | 2 -
man/loginctl.xml | 2 -
man/sd-daemon.xml | 6 ++---
man/sd-journal.xml | 2 -
man/sd-login.xml | 4 +--
man/sd-readahead.xml | 2 -
man/sd_booted.xml | 4 +--
man/sd_bus_message_get_cookie.xml | 12 +++++-----
man/sd_bus_request_name.xml | 28 ++++++++++++------------
man/sd_get_seats.xml | 10 ++++----
man/sd_id128_get_machine.xml | 2 -
man/sd_id128_randomize.xml | 2 -
man/sd_id128_to_string.xml | 2 -
man/sd_is_fifo.xml | 6 ++---
man/sd_journal_add_match.xml | 2 -
man/sd_journal_get_catalog.xml | 2 -
man/sd_journal_get_cursor.xml | 2 -
man/sd_journal_get_cutoff_realtime_usec.xml | 2 -
man/sd_journal_get_data.xml | 2 -
man/sd_journal_get_fd.xml | 2 -
man/sd_journal_get_realtime_usec.xml | 2 -
man/sd_journal_get_usage.xml | 2 -
man/sd_journal_next.xml | 6 ++---
man/sd_journal_print.xml | 2 -
man/sd_journal_query_unique.xml | 2 -
man/sd_journal_seek_head.xml | 4 +--
man/sd_journal_stream_fd.xml | 2 -
man/sd_listen_fds.xml | 6 ++---
man/sd_login_monitor_new.xml | 8 +++----
man/sd_notify.xml | 6 ++---
man/sd_pid_get_session.xml | 2 -
man/sd_readahead.xml | 2 -
man/sd_seat_get_active.xml | 6 ++---
man/sd_session_is_active.xml | 4 +--
man/sd_uid_get_state.xml | 8 +++----
man/sd_watchdog_enabled.xml | 16 +++++++-------
man/shutdown.xml | 2 -
man/sysctl.d.xml | 4 +--
man/systemctl.xml | 18 +++++++--------
man/systemd-analyze.xml | 2 -
man/systemd-ask-password.xml | 2 -
man/systemd-cat.xml | 2 -
man/systemd-cgls.xml | 2 -
man/systemd-cgtop.xml | 2 -
man/systemd-coredumpctl.xml | 2 -
man/systemd-delta.xml | 2 -
man/systemd-getty-generator.xml | 4 +--
man/systemd-halt.service.xml | 2 -
man/systemd-machine-id-setup.xml | 4 +--
man/systemd-networkd.service.xml | 8 +++----
man/systemd-notify.xml | 2 -
man/systemd-tmpfiles.xml | 2 -
man/systemd-tty-ask-password-agent.xml | 2 -
man/systemd.device.xml | 4 +--
man/systemd.exec.xml | 4 +--
man/systemd.mount.xml | 2 -
man/systemd.preset.xml | 4 +--
man/systemd.service.xml | 6 ++---
man/systemd.socket.xml | 4 +--
man/systemd.special.xml | 2 -
man/systemd.swap.xml | 2 -
man/systemd.timer.xml | 20 ++++++++---------
man/systemd.unit.xml | 32 ++++++++++++++--------------
man/systemd.xml | 2 -
man/telinit.xml | 2 -
man/timedatectl.xml | 2 -
man/tmpfiles.d.xml | 4 +--
man/udev.xml | 12 +++++-----
74 files changed, 181 insertions(+), 186 deletions(-)
New commits:
commit 8b8f259170e35b93e6c6d1757cb8b835bbdaa40c
Author: Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl>
Date: Wed Dec 25 22:53:09 2013 -0500
Trim TODO
diff --git a/TODO b/TODO
index 3005289..0069a92 100644
--- a/TODO
+++ b/TODO
@@ -84,8 +84,8 @@ Features:
* refuse boot if /etc/os-release is missing or /etc/machine-id cannot be set up
-* given that logind/machined now let PID 1 do all nasty work, we can
- probably reduce the capability set they retain substantially.
+* given that logind now lets PID 1 do all nasty work, we can
+ probably reduce the capability set it retains substantially.
* btrfs raid assembly: some .device jobs stay stuck in the queue
@@ -292,7 +292,6 @@ Features:
- journal: sanely deal with entries which are larger than the individual file size, but where the components would fit
- Replace utmp, wtmp, btmp, and lastlog completely with journal
- journalctl: instead --after-cursor= maybe have a --cursor=XYZ+1 syntax?
- - journalctl: support -M to read journal of containers and determine journal directory from root directory of container
- tmpfiles: when applying ownership to /run/log/journal, also do this for the journal fails contained in it
- when a kernel driver logs in a tight loop, we should ratelimit that too.
- journald: optionally, log debug messages to /run but everything else to /var
@@ -306,11 +305,9 @@ Features:
hence doing this via signals is not going to work.
* document:
- - document that deps in [Unit] sections ignore Alias= fileds in
+ - document that deps in [Unit] sections ignore Alias= fields in
[Install] units of other units, unless those units are disabled
- man: clarify that time-sync.target is not only sysv compat but also useful otherwise. Same for similar targets
- - Document word splitting syntax for ExecStart= and friends
- - document that units from /etc override those from /usr and /run
- document the exit codes when services fail before they are exec()ed
- document that service reload may be implemented as service reexec
- document in wiki how to map ical recurrence events to systemd timer unit calendar specifications
@@ -340,7 +337,7 @@ Features:
- rework wait filter to not require match callback
- better error message if you run systemctl without systemd running
- systemctl status output should should include list of triggering units and their status
- - in systemctl list-timers show time trggering units ran last
+ - in systemctl list-timers show time triggering units ran last
* unit install:
- "systemctl mask" should find all names by which a unit is accessible
@@ -518,8 +515,6 @@ Features:
- kill scsi_id
- add trigger --subsystem-match=usb/usb_device device
-* cleanup syslog 'priority' vs. 'level' wording
-
* when a service has the same env var set twice we actually store it twice and return that in systemctl show -p... We should only show the last setting
* introduce mix of BindTo and Requisite
commit e0e009c067aa7237f9683c46e5845bbb11ec67c2
Author: Jan Engelhardt <jengelh at inai.de>
Date: Thu Dec 26 02:47:45 2013 +0100
man: grammar and wording improvements
This is a recurring submission and includes corrections to:
- missing words, preposition choice.
- change of /lib to /usr/lib, because that is what most distros are
using as the system-wide location for systemd/udev files.
diff --git a/man/daemon.xml b/man/daemon.xml
index 7790420..1fe4546 100644
--- a/man/daemon.xml
+++ b/man/daemon.xml
@@ -408,7 +408,7 @@
description files.</para>
<para>In systemd, if the developer or
- administrator wants to make sure a service or
+ administrator wants to make sure that a service or
other unit is activated automatically on boot,
it is recommended to place a symlink to the
unit file in the <filename>.wants/</filename>
diff --git a/man/journalctl.xml b/man/journalctl.xml
index 6a97210..55474c5 100644
--- a/man/journalctl.xml
+++ b/man/journalctl.xml
@@ -119,7 +119,7 @@
<para>When outputing to a tty, lines are colored
according to priority: lines of level ERROR and higher
are colored red; lines of level NOTICE and higher are
- highlighted; and other lines are displayed normally.
+ highlighted; other lines are displayed normally.
</para>
</refsect1>
@@ -232,7 +232,7 @@
<term><option>-r</option></term>
<term><option>--reverse</option></term>
- <listitem><para>Reverse output so the newest
+ <listitem><para>Reverse output so that the newest
entries are displayed first.</para></listitem>
</varlistentry>
diff --git a/man/sd_bus_message_get_cookie.xml b/man/sd_bus_message_get_cookie.xml
index 0e3c4ba..bf403a2 100644
--- a/man/sd_bus_message_get_cookie.xml
+++ b/man/sd_bus_message_get_cookie.xml
@@ -85,7 +85,7 @@
field.</para>
<para>Both functions take a message object as first
- parameter and a place to store the 64bit cookie
+ parameter and a place to store the 64-bit cookie
in.</para>
</refsect1>
@@ -97,7 +97,7 @@
errno-style error code.</para>
<para>On success, the cookie/reply cookie is returned
- in the specified 64bit unsigned integer variable.</para>
+ in the specified 64-bit unsigned integer variable.</para>
</refsect1>
<refsect1>
@@ -122,7 +122,7 @@
been sent yet and hence has no cookie
assigned, or that the message is not a
method response message and hence
- carries to reply cookie
+ carries a reply cookie
field.</para></listitem>
</varlistentry>
</variablelist>
diff --git a/man/sd_bus_request_name.xml b/man/sd_bus_request_name.xml
index c84b0b6..7393fdd 100644
--- a/man/sd_bus_request_name.xml
+++ b/man/sd_bus_request_name.xml
@@ -81,7 +81,7 @@
<term><varname>SD_BUS_NAME_ALLOW_REPLACEMENT</varname></term>
<listitem><para>After acquiring the
- name successuflly, permit other peers
+ name successfully, permit other peers
to take over the name when they try to
acquire it with the
<varname>SD_BUS_NAME_REPLACE_EXISTING</varname>
@@ -95,10 +95,10 @@
<varlistentry>
<term><varname>SD_BUS_NAME_REPLACE_EXISTING</varname></term>
- <listitem><para>Take over a the name
- if it is already acquired by a another
- peer, and that other peer permitted
- taking it over by setting
+ <listitem><para>Take over the name
+ if it is already acquired by another
+ peer, and that other peer has permitted
+ takeover by setting
<varname>SD_BUS_NAME_ALLOW_REPLACEMENT</varname>
while acquiring it.</para></listitem>
</varlistentry>
@@ -106,8 +106,8 @@
<varlistentry>
<term><varname>SD_BUS_NAME_QUEUE</varname></term>
- <listitem><para>Queue name
- acquisition when the name is already
+ <listitem><para>Queue the acquisition
+ of the name when the name is already
taken.</para></listitem>
</varlistentry>
</variablelist>
@@ -165,7 +165,7 @@
<varlistentry>
<term><varname>-ESRCH</varname></term>
- <listitem><para>It was attemted to
+ <listitem><para>It was attempted to
release a name that is currently not
registered on the
bus.</para></listitem>
@@ -174,7 +174,7 @@
<varlistentry>
<term><varname>-EADDRINUSE</varname></term>
- <listitem><para>It was attemted to
+ <listitem><para>It was attempted to
release a name that is owned by a
different peer on the
bus.</para></listitem>
@@ -199,7 +199,7 @@
<listitem><para>The bus connection has
been created in a different process
- than the current.</para></listitem>
+ than the current one.</para></listitem>
</varlistentry>
</variablelist>
</refsect1>
diff --git a/man/sd_is_fifo.xml b/man/sd_is_fifo.xml
index 4bb2236..58cd1c9 100644
--- a/man/sd_is_fifo.xml
+++ b/man/sd_is_fifo.xml
@@ -165,7 +165,7 @@
called to check whether the specified file descriptor
refers to a special file. If the
<parameter>path</parameter> parameter is not
- <constant>NULL</constant>, it is checked whether file
+ <constant>NULL</constant>, it is checked whether the file
descriptor is bound to the specified file
name. Special files in this context are character
device nodes and files in <filename>/proc</filename>
diff --git a/man/systemctl.xml b/man/systemctl.xml
index 7c9ffc8..250866a 100644
--- a/man/systemctl.xml
+++ b/man/systemctl.xml
@@ -194,8 +194,8 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
<term><option>--job-mode=</option></term>
<listitem>
- <para>When queuing a new job, control how to deal with already
- queued jobs. Takes one of <literal>fail</literal>,
+ <para>When queuing a new job, this option controls how to deal with
+ already queued jobs. It takes one of <literal>fail</literal>,
<literal>replace</literal>,
<literal>replace-irreversibly</literal>,
<literal>isolate</literal>,
@@ -543,7 +543,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
<term><command>list-sockets <optional><replaceable>PATTERN</replaceable>...</optional></command></term>
<listitem>
- <para>List socket units ordered by the listening address.
+ <para>List socket units ordered by listening address.
If one or more <replaceable>PATTERN</replaceable>s are
specified, only socket units matching one of them are
shown. Produces output similar to
@@ -692,7 +692,7 @@ kobject-uevent 1 systemd-udevd-kernel.socket systemd-udevd.service
<listitem>
<para>Check whether any of the specified units are active
(i.e. running). Returns an exit code 0 if at least one is
- active, non-zero otherwise. Unless <option>--quiet</option>
+ active, or non-zero otherwise. Unless <option>--quiet</option>
is specified, this will also print the current unit state to
STDOUT.</para>
</listitem>
diff --git a/man/systemd-networkd.service.xml b/man/systemd-networkd.service.xml
index 6c65fba..908354c 100644
--- a/man/systemd-networkd.service.xml
+++ b/man/systemd-networkd.service.xml
@@ -64,8 +64,8 @@
<para>Network configurations applied before networkd is started
are not removed, and configuration applied by networkd are not
removed when networkd exits. This ensures restarting networkd
- does not cut the network connection, and in particular that it
- is safe to transition between the initrd and the real root,
+ does not cut the network connection, and, in particular, that
+ it is safe to transition between the initrd and the real root,
and back.</para>
</refsect1>
@@ -80,10 +80,10 @@
identical filenames replace each other. Files in
<filename>/etc</filename> have the highest priority, files in
<filename>/run</filename> take precedence over files with the same
- name in <filename>/lib</filename>. This can be used to override a
+ name in <filename>/usr/lib</filename>. This can be used to override a
system-supplied configuration file with a local file if needed; a symlink in
<filename>/etc</filename> with the same name as a configuration file in
- <filename>/lib</filename>, pointing to <filename>/dev/null</filename>,
+ <filename>/usr/lib</filename>, pointing to <filename>/dev/null</filename>,
disables the configuration file entirely.</para>
<refsect2><title>Virtual Network Devices</title>
diff --git a/man/systemd.device.xml b/man/systemd.device.xml
index fa7074a..619fe19 100644
--- a/man/systemd.device.xml
+++ b/man/systemd.device.xml
@@ -149,7 +149,7 @@
even if it shows up in the udev
tree. If this property is unset or set
to 1, the device will be considered
- plugged if it visible in the
+ plugged if it is visible in the
udev tree. This property has no
influence on the behavior when a
device disappears from the udev
diff --git a/man/systemd.exec.xml b/man/systemd.exec.xml
index 2778497..17748d4 100644
--- a/man/systemd.exec.xml
+++ b/man/systemd.exec.xml
@@ -847,7 +847,7 @@
processes and mounts private
<filename>/tmp</filename> and
<filename>/var/tmp</filename>
- directories inside it that are not
+ directories inside it that is not
shared by processes outside of the
namespace. This is useful to secure
access to temporary files of the
@@ -857,7 +857,7 @@
<filename>/var/tmp</filename>
impossible. All temporary data created
by service will be removed after
- service is stopped. Defaults to
+ the service is stopped. Defaults to
false. Note that it is possible to run
two or more units within the same
private <filename>/tmp</filename> and
diff --git a/man/systemd.service.xml b/man/systemd.service.xml
index 8e6c205..5afeffa 100644
--- a/man/systemd.service.xml
+++ b/man/systemd.service.xml
@@ -427,7 +427,7 @@
<programlisting>ExecStart=/bin/sh -c 'dmesg | tac'
</programlisting>
- <para>Only select environment variables
+ <para>Only select environment variables that
are set for executed commands. See
<citerefentry><refentrytitle>systemd.exec</refentrytitle><manvolnum>5</manvolnum></citerefentry>.
</para>
diff --git a/man/systemd.timer.xml b/man/systemd.timer.xml
index 7143f9f..bb3a6d1 100644
--- a/man/systemd.timer.xml
+++ b/man/systemd.timer.xml
@@ -165,8 +165,8 @@
assignments will have no
effect.</para>
- <para>Note that timers are not
- necessarily expired at the precise
+ <para>Note that timers do not
+ necessarily expire at the precise
time configured with these settings,
as they are subject to the
<varname>AccuracySec=</varname>
@@ -187,8 +187,8 @@
<varname>OnActiveSec=</varname> and
related settings.</para>
- <para>Note that timers are not
- necessarily expired at the precise
+ <para>Note that timers do not
+ necessarily expire at the precise
time configured with this setting,
as it is subject to the
<varname>AccuracySec=</varname>
@@ -201,7 +201,7 @@
<listitem><para>Specify the accuracy
the timer shall elapse with. Defaults
to 1min. The timer is scheduled to
- expire within a time window starting
+ elapse within a time window starting
with the time specified in
<varname>OnCalendar=</varname>,
<varname>OnActiveSec=</varname>,
diff --git a/man/systemd.unit.xml b/man/systemd.unit.xml
index 0244570..487827c 100644
--- a/man/systemd.unit.xml
+++ b/man/systemd.unit.xml
@@ -548,7 +548,7 @@
of units. When systemd stops or restarts
the units listed here, the action is
propagated to this unit.
- Note that this is a one way dependency —
+ Note that this is a one-way dependency —
changes to this unit do not affect the
listed units.
</para></listitem>
diff --git a/man/udev.xml b/man/udev.xml
index bd071e1..32a520e 100644
--- a/man/udev.xml
+++ b/man/udev.xml
@@ -63,10 +63,10 @@
regardless of the directories in which they live. However, files with
identical filenames replace each other. Files in <filename>/etc</filename>
have the highest priority, files in <filename>/run</filename> take precedence
- over files with the same name in <filename>/lib</filename>. This can be
+ over files with the same name in <filename>/usr/lib</filename>. This can be
used to override a system-supplied rules file with a local file if needed;
a symlink in <filename>/etc</filename> with the same name as a rules file in
- <filename>/lib</filename>, pointing to <filename>/dev/null</filename>,
+ <filename>/usr/lib</filename>, pointing to <filename>/dev/null</filename>,
disables the rules file entirely. Rule files must have the extension
<filename>.rules</filename>; other extensions are ignored.</para>
@@ -715,10 +715,10 @@
regardless of the directories in which they live. However, files with
identical filenames replace each other. Files in <filename>/etc</filename>
have the highest priority, files in <filename>/run</filename> take precedence
- over files with the same name in <filename>/lib</filename>. This can be
+ over files with the same name in <filename>/usr/lib</filename>. This can be
used to override a system-supplied hwdb file with a local file if needed;
a symlink in <filename>/etc</filename> with the same name as a hwdb file in
- <filename>/lib</filename>, pointing to <filename>/dev/null</filename>,
+ <filename>/usr/lib</filename>, pointing to <filename>/dev/null</filename>,
disables the hwdb file entirely. hwdb files must have the extension
<filename>.hwdb</filename>; other extensions are ignored.</para>
@@ -754,10 +754,10 @@
regardless of the directories in which they live. However, files with
identical filenames replace each other. Files in <filename>/etc</filename>
have the highest priority, files in <filename>/run</filename> take precedence
- over files with the same name in <filename>/lib</filename>. This can be
+ over files with the same name in <filename>/usr/lib</filename>. This can be
used to override a system-supplied link file with a local file if needed;
a symlink in <filename>/etc</filename> with the same name as a link file in
- <filename>/lib</filename>, pointing to <filename>/dev/null</filename>,
+ <filename>/usr/lib</filename>, pointing to <filename>/dev/null</filename>,
disables the link file entirely.</para>
<para>The link file contains a <literal>[Match]</literal> section, which
commit b040723ea412209e0edf54647fa5aa4287411507
Author: Jan Engelhardt <jengelh at inai.de>
Date: Thu Dec 26 02:47:44 2013 +0100
man: improvements to comma placement
This is a recurring submission and includes corrections to:
comma placement.
diff --git a/man/halt.xml b/man/halt.xml
index 2a13d3c..f54a864 100644
--- a/man/halt.xml
+++ b/man/halt.xml
@@ -148,7 +148,7 @@
<refsect1>
<title>Exit status</title>
- <para>On success 0 is returned, a non-zero failure
+ <para>On success, 0 is returned, a non-zero failure
code otherwise.</para>
</refsect1>
diff --git a/man/hostnamectl.xml b/man/hostnamectl.xml
index 29914b8..4bc05f5 100644
--- a/man/hostnamectl.xml
+++ b/man/hostnamectl.xml
@@ -255,7 +255,7 @@
<refsect1>
<title>Exit status</title>
- <para>On success 0 is returned, a non-zero failure
+ <para>On success, 0 is returned, a non-zero failure
code otherwise.</para>
</refsect1>
diff --git a/man/journalctl.xml b/man/journalctl.xml
index 2de7252..6a97210 100644
--- a/man/journalctl.xml
+++ b/man/journalctl.xml
@@ -691,7 +691,7 @@
matching <replaceable>GLOB</replaceable>
instead of the default runtime and
system journal paths. May be specified
- multiple times, in which case, files will
+ multiple times, in which case files will
be suitably interleaved.</para></listitem>
</varlistentry>
diff --git a/man/sd-daemon.xml b/man/sd-daemon.xml
index 74fe435..ed85deb 100644
--- a/man/sd-daemon.xml
+++ b/man/sd-daemon.xml
@@ -83,7 +83,7 @@
<citerefentry><refentrytitle>sd_booted</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
<citerefentry><refentrytitle>sd_is_fifo</refentrytitle><manvolnum>3</manvolnum></citerefentry>
for more information about the functions
- implemented. In addition to these functions a couple
+ implemented. In addition to these functions, a couple
of logging prefixes are defined as macros:</para>
<programlisting>#define SD_EMERG "<0>" /* system is unusable */
@@ -135,7 +135,7 @@
implementation. See the respective function man pages
for details.</para>
- <para>In addition, for details about the algorithms
+ <para>In addition, for details about the algorithms,
check the liberally licensed reference implementation
sources:
<ulink url="http://cgit.freedesktop.org/systemd/systemd/plain/src/libsystemd-daemon/sd-daemon.c"/>
diff --git a/man/sd-readahead.xml b/man/sd-readahead.xml
index f8a0a0b..bcc46b2 100644
--- a/man/sd-readahead.xml
+++ b/man/sd-readahead.xml
@@ -83,7 +83,7 @@
reference implementation. See the respective function
man pages for details.</para>
- <para>In addition, for details about the algorithms
+ <para>In addition, for details about the algorithms,
check the liberally licensed reference implementation
sources:
<ulink url="http://cgit.freedesktop.org/systemd/systemd/plain/src/readahead/sd-readahead.c"/>
diff --git a/man/sd_booted.xml b/man/sd_booted.xml
index 6f8cc95..1e38d2a 100644
--- a/man/sd_booted.xml
+++ b/man/sd_booted.xml
@@ -106,7 +106,7 @@
file. Alternatively, applications consuming these APIs
may copy the implementation into their source
tree. For more details about the reference
- implementation see
+ implementation, see
<citerefentry><refentrytitle>sd-daemon</refentrytitle><manvolnum>3</manvolnum></citerefentry>.</para>
<para>If the reference implementation is used as
diff --git a/man/sd_bus_message_get_cookie.xml b/man/sd_bus_message_get_cookie.xml
index db344bf..0e3c4ba 100644
--- a/man/sd_bus_message_get_cookie.xml
+++ b/man/sd_bus_message_get_cookie.xml
@@ -78,7 +78,7 @@
<para><function>sd_bus_message_get_reply_cookie()</function>
returns the transaction cookie of the message the
specified message is a response to. When a reply
- message is generated for a method call message its
+ message is generated for a method call message, its
cookie is copied over into this field. Note that while
every message that is transferred is identified by a
cookie, only response messages carry a reply cookie
@@ -96,7 +96,7 @@
integer. On failure, these calls return a negative
errno-style error code.</para>
- <para>On success the cookie/reply cookie is returned
+ <para>On success, the cookie/reply cookie is returned
in the specified 64bit unsigned integer variable.</para>
</refsect1>
diff --git a/man/sd_bus_request_name.xml b/man/sd_bus_request_name.xml
index 7fae7be..c84b0b6 100644
--- a/man/sd_bus_request_name.xml
+++ b/man/sd_bus_request_name.xml
@@ -87,7 +87,7 @@
<varname>SD_BUS_NAME_REPLACE_EXISTING</varname>
flag set. If
<varname>SD_BUS_NAME_ALLOW_REPLACEMENT</varname>
- is not set on the original request
+ is not set on the original request,
such a request by other peers will be
denied.</para></listitem>
</varlistentry>
@@ -125,10 +125,10 @@
errno-style error code.</para>
<para>If <varname>SD_BUS_NAME_QUEUE</varname> is
- specified <function>sd_bus_request_name()</function>
+ specified, <function>sd_bus_request_name()</function>
will return 0 when the name is already taken by
another peer and the client has been added to the
- queue for the name. In that case the caller can
+ queue for the name. In that case, the caller can
subscribe to <literal>NameOwnerChanged</literal>
signals to be notified when the name is successfully
acquired. <function>sd_bus_request_name()</function>
diff --git a/man/sd_get_seats.xml b/man/sd_get_seats.xml
index 1e55af3..f0e7655 100644
--- a/man/sd_get_seats.xml
+++ b/man/sd_get_seats.xml
@@ -107,7 +107,7 @@
<refsect1>
<title>Return Value</title>
- <para>On success <function>sd_get_seats()</function>,
+ <para>On success, <function>sd_get_seats()</function>,
<function>sd_get_sessions()</function>,
<function>sd_get_uids()</function> and
<function>sd_get_machine_names()</function> return the
diff --git a/man/sd_is_fifo.xml b/man/sd_is_fifo.xml
index 5e79453..4bb2236 100644
--- a/man/sd_is_fifo.xml
+++ b/man/sd_is_fifo.xml
@@ -214,7 +214,7 @@
file. Alternatively, applications consuming these APIs
may copy the implementation into their source
tree. For more details about the reference
- implementation see
+ implementation, see
<citerefentry><refentrytitle>sd-daemon</refentrytitle><manvolnum>3</manvolnum></citerefentry>.</para>
<para>These functions continue to work as described,
diff --git a/man/sd_listen_fds.xml b/man/sd_listen_fds.xml
index aaabdbf..6a9e082 100644
--- a/man/sd_listen_fds.xml
+++ b/man/sd_listen_fds.xml
@@ -155,7 +155,7 @@
file. Alternatively, applications consuming these APIs
may copy the implementation into their source
tree. For more details about the reference
- implementation see
+ implementation, see
<citerefentry><refentrytitle>sd-daemon</refentrytitle><manvolnum>3</manvolnum></citerefentry>.</para>
<para>If the reference implementation is used as
diff --git a/man/sd_login_monitor_new.xml b/man/sd_login_monitor_new.xml
index f439d3e..14ff241 100644
--- a/man/sd_login_monitor_new.xml
+++ b/man/sd_login_monitor_new.xml
@@ -198,13 +198,13 @@ else {
<refsect1>
<title>Return Value</title>
- <para>On success
+ <para>On success,
<function>sd_login_monitor_new()</function>,
<function>sd_login_monitor_flush()</function> and
<function>sd_login_monitor_get_timeout()</function>
- return 0 or a positive integer. On success
+ return 0 or a positive integer. On success,
<function>sd_login_monitor_get_fd()</function> returns
- a Unix file descriptor. On success
+ a Unix file descriptor. On success,
<function>sd_login_monitor_get_events()</function>
returns a combination of <constant>POLLIN</constant>,
<constant>POLLOUT</constant> and suchlike. On failure,
diff --git a/man/sd_notify.xml b/man/sd_notify.xml
index cd4a437..d21820f 100644
--- a/man/sd_notify.xml
+++ b/man/sd_notify.xml
@@ -245,7 +245,7 @@
<constant>libsystemd-daemon</constant>Â <citerefentry><refentrytitle>pkg-config</refentrytitle><manvolnum>1</manvolnum></citerefentry>
file. Alternatively, applications consuming these APIs
may copy the implementation into their source tree. For
- more details about the reference implementation see
+ more details about the reference implementation, see
<citerefentry><refentrytitle>sd-daemon</refentrytitle><manvolnum>3</manvolnum></citerefentry>.</para>
<para>If the reference implementation is used as
diff --git a/man/sd_readahead.xml b/man/sd_readahead.xml
index bb01bcf..9827299 100644
--- a/man/sd_readahead.xml
+++ b/man/sd_readahead.xml
@@ -139,7 +139,7 @@
<filename>sd-readahead.h</filename> files. It is
recommended that applications consuming this API copy
the implementation into their source tree. For more
- details about the reference implementation see
+ details about the reference implementation, see
<citerefentry><refentrytitle>sd-readahead</refentrytitle><manvolnum>3</manvolnum></citerefentry></para>
<para>If -DDISABLE_SYSTEMD is set during compilation,
diff --git a/man/sd_seat_get_active.xml b/man/sd_seat_get_active.xml
index 23d582d..c64ba13 100644
--- a/man/sd_seat_get_active.xml
+++ b/man/sd_seat_get_active.xml
@@ -143,9 +143,9 @@
<refsect1>
<title>Return Value</title>
- <para> On success
+ <para> On success,
<function>sd_seat_get_active()</function>
- returns 0 or a positive integer. On success
+ 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,
diff --git a/man/sd_session_is_active.xml b/man/sd_session_is_active.xml
index d1f1a34..bff6b04 100644
--- a/man/sd_session_is_active.xml
+++ b/man/sd_session_is_active.xml
@@ -270,7 +270,7 @@
<para>If the test succeeds,
<function>sd_session_is_active()</function> and
<function>sd_session_is_remote()</function> return a
- positive integer, if it fails 0. On success
+ positive integer; if it fails, 0. On success,
<function>sd_session_get_state()</function>,
<function>sd_session_get_uid()</function>,
<function>sd_session_get_seat()</function>,
diff --git a/man/sd_uid_get_state.xml b/man/sd_uid_get_state.xml
index 0faa765..30b254c 100644
--- a/man/sd_uid_get_state.xml
+++ b/man/sd_uid_get_state.xml
@@ -152,11 +152,11 @@
<refsect1>
<title>Return Value</title>
- <para>On success
+ <para>On success,
<function>sd_uid_get_state()</function> returns 0 or a
positive integer. If the test succeeds,
<function>sd_uid_is_on_seat()</function> returns a
- positive integer, if it fails
+ positive integer; if it fails,
0. <function>sd_uid_get_sessions()</function> and
<function>sd_uid_get_seats()</function> return the
number of entries in the returned arrays. On failure,
diff --git a/man/sd_watchdog_enabled.xml b/man/sd_watchdog_enabled.xml
index 5b0d7e2..cad92df 100644
--- a/man/sd_watchdog_enabled.xml
+++ b/man/sd_watchdog_enabled.xml
@@ -80,7 +80,7 @@
inherited by child processes.</para>
<para>If the <parameter>usec</parameter> parameter is
- non-NULL <function>sd_watchdog_enabled()</function>
+ non-NULL, <function>sd_watchdog_enabled()</function>
will return the timeout in µs for the watchdog
logic. The service manager will usually terminate a
service when it did not get a notification message
@@ -94,7 +94,7 @@
<literal>WATCHDOG=1</literal>.</para>
<para>To enable service supervision with the watchdog
- logic use <varname>WatchdogSec=</varname> in service
+ logic, use <varname>WatchdogSec=</varname> in service
files. See
<citerefentry><refentrytitle>systemd.service</refentrytitle><manvolnum>5</manvolnum></citerefentry>
for details.</para>
@@ -107,7 +107,7 @@
errno-style error code. If the service manager expects
watchdog keep-alive notification messages to be sent,
> 0 is returned, otherwise 0 is returned. Only if
- the return value is > 0 the
+ the return value is > 0, the
<parameter>usec</parameter> parameter is valid after
the call.</para>
</refsect1>
@@ -129,10 +129,10 @@
variable. The call will ignore these variables if
<varname>$WATCHDOG_PID</varname> does containe the PID
of the current process, under the assumption that in
- that case the variables were set for a different
+ that case, the variables were set for a different
process further up the process tree.</para>
- <para>For details about the algorithm check the
+ <para>For details about the algorithm, check the
liberally licensed reference implementation sources:
<ulink url="http://cgit.freedesktop.org/systemd/systemd/plain/src/libsystemd-daemon/sd-daemon.c"/>
and <ulink
@@ -148,7 +148,7 @@
file. Alternatively, applications consuming these APIs
may copy the implementation into their source
tree. For more details about the reference
- implementation see
+ implementation, see
<citerefentry><refentrytitle>sd-daemon</refentrytitle><manvolnum>3</manvolnum></citerefentry>.</para>
<para>If the reference implementation is used as
diff --git a/man/shutdown.xml b/man/shutdown.xml
index 795fb66..27e7e87 100644
--- a/man/shutdown.xml
+++ b/man/shutdown.xml
@@ -164,7 +164,7 @@
<refsect1>
<title>Exit status</title>
- <para>On success 0 is returned, a non-zero failure
+ <para>On success, 0 is returned, a non-zero failure
code otherwise.</para>
</refsect1>
diff --git a/man/systemctl.xml b/man/systemctl.xml
index 6f51135..7c9ffc8 100644
--- a/man/systemctl.xml
+++ b/man/systemctl.xml
@@ -238,7 +238,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
applications.</para>
<para><literal>ignore-requirements</literal> is similar to
- <literal>ignore-dependencies</literal> but only causes the
+ <literal>ignore-dependencies</literal>, but only causes the
requirement dependencies to be ignored, the ordering
dependencies will still be honoured.</para>
</listitem>
@@ -1383,7 +1383,7 @@ kobject-uevent 1 systemd-udevd-kernel.socket systemd-udevd.service
<refsect2>
<title>Parameter Syntax</title>
- <para>For unit commands the specified
+ <para>For unit commands, the specified
<replaceable>NAME</replaceable> should be the full name of the
unit, or an abbreviated name which is automatically extended with
the <literal>.service</literal> suffix.
@@ -1395,7 +1395,7 @@ kobject-uevent 1 systemd-udevd-kernel.socket systemd-udevd.service
<programlisting># systemctl status dev-sda.device
# systemctl status home.mount</programlisting></para>
- <para>For unit file commands the
+ <para>For unit file commands, the
specified <replaceable>NAME</replaceable> should be the full name
of the unit file, or the absolute path to the unit file.
<programlisting># systemctl link /path/to/foo.service</programlisting>
diff --git a/man/systemd-analyze.xml b/man/systemd-analyze.xml
index 1898ca6..cbf59e0 100644
--- a/man/systemd-analyze.xml
+++ b/man/systemd-analyze.xml
@@ -300,7 +300,7 @@
<refsect1>
<title>Exit status</title>
- <para>On success 0 is returned, a non-zero failure
+ <para>On success, 0 is returned, a non-zero failure
code otherwise.</para>
</refsect1>
diff --git a/man/systemd-ask-password.xml b/man/systemd-ask-password.xml
index 8af328d..79902cb 100644
--- a/man/systemd-ask-password.xml
+++ b/man/systemd-ask-password.xml
@@ -167,7 +167,7 @@
<refsect1>
<title>Exit status</title>
- <para>On success 0 is returned, a non-zero failure
+ <para>On success, 0 is returned, a non-zero failure
code otherwise.</para>
</refsect1>
diff --git a/man/systemd-cat.xml b/man/systemd-cat.xml
index ffb1dfd..ba7a2cf 100644
--- a/man/systemd-cat.xml
+++ b/man/systemd-cat.xml
@@ -158,7 +158,7 @@
<refsect1>
<title>Exit status</title>
- <para>On success 0 is returned, a non-zero failure
+ <para>On success, 0 is returned, a non-zero failure
code otherwise.</para>
</refsect1>
diff --git a/man/systemd-cgls.xml b/man/systemd-cgls.xml
index d4520e6..955e0da 100644
--- a/man/systemd-cgls.xml
+++ b/man/systemd-cgls.xml
@@ -145,7 +145,7 @@
<refsect1>
<title>Exit status</title>
- <para>On success 0 is returned, a non-zero failure
+ <para>On success, 0 is returned, a non-zero failure
code otherwise.</para>
</refsect1>
diff --git a/man/systemd-cgtop.xml b/man/systemd-cgtop.xml
index 01a0ae2..38bddf1 100644
--- a/man/systemd-cgtop.xml
+++ b/man/systemd-cgtop.xml
@@ -264,7 +264,7 @@
<refsect1>
<title>Exit status</title>
- <para>On success 0 is returned, a non-zero failure
+ <para>On success, 0 is returned, a non-zero failure
code otherwise.</para>
</refsect1>
diff --git a/man/systemd-coredumpctl.xml b/man/systemd-coredumpctl.xml
index 9ccb67d..67f75d1 100644
--- a/man/systemd-coredumpctl.xml
+++ b/man/systemd-coredumpctl.xml
@@ -200,7 +200,7 @@
<refsect1>
<title>Exit status</title>
- <para>On success 0 is returned, a non-zero failure
+ <para>On success, 0 is returned, a non-zero failure
code otherwise. Not finding any matching coredumps is treated
as failure.
</para>
diff --git a/man/systemd-delta.xml b/man/systemd-delta.xml
index 4d3ab78..ebaa349 100644
--- a/man/systemd-delta.xml
+++ b/man/systemd-delta.xml
@@ -223,7 +223,7 @@
<refsect1>
<title>Exit status</title>
- <para>On success 0 is returned, a non-zero failure
+ <para>On success, 0 is returned, a non-zero failure
code otherwise.</para>
</refsect1>
diff --git a/man/systemd-machine-id-setup.xml b/man/systemd-machine-id-setup.xml
index bc38d55..7b3aa7e 100644
--- a/man/systemd-machine-id-setup.xml
+++ b/man/systemd-machine-id-setup.xml
@@ -116,7 +116,7 @@
<refsect1>
<title>Exit status</title>
- <para>On success 0 is returned, a non-zero failure
+ <para>On success, 0 is returned, a non-zero failure
code otherwise.</para>
</refsect1>
diff --git a/man/systemd-notify.xml b/man/systemd-notify.xml
index a769346..e14977d 100644
--- a/man/systemd-notify.xml
+++ b/man/systemd-notify.xml
@@ -172,7 +172,7 @@
<refsect1>
<title>Exit status</title>
- <para>On success 0 is returned, a non-zero failure
+ <para>On success, 0 is returned, a non-zero failure
code otherwise.</para>
</refsect1>
diff --git a/man/systemd-tmpfiles.xml b/man/systemd-tmpfiles.xml
index 9b8932c..3d11c49 100644
--- a/man/systemd-tmpfiles.xml
+++ b/man/systemd-tmpfiles.xml
@@ -183,7 +183,7 @@
<refsect1>
<title>Exit status</title>
- <para>On success 0 is returned, a non-zero failure
+ <para>On success, 0 is returned, a non-zero failure
code otherwise.</para>
</refsect1>
diff --git a/man/systemd-tty-ask-password-agent.xml b/man/systemd-tty-ask-password-agent.xml
index 31a18ba..cb5fb43 100644
--- a/man/systemd-tty-ask-password-agent.xml
+++ b/man/systemd-tty-ask-password-agent.xml
@@ -148,7 +148,7 @@
<refsect1>
<title>Exit status</title>
- <para>On success 0 is returned, a non-zero failure
+ <para>On success, 0 is returned, a non-zero failure
code otherwise.</para>
</refsect1>
diff --git a/man/systemd.device.xml b/man/systemd.device.xml
index 1bbd322..fa7074a 100644
--- a/man/systemd.device.xml
+++ b/man/systemd.device.xml
@@ -75,7 +75,7 @@
udev tag (by default all block and network devices,
and a few others). This may be used to define
dependencies between devices and other units. To tag a
- udev device use <literal>TAG+="systemd"</literal> in
+ udev device, use <literal>TAG+="systemd"</literal> in
the udev rules file, see
<citerefentry><refentrytitle>udev</refentrytitle><manvolnum>7</manvolnum></citerefentry>
for details.</para>
diff --git a/man/systemd.exec.xml b/man/systemd.exec.xml
index 207592d..2778497 100644
--- a/man/systemd.exec.xml
+++ b/man/systemd.exec.xml
@@ -847,7 +847,7 @@
processes and mounts private
<filename>/tmp</filename> and
<filename>/var/tmp</filename>
- directories inside it, that are not
+ directories inside it that are not
shared by processes outside of the
namespace. This is useful to secure
access to temporary files of the
diff --git a/man/systemd.mount.xml b/man/systemd.mount.xml
index bd50f35..b181949 100644
--- a/man/systemd.mount.xml
+++ b/man/systemd.mount.xml
@@ -94,7 +94,7 @@
in a unit file
<filename>home-lennart.mount</filename>. For details
about the escaping logic used to convert a file system
- path to a unit name see
+ path to a unit name, see
<citerefentry><refentrytitle>systemd.unit</refentrytitle><manvolnum>5</manvolnum></citerefentry>.</para>
<para>Optionally, a mount unit may be accompanied by
diff --git a/man/systemd.service.xml b/man/systemd.service.xml
index 94e72df..8e6c205 100644
--- a/man/systemd.service.xml
+++ b/man/systemd.service.xml
@@ -441,7 +441,7 @@
<literal>one</literal> and
<literal>two two</literal>,
respectively. Since two commands are
- specified
+ specified,
<varname>Type=oneshot</varname> must
be used.</para>
diff --git a/man/systemd.special.xml b/man/systemd.special.xml
index 863a029..76bb5cd 100644
--- a/man/systemd.special.xml
+++ b/man/systemd.special.xml
@@ -996,7 +996,7 @@
<filename>smartcard.target</filename>,
<filename>sound.target</filename>.</para>
- <para>In addition the following special unit is
+ <para>In addition, the following special unit is
understood only when systemd runs as service instance:</para>
<variablelist>
diff --git a/man/systemd.swap.xml b/man/systemd.swap.xml
index 0411232..492309e 100644
--- a/man/systemd.swap.xml
+++ b/man/systemd.swap.xml
@@ -85,7 +85,7 @@
<filename noindex='true'>/dev/sda5</filename> must be configured in a
unit file <filename>dev-sda5.swap</filename>. For
details about the escaping logic used to convert a
- file system path to a unit name see
+ file system path to a unit name, see
<citerefentry><refentrytitle>systemd.unit</refentrytitle><manvolnum>5</manvolnum></citerefentry>.</para>
<para>All swap units automatically get the appropriate
diff --git a/man/systemd.timer.xml b/man/systemd.timer.xml
index 484287c..7143f9f 100644
--- a/man/systemd.timer.xml
+++ b/man/systemd.timer.xml
@@ -141,7 +141,7 @@
also include time units. Example:
"OnBootSec=5h 30min" means 5 hours and
30 minutes after boot-up. For details
- about the syntax of time spans see
+ about the syntax of time spans, see
<citerefentry><refentrytitle>systemd.unit</refentrytitle><manvolnum>5</manvolnum></citerefentry>.</para>
<para>If a timer configured with
@@ -182,7 +182,7 @@
event expressions. See
<citerefentry><refentrytitle>systemd.time</refentrytitle><manvolnum>7</manvolnum></citerefentry>
for more information on the syntax of
- calendar event expressions. Otherwise
+ calendar event expressions. Otherwise,
the semantics are similar to
<varname>OnActiveSec=</varname> and
related settings.</para>
@@ -211,7 +211,7 @@
<varname>OnUnitInactiveSec=</varname>
and ending the time configured with
<varname>AccuracySec=</varname>
- later. Within this time window the
+ later. Within this time window, the
expiry time will be placed at a
host-specific, randomized but stable
position, that is synchronized between
@@ -220,7 +220,7 @@
in networked installations, as well as
optimizing power consumption to
suppress unnecessary CPU wake-ups. To
- get best accuracy set this option to
+ get best accuracy, set this option to
1us. Note that the timer is still
subject to the timer slack configured
via
@@ -229,7 +229,7 @@
setting. See
<citerefentry><refentrytitle>prctl</refentrytitle><manvolnum>2</manvolnum></citerefentry>
for details. To optimize power
- consumption make sure to set this
+ consumption, make sure to set this
value as high as possible and as low
as necessary.</para></listitem>
</varlistentry>
diff --git a/man/systemd.unit.xml b/man/systemd.unit.xml
index 54d5590..0244570 100644
--- a/man/systemd.unit.xml
+++ b/man/systemd.unit.xml
@@ -403,7 +403,7 @@
what the unit's purpose is, followed
by how it is configured, followed by
any other related documentation. This
- option may be specified more than once
+ option may be specified more than once,
in which case the specified list of
URIs is merged. If the empty string is
assigned to this option, the list is
@@ -492,7 +492,7 @@
<varname>Requires=</varname> and
<varname>RequiresOverridable=</varname>,
respectively. However, if the units
- listed here are not started already
+ listed here are not started already,
they will not be started and the
transaction will fail immediately.
</para></listitem>
@@ -506,7 +506,7 @@
listed in this option will be started
if the configuring unit is. However,
if the listed units fail to start
- or cannot be added to the transaction
+ or cannot be added to the transaction,
this has no impact on the validity of
the transaction as a whole. This is
the recommended way to hook start-up
@@ -519,7 +519,7 @@
symlinks to a
<filename>.wants/</filename> directory
accompanying the unit file. For
- details see above.</para></listitem>
+ details, see above.</para></listitem>
</varlistentry>
<varlistentry>
@@ -528,7 +528,7 @@
<listitem><para>Configures requirement
dependencies, very similar in style to
<varname>Requires=</varname>, however
- in addition to this behavior it also
+ in addition to this behavior, it also
declares that this unit is stopped
when any of the units listed suddenly
disappears. Units can suddenly,
@@ -577,9 +577,9 @@
be modified to be fixed (in case one
or both jobs are not a required part
of the transaction). In the latter
- case the job that is not the required
+ case, the job that is not the required
will be removed, or in case both are
- not required the unit that conflicts
+ not required, the unit that conflicts
will be started and the unit that is
conflicted is
stopped.</para></listitem>
@@ -606,7 +606,7 @@
a common pattern to include a unit
name in both the
<varname>After=</varname> and
- <varname>Requires=</varname> option in
+ <varname>Requires=</varname> option, in
which case the unit listed will be
started before the unit that is
configured with these options. This
@@ -686,13 +686,13 @@
directives (see
<citerefentry><refentrytitle>systemd.exec</refentrytitle><manvolnum>5</manvolnum></citerefentry>
for details). If a unit that has this
- setting set is started its processes
+ setting set is started, its processes
will see the same
<filename>/tmp</filename>,
<filename>/tmp/var</filename> and
network namespace as one listed unit
that is started. If multiple listed
- units are already started it is not
+ units are already started, it is not
defined which namespace is
joined. Note that this setting only
has an effect if
@@ -1270,7 +1270,7 @@
<row>
<entry><literal>%p</literal></entry>
<entry>Prefix name</entry>
- <entry>For instantiated units this refers to the string before the <literal>@</literal> character of the unit name. For non-instantiated units this refers to the name of the unit with the type suffix removed.</entry>
+ <entry>For instantiated units, this refers to the string before the <literal>@</literal> character of the unit name. For non-instantiated units, this refers to the name of the unit with the type suffix removed.</entry>
</row>
<row>
<entry><literal>%P</literal></entry>
@@ -1325,12 +1325,12 @@
<row>
<entry><literal>%h</literal></entry>
<entry>User home directory</entry>
- <entry>This is the home directory of the configured user of the unit, or (if none is set) the user running the systemd user instance. Similar to <literal>%U</literal> this specifier is not available for units run by the systemd system instance, unless the configured user is the root user.</entry>
+ <entry>This is the home directory of the configured user of the unit, or (if none is set) the user running the systemd user instance. Similar to <literal>%U</literal>, this specifier is not available for units run by the systemd system instance, unless the configured user is the root user.</entry>
</row>
<row>
<entry><literal>%s</literal></entry>
<entry>User shell</entry>
- <entry>This is the shell of the configured user of the unit, or (if none is set) the user running the systemd user instance. Similar to <literal>%U</literal> this specifier is not available for units run by the systemd system instance, unless the configured user is the root user.</entry>
+ <entry>This is the shell of the configured user of the unit, or (if none is set) the user running the systemd user instance. Similar to <literal>%U</literal>, this specifier is not available for units run by the systemd system instance, unless the configured user is the root user.</entry>
</row>
<row>
<entry><literal>%m</literal></entry>
diff --git a/man/systemd.xml b/man/systemd.xml
index 10ce375..acba820 100644
--- a/man/systemd.xml
+++ b/man/systemd.xml
@@ -480,7 +480,7 @@
<filename>/proc</filename>.</para>
<para>For more information about the concepts and
- ideas behind systemd please refer to the <ulink
+ ideas behind systemd, please refer to the <ulink
url="http://0pointer.de/blog/projects/systemd.html">Original
Design Document</ulink>.</para>
diff --git a/man/telinit.xml b/man/telinit.xml
index bb80939..b20a60a 100644
--- a/man/telinit.xml
+++ b/man/telinit.xml
@@ -171,7 +171,7 @@
<refsect1>
<title>Exit status</title>
- <para>On success 0 is returned, a non-zero failure
+ <para>On success, 0 is returned, a non-zero failure
code otherwise.</para>
</refsect1>
diff --git a/man/timedatectl.xml b/man/timedatectl.xml
index afcb716..beda304 100644
--- a/man/timedatectl.xml
+++ b/man/timedatectl.xml
@@ -223,7 +223,7 @@
<refsect1>
<title>Exit status</title>
- <para>On success 0 is returned, a non-zero failure
+ <para>On success, 0 is returned, a non-zero failure
code otherwise.</para>
</refsect1>
commit 494a66821815e8109afa136bd42818b85da38c09
Author: Jan Engelhardt <jengelh at inai.de>
Date: Thu Dec 26 02:47:43 2013 +0100
man: resolve word omissions
This is a recurring submission and includes corrections to:
word omissions and word class choice.
diff --git a/man/binfmt.d.xml b/man/binfmt.d.xml
index 94f97e0..6f8668b 100644
--- a/man/binfmt.d.xml
+++ b/man/binfmt.d.xml
@@ -88,8 +88,8 @@
administrator, who may use this logic to override the
configuration files installed from vendor
packages. All files are sorted by their filename in
- lexicographic order, regardless in which of the
- directories they reside. If multiple files specify
+ lexicographic order, regardless of which of the
+ directories they reside in. If multiple files specify
the same binary type name, the entry in the file with
the lexicographically latest name will be applied.</para>
diff --git a/man/journald.conf.xml b/man/journald.conf.xml
index 8e642a3..b362c5d 100644
--- a/man/journald.conf.xml
+++ b/man/journald.conf.xml
@@ -155,7 +155,7 @@
into the system journal. If
<literal>uid</literal>, any user ID
will get his own journal files
- regardless whether it belongs to a
+ regardless of whether it belongs to a
system service or refers to a real
logged in user. If
<literal>none</literal>, journal files
diff --git a/man/loginctl.xml b/man/loginctl.xml
index 100ce49..13105d4 100644
--- a/man/loginctl.xml
+++ b/man/loginctl.xml
@@ -155,7 +155,7 @@
<listitem><para>When showing
session/user/seat properties, show all
- properties regardless whether they are
+ properties regardless of whether they are
set or not.</para></listitem>
</varlistentry>
diff --git a/man/sd-daemon.xml b/man/sd-daemon.xml
index 7401112..74fe435 100644
--- a/man/sd-daemon.xml
+++ b/man/sd-daemon.xml
@@ -144,7 +144,7 @@
<para>These APIs are implemented in the reference
implementation's <filename>sd-daemon.c</filename> and
<filename>sd-daemon.h</filename> files. These
- interfaces are available as shared library, which can
+ interfaces are available as a shared library, which can
be compiled and linked to with the
<constant>libsystemd-daemon</constant>Â <citerefentry><refentrytitle>pkg-config</refentrytitle><manvolnum>1</manvolnum></citerefentry>
file. Alternatively, applications consuming these APIs
diff --git a/man/sd-journal.xml b/man/sd-journal.xml
index 6d39611..832d584 100644
--- a/man/sd-journal.xml
+++ b/man/sd-journal.xml
@@ -98,7 +98,7 @@
<refsect1>
<title>Notes</title>
- <para>These APIs are implemented as shared library,
+ <para>These APIs are implemented as a shared library,
which can be compiled and linked to with the
<constant>libsystemd-journal</constant>Â <citerefentry><refentrytitle>pkg-config</refentrytitle><manvolnum>1</manvolnum></citerefentry>
file.</para>
diff --git a/man/sd-login.xml b/man/sd-login.xml
index 251b35b..1d47b29 100644
--- a/man/sd-login.xml
+++ b/man/sd-login.xml
@@ -99,7 +99,7 @@
caller with the libc
<citerefentry><refentrytitle>free</refentrytitle><manvolnum>3</manvolnum></citerefentry>
call after use, including the strings referenced
- therein. Similar, individual strings returned need to
+ therein. Similarly, individual strings returned need to
be freed, as well.</para>
<para>As a special exception, instead of an empty
@@ -120,7 +120,7 @@
<refsect1>
<title>Notes</title>
- <para>These APIs are implemented as shared library,
+ <para>These APIs are implemented as a shared library,
which can be compiled and linked to with the
<constant>libsystemd-login</constant>Â <citerefentry><refentrytitle>pkg-config</refentrytitle><manvolnum>1</manvolnum></citerefentry>
file.</para>
diff --git a/man/sd_booted.xml b/man/sd_booted.xml
index 64c0cd9..6f8cc95 100644
--- a/man/sd_booted.xml
+++ b/man/sd_booted.xml
@@ -100,7 +100,7 @@
in the reference implementation's
<filename>sd-daemon.c</filename> and
<filename>sd-daemon.h</filename> files. These
- interfaces are available as shared library, which can
+ interfaces are available as a shared library, which can
be compiled and linked to with the
<constant>libsystemd-daemon</constant>Â <citerefentry><refentrytitle>pkg-config</refentrytitle><manvolnum>1</manvolnum></citerefentry>
file. Alternatively, applications consuming these APIs
diff --git a/man/sd_bus_message_get_cookie.xml b/man/sd_bus_message_get_cookie.xml
index 28c8737..db344bf 100644
--- a/man/sd_bus_message_get_cookie.xml
+++ b/man/sd_bus_message_get_cookie.xml
@@ -133,7 +133,7 @@
<para>The <function>sd_bus_message_get_cookie()</function>
and <function>sd_bus_message_get_reply_cookie()</function>
- interfaces are available as shared library, which can
+ interfaces are available as a shared library, which can
be compiled and linked to with the
<constant>libsystemd-bus</constant>Â <citerefentry><refentrytitle>pkg-config</refentrytitle><manvolnum>1</manvolnum></citerefentry>
file.</para>
diff --git a/man/sd_bus_request_name.xml b/man/sd_bus_request_name.xml
index b78303a..7fae7be 100644
--- a/man/sd_bus_request_name.xml
+++ b/man/sd_bus_request_name.xml
@@ -209,7 +209,7 @@
<para>The <function>sd_bus_acquire_name()</function>
and <function>sd_bus_release_name()</function>
- interfaces are available as shared library, which can
+ interfaces are available as a shared library, which can
be compiled and linked to with the
<constant>libsystemd-bus</constant>Â <citerefentry><refentrytitle>pkg-config</refentrytitle><manvolnum>1</manvolnum></citerefentry>
file.</para>
diff --git a/man/sd_get_seats.xml b/man/sd_get_seats.xml
index 8254b7c..1e55af3 100644
--- a/man/sd_get_seats.xml
+++ b/man/sd_get_seats.xml
@@ -90,13 +90,13 @@
<constant>NULL</constant> may be returned and should be considered
equivalent to an empty array.</para>
- <para>Similar, <function>sd_get_sessions()</function> may
+ <para>Similarly, <function>sd_get_sessions()</function> may
be used to determine all current login sessions.</para>
- <para>Similar, <function>sd_get_uids()</function> may
+ <para>Similarly, <function>sd_get_uids()</function> may
be used to determine all Unix users who currently have login sessions.</para>
- <para>Similar,
+ <para>Similarly,
<function>sd_get_machine_names()</function> may be
used to determine all current virtual machines and
containers on the system.</para>
@@ -122,7 +122,7 @@
<function>sd_get_sessions()</function>,
<function>sd_get_uids()</function> and
<function>sd_get_machine_names()</function> interfaces
- are available as shared library, which can be compiled
+ are available as a shared library, which can be compiled
and linked to with the
<constant>libsystemd-login</constant>Â <citerefentry><refentrytitle>pkg-config</refentrytitle><manvolnum>1</manvolnum></citerefentry>
file.</para>
diff --git a/man/sd_id128_get_machine.xml b/man/sd_id128_get_machine.xml
index 6bee7ad..084fda2 100644
--- a/man/sd_id128_get_machine.xml
+++ b/man/sd_id128_get_machine.xml
@@ -116,7 +116,7 @@
<para>The <function>sd_id128_get_machine()</function>
and <function>sd_id128_get_boot()</function>
- interfaces are available as shared library, which can
+ interfaces are available as a shared library, which can
be compiled and linked to with the
<literal>libsystemd-id128</literal>Â <citerefentry><refentrytitle>pkg-config</refentrytitle><manvolnum>1</manvolnum></citerefentry>
file.</para>
diff --git a/man/sd_id128_randomize.xml b/man/sd_id128_randomize.xml
index 0b95803..100de16 100644
--- a/man/sd_id128_randomize.xml
+++ b/man/sd_id128_randomize.xml
@@ -95,7 +95,7 @@
<title>Notes</title>
<para>The <function>sd_id128_randomize()</function> interface
- is available as shared library, which can be compiled
+ is available as a shared library, which can be compiled
and linked to with the
<literal>libsystemd-id128</literal>Â <citerefentry><refentrytitle>pkg-config</refentrytitle><manvolnum>1</manvolnum></citerefentry>
file.</para>
diff --git a/man/sd_id128_to_string.xml b/man/sd_id128_to_string.xml
index 71cf82a..eae2915 100644
--- a/man/sd_id128_to_string.xml
+++ b/man/sd_id128_to_string.xml
@@ -118,7 +118,7 @@
<para>The <function>sd_id128_to_string()</function>
and <function>sd_id128_from_string()</function> interfaces are
- available as shared library, which can be compiled and
+ available as a shared library, which can be compiled and
linked to with the <literal>libsystemd-id128</literal>Â <citerefentry><refentrytitle>pkg-config</refentrytitle><manvolnum>1</manvolnum></citerefentry>
file.</para>
</refsect1>
diff --git a/man/sd_is_fifo.xml b/man/sd_is_fifo.xml
index 4d9cd79..5e79453 100644
--- a/man/sd_is_fifo.xml
+++ b/man/sd_is_fifo.xml
@@ -208,7 +208,7 @@
related functions are implemented in the reference
implementation's <filename>sd-daemon.c</filename> and
<filename>sd-daemon.h</filename> files. These
- interfaces are available as shared library, which can
+ interfaces are available as a shared library, which can
be compiled and linked to with the
<constant>libsystemd-daemon</constant>Â <citerefentry><refentrytitle>pkg-config</refentrytitle><manvolnum>1</manvolnum></citerefentry>
file. Alternatively, applications consuming these APIs
diff --git a/man/sd_journal_add_match.xml b/man/sd_journal_add_match.xml
index b6c7b06..6568234 100644
--- a/man/sd_journal_add_match.xml
+++ b/man/sd_journal_add_match.xml
@@ -174,7 +174,7 @@
<function>sd_journal_add_disjunction()</function>,
<function>sd_journal_add_conjunction()</function> and
<function>sd_journal_flush_matches()</function>
- interfaces are available as shared library, which can
+ interfaces are available as a shared library, which can
be compiled and linked to with the
<constant>libsystemd-journal</constant>Â <citerefentry><refentrytitle>pkg-config</refentrytitle><manvolnum>1</manvolnum></citerefentry>
file.</para>
diff --git a/man/sd_journal_get_catalog.xml b/man/sd_journal_get_catalog.xml
index 4a7e0a1..ecd329f 100644
--- a/man/sd_journal_get_catalog.xml
+++ b/man/sd_journal_get_catalog.xml
@@ -118,7 +118,7 @@
<para>The <function>sd_journal_get_catalog()</function> and
<function>sd_journal_get_catalog_for_message_id()</function>
- interfaces are available as shared library, which can
+ interfaces are available as a shared library, which can
be compiled and linked to with the
<constant>libsystemd-journal</constant>Â <citerefentry><refentrytitle>pkg-config</refentrytitle><manvolnum>1</manvolnum></citerefentry>
file.</para>
diff --git a/man/sd_journal_get_cursor.xml b/man/sd_journal_get_cursor.xml
index 4cee7d5..046c154 100644
--- a/man/sd_journal_get_cursor.xml
+++ b/man/sd_journal_get_cursor.xml
@@ -130,7 +130,7 @@
<para>The <function>sd_journal_get_cursor()</function>
and <function>sd_journal_test_cursor()</function>
- interfaces are available as shared library, which can
+ interfaces are available as a shared library, which can
be compiled and linked to with the
<constant>libsystemd-journal</constant>Â <citerefentry><refentrytitle>pkg-config</refentrytitle><manvolnum>1</manvolnum></citerefentry>
file.</para>
diff --git a/man/sd_journal_get_cutoff_realtime_usec.xml b/man/sd_journal_get_cutoff_realtime_usec.xml
index 9bf8220..287c1c5 100644
--- a/man/sd_journal_get_cutoff_realtime_usec.xml
+++ b/man/sd_journal_get_cutoff_realtime_usec.xml
@@ -122,7 +122,7 @@
<function>sd_journal_get_cutoff_realtime_usec()</function>
and
<function>sd_journal_get_cutoff_monotonic_usec()</function>
- interfaces are available as shared library, which can
+ interfaces are available as a shared library, which can
be compiled and linked to with the
<constant>libsystemd-journal</constant>Â <citerefentry><refentrytitle>pkg-config</refentrytitle><manvolnum>1</manvolnum></citerefentry>
file.</para>
diff --git a/man/sd_journal_get_data.xml b/man/sd_journal_get_data.xml
index 0e1111e..6ed52b5 100644
--- a/man/sd_journal_get_data.xml
+++ b/man/sd_journal_get_data.xml
@@ -203,7 +203,7 @@
<function>sd_journal_set_data_threshold()</function>
and
<function>sd_journal_get_data_threshold()</function>
- interfaces are available as shared library, which can
+ interfaces are available as a shared library, which can
be compiled and linked to with the
<constant>libsystemd-journal</constant>Â <citerefentry><refentrytitle>pkg-config</refentrytitle><manvolnum>1</manvolnum></citerefentry>
file.</para>
diff --git a/man/sd_journal_get_fd.xml b/man/sd_journal_get_fd.xml
index 764f716..4b36f97 100644
--- a/man/sd_journal_get_fd.xml
+++ b/man/sd_journal_get_fd.xml
@@ -253,7 +253,7 @@ else {
<function>sd_journal_reliable_fd()</function>,
<function>sd_journal_process()</function> and
<function>sd_journal_wait()</function> interfaces are
- available as shared library, which can be compiled and
+ available as a shared library, which can be compiled and
linked to with the
<constant>libsystemd-journal</constant>Â <citerefentry><refentrytitle>pkg-config</refentrytitle><manvolnum>1</manvolnum></citerefentry>
file.</para>
diff --git a/man/sd_journal_get_realtime_usec.xml b/man/sd_journal_get_realtime_usec.xml
index 8870c29..bf1aa50 100644
--- a/man/sd_journal_get_realtime_usec.xml
+++ b/man/sd_journal_get_realtime_usec.xml
@@ -122,7 +122,7 @@
<function>sd_journal_get_realtime_usec()</function>
and
<function>sd_journal_get_monotonic_usec()</function>
- interfaces are available as shared library, which can
+ interfaces are available as a shared library, which can
be compiled and linked to with the
<constant>libsystemd-journal</constant>Â <citerefentry><refentrytitle>pkg-config</refentrytitle><manvolnum>1</manvolnum></citerefentry>
file.</para>
diff --git a/man/sd_journal_get_usage.xml b/man/sd_journal_get_usage.xml
index 180d8b2..08d8640 100644
--- a/man/sd_journal_get_usage.xml
+++ b/man/sd_journal_get_usage.xml
@@ -84,7 +84,7 @@
<title>Notes</title>
<para>The <function>sd_journal_get_usage()</function>
- interface is available as shared library, which can be
+ interface is available as a shared library, which can be
compiled and linked to with the
<constant>libsystemd-journal</constant>Â <citerefentry><refentrytitle>pkg-config</refentrytitle><manvolnum>1</manvolnum></citerefentry>
file.</para>
diff --git a/man/sd_journal_next.xml b/man/sd_journal_next.xml
index 6e437d1..1409b0d 100644
--- a/man/sd_journal_next.xml
+++ b/man/sd_journal_next.xml
@@ -102,7 +102,7 @@
functions such as
<citerefentry><refentrytitle>sd_journal_get_data</refentrytitle><manvolnum>3</manvolnum></citerefentry>.</para>
- <para>Similar, <function>sd_journal_previous()</function> sets
+ <para>Similarly, <function>sd_journal_previous()</function> sets
the read pointer back one entry.</para>
<para><function>sd_journal_next_skip()</function> and
@@ -129,7 +129,7 @@
<citerefentry><refentrytitle>sd_journal_seek_head</refentrytitle><manvolnum>3</manvolnum></citerefentry>
and <function>sd_journal_next()</function> in order to
make iterating through the journal easier. See below
- for an example. Similar,
+ for an example. Similarly,
<function>SD_JOURNAL_FOREACH_BACKWARDS()</function>
may be used for iterating the journal in reverse
order.</para>
@@ -156,7 +156,7 @@
<para>The <function>sd_journal_next()</function>, <function>sd_journal_previous()</function>,
<function>sd_journal_next_skip()</function> and
<function>sd_journal_previous_skip()</function> interfaces are
- available as shared library, which can be compiled and
+ available as a shared library, which can be compiled and
linked to with the
<constant>libsystemd-journal</constant>Â <citerefentry><refentrytitle>pkg-config</refentrytitle><manvolnum>1</manvolnum></citerefentry>
file.</para>
diff --git a/man/sd_journal_print.xml b/man/sd_journal_print.xml
index e61a648..a716cc3 100644
--- a/man/sd_journal_print.xml
+++ b/man/sd_journal_print.xml
@@ -227,7 +227,7 @@ sd_journal_send("MESSAGE=Hello World, this is PID %lu!", (unsigned long) getpid(
<function>sd_journal_printv()</function>,
<function>sd_journal_send()</function> and
<function>sd_journal_sendv()</function> interfaces
- are available as shared library, which can be compiled
+ are available as a shared library, which can be compiled
and linked to with the
<constant>libsystemd-journal</constant>Â <citerefentry><refentrytitle>pkg-config</refentrytitle><manvolnum>1</manvolnum></citerefentry>
file.</para>
diff --git a/man/sd_journal_query_unique.xml b/man/sd_journal_query_unique.xml
index f5d9d2b..f0b9204 100644
--- a/man/sd_journal_query_unique.xml
+++ b/man/sd_journal_query_unique.xml
@@ -156,7 +156,7 @@
<para>The <function>sd_journal_query_unique()</function>,
<function>sd_journal_enumerate_unique()</function> and
<function>sd_journal_restart_unique()</function>
- interfaces are available as shared library, which can
+ interfaces are available as a shared library, which can
be compiled and linked to with the
<constant>libsystemd-journal</constant>Â <citerefentry><refentrytitle>pkg-config</refentrytitle><manvolnum>1</manvolnum></citerefentry>
file.</para>
diff --git a/man/sd_journal_seek_head.xml b/man/sd_journal_seek_head.xml
index 03de30a..939f0b1 100644
--- a/man/sd_journal_seek_head.xml
+++ b/man/sd_journal_seek_head.xml
@@ -94,7 +94,7 @@
seeks to the beginning of the journal, i.e. the oldest
available entry.</para>
- <para>Similar,
+ <para>Similarly,
<function>sd_journal_seek_tail()</function> may be
used to seek to the end of the journal, i.e. the most
recent available entry.</para>
@@ -156,7 +156,7 @@
<function>sd_journal_seek_monotonic_usec()</function>,
<function>sd_journal_seek_realtime_usec()</function>,
and <function>sd_journal_seek_cursor()</function>
- interfaces are available as shared library, which can
+ interfaces are available as a shared library, which can
be compiled and linked to with the
<constant>libsystemd-journal</constant>Â <citerefentry><refentrytitle>pkg-config</refentrytitle><manvolnum>1</manvolnum></citerefentry>
file.</para>
diff --git a/man/sd_journal_stream_fd.xml b/man/sd_journal_stream_fd.xml
index 4bd0abc..a8dc8fd 100644
--- a/man/sd_journal_stream_fd.xml
+++ b/man/sd_journal_stream_fd.xml
@@ -112,7 +112,7 @@
<title>Notes</title>
<para>The <function>sd_journal_stream_fd()</function>
- interface is available as shared library, which can
+ interface is available as a shared library, which can
be compiled and linked to with the
<constant>libsystemd-journal</constant>Â <citerefentry><refentrytitle>pkg-config</refentrytitle><manvolnum>1</manvolnum></citerefentry>
file.</para>
diff --git a/man/sd_listen_fds.xml b/man/sd_listen_fds.xml
index 240300d..aaabdbf 100644
--- a/man/sd_listen_fds.xml
+++ b/man/sd_listen_fds.xml
@@ -73,7 +73,7 @@
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
+ environment variables before returning (regardless of
whether the function call itself succeeded or
not). Further calls to
<function>sd_listen_fds()</function> will then fail,
@@ -149,7 +149,7 @@
implemented in the reference implementation's
<filename>sd-daemon.c</filename> and
<filename>sd-daemon.h</filename> files. These
- interfaces are available as shared library, which can
+ interfaces are available as a shared library, which can
be compiled and linked to with the
<constant>libsystemd-daemon</constant>Â <citerefentry><refentrytitle>pkg-config</refentrytitle><manvolnum>1</manvolnum></citerefentry>
file. Alternatively, applications consuming these APIs
diff --git a/man/sd_login_monitor_new.xml b/man/sd_login_monitor_new.xml
index 909a3d9..f439d3e 100644
--- a/man/sd_login_monitor_new.xml
+++ b/man/sd_login_monitor_new.xml
@@ -224,7 +224,7 @@ else {
<function>sd_login_monitor_get_fd()</function>,
<function>sd_login_monitor_get_events()</function> and
<function>sd_login_monitor_get_timeout()</function>
- interfaces are available as shared library, which can
+ interfaces are available as a shared library, which can
be compiled and linked to with the
<constant>libsystemd-login</constant>Â <citerefentry><refentrytitle>pkg-config</refentrytitle><manvolnum>1</manvolnum></citerefentry>
file.</para>
diff --git a/man/sd_notify.xml b/man/sd_notify.xml
index 683967c..cd4a437 100644
--- a/man/sd_notify.xml
+++ b/man/sd_notify.xml
@@ -79,7 +79,7 @@
<para>If the <parameter>unset_environment</parameter>
parameter is non-zero, <function>sd_notify()</function>
will unset the <varname>$NOTIFY_SOCKET</varname>
- environment variable before returning (regardless
+ environment variable before returning (regardless of
whether the function call itself succeeded or
not). Further calls to
<function>sd_notify()</function> will then fail, but
@@ -240,7 +240,7 @@
the reference implementation's
<filename>sd-daemon.c</filename> and
<filename>sd-daemon.h</filename> files. These
- interfaces are available as shared library, which can
+ interfaces are available as a shared library, which can
be compiled and linked to with the
<constant>libsystemd-daemon</constant>Â <citerefentry><refentrytitle>pkg-config</refentrytitle><manvolnum>1</manvolnum></citerefentry>
file. Alternatively, applications consuming these APIs
diff --git a/man/sd_pid_get_session.xml b/man/sd_pid_get_session.xml
index e5c7709..ff5905b 100644
--- a/man/sd_pid_get_session.xml
+++ b/man/sd_pid_get_session.xml
@@ -186,7 +186,7 @@
<function>sd_pid_get_owner_uid()</function>,
<function>sd_pid_get_machine_name()</function> and
<function>sd_pid_get_slice()</function> interfaces are
- available as shared library, which can be compiled and
+ available as a shared library, which can be compiled and
linked to with the
<constant>libsystemd-login</constant>Â <citerefentry><refentrytitle>pkg-config</refentrytitle><manvolnum>1</manvolnum></citerefentry>
file.</para>
diff --git a/man/sd_seat_get_active.xml b/man/sd_seat_get_active.xml
index cd87696..23d582d 100644
--- a/man/sd_seat_get_active.xml
+++ b/man/sd_seat_get_active.xml
@@ -164,7 +164,7 @@
<function>sd_seat_can_multi_session()</function>,
<function>sd_seat_can_tty()</function> and
<function>sd_seat_can_grapical()</function> interfaces
- are available as shared library, which can be compiled
+ are available as a shared library, which can be compiled
and linked to with the
<constant>libsystemd-login</constant>Â <citerefentry><refentrytitle>pkg-config</refentrytitle><manvolnum>1</manvolnum></citerefentry>
file.</para>
diff --git a/man/sd_session_is_active.xml b/man/sd_session_is_active.xml
index eb9dd7d..d1f1a34 100644
--- a/man/sd_session_is_active.xml
+++ b/man/sd_session_is_active.xml
@@ -299,7 +299,7 @@
<function>sd_session_get_remote_host()</function>,
<function>sd_session_get_remote_user()</function> and
<function>sd_session_get_tty()</function>
- interfaces are available as shared library, which can
+ interfaces are available as a shared library, which can
be compiled and linked to with the
<constant>libsystemd-login</constant>Â <citerefentry><refentrytitle>pkg-config</refentrytitle><manvolnum>1</manvolnum></citerefentry>
file.</para>
diff --git a/man/sd_uid_get_state.xml b/man/sd_uid_get_state.xml
index d4d23f4..0faa765 100644
--- a/man/sd_uid_get_state.xml
+++ b/man/sd_uid_get_state.xml
@@ -139,7 +139,7 @@
be returned and should be considered equivalent to an
empty array.</para>
- <para>Similar, <function>sd_uid_get_seats()</function>
+ <para>Similarly, <function>sd_uid_get_seats()</function>
may be used to determine the list of seats on which
the user currently has sessions. Similar semantics
apply, however note that the user may have
@@ -171,7 +171,7 @@
<function>sd_uid_is_on_seat()</function>,
<function>sd_uid_get_sessions()</function>, and
<function>sd_uid_get_seats()</function> interfaces are
- available as shared library, which can be compiled and
+ available as a shared library, which can be compiled and
linked to with the <constant>libsystemd-login</constant>Â <citerefentry><refentrytitle>pkg-config</refentrytitle><manvolnum>1</manvolnum></citerefentry>
file.</para>
</refsect1>
diff --git a/man/sd_watchdog_enabled.xml b/man/sd_watchdog_enabled.xml
index e42ae43..5b0d7e2 100644
--- a/man/sd_watchdog_enabled.xml
+++ b/man/sd_watchdog_enabled.xml
@@ -73,7 +73,7 @@
<function>sd_watchdog_enabled()</function> will unset
the <varname>$WATCHDOG_USEC</varname> and
<varname>$WATCHDOG_PID</varname> environment variables
- before returning (regardless whether the function call
+ before returning (regardless of whether the function call
itself succeeded or not). Further calls to
<function>sd_watchdog_enabled()</function> will then
return with zero, but the variable is no longer
@@ -142,7 +142,7 @@
implemented in the reference implementation's
<filename>sd-daemon.c</filename> and
<filename>sd-daemon.h</filename> files. These
- interfaces are available as shared library, which can
+ interfaces are available as a shared library, which can
be compiled and linked to with the
<constant>libsystemd-daemon</constant>Â <citerefentry><refentrytitle>pkg-config</refentrytitle><manvolnum>1</manvolnum></citerefentry>
file. Alternatively, applications consuming these APIs
diff --git a/man/sysctl.d.xml b/man/sysctl.d.xml
index 854864c..5544283 100644
--- a/man/sysctl.d.xml
+++ b/man/sysctl.d.xml
@@ -89,8 +89,8 @@
administrator, who may use this logic to override the
configuration files installed by vendor packages. All
configuration files are sorted by their filename in
- lexicographic order, regardless in which of the
- directories they reside. If multiple files specify the
+ lexicographic order, regardless of which of the
+ directories they reside in. If multiple files specify the
same variable name, the entry in the file with the
lexicographically latest name will be applied. It is
recommended to prefix all filenames with a two-digit
diff --git a/man/systemctl.xml b/man/systemctl.xml
index b48fc4a..6f51135 100644
--- a/man/systemctl.xml
+++ b/man/systemctl.xml
@@ -257,7 +257,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
sleep state. Any user may take these locks and privileged
users may override these locks. If any locks are taken,
shutdown and sleep state requests will normally fail
- (regardless if privileged or not) and a list of active locks
+ (regardless of whether privileged or not) and a list of active locks
is printed. However, if <option>--ignore-inhibitors</option>
is specified, the locks are ignored and not printed, and the
operation attempted anyway, possibly requiring additional
@@ -452,7 +452,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
with identical immediate effects, however, since the latter
is lost on reboot, the changes are lost too.</para>
- <para>Similar, when used with
+ <para>Similarly, when used with
<command>set-property</command>, make changes only
temporarily, so that they are lost on the next
reboot.</para>
diff --git a/man/systemd-getty-generator.xml b/man/systemd-getty-generator.xml
index d3cd980..2f3d124 100644
--- a/man/systemd-getty-generator.xml
+++ b/man/systemd-getty-generator.xml
@@ -68,8 +68,8 @@
requested by the container manager (see <ulink
url="http://www.freedesktop.org/wiki/Software/systemd/ContainerInterface/"><filename>Container Interface</filename></ulink>). This
should ensure that the user is shown a login prompt at
- the right place, regardless in which environment the
- system is started. For example, it is sufficient to
+ the right place, regardless of which environment the
+ system is started in. For example, it is sufficient to
redirect the kernel console with a kernel command line
argument such as <varname>console=</varname> to get
both kernel messages and a getty prompt on a serial
diff --git a/man/systemd-halt.service.xml b/man/systemd-halt.service.xml
index 0737d05..a39253d 100644
--- a/man/systemd-halt.service.xml
+++ b/man/systemd-halt.service.xml
@@ -65,7 +65,7 @@
<para><filename>systemd-halt.service</filename> is a
system service that is pulled in by
<filename>halt.target</filename> and is responsible
- for the actual system halt. Similar,
+ for the actual system halt. Similarly,
<filename>systemd-poweroff.service</filename> is
pulled in by <filename>poweroff.target</filename>,
<filename>systemd-reboot.service</filename> by
diff --git a/man/systemd-machine-id-setup.xml b/man/systemd-machine-id-setup.xml
index fef76bc..bc38d55 100644
--- a/man/systemd-machine-id-setup.xml
+++ b/man/systemd-machine-id-setup.xml
@@ -80,7 +80,7 @@
UUID passed is sufficiently unique and is different
for every booted instanced of the VM.</para>
- <para>Similar, if run inside a Linux container
+ <para>Similarly, if run inside a Linux container
environment and a UUID is set for the container this
is used to initialize the machine ID. For details see
the documentation of the <ulink
diff --git a/man/systemd.preset.xml b/man/systemd.preset.xml
index 16db8cd..55cb4de 100644
--- a/man/systemd.preset.xml
+++ b/man/systemd.preset.xml
@@ -126,8 +126,8 @@
administrator, who may use this logic to override the
preset files installed by vendor packages. All preset
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,
+ order, regardless of which of the directories they
+ reside in. If multiple files specify the same unit name,
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
diff --git a/man/systemd.service.xml b/man/systemd.service.xml
index f6b9fe2..94e72df 100644
--- a/man/systemd.service.xml
+++ b/man/systemd.service.xml
@@ -712,7 +712,7 @@ ExecStart=/bin/echo $ONE $TWO ${TWO}
timeout for the service expires.
If set to
<option>always</option>, the service
- will be restarted regardless whether
+ will be restarted regardless of whether
it exited cleanly or not, got
terminated abnormally by a signal or
hit a timeout.</para>
diff --git a/man/systemd.socket.xml b/man/systemd.socket.xml
index 7c10c58..d1879fa 100644
--- a/man/systemd.socket.xml
+++ b/man/systemd.socket.xml
@@ -213,7 +213,7 @@
traffic on any of the sockets will
trigger service activation, and all
listed sockets will be passed to the
- service, regardless whether there is
+ service, regardless of whether there is
incoming traffic on them or not. If
the empty string is assigned to any of
these options, the list of addresses
@@ -225,7 +225,7 @@
it is often desirable to listen on it
before the interface it is configured
on is up and running, and even
- regardless whether it will be up and
+ regardless of whether it will be up and
running ever at all. To deal with this
it is recommended to set the
<varname>FreeBind=</varname> option
diff --git a/man/systemd.unit.xml b/man/systemd.unit.xml
index 918bbc4..54d5590 100644
--- a/man/systemd.unit.xml
+++ b/man/systemd.unit.xml
@@ -634,7 +634,7 @@
dependency on another unit is shut
down while the latter is started up,
the shut down is ordered before the
- start-up regardless whether the
+ start-up regardless of whether the
ordering dependency is actually of
type <varname>After=</varname> or
<varname>Before=</varname>. If two
@@ -979,7 +979,7 @@
exists, is a regular file and marked
executable.</para>
- <para>Similar,
+ <para>Similarly,
<varname>ConditionKernelCommandLine=</varname>
may be used to check whether a
specific kernel command line option is
diff --git a/man/tmpfiles.d.xml b/man/tmpfiles.d.xml
index 0da52ae..475bcc7 100644
--- a/man/tmpfiles.d.xml
+++ b/man/tmpfiles.d.xml
@@ -88,8 +88,8 @@
the local administrator, who may use this logic to
override the configuration files installed by vendor
packages. All configuration files are sorted by their
- filename in lexicographic order, regardless in which
- of the directories they reside. If multiple files
+ filename in lexicographic order, regardless of which
+ of the directories they reside in. If multiple files
specify the same path, the entry in the file with the
lexicographically earliest name will be applied, all
all other conflicting entries logged as errors.</para>
More information about the systemd-commits
mailing list