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

Ryusuke SUZUKI ryusuke at FreeBSD.org
Sun May 12 07:10:25 UTC 2013


Author: ryusuke
Date: Sun May 12 07:10:24 2013
New Revision: 41605
URL: http://svnweb.freebsd.org/changeset/doc/41605

Log:
  - Merge the following from the English version:
  
  	r39362 -> r41037	head/ja_JP.eucJP/books/handbook/users/chapter.xml

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

Modified: head/ja_JP.eucJP/books/handbook/users/chapter.xml
==============================================================================
--- head/ja_JP.eucJP/books/handbook/users/chapter.xml	Sun May 12 03:14:27 2013	(r41604)
+++ head/ja_JP.eucJP/books/handbook/users/chapter.xml	Sun May 12 07:10:24 2013	(r41605)
@@ -3,7 +3,7 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: r39362
+     Original revision: r41037
      $FreeBSD$
 -->
 
@@ -24,15 +24,9 @@
   <sect1 id="users-synopsis">
     <title>¤³¤Î¾Ï¤Ç¤Ï</title>
 
-    <para>FreeBSD ¤Ï¡¢Ê£¿ô¤Î¥æ¡¼¥¶¤¬Æ±»þ¤Ë¥³¥ó¥Ô¥å¡¼¥¿¤ò»È¤¨¤ë¤è¤¦¤Ë¤·¤Þ¤¹¡£
-      ¤â¤Á¤í¤ó¡¢
+    <para>&os; ¤Ï¡¢Ê£¿ô¤Î¥æ¡¼¥¶¤¬Æ±»þ¤Ë¥³¥ó¥Ô¥å¡¼¥¿¤ò»È¤¨¤ë¤è¤¦¤Ë¤·¤Þ¤¹¡£
       ¥¹¥¯¥ê¡¼¥ó¤È¥­¡¼¥Ü¡¼¥É¤ÎÁ°¤Ë°ìÅ٤˺¤ì¤ë¤Î¤Ï¤½¤ÎÃæ¤Î°ì¿Í¤À¤±¤Ç¤¹¤¬
-      <footnote>
-	<para>Ê£¿ô¤ÎüËö¤òÀܳ¤·¤Ê¤¤¸Â¤ê¤Ï¤Ç¤¹¤¬¡¢
-	  ¤½¤ì¤Ï <xref linkend="serialcomms"/>
-	  ¤Ë¤È¤Ã¤Æ¤ª¤­¤Þ¤·¤ç¤¦¡£</para>
-      </footnote>¡¢
-      ¥æ¡¼¥¶¤Ï²¿¿Í¤Ç¤â¥Í¥Ã¥È¥ï¡¼¥¯¤òÄ̤·¤Æ¥í¥°¥¤¥ó¤·¤Æºî¶È¤Ç¤­¤Þ¤¹¡£
+      ¥æ¡¼¥¶¤Ï²¿¿Í¤Ç¤â¥Í¥Ã¥È¥ï¡¼¥¯¤òÄ̤·¤Æ¥í¥°¥¤¥ó¤Ç¤­¤Þ¤¹¡£
       ¥·¥¹¥Æ¥à¤ò»È¤¦¤¿¤á¤Ë¤Ï¡¢
       ¤É¤Î¥æ¡¼¥¶¤â¥¢¥«¥¦¥ó¥È¤¬¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£</para>
 
@@ -40,15 +34,11 @@
 
     <itemizedlist>
       <listitem>
-	<para>FreeBSD ¤Î¤µ¤Þ¤¶¤Þ¤Ê¥æ¡¼¥¶¥¢¥«¥¦¥ó¥È¤Î°ã¤¤</para>
+	<para>&os; ¤Î¤µ¤Þ¤¶¤Þ¤Ê¥æ¡¼¥¶¥¢¥«¥¦¥ó¥È¤Î°ã¤¤</para>
       </listitem>
 
       <listitem>
-	<para>¥æ¡¼¥¶¥¢¥«¥¦¥ó¥È¤ÎÄɲÃÊýË¡</para>
-      </listitem>
-
-      <listitem>
-	<para>¥æ¡¼¥¶¥¢¥«¥¦¥ó¥È¤Îºï½üÊýË¡</para>
+	<para>¥æ¡¼¥¶¥¢¥«¥¦¥ó¥È¤òÄɲä·¤¿¤êºï½ü¤¹¤ëÊýË¡</para>
       </listitem>
 
       <listitem>
@@ -69,7 +59,7 @@
 
     <itemizedlist>
       <listitem>
-	<para>&unix; ¤È¡¡FreeBSD ¤Î´ðÁÃÃμ± (<xref linkend="basics"/>)
+	<para><link linkend="basics">&unix; ¤È &os; ¤Î´ðÁÃÃμ±</link>
 	  ¤òÍý²ò¤·¤Æ¤ª¤¤¤Æ¤¯¤À¤µ¤¤¡£</para>
       </listitem>
     </itemizedlist>
@@ -78,14 +68,13 @@
   <sect1 id="users-introduction">
     <title>¤Ï¤¸¤á¤Ë</title>
 
-    <para>
-      ¥·¥¹¥Æ¥à¤Ø¥¢¥¯¥»¥¹¤¹¤ë¤Ë¤Ï¡¢¤«¤Ê¤é¤º¥æ¡¼¥¶¥¢¥«¥¦¥ó¥È¤¬»È¤ï¤ì¤Þ¤¹¡£
-      ¤Þ¤¿¡¢¥×¥í¥»¥¹¤â¤¹¤Ù¤Æ¥æ¡¼¥¶¤Ë¤è¤Ã¤Æ¼Â¹Ô¤µ¤ì¤Þ¤¹¤Î¤Ç¡¢
-      ¥æ¡¼¥¶¤È¥¢¥«¥¦¥ó¥È¤Î´ÉÍý¤Ï FreeBSD
-      ¥·¥¹¥Æ¥à¤Ë¤ª¤¤¤Æ·ç¤«¤¹¤³¤È¤Î¤Ç¤­¤Ê¤¤½ÅÍפʤâ¤Î¤Ç¤¹¡£
+    <para>&os; ¥·¥¹¥Æ¥à¤Ø¥¢¥¯¥»¥¹¤¹¤ë¤Ë¤Ï¡¢
+      ¤«¤Ê¤é¤º¥¢¥«¥¦¥ó¥È¤¬»È¤ï¤ì¡¢
+      ¤Þ¤¿¡¢¥×¥í¥»¥¹¤â¤¹¤Ù¤Æ¥æ¡¼¥¶¤Ë¤è¤Ã¤Æ¼Â¹Ô¤µ¤ì¤ë¤Î¤Ç¡¢
+      ¥æ¡¼¥¶¤È¥¢¥«¥¦¥ó¥È¤Î´ÉÍý¤Ï¡¢½ÅÍפʤâ¤Î¤Ç¤¹¡£
     </para>
 
-    <para>FreeBSD ¾å¤Î¤É¤Î¥¢¥«¥¦¥ó¥È¤Ë¤â¡¢
+    <para>&os; ¥·¥¹¥Æ¥à¾å¤Î¤É¤Î¥¢¥«¥¦¥ó¥È¤Ë¤â¡¢
       ¤½¤Î¥¢¥«¥¦¥ó¥È¤ò¼±Ê̤¹¤ë¤¿¤á¤Î¾ðÊ󤬤ʤˤ«¤·¤é·ë¤ÓÉÕ¤±¤é¤ì¤Æ¤¤¤Þ¤¹¡£</para>
 
     <variablelist>
@@ -95,10 +84,11 @@
 	<listitem>
 	  <para><prompt>login:</prompt>
 	    ¥×¥í¥ó¥×¥È¤ËÂФ·¤ÆÆþÎϤ¹¤ë¥æ¡¼¥¶¤Î̾Á°¤Ç¤¹¡£
-	    ¥æ¡¼¥¶Ì¾¤Ï¤½¤Î¥³¥ó¥Ô¥å¡¼¥¿Æâ¤Ç°ì°Õ¤Ç¤Ê¤±¤ì¤Ð¤Ê¤é¤º¡¢
+	    ¥æ¡¼¥¶Ì¾¤Ï¤½¤Î¥·¥¹¥Æ¥à¤Ç°ì°Õ¤Ç¤Ê¤±¤ì¤Ð¤Ê¤é¤º¡¢
 	    2 ̾¤Î¥æ¡¼¥¶¤ËƱ¤¸¥æ¡¼¥¶Ì¾¤ò¤Ä¤±¤ë¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó¡£
 	    Í­¸ú¤Ê¥æ¡¼¥¶Ì¾¤òºîÀ®¤¹¤ë¤Ë¤Ï &man.passwd.5;
 	    ¤Ëµ­ºÜ¤µ¤ì¤Æ¤¤¤ë¤¤¤¯¤Ä¤â¤Îµ¬Â§¤¬¤¢¤ê¤Þ¤¹¡£
+	    ¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Î¾å°Ì¸ß´¹À­¤òÊݤĤ¿¤á¤Ë¡¢
 	    8 ʸ»ú°Ê²¼¤Î¾®Ê¸»ú¤«¤é¤Ê¤ë¥æ¡¼¥¶Ì¾¤¬°ìÈÌŪ¤Ç¤¹¡£</para>
 	</listitem>
       </varlistentry>
@@ -108,41 +98,44 @@
 
 	<listitem>
 	  <para>¤½¤ì¤¾¤ì¤Î¥¢¥«¥¦¥ó¥È¤Ë¤Ï¥Ñ¥¹¥ï¡¼¥É¤¬¤¢¤ê¤Þ¤¹¡£
-	    ¥Ñ¥¹¥ï¡¼¥É¤Ï¶õÇò¤Ë¤â¤Ç¤­¡¢
-	    ¤½¤Î¾ì¹ç¤Ï¥·¥¹¥Æ¥à¤Ë¥¢¥¯¥»¥¹¤¹¤ë¤Î¤Ë¥Ñ¥¹¥ï¡¼¥É¤ÏÉÔÍפǤ¹¡£
-	    ¤³¤ì¤ÏÄ̾ï¤Ï¤È¤Æ¤â°­¤¤¹Í¤¨¤Ç¤¹¡£
+	    ¥Ñ¥¹¥ï¡¼¥É¤Ï¶õÇò¤Ë¤â¤Ç¤­¤Þ¤¹¤¬¡¢
+	    ¹Ô¤¦¤Ù¤­¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£
 	    ¤¹¤Ù¤Æ¤Î¥¢¥«¥¦¥ó¥È¤Ë¤Ï¥Ñ¥¹¥ï¡¼¥É¤ò¤Ä¤±¤ë¤Ù¤­¤Ç¤¹¡£</para>
 	</listitem>
       </varlistentry>
 
       <varlistentry>
-	<term>¥æ¡¼¥¶ ID (UID)</term>
+	<term>¥æ¡¼¥¶ ID (<acronym>UID</acronym>)</term>
 
 	<listitem>
-	  <para>UID ¤Ï¡¢¥·¥¹¥Æ¥à¤¬¥æ¡¼¥¶¤ò°ì°Õ¤Ë¼±Ê̤¹¤ë¤¿¤á¤Î¡¢
-	    ÅÁÅýŪ¤Ë¤Ï 0 ¤«¤é 65535<footnote id="users-largeuidgid">
-	      <para>UID ¤ä GID ¤Ë¤Ï 4294967295 ¤Þ¤Ç¤Î¿ô¤ò»È¤¨¤Þ¤¹¤¬¡¢
+	  <para>¥æ¡¼¥¶ ID (<acronym>UID</acronym>) ¤Ï¡¢
+	    ¥·¥¹¥Æ¥à¤¬¥æ¡¼¥¶¤ò°ì°Õ¤Ë¼±Ê̤¹¤ë¤¿¤á¤Î¡¢
+	    ÅÁÅýŪ¤Ë¤Ï 0 ¤«¤é 65535<footnote
+	      id="users-largeuidgid">
+	      <para><acronym>UID</acronym> ¤ä <acronym>GID</acronym>
+		¤Ë¤Ï 4294967295 ¤Þ¤Ç¤Î¿ô¤ò»È¤¨¤Þ¤¹¤¬¡¢
 		¤½¤Î¤è¤¦¤Ê ID ¤Ï¡¢ID
 		¤ÎÃͤËÂФ·¤Æ²¾Äê¤òÃÖ¤¤¤Æ¤¤¤ë¥½¥Õ¥È¥¦¥§¥¢¤ÇÌäÂê¤òµ¯¤³¤¹²ÄǽÀ­¤¬¤¢¤ê¤Þ¤¹¡£</para>
-	    </footnote>¤Î´Ö¤Î¿ôÃͤǤ¹¡£ÆâÉôŪ¤Ë¤Ï¡¢FreeBSD ¤Ï¥æ¡¼¥¶¤Î¼±ÊÌ¤Ë UID
-	    ¤ò»È¤Ã¤Æ¤¤¤Þ¤¹¡£¥æ¡¼¥¶Ì¾¤ò»ØÄê¤Ç¤­¤ë FreeBSD ¤Î¥³¥Þ¥ó¥É¤Ï¡¢
-	    ¤É¤ì¤â¥æ¡¼¥¶Ì¾¤ò UID ¤ËÊÑ´¹¤·¤Æ¤«¤é°·¤Ã¤Æ¤¤¤Þ¤¹¡£
-	    ¤³¤ì¤Ï¡¢Æ±¤¸ UID
+	    </footnote>¤Î´Ö¤Î¿ôÃͤǤ¹¡£ÆâÉôŪ¤Ë¤Ï¡¢&os; ¤Ï¥æ¡¼¥¶¤Î¼±Ê̤Ë
+	    <acronym>UID</acronym> ¤ò»È¤Ã¤Æ¤¤¤Þ¤¹¡£
+	    ¥æ¡¼¥¶Ì¾¤ò»ØÄê¤Ç¤­¤ë¥³¥Þ¥ó¥É¤Ï¡¢
+	    ¥æ¡¼¥¶Ì¾¤ò <acronym>UID</acronym> ¤ËÊÑ´¹¤·¤Æ¤«¤é°·¤Ã¤Æ¤¤¤Þ¤¹¡£
+	    ¹¥¤Þ¤·¤¯¤¢¤ê¤Þ¤»¤ó¤¬¡¢Æ±¤¸ <acronym>UID</acronym>
 	    ¤ò»ý¤Ä°Û¤Ê¤ë¥æ¡¼¥¶Ì¾¤Î¥¢¥«¥¦¥ó¥È¤¬¤¤¤¯¤Ä¤¢¤Ã¤Æ¤â¤è¤¤¤È¤¤¤¦¤³¤È¤Ë¤Ê¤ê¤Þ¤¹¡£
-	    FreeBSD ¤Ë¸Â¤Ã¤Æ¤¤¤¦¤È¡¢
-	    ¤³¤ì¤é¤Î¥¢¥«¥¦¥ó¥È¤Ï¤Ò¤È¤ê¤Î¥æ¡¼¥¶¤È¤·¤Æ°·¤ï¤ì¤Þ¤¹¡£
-	    ¤½¤¦¤¹¤ëɬÍפ¬¤¢¤ë¤È¤Ï»×¤¨¤Þ¤»¤ó¤¬¡£</para>
+	    &os; ¤Ë¸Â¤Ã¤Æ¤¤¤¦¤È¡¢
+	    ¤³¤ì¤é¤Î¥¢¥«¥¦¥ó¥È¤Ï¤Ò¤È¤ê¤Î¥æ¡¼¥¶¤È¤·¤Æ°·¤ï¤ì¤Þ¤¹¡£</para>
 	</listitem>
       </varlistentry>
 
       <varlistentry>
-	<term>¥°¥ë¡¼¥× ID (GID)</term>
+	<term>¥°¥ë¡¼¥× ID (<acronym>GID</acronym>)</term>
 
 	<listitem>
-	  <para>GID ¤Ï¡¢¥æ¡¼¥¶¤¬Â°¤¹¤ëÂè°ì¥°¥ë¡¼¥×¤ò°ì°Õ¤Ë¼±Ê̤¹¤ë¤¿¤á¤Î¡¢
+	  <para>¥°¥ë¡¼¥× ID (<acronym>GID</acronym>) ¤Ï¡¢
+	    ¥æ¡¼¥¶¤¬Â°¤¹¤ëÂè°ì¥°¥ë¡¼¥×¤ò°ì°Õ¤Ë¼±Ê̤¹¤ë¤¿¤á¤Î¡¢
 	    ÅÁÅýŪ¤Ë¤Ï 0 ¤«¤é 65535<footnoteref linkend="users-largeuidgid"/>
-	    ¤Î´Ö¤Î¿ôÃͤǤ¹¡£¥°¥ë¡¼¥×¤Ï¡¢UID ¤Ç¤Ï¤Ê¤¯¡¢
-	    ¥æ¡¼¥¶¤Î GID ¤Ë´ð¤Å¤¤¤Æ»ñ¸»¤Ø¤Î¥¢¥¯¥»¥¹¤òÀ©¸æ¤¹¤ë»ÅÁȤߤǤ¹¡£
+	    ¤Î´Ö¤Î¿ôÃͤǤ¹¡£¥°¥ë¡¼¥×¤Ï¡¢<acronym>UID</acronym> ¤Ç¤Ï¤Ê¤¯¡¢
+	    ¥æ¡¼¥¶¤Î <acronym>GID</acronym> ¤Ë´ð¤Å¤¤¤Æ»ñ¸»¤Ø¤Î¥¢¥¯¥»¥¹¤òÀ©¸æ¤¹¤ë»ÅÁȤߤǤ¹¡£
 	    ¤³¤ì¤Ï¡¢¤¢¤ë¼ï¤ÎÀßÄê¥Õ¥¡¥¤¥ë¤Î¥µ¥¤¥º¤òÂçÉý¤Ë¾®¤µ¤¯¤·¤Þ¤¹¡£
 	    ¥æ¡¼¥¶¤Ï¡¢Ê£¿ô¤Î¥°¥ë¡¼¥×¤Ë½ê°¤Ç¤­¤Þ¤¹¡£</para>
 	</listitem>
@@ -162,7 +155,7 @@
 	<term>¥Ñ¥¹¥ï¡¼¥ÉÊѹ¹»þ´Ö</term>
 
 	<listitem>
-	  <para>¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï¡¢FreeBSD
+	  <para>¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï¡¢&os;
 	    ¤ÏÄê´üŪ¤Ë¥Ñ¥¹¥ï¡¼¥É¤òÊѹ¹¤¹¤ë¤³¤È¤ò¥æ¡¼¥¶¤Ë¶¯À©¤·¤Þ¤»¤ó¡£
 	    ¤³¤ì¤ò¥æ¡¼¥¶¤´¤È¤ËÀßÄꤷ¤Æ¡¢°ìÉô¤Þ¤¿¤Ï¤¹¤Ù¤Æ¤Î¥æ¡¼¥¶¤Ë¡¢
 	    °ìÄê¤Î»þ´Ö¤¬¤¿¤Ã¤¿¤é¥Ñ¥¹¥ï¡¼¥É¤ò¶¯À©Åª¤ËÊѹ¹¤µ¤»¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£</para>
@@ -173,7 +166,7 @@
 	<term>¥¢¥«¥¦¥ó¥È¼º¸ú»þ´Ö</term>
 
 	<listitem>
-	  <para>¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï¡¢FreeBSD ¤Ï¥¢¥«¥¦¥ó¥È¤ò¼º¸ú¤µ¤»¤Þ¤»¤ó¡£
+	  <para>¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï¡¢&os; ¤Ï¥¢¥«¥¦¥ó¥È¤ò¼º¸ú¤µ¤»¤Þ¤»¤ó¡£
 	    ¤¿¤È¤¨¤Ð³Ø¹»¤ÇÀ¸Å̤Υ¢¥«¥¦¥ó¥È¤¬¤¢¤ë¾ì¹ç¤Ê¤É¡¢
 	    ¸Â¤é¤ì¤¿´ü´Ö¤À¤±¤Î¥¢¥«¥¦¥ó¥È¤òºîÀ®¤¹¤ë¤Ê¤é¡¢
 	    ¤½¤Î¥¢¥«¥¦¥ó¥È¤¬¤¤¤Ä¼º¸ú¤¹¤ë¤«»ØÄê¤Ç¤­¤Þ¤¹¡£
@@ -187,7 +180,7 @@
 	<term>¥æ¡¼¥¶¤Î»á̾</term>
 
 	<listitem>
-	  <para>FreeBSD ¤Ç¤Ï¥æ¡¼¥¶Ì¾¤Ç¥¢¥«¥¦¥ó¥È¤ò°ì°Õ¤Ë¼±Ê̤·¤Þ¤¹¤¬¡¢
+	  <para>&os; ¤Ç¤Ï¥æ¡¼¥¶Ì¾¤Ç¥¢¥«¥¦¥ó¥È¤ò°ì°Õ¤Ë¼±Ê̤·¤Þ¤¹¤¬¡¢
 	    ɬ¤º¤·¤â¥æ¡¼¥¶¤ÎËÜ̾¤òÈ¿±Ç¤·¤¿¤â¤Î¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£
 	    ¤³¤Î¾ðÊó¤ò¥¢¥«¥¦¥ó¥È¤Ë´ØÏ¢ÉÕ¤±¤ë¤³¤È¤â¤Ç¤­¤Þ¤¹¡£</para>
 	</listitem>
@@ -197,16 +190,15 @@
 	<term>¥Û¡¼¥à¥Ç¥£¥ì¥¯¥È¥ê</term>
 
 	<listitem>
-	  <para>¥Û¡¼¥à¥Ç¥£¥ì¥¯¥È¥ê¤Ï¡¢
-	    ¥æ¡¼¥¶¤¬¥í¥°¥¤¥ó¤·¤¿»þ¤Ëºî¶È¤ò³«»Ï¤¹¤ë¡¢
-	    ¥·¥¹¥Æ¥àÃæ¤Î¥Ç¥£¥ì¥¯¥È¥ê¤Ø¤Î¥Õ¥ë¥Ñ¥¹¤Ç¤¹¡£
-	    °ìÈÌŪ¤Ê´·½¬¤Ï¡¢¤¹¤Ù¤Æ¤Î¥æ¡¼¥¶¤Î¥Û¡¼¥à¥Ç¥£¥ì¥¯¥È¥ê¤ò
-	    <filename>/home/<replaceable>username</replaceable></filename>
-	    ¤«
-	    <filename>/usr/home/<replaceable>username</replaceable></filename>
+	  <para>¥Û¡¼¥à¥Ç¥£¥ì¥¯¥È¥ê¤Ï¡¢¥·¥¹¥Æ¥àÃæ¤Î¥Ç¥£¥ì¥¯¥È¥ê¤Ø¤Î¥Õ¥ë¥Ñ¥¹¤Ç¤¹¡£
+	    ¤³¤ì¤Ï¥æ¡¼¥¶¤¬¥í¥°¥¤¥ó¤·¤¿»þ¤Ëºî¶È¤ò³«»Ï¤¹¤ë¥Ç¥£¥ì¥¯¥È¥ê¤Ç¤¹¡£
+	    °ìÈÌŪ¤Ê´·½¬¤Ï¡¢¤¹¤Ù¤Æ¤Î¥æ¡¼¥¶¤Î¥Û¡¼¥à¥Ç¥£¥ì¥¯¥È¥ê¤ò <filename
+	      class="directory">/home/<replaceable>username</replaceable></filename>
+	    ¤« <filename
+	      class="directory">/usr/home/<replaceable>username</replaceable></filename>
 	    ¤Î²¼¤ËÃÖ¤¯¤³¤È¤Ç¤¹¡£
-	    ¥æ¡¼¥¶¤Ï¡¢¸Ä¿Í¤Î¥Õ¥¡¥¤¥ë¤ò¥Û¡¼¥à¥Ç¥£¥ì¥¯¥È¥ê¤ä¡¢
-	    ¤½¤Î²¼¤ËºîÀ®¤¹¤ë¥Ç¥£¥ì¥¯¥È¥ê¤ËÊݸ¤·¤Þ¤¹¡£</para>
+	    ³Æ¥æ¡¼¥¶¤Ï¡¢¸Ä¿Í¤Î¥Õ¥¡¥¤¥ë¤ä¥µ¥Ö¥Ç¥£¥ì¥¯¥È¥ê¤ò¡¢
+	    ¥æ¡¼¥¶¤Î¥Û¡¼¥à¥Ç¥£¥ì¥¯¥È¥ê¤ËÊݸ¤·¤Þ¤¹¡£</para>
 	</listitem>
       </varlistentry>
 
@@ -225,131 +217,113 @@
 
     <para>
       ¥¢¥«¥¦¥ó¥È¤Ë¤ÏÂ礭¤¯Ê¬¤±¤Æ»°¼ïÎà¤Î¤â¤Î¤¬¤¢¤ê¤Þ¤¹¡£¤½¤ì¤Ï¡¢
-      <link linkend="users-superuser">¥¹¡¼¥Ñ¡¼¥æ¡¼¥¶ (Superuser)</link>¡¢
-      <link linkend="users-system">¥·¥¹¥Æ¥à¥æ¡¼¥¶ (system users)</link>¡¢
+      <link linkend="users-superuser">¥¹¡¼¥Ñ¡¼¥æ¡¼¥¶ (superuser)</link>¡¢
+      <link linkend="users-system">¥·¥¹¥Æ¥à¥¢¥«¥¦¥ó¥È (system accounts)</link>¡¢
       ¤½¤·¤Æ<link linkend="users-user">¥æ¡¼¥¶¥¢¥«¥¦¥ó¥È (user accounts)</link> ¤Ç¤¹¡£
       ¥¹¡¼¥Ñ¡¼¥æ¡¼¥¶¤Î¥¢¥«¥¦¥ó¥È¤ÏÄ̾ï <username>root</username> ¤È¸Æ¤Ð¤ì¡¢
       ̵À©¸Â¤ÎÆÃ¸¢¤ò»ý¤Ä¤¿¤á¤Ë¥·¥¹¥Æ¥à¤Î´ÉÍý¤ËÍѤ¤¤é¤ì¤Þ¤¹¡£
-      ¤Þ¤¿¡¢¥·¥¹¥Æ¥à¥æ¡¼¥¶¤Ï¥µ¡¼¥Ó¥¹¤Î±¿ÍѤËÍѤ¤¤é¤ì¡¢
-      ºÇ¸å¤Î¥æ¡¼¥¶¥¢¥«¥¦¥ó¥È¤Ï¡¢
-      ¼ÂºÝ¤Ë¥í¥°¥¤¥ó¤·¤Æ¥á¡¼¥ë¤òÆÉ¤à¤È¤¤¤Ã¤¿ºî¶È¤ò¹Ô¤Ê¤¦ÍøÍѼԤΤ¿¤á¤Î¤â¤Î¤Ç¤¹¡£
-    </para>
-  </sect1>
-
-  <sect1 id="users-superuser">
-    <title>¥¹¡¼¥Ñ¡¼¥æ¡¼¥¶¥¢¥«¥¦¥ó¥È</title>
-
-    <indexterm>
-      <primary>¥¢¥«¥¦¥ó¥È</primary>
-      <secondary>¥¹¡¼¥Ñ¡¼¥æ¡¼¥¶ (root)</secondary>
-    </indexterm>
-    <para>¥¹¡¼¥Ñ¡¼¥æ¡¼¥¶¥¢¥«¥¦¥ó¥È¤ÏÄ̾ï
-      <username>root</username> ¤È¸Æ¤Ð¤ì¡¢
-      ¥·¥¹¥Æ¥à´ÉÍý¤ò¹Ô¤Ê¤¦¤¿¤á¤ËºÇ½é¤«¤éÀßÄêºÑ¤ß¤Ç¤¹¡£
-      ¤³¤Î¥¢¥«¥¦¥ó¥È¤Ï¥á¡¼¥ë¤Î¤ä¤ê¤È¤ê¡¢¥·¥¹¥Æ¥à¤ÎÄ´ºº¡¢
-      ¥×¥í¥°¥é¥ß¥ó¥°¤È¤¤¤Ã¤¿Æü¾ïŪ¤Êºî¶È¤ò¹Ô¤Ê¤¦¤¿¤á¤Ë»È¤ï¤ì¤ë¤Ù¤­¤â¤Î¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£
-    </para>
-
-    <para>
-      ¤½¤ÎÍýͳ¤Ï¡¢¥¹¡¼¥Ñ¡¼¥æ¡¼¥¶¤¬Ä̾ï¤Î¥æ¡¼¥¶¥¢¥«¥¦¥ó¥È¤È°Û¤Ê¤ê¡¢
-      Áàºî¤Ë¤Þ¤Ã¤¿¤¯À©¸Â¤ò¼õ¤±¤Ê¤¤¤³¤È¤Ë¤è¤ê¤Þ¤¹¡£
-      ¤½¤Î¤¿¤á¥¹¡¼¥Ñ¡¼¥æ¡¼¥¶¥¢¥«¥¦¥ó¥È¤ÇÁàºî¤ò´Ö°ã¤¨¤ë¤È¡¢
-      ¥·¥¹¥Æ¥à¤Ë½ÅÂç¤Ê±Æ¶Á¤òÍ¿¤¨¤Æ¤·¤Þ¤¦¶²¤ì¤¬¤¢¤ë¤Î¤Ç¤¹¡£
-      ¥æ¡¼¥¶¥¢¥«¥¦¥ó¥È¤Ç¤Ï¡¢²¾¤ËÁàºî¤ò´Ö°ã¤¨¤Æ¤â¥·¥¹¥Æ¥à¤ò²õ¤·¤Æ¤·¤Þ¤¦¤è¤¦¤Ê¤³¤È¤Ï
-      ¤Ç¤­¤Ê¤¤¤è¤¦¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£¤·¤¿¤¬¤Ã¤ÆÆÃ¸¢¤òɬÍפȤ·¤Æ¤¤¤Ê¤¤¤Î¤Ç¤¢¤ì¤Ð¡¢
-      ¤Ç¤­¤ë¤À¤±¤¤¤Ä¤â¥æ¡¼¥¶¥¢¥«¥¦¥ó¥È¤òÍøÍѤ¹¤ëÊý¤¬Ë¾¤Þ¤·¤¤¤È¸À¤¨¤ë¤Ç¤·¤ç¤¦¡£
-    </para>
+      ¤Þ¤¿¡¢¥·¥¹¥Æ¥à¥¢¥«¥¦¥ó¥È¤Ï¥µ¡¼¥Ó¥¹¤Î±¿ÍѤËÍѤ¤¤é¤ì¡¢
+      ¥æ¡¼¥¶¥¢¥«¥¦¥ó¥È¤Ï¡¢
+      ¼ÂºÝ¤Î¥æ¡¼¥¶¤Ë³ä¤êÅö¤Æ¤é¤ì¡¢¥í¥°¥¤¥ó¤·¤Æ¥·¥¹¥Æ¥à¤òÍøÍѤ¹¤ë¤¿¤á¤Ë»È¤ï¤ì¤Þ¤¹¡£</para>
 
-    <para>¥¹¡¼¥Ñ¡¼¥æ¡¼¥¶¤Ç¼Â¹Ô¤¹¤ë¥³¥Þ¥ó¥É¤Ï¤¤¤Ä¤Ç¤â¡¢
-      Æó²ó¡¢»°²ó¤È³Îǧ¤·¤Æ¤¯¤À¤µ¤¤¡£
-      ¤Ê¤¼¤Ê¤é¥¹¥Ú¡¼¥¹¤¬Â¿¤«¤Ã¤¿¤ê¡¢Ê¸»ú¤¬·ç¤±¤Æ¤¤¤¿¤ê¤¹¤ë¤À¤±¤Ç¡¢
-      ¼è¤êÊÖ¤·¤Î¤Ä¤«¤Ê¤¤¥Ç¡¼¥¿¤ÎÇ˲õ¤Ë¤Ä¤Ê¤¬¤ë²ÄǽÀ­¤¬¤¢¤ë¤«¤é¤Ç¤¹¡£</para>
+    <sect2 id="users-superuser">
+      <title>¥¹¡¼¥Ñ¡¼¥æ¡¼¥¶¥¢¥«¥¦¥ó¥È</title>
 
-    <para>
-      ¤Ç¤¹¤«¤é¡¢¤³¤Î¾Ï¤òÆÉ¤ó¤Ç¤«¤é¤¢¤Ê¤¿¤¬ºÇ½é¤Ë¤¹¤Ù¤­¤Ê¤Î¤Ï¡¢
-      ¤â¤·ÍѰդ·¤Æ¤¤¤Ê¤¤¤Ê¤é¡¢Æü¾ïŪ¤ËÍøÍѤ¹¤ë¤¿¤á¤Î
-      ¤¢¤Ê¤¿¼«¿È¤Î¥æ¡¼¥¶¥¢¥«¥¦¥ó¥È¤òºîÀ®¤¹¤ë¤³¤È¤Ç¤¹¡£
-      ¤³¤ì¤Ï¥Þ¥ë¥Á¥æ¡¼¥¶¥â¡¼¥É¡¢¥·¥ó¥°¥ë¥æ¡¼¥¶¥â¡¼¥É¤òÌä¤ï¤º¡¢
-      ƱÍͤˤ¢¤Æ¤Ï¤Þ¤ê¤Þ¤¹¡£
-      ¤³¤Î¾Ï¤Î¤¦¤·¤í¤ÎÊý¤Ç¤Ï¡¢¥¢¥«¥¦¥ó¥È¤ÎÄɲäÈÄ̾ï¤Î¥æ¡¼¥¶¤«¤é
-      ¥¹¡¼¥Ñ¡¼¥æ¡¼¥¶¤Ø¤È°Ü¹Ô¤¹¤ë¼ê½ç¤Ë¤Ä¤¤¤Æ°·¤¤¤Þ¤¹¡£
-    </para>
-  </sect1>
+      <indexterm>
+	<primary>¥¢¥«¥¦¥ó¥È</primary>
+	<secondary>¥¹¡¼¥Ñ¡¼¥æ¡¼¥¶ (root)</secondary>
+      </indexterm>
+      <para>¥¹¡¼¥Ñ¡¼¥æ¡¼¥¶¥¢¥«¥¦¥ó¥È¤ÏÄ̾ï
+	<username>root</username> ¤È¸Æ¤Ð¤ì¡¢
+	¥·¥¹¥Æ¥à´ÉÍý¤ò¹Ô¤Ê¤¦¤¿¤á¤Ë»È¤ï¤ì¤Þ¤¹¡£
+	¤³¤Î¥¢¥«¥¦¥ó¥È¤Ï¥á¡¼¥ë¤Î¤ä¤ê¤È¤ê¡¢¥·¥¹¥Æ¥à¤ÎÄ´ºº¡¢
+	¥×¥í¥°¥é¥ß¥ó¥°¤È¤¤¤Ã¤¿Æü¾ïŪ¤Êºî¶È¤ò¹Ô¤Ê¤¦¤¿¤á¤Ë»È¤ï¤ì¤ë¤Ù¤­¤â¤Î¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£</para>
+
+      <para>¤½¤ÎÍýͳ¤Ï¡¢¥¹¡¼¥Ñ¡¼¥æ¡¼¥¶¤¬Ä̾ï¤Î¥æ¡¼¥¶¥¢¥«¥¦¥ó¥È¤È°Û¤Ê¤ê¡¢
+	Áàºî¤Ë¤Þ¤Ã¤¿¤¯À©¸Â¤ò¼õ¤±¤Ê¤¤¤³¤È¤Ë¤è¤ê¤Þ¤¹¡£
+	¤½¤Î¤¿¤á¥¹¡¼¥Ñ¡¼¥æ¡¼¥¶¥¢¥«¥¦¥ó¥È¤ÇÁàºî¤ò´Ö°ã¤¨¤ë¤È¡¢
+	¥·¥¹¥Æ¥à¤Ë½ÅÂç¤Ê±Æ¶Á¤òÍ¿¤¨¤Æ¤·¤Þ¤¦¶²¤ì¤¬¤¢¤ë¤Î¤Ç¤¹¡£
+	¥æ¡¼¥¶¥¢¥«¥¦¥ó¥È¤Ç¤Ï¡¢
+	²¾¤ËÁàºî¤ò´Ö°ã¤¨¤Æ¤â¥·¥¹¥Æ¥à¤ò²õ¤·¤Æ¤·¤Þ¤¦¤è¤¦¤Ê¤³¤È¤Ï¤Ç¤­¤Ê¤¤¤è¤¦¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£
+	¤·¤¿¤¬¤Ã¤ÆÆÃ¸¢¤òɬÍפȤ·¤Æ¤¤¤Ê¤¤¤Î¤Ç¤¢¤ì¤Ð¡¢
+	¤Ç¤­¤ë¤À¤±¤¤¤Ä¤â¥æ¡¼¥¶¥¢¥«¥¦¥ó¥È¤òÍøÍѤ¹¤ëÊý¤¬Ë¾¤Þ¤·¤¤¤È¸À¤¨¤ë¤Ç¤·¤ç¤¦¡£</para>
+
+      <para>¥¹¡¼¥Ñ¡¼¥æ¡¼¥¶¤Ç¼Â¹Ô¤¹¤ë¥³¥Þ¥ó¥É¤Ï¤¤¤Ä¤Ç¤â¡¢
+	Æó²ó¡¢»°²ó¤È³Îǧ¤·¤Æ¤¯¤À¤µ¤¤¡£
+	¤Ê¤¼¤Ê¤é¥¹¥Ú¡¼¥¹¤¬Â¿¤«¤Ã¤¿¤ê¡¢Ê¸»ú¤¬·ç¤±¤Æ¤¤¤¿¤ê¤¹¤ë¤À¤±¤Ç¡¢
+	¼è¤êÊÖ¤·¤Î¤Ä¤«¤Ê¤¤¥Ç¡¼¥¿¤ÎÇ˲õ¤Ë¤Ä¤Ê¤¬¤ë²ÄǽÀ­¤¬¤¢¤ë¤«¤é¤Ç¤¹¡£</para>
+
+      <para>¾ï¤Ë¥·¥¹¥Æ¥à´ÉÍý¼ÔÍѤ˥桼¥¶¥¢¥«¥¦¥ó¥È¤òºîÀ®¤·¡¢
+	°ìÈÌŪ¤Ê»ÈÍѤˤª¤¤¤Æ¤Ï¡¢¤½¤Î¥¢¥«¥¦¥ó¥È¤ò»È¤Ã¤Æ¤¯¤À¤µ¤¤¡£
+	¤³¤ì¤Ï¥Þ¥ë¥Á¥æ¡¼¥¶¥â¡¼¥É¡¢¥·¥ó¥°¥ë¥æ¡¼¥¶¥â¡¼¥É¤òÌä¤ï¤º¡¢
+	ƱÍͤˤ¢¤Æ¤Ï¤Þ¤ê¤Þ¤¹¡£
+	¤³¤Î¾Ï¤Î¤¦¤·¤í¤ÎÊý¤Ç¤Ï¡¢¥¢¥«¥¦¥ó¥È¤ÎÄɲäÈÄ̾ï¤Î¥æ¡¼¥¶¤«¤é
+	¥¹¡¼¥Ñ¡¼¥æ¡¼¥¶¤Ø¤È°Ü¹Ô¤¹¤ë¼ê½ç¤Ë¤Ä¤¤¤Æ°·¤¤¤Þ¤¹¡£</para>
+    </sect2>
 
-  <sect1 id="users-system">
-    <title>¥·¥¹¥Æ¥à¥¢¥«¥¦¥ó¥È</title>
+    <sect2 id="users-system">
+      <title>¥·¥¹¥Æ¥à¥¢¥«¥¦¥ó¥È</title>
 
-    <indexterm>
-      <primary>¥¢¥«¥¦¥ó¥È</primary>
-      <secondary>¥·¥¹¥Æ¥à</secondary>
-    </indexterm>
-    <para>
-      ¥·¥¹¥Æ¥à¥æ¡¼¥¶¤È¤Ï¡¢DNS¡¢¥á¡¼¥ë¡¢
-      ¥¦¥§¥Ö¥µ¡¼¥Ð¤È¤¤¤Ã¤¿³Æ¼ï¥µ¡¼¥Ó¥¹¤ò±¿ÍѤ¹¤ë¤¿¤á¤Ë»È¤ï¤ì¤Þ¤¹¡£
-      ¤³¤ÎÌÜŪ¤Ï¡¢¥»¥­¥å¥ê¥Æ¥£¤ò³ÎÊݤ¹¤ë¤¿¤á¤Ç¤¹¡£
-      ¤â¤·¥µ¡¼¥Ó¥¹¤¬¥¹¡¼¥Ñ¡¼¥æ¡¼¥¶¤Ç¼Â¹Ô¤µ¤ì¤Æ¤¤¤ë¤È¡¢
-      ¤½¤ì¤é¤Î¥µ¡¼¥Ó¥¹¤Ï (ËÜÍè°Õ¿Þ¤·¤Ê¤¤¤è¤¦¤Ê)
-      ¤É¤ó¤Êưºî¤Ç¤â²Äǽ¤È¤Ê¤ê¡¢Å¬ÀÚ¤ÊÀ©¸Â¤òŬÍѤ¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó¡£
-    </para>
-
-    <indexterm>
-      <primary>¥¢¥«¥¦¥ó¥È</primary>
-      <secondary><username>daemon</username></secondary>
-    </indexterm>
-    <indexterm>
-      <primary>¥¢¥«¥¦¥ó¥È</primary>
-      <secondary><username>operator</username></secondary>
-    </indexterm>
-    <para>
-      ¥·¥¹¥Æ¥à¥æ¡¼¥¶¤Î¶ñÂÎÎã¤È¤·¤Æ¡¢
-      <username>daemon</username>,
-      <username>operator</username>,
-      <username>bind</username> (DNS; Domain Name Service ÍÑ),
-      <username>news</username> ¤ª¤è¤Ó <username>www</username>
-      ¤È¤¤¤Ã¤¿¤â¤Î¤¬¤¢¤ê¤Þ¤¹¡£
-      ¤Þ¤¿¥·¥¹¥Æ¥à´ÉÍý¼Ô¤Ï¤è¤¯¡¢
-      ¥¤¥ó¥¹¥È¡¼¥ë¤·¤¿¥¦¥§¥Ö¥µ¡¼¥Ð¤ò±¿ÍѤ¹¤ë¤¿¤á¤Ë
-      <username>httpd</username>
-      ¤È¤¤¤¦¥æ¡¼¥¶¤òºîÀ®¤·¤Æ¤¤¤Þ¤¹¡£
-    </para>
+      <indexterm>
+	<primary>¥¢¥«¥¦¥ó¥È</primary>
+	<secondary>¥·¥¹¥Æ¥à</secondary>
+      </indexterm>
+      <para>¥·¥¹¥Æ¥à¥¢¥«¥¦¥ó¥È¤È¤Ï¡¢DNS¡¢¥á¡¼¥ë¡¢
+	¥¦¥§¥Ö¥µ¡¼¥Ð¤È¤¤¤Ã¤¿³Æ¼ï¥µ¡¼¥Ó¥¹¤ò±¿ÍѤ¹¤ë¤¿¤á¤Ë»È¤ï¤ì¤Þ¤¹¡£
+	¤³¤ÎÌÜŪ¤Ï¡¢¥»¥­¥å¥ê¥Æ¥£¤ò³ÎÊݤ¹¤ë¤¿¤á¤Ç¤¹¡£
+	¤â¤·¥µ¡¼¥Ó¥¹¤¬¥¹¡¼¥Ñ¡¼¥æ¡¼¥¶¤Ç¼Â¹Ô¤µ¤ì¤Æ¤¤¤ë¤È¡¢
+	¤½¤ì¤é¤Î¥µ¡¼¥Ó¥¹¤Ï (ËÜÍè°Õ¿Þ¤·¤Ê¤¤¤è¤¦¤Ê)
+	¤É¤ó¤Êưºî¤Ç¤â²Äǽ¤È¤Ê¤ê¡¢Å¬ÀÚ¤ÊÀ©¸Â¤òŬÍѤ¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó¡£</para>
 
-    <indexterm>
-      <primary>¥¢¥«¥¦¥ó¥È</primary>
-      <secondary><username>nobody</username></secondary>
-    </indexterm>
-    <para>
-      <username>nobody</username>
-      ¥æ¡¼¥¶¤ÏÄ̾ï¤ÎÆÃ¸¢¤ò»ý¤¿¤Ê¤¤¥·¥¹¥Æ¥à¥æ¡¼¥¶¤Ç¤¹¡£
-      ¤·¤«¤·¡¢<username>nobody</username>
-      ¤òÍøÍѤ¹¤ë¥µ¡¼¥Ó¥¹¤¬Áý¤¨¤ì¤ÐÁý¤¨¤ë¤Û¤É¡¢
-      ¤½¤ì¤Ë½ê°¤¹¤ë¥Õ¥¡¥¤¥ë¤ä¥×¥í¥»¥¹¤âÁý¤¨¡¢
-      ¤½¤ÎÆÃ¸¢¤âÂ礭¤¯¤Ê¤ë¤È¤¤¤¦¤³¤È¤ò˺¤ì¤Ê¤¤¤è¤¦¤Ë¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
-  </sect1>
+      <indexterm>
+	<primary>¥¢¥«¥¦¥ó¥È</primary>
+	<secondary><username>daemon</username></secondary>
+      </indexterm>
+      <indexterm>
+	<primary>¥¢¥«¥¦¥ó¥È</primary>
+	<secondary><username>operator</username></secondary>
+      </indexterm>
+      <para>¥·¥¹¥Æ¥à¥¢¥«¥¦¥ó¥È¤Î¶ñÂÎÎã¤È¤·¤Æ¡¢
+	<username>daemon</username>, <username>operator</username>,
+	<username>bind</username>, <username>news</username> ¤ª¤è¤Ó
+	<username>www</username>
+	¤È¤¤¤Ã¤¿¤â¤Î¤¬¤¢¤ê¤Þ¤¹¡£</para>
 
-  <sect1 id="users-user">
-    <title>¥æ¡¼¥¶¥¢¥«¥¦¥ó¥È</title>
+      <indexterm>
+	<primary>¥¢¥«¥¦¥ó¥È</primary>
+	<secondary><username>nobody</username></secondary>
+      </indexterm>
+      <para><username>nobody</username>
+	¥æ¡¼¥¶¤ÏÄ̾ï¤ÎÆÃ¸¢¤ò»ý¤¿¤Ê¤¤¥·¥¹¥Æ¥à¥æ¡¼¥¶¤Ç¤¹¡£
+	¤·¤«¤·¡¢<username>nobody</username>
+	¤òÍøÍѤ¹¤ë¥µ¡¼¥Ó¥¹¤¬Áý¤¨¤ì¤ÐÁý¤¨¤ë¤Û¤É¡¢
+	¤½¤ì¤Ë½ê°¤¹¤ë¥Õ¥¡¥¤¥ë¤ä¥×¥í¥»¥¹¤âÁý¤¨¡¢
+	¤½¤ÎÆÃ¸¢¤âÂ礭¤¯¤Ê¤ë¤È¤¤¤¦¤³¤È¤ò˺¤ì¤Ê¤¤¤è¤¦¤Ë¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
+    </sect2>
 
-    <indexterm>
-      <primary>¥¢¥«¥¦¥ó¥È</primary>
-      <secondary>user</secondary>
-    </indexterm>
-    <para>
-      ¥æ¡¼¥¶¥¢¥«¥¦¥ó¥È¤Ï¡¢
-      ¼ç¤Ë¸½¼Â¤Î¥æ¡¼¥¶¤¬¥·¥¹¥Æ¥à¤Ë¥¢¥¯¥»¥¹¤¹¤ë¼êÃʤȤ·¤ÆÍѤ¤¤é¤ì¤ë¤â¤Î¤Ç¤¹¡£
-      ¤³¤Î¥¢¥«¥¦¥ó¥È¤ÏÍøÍѤ¹¤ë¥æ¡¼¥¶¤È¥·¥¹¥Æ¥à´Ä¶­¤òʬΥ¤·¤Þ¤¹¡£
-      ¤½¤Î¤¿¤á¡¢¥·¥¹¥Æ¥à¤ä¾¤Î¥æ¡¼¥¶¤Ë´í³²¤ò¤ª¤è¤Ü¤¹´í¸±À­¤ò¤Ê¤¯¤·¡¢¤Þ¤¿¡¢
-      ¾¤Ë±Æ¶Á¤òÍ¿¤¨¤ë¤³¤È¤Ê¤¯¥æ¡¼¥¶¼«¿È¤Î´Ä¶­¤ò¥«¥¹¥¿¥Þ¥¤¥º¤¹¤ë¤³¤È¤ò²Äǽ¤Ë¤·¤Æ¤¤¤Þ¤¹¡£
-    </para>
+    <sect2 id="users-user">
+      <title>¥æ¡¼¥¶¥¢¥«¥¦¥ó¥È</title>
 
-    <para>¥·¥¹¥Æ¥à¤Ë¥¢¥¯¥»¥¹¤¹¤ë¤¹¤Ù¤Æ¤Î¥æ¡¼¥¶¤Ï¡¢
-      ¤½¤ì¤¾¤ìÍ£°ì¤Î¥æ¡¼¥¶¥¢¥«¥¦¥ó¥È¤ò»ý¤Ä¤Ù¤­¤Ç¤¹¡£
-      ¤³¤¦¤¹¤ë¤³¤È¤Ç郎²¿¤ò¹Ô¤Ê¤Ã¤Æ¤¤¤ë¤«¤¬¤ï¤«¤ê¤Þ¤¹¤·¡¢
-      ¾¤Î¿Í¤ÎÀßÄê¤ò²õ¤·¤Æ¤·¤Þ¤Ã¤¿¤ê¡¢
-      ¾¿Í¤Î¥á¡¼¥ë¤òÆÉ¤ó¤Ç¤·¤Þ¤¦¤è¤¦¤Ê¤³¤È¤òÈò¤±¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£</para>
-
-    <para>¤½¤ì¤¾¤ì¤Î¥æ¡¼¥¶¤Ï²÷Ŭ¤Ë¥·¥¹¥Æ¥à¤òÍøÍѤ¹¤ë¤¿¤á¡¢
-      ¥·¥§¥ë¡¢¥¨¥Ç¥£¥¿¡¢¥­¡¼ÀßÄê¡¢¸À¸ì¤Ê¤É¡¢
-      ³Æ¼«¤Î´Ä¶­¤ò¥»¥Ã¥È¥¢¥Ã¥×¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£</para>
+      <indexterm>
+	<primary>¥¢¥«¥¦¥ó¥È</primary>
+	<secondary>user</secondary>
+      </indexterm>
+      <para>¥æ¡¼¥¶¥¢¥«¥¦¥ó¥È¤Ï¡¢
+	¼ç¤Ë¸½¼Â¤Î¥æ¡¼¥¶¤¬¥·¥¹¥Æ¥à¤Ë¥¢¥¯¥»¥¹¤¹¤ë¼êÃʤȤ·¤ÆÍѤ¤¤é¤ì¤ë¤â¤Î¤Ç¤¹¡£
+	¤³¤Î¥¢¥«¥¦¥ó¥È¤ÏÍøÍѤ¹¤ë¥æ¡¼¥¶¤È¥·¥¹¥Æ¥à´Ä¶­¤òʬΥ¤·¤Þ¤¹¡£
+	¤½¤Î¤¿¤á¡¢¥·¥¹¥Æ¥à¤ä¾¤Î¥æ¡¼¥¶¤Ë´í³²¤ò¤ª¤è¤Ü¤¹´í¸±À­¤ò¤Ê¤¯¤·¡¢¤Þ¤¿¡¢
+	¾¤Ë±Æ¶Á¤òÍ¿¤¨¤ë¤³¤È¤Ê¤¯¥æ¡¼¥¶¼«¿È¤Î´Ä¶­¤ò¥«¥¹¥¿¥Þ¥¤¥º¤¹¤ë¤³¤È¤ò²Äǽ¤Ë¤·¤Æ¤¤¤Þ¤¹¡£</para>
+
+      <para>¥·¥¹¥Æ¥à¤Ë¥¢¥¯¥»¥¹¤¹¤ë¤¹¤Ù¤Æ¤Î¥æ¡¼¥¶¤Ï¡¢
+	¤½¤ì¤¾¤ìÍ£°ì¤Î¥æ¡¼¥¶¥¢¥«¥¦¥ó¥È¤ò»ý¤Ä¤Ù¤­¤Ç¤¹¡£
+	¤³¤¦¤¹¤ë¤³¤È¤Ç´ÉÍý¼Ô¤Ï郎²¿¤ò¹Ô¤Ê¤Ã¤Æ¤¤¤ë¤«¤¬¤ï¤«¤ê¤Þ¤¹¤·¡¢
+	¾¤Î¿Í¤ÎÀßÄê¤ò²õ¤·¤Æ¤·¤Þ¤Ã¤¿¤ê¡¢
+	¾¿Í¤Î¥á¡¼¥ë¤òÆÉ¤ó¤Ç¤·¤Þ¤¦¤è¤¦¤Ê¤³¤È¤òÈò¤±¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£</para>
+
+      <para>¤½¤ì¤¾¤ì¤Î¥æ¡¼¥¶¤Ï²÷Ŭ¤Ë¥·¥¹¥Æ¥à¤òÍøÍѤ¹¤ë¤¿¤á¡¢
+	¥·¥§¥ë¡¢¥¨¥Ç¥£¥¿¡¢¥­¡¼ÀßÄê¡¢¸À¸ì¤Ê¤É¡¢
+	³Æ¼«¤Î´Ä¶­¤ò¥»¥Ã¥È¥¢¥Ã¥×¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£</para>
+    </sect2>
   </sect1>
 
   <sect1 id="users-modifying">
@@ -360,8 +334,8 @@
       <secondary>Êѹ¹</secondary>
     </indexterm>
 
-    <para>&unix; ´Ä¶­¤Ç¤Ï¡¢
-      ¥æ¡¼¥¶¥¢¥«¥¦¥ó¥È¤òÁàºî¤¹¤ë¤Î¤Ë¤µ¤Þ¤¶¤Þ¤Ê¥³¥Þ¥ó¥É¤¬»È¤¨¤Þ¤¹¡£
+    <para>&os; ¤Ë¤Ï¡¢
+      ¥æ¡¼¥¶¥¢¥«¥¦¥ó¥È¤òÁàºî¤¹¤ë¤Î¤Ë¤µ¤Þ¤¶¤Þ¤Ê¥³¥Þ¥ó¥É¤¬ÍѰդµ¤ì¤Æ¤¤¤Þ¤¹¡£
       ¤â¤Ã¤È¤â°ìÈÌŪ¤Ê¥³¥Þ¥ó¥É¤ò°Ê²¼¤Ë¼¨¤·¡¢
       ¤½¤ì¤Ë³¤¤¤Æ¾Ü¤·¤¤»ÈÍÑÎã¤ò¼¨¤·¤Þ¤¹¡£</para>
 
@@ -381,18 +355,22 @@
 	    <entry>&man.adduser.8;</entry>
 	    <entry>¥³¥Þ¥ó¥É¥é¥¤¥ó¤«¤é¥æ¡¼¥¶¤òÄɲ乤뤿¤á¤Î¿ä¾©¥¢¥×¥ê¥±¡¼¥·¥ç¥ó</entry>
 	  </row>
+
 	  <row>
 	    <entry>&man.rmuser.8;</entry>
 	    <entry>¥³¥Þ¥ó¥É¥é¥¤¥ó¤«¤é¥æ¡¼¥¶¤òºï½ü¤¹¤ë¤¿¤á¤Î¿ä¾©¥¢¥×¥ê¥±¡¼¥·¥ç¥ó</entry>
 	  </row>
+
 	  <row>
 	    <entry>&man.chpass.1;</entry>
 	    <entry>¥æ¡¼¥¶¥Ç¡¼¥¿¥Ù¡¼¥¹¤Î¾ðÊó¤òÊѹ¹¤¹¤ë¤¿¤á¤Î½ÀÆð¤Ê¥Ä¡¼¥ë</entry>
 	  </row>
+
 	  <row>
 	    <entry>&man.passwd.1;</entry>
 	    <entry>¥æ¡¼¥¶¤Î¥Ñ¥¹¥ï¡¼¥É¤òÊѹ¹¤¹¤ë´Êñ¤Ê¥³¥Þ¥ó¥É¥é¥¤¥ó¥Ä¡¼¥ë</entry>
 	  </row>
+
 	  <row>
 	    <entry>&man.pw.8;</entry>
 	    <entry>¥æ¡¼¥¶¥¢¥«¥¦¥ó¥È¤Î¤¢¤é¤æ¤ë²Õ½ê¤òÊѹ¹¤¹¤ë¶¯ÎϤǽÀÆð¤Ê¥Ä¡¼¥ë</entry>
@@ -412,20 +390,20 @@
 	<primary><command>adduser</command></primary>
       </indexterm>
       <indexterm>
-	<primary><filename class="directory">/usr/share/skel</filename></primary>
+	<primary><filename
+	  class="directory">/usr/share/skel</filename></primary>
       </indexterm>
       <indexterm><primary>¥¹¥±¥ë¥È¥ó¥Ç¥£¥ì¥¯¥È¥ê</primary></indexterm>
       <para>&man.adduser.8; ¤Ï¡¢
         ¿·¤·¤¤¥æ¡¼¥¶¤òÅÐÏ¿¤¹¤ë¤¿¤á¤Î¥·¥ó¥×¥ë¤Ê¥×¥í¥°¥é¥à¤Ç¤¹¡£
-	¤³¤Î¥×¥í¥°¥é¥à¤Ï¡¢¥·¥¹¥Æ¥à¤Î <filename>passwd</filename> ¤È
-	<filename>group</filename> ¥Õ¥¡¥¤¥ë¤Ë¿·¤·¤¤¹àÌܤòºîÀ®¤·¤Þ¤¹¡£
+	¥æ¡¼¥¶¤òÄɲ乤ë¤È¡¢
+	¤³¤Î¥×¥í¥°¥é¥à¤Ï¡¢<filename>/etc/passwd</filename> ¤È
+	<filename>/etc/group</filename> ¤ò¼«Æ°Åª¤Ë¹¹¿·¤·¤Þ¤¹¡£
 	¤Þ¤¿¡¢¿·µ¬¥æ¡¼¥¶¤Î¥Û¡¼¥à¥Ç¥£¥ì¥¯¥È¥ê¤òºîÀ®¤·¡¢
-	<filename>/usr/share/skel</filename>
-	¤«¤é¡¢¥Ç¥Õ¥©¥ë¥È¤Ç»ÈÍѤµ¤ì¤ëÀßÄê¥Õ¥¡¥¤¥ë
-	(<quote>¥É¥Ã¥È¥Õ¥¡¥¤¥ë</quote>)
-	¤ò¥³¥Ô¡¼¤·¤Þ¤¹¡£¤Þ¤¿¡¢¿·¤·¤¯ºîÀ®¤µ¤ì¤¿¥æ¡¼¥¶¤ËÂФ·¤Æ¡¢
-        ¥¦¥§¥ë¥«¥à¥á¥Ã¥»¡¼¥¸¤ò¥á¡¼¥ë¤ÇÁ÷¿®¤¹¤ë¤³¤È¤â²Äǽ¤Ç¤¹¡£
-      </para>
+	<filename class="directory">/usr/share/skel</filename>
+	¤«¤é¡¢¥Ç¥Õ¥©¥ë¥È¤Ç»ÈÍѤµ¤ì¤ëÀßÄê¥Õ¥¡¥¤¥ë¤ò¥³¥Ô¡¼¤·¤Þ¤¹¡£
+	¤Þ¤¿¡¢¿·¤·¤¯ºîÀ®¤µ¤ì¤¿¥æ¡¼¥¶¤ËÂФ·¤Æ¡¢
+        ¥¦¥§¥ë¥«¥à¥á¥Ã¥»¡¼¥¸¤ò¥á¡¼¥ë¤ÇÁ÷¿®¤¹¤ë¤³¤È¤â²Äǽ¤Ç¤¹¡£</para>
 
       <example>
 	<title>&os; ¤Ë¤ª¤±¤ë¥æ¡¼¥¶¤ÎÄɲÃ</title>
@@ -463,8 +441,8 @@ Goodbye!
       </example>
 
       <note>
-	<para>ÆþÎϤ·¤¿¥Ñ¥¹¥ï¡¼¥É¤Ï²èÌ̤Ëɽ¼¨¤µ¤ì¤Þ¤»¤ó¡£
-	  ¥¢¥¹¥¿¥ê¥¹¥¯µ­¹æ¤âɽ¼¨¤µ¤ì¤Þ¤»¤ó¤Î¤Ç¡¢
+	<para>ÆþÎϤ·¤¿¥Ñ¥¹¥ï¡¼¥É¤Ï²èÌ̤Ëɽ¼¨¤µ¤ì¤Þ¤»¤ó¤Î¤Ç¡¢
+	  ¥æ¡¼¥¶¥¢¥«¥¦¥ó¥È¤òºîÀ®¤¹¤ëºÝ¤Ë¤Ï¡¢
 	  ¥Ñ¥¹¥ï¡¼¥É¤ò´Ö°ã¤¨¤ÆÆþÎϤ·¤Æ¤·¤Þ¤ï¤Ê¤¤¤è¤¦¤ËÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
       </note>
     </sect2>
@@ -478,14 +456,14 @@ Goodbye!
 	<secondary>ºï½ü</secondary>
       </indexterm>
 
-      <para>&man.rmuser.8; ¤ò»È¤¨¤Ð¡¢
-	¥·¥¹¥Æ¥à¤«¤é´°Á´¤Ë¥æ¡¼¥¶¤òºï½ü¤Ç¤­¤Þ¤¹¡£
-	&man.rmuser.8; ¤Ï¡¢¼¡¤Î¼ê½ç¤ò¼Â¹Ô¤·¤Þ¤¹¡£</para>
+      <para>¥·¥¹¥Æ¥à¤«¤é´°Á´¤Ë¥æ¡¼¥¶¤òºï½ü¤¹¤ë¤Ë¤Ï¡¢
+	&man.rmuser.8; ¤ò»È¤¤¤Þ¤¹¡£
+	¤³¤Î¥³¥Þ¥ó¥É¤Ï¡¢¼¡¤Î¼ê½ç¤ò¼Â¹Ô¤·¤Þ¤¹¡£</para>
 
       <procedure>
 	<step>
-	  <para>»ØÄꤵ¤ì¤¿¥æ¡¼¥¶¤Î &man.crontab.1; ¥¨¥ó¥È¥ê¤òºï½ü
-            (¸ºß¤¹¤ë¾ì¹ç)¡£</para>
+	  <para>»ØÄꤵ¤ì¤¿¥æ¡¼¥¶¤Î &man.crontab.1;
+	    ¥¨¥ó¥È¥ê¤¬Â¸ºß¤¹¤ë¾ì¹ç¤Ë¤Ïºï½ü¡£</para>
 	</step>
 
 	<step>
@@ -507,12 +485,12 @@ Goodbye!
 	</step>
 
 	<step>
-	  <para><filename>/var/mail</filename>
+	  <para><filename class="directory">/var/mail</filename>
             ¤«¤é¡¢»ØÄꤵ¤ì¤¿¥æ¡¼¥¶¤ÎÅþÃå¥á¡¼¥ë¥Õ¥¡¥¤¥ë¤òºï½ü¡£</para>
 	</step>
 
 	<step>
-	  <para><filename>/tmp</filename>
+	  <para><filename class="directory">/tmp</filename>
             ¤Î¤è¤¦¤Ê°ì»þ¥Õ¥¡¥¤¥ëÊݸÎΰ褫¤é¡¢
             »ØÄꤵ¤ì¤¿¥æ¡¼¥¶¤Î½êÍ­¤¹¤ë¥Õ¥¡¥¤¥ë¤òºï½ü¡£</para>
 	</step>
@@ -522,26 +500,22 @@ Goodbye!
             <filename>/etc/group</filename> ¤Ë¤¢¤ë
             ¤¹¤Ù¤Æ¤Î¥°¥ë¡¼¥×¤«¤é¡¢»ØÄꤵ¤ì¤¿¥æ¡¼¥¶¤òºï½ü¤·¤Þ¤¹¡£</para>
 
-	    <note>
-	      <para>
-                »ØÄꤵ¤ì¤¿¥æ¡¼¥¶¤ÈƱ¤¸Ì¾Á°¤Î¥°¥ë¡¼¥×¤Ç¡¢
-                ¤½¤Î¥æ¡¼¥¶¤¬ºï½ü¤µ¤ì¤ë¤È¶õ¤Î¥°¥ë¡¼¥×¤È¤Ê¤ë¾ì¹ç¤Ï¡¢
-                ¤½¤Î¥°¥ë¡¼¥×¼«ÂΤ¬ºï½ü¤µ¤ì¤Þ¤¹¡£
-                ¤³¤ì¤Ï &man.adduser.8; ¤Ë¤è¤Ã¤Æ¥æ¡¼¥¶¤´¤È¤ËºîÀ®¤µ¤ì¤ë¡¢
-                ¥æ¥Ë¡¼¥¯¤Ê¥°¥ë¡¼¥×¤ËÂбþ¤¹¤ë¤â¤Î¤Ç¤¹¡£</para>
-	    </note>
+	  <note>
+	    <para>»ØÄꤵ¤ì¤¿¥æ¡¼¥¶¤ÈƱ¤¸Ì¾Á°¤Î¥°¥ë¡¼¥×¤Ç¡¢
+	      ¤½¤Î¥æ¡¼¥¶¤¬ºï½ü¤µ¤ì¤ë¤È¶õ¤Î¥°¥ë¡¼¥×¤È¤Ê¤ë¾ì¹ç¤Ï¡¢
+	      ¤½¤Î¥°¥ë¡¼¥×¼«ÂΤ¬ºï½ü¤µ¤ì¤Þ¤¹¡£
+	      ¤³¤ì¤Ï &man.adduser.8; ¤Ë¤è¤Ã¤Æ¥æ¡¼¥¶¤´¤È¤ËºîÀ®¤µ¤ì¤ë¡¢
+	      ¥æ¥Ë¡¼¥¯¤Ê¥°¥ë¡¼¥×¤ËÂбþ¤¹¤ë¤â¤Î¤Ç¤¹¡£</para>
+	  </note>
 	</step>
       </procedure>
 
       <para>¥¹¡¼¥Ñ¥æ¡¼¥¶¥¢¥«¥¦¥ó¥È¤Îºï½ü¤Ë
 	&man.rmuser.8; ¤òÍøÍѤ¹¤ë¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó¡£
         ¥¹¡¼¥Ñ¥æ¡¼¥¶¥¢¥«¥¦¥ó¥È¤Îºï½ü¤Ï¤Û¤È¤ó¤É¤¹¤Ù¤Æ¤Î¾ì¹ç¡¢
-        Â絬ÌϤʥ·¥¹¥Æ¥à¤ÎÇ˲õ¤ò°ÕÌ£¤¹¤ë¤«¤é¤Ç¤¹¡£
-      </para>
+        Â絬ÌϤʥ·¥¹¥Æ¥à¤ÎÇ˲õ¤ò°ÕÌ£¤¹¤ë¤«¤é¤Ç¤¹¡£</para>
 
-      <para>¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï¡¢
-        ¤É¤¦¤¤¤¦Áàºî¤ò¹Ô¤Ê¤Ã¤Æ¤¤¤ë¤«³Îǧ¤Ç¤­¤ëÂÐÏå⡼¥É¤¬»È¤ï¤ì¤Þ¤¹¡£
-      </para>
+      <para>¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï¡¢°Ê²¼¤ÎÎã¤Î¤è¤¦¤ÊÂÐÏå⡼¥É¤¬»È¤ï¤ì¤Þ¤¹¡£</para>
 
       <example>
 	<title><command>rmuser</command> ¤Ë¤è¤ëÂÐÏÃŪ¤Ê¥¢¥«¥¦¥ó¥È¤Îºï½ü</title>
@@ -565,12 +539,11 @@ Removing files belonging to jru from /va
       <title><command>chpass</command></title>
 
       <indexterm><primary><command>chpass</command></primary></indexterm>
-      <para>&man.chpass.1; ¤Ï¡¢
+      <para>&man.chpass.1; ¤òÍѤ¤¤Æ¡¢
         ¥Ñ¥¹¥ï¡¼¥É¡¢¥·¥§¥ë¡¢¤½¤Î¾¤Î¸Ä¿Í¾ðÊó¤È¤¤¤Ã¤¿¡¢
-        ¥æ¡¼¥¶¥Ç¡¼¥¿¥Ù¡¼¥¹¾ðÊó¤òÊѹ¹¤·¤Þ¤¹¡£
-      </para>
+        ¥æ¡¼¥¶¥Ç¡¼¥¿¥Ù¡¼¥¹¾ðÊó¤òÊѹ¹¤Ç¤­¤Þ¤¹¡£</para>
 
-      <para>¥·¥¹¥Æ¥à´ÉÍý¼Ô¤Ë¸Â¤ê¥¹¡¼¥Ñ¥æ¡¼¥¶¸¢¸Â¤Ç
+      <para>¥¹¡¼¥Ñ¥æ¡¼¥¶¸¢¸Â¤Ë¸Â¤ê¡¢
 	&man.chpass.1; ¤òÍѤ¤¡¢
 	¾¤Î¥æ¡¼¥¶¤Î¾ðÊó¤ä¥Ñ¥¹¥ï¡¼¥É¤òÊѹ¹¤Ç¤­¤Þ¤¹¡£</para>
 
@@ -604,8 +577,8 @@ Home Phone:
 Other information:</screen>
       </example>
 
-      <para>Ä̾ï¤Î¥æ¡¼¥¶¤Ï¡¢¤³¤Î¾ðÊó¤Î¸Â¤é¤ì¤¿Éôʬ¤Î¤ßÊѹ¹¤¬²Äǽ¤Ç¤¹¡£
-        ¤Þ¤¿¡¢Êѹ¹¤Ç¤­¤ë¤Î¤Ï¤½¤Î¥æ¡¼¥¶¼«¿È¤Î¾ðÊó¤Î¤ß¤Ç¤¹¡£
+      <para>¥æ¡¼¥¶¤Ï¡¢¤³¤Î¾ðÊó¤Î¸Â¤é¤ì¤¿Éôʬ¤Î¤ßÊѹ¹¤¬²Äǽ¤Ç¤¹¡£
+        ¤Þ¤¿¡¢Êѹ¹¤Ç¤­¤ë¤Î¤Ï¤½¤Î¥æ¡¼¥¶¼«¿È¤Î¥¢¥«¥¦¥ó¥È¾ðÊó¤Î¤ß¤Ç¤¹¡£
       </para>
 
       <example>
@@ -621,14 +594,13 @@ Other information:</screen>
       </example>
 
       <note>
-	<para>&man.chfn.1;, &man.chsh.1; ¤Ï¤¤¤º¤ì¤â¡¢Ã±¤Ë &man.chpass.1;
-	  ¤Ø¤Î¥Ï¡¼¥É¥ê¥ó¥¯¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£
+	<para>&man.chfn.1; ¤ª¤è¤Ó &man.chsh.1; ¤Ï¤¤¤º¤ì¤â¡¢ &man.chpass.1;
+	  ¤Ø¤Î¥ê¥ó¥¯¤Ç¤¹¡£
           ¤Þ¤¿¡¢&man.ypchpass.1;, &man.ypchfn.1; ¤ª¤è¤Ó &man.ypchsh.1; ¤âƱÍͤǤ¹¡£
-          NIS ¤Î¥µ¥Ý¡¼¥È¤Ï¼«Æ°Åª¤Ë¹Ô¤Ê¤ï¤ì¤Þ¤¹¤Î¤Ç¡¢
+          <acronym>NIS</acronym> ¤Î¥µ¥Ý¡¼¥È¤Ï¼«Æ°Åª¤Ë¹Ô¤Ê¤ï¤ì¤Þ¤¹¤Î¤Ç¡¢
           ¥³¥Þ¥ó¥É¤ÎÀèÆ¬¤Ë <literal>yp</literal>
           ¤ò¤Ä¤±¤ëɬÍפϤ¢¤ê¤Þ¤»¤ó¡£
-	  ¤â¤·¡¢º®Í𤷤Ƥ⿴ÇÛ¤·¤Ê¤¤¤Ç¤¯¤À¤µ¤¤¡£
-	  NIS ¤Ë¤Ä¤¤¤Æ¤Ï¡¢<xref linkend="advanced-networking"/>
+	  NIS ¤ÎÀßÄê¤Ë¤Ä¤¤¤Æ¤Ï¡¢
 	  <!--  <xref linkend="network-servers"/> (cf. rev.1.48) -->
 	  ¤ÇÀâÌÀ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£</para>
       </note>
@@ -645,13 +617,14 @@ Other information:</screen>
       <para>&man.passwd.1; ¤Ï¡¢
         ¥æ¡¼¥¶¤¬¼«Ê¬¤Î¥Ñ¥¹¥ï¡¼¥É¤òÊѹ¹¤¹¤ëÄ̾ï¤ÎÊýË¡¤Ç¤¹¡£
         ¥¹¡¼¥Ñ¥æ¡¼¥¶¸¢¸Â¤Ç¤Ï¡¢
-        ¾¤Î¥æ¡¼¥¶¤Î¥Ñ¥¹¥ï¡¼¥É¤òÊѹ¹¤¹¤ë¤Î¤Ë»È¤ï¤ì¤Þ¤¹¡£
-      </para>
+        ¾¤Î¥æ¡¼¥¶¤Î¥Ñ¥¹¥ï¡¼¥É¤òÊѹ¹¤¹¤ë¤Î¤Ë»È¤ï¤ì¤Þ¤¹¡£</para>
 
       <note>
 	<para>¸í¤Ã¤Æ¡¢¤Þ¤¿¤ÏÉÔÀµ¤Ê¥Ñ¥¹¥ï¡¼¥É¤ÎÊѹ¹¤òÈò¤±¤ë¤¿¤á¡¢
 	  ¿·¤·¤¤¥Ñ¥¹¥ï¡¼¥É¤òÀßÄꤹ¤ëÁ°¤Ë¡¢
-	  ¤â¤È¤Î¥Ñ¥¹¥ï¡¼¥É¤òÆþÎϤ·¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£</para>
+	  ¤â¤È¤Î¥Ñ¥¹¥ï¡¼¥É¤òÆþÎϤ·¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£
+	  ¥¹¡¼¥Ñ¡¼¥æ¡¼¥¶¤Î¸¢¸Â¤Ç¥æ¡¼¥¶¤Î¥Ñ¥¹¥ï¡¼¥É¤òÊѹ¹¤¹¤ëºÝ¤Ë¤Ï¡¢
+	  ¤â¤È¤Î¥Ñ¥¹¥ï¡¼¥É¤òÆþÎϤ¹¤ëɬÍפϤ¢¤ê¤Þ¤»¤ó¡£</para>
       </note>
 
       <example>
@@ -678,14 +651,15 @@ passwd: done</screen>
       </example>
 
       <note>
- 	<para>&man.chpass.1; ƱÍÍ¡¢&man.yppasswd.1; ¤Ï¡¢Ã±¤Ë
-	  &man.passwd.1; ¤Ø¤Î¥Ï¡¼¥É¥ê¥ó¥¯¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤¹¤Î¤Ç¡¢
+ 	<para>&man.chpass.1; ƱÍÍ¡¢&man.yppasswd.1; ¤Ï¡¢
+	  &man.passwd.1; ¤Ø¤Î¥ê¥ó¥¯¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤¹¤Î¤Ç¡¢
 	  NIS ¤Ï¤É¤Á¤é¤Î¥³¥Þ¥ó¥É¤Ç¤âưºî¤·¤Þ¤¹¡£</para>
       </note>
     </sect2>
 
     <sect2 id="users-pw">
       <title><command>pw</command></title>
+
       <indexterm><primary><command>pw</command></primary></indexterm>
 
       <para>&man.pw.8; ¤Ï¡¢¥æ¡¼¥¶¤ä¥°¥ë¡¼¥×¤ÎºîÀ®¡¢ºï½ü¡¢
@@ -694,7 +668,7 @@ passwd: done</screen>
 	¥Õ¥í¥ó¥È¥¨¥ó¥É¤È¤·¤ÆÆ¯¤­¤Þ¤¹¡£&man.pw.8;
 	¤Ï¤È¤Æ¤â¶¯ÎϤʰìÏ¢¤Î¥³¥Þ¥ó¥É¥é¥¤¥ó¥ª¥×¥·¥ç¥ó¤òÍ­¤·¤Æ¤ª¤ê¡¢
 	¥·¥§¥ë¥¹¥¯¥ê¥×¥È¤Ç»È¤¦¤Î¤Ë¸þ¤¤¤Æ¤¤¤Þ¤¹¤¬¡¢¿·¤·¤¤¥æ¡¼¥¶¤Ï¡¢
-	¤³¤³¤Ç¾Ò²ð¤µ¤ì¤Æ¤¤¤ë¾¤Î¥³¥Þ¥ó¥É¤ËÈæ¤Ù¤ÆÆñ¤·¤¤¤È´¶¤¸¤ë¤«¤â¤·¤ì¤Þ¤»¤ó¡£</para>
+	¤³¤Î¾Ï¤Ç¾Ò²ð¤µ¤ì¤Æ¤¤¤ë¾¤Î¥³¥Þ¥ó¥É¤ËÈæ¤Ù¤ÆÆñ¤·¤¤¤È´¶¤¸¤ë¤«¤â¤·¤ì¤Þ¤»¤ó¡£</para>
       </sect2>
 
   </sect1>
@@ -707,12 +681,10 @@ passwd: done</screen>
       <primary>¥¢¥«¥¦¥ó¥È</primary>
       <secondary>À©¸Â</secondary>
     </indexterm>
-    <para>¥æ¡¼¥¶¤¬¤¤¤ë¤Ê¤é¡¢
-      Èà¤é¤ËÂФ·¤Æ¥·¥¹¥Æ¥à¤ÎÍøÍѤòÀ©¸Â¤Ç¤­¤Ê¤¤¤«¹Í¤¨¤¿¤³¤È¤¬¤¢¤ë¤Î¤Ç¤Ï¤Ê¤¤¤Ç¤·¤ç¤¦¤«¡£
-      FreeBSD ¤Ï¡¢
+    <para>&os; ¤Ï¡¢
       ¸Ä¡¹¤Î¥æ¡¼¥¶¤¬ÍøÍѤǤ­¤ë¥·¥¹¥Æ¥à»ñ¸»¤ÎÎ̤ò´ÉÍý¼Ô¤¬À©¸Â¤Ç¤­¤ëÊýË¡¤ò¤¤¤¯¤Ä¤âÍѰդ·¤Æ¤¤¤Þ¤¹¡£
-      ¤½¤Î¼ï¤ÎÀ©¸Â¤Ï¡¢¥Ç¥£¥¹¥¯¥¯¥©¡¼¥¿ (quota) ¤È¤½¤Î¾¤Î»ñ¸»¤ÎÀ©¸Â¤Î
-      ¤È¤½¤Î¾¤Î¥ê¥½¡¼¥¹¤ÎÀ©¸Â¤Î 2 ¤Ä¤Ëʬ¤±¤é¤ì¤Þ¤¹¡£</para>
+      ¤½¤Î¼ï¤ÎÀ©¸Â¤Ï¡¢¥Ç¥£¥¹¥¯¥¯¥©¡¼¥¿ (quota)
+      ¤È¤½¤Î¾¤Î»ñ¸»¤ÎÀ©¸Â¤Î 2 ¤Ä¤Î¾Ï¤ÇÀâÌÀ¤·¤Þ¤¹¡£</para>
 
     <indexterm><primary>¥¯¥©¡¼¥¿ (quotas)</primary></indexterm>
     <indexterm>
@@ -720,9 +692,9 @@ passwd: done</screen>
       <secondary>¥¯¥©¡¼¥¿</secondary>
     </indexterm>
     <indexterm><primary>¥Ç¥£¥¹¥¯¥¯¥©¡¼¥¿</primary></indexterm>
-    <para>¥Ç¥£¥¹¥¯¥¯¥©¡¼¥¿¤Ï¡¢¥æ¡¼¥¶¤Î¥Ç¥£¥¹¥¯¤ÎÍøÍѤòÀ©¸Â¤·¡¢
-      ¤½¤ÎÅÔÅÙ·×»»¤·¤Ê¤¯¤Æ¤â¥æ¡¼¥¶¤Î¥Ç¥£¥¹¥¯»ÈÍÑÎ̤ò´Êñ¤Ë³Îǧ¤Ç¤­¤ë¼êÃʤâÄ󶡤·¤Æ¤¤¤Þ¤¹¡£
-      ¥¯¥©¡¼¥¿¤Ë¤Ä¤¤¤Æ¤Ï¡¢<xref linkend="quotas"/> ¤Ç²òÀ⤷¤Æ¤¤¤Þ¤¹¡£</para>
+    <para>¥Ç¥£¥¹¥¯¥¯¥©¡¼¥¿¤Ï¡¢¥æ¡¼¥¶¤¬ÍøÍѤǤ­¤ë¥Ç¥£¥¹¥¯ÍÆÎ̤òÀ©¸Â¤·¡¢
+      ¤½¤ÎÅÔÅÙ·×»»¤·¤Ê¤¯¤Æ¤â¥Ç¥£¥¹¥¯»ÈÍÑÎ̤ò´Êñ¤Ë³Îǧ¤Ç¤­¤ë¼êÃʤâÄ󶡤·¤Æ¤¤¤Þ¤¹¡£
+      ¥¯¥©¡¼¥¿¤Ë¤Ä¤¤¤Æ¤Ï¡¢<link linkend="quotas"></link> ¤Ç²òÀ⤷¤Æ¤¤¤Þ¤¹¡£</para>
 
     <para>¤½¤Î¾¤Î¥ê¥½¡¼¥¹¤ÎÀ©¸Â¤È¤Ï¡¢¥æ¡¼¥¶¤¬¾ÃÈñ¤Ç¤­¤ë
       CPU¡¢¥á¥â¥ê¤Ê¤É¤Î¥ê¥½¡¼¥¹¤òÀ©¸Â¤¹¤ë¼êÃʤΤ³¤È¤Ç¤¹¡£
@@ -733,27 +705,27 @@ passwd: done</screen>
       <primary><filename>/etc/login.conf</filename></primary>
     </indexterm>
     <para>¥í¥°¥¤¥ó¥¯¥é¥¹¤Ï <filename>/etc/login.conf</filename>
-      ¤ÇÄêµÁ¤·¤Þ¤¹¡£¾ÜºÙ¤ÊƯ¤­¤ÎÀâÌÀ¤Ï¤³¤ÎÀá¤ÎÈϰϤòͤ¨¤Þ¤¹¤¬¡¢
-      &man.login.conf.5; ¤Î¥Þ¥Ë¥å¥¢¥ë¤Ë¾Ü¤·¤¯µ­ºÜ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£
-      ³Æ¥æ¡¼¥¶¤Ë¤Ï¥í¥°¥¤¥ó¥¯¥é¥¹¤¬³ä¤êÅö¤Æ¤é¤ì¤Æ¤¤¤Æ
+      ¤ÇÄêµÁ¤·¤Þ¤¹¡£¾ÜºÙ¤ÊÀâÌÀ¤Ï
+      &man.login.conf.5; ¤Ë¾Ü¤·¤¯µ­ºÜ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£
+      ³Æ¥æ¡¼¥¶¥¢¥«¥¦¥ó¥È¤Ë¤Ï¥í¥°¥¤¥ó¥¯¥é¥¹¤¬³ä¤êÅö¤Æ¤é¤ì¤Æ¤¤¤Æ
       (¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï <literal>default</literal> ¤Ç¤¹)¡¢
-      ¤½¤ì¤¾¤ì¤Î¥í¥°¥¤¥ó¥¯¥é¥¹¤Ë¤Ï¥í¥°¥¤¥ó¥±¡¼¥Ñ¥Ó¥ê¥Æ¥£¤Î½¸¹ç¤¬³ä¤êÅö¤Æ¤é¤ì¤Æ¤¤¤ë¤È¤¤¤¨¤Ð½½Ê¬¤Ç¤·¤ç¤¦¡£
+      ¤½¤ì¤¾¤ì¤Î¥í¥°¥¤¥ó¥¯¥é¥¹¤Ë¤Ï¥í¥°¥¤¥ó¥±¡¼¥Ñ¥Ó¥ê¥Æ¥£¤Î½¸¹ç¤¬³ä¤êÅö¤Æ¤é¤ì¤Æ¤¤¤Þ¤¹¡£
       ¥í¥°¥¤¥ó¥±¡¼¥Ñ¥Ó¥ê¥Æ¥£¤È¤Ï¡¢
       <literal><replaceable>̾¾Î</replaceable>=<replaceable>ÃÍ</replaceable></literal>
       ¤ÎÁȤΤ³¤È¤Ç¡¢<replaceable>̾¾Î</replaceable>
       ¤Ï¼þÃΤμ±Ê̻ҡ¢<replaceable>ÃÍ</replaceable>
-      ¤Ï¡¢Ì¾¾Î¤Ë±þ¤¸¤Æ½èÍý¤µ¤ì¤ëǤ°Õ¤Îʸ»úÎó¤Ç¤¹¡£
+      ¤Ï¡¢<replaceable>̾¾Î</replaceable> ¤Ë±þ¤¸¤Æ½èÍý¤µ¤ì¤ëǤ°Õ¤Îʸ»úÎó¤Ç¤¹¡£
       ¥í¥°¥¤¥ó¥¯¥é¥¹¤È¥±¡¼¥Ñ¥Ó¥ê¥Æ¥£¤òÀßÄꤹ¤ë¤Î¤Ï¤É¤Á¤é¤«¤È¤¤¤¨¤Ð´Êñ¤Ê¤³¤È¤Ç¡¢
       &man.login.conf.5; ¤Ç¤âÀâÌÀ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£</para>
 
     <note>
-      <para>¥·¥¹¥Æ¥à¤ÏÉáÄ̤ϡ¢Ä¾ÀÜ <filename>/etc/login.conf</filename>
-	¥Õ¥¡¥¤¥ë¤«¤éÀßÄê¤òÆÉ¤ß¹þ¤Þ¤º¡¢
-	¤è¤ê®¤¯¸¡º÷¤Ç¤­¤ë¥Ç¡¼¥¿¥Ù¡¼¥¹¥Õ¥¡¥¤¥ë
+      <para>&os; ¤ÏÄ̾ľÀÜ <filename>/etc/login.conf</filename>
+	¤«¤éÀßÄê¤òÆÉ¤ß¹þ¤Þ¤º¡¢
+	¤è¤ê®¤¯¸¡º÷¤Ç¤­¤ë
 	<filename>/etc/login.conf.db</filename>
-	¤«¤éÆÉ¤ß¹þ¤ß¤Þ¤¹¡£<filename>/etc/login.conf</filename>
-	¤«¤é <filename>/etc/login.conf.db</filename> ¤òÀ¸À®¤¹¤ë¤Ë¤Ï¡¢
-	¼¡¤Î¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
+	¥Ç¡¼¥¿¥Ù¡¼¥¹¤«¤éÆÉ¤ß¹þ¤ß¤Þ¤¹¡£<filename>/etc/login.conf</filename>
+	¤òÊÔ½¸¤¹¤ë»þ¤Ë¤Ï <filename>/etc/login.conf.db</filename>
+	¤ò¼¡¤Î¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤·¤Æ¥¢¥Ã¥×¥Ç¡¼¥È¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£</para>
 
       <screen>&prompt.root; <userinput>cap_mkdb /etc/login.conf</userinput></screen>
     </note>
@@ -764,76 +736,67 @@ passwd: done</screen>
       ¥ê¥ß¥Ã¥È¤È¥Ï¡¼¥É¥ê¥ß¥Ã¥È¤¬¤¢¤ê¤Þ¤¹¡£
       ¥½¥Õ¥È¥ê¥ß¥Ã¥È¤Ï¡¢¥æ¡¼¥¶¤ä¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤¬Ä´À°¤Ç¤­¤Þ¤¹¤¬¡¢
       ¥Ï¡¼¥É¥ê¥ß¥Ã¥È¤òͤ¨¤ë¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó¡£
-      ¥æ¡¼¥¶¤Ï¥Ï¡¼¥É¥ê¥ß¥Ã¥È¤ò²¼¤²¤ë¤³¤È¤Ï¤Ç¤­¤Þ¤¹¤¬¡¢¾å¤²¤ë¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó¡£
+      ¥æ¡¼¥¶¤Ï¥Ï¡¼¥É¥ê¥ß¥Ã¥È¤ò²¼¤²¤ë¤³¤È¤Ï¤Ç¤­¤Þ¤¹¤¬¡¢
+      ¾å¤²¤ë¤³¤È¤Ï¥¹¡¼¥Ñ¥æ¡¼¥¶¤Î¤ß¤¬¤Ç¤­¤Þ¤¹¡£
       ÂèÆó¤Ë¡¢¤Û¤È¤ó¤É¤Î¥ê¥½¡¼¥¹¤ÎÀ©¸Â¤ÏÆÃÄê¤Î¥æ¡¼¥¶¤ËÂФ·¤Æ¥×¥í¥»¥¹Ëè¤ËŬÍѤµ¤ì¤ë¤â¤Î¤Ç¡¢
       ¤½¤Î¥æ¡¼¥¶¤¬ÍøÍѤ¹¤ë¥ê¥½¡¼¥¹¤ÎÁíÎ̤òÀ©¸Â¤¹¤ë¤â¤Î¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£
       ¤¿¤À¤·¡¢¤³¤Î°ã¤¤¤ÏÀ©¸Â¤òÆÃḚ̂·¤¤¤¹¤ë¤³¤È¤Ç¼Â¸½¤µ¤ì¤ë¤â¤Î¤Ç¤¢¤ê¡¢
-      ¥í¥°¥¤¥ó¥±¡¼¥Ñ¥Ó¥ê¥Æ¥£¥Õ¥ì¡¼¥à¥ï¡¼¥¯¤Î¼ÂÁõ¤Ë¤è¤ë¤â¤Î¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó
-      (¤Ä¤Þ¤ê¡¢¥ê¥½¡¼¥¹¤ÎÀ©¸Â¤Ï¡¢
-      <emphasis>¼ÂºÝ¤Ë¤Ï</emphasis>¥í¥°¥¤¥ó¥±¡¼¥Ñ¥Ó¥ê¥Æ¥£¤ÎÆÃÊ̤ʾì¹ç¤Ç¤Ï¤Ê¤¤¤Î¤Ç¤¹)¡£</para>
-
-    <para>Æñ¤·¤¤ÏäϤ³¤Î¤¯¤é¤¤¤Ë¤·¤Æ¤ª¤¤¤Æ¡¢
-      °Ê²¼¤¬ºÇ¤â¤è¤¯»È¤ï¤ì¤ë¥ê¥½¡¼¥¹¤ÎÀ©¸Â¤Ë¤Ê¤ê¤Þ¤¹
-      (»Ä¤ê¤Ï¡¢Â¾¤Î¤¹¤Ù¤Æ¤Î¥í¥°¥¤¥ó¥±¡¼¥Ñ¥Ó¥ê¥Æ¥£¤Èʤó¤Ç
-      &man.login.conf.5; ¤Ë½ñ¤«¤ì¤Æ¤¤¤Þ¤¹)¡£</para>
+      ¥í¥°¥¤¥ó¥±¡¼¥Ñ¥Ó¥ê¥Æ¥£¥Õ¥ì¡¼¥à¥ï¡¼¥¯¤Î¼ÂÁõ¤Ë¤è¤ë¤â¤Î¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£</para>
+
+    <para>°Ê²¼¤¬ºÇ¤â¤è¤¯»È¤ï¤ì¤ë¥ê¥½¡¼¥¹¤ÎÀ©¸Â¤Ë¤Ê¤ê¤Þ¤¹¡£
+      »Ä¤ê¤Ï¡¢Â¾¤Î¤¹¤Ù¤Æ¤Î¥í¥°¥¤¥ó¥±¡¼¥Ñ¥Ó¥ê¥Æ¥£¤Èʤó¤Ç
+      &man.login.conf.5; ¤Ë½ñ¤«¤ì¤Æ¤¤¤Þ¤¹¡£</para>
 
     <variablelist>
       <varlistentry>
 	<term><literal>coredumpsize</literal></term>
 
 	<listitem>
-    <indexterm><primary>coredumpsize</primary></indexterm>
-    <indexterm>
-      <primary>¥æ¡¼¥¶¤ËÂФ¹¤ëÀ©¸Â</primary>
-      <secondary>coredumpsize</secondary>
-    </indexterm>
+	  <indexterm><primary>coredumpsize</primary></indexterm>
+	  <indexterm><primary>¥æ¡¼¥¶¤ËÂФ¹¤ëÀ©¸Â</primary>
+	    <secondary>coredumpsize</secondary>
+	  </indexterm>
 	  <para>¥×¥í¥°¥é¥à¤¬À¸À®¤¹¤ë core
-	  ¥Õ¥¡¥¤¥ë¤Î¥µ¥¤¥º¤Ë¤«¤«¤ëÀ©¸Â¤Ï¡¢
-	  ¼«ÌÀ¤ÊÍýͳ¤Ç¤Û¤«¤Î¥Ç¥£¥¹¥¯»ÈÍѤ˴ؤ¹¤ëÀ©¸Â¤Ë½¾Â°¤·¤Þ¤¹
-	  (Îã: <literal>filesize</literal> ¤ä¥Ç¥£¥¹¥¯¥¯¥©¡¼¥¿)¡£¤½¤ì¤Ç¤â¡¢
-	  ¥Ç¥£¥¹¥¯Îΰè¤Î¾ÃÈñ¤òÀ©¸æ¤¹¤ë¤¢¤Þ¤ê¸·¤·¤¯¤Ê¤¤¼êÃʤȤ·¤Æ¤è¤¯»È¤ï¤ì¤Æ¤¤¤Þ¤¹¡£
-	  ¥æ¡¼¥¶¤Ï core ¥Õ¥¡¥¤¥ë¤ò¼«Ê¬¤ÇÀ¸À®¤¹¤ë¤ï¤±¤Ç¤Ï¤Ê¤¯¡¢
-	  ºï½ü¤·¤Ê¤¤¤³¤È¤â¿¤¤¤Î¤Ç¡¢¤³¤ì¤òÀßÄꤹ¤ì¤ÐÂ礭¤Ê¥×¥í¥°¥é¥à
-	  (¤¿¤È¤¨¤Ð <application>Emacs</application>)
-	  ¤¬°Û¾ï½ªÎ»¤·¤Æ¤â¥Ç¥£¥¹¥¯¤Î¶õ¤­¤¬¤Ê¤¯¤Ê¤é¤º¤ËºÑ¤ß¤Þ¤¹¡£</para>
+	    ¥Õ¥¡¥¤¥ë¤Î¥µ¥¤¥º¤Ë¤«¤«¤ëÀ©¸Â¤Ï¡¢
+	    <literal>filesize</literal> ¤ä¥Ç¥£¥¹¥¯¥¯¥©¡¼¥¿¤Ê¤É¤Î¡¢
+	    ¤Û¤«¤Î¥Ç¥£¥¹¥¯»ÈÍѤ˴ؤ¹¤ëÀ©¸Â¤Ë½¾Â°¤·¤Þ¤¹¡£
+	    ¤³¤ÎÀ©¸Â¤Ï¡¢¥Ç¥£¥¹¥¯Îΰè¤Î¾ÃÈñ¤òÀ©¸æ¤¹¤ë¤¢¤Þ¤ê¸·¤·¤¯¤Ê¤¤¼êÃʤȤ·¤Æ¤è¤¯»È¤ï¤ì¤Æ¤¤¤Þ¤¹¡£
+	    ¥æ¡¼¥¶¤Ï core ¥Õ¥¡¥¤¥ë¤ò¼«Ê¬¤ÇÀ¸À®¤¹¤ë¤ï¤±¤Ç¤Ï¤Ê¤¯¡¢
+	    ºï½ü¤·¤Ê¤¤¤³¤È¤â¿¤¤¤Î¤Ç¡¢
+	    ¤³¤ì¤òÀßÄꤹ¤ì¤ÐÂ礭¤Ê¥×¥í¥°¥é¥à¤¬°Û¾ï½ªÎ»¤·¤Æ¤â¥Ç¥£¥¹¥¯¤Î¶õ¤­¤¬¤Ê¤¯¤Ê¤é¤º¤ËºÑ¤ß¤Þ¤¹¡£</para>
 	</listitem>
       </varlistentry>
 
       <varlistentry>
-        <term><literal>cputime</literal></term>
+	<term><literal>cputime</literal></term>
 
 	<listitem>
-    <indexterm><primary>cputime</primary></indexterm>
-    <indexterm>
-      <primary>¥æ¡¼¥¶¤ËÂФ¹¤ëÀ©¸Â</primary>
-      <secondary>cputime</secondary>
-    </indexterm>
+	  <indexterm><primary>cputime</primary></indexterm>
+	  <indexterm>
+	    <primary>¥æ¡¼¥¶¤ËÂФ¹¤ëÀ©¸Â</primary>
+	    <secondary>cputime</secondary>
+	  </indexterm>
 	  <para>¤½¤Î¥æ¡¼¥¶¤Î¥×¥í¥»¥¹¤¬¾ÃÈñ¤Ç¤­¤ë CPU »þ´Ö¤Î¾å¸Â¤Ç¤¹¡£
 	    ¤³¤ì¤òͤ¨¤¿¥×¥í¥»¥¹¤Ï¡¢¥«¡¼¥Í¥ë¤Ë¤è¤ê½ªÎ»¤µ¤ì¤Þ¤¹¡£</para>
 
-	    <note>
-	      <para>¤³¤ì¤Ï¡¢¾ÃÈñ¤µ¤ì¤ë CPU <emphasis>»þ´Ö</emphasis>
-		¤Ë¤Ä¤¤¤Æ¤ÎÀ©¸Â¤Ç¤¢¤Ã¤Æ¡¢&man.top.1; ¤ä&man.ps.1;
-		¤Î¹àÌܤΤɤ줫¤Ëɽ¼¨¤µ¤ì¤ë
-		CPU ¤Î³ä¹ç¤Ë´Ø¤¹¤ë¤â¤Î¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£
-		¤³¤ì¤ò½ñ¤¤¤Æ¤¤¤ë»þÅÀ¤Ç¤Ï¸å¼Ô¤ÎÀ©¸Â¤Ï¤«¤±¤é¤ì¤Þ¤»¤ó¤·¡¢
-		Ìò¤Ë¤¿¤¿¤Ê¤¤¤Ç¤·¤ç¤¦¡£¤¿¤È¤¨¤Ð
-		(ÀµÅö¤Ê¥¿¥¹¥¯¤Ç¤¢¤ë²ÄǽÀ­¤¬¹â¤¤)
-		¥³¥ó¥Ñ¥¤¥é¤Ï¤¿¤ä¤¹¤¯°ìÄê»þ´Ö
-		CPU ¤ò 100% ¶á¤¯»È¤Ã¤Æ¤·¤Þ¤¤¤Þ¤¹¡£</para>
-	    </note>
+	  <note>
+	    <para>¤³¤ì¤Ï¡¢¾ÃÈñ¤µ¤ì¤ë CPU <emphasis>»þ´Ö</emphasis>
+	      ¤Ë¤Ä¤¤¤Æ¤ÎÀ©¸Â¤Ç¤¢¤Ã¤Æ¡¢&man.top.1; ¤ä &man.ps.1;
+	      ¤Î¥Õ¥£¡¼¥ë¥É¤Çɽ¼¨¤µ¤ì¤ë
+	      CPU ¤Î³ä¹ç¤Ë´Ø¤¹¤ë¤â¤Î¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£</para>
+	  </note>
 	</listitem>
       </varlistentry>
 
       <varlistentry>
-        <term><literal>filesize</literal></term>
+	<term><literal>filesize</literal></term>
 
 	<listitem>
-    <indexterm><primary>filesize</primary></indexterm>
-    <indexterm>
-      <primary>¥æ¡¼¥¶¤ËÂФ¹¤ëÀ©¸Â</primary>
-      <secondary>filesize</secondary>
-    </indexterm>
+	  <indexterm><primary>filesize</primary></indexterm>
+	  <indexterm>
+	    <primary>¥æ¡¼¥¶¤ËÂФ¹¤ëÀ©¸Â</primary>
+	    <secondary>filesize</secondary>
+	  </indexterm>
 	  <para>¥æ¡¼¥¶¤¬½êÍ­¤Ç¤­¤ë¥Õ¥¡¥¤¥ë¤ÎÂ礭¤µ¤Î¾å¸Â¤Ç¤¹¡£<link
 	    linkend="quotas">¥Ç¥£¥¹¥¯¥¯¥©¡¼¥¿</link> ¤È°ã¤¤¡¢
 	    ¤³¤ÎÀ©¸Â¤Ï¥æ¡¼¥¶¤Î¥Õ¥¡¥¤¥ë¤ò¤¹¤Ù¤Æ¤Þ¤È¤á¤¿½¸¹ç¤Ë¤Ç¤Ï¤Ê¤¯¡¢
@@ -842,45 +805,42 @@ passwd: done</screen>
       </varlistentry>
 
       <varlistentry>
-        <term><literal>maxproc</literal></term>
+	<term><literal>maxproc</literal></term>
 
 	<listitem>
-    <indexterm><primary>maxproc</primary></indexterm>
-        <indexterm>
-      <primary>¥æ¡¼¥¶¤ËÂФ¹¤ëÀ©¸Â</primary>
-      <secondary>maxproc</secondary>
-    </indexterm>
+	  <indexterm><primary>maxproc</primary></indexterm>
+	  <indexterm>
+	    <primary>¥æ¡¼¥¶¤ËÂФ¹¤ëÀ©¸Â</primary>
+	    <secondary>maxproc</secondary>
+	  </indexterm>
 	  <para>¥æ¡¼¥¶¤¬¼Â¹Ô¤Ç¤­¤ë¥×¥í¥»¥¹¿ô¤Î¾å¸Â¤Ç¤¹¡£
-	    ¥Õ¥©¥¢¥°¥é¥¦¥ó¥É¥×¥í¥»¥¹¤È¥Ð¥Ã¥¯¥°¥é¥¦¥ó¥É¥×¥í¥»¥¹¤ÎξÊý¤òÊ¿Åù¤Ë°·¤¤¤Þ¤¹¡£
-	    ¼«ÌÀ¤ÊÍýͳ¤«¤é¡¢&man.sysctl.8; ÊÑ¿ô
+	    ¥Õ¥©¥¢¥°¥é¥¦¥ó¥É¥×¥í¥»¥¹¤È¥Ð¥Ã¥¯¥°¥é¥¦¥ó¥É¥×¥í¥»¥¹¤ÎξÊý¤ò°·¤¤¤Þ¤¹¡£
+	    ¤³¤Î¾å¸Â¤Ï¡¢&man.sysctl.8; ÊÑ¿ô
 	    <varname>kern.maxproc</varname>
 	    ¤Ç»ØÄꤵ¤ì¤¿¥·¥¹¥Æ¥à¤ÎÀ©¸Â¤òͤ¨¤ë¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó¡£
-	    ¤Þ¤¿¡¢Æ±»þ¤ËÊ£¿ô¥í¥°¥¤¥ó¤¹¤ë¤³¤È¤ä¡¢
+	    Ʊ»þ¤ËÊ£¿ô¥í¥°¥¤¥ó¤¹¤ë¤³¤È¤ä¡¢
 	    ¥Ñ¥¤¥×¥é¥¤¥ó¼Â¹Ô¤¹¤ë¤³¤È¤ÏÊØÍø¤Ê¤³¤È¤¬Â¿¤¤¤Î¤Ç¡¢
 	    ¤³¤ÎÃͤò¤¢¤Þ¤ê¾®¤µ¤ÊÃͤËÀßÄꤹ¤ë¤È¡¢
-	    ¤½¤Î¥æ¡¼¥¶¤ÎÀ¸»ºÀ­¤¬°­²½¤¹¤ë¤³¤È¤Ë¤âÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£
+	    ¤½¤Î¥æ¡¼¥¶¤ÎÀ¸»ºÀ­¤¬°­²½¤¹¤ë²ÄǽÀ­¤¬¤¢¤ê¤Þ¤¹¡£
 	    Â礭¤Ê¥×¥í¥°¥é¥à¤ò¥³¥ó¥Ñ¥¤¥ë¤¹¤ë¾ì¹ç¤Î¤è¤¦¤Ë¡¢
-	    ¥¿¥¹¥¯¤Ë¤è¤Ã¤Æ¤ÏÊ£¿ô¤Î¥×¥í¥»¥¹¤¬¼Â¹Ô¤µ¤ì¤Þ¤¹ (¤¿¤È¤¨¤Ð
-	    &man.make.1;, &man.cc.1;
-	    ¤ä¡¢¤½¤Î¾ÃçΩ¤Á¤È¤Ê¤ë¥×¥ê¥×¥í¥»¥Ã¥µ)¡£</para>
+	    ¥¿¥¹¥¯¤Ë¤è¤Ã¤Æ¤ÏÊ£¿ô¤Î¥×¥í¥»¥¹¤ä¥×¥ê¥×¥í¥»¥Ã¥µ¤¬¼Â¹Ô¤µ¤ì¤Þ¤¹¡£</para>
 	</listitem>
       </varlistentry>
 
       <varlistentry>
-        <term><literal>memorylocked</literal></term>
+	<term><literal>memorylocked</literal></term>
 
 	<listitem>
-    <indexterm><primary>memorylocked</primary></indexterm>
-    <indexterm>
-      <primary>¥æ¡¼¥¶¤ËÂФ¹¤ëÀ©¸Â</primary>
-      <secondary>memorylocked</secondary>
-    </indexterm>
-	  <para>¤³¤ì¤Ï¡¢
-	    1 ¤Ä¤Î¥×¥í¥»¥¹¤¬¥á¥¤¥ó¥á¥â¥ê¤Ë¥í¥Ã¥¯¤µ¤ì¤ë¤³¤È¤òÍ×µá¤Ç¤­¤ë¥á¥â¥ê¤ÎºÇÂçÍÆÎ̤Ǥ¹
-	    (&man.mlock.2; ¤ò¤´Í÷¤¯¤À¤µ¤¤)¡£&man.amd.8;
-	    ¤Î¤è¤¦¤Ê¥·¥¹¥Æ¥à¤Ç½ÅÍ×¤Ê¥×¥í¥°¥é¥à¤Ï¡¢
-	    ¥á¥¤¥ó¥á¥â¥ê¤Ø¥í¥Ã¥¯¤·¤Æ¡¢¥¹¥ï¥Ã¥×¥¢¥¦¥È¥¤¥Ù¥ó¥È¤Ë¤ª¤¤¤Æ¡¢
-	    ÌäÂêȯÀ¸»þ¤Ë¥·¥¹¥Æ¥à¤Î¥¹¥é¥Ã¥·¥ó¥°¤ò°ú¤­µ¯¤³¤µ¤Ê¤¤¤è¤¦¤Ë¤·¤Þ¤¹¡£</para>
+	  <indexterm><primary>memorylocked</primary></indexterm>
+	  <indexterm>
+	    <primary>¥æ¡¼¥¶¤ËÂФ¹¤ëÀ©¸Â</primary>
+	    <secondary>memorylocked</secondary>
+	  </indexterm>
+	  <para>¤³¤ì¤Ï¡¢1 ¤Ä¤Î¥×¥í¥»¥¹¤¬ &man.mlock.2;
+	    ¤Ë¤è¤ê¥á¥¤¥ó¥á¥â¥ê¤Ë¥í¥Ã¥¯¤µ¤ì¤ë¤³¤È¤òÍ×µá¤Ç¤­¤ë¥á¥â¥ê¤ÎºÇÂçÍÆÎ̤Ǥ¹
+	    &man.amd.8; ¤Î¤è¤¦¤Ê¥·¥¹¥Æ¥à¤Ç½ÅÍ×¤Ê¥×¥í¥°¥é¥à¤Ï¡¢
+	    ¥á¥¤¥ó¥á¥â¥ê¤Ø¥í¥Ã¥¯¤·¤Æ¡¢¥·¥¹¥Æ¥à¤¬¥¹¥ï¥Ã¥×¤¹¤ëºÝ¤Ë¡¢
+	    ¥Ç¥£¥¹¥¯¤Î¥¹¥é¥Ã¥·¥ó¥°¤ò°ú¤­µ¯¤³¤µ¤Ê¤¤¤è¤¦¤Ë¤·¤Þ¤¹¡£</para>
 	</listitem>
       </varlistentry>
 
@@ -888,11 +848,10 @@ passwd: done</screen>
 	<term><literal>memoryuse</literal></term>
 
 	<listitem>
-    <indexterm><primary>memoryuse</primary></indexterm>
-    <indexterm>
-      <primary>¥æ¡¼¥¶¤ËÂФ¹¤ëÀ©¸Â</primary>
-      <secondary>memoryuse</secondary>
-    </indexterm>
+	  <indexterm><primary>memoryuse</primary></indexterm>
+	  <indexterm><primary>¥æ¡¼¥¶¤ËÂФ¹¤ëÀ©¸Â</primary>
+	    <secondary>memoryuse</secondary>
+	  </indexterm>
 	  <para>¤³¤ì¤Ï¡¢¤É¤Î»þÅÀ¤«¤òÌä¤ï¤º¡¢
 	    ¤¢¤ë¥×¥í¥»¥¹¤¬¾ÃÈñ¤Ç¤­¤ëºÇÂç¤Î¥á¥â¥êÍÆÎ̤Ǥ¹¡£
 	    ¤³¤ì¤Ï¡¢¥á¥¤¥ó¥á¥â¥ê¤È¥¹¥ï¥Ã¥×¤Î»ÈÍÑÎ̤ò¹ç¤ï¤»¤¿¤â¤Î¤Ç¤¹¡£
@@ -905,17 +864,16 @@ passwd: done</screen>
 	<term><literal>openfiles</literal></term>
 
 	<listitem>
-    <indexterm><primary>openfiles</primary></indexterm>
-    <indexterm>
-      <primary>¥æ¡¼¥¶¤ËÂФ¹¤ëÀ©¸Â</primary>
-      <secondary>openfiles</secondary>
-    </indexterm>
+	  <indexterm><primary>openfiles</primary></indexterm>
+	  <indexterm><primary>¥æ¡¼¥¶¤ËÂФ¹¤ëÀ©¸Â</primary>
+	    <secondary>openfiles</secondary>
+	  </indexterm>
 	  <para>¤³¤ì¤Ï¡¢¤¢¤ë¥×¥í¥»¥¹¤¬³«¤¤¤Æ¤ª¤±¤ëºÇÂç¤Î¥Õ¥¡¥¤¥ë¿ô¤Ç¤¹¡£
-	    FreeBSD ¤Ç¤Ï¡¢¥Õ¥¡¥¤¥ë¤Ï¤Þ¤¿¡¢¥½¥±¥Ã¥È¤ä
+	    &os; ¤Ç¤Ï¡¢¥Õ¥¡¥¤¥ë¤Ï¤Þ¤¿¡¢¥½¥±¥Ã¥È¤ä
 	    IPC ¥Á¥ã¥ó¥Í¥ë¤òɽ¤ï¤¹¤Î¤Ë¤â»È¤ï¤ì¤Æ¤¤¤Þ¤¹¡£
 	    ¤Ç¤¹¤«¤é¡¢¤¢¤Þ¤êÄ㤤ÃͤËÀßÄꤷ¤Ê¤¤¤è¤¦Ãí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£
 	    ¤³¤ì¤ËÂбþ¤¹¤ë¥·¥¹¥Æ¥àÁ´ÂΤÎÀ©¸Â¤Ï
-	    &man.sysctl.8; ÊÑ¿ô
+	    &man.sysctl.8;
 	    <varname>kern.maxfiles</varname> ¤ÇÄêµÁ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£</para>
 	</listitem>
       </varlistentry>
@@ -924,15 +882,13 @@ passwd: done</screen>
 	<term><literal>sbsize</literal></term>
 
 	<listitem>
-    <indexterm><primary>sbsize</primary></indexterm>
-    <indexterm>
-      <primary>¥æ¡¼¥¶¤ËÂФ¹¤ëÀ©¸Â</primary>
-      <secondary>sbsize</secondary>
-    </indexterm>
+	  <indexterm><primary>sbsize</primary></indexterm>
+	  <indexterm><primary>¥æ¡¼¥¶¤ËÂФ¹¤ëÀ©¸Â</primary>
+	    <secondary>sbsize</secondary>
+	  </indexterm>
 	  <para>¤³¤ì¤Ï¡¢¤¢¤ë¥æ¡¼¥¶¤¬¾ÃÈñ¤Ç¤­¤ë¥Í¥Ã¥È¥ï¡¼¥¯¥á¥â¥ê
-	    (¤Ä¤Þ¤ê mbuf) ¤Î¾å¸Â¤ÎÎ̤Ǥ¹¡£¤³¤ì¤Ï¡¢
-	    ÂçÎ̤Υ½¥±¥Ã¥È¤òÀ¸À®¤¹¤ë¸Å¤¤¥µ¡¼¥Ó¥¹µñÈݹ¶·â¤ËÂбþ¤¹¤ë¤â¤Î¤È¤·¤Æºî¤é¤ì¤Þ¤·¤¿¤¬¡¢
-	    °ìÈÌŪ¤Ë¤Ï¥Í¥Ã¥È¥ï¡¼¥¯ÄÌ¿®¤òÀ©¸Â¤¹¤ë¤Î¤Ë»È¤¨¤Þ¤¹¡£</para>
+	    (¤Ä¤Þ¤ê mbuf) ¤Î¾å¸Â¤ÎÎ̤Ǥ¹¡£¥æ¡¼¥¶¤Ï¡¢
+	    ¥Í¥Ã¥È¥ï¡¼¥¯ÄÌ¿®¤òÀ©¸Â¤¹¤ë¤Î¤Ë»È¤¨¤Þ¤¹¡£</para>
 	</listitem>
       </varlistentry>
 
@@ -940,11 +896,10 @@ passwd: done</screen>
 	<term><literal>stacksize</literal></term>
 
 	<listitem>
-    <indexterm><primary>stacksize</primary></indexterm>
-    <indexterm>
-      <primary>¥æ¡¼¥¶¤ËÂФ¹¤ëÀ©¸Â</primary>
-      <secondary>stacksize</secondary>
-    </indexterm>
+	  <indexterm><primary>stacksize</primary></indexterm>
+	  <indexterm><primary>¥æ¡¼¥¶¤ËÂФ¹¤ëÀ©¸Â</primary>
+	    <secondary>stacksize</secondary>
+	  </indexterm>
 	  <para>¤³¤ì¤Ï¡¢¥×¥í¥»¥¹¤Î¥¹¥¿¥Ã¥¯¥µ¥¤¥º¤Î¾å¸Â¤Ç¤¹¡£
 	    ¤¢¤ë¥×¥í¥°¥é¥à¤¬»ÈÍѤ·¤¦¤ë¥á¥â¥ê¤ÎÎ̤òÀ©¸Â¤¹¤ë¤Ë¤Ï¡¢
 	    ¤³¤ì¤À¤±¤Ç¤Ï½½Ê¬¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£
@@ -968,26 +923,26 @@ passwd: done</screen>
 	<para>¥·¥¹¥Æ¥à¤ËÉÕ°¤·¤Æ¤¤¤¿
 	  <filename>/etc/login.conf</filename>
 	  ¤Ï¤Û¤È¤ó¤É¤ÎÀ©¸Â¤Ë¤Ä¤¤¤ÆÂÅÅö¤ÊÃͤˤʤäƤ¤¤Þ¤¹¤¬¡¢

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***


More information about the svn-doc-all mailing list