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

Author: ryusuke
Date: Sat Dec 12 10:32:17 2015
New Revision: 47843
URL: https://svnweb.freebsd.org/changeset/doc/47843

Log:
  - Merge the following from the English version:
  
  	r44413 -> r46038	head/ja_JP.eucJP/books/handbook/eresources/chapter.xml
  	r44411 -> r46038	head/ja_JP.eucJP/share/xml/mailing-lists.ent

Modified:
  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/eresources/chapter.xml
==============================================================================
--- head/ja_JP.eucJP/books/handbook/eresources/chapter.xml	Thu Dec 10 20:33:05 2015	(r47842)
+++ head/ja_JP.eucJP/books/handbook/eresources/chapter.xml	Sat Dec 12 10:32:17 2015	(r47843)
@@ -3,7 +3,7 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: r44413
+     Original revision: r46038
      $FreeBSD$
 -->
 <appendix xmlns="http://docbook.org/ns/docbook"
@@ -247,11 +247,6 @@
 	    </row>
 
 	    <row>
-	      <entry>&a.cvsweb.name;</entry>
-	      <entry>CVSweb ¤Î´ÉÍý</entry>
-	    </row>
-
-	    <row>
 	      <entry>&a.database.name;</entry>
 	      <entry>&os;
 		¾å¤Ç¤Î¥Ç¡¼¥¿¥Ù¡¼¥¹¤ÎÍøÍѤ䳫ȯ¤Ë´Ø¤¹¤ëµÄÏÀ</entry>
@@ -302,6 +297,13 @@
 	    </row>
 
 	    <row>
+	      <entry>&a.enlightenment.name;</entry>
+	      <entry><application>Enlightenment</application> ¤ª¤è¤Ó
+		<application>Enlightenment</application>
+		¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Î°Ü¿¢</entry>
+	    </row>
+
+	    <row>
 	      <entry>&a.firewire.name;</entry>
 	      <entry>&os; &firewire; (iLink, IEEE 1394)
 		¤Ë´Ø¤¹¤ëµ»½ÑŪ¤ÊµÄÏÀ</entry>
@@ -329,6 +331,11 @@
 	    </row>
 
 	    <row>
+	      <entry>&a.git.name;</entry>
+	      <entry>&os; ¥×¥í¥¸¥§¥¯¥È¤Ç¤Î git ¤Î»ÈÍѤ˴ؤ¹¤ëµÄÏÀ</entry>
+	    </row>
+
+	    <row>
 	      <entry>&a.gnome.name;</entry>
 	      <entry><application>GNOME</application> ¤ª¤è¤Ó
 		<application>GNOME</application> ¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Î°Ü¿¢</entry>
@@ -452,6 +459,11 @@
 	    </row>
 
 	    <row>
+	      <entry>&a.pkg.name;</entry>
+	      <entry>¥Ð¥¤¥Ê¥ê package ´ÉÍý¤ª¤è¤Ó package
+		´ØÏ¢¥Ä¡¼¥ë¤ÎµÄÏÀ</entry></row>
+
+	    <row>
 	      <entry>&a.pkg-fallout.name;</entry>
 	      <entry>package ¥Ó¥ë¥É¤Ë¼ºÇÔ¤·¤¿¥í¥°</entry>
 	    </row>
@@ -1073,7 +1085,8 @@
 	    <para>¤³¤ì¤Ï¡¢&os;
 	      ¤Î¥Ð¥°¥ì¥Ý¡¼¥È¤Î¤¿¤á¤Î¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ç¤¹¡£
 	      ²Äǽ¤Ç¤¢¤ë¾ì¹ç¤Ï¤¤¤Ä¤Ç¤â¡¢¥Ð¥°¤Ï &man.send-pr.1;
-	      ¤ò»È¤¦¤«¡¢<link xlink:href="&url.base;/send-pr.html">WEB
+	      ¤ò»È¤¦¤«¡¢
+	      <link xlink:href="https://bugs.freebsd.org/bugzilla/enter_bug.cgi">WEB
 		interface</link>¤òÍѤ¤¤ÆÁ÷¤é¤ì¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£</para>
 	  </listitem>
 	</varlistentry>
@@ -1146,17 +1159,6 @@
 	</varlistentry>
 
 	<varlistentry>
-	  <term>&a.cvsweb.name;</term>
-
-	  <listitem>
-	    <para><emphasis>&os; CVSweb ¥×¥í¥¸¥§¥¯¥È</emphasis></para>
-
-	    <para>&os;-CVSweb
-	      ¤ÎÍøÍÑ¡¢³«È¯¤ª¤è¤Ó´ÉÍý¤Ë¤Ä¤¤¤Æ¤Îµ»½ÑŪ¤ÊµÄÏÀ¤Î¾ì¤Ç¤¹¡£</para>
-	  </listitem>
-	</varlistentry>
-
-	<varlistentry>
 	  <term>&a.desktop.name;</term>
 
 	  <listitem>
@@ -1276,6 +1278,20 @@
 	</varlistentry>
 
 	<varlistentry>
+	  <term>&a.enlightenment.name;</term>
+
+	  <listitem>
+	    <para><emphasis>Enlightenment</emphasis></para>
+
+	    <para>&os; ¥·¥¹¥Æ¥à¤Ç¤Î
+	      <application>Enlightenment</application>
+	      ¥Ç¥¹¥¯¥È¥Ã¥×´Ä¶­¤Ë´ØÏ¢¤·¤¿µÄÏÀ¡£
+	      µ»½ÑŪ¤Ê¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ê¤Î¤Ç¡¢
+	      ´°Á´¤Ëµ»½ÑŪ¤ÊÆâÍƤ¬Í׵ᤵ¤ì¤Þ¤¹¡£</para>
+	  </listitem>
+	</varlistentry>
+
+	<varlistentry>
 	  <term>&a.eol.name;</term>
 
 	  <listitem>
@@ -1359,6 +1375,21 @@
 	</varlistentry>
 
 	<varlistentry>
+	  <term>&a.git.name;</term>
+
+	  <listitem>
+	    <para><emphasis>&os; ¤Ç¤Î git ¤Î»ÈÍÑ</emphasis></para>
+
+	    <para>&os; ¤Î¥×¥í¥¸¥§¥¯¥È¥³¥é¥Ü¥ì¡¼¥·¥ç¥ó¤ª¤±¤ë
+	      github ¥ß¥é¡¼¤ª¤è¤Ó¤½¤Î¾¤Î git ¤Î»ÈÍѤʤɡ¢git
+	      ¥¤¥ó¥Õ¥é¥¹¥È¥é¥¯¥Á¥ã¤ò¤É¤Î¤è¤¦¤Ë»È¤¦¤«¤È¤¤¤Ã¤¿µÄÏÀ¤¬¹Ô¤ï¤ì¤Þ¤¹¡£
+	      &os; github ¥ß¥é¡¼¤«¤é git ¤ò»ÈÍѤ¹¤ëÊý¡¹¤¬µÄÏÀ¤Ë»²²Ã¤·¤Æ¤¤¤Þ¤¹¡£
+	      ¥ß¥é¡¼¤Î»ÈÍѤò¹Í¤¨¤Æ¤¤¤ëÊý¤ä¡¢git ¤Î°ìÈÌŪ¤Ê &os;
+	      ¤Ç¤Î»ÈÍѤò¹Í¤¨¤Æ¤¤¤ëÊý¤Ï¤³¤³¤Ç¼ÁÌä¤Ç¤­¤Þ¤¹¡£</para>
+	  </listitem>
+	</varlistentry>
+
+	<varlistentry>
 	  <term>&a.gnome.name;</term>
 
 	  <listitem>
@@ -2280,7 +2311,7 @@
 
       <itemizedlist>
 	<listitem>
-	  <para><link xlink:href="http://forums.freebsd.org/">The
+	  <para><link xlink:href="https://forums.FreeBSD.org/">The
 	      &os; Forums</link> ¤Ï¡¢&os;
 	    ¤Î¼ÁÌ䤪¤è¤Óµ»½ÑŪ¤ÊµÄÏÀ¤Î¤¿¤á¤Î¥¦¥§¥Ö¥Ù¡¼¥¹¤Î¥Õ¥©¡¼¥é¥à¤Ç¤¹¡£</para></listitem>
 

Modified: head/ja_JP.eucJP/share/xml/mailing-lists.ent
==============================================================================
--- head/ja_JP.eucJP/share/xml/mailing-lists.ent	Thu Dec 10 20:33:05 2015	(r47842)
+++ head/ja_JP.eucJP/share/xml/mailing-lists.ent	Sat Dec 12 10:32:17 2015	(r47843)
@@ -3,7 +3,7 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: r44411
+     Original revision: r46038
      $FreeBSD$
 -->
 
@@ -146,10 +146,6 @@
 <!ENTITY a.cvs-src "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.cvs-src.url;'>FreeBSD CVS src commit list</link>">
 <!ENTITY a.cvs-src.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.cvs-src.url;'>cvs-src</link>">
 
-<!ENTITY a.cvsweb.url "&a.mailman.listinfo;/freebsd-cvsweb">
-<!ENTITY a.cvsweb "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.cvsweb.url;'>FreeBSD CVSweb maintenance ¥á¡¼¥ê¥ó¥°¥ê¥¹¥È</link>">
-<!ENTITY a.cvsweb.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.cvsweb.url;'>freebsd-cvsweb</link>">
-
 <!ENTITY a.database.url "&a.mailman.listinfo;/freebsd-database">
 <!ENTITY a.database "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.database.url;'>FreeBSD based Databases ¥á¡¼¥ê¥ó¥°¥ê¥¹¥È</link>">
 <!ENTITY a.database.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.database.url;'>freebsd-database</link>">
@@ -192,6 +188,10 @@
 <!ENTITY a.emulation "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.emulation.url;'>FreeBSD-emulation ¥á¡¼¥ê¥ó¥°¥ê¥¹¥È</link>">
 <!ENTITY a.emulation.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.emulation.url;'>freebsd-emulation</link>">
 
+<!ENTITY a.enlightenment.url "&a.mailman.listinfo;/freebsd-enlightenment">
+<!ENTITY a.enlightenment "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.enlightenment.url;'>FreeBSD-enlightenment ¥á¡¼¥ê¥ó¥°¥ê¥¹¥È</link>">
+<!ENTITY a.enlightenment.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.enlightenment.url;'>freebsd-enlightenment</link>">
+
 <!ENTITY a.eol.url "&a.mailman.listinfo;/freebsd-eol">
 <!ENTITY a.eol "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.eol.url;'>FreeBSD-eol ¥á¡¼¥ê¥ó¥°¥ê¥¹¥È</link>">
 <!ENTITY a.eol.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.eol.url;'>freebsd-eol</link>">
@@ -220,6 +220,10 @@
 <!ENTITY a.geom "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.geom.url;'>FreeBSD GEOM ¥á¡¼¥ê¥ó¥°¥ê¥¹¥È</link>">
 <!ENTITY a.geom.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.geom.url;'>freebsd-geom</link>">
 
+<!ENTITY a.git.url "&a.mailman.listinfo;/freebsd-git">
+<!ENTITY a.git "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.git.url;'>FreeBSD ¥×¥í¥¸¥§¥¯¥È¤Ç¤Î git ¤Î»ÈÍѤ˴ؤ¹¤ëµÄÏÀ</link>">
+<!ENTITY a.git.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.git.url;'>freebsd-git</link>">
+
 <!ENTITY a.gnome.url "&a.mailman.listinfo;/freebsd-gnome">
 <!ENTITY a.gnome "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.gnome.url;'>FreeBSD GNOME and GNOME applications ¥á¡¼¥ê¥ó¥°¥ê¥¹¥È</link>">
 <!ENTITY a.gnome.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.gnome.url;'>freebsd-gnome</link>">

_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-doc-all
To unsubscribe, send any mail to "[email protected]"