svn commit: r41072 - in head/ja_JP.eucJP/books/handbook: install multimedia printing

Ryusuke SUZUKI ryusuke at FreeBSD.org
Sat Mar 2 17:23:43 UTC 2013


Author: ryusuke
Date: Sat Mar  2 17:23:42 2013
New Revision: 41072
URL: http://svnweb.freebsd.org/changeset/doc/41072

Log:
  - Merge the following from the English version:
  
  	r40601 -> r41064	head/ja_JP.eucJP/books/handbook/install/chapter.xml
  	r38167 -> r41064	head/ja_JP.eucJP/books/handbook/multimedia/chapter.xml
  	r40980 -> r41064	head/ja_JP.eucJP/books/handbook/printing/chapter.xml

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

Modified: head/ja_JP.eucJP/books/handbook/install/chapter.xml
==============================================================================
--- head/ja_JP.eucJP/books/handbook/install/chapter.xml	Sat Mar  2 15:53:52 2013	(r41071)
+++ head/ja_JP.eucJP/books/handbook/install/chapter.xml	Sat Mar  2 17:23:42 2013	(r41072)
@@ -3,7 +3,7 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: rr40601
+     Original revision: r41064
      $FreeBSD$
 -->
 
@@ -4663,8 +4663,8 @@ Please press any key to reboot.</screen>
 	  <para>Ä̾¤³¤Î¥Ç¥£¥ì¥¯¥È¥ê¤Ë¤Ï°Ê²¼¤Î¥¤¥á¡¼¥¸¤¬ÃÖ¤¤¤Æ¤¢¤ê¤Þ¤¹¡£</para>
 
 	  <table frame="none">
-	    <title>FreeBSD 7.<replaceable>X</replaceable> ¤ª¤è¤Ó
-	      8.<replaceable>X</replaceable> ISO ¥¤¥á¡¼¥¸¤Î̾Á°¤ÈÆâÍÆ</title>
+	    <title>&os; 8.<replaceable>X</replaceable>
+	      ISO ¥¤¥á¡¼¥¸¤Î̾Á°¤ÈÆâÍÆ</title>
 
 	    <tgroup cols="2">
 	      <thead>

Modified: head/ja_JP.eucJP/books/handbook/multimedia/chapter.xml
==============================================================================
--- head/ja_JP.eucJP/books/handbook/multimedia/chapter.xml	Sat Mar  2 15:53:52 2013	(r41071)
+++ head/ja_JP.eucJP/books/handbook/multimedia/chapter.xml	Sat Mar  2 17:23:42 2013	(r41072)
@@ -3,7 +3,7 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: 1.144
+     Original revision: r41064
      $FreeBSD$
 -->
 
@@ -1706,9 +1706,7 @@ bktr0: Pinnacle/Miro TV, Philips SECAM t
 	<application>SANE</application> ¤Ë¤Ï
 	¥¹¥­¥ã¥Ê¤Ë¤Ä¤¤¤Æ¤Î¾ðÊó¤È¤½¤Î¾õ¶·¤¬¤Þ¤È¤á¤é¤ì¤Æ¤¤¤ë <ulink
 	  url="http://www.sane-project.org/sane-supported-devices.html">Âбþ¥Ç¥Ð¥¤¥¹¤Î°ìÍ÷</ulink>
-	¤¬¤¢¤ê¤Þ¤¹¡£&os; 8.X ¤è¤êÁ°¤Î¥·¥¹¥Æ¥à¤Ç¤Ï¡¢
-	&os; ¤Î &man.uscanner.4;
-	¥Þ¥Ë¥å¥¢¥ë¥Ú¡¼¥¸¤Ë¤âÂбþ USB ¥¹¥­¥ã¥Ê¤Î°ìÍ÷¤¬µ­ºÜ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£</para>
+	¤¬¤¢¤ê¤Þ¤¹¡£</para>
     </sect2>
 
     <sect2>
@@ -1732,16 +1730,6 @@ device uhci
 device ohci
 device ehci</programlisting>
 
-	<para>&os; 8.X
-	  ¤è¤êÁ°¤Î¥·¥¹¥Æ¥à¤Ç¤Ï°Ê²¼¤Î¹Ô¤âɬÍפȤʤê¤Þ¤¹¡£</para>
-
-	<programlisting>device uscanner</programlisting>
-
-	<para>¤³¤Î¥Ð¡¼¥¸¥ç¥ó¤Î &os; ¤Ç¤Ï¡¢&man.uscanner.4;
-	  ¥Ç¥Ð¥¤¥¹¥É¥é¥¤¥Ð¤¬ USB ¥¹¥­¥ã¥Ê¤Ø¤Î¥¢¥¯¥»¥¹¤òÄ󶡤·¤Æ¤¤¤Þ¤¹¡£
-	  &os; 8.0 °Ê¹ß¤Ç¤Ï¡¢&man.libusb.3;
-	  ¥é¥¤¥Ö¥é¥ê¤¬Ä¾ÀÜÄ󶡤·¤Þ¤¹¡£</para>
-
 	<para>ŬÀڤʥɥ饤¥Ð¤òÁȤ߹þ¤ó¤À¥«¡¼¥Í¥ë¤ÇºÆµ¯Æ°¸å¡¢
 	  USB ¥¹¥­¥ã¥Ê¤ò¥·¥¹¥Æ¥à¤ËÀܳ¤·¤Þ¤¹¡£
 	  ¤¹¤ë¤È¡¢¥á¥Ã¥»¡¼¥¸¥Ð¥Ã¥Õ¥¡ (&man.dmesg.8;)
@@ -1749,14 +1737,7 @@ device ehci</programlisting>
 
 	<screen>ugen0.2: <EPSON> at usbus0</screen>
 
-	<para>&os; 7.X ¥·¥¹¥Æ¥à¤Ç¤Ï¡¢
-	  °Ê²¼¤Î¤è¤¦¤Ê¥á¥Ã¥»¡¼¥¸¤¬½ÐÎϤµ¤ì¤Þ¤¹¡£</para>
-
-	<screen>uscanner0: EPSON EPSON Scanner, rev 1.10/3.02, addr 2</screen>
-
-	<para>¤³¤ì¤é¤ÎÎã¤Ç¤Ï¡¢»ÈÍѤ·¤Æ¤¤¤ë &os; ¤Î¥Ð¡¼¥¸¥ç¥ó¤Ë±þ¤¸¤Æ¡¢
-	  ¥¹¥­¥ã¥Ê¤¬ <filename>/dev/ugen0.2</filename>
-	  ¤Þ¤¿¤Ï¡¢<filename>/dev/uscanner0</filename>
+	<para>¤³¤ì¤é¤ÎÎã¤Ç¤Ï¡¢¥¹¥­¥ã¥Ê¤¬ <filename>/dev/ugen0.2</filename>
 	  ¥Ç¥Ð¥¤¥¹¥Î¡¼¥É¤ò»ÈÍѤ·¤Æ¤¤¤ë¤³¤È¤¬¤ï¤«¤ê¤Þ¤¹¡£
 	  ¤³¤ÎÎã¤Ç¤Ï¡¢&epson.perfection; 1650 USB ¥¹¥­¥ã¥Ê¤¬»È¤ï¤ì¤Æ¤¤¤Þ¤¹¡£</para>
       </sect3>
@@ -2010,22 +1991,6 @@ device `epson:/dev/uscanner0' is a Epson
 add path ugen0.2 mode 0660 group usb
 add path usb/0.2.0 mode 0666 group usb</programlisting>
 
-      <para>&os; 7.X ¤Î¥æ¡¼¥¶¤Ï¡¢¥Ç¥Ð¥¤¥¹¥Î¡¼¥É
-	<filename>/dev/uscanner0</filename> ¤ËÂФ·¡¢
-	°Ê²¼¤Î¤è¤¦¤Ê¹Ô¤ÎÄɲä¬É¬ÍפȤʤë¤Ç¤·¤ç¤¦¡£</para>
-
-      <programlisting>[system=5]
-add path uscanner0 mode 660 group usb</programlisting>
-
-      <para>¼¡¤Ë¡¢<filename>/etc/rc.conf</filename> ¤Ë°Ê²¼¤Î¹Ô¤òÄɲä·¤Æ
-	¥·¥¹¥Æ¥à¤òºÆµ¯Æ°¤·¤Þ¤¹¡£</para>
-
-      <programlisting>devfs_system_ruleset="system"</programlisting>
-
-      <para><filename>/etc/devfs.rules</filename>
-	¤ÇÀßÄꤷ¤¿ÆâÍƤˤĤ¤¤Æ¤Î¾ÜºÙ¤Ï¡¢&man.devfs.8;
-	¤Î¥Þ¥Ë¥å¥¢¥ë¥Ú¡¼¥¸¤ò¤´Í÷¤¯¤À¤µ¤¤¡£</para>
-
       <para>ºÇ¸å¤Ë¡¢¥¹¥­¥ã¥Ê¤òÍøÍѤ¹¤ë¥æ¡¼¥¶¤ò
 	<groupname><replaceable>usb</replaceable></groupname>
 	¥°¥ë¡¼¥×¤ËÄɲä·¤Þ¤¹¡£</para>

Modified: head/ja_JP.eucJP/books/handbook/printing/chapter.xml
==============================================================================
--- head/ja_JP.eucJP/books/handbook/printing/chapter.xml	Sat Mar  2 15:53:52 2013	(r41071)
+++ head/ja_JP.eucJP/books/handbook/printing/chapter.xml	Sat Mar  2 17:23:42 2013	(r41072)
@@ -3,7 +3,7 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: r40980
+     Original revision: r41064
      $FreeBSD$
 -->
 
@@ -205,15 +205,6 @@
   <sect1 id="printing-intro-setup">
     <title>´ðËÜŪ¤ÊÀßÄê</title>
 
-    <warning>
-      <para>&os; 8.0 ¤«¤é¡¢¥·¥ê¥¢¥ë¥Ý¡¼¥È¤Î¥Ç¥Ð¥¤¥¹¥Î¡¼¥É̾¤¬¡¢
-	<filename>/dev/ttyu<replaceable>N</replaceable></filename> ¤«¤é
-	<filename>/dev/ttyd<replaceable>N</replaceable></filename>
-	¤Ø¤ÈÊѹ¹¤Ë¤Ê¤ê¤Þ¤·¤¿¡£
-	&os; 7.X ¥æ¡¼¥¶¤Ï¡¢
-	¤³¤ÎÊѹ¹¤òÍý²ò¤·¤¿¾å¤Ç°Ê²¼¤Îʸ½ñ¤òÆɤó¤Ç¤¯¤À¤µ¤¤¡£</para>
-    </warning>
-
     <para><application>LPD</application>
       ¥¹¥×¡¼¥ê¥ó¥°¥·¥¹¥Æ¥à¤òÍѤ¤¤Æ¥×¥ê¥ó¥¿¤ò»ÈÍѤ¹¤ë¤¿¤á¤Ë¤Ï¡¢
       ¥×¥ê¥ó¥¿µ¡´ï¤È <application>LPD</application>
@@ -1516,15 +1507,6 @@ $%&'()*+,-./01234567
   <sect1 id="printing-advanced">
     <title>¥×¥ê¥ó¥¿ÀßÄê¾åµéÊÔ</title>
 
-    <warning>
-      <para>&os; 8.0 ¤«¤é¡¢¥·¥ê¥¢¥ë¥Ý¡¼¥È¤Î¥Ç¥Ð¥¤¥¹¥Î¡¼¥É̾¤¬¡¢
-	<filename>/dev/ttyu<replaceable>N</replaceable></filename> ¤«¤é
-	<filename>/dev/ttyd<replaceable>N</replaceable></filename>
-	¤Ø¤ÈÊѹ¹¤Ë¤Ê¤ê¤Þ¤·¤¿¡£
-	&os; 7.X ¥æ¡¼¥¶¤Ï¡¢
-	¤³¤ÎÊѹ¹¤òÍý²ò¤·¤¿¾å¤Ç°Ê²¼¤Îʸ½ñ¤òÆɤó¤Ç¤¯¤À¤µ¤¤¡£</para>
-    </warning>
-
     <para>¤³¤ÎÀá¤Ç¤Ï¡¢Æüì¤Ê·Á¼°¤Î¥Õ¥¡¥¤¥ë¤ò°õ»ú¤¹¤ë¤¿¤á¤Î¥Õ¥£¥ë¥¿¡¢
       ¥Ø¥Ã¥À¥Ú¡¼¥¸¡¢¥Í¥Ã¥È¥ï¡¼¥¯±Û¤·¤Î¥×¥ê¥ó¥¿¤Ø¤Î°õ»ú¡¢¤½¤·¤Æ¡¢
       ¥×¥ê¥ó¥¿»ÈÍѤÎÀ©¸Â¤ä²Ý¶â¤Ë¤Ä¤¤¤ÆÀâÌÀ¤·¤Æ¤¤¤Þ¤¹¡£</para>


More information about the svn-doc-all mailing list