From owner-svn-doc-all@FreeBSD.ORG  Mon Jun 25 22:07:34 2012
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 1D8BD1065670;
	Mon, 25 Jun 2012 22:07:34 +0000 (UTC)
	(envelope-from ryusuke@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id E20858FC12;
	Mon, 25 Jun 2012 22:07:33 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q5PM7XmW098181;
	Mon, 25 Jun 2012 22:07:33 GMT (envelope-from ryusuke@svn.freebsd.org)
Received: (from ryusuke@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q5PM7X5c098178;
	Mon, 25 Jun 2012 22:07:33 GMT (envelope-from ryusuke@svn.freebsd.org)
Message-Id: <201206252207.q5PM7X5c098178@svn.freebsd.org>
From: Ryusuke SUZUKI <ryusuke@FreeBSD.org>
Date: Mon, 25 Jun 2012 22:07:33 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
	svn-doc-head@freebsd.org
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r39126 - in head/ja_JP.eucJP/books/handbook: bsdinstall
	kernelconfig
X-BeenThere: svn-doc-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
	user&quot; , &quot; projects&quot; , and &quot;
	translations&quot; \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
	<mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
	<mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 25 Jun 2012 22:07:34 -0000

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>