svn commit: r39370 - head/ja_JP.eucJP/books/handbook/users

Ryusuke SUZUKI ryusuke at FreeBSD.org
Mon Aug 13 10:16:10 UTC 2012


Author: ryusuke
Date: Mon Aug 13 10:16:10 2012
New Revision: 39370
URL: http://svn.freebsd.org/changeset/doc/39370

Log:
  - Merge the following from the English version:
  
  	r11372 -> r17963	head/ja_JP.eucJP/books/handbook/users/chapter.sgml
  
  Submitted by:	Hiroo Ono <hiroo _at_ jp dot FreeBSD dot org>
  References:	[doc-jp-work 1892-1894]

Modified:
  head/ja_JP.eucJP/books/handbook/users/chapter.sgml

Modified: head/ja_JP.eucJP/books/handbook/users/chapter.sgml
==============================================================================
--- head/ja_JP.eucJP/books/handbook/users/chapter.sgml	Mon Aug 13 09:07:35 2012	(r39369)
+++ head/ja_JP.eucJP/books/handbook/users/chapter.sgml	Mon Aug 13 10:16:10 2012	(r39370)
@@ -2,7 +2,7 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: r11372
+     Original revision: r17963
      $FreeBSD$
 -->
 
@@ -68,7 +68,7 @@
 
     <itemizedlist>
       <listitem>
-	<para>Unix ¤È¡¡FreeBSD ¤Î´ðÁÃÃμ± (<xref linkend="basics">)
+	<para>&unix; ¤È¡¡FreeBSD ¤Î´ðÁÃÃμ± (<xref linkend="basics">)
 	  ¤òÍý²ò¤·¤Æ¤ª¤¤¤Æ¤¯¤À¤µ¤¤¡£</para>
       </listitem>
     </itemizedlist>
@@ -353,7 +353,7 @@
       <secondary>Êѹ¹</secondary>
     </indexterm>
 
-    <para>Unix ´Ä¶­¤Ç¤Ï¡¢
+    <para>&unix; ´Ä¶­¤Ç¤Ï¡¢
       ¥æ¡¼¥¶¥¢¥«¥¦¥ó¥È¤òÁàºî¤¹¤ë¤Î¤Ë¤µ¤Þ¤¶¤Þ¤Ê¥³¥Þ¥ó¥É¤¬»È¤¨¤Þ¤¹¡£
       ¤â¤Ã¤È¤â°ìÈÌŪ¤Ê¥³¥Þ¥ó¥É¤ò°Ê²¼¤Ë¼¨¤·¡¢
       ¤½¤ì¤Ë³¤¤¤Æ¾Ü¤·¤¤»ÈÍÑÎã¤ò¼¨¤·¤Þ¤¹¡£</para>
@@ -368,23 +368,23 @@
 	</thead>
 	<tbody>
 	  <row>
-	    <entry><command>adduser</command></entry>
+	    <entry>&man.adduser.8;</entry>
 	    <entry>¥³¥Þ¥ó¥É¥é¥¤¥ó¤«¤é¥æ¡¼¥¶¤òÄɲ乤뤿¤á¤Î¿ä¾©¥¢¥×¥ê¥±¡¼¥·¥ç¥ó</entry>
 	  </row>
 	  <row>
-	    <entry><command>rmuser</command></entry>
+	    <entry>&man.rmuser.8;</entry>
 	    <entry>¥³¥Þ¥ó¥É¥é¥¤¥ó¤«¤é¥æ¡¼¥¶¤òºï½ü¤¹¤ë¤¿¤á¤Î¿ä¾©¥¢¥×¥ê¥±¡¼¥·¥ç¥ó</entry>
 	  </row>
 	  <row>
-	    <entry><command>chpass</command></entry>
+	    <entry>&man.chpass.1;</entry>
 	    <entry>¥æ¡¼¥¶¥Ç¡¼¥¿¥Ù¡¼¥¹¤Î¾ðÊó¤òÊѹ¹¤¹¤ë¤¿¤á¤Î½ÀÆð¤Ê¥Ä¡¼¥ë</entry>
 	  </row>
 	  <row>
-	    <entry><command>passwd</command></entry>
+	    <entry>&man.passwd.1;</entry>
 	    <entry>¥æ¡¼¥¶¤Î¥Ñ¥¹¥ï¡¼¥É¤òÊѹ¹¤¹¤ë´Êñ¤Ê¥³¥Þ¥ó¥É¥é¥¤¥ó¥Ä¡¼¥ë</entry>
 	  </row>
 	  <row>
-	    <entry><command>pw</command></entry>
+	    <entry>&man.pw.8;</entry>
 	    <entry>¥æ¡¼¥¶¥¢¥«¥¦¥ó¥È¤Î¤¢¤é¤æ¤ë²Õ½ê¤òÊѹ¹¤¹¤ë¶¯ÎϤǽÀÆð¤Ê¥Ä¡¼¥ë</entry>
 	  </row>
 	</tbody>
@@ -392,7 +392,7 @@
     </informaltable>
 
     <sect2 id="users-adduser">
-      <title>adduser</title>
+      <title><command>adduser</command></title>
 
       <indexterm>
 	<primary>¥¢¥«¥¦¥ó¥È</primary>
@@ -405,7 +405,7 @@
 	<primary><filename class=directory>/usr/share/skel</filename></primary>
       </indexterm>
       <indexterm><primary>¥¹¥±¥ë¥È¥ó¥Ç¥£¥ì¥¯¥È¥ê</primary></indexterm>
-      <para><command>adduser</command> ¤Ï¡¢
+      <para>&man.adduser.8; ¤Ï¡¢
         ¿·¤·¤¤¥æ¡¼¥¶¤òÅÐÏ¿¤¹¤ë¤¿¤á¤Î¥·¥ó¥×¥ë¤Ê¥×¥í¥°¥é¥à¤Ç¤¹¡£
 	¤³¤Î¥×¥í¥°¥é¥à¤Ï¡¢¥·¥¹¥Æ¥à¤Î <filename>passwd</filename> ¤È
 	<filename>group</filename> ¥Õ¥¡¥¤¥ë¤Ë¿·¤·¤¤¹àÌܤòºîÀ®¤·¤Þ¤¹¡£
@@ -422,16 +422,16 @@
         ¤È¤·¤Þ¤¹<footnote>
 	  <para>¥ª¥×¥·¥ç¥ó <option>-s</option> ¤ò¤Ä¤±¤ë¤È¡¢
 	    ¥Ç¥Õ¥©¥ë¥È¤Ç¾ÜºÙ¤òɽ¼¨¤·¤Ê¤¤¤è¤¦¤Ë
-	    <command>adduser</command> ¤òÀßÄꤷ¤Þ¤¹¡£
+	    &man.adduser.8; ¤òÀßÄꤷ¤Þ¤¹¡£
             ¤³¤Î¸å¤Ë¾ÜºÙ¤òɽ¼¨¤µ¤»¤ë¤è¤¦¤Ë¤·¤¿¤¤¾ì¹ç¤Ï¡¢
             ¥ª¥×¥·¥ç¥ó <option>-v</option> ¤ò»ØÄꤷ¤Æ¤¯¤À¤µ¤¤¡£</para>
 	</footnote>¡£
-	¤½¤·¤Æ¼¡¤Ë <application>adduser</application>
+	¤½¤·¤Æ¼¡¤Ë &man.adduser.8;
 	¤Î¥Ç¥Õ¥©¥ë¥ÈÀßÄê¤ò¹Ô¤Ê¤¤¡¢ºÇ½é¤Î¥æ¡¼¥¶¥¢¥«¥¦¥ó¥È¤òºîÀ®¤·¤Þ¤¹¡£
         ¥·¥¹¥Æ¥à¤òÆü¾ïÍøÍѤ¹¤ëºÝ¤Ë <username>root</username> ¤òÍѤ¤¤ë¤Î¤ÏºÇ°­¤Ç¤¹¡£</para>
 
       <example>
-	<title>adduser ¤ÎÀßÄê</title>
+	<title><command>adduser</command> ¤ÎÀßÄê</title>
 
 	<screen>&prompt.root; <userinput>adduser -v</userinput>
 Use option ``-silent'' if you don't want to see all warnings and questions.
@@ -486,7 +486,7 @@ Goodbye!
         ¿·¤·¤¤¥æ¡¼¥¶¤Ë¥¦¥§¥ë¥«¥à¥á¥Ã¥»¡¼¥¸¤Î¥á¡¼¥ë¤òÁ÷ÉÕ¤·¤Ê¤¤¤è¤¦¤Ë¤·¤Þ¤·¤¿¡£
 	¤½¤·¤Æ¤½¤ÎÀßÄê¤òÊݸ¤·¡¢
 	<username>jru</username> ÍѤΥ¢¥«¥¦¥ó¥È¤òºîÀ®¤·¡¢
-	<username>jru</username> ¤¬ (Èà½÷¤¬ <command>su</command>
+	<username>jru</username> ¤¬ (Èà½÷¤¬ &man.su.1;
 	¥³¥Þ¥ó¥É¤Ç <username>root</username> ¤ÎÌò³ä¤ò²Ì¤¿¤»¤ë¤è¤¦¤Ë)
 	<username>wheel</username>
 	¥°¥ë¡¼¥×¤Ë½ê°¤¹¤ë¤³¤È¤ò³Îǧ¤·¤Þ¤·¤¿¡£</para>
@@ -498,7 +498,7 @@ Goodbye!
       </note>
 
       <note>
-	<para>¤³¤ì°Ê¹ß¤Ï¥ª¥×¥·¥ç¥ó°ú¿ô¤ò¤Ä¤±¤ºÃ±¤Ë <command>adduser</command>
+	<para>¤³¤ì°Ê¹ß¤Ï¥ª¥×¥·¥ç¥ó°ú¿ô¤ò¤Ä¤±¤ºÃ±¤Ë &man.adduser.8;
           ¤òµ¯Æ°¤·¤Þ¤¹¡£
           ¥Ç¥Õ¥©¥ë¥ÈÀßÄê¤òÊѹ¹¤¹¤ëɬÍפϤ¢¤ê¤Þ¤»¤ó¡£
           ¤â¤·¡¢adduser ¤¬¥Ç¥Õ¥©¥ë¥ÈÀßÄê¤òÊѹ¹¤¹¤ë¤«¤É¤¦¤«¿Ò¤Í¤Æ¤­¤¿¤é¡¢
@@ -508,7 +508,7 @@ Goodbye!
     </sect2>
 
     <sect2 id="users-rmuser">
-      <title><application>rmuser</application></title>
+      <title><command>rmuser</command></title>
 
       <indexterm><primary><command>rmuser</command></primary></indexterm>
       <indexterm>
@@ -516,9 +516,9 @@ Goodbye!
 	<secondary>ºï½ü</secondary>
       </indexterm>
 
-      <para><command>rmuser</command> ¤ò»È¤¨¤Ð¡¢
+      <para>&man.rmuser.8; ¤ò»È¤¨¤Ð¡¢
 	¥·¥¹¥Æ¥à¤«¤é´°Á´¤Ë¥æ¡¼¥¶¤òºï½ü¤Ç¤­¤Þ¤¹¡£
-	<command>rmuser</command> ¤Ï¡¢¼¡¤Î¼ê½ç¤ò¼Â¹Ô¤·¤Þ¤¹¡£</para>
+	&man.rmuser.8; ¤Ï¡¢¼¡¤Î¼ê½ç¤ò¼Â¹Ô¤·¤Þ¤¹¡£</para>
 
       <procedure>
 	<step>
@@ -574,7 +574,7 @@ Goodbye!
       </procedure>
 
       <para>¥¹¡¼¥Ñ¥æ¡¼¥¶¥¢¥«¥¦¥ó¥È¤Îºï½ü¤Ë
-	<command>rmuser</command> ¤òÍøÍѤ¹¤ë¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó¡£
+	&man.rmuser.8; ¤òÍøÍѤ¹¤ë¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó¡£
         ¥¹¡¼¥Ñ¥æ¡¼¥¶¥¢¥«¥¦¥ó¥È¤Îºï½ü¤Ï¤Û¤È¤ó¤É¤¹¤Ù¤Æ¤Î¾ì¹ç¡¢
         Â絬ÌϤʥ·¥¹¥Æ¥à¤ÎÇ˲õ¤ò°ÕÌ£¤¹¤ë¤«¤é¤Ç¤¹¡£
       </para>
@@ -584,11 +584,11 @@ Goodbye!
       </para>
 
       <example>
-	<title>rmuser ¤Ë¤è¤ëÂÐÏÃŪ¤Ê¥¢¥«¥¦¥ó¥È¤Îºï½ü</title>
+	<title><command>rmuser</command> ¤Ë¤è¤ëÂÐÏÃŪ¤Ê¥¢¥«¥¦¥ó¥È¤Îºï½ü</title>
 
 	<screen>&prompt.root; <userinput>rmuser jru</userinput>
 Matching password entry:
-jru:*:1001:1001::0:0:J. Random User:/home/jru:/usr/local/bin/tcsh
+jru:*:1001:1001::0:0:J. Random User:/home/jru:/usr/local/bin/zsh
 Is this the entry you wish to remove? <userinput>y</userinput>
 Remove user's home directory (/home/jru)? <userinput>y</userinput>
 Updating password file, updating databases, done.
@@ -602,37 +602,36 @@ Removing files belonging to jru from /va
     </sect2>
 
     <sect2 id="users-chpass">
-      <title><application>chpass</application></title>
+      <title><command>chpass</command></title>
 
       <indexterm><primary><command>chpass</command></primary></indexterm>
-      <para><command>chpass</command> ¤Ï¡¢
+      <para>&man.chpass.1; ¤Ï¡¢
         ¥Ñ¥¹¥ï¡¼¥É¡¢¥·¥§¥ë¡¢¤½¤Î¾¤Î¸Ä¿Í¾ðÊó¤È¤¤¤Ã¤¿¡¢
         ¥æ¡¼¥¶¥Ç¡¼¥¿¥Ù¡¼¥¹¾ðÊó¤òÊѹ¹¤·¤Þ¤¹¡£
       </para>
 
       <para>¥·¥¹¥Æ¥à´ÉÍý¼Ô¤Ë¸Â¤ê¥¹¡¼¥Ñ¥æ¡¼¥¶¸¢¸Â¤Ç
-	<command>chpass</command> ¤òÍѤ¤¡¢
+	&man.chpass.1; ¤òÍѤ¤¡¢
 	¾¤Î¥æ¡¼¥¶¤Î¾ðÊó¤ä¥Ñ¥¹¥ï¡¼¥É¤òÊѹ¹¤Ç¤­¤Þ¤¹¡£</para>
 
       <para>¥æ¡¼¥¶Ì¾¤Î¾¤Ë¥ª¥×¥·¥ç¥ó¤ò»ØÄꤷ¤Ê¤¤¤È¡¢
-	<command>chpass</command>
-        ¤Ï¥æ¡¼¥¶¾ðÊó¤òÊÔ½¸¤¹¤ë¥¨¥Ç¥£¥¿¤òɽ¼¨¤·¤Þ¤¹¡£
+	&man.chpass.1; ¤Ï¥æ¡¼¥¶¾ðÊó¤òÊÔ½¸¤¹¤ë¥¨¥Ç¥£¥¿¤òɽ¼¨¤·¤Þ¤¹¡£
 	¥æ¡¼¥¶¤¬¥¨¥Ç¥£¥¿¤ò½ªÎ»¤¹¤ë¤È¡¢
 	¥æ¡¼¥¶¥Ç¡¼¥¿¥Ù¡¼¥¹¤¬¿·¤·¤¤¾ðÊó¤Ë¹¹¿·¤µ¤ì¤Þ¤¹¡£</para>
 
       <example>
-	<title>¥¹¡¼¥Ñ¥æ¡¼¥¶¤Ë¤è¤ëÂÐÏÃŪ¤Ê chpass</title>
+	<title>¥¹¡¼¥Ñ¥æ¡¼¥¶¤Ë¤è¤ëÂÐÏÃŪ¤Ê <command>chpass</command></title>
 
 	<screen>#Changing user database information for jru.
 Login: jru
 Password: *
-Uid [#]: 1000
-Gid [# or name]: 1000
+Uid [#]: 1001
+Gid [# or name]: 1001
 Change [month day year]:
 Expire [month day year]:
 Class:
 Home directory: /home/jru
-Shell: /usr/local/bin/tcsh
+Shell: /usr/local/bin/zsh
 Full Name: J. Random User
 Office Location:
 Office Phone:
@@ -645,10 +644,10 @@ Other information:</screen>
       </para>
 
       <example>
-	<title>Ä̾ï¤Î¥æ¡¼¥¶¤Ë¤è¤ëÂÐÏÃŪ¤Ê chpass</title>
+	<title>Ä̾ï¤Î¥æ¡¼¥¶¤Ë¤è¤ëÂÐÏÃŪ¤Ê <command>chpass</command></title>
 
 	<screen>#Changing user database information for jru.
-Shell: /usr/local/bin/tcsh
+Shell: /usr/local/bin/zsh
 Full Name: J. Random User
 Office Location:
 Office Phone:
@@ -657,13 +656,9 @@ Other information:</screen>
       </example>
 
       <note>
-	<para><command>chfn</command>¡¢
-          <command>chsh</command> ¤Ï¤¤¤º¤ì¤â¡¢
-	  ñ¤Ë <command>chpass</command>
+	<para>&man.chfn.1;, &man.chsh.1; ¤Ï¤¤¤º¤ì¤â¡¢Ã±¤Ë &man.chpass.1;
 	  ¤Ø¤Î¥Ï¡¼¥É¥ê¥ó¥¯¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£
-          ¤Þ¤¿¡¢<command>ypchpass</command>¡¢
-	  <command>ypchfn</command> ¤ª¤è¤Ó
-	  <command>ypchsh</command> ¤âƱÍͤǤ¹¡£
+          ¤Þ¤¿¡¢&man.ypchpass.1;, &man.ypchfn.1; ¤ª¤è¤Ó &man.ypchsh.1; ¤âƱÍͤǤ¹¡£
           NIS ¤Î¥µ¥Ý¡¼¥È¤Ï¼«Æ°Åª¤Ë¹Ô¤Ê¤ï¤ì¤Þ¤¹¤Î¤Ç¡¢
           ¥³¥Þ¥ó¥É¤ÎÀèƬ¤Ë <literal>yp</literal>
           ¤ò¤Ä¤±¤ëɬÍפϤ¢¤ê¤Þ¤»¤ó¡£
@@ -674,14 +669,14 @@ Other information:</screen>
     </sect2>
 
     <sect2 id="users-passwd">
-      <title>¥Ñ¥¹¥ï¡¼¥É¤ÎÊѹ¹</title>
+      <title><command>passwd</command></title>
 
       <indexterm><primary><command>passwd</command></primary></indexterm>
       <indexterm>
 	<primary>¥¢¥«¥¦¥ó¥È</primary>
 	<secondary>¥Ñ¥¹¥ï¡¼¥É¤ÎÊѹ¹</secondary>
       </indexterm>
-      <para><command>passwd</command> ¤Ï¡¢
+      <para>&man.passwd.1; ¤Ï¡¢
         ¥æ¡¼¥¶¤¬¼«Ê¬¤Î¥Ñ¥¹¥ï¡¼¥É¤òÊѹ¹¤¹¤ëÄ̾ï¤ÎÊýË¡¤Ç¤¹¡£
         ¥¹¡¼¥Ñ¥æ¡¼¥¶¸¢¸Â¤Ç¤Ï¡¢
         ¾¤Î¥æ¡¼¥¶¤Î¥Ñ¥¹¥ï¡¼¥É¤òÊѹ¹¤¹¤ë¤Î¤Ë»È¤ï¤ì¤Þ¤¹¡£
@@ -719,22 +714,20 @@ passwd: done</screen>
       </example>
 
       <note>
- 	<para><command>chpass</command> ƱÍÍ¡¢
-	  <command>yppasswd</command> ¤Ï¡¢Ã±¤Ë
-	  <command>passwd</command>
-	  ¤Ø¤Î¥Ï¡¼¥É¥ê¥ó¥¯¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤¹¤Î¤Ç¡¢
+ 	<para>&man.chpass.1; ƱÍÍ¡¢&man.yppasswd.1; ¤Ï¡¢Ã±¤Ë
+	  &man.passwd.1; ¤Ø¤Î¥Ï¡¼¥É¥ê¥ó¥¯¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤¹¤Î¤Ç¡¢
 	  NIS ¤Ï¤É¤Á¤é¤Î¥³¥Þ¥ó¥É¤Ç¤âÆ°ºî¤·¤Þ¤¹¡£</para>
       </note>
     </sect2>
 
     <sect2 id="users-pw">
-      <title><application>pw</application></title>
+      <title><command>pw</command></title>
       <indexterm><primary><command>pw</command></primary></indexterm>
 
       <para>&man.pw.8; ¤Ï¡¢¥æ¡¼¥¶¤ä¥°¥ë¡¼¥×¤ÎºîÀ®¡¢ºï½ü¡¢
 	Êѹ¹¤ª¤è¤Óɽ¼¨¤ò¹Ô¤Ê¤¦¥³¥Þ¥ó¥É¥é¥¤¥ó¤Î¥æ¡¼¥Æ¥£¥ê¥Æ¥£¤Ç¤¹¡£
 	¤³¤ì¤Ï¡¢¥·¥¹¥Æ¥à¥æ¡¼¥¶¥Õ¥¡¥¤¥ë¤ä¥·¥¹¥Æ¥à¥°¥ë¡¼¥×¥Õ¥¡¥¤¥ë¤Î
-	¥Õ¥í¥ó¥È¥¨¥ó¥É¤È¤·¤ÆƯ¤­¤Þ¤¹¡£<command>pw</command>
+	¥Õ¥í¥ó¥È¥¨¥ó¥É¤È¤·¤ÆƯ¤­¤Þ¤¹¡£&man.pw.8;
 	¤Ï¤È¤Æ¤â¶¯ÎϤʰìÏ¢¤Î¥³¥Þ¥ó¥É¥é¥¤¥ó¥ª¥×¥·¥ç¥ó¤òÍ­¤·¤Æ¤ª¤ê¡¢
 	¥·¥§¥ë¥¹¥¯¥ê¥×¥È¤Ç»È¤¦¤Î¤Ë¸þ¤¤¤Æ¤¤¤Þ¤¹¤¬¡¢¿·¤·¤¤¥æ¡¼¥¶¤Ï¡¢
 	¤³¤³¤Ç¾Ò²ð¤µ¤ì¤Æ¤¤¤ë¾¤Î¥³¥Þ¥ó¥É¤ËÈæ¤Ù¤ÆÆñ¤·¤¤¤È´¶¤¸¤ë¤«¤â¤·¤ì¤Þ¤»¤ó¡£</para>
@@ -750,11 +743,11 @@ passwd: done</screen>
       <primary>¥¢¥«¥¦¥ó¥È</primary>
       <secondary>À©¸Â</secondary>
     </indexterm>
-    <para>¤¢¤Ê¤¿¤¬¥Þ¥ë¥Á¥æ¡¼¥¶¥·¥¹¥Æ¥à¤ò±¿ÍѤ·¤Æ¤¤¤ë¤Î¤Ê¤é¡¢
-      ¤É¤Î¥æ¡¼¥¶¤â¥·¥¹¥Æ¥à¤Ë»³²¤òÍ¿¤¨¤Ê¤¤¤È¤¤¤¦¿®Íê¤Ï¤ª¤¤¤Æ¤¤¤Ê¤¤¤Î¤Ç¤Ï¤Ê¤¤¤Ç¤·¤ç¤¦¤«¡£
+    <para>¥æ¡¼¥¶¤¬¤¤¤ë¤Ê¤é¡¢
+      Èà¤é¤ËÂФ·¤Æ¥·¥¹¥Æ¥à¤ÎÍøÍѤòÀ©¸Â¤Ç¤­¤Ê¤¤¤«¹Í¤¨¤¿¤³¤È¤¬¤¢¤ë¤Î¤Ç¤Ï¤Ê¤¤¤Ç¤·¤ç¤¦¤«¡£
       FreeBSD ¤Ï¡¢
-      ¸Ä¡¹¤Î¥æ¡¼¥¶¤¬ÍøÍѤǤ­¤ë¥·¥¹¥Æ¥à¤Î¥ê¥½¡¼¥¹¤ò¥·¥¹¥Æ¥à´ÉÍý¼Ô¤¬À©¸Â¤¹¤ëÊýË¡¤ò¤¤¤¯¤Ä¤âÍÑ°Õ¤·¤Æ¤¤¤Þ¤¹¡£
-      ¤½¤Î¼ï¤ÎÀ©¸Â¤Ï°ìÈÌŪ¤Ë¤Ï¡¢¥Ç¥£¥¹¥¯¥¯¥©¡¼¥¿ (quota)
+      ¸Ä¡¹¤Î¥æ¡¼¥¶¤¬ÍøÍѤǤ­¤ë¥·¥¹¥Æ¥à»ñ¸»¤ÎÎ̤ò´ÉÍý¼Ô¤¬À©¸Â¤Ç¤­¤ëÊýË¡¤ò¤¤¤¯¤Ä¤âÍÑ°Õ¤·¤Æ¤¤¤Þ¤¹¡£
+      ¤½¤Î¼ï¤ÎÀ©¸Â¤Ï¡¢¥Ç¥£¥¹¥¯¥¯¥©¡¼¥¿ (quota) ¤È¤½¤Î¾¤Î»ñ¸»¤ÎÀ©¸Â¤Î
       ¤È¤½¤Î¾¤Î¥ê¥½¡¼¥¹¤ÎÀ©¸Â¤Î 2 ¤Ä¤Ëʬ¤±¤é¤ì¤Þ¤¹¡£</para>
 
     <indexterm><primary>¥¯¥©¡¼¥¿ (quotas)</primary></indexterm>
@@ -762,10 +755,9 @@ passwd: done</screen>
       <primary>¥æ¡¼¥¶¤ËÂФ¹¤ëÀ©¸Â</primary>
       <secondary>¥¯¥©¡¼¥¿</secondary>
     </indexterm>
-    <indexterm><primary>disk quotas</primary></indexterm>
-    <para>¥Ç¥£¥¹¥¯¥¯¥©¡¼¥¿¤Ï¡¢
-      ¥·¥¹¥Æ¥à´ÉÍý¼Ô¤¬¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤Ë¥æ¡¼¥¶¤¬»ÈÍѤǤ­¤ë¥Ç¥£¥¹¥¯Îΰè¤ÎÎ̤ò»Ø¼¨¤¹¤ë¼êÃʤǤ¹¡£
-      ¤µ¤é¤Ë¡¢¤½¤ÎÅÔÅÙ¬Äꤷ¤Ê¤¯¤Æ¤â¥æ¡¼¥¶¤Î¥Ç¥£¥¹¥¯»ÈÍÑÎ̤ò´Êñ¤Ë³Îǧ¤Ç¤­¤ë¼êÃʤâÄ󶡤·¤Æ¤¤¤Þ¤¹¡£
+    <indexterm><primary>¥Ç¥£¥¹¥¯¥¯¥©¡¼¥¿</primary></indexterm>
+    <para>¥Ç¥£¥¹¥¯¥¯¥©¡¼¥¿¤Ï¡¢¥æ¡¼¥¶¤Î¥Ç¥£¥¹¥¯¤ÎÍøÍѤòÀ©¸Â¤·¡¢
+      ¤½¤ÎÅÔÅÙ·×»»¤·¤Ê¤¯¤Æ¤â¥æ¡¼¥¶¤Î¥Ç¥£¥¹¥¯»ÈÍÑÎ̤ò´Êñ¤Ë³Îǧ¤Ç¤­¤ë¼êÃʤâÄ󶡤·¤Æ¤¤¤Þ¤¹¡£
       ¥¯¥©¡¼¥¿¤Ë¤Ä¤¤¤Æ¤Ï¡¢<xref linkend="quotas"> ¤Ç²òÀ⤷¤Æ¤¤¤Þ¤¹¡£</para>
 
     <para>¤½¤Î¾¤Î¥ê¥½¡¼¥¹¤ÎÀ©¸Â¤È¤Ï¡¢¥æ¡¼¥¶¤¬¾ÃÈñ¤Ç¤­¤ë
@@ -885,7 +877,7 @@ passwd: done</screen>
     </indexterm>
 	  <para>¥æ¡¼¥¶¤¬¼Â¹Ô¤Ç¤­¤ë¥×¥í¥»¥¹¿ô¤Î¾å¸Â¤Ç¤¹¡£
 	    ¥Õ¥©¥¢¥°¥é¥¦¥ó¥É¥×¥í¥»¥¹¤È¥Ð¥Ã¥¯¥°¥é¥¦¥ó¥É¥×¥í¥»¥¹¤ÎξÊý¤òÊ¿Åù¤Ë°·¤¤¤Þ¤¹¡£
-	    ¼«ÌÀ¤ÊÍýͳ¤«¤é¡¢<command>sysctl</command> ÊÑ¿ô
+	    ¼«ÌÀ¤ÊÍýͳ¤«¤é¡¢&man.sysctl.8; ÊÑ¿ô
 	    <varname>kern.maxproc</varname>
 	    ¤Ç»ØÄꤵ¤ì¤¿¥·¥¹¥Æ¥à¤ÎÀ©¸Â¤òĶ¤¨¤ë¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó¡£
 	    ¤Þ¤¿¡¢Æ±»þ¤ËÊ£¿ô¥í¥°¥¤¥ó¤¹¤ë¤³¤È¤ä¡¢
@@ -948,7 +940,7 @@ passwd: done</screen>
 	    IPC ¥Á¥ã¥ó¥Í¥ë¤òɽ¤ï¤¹¤Î¤Ë¤â»È¤ï¤ì¤Æ¤¤¤Þ¤¹¡£
 	    ¤Ç¤¹¤«¤é¡¢¤¢¤Þ¤êÄ㤤ÃͤËÀßÄꤷ¤Ê¤¤¤è¤¦Ãí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£
 	    ¤³¤ì¤ËÂбþ¤¹¤ë¥·¥¹¥Æ¥àÁ´ÂΤÎÀ©¸Â¤Ï
-	    <command>sysctl</command> ÊÑ¿ô
+	    &man.sysctl.8; ÊÑ¿ô
 	    <varname>kern.maxfiles</varname> ¤ÇÄêµÁ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£</para>
 	</listitem>
       </varlistentry>
@@ -1057,12 +1049,12 @@ passwd: done</screen>
       <secondary>¥°¥ë¡¼¥×</secondary>
     </indexterm>
     <para>¥°¥ë¡¼¥×¤È¤Ï¡¢Ã±¤Ë¥æ¡¼¥¶¤òÍåÎó¤·¤¿¤â¤Î¤Ç¤¹¡£
-      ¥°¥ë¡¼¥×¤Ï¡¢¥°¥ë¡¼¥×̾¤È gid (¥°¥ë¡¼¥× ID) ¤Ç¼±Ê̤µ¤ì¤Þ¤¹¡£
-      FreeBSD (¤È¾¤Î Unix ¥·¥¹¥Æ¥à¤Î¤Û¤È¤ó¤É) ¤Ç¤Ï¡¢
+      ¥°¥ë¡¼¥×¤Ï¡¢¥°¥ë¡¼¥×̾¤È GID (¥°¥ë¡¼¥× ID) ¤Ç¼±Ê̤µ¤ì¤Þ¤¹¡£
+      FreeBSD (¤È¾¤Î &unix; ¥·¥¹¥Æ¥à¤Î¤Û¤È¤ó¤É) ¤Ç¤Ï¡¢
       ¤¢¤ë¥×¥í¥»¥¹¤¬²¿¤«¤¹¤ë¤Î¤òµö²Ä¤¹¤ë¤«¤É¤¦¤«¤ò¥«¡¼¥Í¥ë¤¬È½ÃǤ¹¤ëºÝ¤ËÍøÍѤ¹¤ë
       2 ¤Ä¤Î°ø»Ò¤Ï¡¢¥æ¡¼¥¶ ID ¤È¤½¤Î¥æ¡¼¥¶¤¬½ê°¤¹¤ë¥°¥ë¡¼¥×¤Î°ìÍ÷¤Ç¤¹¡£
       ¥æ¡¼¥¶ ID ¤È°Û¤Ê¤ê¡¢¥×¥í¥»¥¹¤Ï¤½¤Î¥×¥í¥»¥¹¤Ë´Ø·¸ÉÕ¤±¤é¤ì¤¿¥°¥ë¡¼¥×¤Î°ìÍ÷¤ò»ý¤Á¤Þ¤¹¡£
-      ¤É¤³¤«¤Ç "¥°¥ë¡¼¥× ID" ¤Ë¿¨¤ì¤Æ¤¤¤ë¤Î¤òʹ¤¯¤³¤È¤¬¤¢¤ë¤Ç¤·¤ç¤¦¤¬¡¢
+      ¤É¤³¤«¤Ç <quote>¥°¥ë¡¼¥× ID</quote> ¤Ë¿¨¤ì¤Æ¤¤¤ë¤Î¤òʹ¤¯¤³¤È¤¬¤¢¤ë¤Ç¤·¤ç¤¦¤¬¡¢
       ¤Û¤È¤ó¤É¤Î¾ì¹ç¤Ï¡¢¤³¤ì¤Ïñ¤Ë°ìÍ÷¤ÎºÇ½é¤Î¥°¥ë¡¼¥×¤ò»Ø¤·¤Æ¤¤¤Þ¤¹¡£</para>
 
     <para>¥°¥ë¡¼¥×̾¤«¤é¥°¥ë¡¼¥× ID ¤Ø¤Î¼ÌÁü¤Ï
@@ -1085,8 +1077,8 @@ passwd: done</screen>
     <example>
       <title>&man.pw.8; ¤Ë¤è¤ë¥°¥ë¡¼¥×¤ÎÄɲÃ</title>
 
-      <screen>&prompt.root; <userinput><command>pw</command> groupadd <groupname>teamtwo</groupname></userinput>
-&prompt.root; <userinput><command>pw</command> groupshow <groupname>teamtwo</groupname></userinput>
+      <screen>&prompt.root; <userinput>pw groupadd teamtwo</userinput>
+&prompt.root; <userinput>pw groupshow teamtwo</userinput>
 teamtwo:*:1100:</screen>
     </example>
 
@@ -1100,8 +1092,8 @@ teamtwo:*:1100:</screen>
     <example>
       <title>&man.pw.8; ¤Ë¤è¤ë¥°¥ë¡¼¥×¤Ø¤Î¥æ¡¼¥¶ÄɲÃ</title>
 
-      <screen>&prompt.root; <userinput><command>pw</command> groupmod <groupname>teamtwo</groupname> <option>-M</option> <username>jru</username></userinput>
-&prompt.root; <userinput><command>pw</command> groupshow <groupname>teamtwo</groupname></userinput>
+      <screen>&prompt.root; <userinput>pw groupmod teamtwo -M jru</userinput>
+&prompt.root; <userinput>pw groupshow teamtwo</userinput>
 teamtwo:*:1100:jru</screen>
     </example>
 
@@ -1110,7 +1102,7 @@ teamtwo:*:1100:jru</screen>
       Á°¤ÎÀᤫ¤é¡¢
       ¥Ñ¥¹¥ï¡¼¥É¥Õ¥¡¥¤¥ë¤Ë³Æ¥æ¡¼¥¶¤Î¥°¥ë¡¼¥×¤¬µ­ºÜ¤µ¤ì¤Æ¤¤¤ë¤³¤È¤¬¤ï¤«¤ê¤Þ¤¹¡£
       Á°¼Ô (¥æ¡¼¥¶) ¤Ï¡¢¥·¥¹¥Æ¥à¤¬¼«Æ°Åª¤Ë¥°¥ë¡¼¥×°ìÍ÷¤ËÄɲä·¤Þ¤¹¡£
-      &man.pw.8; ¤Î <command>groupshow</command> ¥³¥Þ¥ó¥É¤ò»È¤Ã¤¿»þ¤Ï¡¢
+      &man.pw.8; ¤Î <option>groupshow</option> ¥³¥Þ¥ó¥É¤ò»È¤Ã¤¿»þ¤Ï¡¢
       ¤½¤Î¥æ¡¼¥¶¤Ï¥°¥ë¡¼¥×¤Î°ì°÷¤È¤·¤Æɽ¼¨¤µ¤ì¤Þ¤»¤ó¤¬¡¢&man.id.1;
       ¤Ê¤É¤Î¥Ä¡¼¥ë¤ò»È¤Ã¤Æ¾ðÊó¤òÌ䤤¹ç¤ï¤»¤ì¤Ð¡¢
       ¤½¤Î¾ðÊó¤ò°ú¤­½Ð¤»¤Þ¤¹¡£¤Ä¤Þ¤ê¡¢&man.pw.8; ¤Ï
@@ -1120,7 +1112,7 @@ teamtwo:*:1100:jru</screen>
     <example>
       <title>¥°¥ë¡¼¥×¤Ë½ê°¤·¤Æ¤¤¤ë¥æ¡¼¥¶¤òÄ´¤Ù¤ë¤¿¤á¤Î &man.id.1; ¤Î»È¤¤Êý</title>
 
-      <screen>&prompt.user; <userinput><command>id</command> <username>jru</username></userinput>
+      <screen>&prompt.user; <userinput>id jru</userinput>
 uid=1001(jru) gid=1001(jru) groups=1001(jru), 1100(teamtwo)</screen>
     </example>
 


More information about the svn-doc-all mailing list