svn commit: r44845 - head/ja_JP.eucJP/books/handbook/pgpkeys

[Ryusuke SUZUKI]

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>