From e9dd6984076389e8cfa15b72bc62187544e49b61 Mon Sep 17 00:00:00 2001 From: Zbigniew Jędrzejewski-Szmek Date: Mon, 6 Jul 2020 10:49:59 +0200 Subject: tree-wide: fixes for assorted grammar and spelling issues Fixes #16363. Also includes some changes where I generalized the pattern. --- man/homectl.xml | 57 ++++++++++++++++++++++++++++----------------------------- 1 file changed, 28 insertions(+), 29 deletions(-) (limited to 'man/homectl.xml') 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 @@ FILE Read 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. -- cgit v1.2.3