Reword sentences that contain psuedo-English "resp."

aeikum · poettering · commit 16dad32e437f · 2012-10-16T01:03:01.000+02:00
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: Andrew Eikum <aeikum@codeweavers.com>
diff --git a/man/daemon.xml b/man/daemon.xml
@@ -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
diff --git a/man/journalctl.xml b/man/journalctl.xml
@@ -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>
diff --git a/man/os-release.xml b/man/os-release.xml
@@ -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
diff --git a/man/sd-daemon.xml b/man/sd-daemon.xml
@@ -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
diff --git a/man/sd-readahead.xml b/man/sd-readahead.xml
@@ -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
diff --git a/man/sd_booted.xml b/man/sd_booted.xml
@@ -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
diff --git a/man/sd_is_fifo.xml b/man/sd_is_fifo.xml
@@ -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
diff --git a/man/sd_journal_next.xml b/man/sd_journal_next.xml
@@ -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
diff --git a/man/sd_listen_fds.xml b/man/sd_listen_fds.xml
@@ -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
diff --git a/man/sd_notify.xml b/man/sd_notify.xml
@@ -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
diff --git a/man/sd_readahead.xml b/man/sd_readahead.xml
@@ -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
diff --git a/man/systemd-ask-password-console.service.xml b/man/systemd-ask-password-console.service.xml
@@ -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>
 
diff --git a/man/systemd-cat.xml b/man/systemd-cat.xml
@@ -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
diff --git a/man/systemd-cgtop.xml b/man/systemd-cgtop.xml
@@ -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>
diff --git a/man/systemd-inhibit.xml b/man/systemd-inhibit.xml
@@ -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>
 
diff --git a/man/systemd.exec.xml b/man/systemd.exec.xml
@@ -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>
diff --git a/man/systemd.journal-fields.xml b/man/systemd.journal-fields.xml
@@ -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>
diff --git a/man/systemd.kill.xml b/man/systemd.kill.xml
@@ -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>
 
diff --git a/man/systemd.service.xml b/man/systemd.service.xml
@@ -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
diff --git a/man/systemd.socket.xml b/man/systemd.socket.xml
@@ -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
diff --git a/man/systemd.swap.xml b/man/systemd.swap.xml
@@ -78,16 +78,16 @@
                 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
                 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
-                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
diff --git a/man/systemd.unit.xml b/man/systemd.unit.xml
diff --git a/man/systemd.xml b/man/systemd.xml
