Language improvements and some fixes to long standing formatting issues.

Submitted by:	delhua at gmail com
Obtained from:	The FreeBSD Simplified Chinese Project

1 files changed, 36 insertions, 21 deletions

diff --git a/zh_CN.GB2312/books/handbook/users/chapter.sgml b/zh_CN.GB2312/books/handbook/users/chapter.sgml
index 0b6ac45c78..807f401d62 100644
--- a/zh_CN.GB2312/books/handbook/users/chapter.sgml
+++ b/zh_CN.GB2312/books/handbook/users/chapter.sgml
@@ -338,15 +338,17 @@
 	(<quote>dotfiles</quote>) 从 <filename>/usr/share/skel</filename>
 	这个目录， 然后给新用户发送一封带欢迎信息的邮件。</para>
 
-      <para>在&os;&nbsp;5.0版本， &man.adduser.8;命令从Perl脚本改写为shell脚本，
-	起包装&man.pw.8;的作用， 所以它的用法在 &os;&nbsp;4.X
+      <para>在 &os;&nbsp;5.0 版本中， &man.adduser.8; 命令从 Perl 脚本改写为 shell 脚本，
+	起包装 &man.pw.8; 的作用， 所以它的用法在 &os;&nbsp;4.X
 	上和 &os;&nbsp;5.X 上略有不同。</para>
 
       <para>建立初始化配置文件, 使用
 	<command>adduser -s -config_create</command>.
 	<footnote>
-	  <para>选项<option>-s</option>&man.adduser.8;
-	    是。 当我们想要改变默认设置可以使用<option>-v</option>选项</para>
+	  <para>选项 <option>-s</option> 的作用是让 &man.adduser.8;
+	    尽可能使用默认配置而不是提示用户输入。
+	    如果需要修改之前保存的默认设置，
+	    则可以使用 <option>-v</option> 选项</para>
 	</footnote>
 	接下来， 我们配置 &man.adduser.8; 的默认设置，
 	并建立第一个普通用户帐户， 因为将
@@ -355,41 +357,50 @@
       <example>
 	<title>配置 <command>adduser</command> 和添加一个新用户，在&os;&nbsp;4.X版本</title>
 
-	<screen>&prompt.root; <userinput>adduser -v</userinput> Use option ``-silent'' if you don't want to see all warnings and questions.
+	<screen>&prompt.root; <userinput>adduser -v</userinput>
+Use option ``-silent'' if you don't want to see all warnings and questions.
 Check /etc/shells
 Check /etc/master.passwd
 Check /etc/group
-Enter your default shell: csh date no sh tcsh zsh [sh]: <userinput>zsh</userinput> Your default shell is: zsh -&gt; /usr/local/bin/zsh Enter your default HOME partition: [/home]:
-Copy dotfiles from: /usr/share/skel no [/usr/share/skel]:
-Send message from file: /etc/adduser.message no
-[/etc/adduser.message]: <userinput>no</userinput> Do not send message Use passwords (y/n) [y]: <userinput>y</userinput>
+Enter your default shell: csh date no sh tcsh zsh [sh]: <userinput>zsh</userinput>
+Your default shell is: zsh -&gt; /usr/local/bin/zsh
+Enter your default HOME partition: [/home]:
+Copy dotfiles from: /usr/share/skel no [/usr/share/skel]: 
+Send message from file: /etc/adduser.message no 
+[/etc/adduser.message]: <userinput>no</userinput>
+Do not send message
+Use passwords (y/n) [y]: <userinput>y</userinput>
 
 Write your changes to /etc/adduser.conf? (y/n) [n]: <userinput>y</userinput>
 
 Ok, let's go.
 Don't worry about mistakes. I will give you the chance later to correct any input.
-Enter username [a-z0-9_-]: <userinput>jru</userinput> Enter full name []: <userinput>J. Random User</userinput> Enter shell csh date no sh tcsh zsh [zsh]:
-Enter home directory (full path) [/home/jru]:
-Uid [1001]:
-Enter login class: default []:
-Login group jru [jru]:
-Login group is ``jru''. Invite jru into other groups: guest no
+Enter username [a-z0-9_-]: <userinput>jru</userinput>
+Enter full name []: <userinput>J. Random User</userinput>
+Enter shell csh date no sh tcsh zsh [zsh]: 
+Enter home directory (full path) [/home/jru]: 
+Uid [1001]: 
+Enter login class: default []: 
+Login group jru [jru]: 
+Login group is ``jru''. Invite jru into other groups: guest no 
 [no]: <userinput>wheel</userinput>
-Enter password []:
-Enter password again []:
+Enter password []: 
+Enter password again []: 
 
 Name:	  jru
 Password: ****
 Fullname: J. Random User
 Uid:	  1001
 Gid:	  1001 (jru)
-Class:
+Class:	  
 Groups:	  jru wheel
 HOME:     /home/jru
 Shell:	  /usr/local/bin/zsh
 OK? (y/n) [y]: <userinput>y</userinput>
 Added user ``jru''
-Copy files from /usr/share/skel to /home/jru Add another user? (y/n) [y]: <userinput>n</userinput> Goodbye!
+Copy files from /usr/share/skel to /home/jru
+Add another user? (y/n) [y]: <userinput>n</userinput>
+Goodbye!
 &prompt.root;</screen>
       </example>
 
@@ -911,7 +922,9 @@ passwd: done</screen>
     <example>
       <title>使用&man.pw.8;添加一个组</title>
 
-      <screen>&prompt.root; <userinput>pw groupadd teamtwo</userinput> &prompt.root; <userinput>pw groupshow teamtwo</userinput> teamtwo:*:1100:</screen>
+      <screen>&prompt.root; <userinput>pw groupadd teamtwo</userinput>
+&prompt.root; <userinput>pw groupshow teamtwo</userinput>
+teamtwo:*:1100:</screen>
     </example>
 
     <para>上面的数字 <literal>1100</literal> 是组
@@ -924,7 +937,9 @@ passwd: done</screen>
     <example>
       <title>使用 &man.pw.8; 在组中添加用户</title>
 
-      <screen>&prompt.root; <userinput>pw groupmod teamtwo -M jru</userinput> &prompt.root; <userinput>pw groupshow teamtwo</userinput> teamtwo:*:1100:jru</screen>
+      <screen>&prompt.root; <userinput>pw groupmod teamtwo -M jru</userinput>
+&prompt.root; <userinput>pw groupshow teamtwo</userinput>
+teamtwo:*:1100:jru</screen>
     </example>
 
     <para><option>-M</option> 所需的参数是一个用逗号分隔的组中用户成员的列表。