svn commit: r42140 - in head/ja_JP.eucJP/books/handbook: . disks preface

Ryusuke SUZUKI ryusuke at FreeBSD.org
Wed Jul 3 15:38:48 UTC 2013


Author: ryusuke
Date: Wed Jul  3 15:38:46 2013
New Revision: 42140
URL: http://svnweb.freebsd.org/changeset/doc/42140

Log:
  - Merge the following from the English version:
  
  	r41710 -> r42118	head/ja_JP.eucJP/books/handbook/Makefile
  	r41824 -> r42118	head/ja_JP.eucJP/books/handbook/book.xml
  	r21771 -> r42118	head/ja_JP.eucJP/books/handbook/chapters.ent
  	r42018 -> r42118	head/ja_JP.eucJP/books/handbook/disks/chapters.xml
  	r41912 -> r42118	head/ja_JP.eucJP/books/handbook/preface.xml

Modified:
  head/ja_JP.eucJP/books/handbook/Makefile
  head/ja_JP.eucJP/books/handbook/book.xml
  head/ja_JP.eucJP/books/handbook/chapters.ent
  head/ja_JP.eucJP/books/handbook/disks/chapter.xml
  head/ja_JP.eucJP/books/handbook/preface/preface.xml

Modified: head/ja_JP.eucJP/books/handbook/Makefile
==============================================================================
--- head/ja_JP.eucJP/books/handbook/Makefile	Wed Jul  3 15:22:19 2013	(r42139)
+++ head/ja_JP.eucJP/books/handbook/Makefile	Wed Jul  3 15:38:46 2013	(r42140)
@@ -3,7 +3,7 @@
 #
 # Build the FreeBSD Handbook (Japanese).
 #
-# Original revision: r41710
+# Original revision: r42118
 #
 
 # ------------------------------------------------------------------------
@@ -180,13 +180,6 @@ IMAGES_EN+= install/example-dir5.eps
 #IMAGES_EN+= security/ipsec-crypt-pkt.pic
 #IMAGES_EN+= security/ipsec-encap-pkt.pic
 #IMAGES_EN+= security/ipsec-out-pkt.pic
-#IMAGES_EN+= vinum/vinum-concat.pic
-#IMAGES_EN+= vinum/vinum-mirrored-vol.pic
-#IMAGES_EN+= vinum/vinum-raid10-vol.pic
-#IMAGES_EN+= vinum/vinum-raid5-org.pic
-#IMAGES_EN+= vinum/vinum-simple-vol.pic
-#IMAGES_EN+= vinum/vinum-striped-vol.pic
-#IMAGES_EN+= vinum/vinum-striped.pic
 IMAGES_EN+= virtualization/parallels-freebsd1.png
 IMAGES_EN+= virtualization/parallels-freebsd2.png
 IMAGES_EN+= virtualization/parallels-freebsd3.png
@@ -286,7 +279,6 @@ SRCS+= printing/chapter.xml
 SRCS+= security/chapter.xml
 SRCS+= serialcomms/chapter.xml
 SRCS+= users/chapter.xml
-#SRCS+= vinum/chapter.xml
 #SRCS+= virtualization/chapter.xml
 SRCS+= x11/chapter.xml
 

Modified: head/ja_JP.eucJP/books/handbook/book.xml
==============================================================================
--- head/ja_JP.eucJP/books/handbook/book.xml	Wed Jul  3 15:22:19 2013	(r42139)
+++ head/ja_JP.eucJP/books/handbook/book.xml	Wed Jul  3 15:38:46 2013	(r42140)
@@ -11,7 +11,7 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: r41824
+     Original revision: r42118
      $FreeBSD$
 -->
 
@@ -247,7 +247,6 @@
     &chap.disks;
 <!--
     &chap.filesystems;
-    &chap.vinum;
     &chap.virtualization;
 -->
     &chap.l10n;

Modified: head/ja_JP.eucJP/books/handbook/chapters.ent
==============================================================================
--- head/ja_JP.eucJP/books/handbook/chapters.ent	Wed Jul  3 15:22:19 2013	(r42139)
+++ head/ja_JP.eucJP/books/handbook/chapters.ent	Wed Jul  3 15:38:46 2013	(r42140)
@@ -3,7 +3,7 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: 1.28
+     Original revision: r42118
      $FreeBSD$
 
      Creates entities for each chapter in the FreeBSD Handbook. Each entity
@@ -38,10 +38,12 @@
   <!ENTITY chap.users		SYSTEM "users/chapter.xml">
   <!ENTITY chap.security	SYSTEM "security/chapter.xml">
   <!ENTITY chap.jails		SYSTEM "jails/chapter.xml">
+<!--  <!ENTITY chap.mac		SYSTEM "mac/chapter.xml"> -->
   <!ENTITY chap.audit		SYSTEM "audit/chapter.xml">
   <!ENTITY chap.disks		SYSTEM "disks/chapter.xml">
+<!--  <!ENTITY chap.geom		SYSTEM "geom/chapter.xml"> -->
   <!ENTITY chap.filesystems	SYSTEM "filesystems/chapter.xml">
-  <!ENTITY chap.vinum		SYSTEM "vinum/chapter.xml">
+<!--  <!ENTITY chap.virtualization	SYSTEM "virtualization/chapter.xml"> -->
   <!ENTITY chap.l10n		SYSTEM "l10n/chapter.xml">
   <!ENTITY chap.cutting-edge	SYSTEM "cutting-edge/chapter.xml">
   <!ENTITY chap.dtrace		SYSTEM "dtrace/chapter.xml">
@@ -50,6 +52,8 @@
   <!ENTITY chap.serialcomms	SYSTEM "serialcomms/chapter.xml">
   <!ENTITY chap.ppp-and-slip	SYSTEM "ppp-and-slip/chapter.xml">
   <!ENTITY chap.mail		SYSTEM "mail/chapter.xml">
+<!--  <!ENTITY chap.network-servers	SYSTEM "network-servers/chapter.xml"> -->
+<!--  <!ENTITY chap.firewalls	SYSTEM "firewalls/chapter.xml"> -->
   <!ENTITY chap.advanced-networking	SYSTEM "advanced-networking/chapter.xml">
 
 <!-- Part Five (appendices) -->

Modified: head/ja_JP.eucJP/books/handbook/disks/chapter.xml
==============================================================================
--- head/ja_JP.eucJP/books/handbook/disks/chapter.xml	Wed Jul  3 15:22:19 2013	(r42139)
+++ head/ja_JP.eucJP/books/handbook/disks/chapter.xml	Wed Jul  3 15:38:46 2013	(r42140)
@@ -3335,10 +3335,6 @@ Filesystem        Size   Used  Avail Cap
 
       <screen>&prompt.root; <userinput>gbde detach /dev/ad4s1c</userinput></screen>
 
-      <para>&man.vinum.4; ¤Ï &man.geom.4; ¥µ¥Ö¥·¥¹¥Æ¥à¤ò»ÈÍѤ·¤Ê¤¤¤Î¤Ç¡¢
-	<application>vinum</application> ¥Ü¥ê¥å¡¼¥à¤È
-	<application>gbde</application>
-	¤òÊ»ÍѤǤ­¤Ê¤¤¤³¤È¤Ë¤âÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
     </sect2>
   </sect1>
 </chapter>

Modified: head/ja_JP.eucJP/books/handbook/preface/preface.xml
==============================================================================
--- head/ja_JP.eucJP/books/handbook/preface/preface.xml	Wed Jul  3 15:22:19 2013	(r42139)
+++ head/ja_JP.eucJP/books/handbook/preface/preface.xml	Wed Jul  3 15:38:46 2013	(r42140)
@@ -229,15 +229,6 @@
   	  ¥Í¥Ã¥È¥ï¡¼¥¯¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤Ê¤É¤Ç¤¹¡£</para>
       </listitem>
     </varlistentry>
-  <!-- XXX: to be commented in when handbook/vinum is translated.
-    <varlistentry>
-      <term><emphasis><xref linkend="vinum-vinum"/>, Vinum</emphasis></term>
-	<para>¥Ç¥Ð¥¤¥¹Èó°Í¸¤ÊÏÀÍý¥Ç¥£¥¹¥¯¤È¥½¥Õ¥È¥¦¥§¥¢ RAID-0,
-	  RAID-1, RAID-5 ¤òÄ󶡤¹¤ëÏÀÍý¥Ü¥ê¥å¡¼¥à´ÉÍý¥½¥Õ¥È¥¦¥§¥¢
-	  Vinum ¤Î»È¤¤Êý¤òÀâÌÀ¤·¤Æ¤¤¤Þ¤¹¡£</para>
-      </listitem>
-    </varlistentry>
-  -->
     <varlistentry>
       <term><emphasis><xref linkend="l10n"/>, ÃÏ°è²½</emphasis></term>
       <listitem>


More information about the svn-doc-all mailing list