From 16dad32e437fdf2ffca03cc60a083d84bd31886f Mon Sep 17 00:00:00 2001 From: Andrew Eikum Date: Mon, 15 Oct 2012 13:59:12 -0500 Subject: [PATCH 1/1] 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: 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 --- man/daemon.xml | 2 +- man/journalctl.xml | 14 ++--- man/os-release.xml | 4 +- man/sd-daemon.xml | 2 +- man/sd-readahead.xml | 2 +- man/sd_booted.xml | 2 +- man/sd_is_fifo.xml | 2 +- man/sd_journal_next.xml | 4 +- man/sd_listen_fds.xml | 2 +- man/sd_notify.xml | 2 +- man/sd_readahead.xml | 2 +- man/systemd-ask-password-console.service.xml | 4 +- man/systemd-cat.xml | 2 +- man/systemd-cgtop.xml | 12 ++-- man/systemd-inhibit.xml | 5 +- man/systemd.exec.xml | 18 +++--- man/systemd.journal-fields.xml | 4 +- man/systemd.kill.xml | 2 +- man/systemd.service.xml | 4 +- man/systemd.socket.xml | 22 +++---- man/systemd.swap.xml | 6 +- man/systemd.unit.xml | 20 +++---- man/systemd.xml | 60 ++++++++++---------- 23 files changed, 100 insertions(+), 97 deletions(-) diff --git a/man/daemon.xml b/man/daemon.xml index e3c038e46..197138e51 100644 --- a/man/daemon.xml +++ b/man/daemon.xml @@ -740,7 +740,7 @@ directory returned by pkg-config systemd --variable=systemdsystemunitdir (for - system services), resp. pkg-config + system services) or pkg-config systemd --variable=systemduserunitdir (for user services). This will make the diff --git a/man/journalctl.xml b/man/journalctl.xml index 3786fdf51..0bbcee33a 100644 --- a/man/journalctl.xml +++ b/man/journalctl.xml @@ -275,9 +275,9 @@ 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 @@ tomorrow 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. now + current day, or the day after the + current day, respectively. now refers to the current time. Finally, relative times may be specified, prefixed with - or +, referring to - times before resp. after the current - time. + times before or after the current + time, respectively. diff --git a/man/os-release.xml b/man/os-release.xml index 5e34a884b..98320efe3 100644 --- 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 RFC3986 format, and should be diff --git a/man/sd-daemon.xml b/man/sd-daemon.xml index 1e1734adf..a3bf662fe 100644 --- a/man/sd-daemon.xml +++ b/man/sd-daemon.xml @@ -139,7 +139,7 @@ check the liberally licensed reference implementation sources: - resp. + and These APIs are implemented in the reference implementation's sd-daemon.c and diff --git a/man/sd-readahead.xml b/man/sd-readahead.xml index 484e1273b..cebaa5da2 100644 --- a/man/sd-readahead.xml +++ b/man/sd-readahead.xml @@ -87,7 +87,7 @@ check the liberally licensed reference implementation sources: - resp. + and These APIs are implemented in the reference implementation's drop-in diff --git a/man/sd_booted.xml b/man/sd_booted.xml index 3567d585a..34f2cbfbc 100644 --- a/man/sd_booted.xml +++ b/man/sd_booted.xml @@ -94,7 +94,7 @@ For details about the algorithm check the liberally licensed reference implementation sources: - resp. sd_booted() is implemented diff --git a/man/sd_is_fifo.xml b/man/sd_is_fifo.xml index a98122b1b..27e9a0de8 100644 --- a/man/sd_is_fifo.xml +++ b/man/sd_is_fifo.xml @@ -181,7 +181,7 @@ For details about the algorithms check the liberally licensed reference implementation sources: - resp. sd_is_fifo() and the diff --git a/man/sd_journal_next.xml b/man/sd_journal_next.xml index 95429fa6f..58e7cec6f 100644 --- a/man/sd_journal_next.xml +++ b/man/sd_journal_next.xml @@ -140,8 +140,8 @@ 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 sd_journal_next() or sd_journal_previous() reach the diff --git a/man/sd_listen_fds.xml b/man/sd_listen_fds.xml index 649b1995a..b891b6b03 100644 --- a/man/sd_listen_fds.xml +++ b/man/sd_listen_fds.xml @@ -142,7 +142,7 @@ For details about the algorithm check the liberally licensed reference implementation sources: - resp. sd_listen_fds() is diff --git a/man/sd_notify.xml b/man/sd_notify.xml index 346ec8f90..5f86e86fe 100644 --- a/man/sd_notify.xml +++ b/man/sd_notify.xml @@ -228,7 +228,7 @@ For details about the algorithms check the liberally licensed reference implementation sources: - resp. sd_notify() and diff --git a/man/sd_readahead.xml b/man/sd_readahead.xml index ff7b35574..a1fc6f178 100644 --- a/man/sd_readahead.xml +++ b/man/sd_readahead.xml @@ -130,7 +130,7 @@ For details about the algorithm check the liberally licensed reference implementation sources: - resp. sd_readahead() is diff --git a/man/systemd-ask-password-console.service.xml b/man/systemd-ask-password-console.service.xml index 6ca94360a..6c87feb17 100644 --- a/man/systemd-ask-password-console.service.xml +++ b/man/systemd-ask-password-console.service.xml @@ -79,8 +79,8 @@ Note that these services invoke systemd-tty-ask-password-agent1 - with the --watch --console - resp. --watch --wall command line + with either the --watch --console + or --watch --wall command line parameters. diff --git a/man/systemd-cat.xml b/man/systemd-cat.xml index 54e28726c..cac275b45 100644 --- a/man/systemd-cat.xml +++ b/man/systemd-cat.xml @@ -120,7 +120,7 @@ warning, notice, info, - debug, resp. a + debug, 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 index 112e5fff8..7a34512b2 100644 --- a/man/systemd-cgtop.xml +++ b/man/systemd-cgtop.xml @@ -238,19 +238,19 @@ m i - Change ordering of control groups + Sort the control groups by path, number of tasks, CPU load, - memory usage resp. IO - load. + memory usage, or IO + load, respectively. + - - Increase, - resp. decrease refresh - delay. + Increase + or decrease refresh + delay, respectively. diff --git a/man/systemd-inhibit.xml b/man/systemd-inhibit.xml index 1218836cb..5f26c9654 100644 --- 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 idle:sleep:shutdown. diff --git a/man/systemd.exec.xml b/man/systemd.exec.xml index 7ab9b5c1e..3491d877d 100644 --- 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. @@ -117,10 +117,10 @@ Group= 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. @@ -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 memory.limit_in_bytes and memory.soft_limit_in_bytes @@ -889,9 +889,9 @@ path (such as /dev/null) 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 devices.allow and devices.deny @@ -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 blkio.read_bps_device diff --git a/man/systemd.journal-fields.xml b/man/systemd.journal-fields.xml index d1cb40bb1..e212c811f 100644 --- 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. diff --git a/man/systemd.kill.xml b/man/systemd.kill.xml index 330053404..3fff2f57e 100644 --- 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. diff --git a/man/systemd.service.xml b/man/systemd.service.xml index 339dea9aa..11f600663 100644 --- a/man/systemd.service.xml +++ b/man/systemd.service.xml @@ -372,9 +372,9 @@ ExecStartPre= ExecStartPost= Additional commands - that are executed before (resp. after) + that are executed before or after the command in - ExecStart=. Multiple + ExecStart=, 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 index 7885b0748..9db39b1de 100644 --- a/man/systemd.socket.xml +++ b/man/systemd.socket.xml @@ -150,9 +150,9 @@ ListenSequentialPacket= 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: If the address starts with a @@ -434,9 +434,9 @@ SendBuffer= 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 socket7 for details.). @@ -499,7 +499,7 @@ MessageQueueMessageSize= 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 @@ ExecStartPost= 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 @@ ExecStopPre= ExecStopPost= 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 ExecStartPre= of diff --git a/man/systemd.swap.xml b/man/systemd.swap.xml index 5eb008dfc..a932143d4 100644 --- a/man/systemd.swap.xml +++ b/man/systemd.swap.xml @@ -78,7 +78,7 @@ terminated. Swap units must be named after the devices - (resp. files) they control. Example: the swap device + or files they control. Example: the swap device /dev/sda5 must be configured in a unit file dev-sda5.swap. For details about the escaping logic used to convert a @@ -86,8 +86,8 @@ systemd.unit5. All swap units automatically get the appropriate - dependencies on the devices (resp. on the mount points - of the files) they are activated from. + dependencies on the devices or on the mount points + of the files they are activated from. Swap units with DefaultDependencies= enabled diff --git a/man/systemd.unit.xml b/man/systemd.unit.xml index 55569681c..afad56c5b 100644 --- a/man/systemd.unit.xml +++ b/man/systemd.unit.xml @@ -77,8 +77,8 @@ 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. + be configured in the [Unit] or [Install] + sections of the unit files. In addition to the generic [Unit] and [Install] sections described here, each unit should have a @@ -418,7 +418,7 @@ Similar to Requires= - resp. RequiresOverridable=. However, + and RequiresOverridable=, respectively. However, if a unit listed here is not started already it will not be started and the transaction fails @@ -566,7 +566,7 @@ Before=. 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. @@ -672,13 +672,13 @@ Takes a boolean argument. If 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 @@ Installs a symlink in the .wants/ - resp. .requires/ - subdirectory for a unit. This has the + or .requires/ + subdirectory for a unit, respectively. This has the effect that when the listed unit name is activated the unit listing it is activated diff --git a/man/systemd.xml b/man/systemd.xml index 01833f66f..f14e3eb9a 100644 --- a/man/systemd.xml +++ b/man/systemd.xml @@ -144,11 +144,13 @@ - 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. + For , + tell systemd to run a + system instance, even if the process ID is + not 1, i.e. systemd is not run as init process. + 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 @@ 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 - resp. + and (see systemd.exec5 for details). Takes one of @@ -495,12 +497,12 @@ Specification. Systems which invoke systemd in a container - resp. initrd environment should implement the + or initrd environment should implement the Container - Interface resp. or initrd - Interface specifications. + Interface specifications, respectively. @@ -825,11 +827,11 @@ Sets the log level to debug - (resp. info on + (or info on SIGRTMIN+23), as controlled via systemd.log_level=debug - (resp. systemd.log_level=info + (or systemd.log_level=info on SIGRTMIN+23) on the kernel command line. @@ -843,19 +845,19 @@ Sets the log level to journal-or-kmsg - (resp. console on - SIGRTMIN+27; - resp. kmsg on - SIGRTMIN+28; - resp. syslog-or-kmsg + (or console on + SIGRTMIN+27, + kmsg on + SIGRTMIN+28, + or syslog-or-kmsg on SIGRTMIN+29), as controlled via systemd.log_target=journal-or-kmsg - (resp. systemd.log_target=console - on SIGRTMIN+27; - resp. systemd.log_target=kmsg - on SIGRTMIN+28; - resp + (or systemd.log_target=console + on SIGRTMIN+27, + systemd.log_target=kmsg + on SIGRTMIN+28, + or systemd.log_target=syslog-or-kmsg on SIGRTMIN+29) on the kernel command @@ -1073,12 +1075,12 @@ systemd.default_standard_output= systemd.default_standard_error= Controls default - standard output/error output for + standard output and error output for services, with the same effect as the - resp. + and command line arguments described - above. + above, respectively. @@ -1143,12 +1145,12 @@ 5 Boot into the - specified legacy SysV runlevel. This - is equivalent to + specified legacy SysV runlevel. These + are equivalent to systemd.unit=runlevel2.target, systemd.unit=runlevel3.target, systemd.unit=runlevel4.target, - resp. systemd.unit=runlevel5.target + and systemd.unit=runlevel5.target, respectively, and provided for compatibility reasons and to be easier to type. -- 2.30.2