svn commit: r42562 - head/ja_JP.eucJP/books/handbook/printing

Ryusuke SUZUKI ryusuke at FreeBSD.org
Mon Aug 19 02:45:32 UTC 2013


Author: ryusuke
Date: Mon Aug 19 02:45:31 2013
New Revision: 42562
URL: http://svnweb.freebsd.org/changeset/doc/42562

Log:
  - Merge the following from the English version:
  
  	r41064 -> r42402	head/ja_JP.eucJP/books/handbook/printing/chapter.xml

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

Modified: head/ja_JP.eucJP/books/handbook/printing/chapter.xml
==============================================================================
--- head/ja_JP.eucJP/books/handbook/printing/chapter.xml	Mon Aug 19 01:06:13 2013	(r42561)
+++ head/ja_JP.eucJP/books/handbook/printing/chapter.xml	Mon Aug 19 02:45:31 2013	(r42562)
@@ -3,7 +3,7 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: r41064
+     Original revision: r42402
      $FreeBSD$
 -->
 
@@ -121,10 +121,8 @@
       </listitem>
 
       <listitem>
-	<indexterm><primary>¥×¥ê¥ó¥È¥¸¥ç¥Ö</primary></indexterm>
-
 	<para>¥Õ¥¡¥¤¥ë¤ò¥×¥ê¥ó¥È¤¹¤ëÍ×µá¤ËÂФ·¤Æµö²Ä¤òÍ¿¤¨¤Þ¤¹¡£
-	  ¤³¤ÎÍ×µá¤ÏÆäË<emphasis>¥¸¥ç¥Ö</emphasis>¤È¸Æ¤Ð¤ì¤Æ¤¤¤Þ¤¹¡£</para>
+	  ¤³¤ÎÍ×µá¤ÏÆäË<emphasis>¥¸¥ç¥Ö</emphasis><indexterm><primary>¥×¥ê¥ó¥È¥¸¥ç¥Ö</primary></indexterm>¤È¸Æ¤Ð¤ì¤Æ¤¤¤Þ¤¹¡£</para>
       </listitem>
 
       <listitem>
@@ -180,12 +178,12 @@
         </listitem>
 
         <listitem>
-	  <indexterm><primary>&tex;</primary></indexterm>
-
 	  <para><application>LPD</application>
 	    ¤Ç¤Ï¥¸¥ç¥Ö¤ò¥Õ¥£¥ë¥¿¤òÄ̤·¤Æ¥×¥ê¥ó¥È¤¹¤ë¤³¤È¤¬´Êñ¤Ë¤Ç¤­¤Þ¤¹¡£
             ¤³¤ì¤Ë¤è¤ê¡¢°õºþʪ¤Î¥Ø¥Ã¥À¤Ë»þ¹ï¤äÆüÉÕ¤òÆþ¤ì¤¿¤ê¡¢
-            ÆÃÊ̤ʥե¡¥¤¥ë·Á¼° (&tex; ¤Î DVI ¥Õ¥¡¥¤¥ë¤Ê¤É)
+            ÆÃÊ̤ʥե¡¥¤¥ë·Á¼°
+	    (&tex;<indexterm><primary>&tex;</primary></indexterm>
+	    ¤Î DVI ¥Õ¥¡¥¤¥ë¤Ê¤É)
             ¤ò¥×¥ê¥ó¥¿¤¬½èÍý¤Ç¤­¤ë·Á¼°¤ËÊѹ¹¤¹¤ë¤³¤È¤¬¤Ç¤­¡¢
             ¤³¤ì¤é¤Îºî¶È¤ò¼êÆ°¤Ç¹Ô¤Ê¤¦É¬Íפ¬¤Ê¤¯¤Ê¤ê¤Þ¤¹¡£</para>
         </listitem>
@@ -287,8 +285,8 @@
 
           <itemizedlist>
             <listitem>
-              <para><emphasis>¥·¥ê¥¢¥ë</emphasis>¥¤¥ó¥¿¥Õ¥§¡¼¥¹¡¢
-		¤Ï RS-232 ¤Þ¤¿¤Ï COM ¥Ý¡¼¥È¤È¤â¸Æ¤Ð¤ì¤Þ¤¹¤¬¡¢
+              <para><emphasis>¥·¥ê¥¢¥ë</emphasis><indexterm><primary>¥×¥ê¥ó¥¿</primary><secondary>¥·¥ê¥¢¥ë</secondary></indexterm>¥¤¥ó¥¿¥Õ¥§¡¼¥¹
+		(RS-232 ¤Þ¤¿¤Ï COM ¥Ý¡¼¥È¤È¤â¸Æ¤Ð¤ì¤Þ¤¹) ¤Ï¡¢
 		¥³¥ó¥Ô¥å¡¼¥¿¤Ë¤¢¤ë¥·¥ê¥¢¥ë¥Ý¡¼¥È¤ò»È¤Ã¤Æ¥×¥ê¥ó¥¿¤Ë¥Ç¡¼¥¿¤òÁ÷¿®¤·¤Þ¤¹¡£
                 ¥·¥ê¥¢¥ë¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤Ï¥³¥ó¥Ô¥å¡¼¥¿¶È³¦¤Ç¶¦Ä̤·¤Æ»ÈÍѤµ¤ì¤Æ¤¤¤Þ¤¹¡£
                 ¤½¤Î¥±¡¼¥Ö¥ë¤ÏÍưפ˼ê¤ËÆþ¤ê¤Þ¤¹¤·¡¢´Êñ¤Ë¼«ºî¤¹¤ë¤³¤È¤â¤Ç¤­¤Þ¤¹¡£
@@ -300,12 +298,7 @@
             </listitem>
 
             <listitem>
-	      <indexterm>
-		<primary>¥×¥ê¥ó¥¿</primary>
-		<secondary>¥Ñ¥é¥ì¥ë</secondary>
-	      </indexterm>
-
-              <para><emphasis>¥Ñ¥é¥ì¥ë</emphasis>¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤Ç¤Ï¥×¥ê¥ó¥¿¤Ë¥Ç¡¼¥¿¤òÁ÷¿®¤¹¤ë¤¿¤á¤Ë¡¢
+              <para><emphasis>¥Ñ¥é¥ì¥ë</emphasis><indexterm><primary>¥×¥ê¥ó¥¿</primary><secondary>¥Ñ¥é¥ì¥ë</secondary></indexterm>¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤Ç¤Ï¥×¥ê¥ó¥¿¤Ë¥Ç¡¼¥¿¤òÁ÷¿®¤¹¤ë¤¿¤á¤Ë¡¢
                 ¥³¥ó¥Ô¥å¡¼¥¿¤Ë¤¢¤ë¥Ñ¥é¥ì¥ë¥Ý¡¼¥È¤ò»ÈÍѤ·¤Þ¤¹¡£
 		¥Ñ¥é¥ì¥ë¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤Ï PC ¶È³¦¤Ç¤Ï¤è¤¯»È¤ï¤ì¤Æ¤ª¤ê¡¢
 		RS-232 ¥·¥ê¥¢¥ë¤è¤ê¤â®¤¤¤Ç¤¹¡£
@@ -314,21 +307,15 @@
                 ¥Ñ¥é¥ì¥ë¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤Ë¤ÏÄ̾ÄÌ¿®Êý¼°¤ÎÁªÂò¤Ï¤Ê¤¯¡¢
                 ÀßÄê¤Ï¶Ë¤á¤Æñ½ã¤Ç¤¹¡£</para>
 
-              <indexterm>
-                <primary>¥»¥ó¥È¥í¥Ë¥¯¥¹</primary>
-                <see>¥Ñ¥é¥ì¥ë¥×¥ê¥ó¥¿</see>
-              </indexterm>
-	    <para>¥Ñ¥é¥ì¥ë¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤Ï <quote>¥»¥ó¥È¥í¥Ë¥¯¥¹</quote> ¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤È¤·¤ÆÃΤé¤ì¤Æ¤¤¤Þ¤¹¡£
+	    <para>¥Ñ¥é¥ì¥ë¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤Ï
+	      <quote>¥»¥ó¥È¥í¥Ë¥¯¥¹</quote><indexterm><primary>¥»¥ó¥È¥í¥Ë¥¯¥¹</primary><see>¥Ñ¥é¥ì¥ë¥×¥ê¥ó¥¿</see></indexterm>
+		¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤È¤·¤ÆÃΤé¤ì¤Æ¤¤¤Þ¤¹¡£
                 ¤³¤ì¤Ï¡¢¥×¥ê¥ó¥¿ÍѤΥ³¥Í¥¯¥¿¥¿¥¤¥×¤È¤·¤ÆºÎÍѤµ¤ì¤¿¸å¤Ë̾ÉÕ¤±¤é¤ì¤Þ¤·¤¿¡£</para>
             </listitem>
 
 	    <listitem>
-	      <indexterm>
-	        <primary>¥×¥ê¥ó¥¿</primary>
-	        <secondary>USB</secondary>
-	      </indexterm>
-
-	      <para>USB ¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤Ï¡¢Universal Serial Bus
+	      <para>USB<indexterm><primary>¥×¥ê¥ó¥¿</primary><secondary>USB</secondary></indexterm>
+		¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤Ï¡¢Universal Serial Bus
 		(ÈÆÍÑ¥·¥ê¥¢¥ë¥Ð¥¹) ¤Îά¤Ç¡¢¥Ñ¥é¥ì¥ë¤ä RS-232
 		¥·¥ê¥¢¥ë¤è¤ê¤µ¤é¤Ë®¤¯Æ°ºî¤·¤Þ¤¹¡£
 		¥±¡¼¥Ö¥ë¤Ïñ½ã¤Ç°Â²Á¤Ç¤¹¡£USB ¤Ï¡¢°õºþÌÜŪ¤Ë¤Ï RS-232
@@ -413,9 +400,7 @@
             </listitem>
 
             <listitem>
-	      <indexterm><primary>¥Ì¥ë¥â¥Ç¥àÍÑ¥±¡¼¥Ö¥ë</primary></indexterm>
-
-              <para><emphasis>¥Ì¥ë¥â¥Ç¥à</emphasis>ÍÑ¥±¡¼¥Ö¥ë¤Ç¤Ï¡¢
+              <para><emphasis>¥Ì¥ë¥â¥Ç¥à</emphasis>ÍÑ¥±¡¼¥Ö¥ë<indexterm><primary>¥Ì¥ë¥â¥Ç¥àÍÑ¥±¡¼¥Ö¥ë</primary></indexterm>¤Ç¤Ï¡¢
                 ¤¢¤ë¥Ô¥ó¤ÏÂбþ¤¹¤ë¥Ô¥ó¤È¤òÀܳ¤·¤Æ¤¤¤Þ¤¹¤¬¡¢
                 ¤¢¤ë¥Ô¥ó
                 (¤¿¤È¤¨¤Ð¡¢¥Ç¡¼¥¿Á÷¿®ÍѤȥǡ¼¥¿¼õ¿®ÍѤΥԥó)
@@ -725,11 +710,7 @@ showpage</programlisting>
 	  <sect4 id="printing-checking-parallel">
 	    <title>¥Ñ¥é¥ì¥ë¥Ý¡¼¥È¤Î¥×¥ê¥ó¥¿¤È¤ÎÀܳ¤òÄ´¤Ù¤ë</title>
 
-            <indexterm>
-              <primary>¥×¥ê¥ó¥¿</primary>
-              <secondary>¥Ñ¥é¥ì¥ë</secondary>
-            </indexterm>
-	    <para>¤³¤ÎÀá¤Ç¤Ï¡¢&os; ¤¬¥Ñ¥é¥ì¥ë¥Ý¡¼¥È¤ËÀܳ¤µ¤ì¤¿¥×¥ê
+	    <para>¤³¤ÎÀá¤Ç¤Ï¡¢&os; ¤¬¥Ñ¥é¥ì¥ë<indexterm><primary>¥×¥ê¥ó¥¿</primary><secondary>¥Ñ¥é¥ì¥ë</secondary></indexterm>¥Ý¡¼¥È¤ËÀܳ¤µ¤ì¤¿¥×¥ê
 	      ¥ó¥¿¤ÈÄÌ¿®¤Ç¤­¤Æ¤¤¤ë¤«¤É¤¦¤«¤òÄ´¤Ù¤ëÊýË¡¤Ë¤Ä¤¤¤ÆÀâÌÀ¤·
 	      ¤Æ¤¤¤Þ¤¹¡£</para>
 
@@ -943,10 +924,8 @@ showpage</programlisting>
 	  </step>
 
 	  <step>
-	    <indexterm><primary>¥Ø¥Ã¥À¥Ú¡¼¥¸</primary></indexterm>
-
 	    <para><literal>sh</literal> ¤Î¹àÌܤòÄɲ乤뤳¤È¤Ç¡¢
-	      ¥Ø¥Ã¥À¥Ú¡¼¥¸¤Î½ÐÎϤò¶Ø»ß¤·¤Þ¤¹ (¥Ç¥Õ¥©¥ë¥È¤Ïµö²Ä)¡£
+	      ¥Ø¥Ã¥À¥Ú¡¼¥¸<indexterm><primary>¥Ø¥Ã¥À¥Ú¡¼¥¸</primary></indexterm>¤Î½ÐÎϤò¶Ø»ß¤·¤Þ¤¹ (¥Ç¥Õ¥©¥ë¥È¤Ïµö²Ä)¡£
 	      ¤³¤ì¤Ë¤Ä¤¤¤Æ¤Ï¡¢¡Ö<link
 		linkend="printing-no-header-pages">
 		¥Ø¥Ã¥À¥Ú¡¼¥¸¤Î°õ»ú¤ò¶Ø»ß¤¹¤ë</link>¡×
@@ -1774,12 +1753,7 @@ $%&'()*+,-./01234567
 	  </listitem>
 
 	  <listitem>
-	    <indexterm>
-	      <primary>°õºþ</primary>
-	      <secondary>¥Õ¥£¥ë¥¿</secondary>
-	    </indexterm>
-
-	    <para><emphasis>ÊÑ´¹¥Õ¥£¥ë¥¿</emphasis>¤Ï¡¢
+	    <para><emphasis>ÊÑ´¹¥Õ¥£¥ë¥¿</emphasis><indexterm><primary>°õºþ</primary><secondary>¥Õ¥£¥ë¥¿</secondary></indexterm>¤Ï¡¢
 	      ÆÃÄê¤Î¥Õ¥¡¥¤¥ë·Á¼°¤ò¥×¥ê¥ó¥¿
 	      ¤¬»æ¤Ë°õ»ú¤Ç¤­¤ë¤è¤¦¤Ê¤â¤Î¤ËÊÑ´¹¤·¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢
 	      ¥×¥ê¥ó¥¿¤Ç ditroff ÁÈÈǥǡ¼¥¿¤òľÀÜ°õ»ú¤¹¤ë¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó¡£
@@ -4986,10 +4960,8 @@ cfA013rose dequeued
         <term>LPRng</term>
 
 	<listitem>
-	  <indexterm><primary>LPRng</primary></indexterm>
-
-	  <para><quote>¼¡À¤Âå LPR</quote> ¤ò¾Î¤¹¤ë
-	    <application>LPRng</application> ¤Ï¡¢
+	  <para><quote>¼¡À¤Âå LPR</quote><indexterm><primary>LPRng</primary></indexterm>
+	    ¤ò¾Î¤¹¤ë<application>LPRng</application> ¤Ï¡¢
 	    PLP ¤ò´°Á´¤Ë½ñ¤­´¹¤¨¤¿¤â¤Î¤Ç¤¹¡£
             Patrick Powell ¤È Justin Mason (PLP ¤Î¼çÍפʴÉÍý¼Ô)
 	    ¤¬¶¦Æ±¤Ç <application>LPRng</application> ¤òºîÀ®¤·¤Þ¤·¤¿¡£
@@ -5002,9 +4974,7 @@ cfA013rose dequeued
 	<term>CUPS</term>
 
 	<listitem>
-	  <indexterm><primary>CUPS</primary></indexterm>
-
-	  <para><application>CUPS</application> (the Common UNIX Printing
+	  <para><application>CUPS</application><indexterm><primary>CUPS</primary></indexterm> (the Common UNIX Printing
 	    System) ¤Ï¡¢&unix; ¥Ù¡¼¥¹¤Î¥ª¥Ú¥ì¡¼¥Æ¥£¥ó¥°¥·¥¹¥Æ¥à¤ËÂФ·¤Æ¡¢
 	    °Ü¿¢À­¤Î¹â¤¤°õºþ¥ì¥¤¥ä¤òÄ󶡤·¤Þ¤¹¡£
 	    <application>CUPS</application> ¤Ï Easy Software Products
@@ -5034,9 +5004,7 @@ cfA013rose dequeued
 	<term>HPLIP</term>
 
 	<listitem>
-	  <indexterm><primary>HPLIP</primary></indexterm>
-
-	  <para><application>HPLIP</application>
+	  <para><application>HPLIP</application><indexterm><primary>HPLIP</primary></indexterm>
 	    (the HP &linux; Imaging and Printing system) ¤Ï¡¢
 	    HP ¥¢¥×¥é¥¤¥¢¥ó¥¹ÍÑ¤Ë HP ¤¬³«È¯¤·¤¿¡¢
 	    ¥×¥ê¥ó¥¿¡¢¥¹¥­¥ã¥Ê¡¢¥Õ¥¡¥Ã¥¯¥¹¤Ø¤ÎÂбþ¤Î¤¿¤á¤Î¥×¥í¥°¥é¥à·²¤Ç¤¹¡£
@@ -5109,16 +5077,14 @@ exit 2</programlisting>
                  "#$%&'()*+,-./012345
                                  #$%&'()*+,-./0123456</screen>
 
-          <indexterm><primary>MS-DOS</primary></indexterm>
-          <indexterm><primary>OS/2</primary></indexterm>
-          <indexterm><primary>ASCII</primary></indexterm>
 		<para>¤¢¤Ê¤¿¤Ï<emphasis>¡Ö³¬Ãʸú²Ì¡×</emphasis>
 		  ¤Î¿·¤¿¤Ê¤ëµ¾À·¼Ô¤Ë¤Ê¤Ã¤Æ¤·¤Þ¤¤¤Þ¤·¤¿¡£¤³¤Î¸¶°ø¤Ï¡¢
 		  ²þ¹Ô¤òɽ¤ï¤¹¤Ù¤­Ê¸»ú¤¬¤Ê¤ó¤Ç¤¢¤ë¤«
                   ¤Î²ò¼á¤¬º®Í𤷤Ƥ¤¤ë¤³¤È¤Ë¤¢¤ê¤Þ¤¹¡£&unix;
 		  ¥¹¥¿¥¤¥ë¤Î¥ª¥Ú¥ì¡¼¥Æ¥£¥ó¥°¥·¥¹¥Æ¥à¤Ç¤Ï¡¢²þ¹Ôʸ»ú¤Ï
-		  ASCII ¥³¡¼¥É 10 ¤Î line feed (LF)
-		  ¤Î 1 ʸ»ú¤¬»È¤ï¤ì¤Æ¤¤¤Þ¤¹¡£&ms-dos; ¤ä &os2; ¤Ê¤É¤Ï ASCII
+		  ASCII<indexterm><primary>ASCII</primary></indexterm> ¥³¡¼¥É 10 ¤Î line feed (LF)
+		  ¤Î 1 ʸ»ú¤¬»È¤ï¤ì¤Æ¤¤¤Þ¤¹¡£&ms-dos;<indexterm><primary>MS-DOS</primary></indexterm>
+		  ¤ä &os2;<indexterm><primary>OS/2</primary></indexterm> ¤Ê¤É¤Ï ASCII
 		  ¥³¡¼¥É 10¤Î LF <emphasis>¤È</emphasis>¡¢ASCII ¥³¡¼¥É
 		  13 ¤Îʸ»ú (carriage return ¤Þ¤¿¤Ï CR)
 		  ¤ò¥Ú¥¢¤Ç»È¤¤¤Þ¤¹ (ÌõÃí: Macintosh ¤Ç¤Ï CR


More information about the svn-doc-all mailing list