svn commit: r43629 - head/ja_JP.eucJP/books/handbook/basics

[Ryusuke SUZUKI]

Author: ryusuke
Date: Wed Jan 22 12:13:12 2014
New Revision: 43629
URL: http://svnweb.freebsd.org/changeset/doc/43629

Log:
  - Merge the following from the English version:
  
  	r23336 -> r23787	head/ja_JP.eucJP/books/handbook/basics/chapter.xml
  
  Submitted by:	Yuta MASUMOTO <owata _at_ club dot kyutech dot ac dot jp>

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

Modified: head/ja_JP.eucJP/books/handbook/basics/chapter.xml
==============================================================================
--- head/ja_JP.eucJP/books/handbook/basics/chapter.xml	Wed Jan 22 11:47:58 2014	(r43628)
+++ head/ja_JP.eucJP/books/handbook/basics/chapter.xml	Wed Jan 22 12:13:12 2014	(r43629)
@@ -3,7 +3,7 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: r23336
+     Original revision: r23787
      $FreeBSD$
 -->
 <chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="basics">
@@ -20,7 +20,6 @@
 
   <sect1 xml:id="basics-synopsis">
     <title>¤³¤Î¾Ï¤Ç¤Ï</title>
-    <indexterm><primary>´ðÁÃÃμ± (basics)</primary></indexterm>
 
     <para>¤³¤Î¾Ï¤Ç¤Ï FreeBSD
       ¥ª¥Ú¥ì¡¼¥Æ¥£¥ó¥°¥·¥¹¥Æ¥à¤Î´ðËÜŪ¤Ê¥³¥Þ¥ó¥É¤Èµ¡Ç½¤Ë¤Ä¤¤¤Æµ­½Ò¤·¤Æ¤¤¤Þ¤¹¡£
@@ -625,9 +624,7 @@ total 530
       <filename>/etc/fstab</filename> ¤Ë½ñ¤«¤ì¤¿¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤Ï
       <option>noauto</option> ¥ª¥×¥·¥ç¥ó¤¬»ØÄꤵ¤ì¤Æ¤¤¤Ê¤±¤ì¤Ð¡¢
       µ¯Æ°»þ¤Ë &man.rc.8; ¥¹¥¯¥ê¥×¥È¤Ë¤è¤Ã¤Æ¼«Æ°Åª¤Ë¥Þ¥¦¥ó¥È¤µ¤ì¤Þ¤¹¡£
-      <filename>/etc/fstab</filename>
-      ¥Õ¥¡¥¤¥ë¤Î½ñ¼°¤ä¥ª¥×¥·¥ç¥ó¤Ë´Ø¤·¤Æ¤Î¾ÜºÙ¤Ï
-      &man.fstab.5; ¤ò¤´Í÷¤¯¤À¤µ¤¤¡£</para>
+      ¾ÜºÙ¤Ï <xref linkend="disks-fstab"/> ¤ò¤´Í÷¤¯¤À¤µ¤¤¡£</para>
 
     <para>¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¹½Â¤¤òÌÖÍ夷¤¿ÀâÌÀ¤Ï &man.hier.7; ¤Ë½ñ¤«¤ì¤Æ¤¤¤Þ¤¹¡£
       ¤³¤³¤Ç¤Ï¡¢¤â¤Ã¤È¤â¤è¤¯»È¤ï¤ì¤ë¥Ç¥£¥ì¥¯¥È¥ê¤Ë¤Ä¤¤¤Æ´Êñ¤Ë
@@ -1525,6 +1522,10 @@ total 530
          </listitem>
 	</varlistentry>
       </variablelist>
+
+      <para><filename>/etc/fstab</filename>
+	¥Õ¥¡¥¤¥ë¤Î½ñ¼°¤ä¥ª¥×¥·¥ç¥ó¤Ë´Ø¤·¤Æ¤Î¾ÜºÙ¤Ï¡¢
+	&man.fstab.5; ¤ò¤´Í÷¤¯¤À¤µ¤¤¡£</para>
     </sect2>
 
     <sect2 xml:id="disks-mount">
@@ -1588,7 +1589,9 @@ total 530
 
 	  <listitem>
 	    <para>¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤òÆɤ߹þ¤ßÀìÍѤǥޥ¦¥ó¥È¤·¤Þ¤¹¡£
-	      ¤³¤ì¤Ï <option>rdonly</option> °ú¿ô¤ò <option>-o</option>
+	      ¤³¤ì¤Ï <option>ro</option> (5.2 ¤è¤êÁ°¤Î
+	      &os; ¤Ç¤Ï <option>rdonly</option> ¤Ç¤¹)
+	      °ú¿ô¤ò <option>-o</option>
 	      ¥ª¥×¥·¥ç¥ó¤Ë»È¤¦¤Î¤ÈƱ¤¸¤Ç¤¹¡£</para>
 	  </listitem>
 	</varlistentry>
@@ -2233,12 +2236,16 @@ Swap: 256M Total, 38M Used, 217M Free, 1
     <para>¤µ¤Þ¤¶¤Þ¤Ê FreeBSD ¤ÎÀßÄê¤Ï¡¢¥Æ¥­¥¹¥È¥Õ¥¡¥¤¥ë¤òÊÔ½¸¤¹¤ë¤³¤È¤Ç¹Ô¤ï¤ì¤Þ¤¹¡£
       ¤½¤Î¤¿¤á¡¢¥Æ¥­¥¹¥È¥¨¥Ç¥£¥¿¤Î°·¤¤¤Ë´·¤ì¤ë¤ÈÎɤ¤¤Ç¤·¤ç¤¦¡£
       FreeBSD ¤Ë¤Ï¡¢´ðËÜ¥·¥¹¥Æ¥à¤Î°ìÉô¤È¤·¤ÆÆó¡¢»°Ä󶡤µ¤ì¤ë¤â¤Î¤È¡¢
-      Ports collection ¤«¤éÍøÍѤǤ­¤ë¡¢¤¿¤¯¤µ¤ó¤Î¥Æ¥­¥¹¥È¥¨¥Ç¥£¥¿¤¬ÍÑ°Õ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£
+      Ports Collection ¤«¤éÍøÍѤǤ­¤ë¡¢¤¿¤¯¤µ¤ó¤Î¥Æ¥­¥¹¥È¥¨¥Ç¥£¥¿¤¬ÍÑ°Õ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£
     </para>
 
     <indexterm>
       <primary><command>ee</command></primary>
     </indexterm>
+    <indexterm>
+      <primary>editors</primary>
+      <secondary><command>ee</command></secondary>
+    </indexterm>
     <para>ºÇ¤â³Ø½¬¤¬´Êñ¤Ê¥¨¥Ç¥£¥¿¤Ï¡¢
       easy editor ¤Îά¤Ç <application>ee</application> ¤È¸Æ¤Ð¤ì¤ë¤â¤Î¤Ç¤¹¡£
       <application>ee</application> ¤òΩ¤Á¾å¤²¤ë¤Ë¤Ï¡¢¥³¥Þ¥ó¥É¥é¥¤¥ó¤«¤é