svn commit: r39126 - in head/ja_JP.eucJP/books/handbook: bsdinstall kernelconfig

[Ryusuke SUZUKI]

Author: ryusuke
Date: Mon Jun 25 22:07:33 2012
New Revision: 39126
URL: http://svn.freebsd.org/changeset/doc/39126

Log:
  - Merge the following from the English version:
  
  	r39058 -> r39098	head/ja_JP.eucJP/books/handbook/bsdinstall/chapter.sgml
  	r39025 -> r39097	head/ja_JP.eucJP/books/handbook/kernelconfig/chapter.sgml

Modified:
  head/ja_JP.eucJP/books/handbook/bsdinstall/chapter.sgml
  head/ja_JP.eucJP/books/handbook/kernelconfig/chapter.sgml

Modified: head/ja_JP.eucJP/books/handbook/bsdinstall/chapter.sgml
==============================================================================
--- head/ja_JP.eucJP/books/handbook/bsdinstall/chapter.sgml	Mon Jun 25 19:16:09 2012	(r39125)
+++ head/ja_JP.eucJP/books/handbook/bsdinstall/chapter.sgml	Mon Jun 25 22:07:33 2012	(r39126)
@@ -2,7 +2,7 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: r39058
+     Original revision: r39098
      $FreeBSD$
 -->
 
@@ -1367,6 +1367,14 @@ Trying to mount root from cd9660:/dev/is
 	</listitem>
 
 	<listitem>
+	  <para><literal>freebsd-zfs</literal> - &os;
+	    ZFS ¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¡£<!-- <xref linkend="filesystems-zfs"> -->
+	    <ulink url="&url.books.handbook.en;/filesystems-zfs.html">
+	      The Z File System (ZFS)</ulink> ¤ò¤´Í÷¤¯¤À¤µ¤¤¡£
+	  </para>
+	</listitem>
+
+	<listitem>
 	  <para><literal>freebsd-swap</literal> - &os;
 	    ¥¹¥ï¥Ã¥×¶õ´Ö¡£</para>
 	</listitem>

Modified: head/ja_JP.eucJP/books/handbook/kernelconfig/chapter.sgml
==============================================================================
--- head/ja_JP.eucJP/books/handbook/kernelconfig/chapter.sgml	Mon Jun 25 19:16:09 2012	(r39125)
+++ head/ja_JP.eucJP/books/handbook/kernelconfig/chapter.sgml	Mon Jun 25 22:07:33 2012	(r39126)
@@ -2,7 +2,7 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: r39025
+     Original revision: r39097
      $FreeBSD$
 -->
 
@@ -750,8 +750,10 @@ options          NFS_ROOT          # NFS
 
     <programlisting>options          GEOM_PART_GPT     # GUID Partition Tables.</programlisting>
 
-    <para>¤³¤Î¥ª¥×¥·¥ç¥ó¤Ï¡¢
-      ¤Ò¤È¤Ä¤Î¥Ç¥£¥¹¥¯¤Ë¿ô¿¤¯¤Î¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤òºîÀ®²Äǽ¤Ë¤·¤Þ¤¹¡£</para>
+    <para><ulink url="http://en.wikipedia.org/wiki/GUID_Partition_Table">GUID
+      ¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¥Æ¡¼¥Ö¥ë</ulink> ¤ËÂбþ¤·¤Þ¤¹¡£
+      GPT ¤Ç¤Ï¡¢1 ¤Ä¤Î¥Ç¥£¥¹¥¯¤Ë¿ô¿¤¯¤Î¥Ñ¡¼¥Æ¥£¥·¥ç¥ó
+      (ɸ½à¤Î¹½À®¤Ç¤ÏºÇÂç 128) ¤òºîÀ®²Äǽ¤Ç¤¹¡£</para>
 
     <programlisting>options          COMPAT_43         # Compatible with BSD 4.3 [KEEP THIS!]</programlisting>