From d4509bdcacc7aae10375132160eeed298a54e79f Mon Sep 17 00:00:00 2001
From: Ryusuke SUZUKI <ryusuke@FreeBSD.org>
Date: Tue, 18 Sep 2012 12:13:08 +0000
Subject: [PATCH] - Merge the following from the English version:
r36769 -> r39569 head/ja_JP.eucJP/htdocs/security/Makefile
r39262 -> r39576 head/ja_JP.eucJP/books/handbook/introduction/chapter.sgml
r39467 -> r39575 head/ja_JP.eucJP/books/handbook/mirrors/chapter.sgml
---
.../books/handbook/introduction/chapter.sgml | 6 +--
.../books/handbook/mirrors/chapter.sgml | 44 +------------------
ja_JP.eucJP/htdocs/security/Makefile | 5 ++-
3 files changed, 8 insertions(+), 47 deletions(-)
diff --git a/ja_JP.eucJP/books/handbook/introduction/chapter.sgml b/ja_JP.eucJP/books/handbook/introduction/chapter.sgml
index e8c840753e..9d8c3eaa6f 100644
--- a/ja_JP.eucJP/books/handbook/introduction/chapter.sgml
+++ b/ja_JP.eucJP/books/handbook/introduction/chapter.sgml
@@ -3,7 +3,7 @@
The FreeBSD Documentation Project
The FreeBSD Japanese Documentation Project
- Original revision: r39262
+ Original revision: r39576
$FreeBSD$
-->
@@ -922,9 +922,9 @@
<indexterm><primary>���ߥå���</primary></indexterm>
<para><firstterm>���ߥå��� (committers)</firstterm> ��
- CVS �ĥ�ؤ�<emphasis>���߸���</emphasis>����äƤ���͡�
+ Subversion �ĥ�ؤ�<emphasis>���߸���</emphasis>����äƤ���͡�
&os; �Υ��������ѹ���ä��뤳�Ȥ��Ǥ���ͤǤ�
- (CVS �ǥ�ݥ��ȥ���ѹ���ä���ˤ� &man.cvs.1;
+ (��ݥ��ȥ���ѹ���ä���ˤϡ���������ȥ����뤹��
<command>commit</command> �Ȥ������ޥ�ɤ�Ȥ��Τǡ�
�����ο͡��ϱѸ�Ǥ� <quote>committers</quote>
�ȸƤФ�ޤ�)��
diff --git a/ja_JP.eucJP/books/handbook/mirrors/chapter.sgml b/ja_JP.eucJP/books/handbook/mirrors/chapter.sgml
index 64c5e686fa..8892d3580d 100644
--- a/ja_JP.eucJP/books/handbook/mirrors/chapter.sgml
+++ b/ja_JP.eucJP/books/handbook/mirrors/chapter.sgml
@@ -3,7 +3,7 @@
The FreeBSD Documentation Project
The FreeBSD Japanese Documentation Project
- Original revision: r39467
+ Original revision: r39573
$FreeBSD$
-->
@@ -1551,16 +1551,6 @@ doc/zh_*</screen>
</listitem>
</varlistentry>
- <varlistentry>
- <term><literal>doc-all release=cvs</literal></term>
-
- <listitem>
- <para>&os;
- �ϥ�ɥ֥å�����Ӥ���¾�Υɥ�����ȤΥ������Ǥ���
- ����ˤ� &os; web �����ȤΥե�����ϴޤޤ�ޤ���</para>
- </listitem>
- </varlistentry>
-
<varlistentry>
<term><literal>ports-all release=cvs</literal></term>
@@ -2036,14 +2026,6 @@ doc/zh_*</screen>
</listitem>
</varlistentry>
- <varlistentry>
- <term><literal>ports-www release=cvs</literal></term>
-
- <listitem>
- <para>World Wide Web ��Ϣ�Υ��եȥ�������</para>
- </listitem>
- </varlistentry>
-
<varlistentry>
<term><literal>ports-x11 release=cvs</literal></term>
@@ -3257,30 +3239,6 @@ doc/zh_*</screen>
</sect2>
</sect1>
- <sect1 id="mirrors-afs">
- <title>AFS ������</title>
-
- <para>&os; �� AFS �����Фϰʲ��Υ����ȤDz�Ư���Ƥ��ޤ�:</para>
-
- <variablelist>
- <varlistentry>
- <term>���������ǥ�</term>
-
- <listitem>
- <para>�ե�����ϰʲ��ξ��ˤ���ޤ�:
- <filename>/afs/stacken.kth.se/ftp/pub/FreeBSD/</filename></para>
-
- <programlisting>stacken.kth.se # Stacken Computer Club, KTH, Sweden
-130.237.234.43 #hot.stacken.kth.se
-130.237.237.230 #fishburger.stacken.kth.se
-130.237.234.3 #milko.stacken.kth.se</programlisting>
-
- <para>(�ݼ�ô�� <email>ftp@stacken.kth.se</email>)</para>
- </listitem>
- </varlistentry>
- </variablelist>
- </sect1>
-
<sect1 id="mirrors-rsync">
<title>rsync �ߥ顼������</title>
diff --git a/ja_JP.eucJP/htdocs/security/Makefile b/ja_JP.eucJP/htdocs/security/Makefile
index b15e868b14..06c21c201c 100644
--- a/ja_JP.eucJP/htdocs/security/Makefile
+++ b/ja_JP.eucJP/htdocs/security/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
# The FreeBSD Japanese Documentation Project
-# Original revision: 1.18
+# Original revision: r39569
.if exists(../Makefile.conf)
.include "../Makefile.conf"
@@ -9,6 +9,9 @@
.include "../Makefile.inc"
.endif
+#+SUBDIR= advisories
+#+SUBDIR+= patches
+
#DATA= so_public_key.asc
#DOCS= charter.sgml
DOCS+= security.sgml