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

Author: ryusuke
Date: Tue Nov 17 14:06:17 2015
New Revision: 47788
URL: https://svnweb.freebsd.org/changeset/doc/47788

Log:
  - Merge the following from the English version:
  
  	r17060 -> r17170	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	Tue Nov 17 00:34:13 2015	(r47787)
+++ head/ja_JP.eucJP/books/handbook/security/chapter.xml	Tue Nov 17 14:06:17 2015	(r47788)
@@ -3,11 +3,7 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: r17060
-     Translation note: "fs-acl" section added in rev.1.118 is moved to
-	handbook/basics in rev.1.134 and moved back to this file in
-	rev.1.150. The traslation is already done in handbook/basics, so we
-	should skip translating this section until rev.1.150.
+     Original revision: r17170
      $FreeBSD$
 -->
 <chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="security">
@@ -4166,8 +4162,6 @@ [email protected]'s p
       </authorgroup>
     </info>
 
-    
-
     <indexterm>
       <primary>ACL</primary>
     </indexterm>
@@ -4196,15 +4190,17 @@ [email protected]'s p
       ¤Ç¥Í¥¤¥Æ¥£¥ÖÂбþ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£</para>
 
     <note><para><acronym>UFS1</acronym> ¤Ë³Èĥ°À­¤òÉÕ¤¹¤è¤¦¤ËÀßÄꤹ¤ë¤Î¤Ï¡¢
-      <acronym>UFS2</acronym> ¤è¤ê¤â¹â¤¤¥ì¥Ù¥ë¤Î´ÉÍý¥ª¡¼¥Ð¥Ø¥Ã¥É¤¬É¬Íפˤʤê¤Þ¤¹¡£
+      <acronym>UFS2</acronym>
+      ¤è¤ê¤â¹â¤¤¥ì¥Ù¥ë¤Î´ÉÍý¥ª¡¼¥Ð¥Ø¥Ã¥É¤¬É¬Íפˤʤê¤Þ¤¹¡£
       ¤Þ¤¿¡¢<acronym>UFS2</acronym>
       ¤Ë¤ª¤±¤ë³Èĥ°À­¤Î¥Ñ¥Õ¥©¡¼¥Þ¥ó¥¹¤âÂ礭¤¯¾å¤¬¤Ã¤Æ¤¤¤Þ¤¹¡£
       ¤½¤Î·ë²Ì¡¢¥¢¥¯¥»¥¹À©¸æ¥ê¥¹¥È¤òÍøÍѤ¹¤ë¾å¤Ç¤Ï¡¢°ìÈÌŪ¤Ë¤Ï
       <acronym>UFS1</acronym> ¤è¤ê¤â <acronym>UFS2</acronym>
       ¤ÎÊý¤¬¤ª¤¹¤¹¤á¤Ç¤¹¡£</para></note>
 
-    <para><acronym>ACLs</acronym> ¤Ï¡¢¥Þ¥¦¥ó¥È»þ¤Î´ÉÍý¥Õ¥é¥° <option>acls</option>
-      ¤ÇÍ­¸ú¤Ë¤µ¤ì¤Þ¤¹¡£¤³¤ì¤Ï <filename>/etc/fstab</filename> ¤Ëµ­½Ò¤Ç¤­¤Þ¤¹¡£
+    <para><acronym>ACLs</acronym> ¤Ï¡¢¥Þ¥¦¥ó¥È»þ¤Î´ÉÍý¥Õ¥é¥°
+      <option>acls</option> ¤ÇÍ­¸ú¤Ë¤µ¤ì¤Þ¤¹¡£
+      ¤³¤ì¤Ï <filename>/etc/fstab</filename> ¤Ëµ­½Ò¤Ç¤­¤Þ¤¹¡£
       ¥Þ¥¦¥ó¥È»þ¤Î¥Õ¥é¥°¤Ï¡¢&man.tunefs.8;
       ¤ò»È¤Ã¤Æ¡¢¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¥Ø¥Ã¥À¤Î¥¹¡¼¥Ñ¥Ö¥í¥Ã¥¯¤Ë¤¢¤ë
       <acronym>ACLs</acronym> ¥Õ¥é¥°¤òÊѹ¹¤¹¤ë¤È¤¤¤¦ÊýË¡¤Ç¡¢
@@ -4234,7 +4230,8 @@ [email protected]'s p
     </itemizedlist>
 
     <note><para><acronym>ACLs</acronym> ¤ÎÆ°ºî¤òÊѹ¹¤·¤Æ¡¢¤Þ¤Ã¤¿¤¯¿·¤¿¤Ë
-      &man.mount.8; ¤ò¹Ô¤ï¤Ê¤¯¤Æ¤â¥Õ¥é¥°¤òÍ­¸ú¤Ë¤Ç¤­¤ë¤è¤¦¤Ë¤¹¤ë¤³¤È¤â²Äǽ¤Ç¤·¤ç¤¦¡£
+      &man.mount.8;
+      ¤ò¹Ô¤ï¤Ê¤¯¤Æ¤â¥Õ¥é¥°¤òÍ­¸ú¤Ë¤Ç¤­¤ë¤è¤¦¤Ë¤¹¤ë¤³¤È¤â²Äǽ¤Ç¤·¤ç¤¦¡£
       ¤·¤«¤·¡¢²æ¡¹¤Ï¡¢¤¦¤Ã¤«¤ê <acronym>ACLs</acronym>
       ¤òÍ­¸ú¤Ë¤·¤Ê¤¤¤Ç¥Þ¥¦¥ó¥È¤·¤Æ¤·¤Þ¤¦¤Î¤òËɤ°¤è¤¦¤Ë¤·¤¿Êý¤¬Ë¾¤Þ¤·¤¤¤È¹Í¤¨¤Þ¤·¤¿¡£
       <acronym>ACLs</acronym> ¤òÍ­¸ú¤Ë¤·¡¢¤½¤Î¸å̵¸ú¤Ë¤·¤Æ¤«¤é¡¢

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