svn commit: r40731 - in head/ja_JP.eucJP: books/handbook/bsdinstall books/handbook/eresources share/xml

[Ryusuke SUZUKI]

Author: ryusuke
Date: Thu Jan 24 10:39:46 2013
New Revision: 40731
URL: http://svnweb.freebsd.org/changeset/doc/40731

Log:
  - Merge the following from the English version:
  
  	r40628 -> r40690	head/ja_JP.eucJP/share/xml/mailing-lists.ent
  	r40526 -> r40684	head/ja_JP.eucJP/books/handbook/bsdinstall/chapter.xml
  	r40672 -> r40690	head/ja_JP.eucJP/books/handbook/eresources/chapter.xml

Modified:
  head/ja_JP.eucJP/books/handbook/bsdinstall/chapter.xml
  head/ja_JP.eucJP/books/handbook/eresources/chapter.xml
  head/ja_JP.eucJP/share/xml/mailing-lists.ent

Modified: head/ja_JP.eucJP/books/handbook/bsdinstall/chapter.xml
==============================================================================
--- head/ja_JP.eucJP/books/handbook/bsdinstall/chapter.xml	Wed Jan 23 13:13:16 2013	(r40730)
+++ head/ja_JP.eucJP/books/handbook/bsdinstall/chapter.xml	Thu Jan 24 10:39:46 2013	(r40731)
@@ -3,7 +3,7 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: r40526
+     Original revision: r40684
      $FreeBSD$
 -->
 
@@ -752,7 +752,7 @@ Ethernet address 0:3:ba:b:92:d4, Host ID
 	    <area id="bsdinstall-prompt-smp" coords="2 5"/>
 	  </areaspec>
 
-	  <screen><prompt>ok     </prompt>
+	  <screen><prompt>ok    </prompt>
 <prompt>ok {0} </prompt></screen>
 
 	  <calloutlist>

Modified: head/ja_JP.eucJP/books/handbook/eresources/chapter.xml
==============================================================================
--- head/ja_JP.eucJP/books/handbook/eresources/chapter.xml	Wed Jan 23 13:13:16 2013	(r40730)
+++ head/ja_JP.eucJP/books/handbook/eresources/chapter.xml	Thu Jan 24 10:39:46 2013	(r40731)
@@ -1169,6 +1169,20 @@
 	</varlistentry>
 
 	<varlistentry>
+	  <term>&a.ops-announce.name;</term>
+
+	  <listitem>
+	    <para><emphasis>¥×¥í¥¸¥§¥¯¥È¤Î¥¤¥ó¥Õ¥é¥¹¥È¥é¥¯¥Á¥ã¤Ë´Ø¤¹¤ë¥¢¥Ê¥¦¥ó¥¹</emphasis></para>
+
+	    <para>FreeBSD.org
+	      ¥×¥í¥¸¥§¥¯¥È¤Î¥¤¥ó¥Õ¥é¥¹¥È¥é¥¯¥Á¥ã¤ÎÊѹ¹¤ä´ØÏ¢¤·¤¿ÌäÂê¤Ë¤Ä¤¤¤Æ¶½Ì£¤ò»ý¤Ã¤Æ¤¤¤ë¸þ¤±¤Î¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ç¤¹¡£</para>
+
+	    <para>¤³¤Î¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ï¡¢¥¢¥Ê¥¦¥ó¥¹¤ËÀ©¸Â¤µ¤ì¤Æ¤¤¤Þ¤¹
+	      (ÊÖÅú¤äÍ׵ᡢµÄÏÀ¡¢°Õ¸«¤ò½Ò¤Ù¤ë¾ì¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó)¡£</para>
+	  </listitem>
+	</varlistentry>
+
+	<varlistentry>
 	  <term>&a.performance.name;</term>
 
 	  <listitem>

Modified: head/ja_JP.eucJP/share/xml/mailing-lists.ent
==============================================================================
--- head/ja_JP.eucJP/share/xml/mailing-lists.ent	Wed Jan 23 13:13:16 2013	(r40730)
+++ head/ja_JP.eucJP/share/xml/mailing-lists.ent	Thu Jan 24 10:39:46 2013	(r40731)
@@ -2,7 +2,7 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: r40628
+     Original revision: r40690
      $FreeBSD$
 -->
 
@@ -320,6 +320,10 @@
 <!ENTITY a.office "<ulink url='&a.office.url;'>FreeBSD ¤Ç¤Î¥ª¥Õ¥£¥¹¥¢¥×¥ê¥±¡¼¥·¥ç¥ó</ulink>">
 <!ENTITY a.office.name "<ulink url='&a.office.url;'>freebsd-office</ulink>">
 
+<!ENTITY a.ops-announce.url "&a.mailman.listinfo;/freebsd-ops-announce">
+<!ENTITY a.ops-announce "<ulink url='&a.ops-announce.url;'>¥×¥í¥¸¥§¥¯¥È¤Î¥¤¥ó¥Õ¥é¥¹¥È¥é¥¯¥Á¥ã¤Ë´Ø¤¹¤ë¥¢¥Ê¥¦¥ó¥¹</ulink>">
+<!ENTITY a.ops-announce.name "<ulink url='&a.ops-announce.url;'>freebsd-ops-announce</ulink>">
+
 <!ENTITY a.performance.url "&a.mailman.listinfo;/freebsd-performance">
 <!ENTITY a.performance "<ulink url='&a.performance.url;'>FreeBSD performance ¥á¡¼¥ê¥ó¥°¥ê¥¹¥È</ulink>">
 <!ENTITY a.performance.name "<ulink url='&a.performance.url;'>freebsd-performance</ulink>">