From owner-svn-doc-head@FreeBSD.ORG  Wed Sep 10 08:48:59 2014
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 132958EE;
 Wed, 10 Sep 2014 08:48:59 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id E7AC6F70;
 Wed, 10 Sep 2014 08:48:58 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s8A8mwY4020719;
 Wed, 10 Sep 2014 08:48:58 GMT (envelope-from ryusuke@FreeBSD.org)
Received: (from ryusuke@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s8A8mw8A020718;
 Wed, 10 Sep 2014 08:48:58 GMT (envelope-from ryusuke@FreeBSD.org)
Message-Id: <201409100848.s8A8mw8A020718@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: ryusuke set sender to
 ryusuke@FreeBSD.org using -f
From: Ryusuke SUZUKI <ryusuke@FreeBSD.org>
Date: Wed, 10 Sep 2014 08:48:58 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r45583 - head/ja_JP.eucJP/books/handbook/preface
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head/>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 10 Sep 2014 08:48:59 -0000

Author: ryusuke
Date: Wed Sep 10 08:48:58 2014
New Revision: 45583
URL: http://svnweb.freebsd.org/changeset/doc/45583

Log:
  - Merge the following from the English version:
  
  	r40743 -> r42896	head/ja_JP.eucJP/books/handbook/preface/preface.xml

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

Modified: head/ja_JP.eucJP/books/handbook/preface/preface.xml
==============================================================================
--- head/ja_JP.eucJP/books/handbook/preface/preface.xml	Wed Sep 10 00:20:27 2014	(r45582)
+++ head/ja_JP.eucJP/books/handbook/preface/preface.xml	Wed Sep 10 08:48:58 2014	(r45583)
@@ -3,7 +3,7 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: r40743
+     Original revision: r42896
      $FreeBSD$
 -->
 <preface xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="book-preface">
@@ -104,13 +104,6 @@
 	暗号化されたディスクパーティションに関する情報が追加されました。</para>
     </listitem>
 
-<!--      <listitem>
-	<para><xref linkend="vinum-vinum">, Vinum, is a new chapter
-	with this edition.  It describes how to use Vinum, a logical
-	volume manager which provides device-independent logical
-	disks, and software RAID-0, RAID-1 and RAID-5.</para>
-      </listitem> -->
-
     <listitem>
       <para><xref
 	  linkend="ppp-and-slip"/> に、
@@ -285,6 +278,16 @@
       </listitem>
     </varlistentry>
     <varlistentry>
+      <term><emphasis><xref linkend="bsdinstall"/>,
+	&os;&nbsp;9.<replaceable>X</replaceable>
+	のインストール</emphasis></term>
+      <listitem>
+	<para><application>bsdinstall</application> を用いた
+	  &os;&nbsp;9.<replaceable>x</replaceable>
+	  以降のシステムのインストール過程を一通りユーザに案内しています。</para>
+      </listitem>
+    </varlistentry>
+    <varlistentry>
       <term><emphasis><xref linkend="install"/>,
 	&os;&nbsp;8.<replaceable>X</replaceable>
 	のインストール</emphasis></term>
@@ -296,16 +299,6 @@
       </listitem>
     </varlistentry>
     <varlistentry>
-      <term><emphasis><xref linkend="bsdinstall"/>,
-	&os;&nbsp;9.<replaceable>X</replaceable>
-	のインストール</emphasis></term>
-      <listitem>
-	<para><application>bsdinstall</application> を用いた
-	  &os;&nbsp;9.<replaceable>x</replaceable>
-	  以降のシステムのインストール過程を一通りユーザに案内しています。</para>
-      </listitem>
-    </varlistentry>
-    <varlistentry>
       <term><emphasis><xref linkend="basics"/>, &unix;
 	の基礎知識</emphasis></term>
       <listitem>
@@ -452,7 +445,7 @@
     </varlistentry>
 <!--
     <varlistentry>
-      <term><emphasis><xref linkend="geom"/>,
+      <term><emphasis><xref linkend="geom-synopsis"/>,
 	GEOM</emphasis></term>
       <listitem>
 	<para>&os; の GEOM フレームワークおよびサポートされている