svn commit: r48370 - head/ja_JP.eucJP/books/handbook

Ryusuke SUZUKI <[email protected]>
Newsgroups gmane.os.freebsd.devel.cvs.doc
Message-ID <[email protected]>
Author: ryusuke
Date: Fri Mar 11 09:45:28 2016
New Revision: 48370
URL: https://svnweb.freebsd.org/changeset/doc/48370

Log:
  - Merge the following from the English version:
  
  	r47376 -> r48107	head/ja_JP.eucJP/books/handbook/book.xml

Modified:
  head/ja_JP.eucJP/books/handbook/book.xml

Modified: head/ja_JP.eucJP/books/handbook/book.xml
==============================================================================
--- head/ja_JP.eucJP/books/handbook/book.xml	Fri Mar 11 09:27:59 2016	(r48369)
+++ head/ja_JP.eucJP/books/handbook/book.xml	Fri Mar 11 09:45:28 2016	(r48370)
@@ -5,7 +5,7 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: r47376
+     Original revision: r48107
      $FreeBSD$
 -->
 
@@ -20,7 +20,7 @@
   xml:lang="ja">
 
   <info>
-    <title>FreeBSD ¥Ï¥ó¥É¥Ö¥Ã¥¯</title>
+    <title>&os; ¥Ï¥ó¥É¥Ö¥Ã¥¯</title>
 
     <author>
       <orgname>FreeBSD ¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¥×¥í¥¸¥§¥¯¥È</orgname>
@@ -89,44 +89,46 @@
     </legalnotice>
 
     <abstract>
-      <para>FreeBSD ¤Ø¤è¤¦¤³¤½!
+      <para>&os; ¤Ø¤è¤¦¤³¤½!
 	¤³¤Î¥Ï¥ó¥É¥Ö¥Ã¥¯¤Ï
-	<emphasis>FreeBSD &rel2.current;-RELEASE</emphasis>
-	¤ª¤è¤Ó <emphasis>FreeBSD &rel.current;-RELEASE</emphasis>
+	<emphasis>&os; &rel2.current;-RELEASE</emphasis>
+	¤ª¤è¤Ó <emphasis>&os; &rel.current;-RELEASE</emphasis>
 	¤Î¥¤¥ó¥¹¥È¡¼¥ë¤ÈÆü¾ï¤Ç¤Î»È¤¤Êý¤Ë¤Ä¤¤¤Æµ­½Ò¤·¤¿¤â¤Î¤Ç¤¹¡£
-	Ëܥϥó¥É¥Ö¥Ã¥¯¤Ï<emphasis>²þÊÔºî¶ÈÃæ</emphasis>¤Ç¤¢¤ê¡¢
-	¤µ¤Þ¤¶¤Þ¤Ê¿Í¡¹¤¬ÊÔ½¸¤Ë·È¤ï¤Ã¤Æ¤¤¤Þ¤¹¡£
-	¤¤¤Þ¸ºß¤¹¤ë¥»¥¯¥·¥ç¥ó¤ÎÃæ¤Ë¤Ï¾ðÊ󤬸Ť¯¤Ê¤Ã¤Æ¤·¤Þ¤Ã¤¿¤¿¤á¡¢
-	¹¹¿·ºî¶È¤ÎɬÍפ¬¤¢¤ë¤â¤Î¤â´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹¡£
-	¤â¤·¡¢¤³¤Î¥Ï¥ó¥É¥Ö¥Ã¥¯¤òÊÔ½¸¤¹¤ë¥×¥í¥¸¥§¥¯¥È¤Ë¶¨ÎϤ·¤¿¤¤¤È¤ª¹Í¤¨¤Ê¤é¡¢
-	&a.doc; ¤Þ¤ÇÅŻҥ᡼¥ë¤ò(±Ñ¸ì¤Ç)Á÷¤Ã¤Æ¤¯¤À¤µ¤¤¡£
-	¤³¤Îʸ½ñ¤ÎºÇ¿·¥Ð¡¼¥¸¥ç¥ó¤Ï¡¢¤¤¤Ä¤Ç¤â
+	Ëܥϥó¥É¥Ö¥Ã¥¯¤Ï¤µ¤Þ¤¶¤Þ¤Ê¿Í¡¹¤Ë¤è¤ëÊÔ½¸¤ÎÀ®²Ì¤Ç¡¢
+	¸½ºß¤â²þÊÔºî¶ÈÃæ¤Ç¤¹¡£
+	¤¤¤Þ¸ºß¤¹¤ë¥»¥¯¥·¥ç¥ó¤ÎÃæ¤Ë¤Ï¾ðÊ󤬸Ť¯¤Ê¤Ã¤Æ¤·¤Þ¤Ã¤Æ¤¤¤ë¤â¤Î¤¬¤¢¤ê¤Þ¤¹¡£
+	¤â¤·¡¢¤³¤Îʸ½ñ¤ò¿·¤·¤¯¤·¤¿¤ê¡¢
+	¿·¤·¤¤¾ðÊó¤ÎÄɲä˶¨ÎϤ·¤¿¤¤¤È¤ª¹Í¤¨¤Ê¤é¡¢
+	&a.doc; ¤Þ¤ÇÅŻҥ᡼¥ë¤ò (±Ñ¸ì¤Ç) Á÷¤Ã¤Æ¤¯¤À¤µ¤¤¡£</para>
+
+      <para>¤³¤Î¥Ï¥ó¥É¥Ö¥Ã¥¯¤ÎºÇ¿·¥Ð¡¼¥¸¥ç¥ó¤Ï¡¢¤¤¤Ä¤Ç¤â
 	<link xlink:href="http://www.jp.FreeBSD.org/">ÆüËܹñÆâÈǤÎ
 	FreeBSD ¥¦¥§¥Ö¥µ¥¤¥È</link> ¤ª¤è¤Ó
 	<link xlink:href="http://www.FreeBSD.org/">FreeBSD ¥¦¥§¥Ö¥µ¥¤¥È</link>
-	¤«¤éÆþ¼ê¤Ç¤­¤Þ¤¹
-	(¤³¤Îʸ½ñ¤Î°ÊÁ°¤Î¥Ð¡¼¥¸¥ç¥ó¤Ï <uri
+	¤«¤éÆþ¼ê¤Ç¤­¤Þ¤¹¡£
+	¤³¤Îʸ½ñ¤Î°ÊÁ°¤Î¥Ð¡¼¥¸¥ç¥ó¤Ï <uri
 	  xlink:href="http://docs.FreeBSD.org/doc/">http://docs.FreeBSD.org/doc/</uri>
-	¤«¤éÆþ¼ê¤Ç¤­¤Þ¤¹)¡£
+	¤«¤éÆþ¼ê¤Ç¤­¤Þ¤¹¡£
 	¤Þ¤¿¡¢Â¾¤Î¤µ¤Þ¤¶¤Þ¤Êʸ½ñ·Á¼°¡¢°µ½Ì·Á¼°¤Î¤â¤Î¤¬ <link
-	  xlink:href="ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/">FreeBSD
+	  xlink:href="ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/">&os;
 	  FTP ¥µ¡¼¥Ð</link> ¤ä¿ô¿¤¯¤Î
 	<link linkend="mirrors">¥ß¥é¡¼¥µ¥¤¥È</link>
 	¤«¤é¥À¥¦¥ó¥í¡¼¥É¤Ç¤­¤Þ¤¹¡£
 	¤³¤Î¥Ï¥ó¥É¥Ö¥Ã¥¯¤Î½ñÀÒÈÇ (±Ñ¸ìÈÇ) ¤Ï¡¢
 	<link xlink:href="http://www.freebsdmall.com/">FreeBSD
-	  Mall</link> ¤«¤é¹ØÆþ¤Ç¤­¤Þ¤¹¡£¤Þ¤¿¡¢<link
-	  xlink:href="&url.base;/search/index.html">¥Ï¥ó¥É¥Ö¥Ã¥¯¤Î¸¡º÷</link>
-	¤ò¹Ô¤Ê¤¦¤³¤È¤â¤Ç¤­¤Þ¤¹¡£</para>
-
-      <para>FreeBSD ¥Ï¥ó¥É¥Ö¥Ã¥¯ÆüËܸìÈǤκîÀ®¤Ï FreeBSD
-	ÆüËܸì¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¥×¥í¥¸¥§¥¯¥È (FreeBSD doc-jp) ¤¬¤ª¤³¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£
-	¥Ï¥ó¥É¥Ö¥Ã¥¯¤ÎÆüËܸìÌõ¤Ë´Ø¤¹¤ë¤³¤È¤Ï FreeBSD &a.jp.doc-jp;
+	  Mall</link> ¤«¤é¹ØÆþ¤Ç¤­¤Þ¤¹¡£¤Þ¤¿¡¢
+	¥Ï¥ó¥É¥Ö¥Ã¥¯¤ª¤è¤Ó¾¤Îʸ½ñ¤Î¸¡º÷¤Ë¤Ä¤¤¤Æ¤Ï¡¢<link
+	  xlink:href="&url.base;/search/index.html">¸¡º÷¥Ú¡¼¥¸</link>
+	¤Ç¹Ô¤Ê¤¦¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£</para>
+
+      <para>&os; ¥Ï¥ó¥É¥Ö¥Ã¥¯ÆüËܸìÈǤκîÀ®¤Ï &os;
+	ÆüËܸì¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¥×¥í¥¸¥§¥¯¥È (&os; doc-jp) ¤¬¤ª¤³¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£
+	¥Ï¥ó¥É¥Ö¥Ã¥¯¤ÎÆüËܸìÌõ¤Ë´Ø¤¹¤ë¤³¤È¤Ï &os; &a.jp.doc-jp;
 	¤Ë¤ª¤¤¤ÆÆüËܸì¤ÇµÄÏÀ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£</para>
 
       <para>ʸ½ñ¤ÎÆüËܸìÌõ¤Ë´Ø¤¹¤ë¤ªÌ䤤¹ç¤ï¤»¤ä¡¢
 	ʸ½ñ¤Î¸¶Ê¸¤Ë´Ø¤¹¤ëÌ䤤¹ç¤ï¤»¤ò¤·¤¿¤¤¤¬±Ñ¸ì¤¬ÆÀ°Õ¤Ç¤Ê¤¤¤È¤¤¤¦Êý¤Ï
-	FreeBSD &a.jp.doc-jp; ¤Þ¤Ç¡¢ÆüËܸì¤Ç¥³¥á¥ó¥È¤ò¤ª´ó¤»¤¯¤À¤µ¤¤¡£</para>
+	&os; &a.jp.doc-jp; ¤Þ¤Ç¡¢ÆüËܸì¤Ç¥³¥á¥ó¥È¤ò¤ª´ó¤»¤¯¤À¤µ¤¤¡£</para>
     </abstract>
   </info>
 
@@ -136,12 +138,12 @@
     <title>ƳÆþ</title>
 
     <partintro>
-      <para>FreeBSD ¥Ï¥ó¥É¥Ö¥Ã¥¯¤ÎÂè 1 Éô¤Ï¥æ¡¼¥¶¤È
-	FreeBSD ¤¬½é¤á¤Æ¤Î´ÉÍý¼Ô¸þ¤±¤Ç¤¹¡£³Æ¾Ï¤ÎÆâÍÆ¤Ï°Ê²¼¤Î¤È¤ª¤ê¤Ç¤¹¡£</para>
+      <para>¥Ï¥ó¥É¥Ö¥Ã¥¯¤ÎÂè 1 Éô¤Ï¥æ¡¼¥¶¤È
+	&os; ¤¬½é¤á¤Æ¤Î´ÉÍý¼Ô¸þ¤±¤Ç¤¹¡£³Æ¾Ï¤ÎÆâÍÆ¤Ï°Ê²¼¤Î¤È¤ª¤ê¤Ç¤¹¡£</para>
 
       <itemizedlist>
 	<listitem>
-	  <para>FreeBSD ¤Î¾Ò²ð</para>
+	  <para>&os; ¤Î¾Ò²ð</para>
 	</listitem>
 
 	<listitem>
@@ -153,18 +155,17 @@
 	</listitem>
 
 	<listitem>
-	  <para>FreeBSD ¤ÇÍøÍѤǤ­¤ëË­É٤ʥµ¡¼¥É¥Ñ¡¼¥Æ¥£À½¤Î¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Î
+	  <para>&os; ¤ÇÍøÍѤǤ­¤ëË­É٤ʥµ¡¼¥É¥Ñ¡¼¥Æ¥£À½¤Î¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Î
 	    ¥¤¥ó¥¹¥È¡¼¥ëÊýË¡</para>
 	</listitem>
 
 	<listitem>
-	  <para>&unix; ¤Ë¤ª¤±¤ë¥¦¥£¥ó¥É¥¦¥·¥¹¥Æ¥à X¡¢
-	    ¤ª¤è¤Ó¥¯¥ê¥¨¥¤¥Æ¥£¥Ö¤Ê¥Ç¥¹¥¯¥È¥Ã¥×´Ä¶­¤ÎÀßÄê¤Î¾ÜºÙ¤Î¾Ò²ð</para>
+	  <para>&unix; ¤Ë¤ª¤±¤ë¥¦¥£¥ó¥É¥¦¥·¥¹¥Æ¥à¤Î X¡¢
+	    ¤ª¤è¤Ó¥×¥í¥À¥¯¥Æ¥£¥Ö¤Ê¥Ç¥¹¥¯¥È¥Ã¥×´Ä¶­¤ÎÀßÄê¤Î¾ÜºÙ¤Î¾Ò²ð</para>
 	</listitem>
       </itemizedlist>
 
-      <para>¤³¤Î¥Ï¥ó¥É¥Ö¥Ã¥¯¤Ç¤ÏÉÑÈˤ˥ڡ¼¥¸¤òÈô¤¹¤³¤È¤Ê¤¯Á°¤«¤é¸å¤Ø¤È
-	¥¹¥à¡¼¥º¤ËÆÉ¤ß¿Ê¤á¤ë¤è¤¦¤Ë¡¢
+      <para>ÉÑÈˤ˥ڡ¼¥¸¤òÈô¤¹¤³¤È¤Ê¤¯³Æ¾Ï¤òÁ°¤«¤é¸å¤Ø¤È¥¹¥à¡¼¥º¤ËÆÉ¤ß¿Ê¤á¤ë¤è¤¦¤Ë¡¢
 	¸åÊý¤Ø¤Î»²¾È¤ò¶ËÎÏÍÞ¤¨¤ë¤è¤¦¤Ë¤·¤Æ¤¤¤Þ¤¹¡£</para>
     </partintro>
 
@@ -180,8 +181,8 @@
 
     <partintro>
       <para>Âè 1 Éô¤Ç¤Ï´ðÁÃŪ¤Ê¤³¤È¤¬¤é¤òÀâÌÀ¤·¤¿¤Î¤Ç¡¢
-	FreeBSD ¥Ï¥ó¥É¥Ö¥Ã¥¯¤ÎÂè 2 Éô¤Ç¤Ï
-	FreeBSD ¤Ç¤è¤¯»È¤ï¤ì¤ëµ¡Ç½¤Ë¤Ä¤¤¤ÆÀâÌÀ¤·¤Þ¤¹¡£
+	¥Ï¥ó¥É¥Ö¥Ã¥¯¤ÎÂè 2 Éô¤Ç¤Ï
+	&os; ¤Ç¤è¤¯»È¤ï¤ì¤ëµ¡Ç½¤Ë¤Ä¤¤¤ÆÀâÌÀ¤·¤Þ¤¹¡£
 	³Æ¾Ï¤ÎÆâÍÆ¤Ï°Ê²¼¤Î¤È¤ª¤ê¤Ç¤¹¡£</para>
 
       <itemizedlist>
@@ -191,12 +192,12 @@
 	</listitem>
 
 	<listitem>
-	  <para>FreeBSD ¤ÇÍøÍѲÄǽ¤Ê¥Þ¥ë¥Á¥á¥Ç¥£¥¢¥Ä¡¼¥ë¤Î¾Ò²ð</para>
+	  <para>&os; ¤ÇÍøÍѲÄǽ¤Ê¥Þ¥ë¥Á¥á¥Ç¥£¥¢¥Ä¡¼¥ë¤Î¾Ò²ð</para>
 	</listitem>
 
 	<listitem>
-	  <para>¥·¥¹¥Æ¥à¤ÇÆÃÊ̤ʵ¡Ç½¤òÍ­¸ú¤Ë¤¹¤ë¤¿¤á¤Ë¡¢
-	    ¥«¥¹¥¿¥à¥«¡¼¥Í¥ë¤ò¹½ÃÛ¤¹¤ë¼ê½ç¤ÎÀâÌÀ</para>
+	  <para>ÆÃÊ̤ʵ¡Ç½¤òÍ­¸ú¤Ë¤¹¤ë¤¿¤á¤Ë¡¢
+	    ¥«¥¹¥¿¥à &os; ¥«¡¼¥Í¥ë¤ò¹½ÃÛ¤¹¤ë¼ê½ç¤ÎÀâÌÀ</para>
 	</listitem>
 
 	<listitem>
@@ -205,7 +206,7 @@
 	</listitem>
 
 	<listitem>
-	  <para>FreeBSD ¥·¥¹¥Æ¥à¤Ç Linux ¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤ò¼Â¹Ô¤¹¤ëÊýË¡</para>
+	  <para>&os; ¥·¥¹¥Æ¥à¤Ç Linux ¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤ò¼Â¹Ô¤¹¤ëÊýË¡</para>
 	</listitem>
       </itemizedlist>
 
@@ -224,13 +225,13 @@
     <title>¥·¥¹¥Æ¥à´ÉÍý</title>
 
     <partintro>
-      <para>FreeBSD ¥Ï¥ó¥É¥Ö¥Ã¥¯¤Î°Ê²¼¤Î¾Ï¤Ï¡¢
-	FreeBSD ¤Î¥·¥¹¥Æ¥à´ÉÍý¤ÎÌ̤ˤĤ¤¤Æ½ñ¤«¤ì¤Æ¤¤¤Þ¤¹¡£
-	³Æ¾Ï¤Î¤Ï¤¸¤á¤Ç¤Ï¡¢¤½¤Î¾Ï¤Ç³Ø¤ÖÆâÍÆ¤ä
-	¼ÂºÝ¤Ë¼è¤êÁȤàÁ°¤ËÃΤäƤª¤¯¤Ù¤­¤³¤È¤Ë¤Ä¤¤¤ÆÀâÌÀ¤·¤Þ¤¹¡£</para>
+      <para>°Ê²¼¤Î¾Ï¤Ç¤Ï¡¢
+	&os; ¤Î¥·¥¹¥Æ¥à´ÉÍý¤ÎÌ̤ˤĤ¤¤Æ½ñ¤«¤ì¤Æ¤¤¤Þ¤¹¡£
+	³Æ¾Ï¤Î¤Ï¤¸¤á¤Ç¤Ï¡¢¤½¤Î¾Ï¤Ç³Ø¤ÖÆâÍÆ¤ä¡¢
+	ÆÉ¼Ô¤¬¼ÂºÝ¤Ë¼è¤êÁȤàÁ°¤ËÃΤäƤª¤¯¤Ù¤­¤³¤È¤Ë¤Ä¤¤¤ÆÀâÌÀ¤·¤Þ¤¹¡£</para>
 
       <para>³Æ¾Ï¤Ï¡¢É¬Íפˤʤä¿»þ¤Ë¸ÄÊ̤˻²¾È¤Ç¤­¤ë¤è¤¦¤Ë¹½À®¤µ¤ì¤Æ¤¤¤Þ¤¹¡£
-	¤É¤Î½çÈÖ¤ÇÆÉ¤ó¤Ç¤â¹½¤¤¤Þ¤»¤ó¤·¡¢FreeBSD ¤ò»È¤¦¤Î¤Ë¡¢
+	¤É¤Î½çÈÖ¤ÇÆÉ¤ó¤Ç¤â¹½¤¤¤Þ¤»¤ó¤·¡¢&os; ¤ò»È¤¦¤Î¤Ë¡¢
 	¤¹¤Ù¤Æ¤òÆÉ¤ßÄ̤¹É¬Íפ¬¤¢¤ë¡¢¤È¤¤¤¦¤ï¤±¤Ç¤â¤¢¤ê¤Þ¤»¤ó¡£</para>
     </partintro>
 
@@ -261,7 +262,8 @@
     <title>¥Í¥Ã¥È¥ï¡¼¥¯ÄÌ¿®</title>
 
     <partintro>
-      <para>FreeBSD ¤Ï¡¢¹âÀ­Ç½¤Ê¥Í¥Ã¥È¥ï¡¼¥¯¥µ¡¼¥Ð¤È¤·¤ÆºÇ¤â¹­¤¯»ÈÍѤµ¤ì¤Æ¤¤¤ë¥ª¥Ú¥ì¡¼¥Æ¥£¥ó¥°¥·¥¹¥Æ¥à¤Î 1 ¤Ä¤Ç¤¹¡£
+      <para>&os; ¤Ï¡¢
+	¹âÀ­Ç½¤Ê¥Í¥Ã¥È¥ï¡¼¥¯¥µ¡¼¥Ð¤È¤·¤ÆºÇ¤â¹­¤¯»ÈÍѤµ¤ì¤Æ¤¤¤ë¥ª¥Ú¥ì¡¼¥Æ¥£¥ó¥°¥·¥¹¥Æ¥à¤Î 1 ¤Ä¤Ç¤¹¡£
 	³Æ¾Ï¤ÎÆâÍÆ¤Ï°Ê²¼¤ÎÄ̤ê¤Ç¤¹¡£</para>
 
       <itemizedlist>
@@ -270,7 +272,8 @@
 	</listitem>
 
 	<listitem>
-	  <para>PPP ¤È PPP ¥ª¡¼¥Ð¥¤¡¼¥µ¥Í¥Ã¥È (PPPoE)</para>
+	  <para><acronym>PPP</acronym> ¤È <acronym>PPP</acronym>
+	    ¥ª¡¼¥Ð¥¤¡¼¥µ¥Í¥Ã¥È (PPPoE)</para>
 	</listitem>
 
 	<listitem>
@@ -291,7 +294,7 @@
       </itemizedlist>
 
       <para>³Æ¾Ï¤Ï¡¢É¬Íפˤʤä¿»þ¤Ë¸ÄÊ̤˻²¾È¤Ç¤­¤ë¤è¤¦¤Ë¹½À®¤µ¤ì¤Æ¤¤¤Þ¤¹¡£
-	¤É¤Î½çÈÖ¤ÇÆÉ¤ó¤Ç¤â¹½¤¤¤Þ¤»¤ó¤·¡¢¥Í¥Ã¥È¥ï¡¼¥¯´Ä¶­¤Ç FreeBSD ¤ò»È¤¦¤Î¤Ë¡¢
+	¤É¤Î½çÈÖ¤ÇÆÉ¤ó¤Ç¤â¹½¤¤¤Þ¤»¤ó¤·¡¢¥Í¥Ã¥È¥ï¡¼¥¯´Ä¶­¤Ç &os; ¤ò»È¤¦¤Î¤Ë¡¢
 	¤¹¤Ù¤Æ¤òÆÉ¤ßÄ̤¹É¬Íפ¬¤¢¤ë¡¢¤È¤¤¤¦¤ï¤±¤Ç¤â¤¢¤ê¤Þ¤»¤ó¡£</para>
     </partintro>

_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-doc-all
To unsubscribe, send any mail to "[email protected]"
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.