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

Ryusuke SUZUKI ryusuke at FreeBSD.org
Mon Feb 26 12:56:09 UTC 2018


Author: ryusuke
Date: Mon Feb 26 12:56:08 2018
New Revision: 51446
URL: https://svnweb.freebsd.org/changeset/doc/51446

Log:
  - Merge the following from the English version:
  
  	r42267 -> r43278	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	Sun Feb 25 00:19:05 2018	(r51445)
+++ head/ja_JP.eucJP/books/handbook/security/chapter.xml	Mon Feb 26 12:56:08 2018	(r51446)
@@ -3,7 +3,7 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: r42267
+     Original revision: r43278
      $FreeBSD$
 -->
 <chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="security">
@@ -347,7 +347,7 @@
       <para>¥¢¥«¥¦¥ó¥È¤ò´°Á´¤Ë¥í¥Ã¥¯¤¹¤ë¤Ë¤Ï¡¢
 	&man.pw.8; ¤ò»È¤Ã¤Æ¤¯¤À¤µ¤¤¡£</para>
 
-      <screen>&prompt.root; <userinput>pw lock <replaceable>staff</replaceable></userinput></screen>
+      <screen>&prompt.root; <userinput>pw lock staff</userinput></screen>
 
       <para>¤³¤ì¤Ë¤è¤ê¡¢»ØÄꤵ¤ì¤¿¥æ¡¼¥¶¤Ï¡¢&man.ssh.1;
 	¤ò´Þ¤à¤¤¤«¤Ê¤ëÊýË¡¤Ç¤â¥í¥°¥¤¥ó¤Ç¤­¤Ê¤¯¤Ê¤ê¤Þ¤¹¡£</para>
@@ -420,11 +420,9 @@
       <para>¾¤Î¥·¥¹¥Æ¥à¤ÎÀøºßŪ¤Ê¥»¥­¥å¥ê¥Æ¥£¥Û¡¼¥ë¤Ë¤Ï¡¢
 	SUID-root ¤ª¤è¤Ó SGID ¥Ð¥¤¥Ê¥ê¤¬¤¢¤ê¤Þ¤¹¡£
 	¤³¤ì¤é¤Î¥Ð¥¤¥Ê¥ê¤Ï¡¢
-	&man.rlogin.1; ¤Î¤è¤¦¤Ë¡¢<filename
-	  class="directory">/bin</filename>, <filename
-	  class="directory">/sbin</filename>, <filename
-	  class="directory">/usr/bin</filename> ¤Þ¤¿¤Ï <filename
-	  class="directory">/usr/sbin</filename>
+	&man.rlogin.1; ¤Î¤è¤¦¤Ë¡¢<filename>/bin</filename>,
+	<filename>/sbin</filename>, <filename>/usr/bin</filename>
+	¤Þ¤¿¤Ï <filename>/usr/sbin</filename>
 	¤Ë¸ºß¤¹¤ë¤â¤Î¤¬¤Û¤È¤ó¤É¤Ç¤¹¡£
 	100% °ÂÁ´¤Ê¤â¤Î¤Ï¸ºß¤·¤Ê¤¤¤È¤Ï¤¤¤¨¡¢
 	¥·¥¹¥Æ¥à¥Ç¥Õ¥©¥ë¥È¤Î SUID/SGID ¥Ð¥¤¥Ê¥ê¤ÏÈæ³ÓŪ°ÂÁ´¤È¤¤¤¨¤Þ¤¹¡£
@@ -508,7 +506,7 @@
 	¸½ºßÆ°¤¤¤Æ¤¤¤ë¥«¡¼¥Í¥ë¤Î¥»¥­¥å¥ê¥Æ¥£¥ì¥Ù¥ë¤ò¹â¤á¤ëºÇ¤â´Êñ¤ÊÊýË¡¤Ï¡¢
 	<varname>kern.securelevel</varname> ¤òÀßÄꤹ¤ëÊýË¡¤Ç¤¹¡£</para>
 
-      <screen>&prompt.root; <userinput>sysctl kern.securelevel=<replaceable>1</replaceable></userinput></screen>
+      <screen>&prompt.root; <userinput>sysctl kern.securelevel=1</userinput></screen>
 
       <para>¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï¡¢&os; ¤Î¥«¡¼¥Í¥ë¤Ï¥»¥­¥å¥ê¥Æ¥£¥ì¥Ù¥ë
 	-1 ¤Çµ¯Æ°¤·¤Þ¤¹¡£
@@ -536,7 +534,7 @@
 	<para>¥»¥­¥å¥ê¥Æ¥£¥ì¥Ù¥ë¤ò 1 °Ê¾å¤ËÀßÄꤷ¤¿¾ì¹ç¤Ë¤Ï¡¢
 	  <filename>/dev/io</filename> ¤Ø¤Î¥¢¥¯¥»¥¹¤¬¥Ö¥í¥Ã¥¯¤µ¤ì¤ë¤¿¤á¡¢
 	  <application>&xorg;</application> ¤ä¡¢
-	  installworld ¤Î¥×¥í¥»¥¹¤Ç¤Ï¡¢
+	  <buildtarget>installworld</buildtarget> ¤Î¥×¥í¥»¥¹¤Ç¤Ï¡¢
 	  ¤¤¤¯¤Ä¤«¤Î¥Õ¥¡¥¤¥ë¤ÎÄɲÃÀìÍѤª¤è¤ÓÊѹ¹ÉԲĤΥե饰¤Ï°ì»þŪ¤Ë¥ê¥»¥Ã¥È¤µ¤ì¤ë¤¿¤á¡¢
 	  ¥½¡¼¥¹¤«¤é &os;
 	  ¤ò¹½ÃÛ¤·¤Æ¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤È¤­¤Ê¤É¤ÇÌäÂ꤬°ú¤­µ¯¤³¤µ¤ì¤ë²ÄǽÀ­¤¬¤¢¤ê¤Þ¤¹¡£
@@ -563,8 +561,7 @@
 	<literal>schg</literal>
 	¥Õ¥é¥°¤òÀßÄꤷ¤Ê¤¤¤È¤¤¤¦¤È¤³¤í¤ÇÂŶ¨¤¹¤ë¤È¤¤¤¦¼ê¤â¤¢¤ê¤Þ¤¹¡£
 	¤â¤¦°ì¤Ä¤Î²ÄǽÀ­¤È¤·¤Æ¤Ï¡¢Ã±½ã¤Ë
-	<filename class="directory">/</filename> ¤ª¤è¤Ó	<filename
-	  class="directory">/usr</filename>
+	<filename>/</filename> ¤ª¤è¤Ó <filename>/usr</filename>
 	¤òÆɤ߹þ¤ßÀìÍѤǥޥ¦¥ó¥È¤¹¤ë¤³¤È¤Ç¤¹¡£
 	¤³¤³¤ÇÆÃÉ®¤¹¤Ù¤­¤³¤È¤Ï¡¢¥·¥¹¥Æ¥à¤ò¼é¤í¤¦¤È¤·¤Æ¸·¤·¤¯¤·¤¹¤®¤ë¤È¡¢
 	¿¯Æþ¤ò¸¡½Ð¤¹¤ë¤³¤È¤¬¤Ç¤­¤Ê¤¯¤Ê¤Ã¤Æ¤·¤Þ¤¦¤È¤¤¤¦¤³¤È¤Ç¤¹¡£</para>
@@ -576,9 +573,8 @@
       <para>¥·¥¹¥Æ¥à´ÉÍý¼Ô¤Ë¤Ç¤­¤ë¤³¤È¤Ï¡¢
 	ÊØÍø¤µ¤È¤¤¤¦Í×ÁǤ¬¤½¤Î½¹¤¤Æ¬¤ò¾å¤²¤Ê¤¤ÄøÅ٤ˡ¢
 	¥³¥¢¥·¥¹¥Æ¥à¤ÎÀßÄê¤ÈÀ©¸æ¥Õ¥¡¥¤¥ë¤òËɸ椹¤ë¤³¤È¤À¤±¤Ç¤¹¡£
-	¤¿¤È¤¨¤Ð¡¢<filename
-	  class="directory">/</filename> ¤ª¤è¤Ó	<filename
-	  class="directory">/usr</filename>
+	¤¿¤È¤¨¤Ð¡¢<filename>/</filename> ¤ª¤è¤Ó
+	<filename>/usr</filename>
 	¤Ë¤¢¤ëÂçÉôʬ¤Î¥Õ¥¡¥¤¥ë¤Ë <literal>schg</literal>
 	¥Ó¥Ã¥È¤òÀßÄꤹ¤ë¤¿¤á¤Ë &man.chflags.1;
 	¤ò»ÈÍѤ¹¤ë¤Î¤Ï¡¢¤ª¤½¤é¤¯µÕ¸ú²Ì¤Ç¤·¤ç¤¦¡£
@@ -620,16 +616,14 @@
 	¤Ê¤É¤Îñ½ã¤Ê¥·¥¹¥Æ¥à¥æ¡¼¥Æ¥£¥ê¥Æ¥£¤Ç¥¹¥¯¥ê¥×¥È¤ò½ñ¤¯¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
 	¾¯¤Ê¤¯¤È¤â 1 Æü 1 ²ó¡¢¥¯¥é¥¤¥¢¥ó¥È¤Î¥·¥¹¥Æ¥à¥Õ¥¡¥¤¥ë¤òľÀÜ
 	&man.md5.1; ¤Ë¤«¤±¡¢
-	¤µ¤é¤Ë¤â¤Ã¤ÈÉÑÈË¤Ë <filename
-	  class="directory">/etc</filename> ¤ª¤è¤Ó <filename
-	  class="directory">/usr/local/etc</filename>
+	¤µ¤é¤Ë¤â¤Ã¤ÈÉÑÈË¤Ë <filename>/etc</filename> ¤ª¤è¤Ó
+	<filename>/usr/local/etc</filename>
 	¤Ë¤¢¤ë¤è¤¦¤Ê¥³¥ó¥È¥í¡¼¥ëÍÑ¥Õ¥¡¥¤¥ë¤ò»î¸³¤¹¤ë¤Î¤¬°ìÈ֤Ǥ¹¡£
 	¥¢¥¯¥»¥¹À©¸Â¤µ¤ì¤¿¥Þ¥·¥ó¤¬Àµ¤·¤¤¤ÈÃΤäƤ¤¤ë¡¢
 	´ð¤È¤Ê¤ë md5 ¾ðÊó¤ÈÈæ¤Ù¤Æ°ã¤¤¤¬¸«¤Ä¤«¤Ã¤¿¾ì¹ç¡¢
 	¥·¥¹¥Æ¥à´ÉÍý¼Ô¤Ë·Ù¹ð¤¹¤ë¤è¤¦¤Ë¤¹¤Ù¤­¤Ç¤¹¡£
-	Í¥¤ì¤¿¥»¥­¥å¥ê¥Æ¥£ÍÑ¥¹¥¯¥ê¥×¥È¤Ï¡¢<filename
-	  class="directory">/</filename> ¤ª¤è¤Ó	<filename
-	  class="directory">/usr</filename>
+	Í¥¤ì¤¿¥»¥­¥å¥ê¥Æ¥£ÍÑ¥¹¥¯¥ê¥×¥È¤Ï¡¢
+	<filename>/</filename> ¤ª¤è¤Ó <filename>/usr</filename>
 	¤Ê¤É¤Î¥·¥¹¥Æ¥à¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¾å¤ÇÉÔŬÅö¤Ë
 	SUID ¤µ¤ì¤¿¥Ð¥¤¥Ê¥ê¤ä¡¢
 	¿·¤¿¤ËºîÀ®¤µ¤ì¤¿¥Õ¥¡¥¤¥ë¤äºï½ü¤µ¤ì¤¿¥Õ¥¡¥¤¥ë¤¬¤Ê¤¤¤«¤É¤¦¤«¤òÄ´¤Ù¤ë¤Ç¤·¤ç¤¦¡£</para>
@@ -911,7 +905,6 @@
   </sect1>
 
   <sect1 xml:id="crypt">
-
     <info><title>DES, Blowfish, MD5, SHA256, SHA512 ¤ª¤è¤Ó Crypt</title>
       <authorgroup>
 	<author>
@@ -1358,7 +1351,7 @@ Enter secret pass phrase: <userinput><secret passwo
 	¸¡º÷¤Î¥×¥í¥»¥¹¤Ï½ªÎ»¤·¤Þ¤¹¡£</para>
 
       <para>Îã¤È¤·¤Æ¡¢<acronym>POP</acronym>3 ¤ÎÀܳ¤ò
-	<filename role="package">mail/qpopper</filename>
+	<package>mail/qpopper</package>
 	¥Ç¡¼¥â¥ó·Ðͳ¤Çµö²Ä¤¹¤ë¤Ë¤Ï¡¢°Ê²¼¤Î¹Ô¤ò
 	<filename>hosts.allow</filename> ¤ËÄɲ䷤Ƥ¯¤À¤µ¤¤¡£</para>
 
@@ -1588,7 +1581,7 @@ sendmail : PARANOID : deny</programlisting>
 	<acronym>¥¢¥á¥ê¥«¹ç½°¹ñ</acronym> ¤ÎÍ¢½Ðµ¬À©¤Ë¤è¤êÀ©¸Â¤µ¤ì¤Æ¤­¤Þ¤·¤¿¡£
 	<acronym>MIT</acronym> ¤Ç¼ÂÁõ¤µ¤ì¤¿
 	<application>Kerberos</application> ¤Ï¡¢
-	<filename role="package">security/krb5</filename> package ¤Þ¤¿¤Ï
+	<package>security/krb5</package> package ¤Þ¤¿¤Ï
 	port ¤«¤éÍøÍѤǤ­¤Þ¤¹¡£
 	¥Ð¡¼¥¸¥ç¥ó 5 ¤Î¤â¤¦°ì¤Ä¤Î¼ÂÁõ¤¬¡¢
 	Heimdal	<application>Kerberos</application>
@@ -1596,7 +1589,7 @@ sendmail : PARANOID : deny</programlisting>
 	¤³¤Î¼ÂÁõ¤Ï¡¢<acronym>¥¢¥á¥ê¥«¹ç½°¹ñ</acronym>¤Î³°¤Ç³«È¯¤µ¤ì¤¿¤¿¤á¡¢
 	Í¢½Ð¤ÎÀ©¸Â¤òÈò¤±¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
 	Heimdal <application>Kerberos</application> ¤Ï
-	<filename role="package">security/heimdal</filename>
+	<package>security/heimdal</package>>
 	package ¤Þ¤¿¤Ï port ¤«¤é¥¤¥ó¥¹¥È¡¼¥ë¤Ç¤­¤Þ¤¹¤¬¡¢ºÇ¾®¹½À®¤Ï
 	&os; ¤Î base ¥¤¥ó¥¹¥È¡¼¥ë¤Ë´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹¡£</para>
 
@@ -1669,7 +1662,7 @@ kadmind5_server_enable="YES"</programlisting>
       default_realm = EXAMPLE.ORG</programlisting>
 
 	<para>¤½¤·¤Æ¡¢<systemitem
-	    class="fqdomainname">kerberos.EXAMPLE.ORG</systemitem>
+	    class="fqdomainname">example.org</systemitem>
 	  ¥¾¡¼¥ó¥Õ¥¡¥¤¥ë¤Ë¤Ï¡¢°Ê²¼¤Î¹Ô¤¬ÉÕ¤±²Ã¤¨¤é¤ì¤Þ¤¹¡£</para>
 
 	<programlisting>_kerberos._udp      IN  SRV     01 00 88 kerberos.example.org.
@@ -1726,9 +1719,9 @@ Master key: <userinput>xxxxxxxx</userinput>
 Verifying password - Master key: <userinput>xxxxxxxx</userinput>
 
 &prompt.root; <userinput>kadmin -l</userinput>
-kadmin> <userinput>init EXAMPLE.ORG</userinput>
+kadmin> <userinput>init EXAMPLE.ORG</userinput>
 Realm max ticket life [unlimited]:
-kadmin> <userinput>add tillman</userinput>
+kadmin> <userinput>add tillman</userinput>
 Max ticket life [unlimited]:
 Max renewable life [unlimited]:
 Attributes []:
@@ -1744,7 +1737,7 @@ Verifying password - Password: <userinput>xxxxxxxx</us
 	¥×¥ê¥ó¥·¥Ñ¥ë¤Î¥Á¥±¥Ã¥È¤òÆþ¼ê¤·¤¿¤ê¡¢
 	°ìÍ÷¤òɽ¼¨¤¹¤ë¤³¤È¤¬¤Ç¤­¤ë¤³¤È¤ò³Îǧ¤Ç¤­¤Þ¤¹¡£</para>
 
-      <screen>&prompt.user; <userinput>kinit <replaceable>tillman</replaceable></userinput>
+      <screen>&prompt.user; <userinput>kinit tillman</userinput>
 tillman at EXAMPLE.ORG's Password:
 
 &prompt.user; <userinput>klist</userinput>
@@ -1818,12 +1811,12 @@ Aug 27 15:37:58  Aug 28 01:37:58  krbtgt/EXAMPLE.ORG at E
 
       <screen>&prompt.root; <userinput>kadmin</userinput>
 
-kadmin><userinput> add --random-key host/myserver.example.org</userinput>
+kadmin><userinput> add --random-key host/myserver.example.org</userinput>
 Max ticket life [unlimited]:
 Max renewable life [unlimited]:
 Attributes []:
-kadmin><userinput> ext host/myserver.example.org</userinput>
-kadmin><userinput> exit</userinput></screen>
+kadmin><userinput> ext host/myserver.example.org</userinput>
+kadmin><userinput> exit</userinput></screen>
 
       <para><command>ext</command> ¤Ï¡¢¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï¡¢Ãê½Ð¤µ¤ì¤¿¸°¤ò
 	<filename>/etc/krb5.keytab</filename> ¤ËÊݸ¤·¤Þ¤¹¡£</para>
@@ -1840,8 +1833,8 @@ kadmin><userinput> exit</userinput></screen>
 	°ì»þ¥Õ¥¡¥¤¥ë¤ËÃê½Ð¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
       <screen>&prompt.root; <userinput>kadmin</userinput>
-kadmin><userinput> ext --keytab=/tmp/example.keytab host/myserver.example.org</userinput>
-kadmin><userinput> exit</userinput></screen>
+kadmin><userinput> ext --keytab=/tmp/example.keytab host/myserver.example.org</userinput>
+kadmin><userinput> exit</userinput></screen>
 
       <para>¤½¤Î¸å¡¢&man.scp.1; ¤Þ¤¿¤Ï¥ê¥à¡¼¥Ð¥Ö¥ë¥Ç¥£¥¹¥¯¤ò»È¤Ã¤Æ¡¢
 	keytab ¤ò°ÂÁ´¤Ë¥µ¡¼¥Ð¥³¥ó¥Ô¥å¡¼¥¿¤Ë¥³¥Ô¡¼¤·¤Æ¤¯¤À¤µ¤¤¡£
@@ -1965,14 +1958,9 @@ jdoe at example.org</screen>
 	Tips, Tricks, ¤ª¤è¤Ó¥È¥é¥Ö¥ë¥·¥å¡¼¥Æ¥£¥ó¥°</title>
 
       <itemizedlist>
-	<indexterm>
-	  <primary>Kerberos5</primary>
-	  <secondary>¥È¥é¥Ö¥ë¥·¥å¡¼¥Æ¥£¥ó¥°</secondary>
-	</indexterm>
-
 	<listitem>
 	  <para>Heimdal ¤Þ¤¿¤Ï <acronym>MIT</acronym>
-	    <application>Kerberos</application> ports
+	    <application>Kerberos</application><indexterm><primary>Kerberos5</primary><secondary>troubleshooting</secondary></indexterm> ports
 	    ¤Î¤É¤Á¤é¤ò»È¤¦¾ì¹ç¤Ç¤â¡¢
 	    <envar>PATH</envar> ¤Ï¡¢
 	    <application>Kerberos</application> ÈǤΥ¯¥é¥¤¥¢¥ó¥È
@@ -1997,7 +1985,7 @@ jdoe at example.org</screen>
 	    <systemitem class="username">host/</systemitem>
 	    ¥×¥ê¥ó¥·¥Ñ¥ë¤òÊѹ¹¤·¡¢keytab ¤ò¥¢¥Ã¥×¥Ç¡¼¥È¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
 	    Apache ¤Î
-	    <filename role="package">www/mod_auth_kerb</filename>
+	    <package>www/mod_auth_kerb</package>
 	    ¤Ç»È¤ï¤ì¤ë
 	    <systemitem class="username">www/</systemitem>
 	    ¥×¥ê¥ó¥·¥Ñ¥ë¤Î¤è¤¦¤ÊÆÃÊ̤Ê
@@ -2132,15 +2120,14 @@ jdoe at example.org</screen>
 	¤Ë½ñ¤«¤ì¤Æ¤¤¤ë¥¬¥¤¥É¤Ë½¾¤¦¤³¤È¤¬¿ä¾©¤µ¤ì¤Þ¤¹¡£
 	path ¤ÎÌäÂê¤Ë¤Ä¤¤¤ÆÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£
 	<acronym>MIT</acronym> port ¤Ï¥Ç¥Õ¥©¥ë¥È¤Ç
-	<filename class="directory">/usr/local/</filename>
-	¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤·¤Þ¤¹¡£
+	<filename>/usr/local/</filename> ¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤·¤Þ¤¹¡£
 	¤½¤Î¤¿¤á¡¢¤â¤· <envar>PATH</envar>
 	¤Ë¤ª¤¤¤Æ¥·¥¹¥Æ¥à¤Î¥Ç¥£¥ì¥¯¥È¤¬ºÇ½é¤Ë½ñ¤«¤ì¤Æ¤¤¤ë¾ì¹ç¤Ë¤Ï¡¢
 	<acronym>MIT</acronym> ÈǤǤϤʤ¯¡¢<quote>Ä̾ï¤Î</quote>
 	¥·¥¹¥Æ¥à¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤¬µ¯Æ°¤·¤Æ¤·¤Þ¤¤¤Þ¤¹¡£</para>
 
       <note><para>&os; ¤Î <acronym>MIT</acronym>
-	<filename role="package">security/krb5</filename> port ¤Ë¤ª¤¤¤Æ¡¢
+	<package>security/krb5</package> port ¤Ë¤ª¤¤¤Æ¡¢
 	&man.telnetd.8; ¤ª¤è¤Ó <command>klogind</command>
 	·Ðͳ¤Ç¤Î¥í¥°¥¤¥ó¤¬´ñ̯¤Ê¿¶¤ëÉñ¤¤¤ò¤¹¤ë¤³¤È¤òÍý²ò¤¹¤ë¤Ë¤Ï¡¢
 	port ¤«¤é¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤ë
@@ -2157,12 +2144,13 @@ jdoe at example.org</screen>
 
       <programlisting>kerberos5_server="/usr/local/sbin/krb5kdc"
 kadmind5_server="/usr/local/sbin/kadmind"
+kerberos5_server_flags=""
 kerberos5_server_enable="YES"
 kadmind5_server_enable="YES"</programlisting>
 
       <para>¤³¤ì¤ò¹Ô¤¦¤Î¤Ï¡¢
 	<acronym>MIT</acronym> Kerberos ¤Î¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Ï¡¢
-	<filename class="directory">/usr/local</filename>
+	<filename>/usr/local</filename>
 	¹½Â¤¤Î²¼¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤ë¤¿¤á¤Ç¤¹¡£</para>
     </sect2>
 
@@ -2197,7 +2185,7 @@ kadmind5_server_enable="YES"</programlisting>
 
 	<para>¥Þ¥ë¥Á¥æ¡¼¥¶¤Î´Ä¶­¤Ç¤Ï¡¢
 	  <application>Kerberos</application> ¤Ï°ÂÁ´¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£
-	  ¥Á¥±¥Ã¥È¤Ï <filename class="directory">/tmp</filename>
+	  ¥Á¥±¥Ã¥È¤Ï <filename>/tmp</filename>
 	  ¤ËÊݴɤµ¤ì¡¢
 	  ¤³¤Î¥Á¥±¥Ã¥È¤Ï¡¢¤¹¤Ù¤Æ¤Î¥æ¡¼¥¶¤¬Æɤळ¤È¤¬¤Ç¤­¤ë¤¿¤á¤Ç¤¹¡£
 	  ¤â¤·¡¢¥æ¡¼¥¶¤¬¥³¥ó¥Ô¥å¡¼¥¿¤ò¾¤Î¥æ¡¼¥¶¤ÈƱ»þ¤Ë¶¦Í­¤·¤Æ¤¤¤ë¤È¡¢
@@ -2252,7 +2240,7 @@ kadmind5_server_enable="YES"</programlisting>
 	  ¥Û¥¹¥È¤Þ¤¿¤Ï¥µ¡¼¥Ó¥¹¤È¤Î´Ö¤Îǧ¾Ú¤Î¥á¥«¥Ë¥º¥à¤ÏÄ󶡤·¤Þ¤»¤ó¡£
 	  ¤³¤ì¤Ï¡¢¥È¥í¥¤¤ÎÌÚÇϤΠ&man.kinit.1; ¤¬¡¢
 	  ¤¹¤Ù¤Æ¤Î¥æ¡¼¥¶Ì¾¤È¥Ñ¥¹¥ï¡¼¥É¤òµ­Ï¿¤Ç¤­¤ë¤³¤È¤ò°ÕÌ£¤·¤Æ¤¤¤Þ¤¹¡£
-	  <filename role="package">security/tripwire</filename>
+	  <package>security/tripwire</package>
 	  ¤Î¤è¤¦¤Ê¡¢¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤Î´°Á´À­¤ò³Îǧ¤¹¤ë¤¿¤á¤Î¥Ä¡¼¥ë¤Ë¤è¤ê¡¢
 	  ¤³¤Î´í¸±À­¤ò·Ú¸º¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£</para>
       </sect3>
@@ -2330,17 +2318,17 @@ kadmind5_server_enable="YES"</programlisting>
     <para><application>OpenSSL</application> ¤Ï¡¢
       ¥á¡¼¥ë¥¯¥é¥¤¥¢¥ó¥È¤Î°Å¹æ²½¤µ¤ì¤¿Ç§¾Ú¡¢
       ¥¯¥ì¥¸¥Ã¥È¥«¡¼¥É¤Ç¤Î»Ùʧ¤¤¤È¤¤¤Ã¤¿¥¦¥§¥Ö¥Ù¡¼¥¹¤Î¼è°ú¤Ê¤É¤Ç»È¤ï¤ì¤Þ¤¹¡£
-      <filename role="package">www/apache22</filename> ¤ª¤è¤Ó
-      <filename role="package">mail/claws-mail</filename>
+      <package>www/apache22</package> ¤ª¤è¤Ó
+      <package>mail/claws-mail</package>
       ¤È¤¤¤Ã¤¿Â¿¤¯¤Î port ¤Ç¤Ï¡¢
       <application>OpenSSL</application>
       ¤È¤È¤â¤Ë¹½ÃÛ¤¹¤ë¥³¥ó¥Ñ¥¤¥ë¤ËÂбþ¤·¤Æ¤¤¤Þ¤¹¡£</para>
 
     <note>
       <para>¿¤¯¤Î¾ì¹ç¡¢Ports Collection ¤Ï¡¢
-	make ¤Î WITH_OPENSSL_BASE ¤¬ÌÀ¼¨Åª¤Ë
+	make ¤Î <varname>WITH_OPENSSL_BASE</varname> ¤¬ÌÀ¼¨Åª¤Ë
 	<quote>yes</quote> ¤ËÀßÄꤵ¤ì¤Æ¤¤¤Ê¤¤¤È¡¢
-	<filename role="package">security/openssl</filename> port
+	<package>security/openssl</package> port
 	¤Î¹½ÃÛ¤ò»î¤ß¤Þ¤¹¡£</para>
     </note>
 
@@ -2357,7 +2345,7 @@ kadmind5_server_enable="YES"</programlisting>
 	¤â¤·»ÈÍѤ·¤¿¤¤¤Î¤Ç¤¢¤ì¤Ð¡¢¥é¥¤¥»¥ó¥¹¾ò¹à¤òɬ¤º³Îǧ¤·¡¢
 	¥é¥¤¥»¥ó¥¹¾ò¹à¤Ë¹çÃפ¹¤ë¤Î¤Ç¤¢¤ì¤Ð¡¢
 	<filename>/etc/make.conf</filename> ¤Ë¤ª¤¤¤Æ
-	MAKE_IDEA ÊÑ¿ô¤òÀßÄꤷ¤Æ¤¯¤À¤µ¤¤¡£</para>
+	<varname>MAKE_IDEA</varname> ÊÑ¿ô¤òÀßÄꤷ¤Æ¤¯¤À¤µ¤¤¡£</para>
     </note>
 
     <para>ºÇ¤â°ìÈÌŪ¤Ê <application>OpenSSL</application>
@@ -2400,18 +2388,18 @@ There are quite a few fields but you can leave some bl
 For some fields there will be a default value,
 If you enter '.', the field will be left blank.
 -----
-Country Name (2 letter code) [AU]:<userinput><replaceable>US</replaceable></userinput>
-State or Province Name (full name) [Some-State]:<userinput><replaceable>PA</replaceable></userinput>
-Locality Name (eg, city) []:<userinput><replaceable>Pittsburgh</replaceable></userinput>
-Organization Name (eg, company) [Internet Widgits Pty Ltd]:<userinput><replaceable>My Company</replaceable></userinput>
-Organizational Unit Name (eg, section) []:<userinput><replaceable>Systems Administrator</replaceable></userinput>
-Common Name (eg, YOUR name) []:<userinput><replaceable>localhost.example.org</replaceable></userinput>
-Email Address []:<userinput><replaceable>trhodes at FreeBSD.org</replaceable></userinput>
+Country Name (2 letter code) [AU]:<userinput>US</userinput>
+State or Province Name (full name) [Some-State]:<userinput>PA</userinput>
+Locality Name (eg, city) []:<userinput>Pittsburgh</userinput>
+Organization Name (eg, company) [Internet Widgits Pty Ltd]:<userinput>My Company</userinput>
+Organizational Unit Name (eg, section) []:<userinput>Systems Administrator</userinput>
+Common Name (eg, YOUR name) []:<userinput>localhost.example.org</userinput>
+Email Address []:<userinput>trhodes at FreeBSD.org</userinput>
 
 Please enter the following 'extra' attributes
 to be sent with your certificate request
-A challenge password []:<userinput><replaceable>SOME PASSWORD</replaceable></userinput>
-An optional company name []:<userinput><replaceable>Another Name</replaceable></userinput></screen>
+A challenge password []:<userinput>SOME PASSWORD</userinput>
+An optional company name []:<userinput>Another Name</userinput></screen>
 
       <para><quote>Common Name</quote> ¥×¥í¥ó¥×¥Èľ¸å¤Ëɽ¼¨¤µ¤ì¤Æ¤¤¤ë¤Î¤Ï¡¢
 	¥É¥á¥¤¥ó̾¤Ç¤¹¡£
@@ -2440,21 +2428,21 @@ An optional company name []:<userinput><replaceable>An
 	¼«¸Ê½ð̾¾ÚÌÀ½ñ¤òºîÀ®¤Ç¤­¤Þ¤¹¡£
 	ºÇ½é¤Ë <acronym>RSA</acronym> ¤Î¸°¤òÀ¸À®¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
-      <screen>&prompt.root; <userinput>openssl dsaparam -rand -genkey -out <filename>myRSA.key</filename> 1024</userinput></screen>
+      <screen>&prompt.root; <userinput>openssl dsaparam -rand -genkey -out myRSA.key 1024</userinput></screen>
 
       <para>¼¡¤Ë¡¢<acronym>CA</acronym> ¸°¤òÀ¸À®¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
-      <screen>&prompt.root; <userinput>openssl gendsa -des3 -out <filename>myca.key</filename> <filename>myRSA.key</filename></userinput></screen>
+      <screen>&prompt.root; <userinput>openssl gendsa -des3 -out myca.key myRSA.key</userinput></screen>
 
       <para>¤³¤Î¸°¤ò»È¤Ã¤Æ¾ÚÌÀ½ñ¤òºîÀ®¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
-      <screen>&prompt.root; <userinput>openssl req -new -x509 -days 365 -key <filename>myca.key</filename> -out <filename>new.crt</filename></userinput></screen>
+      <screen>&prompt.root; <userinput>openssl req -new -x509 -days 365 -key myca.key -out new.crt</userinput></screen>
 
       <para>¿·¤·¤¯ 2 ¤Ä¤Î¥Õ¥¡¥¤¥ë¤¬¤³¤Î¥Ç¥£¥ì¥¯¥È¥ê¤ËºîÀ®¤µ¤ì¤Þ¤¹¡£
 	¥×¥é¥¤¥Ù¡¼¥È¸° <filename>myca.key</filename> ¤ª¤è¤Ó
 	¾ÚÌÀ½ñ <filename>new.crt</filename> ¤Ç¤¹¡£
 	¤³¤ì¤é¤Î¥Õ¥¡¥¤¥ë¤ò¡¢¹¥¤Þ¤·¤¯¤Ï
-	<filename class="directory">/etc</filename> °Ê²¼¤Ç¡¢
+	<filename>/etc</filename> °Ê²¼¤Ç¡¢
 	<systemitem class="username">root</systemitem>
 	¤Î¤ß¤¬Æɤळ¤È¤Î¤Ç¤­¤ë¥Ç¥£¥ì¥¯¥È¥ê¤ËÃÖ¤¯É¬Íפ¬¤¢¤ê¤Þ¤¹¡£
 	µö²Ä°À­¤Ï 0700 ¤¬Å¬ÀڤǤ¹¡£
@@ -2491,14 +2479,13 @@ define(`confTLS_SRV_OPTIONS', `V')dnl</programlisting>
 
       <para>¤³¤ÎÎã¤Ç¤Ï¡¢
 	¥í¡¼¥«¥ë¤Ç¾ÚÌÀ½ñ¤ª¤è¤Ó¸°¥Õ¥¡¥¤¥ë¤Ï¡¢¥í¡¼¥«¥ë¤Î
-	<filename class="directory">/etc/certs/</filename>
-	¤ËÃÖ¤«¤ì¤Æ¤¤¤Þ¤¹¡£
+	<filename>/etc/certs/</filename> ¤ËÃÖ¤«¤ì¤Æ¤¤¤Þ¤¹¡£
 	¥Õ¥¡¥¤¥ë¤ÎÊÔ½¸¤òÊݸ¤·½ª¤ï¤Ã¤¿¤é¡¢
-	<filename class="directory">/etc/mail</filename> ¤Ë¤ª¤¤¤Æ
-	<command>make</command> <parameter>install</parameter>
+	<filename>/etc/mail</filename> ¤Ë¤ª¤¤¤Æ
+	<command>make install</command>
 	¤ÈÆþÎϤ¹¤ë¤³¤È¤Ç¡¢¥í¡¼¥«¥ë¤Î <filename>.cf</filename>
 	¥Õ¥¡¥¤¥ë¤òºÆ¹½ÃÛ¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
-	¤½¤Î¸å¡¢<command>make</command> <parameter>restart</parameter>
+	¤½¤Î¸å¡¢<command>make restart</command>
 	¤ÈÆþÎϤ·¤Æ¡¢<application>Sendmail</application>
 	¥Ç¡¼¥â¥ó¤òºÆµ¯Æ°¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
@@ -2511,12 +2498,12 @@ define(`confTLS_SRV_OPTIONS', `V')dnl</programlisting>
       <para>°Ê²¼¤Ï´Êñ¤Ê»î¸³¤ÎÎã¤Ç¡¢&man.telnet.1; ¤ò»È¤Ã¤Æ¡¢
 	¥á¡¼¥ë¥µ¡¼¥Ð¤ËÀܳ¤·¤Æ¤¤¤Þ¤¹¡£</para>
 
-      <screen>&prompt.root; <userinput>telnet <replaceable>example.com</replaceable> 25</userinput>
+      <screen>&prompt.root; <userinput>telnet example.com 25</userinput>
 Trying 192.0.34.166...
-Connected to  <systemitem class="ipaddress">example.com</systemitem>
+Connected to  <systemitem class="fqdomainname">example.com</systemitem>
 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>
+220 <systemitem class="fqdomainname">example.com</systemitem> ESMTP Sendmail 8.12.10/8.12.10; Tue, 31 Aug 2004 03:41:22 -0400 (EDT)
+<userinput>ehlo example.com</userinput>
 250-example.com Hello example.com [192.0.34.166], pleased to meet you
 250-ENHANCEDSTATUSCODES
 250-PIPELINING
@@ -2529,7 +2516,7 @@ Escape character is '^]'.
 250-DELIVERBY
 250 HELP
 <userinput>quit</userinput>
-221 2.0.0 <systemitem class="ipaddress">example.com</systemitem> closing connection
+221 2.0.0 <systemitem class="fqdomainname">example.com</systemitem> closing connection
 Connection closed by foreign host.</screen>
 
       <para>½ÐÎÏ¤Ë <quote>STARTTLS</quote> ¹Ô¤¬É½¼¨¤µ¤ì¤ì¤Ð¡¢
@@ -2723,7 +2710,7 @@ device    crypto</screen>
 	</info>
 
 	<para>ºÇ½é¤Ë Ports Collection ¤«¤é
-	  <filename role="package">security/ipsec-tools</filename>
+	  <package>security/ipsec-tools</package>
 	  ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Æ¤¯¤À¤µ¤¤¡£
 	  ¤³¤Î¥½¥Õ¥È¥¦¥§¥¢¤Ï¡¢
 	  ÀßÄê¤ò¥µ¥Ý¡¼¥È¤¹¤ë¿ô¿¤¯¤Î¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤òÄ󶡤·¤Þ¤¹¡£</para>
@@ -2741,9 +2728,9 @@ device    crypto</screen>
 
 	<screen>&prompt.root; <userinput>ifconfig gif0 create</userinput></screen>
 
-	<screen>&prompt.root; <userinput>ifconfig gif0 <replaceable>internal1 internal2</replaceable></userinput></screen>
+	<screen>&prompt.root; <userinput>ifconfig gif0 internal1 internal2</userinput></screen>
 
-	<screen>&prompt.root; <userinput>ifconfig gif0 tunnel <replaceable>external1 external2</replaceable></userinput></screen>
+	<screen>&prompt.root; <userinput>ifconfig gif0 tunnel external1 external2</userinput></screen>
 
 	<para>¤³¤ÎÎã¤Ç¤Ï¡¢²ñ¼Ò¤Î <acronym>LAN</acronym> ¤Î³°Éô
 	  <acronym>IP</acronym> ¥¢¥É¥ì¥¹¤ò
@@ -2806,13 +2793,13 @@ round-trip min/avg/max/stddev = 28.106/94.594/154.524/
 	  ¥Ñ¥±¥Ã¥È¤Î¥ë¡¼¥Æ¥£¥ó¥°¾ðÊó¤òξÊý¤Î¥²¡¼¥È¥¦¥§¥¤¤ËÀßÄꤹ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
 	  ¤³¤ì¤Ï°Ê²¼¤Î¥³¥Þ¥ó¥É¤ÇÀßÄê¤Ç¤­¤Þ¤¹¡£</para>
 
-	<screen>&prompt.root; <userinput>corp-net# route add <replaceable>10.0.0.0 10.0.0.5 255.255.255.0</replaceable></userinput></screen>
+	<screen>&prompt.root; <userinput>corp-net# route add 10.0.0.0 10.0.0.5 255.255.255.0</userinput></screen>
 
-	<screen>&prompt.root; <userinput>corp-net# route add net <replaceable>10.0.0.0: gateway 10.0.0.5</replaceable></userinput></screen>
+	<screen>&prompt.root; <userinput>corp-net# route add net 10.0.0.0: gateway 10.0.0.5</userinput></screen>
 
-	<screen>&prompt.root; <userinput>priv-net# route add <replaceable>10.246.38.0 10.246.38.1 255.255.255.0</replaceable></userinput></screen>
+	<screen>&prompt.root; <userinput>priv-net# route add 10.246.38.0 10.246.38.1 255.255.255.0</userinput></screen>
 
-	<screen>&prompt.root; <userinput>priv-net# route add host <replaceable>10.246.38.0: gateway 10.246.38.1</replaceable></userinput></screen>
+	<screen>&prompt.root; <userinput>priv-net# route add host 10.246.38.0: gateway 10.246.38.1</userinput></screen>
 
 	<para>¤³¤ì¤Ç¡¢¥Í¥Ã¥È¥ï¡¼¥¯Æâ¤Î¥³¥ó¥Ô¥å¡¼¥¿¤Ï¡¢
 	  ¥²¡¼¥È¥¦¥§¥¤¤ª¤è¤Ó¥²¡¼¥È¥¦¥§¥¤¤Î±ü¤Î¥³¥ó¥Ô¥å¡¼¥¿¤«¤éÅþã²Äǽ¤È¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£
@@ -2869,7 +2856,7 @@ timer	# timing options. change as needed
         phase2          15 sec;
 }
 
-listen	# address [port] that racoon will listening on
+listen	# address [port] that racoon will listen on
 {
         isakmp          172.16.5.4 [500];
         isakmp_natt     172.16.5.4 [4500];
@@ -2955,7 +2942,7 @@ n2006-01-30 01:36:04: INFO: ISAKMP-SA established 172.
 	  ¤¿¤À¤·¡¢°Ê²¼¤ÎÎã¤Î <literal>em0</literal> ¤ÎÉôʬ¤Ï¡¢
 	  ɬÍפ˱þ¤¸¤Æ»ÈÍѤ·¤Æ¤¤¤ë¥Í¥Ã¥È¥ï¡¼¥¯¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤ËÃÖ¤­´¹¤¨¤Æ¤¯¤À¤µ¤¤¡£</para>
 
-	<screen>&prompt.root; <userinput>tcpdump -i em0 host <replaceable>172.16.5.4 and dst 192.168.1.12</replaceable></userinput></screen>
+	<screen>&prompt.root; <userinput>tcpdump -i em0 host 172.16.5.4 and dst 192.168.1.12</userinput></screen>
 
 	<para>°Ê²¼¤Î¤è¤¦¤Ê¥Ç¡¼¥¿¤¬¥³¥ó¥½¡¼¥ë¤Ëɽ¼¨¤µ¤ì¤Þ¤¹¡£
 	  ¤â¤·¡¢É½¼¨¤µ¤ì¤Ê¤¤¾ì¹ç¤Ï¡¢ÀßÄê¤Ë²¿¤«ÌäÂ꤬¤¢¤ë¤Î¤Ç¡¢
@@ -3165,7 +3152,7 @@ COPYRIGHT            100% |***************************
 
       <para>¥·¥¹¥Æ¥àÁ´ÂΤÎÀßÄê¥Õ¥¡¥¤¥ë¤Ï¡¢<application>OpenSSH</application>
 	¥Ç¡¼¥â¥ó¡¢¥¯¥é¥¤¥¢¥ó¥È¤ÎξÊý¤È¤â
-	<filename class="directory">/etc/ssh</filename>	¤Ë¤¢¤ê¤Þ¤¹¡£</para>
+	<filename>/etc/ssh</filename>	¤Ë¤¢¤ê¤Þ¤¹¡£</para>
 
       <para><filename>ssh_config</filename> ¤Ï¥¯¥é¥¤¥¢¥ó¥È¤ÎÆ°ºîÀßÄê¡¢
 	<filename>sshd_config</filename>
@@ -3181,7 +3168,7 @@ COPYRIGHT            100% |***************************
 	¤ò»È¤Ã¤Æ¥æ¡¼¥¶¤Îǧ¾ÚÍѤΠ<acronym>DSA</acronym> ¤Þ¤¿¤Ï
 	<acronym>RSA</acronym> °Å¹æ¸°¤òºî¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£</para>
 
-      <screen>&prompt.user; <userinput>ssh-keygen -t <replaceable>dsa</replaceable></userinput>
+      <screen>&prompt.user; <userinput>ssh-keygen -t dsa</userinput>
 Generating public/private dsa key pair.
 Enter file in which to save the key (/home/user/.ssh/id_dsa):
 Created directory '/home/user/.ssh'.
@@ -3388,7 +3375,6 @@ Identity added: /home/user/.ssh/id_dsa (/home/user/.ss
 	<title>&man.ssh.1; ¤òÍѤ¤¤¿ SMTP ÍѤΰÂÁ´¤Ê¥È¥ó¥Í¥ë¤ÎºîÀ®</title>
 
 	<screen>&prompt.user; <userinput>ssh -2 -N -f -L 5025:localhost:25 user at mailserver.example.com</userinput>
-
 user at mailserver.example.com's password: <userinput>*****</userinput>
 &prompt.user; <userinput>telnet localhost 5025</userinput>
 Trying 127.0.0.1...
@@ -3444,7 +3430,7 @@ user at ssh-server.example.com's password: <userinput>***
 	    <acronym>SSH</acronym> Àܳ¤ò¹Ô¤¤¡¢
 	    ´õ˾¤¹¤ë¥µ¡¼¥Ó¥¹¤Ø¤Î¥È¥ó¥Í¥ë¤ËÍøÍѤ¹¤ë¤³¤È¤Ç¤¹¡£</para>
 
-	  <screen>&prompt.user; <userinput>ssh -2 -N -f -L <replaceable>8888:music.example.com:8000 user at unfirewalled-system.example.org</replaceable></userinput>
+	  <screen>&prompt.user; <userinput>ssh -2 -N -f -L 8888:music.example.com:8000 user at unfirewalled-system.example.org</userinput>
 user at unfirewalled-system.example.org's password: <userinput>*******</userinput></screen>
 
 	  <para>¤³¤ÎÎã¤Ç¤Ï¡¢¥¹¥È¥ê¡¼¥ß¥ó¥° Ogg Vorbis ¥¯¥é¥¤¥¢¥ó¥È¤ò
@@ -3604,11 +3590,11 @@ drwxrwx---+ 2 robert  robert  512 Dec 27 11:57 directo
 drwxr-xr-x  2 robert  robert  512 Nov 10 11:54 public_html</programlisting>
 
     <para>¤³¤ÎÎã¤Ç¤Ï¡¢¥Ç¥£¥ì¥¯¥È¥ê
-      <filename class="directory">directory1</filename>,
-      <filename class="directory">directory2</filename> ¤ª¤è¤Ó
-      <filename class="directory">directory3</filename>
+      <filename>directory1</filename>,
+      <filename>directory2</filename> ¤ª¤è¤Ó
+      <filename>directory3</filename>
       ¤Î¤¹¤Ù¤Æ¤Ç <acronym>ACL</acronym> ¤¬Æ¯¤¤¤Æ¤¤¤Þ¤¹¡£
-      °ìÊý <filename class="directory">public_html</filename>
+      °ìÊý <filename>public_html</filename>
       ¤ÏÂоݳ°¤Ç¤¹¡£</para>
 
     <sect2>
@@ -3620,7 +3606,7 @@ drwxr-xr-x  2 robert  robert  512 Nov 10 11:54 public_
 	<acronym>ACL</acronym> ÀßÄê¤òɽ¼¨¤¹¤ë¤Ë¤Ï¡¢
 	°Ê²¼¤Î¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
-      <screen>&prompt.user; <userinput>getfacl <filename>test</filename></userinput>
+      <screen>&prompt.user; <userinput>getfacl test</userinput>
 	#file:test
 	#owner:1001
 	#group:1001
@@ -3631,7 +3617,7 @@ drwxr-xr-x  2 robert  robert  512 Nov 10 11:54 public_
       <para>¤³¤Î¥Õ¥¡¥¤¥ë¤Î <acronym>ACL</acronym> ÀßÄê¤òÊѹ¹¤¹¤ë¤Ë¤Ï¡¢
 	&man.setfacl.1; ¤ò»ÈÍѤ·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
-      <screen>&prompt.user; <userinput>setfacl -k <filename>test</filename></userinput></screen>
+      <screen>&prompt.user; <userinput>setfacl -k test</userinput></screen>
 
       <para>¥Õ¥¡¥¤¥ë¤Þ¤¿¤Ï¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤«¤é¡¢
 	¸½ºßÀßÄꤵ¤ì¤Æ¤¤¤ë <acronym>ACL</acronym>
@@ -3641,7 +3627,7 @@ drwxr-xr-x  2 robert  robert  512 Nov 10 11:54 public_
 	¤³¤Î¥ª¥×¥·¥ç¥ó¤ò»È¤¦¤È¡¢<acronym>ACL</acronym>
 	¤¬Æ°ºî¤¹¤ë¤Î¤ËɬÍפʴðËܤΥե£¡¼¥ë¥É¤Ï»Ä¤ê¤Þ¤¹¡£</para>
 
-      <screen>&prompt.user; <userinput>setfacl -m u:trhodes:rwx,group:web:r--,o::--- <filename>test</filename></userinput></screen>
+      <screen>&prompt.user; <userinput>setfacl -m u:trhodes:rwx,group:web:r--,o::--- test</userinput></screen>
 
       <para>¤³¤ÎÎã¤Ç¤Ï¡¢<option>-m</option>
 	¤Ï¡¢¥Ç¥Õ¥©¥ë¥È <acronym>ACL</acronym>
@@ -3691,7 +3677,7 @@ drwxr-xr-x  2 robert  robert  512 Nov 10 11:54 public_
       ¤³¤ÎÌÜŪ¤Î¤¿¤á¤ËÍÑ°Õ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£</para>
 
     <para>
-      <filename role="package">ports-mgmt/portaudit</filename>
+      <package>ports-mgmt/portaudit</package>
       port ¤Ï¡¢&os; ¥»¥­¥å¥ê¥Æ¥£¥Á¡¼¥à¤ª¤è¤Ó ports
       ³«È¯¼Ô¤¬¥¢¥Ã¥×¥Ç¡¼¥È¤·¡¢´ÉÍý¤·¤Æ¤¤¤ë¡¢
       ´ûÃΤΥ»¥­¥å¥ê¥Æ¥£ÌäÂê¤ËÂФ¹¤ë¥Ç¡¼¥¿¥Ù¡¼¥¹¤òÆþ¼ê¤·¤Þ¤¹¡£</para>
@@ -3888,7 +3874,7 @@ VII. References <co xml:id="co-ref"/></programlisting>
 	    &man.ident.1; ¤ò¼Â¹Ô¤¹¤ë¤È¡¢
 	    ¤½¤Î½ÐÎϤ«¤é¥ê¥Ó¥¸¥ç¥ó¤ò´Êñ¤Ë³Îǧ¤Ç¤­¤Þ¤¹¡£
 	    ports ¤Î¾ì¹ç¤Ë¤Ï¡¢
-	    <filename class="directory">/var/db/pkg</filename>
+	    <filename>/var/db/pkg</filename>
 	    ¤Î port ¤Î̾Á°¤Î¸å¤Ë¡¢¥Ð¡¼¥¸¥ç¥óÈֹ椬¼¨¤µ¤ì¤Æ¤¤¤Þ¤¹¡£
 	    ¤â¤·¡¢¥·¥¹¥Æ¥à¤¬ &os; Subversion
 	    ¥ê¥Ý¥¸¥È¥ê¤ÈƱ´ü¤·¤Æ¤¤¤Ê¤«¤Ã¤¿¤ê¡¢
@@ -4007,12 +3993,11 @@ VII. References <co xml:id="co-ref"/></programlisting>
 	°Ê²¼¤Î¥³¥Þ¥ó¥É¤ò»È¤Ã¤Æ¡¢      
 	¥×¥í¥»¥¹¥¢¥«¥¦¥ó¥Æ¥£¥ó¥°¤òÍ­¸ú¤Ë¤·¤Æ¤ª¤¯É¬Íפ¬¤¢¤ê¤Þ¤¹¡£</para>
 
-      <screen>&prompt.root; <userinput>touch <filename>/var/account/acct</filename></userinput>
+      <screen>&prompt.root; <userinput>touch /var/account/acct</userinput>
+&prompt.root; <userinput>chmod 600 /var/account/acct</userinput>
+&prompt.root; <userinput>accton /var/account/acct</userinput>
+&prompt.root; <userinput>echo 'accounting_enable="YES"' >> /etc/rc.conf</userinput></screen>
 
-&prompt.root; <userinput>accton <filename>/var/account/acct</filename></userinput>
-
-&prompt.root; <userinput>echo 'accounting_enable="YES"' >> <filename>/etc/rc.conf</filename></userinput></screen>
-
       <para>°ìÅÙÍ­¸ú¤ËÀßÄꤹ¤ë¤È¡¢¥¢¥«¥¦¥ó¥Æ¥£¥ó¥°¤Ï¡¢
 	<acronym>CPU</acronym> ¤ÎÅý·×¡¢
 	¼Â¹Ô¤µ¤ì¤¿¥³¥Þ¥ó¥É¤Î¾ðÊó¤ÎÄÉÀפò³«»Ï¤·¤Þ¤¹¡£
@@ -4033,8 +4018,7 @@ VII. References <co xml:id="co-ref"/></programlisting>
 	¤¬¼Â¹Ô¤·¤¿ &man.ls.1;
 	¤Î»ÈÍѤˤĤ¤¤Æ¡¢µ­Ï¿¤µ¤ì¤Æ¤¤¤ë¤¹¤Ù¤Æ¼¨¤·¤Þ¤¹¡£</para>
 
-      <screen>&prompt.root; <userinput>lastcomm ls
-	<systemitem class="username">trhodes</systemitem> ttyp1</userinput></screen>
+      <screen>&prompt.root; <userinput>lastcomm ls trhodes ttyp1</userinput></screen>
 
       <para>¾¤Ë¤âÍ­ÍѤʥª¥×¥·¥ç¥ó¤¬Â¿¤¯¤¢¤ê¡¢
 	&man.lastcomm.1;, &man.acct.5; ¤ª¤è¤Ó &man.sa.8;
@@ -4073,7 +4057,7 @@ VII. References <co xml:id="co-ref"/></programlisting>
       ¥Ñ¥¹¥ï¡¼¥É¥Ç¡¼¥¿¥Ù¡¼¥¹¤ËÂФ·¤Æ¤âÊѹ¹¤¬É¬ÍפȤʤê¤Þ¤¹¡£
       ÀøºßŪ¤Ë¡¢¤è¤ê¿¤¯¤ÎÀ©¸Â¤ò²Ã¤¨¤é¤ì¤¿¥æ¡¼¥¶ÂФ·¤Æ¤Ï¥é¥Ù¥ë¤ÎÄɲä䡢
       <command>cap_mkdb</command>
-      ¤ò»È¤Ã¤¿¥ê¥½¡¼¥¹¥Ç¡¼¥¿¥Ù¡¼¥¹¤Î¹½ÃÛ¡¢
+      ¤ò»È¤Ã¤¿¥ê¥½¡¼¥¹¥Ç¡¼¥¿¥Ù¡¼¥¹¤ÎºÆ¹½ÃÛ¡¢
       <filename>/etc/master.passwd</filename>
       ¤Ø¤ÎÊѹ¹¤¬É¬ÍפȤʤê¤Þ¤¹¡£
       ¤µ¤é¤Ë¡¢¥Ñ¥¹¥ï¡¼¥É¥Ç¡¼¥¿¥Ù¡¼¥¹¤Ï¡¢


More information about the svn-doc-all mailing list