From fbce11397f4d19821a9dfe66ee3ebe11cad90057 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sun, 21 Jul 2013 06:53:14 +0200 Subject: man: wording and grammar updates This includes regularly-submitted corrections to comma setting and orthographical mishaps that appeared in man/ in recent commits. --- man/crypttab.xml | 4 ++-- man/journalctl.xml | 2 +- man/machinectl.xml | 2 +- man/pam_systemd.xml | 12 ++++++------ man/systemctl.xml | 10 +++++----- man/systemd-bootchart.xml | 2 +- man/systemd-machined.service.xml | 2 +- man/systemd-run.xml | 2 +- man/systemd.cgroup.xml | 4 ++-- man/systemd.scope.xml | 2 +- man/systemd.slice.xml | 6 +++--- man/systemd.special.xml | 6 +++--- man/systemd.unit.xml | 2 +- man/systemd.xml | 14 +++++++------- man/udev.xml | 2 +- 15 files changed, 36 insertions(+), 36 deletions(-) diff --git a/man/crypttab.xml b/man/crypttab.xml index 298f39e0e3..5aade57c42 100644 --- a/man/crypttab.xml +++ b/man/crypttab.xml @@ -167,7 +167,7 @@ luks Force LUKS mode. When this mode - is used the following options are ignored since + is used, the following options are ignored since they are provided by the LUKS header on the device: cipher=, hash=, @@ -232,7 +232,7 @@ tcrypt Use TrueCrypt encryption mode. - When this mode is used the following options are + When this mode is used, the following options are ignored since they are provided by the TrueCrypt header on the device or do not apply: cipher=, diff --git a/man/journalctl.xml b/man/journalctl.xml index c8559a0cb0..dcc6d5dce9 100644 --- a/man/journalctl.xml +++ b/man/journalctl.xml @@ -269,7 +269,7 @@ - is very similar + is very similar, but shows ISO 8601 wallclock timestamps. diff --git a/man/machinectl.xml b/man/machinectl.xml index 37fefeadc8..5efa3a542a 100644 --- a/man/machinectl.xml +++ b/man/machinectl.xml @@ -156,7 +156,7 @@ When used with - kill-machine choose + kill-machine, choose which signal to send to selected processes. Must be one of the well-known signal specifiers, such as diff --git a/man/pam_systemd.xml b/man/pam_systemd.xml index 1d924bc319..951ae207a4 100644 --- a/man/pam_systemd.xml +++ b/man/pam_systemd.xml @@ -82,11 +82,11 @@ A new systemd scope unit is created for the session. If this is the first - concurrent session of the user an implicit + concurrent session of the user, an implicit slice below user.slice is automatically created and the scope placed in it. In instance of the system service - user@.service which runt + user@.service which runs the systemd user manager instance. @@ -94,15 +94,15 @@ On logout, this module ensures the following: - If this is enabled all + If this is enabled, all processes of the session are terminated. If - the last concurrent session of a user ends his + the last concurrent session of a user ends, his user systemd instance will be terminated too, and so will the user's slice unit. - If the las concurrent session - of a user ends the + If the last concurrent session + of a user ends, the $XDG_RUNTIME_DIR directory and all its contents are removed, too. diff --git a/man/systemctl.xml b/man/systemctl.xml index 4bfce95ffa..ee13a70fef 100644 --- a/man/systemctl.xml +++ b/man/systemctl.xml @@ -111,8 +111,8 @@ along with systemd; If not, see . - Argument should be a comma-separated list of unit LOAD - or SUB or ACTIVE states. When listing units show only those + The argument should be a comma-separated list of unit LOAD + or SUB or ACTIVE states. When listing units, show only those with specified LOAD or SUB or ACTIVE state. @@ -433,7 +433,7 @@ along with systemd; If not, see . is lost on reboot, the changes are lost too. Similar, when used with - set-property make changes only + set-property, make changes only temporarily, so that they are lost on the next reboot. @@ -727,7 +727,7 @@ kobject-uevent 1 systemd-udevd-kernel.socket systemd-udevd.service systemd.cgroup5) may. The changes are applied instantly, and stored on disk for future boots, unless is - passed in which case the settings only apply until the next + passed, in which case the settings only apply until the next reboot. The syntax of the property assignment follows closely the syntax of assignments in unit files. @@ -736,7 +736,7 @@ kobject-uevent 1 systemd-udevd-kernel.socket systemd-udevd.service Note that this command allows changing multiple properties at the same time, which is preferable over setting them individually. Like unit file configuration - settings assigning the empty list to list parameters will + settings, assigning the empty list to list parameters will reset the list. diff --git a/man/systemd-bootchart.xml b/man/systemd-bootchart.xml index 8de4c69a2d..ae432b563f 100644 --- a/man/systemd-bootchart.xml +++ b/man/systemd-bootchart.xml @@ -203,7 +203,7 @@ - Specify the output folder for the + Specify the output directory for the graphs. By default, bootchart writes the graphs to /run/log. diff --git a/man/systemd-machined.service.xml b/man/systemd-machined.service.xml index 525944b1bc..abe221a178 100644 --- a/man/systemd-machined.service.xml +++ b/man/systemd-machined.service.xml @@ -63,7 +63,7 @@ See systemd-nspawn1 - for some examples how to start a container the systemd + for some examples on how to start a container the systemd way. See the . All command-line arguments after the first non-option argument become part of the commandline of the launched - process. If a command is run as service unit its first argument + process. If a command is run as service unit, its first argument needs to be an absolute binary path. diff --git a/man/systemd.cgroup.xml b/man/systemd.cgroup.xml index 12b19f5c4b..cc0eb15abb 100644 --- a/man/systemd.cgroup.xml +++ b/man/systemd.cgroup.xml @@ -322,9 +322,9 @@ along with systemd; If not, see . hierarchy of slices each of which might have resource settings applied. - For units of type slice the only accepted value for + For units of type slice, the only accepted value for this setting is the parent slice. Since the name of a slice - unit implies the parent slice it is hence redundant to ever + unit implies the parent slice, it is hence redundant to ever set this parameter directly for slice units. diff --git a/man/systemd.scope.xml b/man/systemd.scope.xml index ff41c926f4..e8fa1aed59 100644 --- a/man/systemd.scope.xml +++ b/man/systemd.scope.xml @@ -58,7 +58,7 @@ along with systemd; If not, see . but are only created programmatically using the bus interfaces of systemd. They are named similar to filenames. A unit whose name ends in .scope refers to a scope unit. Scopes - units manage a set of system processes. Unlike service units scope + units manage a set of system processes. Unlike service units, scope units manage externally created processes, and do not fork off processes on its own. diff --git a/man/systemd.slice.xml b/man/systemd.slice.xml index 7ddef85eec..b7b0622d3c 100644 --- a/man/systemd.slice.xml +++ b/man/systemd.slice.xml @@ -60,10 +60,10 @@ along with systemd; If not, see . processes. This management is performed by creating a node in the control group tree. Units that manage processes (primarilly scope and service units) may be assigned to a specific slice. For each - slice certain resource limits may the be set, that apply to all + slice, certain resource limits may the be set that apply to all processes of all units contained in that slice. Slices are organized hierarchially in a tree. The name of the slice encodes - the location in the tree. The name consists of a "-" separated + the location in the tree. The name consists of a dash-separated series of names, which describes the path to the slice from the root slice. The root slice is named, -.slice. Example: @@ -72,7 +72,7 @@ along with systemd; If not, see . the root slice -.slice. - By default service and scope units are placed in + By default, service and scope units are placed in system.slice, virtual machines and containers registered with systemd-machined1 diff --git a/man/systemd.special.xml b/man/systemd.special.xml index 6d456e18e5..e1299abcb0 100644 --- a/man/systemd.special.xml +++ b/man/systemd.special.xml @@ -1050,7 +1050,7 @@ system.slice - By default all services + By default, all services services started by systemd are found in this slice. @@ -1060,7 +1060,7 @@ user.slice - By default all user + By default, all user processes and services started on behalf of the user, including the per-user systemd @@ -1072,7 +1072,7 @@ machine.slice - By defalt all virtual + By defalt, all virtual machines and containers registered with systemd-machined diff --git a/man/systemd.unit.xml b/man/systemd.unit.xml index 65ba545037..f6a0791bf9 100644 --- a/man/systemd.unit.xml +++ b/man/systemd.unit.xml @@ -1119,7 +1119,7 @@ A symbolic link is created in the .wants/ or - .requires/ folder + .requires/ directory of the listed unit when this unit is activated by systemctl enable. This has the effect diff --git a/man/systemd.xml b/man/systemd.xml index 06d2ecf6f8..1e54eac926 100644 --- a/man/systemd.xml +++ b/man/systemd.xml @@ -294,18 +294,18 @@ systemd.unit5, however some are created automatically from other configuration, dynamically from system state or - programmatically at runtime. Units may be 'active' - (meaning started, bound, plugged in, ... depending on - the unit type, see below), or 'inactive' (meaning + programmatically at runtime. Units may be "active" + (meaning started, bound, plugged in, ..., depending on + the unit type, see below), or "inactive" (meaning stopped, unbound, unplugged, ...), as well as in the process of being activated or deactivated, i.e. between the two states (these states are called - 'activating', 'deactivating'). A special 'failed' - state is available as well which is very similar to - 'inactive' and is entered when the service failed in + "activating", "deactivating"). A special "failed" + state is available as well, which is very similar to + "inactive" and is entered when the service failed in some way (process returned error code on exit, or crashed, or an operation timed out). If this state is - entered the cause will be logged, for later + entered, the cause will be logged, for later reference. Note that the various unit types may have a number of additional substates, which are mapped to the five generalized unit states described diff --git a/man/udev.xml b/man/udev.xml index 435dec4c61..0220725140 100644 --- a/man/udev.xml +++ b/man/udev.xml @@ -712,7 +712,7 @@ used to override a system-supplied hwdb file with a local file if needed; a symlink in /etc with the same name as a rules file in /lib, pointing to /dev/null, - disables the rules file entirely. Hwdb files must have the extension + disables the rules file entirely. hwdb files must have the extension .hwdb; other extensions are ignored. The hwdb file contains data records consisting of matches and -- cgit v1.2.3-54-g00ecf