From owner-svn-doc-all@FreeBSD.ORG  Fri May 16 12:24:04 2014
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 83D87172;
 Fri, 16 May 2014 12:24:04 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 650B228F9;
 Fri, 16 May 2014 12:24:04 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4GCO4GB013079;
 Fri, 16 May 2014 12:24:04 GMT (envelope-from ryusuke@svn.freebsd.org)
Received: (from ryusuke@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4GCO4UP013078;
 Fri, 16 May 2014 12:24:04 GMT (envelope-from ryusuke@svn.freebsd.org)
Message-Id: <201405161224.s4GCO4UP013078@svn.freebsd.org>
From: Ryusuke SUZUKI <ryusuke@FreeBSD.org>
Date: Fri, 16 May 2014 12:24:04 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r44845 - head/ja_JP.eucJP/books/handbook/pgpkeys
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-all@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all/>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 16 May 2014 12:24:04 -0000

Author: ryusuke
Date: Fri May 16 12:24:03 2014
New Revision: 44845
URL: http://svnweb.freebsd.org/changeset/doc/44845

Log:
  - Merge the following from the English version:
  
  	r43126 -> r44837	head/ja_JP.eucJP/books/handbook/pgpkeys/chapter.xml

Modified:
  head/ja_JP.eucJP/books/handbook/pgpkeys/chapter.xml

Modified: head/ja_JP.eucJP/books/handbook/pgpkeys/chapter.xml
==============================================================================
--- head/ja_JP.eucJP/books/handbook/pgpkeys/chapter.xml	Fri May 16 01:54:24 2014	(r44844)
+++ head/ja_JP.eucJP/books/handbook/pgpkeys/chapter.xml	Fri May 16 12:24:03 2014	(r44845)
@@ -3,41 +3,38 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: r43126
+     Original revision: r44837
      $FreeBSD$
 -->
-<appendix xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="pgpkeys">
-  <title>PGP 公開鍵</title>
-
-  <indexterm><primary>pgp公開鍵</primary></indexterm>
-  <para>これらは、署名を検証したり、
-    開発者やオフィサに暗号メールを送る必要がある場合に、
-    自由に使用できる PGP 公開鍵です。また、
-    <link xlink:href="&url.base;/doc/pgpkeyring.txt">http://www.FreeBSD.org/doc/pgpkeyring.txt</link>
-    から <systemitem class="fqdomainname">FreeBSD.org</systemitem>
-    ユーザの完全なキーリングをダウンロードすることも可能です。</para>
+<!--
 
-  <sect1 xml:id="pgpkeys-officers">
-    <title>オフィサ</title>
+  Do not edit this file except as instructed by the addkey.sh script.
 
-    &section.pgpkeys-officers;
-  </sect1>
+  See the README file in head/share/pgpkeys for instructions.
 
-  <sect1 xml:id="pgpkeys-core">
-    <title>コアチームメンバ</title>
+  Note that only officer keys are shown here now.  All of the keys are
+  shown in en_US.ISO8859-1/articles/pgpkeys/article.xml.
 
-    &section.pgpkeys-core;
-  </sect1>
+-->
+<appendix xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="pgpkeys">
+  <title><acronym>PGP</acronym> 公開鍵</title>
 
-  <sect1 xml:id="pgpkeys-developers">
-    <title>開発者</title>
+  <indexterm><primary>pgp公開鍵</primary></indexterm>
 
-    &section.pgpkeys-developers;
-  </sect1>
+  <para><systemitem class="fqdomainname">FreeBSD.org</systemitem>
+    オフィサの <acronym>PGP</acronym> 公開鍵を以下に示します。
+    これらの公開鍵は、署名を検証したり、
+    オフィサに暗号メールを送る必要がある場合に使用できます。
+    すべての &os; 公開鍵の一覧は、
+    <link xlink:href="&url.articles.pgpkeys.en;"><acronym>PGP</acronym>
+      Keys</link> にあります。
+    また、完全なキーリングは
+    <link
+    xlink:href="https://www.FreeBSD.org/doc/pgpkeyring.txt">https://www.FreeBSD.org/doc/pgpkeyring.txt</link> からダウンロードできます。</para>
 
-  <sect1 xml:id="pgpkeys-other">
-    <title>他のクラスタアカウント所有者</title>
+  <sect1 xml:id="pgpkeys-officers">
+    <title>オフィサ</title>
 
-    &section.pgpkeys-other;
+    &section.pgpkeys-officers;
   </sect1>
 </appendix>