From 33a6b75bfdf9d38e5b666045060b4b1059729332 Mon Sep 17 00:00:00 2001
From: Ryusuke SUZUKI <ryusuke@FreeBSD.org>
Date: Fri, 28 Jun 2013 11:24:22 +0000
Subject: [PATCH] - Merge the following from the English version:
r41577 -> r42068 head/ja_JP.eucJP/htdocs/docproj/Makefile
r32509 -> r42069 head/ja_JP.eucJP/htdocs/docproj/current.xml
---
ja_JP.eucJP/htdocs/docproj/Makefile | 3 +--
ja_JP.eucJP/htdocs/docproj/current.xml | 19 ++++++++-----------
2 files changed, 9 insertions(+), 13 deletions(-)
diff --git a/ja_JP.eucJP/htdocs/docproj/Makefile b/ja_JP.eucJP/htdocs/docproj/Makefile
index 6b45af8322..7ad3394c77 100644
--- a/ja_JP.eucJP/htdocs/docproj/Makefile
+++ b/ja_JP.eucJP/htdocs/docproj/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
# The FreeBSD Japanese Documentation Project
-# Original revision: r41577
+# Original revision: r42068
.if exists(../Makefile.conf)
.include "../Makefile.conf"
@@ -17,7 +17,6 @@ DOCS+= submitting.xml
DOCS+= who.xml
DOCS+= translations.xml
DOCS+= docproj.xml
-#DOCS+= todo.xml
INDEXLINK= docproj.html
diff --git a/ja_JP.eucJP/htdocs/docproj/current.xml b/ja_JP.eucJP/htdocs/docproj/current.xml
index b8651990a8..7a4936f84a 100644
--- a/ja_JP.eucJP/htdocs/docproj/current.xml
+++ b/ja_JP.eucJP/htdocs/docproj/current.xml
@@ -14,7 +14,7 @@
<!ENTITY status.wip "<img src='&imagebase;/in_progress.png' width='22' height='22' alt='In progress'>">
]>
<!-- The FreeBSD Japanese Documentation Project -->
-<!-- Original revision: 1.89 -->
+<!-- Original revision: r42069 -->
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
@@ -54,11 +54,8 @@
<h3>�ɥ�����ơ������ץ��������Ȥ� TODO �ꥹ��</h3>
<p>�ɥ�����ơ������ץ��������Ȥ�
- <a href="&enbase;/docproj/todo.html">TODO</a> �ꥹ�Ȥϡ�
+ <a href="https://wiki.freebsd.org/DocIdeaList">TODO</a> �ꥹ�Ȥϡ�
�ɥ�����ơ������˴�Ϣ���롢�ǿ��� TODO �ꥹ�ȤǤ���
- ���Υꥹ�Ȥϡ���� <a
- href="mailto:FreeBSD-doc@FreeBSD.org">FreeBSD-doc@FreeBSD.org</a>
- ���ꥹ�Ȥ�ή��ޤ���
FreeBSD �ɥ�����ơ�����åȤ�����������ͤ��Ƥ���ΤǤ���С�
�ޤ��� TODO �ꥹ�Ȥˤ�����ܤ���Ϥ���Ƥ���������</p>
@@ -103,10 +100,7 @@
<h3>Advocacy ���饤��/�ץ쥼��ơ������˹�����</h3>
<p><b>��Ǥ��:</b> FreeBSD-doc
- <<a
- href="mailto:FreeBSD-doc@FreeBSD.org">FreeBSD-doc@FreeBSD.org</a>>,
- Murray Stokely <<a
- href="mailto:murray@FreeBSD.org">murray@FreeBSD.org</a>></p>
+ <<a href="mailto:doc@FreeBSD.org">doc@FreeBSD.org</a>></p>
<p><b>��ά:</b> DocBook-slides DTD �Υץ쥼��ơ������ޡ������åפ���
�ɥ�����ơ�����åȤ�
@@ -126,7 +120,9 @@
<a name="handbooksection"></a>
<h3>�ϥ�ɥ֥å� �����/�⤷���� FAQ �ξϤ��</h3>
- <p><b>��Ǥ��:</b> ����ޤ���</p>
+ <p><b>��Ǥ��:</b> FreeBSD-doc
+ <<a href="mailto:doc@FreeBSD.org">doc@FreeBSD.org</a>></p>
+
<p><b>��ά:</b> FAQ ��ϥ�ɥ֥å��ˤ���Ȥ����ξϤ��ĤäƤ��ꡢ
����ɬ�פ�����ޤ���
@@ -203,7 +199,8 @@
<a name="search-enhancements"></a>
<h3>����������</h3>
- <p><b>��Ǥ��:</b> Eric Anderson <<a href="mailto:anderson@centtech.com">anderson@centtech.com</a>></p>
+ <p><b>��Ǥ��:</b>
+ <<a href="mailto:doc@FreeBSD.org">doc@FreeBSD.org</a>></p>
<p>�����֥����Ȥ������硢��������ν��Ϥ����̤ˤϡ�
�㤨��