diff --git a/ja_JP.eucJP/books/handbook/printing/chapter.sgml b/ja_JP.eucJP/books/handbook/printing/chapter.sgml
index 86e4cd63e6..b26472222b 100644
--- a/ja_JP.eucJP/books/handbook/printing/chapter.sgml
+++ b/ja_JP.eucJP/books/handbook/printing/chapter.sgml
@@ -2,7 +2,7 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: 1.116
+     Original revision: 1.117
      $FreeBSD$
 -->
 
@@ -33,14 +33,14 @@
     <indexterm><primary>LPD ���ס���󥰥����ƥ�</primary></indexterm>
     <indexterm><primary>����</primary></indexterm>
 
-    <para>FreeBSD
+    <para>&os;
       �ϸŤ�����ѥ��ȥץ�󥿤���ǿ��Υ졼�����ץ�󥿤ޤ��������ץ�󥿤����ѤǤ���
       �¹Ԥ��Ƥ��륢�ץꥱ������󤫤���ʼ��ʰ������Ϥ��Ԥ��ޤ���</para>
 
-    <para>FreeBSD �ϥͥåȥ����Υץ�󥿥����ФȤ���ư���褦�����ꤹ�뤳�Ȥ�Ǥ��ޤ���
-      ���ε�ǽ�ϡ�¾�� FreeBSD ����ԥ塼���䡢&windows; ��
+    <para>&os; �ϥͥåȥ����Υץ�󥿥����ФȤ���ư���褦�����ꤹ�뤳�Ȥ�Ǥ��ޤ���
+      ���ε�ǽ�ϡ�¾�� &os; ����ԥ塼���䡢&windows; ��
       &macos; �ۥ��Ȥ����������֤������뤳�Ȥ��Ǥ��ޤ���
-      FreeBSD �ϰ�������֤� 1 �Ĥ��Ľ������뤳�Ȥ��ݾڤ��ޤ���
+      &os; �ϰ�������֤� 1 �Ĥ��Ľ������뤳�Ȥ��ݾڤ��ޤ���
       �ޤ����ɤΥ桼����ޥ��󤬺Ǥ�¿���������Ƥ��뤫�����פ��ꡢ
       �ɤΰ���ʪ��ï��ʪ��ɽ������
       <quote>�Хʡ�</quote> �ڡ����κ����ʤɤ�Ԥ����Ȥ��Ǥ��ޤ���</para>
@@ -49,7 +49,7 @@
 
     <itemizedlist>
       <listitem>
-	<para>FreeBSD �ץ��ȥ��ס����������ˡ��</para>
+	<para>&os; �ץ��ȥ��ס����������ˡ��</para>
       </listitem>
 
       <listitem>
@@ -96,11 +96,11 @@
   <sect1 id="printing-intro-spooler">
     <title>�Ϥ����</title>
 
-    <para>FreeBSD �ǥץ�󥿤�Ȥ�����ˡ�������
+    <para>&os; �ǥץ�󥿤�Ȥ�����ˡ�������
       <application>LPD</application> ���ס���󥰥����ƥࡢ
       �ޤ���ñ�� <application>LPD</application> �Ȥ��Ƥ��Τ���
       Berkeley �饤��ץ�󥿥��ס���󥰥����ƥ��ư���褦������Ǥ��ޤ���
-      ����� FreeBSD �Ǥ�ɸ��Ū�ʥץ�����楷���ƥ�Ǥ���
+      ����� &os; �Ǥ�ɸ��Ū�ʥץ�����楷���ƥ�Ǥ���
       ���ξϤǤϡ�<application>LPD</application> ��Ҳ𤷡�
       ����������ˡ�ˤĤ����������ޤ���</para>
 
@@ -271,7 +271,7 @@
         <para>������Ǥϡ��ץ�󥿤� PC
           ����³���뤿����͡�����ˡ�ˤĤ����������Ƥ��ޤ���
           �����Ǥϡ��ݡ��Ȥ䥱���֥�μ��ࡢ
-          FreeBSD ���ץ�󥿤Ȥ��̿���ɬ�פʥ����ͥ륳��ե����졼�����ˤĤ��Ƥ���ڤ��Ƥ��ޤ���</para>
+          &os; ���ץ�󥿤Ȥ��̿���ɬ�פʥ����ͥ륳��ե����졼�����ˤĤ��Ƥ���ڤ��Ƥ��ޤ���</para>
 
         <para>�⤷�ץ�󥿤�������³����Ƥ��ơ�
           ¾�Υ��ڥ졼�ƥ��󥰥����ƥ��ǥץ�󥿤���ΰ������������Ƥ�����ϡ�
@@ -345,7 +345,7 @@
 	    (����ԥ塼������ץ�󥿤ؤ�)
 	    ñ�����̿��Τߤ�Ԥʤ��Τ��Ф��ơ�
 	    ���ꥢ�뤪��� USB ���󥿥ե��������������̿���Ԥʤ��ޤ���
-	    FreeBSD �Ǥ� IEEE1284 ���Υ����֥��Ȥ��С�
+	    &os; �Ǥ� IEEE1284 ���Υ����֥��Ȥ��С�
 	    �Ƕ�Υѥ���ݡ��� (EPP �� ECP)
 	    �ȥץ�󥿤�¿�����������̿���Ԥʤ����Ȥ��Ǥ��ޤ���</para>
 
@@ -354,7 +354,7 @@
 	  <para>�ѥ���ݡ��ȷ�ͳ�Υץ�󥿤Ȥ��������̿��ˤϡ�
 	    �̾� 2 �Ĥ���ˡ�Τɤ��餫���Ȥ��ޤ�������ܤ���ˡ�ϡ�
 	    �ץ�󥿤����Ѥ��Ƥ���ץ��ץ饤������ʸ�����ä�
-	    FreeBSD �Ѥ˺������줿�ץ�󥿥ɥ饤�Ф�Ȥ���ΤǤ���
+	    &os; �Ѥ˺������줿�ץ�󥿥ɥ饤�Ф�Ȥ���ΤǤ���
 	    ����ϥ��󥯥����åȥץ�󥿤ǤϤ褯�Ȥ�����ˡ�ǡ�
 	    ���󥯤λ��̤䤽��¾�ξ��֤ξ�����Τ餻��Τ˻Ȥ��ޤ���
 	    ����ܤ���ˡ�ϡ��ץ�󥿤� &postscript;
@@ -385,12 +385,12 @@
 
           <para>���κݡ�
             �ɤΥѥ���ݡ��Ȥ���Ѥ�������Ф��Ƥ����Ƥ���������
-	    FreeBSD �ǤϺǽ�Υݡ��Ȥ� <filename>ppc0</filename>��
-	    �����ܤ� <filename>ppc1</filename> �Ǥ��ꡢ
+	    &os; �ǤϺǽ�Υݡ��Ȥ� <filename class="devicefile">ppc0</filename>��
+	    �����ܤ� <filename class="devicefile">ppc1</filename> �Ǥ��ꡢ
             �����ܰʹߤ�Ʊ�ͤ�³���ޤ���
 	    �ץ�󥿤ΥǥХ���̾�ˤ�Ʊ���������Ȥ��Ƥ��ꡢ
 	    �ǽ�Υѥ���ݡ��Ȥ���³���줿�ץ�󥿤�
-	    <filename>/dev/lpt0</filename> �ʤɤȤʤ�ޤ���</para>
+	    <filename class="devicefile">/dev/lpt0</filename> �ʤɤȤʤ�ޤ���</para>
         </sect4>
 
         <sect4 id="printing-serial">
@@ -461,7 +461,7 @@
     <sect3 id="printing-software">
       <title>���եȥ�����������</title>
 
-      <para>����Ǥ� FreeBSD �� <application>LPD</application>
+      <para>����Ǥ� &os; �� <application>LPD</application>
 	���ס���󥰥����ƥ�ǰ����򤪤��ʤ������
 	ɬ�פȤʤ륽�եȥ�����������ˤĤ����������Ƥ��ޤ���</para>
 
@@ -515,7 +515,7 @@
 	  ���ݡ��Ȥ���Ƥ��뤫�ɤ�����Ĵ�٤뤿��ˤϡ�
 	  ���Τ褦�����Ϥ��ޤ���</para>
 
-	<screen>&prompt.root; <userinput>grep sio<replaceable>N</replaceable> /var/run/dmesg.boot</userinput></screen>
+	  <screen>&prompt.root; <userinput><command>grep sio<replaceable>N</replaceable> <filename>/var/run/dmesg.boot</filename></command></userinput></screen>
 
 	<para>�����ǡ�<replaceable>N</replaceable>
 	  �ϥ��ꥢ��ݡ��Ȥ��ֹ�򼨤��������ֹ�� 0 ����Ϥޤ�ޤ���
@@ -529,9 +529,9 @@
 	  ���ݡ��Ȥ���Ƥ��뤫�ɤ�����Ĵ�٤뤿��ˤϡ�
 	  ���Τ褦�����Ϥ��ޤ���</para>
 
-	<screen>&prompt.root; <userinput>grep ppc<replaceable>N</replaceable> /var/run/dmesg.boot</userinput></screen>
+	  <screen>&prompt.root; <userinput><command>grep ppc<replaceable>N</replaceable> /var/run/dmesg.boot</command></userinput></screen>
 
-	<para>�����ǡ�<emphasis remap=it>N</emphasis>
+	<para>�����ǡ�<replaceable>N</replaceable>
 	  �ϥѥ���ݡ��Ȥ��ֹ�򼨤��������ֹ�� 0 ����Ϥޤ�ޤ���
 	  ���Τ褦�ʽ��Ϥ����ä���硢
 	  �����ͥ�Ϥ��Υݡ��Ȥ򥵥ݡ��Ȥ��Ƥ��ޤ���</para>
@@ -547,7 +547,7 @@ ppc0: FIFO with 16/16/8 bytes threshold</screen>
 
 	<para>���ꥢ��ݡ��Ȥ򥵥ݡ��Ȥ�����ˤϡ���<link
 	    linkend="kernelconfig">
-	    FreeBSD�����ͥ�Υ���ե����졼�����</link>�פ��������
+	    &os; �����ͥ�Υ���ե����졼�����</link>�פ��������
 	  ���������ѥ���ݡ��Ȥ򥵥ݡ��Ȥ�������⡢������ȡ�
 	  <emphasis>���碌��</emphasis>��
 	  �������³����⤴������������</para>
@@ -557,10 +557,10 @@ ppc0: FIFO with 16/16/8 bytes threshold</screen>
 	<sect3 id="printing-parallel-port-mode">
 	  <title>�ѥ���ݡ��Ȥ��̿��⡼�ɤ����ꤹ��</title>
 
-	  <para>�ѥ��륤�󥿥ե���������Ѥ��Ƥ����硢FreeBSD �Ǥϡ�
+	  <para>�ѥ��륤�󥿥ե���������Ѥ��Ƥ����硢&os; �Ǥϡ�
 	    �����߶�ư���ˤ��뤫��
 	    �ץ�󥿤Ȥ��̿��ξ����򥫡��ͥ�˴ƻ뤵���뤫�Τ����줫������Ǥ��ޤ���
-	    FreeBSD&nbsp; �����ѥץ�󥿥ǥХ����ɥ饤��
+	    &os; �����ѥץ�󥿥ǥХ����ɥ饤��
 	    (&man.lpt.4;) �� &man.ppbus.4; �����ƥ�����Ѥ��Ƥ��ޤ���
 	    ����� &man.ppc.4;
 	    �ɥ饤�Ф�Ȥäƥѥ���ݡ��ȤΥ��åץ��åȤ����椷�ޤ���</para>
@@ -631,7 +631,7 @@ ppc0: FIFO with 16/16/8 bytes threshold</screen>
 
 		  <programlisting>hint.ppc.0.irq="<replaceable>N</replaceable>"</programlisting>
 
-		  <para>���ˤ�äƤϡ���������Ǥ� FreeBSD&nbsp;
+		  <para>���ˤ�äƤϡ���������Ǥ� &os;
 		    �ǥݡ��Ȥ�ݡ���󥰥⡼�ɤˤ���ˤϽ�ʬ�ǤϤʤ����Ȥ�����ޤ���
 		    ¿���ξ�礳��� &man.acpi.4; �ɥ饤�Ф�ʻ����ư��ޤ���
 		    ����ϥǥХ����Υץ����֤ȥ����å���Ԥ��Τǡ�
@@ -647,7 +647,7 @@ ppc0: FIFO with 16/16/8 bytes threshold</screen>
 		�����ͥ�ι��ۡ����󥹥ȡ���򤪤��ʤ��ޤ��������ơ�
 		��֡��Ȥ��Ƥ����������ܺ٤ϡ���<link
 		  linkend="kernelconfig">
-		  FreeBSD�����ͥ�Υ���ե����졼�����</link>�פ򻲾�
+		  &os;�����ͥ�Υ���ե����졼�����</link>�פ򻲾�
 		���Ƥ���������</para>
 	    </step>
 	  </procedure>
@@ -661,7 +661,7 @@ ppc0: FIFO with 16/16/8 bytes threshold</screen>
 		�򥤥٥�ȶ�ư���������ꤹ����ϡ�
 		���Τ褦�����Ϥ��ޤ���</para>
 
-	      <screen>&prompt.root; <userinput>lptcontrol -i -d /dev/lpt<replaceable>N</replaceable></userinput></screen>
+	      <screen>&prompt.root; <userinput><command>lptcontrol <option>-i</option> <option>-d</option> <filename class="devicefile">/dev/lpt<replaceable>N</replaceable></filename></command></userinput></screen>
 	    </step>
 
 	    <step>
@@ -669,7 +669,7 @@ ppc0: FIFO with 16/16/8 bytes threshold</screen>
 		��ƻ����������ꤹ����ϡ����Τ褦�����Ϥ��ޤ���
 	      </para>
 
-	      <screen>&prompt.root; <userinput>lptcontrol -p -d /dev/lpt<replaceable>N</replaceable></userinput></screen>
+	      <screen>&prompt.root; <userinput><command>lptcontrol <option>-p</option> <option>-d</option> <filename class="devicefile">/dev/lpt<replaceable>N</replaceable></filename></command></userinput></screen>
 	    </step>
 	  </procedure>
 
@@ -730,7 +730,7 @@ showpage</programlisting>
               <primary>�ץ��</primary>
               <secondary>�ѥ���</secondary>
             </indexterm>
-	    <para>������Ǥϡ�FreeBSD ���ѥ���ݡ��Ȥ���³���줿�ץ�
+	    <para>������Ǥϡ�&os; ���ѥ���ݡ��Ȥ���³���줿�ץ�
 	      �󥿤��̿��Ǥ��Ƥ��뤫�ɤ�����Ĵ�٤���ˡ�ˤĤ���������
 	      �Ƥ��ޤ���</para>
 
@@ -752,7 +752,7 @@ showpage</programlisting>
 		      &man.lptest.1; ���ޥ�ɤ�Ȥ��ޤ���
 		      ���Τ褦�����Ϥ��Ƥ���������</para>
 
-		    <screen>&prompt.root; <userinput>lptest &gt; /dev/lpt<replaceable>N</replaceable></userinput></screen>
+		    <screen>&prompt.root; <userinput><command>lptest &gt; <filename class="devicefile">/dev/lpt<replaceable>N</replaceable></filename></command></userinput></screen>
 
 		    <para>�����ǡ�<replaceable>N</replaceable>
 		      �ϥѥ���ݡ��Ȥ��ֹ�ǡ��ֹ��
@@ -765,7 +765,7 @@ showpage</programlisting>
 		      �������������Ƥ������������Τ褦�����Ϥ��ޤ���
 		    </para>
 
-		    <screen>&prompt.root; <userinput>cat &gt; /dev/lpt<replaceable>N</replaceable></userinput></screen>
+		    <screen>&prompt.root; <userinput><command>cat &gt; <filename class="devicefile">/dev/lpt<replaceable>N</replaceable></filename></command></userinput></screen>
 
 		    <para>�����ơ���԰�ԡ�
 		      �ץ�������<emphasis>���Ť�</emphasis>���Ϥ���
@@ -777,7 +777,7 @@ showpage</programlisting>
 		    <para>�⤷���ϡ��ץ����������Ϥ����ե����뤬����
 		      ���ϡ����Τ褦�����Ϥ��Ƥ���������</para>
 
-		    <screen>&prompt.root; <userinput>cat <replaceable>file</replaceable> &gt; /dev/lpt<replaceable>N</replaceable></userinput></screen>
+		    <screen>&prompt.root; <userinput><command>cat <replaceable>file</replaceable> &gt; <filename class="devicefile">/dev/lpt<replaceable>N</replaceable></filename></command></userinput></screen>
 
 		    <para>�����ǡ�<replaceable>file</replaceable>
 		      �ϥץ�����ब��Ǽ����Ƥ��ơ�
@@ -799,7 +799,7 @@ showpage</programlisting>
               <primary>�ץ��</primary>
               <secondary>���ꥢ��</secondary>
             </indexterm>
-	    <para>������Ǥϡ�FreeBSD�����ꥢ��ݡ��Ȥ���³���줿�ץ�
+	    <para>������Ǥϡ�&os; �����ꥢ��ݡ��Ȥ���³���줿�ץ�
 	      �󥿤��̿��Ǥ��Ƥ��뤫�ɤ�����Ĵ�٤���ˡ�ˤĤ��ƽҤ٤��
 	      �Ƥ��ޤ���</para>
 
@@ -817,7 +817,7 @@ showpage</programlisting>
 		  �ե�������Խ����ޤ������Υ���ȥ��ä��Ƥ���������
 		</para>
 
-		<programlisting>printer:dv=/dev/<replaceable>port</replaceable>:br#<replaceable>bps-rate</replaceable>:pa=<replaceable>parity</replaceable></programlisting>
+		<programlisting>printer:dv=<filename class="devicefile">/dev/<replaceable>port</replaceable></filename>:br#<replaceable>bps-rate</replaceable>:pa=<replaceable>parity</replaceable></programlisting>
 
                 <indexterm><primary>bit/��</primary></indexterm>
                 <indexterm><primary>���ꥢ��ݡ���</primary></indexterm>
@@ -839,21 +839,20 @@ showpage</programlisting>
 		  19200&nbsp;bps ���� 3 ���ܤΥ��ꥢ��ݡ��Ȥ���³������
 		  ��Ǥ���</para>
 
-		<programlisting>printer:dv=/dev/ttyd2:br#19200:pa=none</programlisting>
+		<programlisting>printer:dv=<filename class="devicefile">/dev/ttyd2</filename>:br#19200:pa=none</programlisting>
 	      </step>
 
 	      <step>
 		<para>&man.tip.1; ���ޥ�ɤǥץ�󥿤���³���ޤ���
 		  ���Τ褦�����Ϥ��Ƥ���������</para>
 
-		<screen>&prompt.root; <userinput>tip printer</userinput></screen>
+		<screen>&prompt.root; <userinput><command>tip</command> printer</userinput></screen>
 
 		<para>���줬���ޤ������ʤ��ä����ϡ�
 		  <filename>/etc/remote</filename>���Խ����ơ�
-		  <filename>
-		    /dev/ttyd<replaceable>N</replaceable></filename>
-		  ������� <filename>
-		    /dev/cuaa<replaceable>N</replaceable></filename>
+		  <filename class="devicefile">/dev/ttyd<replaceable>N</replaceable></filename>
+		  �������
+		  <filename class="devicefile">/dev/cuaa<replaceable>N</replaceable></filename>
 		  ���ƤߤƤ���������</para>
 	      </step>
 
@@ -963,7 +962,7 @@ showpage</programlisting>
 	  </step>
 
 	  <step>
-	    <para>�ץ�󥿤���Ѥ��뤿��� <filename>/dev</filename>
+	    <para>�ץ�󥿤���Ѥ��뤿��� <filename class="directory">/dev</filename>
 	      ����ȥ�����ꤷ��<filename>/etc/printcap</filename> ��
 	      <literal>lp</literal> ���ܤǤ��Υ���ȥ����ꤷ�ޤ���
 	      ����ˤĤ��Ƥϡ���<link linkend="printing-device">
@@ -1138,7 +1137,7 @@ bamboo|ps|PS|S|panasonic|Panasonic KX-P4455 PostScript v51.4:\
 	    ¾�Τ�������Υ��ס���⤳�Υǥ��쥯�ȥ�˥ե�������֤��ޤ���</para>
 
 	  <para>�͡��ʻ���ˤ�ꥹ�ס���󥰥ǥ��쥯�ȥ�ϡ��̾����
-	    �Ȥ��� <filename>/var/spool</filename> �β����֤��ޤ���
+	    �Ȥ��� <filename class="directory">/var/spool</filename> �β����֤��ޤ���
 	    �ޤ������ס���󥰥ǥ��쥯�ȥ�����Ƥ�
 	    �Хå����åפ򤹤�ɬ�פϤ���ޤ���
 	    &man.mkdir.1; �ˤ�äƥǥ��쥯�ȥ��
@@ -1148,7 +1147,7 @@ bamboo|ps|PS|S|panasonic|Panasonic KX-P4455 PostScript v51.4:\
 	  <para>���ס���󥰥ǥ��쥯�ȥ��̾���ϡ�����ⴷ��Ǥ�����
 	    ���Τ褦�˥ץ�󥿤�̾����Ʊ���ˤ��ޤ���</para>
 
-	  <screen>&prompt.root; <userinput>mkdir /var/spool/<replaceable>printer-name</replaceable></userinput></screen>
+	  <screen>&prompt.root; <userinput><command>mkdir <filename>/var/spool/<replaceable>printer-name</replaceable></filename></command></userinput></screen>
 
 	  <para>�������ʤ��顢�ͥåȥ����˻��Ѳ�ǽ�ʥץ�󥿤�����
 	    ���󤢤�ʤ�С�<application>LPD</application>
@@ -1157,9 +1156,9 @@ bamboo|ps|PS|S|panasonic|Panasonic KX-P4455 PostScript v51.4:\
 	    <literal>bamboo</literal> �ˤĤ��ơ�������������Ѥ���ȡ�
 	    ���Τ褦�ˤʤ�ޤ���</para>
 
-	  <screen>&prompt.root; <userinput>mkdir /var/spool/lpd</userinput>
-&prompt.root; <userinput>mkdir /var/spool/lpd/rattan</userinput>
-&prompt.root; <userinput>mkdir /var/spool/lpd/bamboo</userinput></screen>
+	  <screen>&prompt.root; <userinput><command>mkdir <filename class="directory">/var/spool/lpd</filename></command></userinput>
+&prompt.root; <userinput><command>mkdir <filename class="directory">/var/spool/lpd/rattan</filename></command></userinput>
+&prompt.root; <userinput><command>mkdir <filename class="directory">/var/spool/lpd/bamboo</filename></command></userinput></screen>
 
 	  <note>
 	    <para>�ƥ桼�����������른��֤Υץ饤�Х����ꤿ
@@ -1173,10 +1172,10 @@ bamboo|ps|PS|S|panasonic|Panasonic KX-P4455 PostScript v51.4:\
 	      ��������Υץ�󥿤��Ф��ơ����Τ褦�ˤ��뤳�Ȥˤ��ޤ���
 	      ����</para>
 
-	    <screen>&prompt.root; <userinput>chown daemon:daemon /var/spool/lpd/rattan</userinput>
-&prompt.root; <userinput>chown daemon:daemon /var/spool/lpd/bamboo</userinput>
-&prompt.root; <userinput>chmod 770 /var/spool/lpd/rattan</userinput>
-&prompt.root; <userinput>chmod 770 /var/spool/lpd/bamboo</userinput></screen>
+	    <screen>&prompt.root; <userinput><command>chown daemon:daemon <filename class="directory">/var/spool/lpd/rattan</filename></command></userinput>
+&prompt.root; <userinput><command>chown daemon:daemon <filename class="directory">/var/spool/lpd/bamboo</filename></command></userinput>
+&prompt.root; <userinput><command>chmod 770 <filename class="directory">/var/spool/lpd/rattan</filename></command></userinput>
+&prompt.root; <userinput><command>chmod 770 <filename class="directory">/var/spool/lpd/bamboo</filename></command></userinput></screen>
 	  </note>
 
 	  <para>�Ǹ�ˡ�<filename>/etc/printcap</filename> �ե�����ǡ�
@@ -1189,10 +1188,10 @@ bamboo|ps|PS|S|panasonic|Panasonic KX-P4455 PostScript v51.4:\
 #  /etc/printcap for host rose - added spooling directories
 #
 rattan|line|diablo|lp|Diablo 630 Line Printer:\
-        :sh:sd=/var/spool/lpd/rattan:
+        :sh:sd=<filename class="directory">/var/spool/lpd/rattan</filename>:
 
 bamboo|ps|PS|S|panasonic|Panasonic KX-P4455 PostScript v51.4:\
-        :sh:sd=/var/spool/lpd/bamboo:</programlisting>
+        :sh:sd=<filename class="directory">/var/spool/lpd/bamboo</filename>:</programlisting>
 
 	  <para>�ץ��̾���ǽ�Υ���फ��ϤޤäƤ��ꡢ
 	    ���Υץ�󥿤˴ؤ��Ƶ��Ҥ����¾�ι��ܤϻ���������Ƥ��뤳�ȡ�
@@ -1200,7 +1199,7 @@ bamboo|ps|PS|S|panasonic|Panasonic KX-P4455 PostScript v51.4:\
 
 	  <para><literal>sd</literal>
 	    �ˤ�ꥹ�ס���󥰥ǥ��쥯�ȥ꤬���ꤵ��Ƥ��ʤ���硢
-	    ���ס���󥰥����ƥ�� <filename>/var/spool/lpd</filename>
+	    ���ס���󥰥����ƥ�� <filename class="devicefile">/var/spool/lpd</filename>
 	    ��ǥե�����ͤȤ��ƻ��Ѥ��ޤ���</para>
 	</sect4>
 
@@ -1209,7 +1208,7 @@ bamboo|ps|PS|S|panasonic|Panasonic KX-P4455 PostScript v51.4:\
 
 	  <para><link linkend="printing-hardware">�ץ�󥿵��������</link>
 	    ����Ǥϡ�&os; �ǥץ�󥿤Ȥ��̿��˻��Ѥ����ݡ��Ȥ����
-	    <filename role="directory">/dev</filename>
+	    <filename class="directory">/dev</filename>
 	    �ǥ��쥯�ȥ���Υ���ȥ�����ꤷ�ޤ���
 	    �����ơ�<application>LPD</application> �ˤ��ξ���������ޤ���
 	    �������른��֤�������ȡ����ס���󥰥����ƥ�ϡ�
@@ -1218,7 +1217,7 @@ bamboo|ps|PS|S|panasonic|Panasonic KX-P4455 PostScript v51.4:\
 
 	  <para><filename>/etc/printcap</filename> �ե������
 	    <literal>lp</literal> ���ܤ�Ȥä�
-	    <filename>/dev</filename> ����ȥ�������ޤ���</para>
+	    <filename class="directory">/dev</filename> ����ȥ�������ޤ���</para>
 
 	  <para>�����Ǥ���Ǥϡ�<literal>rattan</literal>
 	    �� 1 ���ܤΥѥ���ݡ��Ȥˡ�<literal>bamboo</literal>
@@ -1230,19 +1229,19 @@ bamboo|ps|PS|S|panasonic|Panasonic KX-P4455 PostScript v51.4:\
 #  /etc/printcap for host rose - identified what devices to use
 #
 rattan|line|diablo|lp|Diablo 630 Line Printer:\
-        :sh:sd=/var/spool/lpd/rattan:\
-        :lp=/dev/lpt0:
+        :sh:sd=<filename class="directory">/var/spool/lpd/rattan</filename>:\
+        :lp=<filename class="devicefile">/dev/lpt0</filename>:
 
 bamboo|ps|PS|S|panasonic|Panasonic KX-P4455 PostScript v51.4:\
-        :sh:sd=/var/spool/lpd/bamboo:\
-        :lp=/dev/ttyd5:</programlisting>
+        :sh:sd=<filename class="directory">/var/spool/lpd/bamboo</filename>:\
+        :lp=<filename class="devicefile">/dev/ttyd5</filename>:</programlisting>
 
 	  <para><filename>/etc/printcap</filename> �ǥץ�󥿤�
 	    <literal>lp</literal> ���ܤ����ꤵ��Ƥ��ʤ����ϡ�
 	    <application>LPD</application>
-	    �ϥǥե���ȤȤ��� <filename>/dev/lp</filename>
-	    ����Ѥ��ޤ���<filename>/dev/lp</filename> �ϡ����ߤ�
-	    FreeBSD �ˤ�¸�ߤ��Ƥ��ޤ���</para>
+	    �ϥǥե���ȤȤ��� <filename class="devicefile">/dev/lp</filename>
+	    ����Ѥ��ޤ���<filename class="devicefile">/dev/lp</filename> �ϡ����ߤ�
+	    &os; �ˤ�¸�ߤ��Ƥ��ޤ���</para>
 
 	  <para>���֤����ץ�󥿤��ѥ���ݡ��Ȥ�
 	    ��³����Ƥ�����ϡ�
@@ -1328,8 +1327,8 @@ bamboo|ps|PS|S|panasonic|Panasonic KX-P4455 PostScript v51.4:\
 	    �ǥϡ��ɥ������ե�����������ꤷ�ޤ���</para>
 
 	  <programlisting>bamboo|ps|PS|S|panasonic|Panasonic KX-P4455 PostScript v51.4:\
-        :sh:sd=/var/spool/lpd/bamboo:\
-        :lp=/dev/ttyd5:ms#-parenb cs8 clocal crtscts:</programlisting>
+        :sh:sd=<filename class="directory">/var/spool/lpd/bamboo</filename>:\
+        :lp=<filename class="devicefile">/dev/ttyd5</filename>:ms#-parenb cs8 clocal crtscts:</programlisting>
 	</sect4>
 
 	<sect4 id="printing-textfilter">
@@ -1364,7 +1363,7 @@ bamboo|ps|PS|S|panasonic|Panasonic KX-P4455 PostScript v51.4:\
 	  <para>�����Ǥδ�ñ�ʥץ������Ǥϡ�
 	    �ץ�󥿤˥���֤����뤿�ᡢ<command>/bin/cat</command>
 	    ��¹Ԥ�������δ�ñ�ʥ����륹����ץȤǴ֤˹礤�ޤ���
-	    FreeBSD ��ɸ�����°���Ƥ��� <command>lpf</command>
+	    &os; ��ɸ�����°���Ƥ��� <command>lpf</command>
 	    �Ȥ����ե��륿�Ǥϡ��Хå����ڡ���ʸ����Ȥä�
 	    ����������ư��򤪤��ʤ�ʸ�����ȥ꡼��򤦤ޤ��������Ȥ��Ǥ��ʤ�
 	    �ץ�󥿤Τ�������ؽ����򤪤��ʤäƤ���ޤ���
@@ -1392,7 +1391,7 @@ exit 2</programlisting>
 
 	  <para>�����ơ����Υե������¹Բ�ǽ�ˤ��ޤ���</para>
 
-	  <screen>&prompt.root; <userinput>chmod 555 /usr/local/libexec/if-simple</userinput></screen>
+	  <screen>&prompt.root; <userinput><command>chmod 555 <filename>/usr/local/libexec/if-simple</filename></command></userinput></screen>
 
 	  <para>LPD
 	    �ˤ��Υƥ����ȥե��륿��Ȥ����Ȥ����ꤹ�뤿��ˤϡ�
@@ -1405,14 +1404,13 @@ exit 2</programlisting>
 #  /etc/printcap for host rose - added text filter
 #
 rattan|line|diablo|lp|Diablo 630 Line Printer:\
-        :sh:sd=/var/spool/lpd/rattan:\
-        :lp=/dev/lpt0:\
-        :if=/usr/local/libexec/if-simple:
+        :sh:sd=<filename class="directory">/var/spool/lpd/rattan</filename>:\ :lp=<filename class="devicefile">/dev/lpt0</filename>:\
+        :if=<filename>/usr/local/libexec/if-simple</filename>:
 
 bamboo|ps|PS|S|panasonic|Panasonic KX-P4455 PostScript v51.4:\
-        :sh:sd=/var/spool/lpd/bamboo:\
-        :lp=/dev/ttyd5:ms#-parenb cs8 clocal crtscts:\
-        :if=/usr/local/libexec/if-simple:</programlisting>
+        :sh:sd=<filename class="directory">/var/spool/lpd/bamboo</filename>:\
+        :lp=<filename class="devicefile">/dev/ttyd5</filename>:ms#-parenb cs8 clocal crtscts:\
+        :if=<filename>/usr/local/libexec/if-simple</filename>:</programlisting>
 
 	  <note>
 	    <para><filename>if-simple</filename>
@@ -1436,7 +1434,7 @@ bamboo|ps|PS|S|panasonic|Panasonic KX-P4455 PostScript v51.4:\
 	    �׻�����Ƶ�ư���뤫�����Τޤ� &man.lpd.8; ��
 	    ��ư���Ƥ���������</para>
 
-	  <screen>&prompt.root; <userinput>lpd</userinput></screen>
+	  <screen>&prompt.root; <userinput><command>lpd</command></userinput></screen>
 	</sect4>
 
 	<sect4 id="printing-trying">
@@ -1464,7 +1462,7 @@ bamboo|ps|PS|S|panasonic|Panasonic KX-P4455 PostScript v51.4:\
 
 	  <para>���Τ褦�����Ϥ��Ƥ���������</para>
 
-	  <screen>&prompt.root; <userinput>lptest 20 5 | lpr -P<replaceable>printer-name</replaceable></userinput></screen>
+	  <screen>&prompt.root; <userinput><command>lptest 20 5 | lpr <option>-P</option><replaceable>printer-name</replaceable></command></userinput></screen>
 
 	  <para>�����ǡ�<replaceable>printer-name</replaceable>
 	    �� <filename>/etc/printcap</filename>
@@ -1484,11 +1482,11 @@ bamboo|ps|PS|S|panasonic|Panasonic KX-P4455 PostScript v51.4:\
 	    &man.lptest.1; ��Ȥä����ϡ�
 	    �ʲ��Τ褦�ʷ�̤�������Ǥ��礦��</para>
 
-	  <programlisting>!"#$%&amp;'()*+,-./01234
+	  <screen>!"#$%&amp;'()*+,-./01234
 "#$%&amp;'()*+,-./012345
 #$%&amp;'()*+,-./0123456
 $%&amp;'()*+,-./01234567
-%&amp;'()*+,-./012345678</programlisting>
+%&amp;'()*+,-./012345678</screen>
 
 	  <para>���˥ץ�󥿤�ƥ��Ȥ��������ϡ�
 	    (����١����Υץ�󥿤Τ����) ��ä��礭�ʥץ��������������뤫��
@@ -1545,14 +1543,14 @@ $%&amp;'()*+,-./01234567
 	�⤷�ե��륿���ʤ��ä��Ȥ��Ƥ⡢
 	���̤ϥե��륿����Τϴ�ñ�Ǥ���</para>
 
-      <para>FreeBSD �ˤ⡢�ץ쥤��ƥ����Ȥ���������뤳�Ȥ��Ǥ���
+      <para>&os; �ˤ⡢�ץ쥤��ƥ����Ȥ���������뤳�Ȥ��Ǥ���
 	<filename>/usr/libexec/lpr/lpf</filename>
 	�Ȥ����ե��륿�� 1 ���դ��Ƥ��ޤ�
 	(���Υե��륿�ϥե�����˴ޤޤ��Хå����ڡ����䥿�֤򰷤��ޤ���
 	�ޤ����ݶ�򤹤뤳�Ȥ�Ǥ��ޤ�����
 	�Ǥ��뤳�ȤϤ��������������ޤ���)��
 	�����Ĥ��Υե��륿�ȥե��륿�ι������Ǥ�
-        FreeBSD Ports Collection �ˤ⤢��ޤ���</para>
+        &os; Ports Collection �ˤ⤢��ޤ���</para>
 
       <para>������ǽҤ٤뤳�Ȥϼ����̤�Ǥ���</para>
 
@@ -1603,9 +1601,9 @@ $%&amp;'()*+,-./01234567
 	      �޷������ǥǡ����Ȥ��ä�����Υե����������
 	      �ץ�󥿤�����Ǥ���������Ѵ������Ȥ�ưŪ�ˤ����ʤ碌����ˡ�ˤĤ��ƽҤ٤ޤ���
 	      ��������ɤ�ȡ�troff �Υǡ������������ˤ� <command>lpr
-	      -t</command>, �ޤ��ϡ�&tex; DVI ���������ˤ�
-	    <command>lpr -d</command>��
-	    �饹�����᡼���ǡ������������ˤ� <command>lpr -v</command>��
+	      <option>-t</option></command>, �ޤ��ϡ�&tex; DVI ���������ˤ�
+	    <command>lpr <option>-d</option></command>��
+	    �饹�����᡼���ǡ������������ˤ� <command>lpr <option>-v</option></command>��
 	    �ʤɤȤ��ä��褦�˥桼�������Ϥ��뤳�Ȥ��Ǥ���褦��
 	    �ץ�󥿤�����򤪤��ʤ����Ȥ��Ǥ��ޤ���
 	    ������⤪�ɤߤˤʤ뤳�Ȥ����ᤷ�ޤ���</para>
@@ -1627,7 +1625,7 @@ $%&amp;'()*+,-./01234567
 	      linkend="printing-advanced-lpf">�ƥ����ȥե��륿
 	      lpf</link>�פǤϡ�<command>lpf</command>
 	    �ˤĤ��Ƥ����������ܴۤ����ˤ����ʤ��Ƥ��ޤ��������
-	    FreeBSD ����°����� ����ץ�� (�ޤ��ϡ�
+	    &os; ����°����� ����ץ�� (�ޤ��ϡ�
 	    �饤��ץ�󥿤Τ褦��ư���졼���ץ��) �Τ���Ρ�
 	    ñ��ʥƥ����ȥե��륿�Ǥ���
 	    �ץ쥤��ƥ����Ȥ�����������Ȥ��Ф��Ʋݶ�򤪤��ʤ���ˡ��
@@ -1669,7 +1667,7 @@ $%&amp;'()*+,-./01234567
 	  <filename>/etc/printcap</filename>
 	  �ե���������Ƥȡ�����֤ε�ư���˥桼�������ꤷ��
 	  &man.lpr.1; ���ޥ�ɤΰ����˰�¸���Ƥ��ޤ���
-	  ���Ȥ��С��桼���� <command>lpr -t</command> �����Ϥ������ϡ�
+	  ���Ȥ��С��桼���� <command>lpr <option>-t</option></command> �����Ϥ������ϡ�
 	  <application>LPD</application> �Ͻ�����Υץ���Ѥ�
 	  <literal>tf</literal> ���ܤǻ��ꤵ��Ƥ��� troff
 	  �ѤΥե��륿��ư������Ǥ��礦��
@@ -1719,7 +1717,7 @@ $%&amp;'()*+,-./01234567
 	      <variablelist>
 		<varlistentry><term><option>-c</option></term>
 		  <listitem>
-		    <para><command>lpr -l</command>
+		    <para><command>lpr <option>-l</option></command>
 		      �ˤ�äƥ���֤����Ϥ��줿�Ȥ���Ϳ�����ޤ���</para>
 		  </listitem>
 		</varlistentry>
@@ -1743,7 +1741,7 @@ $%&amp;'()*+,-./01234567
 
 		<varlistentry><term><replaceable>indent</replaceable></term>
 		  <listitem>
-		    <para><command>lpr -i</command>
+		    <para><command>lpr <option>-i</option></command>
 		      �ˤ�ä�Ϳ����줿���������̤ǡ�
 		      �ǥե���Ȥ� 0 �Ǥ���</para>
 		  </listitem>
@@ -1859,7 +1857,7 @@ $%&amp;'()*+,-./01234567
 	  </varlistentry>
 	</variablelist>
 
-	<para>FreeBSD ����°����ƥ����ȥե��륿
+	<para>&os; ����°����ƥ����ȥե��륿
 	  <filename>/usr/libexec/lpr/lpf</filename> �ϡ�FORM FEED
 	  ʸ��������줿�Ȥ���ץ�󥿻��Ѥ��Ф���ݶ��ɤΤ褦�ˤ��뤫����ꤹ�뤿��ˡ�
 	  �ڡ�������ڡ���Ĺ�ΰ��������Ѥ��ޤ����ޤ���
@@ -1929,7 +1927,7 @@ $%&amp;'()*+,-./01234567
 	  ��ƤӽФ��ޤ��������ơ����Υ���֤�ץ�󥿤����뤿��ˡ�
 	  <command>lprps</command> ���Ȥ��ޤ���</para>
 
-	<para><command>lprps</command> �� FreeBSD Ports Collection
+	<para><command>lprps</command> �� &os; Ports Collection
 	  �˴ޤޤ�Ƥ��ޤ� (<link linkend="ports">Ports Collection</link>
           �򻲾Ȥ��Ƥ�������)��
 	  ��Υ������˹�碌��
@@ -1944,7 +1942,7 @@ $%&amp;'()*+,-./01234567
 	  &postscript; �ץ�󥿤Υ���ȥ���Ф��ơ�����ȤäƤ���������
 	</para>
 
-	<programlisting>:if=/usr/local/libexec/psif:</programlisting>
+        <programlisting>:if=<filename>/usr/local/libexec/psif</filename>:</programlisting>
 
 	<para><application>LPD</application>
 	  �˥ץ�󥿤�꡼�ɡ��饤�ȥ⡼�ɤǥ����ץ󤵤��뤿��ˡ�
@@ -1983,7 +1981,7 @@ fi</programlisting>
 	  �ϥץ쥤��ƥ����Ȥ��� &postscript;
 	  ���Ѵ����뤿����̤˥��󥹥ȡ��뤷���ץ������Ǥ���
 	  �ƥ����Ȥ��� &postscript; ���Ѵ�����Τˤϡ�
-	  �����ߤΤɤ�ʥץ������Ǥ�Ȥ����Ȥ��Ǥ��ޤ���FreeBSD
+	  �����ߤΤɤ�ʥץ������Ǥ�Ȥ����Ȥ��Ǥ��ޤ���&os;
 	  Ports Collection (<link linkend="ports">Ports Collection</link>
 	  �򻲾Ȥ��Ƥ�������) �ˤϡ�<literal>a2ps</literal>
 	  �ȸƤФ��ƥ����Ȥ���
@@ -2006,7 +2004,7 @@ fi</programlisting>
 	  Aladdin Enterprises ����
 	  <application>Ghostscript</application> �ȸƤФ�롢
 	  &postscript; �ߴ���ư��򤹤�ե꡼�Υץ�����ब�Ф���Ƥ��ơ�
-	  FreeBSD ��ư���ޤ���
+	  &os; ��ư���ޤ���
 	  <application>Ghostscript</application> �ϤۤȤ�ɤ� &postscript; �ե�������ɤळ�Ȥ��Ǥ���
 	  �����γƥڡ�����¿���Υ֥��ɤ��� &postscript; �ץ�󥿤�ޤ�
 	  �͡��ʥǥХ����Ѥ��Ѵ����뤳�Ȥ��Ǥ��ޤ���
@@ -2015,7 +2013,7 @@ fi</programlisting>
 	  �� &postscript; �ץ�󥿤򤢤�������ʪ�� &postscript;
 	  �ץ�󥿤Ǥ��뤫�Τ褦��ư����뤳�Ȥ��Ǥ��ޤ���</para>
 
-	<para><application>Ghostscript</application> �� FreeBSD Ports Collection �����äƤ��ޤ���
+	<para><application>Ghostscript</application> �� &os; Ports Collection �����äƤ��ޤ���
 	  ʣ���ΥС�����󤬤���ޤ������Ǥ��ɤ��Ȥ��Ƥ���С������� <filename
 	  role="package">print/ghostscript-gpl</filename> �Ǥ���</para>
 
@@ -2033,7 +2031,7 @@ fi</programlisting>
 	  �ץ���� �Υƥ����ȥե��륿�Ǥ���
 	  ¾�Υץ�󥿤��Ѥ���Ȥ��ϡ�<option>-sDEVICE</option>
 	  ������ <command>gs</command> (<application>Ghostscript</application>)
-	  ���ޥ�ɤ��Ѥ��Ƥ������� (<command>gs -h</command>
+	  ���ޥ�ɤ��Ѥ��Ƥ������� (<command>gs <option>-h</option></command>
 	  �����Ϥ���ȡ����ߥ��󥹥ȡ��뤵��Ƥ��� <application>Ghostscript</application>
 	  �ǥ��ݡ��Ȥ���Ƥ���ǥХ����Υꥹ�Ȥ������ޤ�)��</para>
 
@@ -2075,9 +2073,9 @@ exit 2</programlisting>
 	<para>�Ǹ�ˡ�<literal>if</literal> ���ܤ��̤��ơ�<application>LPD</application>
 	  �ˤ��Υե��륿�򶵤��Ƥ��ɬ�פ�����ޤ���</para>
 
-	<programlisting>:if=/usr/local/libexec/ifhp:</programlisting>
+        <programlisting>:if=<filename>/usr/local/libexec/ifhp</filename>:</programlisting>
 
-	<para>����Ǥ����ޤ��Ǥ���<command>lpr <replaceable>plain.text</replaceable></command>
+	<para>����Ǥ����ޤ��Ǥ���<command>lpr <filename><replaceable>plain.text</replaceable></filename></command>
 	  �Ȥ� <command>lpr <filename><replaceable>whatever.ps</replaceable></filename></command>
 	  �����Ϥ��Ƥߤޤ��礦���ɤ��������˰��������Ϥ��Ǥ���</para>
 
@@ -2116,8 +2114,8 @@ exit 2</programlisting>
 	    ����� &postscript; �ե�������Ѵ�����ɬ�פ�����ޤ���
 	    ���Υ��ޥ�ɤϼ��Τ褦�ˤʤ�Ǥ��礦��</para>
 
-          <screen>&prompt.user; <userinput>dvips <replaceable>seaweed-analysis.dvi</replaceable></userinput>
-&prompt.user; <userinput>lpr <replaceable>seaweed-analysis.ps</replaceable></userinput></screen>
+          <screen>&prompt.user; <userinput><command>dvips <filename><replaceable>seaweed-analysis.dvi</replaceable></filename></command></userinput>
+&prompt.user; <userinput><command>lpr <filename><replaceable>seaweed-analysis.ps</replaceable></filename></command></userinput></screen>
 
 	  <para>DVI �ե������Ѥ��Ѵ��ե��륿�����󥹥ȡ��뤷�Ƥ���ȡ�
 	    <application>LPD</application> ���Ѵ������ꤵ���뤳�Ȥ�������
@@ -2126,7 +2124,7 @@ exit 2</programlisting>
 	    ���Τ褦�ʥ��ޥ�ɤ����Ϥ�������ǡ����줬��������ޤ���
 	  </para>
 
-          <screen>&prompt.user; <userinput>lpr -d <replaceable>seaweed-analysis.dvi</replaceable></userinput></screen>
+          <screen>&prompt.user; <userinput><command>lpr <option>-d</option> <filename><replaceable>seaweed-analysis.dvi</replaceable></filename></command></userinput></screen>
 
 	  <para><application>LPD</application> �� DVI
 	    �ե�������Ѵ��򤵤��뤿��ˤϡ�
@@ -2220,7 +2218,7 @@ exit 2</programlisting>
 	    </tgroup>
 	  </informaltable>
 
-	  <para>�����Τ褦�ˡ�<command>lpr -d</command>
+	  <para>�����Τ褦�ˡ�<command>lpr <option>-d</option></command>
 	    ��Ȥ�����ˤϡ�������Υץ�󥿤�
 	    <filename>/etc/printcap</filename> ��Υ���ȥ�ǡ�
 	    <literal>df</literal>
@@ -2238,7 +2236,7 @@ exit 2</programlisting>
 	    �����ơ�Printerleaf �Ѥ��Ѵ��ե��륿��
 	    <literal>gf</literal> ���ܤ�
 	    ���ꤷ���ѥ��˥��󥹥ȡ��뤹��С�<command>lpr
-	      -g</command> �ΰ�̣�� <quote>Printerleaf
+	      <option>-g</option></command> �ΰ�̣�� <quote>Printerleaf
 	    �ե�������������</quote> ��̣���ȥ桼���˶����뤳�Ȥ��Ǥ��ޤ���
 	    </para>
 	</sect4>
@@ -2246,7 +2244,7 @@ exit 2</programlisting>
 	<sect4>
 	  <title>�Ѵ��ե��륿�Υ��󥹥ȡ���</title>
 
-	  <para>�Ѵ��ե��륿�� FreeBSD
+	  <para>�Ѵ��ե��륿�� &os;
 	    �δ��ܥ����ƥ�Υ��󥹥ȡ���Ȥ��̤˥��󥹥ȡ��뤹��ץ������ʤΤǡ�
 	    �Ѵ��ե��륿�ϡ�
 	    <filename>/usr/local</filename> �ǥ��쥯�ȥ�β����֤��٤��Ǥ��礦��
@@ -2270,15 +2268,15 @@ exit 2</programlisting>
 #  /etc/printcap for host rose - added df filter for bamboo
 #
 rattan|line|diablo|lp|Diablo 630 Line Printer:\
-        :sh:sd=/var/spool/lpd/rattan:\
-        :lp=/dev/lpt0:\
-        :if=/usr/local/libexec/if-simple:
+        :sh:sd=<filename class="directory">/var/spool/lpd/rattan</filename>:\
+        :lp=<filename class="devicefile">/dev/lpt0</filename>:\
+        :if=<filename>/usr/local/libexec/if-simple</filename>:
 
 bamboo|ps|PS|S|panasonic|Panasonic KX-P4455 PostScript v51.4:\
-        :sh:sd=/var/spool/lpd/bamboo:\
-        :lp=/dev/ttyd5:ms#-parenb cs8 clocal crtscts:rw:\
-        :if=/usr/local/libexec/psif:\
-        :df=/usr/local/libexec/psdf:</programlisting>
+        :sh:sd=<filename class="directory">/var/spool/lpd/bamboo</filename>:\
+        :lp=<filename class="devicefile">/dev/ttyd5</filename>:ms#-parenb cs8 clocal crtscts:rw:\
+        :if=<filename>/usr/local/libexec/psif</filename>:\
+        :df=<filename>/usr/local/libexec/psdf</filename>:</programlisting>
 
 	  <para>DVI �ե��륿��
 	    <filename>/usr/local/libexec/psdf</filename> �Ȥ���
@@ -2344,9 +2342,9 @@ giftopnm | ppmtopgm | pgmtopbm | pbmtolj -resolution 300 \
 #  /etc/printcap for host orchid
 #
 teak|hp|laserjet|Hewlett Packard LaserJet 3Si:\
-        :lp=/dev/lpt0:sh:sd=/var/spool/lpd/teak:mx#0:\
-        :if=/usr/local/libexec/hpif:\
-        :vf=/usr/local/libexec/hpvf:</programlisting>
+        :lp=<filename class="devicefile">/dev/lpt0</filename>:sh:sd=<filename class="directory">/var/spool/lpd/teak</filename>:mx#0:\
+        :if=<filename>/usr/local/libexec/hpif</filename>:\
+        :vf=<filename>/usr/local/libexec/hpvf</filename>:</programlisting>
 
 	  <para>���Υ�����ץȤϡ�&postscript; �ץ��
 	    <literal>bamboo</literal> �Τ���� groff ���ǥ����ƥ��
@@ -2396,7 +2394,7 @@ exit 2</programlisting>
 	    <filename>/etc/printcap</filename> �Υץ��
 	    <literal>teak</literal> �Υ���ȥ�˲ä��ޤ���</para>
 
-	  <programlisting>:rf=/usr/local/libexec/hprf:</programlisting>
+          <programlisting>:rf=<filename>/usr/local/libexec/hprf</filename>:</programlisting>
 
 	  <para>���줬�Ǹ�Ρ������ơ��㴳ʣ������Ǥ������˾Ҳ𤷤�
 	    LaserJet �ץ�� <literal>teak</literal> �ˡ�DVI
@@ -2405,11 +2403,11 @@ exit 2</programlisting>
 	    <filename>/etc/printcap</filename> �˽񤭲ä��ޤ���
 	  </para>
 
-	  <programlisting>:df=/usr/local/libexec/hpdf:</programlisting>
+          <programlisting>:df=<filename>/usr/local/libexec/hpdf</filename>:</programlisting>
 
 	  <para>���ơ��񤷤���ʬ�Ǥ���ե��륿�κ����򤪤��ʤ��ޤ���
 	    ���Τ���ˡ�DVI ���� LaserJet/PCL
-	    �ؤ��Ѵ��ץ�����बɬ�פǤ���FreeBSD �� Ports Collection
+	    �ؤ��Ѵ��ץ�����बɬ�פǤ���&os; �� Ports Collection
             (<link linkend="ports">Ports Collection</link>
 	    �򻲾Ȥ��Ƥ�������) �ˤϡ����줬����ޤ���
 	    <filename role="package">dvi2xx</filename> �Ȥ����Τ����� port ��̾���Ǥ���
@@ -2425,21 +2423,21 @@ exit 2</programlisting>
 	    ���Υץ�������Ư�����뤿��ˤϡ��ե�����̾��ɬ�פǤ���
 	    ��äȰ������Ȥˡ��ե�����̾�� <filename>.dvi</filename>
 	    �ǽ���äƤ���ɬ�פ����ꡢɸ�����Ϥ�����ˡ�
-	    <filename>/dev/fd/0</filename> ��Ȥ��Τ����꤬����ޤ���
+	    <filename class="devicefile">/dev/fd/0</filename> ��Ȥ��Τ����꤬����ޤ���
 	    ��������ϡ�(<filename>.dvi</filename> �ǽ����)
-	    ���Ū�ʥե�����̾����<filename>/dev/fd/0</filename> ��
+	    ���Ū�ʥե�����̾����<filename class="devicefile">/dev/fd/0</filename> ��
 	    (����ܥ�å���) ��󥯤�ĥ��
 	    ���ȤDz��򤹤뤳�Ȥ��Ǥ��ޤ�������ǡ�
 	    <command>dvilj2p</command>
 	    �˶���Ū��ɸ�����Ϥ���ǡ������ɤ߹��ޤ��뤳�Ȥ��Ǥ��ޤ���</para>
 
 	  <para>�⤦1�Ĥ�����ϡ����Ū�ʥ�󥯤�ĥ�뤿���
-	    <filename>/tmp</filename>
+	    <filename class="devicefile">/tmp</filename>
 	    �ǥ��쥯�ȥ��Ȥ����Ȥ��Ǥ��ʤ��Ȥ������¤Ǥ���
 	    ����ܥ�å���󥯤ϥ桼�������롼�פ� <username>bin</username>
 	    �Ǥ���桼���˽�ͭ����Ƥ��ޤ����ե��륿�ϥ桼��
 	    <username>daemon</username> �Ȥ��Ƶ�ư���ޤ��������ơ�
-	    <filename>/tmp</filename>
+	    <filename class="devicefile">/tmp</filename>
 	    �ǥ��쥯�ȥ�ϥ��ƥ��å����ӥåȤ�Ω�äƤ��ޤ���
 	    �ե��륿�ϥ�󥯤��뤳�Ȥ��Ǥ��ޤ�����������
 	    ��󥯤��̤Υ桼���˽�ͭ����Ƥ��뤿�ᡢ
@@ -2451,7 +2449,7 @@ exit 2</programlisting>
 	    <literal>sd</literal> ���ܤǻ��ꤹ��) �˺�뤳�Ȥˤ��ޤ���
 	    �ե��륿����Ȥ���ˤϤ����ξ��ϴ����ʾ��ǡ��ʤ��ʤ顢
 	    �äˡ����ס���󥰥ǥ��쥯�ȥ�Υǥ� �����ζ������̤�
-	    (�Ȥ��ɤ�) <filename>/tmp</filename>
+	    (�Ȥ��ɤ�) <filename class="devicefile">/tmp</filename>
 	    �ǥ��쥯�ȥ���⤿�����󤢤뤫��Ǥ���</para>
 
 	  <para>�ʲ��˼����Τ��Ǹ�Υե��륿�Ǥ���</para>
@@ -2550,7 +2548,7 @@ exit 0</programlisting>
             <secondary>�ե��륿</secondary>
             <tertiary>apsfilter</tertiary>
           </indexterm>
-	  <para>FreeBSD Ports Collection �ˤϡ�<command>apsfilter</command>
+	  <para>&os; Ports Collection �ˤϡ�<command>apsfilter</command>
 	    (<filename role="package">print/apsfilter</filename>)
 	    �ȸƤФ�뼫ư�Ѵ��򤪤��ʤ��ƥ����ȥե��륿������ޤ���
 	    ���Υե��륿�� �ץ쥤��ƥ����ȡ�&postscript;, DVI
@@ -2666,11 +2664,11 @@ exit 0</programlisting>
 	<title>�ƥ����ȥե��륿 <command>lpf</command></title>
 
 	<para>�ץ������ <filename>/usr/libexec/lpr/lpf</filename> �ϡ�
-	  FreeBSD �� �Х��ʥ����ۤ���°���Ƥ���ƥ����ȥե��륿
+	  &os; �� �Х��ʥ����ۤ���°���Ƥ���ƥ����ȥե��륿
 	  (���ϥե��륿) �ǡ����Ϥ������������ (<command>lpr
-	    -i</command> �ǥ���֤����Ϥ� �줿�Ȥ�)��
+	    <option>-i</option></command> �ǥ���֤����Ϥ� �줿�Ȥ�)��
 	  ʸ����̤�����Τޤޥץ�󥿤����ä��� (<command>lpr
-	    -l</command> �ǥ���֤����Ϥ��줿�Ȥ�)��
+	    <option>-l</option></command> �ǥ���֤����Ϥ��줿�Ȥ�)��
 	  �������ΥХå����ڡ����䥿�֤ΰ������֤�Ĵ�ᤷ���ꡢ
 	  ���������ڡ������Ф��Ʋݶ⤷���ꤹ�뤳�Ȥ��Ǥ��ޤ����ޤ���
 	  ���Υե��륿�Ͻ��ϥե��륿�Ȥ��Ƥ�ư����뤳�Ȥ��Ǥ��ޤ���</para>
@@ -2782,10 +2780,10 @@ exec /usr/libexec/lpr/lpf</programlisting>
 #  /etc/printcap for host orchid
 #
 teak|hp|laserjet|Hewlett Packard LaserJet 3Si:\
-        :lp=/dev/lpt0:sd=/var/spool/lpd/teak:mx#0:\
-        :if=/usr/local/libexec/hpif:\
-        :vf=/usr/local/libexec/hpvf:\
-        :of=/usr/local/libexec/hpof:</programlisting>
+        :lp=<filename class="devicefile">/dev/lpt0</filename>:sd=<filename class="directory">/var/spool/lpd/teak</filename>:mx#0:\
+        :if=<filename>/usr/local/libexec/hpif</filename>:\
+        :vf=<filename>/usr/local/libexec/hpvf</filename>:\
+        :of=<filename>/usr/local/libexec/hpof</filename>:</programlisting>
 
 	<!-- kuriyama - literallayout? -->
 	<!-- si006 - now literal -->
@@ -2793,7 +2791,7 @@ teak|hp|laserjet|Hewlett Packard LaserJet 3Si:\
 	  ���饸��֤�����������Ȥ���
 	  ���줾��Υ������˥إå��ڡ�������������ޤ���
 	  �⤷���桼��������ʪ��õ���Τ˻��֤���䤷�����Ȼפ��ʤ顢
-	  <command>lpr -h</command> �ˤ�äƥ���֤����Ϥ��뤳�Ȥǡ�
+	  <command>lpr <option>-h</option></command> �ˤ�äƥ���֤����Ϥ��뤳�Ȥǡ�
 	  �إå��ڡ����ΰ�����ߤ�뤳�Ȥ��Ǥ��ޤ���
 	  ����ʳ���
 	  &man.lpr.1; �Υ��ץ����ˤĤ��Ƥϡ�
@@ -2821,7 +2819,7 @@ teak|hp|laserjet|Hewlett Packard LaserJet 3Si:\
 	  <quote>outline</quote> �� <hostid>rose</hostid>
 	  �Ȥ����ۥ��Ȥ������ ���줿���)��</para>
 
-	<programlisting>      k                   ll       ll
+        <screen>      k                   ll       ll
       k                    l        l
       k                    l        l
       k   k     eeee       l        l     y    y
@@ -2867,7 +2865,7 @@ teak|hp|laserjet|Hewlett Packard LaserJet 3Si:\
 
 
                                               Job:  outline
-                                              Date: Sun Sep 17 11:04:58 1995</programlisting>
+                                              Date: Sun Sep 17 11:04:58 1995</screen>
 
 	<para><application>LPD</application> �Ϥ��Υƥ����Ȥν�����
 	  FORM FEED ʸ����ä��ޤ�
@@ -2884,7 +2882,7 @@ teak|hp|laserjet|Hewlett Packard LaserJet 3Si:\
 	  <literal>sb</literal> (short banner) ����ꤷ�Ƥ���������
 	  �إå��ڡ����ϼ��Τ褦�ˤʤ�ޤ���</para>
 
-	<programlisting>rose:kelly  Job: outline  Date: Sun Sep 17 11:07:51 1995</programlisting>
+        <screen>rose:kelly  Job: outline  Date: Sun Sep 17 11:07:51 1995</screen>
 
 	<para>�ǥե���ȤǤϡ�<application>LPD</application>
 	  �ϥإå��ڡ�����ǽ�˰����������˥���֤ΰ����򤪤��ʤ��ޤ���
@@ -2913,14 +2911,14 @@ teak|hp|laserjet|Hewlett Packard LaserJet 3Si:\
 	  ï�˥ץ�����Ѥβݶ�򤪤��ʤ��Ф褤�Τ���ʬ����ʤ��ΤǤ���
 	  �ƥ����ȥե��륿�䤽��¾���Ѵ��ե��륿
 	  (�����Υե��륿�ϥ桼����ۥ��Ȥξ����Τ餵��ޤ�)
-	  �����ϥڡ���������� <quote>1�ڡ���ʬ����������</quote> �����ǤϽ�ʬ�ǤϤ���ޤ���
+	  �����ϥڡ���������� <quote>1 �ڡ���ʬ����������</quote> �����ǤϽ�ʬ�ǤϤ���ޤ���
           �ʤ��ʤ顢�桼����
-	  <command>lpr -h</command> ��
+	  <command>lpr <option>-h</option></command> ��
 	  ��äƥإå��ڡ����ν��Ϥ�ߤ�뤳�Ȥ��Ǥ��뤫��Ǥ���
 	  ��ߤ���� 1 �ڡ��������������ȡ�
 	  ��������Ƥ⤤�ʤ��إå��ڡ������Ф���
 	  �����Ȥ뤳�Ȥˤʤ�ޤ�������Ū�ˡ�<command>lpr
-	   -h</command> �ϴĶ���ͥ����������ĥ桼���˹��ޤ�륪�ץ����Ǥ�����
+	   <option>-h</option></command> �ϴĶ���ͥ����������ĥ桼���˹��ޤ�륪�ץ����Ǥ�����
 	  �����Ȥ��褦�˾��夹�뤳�Ȥ�Ǥ��ޤ���</para>
 
 	<para>�ơ��Υե��륿���ȼ��Υإå��ڡ���������������
@@ -2928,7 +2926,7 @@ teak|hp|laserjet|Hewlett Packard LaserJet 3Si:\
 	  �Ȥ�����ˡ<emphasis>�Ǥ⽽ʬ�Ǥ���ȤϤ����ޤ���</emphasis>��
 	  ���ξ�硢<application>LPD</application> �ϥե��륿��
 	  <option>-h</option> �ξ��������ޤ���Τǡ�<command>lpr
-	    -h</command>
+	    <option>-h</option></command>
 	  �ˤ�äƥإå��ڡ�����������ʤ����ץ��������򤷤��Ȥ��Ƥ⡢
 	  �����Ȥ��ƥإå��ڡ����ϰ������졢
 	  ����ʬ�βݶ⤬�����ʤ��Ƥ��ޤ��ޤ���</para>
@@ -3005,7 +3003,7 @@ teak|hp|laserjet|Hewlett Packard LaserJet 3Si:\
 	  �ե��륿�ϡ�
 	  Ŭ�ڤʥإå��ڡ������������뤿��ˡ�
 	  �桼��̾�ȥۥ���̾�ΰ�����Ȥ��٤��Ǥ���������ˡ�η����ϡ����ĤǤ⡢
-	  <emphasis remap=tt>lpr -h</emphasis>
+	  <command>lpr <option>-h</option></command>
 	  �ˤ�äƥ���֤����Ϥ��줿���Ǥ����⡢
 	  �إå��ڡ��������������Ȥ������ȤǤ���</para>
 
@@ -3158,7 +3156,7 @@ done
 	  �Ȥ�ɬ�פ�����ޤ������ʤ����LPD
 	  ����������إå��ڡ����β��Ϥ򤪤��ʤ���&postscript;
 	  �ǤΥإå��ڡ�������Ϥ�������ϥե��륿����ΤǤ���
-	  ���ξ�硢�桼���� <command>lpr -h</command> �ǥ���֤����Ϥ���ȡ�
+	  ���ξ�硢�桼���� <command>lpr <option>-h</option></command> �ǥ���֤����Ϥ���ȡ�
 	  <application>LPD</application> �ϥإå��ڡ������������ʤ��ʤꡢ�ޤ���
 	  ���ϥե��륿�ⵯư����ޤ��󡣤����Ǥʤ��ʤ�С�
 	  �����������ϥե��륿�� <application>LPD</application>
@@ -3182,7 +3180,7 @@ done
       </indexterm>
       <indexterm><primary>�ͥåȥ���ץ��</primary></indexterm>
 
-      <para>FreeBSD �Ǥϡ��ͥåȥ���ۤ��ΰ��������ʤ����
+      <para>&os; �Ǥϡ��ͥåȥ���ۤ��ΰ��������ʤ����
 	����֤��⡼�ȥץ�󥿤����뤳�Ȥ򥵥ݡ��Ȥ��Ƥ��ޤ���
 	��⡼�ȥץ�󥿤���ν��Ϥ򤹤�ˤϡ����̤ˡ�
 	���� 2 �Ĥ򻲾Ȥ��Ƥ���������
@@ -3266,7 +3264,7 @@ done
 	  <emphasis>�ץ�󥿥ۥ���</emphasis>�� <application>LPD</application>
 	  �����ӥ��λ��Ѥ���Ĥ���Ƥ��뤫��ǧ���Ʋ����� (��<link
 	    linkend="printing-advanced-restricting-remote">
-	    ��⡼�ȥۥ��Ȥ���Υץ�󥿤����Ѥ����¤���
+	    ��⡼�ȥۥ��Ȥ�������Ѥ����¤���
 	  </link>�׻���)��</para>
 
         <indexterm>
@@ -3357,36 +3355,36 @@ done
 #  teak is local; it is connected directly to orchid:
 #
 teak|hp|laserjet|Hewlett Packard LaserJet 3Si:\
-        :lp=/dev/lpt0:sd=/var/spool/lpd/teak:mx#0:\
-        :if=/usr/local/libexec/ifhp:\
-        :vf=/usr/local/libexec/vfhp:\
-        :of=/usr/local/libexec/ofhp:
+        :lp=<filename class="devicefile">/dev/lpt0</filename>:sd=<filename class="directory">/var/spool/lpd/teak</filename>:mx#0:\
+        :if=<filename>/usr/local/libexec/ifhp</filename>:\
+        :vf=<filename>/usr/local/libexec/vfhp</filename>:\
+        :of=<filename>/usr/local/libexec/ofhp</filename>:
 
 #
 #  rattan is connected to rose; send jobs for rattan to rose:
 #
 rattan|line|diablo|lp|Diablo 630 Line Printer:\
-        :lp=:rm=rose:rp=rattan:sd=/var/spool/lpd/rattan:
+        :lp=:rm=rose:rp=rattan:sd=<filename class="directory">/var/spool/lpd/rattan</filename>:
 
 #
 #  bamboo is connected to rose as well:
 #
 bamboo|ps|PS|S|panasonic|Panasonic KX-P4455 PostScript v51.4:\
-        :lp=:rm=rose:rp=bamboo:sd=/var/spool/lpd/bamboo:</programlisting>
+        :lp=:rm=rose:rp=bamboo:sd=<filename class="directory">/var/spool/lpd/bamboo</filename>:</programlisting>
 
 	<para><hostid>orchid</hostid>
 	  ��ɬ�פȤʤ��Ȥϥ��ס���󥰥ǥ��쥯�ȥ���뤳�Ȥ����Ǥ���</para>
 
-	<screen>&prompt.root; <userinput>mkdir -p /var/spool/lpd/rattan /var/spool/lpd/bamboo</userinput>
-&prompt.root; <userinput>chmod 770 /var/spool/lpd/rattan /var/spool/lpd/bamboo</userinput>
-&prompt.root; <userinput>chown daemon:daemon /var/spool/lpd/rattan /var/spool/lpd/bamboo</userinput></screen>
+        <screen>&prompt.root; <userinput><command>mkdir <option>-p</option> <filename>/var/spool/lpd/rattan</filename> <filename>/var/spool/lpd/bamboo</filename></command></userinput>
+&prompt.root; <userinput><command>chmod 770 <filename>/var/spool/lpd/rattan</filename> <filename>/var/spool/lpd/bamboo</filename></command></userinput>
+&prompt.root; <userinput><command>chown daemon:daemon <filename>/var/spool/lpd/rattan</filename> <filename>/var/spool/lpd/bamboo</filename></command></userinput></screen>
 
 	<para>����ǡ�<hostid>orchid</hostid> �Υ桼����
 	  <literal>rattan</literal> �� <literal>bamboo</literal>
 	  �ǰ������뤳�Ȥ��Ǥ���褦�ˤʤ�ޤ�����
 	  ���Ȥ��С�<hostid>orchid</hostid> �Υ桼�������Τ褦�����Ϥ����Ȥ��ޤ���</para>
 
-          <screen>&prompt.user; <userinput>lpr -P bamboo -d <replaceable>sushi-review.dvi</replaceable></userinput></screen>
+          <screen>&prompt.user; <userinput><command>lpr <option>-P</option> bamboo <option>-d</option> <filename><replaceable>sushi-review.dvi</replaceable></filename></command></userinput></screen>
 
 	<para>����ȡ�<hostid>orchid</hostid> ��
 	  <application>LPD</application> �����ƥ�ϡ�
@@ -3438,7 +3436,7 @@ bamboo|ps|PS|S|panasonic|Panasonic KX-P4455 PostScript v51.4:\
 	  <command>netprint</command>
 	  �κǽ�ΰ����ǥץ�󥿤Υۥ���̾��
 	  2 ���ܤΰ�������³����ݡ����ֹ����ꤷ�ޤ���
-	  ���Υץ������Ǥ�ñ�����̿� (FreeBSD ����ץ��)
+	  ���Υץ������Ǥ�ñ�����̿� (&os; ����ץ��)
 	  �Τߤ򥵥ݡ��Ȥ��Ƥ��뤳�Ȥ����դ��Ƥ���������
 	  �ͥåȥ���ץ�󥿤�¿�����������̿��򥵥ݡ��Ȥ��Ƥ��ޤ��Τǡ�
 	  ���β��� (�ץ�󥿤ξ��֤������ꡢ
@@ -3509,7 +3507,7 @@ exec /usr/libexec/lpr/lpf "$@" | /usr/local/libexec/netprint scrivener 5100</pro
 	<para><application>LPD</application>
 	  �����ƥ�Ǥϥ桼����ʣ�����Υ��ԡ��ΰ������ñ�ˤ����ʤ�
 	  ��ǽ���󶡤��Ƥ��ޤ����桼������(���Ȥ���) <command>lpr
-	    -#5</command> ���ޥ�ɤ�Ȥäƥ���֤��������ȡ�
+	    <option>-#5</option></command> ���ޥ�ɤ�Ȥäƥ���֤��������ȡ�
 	  ����֤Τ��줾��Υե�����Υ��ԡ��� 5 �����뤳�Ȥ��Ǥ��ޤ���
 	  ���줬�褤��ǽ�Ǥ���Ȼפ����ɤ����Ͽͤ��줾��Ǥ��礦��</para>
 
@@ -3552,15 +3550,15 @@ exec /usr/libexec/lpr/lpf "$@" | /usr/local/libexec/netprint scrivener 5100</pro
 #  /etc/printcap for host rose - restrict multiple copies on bamboo
 #
 rattan|line|diablo|lp|Diablo 630 Line Printer:\
-        :sh:sd=/var/spool/lpd/rattan:\
-        :lp=/dev/lpt0:\
-        :if=/usr/local/libexec/if-simple:
+        :sh:sd=<filename class="directory">/var/spool/lpd/rattan</filename>:\
+        :lp=<filename class="devicefile">/dev/lpt0</filename>:\
+        :if=<filename>/usr/local/libexec/if-simple</filename>:
 
 bamboo|ps|PS|S|panasonic|Panasonic KX-P4455 PostScript v51.4:\
-        :sh:sd=/var/spool/lpd/bamboo:sc:\
-        :lp=/dev/ttyd5:ms#-parenb cs8 clocal crtscts:rw:\
-        :if=/usr/local/libexec/psif:\
-        :df=/usr/local/libexec/psdf:</programlisting>
+        :sh:sd=<filename class="directory">/var/spool/lpd/bamboo</filename>:sc:\
+        :lp=<filename class="devicefile">/dev/ttyd5</filename>:ms#-parenb cs8 clocal crtscts:rw:\
+        :if=<filename>/usr/local/libexec/psif</filename>:\
+        :df=<filename>/usr/local/libexec/psdf</filename>:</programlisting>
 
 	<para>����ˡ�orchid �� <filename>/etc/printcap</filename>
 	  �ˤ� <literallayout>sc</literallayout>
@@ -3574,24 +3572,24 @@ bamboo|ps|PS|S|panasonic|Panasonic KX-P4455 PostScript v51.4:\
 #  printer teak or remote printer bamboo
 
 teak|hp|laserjet|Hewlett Packard LaserJet 3Si:\
-        :lp=/dev/lpt0:sd=/var/spool/lpd/teak:mx#0:sc:\
-        :if=/usr/local/libexec/ifhp:\
-        :vf=/usr/local/libexec/vfhp:\
-        :of=/usr/local/libexec/ofhp:
+        :lp=<filename class="devicefile">/dev/lpt0</filename>:sd=<filename class="directory">/var/spool/lpd/teak</filename>:mx#0:sc:\
+        :if=<filename>/usr/local/libexec/ifhp</filename>:\
+        :vf=<filename>/usr/local/libexec/vfhp</filename>:\
+        :of=<filename>/usr/local/libexec/ofhp</filename>:
 
 rattan|line|diablo|lp|Diablo 630 Line Printer:\
-        :lp=:rm=rose:rp=rattan:sd=/var/spool/lpd/rattan:
+        :lp=:rm=rose:rp=rattan:sd=<filename class="directory">/var/spool/lpd/rattan</filename>:
 
 bamboo|ps|PS|S|panasonic|Panasonic KX-P4455 PostScript v51.4:\
-        :lp=:rm=rose:rp=bamboo:sd=/var/spool/lpd/bamboo:sc:</programlisting>
+        :lp=:rm=rose:rp=bamboo:sd=<filename class="directory">/var/spool/lpd/bamboo</filename>:sc:</programlisting>
 
 	<para><literal>sc</literal> ���ܤ���ꤹ�뤳�Ȥˤ�ꡢ
-	  <command>lpr -#</command>
+	  <command>lpr <option>-#</option></command>
 	  �λ��Ѥ��ɤ����Ȥ��Ǥ��ޤ��������������ξ��֤Ǥ�
 	  &man.lpr.1; ��ʣ����ư�����ꡢ
 	  1 ��Υ���֤Ǽ��Τ褦��Ʊ���ե������ʣ���Ļ��ꤹ�뤳�Ȥ��ɤ��ޤǤˤϻ�äƤ��ޤ���</para>
 
-        <screen>&prompt.user; <userinput>lpr <replaceable>forsale.sign forsale.sign forsale.sign forsale.sign forsale.sign</replaceable></userinput></screen>
+        <screen>&prompt.user; <userinput>lpr <filename><replaceable>forsale.sign forsale.sign forsale.sign forsale.sign forsale.sign</replaceable></filename></userinput></screen>
 
 	<para>���Τ褦�ʰ��Ѥ��ɤ���ˡ��
 	  (���λؼ���̵�뤹�뤳�Ȥ�ޤ��) �������󤢤�ޤ���
@@ -3641,15 +3639,15 @@ bamboo|ps|PS|S|panasonic|Panasonic KX-P4455 PostScript v51.4:\
 #  /etc/printcap for host rose - restricted group for bamboo
 #
 rattan|line|diablo|lp|Diablo 630 Line Printer:\
-        :sh:sd=/var/spool/lpd/rattan:\
-        :lp=/dev/lpt0:\
-        :if=/usr/local/libexec/if-simple:
+        :sh:sd=<filename class="directory">/var/spool/lpd/rattan</filename>:\
+        :lp=<filename class="devicefile">/dev/lpt0</filename>:\
+        :if=<filename>/usr/local/libexec/if-simple</filename>:
 
 bamboo|ps|PS|S|panasonic|Panasonic KX-P4455 PostScript v51.4:\
-        :sh:sd=/var/spool/lpd/bamboo:sc:rg=artists:\
-        :lp=/dev/ttyd5:ms#-parenb cs8 clocal crtscts:rw:\
-        :if=/usr/local/libexec/psif:\
-        :df=/usr/local/libexec/psdf:</programlisting>
+        :sh:sd=<filename class="directory">/var/spool/lpd/bamboo</filename>:sc:rg=artists:\
+        :lp=<filename class="devicefile">/dev/ttyd5</filename>:ms#-parenb cs8 clocal crtscts:rw:\
+        :if=<filename>/usr/local/libexec/psif</filename>:\
+        :df=<filename>/usr/local/libexec/psdf</filename>:</programlisting>
 
 	<para>����ʳ��� <filename>/etc/printcap</filename> �ե�����
 	  (�ۥ��� <hostid>orchid</hostid> �Τ��)
@@ -3727,18 +3725,18 @@ bamboo|ps|PS|S|panasonic|Panasonic KX-P4455 PostScript v51.4:\
 #  No limit on job size:
 #
 rattan|line|diablo|lp|Diablo 630 Line Printer:\
-        :sh:mx#0:sd=/var/spool/lpd/rattan:\
-        :lp=/dev/lpt0:\
-        :if=/usr/local/libexec/if-simple:
+        :sh:mx#0:sd=<filename class="directory">/var/spool/lpd/rattan</filename>:\
+        :lp=<filename class="devicefile">/dev/lpt0</filename>:\
+        :if=<filename>/usr/local/libexec/if-simple</filename>:
 
 #
 #  Limit of five megabytes:
 #
 bamboo|ps|PS|S|panasonic|Panasonic KX-P4455 PostScript v51.4:\
-        :sh:sd=/var/spool/lpd/bamboo:sc:rg=artists:mx#5000:\
-        :lp=/dev/ttyd5:ms#-parenb cs8 clocal crtscts:rw:\
-        :if=/usr/local/libexec/psif:\
-        :df=/usr/local/libexec/psdf:</programlisting>
+        :sh:sd=<filename class="directory">/var/spool/lpd/bamboo</filename>:sc:rg=artists:mx#5000:\
+        :lp=<filename class="devicefile">/dev/ttyd5</filename>:ms#-parenb cs8 clocal crtscts:rw:\
+        :if=<filename>/usr/local/libexec/psif</filename>:\
+        :df=<filename>/usr/local/libexec/psdf</filename>:</programlisting>
 
 	<para>���ξ��⤽���Ǥ������������¤ϥ������� (�ۥ��� rose)
 	  �Υ桼���Τߤ�Ŭ�Ѥ���ޤ���
@@ -3756,12 +3754,12 @@ bamboo|ps|PS|S|panasonic|Panasonic KX-P4455 PostScript v51.4:\
 	<para>��⡼�ȥۥ��Ȥ���³���줿�ץ�󥿤ؤΥ���֤�
 	  �����������¤������̤���ˡ��¾�ˤ⤢��ޤ�������ˤĤ��Ƥϡ�
 	  ��<link linkend="printing-advanced-restricting-remote">
-	    ��⡼�ȥۥ��Ȥ���Υץ�󥿤����Ѥ����¤���</link>��
+	    ��⡼�ȥۥ��Ȥ�������Ѥ����¤���</link>��
 	  �򻲾Ȥ��Ƥ���������</para>
       </sect3>
 
       <sect3 id="printing-advanced-restricting-remote">
-	<title>��⡼�ȥۥ��Ȥ���Υץ�󥿤����Ѥ����¤���</title>
+	<title>��⡼�ȥۥ��Ȥ�������Ѥ����¤���</title>
 
 	<para><application>LPD</application> ���ס���󥰥����ƥ�Ǥϡ�
 	  ��⡼�ȥۥ��Ȥ����׵ᤵ�줿����֤ΰ��������¤��뤿�����ˡ�������Ĥ��󶡤���Ƥ��ޤ���</para>
@@ -3840,10 +3838,10 @@ madrigal.fishbaum.de</programlisting>
 		�Υ���ȥ���ʬ�򼨤��ޤ���</para>
 
 	      <programlisting>bamboo|ps|PS|S|panasonic|Panasonic KX-P4455 PostScript v51.4:\
-        :sh:sd=/var/spool/lpd/bamboo:sc:rg=artists:mx#5000:\
-        :lp=/dev/ttyd5:ms#-parenb cs8 clocal crtscts:rw:mx#5000:\
-        :if=/usr/local/libexec/psif:\
-        :df=/usr/local/libexec/psdf:</programlisting>
+        :sh:sd=<filename class="directory">/var/spool/lpd/bamboo</filename>:sc:rg=artists:mx#5000:\
+        :lp=<filename class="devicefile">/dev/ttyd5</filename>:ms#-parenb cs8 clocal crtscts:rw:mx#5000:\
+        :if=<filename>/usr/local/libexec/psif</filename>:\
+        :df=<filename>/usr/local/libexec/psdf</filename>:</programlisting>
 
 	      <para>���ס���󥰥ǥ��쥯�ȥ�� <literal>sd</literal>
 		���ܤǻ��ꤵ��ޤ���<application>LPD</application>
@@ -3852,7 +3850,7 @@ madrigal.fishbaum.de</programlisting>
 		(= 6144 �ǥ������֥��å�) �ˤ��뤳�Ȥˤ��ޤ��礦��
 	      </para>
 
-              <screen>&prompt.root; <userinput>echo 6144 &gt; /var/spool/lpd/bamboo/minfree
+              <screen>&prompt.root; <userinput><command>echo 6144 &gt; <filename>/var/spool/lpd/bamboo/minfree</filename></command>
               </userinput></screen>
 	    </listitem>
 	  </varlistentry>
@@ -3973,7 +3971,7 @@ madrigal.fishbaum.de</programlisting>
       <sect3>
 	<title>��ڤʥץ�󥿲ݶ���ˡ</title>
 
-	<para>FreeBSD �ˤϡ������Ū�˲ݶ⤹����ˡ�פˤ��ݶ��
+	<para>&os; �ˤϡ������Ū�˲ݶ⤹����ˡ�פˤ��ݶ��
 	  ����������Ǥ���褦�ˡ�2 �ĤΥץ�������ź�դ��Ƥ��ޤ���
 	  �������1�Ĥϥƥ����ȥե��륿 <command>lpf</command> �ǡ�
 	  ����ˤĤ��Ƥϡ���<link linkend="printing-advanced-lpf">
@@ -4112,7 +4110,7 @@ total                     337.00  154   $  6.74</screen>
 	  �ƥۥ��ȤΥ桼���̤˰����ڡ�������ɽ������ޤ���
 	  (�桼������������Τ��٤ƤΥۥ��Ȥ���ѤǤ��뤿��)
 	  �ۥ���̾�ξ��󤬰�̣������ʤ���硢
-	  <command>pac -m</command>
+	  <command>pac <option>-m</option></command>
 	  ��¹Ԥ��Ƥ������������Τ褦�ʥꥹ�Ȥ������ޤ���</para>
 
 	<screen>  Login               pages/feet   runs    price
@@ -4138,12 +4136,12 @@ total                     337.00  154   $  6.74</screen>
 	  100 ʬ�� 1 �����ñ�̤ǤϤʤ����ɥ�ñ�̤Ǥ������Ȥ��С����λ���Ǥϡ�
 	  1 �ڡ����������ñ���� 1 �ɥ� 50 ����Ȥˤʤ�ޤ���</para>
 
-	  <screen>&prompt.root; <userinput>pac -p1.50</userinput></screen>
+          <screen>&prompt.root; <userinput><command>pac <option>-p1.50</option></command></userinput></screen>
 
 	<para>���Υ��ץ�����Ȥ��ȡ�
 	  �ºݤβݶ�ۤ򽸷פ��뤳�Ȥ��Ǥ��ޤ���</para>
 
-	<para>�Ǹ�ˡ�<command>pac -s</command>
+	<para>�Ǹ�ˡ�<command>pac <option>-s</option></command>
 	  ��ư����ȡ��ݶ����ϲݶ�ǡ����߷ץե��������¸����ޤ���
 	  ���Υե������̾���ϡ��ץ�󥿤βݶ�ǡ����ե�����θ����
 	  <literal>_sum</literal> ���դ�����ΤȤʤ�ޤ��������ơ�
@@ -4224,7 +4222,7 @@ total                     337.00  154   $  6.74</screen>
       <primary>�ץ��</primary>
       <secondary>�Ȥ���</secondary>
     </indexterm>
-    <para>������Ǥϡ�FreeBSD �����ꤷ���ץ�󥿤�Ȥ���ˡ�ˤĤ����������ޤ���
+    <para>������Ǥϡ�&os; �����ꤷ���ץ�󥿤�Ȥ���ˡ�ˤĤ����������ޤ���
       �����Ǥϡ��桼����٥�ǤΥ��ޥ�ɤ��⤷�ޤ���</para>
 
     <variablelist>
@@ -4276,7 +4274,7 @@ total                     337.00  154   $  6.74</screen>
       <para>�ե������������뤿��ˤϡ�
 	���Τ褦�����Ϥ��Ƥ���������</para>
 
-      <screen>&prompt.user; <userinput>lpr <replaceable>filename</replaceable> <replaceable>...</replaceable></userinput></screen>
+      <screen>&prompt.user; <userinput><command>lpr <filename><replaceable>filename</replaceable></filename> <replaceable>...</replaceable></command></userinput></screen>
 
       <indexterm><primary>����</primary></indexterm>
       <para>����ˤ�ꡢ
@@ -4286,21 +4284,21 @@ total                     337.00  154   $  6.74</screen>
 	��ɸ�����Ϥ����������ǡ������ɤ߹��ߤޤ������Ȥ��С�
 	���Υ��ޥ�ɤˤ�ꡢ������פʥ����ƥ�ե����뤬��������ޤ���</para>
 
-      <screen>&prompt.user; <userinput>lpr /etc/host.conf /etc/hosts.equiv</userinput></screen>
+      <screen>&prompt.user; <userinput><command>lpr <filename>/etc/host.conf</filename> <filename>/etc/hosts.equiv</filename></command></userinput></screen>
 
       <para>����������ץ�󥿤����򤹤뤿��ˤϡ�
 	���Τ褦�����Ϥ��ޤ���</para>
 
-      <screen>&prompt.user; <userinput>lpr -P <replaceable>printer-name</replaceable> <replaceable>filename</replaceable> <replaceable>...</replaceable></userinput></screen>
+      <screen>&prompt.user; <userinput><command>lpr <option>-P</option> <replaceable>printer-name</replaceable> <filename><replaceable>filename</replaceable></filename> <replaceable>...</replaceable></command></userinput></screen>
 
       <para>������Ǥϡ��ץ�� <literal>rattan</literal> �ˡ�
 	�����ȥǥ��쥯�ȥ�ˤ���ե�����ξܺ٤ʥꥹ�Ȥ�������Ƥ��ޤ���</para>
 
-      <screen>&prompt.user; <userinput>ls -l | lpr -P rattan</userinput></screen>
+      <screen>&prompt.user; <userinput><command>ls <option>-l</option> | lpr <option>-P</option> rattan</command></userinput></screen>
 
       <para>�嵭�� &man.lpr.1; ���ޥ�ɤǤϥե�����̾�λ��꤬�ʤ��Τǡ�
 	<command>lpr</command> ��ɸ�����Ϥ����������ǡ�����
-	���ξ�硢<command>ls -l</command>
+	���ξ�硢<command>ls <option>-l</option></command>
 	���ޥ�ɤν��ϡ����ɤ߹��ߤޤ���</para>
 
       <para>&man.lpr.1; ���ޥ�ɤǤϡ�
@@ -4328,7 +4326,7 @@ total                     337.00  154   $  6.74</screen>
 	&man.lpq.1; �����Ϥ��ޤ����ץ�󥿤���ꤹ��Ȥ��ϡ�
 	<option>-P</option> ���ץ�����Ȥ��ޤ������Ȥ��С����Υ��ޥ��</para>
 
-      <screen>&prompt.user; <userinput>lpq -P bamboo</userinput></screen>
+	<screen>&prompt.user; <userinput><command>lpq <option>-P</option> bamboo</command></userinput></screen>
 
       <para>�ϡ��ץ�� <literal>bamboo</literal>
 	�Υ��塼�ξ��֤�ɽ�����ޤ������� <command>lpq</command>
@@ -4374,7 +4372,7 @@ active kelly    9    /etc/host.conf, /etc/hosts.equiv   88 bytes
 	<option>-l</option> ���ץ����⥵�ݡ��Ȥ��Ƥ��ޤ���
 	����ˤ�ꡢ
 	�ܤ�������ɽ������ޤ���
-	<command>lpq -l</command> �μ¹���򼡤˼����ޤ���</para>
+	<command>lpq <option>-l</option></command> �μ¹���򼡤˼����ޤ���</para>
 
       <screen>waiting for bamboo to become ready (offline ?)
 kelly: 1st                               [job 009rose]
@@ -4404,14 +4402,14 @@ mary: 3rd                                [job 011rose]
 	���ʤ�������줫�顢
 	���Τ褦�����Ϥ��ơ�����֤������ޤ���</para>
 
-      <screen>&prompt.user; <userinput>lprm <replaceable>job-number</replaceable></userinput></screen>
+      <screen>&prompt.user; <userinput><command>lprm <replaceable>job-number</replaceable></command></userinput></screen>
 
       <para>����Υץ�󥿤ؤΥ���֤�������Ȥ��ϡ�
 	<option>-P</option> ���ץ�����ȤäƤ��Υץ�󥿤���ꤷ�ޤ���
 	���Ȥ��С��ץ�� <literal>bamboo</literal>
 	�Υ��塼���饸����ֹ� 10 �Υ���֤�������ˤϼ��Τ褦�ˤ��ޤ���</para>
 
-      <screen>&prompt.user; <userinput>lprm -P bamboo 10</userinput></screen>
+      <screen>&prompt.user; <userinput><command>lprm <option>-P</option> bamboo 10</command></userinput></screen>
 
       <para>&man.lprm.1; ���ޥ�ɤˤ�ά��ˡ�������Ĥ�����ޤ���</para>
 
@@ -4450,7 +4448,7 @@ mary: 3rd                                [job 011rose]
 	�ץ�� <literal>rattan</literal> �Υ��塼�ؤ��ʤ������ä�����֤�
 	���٤ƺ�����뤿��ˤϼ��Τ褦�ˤ��ޤ���</para>
 
-      <screen>&prompt.user; <userinput>lprm -P rattan -</userinput></screen>
+      <screen>&prompt.user; <userinput><command>lprm <option>-P</option> rattan -</command></userinput></screen>
 
       <note>
 	<para>�ͥåȥ���Ķ��Ǻ�Ȥ򤷤Ƥ����硢
@@ -4461,16 +4459,16 @@ mary: 3rd                                [job 011rose]
 	  ���Υ���֤������뤳�ȤϤǤ��ޤ���
 	  ������Ǥϡ�¾�ۥ��Ȥ��饸��֤������뤳�Ȥ��ߤƤ��ޤ���</para>
 
-	<screen>&prompt.user; <userinput>lpr -P rattan <replaceable>myfile</replaceable></userinput>
-&prompt.user; <userinput>rlogin orchid</userinput>
-&prompt.user; <userinput>lpq -P rattan</userinput>
+	<screen>&prompt.user; <userinput><command>lpr <option>-P</option> rattan <filename><replaceable>myfile</replaceable></filename></command></userinput>
+&prompt.user; <userinput><command>rlogin orchid</command></userinput>
+&prompt.user; <userinput><command>lpq <option>-P</option> rattan</command></userinput>
 Rank   Owner      Job  Files                          Total Size
 active seeyan     12    ...                           49123 bytes
 2nd    kelly      13   myfile                         12 bytes
-&prompt.user; <userinput>lprm -P rattan 13</userinput>
+&prompt.user; <userinput><command>lprm <option>-P</option> rattan 13</command></userinput>
 rose: Permission denied
-&prompt.user; <userinput>logout</userinput>
-&prompt.user; <userinput>lprm -P rattan 13</userinput>
+&prompt.user; <userinput><command>logout</command></userinput>
+&prompt.user; <userinput><command>lprm <option>-P</option> rattan 13</command></userinput>
 dfA013rose dequeued
 cfA013rose dequeued
 	</screen>
@@ -4500,7 +4498,7 @@ cfA013rose dequeued
 	  DVI �ե�����
 	  <filename><replaceable>fish-report.dvi</replaceable></filename> ��������Ƥ��ޤ���</para>
 
-	<screen>&prompt.user; <userinput>lpr -P bamboo -d <replaceable>fish-report.dvi</replaceable></userinput></screen>
+	<screen>&prompt.user; <userinput><command>lpr <option>-P</option> bamboo -d <filename><replaceable>fish-report.dvi</replaceable></filename></command></userinput></screen>
 
 	<para>���Υ��ץ����ϡ�
 	  ����֤˴ޤޤ�뤹�٤ƤΥե�������Ф���Ŭ�Ѥ���ޤ���
@@ -4605,7 +4603,7 @@ cfA013rose dequeued
 	  �Υޥ˥奢�������������������Τ�ǥե���ȥץ�󥿤ǰ������Ƥ��ޤ���
 	</para>
 
-	<screen>&prompt.user; <userinput>zcat /usr/share/man/man1/ls.1.gz | troff -t -man | lpr -t</userinput></screen>
+	<screen>&prompt.user; <userinput><command>zcat <filename>/usr/share/man/man1/ls.1.gz</filename> | troff <option>-t</option> -man | lpr <option>-t</option></command></userinput></screen>
 
 	<para>&man.zcat.1; ���ޥ�ɤ�
 	  &man.ls.1; �Υޥ˥奢��Υ������ե�����ΰ��̤��������������
@@ -4645,7 +4643,7 @@ cfA013rose dequeued
 		<filename><replaceable>parser.c</replaceable></filename> �� 3 �����ԡ��������ˡ�
 		<filename><replaceable>parser.h</replaceable></filename> �� 3 �����ԡ����Ƥ��ޤ���</para>
 
-	      <screen>&prompt.user; <userinput>lpr -#3 <replaceable>parser.c parser.h</replaceable></userinput></screen>
+	      <screen>&prompt.user; <userinput><command>lpr <option>-#3</option> <filename><replaceable>parser.c parser.h</replaceable></filename></command></userinput></screen>
 
 	    </listitem>
 	  </varlistentry>
@@ -4971,11 +4969,11 @@ cfA013rose dequeued
     <title>ɸ�ॹ�ס����������</title>
 
     <para>���Υޥ˥奢���ǽ餫�����ɤ���Ƥ������ʤ�С������ޤǤǡ�
-      FreeBSD ��°�� <application>LPD</application>
+      &os; ��°�� <application>LPD</application>
       ���ס���󥰥����ƥ�˴ؤ����ΤäƤ����٤����Ȥ��٤Ƥ�ؤФ줿���ȤȻפ��ޤ���
       ¿ʬ�����Υ����ƥ�ˤ��뤿������η����ˤĤ���ǧ���Ǥ������ȤǤ��礦��
       ��������
-      <quote>(FreeBSD ���ư���)
+      <quote>(&os; ���ư���)
       ���ס���󥰥����ƥ�ˤ�¾�ˤɤΤ褦�ʤ�Τ�����Τ�</quote>
       �Ȥ������䤬������ͯ���Ƥ��ޤ���</para>
 
@@ -5081,9 +5079,9 @@ exit 2</programlisting>
 	      <listitem>
 		<para>���Ϥ��줿��ˤϼ��Τ褦�˰�������Ƥ��ޤ�����</para>
 
-		<programlisting>!"#$%&amp;'()*+,-./01234
-                            "#$%&amp;'()*+,-./012345
-                                                         #$%&amp;'()*+,-./0123456</programlisting>
+	  <screen>!"#$%&amp;'()*+,-./01234
+                 "#$%&amp;'()*+,-./012345
+                                 #$%&amp;'()*+,-./0123456</screen>
 
           <indexterm><primary>MS-DOS</primary></indexterm>
           <indexterm><primary>OS/2</primary></indexterm>
@@ -5101,7 +5099,7 @@ exit 2</programlisting>
 		  �Τߤ�ɽ������Ƥ��ޤ�)������Υץ�󥿤Ǥϡ�
 		  ���Ԥ�ɽ�魯����� &ms-dos; �δ����ˤ��������ޤ���</para>
 
-		<para>FreeBSD �ǰ��������硢���������ƥ����Ȥ� LF
+		<para>&os; �ǰ��������硢���������ƥ����Ȥ� LF
 		  ʸ������ ���Ȥ��Ƥ��ޤ������ץ�󥿤Ǥ� LF
 		  ʸ���򸫤Ĥ���ȡ���� 1 ��ʬ����Ф��ޤ�������������
 		  ����ʸ����������뤿
@@ -5109,7 +5107,7 @@ exit 2</programlisting>
 		  ʸ������̣���뤳�Ȥϡ�
 		  ����ʸ�������������֤��κ�ü��ư�������ȤǤ���</para>
 
-		<para>FreeBSD
+		<para>&os;
 		  ���ץ�󥿤�ư��򤷤��ߤ����ȻפäƤ���ư���ʲ��˼����ޤ���
 		</para>
 
@@ -5138,7 +5136,7 @@ exit 2</programlisting>
 		      �ɤΤ褦�ˤ�������򤹤뤫�ϥץ�󥿤Υޥ˥奢��򻲾Ȥ��Ƥ���������</para>
 
 		    <note>
-		      <para>FreeBSD
+		      <para>&os;
 			�ʳ��Υ��ڥ졼�ƥ��󥰥����ƥ���ڤ��ؤ��ƻȤ���硢
 			CR �� LF ʸ���β��򤽤Υ��ڥ졼�ƥ��󥰥����ƥ�ǻȤ��Ƥ���褦�˥ץ�󥿤�
 			<emphasis>������</emphasis>����ɬ�פ����뤫�⤷��ޤ���
@@ -5149,7 +5147,7 @@ exit 2</programlisting>
 
 		  <listitem>
 		    <para>��ưŪ�� LF �� CR+LF ���Ѵ����Ƥ����
-		      FreeBSD �ѤΥ��ꥢ��ɥ饤�Ф����ꤹ����ˡ��
+		      &os; �ѤΥ��ꥢ��ɥ饤�Ф����ꤹ����ˡ��
 		      ������󡢤��Υɥ饤�Фϥץ�����Ѥ���³�����
 		      ���ꥢ��ݡ���
 		      <emphasis>�Τ�</emphasis>��ư��ޤ���
@@ -5206,8 +5204,8 @@ exit 2</programlisting>
 #  /etc/printcap for host orchid
 #
 teak|hp|laserjet|Hewlett Packard LaserJet 3Si:\
-        :lp=/dev/lpt0:sh:sd=/var/spool/lpd/teak:mx#0:\
-        :if=/usr/local/libexec/hpif:</programlisting>
+        :lp=<filename class="devicefile">/dev/lpt0</filename>:sh:sd=<filename class="directory">/var/spool/lpd/teak</filename>:mx#0:\
+        :if=<filename>/usr/local/libexec/hpif</filename>:</programlisting>
 		  </listitem>
 
 		  <listitem>
@@ -5235,7 +5233,7 @@ teak|hp|laserjet|Hewlett Packard LaserJet 3Si:\
 
 		<para>��������ϡ�
 		  ���ʸ��ݤȤ� <quote>��ȿ��</quote> ������ǡ�
-		  �ۤȤ�ɤޤ�ˤ���������ޤ���FreeBSD �ǤϹ����Ȥ��ư�����
+		  �ۤȤ�ɤޤ�ˤ���������ޤ���&os; �ǤϹ����Ȥ��ư�����
 		  LF  ʸ��������κ�ü�˰������֤��������ޤ�����
 		  ������Ϥ��ʤ� CR ʸ���Ȥ��ư����Ƥ��ޤ���</para>
 
@@ -5300,17 +5298,19 @@ teak|hp|laserjet|Hewlett Packard LaserJet 3Si:\
 		  <listitem>
 		    <para>�ץ�󥿤� XON/XOFF �Υե�������򥵥ݡ���
 		      ���Ƥ�����ϡ����� <literal>ms#</literal> ��
-		      <literal>ixon</literal> �⡼�ɤ򥻥åȤ��ơ�FreeBSD
+		      <literal>ixon</literal> �⡼�ɤ򥻥åȤ��ơ�&os;
 		      �ˤ��ε�ǽ����Ѥ����Ƥ���������</para>
 		  </listitem>
 
 		  <listitem>
-		    <para>�ץ�󥿤�����ꥢ�ե�������򥵥ݡ��Ȥ���
+		    <para>�ץ�󥿤� Request to Send / Clear to Send
+		      �ϡ��ɥ������ϥ�ɥ�������
+		      (�̾� <literal>RTS/CTS</literal>) �򥵥ݡ��Ȥ���
 		      ������ϡ����� <literal>ms#</literal> ��
 		      <literal>crtscts</literal>
 		      �⡼�ɤ򥻥åȤ��Ʋ����������줫�顢
 		      �ץ�󥿤ȥ���ԥ塼������³���Ƥ��륷�ꥢ�륱���֥뤬
-		      ����ꥢ�ե��������Ѥ��������������줿��Τ��ɤ������ǧ���Ƥ���������</para>
+		      �ϡ��ɥ������ե��������Ѥ��������������줿��Τ��ɤ������ǧ���Ƥ���������</para>
 		  </listitem>
 		</itemizedlist>
 	      </listitem>
@@ -5361,7 +5361,7 @@ teak|hp|laserjet|Hewlett Packard LaserJet 3Si:\
 	    <varlistentry><term>���ⵯ���ʤ�</term>
 	      <listitem>
 		<para>�⤷�ץ�󥿤�����ư��⤷�ʤ��ΤǤ���С�
-		  �ϡ���Ū������ǤϤʤ���¿ʬ FreeBSD
+		  �ϡ���Ū������ǤϤʤ���¿ʬ &os;
 		  ��������꤬����ޤ���
 		  <filename>/etc/printcap</filename> �ե�����ǡ�
 		  �ǥХå����Ƥ���ץ�󥿤Υ���ȥ��
@@ -5371,10 +5371,10 @@ teak|hp|laserjet|Hewlett Packard LaserJet 3Si:\
 		  <literal>lf</literal> �ϼ��Τ褦�ˤʤ�ޤ���</para>
 
 		<programlisting>rattan|line|diablo|lp|Diablo 630 Line Printer:\
-        :sh:sd=/var/spool/lpd/rattan:\
-        :lp=/dev/lpt0:\
-        :if=/usr/local/libexec/if-simple:\
-        :lf=/var/log/rattan.log</programlisting>
+        :sh:sd=<filename class="directory">/var/spool/lpd/rattan</filename>:\
+        :lp=<filename class="devicefile">/dev/lpt0</filename>:\
+        :if=<filename>/usr/local/libexec/if-simple</filename>:\
+        :lf=<filename>/var/log/rattan.log</filename></programlisting>
 
 		<para>���ˡ��⤦���ٰ����򤪤��ʤäƤߤޤ��������ơ�
 		  ȯ�������Ȼפ��륨�顼��å������򸫤뤿��˥����ե�����
@@ -5386,7 +5386,7 @@ teak|hp|laserjet|Hewlett Packard LaserJet 3Si:\
 		<para>���� <literal>lf</literal>
 		  �����ꤵ��Ƥ��ʤ���硢<application>LPD</application>
 		  �ϥǥե���ȤΥ����ե�����Ȥ���
-		  <filename>/dev/console</filename> ��Ȥ��ޤ���</para>
+		  <filename class="devicefile">/dev/console</filename> ��Ȥ��ޤ���</para>
 	      </listitem>
 	    </varlistentry>
 	  </variablelist>