svn commit: r50086 - head/ja_JP.eucJP/books/handbook/security

Author: ryusuke
Date: Sun Mar 26 01:12:53 2017
New Revision: 50086
URL: https://svnweb.freebsd.org/changeset/doc/50086

Log:
  - Merge the following from the English version:
  
  	r22219 -> r22608	head/ja_JP.eucJP/books/handbook/security/chapter.xml

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

Modified: head/ja_JP.eucJP/books/handbook/security/chapter.xml
==============================================================================
--- head/ja_JP.eucJP/books/handbook/security/chapter.xml	Sat Mar 25 13:57:59 2017	(r50085)
+++ head/ja_JP.eucJP/books/handbook/security/chapter.xml	Sun Mar 26 01:12:53 2017	(r50086)
@@ -3,7 +3,7 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: r22219
+     Original revision: r22608
      $FreeBSD$
 -->
 <chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="security">
@@ -415,6 +415,12 @@
 	²¿¤â¤·¤Ê¤¤¤è¤ê¤ÏÎɤ¤¤Î¤Ç¤¹¤¬¡¢
 	ɬ¤º¤·¤âºÇ¤â°ÂÁ´¤ÊÁªÂò»è¤È¤Ï¸Â¤ê¤Þ¤»¤ó¡£</para>
 
+      <!-- XXX:
+	This will need updating depending on the outcome of PR bin/71147.
+	Personally I know what I'd like to see, which puts this in definite
+	need of a rewrite, but we'll have to wait and see.  ceri@
+      -->
+
       <para>¥¹¥¿¥Ã¥Õ¤Î¥¢¥«¥¦¥ó¥È¡¢¤Þ¤¿µæ¶Ë¤Ë¤Ï
 	<systemitem class="username">root</systemitem> ¥¢¥«¥¦¥ó¥È¤Î°ÂÁ´À­
 	¤ò¹â¤á¤ë´ÖÀÜŪ¤ÊÊýË¡¤Ï¡¢ÊÌ¤Î¥í¥°¥¤¥ó¥¢¥¯¥»¥¹¤ÎÊýË¡¤òÍѤ¤¤Æ¥¹¥¿¥Ã
@@ -1616,7 +1622,7 @@ permit port ttyd0</programlisting>
     </sect2>
   </sect1>
 
-  <sect1>
+  <sect1 xml:id="tcpwrappers">
     <info><title>TCP Wrappers</title>
       <authorgroup>
 	<author>
@@ -1663,6 +1669,13 @@ permit port ttyd0</programlisting>
       <link linkend="network-inetd">inetd ¤ÎÀßÄê</link>
       ¾Ï¤ò¤¹¤Ç¤ËÆɤó¤Ç¤¤¤ë¤³¤È¤òÁÛÄꤷ¤Æ¤¤¤Þ¤¹¡£</para>
 
+    <note>
+      <para>&man.inetd.8; ¤Ë¤è¤êµ¯Æ°¤µ¤ì¤ë¥×¥í¥°¥é¥à¤Ï¡¢Àµ³Î¤Ë¤Ï¡¢
+	<quote>¥Ç¡¼¥â¥ó</quote> ¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¤¬¡¢
+	ÅÁÅýŪ¤Ë¥Ç¡¼¥â¥ó¤È¸Æ¤Ð¤ì¤Æ¤¤¤Þ¤¹¡£
+	¤³¤Î¾Ï¤Ç¤â¡¢¤³¤Î¤è¤¦¤Ë¸Æ¤Ö¤³¤È¤È¤·¤Þ¤¹¡£</para>
+    </note>
+
     <sect2>
       <title>½é´üÀßÄê</title>
 
@@ -1694,7 +1707,7 @@ permit port ttyd0</programlisting>
 	´ðËÜŪ¤ÊÀßÄê¤òÍý²ò¤·¤¿¸å¤ÇµÄÏÀ¤µ¤ì¤ë¤Ù¤­¤Ç¤¹¡£</para>
 
       <para>´ðËÜŪ¤ÊÀßÄê¤Ï¡¢Ä̾ï
-	<literal>daemon : host option(s) : action</literal>
+	<literal>daemon : address : action</literal>
 	¤È¤¤¤¦·Á¼°¤Ç¤¹¡£¤³¤³¤Ç¡¢
 	<literal>daemon</literal> ¤Ï¡¢
 	<command>inetd</command> ¤¬µ¯Æ°¤¹¤ë¥Ç¡¼¥â¥ó¤Î̾Á°¤Ç¤¹¡£
@@ -3488,7 +3501,7 @@ [email protected]</screen>
 
       <para>¸½ºß¡¢IPFW
 	¤Ë´Ø·¸¤¹¤ë¥«¡¼¥Í¥ë¥³¥ó¥Õ¥£¥°¥ì¡¼¥·¥ç¥ó¥ª¥×¥·¥ç¥ó¤Ï
-	5 ¤Ä¤¢¤ê¤Þ¤¹¡£</para>
+	4 ¤Ä¤¢¤ê¤Þ¤¹¡£</para>
 
       <variablelist>
 	<varlistentry><term><literal>options IPFIREWALL</literal></term>
@@ -3553,19 +3566,6 @@ [email protected]</screen>
 
 	  </listitem>
 	</varlistentry>
-
-	<varlistentry>
-	  <term><literal>options PFIL_HOOKS</literal></term>
-
-	  <listitem>
-	    <para>&os; 5.3-RELEASE °Ê¹ß¤Î¥Ð¡¼¥¸¥ç¥ó¤Ç¤Ï¡¢
-	      ¥Ñ¥±¥Ã¥È¥Õ¥£¥ë¥¿¤Î¤¿¤á¤Ë¥³¡¼¥ë¥¢¥¦¥È¤Î¥Õ¥Ã¥¯¤òÄɲ乤뤿¤á¡¢
-	      ¤³¤Î¥ª¥×¥·¥ç¥ó¤¬É¬ÍפȤʤê¤Þ¤¹¡£
-	      ¤³¤ì¤é¤Î¥Ð¡¼¥¸¥ç¥ó¤Î &os; ¤Ç¤Ï¡¢
-	      ¤³¤Î¥ª¥×¥·¥ç¥ó¤¬»ØÄꤵ¤ì¤Æ¤¤¤Ê¤¤¤È¡¢
-	      IPFW ¤ÏÆ°ºî¤·¤Ê¤¤¤Ç¤·¤ç¤¦¡£</para>
-	  </listitem>
-	</varlistentry>
       </variablelist>
 
       <note><para>°ÊÁ°¤Î¥Ð¡¼¥¸¥ç¥ó¤Î FreeBSD ¤Ï
@@ -4417,7 +4417,8 @@ An optional company name []:<userinput><
 	¾ÚÌÀ½ñ <filename>new.crt</filename> ¤Ç¤¹¡£
 	¤³¤ì¤é¤Î¥Õ¥¡¥¤¥ë¤ò¡¢(¹¥¤Þ¤·¤¯¤Ï
 	<filename role="directory">/etc</filename> °Ê²¼¤Ç)
-	root ¤Î¤ß¤¬Æɤळ¤È¤Î¤Ç¤­¤ë¥Ç¥£¥ì¥¯¥È¥ê¤ËÃÖ¤¯É¬Íפ¬¤¢¤ê¤Þ¤¹¡£
+	<systemitem class="username">root</systemitem>
+	¤Î¤ß¤¬Æɤळ¤È¤Î¤Ç¤­¤ë¥Ç¥£¥ì¥¯¥È¥ê¤ËÃÖ¤¯É¬Íפ¬¤¢¤ê¤Þ¤¹¡£
 	<command>chmod</command>
 	¥æ¡¼¥Æ¥£¥ê¥Æ¥£¤ò»È¤Ã¤Æµö²Ä°À­¤ò 0600 ¤ËÀßÄꤷ¤Æ¤¯¤À¤µ¤¤¡£</para>
     </sect2>
@@ -4479,7 +4480,7 @@ Connected to  <systemitem class="ipaddre
 Escape character is '^]'.
 220 <systemitem class="ipaddress">example.com</systemitem> ESMTP Sendmail 8.12.10/8.12.10; Tue, 31 Aug 2004 03:41:22 -0400 (EDT)
 <userinput>ehlo <replaceable>example.com</replaceable></userinput>
-250-pittgoth.com Hello example.com [192.0.34.166], pleased to meet you
+250-example.com Hello example.com [192.0.34.166], pleased to meet you
 250-ENHANCEDSTATUSCODES
 250-PIPELINING
 250-8BITMIME
@@ -4632,17 +4633,15 @@ options   IPSEC_DEBUG  #debug for IP sec
       <para>VPN ¤Î¹½À®¤Ë¤Ä¤¤¤Æ¤Îɸ½à¤Ï¤¢¤ê¤Þ¤»¤ó¡£
 	VPN ¤Ï¡¢¿ô¿¤¯¤Îµ»½Ñ¤È¶¦¤Ë¼ÂÁõ¤¹¤ë¤³¤È¤¬²Äǽ¤Ç¤¹¡£
 	¤½¤Î³Æµ»½Ñ¤Ë¤Ï¡¢¤½¤ì¼«¿È¤ÎĹ½ê¤Èû½ê¤¬¤¢¤ê¤Þ¤¹¡£
-	¤³¤Îʸ½ñ¤Ç¤Ï¡¢Â¿¤¯¤Î¥·¥Ê¥ê¥ª¤Ë¤Ä¤¤¤Æ¼¨¤·¡¢
-        ³Æ¥·¥Ê¥ê¥ª¤ËÂФ·¤Æ¡¢VPN ¤ò¼ÂÁõ¤¹¤ëÀïά¤Ë¤Ä¤¤¤ÆÀâÌÀ¤·¤Þ¤¹¡£</para>
+	¤³¤Î¾Ï¤Ç¤Ï¡¢¥·¥Ê¥ê¥ª¤ò¼¨¤·¡¢
+        ¤½¤Î¥·¥Ê¥ê¥ª¤ËÂФ·¤Æ¡¢VPN ¤ò¼ÂÁõ¤¹¤ëÀïά¤Ë¤Ä¤¤¤ÆÀâÌÀ¤·¤Þ¤¹¡£</para>
     </sect2>
 
     <sect2>
-      <title>¥·¥Ê¥ê¥ª #1:
-        ¥¤¥ó¥¿¡¼¥Í¥Ã¥È¤ËÀܳ¤·¤Æ¤¤¤ë 2 ¤Ä¤Î¥Í¥Ã¥È¥ï¡¼¥¯¤¬
+      <title>¥·¥Ê¥ê¥ª: ¥¤¥ó¥¿¡¼¥Í¥Ã¥È¤ËÀܳ¤·¤Æ¤¤¤ë 2 ¤Ä¤Î¥Í¥Ã¥È¥ï¡¼¥¯¤¬
         1 ¤Ä¤Î¥Í¥Ã¥È¥ï¡¼¥¯¤È¤·¤Æ¿¶¤ëÉñ¤¦</title>
       
-      <para>¤³¤ì¤Ï¡¢»ä¤¬ºÇ½é¤Ë VPN ¤òÄ´¤Ù»Ï¤á¤ë¸¶°ø¤È¤Ê¤Ã¤¿¥·¥Ê¥ê¥ª¤Ç¤¹¡£
-        Á°Äó¤Ï°Ê²¼¤ÎÄ̤ê¤Ç¤¹¡£</para>
+      <para>Á°Äó¤Ï°Ê²¼¤ÎÄ̤ê¤Ç¤¹¡£</para>
       
       <itemizedlist>
         <listitem>

_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-doc-all
To unsubscribe, send any mail to "[email protected]"