svn commit: r41348 - in head/ja_JP.eucJP/books/handbook: . desktop mirrors x11

[Ryusuke SUZUKI]

Author: ryusuke
Date: Tue Apr  2 13:41:35 2013
New Revision: 41348
URL: http://svnweb.freebsd.org/changeset/doc/41348

Log:
  - Merge the following from the English version:
  
  	r40585 -> r41343	head/ja_JP.eucJP/books/handbook/book.xml
  	r41113 -> r41335	head/ja_JP.eucJP/books/handbook/desktop/chapter.xml
  	r41189 -> r41337	head/ja_JP.eucJP/books/handbook/mirrors/chapter.xml
  	r41025 -> r41343	head/ja_JP.eucJP/books/handbook/x11/chapter.xml

Modified:
  head/ja_JP.eucJP/books/handbook/book.xml
  head/ja_JP.eucJP/books/handbook/desktop/chapter.xml
  head/ja_JP.eucJP/books/handbook/mirrors/chapter.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	Tue Apr  2 12:35:57 2013	(r41347)
+++ head/ja_JP.eucJP/books/handbook/book.xml	Tue Apr  2 13:41:35 2013	(r41348)
@@ -14,7 +14,7 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: r40585
+     Original revision: r41343
      $FreeBSD$
 -->
 
@@ -61,7 +61,6 @@
       &tm-attrib.adaptec;
       &tm-attrib.adobe;
       &tm-attrib.apple;
-      &tm-attrib.corel;
       &tm-attrib.creative;
       &tm-attrib.cvsup;
       &tm-attrib.heidelberger;
@@ -74,7 +73,6 @@
       &tm-attrib.m-systems;
       &tm-attrib.macromedia;
       &tm-attrib.microsoft;
-      &tm-attrib.netscape;
       &tm-attrib.nexthop;
       &tm-attrib.opengroup;
       &tm-attrib.oracle;

Modified: head/ja_JP.eucJP/books/handbook/desktop/chapter.xml
==============================================================================
--- head/ja_JP.eucJP/books/handbook/desktop/chapter.xml	Tue Apr  2 12:35:57 2013	(r41347)
+++ head/ja_JP.eucJP/books/handbook/desktop/chapter.xml	Tue Apr  2 13:41:35 2013	(r41348)
@@ -3,7 +3,7 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: r41113
+     Original revision: r41335
      $FreeBSD$
 -->
 
@@ -234,7 +234,7 @@
       <application>GNOME</application> ¥Ç¥¹¥¯¥È¥Ã¥×´Ä¶­¤Ë¤Ï¡¢
       ¤½¤ì¤¾¤ì HTML ¥Ö¥é¥¦¥¶¤¬ÍÑ°Õ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£
       ¤³¤ì¤é¤Î¥Ç¥¹¥¯¥È¥Ã¥×´Ä¶­¤òÀßÄꤹ¤ë¤¿¤á¤Î¾ðÊó¤Ë¤Ä¤¤¤Æ¤Ï
-      <link linkend="x11-wm"></link> ¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
+      <xref linkend="x11-wm"/> ¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
     <para>·ÚÎ̤ʥ֥饦¥¶¤È¤·¤Æ¤Ï¡¢
       <filename role="package">www/dillo2</filename>,
@@ -591,7 +591,7 @@
       </note>
 
       <para>&java; ¥×¥é¥°¥¤¥ó¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤Ë¤Ï¡¢
-	<link linkend="moz-java-plugin"></link>
+	<xref linkend="moz-java-plugin"/>
 	¤Ë½ñ¤«¤ì¤Æ¤¤¤ë¼ê½ç¤Ë½¾¤Ã¤Æ¤¯¤À¤µ¤¤¡£</para>
 
       <para>&java; ¤Î¥µ¥Ý¡¼¥È¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤¿¤é¡¢

Modified: head/ja_JP.eucJP/books/handbook/mirrors/chapter.xml
==============================================================================
--- head/ja_JP.eucJP/books/handbook/mirrors/chapter.xml	Tue Apr  2 12:35:57 2013	(r41347)
+++ head/ja_JP.eucJP/books/handbook/mirrors/chapter.xml	Tue Apr  2 13:41:35 2013	(r41348)
@@ -3,7 +3,7 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: r41189
+     Original revision: r41337
      $FreeBSD$
 -->
 
@@ -1758,6 +1758,15 @@ usr.bin/</programlisting>
       </varlistentry>
 
       <varlistentry>
+	<term>RELENG_9_1</term>
+
+	<listitem>
+	  <para>&os;-9.1 ÍѤΥê¥ê¡¼¥¹¥Ö¥é¥ó¥Á¡£¥»¥­¥å¥ê¥Æ¥£´«¹ð¤ä¡¢
+	    ¤½¤Î¾¤Î¿¼¹ï¤Ê¥»¥­¥å¥ê¥Æ¥£¾å¤Î½¤Àµ¤¬¤¢¤Ã¤¿¾ì¹ç¤Ë¤Î¤ß»È¤ï¤ì¤Þ¤¹¡£</para>
+	</listitem>
+      </varlistentry>
+
+      <varlistentry>
 	<term>RELENG_9_0</term>
 
 	<listitem>
@@ -1776,6 +1785,15 @@ usr.bin/</programlisting>
       </varlistentry>
 
       <varlistentry>
+	<term>RELENG_8_4</term>
+
+	<listitem>
+	  <para>&os;-8.4 ÍѤΥê¥ê¡¼¥¹¥Ö¥é¥ó¥Á¡£¥»¥­¥å¥ê¥Æ¥£´«¹ð¤ä¡¢
+	    ¤½¤Î¾¤Î¿¼¹ï¤Ê¥»¥­¥å¥ê¥Æ¥£¾å¤Î½¤Àµ¤¬¤¢¤Ã¤¿¾ì¹ç¤Ë¤Î¤ß»È¤ï¤ì¤Þ¤¹¡£</para>
+	</listitem>
+      </varlistentry>
+
+      <varlistentry>
 	<term>RELENG_8_3</term>
 
 	<listitem>
@@ -2114,6 +2132,14 @@ usr.bin/</programlisting>
 
     <variablelist>
       <varlistentry>
+	<term>RELENG_9_1_0_RELEASE</term>
+
+	<listitem>
+	  <para>&os; 9.1</para>
+	</listitem>
+      </varlistentry>
+
+      <varlistentry>
 	<term>RELENG_9_0_0_RELEASE</term>
 
 	<listitem>

Modified: head/ja_JP.eucJP/books/handbook/x11/chapter.xml
==============================================================================
--- head/ja_JP.eucJP/books/handbook/x11/chapter.xml	Tue Apr  2 12:35:57 2013	(r41347)
+++ head/ja_JP.eucJP/books/handbook/x11/chapter.xml	Tue Apr  2 13:41:35 2013	(r41348)
@@ -3,7 +3,7 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: r41025
+     Original revision: r41343
      $FreeBSD$
 -->
 
@@ -824,8 +824,7 @@ EndSection</programlisting>
       <para>X11 ¤ËÉÕ¤¤¤Æ¤¯¤ë¥Ç¥Õ¥©¥ë¥È¤Î¥Õ¥©¥ó¥È¤Ï¡¢
 	Ä̾ï¤Î¥Ç¥¹¥¯¥È¥Ã¥×¥Ñ¥Ö¥ê¥Ã¥·¥ó¥°¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Ë¤È¤Ã¤Æ¤ÏÍýÁÛŪ¤È¤Ï¸À¤¨¤Ê¤¤ÄøÅ٤Τâ¤Î¤Ç¤¹¡£
 	ʸ»ú¤òÂ礭¤¯¤¹¤ë¤È¥¸¥ã¥®¡¼¤Ë¤Ê¤ê¥×¥í¥Õ¥§¥Ã¥·¥ç¥Ê¥ë¤È¤Ï¸À¤¨¤Ê¤¤¤è¤¦¤Ê¤â¤Î¤Ë¤Ê¤ê¤Þ¤¹¤·¡¢
-	<application>&netscape;</application>
-	¤Ç¤Î¾®¤µ¤Ê¥Õ¥©¥ó¥È¤ÏƬ¤¬°­¤½¤¦¤Ë¸«¤¨¤Þ¤¹¡£
+	¾®¤µ¤Ê¥Õ¥©¥ó¥È¤ÏƬ¤¬°­¤½¤¦¤Ë¸«¤¨¤Þ¤¹¡£
 	¤·¤«¤·¡¢À¤¤ÎÃæ¤Ë¤Ï¼Á¤Î¹â¤¤ Type1 (&postscript;)
 	¥Õ¥©¥ó¥È¤¬¤¤¤¯¤Ä¤«¤¢¤ê¡¢
 	X11 ¤Ç¤Ï¤½¤ì¤é¤ò´Êñ¤ËÍøÍѤ¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
@@ -928,9 +927,9 @@ EndSection</programlisting>
       <para>¤È¤¹¤ë¤«¡¢¤â¤·¤¯¤Ï <filename>xorg.conf</filename>
 	¥Õ¥¡¥¤¥ë¤Ë <literal>FontPath</literal> ¹Ô¤òÄɲä·¤Þ¤¹¡£</para>
 
-      <para>¤³¤ì¤Ç½ª¤ï¤ê¤Ç¤¹¡£<application>&netscape;</application> ¤ä
-	<application>Gimp</application>,
-	<application>&staroffice;</application>
+      <para>¤³¤ì¤Ç½ª¤ï¤ê¤Ç¤¹¡£
+	<application>Gimp</application> ¤ä
+	<application>Apache OpenOffice</application>
 	¤È¤¤¤Ã¤¿¤¹¤Ù¤Æ¤Î X ¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤«¤é
 	&truetype; ¥Õ¥©¥ó¥È¤ò»È¤¦¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
 	(¹â²òÁüÅ٤ʥǥ£¥¹¥×¥ì¥¤¤Ç¸«¤ë¥¦¥§¥Ö¥Ú¡¼¥¸¾å¤Î¥Æ¥­¥¹¥È¤ß¤¿¤¤¤Ê)