From 0923b4253c93ace134d06e6ecba8133b3e797616 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Sat, 15 Oct 2022 16:06:20 +0200 Subject: tree-wide: replace "plural(s)" by "plurals" (s) is just ugly with a vibe of DOS. In most cases just using the normal plural form is more natural and gramatically correct. There are some log_debug() statements left, and texts in foreign licenses or headers. Those are not touched on purpose. --- man/crypttab.xml | 2 +- man/hostnamectl.xml | 2 +- man/oomctl.xml | 2 +- man/portablectl.xml | 8 ++++---- man/systemd-analyze.xml | 8 ++++---- man/systemd-getty-generator.xml | 2 +- man/systemd-measure.xml | 2 +- man/systemd.path.xml | 2 +- man/systemd.resource-control.xml | 2 +- man/systemd.service.xml | 4 ++-- man/systemd.time.xml | 5 ++--- man/tmpfiles.d.xml | 4 ++-- man/udevadm.xml | 10 +++++----- 13 files changed, 26 insertions(+), 27 deletions(-) (limited to 'man') diff --git a/man/crypttab.xml b/man/crypttab.xml index 363691a007..cbbb8ab2a9 100644 --- a/man/crypttab.xml +++ b/man/crypttab.xml @@ -94,7 +94,7 @@ Most prominently, the user may be queried interactively during volume activation - (i.e. typically at boot), asking them to type in the necessary passphrase(s). + (i.e. typically at boot), asking them to type in the necessary passphrases. The (unencrypted) key may be read from a file on disk, possibly on removable media. The third field of each line encodes the location, for details see above. diff --git a/man/hostnamectl.xml b/man/hostnamectl.xml index 3697bbb474..6933c68e38 100644 --- a/man/hostnamectl.xml +++ b/man/hostnamectl.xml @@ -175,7 +175,7 @@ If status is invoked (or no explicit command is given) and one of these switches is specified, hostnamectl will print out just this selected hostname. - If used with set-hostname, only the selected hostname(s) will be updated. When more + If used with set-hostname, only the selected hostnames will be updated. When more than one of these switches are specified, all the specified hostnames will be updated. diff --git a/man/oomctl.xml b/man/oomctl.xml index b5e8a44282..950e79df13 100644 --- a/man/oomctl.xml +++ b/man/oomctl.xml @@ -48,7 +48,7 @@ dump - Show the current state of the cgroup(s) and system context(s) stored by + Show the current state of the cgroups and system contexts stored by systemd-oomd. diff --git a/man/portablectl.xml b/man/portablectl.xml index deb7842d1f..963361e28c 100644 --- a/man/portablectl.xml +++ b/man/portablectl.xml @@ -135,7 +135,7 @@ when is specified (see below). This ensures that the new units made available to the service manager are seen by it. - If and/or are passed, the portable service(s) are + If and/or are passed, the portable services are immediately started (blocking operation unless is passed) and/or enabled after attaching the image. @@ -151,7 +151,7 @@ files. This is a convenience feature to allow all arguments passed as attach also to detach. - If and/or are passed, the portable service(s) are + If and/or are passed, the portable services are immediately stopped (blocking operation) and/or disabled before detaching the image. Prefix(es) are also accepted, to be used in case the unit names do not match the image name as described in the attach. @@ -165,7 +165,7 @@ character has to match. If the new image doesn't exist, the existing one will not be detached. The parameters follow the same syntax as the attach command. - If and/or are passed, the portable service(s) are + If and/or are passed, the portable services are immediately stopped if removed, started and/or enabled if added, or restarted if updated. Prefixes are also accepted, in the same way as described in the attach case. @@ -362,7 +362,7 @@ systemd.exec5 for the ExtensionImages= directive and for the systemd-sysext8 tool. - The image(s) must contain an extension-release file with metadata that matches + The images must contain an extension-release file with metadata that matches what is defined in the os-release of IMAGE. See: os-release5. Images can be block images, btrfs subvolumes or directories. For more information on portable diff --git a/man/systemd-analyze.xml b/man/systemd-analyze.xml index cce08fa121..0d91cdd7d0 100644 --- a/man/systemd-analyze.xml +++ b/man/systemd-analyze.xml @@ -742,7 +742,7 @@ $ systemd-analyze verify /tmp/source:alias.service <command>systemd-analyze inspect-elf <replaceable>FILE</replaceable>...</command> - This command will load the specified file(s), and if they are ELF objects (executables, + This command will load the specified files, and if they are ELF objects (executables, libraries, core files, etc.) it will parse the embedded packaging metadata, if any, and print it in a table or json format. See the Packaging Metadata documentation for more information. @@ -902,7 +902,7 @@ $ systemd-analyze verify /tmp/source:alias.service With security, perform an offline security review - of the specified unit file(s), i.e. does not have to rely on PID 1 to acquire security + of the specified unit files, i.e. does not have to rely on PID 1 to acquire security information for the files like the security verb when used by itself does. This means that can be used with and as well. If a unit's overall exposure level is above that set by @@ -914,7 +914,7 @@ $ systemd-analyze verify /tmp/source:alias.service With security , takes into - consideration the specified portable profile when assessing the unit(s) settings. + consideration the specified portable profile when assessing unit settings. The profile can be passed by name, in which case the well-known system locations will be searched, or it can be the full path to a specific drop-in file. @@ -923,7 +923,7 @@ $ systemd-analyze verify /tmp/source:alias.service With security, allow the user to set a custom value - to compare the overall exposure level with, for the specified unit file(s). If a unit's + to compare the overall exposure level with, for the specified unit files. If a unit's overall exposure level, is greater than that set by the user, security will return an error. can be used with as well and its default value is 100. diff --git a/man/systemd-getty-generator.xml b/man/systemd-getty-generator.xml index 038613d829..def38520df 100644 --- a/man/systemd-getty-generator.xml +++ b/man/systemd-getty-generator.xml @@ -29,7 +29,7 @@ Description systemd-getty-generator is a generator that automatically instantiates - serial-getty@.service on the kernel console(s), if they can function as ttys and are + serial-getty@.service on the kernel consoles, if they can function as ttys and are not provided by the virtual console subsystem. It will also instantiate serial-getty@.service instances for virtualizer consoles, if execution in a virtualized environment is detected. If execution in a container environment is detected, it will instead diff --git a/man/systemd-measure.xml b/man/systemd-measure.xml index 5ad30c6511..e54cd774ea 100644 --- a/man/systemd-measure.xml +++ b/man/systemd-measure.xml @@ -162,7 +162,7 @@ PHASE - Controls which boot phase(s) to calculate expected PCR 11 values for. This takes a + Controls which boot phases to calculate expected PCR 11 values for. This takes a series of colon-separated strings that encode boot "paths" for entering a specific phase of the boot process. Each of the specified strings is measured by the systemd-pcrphase-initrd.service and diff --git a/man/systemd.path.xml b/man/systemd.path.xml index f143208cb4..f8748bf700 100644 --- a/man/systemd.path.xml +++ b/man/systemd.path.xml @@ -198,7 +198,7 @@ details on the various time units understood. The TriggerLimitBurst= setting takes a positive integer value and specifies the number of permitted activations per time interval, and defaults to 200. Set either to 0 to disable any form of trigger rate limiting. If the limit is hit, - the unit is placed into a failure mode, and will not watch the path(s) anymore until restarted. Note + the unit is placed into a failure mode, and will not watch the paths anymore until restarted. Note that this limit is enforced before the service activation is enqueued. diff --git a/man/systemd.resource-control.xml b/man/systemd.resource-control.xml index 2b1c20b96e..2a0e40a17d 100644 --- a/man/systemd.resource-control.xml +++ b/man/systemd.resource-control.xml @@ -852,7 +852,7 @@ RestrictNetworkInterfaces=~eth1 Control access to specific device nodes by the executed processes. Takes two space-separated strings: a device node specifier followed by a combination of r, w, m to control reading, - writing, or creation of the specific device node(s) by the unit + writing, or creation of the specific device nodes by the unit (mknod), respectively. This functionality is implemented using eBPF filtering. diff --git a/man/systemd.service.xml b/man/systemd.service.xml index 98c8bf8c6d..8d8dd77689 100644 --- a/man/systemd.service.xml +++ b/man/systemd.service.xml @@ -467,7 +467,7 @@ ExecCondition= - Optional commands that are executed before the command(s) in ExecStartPre=. + Optional commands that are executed before the commands in ExecStartPre=. Syntax is the same as for ExecStart=, except that multiple command lines are allowed and the commands are executed one after the other, serially. @@ -476,7 +476,7 @@ commands are skipped and the unit is not marked as failed. However, if an ExecCondition= command exits with 255 or abnormally (e.g. timeout, killed by a signal, etc.), the unit will be considered failed (and remaining commands will be skipped). Exit code of 0 or - those matching SuccessExitStatus= will continue execution to the next command(s). + those matching SuccessExitStatus= will continue execution to the next commands. The same recommendations about not running long-running processes in ExecStartPre= also applies to ExecCondition=. ExecCondition= will also run the commands diff --git a/man/systemd.time.xml b/man/systemd.time.xml index a759707fec..643ff7d78f 100644 --- a/man/systemd.time.xml +++ b/man/systemd.time.xml @@ -220,9 +220,8 @@ tomorrow Pacific/Auckland → Thu 2012-11-23 19:00:00 times starting with the start value, and continuing with all multiples of the repetition value relative to the start value, ending at the end value the latest. - A date specification may use ~ to indicate the - last day(s) in a month. For example, *-02~03 means - "the third last day in February," and Mon *-05~07/1 + A date specification may use ~ to indicate the last day in a month. For example, + *-02~03 means "the third last day in February," and Mon *-05~07/1 means "the last Monday in May." The seconds component may contain decimal fractions both in diff --git a/man/tmpfiles.d.xml b/man/tmpfiles.d.xml index 4ede01c82d..bd3bc33ab4 100644 --- a/man/tmpfiles.d.xml +++ b/man/tmpfiles.d.xml @@ -418,8 +418,8 @@ L /tmp/foobar - - - - /dev/null place of normal path names. The format of the argument field is [+-=][aAcCdDeijPsStTu]. The prefix - + (the default one) causes the attribute(s) to be added; - - causes the attribute(s) to be removed; = causes the attributes to be set exactly + + (the default one) causes the attributes to be added; - + causes the attributes to be removed; = causes the attributes to be set exactly as the following letters. The letters aAcCdDeijPsStTu select the new attributes for the files, see chattr 1 for further information. diff --git a/man/udevadm.xml b/man/udevadm.xml index 47556ee9b3..ee0658dc14 100644 --- a/man/udevadm.xml +++ b/man/udevadm.xml @@ -800,9 +800,9 @@ … - udevadm lock takes an (advisory) exclusive lock(s) on a block device (or - multiple thereof), as per Locking Block Device - Access and invokes a program with the lock(s) taken. When the invoked program exits the lock(s) + udevadm lock takes an (advisory) exclusive lock on a block device (or all + specified devices), as per Locking Block Device + Access and invokes a program with the locks taken. When the invoked program exits the locks are automatically released and its return value is propagated as exit code of udevadm lock. @@ -861,8 +861,8 @@ - Instead of locking the specified device(s) and executing a command, just print the - device path(s) that would be locked, and execute no command. This command is useful to determine + Instead of locking the specified devices and executing a command, just print the + device paths that would be locked, and execute no command. This command is useful to determine the "whole" block device in case a partition block device is specified. The devices will be sorted by their device node major number as primary ordering key and the minor number as secondary ordering key (i.e. they are shown in the order they'd be locked). Note that the number of lines -- cgit v1.2.1