From: Jan Engelhardt Date: Tue, 15 Oct 2013 06:58:51 +0000 (+0200) Subject: man: wording and grammar updates X-Git-Tag: v209~1877 X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=72f4d9669c253d5bd7c126bf2e7a0db0198cf2eb man: wording and grammar updates This is a recurring submission and includes corrections to various issue spotted. I guess I can just skip over reporting ubiquitous comma placement fixes… --- diff --git a/man/journalctl.xml b/man/journalctl.xml index 2ce81a056..508f1dd53 100644 --- a/man/journalctl.xml +++ b/man/journalctl.xml @@ -157,14 +157,14 @@ Ellipsize fields when - they don't fit in available columns. + they do not fit in available columns. The default is to show full fields, allowing them to wrap or be truncated by the pager if one is used. - Old options + The old options / - not useful anymore, except to undo + are not useful anymore, except to undo . diff --git a/man/systemctl.xml b/man/systemctl.xml index e789d4b62..be6b5ea1f 100644 --- a/man/systemctl.xml +++ b/man/systemctl.xml @@ -831,7 +831,7 @@ kobject-uevent 1 systemd-udevd-kernel.socket systemd-udevd.service Depending on whether , , , - or, is specified, this enables the unit + or is specified, this enables the unit for the system, for the calling user only, for only this boot of the system, or for all future logins of all users, or only this boot. Note that in the last case, no systemd daemon @@ -861,7 +861,7 @@ kobject-uevent 1 systemd-udevd-kernel.socket systemd-udevd.service This command honors , - , , + , and in a similar way as enable. @@ -921,7 +921,7 @@ kobject-uevent 1 systemd-udevd-kernel.socket systemd-udevd.service disable, since it prohibits all kinds of activation of the unit, including manual activation. Use this option with care. This honors the - option, to only mask temporarily + option to only mask temporarily until the next reoobt of the system. diff --git a/man/systemd-cgtop.xml b/man/systemd-cgtop.xml index 7faedfbfd..01a0ae216 100644 --- a/man/systemd-cgtop.xml +++ b/man/systemd-cgtop.xml @@ -79,15 +79,15 @@ CPUAccounting=1, MemoryAccounting=1 and BlockIOAccounting=1 settings in the - unit files in question (See + unit files in question. See systemd.resource-control5 - for details). + for details. To emphasize this: unless CPUAccounting=1, MemoryAccounting=1 and BlockIOAccounting=1 are enabled for - the services in question no resource accounting will + the services in question, no resource accounting will be available for system services and the data shown by systemd-cgtop will be incomplete. diff --git a/man/systemd-cryptsetup-generator.xml b/man/systemd-cryptsetup-generator.xml index d6b7e49f1..3abb39d55 100644 --- a/man/systemd-cryptsetup-generator.xml +++ b/man/systemd-cryptsetup-generator.xml @@ -115,8 +115,8 @@ luks.uuid= rd.luks.uuid= - Takes a LUKS super - block UUID as argument. This will + Takes a LUKS superblock + UUID as argument. This will activate the specified device as part of the boot process as if it was listed in diff --git a/man/systemd.exec.xml b/man/systemd.exec.xml index e213ec4f3..8c44071d5 100644 --- a/man/systemd.exec.xml +++ b/man/systemd.exec.xml @@ -1027,7 +1027,7 @@ User name (twice), home directory, and the login shell. - Set for the units which + The variables are set for the units that have User= set, which includes user systemd instances. @@ -1053,14 +1053,14 @@ $XDG_VTNR The identifier of the - session, and the seat name, and + session, the seat name, and virtual terminal of the session. Set by pam_systemd8 for login sessions. $XDG_SEAT and - $XDG_VTNR will be - only set when attached to a seat and a + $XDG_VTNR will + only be set when attached to a seat and a tty. diff --git a/man/systemd.resource-control.xml b/man/systemd.resource-control.xml index 868890590..fcfe86125 100644 --- a/man/systemd.resource-control.xml +++ b/man/systemd.resource-control.xml @@ -64,7 +64,7 @@ along with systemd; If not, see . Unit configuration files for services, slices, scopes, sockets, mount points, and swap devices share a subset of configuration options for resource control of spawned - processes. Internally, this relies on the the Control Groups + processes. Internally, this relies on the Control Groups kernel concept for organizing processes in a hierarchial tree of named groups for the purpose of resource management. @@ -86,7 +86,7 @@ along with systemd; If not, see . See the New - Control Group Interfaces for an introduction how to make + Control Group Interfaces for an introduction on how to make use of resource control APIs from programs. @@ -199,7 +199,7 @@ along with systemd; If not, see . path and a weight value to specify the device specific weight value, between 10 and 1000. (Example: "/dev/sda 500"). The file path may be specified as path to a block - device node or as any other file in which case the backing + device node or as any other file, in which case the backing block device of the file system of the file is determined. This controls the blkio.weight_device control group diff --git a/man/systemd.scope.xml b/man/systemd.scope.xml index 392abbf15..e047f4b7b 100644 --- a/man/systemd.scope.xml +++ b/man/systemd.scope.xml @@ -71,7 +71,7 @@ along with systemd; If not, see . See the New - Control Group Interfaces for an introduction how to make + Control Group Interfaces for an introduction on how to make use of scope units from programs. Unless DefaultDependencies=false diff --git a/man/systemd.service.xml b/man/systemd.service.xml index 5e1ddf718..81a4078c7 100644 --- a/man/systemd.service.xml +++ b/man/systemd.service.xml @@ -369,7 +369,7 @@ case it will be replaced by the value of the environment variable split up at whitespace, resulting in zero or - more arguments. To pass literal dollar sign + more arguments. To pass a literal dollar sign, use $$. Note that the first argument (i.e. the program to execute) may not be a variable, since it must diff --git a/man/systemd.unit.xml b/man/systemd.unit.xml index 5c8b8e886..baf44ad2e 100644 --- a/man/systemd.unit.xml +++ b/man/systemd.unit.xml @@ -1236,12 +1236,12 @@ %r Root control group path where units are placed. - For system instances this usually resolves to /system, except in containers, where the path might be prefixed with the container's root control group. + For system instances, this usually resolves to /system, except in containers, where the path might be prefixed with the container's root control group. %R Parent directory of the control group path where units are placed. - For system instances this usually + For system instances, this usually resolves to /, except in containers, where this resolves to the container's root directory. diff --git a/man/tmpfiles.d.xml b/man/tmpfiles.d.xml index e8b630da2..1c079f64b 100644 --- a/man/tmpfiles.d.xml +++ b/man/tmpfiles.d.xml @@ -158,11 +158,11 @@ L /tmp/foobar - - - - /dev/null m If the - specified file path exists + specified file path exists, adjust its access mode, group and user to the specified values and reset the SELinux - label. If it doesn't exist do + label. If it does not exist, do nothing. @@ -187,7 +187,7 @@ L /tmp/foobar - - - - /dev/null during cleaning. Use this type to exclude paths from clean-up as controlled with the Age - parameter. Unlike x this + parameter. Unlike x, this parameter will not exclude the content if path is a directory, but only directory itself. diff --git a/man/udevadm.xml b/man/udevadm.xml index a1ffe4219..30a6ac423 100644 --- a/man/udevadm.xml +++ b/man/udevadm.xml @@ -98,7 +98,7 @@ - Query the database for specified type of device + Query the database for the specified type of device data. It needs the or to identify the specified device. Valid queries are: name, @@ -113,7 +113,7 @@ The /sys path of the device to query, e.g. /sys/class/block/sda. - Note that this option usually isn't very useful, since + Note that this option usually is not very useful, since udev can guess the type of the argument, so udevadm --devpath=/class/block/sda is equivalent to @@ -125,7 +125,7 @@ The name of the device node or a symlink to query, e.g. /dev/sda. - Note that this option usually isn't very useful, since + Note that this option usually is not very useful, since udev can guess the type of the argument, so udevadm --name=sda is equivalent to udevadm /dev/sda. @@ -481,10 +481,10 @@ Specify when udevadm should resolve names of users and groups. When set to early (the - default) names will be resolved when the rules are - parsed. When set to late names will + default), names will be resolved when the rules are + parsed. When set to late, names will be resolved for every event. When set to - never names will never be resolved + never, names will never be resolved and all devices will be owned by root.