From 534834dc593935c628a3f6ac491798c2feed326f Mon Sep 17 00:00:00 2001
From: Ryusuke SUZUKI <ryusuke@FreeBSD.org>
Date: Sun, 27 May 2018 07:21:36 +0000
Subject: [PATCH] - Merge the following from the English version:

	r51498 -> r51628	head/ja_JP.eucJP/books/handbook/eresources/chapter.xml
	r51458 -> r51628	head/ja_JP.eucJP/share/xml/mailing-lists.ent
---
 ja_JP.eucJP/books/handbook/eresources/chapter.xml | 7 ++++++-
 ja_JP.eucJP/share/xml/mailing-lists.ent           | 6 +++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/ja_JP.eucJP/books/handbook/eresources/chapter.xml b/ja_JP.eucJP/books/handbook/eresources/chapter.xml
index a37dc56f5d..b4881beccd 100644
--- a/ja_JP.eucJP/books/handbook/eresources/chapter.xml
+++ b/ja_JP.eucJP/books/handbook/eresources/chapter.xml
@@ -3,7 +3,7 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: r51498
+     Original revision: r51628
      $FreeBSD$
 -->
 <appendix xmlns="http://docbook.org/ns/docbook"
@@ -340,6 +340,11 @@
 		アプリケーションの移植</entry>
 	    </row>
 
+	    <row>
+	      <entry>&a.erlang.name;</entry>
+	      <entry>&os; 固有の Erlang に関する議論</entry>
+	    </row>
+
 	    <row>
 	      <entry>&a.firewire.name;</entry>
 	      <entry>&os; &firewire; (iLink, IEEE 1394)
diff --git a/ja_JP.eucJP/share/xml/mailing-lists.ent b/ja_JP.eucJP/share/xml/mailing-lists.ent
index a948fcadbd..dbdfcf3f74 100644
--- a/ja_JP.eucJP/share/xml/mailing-lists.ent
+++ b/ja_JP.eucJP/share/xml/mailing-lists.ent
@@ -3,7 +3,7 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: r51458
+     Original revision: r51628
      $FreeBSD$
 -->
 
@@ -204,6 +204,10 @@
 <!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>">
 
+<!ENTITY a.erlang.url "&a.mailman.listinfo;/freebsd-erlang">
+<!ENTITY a.erlang "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.erlang.url;'>FreeBSD-erlang メーリングリスト</link>">
+<!ENTITY a.erlang.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.erlang.url;'>freebsd-erlang</link>">
+
 <!ENTITY a.firewire.url "&a.mailman.listinfo;/freebsd-firewire">
 <!ENTITY a.firewire "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.firewire.url;'>FreeBSD FireWire (IEEE 1394) discussion メーリングリスト</link>">
 <!ENTITY a.firewire.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.firewire.url;'>freebsd-firewire</link>">