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

Ryusuke SUZUKI ryusuke at FreeBSD.org
Tue Jul 8 14:14:51 UTC 2014


Author: ryusuke
Date: Tue Jul  8 14:14:50 2014
New Revision: 45224
URL: http://svnweb.freebsd.org/changeset/doc/45224

Log:
  - Merge the following from the English version:
  
  	r29930 -> r30735	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	Tue Jul  8 12:18:18 2014	(r45223)
+++ head/ja_JP.eucJP/books/handbook/basics/chapter.xml	Tue Jul  8 14:14:50 2014	(r45224)
@@ -3,7 +3,7 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: r29930
+     Original revision: r30735
      $FreeBSD$
 -->
 <chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="basics">
@@ -662,11 +662,11 @@ total 530
       ¥ª¥Ú¥ì¡¼¥Æ¥£¥ó¥°¥·¥¹¥Æ¥à¤ò¥Þ¥ë¥Á¥æ¡¼¥¶¤ÇÆ°ºî¤µ¤»¤ë¤¿¤á¤Ë
       ɬÍפʴðËÜ¥·¥¹¥Æ¥à¤¬´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹¡£
       ¤Þ¤¿¡¢¥ë¡¼¥È¥Ç¥£¥ì¥¯¥È¥ê¤Ë¤Ï¡¢
-      ¾¤Î¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤ò¥Þ¥¦¥ó¥È¤¹¤ë¤¿¤á¤Î¥Þ¥¦¥ó¥È¥Ý¥¤¥ó¥È¤â´Þ¤Þ¤ì¤Þ¤¹¡£
-    </para>
+      ¥Þ¥ë¥Á¥æ¡¼¥¶¤Ø¤Î°Ü¹ÔÃæ¤Ë¾¤Î¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤ò¥Þ¥¦¥ó¥È¤¹¤ë¤¿¤á¤Î¥Þ¥¦¥ó¥È¥Ý¥¤¥ó¥È¤â´Þ¤Þ¤ì¤Þ¤¹¡£</para>
 
-    <para>¥Þ¥¦¥ó¥È¥Ý¥¤¥ó¥È¤È¤Ï¥ë¡¼¥È¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤Ë¸ºß¤¹¤ë¡¢
-      ÄɲäΥե¡¥¤¥ë¥·¥¹¥Æ¥à¤ÈÀܳ¤¹¤ë¤¿¤á¤Î¥Ç¥£¥ì¥¯¥È¥ê¤Î¤³¤È¤Ç¤¹¡£
+    <para>¥Þ¥¦¥ó¥È¥Ý¥¤¥ó¥È¤È¤Ï¡¢
+      ÄɲäΥե¡¥¤¥ë¥·¥¹¥Æ¥à¤ÈÀܳ¤¹¤ë¤¿¤á¤Î¥Ç¥£¥ì¥¯¥È¥ê¤Î¤³¤È¤Ç¤¹
+      (ÉáÄ̤ϥ롼¥È¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤Ë¤¢¤ê¤Þ¤¹) ¡£
       ¤è¤ê¾ÜºÙ¤ÊÀâÌÀ¤Ï
       <xref linkend="disk-organization"/>
       ¤ÎÀá¤Ë¤¢¤ê¤Þ¤¹¡£
@@ -1312,9 +1312,9 @@ total 530
 
       <para>¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤ò»²¾È¤¹¤ë¤È¤­¤Ë¤Ï¡¢
 	FreeBSD ¤Ï¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤ò´Þ¤à¥¹¥é¥¤¥¹¤ª¤è¤Ó¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤â»ØÄꤹ¤ë¤³¤È¤òɬÍפȤ·¤Þ¤¹¡£
-	¤½¤·¤Æ¥¹¥é¥¤¥¹¤ò»²¾È¤¹¤ë¤È¤­¤Ï¥Ç¥£¥¹¥¯Ì¾¤â»²¾È¤·¤Ê¤¤¤È¤¤¤±¤Ê¤¤¤Ç¤·¤ç¤¦¡£
-	¤³¤Î¤³¤È¤Ï¡¢¥Ç¥£¥¹¥¯Ì¾¡¢<literal>s</literal>¡¢¥¹¥é¥¤¥¹Èֹ桢
-	¤½¤·¤Æ¥Ñ¡¼¥Æ¥£¥·¥ç¥óʸ»ú¤òʤ٤뤳¤È¤Ë¤è¤Ã¤Æ¤Ç¤­¤Þ¤¹¡£
+	¤½¤·¤Æ¥¹¥é¥¤¥¹¤ò»²¾È¤¹¤ë¤È¤­¤Ï¥Ç¥£¥¹¥¯Ì¾¤â»²¾È¤·¤Ê¤¤¤È¤¤¤±¤Þ¤»¤ó¡£
+	¤·¤¿¤¬¤Ã¤Æ¡¢¥Ç¥£¥¹¥¯Ì¾¡¢<literal>s</literal>¡¢¥¹¥é¥¤¥¹Èֹ桢
+	¤½¤·¤Æ¥Ñ¡¼¥Æ¥£¥·¥ç¥óʸ»ú¤òʤ٤뤳¤È¤Ë¤è¤Ã¤Æ¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤ò»²¾È¤·¤Þ¤¹¡£
 	<xref linkend="basics-disk-slice-part"/>¤ËÎ㤬¤¢¤ê¤Þ¤¹¡£</para>
 
       <para><xref linkend="basics-concept-disk-model"/>
@@ -1424,7 +1424,7 @@ total 530
 	  °ìÈÖÌܤΥ¹¥é¥¤¥¹¤Ï &ms-dos; ¥Ç¥£¥¹¥¯¤Î <filename>C:</filename>
 	  ¤ò´Þ¤ó¤Ç¤¤¤Þ¤¹¡£
 	  ¤½¤·¤Æ¡¢ÆóÈÖÌܤΥ¹¥é¥¤¥¹¤Ï FreeBSD ¤Î¥Ç¥£¥¹¥¯¤ò´Þ¤ó¤Ç¤¤¤Þ¤¹¡£
-	  ¤³¤ì¤Ï FreeBSD ¥¤¥ó¥¹¥È¡¼¥é¤¬»°¤Ä¤Î¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤È°ì¤Ä¤Î¥¹¥ï¥Ã¥×¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤òºîÀ®¤·¤¿Îã¤Ç¤¹¡£</para>
+	  ¤³¤ì¤Ï FreeBSD ¥¤¥ó¥¹¥È¡¼¥é¤¬»°¤Ä¤Î¥Ç¡¼¥¿¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤È°ì¤Ä¤Î¥¹¥ï¥Ã¥×¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤òºîÀ®¤·¤¿Îã¤Ç¤¹¡£</para>
 
 	<para>»°¤Ä¤Î¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤Ï¤½¤ì¤¾¤ì¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤ò´Þ¤ó¤Ç¤¤¤Þ¤¹¡£
 	  <literal>a</literal> 
@@ -1704,15 +1704,6 @@ total 530
 
       <variablelist>
 	<varlistentry>
-	  <term>nodev</term>
-
-	  <listitem>
-	    <para>¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¾å¤Î¥¹¥Ú¥·¥ã¥ë¥Ç¥Ð¥¤¥¹¤ò²ò¼á¤·¤Þ¤»¤ó¡£
-	      ¥»¥­¥å¥ê¥Æ¥£¤Î¤¿¤á¤ËÍ­ÍѤʥª¥×¥·¥ç¥ó¤Ç¤¹¡£</para>
-	  </listitem>
-	</varlistentry>
-
-	<varlistentry>
 	  <term>noexec</term>
 
 	  <listitem>
@@ -1823,7 +1814,8 @@ total 530
       &man.ps.1; ¤Î½ÐÎϤϤ¤¤¯¤Ä¤«¤Î¹Ô¤ËÀ°·Á¤µ¤ì¤Æ¤¤¤Þ¤¹¡£
       <literal>PID</literal> ¤ÏÀè¤Û¤É¸«¤¿¥×¥í¥»¥¹ ID ¤Ç¤¹¡£
       PID ¤Ï 1 ¤«¤é½ç¤Ë 99999 ¤Þ¤Ç³ä¤êÅö¤Æ¤é¤ì¡¢
-      ­¤ê¤Ê¤¯¤Ê¤ë¤ÈºÇ½é¤ËÌá¤Ã¤Æ»È¤¤²ó¤µ¤ì¤Þ¤¹¡£
+      ­¤ê¤Ê¤¯¤Ê¤ë¤ÈºÇ½é¤ËÌá¤Ã¤Æ»È¤¤²ó¤µ¤ì¤Þ¤¹
+      (»ÈÍÑÃæ¤Î PID ¤Ï³ä¤êÅö¤Æ¤é¤ì¤Þ¤»¤ó) ¡£
       <literal>TT</literal> ¤ÎÎó¤Ï¥×¥í¥°¥é¥à¤¬Æ°¤¤¤Æ¤¤¤ë tty ¤ò¼¨¤·¤Þ¤¹¡£
       º¹¤·Åö¤¿¤Ã¤Æ̵»ë¤·¤Æ¤â¤«¤Þ¤ï¤Ê¤¤¤Ç¤·¤ç¤¦¡£
       <literal>STAT</literal> ¤Ï¥×¥í¥°¥é¥à¤Î¾õÂÖ¤ò¼¨¤·¤Þ¤¹¤¬¡¢
@@ -1842,7 +1834,7 @@ total 530
       <option>u</option> ¤Ï¥×¥í¥»¥¹¤Î½êÍ­¼Ô¤Î̾Á°¤ò¥á¥â¥ê»ÈÍÑÎ̤ÈƱÍͤËɽ¼¨¤·¤Þ¤¹¡£
       <option>x</option> ¤Ï¥Ç¡¼¥â¥ó¥×¥í¥»¥¹¤Ë¤Ä¤¤¤Æ¤Î¾ðÊó¤òɽ¼¨¤·¡¢
       <option>ww</option> ¤Ç¡¢¥¹¥¯¥ê¡¼¥ó¤ËÆþ¤ê¤­¤é¤Ê¤¤¤Û¤ÉŤ¯¤Ê¤Ã¤¿¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ç¤â¾Êά¤»¤º¡¢
-      &man.ps.1; ¤ËÁ´¥³¥Þ¥ó¥É¥é¥¤¥ó¤òɽ¼¨¤µ¤»¤Þ¤¹¡£</para>
+      &man.ps.1; ¤Ë³Æ¥×¥í¥»¥¹¤ÎÁ´¥³¥Þ¥ó¥É¥é¥¤¥ó¤òɽ¼¨¤µ¤»¤Þ¤¹¡£</para>
 
     <para>&man.top.1; ¤Î½ÐÎϤâƱÍͤǤ¹¡£ Îã¤Ï°Ê²¼¤ÎÄ̤ê¤Ç¤¹¡£</para>
 
@@ -1911,10 +1903,11 @@ Swap: 256M Total, 38M Used, 217M Free, 1
 
     <para>Ä̾ï¥Ç¡¼¥â¥ó¤È¤·¤ÆÆ°ºî¤¹¤ë¥×¥í¥°¥é¥à¤Ë¤ÏËöÈø¤Ë <quote>d</quote>
       ¤ò»ý¤Ã¤¿Ì¾Á°¤ò¤Ä¤±¤ë´·½¬¤¬¤¢¤ê¤Þ¤¹¡£
-      <application>BIND</application> ¤Ï Berkeley Internet Name Daemon ¤Ç¤¹¤·
-      (¼ÂºÝ¼Â¹Ô¤µ¤ì¤ë¥×¥í¥°¥é¥à¤Ï <command>named</command> ¤È¤¤¤¦Ì¾Á°¤Ç¤¹)¡¢
+      <application>BIND</application> ¤Ï Berkeley Internet Name Domain
+      ¤Ç¤¹¤¬¡¢
+      ¼ÂºÝ¼Â¹Ô¤µ¤ì¤ë¥×¥í¥°¥é¥à¤Ï <command>named</command> ¤È¤¤¤¦Ì¾Á°¤Ç¤¹¡£
       <application>Apache</application> ¥¦¥§¥Ö¥µ¡¼¥Ð¤Î¥×¥í¥°¥é¥à¤Ï
-      <command>httpd</command> ¤È¸Æ¤Ð¤ì¤Þ¤¹¤·¡¢
+      <command>httpd</command> ¤È¸Æ¤Ð¤ì¡¢
       ¥é¥¤¥ó¥×¥ê¥ó¥¿¥¹¥×¡¼¥ê¥ó¥°¥Ç¡¼¥â¥ó¤Ï <command>lpd</command>¡¢
       ¤Ê¤É¤Ê¤É¤Ç¤¹¡£
       ¤³¤ì¤Ïñ¤Ê¤ë´·½¬¤Ç¡¢¤·¤Ã¤«¤ê¤¬¤Ã¤Á¤ê¤È¤·¤¿¥ë¡¼¥ë¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£
@@ -1924,9 +1917,8 @@ Swap: 256M Total, 38M Used, 217M Free, 1
       Ï¢ÁÛ¤·¤½¤¦¤Ê <command>maild</command> ¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£</para>
 
     <para>»þ¡¹¡¢¥Ç¡¼¥â¥ó¥×¥í¥»¥¹¤ÈÄÌ¿®¤·¤¿¤¤¤È¤­¤¬¤¢¤ê¤Þ¤¹¡£
-      ¤³¤ÎÄÌ¿®¤Ï<firstterm>¥·¥°¥Ê¥ë</firstterm>¤È¸Æ¤Ð¤ì¡¢
-      ¥Ç¡¼¥â¥ó¤Ë¥·¥°¥Ê¥ë¤òÁ÷¤ë¤³¤È¤Ë¤è¤Ã¤Æ¥Ç¡¼¥â¥ó
-      (¤Ë¸Â¤é¤º¤É¤ó¤ÊÆ°ºîÃæ¤Î¥×¥í¥»¥¹¤Ç¤â) ¤ÈÄÌ¿®¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
+      °ì¤Ä¤ÎÊýË¡¤È¤·¤Æ¡¢¤½¤ì (¤Ë¸Â¤é¤º¤É¤ó¤ÊÆ°ºîÃæ¤Î¥×¥í¥»¥¹¤Ç¤â) ¤Ë
+      <firstterm>¥·¥°¥Ê¥ë</firstterm>¤È¸Æ¤Ð¤ì¤ë¤â¤Î¤òÁ÷¿®¤¹¤ëÊýË¡¤Ç¤¹¡£
       Á÷¿®²Äǽ¤Ê¥·¥°¥Ê¥ë¤Ï¤¿¤¯¤µ¤ó¤¢¤ê¤Þ¤¹—ÆÃÊ̤ʰÕÌ£¤¬¤¢¤ë¤â¤Î¤â¤¢¤ì¤Ð¡¢
       ¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Ë¤è¤Ã¤Æ²ò¼á¤µ¤ì¤ë¤â¤Î¤â¤¢¤ê¤Þ¤¹¤·¡¢
       ¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤¬¥·¥°¥Ê¥ë¤ò¤É¤¦²ò¼á¤¹¤ë¤«¤Ï
@@ -2162,7 +2154,7 @@ Swap: 256M Total, 38M Used, 217M Free, 1
 
 	  <row>
 	    <entry><envar>TERM</envar></entry>
-	    <entry>¥æ¡¼¥¶¤ÎüËö̾¡£
+	    <entry>¥æ¡¼¥¶¤ÎüËö¼ï̾¡£
               üËö¤Î¥±¡¼¥Ñ¥Ó¥ê¥Æ¥£¤ò·èÄꤹ¤ë¤Î¤Ë»È¤ï¤ì¤ë¡£</entry>
 	  </row>
 


More information about the svn-doc-head mailing list