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

Author: ryusuke
Date: Sat Jan  6 14:40:02 2018
New Revision: 51367
URL: https://svnweb.freebsd.org/changeset/doc/51367

Log:
  - Merge the following from the English version:
  
  	r50383 -> r51348	head/ja_JP.eucJP/books/handbook/eresources/chapter.xml
  	r50383 -> r51193	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 Jan  4 23:31:06 2018	(r51366)
+++ head/ja_JP.eucJP/books/handbook/eresources/chapter.xml	Sat Jan  6 14:40:02 2018	(r51367)
@@ -3,7 +3,7 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: r50383
+     Original revision: r51348
      $FreeBSD$
 -->
 <appendix xmlns="http://docbook.org/ns/docbook"
@@ -43,7 +43,7 @@
       <listitem>
 	<para><link
 	    xlink:href="http://planet.freebsd.org/">Planet
-	    xlink:href="http://planet.freebsd.org/">Planet
+	    xlink:href="https://planet.freebsd.org/">Planet
 	  &os;</link> ¤Ï¡¢&os;
 	  ³«È¯¼Ô¤Ë¤è¤ê½ñ¤«¤ì¤¿¿ô¿¤¯¤Î¥Ö¥í¥°¤Î¥Õ¥£¡¼¥É°ìÍ÷¤òÄ󶡤·¤Þ¤¹¡£
 	  ¿¤¯¤Î³«È¯¼Ô¤Ï¡¢¼«Ê¬¤¿¤Á¤¬¼è¤êÁȤó¤Ç¤¤¤ë¤³¤È¤ä¿·¤·¤¤¥Ñ¥Ã¥Á¡¢
@@ -378,6 +378,11 @@
 	      <entry>°ìÈÌŪ¤Êµ»½Ñ¤ÎµÄÏÀ</entry>
 	    </row>
 
+	   <row>
+	      <entry>&a.haskell.name;</entry>
+	      <entry>&os; ¸ÇÍ­¤Î Haskell ¤Ë´Ø¤¹¤ëµÄÏÀ</entry>
+	   </row>
+
 	    <row>
 	      <entry>&a.hardware.name;</entry>
 	      <entry>&os; ¤ÎÁö¤ë¥Ï¡¼¥É¥¦¥§¥¢¤Î°ìÈÌŪ¤ÊµÄÏÀ</entry>
@@ -1998,6 +2003,16 @@
 	</varlistentry>
 
 	<varlistentry>
+	  <term>&a.teaching.name;</term>
+
+	  <listitem>
+	    <para><emphasis>&os; ¤Ë¤è¤ë¶µ°é</emphasis></para>
+
+	    <para>&os; ¤Ë¤è¤ë¶µ°é¤Ë¤Ä¤¤¤ÆµÄÏÀ¤ò¹Ô¤¦¤¿¤á¤Îµ»½ÑŪ¤Ç¤Ï¤Ê¤¤¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ç¤¹¡£</para>
+	  </listitem>
+	</varlistentry>
+
+	<varlistentry>
 	  <term>&a.testing.name;</term>
 
 	  <listitem>
@@ -2158,7 +2173,7 @@
 	    <para>¤³¤Î¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ø¤Î¥á¥Ã¥»¡¼¥¸¤ÎÊÔ½¸¥À¥¤¥¸¥§¥¹¥ÈÈǤ¬¡¢
 	      ¿ÊĽ¾õ¶·¥ì¥Ý¡¼¥È
 	      <footnote><para><link
-		    xlink:href="http://www.freebsd.org/news/status/"></link></para></footnote>
+		    xlink:href="https://www.freebsd.org/news/status/"></link></para></footnote>
 	      ¤È¤·¤Æ¡¢¿ô¥ö·î¤ª¤­¤Ë &os; ¥¦¥§¥Ö¥µ¥¤¥È¤Ë¸ø³«¤µ¤ì¤Þ¤¹¡£
 	      ²áµî¤Î¥ì¥Ý¡¼¥È¤â¥¢¡¼¥«¥¤¥Ö¤µ¤ì¤Æ¤¤¤Þ¤¹¡£</para>
 	  </listitem>

Modified: head/ja_JP.eucJP/share/xml/mailing-lists.ent
==============================================================================
--- head/ja_JP.eucJP/share/xml/mailing-lists.ent	Thu Jan  4 23:31:06 2018	(r51366)
+++ head/ja_JP.eucJP/share/xml/mailing-lists.ent	Sat Jan  6 14:40:02 2018	(r51367)
@@ -3,7 +3,7 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: r50383
+     Original revision: r51193
      $FreeBSD$
 -->
 
@@ -236,6 +236,10 @@
 <!ENTITY a.hackers "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.hackers.url;'>FreeBSD technical discussions ¥á¡¼¥ê¥ó¥°¥ê¥¹¥È</link>">
 <!ENTITY a.hackers.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.hackers.url;'>freebsd-hackers</link>">
 
+<!ENTITY a.haskell.url "&a.mailman.listinfo;/freebsd-haskell">
+<!ENTITY a.haskell "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.hardware.url;'>FreeBSD ¸ÇÍ­¤Î Haskell ¤Ë´Ø¤¹¤ëµÄÏÀ</link>">
+<!ENTITY a.haskell.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.haskell.url;'>freebsd-haskell</link>">
+
 <!ENTITY a.hardware.url "&a.mailman.listinfo;/freebsd-hardware">
 <!ENTITY a.hardware "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.hardware.url;'>FreeBSD hardware and equipment ¥á¡¼¥ê¥ó¥°¥ê¥¹¥È</link>">
 <!ENTITY a.hardware.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.hardware.url;'>freebsd-hardware</link>">
@@ -555,6 +559,10 @@
 <!ENTITY a.tcltk.url "&a.mailman.listinfo;/freebsd-tcltk">
 <!ENTITY a.tcltk "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.tcltk.url;'>FreeBSD ¸ÇÍ­¤Î Tcl/Tk ¤Ë´Ø¤¹¤ëµÄÏÀ</link>">
 <!ENTITY a.tcltk.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.tcltk.url;'>freebsd-tcltk</link>">
+
+<!ENTITY a.teaching.url "&a.mailman.listinfo;/freebsd-teaching">
+<!ENTITY a.teaching "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.teaching.url;'>FreeBSD ¶µ°é¤Î¥á¡¼¥ê¥ó¥°¥ê¥¹¥È</link>">
+<!ENTITY a.teaching.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.teaching.url;'>freebsd-teaching</link>">
 
 <!ENTITY a.test.url "&a.mailman.listinfo;/freebsd-test">
 <!ENTITY a.test "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.test.url;'>FreeBSD test ¥á¡¼¥ê¥ó¥°¥ê¥¹¥È</link>">

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