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

Author: ryusuke
Date: Sat Feb 24 08:34:51 2018
New Revision: 51444
URL: https://svnweb.freebsd.org/changeset/doc/51444

Log:
  - Merge the following from the English version:
  
  	r42014 -> r42266	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 Feb 24 08:23:09 2018	(r51443)
+++ head/ja_JP.eucJP/books/handbook/security/chapter.xml	Sat Feb 24 08:34:51 2018	(r51444)
@@ -3,7 +3,7 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: r42014
+     Original revision: r42266
      $FreeBSD$
 -->
 <chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="security">
@@ -3201,7 +3201,7 @@ bb:48:db:f2:93:57:80:b6:aa:bc:f5:d5:ba:8f:79:17 user@h
 	<acronym>DSA</acronym> ¤Þ¤¿¤Ï <acronym>RSA</acronym>
 	¤Î¤É¤Á¤é¤ò»È¤¦¾ì¹ç¤Ë¤â¡¢
 	¥ê¥â¡¼¥È¥Þ¥·¥ó¤Î <filename>~/.ssh/authorized_keys</filename>
-	¥Õ¥¡¥¤¥ë¤Ë´Þ¤Þ¤ì¤Æ¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£</para>
+	¤Ë´Þ¤Þ¤ì¤Æ¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£</para>
 
       <para>¤³¤ÎÀßÄê¤Ë¤è¤ê¡¢¥Ñ¥¹¥ï¡¼¥É¤ËÂå¤ï¤ê¡¢
 	<acronym>SSH</acronym>
@@ -3283,7 +3283,7 @@ Identity added: /home/user/.ssh/id_dsa (/home/user/.ss
 	¾å¤Çµ¯Æ°¤µ¤ì¤ë¤¹¤Ù¤Æ¤Î¥×¥í¥°¥é¥à¤Ë¤ª¤¤¤Æ¡¢
 	&man.ssh-agent.1; ¥µ¡¼¥Ó¥¹¤¬Ä󶡤µ¤ì¤ë¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡£
 	<filename>~/.xinitrc</filename>
-	¥Õ¥¡¥¤¥ë¤ÎÎã¤Ï°Ê²¼¤È¤Ê¤ê¤Þ¤¹¡£</para>
+	¤ÎÎã¤Ï°Ê²¼¤È¤Ê¤ê¤Þ¤¹¡£</para>
 
       <programlisting>exec ssh-agent <replaceable>startxfce4</replaceable></programlisting>
 
@@ -4074,7 +4074,7 @@ VII. References <co xml:id="co-ref"/></programlisting>
       <command>cap_mkdb</command>
       ¤ò»È¤Ã¤¿¥ê¥½¡¼¥¹¥Ç¡¼¥¿¥Ù¡¼¥¹¤Î¹½ÃÛ¡¢
       <filename>/etc/master.passwd</filename>
-      ¥Õ¥¡¥¤¥ë¤Ø¤ÎÊѹ¹¤¬É¬ÍפȤʤê¤Þ¤¹¡£
+      ¤Ø¤ÎÊѹ¹¤¬É¬ÍפȤʤê¤Þ¤¹¡£
       ¤µ¤é¤Ë¡¢¥Ñ¥¹¥ï¡¼¥É¥Ç¡¼¥¿¥Ù¡¼¥¹¤Ï¡¢
       <command>pwd_mkdb</command> ¤ò»È¤Ã¤ÆºÆ¹½ÃÛ¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
       ¤³¤ÎÊ£¿ô²ó¤ËÅϤë¥×¥í¥»¥¹¤Ï¡¢
@@ -4116,7 +4116,7 @@ options         RCTL</programlisting>
     <para>¤³¤ì¤Ï´ðËÜŪ¤Ê¥ë¡¼¥ë¤Ç¤¹¡£
       ¤³¤³¤Ç¡¢subject ¤Ï <literal>user</literal>¡¢
       subject-id ¤Ï <literal>trhodes</literal> ¤Ç¤¹¡£
-      maxproc ¤Ï¤â¤Á¤í¤ó¥×¥í¥»¥¹¤ÎºÇÂç¿ô¤Ç¤¢¤ê¡¢action ¤Ç¤¹¡£
+      maxproc ¤Ï¤â¤Á¤í¤ó¥×¥í¥»¥¹¤ÎºÇÂç¿ô¤Ç¤¢¤ê¡¢resource ¤Ç¤¹¡£
       ¤³¤³¤Ç action ¤Ï¡¢<literal>deny</literal> ¤ÈÀßÄꤵ¤ì¤Æ¤ª¤ê¡¢
       ¿·¤·¤¤¥×¥í¥»¥¹¤ÎÀ¸À®¤¬¥Ö¥í¥Ã¥¯¤µ¤ì¤Þ¤¹¡£
       ¤³¤ÎÎã¤Ç¤Ï¡¢¥æ¡¼¥¶ <literal>trhodes</literal> ¤Î¥×¥í¥»¥¹¤Ï
@@ -4142,7 +4142,7 @@ eval: Cannot fork: Resource temporarily unavailable</s
 
     <screen>&prompt.root; <userinput>rctl -a jail:httpd:memoryuse:deny=2G/jail</userinput></screen>
 
-    <para>¥ë¡¼¥ë¤ò <filename>/etc/rctl.conf</filename> ¥Õ¥¡¥¤¥ë¤ËÄɲ乤ë¤È¡¢
+    <para>¥ë¡¼¥ë¤ò <filename>/etc/rctl.conf</filename> ¤ËÄɲ乤ë¤È¡¢
       ºÆµ¯Æ°¤·¤Æ¤â¥ë¡¼¥ë¤Ï»ý³¤·¤Þ¤¹¡£
       ¥Õ¥©¡¼¥Þ¥Ã¥È¤Ï¡¢¥ë¡¼¥ë¤«¤éºÇ½é¤Î¥³¥Þ¥ó¥É¤ÎÉôʬ¤ò½ü¤¤¤¿¤â¤Î¤È¤Ê¤ê¤Þ¤¹¡£
       ¤¿¤È¤¨¤Ð¡¢¾å¤Î¥ë¡¼¥ë¤òÄɲ乤ë¤Ë¤Ï¡¢

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