svn commit: r47284 - in head/ja_JP.eucJP/books/handbook: . preface x11

[Ryusuke SUZUKI]

Author: ryusuke
Date: Wed Aug 19 12:48:54 2015
New Revision: 47284
URL: https://svnweb.freebsd.org/changeset/doc/47284

Log:
  - Merge the following from the English version:
  
  	r46610 -> r47275	head/ja_JP.eucJP/books/handbook/book.xml
  	r46055 -> r47274	head/ja_JP.eucJP/books/handbook/preface/preface.xml
  	r47098 -> r47273	head/ja_JP.eucJP/books/handbook/x11/chapter.xml

Modified:
  head/ja_JP.eucJP/books/handbook/book.xml
  head/ja_JP.eucJP/books/handbook/preface/preface.xml
  head/ja_JP.eucJP/books/handbook/x11/chapter.xml

Modified: head/ja_JP.eucJP/books/handbook/book.xml
==============================================================================
--- head/ja_JP.eucJP/books/handbook/book.xml	Wed Aug 19 12:31:23 2015	(r47283)
+++ head/ja_JP.eucJP/books/handbook/book.xml	Wed Aug 19 12:48:54 2015	(r47284)
@@ -5,7 +5,7 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: r46610
+     Original revision: r47275
      $FreeBSD$
 -->
 
@@ -91,7 +91,6 @@
     <abstract>
       <para>FreeBSD ¤Ø¤è¤¦¤³¤½!
 	¤³¤Î¥Ï¥ó¥É¥Ö¥Ã¥¯¤Ï
-	<emphasis>FreeBSD &rel3.current;-RELEASE</emphasis>,
 	<emphasis>FreeBSD &rel2.current;-RELEASE</emphasis>
 	¤È <emphasis>FreeBSD &rel.current;-RELEASE</emphasis>
 	¤Î¥¤¥ó¥¹¥È¡¼¥ë¤ª¤è¤Ó¡¢Æü¾ï¤Ç¤Î»È¤¤Êý¤Ë¤Ä¤¤¤Æµ­½Ò¤·¤¿¤â¤Î¤Ç¤¹¡£
@@ -171,7 +170,6 @@
 
     &chap.introduction;
     &chap.bsdinstall;
-    &chap.install;
     &chap.basics;
     &chap.ports;
     &chap.x11;

Modified: head/ja_JP.eucJP/books/handbook/preface/preface.xml
==============================================================================
--- head/ja_JP.eucJP/books/handbook/preface/preface.xml	Wed Aug 19 12:31:23 2015	(r47283)
+++ head/ja_JP.eucJP/books/handbook/preface/preface.xml	Wed Aug 19 12:48:54 2015	(r47284)
@@ -3,7 +3,7 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: r46055
+     Original revision: r47274
      $FreeBSD$
 -->
 <preface xmlns="http://docbook.org/ns/docbook"
@@ -182,11 +182,6 @@
       </listitem>
 
       <listitem>
-	<para><xref linkend="install"/>
-	  ¤Ï¿·µ¬¥æ¡¼¥¶¡¼¤¬Ê¸¾Ï¤ÎÆâÍƤòÍý²ò¤·¤ä¤¹¤¤¤è¤¦¤Ë¿¤¯¤Î¥¹¥¯¥ê¡¼¥ó¥·¥ç¥Ã¥È¤òÆþ¤ì¤Æ´°Á´¤Ë½ñ¤­Ä¾¤µ¤ì¤Þ¤·¤¿¡£</para>
-      </listitem>
-
-      <listitem>
 	<para><xref linkend="basics"/> ¤Ë¤Ï¡¢¥×¥í¥»¥¹¡¢¥Ç¡¼¥â¥ó¡¢
 	  ¥·¥°¥Ê¥ë¤Ë´Ø¤¹¤ë¾ðÊó¤¬Äɲ䵤ì¤Þ¤·¤¿¡£</para>
       </listitem>
@@ -304,17 +299,6 @@
     </varlistentry>
 
     <varlistentry>
-      <term><emphasis><xref linkend="install"/></emphasis></term>
-
-      <listitem>
-	<para><application>sysinstall</application> ¤òÍѤ¤¤¿
-	  &os; 8.<replaceable>x</replaceable> °Ê¹ß¤Î¥·¥¹¥Æ¥à¤Î
-	  ¥¤¥ó¥¹¥È¡¼¥ë²áÄø¤ò°ìÄ̤ê¥æ¡¼¥¶¤Ë°ÆÆ⤷¤Æ¤¤¤Þ¤¹¡£
-	  ¤Þ¤¿¡¢¥·¥ê¥¢¥ë¥³¥ó¥½¡¼¥ë·Ðͳ¤Ç¤Î¥¤¥ó¥¹¥È¡¼¥ë¤Î¤è¤¦¤Ê¹âÅÙ¤ÊÏÃÂê¤â¤¤¤¯¤é¤«°·¤Ã¤Æ¤¤¤Þ¤¹¡£</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
       <term><emphasis><xref linkend="basics"/></emphasis></term>
 
       <listitem>
@@ -669,7 +653,7 @@
       <term><application>ÂÀ»ú</application></term>
 
       <listitem>
-	<para><application>ÂÀ»ú</application>¤Î¥Õ¥©¥ó¥È¤Ï¡¢
+	<para><keycap>ÂÀ»ú</keycap>¤Î¥Õ¥©¥ó¥È¤Ï¡¢
 	  ¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¡¢¥³¥Þ¥ó¥É¡¢¥­¡¼¤òɽ¤¹¤Î¤Ë»È¤ï¤ì¤Æ¤¤¤Þ¤¹¡£</para>
       </listitem>
     </varlistentry>

Modified: head/ja_JP.eucJP/books/handbook/x11/chapter.xml
==============================================================================
--- head/ja_JP.eucJP/books/handbook/x11/chapter.xml	Wed Aug 19 12:31:23 2015	(r47283)
+++ head/ja_JP.eucJP/books/handbook/x11/chapter.xml	Wed Aug 19 12:48:54 2015	(r47284)
@@ -452,7 +452,6 @@ dbus_enable="YES"</programlisting>
 
       <para>¤â¤·¥Þ¥¦¥¹¤¬Æ°ºî¤·¤Ê¤±¤ì¤Ð¡¢
 	Àè¤Ø¿Ê¤àÁ°¤Ë¥Þ¥¦¥¹¤ÎÀßÄê¤ò¹Ô¤¦É¬Íפ¬¤¢¤ê¤Þ¤¹¡£
-	&os; ¥¤¥ó¥¹¥È¡¼¥ë¤Î¾Ï¤Î <xref linkend="mouse"/> ¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
 	¤µ¤é¤Ë¡¢
 	ºÇ¶á¤Î <application>Xorg</application> ¤Ç¤Ï¡¢¥Ç¥Ð¥¤¥¹¤Î¼«Æ°Ç§¼±¤Î¤¿¤á¡¢
 	<filename>xorg.conf</filename> ¤Î