summaryrefslogtreecommitdiff
path: root/man/zh_CN
diff options
context:
space:
mode:
authorAndreas Henriksson <andreas@fatal.se>2019-12-05 13:29:31 +0100
committerAndreas Henriksson <andreas@fatal.se>2019-12-05 13:29:31 +0100
commit69d932140c70455a282b6e7115d9caf0cc56d6ff (patch)
treeeda18bc82cc58e5d193e608f00543b2b5b537d49 /man/zh_CN
parentb28d45d2bd2462414b9dbbe38e6c7f3d5f7b462b (diff)
downloadshadow-69d932140c70455a282b6e7115d9caf0cc56d6ff.tar.gz
New upstream version 4.8upstream/4.8
Diffstat (limited to 'man/zh_CN')
-rw-r--r--man/zh_CN/Makefile.in33
-rw-r--r--man/zh_CN/man1/chage.171
-rw-r--r--man/zh_CN/man1/chfn.124
-rw-r--r--man/zh_CN/man1/chsh.124
-rw-r--r--man/zh_CN/man1/expiry.19
-rw-r--r--man/zh_CN/man1/gpasswd.179
-rw-r--r--man/zh_CN/man1/groups.16
-rw-r--r--man/zh_CN/man1/id.16
-rw-r--r--man/zh_CN/man1/login.1128
-rw-r--r--man/zh_CN/man1/newgrp.114
-rw-r--r--man/zh_CN/man1/passwd.1145
-rw-r--r--man/zh_CN/man1/sg.140
-rw-r--r--man/zh_CN/man1/su.1241
-rw-r--r--man/zh_CN/man3/shadow.340
-rw-r--r--man/zh_CN/man5/faillog.56
-rw-r--r--man/zh_CN/man5/gshadow.517
-rw-r--r--man/zh_CN/man5/limits.528
-rw-r--r--man/zh_CN/man5/login.access.59
-rw-r--r--man/zh_CN/man5/login.defs.5263
-rw-r--r--man/zh_CN/man5/passwd.571
-rw-r--r--man/zh_CN/man5/porttime.543
-rw-r--r--man/zh_CN/man5/shadow.529
-rw-r--r--man/zh_CN/man5/suauth.535
-rw-r--r--man/zh_CN/man8/chgpasswd.868
-rw-r--r--man/zh_CN/man8/chpasswd.859
-rw-r--r--man/zh_CN/man8/faillog.834
-rw-r--r--man/zh_CN/man8/groupadd.884
-rw-r--r--man/zh_CN/man8/groupdel.838
-rw-r--r--man/zh_CN/man8/groupmems.821
-rw-r--r--man/zh_CN/man8/groupmod.828
-rw-r--r--man/zh_CN/man8/grpck.856
-rw-r--r--man/zh_CN/man8/lastlog.829
-rw-r--r--man/zh_CN/man8/logoutd.86
-rw-r--r--man/zh_CN/man8/newusers.8160
-rw-r--r--man/zh_CN/man8/nologin.813
-rw-r--r--man/zh_CN/man8/pwck.884
-rw-r--r--man/zh_CN/man8/pwconv.8118
-rw-r--r--man/zh_CN/man8/sulogin.832
-rw-r--r--man/zh_CN/man8/useradd.8426
-rw-r--r--man/zh_CN/man8/userdel.8133
-rw-r--r--man/zh_CN/man8/usermod.8175
-rw-r--r--man/zh_CN/man8/vipw.839
42 files changed, 1576 insertions, 1388 deletions
diff --git a/man/zh_CN/Makefile.in b/man/zh_CN/Makefile.in
index 612882ca..432a5931 100644
--- a/man/zh_CN/Makefile.in
+++ b/man/zh_CN/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2017 Free Software Foundation, Inc.
+# Copyright (C) 1994-2018 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -180,6 +180,7 @@ DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
+ECONF_CPPFLAGS = @ECONF_CPPFLAGS@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
FGREP = @FGREP@
@@ -202,6 +203,7 @@ LIBATTR = @LIBATTR@
LIBAUDIT = @LIBAUDIT@
LIBCRACK = @LIBCRACK@
LIBCRYPT = @LIBCRYPT@
+LIBECONF = @LIBECONF@
LIBICONV = @LIBICONV@
LIBINTL = @LIBINTL@
LIBMD = @LIBMD@
@@ -247,6 +249,7 @@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
USE_NLS = @USE_NLS@
+VENDORDIR = @VENDORDIR@
VERSION = @VERSION@
XGETTEXT = @XGETTEXT@
XGETTEXT_015 = @XGETTEXT_015@
@@ -338,7 +341,7 @@ LANG = $(notdir $(CURDIR))
@ENABLE_REGENERATE_MAN_TRUE@@USE_SHA_CRYPT_TRUE@SHA_CRYPT_COND = sha_crypt
@ENABLE_REGENERATE_MAN_TRUE@@ENABLE_SUBIDS_FALSE@SUBIDS_COND = no_subids
@ENABLE_REGENERATE_MAN_TRUE@@ENABLE_SUBIDS_TRUE@SUBIDS_COND = subids
-CLEANFILES = .xml2po.mo $(EXTRA_DIST) $(addsuffix .xml,$(EXTRA_DIST)) config.xml
+CLEANFILES = messages.mo login.defs.d $(EXTRA_DIST) $(addsuffix .xml,$(EXTRA_DIST)) config.xml
all: all-am
.SUFFIXES:
@@ -359,8 +362,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
*config.status*) \
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
*) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
esac;
$(srcdir)/../generate_translations.mak $(srcdir)/../generate_mans.mak $(am__empty):
@@ -557,7 +560,10 @@ ctags CTAGS:
cscope cscopelist:
-distdir: $(DISTFILES)
+distdir: $(BUILT_SOURCES)
+ $(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
list='$(DISTFILES)'; \
@@ -718,8 +724,19 @@ uninstall-man: uninstall-man1 uninstall-man3 uninstall-man5 \
@ENABLE_REGENERATE_MAN_TRUE@ $(MAKE) -C .. config.xml
@ENABLE_REGENERATE_MAN_TRUE@ cp ../config.xml $@
-@ENABLE_REGENERATE_MAN_TRUE@%.xml: ../%.xml ../po/$(LANG).po
-@ENABLE_REGENERATE_MAN_TRUE@ xml2po --expand-all-entities -l $(LANG) -p ../po/$(LANG).po -o $@ ../$@
+@ENABLE_REGENERATE_MAN_TRUE@messages.mo: ../po/$(LANG).po
+@ENABLE_REGENERATE_MAN_TRUE@ msgfmt ../po/$(LANG).po -o messages.mo
+
+@ENABLE_REGENERATE_MAN_TRUE@login.defs.d:
+@ENABLE_REGENERATE_MAN_TRUE@ ln -sf ../login.defs.d login.defs.d
+
+@ENABLE_REGENERATE_MAN_TRUE@%.xml: ../%.xml messages.mo login.defs.d
+@ENABLE_REGENERATE_MAN_TRUE@ if grep -q SHADOW-CONFIG-HERE $< ; then \
+@ENABLE_REGENERATE_MAN_TRUE@ sed -e 's/^<!-- SHADOW-CONFIG-HERE -->/<!ENTITY % config SYSTEM "config.xml">%config;/' $< > $@; \
+@ENABLE_REGENERATE_MAN_TRUE@ else \
+@ENABLE_REGENERATE_MAN_TRUE@ sed -e 's/^\(<!DOCTYPE .*docbookx.dtd"\)>/\1 [<!ENTITY % config SYSTEM "config.xml">%config;]>/' $< > $@; \
+@ENABLE_REGENERATE_MAN_TRUE@ fi
+@ENABLE_REGENERATE_MAN_TRUE@ itstool -d -l $(LANG) -m messages.mo -o . $@
@ENABLE_REGENERATE_MAN_TRUE@ sed -i 's:\(^<refentry .*\)>:\1 lang="$(LANG)">:' $@
@ENABLE_REGENERATE_MAN_TRUE@%.xml-config: %.xml
diff --git a/man/zh_CN/man1/chage.1 b/man/zh_CN/man1/chage.1
index 1cf4f31e..523312ad 100644
--- a/man/zh_CN/man1/chage.1
+++ b/man/zh_CN/man1/chage.1
@@ -2,12 +2,12 @@
.\" Title: chage
.\" Author: Julianne Frances Haugh
.\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\" Date: 2019-06-13
+.\" Date: 2019-12-01
.\" Manual: 用户命令
-.\" Source: shadow-utils 4.7
+.\" Source: shadow-utils 4.8
.\" Language: Chinese Simplified
.\"
-.TH "CHAGE" "1" "2019-06-13" "shadow\-utils 4\&.7" "用户命令"
+.TH "CHAGE" "1" "2019-12-01" "shadow\-utils 4\&.8" "用户命令"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
@@ -39,8 +39,9 @@ The
command changes the number of days between password changes and the date of the last password change\&. This information is used by the system to determine when a user must change their password\&.
.SH "选项"
.PP
+The options which apply to the
\fBchage\fR
-命令可以接受的选项有:
+command are:
.PP
\fB\-d\fR, \fB\-\-lastday\fR\ \&\fILAST_DAY\fR
.RS 4
@@ -51,10 +52,11 @@ Set the number of days since January 1st, 1970 when the password was last change
.RS 4
Set the date or number of days since January 1, 1970 on which the user\*(Aqs account will no longer be accessible\&. The date may also be expressed in the format YYYY\-MM\-DD (or the format more commonly used in your area)\&. A user whose account is locked must contact the system administrator before being able to use the system again\&.
.sp
-\fIEXPIRE_DATE\fR
-设置为
+Passing the number
\fI\-1\fR
-会移除账户的过期日期。
+as the
+\fIEXPIRE_DATE\fR
+will remove an account expiration date\&.
.RE
.PP
\fB\-h\fR, \fB\-\-help\fR
@@ -62,16 +64,22 @@ Set the date or number of days since January 1, 1970 on which the user\*(Aqs acc
现实帮助信息并退出。
.RE
.PP
+\fB\-i\fR, \fB\-\-iso8601\fR
+.RS 4
+When printing dates, use YYYY\-MM\-DD format\&.
+.RE
+.PP
\fB\-I\fR, \fB\-\-inactive\fR\ \&\fIINACTIVE\fR
.RS 4
Set the number of days of inactivity after a password has expired before the account is locked\&. The
\fIINACTIVE\fR
option is the number of days of inactivity\&. A user whose account is locked must contact the system administrator before being able to use the system again\&.
.sp
-\fIINACTIVE\fR
-设置为
+Passing the number
\fI\-1\fR
-会移除账户禁用功能。
+as the
+\fIINACTIVE\fR
+will remove an account\*(Aqs inactivity\&.
.RE
.PP
\fB\-l\fR, \fB\-\-list\fR
@@ -81,8 +89,8 @@ option is the number of days of inactivity\&. A user whose account is locked mus
.PP
\fB\-m\fR, \fB\-\-mindays\fR\ \&\fIMIN_DAYS\fR
.RS 4
-在密码更改之间的最小天数设置为
-\fIMIN_DAYS\fR。此字段中的 0 值表示用户可以在任何时间更改其密码。
+Set the minimum number of days between password changes to
+\fIMIN_DAYS\fR\&. A value of zero for this field indicates that the user may change their password at any time\&.
.RE
.PP
\fB\-M\fR, \fB\-\-maxdays\fR\ \&\fIMAX_DAYS\fR
@@ -95,10 +103,11 @@ is less than the current day, the user will be required to change their password
\fB\-W\fR
option, which provides the user with advance warning\&.
.sp
-\fIMAX_DAYS\fR
-设置为
+Passing the number
\fI\-1\fR
-会移除密码有效性检查。
+as
+\fIMAX_DAYS\fR
+will remove checking a password\*(Aqs validity\&.
.RE
.PP
\fB\-R\fR, \fB\-\-root\fR\ \&\fICHROOT_DIR\fR
@@ -117,24 +126,27 @@ Set the number of days of warning before a password change is required\&. The
option is the number of days prior to the password expiring that a user will be warned their password is about to expire\&.
.RE
.PP
-如果没有选择任何选项,\fBchage\fR
-会进入交互模式,以所有字段的当前值提示用户。输入一个新值可以更改这些字段,或者留空使用当前值。当前值出现在
+If none of the options are selected,
+\fBchage\fR
+operates in an interactive fashion, prompting the user with the current values for all of the fields\&. Enter the new value to change the field, or leave the line blank to use the current value\&. The current value is displayed between a pair of
\fI[ ]\fR
-标记对里。
+marks\&.
.SH "注意"
.PP
+The
\fBchage\fR
-需要有一个影子密码文件才可用。
+program requires a shadow password file to be available\&.
.PP
-只有 root 才可以使用
-\fBchage\fR,一个特殊情况是
+The
+\fBchage\fR
+command is restricted to the root user, except for the
\fB\-l\fR
-选项,用来让非特权用户觉得自己的密码或账户何时过期。
+option, which may be used by an unprivileged user to determine when their password or account is due to expire\&.
.SH "配置文件"
.PP
-在
+The following configuration variables in
/etc/login\&.defs
-中有如下配置变量,可以用来更改此工具的行为:
+change the behavior of this tool:
.SH "文件"
.PP
/etc/passwd
@@ -148,27 +160,28 @@ option is the number of days prior to the password expiring that a user will be
.RE
.SH "退出值"
.PP
+The
\fBchage\fR
-命令有如下退出值:
+command exits with the following values:
.PP
\fI0\fR
.RS 4
-成功
+success
.RE
.PP
\fI1\fR
.RS 4
-权限不够
+permission denied
.RE
.PP
\fI2\fR
.RS 4
-无效的命令语法
+invalid command syntax
.RE
.PP
\fI15\fR
.RS 4
-无法找到影子密码文件
+can\*(Aqt find the shadow password file
.RE
.SH "参见"
.PP
diff --git a/man/zh_CN/man1/chfn.1 b/man/zh_CN/man1/chfn.1
index 061d56e0..3708ee7a 100644
--- a/man/zh_CN/man1/chfn.1
+++ b/man/zh_CN/man1/chfn.1
@@ -2,12 +2,12 @@
.\" Title: chfn
.\" Author: Julianne Frances Haugh
.\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\" Date: 2019-06-13
+.\" Date: 2019-12-01
.\" Manual: 用户命令
-.\" Source: shadow-utils 4.7
+.\" Source: shadow-utils 4.8
.\" Language: Chinese Simplified
.\"
-.TH "CHFN" "1" "2019-06-13" "shadow\-utils 4\&.7" "用户命令"
+.TH "CHFN" "1" "2019-12-01" "shadow\-utils 4\&.8" "用户命令"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
@@ -50,8 +50,9 @@ field, they should not contain any comma or equal sign\&. It is also recommended
field is used to store accounting information used by other applications\&.
.SH "选项"
.PP
+The options which apply to the
\fBchfn\fR
-命令可以接受的选项有:
+command are:
.PP
\fB\-f\fR, \fB\-\-full\-name\fR\ \&\fIFULL_NAME\fR
.RS 4
@@ -101,15 +102,16 @@ marks\&. Without options,
prompts for the current user account\&.
.SH "配置文件"
.PP
-在
+The following configuration variables in
/etc/login\&.defs
-中有如下配置变量,可以用来更改此工具的行为:
+change the behavior of this tool:
.PP
\fBCHFN_AUTH\fR (boolean)
.RS 4
-如果为
-\fIyes\fR,\fBchfn\fR
-进行任何更改前都要要求认证,除非由超级用户运行。
+If
+\fIyes\fR, the
+\fBchfn\fR
+program will require authentication before making any changes, unless run by the superuser\&.
.RE
.PP
\fBCHFN_RESTRICT\fR (string)
@@ -140,8 +142,8 @@ SUID\&.
.RS 4
此字符串用于提示输入密码。默认是 "Password: ",或者翻译了的结果(汉语中翻译为了\(lq密码:\(rq)。如果设置了此变量,提示不会被翻译。
.sp
-如果字符串包含
-\fI%s\fR,将会被用户名替换。
+If the string contains
+\fI%s\fR, this will be replaced by the user\*(Aqs name\&.
.RE
.SH "文件"
.PP
diff --git a/man/zh_CN/man1/chsh.1 b/man/zh_CN/man1/chsh.1
index 4a17f27a..5e70f753 100644
--- a/man/zh_CN/man1/chsh.1
+++ b/man/zh_CN/man1/chsh.1
@@ -2,12 +2,12 @@
.\" Title: chsh
.\" Author: Julianne Frances Haugh
.\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\" Date: 2019-06-13
+.\" Date: 2019-12-01
.\" Manual: 用户命令
-.\" Source: shadow-utils 4.7
+.\" Source: shadow-utils 4.8
.\" Language: Chinese Simplified
.\"
-.TH "CHSH" "1" "2019-06-13" "shadow\-utils 4\&.7" "用户命令"
+.TH "CHSH" "1" "2019-12-01" "shadow\-utils 4\&.8" "用户命令"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
@@ -39,8 +39,9 @@ The
command changes the user login shell\&. This determines the name of the user\*(Aqs initial login command\&. A normal user may only change the login shell for her own account; the superuser may change the login shell for any account\&.
.SH "选项"
.PP
+The options which apply to the
\fBchsh\fR
-命令可以接受的选项有:
+command are:
.PP
\fB\-h\fR, \fB\-\-help\fR
.RS 4
@@ -78,23 +79,24 @@ in
is discouraged since accidentally changing to a restricted shell would prevent the user from ever changing her login shell back to its original value\&.
.SH "配置文件"
.PP
-在
+The following configuration variables in
/etc/login\&.defs
-中有如下配置变量,可以用来更改此工具的行为:
+change the behavior of this tool:
.PP
\fBCHSH_AUTH\fR (boolean)
.RS 4
-如果
-\fIyes\fR,\fBchsh\fR
-程序在做任何更改之前都会要求认证,除非是以超级用户身份运行的。
+If
+\fIyes\fR, the
+\fBchsh\fR
+program will require authentication before making any changes, unless run by the superuser\&.
.RE
.PP
\fBLOGIN_STRING\fR (string)
.RS 4
此字符串用于提示输入密码。默认是 "Password: ",或者翻译了的结果(汉语中翻译为了\(lq密码:\(rq)。如果设置了此变量,提示不会被翻译。
.sp
-如果字符串包含
-\fI%s\fR,将会被用户名替换。
+If the string contains
+\fI%s\fR, this will be replaced by the user\*(Aqs name\&.
.RE
.SH "文件"
.PP
diff --git a/man/zh_CN/man1/expiry.1 b/man/zh_CN/man1/expiry.1
index b13f0340..24129a4b 100644
--- a/man/zh_CN/man1/expiry.1
+++ b/man/zh_CN/man1/expiry.1
@@ -2,12 +2,12 @@
.\" Title: expiry
.\" Author: Julianne Frances Haugh
.\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\" Date: 2019-06-13
+.\" Date: 2019-12-01
.\" Manual: 用户命令
-.\" Source: shadow-utils 4.7
+.\" Source: shadow-utils 4.8
.\" Language: Chinese Simplified
.\"
-.TH "EXPIRY" "1" "2019-06-13" "shadow\-utils 4\&.7" "用户命令"
+.TH "EXPIRY" "1" "2019-12-01" "shadow\-utils 4\&.8" "用户命令"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
@@ -39,8 +39,9 @@ The
command checks (\fB\-c\fR) the current password expiration and forces (\fB\-f\fR) changes when required\&. It is callable as a normal user command\&.
.SH "选项"
.PP
+The options which apply to the
\fBexpiry\fR
-选项可以接受的选项有:
+command are:
.PP
\fB\-c\fR, \fB\-\-check\fR
.RS 4
diff --git a/man/zh_CN/man1/gpasswd.1 b/man/zh_CN/man1/gpasswd.1
index 7ab82b2d..bed6d263 100644
--- a/man/zh_CN/man1/gpasswd.1
+++ b/man/zh_CN/man1/gpasswd.1
@@ -2,12 +2,12 @@
.\" Title: gpasswd
.\" Author: Rafal Maszkowski
.\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\" Date: 2019-06-13
+.\" Date: 2019-12-01
.\" Manual: 用户命令
-.\" Source: shadow-utils 4.7
+.\" Source: shadow-utils 4.8
.\" Language: Chinese Simplified
.\"
-.TH "GPASSWD" "1" "2019-06-13" "shadow\-utils 4\&.7" "用户命令"
+.TH "GPASSWD" "1" "2019-12-01" "shadow\-utils 4\&.8" "用户命令"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
@@ -28,7 +28,7 @@
.\" * MAIN CONTENT STARTS HERE *
.\" -----------------------------------------------------------------
.SH "名称"
-gpasswd \- 管理员 /etc/group 和 /etc/gshadow
+gpasswd \- administer /etc/group and /etc/gshadow
.SH "大纲"
.HP \w'\fBgpasswd\fR\ 'u
\fBgpasswd\fR [\fI选项\fR] \fIgroup\fR
@@ -61,29 +61,30 @@ without a password, and non\-members must supply the password\&.
Group passwords are an inherent security problem since more than one person is permitted to know the password\&. However, groups are a useful tool for permitting co\-operation between different users\&.
.SH "选项"
.PP
-除了
+Except for the
\fB\-A\fR
-和
+and
\fB\-M\fR
-选项,其它选项不能联合使用。
+options, the options cannot be combined\&.
.PP
+The options which apply to the
\fBgpasswd\fR
-可以接受的选项有:
+command are:
.PP
\fB\-a\fR, \fB\-\-add\fR\ \&\fIuser\fR
.RS 4
-向名为
-\fIgroup\fR
-的组中添加用户
-\fIuser\fR。
+Add the
+\fIuser\fR
+to the named
+\fIgroup\fR\&.
.RE
.PP
\fB\-d\fR, \fB\-\-delete\fR\ \&\fIuser\fR
.RS 4
-从名为
-\fIgroup\fR
-的组中移除用户
-\fIuser\fR。
+Remove the
+\fIuser\fR
+from the named
+\fIgroup\fR\&.
.RE
.PP
\fB\-h\fR, \fB\-\-help\fR
@@ -135,28 +136,29 @@ and /etc/gshadow files\&.
Thus you cannot change any NIS or LDAP group\&. This must be performed on the corresponding server\&.
.SH "配置文件"
.PP
-在
+The following configuration variables in
/etc/login\&.defs
-中有如下配置变量,可以用来更改此工具的行为:
+change the behavior of this tool:
.PP
\fBENCRYPT_METHOD\fR (string)
.RS 4
这定义了系统加密密码的默认算法(如果没有在命令行上指定算法)。
.sp
-可以使用如下值:\fIDES\fR
+It can take one of these values:
+\fIDES\fR
(default),
\fIMD5\fR, \fISHA256\fR, \fISHA512\fR\&.
.sp
-注意,此参数会覆盖
+Note: this parameter overrides the
\fBMD5_CRYPT_ENAB\fR
-变量。
+variable\&.
.RE
.PP
\fBMAX_MEMBERS_PER_GROUP\fR (number)
.RS 4
-每个组条目的最大成员数。达到最大值时,在
+Maximum members per group entry\&. When the maximum is reached, a new group entry (line) is started in
/etc/group
-开始一个新条目(行)(使用同样的名称,同样的密码,同样的 GID)。
+(with the same name, same password, and same GID)\&.
.sp
默认值是 0,意味着组中的成员数没有限制。
.sp
@@ -169,27 +171,28 @@ Thus you cannot change any NIS or LDAP group\&. This must be performed on the co
.PP
\fBMD5_CRYPT_ENAB\fR (boolean)
.RS 4
-表示密码是否必须使用基于 MD5 的算法加密。如果设为
-\fIyes\fR,新密码将使用可以和新版 FreeBSD 兼容的基于 MD5 的算法加密。它支持无限长度的密码以及更长的盐字符串。如果您需要将加密的密码复制到其它不理解新算法的系统,设置为
-\fIno\fR。默认值是
-\fIno\fR。
+Indicate if passwords must be encrypted using the MD5\-based algorithm\&. If set to
+\fIyes\fR, new passwords will be encrypted using the MD5\-based algorithm compatible with the one used by recent releases of FreeBSD\&. It supports passwords of unlimited length and longer salt strings\&. Set to
+\fIno\fR
+if you need to copy encrypted passwords to other systems which don\*(Aqt understand the new algorithm\&. Default is
+\fIno\fR\&.
.sp
This variable is superseded by the
\fBENCRYPT_METHOD\fR
variable or by any command line option used to configure the encryption algorithm\&.
.sp
-此变量已经废弃。您应该使用
-\fBENCRYPT_METHOD\fR。
+This variable is deprecated\&. You should use
+\fBENCRYPT_METHOD\fR\&.
.RE
.PP
\fBSHA_CRYPT_MIN_ROUNDS\fR (number), \fBSHA_CRYPT_MAX_ROUNDS\fR (number)
.RS 4
+When
\fBENCRYPT_METHOD\fR
-设为
+is set to
\fISHA256\fR
-或
-\fISHA512\fR
-时,此项确定加密算法默认使用 SHA 轮转数目(当轮转数没有通过命令行指定时)。
+or
+\fISHA512\fR, this defines the number of SHA rounds used by the encryption algorithm by default (when the number of rounds is not specified on the command line)\&.
.sp
使用很多轮转,会让暴力破解更加困难。但是需要注意,认证用户时也会需要更多的 CPU 资源。
.sp
@@ -197,16 +200,16 @@ variable or by any command line option used to configure the encryption algorith
.sp
值必须在 1000 \- 999,999,999 之间。
.sp
-如果只设置了一个
+If only one of the
\fBSHA_CRYPT_MIN_ROUNDS\fR
-或
+or
\fBSHA_CRYPT_MAX_ROUNDS\fR
-值,就会使用这个值。
+values is set, then this value will be used\&.
.sp
-如果
+If
\fBSHA_CRYPT_MIN_ROUNDS\fR
>
-\fBSHA_CRYPT_MAX_ROUNDS\fR,将会使用大的那个。
+\fBSHA_CRYPT_MAX_ROUNDS\fR, the highest value will be used\&.
.RE
.SH "文件"
.PP
diff --git a/man/zh_CN/man1/groups.1 b/man/zh_CN/man1/groups.1
index 6737a110..d336323a 100644
--- a/man/zh_CN/man1/groups.1
+++ b/man/zh_CN/man1/groups.1
@@ -2,12 +2,12 @@
.\" Title: groups
.\" Author: Julianne Frances Haugh
.\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\" Date: 2019-06-13
+.\" Date: 2019-12-01
.\" Manual: 用户命令
-.\" Source: shadow-utils 4.7
+.\" Source: shadow-utils 4.8
.\" Language: Chinese Simplified
.\"
-.TH "GROUPS" "1" "2019-06-13" "shadow\-utils 4\&.7" "用户命令"
+.TH "GROUPS" "1" "2019-12-01" "shadow\-utils 4\&.8" "用户命令"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff --git a/man/zh_CN/man1/id.1 b/man/zh_CN/man1/id.1
index edb4a05d..634377ed 100644
--- a/man/zh_CN/man1/id.1
+++ b/man/zh_CN/man1/id.1
@@ -2,12 +2,12 @@
.\" Title: id
.\" Author: Julianne Frances Haugh
.\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\" Date: 2019-06-13
+.\" Date: 2019-12-01
.\" Manual: 用户命令
-.\" Source: shadow-utils 4.7
+.\" Source: shadow-utils 4.8
.\" Language: Chinese Simplified
.\"
-.TH "ID" "1" "2019-06-13" "shadow\-utils 4\&.7" "用户命令"
+.TH "ID" "1" "2019-12-01" "shadow\-utils 4\&.8" "用户命令"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff --git a/man/zh_CN/man1/login.1 b/man/zh_CN/man1/login.1
index 467e1bd8..f20e1246 100644
--- a/man/zh_CN/man1/login.1
+++ b/man/zh_CN/man1/login.1
@@ -2,12 +2,12 @@
.\" Title: login
.\" Author: Julianne Frances Haugh
.\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\" Date: 2019-06-13
+.\" Date: 2019-12-01
.\" Manual: 用户命令
-.\" Source: shadow-utils 4.7
+.\" Source: shadow-utils 4.8
.\" Language: Chinese Simplified
.\"
-.TH "LOGIN" "1" "2019-06-13" "shadow\-utils 4\&.7" "用户命令"
+.TH "LOGIN" "1" "2019-12-01" "shadow\-utils 4\&.8" "用户命令"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
@@ -31,11 +31,11 @@
login \- 在系统上启动回话
.SH "大纲"
.HP \w'\fBlogin\fR\ 'u
-\fBlogin\fR [\-p] [\-h\ \fI主机\fR] [\fI用户名\fR] [\fIENV=VAR\fR...]
+\fBlogin\fR [\-p] [\-h\ \fIhost\fR] [\fI用户名\fR] [\fIENV=VAR\fR...]
.HP \w'\fBlogin\fR\ 'u
-\fBlogin\fR [\-p] [\-h\ \fI主机\fR] \-f \fI用户名\fR
+\fBlogin\fR [\-p] [\-h\ \fIhost\fR] \-f \fI用户名\fR
.HP \w'\fBlogin\fR\ 'u
-\fBlogin\fR [\-p] \-r\ \fI主机\fR
+\fBlogin\fR [\-p] \-r\ \fIhost\fR
.SH "描述"
.PP
The
@@ -100,8 +100,9 @@ from the shell prompt without
.RS 4
不要执行认证,用户已经预认证过。
.sp
-注意:此时,\fIusername\fR
-是强制的。
+Note: In that case,
+\fIusername\fR
+is mandatory\&.
.RE
.PP
\fB\-h\fR
@@ -119,18 +120,19 @@ from the shell prompt without
为 rlogin (远程登录)执行 autologin (自动登录)协议。
.RE
.PP
+The
\fB\-r\fR,
\fB\-h\fR
and
\fB\-f\fR
-只能用于 root 使用
+options are only used when
\fBlogin\fR
-时。
+is invoked by root\&.
.SH "CAVEATS"
.PP
-此版本的
+This version of
\fBlogin\fR
-有很多编译选项,只有一部分可以在任何站点使用。
+has many compilation options, only some of which may be in use at any particular site\&.
.PP
文件的位置由系统配置决定。
.PP
@@ -149,9 +151,9 @@ As with any program,
\fBlogin\fR\*(Aqs appearance can be faked\&. If non\-trusted users have physical access to a machine, an attacker could use this to obtain the password of the next person coming to sit in front of the machine\&. Under Linux, the SAK mechanism can be used by users to initiate a trusted path and prevent this kind of attack\&.
.SH "配置文件"
.PP
-在
+The following configuration variables in
/etc/login\&.defs
-中有如下配置变量,可以用来更改此工具的行为:
+change the behavior of this tool:
.PP
\fBCONSOLE\fR (string)
.RS 4
@@ -164,24 +166,24 @@ As with any program,
.PP
\fBCONSOLE_GROUPS\fR (string)
.RS 4
-在控制台登录时,添加到用户附加组集中的组列表(就如 CONSOLE 所确定的)。默认是无。
-使用时需要注意:这可能使用户获取这些组的永久权限,甚至登录到的不是此控制台时。
+List of groups to add to the user\*(Aqs supplementary groups set when logging in on the console (as determined by the CONSOLE setting)\&. Default is none\&.
+
+Use with caution \- it is possible for users to gain permanent access to these groups, even when not logged in on the console\&.
.RE
.PP
\fBDEFAULT_HOME\fR (boolean)
.RS 4
如果不能 cd 到主目录时,说明是否允许登录。默认是否。
.sp
-如果设置为
-\fIyes\fR,如果不能 cd 到主目录时,用户将会登录到根目录(/)。
+If set to
+\fIyes\fR, the user will login in the root (/) directory if it is not possible to cd to her home directory\&.
.RE
.PP
\fBENV_HZ\fR (string)
.RS 4
-如果设置了,将会用于在用户登录时定义 HZ 环境变量。值必须以
-\fIHZ=\fR
-开头。Linux 上的常用值是
-\fIHZ=100\fR。
+If set, it will be used to define the HZ environment variable when a user login\&. The value must be preceded by
+\fIHZ=\fR\&. A common value on Linux is
+\fIHZ=100\fR\&.
.RE
.PP
\fBENV_PATH\fR (string)
@@ -202,14 +204,14 @@ If set, it will be used to define the PATH environment variable when the superus
.PP
\fBENV_TZ\fR (string)
.RS 4
-如果设置了,它将用于在用户登录时定义 TZ 环境变量。此值可以是以
+If set, it will be used to define the TZ environment variable when a user login\&. The value can be the name of a timezone preceded by
\fITZ=\fR
-开头的时区名(例如
-\fITZ=CST6CDT\fR),或者是包含时区规则的文件完整路径(例如
-/etc/tzname)。
+(for example
+\fITZ=CST6CDT\fR), or the full path to the file containing the timezone specification (for example
+/etc/tzname)\&.
.sp
-如果将完整路径指定为了一个不存在或不可读的文件,则默认使用
-\fITZ=CST6CDT\fR。
+If a full path is specified but the file does not exist or cannot be read, the default is to use
+\fITZ=CST6CDT\fR\&.
.RE
.PP
\fBENVIRON_FILE\fR (string)
@@ -221,10 +223,10 @@ If set, it will be used to define the PATH environment variable when the superus
.PP
\fBERASECHAR\fR (number)
.RS 4
-终端擦除字符 (\fI010\fR
+Terminal ERASE character (\fI010\fR
= backspace,
\fI0177\fR
-= DEL)。
+= DEL)\&.
.sp
此值可以使用前缀\(lq0\(rq表示八进制,\(lq0x\(rq表示十六进制。
.RE
@@ -236,17 +238,17 @@ If set, it will be used to define the PATH environment variable when the superus
.PP
\fBFAILLOG_ENAB\fR (boolean)
.RS 4
-允许登录并显示
+Enable logging and display of
/var/log/faillog
-登录失败信息。
+login failure info\&.
.RE
.PP
\fBFAKE_SHELL\fR (string)
.RS 4
-如果设置了,\fBlogin\fR
-将执行此 shell 而不是在
-/etc/passwd
-中指定的用户 shell。
+If set,
+\fBlogin\fR
+will execute this shell instead of the users\*(Aq shell specified in
+/etc/passwd\&.
.RE
.PP
\fBFTMP_FILE\fR (string)
@@ -266,8 +268,8 @@ If defined, this file can inhibit all the usual chatter during the login sequenc
.PP
\fBKILLCHAR\fR (number)
.RS 4
-终端 KILL 字符 (\fI025\fR
-= CTRL/U)。
+Terminal KILL character (\fI025\fR
+= CTRL/U)\&.
.sp
此值可以使用前缀\(lq0\(rq表示八进制,\(lq0x\(rq表示十六进制。
.RE
@@ -286,8 +288,8 @@ If defined, this file can inhibit all the usual chatter during the login sequenc
.RS 4
此字符串用于提示输入密码。默认是 "Password: ",或者翻译了的结果(汉语中翻译为了\(lq密码:\(rq)。如果设置了此变量,提示不会被翻译。
.sp
-如果字符串包含
-\fI%s\fR,将会被用户名替换。
+If the string contains
+\fI%s\fR, this will be replaced by the user\*(Aqs name\&.
.RE
.PP
\fBLOGIN_TIMEOUT\fR (number)
@@ -324,21 +326,22 @@ If defined, this file can inhibit all the usual chatter during the login sequenc
定义用户邮箱文件的位置(相对于主目录)。
.RE
.PP
+The
\fBMAIL_DIR\fR
and
\fBMAIL_FILE\fR
-变量由
-\fBuseradd\fR,\fBusermod\fR
-和
+variables are used by
+\fBuseradd\fR,
+\fBusermod\fR, and
\fBuserdel\fR
-用于创建、移动或删除用户邮箱。
+to create, move, or delete the user\*(Aqs mail spool\&.
.PP
-如果
+If
\fBMAIL_CHECK_ENAB\fR
-设置为
-\fIyes\fR,它们也被用于定义
+is set to
+\fIyes\fR, they are also used to define the
\fBMAIL\fR
-环境变量。
+environment variable\&.
.PP
\fBMOTD_FILE\fR (string)
.RS 4
@@ -388,9 +391,9 @@ If defined, file which maps tty line to TERM environment parameter\&. Each line
.PP
\fBULIMIT\fR (number)
.RS 4
-默认
+Default
\fBulimit\fR
-值。
+value\&.
.RE
.PP
\fBUMASK\fR (number)
@@ -398,29 +401,30 @@ If defined, file which maps tty line to TERM environment parameter\&. Each line
文件模式创建掩码初始化为此值。如果没有指定,掩码初始化为 022。
.sp
\fBuseradd\fR
-和
+and
\fBnewusers\fR
-使用此掩码设置它们创建的用户主目录的模式。
+use this mask to set the mode of the home directory they create
.sp
-也被
+It is also used by
\fBlogin\fR
-用于指定用户的初始 umask。注意,此掩码可以被用户的 GECOS 行覆盖(当设置了
+to define users\*(Aq initial umask\&. Note that this mask can be overridden by the user\*(Aqs GECOS line (if
\fBQUOTAS_ENAB\fR
-时),也可以被带
+is set) or by the specification of a limit with the
\fIK\fR
-指示符的
-\fBlimits\fR(5)
-定义的限制值覆盖。
+identifier in
+\fBlimits\fR(5)\&.
.RE
.PP
\fBUSERGROUPS_ENAB\fR (boolean)
.RS 4
如果 uid 和 gid 相同,用户名和主用户名也相同,使非 root 组的组掩码位和属主位相同 (如:022 \-> 002, 077 \-> 007)。
.sp
-如果设置为
-\fIyes\fR,如果组中没有成员了,\fBuserdel\fR
-将移除此用户组,\fBuseradd\fR
-创建用户时,也会创建一个同名的默认组。
+If set to
+\fIyes\fR,
+\fBuserdel\fR
+will remove the user\*(Aqs group if it contains no more members, and
+\fBuseradd\fR
+will create by default a group with the name of the user\&.
.RE
.SH "文件"
.PP
diff --git a/man/zh_CN/man1/newgrp.1 b/man/zh_CN/man1/newgrp.1
index 9350cc06..96adf71a 100644
--- a/man/zh_CN/man1/newgrp.1
+++ b/man/zh_CN/man1/newgrp.1
@@ -2,12 +2,12 @@
.\" Title: newgrp
.\" Author: Julianne Frances Haugh
.\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\" Date: 2019-06-13
+.\" Date: 2019-12-01
.\" Manual: 用户命令
-.\" Source: shadow-utils 4.7
+.\" Source: shadow-utils 4.8
.\" Language: Chinese Simplified
.\"
-.TH "NEWGRP" "1" "2019-06-13" "shadow\-utils 4\&.7" "用户命令"
+.TH "NEWGRP" "1" "2019-12-01" "shadow\-utils 4\&.8" "用户命令"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
@@ -57,15 +57,15 @@ If there is an entry for this group in
is considered\&.
.SH "配置文件"
.PP
-在
+The following configuration variables in
/etc/login\&.defs
-中有如下配置变量,可以用来更改此工具的行为:
+change the behavior of this tool:
.PP
\fBSYSLOG_SG_ENAB\fR (boolean)
.RS 4
-允许\(lqsyslog\(rq记录
+Enable "syslog" logging of
\fBsg\fR
-的活动。
+activity\&.
.RE
.SH "文件"
.PP
diff --git a/man/zh_CN/man1/passwd.1 b/man/zh_CN/man1/passwd.1
index 0742a7b2..16bc7e0e 100644
--- a/man/zh_CN/man1/passwd.1
+++ b/man/zh_CN/man1/passwd.1
@@ -2,12 +2,12 @@
.\" Title: passwd
.\" Author: Julianne Frances Haugh
.\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\" Date: 2019-06-13
+.\" Date: 2019-12-01
.\" Manual: 用户命令
-.\" Source: shadow-utils 4.7
+.\" Source: shadow-utils 4.8
.\" Language: Chinese Simplified
.\"
-.TH "PASSWD" "1" "2019-06-13" "shadow\-utils 4\&.7" "用户命令"
+.TH "PASSWD" "1" "2019-12-01" "shadow\-utils 4\&.8" "用户命令"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
@@ -34,15 +34,18 @@ passwd \- 更改用户密码
\fBpasswd\fR [\fI选项\fR] [\fI登录\fR]
.SH "描述"
.PP
+The
\fBpasswd\fR
-命令用来更改用户账户的密码。普通用户通常只更改其自己账户的密码,而超级用户可以更改任何账户的密码。\fBpasswd\fR
-也更改账户或相关的密码有效期。
+command changes passwords for user accounts\&. A normal user may only change the password for their own account, while the superuser may change the password for any account\&.
+\fBpasswd\fR
+also changes the account or associated password validity period\&.
.SS "密码更改"
.PP
如果有旧密码,首先提示用户输入旧密码。加密这个密码然后和存储的密码进行比较。用户只有一次机会输入正确密码。允许超级用户略过这个步骤,以便更改忘记了的密码。
.PP
-输入了密码之后,会检查密码年龄信息,以查看此时是否允许用户更改密码。如果不允许,\fBpasswd\fR
-拒绝更改密码,然后退出。
+After the password has been entered, password aging information is checked to see if the user is permitted to change the password at this time\&. If not,
+\fBpasswd\fR
+refuses to change the password and exits\&.
.PP
提示用户输入两次新密码。第二次和第一次进行比较,并且需要相同才能更改密码。
.PP
@@ -81,28 +84,30 @@ passwd \- 更改用户密码
标点符号
.RE
.PP
-必须要留意不能包含系统默认的擦除和杀死字符。\fBpasswd\fR
-会拒绝复杂度不满足要求的密码。
+Care must be taken not to include the system default erase or kill characters\&.
+\fBpasswd\fR
+will reject any password which is not suitably complex\&.
.SS "关于用户密码的提示"
.PP
-密码的安全性依赖于加密算法的强度和密钥空间的大小。旧的
+The security of a password depends upon the strength of the encryption algorithm and the size of the key space\&. The legacy
\fIUNIX\fR
-系统加密算法基于 NBS DES 算法。推荐使用更新的算法(查看
-\fBENCRYPT_METHOD\fR)。密钥空间的大小依赖于选择的密码的随机性。
+System encryption method is based on the NBS DES algorithm\&. More recent methods are now recommended (see
+\fBENCRYPT_METHOD\fR)\&. The size of the key space depends upon the randomness of the password which is selected\&.
.PP
由于粗心地或处理选择密码,会危及密码的安全。由于这个原因,您不应该选择出现在词典中或者必须要写下来才能记住的密码。密码也不应该是一个名字、许可证号、生日或者街道号。所有这些可以用于猜测来损害系统安全。
.PP
You can find advice on how to choose a strong password on http://en\&.wikipedia\&.org/wiki/Password_strength
.SH "选项"
.PP
+The options which apply to the
\fBpasswd\fR
-命令可以接受的选项有:
+command are:
.PP
\fB\-a\fR, \fB\-\-all\fR
.RS 4
-此选项只能和
+This option can be used only with
\fB\-S\fR
-一起使用,来显示所有用户的状态。
+and causes show status for all users\&.
.RE
.PP
\fB\-d\fR, \fB\-\-delete\fR
@@ -122,9 +127,9 @@ You can find advice on how to choose a strong password on http://en\&.wikipedia\
.PP
\fB\-i\fR, \fB\-\-inactive\fR\ \&\fIINACTIVE\fR
.RS 4
-此选项用于在密码过期一定天数之后禁用账户。一个用户账户密码已经过期
+This option is used to disable an account after the password has been expired for a number of days\&. After a user account has had an expired password for
\fIINACTIVE\fR
-天之后,用户将不能再登录进账户。
+days, the user may no longer sign on to the account\&.
.RE
.PP
\fB\-k\fR, \fB\-\-keep\-tokens\fR
@@ -136,17 +141,17 @@ You can find advice on how to choose a strong password on http://en\&.wikipedia\
.RS 4
锁定指定账户的密码。此选项通过将密码更改为一个不可能与加密值匹配的值来禁用(它在密码开头添加一个\(lq!\(rq)。
.sp
-注意,这并没有禁用此账户。用户仍然可以通过其它认证方式(如 SSH 密码)来登录。要禁用此账户,管理员需要使用
+Note that this does not disable the account\&. The user may still be able to login using another authentication token (e\&.g\&. an SSH key)\&. To disable the account, administrators should use
\fBusermod \-\-expiredate 1\fR
-(设置账户的过期时间为1970年1月2日)。
+(this set the account\*(Aqs expire date to Jan 2, 1970)\&.
.sp
被锁定了密码的用户不允许更改密码。
.RE
.PP
\fB\-n\fR, \fB\-\-mindays\fR\ \&\fIMIN_DAYS\fR
.RS 4
-在密码更改之间的最小天数设置为
-\fIMIN_DAYS\fR。此字段中的 0 值表示用户可以在任何时间更改其密码。
+Set the minimum number of days between password changes to
+\fIMIN_DAYS\fR\&. A value of zero for this field indicates that the user may change their password at any time\&.
.RE
.PP
\fB\-q\fR, \fB\-\-quiet\fR
@@ -156,9 +161,9 @@ You can find advice on how to choose a strong password on http://en\&.wikipedia\
.PP
\fB\-r\fR, \fB\-\-repository\fR\ \&\fIREPOSITORY\fR
.RS 4
-在
+change password in
\fIREPOSITORY\fR
-中更改密码
+repository
.RE
.PP
\fB\-R\fR, \fB\-\-root\fR\ \&\fICHROOT_DIR\fR
@@ -177,26 +182,28 @@ directory\&.
.PP
\fB\-u\fR, \fB\-\-unlock\fR
.RS 4
-解锁指定用户的密码。此操作通过将密码改回先前值(改回使用
+Unlock the password of the named account\&. This option re\-enables a password by changing the password back to its previous value (to the value before using the
\fB\-l\fR
-之前的值)重新启用密码。
+option)\&.
.RE
.PP
\fB\-w\fR, \fB\-\-warndays\fR\ \&\fIWARN_DAYS\fR
.RS 4
-设置在要求更改密码之前警告的天数。\fIWARN_DAYS\fR
-选项是在密码过期之前提前警告的天数。
+Set the number of days of warning before a password change is required\&. The
+\fIWARN_DAYS\fR
+option is the number of days prior to the password expiring that a user will be warned that their password is about to expire\&.
.RE
.PP
\fB\-x\fR, \fB\-\-maxdays\fR\ \&\fIMAX_DAYS\fR
.RS 4
-设置密码仍然有效的最大天数。\fIMAX_DAYS\fR
-之后,密码会要求更改。
+Set the maximum number of days a password remains valid\&. After
+\fIMAX_DAYS\fR, the password is required to be changed\&.
.sp
-\fIMAX_DAYS\fR
-设置为
+Passing the number
\fI\-1\fR
-会移除密码有效性检查。
+as
+\fIMAX_DAYS\fR
+will remove checking a password\*(Aqs validity\&.
.RE
.SH "CAVEATS"
.PP
@@ -205,36 +212,38 @@ directory\&.
在启动了 NIS 的系统上,如果没有登录 NIS 服务器,用户或许不能更改自己的密码。
.SH "配置文件"
.PP
-在
+The following configuration variables in
/etc/login\&.defs
-中有如下配置变量,可以用来更改此工具的行为:
+change the behavior of this tool:
.PP
\fBENCRYPT_METHOD\fR (string)
.RS 4
这定义了系统加密密码的默认算法(如果没有在命令行上指定算法)。
.sp
-可以使用如下值:\fIDES\fR
+It can take one of these values:
+\fIDES\fR
(default),
\fIMD5\fR, \fISHA256\fR, \fISHA512\fR\&.
.sp
-注意,此参数会覆盖
+Note: this parameter overrides the
\fBMD5_CRYPT_ENAB\fR
-变量。
+variable\&.
.RE
.PP
\fBMD5_CRYPT_ENAB\fR (boolean)
.RS 4
-表示密码是否必须使用基于 MD5 的算法加密。如果设为
-\fIyes\fR,新密码将使用可以和新版 FreeBSD 兼容的基于 MD5 的算法加密。它支持无限长度的密码以及更长的盐字符串。如果您需要将加密的密码复制到其它不理解新算法的系统,设置为
-\fIno\fR。默认值是
-\fIno\fR。
+Indicate if passwords must be encrypted using the MD5\-based algorithm\&. If set to
+\fIyes\fR, new passwords will be encrypted using the MD5\-based algorithm compatible with the one used by recent releases of FreeBSD\&. It supports passwords of unlimited length and longer salt strings\&. Set to
+\fIno\fR
+if you need to copy encrypted passwords to other systems which don\*(Aqt understand the new algorithm\&. Default is
+\fIno\fR\&.
.sp
This variable is superseded by the
\fBENCRYPT_METHOD\fR
variable or by any command line option used to configure the encryption algorithm\&.
.sp
-此变量已经废弃。您应该使用
-\fBENCRYPT_METHOD\fR。
+This variable is deprecated\&. You should use
+\fBENCRYPT_METHOD\fR\&.
.RE
.PP
\fBOBSCURE_CHECKS_ENAB\fR (boolean)
@@ -254,21 +263,22 @@ variable or by any command line option used to configure the encryption algorith
.PP
\fBPASS_MAX_LEN\fR (number), \fBPASS_MIN_LEN\fR (number)
.RS 4
-crypt() 的有效字符位数。\fBPASS_MAX_LEN\fR
-默认是 8,除非您自己的 crypt() 更好,否则不要更改。如果
+Number of significant characters in the password for crypt()\&.
+\fBPASS_MAX_LEN\fR
+is 8 by default\&. Don\*(Aqt change unless your crypt() is better\&. This is ignored if
\fBMD5_CRYPT_ENAB\fR
-设为
-\fIyes\fR,会被忽略。
+set to
+\fIyes\fR\&.
.RE
.PP
\fBSHA_CRYPT_MIN_ROUNDS\fR (number), \fBSHA_CRYPT_MAX_ROUNDS\fR (number)
.RS 4
+When
\fBENCRYPT_METHOD\fR
-设为
+is set to
\fISHA256\fR
-或
-\fISHA512\fR
-时,此项确定加密算法默认使用 SHA 轮转数目(当轮转数没有通过命令行指定时)。
+or
+\fISHA512\fR, this defines the number of SHA rounds used by the encryption algorithm by default (when the number of rounds is not specified on the command line)\&.
.sp
使用很多轮转,会让暴力破解更加困难。但是需要注意,认证用户时也会需要更多的 CPU 资源。
.sp
@@ -276,16 +286,16 @@ crypt() 的有效字符位数。\fBPASS_MAX_LEN\fR
.sp
值必须在 1000 \- 999,999,999 之间。
.sp
-如果只设置了一个
+If only one of the
\fBSHA_CRYPT_MIN_ROUNDS\fR
-或
+or
\fBSHA_CRYPT_MAX_ROUNDS\fR
-值,就会使用这个值。
+values is set, then this value will be used\&.
.sp
-如果
+If
\fBSHA_CRYPT_MIN_ROUNDS\fR
>
-\fBSHA_CRYPT_MAX_ROUNDS\fR,将会使用大的那个。
+\fBSHA_CRYPT_MAX_ROUNDS\fR, the highest value will be used\&.
.RE
.SH "文件"
.PP
@@ -305,48 +315,51 @@ Shadow 密码套件配置。
.RE
.SH "退出值"
.PP
+The
\fBpasswd\fR
-命令退出,并返回如下值:
+command exits with the following values:
.PP
\fI0\fR
.RS 4
-成功
+success
.RE
.PP
\fI1\fR
.RS 4
-权限不够
+permission denied
.RE
.PP
\fI2\fR
.RS 4
-无效的选项组合
+invalid combination of options
.RE
.PP
\fI3\fR
.RS 4
-意外的失败,什么也没有做。
+unexpected failure, nothing done
.RE
.PP
\fI4\fR
.RS 4
-意外的失败,passwd
-文件丢失
+unexpected failure,
+passwd
+file missing
.RE
.PP
\fI5\fR
.RS 4
passwd
-文件忙,请重试
+file busy, try again
.RE
.PP
\fI6\fR
.RS 4
-给了选项一个无效的参数
+invalid argument to option
.RE
.SH "参见"
.PP
\fBchpasswd\fR(8),
\fBpasswd\fR(5),
\fBshadow\fR(5),
-\fBlogin.defs\fR(5),\fBusermod\fR(8)\&.
+\fBlogin.defs\fR(5),
+\fBusermod\fR(8)\&.
diff --git a/man/zh_CN/man1/sg.1 b/man/zh_CN/man1/sg.1
index f1b0f5c3..91f28d96 100644
--- a/man/zh_CN/man1/sg.1
+++ b/man/zh_CN/man1/sg.1
@@ -2,12 +2,12 @@
.\" Title: sg
.\" Author: Julianne Frances Haugh
.\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\" Date: 2019-06-13
+.\" Date: 2019-12-01
.\" Manual: 用户命令
-.\" Source: shadow-utils 4.7
+.\" Source: shadow-utils 4.8
.\" Language: Chinese Simplified
.\"
-.TH "SG" "1" "2019-06-13" "shadow\-utils 4\&.7" "用户命令"
+.TH "SG" "1" "2019-12-01" "shadow\-utils 4\&.8" "用户命令"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
@@ -31,38 +31,40 @@
sg \- 以不同的组 ID 执行命令
.SH "大纲"
.HP \w'\fBsg\fR\ 'u
-\fBsg\fR [\-] [组\ [\-c]\ 命令]
+\fBsg\fR [\-] [group\ [\-c\ ]\ command]
.SH "描述"
.PP
+The
\fBsg\fR
-命令类似于
-\fBnewgrp\fR,但是可以接受一个命令。这个命令将会使用
+command works similar to
+\fBnewgrp\fR
+but accepts a command\&. The command will be executed with the
/bin/sh
-shell 来执行。对于您可以使用
+shell\&. With most shells you may run
\fBsg\fR
-启动的多数 shell,您需要将多个词的命令用引号引起来。\fBnewgrp\fR
-和
+from, you need to enclose multi\-word commands in quotes\&. Another difference between
+\fBnewgrp\fR
+and
\fBsg\fR
-之间的另外一个不同点是某些 shell 对
+is that some shells treat
\fBnewgrp\fR
-有特殊对待,会使用
+specially, replacing themselves with a new instance of a shell that
\fBnewgrp\fR
-创建的一个新的 shell 实例替换自身。这不会发生在
-\fBsg\fR
-身上,所以从
+creates\&. This doesn\*(Aqt happen with
+\fBsg\fR, so upon exit from a
\fBsg\fR
-退出后,您会返回到先前的组 ID。
+command you are returned to your previous group ID\&.
.SH "配置文件"
.PP
-在
+The following configuration variables in
/etc/login\&.defs
-中有如下配置变量,可以用来更改此工具的行为:
+change the behavior of this tool:
.PP
\fBSYSLOG_SG_ENAB\fR (boolean)
.RS 4
-允许\(lqsyslog\(rq记录
+Enable "syslog" logging of
\fBsg\fR
-的活动。
+activity\&.
.RE
.SH "文件"
.PP
diff --git a/man/zh_CN/man1/su.1 b/man/zh_CN/man1/su.1
index 258f80e2..9bf038f0 100644
--- a/man/zh_CN/man1/su.1
+++ b/man/zh_CN/man1/su.1
@@ -2,12 +2,12 @@
.\" Title: su
.\" Author: Julianne Frances Haugh
.\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\" Date: 2019-06-13
+.\" Date: 2019-12-01
.\" Manual: 用户命令
-.\" Source: shadow-utils 4.7
+.\" Source: shadow-utils 4.8
.\" Language: Chinese Simplified
.\"
-.TH "SU" "1" "2019-06-13" "shadow\-utils 4\&.7" "用户命令"
+.TH "SU" "1" "2019-12-01" "shadow\-utils 4\&.8" "用户命令"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
@@ -55,28 +55,30 @@ option is special: it is also recognized after
.PP
如果合适,将提示用户输入一个密码。输入无效的密码会产生一个错误消息。所有的尝试,无论成功还是失败,都会被记录,以检测对系统的滥用。
.PP
-当前环境会传递给新 shell。对于普通用户,\fB$PATH\fR
-的值重置为
-/bin:/usr/bin,而对于超级用户则是
-/sbin:/bin:/usr/sbin:/usr/bin。这会随
-/etc/login\&.defs
-中的
+The current environment is passed to the new shell\&. The value of
+\fB$PATH\fR
+is reset to
+/bin:/usr/bin
+for normal users, or
+/sbin:/bin:/usr/sbin:/usr/bin
+for the superuser\&. This may be changed with the
\fBENV_PATH\fR
-和
+and
\fBENV_SUPATH\fR
-值改变。
+definitions in
+/etc/login\&.defs\&.
.PP
在登录 shell 中以第一个字符是\(lq*\(rq标注的是子系统登录。给定的主目录将被用于用户实际登录的新文件系统的根。
.SH "选项"
.PP
+The options which apply to the
\fBsu\fR
-命令可以接受的选项有:
+command are:
.PP
\fB\-c\fR, \fB\-\-command\fR\ \&\fICOMMAND\fR
.RS 4
-通过使用其
-\fB\-c\fR
-选项,指定一个由 shell 运行的命令。
+Specify a command that will be invoked by the shell using its
+\fB\-c\fR\&.
.sp
The executed command will have no controlling terminal\&. This option cannot be used to execute interactive programs which need a controlling TTY\&.
.RE
@@ -98,125 +100,134 @@ and
.RS 4
将使用的 shell。
.sp
-使用的 shell 在如下中选择(高优先级在前):.PP
+The invoked shell is chosen from (highest priority first):
+.PP
.RS 4
-通过 \-\-shell 指定的 shell。
+The shell specified with \-\-shell\&.
.RE
.PP
.RS 4
-如果使用了
-\fB\-\-preserve\-environment\fR,shell 将由
+If
+\fB\-\-preserve\-environment\fR
+is used, the shell specified by the
\fB$SHELL\fR
-环境变量指定。
+environment variable\&.
.RE
.PP
.RS 4
-在
+The shell indicated in the
/etc/passwd
-的相应项中为目标用户指定的 shell。
+entry for the target user\&.
.RE
.PP
.RS 4
-如果无法通过以上办法找到一个 shell,则使用
-/bin/sh。
+/bin/sh
+if a shell could not be found by any above method\&.
.RE
.sp
-如果目标用户的 shell 是有限制的(即,/etc/passwd
-中用户项中的 shell 字段没有在
-/etc/shells
-中列出),那么
+If the target user has a restricted shell (i\&.e\&. the shell field of this user\*(Aqs entry in
+/etc/passwd
+is not listed in
+/etc/shells), then the
\fB\-\-shell\fR
-选项或
+option or the
\fB$SHELL\fR
-环境变量不会带入账户,除非
+environment variable won\*(Aqt be taken into account, unless
\fBsu\fR
-是被 root 调用的。
+is called by root\&.
.RE
.PP
\fB\-m\fR, \fB\-p\fR, \fB\-\-preserve\-environment\fR
.RS 4
-保留当前环境,除非:.PP
+Preserve the current environment, except for:
+.PP
\fB$PATH\fR
.RS 4
-根据
+reset according to the
/etc/login\&.defs
-中的
+options
\fBENV_PATH\fR
or
\fBENV_SUPATH\fR
-选项重设 (请往下看)
+(see below);
.RE
.PP
\fB$IFS\fR
.RS 4
-如果已经设置了,重设
-\(lq<space><tab><newline>\(rq。
+reset to
+\(lq<space><tab><newline>\(rq, if it was set\&.
.RE
.sp
-如果用户的 shell 受限,此选项无效 (除非是 root 调用的
-\fBsu\fR)。
+If the target user has a restricted shell, this option has no effect (unless
+\fBsu\fR
+is called by root)\&.
.sp
-注意,环境的默认行为如下:.PP
+Note that the default behavior for the environment is the following:
+.PP
.RS 4
The
\fB$HOME\fR,
\fB$SHELL\fR,
\fB$USER\fR,
\fB$LOGNAME\fR,
-\fB$PATH\fR, 和
+\fB$PATH\fR, and
\fB$IFS\fR
-这些环境变量会被重置。
+environment variables are reset\&.
.RE
.PP
.RS 4
-如果没有使用
-\fB\-\-login\fR,复制环境,上述几个变量除外。
+If
+\fB\-\-login\fR
+is not used, the environment is copied, except for the variables above\&.
.RE
.PP
.RS 4
-如果使用了
-\fB\-\-login\fR,如果设置了
+If
+\fB\-\-login\fR
+is used, the
\fB$TERM\fR,
\fB$COLORTERM\fR,
-\fB$DISPLAY\fR
-和
-\fB$XAUTHORITY\fR,这些环境变量也会被重置。
+\fB$DISPLAY\fR, and
+\fB$XAUTHORITY\fR
+environment variables are copied if they were set\&.
.RE
.PP
.RS 4
-如果使用了
-\fB\-\-login\fR,环境变量
+If
+\fB\-\-login\fR
+is used, the
\fB$TZ\fR,
\fB$HZ\fR, and
\fB$MAIL\fR
-也会根据
+environment variables are set according to the
/etc/login\&.defs
-中的选项
+options
\fBENV_TZ\fR,
\fBENV_HZ\fR,
-\fBMAIL_DIR\fR
-和
+\fBMAIL_DIR\fR, and
\fBMAIL_FILE\fR
-重置 (请看下边)。
+(see below)\&.
.RE
.PP
.RS 4
-如果使用了
-\fB\-\-login\fR,其它环境变量可能会根据
+If
+\fB\-\-login\fR
+is used, other environment variables might be set by the
\fBENVIRON_FILE\fR
-文件来设置(请看下边)。
+file (see below)\&.
.RE
+.sp
.RE
.SH "CAVEATS"
.PP
-此版本的
+This version of
\fBsu\fR
-有很多编译选项,在某些机器上,可能只使用了其中的一部分。
+has many compilation options, only some of which may be in use at any particular site\&.
.SH "配置文件"
.PP
-在
+The following configuration variables in
/etc/login\&.defs
-中有如下配置变量,可以用来更改此工具的行为:
+change the behavior of this tool:
.PP
\fBCONSOLE\fR (string)
.RS 4
@@ -229,24 +240,24 @@ The
.PP
\fBCONSOLE_GROUPS\fR (string)
.RS 4
-在控制台登录时,添加到用户附加组集中的组列表(就如 CONSOLE 所确定的)。默认是无。
-使用时需要注意:这可能使用户获取这些组的永久权限,甚至登录到的不是此控制台时。
+List of groups to add to the user\*(Aqs supplementary groups set when logging in on the console (as determined by the CONSOLE setting)\&. Default is none\&.
+
+Use with caution \- it is possible for users to gain permanent access to these groups, even when not logged in on the console\&.
.RE
.PP
\fBDEFAULT_HOME\fR (boolean)
.RS 4
如果不能 cd 到主目录时,说明是否允许登录。默认是否。
.sp
-如果设置为
-\fIyes\fR,如果不能 cd 到主目录时,用户将会登录到根目录(/)。
+If set to
+\fIyes\fR, the user will login in the root (/) directory if it is not possible to cd to her home directory\&.
.RE
.PP
\fBENV_HZ\fR (string)
.RS 4
-如果设置了,将会用于在用户登录时定义 HZ 环境变量。值必须以
-\fIHZ=\fR
-开头。Linux 上的常用值是
-\fIHZ=100\fR。
+If set, it will be used to define the HZ environment variable when a user login\&. The value must be preceded by
+\fIHZ=\fR\&. A common value on Linux is
+\fIHZ=100\fR\&.
.RE
.PP
\fBENVIRON_FILE\fR (string)
@@ -274,22 +285,22 @@ If set, it will be used to define the PATH environment variable when the superus
.PP
\fBENV_TZ\fR (string)
.RS 4
-如果设置了,它将用于在用户登录时定义 TZ 环境变量。此值可以是以
+If set, it will be used to define the TZ environment variable when a user login\&. The value can be the name of a timezone preceded by
\fITZ=\fR
-开头的时区名(例如
-\fITZ=CST6CDT\fR),或者是包含时区规则的文件完整路径(例如
-/etc/tzname)。
+(for example
+\fITZ=CST6CDT\fR), or the full path to the file containing the timezone specification (for example
+/etc/tzname)\&.
.sp
-如果将完整路径指定为了一个不存在或不可读的文件,则默认使用
-\fITZ=CST6CDT\fR。
+If a full path is specified but the file does not exist or cannot be read, the default is to use
+\fITZ=CST6CDT\fR\&.
.RE
.PP
\fBLOGIN_STRING\fR (string)
.RS 4
此字符串用于提示输入密码。默认是 "Password: ",或者翻译了的结果(汉语中翻译为了\(lq密码:\(rq)。如果设置了此变量,提示不会被翻译。
.sp
-如果字符串包含
-\fI%s\fR,将会被用户名替换。
+If the string contains
+\fI%s\fR, this will be replaced by the user\*(Aqs name\&.
.RE
.PP
\fBMAIL_CHECK_ENAB\fR (boolean)
@@ -309,21 +320,22 @@ If set, it will be used to define the PATH environment variable when the superus
定义用户邮箱文件的位置(相对于主目录)。
.RE
.PP
+The
\fBMAIL_DIR\fR
and
\fBMAIL_FILE\fR
-变量由
-\fBuseradd\fR,\fBusermod\fR
-和
+variables are used by
+\fBuseradd\fR,
+\fBusermod\fR, and
\fBuserdel\fR
-用于创建、移动或删除用户邮箱。
+to create, move, or delete the user\*(Aqs mail spool\&.
.PP
-如果
+If
\fBMAIL_CHECK_ENAB\fR
-设置为
-\fIyes\fR,它们也被用于定义
+is set to
+\fIyes\fR, they are also used to define the
\fBMAIL\fR
-环境变量。
+environment variable\&.
.PP
\fBQUOTAS_ENAB\fR (boolean)
.RS 4
@@ -344,28 +356,35 @@ and ulimit, umask, and niceness from the user\*(Aqs passwd gecos field\&.
.PP
\fBSU_WHEEL_ONLY\fR (boolean)
.RS 4
-如果为
-\fIyes\fR,用户必须在
+If
+\fIyes\fR, the user must be listed as a member of the first gid 0 group in
/etc/group
-中别设定为 GID 为 0 的组(在大部分 Linux 上叫
-\fIroot\fR)的成员。
+(called
+\fIroot\fR
+on most Linux systems) to be able to
+\fBsu\fR
+to uid 0 accounts\&. If the group doesn\*(Aqt exist or is empty, no one will be able to
+\fBsu\fR
+to uid 0\&.
.RE
.PP
\fBSYSLOG_SU_ENAB\fR (boolean)
.RS 4
-除了 sulog 文件日志,也为
+Enable "syslog" logging of
\fBsu\fR
-活动启用\(lqsyslog\(rq日志。
+activity \- in addition to sulog file logging\&.
.RE
.PP
\fBUSERGROUPS_ENAB\fR (boolean)
.RS 4
如果 uid 和 gid 相同,用户名和主用户名也相同,使非 root 组的组掩码位和属主位相同 (如:022 \-> 002, 077 \-> 007)。
.sp
-如果设置为
-\fIyes\fR,如果组中没有成员了,\fBuserdel\fR
-将移除此用户组,\fBuseradd\fR
-创建用户时,也会创建一个同名的默认组。
+If set to
+\fIyes\fR,
+\fBuserdel\fR
+will remove the user\*(Aqs group if it contains no more members, and
+\fBuseradd\fR
+will create by default a group with the name of the user\&.
.RE
.SH "文件"
.PP
@@ -385,37 +404,41 @@ Shadow 密码套件配置。
.RE
.SH "退出值"
.PP
-成功时,\fBsu\fR
-返回执行的命令的退出值。
+On success,
+\fBsu\fR
+returns the exit value of the command it executed\&.
.PP
-如果命令被信号结束,\fBsu\fR
-返回此信号的编号加 128。
+If this command was terminated by a signal,
+\fBsu\fR
+returns the number of this signal plus 128\&.
.PP
-如果 su 必须要杀死此命令(因为已经要求它结束,可是却没有及时结束),\fBsu\fR
-返回 255。
+If su has to kill the command (because it was asked to terminate, and the command did not terminate in time),
+\fBsu\fR
+returns 255\&.
.PP
+Some exit values from
\fBsu\fR
-中的某些退出值与执行的命令无关:
+are independent from the executed command:
.PP
\fI0\fR
.RS 4
-成功 (只有
-\fB\-\-help\fR)
+success (\fB\-\-help\fR
+only)
.RE
.PP
\fI1\fR
.RS 4
-系统或者认证失败
+System or authentication failure
.RE
.PP
\fI126\fR
.RS 4
-要求的命令不存在
+The requested command was not found
.RE
.PP
\fI127\fR
.RS 4
-请求的命令不能执行
+The requested command could not be executed
.RE
.SH "参见"
.PP
diff --git a/man/zh_CN/man3/shadow.3 b/man/zh_CN/man3/shadow.3
index 89abada5..0bb8fc3f 100644
--- a/man/zh_CN/man3/shadow.3
+++ b/man/zh_CN/man3/shadow.3
@@ -2,12 +2,12 @@
.\" Title: shadow
.\" Author: Julianne Frances Haugh
.\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\" Date: 2019-06-13
+.\" Date: 2019-12-01
.\" Manual: 库函数调用
-.\" Source: shadow-utils 4.7
+.\" Source: shadow-utils 4.8
.\" Language: Chinese Simplified
.\"
-.TH "SHADOW" "3" "2019-06-13" "shadow\-utils 4\&.7" "库函数调用"
+.TH "SHADOW" "3" "2019-12-01" "shadow\-utils 4\&.8" "库函数调用"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
@@ -59,10 +59,10 @@ shadow, getspnam \- 加密密码文件工具函数
.SH "描述"
.PP
\fIshadow\fR
-处理 shadow 密码文件
-/etc/shadow
-的内容。\fI#include\fR
-文件中的结构是:
+manipulates the contents of the shadow password file,
+/etc/shadow\&. The structure in the
+\fI#include\fR
+file is:
.sp
.if n \{\
.RS 4
@@ -206,28 +206,30 @@ searches from the current position in the file for an entry matching
\fIname\fR\&.
.PP
\fIsetspent\fR
-和
+and
\fIendspent\fR
-分别用来开始和结束对影子密码文件的访问。
+may be used to begin and end, respectively, access to the shadow password file\&.
.PP
-需要使用
+The
\fIlckpwdf\fR
-和
+and
\fIulckpwdf\fR
-函数来确保对
+routines should be used to insure exclusive access to the
/etc/shadow
-文件的互斥访问。\fIlckpwdf\fR
-使用
+file\&.
+\fIlckpwdf\fR
+attempts to acquire a lock using
\fIpw_lock\fR
-来获取一个最长为 15 秒的锁,然后继续使用
+for up to 15 seconds\&. It continues by attempting to acquire a second lock using
\fIspw_lock\fR
-来获取长度为开始的 15 秒时间的剩余量的第二把锁。总计 15 秒之后,无论哪个失败,\fIlckpwdf\fR
-都返回 \-1。两把锁都获取成功时,返回 0。
+for the remainder of the initial 15 seconds\&. Should either attempt fail after a total of 15 seconds,
+\fIlckpwdf\fR
+returns \-1\&. When both locks are acquired 0 is returned\&.
.SH "DIAGNOSTICS"
.PP
-如果没有更多条目了或者处理时出错,此函数返回 NULL。使用
+Routines return NULL if no more entries are available or if an error occurs during processing\&. Routines which have
\fIint\fR
-类型返回值的函数返回 0 表示成功,\-1 表示失败。
+as the return value return 0 for success and \-1 for failure\&.
.SH "CAVEATS"
.PP
这些函数只能由超级用户使用,因为对影子密码文件的访问是受限的。
diff --git a/man/zh_CN/man5/faillog.5 b/man/zh_CN/man5/faillog.5
index 49c13f4a..ee07524d 100644
--- a/man/zh_CN/man5/faillog.5
+++ b/man/zh_CN/man5/faillog.5
@@ -2,12 +2,12 @@
.\" Title: faillog
.\" Author: Julianne Frances Haugh
.\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\" Date: 2019-06-13
+.\" Date: 2019-12-01
.\" Manual: 文件格式和转化
-.\" Source: shadow-utils 4.7
+.\" Source: shadow-utils 4.8
.\" Language: Chinese Simplified
.\"
-.TH "FAILLOG" "5" "2019-06-13" "shadow\-utils 4\&.7" "文件格式和转化"
+.TH "FAILLOG" "5" "2019-12-01" "shadow\-utils 4\&.8" "文件格式和转化"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff --git a/man/zh_CN/man5/gshadow.5 b/man/zh_CN/man5/gshadow.5
index ea7eca7b..8ccd78f4 100644
--- a/man/zh_CN/man5/gshadow.5
+++ b/man/zh_CN/man5/gshadow.5
@@ -2,12 +2,12 @@
.\" Title: gshadow
.\" Author: Nicolas Fran\(,cois <nicolas.francois@centraliens.net>
.\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\" Date: 2019-06-13
+.\" Date: 2019-12-01
.\" Manual: 文件格式和转化
-.\" Source: shadow-utils 4.7
+.\" Source: shadow-utils 4.8
.\" Language: Chinese Simplified
.\"
-.TH "GSHADOW" "5" "2019-06-13" "shadow\-utils 4\&.7" "文件格式和转化"
+.TH "GSHADOW" "5" "2019-12-01" "shadow\-utils 4\&.8" "文件格式和转化"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
@@ -32,7 +32,7 @@ gshadow \- 影子化了的组文件
.SH "描述"
.PP
/etc/gshadow
-包含影子化了的组账户信息。
+contains the shadowed information for group accounts\&.
.PP
如果没有维护好密码安全,此文件绝对不能让普通用户可读。
.PP
@@ -45,9 +45,9 @@ gshadow \- 影子化了的组文件
.PP
\fB加密了的密码\fR
.RS 4
-请参考
+Refer to
\fBcrypt\fR(3)
-来了解关于解析此字符串的细节信息。
+for details on how this string is interpreted\&.
.sp
If the password field contains some string that is not a valid result of
\fBcrypt\fR(3), for instance ! or *, users will not be able to use a unix password to access the group (but group members do not need the password)\&.
@@ -59,9 +59,8 @@ The password is used when a user who is not a member of the group wants to gain
.sp
A password field which starts with an exclamation mark means that the password is locked\&. The remaining characters on the line represent the password field before the password was locked\&.
.sp
-此密码取代
-/etc/group
-中指定的任何密码。
+This password supersedes any password specified in
+/etc/group\&.
.RE
.PP
\fB管理员\fR
diff --git a/man/zh_CN/man5/limits.5 b/man/zh_CN/man5/limits.5
index 5b55ef32..37893c88 100644
--- a/man/zh_CN/man5/limits.5
+++ b/man/zh_CN/man5/limits.5
@@ -2,12 +2,12 @@
.\" Title: limits
.\" Author: Luca Berra
.\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\" Date: 2019-06-13
+.\" Date: 2019-12-01
.\" Manual: 文件格式和转化
-.\" Source: shadow-utils 4.7
+.\" Source: shadow-utils 4.8
.\" Language: Chinese Simplified
.\"
-.TH "LIMITS" "5" "2019-06-13" "shadow\-utils 4\&.7" "文件格式和转化"
+.TH "LIMITS" "5" "2019-12-01" "shadow\-utils 4\&.8" "文件格式和转化"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
@@ -47,8 +47,9 @@ By default no quota is imposed on \*(Aqroot\*(Aq\&. In fact, there is no way to
.PP
\fI@group LIMITS_STRING\fR
.PP
+The
\fILIMITS_STRING\fR
-是一个串联的资源限制列表。每条限制由一个字母指示符和跟随的数字限制组成。
+is a string of a concatenated list of resource limits\&. Each limit consists of a letter identifier followed by a numerical limit\&.
.PP
可用的指示符有:
.sp
@@ -104,9 +105,8 @@ F: maximum file size (KB)
.sp -1
.IP \(bu 2.3
.\}
-K:文件创建掩码,由
-\fBumask\fR(2)
-设置。
+K: file creation mask, set by
+\fBumask\fR(2)\&.
.RE
.sp
.RS 4
@@ -172,9 +172,8 @@ O:最大实时优先级
.sp -1
.IP \(bu 2.3
.\}
-P:进程优先级,由
-\fBsetpriority\fR(2)
-设置。
+P: process priority, set by
+\fBsetpriority\fR(2)\&.
.RE
.sp
.RS 4
@@ -221,9 +220,10 @@ T:最大 CPU 时间 (分钟)
U:最大处理器数目
.RE
.PP
-例如,\fIL2D2048N5\fR
-就是有效的
-\fILIMITS_STRING\fR。为了阅读方便,如下项表示同样的意思:
+For example,
+\fIL2D2048N5\fR
+is a valid
+\fILIMITS_STRING\fR\&. For reading convenience, the following entries are equivalent:
.sp
.if n \{\
.RS 4
@@ -257,7 +257,7 @@ If no lines are specified for a user, the last
\fI@group\fR
line matching a group whose the user is a member of will be considered, or the last line with default limits if no groups contain the user\&.
.PP
-要完全禁用对一个用户的限制,可以仅仅只使用一个短线\(lq\-\(rq。
+To completely disable limits for a user, a single dash "\fI\-\fR" will do\&.
.PP
To disable a limit for a user, a single dash "\fI\-\fR" can be used instead of the numerical value for this limit\&.
.PP
diff --git a/man/zh_CN/man5/login.access.5 b/man/zh_CN/man5/login.access.5
index c3bf5982..0b23bc53 100644
--- a/man/zh_CN/man5/login.access.5
+++ b/man/zh_CN/man5/login.access.5
@@ -2,12 +2,12 @@
.\" Title: login.access
.\" Author: Marek Micha\(/lkiewicz
.\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\" Date: 2019-06-13
+.\" Date: 2019-12-01
.\" Manual: 文件格式和转化
-.\" Source: shadow-utils 4.7
+.\" Source: shadow-utils 4.8
.\" Language: Chinese Simplified
.\"
-.TH "LOGIN\&.ACCESS" "5" "2019-06-13" "shadow\-utils 4\&.7" "文件格式和转化"
+.TH "LOGIN\&.ACCESS" "5" "2019-12-01" "shadow\-utils 4\&.8" "文件格式和转化"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
@@ -51,8 +51,9 @@ The first field should be a "\fI+\fR" (access granted) or "\fI\-\fR" (access den
\fILOCAL\fR
(matches any string that does not contain a "\&." character)\&. If you run NIS you can use @netgroupname in host or user patterns\&.
.PP
+The
\fIEXCEPT\fR
-操作符让编写非常复杂的规则,成为可能。
+operator makes it possible to write very compact rules\&.
.PP
The group file is searched only when a name does not match that of the logged\-in user\&. Only groups are matched in which users are explicitly listed: the program does not look at a user\*(Aqs primary group id value\&.
.SH "文件"
diff --git a/man/zh_CN/man5/login.defs.5 b/man/zh_CN/man5/login.defs.5
index b5ebccb5..71816917 100644
--- a/man/zh_CN/man5/login.defs.5
+++ b/man/zh_CN/man5/login.defs.5
@@ -2,12 +2,12 @@
.\" Title: login.defs
.\" Author: Julianne Frances Haugh
.\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\" Date: 2019-06-13
+.\" Date: 2019-12-01
.\" Manual: 文件格式和转化
-.\" Source: shadow-utils 4.7
+.\" Source: shadow-utils 4.8
.\" Language: Chinese Simplified
.\"
-.TH "LOGIN\&.DEFS" "5" "2019-06-13" "shadow\-utils 4\&.7" "文件格式和转化"
+.TH "LOGIN\&.DEFS" "5" "2019-12-01" "shadow\-utils 4\&.8" "文件格式和转化"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
@@ -50,9 +50,10 @@ value\&. Numbers (both regular and long) may be either decimal values, octal val
.PP
\fBCHFN_AUTH\fR (boolean)
.RS 4
-如果为
-\fIyes\fR,\fBchfn\fR
-进行任何更改前都要要求认证,除非由超级用户运行。
+If
+\fIyes\fR, the
+\fBchfn\fR
+program will require authentication before making any changes, unless run by the superuser\&.
.RE
.PP
\fBCHFN_RESTRICT\fR (string)
@@ -81,9 +82,10 @@ SUID\&.
.PP
\fBCHSH_AUTH\fR (boolean)
.RS 4
-如果
-\fIyes\fR,\fBchsh\fR
-程序在做任何更改之前都会要求认证,除非是以超级用户身份运行的。
+If
+\fIyes\fR, the
+\fBchsh\fR
+program will require authentication before making any changes, unless run by the superuser\&.
.RE
.PP
\fBCONSOLE\fR (string)
@@ -97,8 +99,9 @@ SUID\&.
.PP
\fBCONSOLE_GROUPS\fR (string)
.RS 4
-在控制台登录时,添加到用户附加组集中的组列表(就如 CONSOLE 所确定的)。默认是无。
-使用时需要注意:这可能使用户获取这些组的永久权限,甚至登录到的不是此控制台时。
+List of groups to add to the user\*(Aqs supplementary groups set when logging in on the console (as determined by the CONSOLE setting)\&. Default is none\&.
+
+Use with caution \- it is possible for users to gain permanent access to these groups, even when not logged in on the console\&.
.RE
.PP
\fBCREATE_HOME\fR (boolean)
@@ -112,29 +115,29 @@ SUID\&.
.RS 4
如果不能 cd 到主目录时,说明是否允许登录。默认是否。
.sp
-如果设置为
-\fIyes\fR,如果不能 cd 到主目录时,用户将会登录到根目录(/)。
+If set to
+\fIyes\fR, the user will login in the root (/) directory if it is not possible to cd to her home directory\&.
.RE
.PP
\fBENCRYPT_METHOD\fR (string)
.RS 4
这定义了系统加密密码的默认算法(如果没有在命令行上指定算法)。
.sp
-可以使用如下值:\fIDES\fR
+It can take one of these values:
+\fIDES\fR
(default),
\fIMD5\fR, \fISHA256\fR, \fISHA512\fR\&.
.sp
-注意,此参数会覆盖
+Note: this parameter overrides the
\fBMD5_CRYPT_ENAB\fR
-变量。
+variable\&.
.RE
.PP
\fBENV_HZ\fR (string)
.RS 4
-如果设置了,将会用于在用户登录时定义 HZ 环境变量。值必须以
-\fIHZ=\fR
-开头。Linux 上的常用值是
-\fIHZ=100\fR。
+If set, it will be used to define the HZ environment variable when a user login\&. The value must be preceded by
+\fIHZ=\fR\&. A common value on Linux is
+\fIHZ=100\fR\&.
.RE
.PP
\fBENV_PATH\fR (string)
@@ -155,14 +158,14 @@ If set, it will be used to define the PATH environment variable when the superus
.PP
\fBENV_TZ\fR (string)
.RS 4
-如果设置了,它将用于在用户登录时定义 TZ 环境变量。此值可以是以
+If set, it will be used to define the TZ environment variable when a user login\&. The value can be the name of a timezone preceded by
\fITZ=\fR
-开头的时区名(例如
-\fITZ=CST6CDT\fR),或者是包含时区规则的文件完整路径(例如
-/etc/tzname)。
+(for example
+\fITZ=CST6CDT\fR), or the full path to the file containing the timezone specification (for example
+/etc/tzname)\&.
.sp
-如果将完整路径指定为了一个不存在或不可读的文件,则默认使用
-\fITZ=CST6CDT\fR。
+If a full path is specified but the file does not exist or cannot be read, the default is to use
+\fITZ=CST6CDT\fR\&.
.RE
.PP
\fBENVIRON_FILE\fR (string)
@@ -174,10 +177,10 @@ If set, it will be used to define the PATH environment variable when the superus
.PP
\fBERASECHAR\fR (number)
.RS 4
-终端擦除字符 (\fI010\fR
+Terminal ERASE character (\fI010\fR
= backspace,
\fI0177\fR
-= DEL)。
+= DEL)\&.
.sp
此值可以使用前缀\(lq0\(rq表示八进制,\(lq0x\(rq表示十六进制。
.RE
@@ -189,17 +192,17 @@ If set, it will be used to define the PATH environment variable when the superus
.PP
\fBFAILLOG_ENAB\fR (boolean)
.RS 4
-允许登录并显示
+Enable logging and display of
/var/log/faillog
-登录失败信息。
+login failure info\&.
.RE
.PP
\fBFAKE_SHELL\fR (string)
.RS 4
-如果设置了,\fBlogin\fR
-将执行此 shell 而不是在
-/etc/passwd
-中指定的用户 shell。
+If set,
+\fBlogin\fR
+will execute this shell instead of the users\*(Aq shell specified in
+/etc/passwd\&.
.RE
.PP
\fBFTMP_FILE\fR (string)
@@ -209,15 +212,15 @@ If set, it will be used to define the PATH environment variable when the superus
.PP
\fBGID_MAX\fR (number), \fBGID_MIN\fR (number)
.RS 4
-\fBuseradd\fR,\fBgroupadd\fR
-或
-\fBnewusers\fR
-创建的常规组的组 ID 的范围。
+Range of group IDs used for the creation of regular groups by
+\fBuseradd\fR,
+\fBgroupadd\fR, or
+\fBnewusers\fR\&.
.sp
+The default value for
\fBGID_MIN\fR
-和
-\fBGID_MAX\fR
-的默认值分别是 1000 和 60000。
+(resp\&.
+\fBGID_MAX\fR) is 1000 (resp\&. 60000)\&.
.RE
.PP
\fBHUSHLOGIN_FILE\fR (string)
@@ -232,8 +235,8 @@ If defined, this file can inhibit all the usual chatter during the login sequenc
.PP
\fBKILLCHAR\fR (number)
.RS 4
-终端 KILL 字符 (\fI025\fR
-= CTRL/U)。
+Terminal KILL character (\fI025\fR
+= CTRL/U)\&.
.sp
此值可以使用前缀\(lq0\(rq表示八进制,\(lq0x\(rq表示十六进制。
.RE
@@ -273,8 +276,8 @@ option present in the configuration means that there is no user ID limit for wri
.RS 4
此字符串用于提示输入密码。默认是 "Password: ",或者翻译了的结果(汉语中翻译为了\(lq密码:\(rq)。如果设置了此变量,提示不会被翻译。
.sp
-如果字符串包含
-\fI%s\fR,将会被用户名替换。
+If the string contains
+\fI%s\fR, this will be replaced by the user\*(Aqs name\&.
.RE
.PP
\fBLOGIN_TIMEOUT\fR (number)
@@ -299,27 +302,28 @@ option present in the configuration means that there is no user ID limit for wri
定义用户邮箱文件的位置(相对于主目录)。
.RE
.PP
+The
\fBMAIL_DIR\fR
and
\fBMAIL_FILE\fR
-变量由
-\fBuseradd\fR,\fBusermod\fR
-和
+variables are used by
+\fBuseradd\fR,
+\fBusermod\fR, and
\fBuserdel\fR
-用于创建、移动或删除用户邮箱。
+to create, move, or delete the user\*(Aqs mail spool\&.
.PP
-如果
+If
\fBMAIL_CHECK_ENAB\fR
-设置为
-\fIyes\fR,它们也被用于定义
+is set to
+\fIyes\fR, they are also used to define the
\fBMAIL\fR
-环境变量。
+environment variable\&.
.PP
\fBMAX_MEMBERS_PER_GROUP\fR (number)
.RS 4
-每个组条目的最大成员数。达到最大值时,在
+Maximum members per group entry\&. When the maximum is reached, a new group entry (line) is started in
/etc/group
-开始一个新条目(行)(使用同样的名称,同样的密码,同样的 GID)。
+(with the same name, same password, and same GID)\&.
.sp
默认值是 0,意味着组中的成员数没有限制。
.sp
@@ -332,17 +336,18 @@ and
.PP
\fBMD5_CRYPT_ENAB\fR (boolean)
.RS 4
-表示密码是否必须使用基于 MD5 的算法加密。如果设为
-\fIyes\fR,新密码将使用可以和新版 FreeBSD 兼容的基于 MD5 的算法加密。它支持无限长度的密码以及更长的盐字符串。如果您需要将加密的密码复制到其它不理解新算法的系统,设置为
-\fIno\fR。默认值是
-\fIno\fR。
+Indicate if passwords must be encrypted using the MD5\-based algorithm\&. If set to
+\fIyes\fR, new passwords will be encrypted using the MD5\-based algorithm compatible with the one used by recent releases of FreeBSD\&. It supports passwords of unlimited length and longer salt strings\&. Set to
+\fIno\fR
+if you need to copy encrypted passwords to other systems which don\*(Aqt understand the new algorithm\&. Default is
+\fIno\fR\&.
.sp
This variable is superseded by the
\fBENCRYPT_METHOD\fR
variable or by any command line option used to configure the encryption algorithm\&.
.sp
-此变量已经废弃。您应该使用
-\fBENCRYPT_METHOD\fR。
+This variable is deprecated\&. You should use
+\fBENCRYPT_METHOD\fR\&.
.RE
.PP
\fBMOTD_FILE\fR (string)
@@ -393,11 +398,12 @@ are only used at the time of account creation\&. Any changes to these settings w
.PP
\fBPASS_MAX_LEN\fR (number), \fBPASS_MIN_LEN\fR (number)
.RS 4
-crypt() 的有效字符位数。\fBPASS_MAX_LEN\fR
-默认是 8,除非您自己的 crypt() 更好,否则不要更改。如果
+Number of significant characters in the password for crypt()\&.
+\fBPASS_MAX_LEN\fR
+is 8 by default\&. Don\*(Aqt change unless your crypt() is better\&. This is ignored if
\fBMD5_CRYPT_ENAB\fR
-设为
-\fIyes\fR,会被忽略。
+set to
+\fIyes\fR\&.
.RE
.PP
\fBPORTTIME_CHECKS_ENAB\fR (boolean)
@@ -415,12 +421,12 @@ and ulimit, umask, and niceness from the user\*(Aqs passwd gecos field\&.
.PP
\fBSHA_CRYPT_MIN_ROUNDS\fR (number), \fBSHA_CRYPT_MAX_ROUNDS\fR (number)
.RS 4
+When
\fBENCRYPT_METHOD\fR
-设为
+is set to
\fISHA256\fR
-或
-\fISHA512\fR
-时,此项确定加密算法默认使用 SHA 轮转数目(当轮转数没有通过命令行指定时)。
+or
+\fISHA512\fR, this defines the number of SHA rounds used by the encryption algorithm by default (when the number of rounds is not specified on the command line)\&.
.sp
使用很多轮转,会让暴力破解更加困难。但是需要注意,认证用户时也会需要更多的 CPU 资源。
.sp
@@ -428,16 +434,16 @@ and ulimit, umask, and niceness from the user\*(Aqs passwd gecos field\&.
.sp
值必须在 1000 \- 999,999,999 之间。
.sp
-如果只设置了一个
+If only one of the
\fBSHA_CRYPT_MIN_ROUNDS\fR
-或
+or
\fBSHA_CRYPT_MAX_ROUNDS\fR
-值,就会使用这个值。
+values is set, then this value will be used\&.
.sp
-如果
+If
\fBSHA_CRYPT_MIN_ROUNDS\fR
>
-\fBSHA_CRYPT_MAX_ROUNDS\fR,将会使用大的那个。
+\fBSHA_CRYPT_MAX_ROUNDS\fR, the highest value will be used\&.
.RE
.PP
\fBSULOG_FILE\fR (string)
@@ -452,11 +458,16 @@ and ulimit, umask, and niceness from the user\*(Aqs passwd gecos field\&.
.PP
\fBSU_WHEEL_ONLY\fR (boolean)
.RS 4
-如果为
-\fIyes\fR,用户必须在
+If
+\fIyes\fR, the user must be listed as a member of the first gid 0 group in
/etc/group
-中别设定为 GID 为 0 的组(在大部分 Linux 上叫
-\fIroot\fR)的成员。
+(called
+\fIroot\fR
+on most Linux systems) to be able to
+\fBsu\fR
+to uid 0 accounts\&. If the group doesn\*(Aqt exist or is empty, no one will be able to
+\fBsu\fR
+to uid 0\&.
.RE
.PP
\fBSUB_GID_MIN\fR (number), \fBSUB_GID_MAX\fR (number), \fBSUB_GID_COUNT\fR (number)
@@ -507,44 +518,44 @@ are respectively 100000, 600100000 and 65536\&.
.PP
\fBSYS_GID_MAX\fR (number), \fBSYS_GID_MIN\fR (number)
.RS 4
-\fBuseradd\fR、\fBgroupadd\fR
-或
-\fBnewusers\fR
-创建的系统组的组 ID 的范围。
+Range of group IDs used for the creation of system groups by
+\fBuseradd\fR,
+\fBgroupadd\fR, or
+\fBnewusers\fR\&.
.sp
+The default value for
\fBSYS_GID_MIN\fR
-和
-\fBSYS_GID_MAX\fR
-的默认值分别是 101 和
-\fBGID_MIN\fR\-1。
+(resp\&.
+\fBSYS_GID_MAX\fR) is 101 (resp\&.
+\fBGID_MIN\fR\-1)\&.
.RE
.PP
\fBSYS_UID_MAX\fR (number), \fBSYS_UID_MIN\fR (number)
.RS 4
+Range of user IDs used for the creation of system users by
\fBuseradd\fR
-或
-\fBnewusers\fR
-创建的系统用户的用户 ID 的范围。
+or
+\fBnewusers\fR\&.
.sp
+The default value for
\fBSYS_UID_MIN\fR
-和
-\fBSYS_UID_MAX\fR
-的默认值分别是 101 和
-\fBUID_MIN\fR\-1。
+(resp\&.
+\fBSYS_UID_MAX\fR) is 101 (resp\&.
+\fBUID_MIN\fR\-1)\&.
.RE
.PP
\fBSYSLOG_SG_ENAB\fR (boolean)
.RS 4
-允许\(lqsyslog\(rq记录
+Enable "syslog" logging of
\fBsg\fR
-的活动。
+activity\&.
.RE
.PP
\fBSYSLOG_SU_ENAB\fR (boolean)
.RS 4
-除了 sulog 文件日志,也为
+Enable "syslog" logging of
\fBsu\fR
-活动启用\(lqsyslog\(rq日志。
+activity \- in addition to sulog file logging\&.
.RE
.PP
\fBTTYGROUP\fR (string), \fBTTYPERM\fR (string)
@@ -572,22 +583,22 @@ If defined, file which maps tty line to TERM environment parameter\&. Each line
.PP
\fBUID_MAX\fR (number), \fBUID_MIN\fR (number)
.RS 4
+Range of user IDs used for the creation of regular users by
\fBuseradd\fR
-或
-\fBnewusers\fR
-创建的普通用户的用户 ID 的范围。
+or
+\fBnewusers\fR\&.
.sp
+The default value for
\fBUID_MIN\fR
-和
-\fBUID_MAX\fR
-的默认值分别是 1000 和 60000。
+(resp\&.
+\fBUID_MAX\fR) is 1000 (resp\&. 60000)\&.
.RE
.PP
\fBULIMIT\fR (number)
.RS 4
-默认
+Default
\fBulimit\fR
-值。
+value\&.
.RE
.PP
\fBUMASK\fR (number)
@@ -595,19 +606,18 @@ If defined, file which maps tty line to TERM environment parameter\&. Each line
文件模式创建掩码初始化为此值。如果没有指定,掩码初始化为 022。
.sp
\fBuseradd\fR
-和
+and
\fBnewusers\fR
-使用此掩码设置它们创建的用户主目录的模式。
+use this mask to set the mode of the home directory they create
.sp
-也被
+It is also used by
\fBlogin\fR
-用于指定用户的初始 umask。注意,此掩码可以被用户的 GECOS 行覆盖(当设置了
+to define users\*(Aq initial umask\&. Note that this mask can be overridden by the user\*(Aqs GECOS line (if
\fBQUOTAS_ENAB\fR
-时),也可以被带
+is set) or by the specification of a limit with the
\fIK\fR
-指示符的
-\fBlimits\fR(5)
-定义的限制值覆盖。
+identifier in
+\fBlimits\fR(5)\&.
.RE
.PP
\fBUSERDEL_CMD\fR (string)
@@ -616,7 +626,7 @@ If defined, file which maps tty line to TERM environment parameter\&. Each line
.sp
这个脚本的返回值并不被带到账户中去。
.sp
-这是一个示例脚本,它移除用户的 cron、at 和 print 作业:
+Here is an example script, which removes the user\*(Aqs cron, at and print jobs:
.sp
.if n \{\
.RS 4
@@ -624,41 +634,44 @@ If defined, file which maps tty line to TERM environment parameter\&. Each line
.nf
#! /bin/sh
-# 检查需要的参数
+# Check for the required argument\&.
if [ $# != 1 ]; then
echo "Usage: $0 username"
exit 1
fi
-# 移除 cron 作业
+# Remove cron jobs\&.
crontab \-r \-u $1
-# 移除 at 作业
-# 注意这将移除所有属于同一个 UID 的作业
-# 即使此 ID 由多个用户名共享
+# Remove at jobs\&.
+# Note that it will remove any jobs owned by the same UID,
+# even if it was shared by a different username\&.
AT_SPOOL_DIR=/var/spool/cron/atjobs
find $AT_SPOOL_DIR \-name "[^\&.]*" \-type f \-user $1 \-delete \e;
-# 移除 print 作业
+# Remove print jobs\&.
lprm $1
-# 全部完成
+# All done\&.
exit 0
.fi
.if n \{\
.RE
.\}
+.sp
.RE
.PP
\fBUSERGROUPS_ENAB\fR (boolean)
.RS 4
如果 uid 和 gid 相同,用户名和主用户名也相同,使非 root 组的组掩码位和属主位相同 (如:022 \-> 002, 077 \-> 007)。
.sp
-如果设置为
-\fIyes\fR,如果组中没有成员了,\fBuserdel\fR
-将移除此用户组,\fBuseradd\fR
-创建用户时,也会创建一个同名的默认组。
+If set to
+\fIyes\fR,
+\fBuserdel\fR
+will remove the user\*(Aqs group if it contains no more members, and
+\fBuseradd\fR
+will create by default a group with the name of the user\&.
.RE
.SH "交叉引用"
.PP
diff --git a/man/zh_CN/man5/passwd.5 b/man/zh_CN/man5/passwd.5
index e638187e..8c2e1d9c 100644
--- a/man/zh_CN/man5/passwd.5
+++ b/man/zh_CN/man5/passwd.5
@@ -2,12 +2,12 @@
.\" Title: passwd
.\" Author: Julianne Frances Haugh
.\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\" Date: 2019-06-13
+.\" Date: 2019-12-01
.\" Manual: 文件格式和转化
-.\" Source: shadow-utils 4.7
+.\" Source: shadow-utils 4.8
.\" Language: Chinese Simplified
.\"
-.TH "PASSWD" "5" "2019-06-13" "shadow\-utils 4\&.7" "文件格式和转化"
+.TH "PASSWD" "5" "2019-12-01" "shadow\-utils 4\&.8" "文件格式和转化"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
@@ -32,7 +32,7 @@ passwd \- 密码文件
.SH "描述"
.PP
/etc/passwd
-为每个用户账户包含一行,包含使用冒号 (\(lq:\(rq) 分隔的七个字段,分别是:
+contains one line for each user account, with seven fields delimited by colons (\(lq:\(rq)\&. These fields are:
.sp
.RS 4
.ie n \{\
@@ -111,40 +111,55 @@ passwd \- 密码文件
可选的用户命令解释器
.RE
.PP
-加密的密码字段可以为空,此时使用指定的登录名登录时不会要求认证。然而,如果
+If the
\fIpassword\fR
-为空,一些读取
-/etc/passwd
-文件的程序可能会不允许
-\fI任何\fR
-访问。如果
-\fIpassword\fR
-字段是一个小写的
-\(lqx\(rq,那么加密的密码实际上存储于
+field is a lower\-case
+\(lqx\(rq, then the encrypted password is actually stored in the
\fBshadow\fR(5)
-中;在
+file instead; there
+\fImust\fR
+be a corresponding line in the
/etc/shadow
-文件中
-\fI必须\fR
-有对应的行,否则用户账户就会无效。如果
+file, or else the user account is invalid\&.
+.PP
+The encrypted
+\fIpassword\fR
+field may be empty, in which case no password is required to authenticate as the specified login name\&. However, some applications which read the
+/etc/passwd
+file may decide not to permit
+\fIany\fR
+access at all if the
\fIpassword\fR
-字段是其他任何字符串,将会被视为加密过的密码,如
+field is blank\&.
+.PP
+A
+\fIpassword\fR
+field which starts with an exclamation mark means that the password is locked\&. The remaining characters on the line represent the
+\fIpassword\fR
+field before the password was locked\&.
+.PP
+Refer to
\fBcrypt\fR(3)
-中的说明。
+for details on how this string is interpreted\&.
+.PP
+If the password field contains some string that is not a valid result of
+\fBcrypt\fR(3), for instance ! or *, the user will not be able to use a unix password to log in (but the user may log in the system by other means)\&.
.PP
-此注释字段被多个系统工具使用,例如
-\fBfinger\fR(1)。
+The comment field is used by various system utilities, such as
+\fBfinger\fR(1)\&.
.PP
-主目录字段提供了初始工作目录的名称。\fBlogin\fR
-程序根据此信息设置
+The home directory field provides the name of the initial working directory\&. The
+\fBlogin\fR
+program uses this information to set the value of the
\fB$HOME\fR
-环境变量。
+environmental variable\&.
.PP
-命令解释器字段提供了用户命令语言解释器的名称,或者开始时执行的程序的名称。\fBlogin\fR
-程序使用此信息设置
+The command interpreter field provides the name of the user\*(Aqs command language interpreter, or the name of the initial program to execute\&. The
+\fBlogin\fR
+program uses this information to set the value of the
\fB$SHELL\fR
-环境变量的值。如果字段为空,默认值为
-/bin/sh。
+environmental variable\&. If this field is empty, it defaults to the value
+/bin/sh\&.
.SH "文件"
.PP
/etc/passwd
diff --git a/man/zh_CN/man5/porttime.5 b/man/zh_CN/man5/porttime.5
index a58256cc..841153b1 100644
--- a/man/zh_CN/man5/porttime.5
+++ b/man/zh_CN/man5/porttime.5
@@ -2,12 +2,12 @@
.\" Title: porttime
.\" Author: Julianne Frances Haugh
.\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\" Date: 2019-06-13
+.\" Date: 2019-12-01
.\" Manual: 文件格式和转化
-.\" Source: shadow-utils 4.7
+.\" Source: shadow-utils 4.8
.\" Language: Chinese Simplified
.\"
-.TH "PORTTIME" "5" "2019-06-13" "shadow\-utils 4\&.7" "文件格式和转化"
+.TH "PORTTIME" "5" "2019-12-01" "shadow\-utils 4\&.8" "文件格式和转化"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
@@ -32,39 +32,41 @@ porttime \- 端口访问时间文件
.SH "描述"
.PP
\fIporttime\fR
-包含一个 tty 设备、用户名和允许登录时间的列表。
+contains a list of tty devices, user names, and permitted login times\&.
.PP
每项包含三个由冒号分隔的字段。第一个字段是逗号分隔的 tty 设备列表,或者星号表示匹配所有终端。第二个字段是逗号分隔的用户名列表,或者星号表示匹配所有用户名。第三个字段是逗号分隔的访问许可时间。
.PP
-每条访问时间包含一周的 0 天或多天,缩写为
+Each access time entry consists of zero or more days of the week, abbreviated
\fISu\fR,
\fIMo\fR,
\fITu\fR,
\fIWe\fR,
\fITh\fR,
-\fIFr\fR
-和
-\fISa\fR,随后是连字符分隔的一组时间,缩写
+\fIFr\fR, and
+\fISa\fR, followed by a pair of times separated by a hyphen\&. The abbreviation
\fIWk\fR
-可以用于表示周一到周五,\fIAl\fR
-可以用于表示没一天。如果没有制定周几,将会假定为
-\fIAl\fR。
+may be used to represent Monday thru Friday, and
+\fIAl\fR
+may be used to indicate every day\&. If no days are given,
+\fIAl\fR
+is assumed\&.
.SH "示例"
.PP
-下面的条目允许在工作日的上午九点到下午五点在任何端口上访问用户
-\fBjfh\fR。
+The following entry allows access to user
+\fBjfh\fR
+on every port during weekdays from 9am to 5pm\&.
.PP
*:jfh:Wk0900\-1700
.PP
-下面这条任何时间,只允许用户
+The following entries allow access only to the users
\fIroot\fR
-和
+and
\fIoper\fR
-在
+on
/dev/console
-登录。这也是说
+at any time\&. This illustrates how the
/etc/porttime
-文件是一个访问时间的有序列表。任何匹配第二条的其他用户都不会被允许访问。
+file is an ordered list of access times\&. Any other user would match the second entry which does not permit access at any time\&.
.sp
.if n \{\
.RS 4
@@ -78,8 +80,9 @@ porttime \- 端口访问时间文件
.RE
.\}
.PP
-如下项允许,在非工作时间在任何端口上使用用户
-\fIgames\fR。
+The following entry allows access for the user
+\fIgames\fR
+on any port during non\-working hours\&.
.PP
*:games:Wk1700\-0900,SaSu0000\-2400
.SH "文件"
diff --git a/man/zh_CN/man5/shadow.5 b/man/zh_CN/man5/shadow.5
index e764babb..d036d45d 100644
--- a/man/zh_CN/man5/shadow.5
+++ b/man/zh_CN/man5/shadow.5
@@ -2,12 +2,12 @@
.\" Title: shadow
.\" Author: Julianne Frances Haugh
.\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\" Date: 2019-06-13
+.\" Date: 2019-12-01
.\" Manual: 文件格式和转化
-.\" Source: shadow-utils 4.7
+.\" Source: shadow-utils 4.8
.\" Language: Chinese Simplified
.\"
-.TH "SHADOW" "5" "2019-06-13" "shadow\-utils 4\&.7" "文件格式和转化"
+.TH "SHADOW" "5" "2019-12-01" "shadow\-utils 4\&.8" "文件格式和转化"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
@@ -32,11 +32,11 @@ shadow \- 影子化了的密码文件
.SH "描述"
.PP
shadow
-是一个文件,它包含系统账户的密码信息和可选的年龄信息。
+is a file which contains the password information for the system\*(Aqs accounts and optional aging information\&.
.PP
如果没有维护好密码安全,此文件绝对不能让普通用户可读。
.PP
-此文件的每行包括 9 个字段,使用半角冒号 (\(lq:\(rq) 分隔,顺序如下:
+Each line of this file contains 9 fields, separated by colons (\(lq:\(rq), in the following order:
.PP
\fB登录名\fR
.RS 4
@@ -45,19 +45,18 @@ shadow
.PP
\fB加密了的密码\fR
.RS 4
-请参考
-\fBcrypt\fR(3)
-来了解关于解析此字符串的细节信息。
-.sp
-如果密码字段包含一些不是
-\fBcrypt\fR(3)
-合法结果的字符,比如 ! 或 *,用户将无法使用 unix 密码登录(但是可以通过其它方法登录系统)。
-.sp
-此字段可以为空,此时认证为特定的登录名时,不要求密码。然而,一些读取
+This field may be empty, in which case no passwords are required to authenticate as the specified login name\&. However, some applications which read the
/etc/shadow
-文件的应用程序,在密码字段为空时,可能决定禁止任何访问。
+file may decide not to permit any access at all if the password field is empty\&.
.sp
A password field which starts with an exclamation mark means that the password is locked\&. The remaining characters on the line represent the password field before the password was locked\&.
+.sp
+Refer to
+\fBcrypt\fR(3)
+for details on how this string is interpreted\&.
+.sp
+If the password field contains some string that is not a valid result of
+\fBcrypt\fR(3), for instance ! or *, the user will not be able to use a unix password to log in (but the user may log in the system by other means)\&.
.RE
.PP
\fB最后一次更改密码的日期\fR
diff --git a/man/zh_CN/man5/suauth.5 b/man/zh_CN/man5/suauth.5
index dd5b3425..8f522680 100644
--- a/man/zh_CN/man5/suauth.5
+++ b/man/zh_CN/man5/suauth.5
@@ -2,12 +2,12 @@
.\" Title: suauth
.\" Author: Marek Micha\(/lkiewicz
.\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\" Date: 2019-06-13
+.\" Date: 2019-12-01
.\" Manual: 文件格式和转化
-.\" Source: shadow-utils 4.7
+.\" Source: shadow-utils 4.8
.\" Language: Chinese Simplified
.\"
-.TH "SUAUTH" "5" "2019-06-13" "shadow\-utils 4\&.7" "文件格式和转化"
+.TH "SUAUTH" "5" "2019-12-01" "shadow\-utils 4\&.8" "文件格式和转化"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
@@ -34,8 +34,9 @@ suauth \- 详细的 su 控制文件
\fB/etc/suauth\fR
.SH "描述"
.PP
-执行 su 命令时,总是根据
-/etc/suauth,可以更改 su 命令的行为,规则是:
+The file
+/etc/suauth
+is referenced whenever the su command is called\&. It can change the behaviour of the su command, based upon:
.sp
.if n \{\
.RS 4
@@ -63,9 +64,10 @@ suauth \- 详细的 su 控制文件
.RE
.\}
.PP
-此处的 to\-id 可以是:\fIALL\fR,逗号(,) 分隔的用户名列表或者
+Where to\-id is either the word
+\fIALL\fR, a list of usernames delimited by "," or the words
\fIALL EXCEPT\fR
-后跟逗号分隔的用户名列表。
+followed by a list of usernames delimited by ","\&.
.PP
from\-id is formatted the same as to\-id except the extra word
\fIGROUP\fR
@@ -101,19 +103,22 @@ su 尝试自动成功,而且不询问密码。
.RS 4
.\}
.nf
- # 示例 /etc/suauth 文件
+ # sample /etc/suauth file
#
- # 有两个用户可以使用自己的密码 su 成 root
+ # A couple of privileged usernames may
+ # su to root with their own password\&.
#
root:chris,birddog:OWNPASS
#
- # 任何其他人都不能 su 成 root,除非在 wheel 组中。
- # BSD 就是这样实现这个功能的。
+ # Anyone else may not su to root unless in
+ # group wheel\&. This is how BSD does things\&.
#
root:ALL EXCEPT GROUP wheel:DENY
#
- # 或许 terry 和 birddog 是属于同一个人的账户
- # 两个账户直接互相 su,不需要密码
+ # Perhaps terry and birddog are accounts
+ # owned by the same person\&.
+ # Access can be arranged between them
+ # with no password\&.
#
terry:birddog:NOPASS
birddog:terry:NOPASS
@@ -133,9 +138,9 @@ su 尝试自动成功,而且不询问密码。
可能会有很多潜在问题。文件解析器尤其不能容忍语法错误,不能有无意义的空白符(除了行首和行尾),并且使用特定的标记分割不同的事情。
.SH "DIAGNOSTICS"
.PP
-此文件的解析错误会使用
+An error parsing the file is reported using
\fBsyslogd\fR(8)
-作为 AUTH 中的 ERR 级别报告。
+as level ERR on facility AUTH\&.
.SH "参见"
.PP
\fBsu\fR(1)\&.
diff --git a/man/zh_CN/man8/chgpasswd.8 b/man/zh_CN/man8/chgpasswd.8
index 0b6e03cb..49841d85 100644
--- a/man/zh_CN/man8/chgpasswd.8
+++ b/man/zh_CN/man8/chgpasswd.8
@@ -2,12 +2,12 @@
.\" Title: chgpasswd
.\" Author: Thomas K\(/loczko <kloczek@pld.org.pl>
.\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\" Date: 2019-06-13
+.\" Date: 2019-12-01
.\" Manual: 系统管理命令
-.\" Source: shadow-utils 4.7
+.\" Source: shadow-utils 4.8
.\" Language: Chinese Simplified
.\"
-.TH "CHGPASSWD" "8" "2019-06-13" "shadow\-utils 4\&.7" "系统管理命令"
+.TH "CHGPASSWD" "8" "2019-12-01" "shadow\-utils 4\&.8" "系统管理命令"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
@@ -34,14 +34,14 @@ chgpasswd \- 批量更新组密码
\fBchgpasswd\fR [\fI选项\fR]
.SH "描述"
.PP
+The
\fBchgpasswd\fR
-命令从标准输入读取一系列组名和密码对,并使用此信息更新这些存在的组。每行的格式如下:
+command reads a list of group name and password pairs from standard input and uses this information to update a set of existing groups\&. Each line is of the format:
.PP
\fIgroup_name\fR:\fIpassword\fR
.PP
-默认上,提供的密码必须是明码文本,然后由
-\fBchgpasswd\fR
-加密。
+By default the supplied password must be in clear\-text, and is encrypted by
+\fBchgpasswd\fR\&.
.PP
The default encryption algorithm can be defined for the system with the
\fBENCRYPT_METHOD\fR
@@ -55,8 +55,9 @@ options\&.
此命令一般用于需要一次创建很多用户的大型系统。
.SH "选项"
.PP
+The options which apply to the
\fBchgpasswd\fR
-可以接受的选项有:
+command are:
.PP
\fB\-c\fR, \fB\-\-crypt\-method\fR
.RS 4
@@ -99,9 +100,8 @@ directory\&.
.sp
您只可以对 SHA256 或 SHA512 使用此选项。
.sp
-默认,轮转数由
-/etc/login\&.defs
-文件中的 SHA_CRYPT_MIN_ROUNDS 和 SHA_CRYPT_MAX_ROUNDS 变量确定。
+By default, the number of rounds is defined by the SHA_CRYPT_MIN_ROUNDS and SHA_CRYPT_MAX_ROUNDS variables in
+/etc/login\&.defs\&.
.RE
.SH "CAVEATS"
.PP
@@ -110,28 +110,29 @@ directory\&.
您需要确保你吗和加密方法符合系统的密码策略。
.SH "配置文件"
.PP
-在
+The following configuration variables in
/etc/login\&.defs
-中有如下配置变量,可以用来更改此工具的行为:
+change the behavior of this tool:
.PP
\fBENCRYPT_METHOD\fR (string)
.RS 4
这定义了系统加密密码的默认算法(如果没有在命令行上指定算法)。
.sp
-可以使用如下值:\fIDES\fR
+It can take one of these values:
+\fIDES\fR
(default),
\fIMD5\fR, \fISHA256\fR, \fISHA512\fR\&.
.sp
-注意,此参数会覆盖
+Note: this parameter overrides the
\fBMD5_CRYPT_ENAB\fR
-变量。
+variable\&.
.RE
.PP
\fBMAX_MEMBERS_PER_GROUP\fR (number)
.RS 4
-每个组条目的最大成员数。达到最大值时,在
+Maximum members per group entry\&. When the maximum is reached, a new group entry (line) is started in
/etc/group
-开始一个新条目(行)(使用同样的名称,同样的密码,同样的 GID)。
+(with the same name, same password, and same GID)\&.
.sp
默认值是 0,意味着组中的成员数没有限制。
.sp
@@ -144,27 +145,28 @@ directory\&.
.PP
\fBMD5_CRYPT_ENAB\fR (boolean)
.RS 4
-表示密码是否必须使用基于 MD5 的算法加密。如果设为
-\fIyes\fR,新密码将使用可以和新版 FreeBSD 兼容的基于 MD5 的算法加密。它支持无限长度的密码以及更长的盐字符串。如果您需要将加密的密码复制到其它不理解新算法的系统,设置为
-\fIno\fR。默认值是
-\fIno\fR。
+Indicate if passwords must be encrypted using the MD5\-based algorithm\&. If set to
+\fIyes\fR, new passwords will be encrypted using the MD5\-based algorithm compatible with the one used by recent releases of FreeBSD\&. It supports passwords of unlimited length and longer salt strings\&. Set to
+\fIno\fR
+if you need to copy encrypted passwords to other systems which don\*(Aqt understand the new algorithm\&. Default is
+\fIno\fR\&.
.sp
This variable is superseded by the
\fBENCRYPT_METHOD\fR
variable or by any command line option used to configure the encryption algorithm\&.
.sp
-此变量已经废弃。您应该使用
-\fBENCRYPT_METHOD\fR。
+This variable is deprecated\&. You should use
+\fBENCRYPT_METHOD\fR\&.
.RE
.PP
\fBSHA_CRYPT_MIN_ROUNDS\fR (number), \fBSHA_CRYPT_MAX_ROUNDS\fR (number)
.RS 4
+When
\fBENCRYPT_METHOD\fR
-设为
+is set to
\fISHA256\fR
-或
-\fISHA512\fR
-时,此项确定加密算法默认使用 SHA 轮转数目(当轮转数没有通过命令行指定时)。
+or
+\fISHA512\fR, this defines the number of SHA rounds used by the encryption algorithm by default (when the number of rounds is not specified on the command line)\&.
.sp
使用很多轮转,会让暴力破解更加困难。但是需要注意,认证用户时也会需要更多的 CPU 资源。
.sp
@@ -172,16 +174,16 @@ variable or by any command line option used to configure the encryption algorith
.sp
值必须在 1000 \- 999,999,999 之间。
.sp
-如果只设置了一个
+If only one of the
\fBSHA_CRYPT_MIN_ROUNDS\fR
-或
+or
\fBSHA_CRYPT_MAX_ROUNDS\fR
-值,就会使用这个值。
+values is set, then this value will be used\&.
.sp
-如果
+If
\fBSHA_CRYPT_MIN_ROUNDS\fR
>
-\fBSHA_CRYPT_MAX_ROUNDS\fR,将会使用大的那个。
+\fBSHA_CRYPT_MAX_ROUNDS\fR, the highest value will be used\&.
.RE
.SH "文件"
.PP
diff --git a/man/zh_CN/man8/chpasswd.8 b/man/zh_CN/man8/chpasswd.8
index 6f7aadc2..54ac59ce 100644
--- a/man/zh_CN/man8/chpasswd.8
+++ b/man/zh_CN/man8/chpasswd.8
@@ -2,12 +2,12 @@
.\" Title: chpasswd
.\" Author: Julianne Frances Haugh
.\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\" Date: 2019-06-13
+.\" Date: 2019-12-01
.\" Manual: 系统管理命令
-.\" Source: shadow-utils 4.7
+.\" Source: shadow-utils 4.8
.\" Language: Chinese Simplified
.\"
-.TH "CHPASSWD" "8" "2019-06-13" "shadow\-utils 4\&.7" "系统管理命令"
+.TH "CHPASSWD" "8" "2019-12-01" "shadow\-utils 4\&.8" "系统管理命令"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
@@ -40,9 +40,8 @@ command reads a list of user name and password pairs from standard input and use
.PP
\fIuser_name\fR:\fIpassword\fR
.PP
-默认必须明文提供密码,然后由
-\fBchpasswd\fR
-加密。如果存在密码年龄信息,也会更新之。
+By default the passwords must be supplied in clear\-text, and are encrypted by
+\fBchpasswd\fR\&. Also the password age will be updated, if present\&.
.PP
The default encryption algorithm can be defined for the system with the
\fBENCRYPT_METHOD\fR
@@ -61,8 +60,9 @@ first updates all the passwords in memory, and then commits all the changes to d
此命令一般用于需要一次创建很多用户的大型系统。
.SH "选项"
.PP
+The options which apply to the
\fBchpasswd\fR
-可以接受的选项有:
+command are:
.PP
\fB\-c\fR, \fB\-\-crypt\-method\fR\ \&\fIMETHOD\fR
.RS 4
@@ -128,46 +128,48 @@ variables in
记住要设置权限或者掩码来阻止其它用户对未加密文件的读取。
.SH "配置文件"
.PP
-在
+The following configuration variables in
/etc/login\&.defs
-中有如下配置变量,可以用来更改此工具的行为:
+change the behavior of this tool:
.PP
\fBENCRYPT_METHOD\fR (string)
.RS 4
这定义了系统加密密码的默认算法(如果没有在命令行上指定算法)。
.sp
-可以使用如下值:\fIDES\fR
+It can take one of these values:
+\fIDES\fR
(default),
\fIMD5\fR, \fISHA256\fR, \fISHA512\fR\&.
.sp
-注意,此参数会覆盖
+Note: this parameter overrides the
\fBMD5_CRYPT_ENAB\fR
-变量。
+variable\&.
.RE
.PP
\fBMD5_CRYPT_ENAB\fR (boolean)
.RS 4
-表示密码是否必须使用基于 MD5 的算法加密。如果设为
-\fIyes\fR,新密码将使用可以和新版 FreeBSD 兼容的基于 MD5 的算法加密。它支持无限长度的密码以及更长的盐字符串。如果您需要将加密的密码复制到其它不理解新算法的系统,设置为
-\fIno\fR。默认值是
-\fIno\fR。
+Indicate if passwords must be encrypted using the MD5\-based algorithm\&. If set to
+\fIyes\fR, new passwords will be encrypted using the MD5\-based algorithm compatible with the one used by recent releases of FreeBSD\&. It supports passwords of unlimited length and longer salt strings\&. Set to
+\fIno\fR
+if you need to copy encrypted passwords to other systems which don\*(Aqt understand the new algorithm\&. Default is
+\fIno\fR\&.
.sp
This variable is superseded by the
\fBENCRYPT_METHOD\fR
variable or by any command line option used to configure the encryption algorithm\&.
.sp
-此变量已经废弃。您应该使用
-\fBENCRYPT_METHOD\fR。
+This variable is deprecated\&. You should use
+\fBENCRYPT_METHOD\fR\&.
.RE
.PP
\fBSHA_CRYPT_MIN_ROUNDS\fR (number), \fBSHA_CRYPT_MAX_ROUNDS\fR (number)
.RS 4
+When
\fBENCRYPT_METHOD\fR
-设为
+is set to
\fISHA256\fR
-或
-\fISHA512\fR
-时,此项确定加密算法默认使用 SHA 轮转数目(当轮转数没有通过命令行指定时)。
+or
+\fISHA512\fR, this defines the number of SHA rounds used by the encryption algorithm by default (when the number of rounds is not specified on the command line)\&.
.sp
使用很多轮转,会让暴力破解更加困难。但是需要注意,认证用户时也会需要更多的 CPU 资源。
.sp
@@ -175,16 +177,16 @@ variable or by any command line option used to configure the encryption algorith
.sp
值必须在 1000 \- 999,999,999 之间。
.sp
-如果只设置了一个
+If only one of the
\fBSHA_CRYPT_MIN_ROUNDS\fR
-或
+or
\fBSHA_CRYPT_MAX_ROUNDS\fR
-值,就会使用这个值。
+values is set, then this value will be used\&.
.sp
-如果
+If
\fBSHA_CRYPT_MIN_ROUNDS\fR
>
-\fBSHA_CRYPT_MAX_ROUNDS\fR,将会使用大的那个。
+\fBSHA_CRYPT_MAX_ROUNDS\fR, the highest value will be used\&.
.RE
.SH "文件"
.PP
@@ -206,4 +208,5 @@ Shadow 密码套件配置。
.PP
\fBpasswd\fR(1),
\fBnewusers\fR(8),
-\fBlogin.defs\fR(5),\fBuseradd\fR(8)\&.
+\fBlogin.defs\fR(5),
+\fBuseradd\fR(8)\&.
diff --git a/man/zh_CN/man8/faillog.8 b/man/zh_CN/man8/faillog.8
index 5cd8bdff..4b9fa4d5 100644
--- a/man/zh_CN/man8/faillog.8
+++ b/man/zh_CN/man8/faillog.8
@@ -2,12 +2,12 @@
.\" Title: faillog
.\" Author: Julianne Frances Haugh
.\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\" Date: 2019-06-13
+.\" Date: 2019-12-01
.\" Manual: 系统管理命令
-.\" Source: shadow-utils 4.7
+.\" Source: shadow-utils 4.8
.\" Language: Chinese Simplified
.\"
-.TH "FAILLOG" "8" "2019-06-13" "shadow\-utils 4\&.7" "系统管理命令"
+.TH "FAILLOG" "8" "2019-12-01" "shadow\-utils 4\&.8" "系统管理命令"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
@@ -40,8 +40,9 @@ displays the contents of the failure log database (/var/log/faillog)\&. It can a
is run without arguments, it only displays the faillog records of the users who had a login failure\&.
.SH "选项"
.PP
+The options which apply to the
\fBfaillog\fR
-可以接受的选项有:
+command are:
.PP
\fB\-a\fR, \fB\-\-all\fR
.RS 4
@@ -49,9 +50,9 @@ Display (or act on) faillog records for all users having an entry in the
faillog
database\&.
.sp
-用户的范围可以使用
+The range of users can be restricted with the
\fB\-u\fR
-选项限制。
+option\&.
.sp
In display mode, this is still restricted to existing users but forces the display of the faillog entries even if they are empty\&.
.sp
@@ -70,13 +71,13 @@ options, the users\*(Aq records are changed, even if the user does not exist on
.PP
\fB\-l\fR, \fB\-\-lock\-secs\fR\ \&\fISEC\fR
.RS 4
-登录失败后锁定账户
+Lock account for
\fISEC\fR
-秒。
+seconds after failed login\&.
.sp
-此选项要求对
+Write access to
/var/log/faillog
-有写入权限。
+is required for this option\&.
.RE
.PP
\fB\-m\fR, \fB\-\-maximum\fR\ \&\fIMAX\fR
@@ -92,18 +93,18 @@ The maximum failure count should always be 0 for
\fIroot\fR
to prevent a denial of services attack against the system\&.
.sp
-此选项要求对
+Write access to
/var/log/faillog
-有写入权限。
+is required for this option\&.
.RE
.PP
\fB\-r\fR, \fB\-\-reset\fR
.RS 4
重置登录失败计数。
.sp
-此选项要求对
+Write access to
/var/log/faillog
-有写入权限。
+is required for this option\&.
.RE
.PP
\fB\-R\fR, \fB\-\-root\fR\ \&\fICHROOT_DIR\fR
@@ -117,9 +118,8 @@ directory\&.
.PP
\fB\-t\fR, \fB\-\-time\fR\ \&\fIDAYS\fR
.RS 4
-显示新于
-\fIDAYS\fR
-的登录失败记录。
+Display faillog records more recent than
+\fIDAYS\fR\&.
.RE
.PP
\fB\-u\fR, \fB\-\-user\fR\ \&\fILOGIN\fR|\fIRANGE\fR
diff --git a/man/zh_CN/man8/groupadd.8 b/man/zh_CN/man8/groupadd.8
index e8c932f4..29aab862 100644
--- a/man/zh_CN/man8/groupadd.8
+++ b/man/zh_CN/man8/groupadd.8
@@ -2,12 +2,12 @@
.\" Title: groupadd
.\" Author: Julianne Frances Haugh
.\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\" Date: 2019-06-13
+.\" Date: 2019-12-01
.\" Manual: 系统管理命令
-.\" Source: shadow-utils 4.7
+.\" Source: shadow-utils 4.8
.\" Language: Chinese Simplified
.\"
-.TH "GROUPADD" "8" "2019-06-13" "shadow\-utils 4\&.7" "系统管理命令"
+.TH "GROUPADD" "8" "2019-12-01" "shadow\-utils 4\&.8" "系统管理命令"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
@@ -39,8 +39,9 @@ The
command creates a new group account using the values specified on the command line plus the default values from the system\&. The new group will be entered into the system files as needed\&.
.SH "选项"
.PP
+The options which apply to the
\fBgroupadd\fR
-命令可以接受的选项有:
+command are:
.PP
\fB\-f\fR, \fB\-\-force\fR
.RS 4
@@ -78,10 +79,13 @@ defaults (GID_MIN, GID_MAX and others)\&. Multiple
\fB\-K\fR
options can be specified\&.
.sp
-示例:\fB\-K\fR\ \&\fIGID_MIN\fR=\fI100\fR\ \&\fB\-K\fR\ \&\fIGID_MAX\fR=\fI499\fR
+Example:
+\fB\-K\fR\ \&\fIGID_MIN\fR=\fI100\fR\ \&
+\fB\-K\fR\ \&\fIGID_MAX\fR=\fI499\fR
.sp
-注意:\fB\-K\fR\ \&\fIGID_MIN\fR=\fI10\fR,\fIGID_MAX\fR=\fI499\fR
-尚不能工作。
+Note:
+\fB\-K\fR\ \&\fIGID_MIN\fR=\fI10\fR,\fIGID_MAX\fR=\fI499\fR
+doesn\*(Aqt work yet\&.
.RE
.PP
\fB\-o\fR, \fB\-\-non\-unique\fR
@@ -91,11 +95,11 @@ options can be specified\&.
.PP
\fB\-p\fR, \fB\-\-password\fR\ \&\fIPASSWORD\fR
.RS 4
-加密了的密码,就像
-\fBcrypt\fR(3)
-的返回值。默认为禁用密码。
+The encrypted password, as returned by
+\fBcrypt\fR(3)\&. The default is to disable the password\&.
.sp
-\fB注意:\fR不推荐使用这个选项,因为密码(或加密过的密码)会被用户通过列出这个过程而看到。
+\fBNote:\fR
+This option is not recommended because the password (or encrypted password) will be visible by users listing the processes\&.
.sp
您应该确保密码符合系统的密码政策。
.RE
@@ -130,28 +134,28 @@ directory\&. This option does not chroot and is intended for preparing a cross\-
.RE
.SH "配置文件"
.PP
-在
+The following configuration variables in
/etc/login\&.defs
-中有如下配置变量,可以用来更改此工具的行为:
+change the behavior of this tool:
.PP
\fBGID_MAX\fR (number), \fBGID_MIN\fR (number)
.RS 4
-\fBuseradd\fR,\fBgroupadd\fR
-或
-\fBnewusers\fR
-创建的常规组的组 ID 的范围。
+Range of group IDs used for the creation of regular groups by
+\fBuseradd\fR,
+\fBgroupadd\fR, or
+\fBnewusers\fR\&.
.sp
+The default value for
\fBGID_MIN\fR
-和
-\fBGID_MAX\fR
-的默认值分别是 1000 和 60000。
+(resp\&.
+\fBGID_MAX\fR) is 1000 (resp\&. 60000)\&.
.RE
.PP
\fBMAX_MEMBERS_PER_GROUP\fR (number)
.RS 4
-每个组条目的最大成员数。达到最大值时,在
+Maximum members per group entry\&. When the maximum is reached, a new group entry (line) is started in
/etc/group
-开始一个新条目(行)(使用同样的名称,同样的密码,同样的 GID)。
+(with the same name, same password, and same GID)\&.
.sp
默认值是 0,意味着组中的成员数没有限制。
.sp
@@ -164,16 +168,16 @@ directory\&. This option does not chroot and is intended for preparing a cross\-
.PP
\fBSYS_GID_MAX\fR (number), \fBSYS_GID_MIN\fR (number)
.RS 4
-\fBuseradd\fR、\fBgroupadd\fR
-或
-\fBnewusers\fR
-创建的系统组的组 ID 的范围。
+Range of group IDs used for the creation of system groups by
+\fBuseradd\fR,
+\fBgroupadd\fR, or
+\fBnewusers\fR\&.
.sp
+The default value for
\fBSYS_GID_MIN\fR
-和
-\fBSYS_GID_MAX\fR
-的默认值分别是 101 和
-\fBGID_MIN\fR\-1。
+(resp\&.
+\fBSYS_GID_MAX\fR) is 101 (resp\&.
+\fBGID_MIN\fR\-1)\&.
.RE
.SH "文件"
.PP
@@ -195,7 +199,7 @@ Shadow 密码套件配置。
.PP
组名必须以小写字母或者下划线开头,跟随小写字母、下划线或短横线。可以由美元符号结束。用正则表达式就是:[a\-z_][a\-z0\-9_\-]*[$]?
.PP
-组名最长为 16 个字符。
+Groupnames may only be up to 16 characters long\&.
.PP
You may not add a NIS or LDAP group\&. This must be performed on the corresponding server\&.
.PP
@@ -204,38 +208,40 @@ If the groupname already exists in an external group database such as NIS or LDA
will deny the group creation request\&.
.SH "退出值"
.PP
+The
\fBgroupadd\fR
-可能以如下值退出:
+command exits with the following values:
.PP
\fI0\fR
.RS 4
-成功
+success
.RE
.PP
\fI2\fR
.RS 4
-无效的命令语法
+invalid command syntax
.RE
.PP
\fI3\fR
.RS 4
-给了选项一个无效的参数
+invalid argument to option
.RE
.PP
\fI4\fR
.RS 4
-GID 不唯一 (没有使用
-\fB\-o\fR)
+GID not unique (when
+\fB\-o\fR
+not used)
.RE
.PP
\fI9\fR
.RS 4
-组名不唯一
+group name not unique
.RE
.PP
\fI10\fR
.RS 4
-无法更新组文件
+can\*(Aqt update group file
.RE
.SH "参见"
.PP
diff --git a/man/zh_CN/man8/groupdel.8 b/man/zh_CN/man8/groupdel.8
index d3d8aa4d..73a0cf93 100644
--- a/man/zh_CN/man8/groupdel.8
+++ b/man/zh_CN/man8/groupdel.8
@@ -2,12 +2,12 @@
.\" Title: groupdel
.\" Author: Julianne Frances Haugh
.\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\" Date: 2019-06-13
+.\" Date: 2019-12-01
.\" Manual: 系统管理命令
-.\" Source: shadow-utils 4.7
+.\" Source: shadow-utils 4.8
.\" Language: Chinese Simplified
.\"
-.TH "GROUPDEL" "8" "2019-06-13" "shadow\-utils 4\&.7" "系统管理命令"
+.TH "GROUPDEL" "8" "2019-12-01" "shadow\-utils 4\&.8" "系统管理命令"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
@@ -34,14 +34,15 @@ groupdel \- 删除一个组
\fBgroupdel\fR [\fI选项\fR] \fIGROUP\fR
.SH "描述"
.PP
-\fBuserdel\fR
-修改系统账户文件,删除与
-\fIGROUP\fR
-相关的所有项目。给出的组名必须存在。
+The
+\fBgroupdel\fR
+command modifies the system account files, deleting all entries that refer to
+\fIGROUP\fR\&. The named group must exist\&.
.SH "选项"
.PP
+The options which apply to the
\fBgroupdel\fR
-命令可以接受的选项有:
+command are:
.PP
\fB\-h\fR, \fB\-\-help\fR
.RS 4
@@ -72,15 +73,15 @@ directory\&. This option does not chroot and is intended for preparing a cross\-
您需要手动检查所有文件系统,以确保没有遗留的属于此组的文件。
.SH "配置文件"
.PP
-在
+The following configuration variables in
/etc/login\&.defs
-中有如下配置变量,可以用来更改此工具的行为:
+change the behavior of this tool:
.PP
\fBMAX_MEMBERS_PER_GROUP\fR (number)
.RS 4
-每个组条目的最大成员数。达到最大值时,在
+Maximum members per group entry\&. When the maximum is reached, a new group entry (line) is started in
/etc/group
-开始一个新条目(行)(使用同样的名称,同样的密码,同样的 GID)。
+(with the same name, same password, and same GID)\&.
.sp
默认值是 0,意味着组中的成员数没有限制。
.sp
@@ -103,32 +104,33 @@ directory\&. This option does not chroot and is intended for preparing a cross\-
.RE
.SH "退出值"
.PP
+The
\fBgroupdel\fR
-命令以如下值退出:
+command exits with the following values:
.PP
\fI0\fR
.RS 4
-成功
+success
.RE
.PP
\fI2\fR
.RS 4
-无效的命令语法
+invalid command syntax
.RE
.PP
\fI6\fR
.RS 4
-指定的组不存在
+specified group doesn\*(Aqt exist
.RE
.PP
\fI8\fR
.RS 4
-不能移除用户的主组
+can\*(Aqt remove user\*(Aqs primary group
.RE
.PP
\fI10\fR
.RS 4
-无法更新组文件
+can\*(Aqt update group file
.RE
.SH "参见"
.PP
diff --git a/man/zh_CN/man8/groupmems.8 b/man/zh_CN/man8/groupmems.8
index 0321a283..272431f6 100644
--- a/man/zh_CN/man8/groupmems.8
+++ b/man/zh_CN/man8/groupmems.8
@@ -2,12 +2,12 @@
.\" Title: groupmems
.\" Author: George Kraft, IV
.\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\" Date: 2019-06-13
+.\" Date: 2019-12-01
.\" Manual: 系统管理命令
-.\" Source: shadow-utils 4.7
+.\" Source: shadow-utils 4.8
.\" Language: Chinese Simplified
.\"
-.TH "GROUPMEMS" "8" "2019-06-13" "shadow\-utils 4\&.7" "系统管理命令"
+.TH "GROUPMEMS" "8" "2019-12-01" "shadow\-utils 4\&.8" "系统管理命令"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
@@ -45,8 +45,9 @@ Only the superuser, as administrator, can use
to alter the memberships of other groups\&.
.SH "选项"
.PP
+The options which apply to the
\fBgroupmems\fR
-命令可以接受的选项有:
+command are:
.PP
\fB\-a\fR, \fB\-\-add\fR\ \&\fIuser_name\fR
.RS 4
@@ -63,9 +64,9 @@ file, a new entry will be created\&.
.RS 4
从组成员列表中删除用户。
.sp
-如果
+If the
/etc/gshadow
-文件存在,用户将会被从组成员和管理员中移除。
+file exist, the user will be removed from the list of members and administrators of the group\&.
.sp
If the
/etc/gshadow
@@ -138,15 +139,15 @@ utility to manage their own group membership list\&.
.\}
.SH "配置文件"
.PP
-在
+The following configuration variables in
/etc/login\&.defs
-中有如下配置变量,可以用来更改此工具的行为:
+change the behavior of this tool:
.PP
\fBMAX_MEMBERS_PER_GROUP\fR (number)
.RS 4
-每个组条目的最大成员数。达到最大值时,在
+Maximum members per group entry\&. When the maximum is reached, a new group entry (line) is started in
/etc/group
-开始一个新条目(行)(使用同样的名称,同样的密码,同样的 GID)。
+(with the same name, same password, and same GID)\&.
.sp
默认值是 0,意味着组中的成员数没有限制。
.sp
diff --git a/man/zh_CN/man8/groupmod.8 b/man/zh_CN/man8/groupmod.8
index dd6c8b0e..1e9891e5 100644
--- a/man/zh_CN/man8/groupmod.8
+++ b/man/zh_CN/man8/groupmod.8
@@ -2,12 +2,12 @@
.\" Title: groupmod
.\" Author: Julianne Frances Haugh
.\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\" Date: 2019-06-13
+.\" Date: 2019-12-01
.\" Manual: 系统管理命令
-.\" Source: shadow-utils 4.7
+.\" Source: shadow-utils 4.8
.\" Language: Chinese Simplified
.\"
-.TH "GROUPMOD" "8" "2019-06-13" "shadow\-utils 4\&.7" "系统管理命令"
+.TH "GROUPMOD" "8" "2019-12-01" "shadow\-utils 4\&.8" "系统管理命令"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
@@ -41,8 +41,9 @@ command modifies the definition of the specified
by modifying the appropriate entry in the group database\&.
.SH "选项"
.PP
+The options which apply to the
\fBgroupmod\fR
-命令可以接受的选项有:
+command are:
.PP
\fB\-g\fR, \fB\-\-gid\fR\ \&\fIGID\fR
.RS 4
@@ -96,11 +97,11 @@ to a non\-unique value\&.
.PP
\fB\-p\fR, \fB\-\-password\fR\ \&\fIPASSWORD\fR
.RS 4
-已经加密过的密码,就像
-\fBcrypt\fR(3)
-返回的那样。
+The encrypted password, as returned by
+\fBcrypt\fR(3)\&.
.sp
-\fB注意:\fR不推荐使用这个选项,因为密码(或加密过的密码)会被用户通过列出这个过程而看到。
+\fBNote:\fR
+This option is not recommended because the password (or encrypted password) will be visible by users listing the processes\&.
.sp
您应该确保密码符合系统的密码政策。
.RE
@@ -124,15 +125,15 @@ directory\&. This option does not chroot and is intended for preparing a cross\-
.RE
.SH "配置文件"
.PP
-在
+The following configuration variables in
/etc/login\&.defs
-中有如下配置变量,可以用来更改此工具的行为:
+change the behavior of this tool:
.PP
\fBMAX_MEMBERS_PER_GROUP\fR (number)
.RS 4
-每个组条目的最大成员数。达到最大值时,在
+Maximum members per group entry\&. When the maximum is reached, a new group entry (line) is started in
/etc/group
-开始一个新条目(行)(使用同样的名称,同样的密码,同样的 GID)。
+(with the same name, same password, and same GID)\&.
.sp
默认值是 0,意味着组中的成员数没有限制。
.sp
@@ -165,8 +166,9 @@ Shadow 密码套件配置。
.RE
.SH "退出值"
.PP
+The
\fBgroupmod\fR
-命令可以返回如下值:
+command exits with the following values:
.PP
\fI0\fR
.RS 4
diff --git a/man/zh_CN/man8/grpck.8 b/man/zh_CN/man8/grpck.8
index e77eabb1..2a5e9ef1 100644
--- a/man/zh_CN/man8/grpck.8
+++ b/man/zh_CN/man8/grpck.8
@@ -2,12 +2,12 @@
.\" Title: grpck
.\" Author: Julianne Frances Haugh
.\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\" Date: 2019-06-13
+.\" Date: 2019-12-01
.\" Manual: 系统管理命令
-.\" Source: shadow-utils 4.7
+.\" Source: shadow-utils 4.8
.\" Language: Chinese Simplified
.\"
-.TH "GRPCK" "8" "2019-06-13" "shadow\-utils 4\&.7" "系统管理命令"
+.TH "GRPCK" "8" "2019-12-01" "shadow\-utils 4\&.8" "系统管理命令"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
@@ -73,8 +73,8 @@ have the proper format and contain valid data\&. The user is prompted to delete
.sp -1
.IP \(bu 2.3
.\}
-有效的组标识符
-(仅 /etc/group)
+a valid group identifier
+(/etc/group only)
.RE
.sp
.RS 4
@@ -85,9 +85,8 @@ have the proper format and contain valid data\&. The user is prompted to delete
.sp -1
.IP \(bu 2.3
.\}
-有效的成员和
-管理员
-列表。
+a valid list of members
+and administrators
.RE
.sp
.RS 4
@@ -119,13 +118,15 @@ are not able to alter corrupted or duplicated entries\&.
should be used in those circumstances to remove the offending entries\&.
.SH "选项"
.PP
+The
\fB\-r\fR
-和
+and
\fB\-s\fR
-选项不能联合使用。
+options cannot be combined\&.
.PP
+The options which apply to the
\fBgrpck\fR
-可以接受的选项有:
+command are:
.PP
\fB\-h\fR, \fB\-\-help\fR
.RS 4
@@ -152,9 +153,10 @@ directory\&.
.PP
\fB\-s\fR, \fB\-\-sort\fR
.RS 4
-根据 GID 在
-/etc/group和 /etc/gshadow
-中进行排序。
+Sort entries in
+/etc/group
+and /etc/gshadow
+by GID\&.
.RE
.PP
By default,
@@ -166,15 +168,15 @@ and /etc/gshadow\&. The user may select alternate files with the
and \fIshadow\fR parameters\&.
.SH "配置文件"
.PP
-在
+The following configuration variables in
/etc/login\&.defs
-中有如下配置变量,可以用来更改此工具的行为:
+change the behavior of this tool:
.PP
\fBMAX_MEMBERS_PER_GROUP\fR (number)
.RS 4
-每个组条目的最大成员数。达到最大值时,在
+Maximum members per group entry\&. When the maximum is reached, a new group entry (line) is started in
/etc/group
-开始一个新条目(行)(使用同样的名称,同样的密码,同样的 GID)。
+(with the same name, same password, and same GID)\&.
.sp
默认值是 0,意味着组中的成员数没有限制。
.sp
@@ -202,42 +204,44 @@ and \fIshadow\fR parameters\&.
.RE
.SH "退出值"
.PP
+The
\fBgrpck\fR
-可以返回如下值:
+command exits with the following values:
.PP
\fI0\fR
.RS 4
-成功
+success
.RE
.PP
\fI1\fR
.RS 4
-无效的命令语法
+invalid command syntax
.RE
.PP
\fI2\fR
.RS 4
-一个或多个坏掉的组条目
+one or more bad group entries
.RE
.PP
\fI3\fR
.RS 4
-无法打开组文件
+can\*(Aqt open group files
.RE
.PP
\fI4\fR
.RS 4
-无法锁定组文件
+can\*(Aqt lock group files
.RE
.PP
\fI5\fR
.RS 4
-无法更新组文件
+can\*(Aqt update group files
.RE
.SH "参见"
.PP
\fBgroup\fR(5),
\fBgroupmod\fR(8),
-\fBgshadow\fR(5),\fBpasswd\fR(5),
+\fBgshadow\fR(5),
+\fBpasswd\fR(5),
\fBpwck\fR(8),
\fBshadow\fR(5)\&.
diff --git a/man/zh_CN/man8/lastlog.8 b/man/zh_CN/man8/lastlog.8
index 90b11463..7f6e77ee 100644
--- a/man/zh_CN/man8/lastlog.8
+++ b/man/zh_CN/man8/lastlog.8
@@ -2,12 +2,12 @@
.\" Title: lastlog
.\" Author: Julianne Frances Haugh
.\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\" Date: 2019-06-13
+.\" Date: 2019-12-01
.\" Manual: 系统管理命令
-.\" Source: shadow-utils 4.7
+.\" Source: shadow-utils 4.8
.\" Language: Chinese Simplified
.\"
-.TH "LASTLOG" "8" "2019-06-13" "shadow\-utils 4\&.7" "系统管理命令"
+.TH "LASTLOG" "8" "2019-12-01" "shadow\-utils 4\&.8" "系统管理命令"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
@@ -45,14 +45,14 @@ will be printed\&. The default (no flags) causes lastlog entries to be printed,
/etc/passwd\&.
.SH "选项"
.PP
+The options which apply to the
\fBlastlog\fR
-命令可以接受的选项有:
+command are:
.PP
\fB\-b\fR, \fB\-\-before\fR\ \&\fIDAYS\fR
.RS 4
-只显示老于
-\fIDAYS\fR
-的最近登录记录。
+Print only lastlog records older than
+\fIDAYS\fR\&.
.RE
.PP
\fB\-C\fR, \fB\-\-clear\fR
@@ -85,9 +85,8 @@ Set lastlog record of a user to the current time\&. This option can be used only
.PP
\fB\-t\fR, \fB\-\-time\fR\ \&\fIDAYS\fR
.RS 4
-只现实新于
-\fIDAYS\fR
-的最近登录记录。
+Print the lastlog records more recent than
+\fIDAYS\fR\&.
.RE
.PP
\fB\-u\fR, \fB\-\-user\fR\ \&\fILOGIN\fR|\fIRANGE\fR
@@ -101,9 +100,9 @@ of users\&. This
of users can be specified with a min and max values (\fIUID_MIN\-UID_MAX\fR), a max value (\fI\-UID_MAX\fR), or a min value (\fIUID_MIN\-\fR)\&.
.RE
.PP
-如果用户从来没有登录过,将会显示
-\fI** 从未登录 **\fR
-而不是端口和时间。
+If the user has never logged in the message
+\fI** Never logged in**\fR
+will be displayed instead of the port and time\&.
.PP
Only the entries for the current users of the system will be displayed\&. Other entries may exist for users that were deleted previously\&.
.SH "注意"
@@ -115,9 +114,9 @@ passwd
users with a high UID)\&. You can display its real size with "\fBls \-s\fR"\&.
.SH "配置文件"
.PP
-在
+The following configuration variables in
/etc/login\&.defs
-中有如下配置变量,可以用来更改此工具的行为:
+change the behavior of this tool:
.PP
\fBLASTLOG_UID_MAX\fR (number)
.RS 4
diff --git a/man/zh_CN/man8/logoutd.8 b/man/zh_CN/man8/logoutd.8
index afd31d95..d1db0a65 100644
--- a/man/zh_CN/man8/logoutd.8
+++ b/man/zh_CN/man8/logoutd.8
@@ -2,12 +2,12 @@
.\" Title: logoutd
.\" Author: Julianne Frances Haugh
.\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\" Date: 2019-06-13
+.\" Date: 2019-12-01
.\" Manual: 系统管理命令
-.\" Source: shadow-utils 4.7
+.\" Source: shadow-utils 4.8
.\" Language: Chinese Simplified
.\"
-.TH "LOGOUTD" "8" "2019-06-13" "shadow\-utils 4\&.7" "系统管理命令"
+.TH "LOGOUTD" "8" "2019-12-01" "shadow\-utils 4\&.8" "系统管理命令"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff --git a/man/zh_CN/man8/newusers.8 b/man/zh_CN/man8/newusers.8
index 1f5db412..f264b65e 100644
--- a/man/zh_CN/man8/newusers.8
+++ b/man/zh_CN/man8/newusers.8
@@ -2,12 +2,12 @@
.\" Title: newusers
.\" Author: Julianne Frances Haugh
.\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\" Date: 2019-06-13
+.\" Date: 2019-12-01
.\" Manual: 系统管理命令
-.\" Source: shadow-utils 4.7
+.\" Source: shadow-utils 4.8
.\" Language: Chinese Simplified
.\"
-.TH "NEWUSERS" "8" "2019-06-13" "shadow\-utils 4\&.7" "系统管理命令"
+.TH "NEWUSERS" "8" "2019-12-01" "shadow\-utils 4\&.8" "系统管理命令"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
@@ -75,20 +75,19 @@ If this field contains the name of an existing user (or the name of a user creat
.RS 4
此字段用于定义用户的主组 ID。
.sp
-如果此字段包含一个现有组的组名(或者
-\fBnewusers\fR
-在前边创建的一个组),此组的 GID 会被用于做此用户的主组 ID。
+If this field contains the name of an existing group (or a group created before by
+\fBnewusers\fR), the GID of this group will be used as the primary group ID for the user\&.
.sp
如果此字段是一个数字,此数字会被用作此用户的主组 ID。如果没有对应此 GID 的现有组,将会使用此 GID 创建一个新组,名称和用户名相同。
.sp
-如果此字段为空,将会使用用户名作为组名,\fBnewusers\fR
-自动确定的一个 GID 作为主组 ID 来创建一个新组。
-.sp
-如果此字段包含一个不存在的组的名字(也没有由
+If this field is empty, a new group will be created with the name of the user and a GID will be automatically defined by
\fBnewusers\fR
-在前边创建),将使用指定的组名和
+to be used as the primary group ID for the user and as the GID for the new group\&.
+.sp
+If this field contains the name of a group which does not exist (and was not created before by
+\fBnewusers\fR), a new group will be created with the specified name and a GID will be automatically defined by
\fBnewusers\fR
-自动确定的 GID 创建一个组,并作为用户的主组。
+to be used as the primary group ID for the user and GID for the new group\&.
.RE
.PP
\fIpw_gecos\fR
@@ -102,8 +101,9 @@ If this field contains the name of an existing user (or the name of a user creat
.sp
如果此字段指定的不是现有的目录,将会创建指定的目录,所有权设置为创建或更新的用户及其主组。
.sp
-如果现有用户的主目录变更,\fBnewusers\fR
-不会移动或者复制旧目录的内容到新位置。这需要手动完成。
+If the home directory of an existing user is changed,
+\fBnewusers\fR
+does not move or copy the content of the old directory to the new location\&. This should be done manually\&.
.RE
.PP
\fIpw_shell\fR
@@ -112,13 +112,19 @@ If this field contains the name of an existing user (or the name of a user creat
.RE
.PP
\fBnewusers\fR
-首先尝试创建或更改所有指定的用户,然后将这些更改写入用户或组数据库。如果发生错误(除非是在最后写入数据库过程中),不会有任何更改。
+first tries to create or change all the specified users, and then write these changes to the user or group databases\&. If an error occurs (except in the final writes to the databases), no changes are committed to the databases\&.
.PP
此命令一般用于在大型的应用环境中,对大量账户进行一次性更新。
.SH "选项"
.PP
+The options which apply to the
\fBnewusers\fR
-命令可以使用的选项有:
+command are:
+.PP
+\fB\-\-badname\fR\ \&
+.RS 4
+Allow names that do not conform to standards\&.
+.RE
.PP
\fB\-c\fR, \fB\-\-crypt\-method\fR
.RS 4
@@ -166,9 +172,8 @@ directory\&.
.sp
您只可以对 SHA256 或 SHA512 使用此选项。
.sp
-默认,轮转数由
-/etc/login\&.defs
-文件中的 SHA_CRYPT_MIN_ROUNDS 和 SHA_CRYPT_MAX_ROUNDS 变量确定。
+By default, the number of rounds is defined by the SHA_CRYPT_MIN_ROUNDS and SHA_CRYPT_MAX_ROUNDS variables in
+/etc/login\&.defs\&.
.RE
.SH "CAVEATS"
.PP
@@ -177,41 +182,42 @@ directory\&.
您需要确保你吗和加密方法符合系统的密码策略。
.SH "配置文件"
.PP
-在
+The following configuration variables in
/etc/login\&.defs
-中有如下配置变量,可以用来更改此工具的行为:
+change the behavior of this tool:
.PP
\fBENCRYPT_METHOD\fR (string)
.RS 4
这定义了系统加密密码的默认算法(如果没有在命令行上指定算法)。
.sp
-可以使用如下值:\fIDES\fR
+It can take one of these values:
+\fIDES\fR
(default),
\fIMD5\fR, \fISHA256\fR, \fISHA512\fR\&.
.sp
-注意,此参数会覆盖
+Note: this parameter overrides the
\fBMD5_CRYPT_ENAB\fR
-变量。
+variable\&.
.RE
.PP
\fBGID_MAX\fR (number), \fBGID_MIN\fR (number)
.RS 4
-\fBuseradd\fR,\fBgroupadd\fR
-或
-\fBnewusers\fR
-创建的常规组的组 ID 的范围。
+Range of group IDs used for the creation of regular groups by
+\fBuseradd\fR,
+\fBgroupadd\fR, or
+\fBnewusers\fR\&.
.sp
+The default value for
\fBGID_MIN\fR
-和
-\fBGID_MAX\fR
-的默认值分别是 1000 和 60000。
+(resp\&.
+\fBGID_MAX\fR) is 1000 (resp\&. 60000)\&.
.RE
.PP
\fBMAX_MEMBERS_PER_GROUP\fR (number)
.RS 4
-每个组条目的最大成员数。达到最大值时,在
+Maximum members per group entry\&. When the maximum is reached, a new group entry (line) is started in
/etc/group
-开始一个新条目(行)(使用同样的名称,同样的密码,同样的 GID)。
+(with the same name, same password, and same GID)\&.
.sp
默认值是 0,意味着组中的成员数没有限制。
.sp
@@ -224,17 +230,18 @@ directory\&.
.PP
\fBMD5_CRYPT_ENAB\fR (boolean)
.RS 4
-表示密码是否必须使用基于 MD5 的算法加密。如果设为
-\fIyes\fR,新密码将使用可以和新版 FreeBSD 兼容的基于 MD5 的算法加密。它支持无限长度的密码以及更长的盐字符串。如果您需要将加密的密码复制到其它不理解新算法的系统,设置为
-\fIno\fR。默认值是
-\fIno\fR。
+Indicate if passwords must be encrypted using the MD5\-based algorithm\&. If set to
+\fIyes\fR, new passwords will be encrypted using the MD5\-based algorithm compatible with the one used by recent releases of FreeBSD\&. It supports passwords of unlimited length and longer salt strings\&. Set to
+\fIno\fR
+if you need to copy encrypted passwords to other systems which don\*(Aqt understand the new algorithm\&. Default is
+\fIno\fR\&.
.sp
This variable is superseded by the
\fBENCRYPT_METHOD\fR
variable or by any command line option used to configure the encryption algorithm\&.
.sp
-此变量已经废弃。您应该使用
-\fBENCRYPT_METHOD\fR。
+This variable is deprecated\&. You should use
+\fBENCRYPT_METHOD\fR\&.
.RE
.PP
\fBPASS_MAX_DAYS\fR (number)
@@ -254,12 +261,12 @@ variable or by any command line option used to configure the encryption algorith
.PP
\fBSHA_CRYPT_MIN_ROUNDS\fR (number), \fBSHA_CRYPT_MAX_ROUNDS\fR (number)
.RS 4
+When
\fBENCRYPT_METHOD\fR
-设为
+is set to
\fISHA256\fR
-或
-\fISHA512\fR
-时,此项确定加密算法默认使用 SHA 轮转数目(当轮转数没有通过命令行指定时)。
+or
+\fISHA512\fR, this defines the number of SHA rounds used by the encryption algorithm by default (when the number of rounds is not specified on the command line)\&.
.sp
使用很多轮转,会让暴力破解更加困难。但是需要注意,认证用户时也会需要更多的 CPU 资源。
.sp
@@ -267,16 +274,16 @@ variable or by any command line option used to configure the encryption algorith
.sp
值必须在 1000 \- 999,999,999 之间。
.sp
-如果只设置了一个
+If only one of the
\fBSHA_CRYPT_MIN_ROUNDS\fR
-或
+or
\fBSHA_CRYPT_MAX_ROUNDS\fR
-值,就会使用这个值。
+values is set, then this value will be used\&.
.sp
-如果
+If
\fBSHA_CRYPT_MIN_ROUNDS\fR
>
-\fBSHA_CRYPT_MAX_ROUNDS\fR,将会使用大的那个。
+\fBSHA_CRYPT_MAX_ROUNDS\fR, the highest value will be used\&.
.RE
.PP
\fBSUB_GID_MIN\fR (number), \fBSUB_GID_MAX\fR (number), \fBSUB_GID_COUNT\fR (number)
@@ -327,43 +334,43 @@ are respectively 100000, 600100000 and 65536\&.
.PP
\fBSYS_GID_MAX\fR (number), \fBSYS_GID_MIN\fR (number)
.RS 4
-\fBuseradd\fR、\fBgroupadd\fR
-或
-\fBnewusers\fR
-创建的系统组的组 ID 的范围。
+Range of group IDs used for the creation of system groups by
+\fBuseradd\fR,
+\fBgroupadd\fR, or
+\fBnewusers\fR\&.
.sp
+The default value for
\fBSYS_GID_MIN\fR
-和
-\fBSYS_GID_MAX\fR
-的默认值分别是 101 和
-\fBGID_MIN\fR\-1。
+(resp\&.
+\fBSYS_GID_MAX\fR) is 101 (resp\&.
+\fBGID_MIN\fR\-1)\&.
.RE
.PP
\fBSYS_UID_MAX\fR (number), \fBSYS_UID_MIN\fR (number)
.RS 4
+Range of user IDs used for the creation of system users by
\fBuseradd\fR
-或
-\fBnewusers\fR
-创建的系统用户的用户 ID 的范围。
+or
+\fBnewusers\fR\&.
.sp
+The default value for
\fBSYS_UID_MIN\fR
-和
-\fBSYS_UID_MAX\fR
-的默认值分别是 101 和
-\fBUID_MIN\fR\-1。
+(resp\&.
+\fBSYS_UID_MAX\fR) is 101 (resp\&.
+\fBUID_MIN\fR\-1)\&.
.RE
.PP
\fBUID_MAX\fR (number), \fBUID_MIN\fR (number)
.RS 4
+Range of user IDs used for the creation of regular users by
\fBuseradd\fR
-或
-\fBnewusers\fR
-创建的普通用户的用户 ID 的范围。
+or
+\fBnewusers\fR\&.
.sp
+The default value for
\fBUID_MIN\fR
-和
-\fBUID_MAX\fR
-的默认值分别是 1000 和 60000。
+(resp\&.
+\fBUID_MAX\fR) is 1000 (resp\&. 60000)\&.
.RE
.PP
\fBUMASK\fR (number)
@@ -371,19 +378,18 @@ are respectively 100000, 600100000 and 65536\&.
文件模式创建掩码初始化为此值。如果没有指定,掩码初始化为 022。
.sp
\fBuseradd\fR
-和
+and
\fBnewusers\fR
-使用此掩码设置它们创建的用户主目录的模式。
+use this mask to set the mode of the home directory they create
.sp
-也被
+It is also used by
\fBlogin\fR
-用于指定用户的初始 umask。注意,此掩码可以被用户的 GECOS 行覆盖(当设置了
+to define users\*(Aq initial umask\&. Note that this mask can be overridden by the user\*(Aqs GECOS line (if
\fBQUOTAS_ENAB\fR
-时),也可以被带
+is set) or by the specification of a limit with the
\fIK\fR
-指示符的
-\fBlimits\fR(5)
-定义的限制值覆盖。
+identifier in
+\fBlimits\fR(5)\&.
.RE
.SH "文件"
.PP
diff --git a/man/zh_CN/man8/nologin.8 b/man/zh_CN/man8/nologin.8
index 62327db2..06f62b56 100644
--- a/man/zh_CN/man8/nologin.8
+++ b/man/zh_CN/man8/nologin.8
@@ -2,12 +2,12 @@
.\" Title: nologin
.\" Author: Nicolas Fran\(,cois <nicolas.francois@centraliens.net>
.\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\" Date: 2019-06-13
+.\" Date: 2019-12-01
.\" Manual: 系统管理命令
-.\" Source: shadow-utils 4.7
+.\" Source: shadow-utils 4.8
.\" Language: Chinese Simplified
.\"
-.TH "NOLOGIN" "8" "2019-06-13" "shadow\-utils 4\&.7" "系统管理命令"
+.TH "NOLOGIN" "8" "2019-12-01" "shadow\-utils 4\&.8" "系统管理命令"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
@@ -34,11 +34,12 @@ nologin \- 礼貌地拒绝登录
\fBnologin\fR
.SH "描述"
.PP
+The
\fBnologin\fR
-命令显示一个信息,说账户不可用然后返回非零值。它用于代替已经禁用的账户的 shell 字段。
+command displays a message that an account is not available and exits non\-zero\&. It is intended as a replacement shell field for accounts that have been disabled\&.
.PP
-如果要禁用所有登录,请参考
-\fBnologin\fR(5)。
+To disable all logins, investigate
+\fBnologin\fR(5)\&.
.SH "参见"
.PP
\fBlogin\fR(1),
diff --git a/man/zh_CN/man8/pwck.8 b/man/zh_CN/man8/pwck.8
index 3828b0eb..cf5f017f 100644
--- a/man/zh_CN/man8/pwck.8
+++ b/man/zh_CN/man8/pwck.8
@@ -2,12 +2,12 @@
.\" Title: pwck
.\" Author: Julianne Frances Haugh
.\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\" Date: 2019-06-13
+.\" Date: 2019-12-01
.\" Manual: 系统管理命令
-.\" Source: shadow-utils 4.7
+.\" Source: shadow-utils 4.8
.\" Language: Chinese Simplified
.\"
-.TH "PWCK" "8" "2019-06-13" "shadow\-utils 4\&.7" "系统管理命令"
+.TH "PWCK" "8" "2019-12-01" "shadow\-utils 4\&.8" "系统管理命令"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
@@ -34,12 +34,13 @@ pwck \- 检查密码文件的完整性
\fBpwck\fR [选项] [\fIpasswd\fR\ [\ \fIshadow\fR\ ]]
.SH "描述"
.PP
+The
\fBpwck\fR
-命令检查用户及其认证信息的完整性。它检查
+command verifies the integrity of the users and authentication information\&. It checks that all entries in
/etc/passwd
-和
+and
/etc/shadow
-格式正确、数据有效。将会提示用户删除格式不正确或者有其它错误的项。
+have the proper format and contain valid data\&. The user is prompted to delete entries that are improperly formatted or which have other uncorrectable errors\&.
.PP
检查的项目有:
.sp
@@ -109,11 +110,10 @@ pwck \- 检查密码文件的完整性
有效的登录 shell
.RE
.PP
-当指定第二个文件参数或
-/etc/shadow
-在系统中存在时,启用
shadow
-检查。
+checks are enabled when a second file parameter is specified or when
+/etc/shadow
+exists on the system\&.
.PP
这些检查是:
.sp
@@ -176,20 +176,27 @@ The checks for correct number of fields and unique user name are fatal\&. If the
\fBusermod\fR
command to correct the error\&.
.PP
-操作
+The commands which operate on the
/etc/passwd
-文件的这些命令不能警告损坏或重复的条目,这些情况下,应该使用
+file are not able to alter corrupted or duplicated entries\&.
\fBpwck\fR
-来移除这写有问题的条目。
+should be used in those circumstances to remove the offending entry\&.
.SH "选项"
.PP
+The
\fB\-r\fR
-和
+and
\fB\-s\fR
-选项不能联合使用。
+options cannot be combined\&.
.PP
+The options which apply to the
\fBpwck\fR
-选项可以接受的选项有:
+command are:
+.PP
+\fB\-\-badname\fR\ \&
+.RS 4
+Allow names that do not conform to standards\&.
+.RE
.PP
\fB\-h\fR, \fB\-\-help\fR
.RS 4
@@ -203,8 +210,9 @@ command to correct the error\&.
.PP
\fB\-r\fR, \fB\-\-read\-only\fR
.RS 4
-在只读模式下执行
-\fBpwck\fR。
+Execute the
+\fBpwck\fR
+command in read\-only mode\&.
.RE
.PP
\fB\-R\fR, \fB\-\-root\fR\ \&\fICHROOT_DIR\fR
@@ -218,27 +226,28 @@ directory\&.
.PP
\fB\-s\fR, \fB\-\-sort\fR
.RS 4
-根据 UID 在
+Sort entries in
/etc/passwd
-和
+and
/etc/shadow
-对项目进行排序。
+by UID\&.
.RE
.PP
-默认上,\fBpwck\fR
-操作文件
+By default,
+\fBpwck\fR
+operates on the files
/etc/passwd
-和
-/etc/shadow。用户也可以使用
+and
+/etc/shadow\&. The user may select alternate files with the
\fIpasswd\fR
-和
+and
\fIshadow\fR
-参数来选择替代文件。
+parameters\&.
.SH "配置文件"
.PP
-在
+The following configuration variables in
/etc/login\&.defs
-中有如下配置变量,可以用来更改此工具的行为:
+change the behavior of this tool:
.PP
\fBPASS_MAX_DAYS\fR (number)
.RS 4
@@ -272,42 +281,43 @@ directory\&.
.RE
.SH "退出值"
.PP
+The
\fBpwck\fR
-命令有如下返回值:
+command exits with the following values:
.PP
\fI0\fR
.RS 4
-成功
+success
.RE
.PP
\fI1\fR
.RS 4
-无效的命令语法
+invalid command syntax
.RE
.PP
\fI2\fR
.RS 4
-一个或多个错误的密码条目
+one or more bad password entries
.RE
.PP
\fI3\fR
.RS 4
-无法打开密码文件
+can\*(Aqt open password files
.RE
.PP
\fI4\fR
.RS 4
-无法锁定密码文件
+can\*(Aqt lock password files
.RE
.PP
\fI5\fR
.RS 4
-无法更新密码文件
+can\*(Aqt update password files
.RE
.PP
\fI6\fR
.RS 4
-无法在密码文件中排序
+can\*(Aqt sort password files
.RE
.SH "参见"
.PP
diff --git a/man/zh_CN/man8/pwconv.8 b/man/zh_CN/man8/pwconv.8
index 9aecd0c3..62336de3 100644
--- a/man/zh_CN/man8/pwconv.8
+++ b/man/zh_CN/man8/pwconv.8
@@ -2,12 +2,12 @@
.\" Title: pwconv
.\" Author: Marek Micha\(/lkiewicz
.\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\" Date: 2019-06-13
+.\" Date: 2019-12-01
.\" Manual: 系统管理命令
-.\" Source: shadow-utils 4.7
+.\" Source: shadow-utils 4.8
.\" Language: Chinese Simplified
.\"
-.TH "PWCONV" "8" "2019-06-13" "shadow\-utils 4\&.7" "系统管理命令"
+.TH "PWCONV" "8" "2019-12-01" "shadow\-utils 4\&.8" "系统管理命令"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
@@ -40,76 +40,82 @@ pwconv, pwunconv, grpconv, grpunconv \- 在影子密码和组以及其它直接
\fBgrpunconv\fR [\fI选项\fR]
.SH "描述"
.PP
+The
\fBpwconv\fR
-命令使用
-\fIpasswd\fR
-以及可选并已经存在的
+command creates
\fIshadow\fR
-来创建
-\fIshadow\fR。
+from
+\fIpasswd\fR
+and an optionally existing
+\fIshadow\fR\&.
.PP
+The
\fBpwunconv\fR
-命令使用
+command creates
+\fIpasswd\fR
+from
\fIpasswd\fR
-和
+and
\fIshadow\fR
-来创建
-\fIpasswd\fR,然后移除
-\fIshadow\fR。
+and then removes
+\fIshadow\fR\&.
.PP
+The
\fBgrpconv\fR
-从
-\fIgroup\fR
-和可能存在的
+command creates
\fIgshadow\fR
-创建
-\fIgshadow\fR。
+from
+\fIgroup\fR
+and an optionally existing
+\fIgshadow\fR\&.
.PP
+The
\fBgrpunconv\fR
-命令从
+command creates
+\fIgroup\fR
+from
\fIgroup\fR
-和
+and
\fIgshadow\fR
-创建
-\fIgroup\fR,然后移除
-\fIgshadow\fR。
+and then removes
+\fIgshadow\fR\&.
.PP
-这四个程序都可以操作普通或影子密码和组文件:/etc/passwd,
+These four programs all operate on the normal and shadow password and group files:
+/etc/passwd,
/etc/group,
-/etc/shadow
-和
-/etc/gshadow。
+/etc/shadow, and
+/etc/gshadow\&.
.PP
-转换前,每个程序都会获取需要的锁。\fBpwconv\fR
-和
+Each program acquires the necessary locks before conversion\&.
+\fBpwconv\fR
+and
\fBgrpconv\fR
-也类似。首先删除,存在于在影子文件中,但在主文件中却没有的条目;然后,更新在主文件中不使用\(lqx\(rq作为密码的影子条目,会添加所有缺失的条目;最后,将主文件中的密码替换为\(lqx\(rq。这两个工具可以用于初始转换以及根据手动编辑的主文件更新影子文件。
+are similar\&. First, entries in the shadowed file which don\*(Aqt exist in the main file are removed\&. Then, shadowed entries which don\*(Aqt have `x\*(Aq as the password in the main file are updated\&. Any missing shadowed entries are added\&. Finally, passwords in the main file are replaced with `x\*(Aq\&. These programs can be used for initial conversion as well to update the shadowed file if the main file is edited by hand\&.
.PP
\fBpwconv\fR
-向
-/etc/shadow
-添加条目时,将使用/etc/login\&.defs
-中的
+will use the values of
\fIPASS_MIN_DAYS\fR,
-\fIPASS_MAX_DAYS\fR
-和
+\fIPASS_MAX_DAYS\fR, and
\fIPASS_WARN_AGE\fR
-值。
+from
+/etc/login\&.defs
+when adding new entries to
+/etc/shadow\&.
.PP
+Likewise
\fBpwunconv\fR
-和
+and
\fBgrpunconv\fR
-与此类似。主文件中的密码会根据影子文件更新。在主文件中存在,但不在影子文件中的条目单独留下。最后,移除影子文件。一些密码年龄信息会因为
-\fBpwunconv\fR
-而丢失。它只转换它可以转换的。
+are similar\&. Passwords in the main file are updated from the shadowed file\&. Entries which exist in the main file but not in the shadowed file are left alone\&. Finally, the shadowed file is removed\&. Some password aging information is lost by
+\fBpwunconv\fR\&. It will convert what it can\&.
.SH "选项"
.PP
+The options which apply to the
\fBpwconv\fR,
\fBpwunconv\fR,
-\fBgrpconv\fR
-和
+\fBgrpconv\fR, and
\fBgrpunconv\fR
-命令可以接受的选项有:
+commands are:
.PP
\fB\-h\fR, \fB\-\-help\fR
.RS 4
@@ -126,25 +132,25 @@ directory\&.
.RE
.SH "缺陷"
.PP
-在 passwd 或 group 文件中有错误(比如,有重复条目)可能会造成这些程序死循环或者以奇怪的方式失败。在转换自,或转换到影子密码或组文件前,请运行
+Errors in the password or group files (such as invalid or duplicate entries) may cause these programs to loop forever or fail in other strange ways\&. Please run
\fBpwck\fR
-和
+and
\fBgrpck\fR
-来修正此类错误。
+to correct any such errors before converting to or from shadow passwords or groups\&.
.SH "配置文件"
.PP
+The following configuration variable in
/etc/login\&.defs
-中的如下配置变量改变
+changes the behavior of
\fBgrpconv\fR
-和
-\fBgrpunconv\fR
-的行为:
+and
+\fBgrpunconv\fR:
.PP
\fBMAX_MEMBERS_PER_GROUP\fR (number)
.RS 4
-每个组条目的最大成员数。达到最大值时,在
+Maximum members per group entry\&. When the maximum is reached, a new group entry (line) is started in
/etc/group
-开始一个新条目(行)(使用同样的名称,同样的密码,同样的 GID)。
+(with the same name, same password, and same GID)\&.
.sp
默认值是 0,意味着组中的成员数没有限制。
.sp
@@ -155,10 +161,10 @@ directory\&.
注意:分割组可能不受所有工具的支持(甚至在 Shadow 工具集中)。您不应该使用这个变量,除非真的需要。
.RE
.PP
+The following configuration variables in
/etc/login\&.defs
-中的如下配置变量改变
-\fBpwconv\fR
-的行为:
+change the behavior of
+\fBpwconv\fR:
.PP
\fBPASS_MAX_DAYS\fR (number)
.RS 4
diff --git a/man/zh_CN/man8/sulogin.8 b/man/zh_CN/man8/sulogin.8
index 23243948..6ebbd7c5 100644
--- a/man/zh_CN/man8/sulogin.8
+++ b/man/zh_CN/man8/sulogin.8
@@ -2,12 +2,12 @@
.\" Title: sulogin
.\" Author: Julianne Frances Haugh
.\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\" Date: 2019-06-13
+.\" Date: 2019-12-01
.\" Manual: 系统管理命令
-.\" Source: shadow-utils 4.7
+.\" Source: shadow-utils 4.8
.\" Language: Chinese Simplified
.\"
-.TH "SULOGIN" "8" "2019-06-13" "shadow\-utils 4\&.7" "系统管理命令"
+.TH "SULOGIN" "8" "2019-12-01" "shadow\-utils 4\&.8" "系统管理命令"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
@@ -47,7 +47,8 @@ has an entry for a single user login\&.
.PP
The user is prompted
.PP
-Type control\-d to proceed with normal startup, (or give root password for system maintenance):
+Type control\-d to proceed with normal startup,
+(or give root password for system maintenance):
.PP
Input and output will be performed with the standard file descriptors unless the optional device name argument is provided\&.
.PP
@@ -75,28 +76,27 @@ should execute the sulogin command in single user mode\&.
As complete an environment as possible is created\&. However, various devices may be unmounted or uninitialized and many of the user commands may be unavailable or nonfunctional as a result\&.
.SH "配置文件"
.PP
-在
+The following configuration variables in
/etc/login\&.defs
-中有如下配置变量,可以用来更改此工具的行为:
+change the behavior of this tool:
.PP
\fBENV_HZ\fR (string)
.RS 4
-如果设置了,将会用于在用户登录时定义 HZ 环境变量。值必须以
-\fIHZ=\fR
-开头。Linux 上的常用值是
-\fIHZ=100\fR。
+If set, it will be used to define the HZ environment variable when a user login\&. The value must be preceded by
+\fIHZ=\fR\&. A common value on Linux is
+\fIHZ=100\fR\&.
.RE
.PP
\fBENV_TZ\fR (string)
.RS 4
-如果设置了,它将用于在用户登录时定义 TZ 环境变量。此值可以是以
+If set, it will be used to define the TZ environment variable when a user login\&. The value can be the name of a timezone preceded by
\fITZ=\fR
-开头的时区名(例如
-\fITZ=CST6CDT\fR),或者是包含时区规则的文件完整路径(例如
-/etc/tzname)。
+(for example
+\fITZ=CST6CDT\fR), or the full path to the file containing the timezone specification (for example
+/etc/tzname)\&.
.sp
-如果将完整路径指定为了一个不存在或不可读的文件,则默认使用
-\fITZ=CST6CDT\fR。
+If a full path is specified but the file does not exist or cannot be read, the default is to use
+\fITZ=CST6CDT\fR\&.
.RE
.SH "文件"
.PP
diff --git a/man/zh_CN/man8/useradd.8 b/man/zh_CN/man8/useradd.8
index aad64ce3..acb05afc 100644
--- a/man/zh_CN/man8/useradd.8
+++ b/man/zh_CN/man8/useradd.8
@@ -2,12 +2,12 @@
.\" Title: useradd
.\" Author: Julianne Frances Haugh
.\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\" Date: 2019-06-13
+.\" Date: 2019-12-01
.\" Manual: 系统管理命令
-.\" Source: shadow-utils 4.7
+.\" Source: shadow-utils 4.8
.\" Language: Chinese Simplified
.\"
-.TH "USERADD" "8" "2019-06-13" "shadow\-utils 4\&.7" "系统管理命令"
+.TH "USERADD" "8" "2019-12-01" "shadow\-utils 4\&.8" "系统管理命令"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
@@ -38,38 +38,50 @@ useradd \- 创建一个新用户或更新默认新用户信息
\fBuseradd\fR \-D [\fI选项\fR]
.SH "描述"
.PP
-如果使用时不带
+When invoked without the
\fB\-D\fR
-选项,\fBuseradd\fR
-命令使用命令行上指定的值和系统的默认值创建一个新用户。根据命令行选项,\fBuseradd\fR
-命令也会更新系统文件和创建新用户的主目录并复制初始文件。
+option, the
+\fBuseradd\fR
+command creates a new user account using the values specified on the command line plus the default values from the system\&. Depending on command line options, the
+\fBuseradd\fR
+command will update system files and may also create the new user\*(Aqs home directory and copy initial files\&.
.PP
-默认上,也会为用户创建组 (察看
+By default, a group will also be created for the new user (see
\fB\-g\fR,
\fB\-N\fR,
-\fB\-U\fR,和
-\fBUSERGROUPS_ENAB\fR)。
+\fB\-U\fR, and
+\fBUSERGROUPS_ENAB\fR)\&.
.SH "选项"
.PP
+The options which apply to the
\fBuseradd\fR
-可以使用的选项有:
+command are:
+.PP
+\fB\-\-badname\fR\ \&
+.RS 4
+Allow names that do not conform to standards\&.
+.RE
.PP
\fB\-b\fR, \fB\-\-base\-dir\fR\ \&\fIBASE_DIR\fR
.RS 4
-如果没有使用
-\fB\-d\fR\ \&\fIHOME_DIR\fR,则使用默认的基目录。\fIBASE_DIR\fR
-加上账户名就是主目录。如果没有使用
+The default base directory for the system if
+\fB\-d\fR\ \&\fIHOME_DIR\fR
+is not specified\&.
+\fIBASE_DIR\fR
+is concatenated with the account name to define the home directory\&. If the
\fB\-m\fR
-选项,\fIBASE_DIR\fR
-必须已经存在。
+option is not used,
+\fIBASE_DIR\fR
+must exist\&.
.sp
-如果选项没有指定,\fBuseradd\fR
-将使用
-/etc/default/useradd
-中的
+If this option is not specified,
+\fBuseradd\fR
+will use the base directory specified by the
\fBHOME\fR
-变量,或者默认的
-/home。
+variable in
+/etc/default/useradd, or
+/home
+by default\&.
.RE
.PP
\fB\-c\fR, \fB\-\-comment\fR\ \&\fICOMMENT\fR
@@ -79,14 +91,15 @@ useradd \- 创建一个新用户或更新默认新用户信息
.PP
\fB\-d\fR, \fB\-\-home\-dir\fR\ \&\fIHOME_DIR\fR
.RS 4
-将创建新用户,并使用
+The new user will be created using
\fIHOME_DIR\fR
-作为用户登陆目录的值。默认值是将
+as the value for the user\*(Aqs login directory\&. The default is to append the
\fILOGIN\fR
-名附加到
+name to
\fIBASE_DIR\fR
-后面,并使用这作为登陆目录。目录不一定必须已经存在
-\fIHOME_DIR\fR,但是会在需要时创建。
+and use that as the login directory name\&. The directory
+\fIHOME_DIR\fR
+does not have to exist but will not be created if it is missing\&.
.RE
.PP
\fB\-D\fR, \fB\-\-defaults\fR
@@ -96,58 +109,57 @@ useradd \- 创建一个新用户或更新默认新用户信息
.PP
\fB\-e\fR, \fB\-\-expiredate\fR\ \&\fIEXPIRE_DATE\fR
.RS 4
-用户账户将被禁用的日期。日期以
-\fIYYYY\-MM\-DD\fR
-格式指定。
+The date on which the user account will be disabled\&. The date is specified in the format
+\fIYYYY\-MM\-DD\fR\&.
.sp
-如果没有指定,\fBuseradd\fR
-将使用
-/etc/default/useradd
-中
+If not specified,
+\fBuseradd\fR
+will use the default expiry date specified by the
\fBEXPIRE\fR
-变量指定的默认过期日期,或者一个空字符串(不过期)。
+variable in
+/etc/default/useradd, or an empty string (no expiry) by default\&.
.RE
.PP
\fB\-f\fR, \fB\-\-inactive\fR\ \&\fIINACTIVE\fR
.RS 4
密码过期后,账户被彻底禁用之前的天数。0 表示立即禁用,\-1 表示禁用这个功能。
.sp
-如果未指定,\fBuseradd\fR
-将使用
-/etc/default/useradd
-中的
+If not specified,
+\fBuseradd\fR
+will use the default inactivity period specified by the
\fBINACTIVE\fR
-指定的默认禁用周期,或者默认为 \-1。
+variable in
+/etc/default/useradd, or \-1 by default\&.
.RE
.PP
\fB\-g\fR, \fB\-\-gid\fR\ \&\fIGROUP\fR
.RS 4
用户初始登陆组的组名或号码。组名必须已经存在。组号码必须指代已经存在的组。
.sp
-如果没有指定,
+If not specified, the behavior of
\fBuseradd\fR
-的行为将依赖于
-/etc/login\&.defs
-文件中的
+will depend on the
\fBUSERGROUPS_ENAB\fR
-参数。如果此参数设置为了
+variable in
+/etc/login\&.defs\&. If this variable is set to
\fIyes\fR
-(或者在命令行上指定了
-\fB\-U/\-\-user\-group\fR),将会为用户创建一个组,组名和登录名相同。如果选项设置为了
+(or
+\fB\-U/\-\-user\-group\fR
+is specified on the command line), a group will be created for the user, with the same name as her loginname\&. If the variable is set to
\fIno\fR
-(或者在命令行上指定了
-\fB\-N/\-\-no\-user\-group\fR),useradd 会把新用户的主组设置为
-/etc/default/useradd
-中
+(or
+\fB\-N/\-\-no\-user\-group\fR
+is specified on the command line), useradd will set the primary group of the new user to the value specified by the
\fBGROUP\fR
-变量指定的值,再或者默认是 100。
+variable in
+/etc/default/useradd, or 100 by default\&.
.RE
.PP
\fB\-G\fR, \fB\-\-groups\fR\ \&\fIGROUP1\fR[\fI,GROUP2,\&.\&.\&.\fR[\fI,GROUPN\fR]]]
.RS 4
-用户还属于的附加组列表。每个组都用逗号隔开,没有中间的空格。这里的组受到了
+A list of supplementary groups which the user is also a member of\&. Each group is separated from the next by a comma, with no intervening whitespace\&. The groups are subject to the same restrictions as the group given with the
\fB\-g\fR
-选项给定的组同样的限制。默认上,用户只属于初始组。
+option\&. The default is for the user to belong only to the initial group\&.
.RE
.PP
\fB\-h\fR, \fB\-\-help\fR
@@ -157,21 +169,20 @@ useradd \- 创建一个新用户或更新默认新用户信息
.PP
\fB\-k\fR, \fB\-\-skel\fR\ \&\fISKEL_DIR\fR
.RS 4
-骨架目录,包含使用
-\fBuseradd\fR
-创建用户时,要复制到用户主目录中的文件和目录。
+The skeleton directory, which contains files and directories to be copied in the user\*(Aqs home directory, when the home directory is created by
+\fBuseradd\fR\&.
.sp
-这个选项只有在指定
+This option is only valid if the
\fB\-m\fR
-(或
-\fB\-\-create\-home\fR) 选项时才有效。
+(or
+\fB\-\-create\-home\fR) option is specified\&.
.sp
-如果此项没有设置,骨架目录使用
-/etc/default/useradd
-中的
+If this option is not set, the skeleton directory is defined by the
\fBSKEL\fR
-的变量或默认为
-/etc/skel。
+variable in
+/etc/default/useradd
+or, by default,
+/etc/skel\&.
.sp
如果可以,也复制 ACL 和扩展属性。
.RE
@@ -204,61 +215,58 @@ By default, the user\*(Aqs entries in the lastlog and faillog databases are rese
.PP
\fB\-m\fR, \fB\-\-create\-home\fR
.RS 4
-如果不存在,则创建用户主目录。骨架目录中的文件和目录(可以使用
+Create the user\*(Aqs home directory if it does not exist\&. The files and directories contained in the skeleton directory (which can be defined with the
\fB\-k\fR
-选项指定),将会复制到主目录。
+option) will be copied to the home directory\&.
.sp
-默认上,如果没有指定此选项并且
+By default, if this option is not specified and
\fBCREATE_HOME\fR
-没有启用,不会创建主目录。
+is not enabled, no home directories are created\&.
.RE
.PP
\fB\-M\fR, \fB\-\-no\-create\-home\fR
.RS 4
-不创建用户主目录,即使系统在
+Do no create the user\*(Aqs home directory, even if the system wide setting from
/etc/login\&.defs
-中的设置 (\fBCREATE_HOME\fR) 为
-\fIyes\fR。
+(\fBCREATE_HOME\fR) is set to
+\fIyes\fR\&.
.RE
.PP
\fB\-N\fR, \fB\-\-no\-user\-group\fR
.RS 4
-不要创建同名组,而是将用户添加到
+Do not create a group with the same name as the user, but add the user to the group specified by the
\fB\-g\fR
-选项指定的组,或根据
-/etc/default/useradd
-中的
+option or by the
\fBGROUP\fR
-变量。
+variable in
+/etc/default/useradd\&.
.sp
-如果没有指定
+The default behavior (if the
\fB\-g\fR,
-\fB\-N\fR
-和
+\fB\-N\fR, and
\fB\-U\fR
-选项,默认行为由
-/etc/login\&.defs
-中的
+options are not specified) is defined by the
\fBUSERGROUPS_ENAB\fR
-变量指定。
+variable in
+/etc/login\&.defs\&.
.RE
.PP
\fB\-o\fR, \fB\-\-non\-unique\fR
.RS 4
允许使用重复的 UID 创建用户账户。
.sp
-此选项只有和
+This option is only valid in combination with the
\fB\-u\fR
-选项组合使用才有效。
+option\&.
.RE
.PP
\fB\-p\fR, \fB\-\-password\fR\ \&\fIPASSWORD\fR
.RS 4
-加密了的密码,就像
-\fBcrypt\fR(3)
-的返回值。默认为禁用密码。
+The encrypted password, as returned by
+\fBcrypt\fR(3)\&. The default is to disable the password\&.
.sp
-\fB注意:\fR不推荐使用这个选项,因为密码(或加密过的密码)会被用户通过列出这个过程而看到。
+\fBNote:\fR
+This option is not recommended because the password (or encrypted password) will be visible by users listing the processes\&.
.sp
您应该确保密码符合系统的密码政策。
.RE
@@ -306,41 +314,39 @@ directory\&. This option does not chroot and is intended for preparing a cross\-
.PP
\fB\-s\fR, \fB\-\-shell\fR\ \&\fISHELL\fR
.RS 4
-用户的登录 shell 名。默认为留空,让系统根据
-/etc/default/useradd
-中的
+The name of the user\*(Aqs login shell\&. The default is to leave this field blank, which causes the system to select the default login shell specified by the
\fBSHELL\fR
-变量选择默认的登录 shell,默认为空字符串。
+variable in
+/etc/default/useradd, or an empty string by default\&.
.RE
.PP
\fB\-u\fR, \fB\-\-uid\fR\ \&\fIUID\fR
.RS 4
-用户 ID 的数字值。此值必须为唯一的,除非使用了
+The numerical value of the user\*(Aqs ID\&. This value must be unique, unless the
\fB\-o\fR
-选项。此值必须非负,默认使用大于等于
-\fBUID_MIN\fR,且大于任何其他用户 ID 最小值。
+option is used\&. The value must be non\-negative\&. The default is to use the smallest ID value greater than or equal to
+\fBUID_MIN\fR
+and greater than every other user\&.
.sp
-请参考
+See also the
\fB\-r\fR
-选项和
+option and the
\fBUID_MAX\fR
-的描述。
+description\&.
.RE
.PP
\fB\-U\fR, \fB\-\-user\-group\fR
.RS 4
创建一个和用户同名的组,并将用户添加到组中。
.sp
-如果没有指定
+The default behavior (if the
\fB\-g\fR,
-\fB\-N\fR
-和
+\fB\-N\fR, and
\fB\-U\fR
-选项,默认行为由
-/etc/login\&.defs
-中的
+options are not specified) is defined by the
\fBUSERGROUPS_ENAB\fR
-变量指定。
+variable in
+/etc/login\&.defs\&.
.RE
.PP
\fB\-Z\fR, \fB\-\-selinux\-user\fR\ \&\fISEUSER\fR
@@ -349,100 +355,99 @@ directory\&. This option does not chroot and is intended for preparing a cross\-
.RE
.SS "更改默认值"
.PP
-只带
+When invoked with only the
+\fB\-D\fR
+option,
+\fBuseradd\fR
+will display the current default values\&. When invoked with
\fB\-D\fR
-选项使用时,\fBuseradd\fR
-将显示当前的默认值。\fB\-D\fR
-和其它选项配合使用时,\fBuseradd\fR
-将为指定的选项更新默认值。有效的\(lq更改默认值\(rq选项有:
+plus other options,
+\fBuseradd\fR
+will update the default values for the specified options\&. Valid default\-changing options are:
.PP
\fB\-b\fR, \fB\-\-base\-dir\fR\ \&\fIBASE_DIR\fR
.RS 4
-新用户主目录的路径前缀。如果创建新账户时,没有使用
-\fB\-d\fR
-选项,用户的名称将会缀在
+The path prefix for a new user\*(Aqs home directory\&. The user\*(Aqs name will be affixed to the end of
\fIBASE_DIR\fR
-的后边形成新用户的主目录名。
+to form the new user\*(Aqs home directory name, if the
+\fB\-d\fR
+option is not used when creating a new account\&.
.sp
-这个选择在
-/etc/default/useradd
-中设置
+This option sets the
\fBHOME\fR
-选项。
+variable in
+/etc/default/useradd\&.
.RE
.PP
\fB\-e\fR, \fB\-\-expiredate\fR\ \&\fIEXPIRE_DATE\fR
.RS 4
禁用此用户账户的日期。
.sp
-此选项在
-/etc/default/useradd
-中设置
+This option sets the
\fBEXPIRE\fR
-变量。
+variable in
+/etc/default/useradd\&.
.RE
.PP
\fB\-f\fR, \fB\-\-inactive\fR\ \&\fIINACTIVE\fR
.RS 4
密码过期到账户被禁用之前的天数。
.sp
-这个选项在
-/etc/default/useradd
-中设置
+This option sets the
\fBINACTIVE\fR
-变量。
+variable in
+/etc/default/useradd\&.
.RE
.PP
\fB\-g\fR, \fB\-\-gid\fR\ \&\fIGROUP\fR
.RS 4
-新用户初始组的组名或 ID (使用了
+The group name or ID for a new user\*(Aqs initial group (when the
\fB\-N/\-\-no\-user\-group\fR
-或者
-/etc/login\&.defs
-中的变量
+is used or when the
\fBUSERGROUPS_ENAB\fR
-设置为
+variable is set to
\fIno\fR
-时)。给出的组必须存在,并且数字组 ID 必须有一个已经存在的项。
+in
+/etc/login\&.defs)\&. The named group must exist, and a numerical group ID must have an existing entry\&.
.sp
-这个选项在
-/etc/default/useradd
-中设置
+This option sets the
\fBGROUP\fR
-变量。
+variable in
+/etc/default/useradd\&.
.RE
.PP
\fB\-s\fR, \fB\-\-shell\fR\ \&\fISHELL\fR
.RS 4
新用户的登录 shell 名。
.sp
-这个选项在
-/etc/default/useradd
-设置
+This option sets the
\fBSHELL\fR
-变量。
+variable in
+/etc/default/useradd\&.
.RE
.SH "注意:"
.PP
-系统管理员负责将默认的用户文件放在
+The system administrator is responsible for placing the default user files in the
/etc/skel/
-目录中(或者命令行上、/etc/default/useradd
-中指定的任何其它目录)。
+directory (or any other skeleton directory specified in
+/etc/default/useradd
+or on the command line)\&.
.SH "CAVEATS"
.PP
您可能不能想 NIS 组或 LDAP 组添加用户。这只能在相应服务器上进行。
.PP
-相似地,如果用户名已经存在于外部用户数据库中,比如 NIS 或 LDAP,\fBuseradd\fR
-将拒绝创建用户账户的请求。
+Similarly, if the username already exists in an external user database such as NIS or LDAP,
+\fBuseradd\fR
+will deny the user account creation request\&.
.PP
用户名必须以一个小写字母或下划线开始,跟随小写字符、数字、下划线或连字符的组合。可以以美元符号结束。用正则表达式表示就是:[a\-z_][a\-z0\-9_\-]*[$]?
.PP
用户名不能超过 32 个字符长。
.SH "配置文件"
.PP
-在
+The following configuration variables in
/etc/login\&.defs
-中有如下配置变量,可以用来更改此工具的行为:
+change the behavior of this tool:
.PP
\fBCREATE_HOME\fR (boolean)
.RS 4
@@ -453,15 +458,15 @@ directory\&. This option does not chroot and is intended for preparing a cross\-
.PP
\fBGID_MAX\fR (number), \fBGID_MIN\fR (number)
.RS 4
-\fBuseradd\fR,\fBgroupadd\fR
-或
-\fBnewusers\fR
-创建的常规组的组 ID 的范围。
+Range of group IDs used for the creation of regular groups by
+\fBuseradd\fR,
+\fBgroupadd\fR, or
+\fBnewusers\fR\&.
.sp
+The default value for
\fBGID_MIN\fR
-和
-\fBGID_MAX\fR
-的默认值分别是 1000 和 60000。
+(resp\&.
+\fBGID_MAX\fR) is 1000 (resp\&. 60000)\&.
.RE
.PP
\fBLASTLOG_UID_MAX\fR (number)
@@ -483,27 +488,28 @@ option present in the configuration means that there is no user ID limit for wri
定义用户邮箱文件的位置(相对于主目录)。
.RE
.PP
+The
\fBMAIL_DIR\fR
and
\fBMAIL_FILE\fR
-变量由
-\fBuseradd\fR,\fBusermod\fR
-和
+variables are used by
+\fBuseradd\fR,
+\fBusermod\fR, and
\fBuserdel\fR
-用于创建、移动或删除用户邮箱。
+to create, move, or delete the user\*(Aqs mail spool\&.
.PP
-如果
+If
\fBMAIL_CHECK_ENAB\fR
-设置为
-\fIyes\fR,它们也被用于定义
+is set to
+\fIyes\fR, they are also used to define the
\fBMAIL\fR
-环境变量。
+environment variable\&.
.PP
\fBMAX_MEMBERS_PER_GROUP\fR (number)
.RS 4
-每个组条目的最大成员数。达到最大值时,在
+Maximum members per group entry\&. When the maximum is reached, a new group entry (line) is started in
/etc/group
-开始一个新条目(行)(使用同样的名称,同样的密码,同样的 GID)。
+(with the same name, same password, and same GID)\&.
.sp
默认值是 0,意味着组中的成员数没有限制。
.sp
@@ -577,43 +583,43 @@ are respectively 100000, 600100000 and 65536\&.
.PP
\fBSYS_GID_MAX\fR (number), \fBSYS_GID_MIN\fR (number)
.RS 4
-\fBuseradd\fR、\fBgroupadd\fR
-或
-\fBnewusers\fR
-创建的系统组的组 ID 的范围。
+Range of group IDs used for the creation of system groups by
+\fBuseradd\fR,
+\fBgroupadd\fR, or
+\fBnewusers\fR\&.
.sp
+The default value for
\fBSYS_GID_MIN\fR
-和
-\fBSYS_GID_MAX\fR
-的默认值分别是 101 和
-\fBGID_MIN\fR\-1。
+(resp\&.
+\fBSYS_GID_MAX\fR) is 101 (resp\&.
+\fBGID_MIN\fR\-1)\&.
.RE
.PP
\fBSYS_UID_MAX\fR (number), \fBSYS_UID_MIN\fR (number)
.RS 4
+Range of user IDs used for the creation of system users by
\fBuseradd\fR
-或
-\fBnewusers\fR
-创建的系统用户的用户 ID 的范围。
+or
+\fBnewusers\fR\&.
.sp
+The default value for
\fBSYS_UID_MIN\fR
-和
-\fBSYS_UID_MAX\fR
-的默认值分别是 101 和
-\fBUID_MIN\fR\-1。
+(resp\&.
+\fBSYS_UID_MAX\fR) is 101 (resp\&.
+\fBUID_MIN\fR\-1)\&.
.RE
.PP
\fBUID_MAX\fR (number), \fBUID_MIN\fR (number)
.RS 4
+Range of user IDs used for the creation of regular users by
\fBuseradd\fR
-或
-\fBnewusers\fR
-创建的普通用户的用户 ID 的范围。
+or
+\fBnewusers\fR\&.
.sp
+The default value for
\fBUID_MIN\fR
-和
-\fBUID_MAX\fR
-的默认值分别是 1000 和 60000。
+(resp\&.
+\fBUID_MAX\fR) is 1000 (resp\&. 60000)\&.
.RE
.PP
\fBUMASK\fR (number)
@@ -621,29 +627,30 @@ are respectively 100000, 600100000 and 65536\&.
文件模式创建掩码初始化为此值。如果没有指定,掩码初始化为 022。
.sp
\fBuseradd\fR
-和
+and
\fBnewusers\fR
-使用此掩码设置它们创建的用户主目录的模式。
+use this mask to set the mode of the home directory they create
.sp
-也被
+It is also used by
\fBlogin\fR
-用于指定用户的初始 umask。注意,此掩码可以被用户的 GECOS 行覆盖(当设置了
+to define users\*(Aq initial umask\&. Note that this mask can be overridden by the user\*(Aqs GECOS line (if
\fBQUOTAS_ENAB\fR
-时),也可以被带
+is set) or by the specification of a limit with the
\fIK\fR
-指示符的
-\fBlimits\fR(5)
-定义的限制值覆盖。
+identifier in
+\fBlimits\fR(5)\&.
.RE
.PP
\fBUSERGROUPS_ENAB\fR (boolean)
.RS 4
如果 uid 和 gid 相同,用户名和主用户名也相同,使非 root 组的组掩码位和属主位相同 (如:022 \-> 002, 077 \-> 007)。
.sp
-如果设置为
-\fIyes\fR,如果组中没有成员了,\fBuserdel\fR
-将移除此用户组,\fBuseradd\fR
-创建用户时,也会创建一个同名的默认组。
+If set to
+\fIyes\fR,
+\fBuserdel\fR
+will remove the user\*(Aqs group if it contains no more members, and
+\fBuseradd\fR
+will create by default a group with the name of the user\&.
.RE
.SH "文件"
.PP
@@ -693,53 +700,54 @@ Shadow 密码套件配置。
.RE
.SH "退出值"
.PP
+The
\fBuseradd\fR
-可以返回如下值:
+command exits with the following values:
.PP
\fI0\fR
.RS 4
-成功
+success
.RE
.PP
\fI1\fR
.RS 4
-无法更新密码文件
+can\*(Aqt update password file
.RE
.PP
\fI2\fR
.RS 4
-无效的命令语法
+invalid command syntax
.RE
.PP
\fI3\fR
.RS 4
-给了选项一个无效的参数
+invalid argument to option
.RE
.PP
\fI4\fR
.RS 4
-UID 已经使用 (且没有
+UID already in use (and no
\fB\-o\fR)
.RE
.PP
\fI6\fR
.RS 4
-指定的组不存在
+specified group doesn\*(Aqt exist
.RE
.PP
\fI9\fR
.RS 4
-用户名已被使用
+username already in use
.RE
.PP
\fI10\fR
.RS 4
-无法更新组文件
+can\*(Aqt update group file
.RE
.PP
\fI12\fR
.RS 4
-无法创建主目录
+can\*(Aqt create home directory
.RE
.PP
\fI14\fR
diff --git a/man/zh_CN/man8/userdel.8 b/man/zh_CN/man8/userdel.8
index 66d5a275..babc5fbe 100644
--- a/man/zh_CN/man8/userdel.8
+++ b/man/zh_CN/man8/userdel.8
@@ -2,12 +2,12 @@
.\" Title: userdel
.\" Author: Julianne Frances Haugh
.\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\" Date: 2019-06-13
+.\" Date: 2019-12-01
.\" Manual: 系统管理命令
-.\" Source: shadow-utils 4.7
+.\" Source: shadow-utils 4.8
.\" Language: Chinese Simplified
.\"
-.TH "USERDEL" "8" "2019-06-13" "shadow\-utils 4\&.7" "系统管理命令"
+.TH "USERDEL" "8" "2019-12-01" "shadow\-utils 4\&.8" "系统管理命令"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
@@ -34,27 +34,30 @@ userdel \- 删除用户账户和相关文件
\fBuserdel\fR [选项] \fI登录\fR
.SH "描述"
.PP
+The
\fBuserdel\fR
-修改系统账户文件,删除与用户名
-\fILOGIN\fR
-相关的所以项目。给出的用户名必须存在。
+command modifies the system account files, deleting all entries that refer to the user name
+\fILOGIN\fR\&. The named user must exist\&.
.SH "选项"
.PP
+The options which apply to the
\fBuserdel\fR
-可以使用的选项有:
+command are:
.PP
\fB\-f\fR, \fB\-\-force\fR
.RS 4
-此选项强制删除用户账户,甚至用户仍然在登录状态。它也强制
+This option forces the removal of the user account, even if the user is still logged in\&. It also forces
\fBuserdel\fR
-删除用户的主目录和邮箱,即使其它用户也使用同一个主目录或邮箱不属于指定的用户。如果
-/etc/login\&.defs
-中的
+to remove the user\*(Aqs home directory and mail spool, even if another user uses the same home directory or if the mail spool is not owned by the specified user\&. If
\fBUSERGROUPS_ENAB\fR
-定义为
-\fIyes\fR,并且如果有一个和用户同名的组,也会删除此组,即使它仍然是别的用户的主组。
+is defined to
+\fIyes\fR
+in
+/etc/login\&.defs
+and if a group exists with the same name as the deleted user, then this group will be removed, even if it is still the primary group of another user\&.
.sp
-\fI注意:\fR此选项危险,可能会破坏系统的稳定性。
+\fINote:\fR
+This option is dangerous and may leave your system in an inconsistent state\&.
.RE
.PP
\fB\-h\fR, \fB\-\-help\fR
@@ -66,11 +69,11 @@ userdel \- 删除用户账户和相关文件
.RS 4
用户主目录中的文件将随用户主目录和用户邮箱一起删除。在其它文件系统中的文件必须手动搜索并删除。
.sp
-邮箱在
-login\&.defs
-文件中的
+The mail spool is defined by the
\fBMAIL_DIR\fR
-变量中定义。
+variable in the
+login\&.defs
+file\&.
.RE
.PP
\fB\-R\fR, \fB\-\-root\fR\ \&\fICHROOT_DIR\fR
@@ -97,9 +100,9 @@ directory\&. This option does not chroot and is intended for preparing a cross\-
.RE
.SH "配置文件"
.PP
-在
+The following configuration variables in
/etc/login\&.defs
-中有如下配置变量,可以用来更改此工具的行为:
+change the behavior of this tool:
.PP
\fBMAIL_DIR\fR (string)
.RS 4
@@ -111,27 +114,28 @@ directory\&. This option does not chroot and is intended for preparing a cross\-
定义用户邮箱文件的位置(相对于主目录)。
.RE
.PP
+The
\fBMAIL_DIR\fR
and
\fBMAIL_FILE\fR
-变量由
-\fBuseradd\fR,\fBusermod\fR
-和
+variables are used by
+\fBuseradd\fR,
+\fBusermod\fR, and
\fBuserdel\fR
-用于创建、移动或删除用户邮箱。
+to create, move, or delete the user\*(Aqs mail spool\&.
.PP
-如果
+If
\fBMAIL_CHECK_ENAB\fR
-设置为
-\fIyes\fR,它们也被用于定义
+is set to
+\fIyes\fR, they are also used to define the
\fBMAIL\fR
-环境变量。
+environment variable\&.
.PP
\fBMAX_MEMBERS_PER_GROUP\fR (number)
.RS 4
-每个组条目的最大成员数。达到最大值时,在
+Maximum members per group entry\&. When the maximum is reached, a new group entry (line) is started in
/etc/group
-开始一个新条目(行)(使用同样的名称,同样的密码,同样的 GID)。
+(with the same name, same password, and same GID)\&.
.sp
默认值是 0,意味着组中的成员数没有限制。
.sp
@@ -148,7 +152,7 @@ and
.sp
这个脚本的返回值并不被带到账户中去。
.sp
-这是一个示例脚本,它移除用户的 cron、at 和 print 作业:
+Here is an example script, which removes the user\*(Aqs cron, at and print jobs:
.sp
.if n \{\
.RS 4
@@ -156,41 +160,44 @@ and
.nf
#! /bin/sh
-# 检查需要的参数
+# Check for the required argument\&.
if [ $# != 1 ]; then
echo "Usage: $0 username"
exit 1
fi
-# 移除 cron 作业
+# Remove cron jobs\&.
crontab \-r \-u $1
-# 移除 at 作业
-# 注意这将移除所有属于同一个 UID 的作业
-# 即使此 ID 由多个用户名共享
+# Remove at jobs\&.
+# Note that it will remove any jobs owned by the same UID,
+# even if it was shared by a different username\&.
AT_SPOOL_DIR=/var/spool/cron/atjobs
find $AT_SPOOL_DIR \-name "[^\&.]*" \-type f \-user $1 \-delete \e;
-# 移除 print 作业
+# Remove print jobs\&.
lprm $1
-# 全部完成
+# All done\&.
exit 0
.fi
.if n \{\
.RE
.\}
+.sp
.RE
.PP
\fBUSERGROUPS_ENAB\fR (boolean)
.RS 4
如果 uid 和 gid 相同,用户名和主用户名也相同,使非 root 组的组掩码位和属主位相同 (如:022 \-> 002, 077 \-> 007)。
.sp
-如果设置为
-\fIyes\fR,如果组中没有成员了,\fBuserdel\fR
-将移除此用户组,\fBuseradd\fR
-创建用户时,也会创建一个同名的默认组。
+If set to
+\fIyes\fR,
+\fBuserdel\fR
+will remove the user\*(Aqs group if it contains no more members, and
+\fBuseradd\fR
+will create by default a group with the name of the user\&.
.RE
.SH "文件"
.PP
@@ -225,63 +232,67 @@ Per user subordinate user IDs\&.
.RE
.SH "退出值"
.PP
+The
\fBuserdel\fR
-命令使用如下值退出:
+command exits with the following values:
.PP
\fI0\fR
.RS 4
-成功
+success
.RE
.PP
\fI1\fR
.RS 4
-无法更新密码文件
+can\*(Aqt update password file
.RE
.PP
\fI2\fR
.RS 4
-无效的命令语法
+invalid command syntax
.RE
.PP
\fI6\fR
.RS 4
-指定的用户不存在
+specified user doesn\*(Aqt exist
.RE
.PP
\fI8\fR
.RS 4
-用户已经登录
+user currently logged in
.RE
.PP
\fI10\fR
.RS 4
-无法更新组文件
+can\*(Aqt update group file
.RE
.PP
\fI12\fR
.RS 4
-无法删除主目录
+can\*(Aqt remove home directory
.RE
.SH "CAVEATS"
.PP
-如果某账户有正在运行的进程,\fBuserdel\fR
-不会允许此账户。此时,您可能必须要杀死那写进程或者锁定用户的密码和账户,并稍后再删除账户。\fB\-f\fR
-选项可以强制此删除账户。
+\fBuserdel\fR
+will not allow you to remove an account if there are running processes which belong to this account\&. In that case, you may have to kill those processes or lock the user\*(Aqs password or account and remove the account later\&. The
+\fB\-f\fR
+option can force the deletion of this account\&.
.PP
您应该手动检查所以文件系统,以确保没有遗留此用户的文件。
.PP
您不能在 NIS 客户端上移除任何 NIS 属性。这必须在 NIS 服务器上执行。
.PP
-如果在
-/etc/login\&.defs
-中
+If
\fBUSERGROUPS_ENAB\fR
-设置为
-\fIyes\fR,
+is defined to
+\fIyes\fR
+in
+/etc/login\&.defs,
+\fBuserdel\fR
+will delete the group with the same name as the user\&. To avoid inconsistencies in the passwd and group databases,
\fBuserdel\fR
-将删除同名组。为了避免损坏 passwd 和 group 数据库,\fBuserdel\fR
-将会检查这个主是否被别的用户用作主组,如果有,将只发出警告并不删除此组。\fB\-f\fR
-选项可以强制删除此组。
+will check that this group is not used as a primary group for another user, and will just warn without deleting the group otherwise\&. The
+\fB\-f\fR
+option can force the deletion of this group\&.
.SH "参见"
.PP
\fBchfn\fR(1),
diff --git a/man/zh_CN/man8/usermod.8 b/man/zh_CN/man8/usermod.8
index a4c55f92..4a61eb25 100644
--- a/man/zh_CN/man8/usermod.8
+++ b/man/zh_CN/man8/usermod.8
@@ -2,12 +2,12 @@
.\" Title: usermod
.\" Author: Julianne Frances Haugh
.\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\" Date: 2019-06-13
+.\" Date: 2019-12-01
.\" Manual: 系统管理命令
-.\" Source: shadow-utils 4.7
+.\" Source: shadow-utils 4.8
.\" Language: Chinese Simplified
.\"
-.TH "USERMOD" "8" "2019-06-13" "shadow\-utils 4\&.7" "系统管理命令"
+.TH "USERMOD" "8" "2019-12-01" "shadow\-utils 4\&.8" "系统管理命令"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
@@ -34,51 +34,62 @@ usermod \- 修改一个用户账户
\fBusermod\fR [\fI选项\fR] \fI登录\fR
.SH "描述"
.PP
+The
\fBusermod\fR
-修改系统账户文件和在命令行上指定的相关更改。
+command modifies the system account files to reflect the changes that are specified on the command line\&.
.SH "选项"
.PP
+The options which apply to the
\fBusermod\fR
-可以接受的选项有:
+command are:
.PP
\fB\-a\fR, \fB\-\-append\fR
.RS 4
-将用户添加到附加组。只能和
+Add the user to the supplementary group(s)\&. Use only with the
\fB\-G\fR
-选项一起使用。
+option\&.
+.RE
+.PP
+\fB\-b\fR, \fB\-\-badnames\fR
+.RS 4
+Allow names that do not conform to standards\&.
+.RE
+.PP
+\fB\-b\fR, \fB\-\-badnames\fR
+.RS 4
+Allow names that do not conform to standards\&.
.RE
.PP
\fB\-c\fR, \fB\-\-comment\fR\ \&\fICOMMENT\fR
.RS 4
-用户密码文件中注释字段的新值。通常使用
+The new value of the user\*(Aqs password file comment field\&. It is normally modified using the
\fBchfn\fR(1)
-工具对其进行修改。
+utility\&.
.RE
.PP
\fB\-d\fR, \fB\-\-home\fR\ \&\fIHOME_DIR\fR
.RS 4
用户的新登录目录。
.sp
-如果给了
+If the
\fB\-m\fR
-选项,当前主目录的内容将会移动到新主目录中,如果不存在,则创建。
+option is given, the contents of the current home directory will be moved to the new home directory, which is created if it does not already exist\&.
.RE
.PP
\fB\-e\fR, \fB\-\-expiredate\fR\ \&\fIEXPIRE_DATE\fR
.RS 4
-用户账户将被禁用的日期。日期以
-\fIYYYY\-MM\-DD\fR
-格式指定。
+The date on which the user account will be disabled\&. The date is specified in the format
+\fIYYYY\-MM\-DD\fR\&.
.sp
-空
+An empty
\fIEXPIRE_DATE\fR
-参数将禁用账户过期。
+argument will disable the expiration of the account\&.
.sp
-此选项需要一个
-/etc/passwd
-文件。如果没有,将会创建一条
+This option requires a
/etc/shadow
-项目。
+file\&. A
+/etc/shadow
+entry will be created if there were none\&.
.RE
.PP
\fB\-f\fR, \fB\-\-inactive\fR\ \&\fIINACTIVE\fR
@@ -87,11 +98,11 @@ usermod \- 修改一个用户账户
.sp
0 表示密码过期时,立即禁用账户;\-1 表示不使用这个功能。
.sp
-此选项需要一个
-/etc/passwd
-文件。如果没有,将会创建一条
+This option requires a
/etc/shadow
-项目。
+file\&. A
+/etc/shadow
+entry will be created if there were none\&.
.RE
.PP
\fB\-g\fR, \fB\-\-gid\fR\ \&\fIGROUP\fR
@@ -105,64 +116,63 @@ usermod \- 修改一个用户账户
.PP
\fB\-G\fR, \fB\-\-groups\fR\ \&\fIGROUP1\fR[\fI,GROUP2,\&.\&.\&.\fR[\fI,GROUPN\fR]]]
.RS 4
-用户还属于的附加组列表。组之间使用逗号分隔,没有空格。这些组需要遵守和
+A list of supplementary groups which the user is also a member of\&. Each group is separated from the next by a comma, with no intervening whitespace\&. The groups are subject to the same restrictions as the group given with the
\fB\-g\fR
-选项中给的组同样的限制。
+option\&.
.sp
-如果用户当前是一个组的成员,而这个组没有列在这里,用户将被从那个组里便删除。这个行为可以通过
+If the user is currently a member of a group which is not listed, the user will be removed from the group\&. This behaviour can be changed via the
\fB\-a\fR
-选项修改,这使用户追加到给出的附加组列表中。
+option, which appends the user to the current supplementary group list\&.
.RE
.PP
\fB\-l\fR, \fB\-\-login\fR\ \&\fINEW_LOGIN\fR
.RS 4
-用户的名称将会从
+The name of the user will be changed from
\fILOGIN\fR
-修改为
-\fINEW_LOGIN\fR。不会更改别的任何东西。特别是,用户的主目录名和邮件池也需要手动修改以和新登录名对应。
+to
+\fINEW_LOGIN\fR\&. Nothing else is changed\&. In particular, the user\*(Aqs home directory or mail spool should probably be renamed manually to reflect the new login name\&.
.RE
.PP
\fB\-L\fR, \fB\-\-lock\fR
.RS 4
-锁定用户的密码。这会在用户加密的密码之前放置一个\(lq!\(rq,可以快速禁用密码。您可以和
+Lock a user\*(Aqs password\&. This puts a \*(Aq!\*(Aq in front of the encrypted password, effectively disabling the password\&. You can\*(Aqt use this option with
\fB\-p\fR
-或
-\fB\-U\fR
-配合使用此选项。
+or
+\fB\-U\fR\&.
.sp
-注意:如果希望锁定账户(不仅仅是通过密码访问),您也需要设置
+Note: if you wish to lock the account (not only access with a password), you should also set the
\fIEXPIRE_DATE\fR
-为
-\fI1\fR。
+to
+\fI1\fR\&.
.RE
.PP
\fB\-m\fR, \fB\-\-move\-home\fR
.RS 4
将用户的主目录移动到新位置。
.sp
-这个选项只有和
+This option is only valid in combination with the
\fB\-d\fR
-(或
-\fB\-\-home\fR) 选项组合使用时才有效。
+(or
+\fB\-\-home\fR) option\&.
.sp
\fBusermod\fR
-会改写文件的属主并复制模式、ACL 和扩展属性,但是稍后也可能需要手动修改。
+will try to adapt the ownership of the files and to copy the modes, ACL and extended attributes, but manual changes might be needed afterwards\&.
.RE
.PP
\fB\-o\fR, \fB\-\-non\-unique\fR
.RS 4
-使用
+When used with the
\fB\-u\fR
-选项时,可以将用户 ID 改为非唯一的值。
+option, this option allows to change the user ID to a non\-unique value\&.
.RE
.PP
\fB\-p\fR, \fB\-\-password\fR\ \&\fIPASSWORD\fR
.RS 4
-已经加密过的密码,就像
-\fBcrypt\fR(3)
-返回的那样。
+The encrypted password, as returned by
+\fBcrypt\fR(3)\&.
.sp
-\fB注意:\fR不推荐使用这个选项,因为密码(或加密过的密码)会被用户通过列出这个过程而看到。
+\fBNote:\fR
+This option is not recommended because the password (or encrypted password) will be visible by users listing the processes\&.
.sp
您应该确保密码符合系统的密码政策。
.RE
@@ -194,41 +204,37 @@ directory\&. This option does not chroot and is intended for preparing a cross\-
.RS 4
用户 ID 的新数值。
.sp
-这个值必须是唯一的,除非使用了
+This value must be unique, unless the
\fB\-o\fR
-选项,必须是非负值。
+option is used\&. The value must be non\-negative\&.
.sp
用户的邮箱,用户主目录中属于此用户的文件的属主 ID 也将自动更改。
.sp
用户主目录之外文件所有权必须手动修复。
.sp
-不会对
-/etc/login\&.defs
-中的
+No checks will be performed with regard to the
\fBUID_MIN\fR,
\fBUID_MAX\fR,
-\fBSYS_UID_MIN\fR
-和
+\fBSYS_UID_MIN\fR, or
\fBSYS_UID_MAX\fR
-进行检查。
+from
+/etc/login\&.defs\&.
.RE
.PP
\fB\-U\fR, \fB\-\-unlock\fR
.RS 4
-解锁用户的密码。这将移除加密的密码之前的\(lq!\(rq。您可以将此选项和
+Unlock a user\*(Aqs password\&. This removes the \*(Aq!\*(Aq in front of the encrypted password\&. You can\*(Aqt use this option with
\fB\-p\fR
-或
-\fB\-L\fR
-配合使用。
+or
+\fB\-L\fR\&.
.sp
-注意:如果您希望解锁账户(不只是使用密码访问),您也应该设置
+Note: if you wish to unlock the account (not only access with a password), you should also set the
\fIEXPIRE_DATE\fR
-(例如设置为
-\fI99999\fR,或者
-/etc/default/useradd
-中的
+(for example to
+\fI99999\fR, or to the
\fBEXPIRE\fR
-值)。
+value from
+/etc/default/useradd)\&.
.RE
.PP
\fB\-v\fR, \fB\-\-add\-subuids\fR\ \&\fIFIRST\fR\-\fILAST\fR
@@ -295,11 +301,11 @@ from /etc/login\&.defs\&.
.RS 4
用户登陆的 SELinux 用户。
.sp
-空的
+A blank
\fISEUSER\fR
-将移除用户
+will remove the SELinux user mapping for user
\fILOGIN\fR
-的 SELinux 用户映射(如果有)。
+(if any)\&.
.RE
.SH "CAVEATS"
.PP
@@ -307,18 +313,18 @@ You must make certain that the named user is not executing any processes when th
\fBusermod\fR
checks this on Linux\&. On other platforms it only uses utmp to check if the user is logged in\&.
.PP
-您必须手动更改
+You must change the owner of any
\fBcrontab\fR
-文件或
+files or
\fBat\fR
-作业的属主。
+jobs manually\&.
.PP
您必须更改 NIS 服务器上的 NIS 相关内容。
.SH "配置文件"
.PP
-在
+The following configuration variables in
/etc/login\&.defs
-中有如下配置变量,可以用来更改此工具的行为:
+change the behavior of this tool:
.PP
\fBLASTLOG_UID_MAX\fR (number)
.RS 4
@@ -339,27 +345,28 @@ option present in the configuration means that there is no user ID limit for wri
定义用户邮箱文件的位置(相对于主目录)。
.RE
.PP
+The
\fBMAIL_DIR\fR
and
\fBMAIL_FILE\fR
-变量由
-\fBuseradd\fR,\fBusermod\fR
-和
+variables are used by
+\fBuseradd\fR,
+\fBusermod\fR, and
\fBuserdel\fR
-用于创建、移动或删除用户邮箱。
+to create, move, or delete the user\*(Aqs mail spool\&.
.PP
-如果
+If
\fBMAIL_CHECK_ENAB\fR
-设置为
-\fIyes\fR,它们也被用于定义
+is set to
+\fIyes\fR, they are also used to define the
\fBMAIL\fR
-环境变量。
+environment variable\&.
.PP
\fBMAX_MEMBERS_PER_GROUP\fR (number)
.RS 4
-每个组条目的最大成员数。达到最大值时,在
+Maximum members per group entry\&. When the maximum is reached, a new group entry (line) is started in
/etc/group
-开始一个新条目(行)(使用同样的名称,同样的密码,同样的 GID)。
+(with the same name, same password, and same GID)\&.
.sp
默认值是 0,意味着组中的成员数没有限制。
.sp
diff --git a/man/zh_CN/man8/vipw.8 b/man/zh_CN/man8/vipw.8
index 8c8fda0a..aa25d979 100644
--- a/man/zh_CN/man8/vipw.8
+++ b/man/zh_CN/man8/vipw.8
@@ -2,12 +2,12 @@
.\" Title: vipw
.\" Author: Marek Micha\(/lkiewicz
.\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\" Date: 2019-06-13
+.\" Date: 2019-12-01
.\" Manual: 系统管理命令
-.\" Source: shadow-utils 4.7
+.\" Source: shadow-utils 4.8
.\" Language: Chinese Simplified
.\"
-.TH "VIPW" "8" "2019-06-13" "shadow\-utils 4\&.7" "系统管理命令"
+.TH "VIPW" "8" "2019-12-01" "shadow\-utils 4\&.8" "系统管理命令"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
@@ -36,28 +36,29 @@ vipw, vigr \- 编辑密码、组、影子密码或影子组文件。
\fBvigr\fR [\fI选项\fR]
.SH "描述"
.PP
+The
\fBvipw\fR
-和
+and
\fBvigr\fR
-命令分别编辑
+commands edits the files
/etc/passwd
-和
-/etc/group
-文件。使用
+and
+/etc/group, respectively\&. With the
\fB\-s\fR
-标识时,将编辑这些文件的影子版,即分别为
+flag, they will edit the shadow versions of those files,
/etc/shadow
-和
-/etc/gshadow。这些程序将设置相应的锁,以防止文件损坏。寻找编辑器时,首先尝试环境变量
-\fB$VISUAL\fR,然后是环境变量
-\fB$EDITOR\fR,最后是默认编辑器
-\fBvi\fR(1)。
+and
+/etc/gshadow, respectively\&. The programs will set the appropriate locks to prevent file corruption\&. When looking for an editor, the programs will first try the environment variable
+\fB$VISUAL\fR, then the environment variable
+\fB$EDITOR\fR, and finally the default editor,
+\fBvi\fR(1)\&.
.SH "选项"
.PP
+The options which apply to the
\fBvipw\fR
-和
+and
\fBvigr\fR
-命令可以接受的选项有:
+commands are:
.PP
\fB\-g\fR, \fB\-\-group\fR
.RS 4
@@ -101,8 +102,9 @@ directory\&.
.PP
\fBEDITOR\fR
.RS 4
+Editor to be used if
\fBVISUAL\fR
-没有设置的情况下,使用的编辑器。
+is not set\&.
.RE
.SH "文件"
.PP
@@ -129,6 +131,7 @@ directory\&.
.PP
\fBvi\fR(1),
\fBgroup\fR(5),
-\fBgshadow\fR(5),
+\fBgshadow\fR(5)
+,
\fBpasswd\fR(5), ,
\fBshadow\fR(5)\&.