From e538c801034bd30fcdf5d1b1d45c261cd8d87479 Mon Sep 17 00:00:00 2001
From: Ryusuke SUZUKI <ryusuke@FreeBSD.org>
Date: Sun, 16 Feb 2014 15:11:25 +0000
Subject: [PATCH] - Merge the following from the English version:
r35386 -> r36665 head/ja_JP.eucJP/articles/contributors/Makefile
r35368 -> r38558 head/ja_JP.eucJP/articles/contributors/article.xml
---
ja_JP.eucJP/articles/contributors/Makefile | 3 ++-
ja_JP.eucJP/articles/contributors/article.xml | 25 +++++++++++++++++--
2 files changed, 25 insertions(+), 3 deletions(-)
diff --git a/ja_JP.eucJP/articles/contributors/Makefile b/ja_JP.eucJP/articles/contributors/Makefile
index 597d6abe09..68d8b59f14 100644
--- a/ja_JP.eucJP/articles/contributors/Makefile
+++ b/ja_JP.eucJP/articles/contributors/Makefile
@@ -3,7 +3,7 @@
#
# Article: Contributors to FreeBSD
#
-# Original revision: r35386
+# Original revision: r36665
DOC?= article
@@ -23,6 +23,7 @@ SRCS+= ${ORGDIR}/contrib.committers.xml
SRCS+= ${ORGDIR}/contrib.corealumni.xml
SRCS+= ${ORGDIR}/contrib.develalumni.xml
SRCS+= ${ORGDIR}/contrib.develinmemoriam.xml
+SRCS+= ${ORGDIR}/contrib.portmgralumni.xml
URL_RELPREFIX?= ../../../..
DOC_PREFIX?= ${.CURDIR}/../../..
diff --git a/ja_JP.eucJP/articles/contributors/article.xml b/ja_JP.eucJP/articles/contributors/article.xml
index f2bc0df19d..acde147326 100644
--- a/ja_JP.eucJP/articles/contributors/article.xml
+++ b/ja_JP.eucJP/articles/contributors/article.xml
@@ -8,7 +8,7 @@
The FreeBSD Documentation Project
The FreeBSD Japanese Documentation Project
- Original revision: r35368
+ Original revision: r38558
$FreeBSD$
-->
<article xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:lang="ja">
@@ -34,6 +34,13 @@
<sect1 xml:id="donors">
<title>��£�ԥ����</title>
+ <note>
+ <para>2010 ǯ���ߡ�������ϲ�ǯ�����Τ�ΤˤʤäƤ��ޤ���
+ ��ǯ������δ��դˤĤ��Ƥϡ�
+ <link xlink:href="&url.base;/donations/donors.html">����</link>
+ �ˤޤȤ���Ƥ��ޤ���</para>
+ </note>
+
<para>FreeBSD �ץ��������Ȥϼ��δ�£�Ԥ˲���������Ƥ��ꡢ
�����˸�ɽ���ƴ��դΰդ�ɽ�������Ȼפ��ޤ���</para>
@@ -268,7 +275,7 @@
</listitem>
<listitem>
- <para>Ernst Winter <email>ewinter@lobo.muc.de</email> �ϡ�
+ <para>Ernst Winter (<link xlink:href="http://berklix.org/ewinter/">�ο�</link>) �ϡ�
���Υץ��������Ȥ� 2.88 MB
�Υե��åԡ��ɥ饤�֤����Ƥ��������ޤ�����
���ޤ������С�
@@ -396,6 +403,20 @@
&contrib.develalumni;
</sect1>
+ <sect1 xml:id="contrib-portmgralumni">
+ <title>Ports Management �������´����</title>
+
+ <indexterm><primary>portmgr ������ (portmgr team)</primary></indexterm>
+ <para>���ˤ�����͡��� () �ǵ��������֡�FreeBSD
+ portmgr ������Υ��С��Ǥ�����FreeBSD
+ �ץ��������Ȥˤ������������Ϥ˴��դΰդ�ɽ���ޤ���
+ </para>
+
+ <para><emphasis>���������ε�ǯ���</emphasis></para>
+
+ &contrib.portmgralumni;
+ </sect1>
+
<sect1 xml:id="contrib-develinmemoriam">
<title>��ȯ������ : ˴���ʤ�줿��ȯ�Ԥ�����</title>