From e9dd6984076389e8cfa15b72bc62187544e49b61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Mon, 6 Jul 2020 10:49:59 +0200 Subject: [PATCH] tree-wide: fixes for assorted grammar and spelling issues Fixes #16363. Also includes some changes where I generalized the pattern. --- man/coredumpctl.xml | 4 +- man/crypttab.xml | 11 +- man/file-hierarchy.xml | 2 +- man/homectl.xml | 57 +++--- man/journalctl.xml | 12 +- man/kernel-install.xml | 4 +- man/logind.conf.xml | 2 +- man/machine-id.xml | 2 +- man/machinectl.xml | 2 +- man/nss-myhostname.xml | 3 +- man/nss-mymachines.xml | 3 +- man/nss-resolve.xml | 2 +- man/nss-systemd.xml | 2 +- man/pam_systemd.xml | 2 +- man/portablectl.xml | 4 +- man/pstore.conf.xml | 2 +- man/sd_bus_enqueue_for_read.xml | 2 +- man/sd_bus_is_open.xml | 2 +- man/sd_bus_message_new_method_error.xml | 2 +- man/sd_bus_set_connected_signal.xml | 2 +- man/sd_bus_slot_set_destroy_callback.xml | 2 +- man/sd_bus_slot_set_floating.xml | 2 +- man/sd_event_source_set_destroy_callback.xml | 2 +- man/sd_journal_has_runtime_files.xml | 2 +- man/sd_machine_get_class.xml | 2 +- man/sd_pid_get_owner_uid.xml | 2 +- man/sysctl.d.xml | 10 +- man/systemctl.xml | 4 +- man/systemd-analyze.xml | 10 +- man/systemd-bless-boot-generator.xml | 2 +- man/systemd-boot.xml | 10 +- man/systemd-gpt-auto-generator.xml | 2 +- man/systemd-journal-gatewayd.service.xml | 6 +- man/systemd-journal-upload.service.xml | 2 +- man/systemd-logind.service.xml | 2 +- man/systemd-mount.xml | 23 +-- man/systemd-nspawn.xml | 46 +++-- man/systemd-random-seed.service.xml | 2 +- man/systemd-repart.xml | 19 +- man/systemd-socket-proxyd.xml | 2 +- man/systemd-suspend.service.xml | 13 +- man/systemd-system.conf.xml | 6 +- man/systemd-time-wait-sync.service.xml | 2 +- man/systemd.device.xml | 2 +- man/systemd.exec.xml | 56 +++--- man/systemd.journal-fields.xml | 3 +- man/systemd.kill.xml | 2 +- man/systemd.net-naming-scheme.xml | 2 +- man/systemd.netdev.xml | 115 ++++++------ man/systemd.network.xml | 154 ++++++++-------- man/systemd.nspawn.xml | 2 +- man/systemd.offline-updates.xml | 6 +- man/systemd.service.xml | 2 +- man/systemd.socket.xml | 175 ++++++++----------- man/systemd.special.xml | 6 +- man/systemd.swap.xml | 2 +- man/systemd.syntax.xml | 4 +- man/systemd.time.xml | 28 +-- man/systemd.unit.xml | 10 +- man/systemd.xml | 21 ++- man/tc.xml | 24 +-- man/userdbctl.xml | 5 +- src/basic/user-util.c | 2 +- src/journal/journal-file.c | 2 +- src/libsystemd/sd-bus/bus-internal.h | 2 +- 65 files changed, 456 insertions(+), 464 deletions(-) diff --git a/man/coredumpctl.xml b/man/coredumpctl.xml index a313611369..150d410c24 100644 --- a/man/coredumpctl.xml +++ b/man/coredumpctl.xml @@ -52,8 +52,8 @@ matching specified characteristics. If no command is specified, this is the implied default. - The output is designed to be human readable and contains list contains - a table with the following columns: + The output is designed to be human readable and contains a table with the following + columns: TIME diff --git a/man/crypttab.xml b/man/crypttab.xml index 4cdc52dcb8..ee54499bfe 100644 --- a/man/crypttab.xml +++ b/man/crypttab.xml @@ -255,6 +255,7 @@ Perform encryption using the same cpu that IO was submitted on. The default is to use an unbound workqueue so that encryption work is automatically balanced between available CPUs. + This requires kernel 4.0 or newer. @@ -263,9 +264,10 @@ Disable offloading writes to a separate thread after encryption. There are some - situations where offloading write bios from the encryption threads to a single thread degrades - performance significantly. The default is to offload write bios to the same thread because it benefits - CFQ to have writes submitted using the same context. + situations where offloading write requests from the encryption threads to a dedicated thread degrades + performance significantly. The default is to offload write requests to a dedicated thread because it + benefits the CFQ scheduler to have writes submitted using the same context. + This requires kernel 4.0 or newer. @@ -512,7 +514,8 @@ external /dev/sda3 keyfile:LABEL=keydev keyfile-timeout=10sThe PKCS#11 logic allows hooking up any compatible security token that is capable of storing RSA decryption keys. Here's an example how to set up a Yubikey security token for this purpose, using - ykman from the yubikey-manager project: + ykmap1 + from the yubikey-manager project: diff --git a/man/file-hierarchy.xml b/man/file-hierarchy.xml index 497cb580c7..d5899dc362 100644 --- a/man/file-hierarchy.xml +++ b/man/file-hierarchy.xml @@ -648,7 +648,7 @@ /usr/share/ hierarchy to the locations defined by the various relevant specifications. - During runtime, and for local configuration and state, + During runtime, and for local configuration and runtime state, additional directories are defined: diff --git a/man/homectl.xml b/man/homectl.xml index 134a60bb97..ad59c174e0 100644 --- a/man/homectl.xml +++ b/man/homectl.xml @@ -119,9 +119,9 @@ FILERead the user's JSON record from the specified file. If passed as - - reads the user record from standard input. The supplied JSON object must follow - the structure documented on JSON User - Records. This option may be used in conjunction with the create and + - read the user record from standard input. The supplied JSON object must follow + the structure documented on JSON User Records. + This option may be used in conjunction with the create and update commands (see below), where it allows configuring the user record in JSON as-is, instead of setting the individual user record properties (see below). @@ -247,10 +247,9 @@ different system and the configured UID is taken by another user there, then systemd-homed may assign the user a different UID on that system. The specified UID must be outside of the system user range. It is recommended to use the 60001…60513 UID range for - this purpose. If not specified the UID is automatically picked. When logging in and the home - directory is found to be owned by a UID not matching the user's assigned one the home directory and - all files and directories inside it will have their ownership changed automatically before login - completes. + this purpose. If not specified, the UID is automatically picked. If the home directory is found to be + owned by a different UID when logging in, the home directory and everything underneath it will have + its ownership changed automatically before login completes.Note that users managed by systemd-homed always have a matching group associated with the same name as well as a GID matching the UID of the user. Thus, configuring the @@ -266,19 +265,19 @@ privileges. Note that systemd-homed does not manage any groups besides a group matching the user in name and numeric UID/GID. Thus any groups listed here must be registered independently, for example with groupadd8. If - non-existent groups that are listed there are ignored. This option may be used more than once, in - which case all specified group lists are combined. If the user is currently a member of a group - which is not listed, the user will be removed from the group. + project='man-pages'>groupadd8. + Any non-existent groups are ignored. This option may be used more than once, in which case all + specified group lists are combined. If the user is currently a member of a group which is not listed, + the user will be removed from the group. PATH Takes a file system path to a directory. Specifies the skeleton directory to - initialize the home directory with. All files and directories in the specified are copied into any - newly create home directory. If not specified defaults to - /etc/skel/. + initialize the home directory with. All files and directories in the specified path are copied into + any newly create home directory. If not specified defaults to /etc/skel/. + @@ -313,7 +312,7 @@ Takes a specifier indicating the preferred language of the user. The $LANG environment variable is initialized from this value on login, and thus a value suitable for this environment variable is accepted here, for example - + . @@ -331,8 +330,8 @@ security token with exactly one pair of X.509 certificate and private key. A random secret key is then generated, encrypted with the public key of the X.509 certificate, and stored as part of the user record. At login time it is decrypted with the PKCS#11 module and then used to unlock the - account and associated resources. See below for an example how to set up authentication with security - token. + account and associated resources. See below for an example how to set up authentication with a + security token. Instead of a valid PKCS#11 URI, the special strings list and auto may be specified. If list is passed, a brief table of @@ -439,19 +438,19 @@ Each of these options takes a time span specification as argument (in the syntax documented in systemd.time5) and - configure various aspects of the user's password expiration policy. Specifically, + configures various aspects of the user's password expiration policy. Specifically, configures how much time has to pass after changing the password of the user until the password may be changed again. If the user tries to change their password before this time passes the attempt is refused. - configures how much time has to pass after the password is changed until the password expires and - needs to be changed again. After this time passes any attempts to log in may only proceed after the - password is changed. specifies how much earlier than then - the time configured with the user is warned at login to - change their password as it will expire soon. Finally - configures the time which has to pass after the password as expired until the user is not permitted - to log in or change the password anymore. Note that these options only apply to password - authentication, and do not apply to other forms of authentication, for example PKCS#11-based security - token authentication. + configures how soon after it has been changed the password expires and needs to be changed again. + After this time passes logging in may only proceed after the password is changed. + specifies how much earlier than then the time configured + with the user is warned at login to change their password as + it will expire soon. Finally configures the time which + has to pass after the password as expired until the user is not permitted to log in or change the + password anymore. Note that these options only apply to password authentication, and do not apply to + other forms of authentication, for example PKCS#11-based security token + authentication. @@ -695,8 +694,8 @@ Activation of a home directory involves various operations that depend on the selected storage mechanism. If the LUKS2 mechanism is used, this generally involves: inquiring the user for a password, setting up a loopback device, validating and activating the LUKS2 volume, checking the file - system, mounting the file system, and potentiatlly changing the ownership of all included files to - the correct UID/GID. + system, mounting the file system, and potentially changing the ownership of all included files to the + correct UID/GID. diff --git a/man/journalctl.xml b/man/journalctl.xml index 5c32ce8b9b..ea60196e86 100644 --- a/man/journalctl.xml +++ b/man/journalctl.xml @@ -555,7 +555,7 @@ is also added for _SYSTEMD_SLICE=UNIT, such that if the provided UNIT is a systemd.slice5 - unit, all logs of the children of the slice will be logged. + unit, all logs of children of the slice will be shown. This parameter can be specified multiple times. @@ -574,7 +574,7 @@ is also added for _SYSTEMD_USER_SLICE=UNIT, such that if the provided UNIT is a systemd.slice5 - unit, all logs of the children of the unit will be logged. + unit, all logs of children of the unit will be shown. This parameter can be specified multiple times. @@ -761,8 +761,8 @@ underneath the specified directory instead of the root directory (e.g. will create ROOT/var/lib/systemd/catalog/database, - and journal files under ROOT/run/journal - or ROOT/var/log/journal will be displayed). + and journal files under ROOT/run/journal/ + or ROOT/var/log/journal/ will be displayed). @@ -929,10 +929,10 @@ /run/log/journal/ into /var/log/journal/, if persistent storage is enabled. This call does not return until the operation is complete. Note that this call is idempotent: the data is only flushed from /run/log/journal/ into - /var/log/journal once during system runtime (but see + /var/log/journal/ once during system runtime (but see below), and this command exits cleanly without executing any operation if this has already happened. This command effectively guarantees that all data is flushed - to /var/log/journal at the time it returns. + to /var/log/journal/ at the time it returns. diff --git a/man/kernel-install.xml b/man/kernel-install.xml index 3df80751dd..273270f550 100644 --- a/man/kernel-install.xml +++ b/man/kernel-install.xml @@ -36,7 +36,7 @@ Description kernel-install is used to install and remove kernel and initramfs images to and from the boot loader partition, referred to as $BOOT here. It will usually be one of - /boot, /efi, or /boot/efi, see below. + /boot/, /efi/, or /boot/efi/, see below. kernel-install will execute the files @@ -137,7 +137,7 @@ The partition where the kernels and Boot Loader Specification snippets are located is called $BOOT. kernel-install determines the location of this partition by checking - /efi/, /boot/, and /boot/efi + /efi/, /boot/, and /boot/efi/ in turn. The first location where $BOOT/loader/entries/ or $BOOT/$MACHINE_ID/ exists is used. diff --git a/man/logind.conf.xml b/man/logind.conf.xml index b00daf366d..b23794c2f3 100644 --- a/man/logind.conf.xml +++ b/man/logind.conf.xml @@ -277,7 +277,7 @@ HoldoffTimeoutSec= - Specifies the timeout after system startup or + Specifies a period of time after system startup or system resume in which systemd will hold off on reacting to lid events. This is required for the system to properly detect any hotplugged devices so systemd can ignore lid events diff --git a/man/machine-id.xml b/man/machine-id.xml index ebee065a61..bd55366ac8 100644 --- a/man/machine-id.xml +++ b/man/machine-id.xml @@ -39,7 +39,7 @@ The machine ID may be set, for example when network booting, with the systemd.machine_id= kernel command line parameter or by passing the - option to systemd. An ID is specified in this manner + option to systemd. An ID specified in this manner has higher priority and will be used instead of the ID stored in /etc/machine-id. diff --git a/man/machinectl.xml b/man/machinectl.xml index e903eca721..37e51f90cf 100644 --- a/man/machinectl.xml +++ b/man/machinectl.xml @@ -320,7 +320,7 @@ Copies files or directories from a container into the host system. Takes a container name, followed by the - source path in the container the destination path on the host. + source path in the container and the destination path on the host. If the destination path is omitted, the same as the source path is used. diff --git a/man/nss-myhostname.xml b/man/nss-myhostname.xml index e23b24483e..8bb21f2621 100644 --- a/man/nss-myhostname.xml +++ b/man/nss-myhostname.xml @@ -18,8 +18,7 @@ nss-myhostname libnss_myhostname.so.2 - Provide hostname resolution for the locally - configured system hostname. + Hostname resolution for the locally configured system hostname diff --git a/man/nss-mymachines.xml b/man/nss-mymachines.xml index 1ff88aba2d..6e48835550 100644 --- a/man/nss-mymachines.xml +++ b/man/nss-mymachines.xml @@ -18,8 +18,7 @@ nss-mymachines libnss_mymachines.so.2 - Provide hostname resolution for local - container instances. + Hostname resolution for local container instances diff --git a/man/nss-resolve.xml b/man/nss-resolve.xml index 8bc75b1316..332cf0b06d 100644 --- a/man/nss-resolve.xml +++ b/man/nss-resolve.xml @@ -18,7 +18,7 @@ nss-resolve libnss_resolve.so.2 - Provide hostname resolution via systemd-resolved.service + Hostname resolution via systemd-resolved.service diff --git a/man/nss-systemd.xml b/man/nss-systemd.xml index ac22452bc3..26730f0fe9 100644 --- a/man/nss-systemd.xml +++ b/man/nss-systemd.xml @@ -18,7 +18,7 @@ nss-systemd libnss_systemd.so.2 - Provide UNIX user and group name resolution for user/group lookup via Varlink + UNIX user and group name resolution for user/group lookup via Varlink diff --git a/man/pam_systemd.xml b/man/pam_systemd.xml index cf9ba71adc..609743be6b 100644 --- a/man/pam_systemd.xml +++ b/man/pam_systemd.xml @@ -153,7 +153,7 @@ hence be used to uniquely label files or other resources of this session. Combine this ID with the boot identifier, as returned by sd_id128_get_boot3, for a - globally unique identifier for the current session. + globally unique identifier. diff --git a/man/portablectl.xml b/man/portablectl.xml index f2d8da40c4..962429683d 100644 --- a/man/portablectl.xml +++ b/man/portablectl.xml @@ -118,7 +118,7 @@ By default all unit files whose names start with a prefix generated from the image's file name are copied out. Specifically, the prefix is determined from the image file name with any suffix such as - .raw removed, truncated at the first occurrence of and underscore character + .raw removed, truncated at the first occurrence of an underscore character (_), if there is one. The underscore logic is supposed to be used to versioning so that the an image file foobar_47.11.raw will result in a unit file matching prefix of foobar. This prefix is then compared with all unit files names contained in the image in @@ -403,7 +403,7 @@
- For details on this profiles, and their effects please have a look at their precise definitions, + For details on these profiles and their effects see their precise definitions, e.g. /usr/lib/systemd/portable/profile/default/service.conf and similar. diff --git a/man/pstore.conf.xml b/man/pstore.conf.xml index 2b9c8b1a71..15af353de1 100644 --- a/man/pstore.conf.xml +++ b/man/pstore.conf.xml @@ -82,7 +82,7 @@ See Also - systemd-journald.service8, + systemd-journald.service8 diff --git a/man/sd_bus_enqueue_for_read.xml b/man/sd_bus_enqueue_for_read.xml index 3318a3031b..f948b5914f 100644 --- a/man/sd_bus_enqueue_for_read.xml +++ b/man/sd_bus_enqueue_for_read.xml @@ -19,7 +19,7 @@ sd_bus_enqueue_for_read - Re-enqueue a bus message on a bus connection, for reading. + Re-enqueue a bus message on a bus connection, for reading diff --git a/man/sd_bus_is_open.xml b/man/sd_bus_is_open.xml index d993142cb5..4a21189c1d 100644 --- a/man/sd_bus_is_open.xml +++ b/man/sd_bus_is_open.xml @@ -20,7 +20,7 @@ sd_bus_is_open sd_bus_is_ready - Check whether the a bus connection is open or ready. + Check whether the bus connection is open or ready diff --git a/man/sd_bus_message_new_method_error.xml b/man/sd_bus_message_new_method_error.xml index aa29007c27..39bb24c3a5 100644 --- a/man/sd_bus_message_new_method_error.xml +++ b/man/sd_bus_message_new_method_error.xml @@ -22,7 +22,7 @@ sd_bus_message_new_method_errno sd_bus_message_new_method_errnof - Create a an error reply for a method call + Create an error reply for a method call diff --git a/man/sd_bus_set_connected_signal.xml b/man/sd_bus_set_connected_signal.xml index edb0df205a..b025112b63 100644 --- a/man/sd_bus_set_connected_signal.xml +++ b/man/sd_bus_set_connected_signal.xml @@ -20,7 +20,7 @@ sd_bus_set_connected_signal sd_bus_get_connected_signal - Control emmission of local connection establishment signal on bus connections + Control emission of local connection establishment signal on bus connections diff --git a/man/sd_bus_slot_set_destroy_callback.xml b/man/sd_bus_slot_set_destroy_callback.xml index c6fe72e37b..c2a0876e21 100644 --- a/man/sd_bus_slot_set_destroy_callback.xml +++ b/man/sd_bus_slot_set_destroy_callback.xml @@ -23,7 +23,7 @@ sd_bus_track_get_destroy_callback sd_bus_destroy_t - Define the callback function for resource cleanup. + Define the callback function for resource cleanup diff --git a/man/sd_bus_slot_set_floating.xml b/man/sd_bus_slot_set_floating.xml index f63907aa40..ecfc079514 100644 --- a/man/sd_bus_slot_set_floating.xml +++ b/man/sd_bus_slot_set_floating.xml @@ -19,7 +19,7 @@ sd_bus_slot_set_floating sd_bus_slot_get_floating - Control whether a bus slot object is "floating". + Control whether a bus slot object is "floating" diff --git a/man/sd_event_source_set_destroy_callback.xml b/man/sd_event_source_set_destroy_callback.xml index 2ffca9ec36..3df926b863 100644 --- a/man/sd_event_source_set_destroy_callback.xml +++ b/man/sd_event_source_set_destroy_callback.xml @@ -21,7 +21,7 @@ sd_event_source_get_destroy_callback sd_event_destroy_t - Define the callback function for resource cleanup. + Define the callback function for resource cleanup diff --git a/man/sd_journal_has_runtime_files.xml b/man/sd_journal_has_runtime_files.xml index 7e6e7d4b9d..02fdc12473 100644 --- a/man/sd_journal_has_runtime_files.xml +++ b/man/sd_journal_has_runtime_files.xml @@ -21,7 +21,7 @@ sd_journal_has_runtime_files sd_journal_has_persistent_files - Query availability of runtime or persistent journal files. + Query availability of runtime or persistent journal files diff --git a/man/sd_machine_get_class.xml b/man/sd_machine_get_class.xml index db6cf0dbc0..cd259c863f 100644 --- a/man/sd_machine_get_class.xml +++ b/man/sd_machine_get_class.xml @@ -19,7 +19,7 @@ sd_machine_get_class sd_machine_get_ifindices Determine the class and network interface indices of a - locally running virtual machine or container. + locally running virtual machine or container diff --git a/man/sd_pid_get_owner_uid.xml b/man/sd_pid_get_owner_uid.xml index e9d7a8eb69..9c16d5bc9c 100644 --- a/man/sd_pid_get_owner_uid.xml +++ b/man/sd_pid_get_owner_uid.xml @@ -35,7 +35,7 @@ sd_peer_get_cgroup Determine the owner uid of the user unit or session, or the session, user unit, system unit, container/VM or slice that - a specific PID or socket peer belongs to. + a specific PID or socket peer belongs to diff --git a/man/sysctl.d.xml b/man/sysctl.d.xml index d26f82475b..70504510f9 100644 --- a/man/sysctl.d.xml +++ b/man/sysctl.d.xml @@ -70,11 +70,11 @@ key.pattern.overridden.with.glob = custom followed by =, see SYNOPSIS. Any access permission errors and attempts to write variables not present on the local system are - logged, but do not cause the service to fail. Debug log level is used, which means that the message will - not show up at all by default. Moreover, if a variable assignment is prefixed with a single - - character, any failure to set the variable will be logged at debug level, but will - not cause the service to fail. All other errors when setting variables are logged with higher priority - and cause the service to return failure at the end (other variables are still processed). + logged at debug level and do not cause the service to fail. Moreover, if a variable assignment is + prefixed with a single - character, failure to set the variable for other reasons will + be logged at debug level and will not cause the service to fail. In other cases, errors when setting + variables are logged with higher priority and cause the service to return failure at the end (after + processing other variables). The settings configured with sysctl.d files will be applied early on boot. The network interface-specific options will also be applied individually for each network interface as it diff --git a/man/systemctl.xml b/man/systemctl.xml index 53342c4b9d..f05beaf6ee 100644 --- a/man/systemctl.xml +++ b/man/systemctl.xml @@ -412,7 +412,7 @@ Jan 12 10:46:45 example.com bluetoothd[8900]: gatt-time-server: Input/output err The "Loaded:" line in the output will show loaded if the unit has been loaded into memory. Other possible values for "Loaded:" include: error if there was a problem - loading it, not-found if not unit file was found for this unit, + loading it, not-found if no unit file was found for this unit, bad-setting if an essential unit file setting could not be parsed and masked if the unit file has been masked. Along with showing the path to the unit file, this line will also show the enablement state. Enabled commands start at boot. See the full table of @@ -773,7 +773,7 @@ Jan 12 10:46:45 example.com bluetoothd[8900]: gatt-time-server: Input/output err indirect - The unit file itself is not enabled, but it has a non-empty Also= setting in the [Install] unit file section, listing other unit files that might be enabled, or it has an alias under a different name through a symlink that is not specified in Also=. For template unit file, an instance different than the one specified in DefaultInstance= is enabled. + The unit file itself is not enabled, but it has a non-empty Also= setting in the [Install] unit file section, listing other unit files that might be enabled, or it has an alias under a different name through a symlink that is not specified in Also=. For template unit files, an instance different than the one specified in DefaultInstance= is enabled. 0 diff --git a/man/systemd-analyze.xml b/man/systemd-analyze.xml index ba8e67dff4..3d6de1710d 100644 --- a/man/systemd-analyze.xml +++ b/man/systemd-analyze.xml @@ -509,9 +509,9 @@ NAutoVTs=8 This command will load unit files and print warnings if any errors are detected. Files specified on the command line will be loaded, but also any other units referenced by them. The full unit search path is formed by combining the directories for all command line arguments, and the usual unit load - paths (variable $SYSTEMD_UNIT_PATH is supported, and may be used to replace or + paths. The variable $SYSTEMD_UNIT_PATH is supported, and may be used to replace or augment the compiled in set of unit load paths; see - systemd.unit5). All + systemd.unit5. All units files present in the directories containing the command line arguments will be used in preference to the other paths. @@ -700,9 +700,9 @@ Service b@0.service not loaded, b.socket cannot be started. - Do not invoke man to verify the existence of - man pages listed in Documentation=. - + Do not invoke + man1 + to verify the existence of man pages listed in Documentation=. diff --git a/man/systemd-bless-boot-generator.xml b/man/systemd-bless-boot-generator.xml index 0c5144f6b8..8275838bce 100644 --- a/man/systemd-bless-boot-generator.xml +++ b/man/systemd-bless-boot-generator.xml @@ -17,7 +17,7 @@ systemd-bless-boot-generator - Pull systemd-bless-boot.service into the initial boot transaction when boot counting is in effect. + Pull systemd-bless-boot.service into the initial boot transaction when boot counting is in effect diff --git a/man/systemd-boot.xml b/man/systemd-boot.xml index b666ae1e53..3288728b2c 100644 --- a/man/systemd-boot.xml +++ b/man/systemd-boot.xml @@ -91,7 +91,7 @@ The boot manager optionally reads a random seed from the ESP partition, combines it with a 'system token' stored in a persistent EFI variable and derives a random seed to use by the OS as - entropy pool initializaton, providing a full entropy pool during early boot. + entropy pool initialization, providing a full entropy pool during early boot. bootctl1 @@ -313,7 +313,7 @@ is maintained persistently, while LoaderConfigTimeoutOneShot is a one-time override which is read once (in which case it takes precedence over LoaderConfigTimeout) and then removed. LoaderConfigTimeout may be manipulated with the - t/T keys, see above.) + t/T keys, see above. @@ -422,9 +422,9 @@ LoaderSystemToken - A binary random data field, that is used for generating the random see to pass to the - OS (see above). Note that this random data is generally only generated once, during OS installation, - and is then never updated again. + A binary random data field, that is used for generating the random seed to pass to + the OS (see above). Note that this random data is generally only generated once, during OS + installation, and is then never updated again. diff --git a/man/systemd-gpt-auto-generator.xml b/man/systemd-gpt-auto-generator.xml index b0fa617d63..78fdacccab 100644 --- a/man/systemd-gpt-auto-generator.xml +++ b/man/systemd-gpt-auto-generator.xml @@ -19,7 +19,7 @@ systemd-gpt-auto-generator Generator for automatically discovering and mounting root, /home/, /srv/, /var/ and /var/tmp/ partitions, as - well as discovering and enabling swap partitions, based on GPT partition type GUIDs. + well as discovering and enabling swap partitions, based on GPT partition type GUIDs diff --git a/man/systemd-journal-gatewayd.service.xml b/man/systemd-journal-gatewayd.service.xml index 633b4cb55b..0f7aaab624 100644 --- a/man/systemd-journal-gatewayd.service.xml +++ b/man/systemd-journal-gatewayd.service.xml @@ -217,9 +217,9 @@ where - is a cursor string, - is an integer, - is an unsigned integer. + cursor is a cursor string, + num_skip is an integer, + num_entries is an unsigned integer. Range defaults to all available events. diff --git a/man/systemd-journal-upload.service.xml b/man/systemd-journal-upload.service.xml index a073a37a29..174bef803f 100644 --- a/man/systemd-journal-upload.service.xml +++ b/man/systemd-journal-upload.service.xml @@ -267,7 +267,7 @@ openssl ca -batch -config ca.conf -notext -in $CLIENT.csr -out $CLIENT.pem those files can be specified using TrustedCertificateFile=, ServerCertificateFile=, - ServerKeyFile=, in + and ServerKeyFile= in /etc/systemd/journal-remote.conf and /etc/systemd/journal-upload.conf, respectively. The default locations can be queried by using diff --git a/man/systemd-logind.service.xml b/man/systemd-logind.service.xml index c602b2e42f..bbfcad4af6 100644 --- a/man/systemd-logind.service.xml +++ b/man/systemd-logind.service.xml @@ -103,7 +103,7 @@ systemd-user-sessions.service8, loginctl1, logind.conf5, - pam_systemd8 + pam_systemd8, sd-login3 diff --git a/man/systemd-mount.xml b/man/systemd-mount.xml index a6e6dd9b48..f1089eed3b 100644 --- a/man/systemd-mount.xml +++ b/man/systemd-mount.xml @@ -50,10 +50,11 @@ WHERE. In many ways, systemd-mount is similar to the lower-level - mount8 command, however instead - of executing the mount operation directly and immediately, systemd-mount schedules it through - the service manager job queue, so that it may pull in further dependencies (such as parent mounts, or a file system - checker to execute a priori), and may make use of the auto-mounting logic. + mount8 + command, however instead of executing the mount operation directly and immediately, + systemd-mount schedules it through the service manager job queue, so that it may pull + in further dependencies (such as parent mounts, or a file system checker to execute a priori), and may + make use of the auto-mounting logic. The command takes either one or two arguments. If only one argument is specified it should refer to a block device or regular file containing a file system (e.g. /dev/sdb1 or @@ -61,15 +62,15 @@ label and other metadata, and is mounted to a directory below /run/media/system/ whose name is generated from the file system label. In this mode the block device or image file must exist at the time of invocation of the command, so that it may be probed. If the device is found to be a - removable block device (e.g. a USB stick) an automount point instead of a regular mount point is created + removable block device (e.g. a USB stick), an automount point is created instead of a regular mount point (i.e. the option is implied, see below). - If two arguments are specified the first indicates the mount source (the WHAT) and - the second indicates the path to mount it on (the WHERE). In this mode no probing of the - source is attempted, and a backing device node doesn't have to exist yet. However, if this mode is combined with - , device node probing for additional metadata is enabled, and – much like in the - single-argument case discussed above – the specified device has to exist at the time of invocation of the - command. + If two arguments are specified, the first indicates the mount source (the + WHAT) and the second indicates the path to mount it on (the + WHERE). In this mode no probing of the source is attempted, and a backing + device node doesn't have to exist. However, if this mode is combined with , + device node probing for additional metadata is enabled, and – much like in the single-argument case + discussed above – the specified device has to exist at the time of invocation of the command. Use the command to show a terse table of all local, known block devices with file systems that may be mounted with this command. diff --git a/man/systemd-nspawn.xml b/man/systemd-nspawn.xml index e28572db6d..7b643908e0 100644 --- a/man/systemd-nspawn.xml +++ b/man/systemd-nspawn.xml @@ -531,11 +531,9 @@ - After transitioning into the container, change - to the specified user-defined in the container's user - database. Like all other systemd-nspawn features, this is not - a security feature and provides protection against accidental - destructive operations only. + After transitioning into the container, change to the specified user defined in the + container's user database. Like all other systemd-nspawn features, this is not a security feature and + provides protection against accidental destructive operations only. @@ -1167,10 +1165,9 @@ Finally, if set to auto the file is left as it is if private networking is turned on (see ). Otherwise, if - systemd-resolved.service is connectible its stub - resolv.conf file is used, and if not the host's - /etc/resolv.conf file is used. In the latter cases the file is copied if the - image is writable, and bind mounted otherwise. + systemd-resolved.service is running its stub resolv.conf + file is used, and if not the host's /etc/resolv.conf file. In the latter cases + the file is copied if the image is writable, and bind mounted otherwise. It's recommended to use copy-… or replace-… if the container shall be able to make changes to the DNS configuration on its own, deviating from the @@ -1186,19 +1183,20 @@ - Configures how /etc/localtime inside of the container (i.e. local timezone - synchronization from host to container) shall be handled. Takes one of off, - copy, bind, symlink, delete or - auto. If set to off the /etc/localtime file in the - container is left as it is included in the image, and neither modified nor bind mounted over. If set to - copy the /etc/localtime file of the host is copied into the - container. Similar, if bind is used, it is bind mounted from the host into the container. If - set to symlink a symlink from /etc/localtime in the container is - created pointing to the matching the timezone file of the container that matches the timezone setting on the - host. If set to delete the file in the container is deleted, should it exist. If set to - auto and the /etc/localtime file of the host is a symlink, then - symlink mode is used, and copy otherwise, except if the image is - read-only in which case bind is used instead. Defaults to + Configures how /etc/localtime inside of the container + (i.e. local timezone synchronization from host to container) shall be handled. Takes one of + off, copy, bind, symlink, + delete or auto. If set to off the + /etc/localtime file in the container is left as it is included in the image, and + neither modified nor bind mounted over. If set to copy the + /etc/localtime file of the host is copied into the container. Similarly, if + bind is used, the file is bind mounted from the host into the container. If set to + symlink, a symlink is created pointing from /etc/localtime in + the container to the timezone file in the container that matches the timezone setting on the host. If + set to delete, the file in the container is deleted, should it exist. If set to + auto and the /etc/localtime file of the host is a symlink, + then symlink mode is used, and copy otherwise, except if the + image is read-only in which case bind is used instead. Defaults to auto. @@ -1441,7 +1439,7 @@ This installs a minimal Fedora distribution into the directory /var/lib/machines/f&fedora_latest_version; - and then boots an OS in a namespace container in it. Because the installation + and then boots that OS in a namespace container. Because the installation is located underneath the standard /var/lib/machines/ directory, it is also possible to start the machine using systemd-nspawn -M f&fedora_latest_version;. @@ -1455,7 +1453,7 @@ This installs a minimal Debian unstable distribution into the directory ~/debian-tree/ and then - spawns a shell in a namespace container in it. + spawns a shell from this image in a namespace container. debootstrap supports Debian, diff --git a/man/systemd-random-seed.service.xml b/man/systemd-random-seed.service.xml index 28783a15e9..a9e322425f 100644 --- a/man/systemd-random-seed.service.xml +++ b/man/systemd-random-seed.service.xml @@ -44,7 +44,7 @@ systemd-boot7, with its bootctl random-seed functionality. - When loading the random seed from disk its file is immediately updated with a new seed retrieved + When loading the random seed from disk, the file is immediately updated with a new seed retrieved from the kernel, in order to ensure no two boots operate with the same random seed. This new seed is retrieved synchronously from the kernel, which means the service will not complete start-up until the random pool is fully initialized. On entropy-starved systems this may take a while. This functionality is diff --git a/man/systemd-repart.xml b/man/systemd-repart.xml index 74c6ba95b1..ffa88baf67 100644 --- a/man/systemd-repart.xml +++ b/man/systemd-repart.xml @@ -57,9 +57,10 @@ available but not yet used. Specifically the following use cases are among those covered: - The root partition may be grown to cover the whole available disk space - A /home/, swap or /srv/ partition can be added in - A second (or third, …) root partition may be added in, to cover A/B style setups + The root partition may be grown to cover the whole available disk space. + A /home/, swap or /srv/ partition can be + added. + A second (or third, …) root partition may be added, to cover A/B style setups where a second version of the root file system is alternatingly used for implementing update schemes. The deployed image would carry only a single partition ("A") but on first boot a second partition ("B") for this purpose is automatically created. @@ -69,7 +70,7 @@ The repart.d/*.conf configuration files are loaded and parsed, - and ordered by filename (without the directory suffix). + and ordered by filename (without the directory prefix). The partition table already existing on the block device is loaded and parsed. @@ -119,13 +120,13 @@ As exception to the normally strictly incremental operation, when called in a special "factory - reset" mode systemd-repart may also be used to erase select existing partitions to + reset" mode, systemd-repart may also be used to erase existing partitions to reset an installation back to vendor defaults. This mode of operation is used when either the switch is passed on the tool's command line, or the option specified on the kernel command line, or the FactoryReset EFI variable (vendor UUID 8cf2644b-4b0b-428f-9387-6d876050dc67) is set to "yes". It alters the algorithm above - slightly: between the 3rd and the 4th step above the any partition marked explicitly via the + slightly: between the 3rd and the 4th step above any partition marked explicitly via the FactoryReset= boolean is deleted, and the algorithm restarted, thus immediately re-creating these partitions anew empty. @@ -267,9 +268,9 @@ - Takes a file system path. If specified the *.conf are directly - read from the specified directory instead of searching in - /usr/lib/repart.d/*.conf, /etc/repart.d/*.conf, + Takes a file system path. If specified the *.conf files are read + from the specified directory instead of searching in /usr/lib/repart.d/*.conf, + /etc/repart.d/*.conf, /run/repart.d/*.conf. diff --git a/man/systemd-socket-proxyd.xml b/man/systemd-socket-proxyd.xml index 58b26aad87..a4e18989fc 100644 --- a/man/systemd-socket-proxyd.xml +++ b/man/systemd-socket-proxyd.xml @@ -16,7 +16,7 @@ systemd-socket-proxyd - Bidirectionally proxy local sockets to another (possibly remote) socket. + Bidirectionally proxy local sockets to another (possibly remote) socket diff --git a/man/systemd-suspend.service.xml b/man/systemd-suspend.service.xml index 2310e6f526..4f445123a7 100644 --- a/man/systemd-suspend.service.xml +++ b/man/systemd-suspend.service.xml @@ -71,14 +71,11 @@ url="https://www.freedesktop.org/wiki/Software/systemd/inhibit">Inhibitor interface. - Note that - systemd-suspend.service, - systemd-hibernate.service, and - systemd-hybrid-sleep.service - systemd-suspend-then-hibernate.service - should never be executed directly. Instead, trigger system sleep - states with a command such as systemctl suspend - or similar. + Note that systemd-suspend.service, + systemd-hibernate.service, systemd-hybrid-sleep.service, and + systemd-suspend-then-hibernate.service should never be executed directly. Instead, + trigger system sleep with a command such as systemctl suspend or systemctl + hibernate. Internally, this service will echo a string like mem into /sys/power/state, diff --git a/man/systemd-system.conf.xml b/man/systemd-system.conf.xml index 435c3882db..dd505c05f0 100644 --- a/man/systemd-system.conf.xml +++ b/man/systemd-system.conf.xml @@ -387,9 +387,9 @@ units. See setrlimit2 for details. These settings may be overridden in individual units using the corresponding - LimitXXX= directives, see - systemd.exec5, for - details, and they accept the same parameter syntax. Note that these resource limits are only defaults + LimitXXX= directives and they accept the same parameter syntax, + see systemd.exec5 + for details. Note that these resource limits are only defaults for units, they are not applied to the service manager process (i.e. PID 1) itself. diff --git a/man/systemd-time-wait-sync.service.xml b/man/systemd-time-wait-sync.service.xml index c8a92f94a8..685fe74339 100644 --- a/man/systemd-time-wait-sync.service.xml +++ b/man/systemd-time-wait-sync.service.xml @@ -18,7 +18,7 @@ systemd-time-wait-sync.service systemd-time-wait-sync - Wait Until Kernel Time Synchronized + Wait until kernel time is synchronized diff --git a/man/systemd.device.xml b/man/systemd.device.xml index ae786a3298..84acf9001a 100644 --- a/man/systemd.device.xml +++ b/man/systemd.device.xml @@ -60,7 +60,7 @@ Device units will be reloaded by systemd whenever the corresponding device generates a changed event. Other units can use ReloadPropagatedFrom= to react - to that event + to that event. diff --git a/man/systemd.exec.xml b/man/systemd.exec.xml index 64799edd99..b94bc2e4f4 100644 --- a/man/systemd.exec.xml +++ b/man/systemd.exec.xml @@ -511,10 +511,11 @@ CapabilityBoundingSet=~CAP_B CAP_C AppArmorProfile= - 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. This result in a non - operation if AppArmor is not enabled. If prefixed by -, all errors will be ignored. This - does not affect commands prefixed with +. + 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. If + prefixed by -, all errors will be ignored. This setting has no effect if AppArmor + is not enabled. This setting not affect commands prefixed with +. + @@ -880,7 +881,7 @@ CapabilityBoundingSet=~CAP_B CAP_C in NUMAMask=. For more details on each policy please see, set_mempolicy2. For overall overview of NUMA support in Linux see, - numa7 + numa7. @@ -1067,14 +1068,16 @@ CapabilityBoundingSet=~CAP_B CAP_C RootDirectory= or RootImage= these paths always reside on the host and are mounted from there into the unit's file system namespace. - If DynamicUser= is used in conjunction with StateDirectory=, - CacheDirectory= and LogsDirectory= is slightly altered: the directories - are created below /var/lib/private, /var/cache/private and + If DynamicUser= is used in conjunction with + StateDirectory=, the logic for CacheDirectory= and + LogsDirectory= is slightly altered: the directories are created below + /var/lib/private, /var/cache/private and /var/log/private, respectively, which are host directories made inaccessible to - unprivileged users, which ensures that access to these directories cannot be gained through dynamic user ID - recycling. Symbolic links are created to hide this difference in behaviour. Both from perspective of the host - and from inside the unit, the relevant directories hence always appear directly below - /var/lib, /var/cache and /var/log. + unprivileged users, which ensures that access to these directories cannot be gained through dynamic + user ID recycling. Symbolic links are created to hide this difference in behaviour. Both from + perspective of the host and from inside the unit, the relevant directories hence always appear + directly below /var/lib, /var/cache and + /var/log. Use RuntimeDirectory= to manage one or more runtime directories for the unit and bind their lifetime to the daemon runtime. This is particularly useful for unprivileged daemons that cannot create @@ -1238,8 +1241,8 @@ BindReadOnlyPaths=/var/lib/systemd PrivateTmp= Takes a boolean argument. If true, sets up a new file system namespace for the executed - processes and mounts private /tmp and /var/tmp directories inside it - that is not shared by processes outside of the namespace. This is useful to secure access to temporary files of + processes and mounts private /tmp/ and /var/tmp/ directories inside it + that are not shared by processes outside of the namespace. This is useful to secure access to temporary files of the process, but makes sharing between processes via /tmp or /var/tmp impossible. If this is enabled, all temporary files created by a service in these directories will be removed after the service is stopped. Defaults to false. It is possible to run two or more units within the same @@ -1399,7 +1402,7 @@ BindReadOnlyPaths=/var/lib/systemd this option removes CAP_SYS_TIME and CAP_WAKE_ALARM from the capability bounding set for this unit, installs a system call filter to block calls that can set the clock, and DeviceAllow=char-rtc r is implied. This ensures /dev/rtc0, - /dev/rtc1, etc are made read only to the service. See + /dev/rtc1, etc. are made read-only to the service. See systemd.resource-control5 for the details about DeviceAllow=. @@ -1495,7 +1498,7 @@ BindReadOnlyPaths=/var/lib/systemd systemd.socket5) are unaffected. Also, sockets created with socketpair() (which creates connected AF_UNIX sockets only) are unaffected. Note that this option has no effect on 32-bit x86, s390, s390x, - mips, mips-le, ppc, ppc-le, pcc64, ppc64-le and is ignored (but works correctly on other ABIs, + mips, mips-le, ppc, ppc-le, ppc64, ppc64-le and is ignored (but works correctly on other ABIs, including x86-64). Note that on systems supporting multiple ABIs (such as x86/x86-64) it is recommended to turn off alternative ABIs for services, so that they cannot be used to circumvent the restrictions of this option. Specifically, it is recommended to combine this option with @@ -1803,7 +1806,7 @@ RestrictNamespaces=~cgroup net @file-system - File system operations: opening, creating files and directories for read and write, renaming and removing them, reading file properties, or creating hard and symbolic links. + File system operations: opening, creating files and directories for read and write, renaming and removing them, reading file properties, or creating hard and symbolic links @io-event @@ -1819,7 +1822,7 @@ RestrictNamespaces=~cgroup net @memlock - Locking of memory into RAM (mlock2, mlockall2 and related calls) + Locking of memory in RAM (mlock2, mlockall2 and related calls) @module @@ -1843,7 +1846,7 @@ RestrictNamespaces=~cgroup net @process - Process control, execution, namespaceing operations (clone2, kill2, namespaces7, … + Process control, execution, namespaceing operations (clone2, kill2, namespaces7, …) @raw-io @@ -1871,7 +1874,7 @@ RestrictNamespaces=~cgroup net @sync - Synchronizing files and memory to disk: (fsync2, msync2, and related calls) + Synchronizing files and memory to disk (fsync2, msync2, and related calls) @system-service @@ -1949,7 +1952,7 @@ SystemCallErrorNumber=EPERM manager is compiled for). If running in user mode, or in system mode, but without the CAP_SYS_ADMIN capability (e.g. setting User=nobody), NoNewPrivileges=yes is implied. By default, this option is set to the empty list, i.e. no - system call architecture filtering is applied. + filtering is applied. If this setting is used, processes of this unit will only be permitted to call native system calls, and system calls of the specified architectures. For the purposes of this option, the x32 architecture is treated @@ -2213,8 +2216,9 @@ SystemCallErrorNumber=EPERM AF_UNIX socket in the file system, as in that case only a single stream connection is created for both input and output. - is similar to above, but it opens the file in append mode. + is similar to + above, but it opens the file in append mode. + connects standard output to a socket acquired via socket activation. The semantics are similar to the same option of StandardInput=, see above. @@ -2551,7 +2555,7 @@ StandardInputData=SWNrIHNpdHplIGRhIHVuJyBlc3NlIEtsb3BzLAp1ZmYgZWVtYWwga2xvcHAncy UnsetEnvironment= are removed again from the compiled environment variable list, immediately before it is passed to the executed process. - The following select environment variables are set or propagated by the service manager for each invoked + The following environment variables are set or propagated by the service manager for each invoked process: @@ -2622,7 +2626,7 @@ StandardInputData=SWNrIHNpdHplIGRhIHVuJyBlc3NlIEtsb3BzLAp1ZmYgZWVtYWwga2xvcHAncy $LOGS_DIRECTORY $CONFIGURATION_DIRECTORY - Contains and absolute paths to the directories defined with + Absolute paths to the directories defined with RuntimeDirectory=, StateDirectory=, CacheDirectory=, LogsDirectory=, and ConfigurationDirectory= when those settings are used. @@ -3228,7 +3232,7 @@ StandardInputData=SWNrIHNpdHplIGRhIHVuJyBlc3NlIEtsb3BzLAp1ZmYgZWVtYWwga2xvcHAncy 242 EXIT_NUMA_POLICY - Failed to set up unit's NUMA memory policy. See NUMAPolicy= and NUMAMask=above. + Failed to set up unit's NUMA memory policy. See NUMAPolicy= and NUMAMask= above. diff --git a/man/systemd.journal-fields.xml b/man/systemd.journal-fields.xml index 31ad143113..197a468f25 100644 --- a/man/systemd.journal-fields.xml +++ b/man/systemd.journal-fields.xml @@ -524,7 +524,8 @@ structured log entries via calls such as sd_journal_send3. They may also not be used as matches for - sd_journal_add_match3 + sd_journal_add_match3. + diff --git a/man/systemd.kill.xml b/man/systemd.kill.xml index 5e4d430031..73f61c80e4 100644 --- a/man/systemd.kill.xml +++ b/man/systemd.kill.xml @@ -151,7 +151,7 @@ terminate upon receiving the initial SIGTERM signal. This can be achieved by configuring LimitCORE= and setting FinalKillSignal= to either - SIGQUIT or SIGABRT + SIGQUIT or SIGABRT. Defaults to SIGKILL. diff --git a/man/systemd.net-naming-scheme.xml b/man/systemd.net-naming-scheme.xml index 4fc85d40ec..324c94dbd9 100644 --- a/man/systemd.net-naming-scheme.xml +++ b/man/systemd.net-naming-scheme.xml @@ -357,7 +357,7 @@ Note that latest may be used to denote the latest scheme known (to this - particular version of systemd. + particular version of systemd). diff --git a/man/systemd.netdev.xml b/man/systemd.netdev.xml index 6ebaf1143c..e8c1c140cf 100644 --- a/man/systemd.netdev.xml +++ b/man/systemd.netdev.xml @@ -114,10 +114,10 @@ An IPv4 over IPv4 tunnel. ipvlan - An ipvlan device is a stacked device which receives packets from its underlying device based on IP address filtering. + An IPVLAN device is a stacked device which receives packets from its underlying device based on IP address filtering. ipvtap - An ipvtap device is a stacked device which receives packets from its underlying device based on IP address filtering and can be accessed using the tap user space interface. + An IPVTAP device is a stacked device which receives packets from its underlying device based on IP address filtering and can be accessed using the tap user space interface. macvlan A macvlan device is a stacked device which receives packets from its underlying device based on MAC address filtering. @@ -273,13 +273,13 @@ Name= The interface name used when creating the netdev. - This option is compulsory. + This setting is compulsory. Kind= - The netdev kind. This option is compulsory. See the + The netdev kind. This setting is compulsory. See the Supported netdev kinds section for the valid keys. @@ -287,7 +287,7 @@ MTUBytes= - The maximum transmission unit in bytes to set for the device. The usual suffixes K, M, G, + The maximum transmission unit in bytes to set for the device. The usual suffixes K, M, G are supported and are understood to the base of 1024. For tun or tap devices, MTUBytes= setting is not currently supported in [NetDev] section. Please specify it in [Link] section of @@ -445,7 +445,7 @@ Id= The VLAN ID to use. An integer in the range 0–4094. - This option is compulsory. + This setting is compulsory. @@ -478,8 +478,8 @@ ReorderHeader= - Takes a boolean. The VLAN reorder header is set VLAN interfaces behave like physical interfaces. - When unset, the kernel's default will be used. + Takes a boolean. When enabled, the VLAN reorder header is used and VLAN interfaces behave + like physical interfaces. When unset, the kernel's default will be used. @@ -579,7 +579,8 @@ Group= - Configures VXLAN multicast group IP address. All members of a VXLAN must use the same multicast group address. + Configures VXLAN multicast group IP address. All members of a VXLAN must use the same + multicast group address. @@ -637,8 +638,7 @@ L3MissNotification= - Takes a boolean. When true, enables netlink IP address miss - notifications. + Takes a boolean. When true, enables netlink IP address miss notifications. @@ -765,15 +765,16 @@ TTL= - Accepts the same key in [VXLAN] section except when unset or - set to 0, the kernel's default will be used meaning that packets TTL will be set from + Accepts the same values as in the [VXLAN] section, except that when unset + or set to 0, the kernel's default will be used, meaning that packet TTL will be set from /proc/sys/net/ipv4/ip_default_ttl. UDPChecksum= - Takes a boolean. When true, specifies if UDP checksum is calculated for transmitted packets over IPv4. + Takes a boolean. When true, specifies that UDP checksum is calculated for transmitted packets + over IPv4. @@ -821,21 +822,23 @@ TunnelId= - Specifies the tunnel id. The value used must match the PeerTunnelId= value being used at the peer. - Ranges a number between 1 and 4294967295). This option is compulsory. + Specifies the tunnel identifier. Takes an number in the range 1–4294967295. The value used + must match the PeerTunnelId= value being used at the peer. This setting is + compulsory. PeerTunnelId= - Specifies the peer tunnel id. The value used must match the PeerTunnelId= value being used at the peer. - Ranges a number between 1 and 4294967295). This option is compulsory. + Specifies the peer tunnel id. Takes a number in the range 1—4294967295. The value used must + match the PeerTunnelId= value being used at the peer. This setting is + compulsory. Remote= - Specifies the IP address of the remote peer. This option is compulsory. + Specifies the IP address of the remote peer. This setting is compulsory. @@ -852,27 +855,29 @@ EncapsulationType= - Specifies the encapsulation type of the tunnel. Takes one of udp or ip. + Specifies the encapsulation type of the tunnel. Takes one of udp or + ip. UDPSourcePort= - Specifies the UDP source port to be used for the tunnel. When UDP encapsulation is selected it's mandotory. Ignored when ip - encapsulation is selected. + Specifies the UDP source port to be used for the tunnel. When UDP encapsulation is selected + it's mandatory. Ignored when IP encapsulation is selected. UDPDestinationPort= - Specifies destination port. When UDP encapsulation is selected it's mandotory. Ignored when ip + Specifies destination port. When UDP encapsulation is selected it's mandatory. Ignored when IP encapsulation is selected. UDPChecksum= - Takes a boolean. When true, specifies if UDP checksum is calculated for transmitted packets over IPv4. + Takes a boolean. When true, specifies that UDP checksum is calculated for transmitted packets + over IPv4. @@ -900,21 +905,23 @@ Name= - Specifies the name of the session. This option is compulsory. + Specifies the name of the session. This setting is compulsory. SessionId= - Specifies the session id. The value used must match the SessionId= value being used at the peer. - Ranges a number between 1 and 4294967295). This option is compulsory. + Specifies the session identifier. Takes an number in the range 1–4294967295. The value used + must match the SessionId= value being used at the peer. This setting is + compulsory. PeerSessionId= - Specifies the peer session id. The value used must match the PeerSessionId= value being used at the peer. - Ranges a number between 1 and 4294967295). This option is compulsory. + Specifies the peer session identifier. Takes an number in the range 1–4294967295. + The value used must match the PeerSessionId= value being used at the peer. + This setting is compulsory. @@ -968,7 +975,7 @@ MACAddress= Specifies the MAC address to be used for the MACsec receive channel. The MAC address - used to make secure channel identifier (SCI). This option is compulsory, and is not set by + used to make secure channel identifier (SCI). This setting is compulsory, and is not set by default. @@ -1002,7 +1009,7 @@ Key= Specifies the encryption key used in the transmission channel. The same key must be - configured on the peer’s matching receive channel. This option is compulsory, and is not set + configured on the peer’s matching receive channel. This setting is compulsory, and is not set by default. Takes a 128-bit key encoded in a hexadecimal string, for example dffafc8d7b9a43d5b9a3dfbbf6a30c16. @@ -1136,7 +1143,7 @@ A fixed Time To Live N on tunneled packets. N is a number in the range 1–255. 0 is a special value meaning that packets inherit the TTL value. The default value for IPv4 - tunnels is: inherit. The default value for IPv6 tunnels is + tunnels is 0 (inherit). The default value for IPv6 tunnels is 64. @@ -1192,7 +1199,7 @@ both directions (InputKey= and OutputKey=). The Key= is either a number or an IPv4 address-like dotted quad. It is used as mark-configured SAD/SPD entry as part of the lookup key (both in data - and control path) in ip xfrm (framework used to implement IPsec protocol). + and control path) in IP XFRM (framework used to implement IPsec protocol). See ip-xfrm — transform configuration for details. It is only used for VTI/VTI6, GRE, GRETAP, and ERSPAN tunnels. @@ -1322,29 +1329,32 @@ Encapsulation= - Specifies the encapsulation mechanism used to store networking packets of various protocols inside the UDP packets. Supports the following values: + Specifies the encapsulation mechanism used to store networking packets of various protocols + inside the UDP packets. Supports the following values: - FooOverUDP provides the simplest no frills model of UDP encapsulation, it simply encapsulates - packets directly in the UDP payload. - GenericUDPEncapsulation is a generic and extensible encapsulation, it allows encapsulation of packets for any IP - protocol and optional data as part of the encapsulation. - For more detailed information see Generic UDP Encapsulation. - Defaults to FooOverUDP. + FooOverUDP provides the simplest no frills model of UDP encapsulation, it simply + encapsulates packets directly in the UDP payload. GenericUDPEncapsulation is a + generic and extensible encapsulation, it allows encapsulation of packets for any IP protocol and + optional data as part of the encapsulation. For more detailed information see Generic UDP Encapsulation. Defaults to + FooOverUDP. Port= - Specifies the port number, where the IP encapsulation packets will arrive. Please take note that the packets - will arrive with the encapsulation will be removed. Then they will be manually fed back into the network stack, and sent ahead - for delivery to the real destination. This option is mandatory. + Specifies the port number, where the IP encapsulation packets will arrive. Please take note + that the packets will arrive with the encapsulation will be removed. Then they will be manually fed + back into the network stack, and sent ahead for delivery to the real destination. This option is + mandatory. PeerPort= - Specifies the peer port number. Defaults to unset. Note that when peer port is set Peer= address is mandotory. + Specifies the peer port number. Defaults to unset. Note that when peer port is set + Peer= address is mandatory. @@ -1360,7 +1370,8 @@ Peer= - Configures peer IP address. Note that when peer address is set PeerPort= is mandotory. + Configures peer IP address. Note that when peer address is set PeerPort= + is mandatory. @@ -1384,7 +1395,7 @@ Name= The interface name used when creating the netdev. - This option is compulsory. + This setting is compulsory. @@ -1410,7 +1421,7 @@ Peer= The peer interface name used when creating the netdev. - This option is compulsory. + This setting is compulsory. @@ -1702,14 +1713,15 @@ AdActorSystemPriority= - Specifies the 802.3ad actor system priority. Ranges [1-65535]. + Specifies the 802.3ad actor system priority. Takes a number in the range 1—65535. AdUserPortKey= - Specifies the 802.3ad user defined portion of the port key. Ranges [0-1023]. + Specifies the 802.3ad user defined portion of the port key. Takes a number in the range + 0–1023. @@ -1902,8 +1914,7 @@ For more detail information see - - Virtual xfrm interfaces + Virtual XFRM Interfaces. @@ -1916,7 +1927,7 @@ Table= - The numeric routing table identifier. This option is compulsory. + The numeric routing table identifier. This setting is compulsory. diff --git a/man/systemd.network.xml b/man/systemd.network.xml index ed08826389..7e3b2953c0 100644 --- a/man/systemd.network.xml +++ b/man/systemd.network.xml @@ -132,9 +132,8 @@ A whitespace-separated list of hardware address of the currently connected wireless LAN. Use full colon-, hyphen- or dot-delimited hexadecimal. See the example in - MACAddress=. This option may appear more than one, in which case the - lists are merged. If the empty string is assigned to this option, the list of BSSID defined - prior to this is reset. + MACAddress=. This option may appear more than once, in which case the + lists are merged. If the empty string is assigned to this option, the list is reset. @@ -211,7 +210,7 @@ Link groups are similar to port ranges found in managed switches. When network interfaces are added to a numbered group, operations on all the interfaces from that group can be performed at once. An unsigned - integer ranges 0 to 4294967294. Default to unset. + integer in the range 0—4294967294. Defaults to unset. @@ -495,10 +494,8 @@ DNSSEC= - Takes a boolean. or - allow-downgrade. When true, enables - DNSSEC + Takes a boolean or allow-downgrade. When true, enables + DNSSEC DNS validation support on the link. When set to allow-downgrade, compatibility with non-DNSSEC capable networks is increased, by automatically @@ -770,7 +767,7 @@ IPv4ProxyARP= Takes a boolean. Configures proxy ARP for IPv4. Proxy ARP is the technique in which one host, usually a router, answers ARP requests intended for another machine. By "faking" its identity, - the router accepts responsibility for routing packets to the "real" destination. (see RFC 1027. When unset, the kernel's default will be used. @@ -1031,7 +1028,7 @@ Scope= The scope of the address, which can be global, - link or host or an unsigned integer ranges 0 to 255. + link or host or an unsigned integer in the range 0—255. Defaults to global. @@ -1129,8 +1126,8 @@ Label= - The label for the prefix (an unsigned integer) ranges 0 to 4294967294. - 0xffffffff is reserved. This key is mandatory. + The label for the prefix, an unsigned integer in the range 0–4294967294. + 0xffffffff is reserved. This setting is mandatory. @@ -1154,7 +1151,7 @@ TypeOfService= - Specifies the type of service to match a number between 0 to 255. + Takes a number between 0 and 255 that specifies the type of service to match. @@ -1261,10 +1258,9 @@ [NextHop] Section Options - The [NextHop] section accepts the - following keys. Specify several [NextHop] - sections to configure several nexthop. Nexthop is used to manipulate entries in the kernel's nexthop - tables. + The [NextHop] section is used to manipulate entries in the kernel's "nexthop" tables. The + [NextHop] section accepts the following keys. Specify several [NextHop] sections to configure several + hops. @@ -1333,10 +1329,10 @@ IPv6Preference= Specifies the route preference as defined in RFC4191 for Router Discovery messages. - Which can be one of low the route has a lowest priority, - medium the route has a default priority or - high the route has a highest priority. + url="https://tools.ietf.org/html/rfc4191">RFC 4191 for Router Discovery messages. Which + can be one of low the route has a lowest priority, medium + the route has a default priority or high the route has a highest priority. + @@ -1717,8 +1713,8 @@ The table identifier for DHCP routes (a number between 1 and 4294967295, or 0 to unset). The table can be retrieved using ip route show table num. - When used in combination with VRF= the - VRF's routing table is used unless this parameter is specified. + When used in combination with VRF=, the + VRF's routing table is used when this parameter is not specified. @@ -1757,11 +1753,12 @@ SendDecline= - A boolean. When true, DHCPv4 clients receives IP address from DHCP server. - After new IP is received, DHCPv4 performs IPv4 Duplicate Address Detection. If duplicate use of IP is detected - the DHCPv4 client rejects the IP by sending a DHCPDECLINE packet DHCP clients try to obtain an IP address again. - See RFC 5224. - Defaults to unset. + A boolean. When true, the DHCPv4 client receives the IP address from the + DHCP server. After a new IP is received, the DHCPv4 client performs IPv4 Duplicate Address + Detection. If duplicate use is detected, the DHCPv4 client rejects the IP by sending a + DHCPDECLINE packet and tries to obtain an IP address again. See RFC 5224. Defaults to + unset. @@ -1839,7 +1836,7 @@ Takes a boolean. The DHCPv6 client can obtain configuration parameters from a DHCPv6 server through a rapid two-message exchange (solicit and reply). When the rapid commit option is enabled by both the DHCPv6 client and the DHCPv6 server, the two-message exchange is used, rather than the default - four-method exchange (solicit, advertise, request, and reply). The two-message exchange provides + four-message exchange (solicit, advertise, request, and reply). The two-message exchange provides faster client configuration and is beneficial in environments in which networks are under a heavy load. See RFC 3315 for details. Defaults to true. @@ -1867,14 +1864,15 @@ SendVendorOption= - Send an arbitrary vendor option in the DHCPv6 request. Takes an enterprise identifier, DHCP option number, - data type, and data separated with a colon - (enterprise identifier:option:type: - value). Enterprise identifier is an unsigned integer ranges 1..4294967294. - The option number must be an integer in the range 1..254. Data type takes one of uint8, - uint16, uint32, ipv4address, ipv6address, or - string. Special characters in the data string may be escaped using - C-style + Send an arbitrary vendor option in the DHCPv6 request. Takes an enterprise identifier, DHCP + option number, data type, and data separated with a colon (enterprise + identifier:option:type: + value). Enterprise identifier is an unsigned integer in the + range 1–4294967294. The option number must be an integer in the range 1–254. Data type takes one + of uint8, uint16, uint32, + ipv4address, ipv6address, or + string. Special characters in the data string may be escaped using C-style escapes. This setting can be specified multiple times. If an empty string is specified, then all options specified earlier are cleared. Defaults to unset. @@ -1918,17 +1916,19 @@ PrefixDelegationHint= - Takes an IPv6 address with prefix length as Address= in - the "[Network]" section. Specifies the DHCPv6 client for the requesting router to include - a prefix-hint in the DHCPv6 solicitation. Prefix ranges 1..128. Defaults to unset. + Takes an IPv6 address with prefix length in the same format as the + Address= in the [Network] section. The DHCPv6 client will include a prefix + hint in the DHCPv6 solicitation sent to the server. The prefix length must be in the range + 1–128. Defaults to unset. WithoutRA= - Allows DHCPv6 client to start without router advertisements's managed or other address configuration flag. - Takes one of solicit or information-request. Defaults to unset. + Allows DHCPv6 client to start without router advertisements's managed or other address + configuration flag. Takes one of solicit or + information-request. Defaults to unset. @@ -2275,10 +2275,9 @@ [IPv6Prefix] Section Options - One or more [IPv6Prefix] sections contain the IPv6 - prefixes that are announced via Router Advertisements. See - RFC 4861 - for further details. + One or more [IPv6Prefix] sections contain the IPv6 prefixes that are announced via Router + Advertisements. See RFC 4861 for further + details. @@ -2405,10 +2404,9 @@ HairPin= - Takes a boolean. Configures whether traffic may be sent back - out of the port on which it was received. When this flag is false, and the bridge - will not forward traffic back out of the receiving port. - When unset, the kernel's default will be used. + Takes a boolean. Configures whether traffic may be sent back out of the port on which it + was received. When this flag is false, then the bridge will not forward traffic back out of the + receiving port. When unset, the kernel's default will be used. @@ -2684,7 +2682,7 @@ PacketLimit= Specifies the maximum number of packets the qdisc may hold queued at a time. - An unsigned integer ranges 0 to 4294967294. Defaults to 1000. + An unsigned integer in the range 0–4294967294. Defaults to 1000. @@ -2708,8 +2706,8 @@ [TokenBucketFilter] Section Options - The [TokenBucketFilter] section manages the queueing discipline (qdisc) of - token bucket filter (tbf). + The [TokenBucketFilter] section manages the queueing discipline (qdisc) of token bucket filter + (tbf). @@ -2793,7 +2791,7 @@ PacketLimit= Specifies the hard limit on the queue size in number of packets. When this limit is reached, incoming packets are - dropped. An unsigned integer ranges 1 to 4294967294. Defaults to unset and kernel's default is used. + dropped. An unsigned integer in the range 1–4294967294. Defaults to unset and kernel's default is used. @@ -2811,8 +2809,9 @@ PacketLimit= - Specifies the hard limit on the queue size in number of packets. When this limit is reached, incoming packets are - dropped. An unsigned integer ranges 0 to 4294967294. Defaults to unset and kernel's default is used. + Specifies the hard limit on the queue size in number of packets. When this limit is reached, + incoming packets are dropped. An unsigned integer in the range 0–4294967294. Defaults to unset and + kernel's default is used. @@ -2848,10 +2847,11 @@ LimitBytes= - Specifies the hard limit on the FIFO size in bytes. The size limit (a buffer size) to prevent it - from overflowing in case it is unable to dequeue packets as quickly as it receives them. When this limit - is reached, incoming packets are dropped. When suffixed with K, M, or G, the specified size is parsed as - Kilobytes, Megabytes, or Gigabytes, respectively, to the base of 1024. Defaults to unset and kernel's default is used. + Specifies the hard limit on the FIFO size in bytes. The size limit (a buffer size) to prevent + it from overflowing in case it is unable to dequeue packets as quickly as it receives them. When + this limit is reached, incoming packets are dropped. When suffixed with K, M, or G, the specified + size is parsed as Kilobytes, Megabytes, or Gigabytes, respectively, to the base of 1024. Defaults + to unset and kernel's default is used. @@ -2869,9 +2869,10 @@ PacketLimit= - Specifies the hard limit on the FIFO size in number of packets. The size limit (a buffer size) to prevent it - from overflowing in case it is unable to dequeue packets as quickly as it receives them. When this limit is reached, - incoming packets are dropped. An unsigned integer ranges 0 to 4294967294. Defaults to unset and kernel's default is used. + Specifies the hard limit on the FIFO size in number of packets. The size limit (a buffer + size) to prevent it from overflowing in case it is unable to dequeue packets as quickly as it + receives them. When this limit is reached, incoming packets are dropped. An unsigned integer in the + range 0–4294967294. Defaults to unset and kernel's default is used. @@ -2917,8 +2918,8 @@ OverheadBytes= - Specifies that bytes to be addeded to the size of each packet. Bytes may be negative. - Takes an integer ranges -64 to 256. Defaults to unset and kernel's default is used. + Specifies that bytes to be addeded to the size of each packet. Bytes may be negative. Takes + an integer in the range from -64 to 256. Defaults to unset and kernel's default is used. @@ -2945,8 +2946,9 @@ PacketLimit= - Specifies the hard limit on the queue size in number of packets. When this limit is reached, incoming packets are - dropped. An unsigned integer ranges 0 to 4294967294. Defaults to unset and kernel's default is used. + Specifies the hard limit on the queue size in number of packets. When this limit is reached, + incoming packets are dropped. An unsigned integer in the range 0–4294967294. Defaults to unset and + kernel's default is used. @@ -3029,18 +3031,17 @@ Bands= - Specifies the number of bands. An unsigned integer ranges 1 to 16. This value has to be - at least large enough to cover the strict bands specified through the - StrictBands= and bandwidth-sharing bands specified in - QuantumBytes=. + Specifies the number of bands. An unsigned integer in the range 1–16. This value has to be at + least large enough to cover the strict bands specified through the StrictBands= + and bandwidth-sharing bands specified in QuantumBytes=. StrictBands= - Specifies the number of bands that should be created in strict mode. An unsigned integer - ranges 1 to 16. + Specifies the number of bands that should be created in strict mode. An unsigned integer in + the range 1–16. @@ -3156,7 +3157,7 @@ QuantumBytes= - Specifies the number of bytes used as 'deficit' in the fair queuing algorithmtimespan. + Specifies the number of bytes used as the "deficit" in the fair queuing algorithm timespan. When suffixed with K, M, or G, the specified size is parsed as Kilobytes, Megabytes, or Gigabytes, respectively, to the base of 1024. Defaults to unset and kernel's default is used. @@ -3411,8 +3412,9 @@ PacketLimit= - Specifies the hard limit on the queue size in number of packets. When this limit is reached, incoming packets are - dropped. An unsigned integer ranges 0 to 4294967294. Defaults to unset and kernel's default is used. + Specifies the hard limit on the queue size in number of packets. When this limit is reached, + incoming packets are dropped. An unsigned integer in the range 0–4294967294. Defaults to unset and + kernel's default is used. diff --git a/man/systemd.nspawn.xml b/man/systemd.nspawn.xml index 27eae50b51..44d3bbc75b 100644 --- a/man/systemd.nspawn.xml +++ b/man/systemd.nspawn.xml @@ -405,7 +405,7 @@ Inaccessible= - Masks the specified file or directly in the container, by over-mounting it with an empty file + Masks the specified file or directory in the container, by over-mounting it with an empty file node of the same type with the most restrictive access mode. Takes a file system path as argument. This option may be used multiple times to mask multiple files or directories. This option is equivalent to the command line switch , see diff --git a/man/systemd.offline-updates.xml b/man/systemd.offline-updates.xml index 89c12b598b..81a37f6789 100644 --- a/man/systemd.offline-updates.xml +++ b/man/systemd.offline-updates.xml @@ -33,7 +33,7 @@ - The package manager prepares system updates by downloading all (RPM or DEB or + The package manager prepares system updates by downloading all (.rpm or .deb or whatever) packages to update off-line in a special directory /var/lib/system-update (or another directory of the package/upgrade manager's choice). @@ -85,8 +85,8 @@ - The upgrade scripts should exit only after the update is finished. It is expected - that the service which performs the upgrade will cause the machine to reboot after it + The update scripts should exit only after the update is finished. It is expected + that the service which performs the update will cause the machine to reboot after it is done. If the system-update.target is successfully reached, i.e. all update services have run, and the /system-update symlink still exists, it will be removed and the machine rebooted as a safety measure. diff --git a/man/systemd.service.xml b/man/systemd.service.xml index 87929da81a..8ddfec2b94 100644 --- a/man/systemd.service.xml +++ b/man/systemd.service.xml @@ -896,7 +896,7 @@ this option will have no effect. - A service with with the <varname>SuccessExitStatus=</varname> setting + A service with the <varname>SuccessExitStatus=</varname> setting SuccessExitStatus=TEMPFAIL 250 SIGUSR1 diff --git a/man/systemd.socket.xml b/man/systemd.socket.xml index 46a2dbc7ed..0a9dfd2564 100644 --- a/man/systemd.socket.xml +++ b/man/systemd.socket.xml @@ -117,10 +117,9 @@ Socket units automatically gain a Before= dependency on the service units they activate. - Socket units referring to file system paths (such as AF_UNIX - sockets or FIFOs) implicitly gain Requires= and - After= dependencies on all mount units - necessary to access those paths. + Socket units referring to file system paths (such as AF_UNIX + sockets or FIFOs) implicitly gain Requires= and After= + dependencies on all mount units necessary to access those paths. Socket units using the BindToDevice= setting automatically gain a BindsTo= and @@ -300,7 +299,7 @@ url="https://www.kernel.org/doc/Documentation/usb/functionfs.txt">USB FunctionFS endpoints location to listen on, for implementation of USB gadget functions. This expects an - absolute file system path of functionfs mount point as the argument. + absolute file system path of FunctionFS mount point as the argument. Behavior otherwise is very similar to the ListenFIFO= directive above. Use this to open the FunctionFS endpoint ep0. When using this option, the @@ -313,9 +312,9 @@ SocketProtocol= Takes one of - or . Specifies a socket protocol - (IPPROTO_UDPLITE) UDP-Lite - (IPPROTO_SCTP) SCTP socket respectively. + or . The socket will use the UDP-Lite + (IPPROTO_UDPLITE) or SCTP + (IPPROTO_SCTP) protocol, respectively. @@ -349,16 +348,14 @@ BindToDevice= - Specifies a network interface name to bind - this socket to. If set, traffic will only be accepted from the - specified network interfaces. This controls the - SO_BINDTODEVICE socket option (see socket7 - for details). If this option is used, an implicit dependency - from this socket unit on the network interface device unit - (systemd.device5 - is created. Note that setting this parameter might result in - additional dependencies to be added to the unit (see + Specifies a network interface name to bind this socket to. If set, traffic will only + be accepted from the specified network interfaces. This controls the + SO_BINDTODEVICE socket option (see socket7 for + details). If this option is used, an implicit dependency from this socket unit on the network + interface device unit is created + (see systemd.device5). + Note that setting this parameter might result in additional dependencies to be added to the unit (see above). @@ -366,12 +363,10 @@ SocketUser= SocketGroup= - Takes a UNIX user/group name. When specified, - all AF_UNIX sockets and FIFO nodes in the file system are - owned by the specified user and group. If unset (the default), - the nodes are owned by the root user/group (if run in system - context) or the invoking user/group (if run in user context). - If only a user is specified but no group, then the group is + Takes a UNIX user/group name. When specified, all AF_UNIX + sockets and FIFO nodes in the file system are owned by the specified user and group. If unset (the + default), the nodes are owned by the root user/group (if run in system context) or the invoking + user/group (if run in user context). If only a user is specified but no group, then the group is derived from the user's default group. @@ -420,10 +415,10 @@ to work unmodified with systemd socket activation. - For IPv4 and IPv6 connections, the REMOTE_ADDR - environment variable will contain the remote IP address, and REMOTE_PORT - will contain the remote port. This is the same as the format used by CGI. - For SOCK_RAW, the port is the IP protocol. + For IPv4 and IPv6 connections, the REMOTE_ADDR environment variable will + contain the remote IP address, and REMOTE_PORT will contain the remote port. This + is the same as the format used by CGI. For SOCK_RAW, the port is the IP + protocol. @@ -456,17 +451,13 @@ KeepAlive= - Takes a boolean argument. If true, the TCP/IP - stack will send a keep alive message after 2h (depending on - the configuration of - /proc/sys/net/ipv4/tcp_keepalive_time) - for all TCP streams accepted on this socket. This controls the - SO_KEEPALIVE socket option (see - socket7 - and the TCP - Keepalive HOWTO for details.) Defaults to - . + Takes a boolean argument. If true, the TCP/IP stack will send a keep alive message + after 2h (depending on the configuration of + /proc/sys/net/ipv4/tcp_keepalive_time) for all TCP streams accepted on this + socket. This controls the SO_KEEPALIVE socket option (see socket7 and + the TCP Keepalive + HOWTO for details.) Defaults to . @@ -483,15 +474,12 @@ KeepAliveIntervalSec= - Takes time (in seconds) as argument between - individual keepalive probes, if the socket option SO_KEEPALIVE - has been set on this socket. This controls - the TCP_KEEPINTVL socket option (see - socket7 - and the TCP - Keepalive HOWTO for details.) Defaults value is 75 - seconds. + Takes time (in seconds) as argument between individual keepalive probes, if the + socket option SO_KEEPALIVE has been set on this socket. This controls the + TCP_KEEPINTVL socket option (see socket7 and + the TCP Keepalive + HOWTO for details.) Defaults value is 75 seconds. @@ -513,17 +501,16 @@ algorithm works by combining a number of small outgoing messages, and sending them all at once. This controls the TCP_NODELAY socket option (see - tcp7 + tcp7). Defaults to . Priority= - Takes an integer argument controlling the - priority for all traffic sent from this socket. This controls - the SO_PRIORITY socket option (see - socket7 - for details.). + Takes an integer argument controlling the priority for all traffic sent from this + socket. This controls the SO_PRIORITY socket option (see socket7 for + details.). @@ -559,12 +546,12 @@ ReceiveBuffer= SendBuffer= - Takes an integer argument controlling the - receive or send buffer sizes of this socket, respectively. - This controls the SO_RCVBUF and SO_SNDBUF socket options (see - socket7 - for details.). The usual suffixes K, M, G are supported and - are understood to the base of 1024. + Takes an integer argument controlling the receive or send buffer sizes of this + socket, respectively. This controls the SO_RCVBUF and + SO_SNDBUF socket options (see socket7 for + details.). The usual suffixes K, M, G are supported and are understood to the base of + 1024. @@ -593,23 +580,20 @@ Mark= - Takes an integer value. Controls the firewall - mark of packets generated by this socket. This can be used in - the firewall logic to filter packets from this socket. This - sets the SO_MARK socket option. See - iptables8 - for details. + Takes an integer value. Controls the firewall mark of packets generated by this + socket. This can be used in the firewall logic to filter packets from this socket. This sets the + SO_MARK socket option. See iptables8 for + details. ReusePort= - Takes a boolean value. If true, allows - multiple - bind2s - to this TCP or UDP port. This controls the SO_REUSEPORT socket - option. See - socket7 - for details. + Takes a boolean value. If true, allows multiple + bind2s to this TCP + or UDP port. This controls the SO_REUSEPORT socket option. See socket7 for + details. @@ -685,28 +669,23 @@ Broadcast= - Takes a boolean value. This controls the - SO_BROADCAST socket option, which allows broadcast datagrams - to be sent from this socket. Defaults to + Takes a boolean value. This controls the SO_BROADCAST socket + option, which allows broadcast datagrams to be sent from this socket. Defaults to . PassCredentials= - Takes a boolean value. This controls the - SO_PASSCRED socket option, which allows - AF_UNIX sockets to receive the - credentials of the sending process in an ancillary message. - Defaults to . + Takes a boolean value. This controls the SO_PASSCRED socket + option, which allows AF_UNIX sockets to receive the credentials of the sending + process in an ancillary message. Defaults to . PassSecurity= - Takes a boolean value. This controls the - SO_PASSSEC socket option, which allows - AF_UNIX sockets to receive the security - context of the sending process in an ancillary message. - Defaults to . + Takes a boolean value. This controls the SO_PASSSEC socket + option, which allows AF_UNIX sockets to receive the security context of the + sending process in an ancillary message. Defaults to . @@ -720,11 +699,10 @@ TCPCongestion= - Takes a string value. Controls the TCP - congestion algorithm used by this socket. Should be one of - "westwood", "veno", "cubic", "lp" or any other available - algorithm supported by the IP stack. This setting applies only - to stream sockets. + Takes a string value. Controls the TCP congestion algorithm used by this + socket. Should be one of westwood, veno, + cubic, lp or any other available algorithm supported by the IP + stack. This setting applies only to stream sockets. @@ -788,15 +766,12 @@ RemoveOnStop= - Takes a boolean argument. If enabled, any file - nodes created by this socket unit are removed when it is - stopped. This applies to AF_UNIX sockets in the file system, - POSIX message queues, FIFOs, as well as any symlinks to them - configured with Symlinks=. Normally, it - should not be necessary to use this option, and is not - recommended as services might continue to run after the socket - unit has been terminated and it should still be possible to - communicate with them via their file system node. Defaults to + Takes a boolean argument. If enabled, any file nodes created by this socket unit are + removed when it is stopped. This applies to AF_UNIX sockets in the file system, + POSIX message queues, FIFOs, as well as any symlinks to them configured with + Symlinks=. Normally, it should not be necessary to use this option, and is not + recommended as services might continue to run after the socket unit has been terminated and it should + still be possible to communicate with them via their file system node. Defaults to off. diff --git a/man/systemd.special.xml b/man/systemd.special.xml index 9f368f903d..5a825a3913 100644 --- a/man/systemd.special.xml +++ b/man/systemd.special.xml @@ -1043,7 +1043,7 @@ By default, all user processes and services started on behalf of the user, including the per-user systemd instance are found in this slice. This is pulled in by - systemd-logind.service + systemd-logind.service. @@ -1052,8 +1052,8 @@ By default, all virtual machines and containers registered with systemd-machined are - found in this slice. This is pulled in by - systemd-machined.service + found in this slice. This is pulled in by + systemd-machined.service. diff --git a/man/systemd.swap.xml b/man/systemd.swap.xml index c4160290a5..6410b2fe5c 100644 --- a/man/systemd.swap.xml +++ b/man/systemd.swap.xml @@ -166,7 +166,7 @@ Options - Swap files must include a [Swap] section, which carries + Swap unit files must include a [Swap] section, which carries information about the swap device it supervises. A number of options that may be used in this section are shared with other unit types. These options are documented in diff --git a/man/systemd.syntax.xml b/man/systemd.syntax.xml index 04b1564b17..df100ec4e7 100644 --- a/man/systemd.syntax.xml +++ b/man/systemd.syntax.xml @@ -98,10 +98,10 @@ KeyTwo=value 2 \ value 2 continued [Section C] -KeyThree=value 2\ +KeyThree=value 3\ # this line is ignored ; this line is ignored too - value 2 continued + value 3 continued Boolean arguments used in configuration files can be written in diff --git a/man/systemd.time.xml b/man/systemd.time.xml index b4656b05d1..5b7800e78b 100644 --- a/man/systemd.time.xml +++ b/man/systemd.time.xml @@ -98,18 +98,20 @@ Parsing Timestamps - When parsing, systemd will accept a similar syntax, but expects no timezone specification, unless it is given - as the literal string UTC (for the UTC timezone), or is specified to be the locally configured - timezone, or the timezone name in the IANA timezone database format. The complete list of timezones - supported on your system can be obtained using the timedatectl list-timezones - (see timedatectl1). - Using IANA format is recommended over local timezone names, as less prone to errors (eg: with local timezone it's possible to - specify daylight saving time in winter, while it's incorrect). The weekday specification is optional, but when - the weekday is specified, it must either be in the abbreviated (Wed) or non-abbreviated - (Wednesday) English language form (case does not matter), and is not subject to the locale - choice of the user. Either the date, or the time part may be omitted, in which case the current date or 00:00:00, - respectively, is assumed. The seconds component of the time may also be omitted, in which case ":00" is - assumed. Year numbers may be specified in full or may be abbreviated (omitting the century). + When parsing, systemd will accept a similar syntax, but expects no timezone specification, unless + it is given as the literal string UTC (for the UTC timezone), or is specified to be + the locally configured timezone, or the timezone name in the IANA timezone database format. The complete + list of timezones supported on your system can be obtained using the timedatectl + list-timezones (see + timedatectl1). Using + IANA format is recommended over local timezone names, as less prone to errors (e.g. with local timezone + it's possible to specify daylight saving time in winter, even though that is not correct). The weekday + specification is optional, but when the weekday is specified, it must either be in the abbreviated + (Wed) or non-abbreviated (Wednesday) English language form (case + does not matter), and is not subject to the locale choice of the user. Either the date, or the time part + may be omitted, in which case the current date or 00:00:00, respectively, is assumed. The seconds + component of the time may also be omitted, in which case ":00" is assumed. Year numbers may be specified + in full or may be abbreviated (omitting the century). A timestamp is considered invalid if a weekday is specified and the date does not match the specified day of the week. @@ -282,7 +284,7 @@ Wed..Sat,Tue 12-10-15 1:2:3 → Tue..Sat 2012-10-15 01:02:03 Use the calendar command of systemd-analyze1 to validate and normalize calendar time specifications for testing purposes. The tool also calculates when a specified - calendar event would elapse next. + calendar event would occur next. diff --git a/man/systemd.unit.xml b/man/systemd.unit.xml index 8c0815488b..a9399cc88a 100644 --- a/man/systemd.unit.xml +++ b/man/systemd.unit.xml @@ -737,7 +737,7 @@ that the listed unit is fully started up before the configured unit is started. When two units with an ordering dependency between them are shut down, the inverse of the - start-up order is applied. i.e. if a unit is configured with After= on another + start-up order is applied. I.e. if a unit is configured with After= on another unit, the former is stopped before the latter if both are shut down. Given two units with any ordering dependency between them, if one unit is shut down and the other is started up, the shutdown is ordered before the start-up. It doesn't matter if the ordering dependency is @@ -833,7 +833,7 @@ option for details on the possible values. If this is set to isolate, only a single unit may be listed in - OnFailure=.. + OnFailure=. @@ -1027,9 +1027,9 @@ StartLimitAction= Configure an additional action to take if the rate limit configured with - StartLimitIntervalSec= and StartLimitBurst= is hit. Takes the same - values as the setting FailureAction=/SuccessAction= settings and executes - the same actions. If is set, hitting the rate limit will trigger no action besides that + StartLimitIntervalSec= and StartLimitBurst= is hit. Takes the same + values as the FailureAction=/SuccessAction= settings. If + is set, hitting the rate limit will trigger no action except that the start will not be permitted. Defaults to . diff --git a/man/systemd.xml b/man/systemd.xml index 11954a78da..a13d53e72c 100644 --- a/man/systemd.xml +++ b/man/systemd.xml @@ -760,13 +760,11 @@ systemd.crash_chvt - Takes a positive integer, or a boolean argument. Can be also - specified without an argument, with the same effect as a positive boolean. If - a positive integer (in the range 1–63) is specified, the system manager (PID - 1) will activate the specified virtual terminal (VT) when it - crashes. Defaults to disabled, meaning that no such switch is attempted. If - set to enabled, the VT the kernel messages are written to is selected. - + Takes a positive integer, or a boolean argument. Can be also specified without an + argument, with the same effect as a positive boolean. If a positive integer (in the range 1–63) is + specified, the system manager (PID 1) will activate the specified virtual terminal when it crashes. + Defaults to disabled, meaning that no such switch is attempted. If set to enabled, the virtual + terminal the kernel messages are written to is used instead. @@ -1089,14 +1087,15 @@ this context, because they are properly namespaced. When an option is specified both on the kernel command line, and as a normal command line argument, the latter has higher precedence. - When systemd is used a user manager, the kernel command line is ignored and + When systemd is used as a user manager, the kernel command line is ignored and the options described are understood. Nevertheless, systemd is usually started in this mode through the user@.service5 service, which is shared between all users, and it may be more convenient to use configuration files to modify settings, see systemd-user.conf5, - or a drop-in that specifies one of the environment variables listed above in "Environment, see + or a drop-in that specifies one of the environment variables listed above in the Environment section, + see systemd.unit5. @@ -1146,8 +1145,8 @@ - Show terse unit status information is shown on the console during boot-up and - shutdown. See systemd.show_status above. + Show terse unit status information on the console during boot-up and shutdown. See + systemd.show_status above. diff --git a/man/tc.xml b/man/tc.xml index 1711915c22..f312ac2692 100644 --- a/man/tc.xml +++ b/man/tc.xml @@ -10,27 +10,28 @@ Parent= - Specifies the parent Queueing Discipline (qdisc). Takes one of root, - clsact, ingress or a class id. The class id takes the - major and minor number in hexadecimal ranges 1 to ffff separated with a colon - (major:minor). Defaults to root. + Configures the parent Queueing Discipline (qdisc). Takes one of root, + clsact, ingress or a class identifier. The class identifier is + specified as the major and minor numbers in hexadecimal in the range 0x1–Oxffff separated with a + colon (major:minor). Defaults to root. Handle= - Specifies the major number of unique identifier of the qdisc, known as the handle. - Takes a number in hexadecimal ranges 1 to ffff. Defaults to unset. + Configures the major number of unique identifier of the qdisc, known as the handle. + Takes a hexadecimal number in the range 0x1–0xffff. Defaults to unset. Parent= - Specifies the parent Queueing Discipline (qdisc). Takes one of root, - or a qdisc id. The qdisc id takes the major and minor number in hexadecimal ranges 1 to ffff - separated with a colon (major:minor). Defaults to root. + Configures the parent Queueing Discipline (qdisc). Takes one of root, or a + qdisc identifier. The qdisc identifier is specified as the major and minor numbers in hexadecimal in + the range 0x1–Oxffff separated with a colon (major:minor). Defaults to + root. @@ -38,8 +39,9 @@ ClassId= - Specifies the major and minur number of unique identifier of the class, known as the - class ID. Each number is in hexadecimal ranges 1 to ffff. Defaults to unset. + Configues the unique identifier of the class. It is specified as the major and minor numbers in + hexadecimal in the range 0x1–Oxffff separated with a colon (major:minor). + Defaults to unset. diff --git a/man/userdbctl.xml b/man/userdbctl.xml index e10f055222..777393ab75 100644 --- a/man/userdbctl.xml +++ b/man/userdbctl.xml @@ -163,11 +163,10 @@ Well-Known Services The userdbctl services command will list all currently running services that - provide user or group definitions to the system. The following are well-known services are shown among - this list. + provide user or group definitions to the system. The following well-known services are shown among + this list: - io.systemd.DynamicUser diff --git a/src/basic/user-util.c b/src/basic/user-util.c index 7dd2f6664a..66f8856fdf 100644 --- a/src/basic/user-util.c +++ b/src/basic/user-util.c @@ -777,7 +777,7 @@ bool valid_user_group_name(const char *u, ValidUserFlags flags) { return false; if (in_charset(u, "0123456789")) /* Don't allow fully numeric strings, they might be confused - * with with UIDs (note that this test is more broad than + * with UIDs (note that this test is more broad than * the parse_uid() test above, as it will cover more than * the 32bit range, and it will detect 65535 (which is in * invalid UID, even though in the unsigned 32 bit range) */ diff --git a/src/journal/journal-file.c b/src/journal/journal-file.c index 9a08de1ba4..cdcded2e24 100644 --- a/src/journal/journal-file.c +++ b/src/journal/journal-file.c @@ -625,7 +625,7 @@ int journal_file_fstat(JournalFile *f) { f->last_stat_usec = now(CLOCK_MONOTONIC); - /* Refuse dealing with with files that aren't regular */ + /* Refuse dealing with files that aren't regular */ r = stat_verify_regular(&f->last_stat); if (r < 0) return r; diff --git a/src/libsystemd/sd-bus/bus-internal.h b/src/libsystemd/sd-bus/bus-internal.h index 7e13f4f73b..ef2c3dbc4f 100644 --- a/src/libsystemd/sd-bus/bus-internal.h +++ b/src/libsystemd/sd-bus/bus-internal.h @@ -43,7 +43,7 @@ struct match_callback { unsigned last_iteration; - /* Don't dispatch this slot with with messages that arrived in any iteration before or at the this + /* Don't dispatch this slot with messages that arrived in any iteration before or at the this * one. We use this to ensure that matches don't apply "retroactively" and thus can confuse the * caller: matches will only match incoming messages from the moment on the match was installed. */ uint64_t after;