From 7c0130ffef611aa9e49133324f3b6d0d965cd340 Mon Sep 17 00:00:00 2001
From: Ryusuke SUZUKI <ryusuke@FreeBSD.org>
Date: Wed, 25 Jul 2012 11:28:50 +0000
Subject: [PATCH] - Merge the following from the English version:

	r11515 -> r13013	head/ja_JP.eucJP/books/handbook/eresources/chapter.sgml
	r39255 -> r39262	head/ja_JP.eucJP/books/handbook/introduction/chapter.sgml
---
 .../books/handbook/eresources/chapter.sgml    | 57 +++++++++++++------
 .../books/handbook/introduction/chapter.sgml  | 29 +++++-----
 2 files changed, 57 insertions(+), 29 deletions(-)

diff --git a/ja_JP.eucJP/books/handbook/eresources/chapter.sgml b/ja_JP.eucJP/books/handbook/eresources/chapter.sgml
index 226d25a4d6..e5e6088b30 100644
--- a/ja_JP.eucJP/books/handbook/eresources/chapter.sgml
+++ b/ja_JP.eucJP/books/handbook/eresources/chapter.sgml
@@ -2,7 +2,7 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: r11515
+     Original revision: r13013
      $FreeBSD$
 -->
 
@@ -102,6 +102,12 @@
 	      <entry>�Х���ݡ���</entry>
 	    </row>
 
+	    <row>
+	      <entry>freebsd-bugbusters</entry>
+	      <entry>FreeBSD
+		�㳲���ǡ����١�������Ӵ�Ϣ����ġ���δ����˴ؤ������</entry>
+	    </row>
+
 	    <row>
 	      <entry>freebsd-chat</entry>
 	      <entry>FreeBSD
@@ -139,6 +145,16 @@
 	      <entry>�桼������μ���ȵ��ѥ��ݡ���</entry>
 	    </row>
 
+	    <row>
+	      <entry>freebsd-security</entry>
+	      <entry>�������ƥ��˴ؤ�������</entry>
+	    </row>
+
+	    <row>
+	      <entry>freebsd-security-notifications</entry>
+	      <entry>�������ƥ��˴ؤ�������</entry>
+	    </row>
+
 	    <row>
 	      <entry>freebsd-stable</entry>
 	      <entry>FreeBSD-stable �λ��Ѥ˴�Ϣ�������</entry>
@@ -175,6 +191,11 @@
 	      <entry>FreeBSD �ؤ�AFS�ΰܿ�</entry>
 	    </row>
 
+	    <row>
+	      <entry>freebsd-aic7xxx</entry>
+	      <entry>Adaptec AIC 7xxx �ѥɥ饤�Фγ�ȯ</entry>
+	    </row>
+
 	    <row>
 	      <entry>freebsd-alpha</entry>
 	      <entry>FreeBSD �� Alpha �ؤΰܿ�</entry>
@@ -233,6 +254,11 @@
 	      <entry>�ե����륷���ƥ�</entry>
 	    </row>
 
+	    <row>
+	      <entry>freebsd-gnome</entry>
+	      <entry>GNOME ����� GNOME ���ץꥱ�������ΰܿ�</entry>
+	    </row>
+
 	    <row>
 	      <entry>freebsd-hackers</entry>
 	      <entry>����Ū�ʵ��Ѥε���</entry>
@@ -269,6 +295,11 @@
 		��ܿ�����ͤ���</entry>
 	    </row>
 
+	    <row>
+	      <entry>freebsd-lfs</entry>
+	      <entry>LFS �� FreeBSD �ؤΰܿ�</entry>
+	    </row>
+
 	    <row>
 	      <entry>freebsd-libh</entry>
 	      <entry>�� 2 ����Υ��󥹥ȡ��롢�ѥå����������ƥ�</entry>
@@ -330,16 +361,6 @@
 	      <entry>SCSI ���֥����ƥ�</entry>
 	    </row>
 
-	    <row>
-	      <entry>freebsd-security</entry>
-	      <entry>�������ƥ��˴ؤ�������</entry>
-	    </row>
-
-	    <row>
-	      <entry>freebsd-security-notifications</entry>
-	      <entry>�������ƥ��˴ؤ�������</entry>
-	    </row>
-
 	    <row>
 	      <entry>freebsd-small</entry>
 	      <entry>�Ȥ߹��ߥ��ץꥱ�������ˤ����� FreeBSD ������</entry>
@@ -353,7 +374,7 @@
 
 	    <row>
 	      <entry>freebsd-sparc</entry>
-	      <entry>FreeBSD �� Sparc �ؤΰܿ�</entry>
+	      <entry>FreeBSD �� SPARC �١��������ƥ�ؤΰܿ�</entry>
 	    </row>
 
 	    <row>
@@ -419,6 +440,11 @@
 	      <entry>�桼�����롼�פ�Ĵ��</entry>
 	    </row>
 
+	    <row>
+	      <entry>freebsd-user-vendors</entry>
+	      <entry>�ץ��꡼���˴ؤ���٥���Ȥ�Ĵ��</entry>
+	    </row>
+
 	    <row>
 	      <entry>freebsd-www</entry>
 	      <entry><ulink url="../../../../ja/index.html">www.FreeBSD.org
@@ -618,9 +644,8 @@ help
 	    ��°���Ƥ��뤹�٤Ƥοͤ��Ф��ƥ᡼��󥰥ꥹ��
 	    �β��ͤ򲼤��Ƥ��ޤ������Ǥ�����
 	    �������԰٤ǤϤʤ��Ǥ��礦��
-	    �Ȥ�������Τʤ���ͳ�����ε������Ф��Ƥ� freebsd-chat
-	    <email>freebsd-chat@FreeBSD.org</email>�᡼��
-	    �󥰥ꥹ�Ȥ���ͳ��ǧ�Ĥ���Ƥ���Τǡ�
+	    �Ȥ�������Τʤ���ͳ�����ε������Ф��Ƥ� &a.chat;
+	    ����ͳ��ǧ�Ĥ���Ƥ���Τǡ�
 	    �����˻Ȥ��٤��Ǥ��礦��</para>
 	</listitem>
 
@@ -1390,7 +1415,7 @@ help
 	    <entry>storm.uk.FreeBSD.org</entry>
 	    <entry>SSH �Τ�</entry>
 	    <entry>Read-only cvs, personal web space, email</entry>
-	    <entry>&a.brian</entry>
+	    <entry>&a.brian;</entry>
           </row>
 	
 	  <row>
diff --git a/ja_JP.eucJP/books/handbook/introduction/chapter.sgml b/ja_JP.eucJP/books/handbook/introduction/chapter.sgml
index 717e5bedce..bed02751b0 100644
--- a/ja_JP.eucJP/books/handbook/introduction/chapter.sgml
+++ b/ja_JP.eucJP/books/handbook/introduction/chapter.sgml
@@ -2,7 +2,7 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: r39255
+     Original revision: r39262
      $FreeBSD$
 -->
 
@@ -859,25 +859,28 @@
 	      ����ޤǤ����Ѥ��줿������̤�����ˤ�äơ�
 	      <application>CVS</application>
 	      �λ��ĵ���Ū�ʸ³��������ˤʤäƤ�������Ǥ���
-	      base ��ݥ��ȥ�� <application>SVN</application>
-	      �ˤ�äƴ�������ޤ�����
+	      �ɥ�����ơ������ץ��������Ȥ�
+	      Ports Collection ��ݥ��ȥ�⡢���줾��
+	      2012 ǯ 5 ��� 7 ���
+	      <application>CVS</application> ����
+	      <application>SVN</application> �ؤȰܹԤ��ޤ�����</para>
+
+	    <para>���� <literal>src/</literal> �����
+	      <literal>ports/</literal> ��ݥ��ȥ��
+	      <application>SVN</application> �ˤ�äƴ�������Ƥ��ޤ�����
 	      <application>SVN</application> ��ݥ��ȥ�ˤ������ѹ�����
 	      <application>CVS</application> ��ȿ�Ǥ����Τǡ�
 	      <application>csup</application>
 	      �Ȥ��ä� <application>CVS</application>
-	      �Υ��饤����ȥġ���Ϥ���ޤ��̤������ư���ޤ���</para>
-
-	    <para>2012 ǯ 5 ��ɥ�����ơ������ץ��������ȤΥ�ݥ��ȥ��
-	      <application>CVS</application> ���� <application>SVN</application>
-	      �ؤȰܹԤ��ޤ�����
-	      �١��������ƥ�Ȥϰۤʤꡢ�ɥ�����ơ�������
+	      �Υ��饤����ȥġ���Ϥ���ޤ��̤������ư���ޤ���
+	      <literal>src/</literal> ����� <literal>ports/</literal>
+	      �Ȥϰۤʤꡢ�ɥ�����ơ�������
 	      <application>SVN</application> ��ݥ��ȥ�ϡ�
 	      <application>CVS</application> �ؤ�ȿ�Ǥ���ޤ���</para>
 
-	    <para>Ports ��ݥ��ȥ�ϡ����� <application>CVS</application>
-	      �ˤ�äƴ�������Ƥ��ޤ���
-	      &os; ��<ulink url="http://www.FreeBSD.org/cgi/cvsweb.cgi">
-		�ᥤ���ݥ��ȥ�</ulink>���ƹ񥫥�ե���˥����Υ��󥿥����Ԥ�¸�ߤ���
+	    <para>&os; �� <application>CVS</application>
+	      <ulink url="http://www.FreeBSD.org/cgi/cvsweb.cgi">�ᥤ���ݥ��ȥ�</ulink>
+	      ���ƹ񥫥�ե���˥����Υ��󥿥����Ԥ�¸�ߤ���
 	      ��������������Τ�������Υߥ顼�����Ȥ˥��ԡ�����Ƥ��ޤ���
 	      <link linkend="current">-CURRENT</link> ��
 	      <link linkend="stable">-STABLE</link>