Hello Marc, I implemented the fixes, but somehow I cannot push to the repository (translation branch). I'll investigate later, but for now I attached my change, so you can already review it.
Greetings
Helge
--
Dr. Helge Kreutzmann deb...@helgefjell.de
Dipl.-Phys. http://www.helgefjell.de/debian.php
64bit GNU powered gpg signed mail preferred
Help keep free software "libre": http://www.ffii.de/
diff --git a/doc/adduser.8 b/doc/adduser.8 index 72f7bfc..ad2fc6f 100644 --- a/doc/adduser.8 +++ b/doc/adduser.8 @@ -170,7 +170,7 @@ The interaction between is explained in detail in .BR adduser.conf (5). .PP -Users' primary groups can also be overridden +The users' primary group can also be overridden from the command line with the \fB\-\-gid\fP or \fB\-\-ingroup\fP options to set the group by id or name, @@ -178,7 +178,7 @@ respectively. Also, users can be added to one or more supplemental groups -defined as \fBEXTRA_GROUPS\fP in the configuration file +defined as \fBEXTRA_GROUPS\fP either by setting \fBADD_EXTRA_GROUPS\fP to 1 in the configuration file, or by passing \fB\-\-add\-extra\-groups\fP on the command line. @@ -228,7 +228,7 @@ the new system user will have the shell set to Skeletal configuration files are not copied. .PP Other options will behave as for the creation of a normal user. -The files referenced by \fBUID_POOL\fP and \fBGID_POOL\fP do also work. +The files referenced by \fBUID_POOL\fP and \fBGID_POOL\fP are also honored. .SS "Add a group" If \fBadduser\fP is called with the \fB\-\-group\fP option and @@ -270,18 +270,18 @@ They are going to stay supported, but are removed from the documentation. Users are advised to migrate to the long version of options. .TP .B \-\-add\-extra\-groups -Add new user to extra groups defined in the configuration files' +Add new users to extra groups defined in the configuration files' \fBEXTRA_GROUPS\fP setting. The old spelling \fB\-\-add_extra_groups\fP is deprecated and will be supported in Debian bookworm only. -Valid Modes: \fBadduser\fP, \fBadduser \-\-system\fP. +Valid modes: \fBadduser\fP, \fBadduser \-\-system\fP. .TP .B \-\-allow\-all\-names Allow any user- and groupname which is supported by the underlying \fBuseradd\fP(8), including names containing non-ASCII characters. See VALID NAMES in .BR adduser.conf (5). -Valid Modes: \fBadduser\fP, \fBadduser \-\-system\fP, +Valid modes: \fBadduser\fP, \fBadduser \-\-system\fP, \fBaddgroup\fP, \fBaddgroup \-\-system\fP. .TP .B \-\-allow\-bad\-names @@ -289,7 +289,7 @@ Disable \fBNAME_REGEX\fP and \fBSYS_NAME_REGEX\fP check of names. Only a weaker check for validity of the name is applied. See VALID NAMES in .BR adduser.conf (5). -Valid Modes: \fBadduser\fP, \fBadduser \-\-system\fP, +Valid modes: \fBadduser\fP, \fBadduser \-\-system\fP, \fBaddgroup\fP, \fBaddgroup \-\-system\fP. .TP .BI \-\-comment " comment " @@ -299,7 +299,7 @@ This field is also known under the name GECOS field and contains information that is used by the \fBfinger\fR(1) command. This used to be the \fB\-\-gecos\fR option, which is deprecated and will be removed after Debian bookworm. -Valid Modes: \fBadduser\fP, \fBadduser \-\-system\fP. +Valid modes: \fBadduser\fP, \fBadduser \-\-system\fP. .TP .BI \-\-conf " file " Use \fIfile\fP instead of \fI/etc/adduser.conf\fP. @@ -317,7 +317,7 @@ In most situations, logins are still possible though for reasons that are beyond \fBadduser\fP's scope. \fB\-\-disabled\-login\fP will additionally set the shell to \fI/usr/sbin/nologin\fP. -Valid Mode: \fBadduser\fP. +Valid mode: \fBadduser\fP. .TP .BI \-\-firstuid " ID " .TQ @@ -327,7 +327,7 @@ Valid Mode: \fBadduser\fP. .TQ .BI \-\-lastgid " ID " Override the first UID / last UID / first GID / last GID -in the range that the uid is chosen from +in the range that the numeric identity is chosen from (\fBFIRST_UID\fP, \fBLAST_UID\fP, \fBFIRST_GID\fP and \fBLAST_GID\fP, \fBFIRST_SYSTEM_UID\fP, \fBLAST_SYSTEM_UID\fP, \fBFIRST_SYSTEM_GID\fP and \fBLAST_SYSTEM_GID\fP @@ -336,7 +336,7 @@ If a group is created as a usergroup, \fB\-\-firstgid\fP and \fB\-\-lastgid\fP are ignored. The group gets the same ID as the user. -Valid Modes: \fBadduser\fP, \fBadduser \-\-system\fP, +Valid modes: \fBadduser\fP, \fBadduser \-\-system\fP, for \fP\-\-firstgid\fP and \fB\-\-lastgid\fR also \fBaddgroup\fP. .TP @@ -344,16 +344,16 @@ for \fP\-\-firstgid\fP and \fB\-\-lastgid\fR also .TQ .B \-\-allow\-badname These are the deprecated forms of \fB\-\-allow\-bad\-names\fR. -It will be removed -during the release cycle of the Debian release after \fIbookworm\fP. +They will be removed +during the release cycle of the Debian release after bookworm. .TP .BI \-\-gid " ID " When creating a group, this option sets the group ID number of the new group to \fIGID\fP. When creating a user, this option sets the primary group ID number of the new user -to \fIGID\fP. -Valid Modes: \fBadduser\fP, \fBadduser \-\-system\fP, +to \fIID\fP. +Valid modes: \fBadduser\fP, \fBadduser \-\-system\fP, \fBaddgroup\fP, \fBaddgroup \-\-system\fP. .TP .B \-\-group @@ -365,7 +365,7 @@ If not combined with \fB\-\-system\fP, a group with the given name is created. The latter is the default action if the program is invoked as \fBaddgroup\fP. -Valid Modes: \fBadduser \-\-system\fP, +Valid modes: \fBadduser \-\-system\fP, \fBaddgroup\fP, \fBaddgroup \-\-system\fP. .TP .BR \-\-help @@ -376,7 +376,7 @@ Use \fIdir\fP as the user's home directory, rather than the default specified by the configuration file (or \fI/nonexistent\fP if \fBadduser \-\-system\fP is used). If the directory does not exist, it is created. -Valid Modes: \fBadduser\fP, \fBadduser \-\-system\fP. +Valid modes: \fBadduser\fP, \fBadduser \-\-system\fP. .TP .BI \-\-ingroup " GROUP " When creating a user, @@ -385,7 +385,7 @@ to the GID of the named group. Unlike with the \fB\-\-gid\fP option, the group is specified here by name rather than by numeric ID number. The group must already exist. -Valid Modes: \fBadduser\fP, \fBadduser \-\-system\fP. +Valid modes: \fBadduser\fP, \fBadduser \-\-system\fP. .TP .BI \-\-lastuid " ID " .TQ @@ -402,7 +402,7 @@ The use of this option does not imply that this field should be empty. Rather, it indicates to \fB\%adduser\fP that some other mechanism will be responsible for initializing the new user's home directory. -Valid Modes: \fBadduser\fP, \fBadduser \-\-system\fP. +Valid modes: \fBadduser\fP, \fBadduser \-\-system\fP. .TP .BR \-\-quiet Suppress informational messages, only show warnings and errors. @@ -411,7 +411,7 @@ Suppress informational messages, only show warnings and errors. Use \fIshell\fP as the user's login shell, rather than the default specified by the configuration file (or \fI/usr/sbin/nologin\fP if \fBadduser \-\-system\fP is used). -Valid Modes: \fBadduser\fP, \fBadduser \-\-system\fP. +Valid modes: \fBadduser\fP, \fBadduser \-\-system\fP. .TP .B \-\-system Nomally, \fBadduser\fP creates @@ -420,12 +420,12 @@ as defined in Debian Policy, Chapter 9.2.2. With this option, \fBadduser\fP creates a \fIdynamically allocated system user and group\fP and changes its mode respectively. -Valid Modes: \fBadduser\fP, \fBaddgroup\fP. +Valid modes: \fBadduser\fP, \fBaddgroup\fP. .TP .BI \-\-uid " ID " Force the new userid to be the given number. \fBadduser\fP will fail if the userid is already taken. -Valid Modes: \fBadduser\fP, \fBadduser \-\-system\fP. +Valid modes: \fBadduser\fP, \fBadduser \-\-system\fP. .TP .BR \-\-verbose Be more verbose. diff --git a/doc/adduser.conf.5 b/doc/adduser.conf.5 index f07c4ab..4abaffb 100644 --- a/doc/adduser.conf.5 +++ b/doc/adduser.conf.5 @@ -203,7 +203,7 @@ The "$" sign is allowed at the end of usernames to allow typical Samba machine accounts. .PP The default settings for \fBNAME_REGEX\fP and \fBSYS_NAME_REGEX\fP -allow usernames to contain lowercase letters and numbers, +allow usernames to contain lowercase letters and digits, plus dash (\-) and underscore (_); the name must begin with a letter (or an underscore for system users). diff --git a/doc/deluser.8 b/doc/deluser.8 index 58cf2f6..2bf34d3 100644 --- a/doc/deluser.8 +++ b/doc/deluser.8 @@ -141,8 +141,7 @@ The primary group of an existing user cannot be removed. If the option \fB\-\-only\-if\-empty\fP is given, the group won't be removed if it has any members left. .PP -The \fB\-\-system\fP option adds the same functionality as for users, -respectively. +The \fB\-\-system\fP option adds the same functionality as for users. .SS "Remove a user from a specific group" If called with two non-option arguments, @@ -160,19 +159,19 @@ Users are advised to migrate to the long version of options. .B \-\-backup Backup all files contained in the userhome and the mailspool file to a file named \fIusername.tar.bz2\fP or \fIusername.tar.gz\fP. -Valid Modes: \fBdeluser\fP, \fBdeluser \-\-system\fP, +Valid modes: \fBdeluser\fP, \fBdeluser \-\-system\fP. .TP .BR "\-\-backup\-suffix "str Select compression algorithm for a home directory backup. Can be set to any suffix recognized by \fBtar \-\-auto\-compress\fP. Defaults to \fI.gz\fP. -Valid Modes: \fBdeluser\fP, \fBdeluser \-\-system\fP, +Valid modes: \fBdeluser\fP, \fBdeluser \-\-system\fP. .TP .BI "\-\-backup\-to "dir Place the backup files not in the current directory but in \fIdir\fP. This implicitly sets \fB\-\-backup\fP also. -(defaulting to the current working directory). -Valid Modes: \fBdeluser\fP, \fBdeluser \-\-system\fP, +(Defaults to the current working directory). +Valid modes: \fBdeluser\fP, \fBdeluser \-\-system\fP. .TP .BR "\-\-conf \fIfile\fP" Use \fIfile\fP instead of the default files @@ -186,14 +185,14 @@ Activate debugging code. Remove a group. This is the default action if the program is invoked as \fIdelgroup\fP. -Valid Mode: \fBdeluser\fP. +Valid mode: \fBdeluser\fP. .TP .B \-\-help Display brief instructions. .TP .B \-\-only\-if\-empty Only remove if no members are left. -Valid Modes: \fBdeluser --group\fP, \fBdelgroup\fP, +Valid modes: \fBdeluser --group\fP, \fBdelgroup\fP. .TP .B \-\-quiet Suppress informational messages, only show warnings and errors. @@ -203,18 +202,18 @@ Remove all files from the system owned by this user. Note: \-\-remove\-home does not have an effect any more. If \fB\-\-backup\fP is specified, the files are deleted after having performed the backup. -Valid Modes: \fBdeluser\fP, \fBdeluser \-\-system\fP, +Valid modes: \fBdeluser\fP, \fBdeluser \-\-system\fP. .TP .B \-\-remove\-home Remove the home directory of the user and its mailspool. If \fB\-\-backup\fP is specified, the files are deleted after having performed the backup. -Valid Modes: \fBdeluser\fP, \fBdeluser \-\-system\fP, +Valid modes: \fBdeluser\fP, \fBdeluser \-\-system\fP. .TP .B \-\-system Only delete if user/group is a system user/group. If the user does not exist, no error value is returned. -Valid Modes: \fBdeluser\fP, \fBdeluser \-\-system\fP, +Valid modes: \fBdeluser\fP, \fBdeluser \-\-system\fP. .TP .B \-\-verbose Be more verbose. @@ -271,7 +270,7 @@ Do not use \fBsudo\fP(8) or similar tools to give partial privileges to \fBdeluser\fP with restricted command line parameters. This is easy to circumvent and might -allow users to create arbitrary accounts. +allow users to remove arbitrary accounts. If you want this, consider writing your own wrapper script and giving privileges to execute that script.
signature.asc
Description: PGP signature
