[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[d-i doc] 翻訳更新



�太郎��。

インストールマニュアル�訳を追�����。

本文�差分を添付�����査読を�願������。
#先���リ�ジトリ��コミット権を���������コミット������。

アーカイブ�内容�以下��り��。
$ tar ztf d-i-update0518.tar.gz
ja/bookinfo.xml
ja/install-methods/install-tftp.xml
ja/install-methods/usb-setup/i386.xml
ja/install-methods/boot-drive-files.xml
ja/install-methods/boot-usb-files.xml
ja/install-methods/create-floppy.xml
ja/install-methods/ipl-tape.xml
ja/install-methods/tftp/bootp.xml

-- 
+--------------------------------------------------------+
 倉澤 望(�太郎) 
 KURASAWA Nozomu (nabetaro)  <nabetaro @ caldron.jp>
 GnuPG FingerPrint:
    C4E5 7063 FD75 02EB E71D  559B ECF6 B9D2 8147 ADFB
+--------------------------------------------------------+

Attachment: d-i-update0518.tar.gz
Description: Binary data

Index: ja/bookinfo.xml
===================================================================
--- ja/bookinfo.xml	(¥ê¥Ó¥¸¥ç¥ó 37399)
+++ ja/bookinfo.xml	(ºî¶È¥³¥Ô¡¼)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="EUC-JP"?>
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 34719 -->
+<!-- original version: 36879 -->
 
 <bookinfo id="debian_installation_guide">
 <title>&debian; ¥¤¥ó¥¹¥È¡¼¥ë¥¬¥¤¥É</title>
@@ -18,7 +18,7 @@
 &debian; &release; ¥·¥¹¥Æ¥à (¥³¡¼¥É¥Í¡¼¥à <quote>&releasename;</quote>)
 ¤Î¥¤¥ó¥¹¥È¡¼¥ëÀâÌÀ½ñ¤Ç¤¹¡£
 ¤Þ¤¿¡¢¤µ¤é¤Ë¾Ü¤·¤¤¾ðÊó¤Ø¤Î¥Ý¥¤¥ó¥¿¤ä¡¢
-¤Û¤È¤ó¤É¤Î¿·¤·¤¤ Debian ¥·¥¹¥Æ¥à¤ËÂбþ¤·¤¿¹½ÃÛË¡¤Ë´Ø¤¹¤ë¾ðÊó¤â´Þ¤ó¤Ç¤¤¤Þ¤¹¡£
+¿·¤·¤¯ Debian ¥·¥¹¥Æ¥à¤ò¹½ÃÛ¤¹¤ëÊýË¡¤Ë¤â¸ÀµÚ¤·¤Æ¤¤¤Þ¤¹¡£
 </para>
 
 <para>
@@ -46,7 +46,7 @@
 ¤³¤Î¥Þ¥Ë¥å¥¢¥ë¤Î¿·ÈÇ (¤³¤Î¥¢¡¼¥­¥Æ¥¯¥Á¥ã¤ËÂФ·¤Æ¡¢
 ¤Ç¤­¤ë¸Â¤ê¤è¤¯½ñ¤«¤ì¤Æ¤¤¤Þ¤¹) ¤Ï¡¢¥¤¥ó¥¿¡¼¥Í¥Ã¥È 
 (<ulink url="&url-d-i;">&d-i; home page</ulink>) ¤Ç¸«¤Ä¤±¤é¤ì¤Þ¤¹¡£
-¤Þ¤¿¤½¤³¤ÇÄɲäÎËÝÌõ¤â¸«¤Ä¤«¤ë¤Ç¤·¤ç¤¦¡£
+¤Þ¤¿¤½¤³¤Ç¡¢ÄɲÃËÝÌõ¤â¸«¤Ä¤«¤ë¤Ç¤·¤ç¤¦¡£
 </para></warning>
 
 <note condition="checked"><para>
@@ -61,10 +61,34 @@
 &releasename; ¤Î¸ø¼°¥ê¥ê¡¼¥¹¸å¤Ë¡¢
 ¤¤¤¯¤Ä¤«Êѹ¹¤ò²Ã¤¨¤¿¤êºÙÉô¤ÎºÆ¹½À®¤ò·×²è¤·¤Æ¤¤¤Þ¤¹¡£
 ¤³¤Î¥Þ¥Ë¥å¥¢¥ë¤Î¿·ÈǤϡ¢¥¤¥ó¥¿¡¼¥Í¥Ã¥È 
-(<ulink url="&url-d-i;">&d-i; home page</ulink>) ¤Ç¸«¤Ä¤«¤ë¤«¤âÃΤì¤Þ¤»¤ó¡£
-¤Þ¤¿¤½¤³¤ÇÄɲÃËÝÌõ¤â¸«¤Ä¤«¤ë¤Ç¤·¤ç¤¦¡£
+(<ulink url="&url-d-i;">&d-i; home page</ulink>) ¤Ç¸«¤Ä¤±¤é¤ì¤Þ¤¹¡£
+¤Þ¤¿¤½¤³¤Ç¡¢ÄɲÃËÝÌõ¤â¸«¤Ä¤«¤ë¤Ç¤·¤ç¤¦¡£
 </para></note>
 </para>
+
+<para condition="bookinfo-langteam">
+<!--
+Translators can use this paragraph to provide some information about
+the status of the translation, the people behind it, how to contact
+the team, etc.
+
+See build/lang-options/README on how to enable this paragraph.
+Its condition is "bookinfo_langteam".
+-->
+ÆüËܸìÌõ¤Ï¡¢
+³û»ÖÅÄ ËÓ (1997 ǯ)¡¢
+²¬ ½¼ (1998-1999 ǯ)¡¢
+±óÆ£ Èþ½ã (1998-2000 ǯ)¡¢
+ÌçÏÆ Àµ»Ë¡¢Æéë ±ÉŸ¡¢È¬ÅÄ ¿¿¹Ô¡¢Guangcheng Wen (1999 ǯ)¡¢
+º£°æ ¿­¹­¡¢¾åÀî ½ã°ì¡¢´îÀ¥ ¹À¡¢µ×ÊÝÅÄ ÃÒ¹­¡¢ã·Æ£ ÅØ¡¢ÃæÌî Éðͺ (2002 ǯ)¡¢
+¿ù»³ ͧ¾Ï¡¢Éð°æ ¿­¸÷¡¢ÁÒß· ˾ (2002-2006 ǯ)
+¤ËÃøºî¸¢¤¬¤¢¤ê¤Þ¤¹¡£
+</para>
+
+<para condition="bookinfo-langteam">
+ÆüËܸìÌõ¤Ë¤Ä¤¤¤Æ¤Î¤ªÌ䤤¹ç¤ï¤»¤Ï¡¢
+debian-doc@debian.or.jp ¤Ø¤ª´ê¤¤¤¤¤¿¤·¤Þ¤¹¡£(Í× subscribe)
+</para>
 </abstract>
 
 <copyright>
@@ -74,18 +98,6 @@
  <holder>the Debian Installer team</holder>
 </copyright>
 
-<!--
-ÆüËܸìÌõ¤Ë¤Ä¤¤¤Æ¤Ï¡¢
-³û»ÖÅÄ ËÓ (1997 ǯ)
-²¬ ½¼ (1998¡¢1999 ǯ)
-ÌçÏÆ Àµ»Ë¡¢Æéë ±ÉŸ¡¢È¬ÅÄ ¿¿¹Ô¡¢Guangcheng Wen (1999 ǯ)
-±óÆ£ Èþ½ã (1998-2000 ǯ)
-º£°æ ¿­¹­¡¢¾åÀî ½ã°ì¡¢´îÀ¥ ¹À¡¢µ×ÊÝÅÄ ÃÒ¹­¡¢ã·Æ£ ÅØ¡¢
-¿ù»³ ͧ¾Ï¡¢Éð°æ ¿­¸÷¡¢ÃæÌî Éðͺ (2002 ǯ)
-ÁÒß· ˾¡¢¿ù»³ ͧ¾Ï¡¢Éð°æ ¿­¸÷ (2002-2005 ǯ)
-¤ËÃøºî¸¢¤¬¤¢¤ê¤Þ¤¹¡£
-
-ÌõÃí:¾åµ­¤Îʸ¤Ïɽ¼¨¤·¤¿Êý¤¬¤¤¤¤¤Ç¤¹¤«?
 -->
 
 <legalnotice>
Index: ja/install-methods/install-tftp.xml
===================================================================
--- ja/install-methods/install-tftp.xml	(¥ê¥Ó¥¸¥ç¥ó 37399)
+++ ja/install-methods/install-tftp.xml	(ºî¶È¥³¥Ô¡¼)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="EUC-JP"?>
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 35613 -->
+<!-- original version: 36841 -->
 
  <sect1 condition="supports-tftp" id="install-tftp">
  <title>TFTP ¥Í¥Ã¥È¥Ö¡¼¥ÈÍÑ¥Õ¥¡¥¤¥ë¤Î½àÈ÷</title>
@@ -341,14 +341,15 @@
 <!--
 For DECstations, there are tftpimage files for each subarchitecture,
 which contain both kernel and installer in one file. The naming
-convention is <replaceable>subarchitecture</replaceable>/netboot-boot.img.
+convention is
+<filename><replaceable>subarchitecture</replaceable>/netboot-boot.img</filename>.
 Copy the tftpimage file you would like to use to
 <userinput>/tftpboot/tftpboot.img</userinput> if you work with the
 example BOOTP/DHCP setups described above.
 -->
 DECstation ¤Ë¤Ï¡¢³Æ¥µ¥Ö¥¢¡¼¥­¥Æ¥¯¥Á¥ã¤´¤È¤Ë tftp ¥¤¥á¡¼¥¸¤¬¤¢¤ê¡¢
 ¥«¡¼¥Í¥ë¤È¥¤¥ó¥¹¥È¡¼¥é¤¬¤Ò¤È¤Ä¤Î¥¤¥á¡¼¥¸¤Ë¼ý¤á¤é¤ì¤Æ¤¤¤Þ¤¹¡£
-̿̾µ¬Â§¤Ï <replaceable>subarchitecture</replaceable>/netboot-boot.img ¤Ç¤¹¡£
+̿̾µ¬Â§¤Ï <filename><replaceable>subarchitecture</replaceable>/netboot-boot.img</filename> ¤Ç¤¹¡£
 ¾å½Ò¤ÎÎã¤Î¤è¤¦¤Ë BOOTP/DHCP ¤òÀßÄꤷ¤¿¤Î¤Ç¤·¤¿¤é¡¢
 »È¤¤¤¿¤¤ tftp ¥¤¥á¡¼¥¸¤ò <userinput>/tftpboot/tftpboot.img</userinput>
 ¤Ë¥³¥Ô¡¼¤·¤Þ¤¹¡£
@@ -476,45 +477,39 @@
 <para>
 
 <!--
-SPARC architectures for instance use the subarchitecture names, such
-as <quote>SUN4M</quote> or <quote>SUN4C</quote>; in some cases, the
-architecture is left blank, so the file the client looks for is just
-<filename>client-ip-in-hex</filename>.  Thus, if your system
-subarchitecture is a SUN4C, and its IP is 192.168.1.3, the filename
-would be <filename>C0A80103.SUN4C</filename>. An easy way to determine
-this is to pull up a shell on another Unix machine and:
-
-this is to enter the following command in a shell (assuming the
-machine's intended IP is 10.0.0.4).
+Some SPARC architectures add the subarchitecture names, such as
+<quote>SUN4M</quote> or <quote>SUN4C</quote>, to the filename. Thus,
+if your system's subarchitecture is a SUN4C, and its IP is 192.168.1.3,
+the filename would be <filename>C0A80103.SUN4C</filename>. However,
+there are also subarchitectures where the file the client looks for is
+just <filename>client-ip-in-hex</filename>. An easy way to determine the
+hexadecimal code for the IP address is to enter the following command
+in a shell (assuming the machine's intended IP is 10.0.0.4).
 -->
 <!--nabetaro ÌõÃí»Ä¤·¤Þ¤·¤¿ -->
-SPARC ¥¢¡¼¥­¥Æ¥¯¥Á¥ã¤Ï (ÌõÃí: <replaceable>client-architecture</replaceable> ¤Ë)
+SPARC ¥¢¡¼¥­¥Æ¥¯¥Á¥ã¤Ç¤Ï¡¢
 <quote>SUN4M</quote> ¤ä <quote>SUN4C</quote> ¤Î¤è¤¦¤Ê
-¥µ¥Ö¥¢¡¼¥­¥Æ¥¯¥Á¥ã¤Î̾Á°¤ò»È¤¤¤Þ¤¹¡£
-¾ì¹ç¤Ë¤è¤Ã¤Æ¤Ï¥¢¡¼¥­¥Æ¥¯¥Á¥ã¤¬¶õ¤Î¤³¤È¤â¤¢¤ê¡¢
-¤³¤Î¾ì¹ç¥¯¥é¥¤¥¢¥ó¥È¤¬Ãµ¤¹¥Õ¥¡¥¤¥ë¤Ï
-<filename>client-ip-in-hex</filename> ¤À¤±¤Ë¤Ê¤ê¤Þ¤¹¡£
+¥µ¥Ö¥¢¡¼¥­¥Æ¥¯¥Á¥ã¤Î̾Á°¤ò¥Õ¥¡¥¤¥ë̾¤ËÄɲä·¤Þ¤¹¡£
 Î㤨¤Ð¡¢¥·¥¹¥Æ¥à¤Î¥µ¥Ö¥¢¡¼¥­¥Æ¥¯¥Á¥ã¤¬ SUN4C ¤Ç
-IP ¤¬ 192.168.1.3 ¤Î¾ì¹ç¤Ï¡¢¥Õ¥¡¥¤¥ë̾¤Ï
-<filename>C0A80103.SUN4C</filename> ¤È¤Ê¤ê¤Þ¤¹¡£
-¤³¤ì¤ò·èÄꤹ¤ë´Êñ¤ÊÊýË¡¤Ï¡¢°Ê²¼¤Î¥³¥Þ¥ó¥É¤ò¥·¥§¥ë¤ËÆþÎϤ·¤Þ¤¹¡£
-(ͽÄꤷ¤Æ¤¤¤ë IP ¥¢¥É¥ì¥¹¤Ï 10.0.0.4 ¤È¤¹¤ë)
+IP ¥¢¥É¥ì¥¹¤¬ 192.168.1.3 ¤Î¾ì¹ç¡¢
+¥Õ¥¡¥¤¥ë̾¤Ï <filename>C0A80103.SUN4C</filename> ¤È¤Ê¤ê¤Þ¤¹¡£
+¤·¤«¤·¡¢¥¯¥é¥¤¥¢¥ó¥È¤¬Ãµ¤¹¥Õ¥¡¥¤¥ë¤¬
+<filename>client-ip-in-hex</filename> ¤È¤Ê¤ë¥µ¥Ö¥¢¡¼¥­¥Æ¥¯¥Á¥ã¤â¤¢¤ê¤Þ¤¹¡£
+IP ¥¢¥É¥ì¥¹¤Î 16 ¿Êɽµ­¤ò´Êñ¤ËÆÀ¤ë¤Ë¤Ï¡¢
+°Ê²¼¤Î¥³¥Þ¥ó¥É¤ò¥·¥§¥ë¤ËÆþÎϤ·¤Æ¤¯¤À¤µ¤¤¡£
+(ÁÛÄꤷ¤Æ¤¤¤ë IP ¥¢¥É¥ì¥¹¤Ï 10.0.0.4 ¤Ç¤¹)
 
 <informalexample><screen>
 $ printf '%.2x%.2x%.2x%.2x\n' 10 0 0 4
 </screen></informalexample>
  
 <!--
-This will spit out the IP in hexadecimal; to get to the correct
-filename, you will need to change all letters to uppercase and
-if necessary append the subarchitecture name.
+To get to the correct filename, you will need to change all letters to
+uppercase and if necessary append the subarchitecture name.
 -->
-ͽÄꤷ¤Æ¤¤¤ë¥Þ¥·¥ó¤Î IP ¥¢¥É¥ì¥¹¤¬ 10.0.0.4 ¤Î¾ì¹ç¡¢
-¤³¤¦¤·¤Æ IP ¥¢¥É¥ì¥¹¤ò 16 ¿Ê¿ô¤Ç½ÐÎϤ·¤Þ¤¹¡£
 Àµ¤·¤¤¥Õ¥¡¥¤¥ë̾¤ò¼èÆÀ¤¹¤ë¤Ë¤Ï¡¢Ê¸»ú¤ò¤¹¤Ù¤ÆÂçʸ»ú¤ËÊѹ¹¤·¡¢
 (ɬÍפʤé) ¥µ¥Ö¥¢¡¼¥­¥Æ¥¯¥Á¥ã̾¤òÄɲ䷤ʤ±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£
 
-
 </para><para>
 
 <!--
@@ -597,7 +592,7 @@
 
 <!--
 You don't have to configure DHCP in a special way because you'll pass the
-full path of the file to the loaded to CFE.
+full path of the file to be loaded to CFE.
 -->
 CFE ¤Ë¥í¡¼¥É¤¹¤ë¥Õ¥¡¥¤¥ë¤Î¥Õ¥ë¥Ñ¥¹¤òÅϤ·¤Æ¤¤¤ë¤¿¤á¡¢
 ÆÃ¼ì¤Ê DHCP ¤ÎÀßÄê¤ò¤¹¤ëɬÍפϤ¢¤ê¤Þ¤»¤ó¡£
Index: ja/install-methods/usb-setup/i386.xml
===================================================================
--- ja/install-methods/usb-setup/i386.xml	(¥ê¥Ó¥¸¥ç¥ó 37399)
+++ ja/install-methods/usb-setup/i386.xml	(ºî¶È¥³¥Ô¡¼)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="EUC-JP"?>
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 33725-->
+<!-- original version: 36841-->
 
    <sect3 arch="i386">
    <title>&arch-title; ¤Ç¤Î USB ¥¹¥Æ¥£¥Ã¥¯¤Î¥Ñ¡¼¥Æ¥£¥·¥ç¥óʬ³ä</title>
@@ -19,16 +19,16 @@
 Since most USB sticks come pre-configured with a single FAT16
 partition, you probably won't have to repartition or reformat the
 stick.  If you have to do that anyway, use <command>cfdisk</command>
-or any other partitioning tool for creating a FAT16 partition and then
+or any other partitioning tool to create a FAT16 partition, and then
 create the filesystem using:
 -->
 ¤Û¤È¤ó¤É¤Î USB ¥¹¥Æ¥£¥Ã¥¯¤Ï¡¢
 FAT16 ¥Ñ¡¼¥Æ¥£¥·¥ç¥ó 1 ¤Ä¤Ç¤¢¤é¤«¤¸¤áÀßÄꤵ¤ì¤Æ¤¤¤ë¤Î¤Ç¡¢
 ¤ª¤½¤é¤¯ USB ¥¹¥Æ¥£¥Ã¥¯¤Î¥Ñ¡¼¥Æ¥£¥·¥ç¥óʬ³ä¤Î¤ä¤êľ¤·¤ä¡¢
-ºÆ¥Õ¥©¡¼¥Þ¥Ã¥È¤ÏɬÍפʤ¤¤Ç¤·¤ç¤¦¡£
+ºÆ¥Õ¥©¡¼¥Þ¥Ã¥È¤ÏɬÍפ¢¤ê¤Þ¤»¤ó¡£
 ¤É¤¦¤·¤Æ¤â¤·¤Ê¤±¤ì¤Ð¤Ê¤é¤Ê¤¤¾ì¹ç¤Ï¡¢
 <command>cfdisk</command> ¤ä¾¤Î¥Ñ¡¼¥Æ¥£¥·¥ç¥óʬ³ä¥Ä¡¼¥ë¤ò»È¤Ã¤Æ¡¢
-FAT16 ¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤òºîÀ®¤·¤Æ°Ê²¼¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤¡£
+FAT16 ¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤òºîÀ®¤·¡¢°Ê²¼¤Î¤è¤¦¤Ë¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤òºîÀ®¤·¤Æ¤¯¤À¤µ¤¤¡£
 
 <informalexample><screen>
 # mkdosfs /dev/<replaceable>sda1</replaceable>
Index: ja/install-methods/boot-drive-files.xml
===================================================================
--- ja/install-methods/boot-drive-files.xml	(¥ê¥Ó¥¸¥ç¥ó 37399)
+++ ja/install-methods/boot-drive-files.xml	(ºî¶È¥³¥Ô¡¼)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="EUC-JP"?>
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 28997 -->
+<!-- original version: 36841 -->
 
  <sect1 condition="bootable-disk" id="boot-drive-files">
  <title>¥Ï¡¼¥É¥Ç¥£¥¹¥¯µ¯Æ°¥Õ¥¡¥¤¥ë¤Î½àÈ÷</title>
@@ -262,14 +262,14 @@
 <!--
 Make a note of the partition number of the MacOS partition where you
 place these files. If you have the MacOS <command>pdisk</command>
-program, you can use the L command to check for the partition
-number. You will need this partition number for the command you type
-at the Open Firmware prompt when you boot the installer.
+program, you can use the <command>L</command> command to check for the
+partition number. You will need this partition number for the command
+you type at the Open Firmware prompt when you boot the installer.
 -->
 ¤³¤ì¤é¤Î¥Õ¥¡¥¤¥ë¤òÃÖ¤¤¤¿ MacOS ¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤Î
 ¥Ñ¡¼¥Æ¥£¥·¥ç¥óÈÖ¹æ¤òµ­Ï¿¤·¤Æ¤ª¤­¤Þ¤·¤ç¤¦¡£
 MacOS ¤Î <command>pdisk</command> ¥×¥í¥°¥é¥à¤¬¤¢¤ì¤Ð¡¢
-L ¥³¥Þ¥ó¥É¤Ç¥Ñ¡¼¥Æ¥£¥·¥ç¥óÈÖ¹æ¤ò³Îǧ¤Ç¤­¤Þ¤¹¡£
+<command>L</command> ¥³¥Þ¥ó¥É¤Ç¥Ñ¡¼¥Æ¥£¥·¥ç¥óÈÖ¹æ¤ò³Îǧ¤Ç¤­¤Þ¤¹¡£
 ¤³¤Î¥Ñ¡¼¥Æ¥£¥·¥ç¥óÈÖ¹æ¤Ï¡¢¥¤¥ó¥¹¥È¡¼¥é¤òµ¯Æ°¤µ¤»¤¿¤È¤­¤Ë
 Open Firmware ¥×¥í¥ó¥×¥È¤«¤éÆþÎϤ¹¤ë¥³¥Þ¥ó¥É¤ÇɬÍפȤʤê¤Þ¤¹¡£
 
Index: ja/install-methods/boot-usb-files.xml
===================================================================
--- ja/install-methods/boot-usb-files.xml	(¥ê¥Ó¥¸¥ç¥ó 37399)
+++ ja/install-methods/boot-usb-files.xml	(ºî¶È¥³¥Ô¡¼)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="EUC-JP"?>
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 32124 -->
+<!-- original version: 37295 -->
 
  <sect1 condition="bootable-usb" id="boot-usb-files">
  <title>USB ¥á¥â¥ê¥¹¥Æ¥£¥Ã¥¯¤Ç¤Îµ¯Æ°ÍÑ¥Õ¥¡¥¤¥ë¤Î½àÈ÷</title>
@@ -8,22 +8,22 @@
 <para>
 
 <!--
-For preparing the USB stick you will need a system where GNU/Linux is
+To prepare the USB stick, you will need a system where GNU/Linux is
 already running and where USB is supported. You should ensure that the
 usb-storage kernel module is loaded (<userinput>modprobe
 usb-storage</userinput>) and try to find out which SCSI device the USB
 stick has been mapped to (in this example
 <filename>/dev/sda</filename> is used). To write to your stick, you
-will probably have to turn off its write protection switch.
+may have to turn off its write protection switch.
 -->
-USB ¥¹¥Æ¥£¥Ã¥¯¤Î½àÈ÷¤Î¤¿¤á¡¢
+USB ¥¹¥Æ¥£¥Ã¥¯¤Î½àÈ÷¤ò¤¹¤ë¤Ë¤Ï¡¢
 GNU/Linux ¤¬´û¤Ëư¤¤¤Æ¤¤¤Æ¡¢USB ¤ò¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤ë¥·¥¹¥Æ¥à¤¬É¬Íפˤʤê¤Þ¤¹¡£
 usb-storage ¥«¡¼¥Í¥ë¥â¥¸¥å¡¼¥ë¤ò¤­¤Á¤ó¤È¥í¡¼¥É¤·¤Æ 
 (<userinput>modprobe usb-storage</userinput>)¡¢
 USB ¥¹¥Æ¥£¥Ã¥¯¤ò¥Þ¥Ã¥Ô¥ó¥°¤·¤Æ¤¤¤ë¤Î¤¬¤É¤Î SCSI ¥Ç¥Ð¥¤¥¹¤«¤ò¸¡½Ð¤·¤Æ¤ß¤ë¤Ù¤­¤Ç¤¹¡£
 (¤³¤ÎÎã¤Ç¤Ï <filename>/dev/sda</filename> ¤ò»ÈÍѤ·¤Þ¤¹) 
-¤ª¤½¤é¤¯ USB ¥¹¥Æ¥£¥Ã¥¯¤Ë½ñ¤­¹þ¤à¤¿¤á¤Ë¡¢
-¥é¥¤¥È¥×¥í¥Æ¥¯¥È¥¹¥¤¥Ã¥Á¤òÀÚ¤é¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£
+USB ¥¹¥Æ¥£¥Ã¥¯¤Ë½ñ¤­¹þ¤à¤¿¤á¤Ë¡¢
+¥é¥¤¥È¥×¥í¥Æ¥¯¥È¥¹¥¤¥Ã¥Á¤òÀÚ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
 
 </para><para>
 
@@ -134,17 +134,26 @@
 &usb-setup-i386.xml;
 &usb-setup-powerpc.xml;
 
-   <sect3>
+   </sect2>
+   <sect2>
+<!--
+   <title>Adding an ISO image</title>
+-->
    <title>ISO ¥¤¥á¡¼¥¸¤ÎÄɲÃ</title>
 <para>
 
 <!--
-Now you should put any Debian ISO image (businesscard, netinst or even
-a full one) onto your stick (if it fits). The file name of such an
+The installer will look for a Debian ISO image on the stick as its source
+for additional data needed for the installation. So your next step is to
+copy a Debian ISO image (businesscard, netinst or even a full CD image)
+onto your stick (be sure to select one that fits). The file name of the
 image must end in <filename>.iso</filename>.
 -->
-º£Å٤ϡ¢Debian ISO ¥¤¥á¡¼¥¸ (̾»É¡¢netinst¡¢´°Á´ÈǤΤ¤¤º¤ì¤«) ¤ò¡¢
-USB ¥¹¥Æ¥£¥Ã¥¯¤Ë (Æþ¤ë¤Ê¤é¤Ð) Æþ¤ì¤Þ¤·¤ç¤¦¡£
+¥¤¥ó¥¹¥È¡¼¥é¤Ï¡¢USB ¥¹¥Æ¥£¥Ã¥¯¾å¤Î Debian ISO ¥¤¥á¡¼¥¸¤òõ¤·¡¢
+¥¤¥ó¥¹¥È¡¼¥ë¤ËɬÍפÊÄɲåǡ¼¥¿¤Î¼èÆÀ¸µ¤È¤·¤Þ¤¹¡£
+¤Ç¤¹¤«¤é¼¡¤Î¥¹¥Æ¥Ã¥×¤Ï¡¢
+Debian ISO ¥¤¥á¡¼¥¸ (̾»É¡¢netinst¡¢´°Á´ÈǤΤ¤¤º¤ì¤«) ¤ò¡¢
+USB ¥¹¥Æ¥£¥Ã¥¯¤Ë (Æþ¤ë¤â¤Î¤òÁª¤ó¤Ç) Æþ¤ì¤ë¤³¤È¤Ç¤¹¡£
 ISO ¥¤¥á¡¼¥¸¤Î¥Õ¥¡¥¤¥ë̾¤Ï <filename>.iso</filename> 
 ¤Ç½ª¤ï¤Ã¤Æ¤¤¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£
 
@@ -177,11 +186,14 @@
 ¥é¥¤¥È¥×¥í¥Æ¥¯¥È¥¹¥¤¥Ã¥Á¤òÍ­¸ú¤Ë¤·¤Æ¤¯¤À¤µ¤¤¡£
 
 </para>
-   </sect3>
+  </sect2>
 
-   <!-- TODO: doesn't this section belong later? -->
-   <sect3 arch="i386">
-   <title>USB ¥¹¥Æ¥£¥Ã¥¯¤«¤é¤Îµ¯Æ°</title>
+  <!-- TODO: doesn't this section belong later? -->
+  <sect2 arch="i386">
+<!--
+  <title>Booting the USB stick</title>
+-->
+  <title>USB ¥¹¥Æ¥£¥Ã¥¯¤«¤é¤Îµ¯Æ°</title>
 <warning><para>
 
 <!--
@@ -200,6 +212,5 @@
 </screen></informalexample>
 
 </para></warning>
-   </sect3>
   </sect2>
  </sect1>
Index: ja/install-methods/create-floppy.xml
===================================================================
--- ja/install-methods/create-floppy.xml	(¥ê¥Ó¥¸¥ç¥ó 37399)
+++ ja/install-methods/create-floppy.xml	(ºî¶È¥³¥Ô¡¼)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="EUC-JP"?>
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 28672 -->
+<!-- original version: 36841 -->
 
  <sect1 condition="supports-floppy-boot" id="create-floppy">
  <title>¥Ç¥£¥¹¥¯¥¤¥á¡¼¥¸¤«¤é¤Î¥Õ¥í¥Ã¥Ô¡¼¤ÎºîÀ®</title>
@@ -17,19 +17,20 @@
 </para><para arch="powerpc">
 
 <!--
-Floppy disk booting reportedly fails on Mac USB floppy drives.
+Booting the installer from floppy disk reportedly fails on Mac USB
+floppy drives.
 -->
-Mac USB ¥Õ¥í¥Ã¥Ô¡¼¥É¥é¥¤¥Ö¤Ç¤Ï
-¥Õ¥í¥Ã¥Ô¡¼¥Ç¥£¥¹¥¯¤«¤é¤Îµ¯Æ°¤Ï¤Ç¤­¤Ê¤¤¤½¤¦¤Ç¤¹¡£
+Mac USB ¥Õ¥í¥Ã¥Ô¡¼¥É¥é¥¤¥Ö¤Ç¤Ï¡¢
+¥Õ¥í¥Ã¥Ô¡¼¥Ç¥£¥¹¥¯¤«¤é¥¤¥ó¥¹¥È¡¼¥é¤òµ¯Æ°¤Ç¤­¤Ê¤¤¤½¤¦¤Ç¤¹¡£
 
 </para><para arch="m68k">
 
 <!--
-Floppy disk booting is not supported on Amigas or
+Booting the installer from floppy disk is not supported on Amigas or
 68k Macs.
 -->
 Amiga ¤ä 68k Mac ¤Ç¤Ï¡¢
-¥Õ¥í¥Ã¥Ô¡¼¤«¤é¤Îµ¯Æ°¤Ï¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£
+¥Õ¥í¥Ã¥Ô¡¼¤«¤é¥¤¥ó¥¹¥È¡¼¥é¤Îµ¯Æ°¤ò¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Þ¤»¤ó¡£
 
 </para><para>
 
@@ -57,12 +58,11 @@
 </para><para>
 
 <!--
-There are different techniques for creating floppies from disk images,
-which depend on your platform.  This section describes how to create
-floppies from disk images on different platforms.
+There are different techniques for creating floppies from disk images.
+This section describes how to create floppies from disk images on
+different platforms.
 -->
-¥×¥é¥Ã¥È¥Õ¥©¡¼¥à¤Ë¤è¤Ã¤Æ¡¢
-¥Ç¥£¥¹¥¯¥¤¥á¡¼¥¸¤«¤é¥Õ¥í¥Ã¥Ô¡¼¤òºîÀ®¤¹¤ëÊýË¡¤Ï°Û¤Ê¤ê¤Þ¤¹¡£
+¥Ç¥£¥¹¥¯¥¤¥á¡¼¥¸¤«¤é¥Õ¥í¥Ã¥Ô¡¼¤òºîÀ®¤¹¤ëÊýË¡¤Ë¤Ï°ã¤¤¤¬¤¢¤ê¤Þ¤¹¡£
 ¤³¤ÎÀá¤Ç¤Ï¡¢¤½¤ì¤¾¤ì¤Î¥×¥é¥Ã¥È¥Õ¥©¡¼¥à¤Ë¤ª¤¤¤Æ¡¢
 ¥Ç¥£¥¹¥¯¥¤¥á¡¼¥¸¤«¤é¥Õ¥í¥Ã¥Ô¡¼¤òºîÀ®¤¹¤ëÊýË¡¤òÀâÌÀ¤·¤Þ¤¹¡£
 
Index: ja/install-methods/ipl-tape.xml
===================================================================
--- ja/install-methods/ipl-tape.xml	(¥ê¥Ó¥¸¥ç¥ó 37399)
+++ ja/install-methods/ipl-tape.xml	(ºî¶È¥³¥Ô¡¼)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="EUC-JP"?>
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 28672 -->
+<!-- original version: 36841 -->
 
  <sect1 arch="s390" id="ipl-tape">
  <title>IPL ¥Æ¡¼¥×¤ÎºîÀ®</title>
@@ -32,7 +32,7 @@
 <filename>parmfile.debian</filename>, 
 <filename>initrd.debian</filename> ¤Ç¤¹¡£
 ¤³¤Î¥Õ¥¡¥¤¥ë¤Ï <filename>tape</filename> ¥µ¥Ö¥Ç¥£¥ì¥¯¥È¥ê¤Ë¤¢¤ê¤Þ¤¹¡£
-<xref linkend="where-files"/> ¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
+<xref linkend="where-files"/> ¤ò¤´Í÷¤¯¤À¤µ¤¤¡£
 
 </para>
  </sect1>
Index: ja/install-methods/tftp/bootp.xml
===================================================================
--- ja/install-methods/tftp/bootp.xml	(¥ê¥Ó¥¸¥ç¥ó 37399)
+++ ja/install-methods/tftp/bootp.xml	(ºî¶È¥³¥Ô¡¼)
@@ -1,24 +1,28 @@
 <?xml version="1.0" encoding="EUC-JP"?>
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 35613 -->
+<!-- original version: 36841 -->
 
 
   <sect2 condition="supports-bootp" id="tftp-bootp">
+<!--
+  <title>Setting up BOOTP server</title>
+-->
   <title>BOOTP ¥µ¡¼¥Ð¤ÎÀßÄê</title>
 <para>
 
 <!--
-There are two BOOTP servers available for GNU/Linux, the CMU
-<command>bootpd</command> and the other is actually a DHCP server, ISC
-<command>dhcpd</command>, which are contained in the
+There are two BOOTP servers available for GNU/Linux. The first is CMU
+<command>bootpd</command>. The other is actually a DHCP server: ISC
+<command>dhcpd</command>. In &debian; these are contained in the
 <classname>bootp</classname> and <classname>dhcp</classname> packages
-in &debian;.
+respectively.
 -->
-GNU/Linux ¤Ç»È¤¨¤ë BOOTP ¥µ¡¼¥Ð¤ÏÆó¤Ä¤¢¤ê¤Þ¤¹¡£
-CMU ¤Î <command>bootpd</command> ¤È¡¢¤â¤¦°ì¤Ä¤Ï¼ÂºÝ¤Ë¤Ï DHCP ¥µ¡¼¥Ð¤Ê¤Î¤Ç¤¹¤¬¡¢
-ISC ¤Î <command>dhcpd</command> ¤Ç¤¹¡£¤½¤ì¤¾¤ì &debian; ¤Ç¤Ï
+GNU/Linux ¤Ç»È¤¨¤ë BOOTP ¥µ¡¼¥Ð¤Ï 2 ¤Ä¤¢¤ê¤Þ¤¹¡£
+¤Ò¤È¤Ä¤Ï CMU ¤Î <command>bootpd</command> ¤Ç¤¹¡£
+¤â¤¦ 1 ¤Ä¤Ï¼ÂºÝ¤Ï DHCP ¥µ¡¼¥Ð¤Ç¤¹¤¬¡¢ISC ¤Î <command>dhcpd</command> ¤Ç¤¹¡£
+&debian; ¤Ç¤Ï¡¢
 <classname>bootp</classname> ¥Ñ¥Ã¥±¡¼¥¸¤È <classname>dhcp</classname> 
-¥Ñ¥Ã¥±¡¼¥¸¤ËÆþ¤Ã¤Æ¤¤¤Þ¤¹¡£
+¥Ñ¥Ã¥±¡¼¥¸¤Ë¤½¤ì¤¾¤ìÆþ¤Ã¤Æ¤¤¤Þ¤¹¡£
 
 </para><para>
 
@@ -27,14 +31,14 @@
 add) the relevant line in <filename>/etc/inetd.conf</filename>.  On
 &debian;, you can run <userinput>update-inetd -\-enable
 bootps</userinput>, then <userinput>/etc/init.d/inetd
-reload</userinput> to do so. Elsewhere, the line in question should
-look like:
+reload</userinput> to do so. Just in case your BOOTP server does not
+run Debian, the line in question should look like:
 -->
 CMU <command>bootpd</command> ¤ò»È¤¦¾ì¹ç¤Ï¡¢¤Þ¤º <filename>/etc/inetd.conf</filename> ¥Õ¥¡¥¤¥ë¤Î
 ³ºÅö¹Ô¤ò¥¢¥ó¥³¥á¥ó¥È (¤Þ¤¿¤ÏÄɲÃ) ¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
 &debian; ¤Ç¤Ï <userinput>update-inetd --enable bootps</userinput> ¤ò¼Â¹Ô¤·¡¢
 ³¤¤¤Æ <userinput>/etc/init.d/inetd reload</userinput> ¤È¤¹¤ì¤Ð OK ¤Ç¤¹¡£
-¤³¤Î¹Ô¤Ï¼¡¤Î¤è¤¦¤Ê¤â¤Î¤Ç¤¹¡£
+ǰ¤Î¤¿¤á¡¢BOOTP ¥µ¡¼¥Ð¤¬ Debian ¤Çư¤«¤·¤Þ¤»¤ó¡£°Ê²¼¤Î¤è¤¦¤Ë¤·¤Þ¤¹¡£
 
 <informalexample><screen>
 bootps  dgram  udp  wait  root  /usr/sbin/bootpd  bootpd -i -t 120