From dca348bcbb462305864526c587495a14a76bfcde Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 8 May 2014 01:28:44 +0200 Subject: [PATCH] doc: corrections to words and forms This patch exchange words which are inappropriate for a situation, deletes duplicated words, and adds particles where needed. --- NEWS | 2 +- man/sd_bus_message_append_string_memfd.xml | 4 ++-- man/sd_bus_message_append_strv.xml | 4 ++-- man/sd_bus_open_user.xml | 4 ++-- man/sd_bus_path_encode.xml | 4 ++-- man/sd_event_new.xml | 2 +- man/systemctl.xml | 2 +- man/systemd-gpt-auto-generator.xml | 4 ++-- man/systemd-journal-remote.xml | 8 ++++---- man/systemd-nspawn.xml | 2 +- man/systemd-run.xml | 2 +- man/systemd.exec.xml | 6 +++--- man/systemd.link.xml | 2 +- man/systemd.socket.xml | 2 +- src/core/unit-printf.c | 2 +- 15 files changed, 25 insertions(+), 25 deletions(-) diff --git a/NEWS b/NEWS index ac2cf4130..1b548f503 100644 --- a/NEWS +++ b/NEWS @@ -2348,7 +2348,7 @@ CHANGES WITH 190: dir: %_presetdir. * journald will now warn if it ca not forward a message to the - syslog daemon because it's socket is full. + syslog daemon because its socket is full. * timedated will no longer write or process /etc/timezone, except on Debian. As we do not support late mounted /usr diff --git a/man/sd_bus_message_append_string_memfd.xml b/man/sd_bus_message_append_string_memfd.xml index a9b892480..bf185ef6d 100644 --- a/man/sd_bus_message_append_string_memfd.xml +++ b/man/sd_bus_message_append_string_memfd.xml @@ -115,8 +115,8 @@ along with systemd; If not, see . space for a string to message m. If behaves similarly to sd_bus_message_append_basic with type s, but instead of copying a string into - the the message, it returns a pointer to the destination area to - the caller in pointer p. Space for string + the message, it returns a pointer to the destination area to + the caller in pointer p. Space for the string of length size plus the terminating NUL is allocated. diff --git a/man/sd_bus_message_append_strv.xml b/man/sd_bus_message_append_strv.xml index 048bbcac0..4fb1390df 100644 --- a/man/sd_bus_message_append_strv.xml +++ b/man/sd_bus_message_append_strv.xml @@ -77,8 +77,8 @@ along with systemd; If not, see . The memory pointed at by p and the contents of the strings themselves are copied into the memory area containing the message and may be changed after this call. Note - that the signature of l parameter is be - treated as const char* const*, and the the contents + that the signature of l parameter is to be + treated as const char *const *, and the contents will not be modified. diff --git a/man/sd_bus_open_user.xml b/man/sd_bus_open_user.xml index 7fa1be61e..740977e1c 100644 --- a/man/sd_bus_open_user.xml +++ b/man/sd_bus_open_user.xml @@ -96,13 +96,13 @@ along with systemd; If not, see . Description sd_bus_open_user() creates a new bus - object and opens a connection to the the user bus. + object and opens a connection to the user bus. sd_bus_open_system() does the same, but connects to the system bus. If the $DBUS_SESSION_BUS_ADDRESS environment variable is set - (c.f. environ7), + (cf. environ7), it will be used as the address of the user bus. This variable can contain multiple addresses separated by ;. If this variable is not set, a suitable default for the default user diff --git a/man/sd_bus_path_encode.xml b/man/sd_bus_path_encode.xml index 7cb8e77bc..7e1190687 100644 --- a/man/sd_bus_path_encode.xml +++ b/man/sd_bus_path_encode.xml @@ -101,11 +101,11 @@ along with systemd; If not, see . takes a bus path and a prefix string, plus a place to store the returned external identifier string. If the bus path does not start with the specified prefix, 0 is returned and the returned - string is set to NULL. Otherwise the the + string is set to NULL. Otherwise the string following the prefix is unescaped and returned in the external identifier string. - The escaping used will will replace all characters which are + The escaping used will replace all characters which are invalid in a bus object path by _ followed by a hexadecimal value. As a special case, the empty string will be replaced by a lone _. diff --git a/man/sd_event_new.xml b/man/sd_event_new.xml index 6545cde7c..f25631f9c 100644 --- a/man/sd_event_new.xml +++ b/man/sd_event_new.xml @@ -109,7 +109,7 @@ along with systemd; If not, see . sd_event_unref() decreases the reference counter of the specified event loop object by one. If the counter hits zero the event loop object is freed. Note that it - is freed regardless if it is the default event loop object of a + is freed regardless of whether it is the default event loop object for a thread or not. This means that allocating an event loop with sd_event_default(), then releasing it and then acquiring a new one with diff --git a/man/systemctl.xml b/man/systemctl.xml index 94f238041..28a7cca0e 100644 --- a/man/systemctl.xml +++ b/man/systemctl.xml @@ -724,7 +724,7 @@ kobject-uevent 1 systemd-udevd-kernel.socket systemd-udevd.service Show terse runtime status information about one or more units, followed by most recent log data from the journal. If no units are specified, show system status. If - combined with also shows status of + combined with also show the status of all units (subject to limitations specified with ). If a PID is passed, show information about the unit the process belongs to. diff --git a/man/systemd-gpt-auto-generator.xml b/man/systemd-gpt-auto-generator.xml index 32e118333..41b83dd38 100644 --- a/man/systemd-gpt-auto-generator.xml +++ b/man/systemd-gpt-auto-generator.xml @@ -60,7 +60,7 @@ is a unit generator that automatically discovers root, /home, /srv and swap partitions and creates mount and swap units - for them, based on the the partition type GUIDs of + for them, based on the partition type GUIDs of GUID partition tables (GPT). It implements the Discoverable Partitions Specification. Note that this @@ -75,7 +75,7 @@ Partition (ESP) is located on. It will only look for the other partitions on the same physical disk the root file system is located on. These partitions will - not be search on systems where the root file system is + not be searched on systems where the root file system is distributed on multiple disks, for example via btrfs RAID. diff --git a/man/systemd-journal-remote.xml b/man/systemd-journal-remote.xml index 40bef05a1..1f0d93e2f 100644 --- a/man/systemd-journal-remote.xml +++ b/man/systemd-journal-remote.xml @@ -79,7 +79,7 @@ along with systemd; If not, see . (systemd-journal-remote requests and pulls the data), or "passive" (systemd-journal-remote waits for a - connection and than receives events pushed by the other side). + connection and then receives events pushed by the other side). @@ -131,7 +131,7 @@ along with systemd; If not, see . ADDRESS must be an - address suitable for (c.f. + address suitable for (cf. systemd.socket5). systemd-journal-remote will listen on this socket for connections. Each connection is expected to be a @@ -195,8 +195,8 @@ along with systemd; If not, see . end with .journal. The file will be created if it does not exist. When necessary (journal file full, or corrupted) the file will be renamed following normal - journald rules and a new journal file will be created in it's - stead. + journald rules and a new journal file will be created in its + stead. diff --git a/man/systemd-nspawn.xml b/man/systemd-nspawn.xml index 18946167c..1ad8e6ec0 100644 --- a/man/systemd-nspawn.xml +++ b/man/systemd-nspawn.xml @@ -340,7 +340,7 @@ container's name (as specified with ), prefixed with ve-. The - container side of the the Ethernet + container side of the Ethernet link will be named host0. Note that diff --git a/man/systemd-run.xml b/man/systemd-run.xml index 8bb587cf7..9ca17df55 100644 --- a/man/systemd-run.xml +++ b/man/systemd-run.xml @@ -121,7 +121,7 @@ along with systemd; If not, see . - Provide description for the service or scope + Provide a description for the service or scope unit. If not specified, the command itself will be used as a description. See Description= in systemd.unit5. diff --git a/man/systemd.exec.xml b/man/systemd.exec.xml index d206d4f64..f79489494 100644 --- a/man/systemd.exec.xml +++ b/man/systemd.exec.xml @@ -341,7 +341,7 @@ The files listed with this directive will be read shortly before the process is executed (more - specifically, this means after all + specifically, after all processes from a previous unit state terminated. This means you can generate these files in one unit @@ -1022,7 +1022,7 @@ AppArmorProfile= - Take a profile name as argument. + Takes a profile name as argument. The process executed by the unit will switch to this profile when started. Profiles must already be loaded in the kernel, or the unit will fail. @@ -1427,7 +1427,7 @@ systemd.setenv= (see systemd1). Additional variables may also be set through PAM, - c.f. pam_env8. + cf. pam_env8. diff --git a/man/systemd.link.xml b/man/systemd.link.xml index 2f5de2374..1bee07cf1 100644 --- a/man/systemd.link.xml +++ b/man/systemd.link.xml @@ -186,7 +186,7 @@ If the hardware has a persistent MAC address, as most hardware should, - and this is used by the kernel, nothing + and if it is used by the kernel, nothing is done. Otherwise, a new MAC address is generated which is guaranteed to be the same on every boot for the given diff --git a/man/systemd.socket.xml b/man/systemd.socket.xml index d645de45e..c0d7906d7 100644 --- a/man/systemd.socket.xml +++ b/man/systemd.socket.xml @@ -571,7 +571,7 @@ PipeSize= - Takes an size in + Takes a size in bytes. Controls the pipe buffer size of FIFOs configured in this socket unit. See diff --git a/src/core/unit-printf.c b/src/core/unit-printf.c index 4e18afab8..d16d856b5 100644 --- a/src/core/unit-printf.c +++ b/src/core/unit-printf.c @@ -369,7 +369,7 @@ int unit_full_printf(Unit *u, const char *format, char **ret) { /* This is similar to unit_name_printf() but also supports * unescaping. Also, adds a couple of additional codes: * - * %f the the instance if set, otherwise the id + * %f the instance if set, otherwise the id * %c cgroup path of unit * %r where units in this slice are placed in the cgroup tree * %R the root of this systemd's instance tree -- 2.30.2