Commit 16dad32e authored by Andrew Eikum's avatar Andrew Eikum Committed by Lennart Poettering

Reword sentences that contain psuedo-English "resp."

As you likely know, Arch Linux is in the process of moving to systemd.
So I was reading through the various systemd docs and quickly became
baffled by this new abbreviation "resp.", which I've never seen before
in my English-mother-tongue life.

Some quick Googling turned up a reference:
<http://www.transblawg.eu/index.php?/archives/870-Resp.-and-other-non-existent-English-wordsNicht-existente-englische-Woerter.html>

I guess it's a literal translation of the German "Beziehungsweise", but
English doesn't work the same way. The word "respectively" is used
exclusively to provide an ordering connection between two lists. E.g.
"the prefixes k, M, and G refer to kilo-, mega-, and giga-,
respectively." It is also never abbreviated to "resp." So the sentence
"Sets the default output resp. error output for all services and
sockets" makes no sense to a natural English speaker.

This patch removes all instances of "resp." in the man pages and
replaces them with sentences which are much more clear and, hopefully,
grammatically valid. In almost all instances, it was simply replacing
"resp." with "or," which the original author (Lennart?) could probably
just do in the future.

The only other instances of "resp." are in the src/ subtree, which I
don't feel privileged to correct.
Signed-off-by: default avatarAndrew Eikum <aeikum@codeweavers.com>
parent edfb521a
......@@ -740,7 +740,7 @@
directory returned by <command>pkg-config
systemd
--variable=systemdsystemunitdir</command> (for
system services), resp. <command>pkg-config
system services) or <command>pkg-config
systemd
--variable=systemduserunitdir</command>
(for user services). This will make the
......
......@@ -275,9 +275,9 @@
<term><option>--until=</option></term>
<listitem><para>Start showing entries
newer or of the specified date,
resp. older or of the specified
date. Date specifications should be of
on or newer than the specified date,
or on or older than the specified
date, respectively. Date specifications should be of
the format "2012-10-30 18:17:16". If
the time part is omitted, 00:00:00 is
assumed. If only the seconds component
......@@ -290,14 +290,14 @@
<literal>tomorrow</literal> are
understood, which refer to 00:00:00 of
the day before the current day, the
current day, resp the day after the
current day. <literal>now</literal>
current day, or the day after the
current day, respectively. <literal>now</literal>
refers to the current time. Finally,
relative times may be specified,
prefixed with <literal>-</literal> or
<literal>+</literal>, referring to
times before resp. after the current
time.</para></listitem>
times before or after the current
time, respectively.</para></listitem>
</varlistentry>
<varlistentry>
......
......@@ -279,8 +279,8 @@
URLs are intended to be exposed in
"About this system" UIs behind links
with captions such as "About this
Operating System", "Obtain Support"
resp. "Report a Bug". The values should
Operating System", "Obtain Support",
and "Report a Bug". The values should
be in <ulink
url="https://tools.ietf.org/html/rfc3986">RFC3986
format</ulink>, and should be
......
......@@ -139,7 +139,7 @@
check the liberally licensed reference implementation
sources:
<ulink url="http://cgit.freedesktop.org/systemd/systemd/plain/src/libsystemd-daemon/sd-daemon.c"/>
resp. <ulink url="http://cgit.freedesktop.org/systemd/systemd/plain/src/systemd/sd-daemon.h"/></para>
and <ulink url="http://cgit.freedesktop.org/systemd/systemd/plain/src/systemd/sd-daemon.h"/></para>
<para>These APIs are implemented in the reference
implementation's <filename>sd-daemon.c</filename> and
......
......@@ -87,7 +87,7 @@
check the liberally licensed reference implementation
sources:
<ulink url="http://cgit.freedesktop.org/systemd/systemd/plain/src/readahead/sd-readahead.c"/>
resp. <ulink url="http://cgit.freedesktop.org/systemd/systemd/plain/src/systemd/sd-readahead.h"/></para>
and <ulink url="http://cgit.freedesktop.org/systemd/systemd/plain/src/systemd/sd-readahead.h"/></para>
<para>These APIs are implemented in the reference
implementation's drop-in
......
......@@ -94,7 +94,7 @@
<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"/>
resp. <ulink
and <ulink
url="http://cgit.freedesktop.org/systemd/systemd/plain/src/systemd/sd-daemon.h"/></para>
<para><function>sd_booted()</function> is implemented
......
......@@ -181,7 +181,7 @@
<para>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"/>
resp. <ulink
and <ulink
url="http://cgit.freedesktop.org/systemd/systemd/plain/src/systemd/sd-daemon.h"/></para>
<para><function>sd_is_fifo()</function> and the
......
......@@ -140,8 +140,8 @@
<para>The four calls return the number of entries
advanced/set back on success or a negative errno-style
error code. When the end (resp. beginning) of the journal
is reached a number smaller than requested is
error code. When the end or beginning of the journal
is reached, a number smaller than requested is
returned. More specifically, if
<function>sd_journal_next()</function> or
<function>sd_journal_previous()</function> reach the
......
......@@ -142,7 +142,7 @@
<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"/>
resp. <ulink
and <ulink
url="http://cgit.freedesktop.org/systemd/systemd/plain/src/systemd/sd-daemon.h"/></para>
<para><function>sd_listen_fds()</function> is
......
......@@ -228,7 +228,7 @@
<para>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"/>
resp. <ulink
and <ulink
url="http://cgit.freedesktop.org/systemd/systemd/plain/src/systemd/sd-daemon.h"/></para>
<para><function>sd_notify()</function> and
......
......@@ -130,7 +130,7 @@
<para>For details about the algorithm check the
liberally licensed reference implementation sources:
<ulink url="http://cgit.freedesktop.org/systemd/systemd/plain/src/readahead/sd-readahead.c"/>
resp. <ulink
and <ulink
url="http://cgit.freedesktop.org/systemd/systemd/plain/src/systemd/sd-readahead.h"/></para>
<para><function>sd_readahead()</function> is
......
......@@ -79,8 +79,8 @@
<para>Note that these services invoke
<citerefentry><refentrytitle>systemd-tty-ask-password-agent</refentrytitle><manvolnum>1</manvolnum></citerefentry>
with the <command>--watch --console</command>
resp. <command>--watch --wall</command> command line
with either the <command>--watch --console</command>
or <command>--watch --wall</command> command line
parameters.</para>
</refsect1>
......
......@@ -120,7 +120,7 @@
<literal>warning</literal>,
<literal>notice</literal>,
<literal>info</literal>,
<literal>debug</literal>, resp. a
<literal>debug</literal>, or a
value between 0 and 7 (corresponding
to the same named levels). These
priority values are the same as
......
......@@ -238,19 +238,19 @@
<term>m</term>
<term>i</term>
<listitem><para>Change ordering of control groups
<listitem><para>Sort the control groups
by path, number of tasks, CPU load,
memory usage resp. IO
load.</para></listitem>
memory usage, or IO
load, respectively.</para></listitem>
</varlistentry>
<varlistentry>
<term>+</term>
<term>-</term>
<listitem><para>Increase,
resp. decrease refresh
delay.</para></listitem>
<listitem><para>Increase
or decrease refresh
delay, respectively.</para></listitem>
</varlistentry>
</variablelist>
......
......@@ -114,9 +114,10 @@
for inhibiting
reboot/power-off/halt/kexec,
suspending/hibernating, the automatic
idle detection, resp. the low-level
idle detection, or the low-level
handling of the power/sleep key and
the lid switch. If omitted defaults to
the lid switch, respectively. If omitted,
defaults to
<literal>idle:sleep:shutdown</literal>.</para></listitem>
</varlistentry>
......
......@@ -75,7 +75,7 @@
for more information on the specific unit
configuration files. The execution specific
configuration options are configured in the [Service],
[Socket], [Mount] resp. [Swap] section, depending on the unit
[Socket], [Mount], or [Swap] sections, depending on the unit
type.</para>
</refsect1>
......@@ -117,10 +117,10 @@
<term><varname>Group=</varname></term>
<listitem><para>Sets the Unix user
resp. group the processes are executed
as. Takes a single user resp. group
or group that the processes are executed
as, respectively. Takes a single user or group
name or ID as argument. If no group is
set the default group of the user is
set, the default group of the user is
chosen.</para></listitem>
</varlistentry>
......@@ -868,8 +868,8 @@
the value is suffixed with K, M, G or
T the specified memory size is parsed
as Kilobytes, Megabytes, Gigabytes,
resp. Terabytes (to the base
1024). This controls the
or Terabytes (to the base
1024), respectively. This controls the
<literal>memory.limit_in_bytes</literal>
and
<literal>memory.soft_limit_in_bytes</literal>
......@@ -889,9 +889,9 @@
path (such as
<filename>/dev/null</filename>)
followed by a combination of r, w, m
to control reading, writing resp.
to control reading, writing, or
creating of the specific device node
by the unit. This controls the
by the unit, respectively. This controls the
<literal>devices.allow</literal>
and
<literal>devices.deny</literal>
......@@ -948,7 +948,7 @@
If the bandwidth is suffixed with K, M,
G, or T the specified bandwidth is
parsed as Kilobytes, Megabytes,
Gigabytes, resp. Terabytes (Example:
Gigabytes, or Terabytes, respectively (Example:
"/dev/disk/by-path/pci-0000:00:1f.2-scsi-0:0:0:0
5M"). This controls the
<literal>blkio.read_bps_device</literal>
......
......@@ -298,8 +298,8 @@
journal protocol, for the
those read from a services'
standard output or error
output, and for those read
from the kernel, resp.
output, or for those read
from the kernel, respectively.
</para>
</listitem>
</varlistentry>
......
......@@ -75,7 +75,7 @@
for more information on the specific unit
configuration files. The execution specific
configuration options are configured in the [Service],
[Socket], [Mount] resp. [Swap] section, depending on the unit
[Socket], [Mount], or [Swap] section, depending on the unit
type.</para>
</refsect1>
......
......@@ -372,9 +372,9 @@
<term><varname>ExecStartPre=</varname></term>
<term><varname>ExecStartPost=</varname></term>
<listitem><para>Additional commands
that are executed before (resp. after)
that are executed before or after
the command in
<varname>ExecStart=</varname>. Multiple
<varname>ExecStart=</varname>, respectively. Multiple
command lines may be concatenated in a
single directive, by separating them
by semicolons (these semicolons must
......
......@@ -150,9 +150,9 @@
<term><varname>ListenSequentialPacket=</varname></term>
<listitem><para>Specifies an address
to listen on for a stream
(SOCK_STREAM), datagram (SOCK_DGRAM)
resp. sequential packet
(SOCK_SEQPACKET) socket. The address
(SOCK_STREAM), datagram (SOCK_DGRAM),
or sequential packet
(SOCK_SEQPACKET) socket, respectively. The address
can be written in various formats:</para>
<para>If the address starts with a
......@@ -434,9 +434,9 @@
<term><varname>SendBuffer=</varname></term>
<listitem><para>Takes an integer
argument controlling the receive
resp. send buffer sizes of this
socket. This controls the SO_RCVBUF
resp. SO_SNDBUF socket options (see
or send buffer sizes of this
socket, respectively. This controls the SO_RCVBUF
and SO_SNDBUF socket options (see
<citerefentry><refentrytitle>socket</refentrytitle><manvolnum>7</manvolnum></citerefentry>
for details.).</para></listitem>
</varlistentry>
......@@ -499,7 +499,7 @@
<varname>MessageQueueMessageSize=</varname></term>
<listitem><para>These two settings
take integer values and control the
mq_maxmsg resp. mq_msgsize field when
mq_maxmsg field or the mq_msgsize field, respectively, when
creating the message queue. Note that
either none or both of these variables
need to be set. See
......@@ -581,9 +581,9 @@
<term><varname>ExecStartPost=</varname></term>
<listitem><para>Takes one or more
command lines, which are executed
before (resp. after) the listening
before or after the listening
sockets/FIFOs are created and
bound. The first token of the command
bound, respectively. The first token of the command
line must be an absolute file name,
then followed by arguments for the
process. Multiple command lines may be
......@@ -597,9 +597,9 @@
<term><varname>ExecStopPre=</varname></term>
<term><varname>ExecStopPost=</varname></term>
<listitem><para>Additional commands
that are executed before (resp. after)
that are executed before or after
the listening sockets/FIFOs are closed
and removed. Multiple command lines
and removed, respectively. Multiple command lines
may be specified following the same
scheme as used for
<varname>ExecStartPre=</varname> of
......
......@@ -78,7 +78,7 @@
terminated.</para>
<para>Swap units must be named after the devices
(resp. files) they control. Example: the swap device
or files they control. Example: the swap device
<filename>/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
......@@ -86,8 +86,8 @@
<citerefentry><refentrytitle>systemd.unit</refentrytitle><manvolnum>5</manvolnum></citerefentry>.</para>
<para>All swap units automatically get the appropriate
dependencies on the devices (resp. on the mount points
of the files) they are activated from.</para>
dependencies on the devices or on the mount points
of the files they are activated from.</para>
<para>Swap units with
<varname>DefaultDependencies=</varname> enabled
......
......@@ -77,8 +77,8 @@
<para>This man pages lists the common configuration
options of all the unit types. These options need to
be configured in the [Unit] resp. [Install]
section of the unit files.</para>
be configured in the [Unit] or [Install]
sections of the unit files.</para>
<para>In addition to the generic [Unit] and [Install]
sections described here, each unit should have a
......@@ -418,7 +418,7 @@
<listitem><para>Similar to
<varname>Requires=</varname>
resp. <varname>RequiresOverridable=</varname>. However,
and <varname>RequiresOverridable=</varname>, respectively. However,
if a unit listed here is not started
already it will not be started and the
transaction fails
......@@ -566,7 +566,7 @@
<varname>Before=</varname>. If two
units have no ordering dependencies
between them they are shut down
resp. started up simultaneously, and
or started up simultaneously, and
no ordering takes
place. </para></listitem>
</varlistentry>
......@@ -672,13 +672,13 @@
<listitem><para>Takes a boolean
argument. If <option>true</option>
this unit can only be activated
(resp. deactivated) indirectly. In
or deactivated indirectly. In
this case explicit start-up
(resp. termination) requested by the
or termination requested by the
user is denied, however if it is
started (resp. stopped) as a
started or stopped as a
dependency of another unit, start-up
(resp. termination) will succeed. This
or termination will succeed. This
is mostly a safety feature to ensure
that the user does not accidentally
activate units that are not intended
......@@ -1023,8 +1023,8 @@
<listitem><para>Installs a symlink in
the <filename>.wants/</filename>
resp. <filename>.requires/</filename>
subdirectory for a unit. This has the
or <filename>.requires/</filename>
subdirectory for a unit, respectively. This has the
effect that when the listed unit name
is activated the unit listing it is
activated
......
......@@ -144,11 +144,13 @@
<term><option>--system</option></term>
<term><option>--user</option></term>
<listitem><para>Tell systemd to run a
system instance (resp. user
instance), even if the process ID is
not 1 (resp. is 1), i.e. systemd is
not (resp. is) run as init process.
<listitem><para>For <option>--system</option>,
tell systemd to run a
system instance, even if the process ID is
not 1, i.e. systemd is not run as init process.
<option>--user</option> does the opposite,
running a user instance even if the process
ID is 1.
Normally it should not be necessary to
pass these options, as systemd
automatically detects the mode it is
......@@ -251,11 +253,11 @@
<term><option>--default-standard-error=</option></term>
<listitem><para>Sets the default
output resp. error output for all
services and sockets, i.e. controls
output or error output for all
services and sockets, respectively. That is, controls
the default for
<option>StandardOutput=</option>
resp. <option>StandardError=</option>
and <option>StandardError=</option>
(see
<citerefentry><refentrytitle>systemd.exec</refentrytitle><manvolnum>5</manvolnum></citerefentry>
for details). Takes one of
......@@ -495,12 +497,12 @@
Specification</ulink>.</para>
<para>Systems which invoke systemd in a container
resp. initrd environment should implement the
or initrd environment should implement the
<ulink
url="http://www.freedesktop.org/wiki/Software/systemd/ContainerInterface">Container
Interface</ulink> resp. <ulink
Interface</ulink> or <ulink
url="http://www.freedesktop.org/wiki/Software/systemd/InitrdInterface">initrd
Interface</ulink> specifications.</para>
Interface</ulink> specifications, respectively.</para>
</refsect1>
<refsect1>
......@@ -825,11 +827,11 @@
<listitem><para>Sets the log level to
<literal>debug</literal>
(resp. <literal>info</literal> on
(or <literal>info</literal> on
<literal>SIGRTMIN+23</literal>), as
controlled via
<varname>systemd.log_level=debug</varname>
(resp. <varname>systemd.log_level=info</varname>
(or <varname>systemd.log_level=info</varname>
on <literal>SIGRTMIN+23</literal>) on
the kernel command
line.</para></listitem>
......@@ -843,19 +845,19 @@
<listitem><para>Sets the log level to
<literal>journal-or-kmsg</literal>
(resp. <literal>console</literal> on
<literal>SIGRTMIN+27</literal>;
resp. <literal>kmsg</literal> on
<literal>SIGRTMIN+28</literal>;
resp. <literal>syslog-or-kmsg</literal>
(or <literal>console</literal> on
<literal>SIGRTMIN+27</literal>,
<literal>kmsg</literal> on
<literal>SIGRTMIN+28</literal>,
or <literal>syslog-or-kmsg</literal>
on <literal>SIGRTMIN+29</literal>), as
controlled via
<varname>systemd.log_target=journal-or-kmsg</varname>
(resp. <varname>systemd.log_target=console</varname>
on <literal>SIGRTMIN+27</literal>;
resp. <varname>systemd.log_target=kmsg</varname>
on <literal>SIGRTMIN+28</literal>;
resp
(or <varname>systemd.log_target=console</varname>
on <literal>SIGRTMIN+27</literal>,
<varname>systemd.log_target=kmsg</varname>
on <literal>SIGRTMIN+28</literal>,
or
<varname>systemd.log_target=syslog-or-kmsg</varname>
on <literal>SIGRTMIN+29</literal>) on
the kernel command
......@@ -1073,12 +1075,12 @@
<term><varname>systemd.default_standard_output=</varname></term>
<term><varname>systemd.default_standard_error=</varname></term>
<listitem><para>Controls default
standard output/error output for
standard output and error output for
services, with the same effect as the
<option>--default-standard-output=</option>
resp. <option>--default-standard-error=</option>
and <option>--default-standard-error=</option>
command line arguments described
above.</para></listitem>
above, respectively.</para></listitem>
</varlistentry>
<varlistentry>
......@@ -1143,12 +1145,12 @@
<term><varname>5</varname></term>
<listitem><para>Boot into the
specified legacy SysV runlevel. This
is equivalent to
specified legacy SysV runlevel. These
are equivalent to
<varname>systemd.unit=runlevel2.target</varname>,
<varname>systemd.unit=runlevel3.target</varname>,
<varname>systemd.unit=runlevel4.target</varname>,
resp. <varname>systemd.unit=runlevel5.target</varname>
and <varname>systemd.unit=runlevel5.target</varname>, respectively,
and provided for compatibility reasons
and to be easier to
type.</para></listitem>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment