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

[d-i doc] 翻訳更新



�太郎��。

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

本文�差分を添付�����査読を�願������。

アーカイブ�内容�以下��り��。
$ tar ztf d-i-update0629.tar.gz 
ja/preparing/pre-install-bios-setup.xml
ja/preparing/needed-info.xml
ja/appendix/preseed.xml
ja/using-d-i/modules/kbd-chooser.xml
ja/using-d-i/modules/partman.xml
ja/using-d-i/using-d-i.xml
ja/boot-installer/m68k.xml
ja/boot-installer/i386.xml
ja/boot-installer/parameters.xml
ja/boot-installer/trouble.xml

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

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

Index: ja/preparing/pre-install-bios-setup.xml
===================================================================
--- ja/preparing/pre-install-bios-setup.xml	(¥ê¥Ó¥¸¥ç¥ó 38453)
+++ ja/preparing/pre-install-bios-setup.xml	(ºî¶È¥³¥Ô¡¼)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="EUC-JP"?>
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 28997 -->
+<!-- original version: 38299 -->
 
  <sect1 id="pre-install-bios-setup">
  <title>¥¤¥ó¥¹¥È¡¼¥ëÁ°¤Ë¹Ô¤¦¥Ï¡¼¥É¥¦¥§¥¢¡¦OS ¤ÎÀßÄê</title>
@@ -257,5 +257,37 @@
 
 </para>
    </sect3>
+
+   <sect3 arch="powerpc">
+<!--
+   <title>Display visibility on OldWorld Powermacs</title>
+-->
+   <title>OldWorld PowerMAC ¤Ç¤Î¥Ç¥£¥¹¥×¥ì¥¤É½¼¨</title>
+
+<para>
+
+<!--
+Some OldWorld Powermacs, most notably those with the <quote>control</quote>
+display driver but possibly others as well, may not produce a colormap with
+reliably results in visible output under Linux when the display is
+configured for more than 256 colors. If you are experiencing such issues
+with your display after rebooting (you can sometimes see data on
+the monitor, but on other occasions cannot see anything) or, if the screen
+turns black after booting the installer instead of showing you the user
+interface, try changing your display settings under MacOS to use 256
+colors instead of <quote>thousands</quote> or <quote>millions</quote>.
+-->
+¥Ç¥£¥¹¥×¥ì¥¤¥É¥é¥¤¥Ð¤ä¡¢¤Ò¤ç¤Ã¤È¤¹¤ë¤È¤½¤Î¾¤Î¤â¤Î¤âƱÍÍ¤Ë 
+<quote>À©¸æ</quote> ¤¹¤ë OldWorld PowerMAC ¤Ç¤Ï¡¢
+ɽ¼¨¤ò 256 ¿§¤è¤êÂ礭¤¯ÀßÄꤷ¤Æ¤¤¤ë¾ì¹ç¡¢
+Linux ¾å¤Ç½ÐÎϤ¹¤ë¤Î¤ËŬÀڤʥ«¥é¡¼¥Þ¥Ã¥×¤òÀ¸À®¤·¤Ê¤¤²ÄǽÀ­¤¬¤¢¤ê¤Þ¤¹¡£
+ºÆµ¯Æ°¸å¤Ë¤½¤Î¤è¤¦¤Ê¾õÂ֤ˤʤä¿ (¥â¥Ë¥¿¤Ëɽ¼¨¤µ¤ì¤ë¤³¤È¤â¤¢¤ê¤Þ¤¹¤¬¡¢
+¤½¤¦¤Ç¤Ê¤±¤ì¤Ð²¿¤â¸«¤¨¤Þ¤»¤ó) ¾ì¹ç¤ä¡¢¥¤¥ó¥¹¥È¡¼¥é¤Îµ¯Æ°¸å¤Ë¡¢
+¥æ¡¼¥¶¥¤¥ó¥¿¡¼¥Õ¥§¡¼¥¹¤òɽ¼¨¤»¤º²èÌ̤¬¹õ¤¯¤Ê¤Ã¤Æ¤·¤Þ¤Ã¤¿¾ì¹ç¤Ï¡¢
+MacOS ¾å¤Ç¡¢<quote>¿ôÀé</quote>¡¢<quote>¿ôÉ´Ëü</quote> ¤ÈÀßÄꤻ¤º¤Ë¡¢
+256 ¿§¤È¤·¤Æ¤ß¤Æ¤¯¤À¤µ¤¤¡£
+
+</para>
+   </sect3>
   </sect2>
  </sect1>
Index: ja/preparing/needed-info.xml
===================================================================
--- ja/preparing/needed-info.xml	(¥ê¥Ó¥¸¥ç¥ó 38453)
+++ ja/preparing/needed-info.xml	(ºî¶È¥³¥Ô¡¼)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="EUC-JP"?>
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 35130 -->
+<!-- original version: 38334 -->
 
  <sect1 id="needed-info">
 <!--
@@ -314,6 +314,8 @@
 </row>
 <row arch="not-s390"><entry>Their order on the system.</entry></row>
 <row arch="not-s390;not-m68k">
+ "not-m68k;not-s390" would really turn out to be everything...
+<row arch="alpha;arm;hppa;i386;ia64;mips;mipsel;powerpc;sparc">
   <entry>Whether IDE or SCSI (most computers are IDE).</entry>
 </row>
 <row arch="m68k">
@@ -330,7 +332,8 @@
   <entry>¥É¥é¥¤¥Ö¤ÎÂæ¿ô</entry>
 </row>
 <row arch="not-s390"><entry>¥·¥¹¥Æ¥à¤Ç¤ÎÀܳ½ç½ø</entry></row>
-<row arch="not-s390;not-m68k">
+<!-- "not-m68k;not-s390" would really turn out to be everything... -->
+<row arch="alpha;arm;hppa;i386;ia64;mips;mipsel;powerpc;sparc">
   <entry>IDE ¤« SCSI ¤« (ÂçÄñ¤Î¥³¥ó¥Ô¥å¡¼¥¿¤Ï IDE)</entry>
 </row>
 <row arch="m68k">
Index: ja/appendix/preseed.xml
===================================================================
--- ja/appendix/preseed.xml	(¥ê¥Ó¥¸¥ç¥ó 38453)
+++ ja/appendix/preseed.xml	(ºî¶È¥³¥Ô¡¼)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="EUC-JP"?>
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 37512 -->
+<!-- original version: 38429 -->
 
 <!--
 Be carefull with the format of this file as it is parsed to generate
@@ -505,6 +505,18 @@
 <para>
 
 <!--
+Note that <filename>preseed/url</filename> can be shortened to just
+<filename>url</filename> and <filename>preseed/file</filename> to just
+<filename>file</filename> when they are passed as boot parameters.
+-->
+¥Ö¡¼¥È¥Ñ¥é¥á¡¼¥¿¤ËÅϤ¹ºÝ¤Ë¡¢
+<filename>preseed/url</filename> ¤Ï <filename>url</filename> ¤Ë¡¢
+<filename>preseed/file</filename> ¤Ï <filename>file</filename> ¤Ë
+û½Ì¤Ç¤­¤ë¤³¤È¤ËÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£
+
+</para><para>
+
+<!--
 While you're at it, you may want to add a boot parameter
 <userinput>debconf/priority=critical</userinput>. This will avoid most
 questions even if the preseeding below misses some.
@@ -621,6 +633,17 @@
 </para><para>
 
 <!--
+Note that some variables that are frequently set at the boot prompt have a
+shorter alias. If an alias is available, it is used in the examples in
+this appendix instead of the full variable.
+-->
+¥Ö¡¼¥È¥×¥í¥ó¥×¥È¤Ë¤è¤¯»ÈÍѤµ¤ì¤ëÊÑ¿ô¤Ë¤Ï¡¢
+û¤¤¥¨¥¤¥ê¥¢¥¹¤¬¤¢¤ë¤³¤È¤ËÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£
+Í­¸ú¤Ê¥¨¥¤¥ê¥¢¥¹¤Ï¡¢ËÜ¥µ¥ó¥×¥ëÆâ¤Ç´°Á´¤ÊÊÑ¿ô̾¤ÎÂå¤ï¤ê¤Ë»ÈÍѤ·¤Æ¤¤¤Þ¤¹¡£
+
+</para><para>
+
+<!--
 A <quote>-\-</quote> in the boot options has special meaning.
 Kernel parameters that appear after it will be copied into the installed
 bootloader configuration (if supported by the installer for the
@@ -907,11 +930,11 @@
 <!--
 The locale can be used to specify both language and country.
 To specify the locale as a boot parameter, use
-<userinput>debian-installer/locale=<replaceable>en_US</replaceable></userinput>.
+<userinput>locale=<replaceable>en_US</replaceable></userinput>.
 -->
 ¥í¥±¡¼¥ë¤Ï¸À¸ì¤È¹ñ¤òξÊý»ØÄꤷ¤Þ¤¹¡£
 ¥Ö¡¼¥È¥Ñ¥é¥á¡¼¥¿¤Ç¥í¥±¡¼¥ë¤ò»ØÄꤹ¤ë¤Ë¤Ï¡¢
-<userinput>debian-installer/locale=<replaceable>en_US</replaceable></userinput>
+<userinput>locale=<replaceable>en_US</replaceable></userinput>
 ¤È¤·¤Æ¤¯¤À¤µ¤¤¡£
 
 <informalexample role="example"><screen>
@@ -996,11 +1019,11 @@
 <!--
 If you need to pick a particular interface when netbooting before loading
 a preconfiguration file from the network, use a boot parameter such as
-<userinput>netcfg/choose_interface=<replaceable>eth1</replaceable></userinput>.
+<userinput>interface=<replaceable>eth1</replaceable></userinput>.
 -->
 ¥Í¥Ã¥È¥ï¡¼¥¯¤«¤é»öÁ°ÀßÄê¥Õ¥¡¥¤¥ë¤òÆÉ¤ß¹þ¤àÁ°¤Ë netboot ¤¹¤ë¤È¤­¡¢
 ÆÃÄê¤Î¥¤¥ó¥¿¡¼¥Õ¥§¡¼¥¹¤òÁª¤ÖɬÍפ¬¤¢¤ë¤Ê¤é¡¢
-<userinput>netcfg/choose_interface=<replaceable>eth1</replaceable></userinput>
+<userinput>interface=<replaceable>eth1</replaceable></userinput>
 ¤Î¤è¤¦¤Ë¥Ö¡¼¥È¥Ñ¥é¥á¡¼¥¿¤ò»ÈÍѤ·¤Æ¤¯¤À¤µ¤¤¡£
 
 
@@ -1161,6 +1184,8 @@
 # be given in either devfs or traditional non-devfs format.
 # For example, to use the first disk devfs knows of:
 d-i partman-auto/disk string /dev/discs/disc0/disc
+# Or, if you want to use LVM:
+#d-i partman-auto-lvm/disk string /dev/discs/disc0/disc
 
 # You can choose from any of the predefined partitioning recipes.
 # Note: this must be preseeded with a localized (translated) value.
Index: ja/using-d-i/modules/kbd-chooser.xml
===================================================================
--- ja/using-d-i/modules/kbd-chooser.xml	(¥ê¥Ó¥¸¥ç¥ó 38453)
+++ ja/using-d-i/modules/kbd-chooser.xml	(ºî¶È¥³¥Ô¡¼)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="EUC-JP"?>
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 28672 -->
+<!-- original version: 38231 -->
 
    <sect3 id="kbd-chooser">
    <title>¥­¡¼¥Ü¡¼¥ÉÁªÂò</title>
@@ -98,11 +98,11 @@
 
 <!--
 To get a working keyboard, you should boot the installer with parameter
-<userinput>debconf/priority=medium</userinput>. When you get to keyboard
+<userinput>priority=medium</userinput>. When you get to keyboard
 selection<footnote>
 -->
 ¥­¡¼¥Ü¡¼¥É¤¬Æ°ºî¤¹¤ë¤è¤¦¤Ë¤¹¤ë¤Ë¤Ï¡¢
-<userinput>debconf/priority=medium</userinput> 
+<userinput>priority=medium</userinput>
 ¤È¤¤¤¦¥Ñ¥é¥á¡¼¥¿¤ò¤Ä¤±¤Æ¥¤¥ó¥¹¥È¡¼¥é¤òµ¯Æ°¤·¤Æ¤¯¤À¤µ¤¤¡£
 ¥­¡¼¥Ü¡¼¥É¤ÎÁªÂò¤Þ¤Ç¤­¤¿¤é<footnote>
 
Index: ja/using-d-i/modules/partman.xml
===================================================================
--- ja/using-d-i/modules/partman.xml	(¥ê¥Ó¥¸¥ç¥ó 38453)
+++ ja/using-d-i/modules/partman.xml	(ºî¶È¥³¥Ô¡¼)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="EUC-JP"?>
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 30158 -->
+<!-- original version: 38406 -->
 
    <sect3 id="partman">
    <title>¥Ç¥£¥¹¥¯¤Î¥Ñ¡¼¥Æ¥£¥·¥ç¥óʬ³ä</title>
@@ -34,15 +34,37 @@
 </para><para>
 
 <!--
-If you choose guided partitioning, you will be able to choose from the
-schemes listed in the table below. All schemes have their pros and cons,
+If you choose guided partitioning, you may have two options: to create
+partitions directly on the hard disk (classic method) or to use Logical
+Volume Management (LVM). In the second case, the installer will create most
+partitions inside one big partition; the advantage of this method is that
+partitions inside this big partition can be resized relatively easily later.
+Note: the option to use LVM may not be available on all architectures.
+-->
+¥¬¥¤¥É¥Ñ¡¼¥Æ¥£¥·¥ç¥óʬ³ä¤òÁªÂò¤·¤¿¾ì¹ç¡¢ÁªÂò»è¤¬ 2 ¤Ä¤¢¤ê¤Þ¤¹¡£
+¥Ï¡¼¥É¥Ç¥£¥¹¥¯¤ËľÀܥѡ¼¥Æ¥£¥·¥ç¥ó¤òºîÀ®¤¹¤ë (¥¯¥é¥·¥Ã¥¯) ÊýË¡¤È¡¢
+ÏÀÍý¥Ü¥ê¥å¡¼¥à´ÉÍý (LVM) ¤òÍøÍѤ¹¤ëÊýË¡¤Ç¤¹¡£
+2 ÈÖÌܤÎÊýË¡¤Ç¤Ï¡¢¥¤¥ó¥¹¥È¡¼¥é¤¬ºîÀ®¤¹¤ë¤Û¤È¤ó¤É¤Î¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤ò¡¢
+Â礭¤Ê¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤ÎÃæ¤ËºîÀ®¤·¤Þ¤¹¡£
+¤³¤ÎÍøÅÀ¤Ï¡¢Â礭¤Ê¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤ÎÃæ¤Ë¤¢¤ë¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤ò¡¢
+¸å¤«¤é´Êñ¤ËÂ礭¤µ¤òÊѹ¹¤Ç¤­¤ë¤³¤È¤Ç¤¹¡£
+Ãí°Õ: LVM ¤ò»ÈÍѤ¹¤ëÊýË¡¤Ï¡¢
+¤¹¤Ù¤Æ¤Î¥¢¡¼¥­¥Æ¥¯¥Á¥ã¤Ç»ÈÍѤǤ­¤ë¤ï¤±¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£
+
+</para><para>
+
+<!--
+After you choose guided partitioning (either classic or using LVM), you
+will be able to choose from the schemes listed in the table below.
+All schemes have their pros and cons,
 some of which are discussed in <xref linkend="partitioning"/>. If you are
-unsure, choose the first one. Bear in mind, that guided partitioning
-needs certain minimal amount of free space to operate with. If you don't
+unsure, choose the first one. Bear in mind that guided partitioning
+needs a certain minimal amount of free space to operate with. If you don't
 give it at least about 1GB of space (depends on chosen scheme), guided
 partitioning will fail.
 -->
-¥¬¥¤¥É¥Ñ¡¼¥Æ¥£¥·¥ç¥óʬ³ä¤òÁªÂò¤·¤¿¾ì¹ç¡¢°Ê²¼¤Îɽ¤«¤éʬ³ä°Æ¤òÁªÂò¤Ç¤­¤Þ¤¹¡£
+¥¬¥¤¥É¥Ñ¡¼¥Æ¥£¥·¥ç¥óʬ³ä¤òÁªÂò¤·¤¿¾ì¹ç¡¢(¥¯¥é¥·¥Ã¥¯¤Ç¤â LVM¤Ç¤â) 
+°Ê²¼¤Îɽ¤«¤éʬ³ä°Æ¤òÁªÂò¤Ç¤­¤Þ¤¹¡£
 ¤É¤Î°Æ¤Ç¤â»¿ÈÝξÏÀ¤¢¤ê¡¢<xref linkend="partitioning"/> ¤ÇµÄÏÀ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£
 ¤è¤¯¤ï¤«¤é¤Ê¤±¤ì¤Ð¡¢ºÇ½é¤Î¹àÌܤòÁªÂò¤·¤Æ¤¯¤À¤µ¤¤¡£
 ¥¬¥¤¥É¥Ñ¡¼¥Æ¥£¥·¥ç¥óʬ³ä¤Ï¡¢ºÇÄã¸Âưºî¤¹¤ë¶õ¤­Îΰ褬ɬÍפʤ³¤È¤ò¡¢
@@ -68,13 +90,13 @@
   <entry>600MB</entry>
   <entry><filename>/</filename>, swap</entry>
 </row><row>
-  <entry>Desktop machine</entry>
+  <entry>Separate /home partition</entry>
   <entry>500MB</entry>
   <entry>
     <filename>/</filename>, <filename>/home</filename>, swap
   </entry>
 </row><row>
-  <entry>Multi-user workstation</entry>
+  <entry>Separate /home, /usr, /var and /tmp partitions</entry>
   <entry>1GB</entry>
   <entry>
     <filename>/</filename>, <filename>/home</filename>,
@@ -85,16 +107,28 @@
 
 </tbody></tgroup></informaltable>
 
-<para arch="ia64">
+<para>
 
 <!--
-If you chose an automatic partitioning for your IA64 system, there
+If you choose guided partitioning using LVM, the installer will also create
+a separate /boot partition. The other partitions, except for the swap
+partition, will be created inside the LVM partition.
+-->
+LVM ¤òÍøÍѤ¹¤ë¥¬¥¤¥É¥Ñ¡¼¥Æ¥£¥·¥ç¥óʬ³ä¤ò¹Ô¤¦¤È·è¤á¤¿¾ì¹ç¡¢
+¥¤¥ó¥¹¥È¡¼¥é¤ÏÆÈΩ¤·¤¿ /boot ¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤âºîÀ®¤·¤Þ¤¹¡£
+¥¹¥ï¥Ã¥×¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤ò½ü¤¯¤½¤Î¾¤Î¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤Ï¡¢
+LVM ¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤ÎÆâÉô¤ËºîÀ®¤·¤Þ¤¹¡£
+
+</para><para arch="ia64">
+
+<!--
+If you choose guided partitioning for your IA64 system, there
 will be an additional partition, formatted as a FAT16 bootable filesystem,
 for the EFI boot loader.
 There is also an additional menu item in the formatting menu to manually
 set up a partition as an EFI boot partition.
 -->
-¤â¤· IA64 ¥·¥¹¥Æ¥à¤ËÂФ·¤Æ¼«Æ°¥Ñ¡¼¥Æ¥£¥·¥ç¥óʬ³ä¤ò¹Ô¤¦¤È·è¤á¤¿¾ì¹ç¡¢
+IA64 ¥·¥¹¥Æ¥à¤ËÂФ·¤Æ¥¬¥¤¥É¥Ñ¡¼¥Æ¥£¥·¥ç¥óʬ³ä¤ò¹Ô¤¦¤È·è¤á¤¿¾ì¹ç¡¢
 EFI ¥Ö¡¼¥È¥í¡¼¥ÀÍѤˡ¢ FAT16 ¤Îµ¯Æ°²Äǽ¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤Ç¥Õ¥©¡¼¥Þ¥Ã¥È¤µ¤ì¤¿
 Äɲåѡ¼¥Æ¥£¥·¥ç¥ó¤¬¤¢¤ë¤Ï¤º¤Ç¤¹¡£
 ¼êư¤Ç EFI ¥Ö¡¼¥È¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤È¤·¤Æ¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤ò¥»¥Ã¥È¥¢¥Ã¥×¤¹¤ë¤è¤¦¡¢
@@ -103,11 +137,11 @@
 </para><para arch="alpha">
 
 <!--
-If you chose an automatic partitioning for your Alpha system, an
+If you choose guided partitioning for your Alpha system, an
 additional, unformatted partition will be allocated at the beginning of
 your disk to reserve this space for the aboot boot loader.
 -->
-Alpha ¥Þ¥·¥ó¤ËÂФ·¤Æ¼«Æ°¥Ñ¡¼¥Æ¥£¥·¥ç¥óʬ³ä¤ò¹Ô¤¦¤È·è¤á¤¿¾ì¹ç¡¢
+Alpha ¥Þ¥·¥ó¤ËÂФ·¤Æ¥¬¥¤¥É¥Ñ¡¼¥Æ¥£¥·¥ç¥óʬ³ä¤ò¹Ô¤¦¤È·è¤á¤¿¾ì¹ç¡¢
 ¥Ç¥£¥¹¥¯¤ÎÀèÆ¬¤Ë aboot ¥Ö¡¼¥È¥í¡¼¥ÀÍѤÎ̤¥Õ¥©¡¼¥Þ¥Ã¥ÈÎΰè¤ò¡¢
 ÄɲäÇͽÌ󤷤ʤ±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£
 
@@ -129,36 +163,39 @@
 -->
 ¥Ñ¡¼¥Æ¥£¥·¥ç¥ó°ìÍ÷¤Ï°Ê²¼¤Î¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡£
 
-<!-- TODO: show some flags here (lightning, skull, smiley) -->
 <informalexample><screen>
   IDE1 master (hda) - 6.4 GB WDC AC36400L
-        #1 primary   16.4 MB     ext2       /boot
-        #2 primary  551.0 MB     swap       swap
-        #3 primary    5.8 GB     ntfs
-           pri/log    8.2 MB     FREE SPACE
+        #1 primary   16.4 MB  B f ext2       /boot
+        #2 primary  551.0 MB      swap       swap
+        #3 primary    5.8 GB      ntfs
+           pri/log    8.2 MB      FREE SPACE
 
   IDE1 slave (hdb) - 80.0 GB ST380021A
-        #1 primary   15.9 MB     ext3
-        #2 primary  996.0 MB     fat16
-        #3 primary    3.9 GB     xfs        /home
-        #5 logical    6.0 GB     ext3       /
-        #6 logical    1.0 GB     ext3       /var
-        #7 logical  498.8 MB     ext3
-        #8 logical  551.5 MB     swap       swap
-        #9 logical   65.8 GB     ext2
+        #1 primary   15.9 MB      ext3
+        #2 primary  996.0 MB      fat16
+        #3 primary    3.9 GB      xfs        /home
+        #5 logical    6.0 GB    f ext3       /
+        #6 logical    1.0 GB    f ext3       /var
+        #7 logical  498.8 MB      ext3
+        #8 logical  551.5 MB      swap       swap
+        #9 logical   65.8 GB      ext2
 </screen></informalexample>
 
 <!--
 This example shows two IDE harddrives divided into several partitions;
 the first disk has some free space. Each partition line consists of the
 partition number, its type, size, optional flags, file system, and
-mountpoint (if any).
+mountpoint (if any). Note: this particular setup cannot be created using
+guided partitioning but it does show possible variation that can be achieved
+using manual partitioning).
 -->
 ¤³¤ÎÎã¤Ç¤Ï¡¢2 ¤Ä¤Î IDE ¥Ï¡¼¥É¥Ç¥£¥¹¥¯¤ò¡¢
 ¤¤¤¯¤Ä¤«¤Î¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤Ëʬ³ä¤·¤Æ¤¤¤Þ¤¹¡£
 Âè 1 ¥Ç¥£¥¹¥¯¤Ë¤Ï¶õ¤­Îΰ褬¤¤¤¯¤é¤«¤¢¤ê¤Þ¤¹¡£
 ¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¹Ô¤´¤È¤Ë¡¢¥Ñ¡¼¥Æ¥£¥·¥ç¥óÈֹ桢¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¥¿¥¤¥×¡¢¥µ¥¤¥º¡¢
-Äɲåե饰¡¢¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¡¢¥Þ¥¦¥ó¥È¥Ý¥¤¥ó¥È¤òɽ¼¨¤·¤Æ¤¤¤Þ¤¹¡£
+Äɲåե饰¡¢¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¡¢¥Þ¥¦¥ó¥È¥Ý¥¤¥ó¥È¤ò (¤¢¤ì¤Ð) ɽ¼¨¤·¤Æ¤¤¤Þ¤¹¡£
+Ãí°Õ: ¤³¤¦¤¤¤Ã¤¿¾ÜºÙ¤Ê¥»¥Ã¥È¥¢¥Ã¥×¤Ï¥¬¥¤¥É¥Ñ¡¼¥Æ¥£¥·¥ç¥óʬ³ä¤Ç¤Ï¹Ô¤¨¤Þ¤»¤ó¤¬¡¢
+¼êư¥Ñ¡¼¥Æ¥£¥·¥ç¥óʬ³ä¤Ç»ÈÍѤǤ­¤ëÊѲ½¤ò¼¨¤·¤Þ¤¹¡£
 
 </para><para>
 
@@ -168,8 +205,7 @@
 partitioning and write changes to disk</guimenuitem> from the menu to
 implement the new partition table (as described at the end of this
 section). If you are not happy, you can choose to <guimenuitem>Undo
-changes to partitions</guimenuitem>, to run guided partitioning again
-or modify the proposed changes as described below for manual partitioning.
+changes to partitions</guimenuitem><footnote>
 -->
 ¤³¤ì¤Ç¥¬¥¤¥É¥Ñ¡¼¥Æ¥£¥·¥ç¥óʬ³ä¤ò½ª¤¨¤Þ¤¹¡£
 À¸À®¤µ¤ì¤¿¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¥Æ¡¼¥Ö¥ë¤Ç¤è¤±¤ì¤Ð¡¢
@@ -178,8 +214,27 @@
 ¤ò¥á¥Ë¥å¡¼¤«¤éÁª¤Ù¤Þ¤¹¡£
 ¤½¤¦¤Ç¤Ê¤±¤ì¤Ð¡¢¤â¤¦°ìÅÙ¥¬¥¤¥É¥Ñ¡¼¥Æ¥£¥·¥ç¥óʬ³ä¤ò¤·¤¿¤ê¡¢
 °Ê²¼¤Ë½Ò¤Ù¤ë¼êư¥Ñ¡¼¥Æ¥£¥·¥ç¥óʬ³ä¤ÇÄ󰯤¹¤ëÊѹ¹¤ò½¤Àµ¤ò¤¹¤ë¤Î¤Ë 
-<guimenuitem>Undo changes to partitions</guimenuitem> ¤òÁª¤Ù¤Þ¤¹¡£
+<guimenuitem>Undo changes to partitions</guimenuitem><footnote>
 
+<para>
+
+<!--
+If you selected guided partitioning using LVM, you will not be able to undo
+all changes made as some changes will already have been committed to the
+hard disk. The installer will warn you before that happens though.
+-->
+LVM ¤ò»ÈÍѤ·¤Æ¥¬¥¤¥É¥Ñ¡¼¥Æ¥£¥·¥ç¥óʬ³ä¤ò¹Ô¤¦¾ì¹ç¡¢
+¥Ï¡¼¥É¥Ç¥£¥¹¥¯¤Ë¥³¥ß¥Ã¥È¤·¤Æ¤·¤Þ¤Ã¤¿Êѹ¹¤Ï¸µ¤ËÌ᤻¤Þ¤»¤ó¡£
+¤â¤Ã¤È¤â¡¢¤½¤¦¤Ê¤ëÁ°¤Ë¥¤¥ó¥¹¥È¡¼¥é¤¬·Ù¹ð¤·¤Æ¤­¤Þ¤¹
+
+</para>
+
+<!--
+</footnote> and run guided partitioning again, or modify the proposed changes
+as described below for manual partitioning.
+-->
+</footnote> ¤òÁª¤Ù¤Þ¤¹¡£
+
 </para><para>
 
 <!--
@@ -227,7 +282,7 @@
 existing partition onto this one.
 When you are satisfied with your new partition, select
 <guimenuitem>Done setting up the partition</guimenuitem> and you will be
-thrown back to the <command>partman</command>'s main screen.
+thrown back to <command>partman</command>'s main screen.
 -->
 ¶õ¤­Îΰè¤òÁªÂò¤¹¤ë¤È¡¢¿·¤·¤¤¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤òºîÀ®¤¹¤ë¤è¤¦Â¥¤µ¤ì¤Þ¤¹¡£
 ¥µ¥¤¥º¤ä¥¿¥¤¥× (´ðËܤ«ÏÀÍý¤«) ¡¢¾ì½ê (¶õ¤­Îΰè¤ÎÀèÆ¬¤«¤é¤«ºÇ¸å¤«¤é¤«) 
@@ -289,7 +344,7 @@
 </para><para arch="ia64">
 
 <!--
-If you forget to select and format an EFI boot partition
+If you forget to select and format an EFI boot partition,
 <command>partman</command> will detect this and will not let you continue
 until you allocate one.
 -->
Index: ja/using-d-i/using-d-i.xml
===================================================================
--- ja/using-d-i/using-d-i.xml	(¥ê¥Ó¥¸¥ç¥ó 38453)
+++ ja/using-d-i/using-d-i.xml	(ºî¶È¥³¥Ô¡¼)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="EUC-JP"?>
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 36647 -->
+<!-- original version: 38231 -->
 
 
  <chapter id="d-i-intro"><title>Debian Installer ¤Î»ÈÍÑË¡</title>
@@ -77,13 +77,13 @@
 where each step is controlled by the user rather than the installer
 performing each step automatically in sequence. To use the installer
 in a manual, menu-driven way, add the boot argument
-<userinput>debconf/priority=medium</userinput>.
+<userinput>priority=medium</userinput>.
 -->
 ¥Ñ¥ï¡¼¥æ¡¼¥¶¤Ï¡¢¥á¥Ë¥å¡¼¥É¥ê¥Ö¥ó¥¤¥ó¥¿¡¼¥Õ¥§¡¼¥¹ 
 (¼«Æ°¤Ç½ç¤Ë³Æ¥¹¥Æ¥Ã¥×¤ò¼Â¹Ô¤¹¤ë¥¤¥ó¥¹¥È¡¼¥é¤Ç¤Ï¤Ê¤¯¡¢
 ¥æ¡¼¥¶¤¬³Æ¥¹¥Æ¥Ã¥×¤òÀ©¸æ¤¹¤ë) ¤ÎÊý¤¬¡¢Ëþ­¤¹¤ë¤«¤â¤·¤ì¤Þ¤»¤ó¡£
 ¼êư (¥á¥Ë¥å¡¼¶îư) ¤Ç¥¤¥ó¥¹¥È¡¼¥é¤ò»ÈÍѤ¹¤ë¤Ë¤Ï¡¢
-µ¯Æ°°ú¿ô¤Ë <userinput>debconf/priority=medium</userinput> ¤ò²Ã¤¨¤Æ¤¯¤À¤µ¤¤¡£
+µ¯Æ°°ú¿ô¤Ë <userinput>priority=medium</userinput> ¤ò²Ã¤¨¤Æ¤¯¤À¤µ¤¤¡£
 
 </para><para>
 
@@ -92,14 +92,14 @@
 they are installed, you will need to start the installer in
 <quote>expert</quote> mode. This can be done by either using the
 <command>expert</command> command to start the installer or by adding
-the boot argument <userinput>debconf/priority=low</userinput>.
+the boot argument <userinput>priority=low</userinput>.
 Expert mode gives you full control over &d-i;.
 -->
 ¥Ï¡¼¥É¥¦¥§¥¢¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ëºÝ¤Ë¡¢
 ¥ª¥×¥·¥ç¥ó¤ò¥«¡¼¥Í¥ë¥â¥¸¥å¡¼¥ë¤ØÅϤ¹É¬Íפ¬¤¢¤ë¾ì¹ç¡¢
 <quote>¥¨¥­¥¹¥Ñ¡¼¥È</quote>¥â¡¼¥É¤Ç¥¤¥ó¥¹¥È¡¼¥é¤òµ¯Æ°¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
 ¤³¤ì¤Ï¡¢¥¤¥ó¥¹¥È¡¼¥é¤òµ¯Æ°¤¹¤ë¥³¥Þ¥ó¥É¤Ë <command>expert</command> ¤ò»ÈÍѤ¹¤ë¡¢
-¤¢¤ë¤¤¤Ïµ¯Æ°°ú¿ô¤Ë <userinput>debconf/priority=low</userinput>
+¤¢¤ë¤¤¤Ïµ¯Æ°°ú¿ô¤Ë <userinput>priority=low</userinput>
 ¤ò²Ã¤¨¤ë¤³¤È¤Ç¹Ô¤¤¤Þ¤¹¡£
 ¥¨¥­¥¹¥Ñ¡¼¥È¥â¡¼¥É¤Ç¤Ï &d-i; ¤ò¥Õ¥ë¥³¥ó¥È¥í¡¼¥ë¤Ç¤­¤Þ¤¹¡£
 
Index: ja/boot-installer/m68k.xml
===================================================================
--- ja/boot-installer/m68k.xml	(¥ê¥Ó¥¸¥ç¥ó 38453)
+++ ja/boot-installer/m68k.xml	(ºî¶È¥³¥Ô¡¼)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="EUC-JP"?>
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 33725 -->
+<!-- original version: 38231 -->
 
   <sect2 arch="m68k"><title>¥¤¥ó¥¹¥È¡¼¥ëÊýË¡¤ÎÁªÂò</title>
 
@@ -77,12 +77,11 @@
 
 <!--
 Amiga does not currently work with bogl, so if
-you are seeing bogl errors, you need to include the kernel parameter
-<userinput>debian-installer/framebuffer=false</userinput>.
+you are seeing bogl errors, you need to include the boot parameter
+<userinput>fb=false</userinput>.
 -->
 bogl ¥¨¥é¡¼¤ò¸«¤ë¤Ë¤Ï¡¢
-¥«¡¼¥Í¥ë¥Ñ¥é¥á¡¼¥¿ <userinput>debian-installer/framebuffer=false</userinput>
-¤ò´Þ¤á¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
+¥Ö¡¼¥È¥Ñ¥é¥á¡¼¥¿ <userinput>fb=false</userinput> ¤ò´Þ¤á¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
 ¤½¤Î¤¿¤á¡¢Amiga ¤Ï¡¢¸½ºß bogl ¤È¤È¤â¤Ë¤Ïưºî¤·¤Þ¤»¤ó¡£
 
 </para>
@@ -105,12 +104,11 @@
 
 <!--
 Atari does not currently work with bogl, so if
-you are seeing bogl errors, you need to include the kernel parameter
-<userinput>debian-installer/framebuffer=false</userinput>.
+you are seeing bogl errors, you need to include the boot parameter
+<userinput>fb=false</userinput>.
 -->
 bogl ¥¨¥é¡¼¤ò¸«¤ë¤Ë¤Ï¡¢
-¥«¡¼¥Í¥ë¥Ñ¥é¥á¡¼¥¿ <userinput>debian-installer/framebuffer=false</userinput>
-¤ò´Þ¤á¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
+¥Ö¡¼¥È¥Ñ¥é¥á¡¼¥¿ <userinput>fb=false</userinput> ¤ò´Þ¤á¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
 ¤½¤Î¤¿¤á¡¢Atari ¤Ï¡¢¸½ºß bogl ¤È¤È¤â¤Ë¤Ïưºî¤·¤Þ¤»¤ó¡£
 
 </para>
Index: ja/boot-installer/i386.xml
===================================================================
--- ja/boot-installer/i386.xml	(¥ê¥Ó¥¸¥ç¥ó 38453)
+++ ja/boot-installer/i386.xml	(ºî¶È¥³¥Ô¡¼)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="EUC-JP"?>
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 36744 -->
+<!-- original version: 38231 -->
 
   <sect2 arch="i386"><title>CD-ROM ¤«¤é¤Îµ¯Æ°</title>
 
@@ -513,14 +513,14 @@
 <keycap>F8</keycap>. If you add any parameters to
 the boot command line, be sure to type the boot method (the default is
 <userinput>linux</userinput>) and a space before the first parameter (e.g.,
-<userinput>linux debconf/priority=medium</userinput>).
+<userinput>linux fb=false</userinput>).
 -->
 Í­¸ú¤Êµ¯Æ°ÊýË¡¤äµ¯Æ°¥Ñ¥é¥á¡¼¥¿¤ÎÍ­ÍѤʾðÊó¤ò¡¢<keycap>F2</keycap> ¤«¤é
 <keycap>F8</keycap> ¤ò²¡¤¹¤Èɽ¼¨¤·¤Þ¤¹¡£
 ¥Ñ¥é¥á¡¼¥¿¤òµ¯Æ°¥³¥Þ¥ó¥É¥é¥¤¥ó¤ËÄɲ乤ë¾ì¹ç¤Ë¤Ï¡¢
 µ¯Æ°ÊýË¡ (¥Ç¥Õ¥©¥ë¥È¤Ï <userinput>linux</userinput>) ¤ò¥¿¥¤¥×¤·¡¢
 ºÇ½é¤Î¥Ñ¥é¥á¡¼¥¿¤ÎÁ°¤Ë¥¹¥Ú¡¼¥¹¤ò¶õ¤±¤Æ¤¯¤À¤µ¤¤
-(Îã: <userinput>linux debconf/priority=medium</userinput>)¡£
+(Îã: <userinput>linux fb=false</userinput>)¡£
 
 <note><para>
 
@@ -561,7 +561,7 @@
 past the splash screen and at the help text your keystrokes will be echoed
 at the prompt as expected. To prevent the installer from using the
 framebuffer for the rest of the installation, you will also want to add
-<userinput>debian-installer/framebuffer=false</userinput> to the boot prompt,
+<userinput>fb=false</userinput> to the boot prompt,
 as described in the help text.
 -->
 </footnote> ¤ò²¡¤¹¤È¡¢¤³¤Î²èÌ̤ò¥Ð¥¤¥Ñ¥¹¤·¥Ø¥ë¥×¥Æ¥­¥¹¥È¤òɽ¼¨¤Ç¤­¤Þ¤¹¡£
@@ -569,8 +569,7 @@
 ¥Ø¥ë¥×¥Æ¥­¥¹¥È¤ÇÆþÎϤ·¤¿¥­¡¼¤¬Í½ÁÛÄ̤ê¥×¥í¥ó¥×¥È¤Ëɽ¼¨¤µ¤ì¤Æ¤¤¤Þ¤¹¡£
 ¤Þ¤¿¡¢¥¤¥ó¥¹¥È¡¼¥ë¤Ç¥¤¥ó¥¹¥È¡¼¥é¤¬¥Õ¥ì¡¼¥à¥Ð¥Ã¥Õ¥¡¤ò»ÈÍѤ·¤Ê¤¤¤è¤¦¡¢
 (¥Ø¥ë¥×¥Æ¥­¥¹¥È¤Ë¤¢¤ë¤è¤¦¤Ë) ¥×¥í¥ó¥×¥È¤Ë 
-<userinput>debian-installer/framebuffer=false</userinput> 
-¤òÄɲ乤ë»ö¤â¤Ç¤­¤Þ¤¹¡£
+<userinput>fb=false</userinput> ¤òÄɲ乤ë»ö¤â¤Ç¤­¤Þ¤¹¡£
 
 </para></note>
 </para>
Index: ja/boot-installer/parameters.xml
===================================================================
--- ja/boot-installer/parameters.xml	(¥ê¥Ó¥¸¥ç¥ó 38453)
+++ ja/boot-installer/parameters.xml	(ºî¶È¥³¥Ô¡¼)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="EUC-JP"?>
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 36744 -->
+<!-- original version: 38289 -->
 
  <sect1 id="boot-parms"><title>¥Ö¡¼¥È¥Ñ¥é¥á¡¼¥¿</title>
 <para>
@@ -133,18 +133,17 @@
 <para>
 
 <!--
-Note that the kernel accepts a maximum of 8 command line options and
+Note that the 2.4 kernel accepts a maximum of 8 command line options and
 8 environment options (including any options added by default for the
 installer). If these numbers are exceeded, 2.4 kernels will drop any
-excess options and 2.6 kernels will panic. With kernel 2.6.9 or newer,
+excess options. With kernel 2.6.9 or newer,
 you can use 32 command line options and 32 environment options.
 -->
-¥«¡¼¥Í¥ë¤ÏºÇÂç¤Ç¥³¥Þ¥ó¥É¥é¥¤¥ó¥ª¥×¥·¥ç¥ó¤ò 8 ¤Ä¤È¡¢
+¥«¡¼¥Í¥ë 2.4 ¤ÏºÇÂç¤Ç¥³¥Þ¥ó¥É¥é¥¤¥ó¥ª¥×¥·¥ç¥ó¤ò 8 ¤Ä¤È¡¢
 ´Ä¶­¥ª¥×¥·¥ç¥ó¤ò 8 ¤Ä¼õ¤±ÉÕ¤±¤Þ¤¹¡£
 (¥¤¥ó¥¹¥È¡¼¥é¤¬¥Ç¥Õ¥©¥ë¥È¤ÇÉղ乤륪¥×¥·¥ç¥ó´Þ¤à)
 ¤â¤·¤³¤Î¿ô¤òĶ²á¤¹¤ë¤È¡¢
-2.4 ¥«¡¼¥Í¥ë¤ÏĶ²á¤·¤¿¥ª¥×¥·¥ç¥ó¤ò̵»ë¤·¤Æ¤·¤Þ¤¤¤Þ¤¹¤·¡¢
-2.6 ¥«¡¼¥Í¥ë¤Ï¥«¡¼¥Í¥ë¥Ñ¥Ë¥Ã¥¯¤òµ¯¤³¤·¤Æ¤·¤Þ¤¤¤Þ¤¹¡£
+2.4 ¥«¡¼¥Í¥ë¤ÏĶ²á¤·¤¿¥ª¥×¥·¥ç¥ó¤ò̵»ë¤·¤Æ¤·¤Þ¤¤¤Þ¤¹¡£
 2.6.9 ¥«¡¼¥Í¥ë°Ê¹ß¤Ç¤Ï¡¢
 ¥³¥Þ¥ó¥É¥é¥¤¥ó¥ª¥×¥·¥ç¥ó¤ò 32 ¸Ä¤È´Ä¶­¥ª¥×¥·¥ç¥ó¤ò 32 ¸Ä»ÈÍѤǤ­¤Þ¤¹¡£
 
@@ -163,19 +162,21 @@
 
 <!--
 This parameter sets the lowest priority of messages to be displayed.
+Short form: <userinput>priority</userinput>
 -->
 ¤³¤Î¥Ñ¥é¥á¡¼¥¿¤Ë¤Ï¡¢É½¼¨¤¹¤ë¥á¥Ã¥»¡¼¥¸¤Î¤â¤Ã¤È¤âÄ㤤ͥÀèÅÙ¤òÀßÄꤷ¤Þ¤¹¡£
+û½Ì·Á: <userinput>priority</userinput>
 
 </para><para>
 
 <!--
-The default installation uses <userinput>debconf/priority=high</userinput>.
+The default installation uses <userinput>priority=high</userinput>.
 This means that both high and critical priority messages are shown, but medium
 and low priority messages are skipped.
 If problems are encountered, the installer adjusts the priority as needed.
 -->
 ¥Ç¥Õ¥©¥ë¥È¤Î¥¤¥ó¥¹¥È¡¼¥ë¤Ç¤Ï¡¢
-<userinput>debconf/priority=high</userinput> ¤ò»ÈÍѤ·¤Þ¤¹¡£
+<userinput>priority=high</userinput> ¤ò»ÈÍѤ·¤Þ¤¹¡£
 Í¥ÀèÅÙ¤¬¡Ö¹â¡×¤Î¤â¤Î¤È¡¢¡Ö½ÅÍספΤâ¤Î¤Î¥á¥Ã¥»¡¼¥¸¤òɽ¼¨¤·¡¢
 ¡Öɸ½à¡×¤ä¡¢¡ÖÄã¡×¤Î¥á¥Ã¥»¡¼¥¸¤Ï¥¹¥­¥Ã¥×¤·¤Þ¤¹¡£
 ÌäÂê¤Ë¤Ö¤Ä¤«¤Ã¤¿¾ì¹ç¡¢¥¤¥ó¥¹¥È¡¼¥é¤ÏɬÍפÊÍ¥ÀèÅÙ¤ËÄ´À°¤·¤Þ¤¹¡£
@@ -183,19 +184,19 @@
 </para><para>
 
 <!--
-If you add <userinput>debconf/priority=medium</userinput> as boot parameter, you
+If you add <userinput>priority=medium</userinput> as boot parameter, you
 will be shown the installation menu and gain more control over the installation.
-When <userinput>debconf/priority=low</userinput> is used, all messages are shown
+When <userinput>priority=low</userinput> is used, all messages are shown
 (this is equivalent to the <emphasis>expert</emphasis> boot method).
-With <userinput>debconf/priority=critical</userinput>, the installation system
+With <userinput>priority=critical</userinput>, the installation system
 will display only critical messages and try to do the right thing without fuss.
 -->
-¥Ö¡¼¥È¥Ñ¥é¥á¡¼¥¿¤Ë <userinput>debconf/priority=medium</userinput>
+¥Ö¡¼¥È¥Ñ¥é¥á¡¼¥¿¤Ë <userinput>priority=medium</userinput>
 ¤òÄɲ乤ë¤È¡¢¥¤¥ó¥¹¥È¡¼¥ë¥á¥Ë¥å¡¼¤¬É½¼¨¤µ¤ì¡¢
 ¥¤¥ó¥¹¥È¡¼¥ë¤Ë¤Ä¤¤¤Æ¡¢¤µ¤é¤Ë¿¤¯¤ÎÀ©¸æ¤ò¹Ô¤¦¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
-<userinput>debconf/priority=low</userinput> ¤ò»È¤Ã¤¿¾ì¹ç¤Ï¡¢
+<userinput>priority=low</userinput> ¤ò»È¤Ã¤¿¾ì¹ç¤Ï¡¢
 ¤¹¤Ù¤Æ¤Î¥á¥Ã¥»¡¼¥¸¤òɽ¼¨¤·¤Þ¤¹ (<emphasis>expert</emphasis> µ¯Æ°Ë¡¤ÈÅù²Á)¡£
-<userinput>debconf/priority=critical</userinput> ¤Î¾ì¹ç¤Ï¡¢
+<userinput>priority=critical</userinput> ¤Î¾ì¹ç¤Ï¡¢
 ¥¤¥ó¥¹¥È¡¼¥ë¥·¥¹¥Æ¥à¤Ï½ÅÍפʥá¥Ã¥»¡¼¥¸¤À¤±¤òɽ¼¨¤·¡¢
 ÂçÁû¤®¤»¤º¤ËÀµ¤·¤¤ÀßÄê¤ò¤·¤è¤¦¤È¤·¤Þ¤¹¡£
 
@@ -345,14 +346,16 @@
 Some architectures use the kernel framebuffer to offer installation in
 a number of languages. If framebuffer causes a problem on your system
 you can disable the feature by the parameter
-<userinput>debian-installer/framebuffer=false</userinput>. Problem
-symptoms are error messages about bterm or bogl, a blank screen, or
-a freeze within a few minutes after starting the install.
+<userinput>debian-installer/framebuffer=false</userinput>, or
+<userinput>fb=false</userinput> for short. Problem symptoms are error messages
+about bterm or bogl, a blank screen, or a freeze within a few minutes after
+starting the install.
 -->
 ¤¤¤¯¤Ä¤«¤Î¥¢¡¼¥­¥Æ¥¯¥Á¥ã¤Ç¤Ï¡¢Â¿¤¯¤Î¸À¸ì¤Ç¥¤¥ó¥¹¥È¡¼¥ë¤ò¹Ô¤¦¤¿¤á¤Ë¡¢
 ¥«¡¼¥Í¥ë¥Õ¥ì¡¼¥à¥Ð¥Ã¥Õ¥¡¤ò»ÈÍѤ·¤Þ¤¹¡£
 ¥Õ¥ì¡¼¥à¥Ð¥Ã¥Õ¥¡¤¬ÌäÂê¤È¤Ê¤ë¥·¥¹¥Æ¥à¤Î¾ì¹ç¡¢
-<userinput>debian-installer/framebuffer=false</userinput> 
+<userinput>debian-installer/framebuffer=false</userinput> ¤ä
+¾Êά¤·¤¿ <userinput>fb=false</userinput>
 ¥Ñ¥é¥á¡¼¥¿¤Ë¤è¤Ã¤Æ¤³¤Îµ¡Ç½¤ò̵¸ú¤Ë¤Ç¤­¤Þ¤¹¡£
 bterm ¤ä bogl ¤Ë´Ø¤¹¤ë¥¨¥é¡¼¥á¥Ã¥»¡¼¥¸¤ä¡¢¿¿¤Ã°Å¤Ê²èÌÌ¡¢
 ¥¤¥ó¥¹¥È¡¼¥ë¤¬»Ï¤Þ¤Ã¤Æ¿ôʬ¸å¤Ë¥Õ¥ê¡¼¥º¤¬¤ª¤­¤¿¤éÌäÂê¤ÎÃû¸õ¤Ç¤¹¡£
@@ -361,10 +364,11 @@
 
 <!--
 The <userinput>video=vga16:off</userinput> argument may also be used
-to disable the framebuffer. Such problems have been reported on a Dell
-Inspiron with Mobile Radeon card.
+to disable the kernel's use of the framebuffer. Such problems have been
+reported on a Dell Inspiron with Mobile Radeon card.
 -->
-<userinput>video=vga16:off</userinput> °ú¿ô¤Ï¥Õ¥ì¡¼¥à¥Ð¥Ã¥Õ¥¡¤ò̵¸ú¤Ë¤¹¤ë¸ú²Ì¤â¤¢¤ê¤Þ¤¹¡£
+<userinput>video=vga16:off</userinput> °ú¿ô¤Ï¡¢
+¥«¡¼¥Í¥ë¤Î¥Õ¥ì¡¼¥à¥Ð¥Ã¥Õ¥¡ÍøÍѤò̵¸ú¤Ë¤¹¤ë¸ú²Ì¤â¤¢¤ê¤Þ¤¹¡£
 ¤½¤Î¤è¤¦¤ÊÌäÂ꤬¡¢Mobile Radeon ¤òÅëºÜ¤·¤¿ Dell Inspiron ¤Ë¤Ä¤¤¤ÆÊó¹ð¤µ¤ì¤Æ¤¤¤Þ¤¹¡£
 
 </para><para arch="m68k">
@@ -472,10 +476,12 @@
 <!--
 Specify the url to a preconfiguration file to download and use in
 automating the install. See <xref linkend="automatic-install"/>.
+Short form: <userinput>url</userinput>
 -->
 preconfiguration ¥Õ¥¡¥¤¥ë¤ò¥À¥¦¥ó¥í¡¼¥É¤¹¤ë URL ¤ò»ØÄꤷ¤Þ¤¹¡£
 ¤³¤ì¤Ï¼«Æ°¥¤¥ó¥¹¥È¡¼¥ë¤Ç»ÈÍѤ·¤Þ¤¹¡£
 <xref linkend="automatic-install"/> ¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
+û½Ì·Á: <userinput>url</userinput>
 
 </para></listitem>
 </varlistentry>
Index: ja/boot-installer/trouble.xml
===================================================================
--- ja/boot-installer/trouble.xml	(¥ê¥Ó¥¸¥ç¥ó 38453)
+++ ja/boot-installer/trouble.xml	(ºî¶È¥³¥Ô¡¼)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="EUC-JP"?>
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 33725 -->
+<!-- original version: 38231 -->
 
  <sect1 id="boot-troubleshooting">
  <title>¥¤¥ó¥¹¥È¡¼¥ë¥×¥í¥»¥¹¤Î¥È¥é¥Ö¥ë¥·¥å¡¼¥Æ¥£¥ó¥°</title>
@@ -209,8 +209,7 @@
 eg. pure white, pure black or colored pixel garbage, your system may
 contain a problematic video card which does not switch to the
 framebuffer mode properly.  Then you can use the boot parameter
-<userinput>debian-installer/framebuffer=false</userinput> or
-<userinput>video=vga16:off</userinput> to disable the framebuffer
+<userinput>fb=false video=vga16:off</userinput> to disable the framebuffer
 console. Only the English
 language will be available during the installation due to limited
 console features. See <xref linkend="boot-parms"/> for details.
@@ -218,9 +217,8 @@
 ¥«¡¼¥Í¥ë¤Îµ¯Æ°»þ¤Ë²èÌ̤¬ÉԻ׵Ĥʳ¨ (Îã: ¿¿¤ÃÇò¡¢¿¿¤Ã¹õ¡¢¿§ÉÕ¤­¥Ô¥¯¥»¥ë¶ý) 
 ¤òɽ¼¨¤·»Ï¤á¤ë¾ì¹ç¡¢¤¢¤Ê¤¿¤Î¥·¥¹¥Æ¥à¤Ï¡¢
 ¥Õ¥ì¡¼¥à¥Ð¥Ã¥Õ¥¡¥â¡¼¥É¤ËŬÀÚ¤ËÊѤï¤é¤Ê¤¤ÌäÂê¤Î¤¢¤ë¥Ó¥Ç¥ª¥«¡¼¥É¤¬¤Ä¤¤¤Æ¤¤¤ë¤«¤â¤·¤ì¤Þ¤»¤ó¡£
-¤½¤Î¾ì¹ç¡¢¥Õ¥ì¡¼¥à¥Ð¥Ã¥Õ¥¡¥³¥ó¥½¡¼¥ë¤ò̵¸ú¤Ë¤¹¤ë¤¿¤á¡¢
-¥Ö¡¼¥È¥Ñ¥é¥á¡¼¥¿¤Ë <userinput>debian-installer/framebuffer=false</userinput> 
-¤« <userinput>video=vga16:off</userinput> ¤ò»ÈÍѤǤ­¤Þ¤¹¡£
+¤½¤Î¾ì¹ç¡¢¥Õ¥ì¡¼¥à¥Ð¥Ã¥Õ¥¡¥³¥ó¥½¡¼¥ë¤ò̵¸ú¤Ë¤¹¤ë¤¿¤á¡¢¥Ö¡¼¥È¥Ñ¥é¥á¡¼¥¿¤Ë 
+<userinput>fb=false video=vga16:off</userinput> ¤ò»ÈÍѤǤ­¤Þ¤¹¡£
 ¥³¥ó¥½¡¼¥ë¤Îµ¡Ç½¤¬À©¸Â¤µ¤ì¤Æ¤¤¤ë¤¿¤á¡¢¥¤¥ó¥¹¥È¡¼¥ëÃæ¤Ë¤Ï±Ñ¸ì¤·¤«»È¤¨¤Þ¤»¤ó¡£
 ¾ÜºÙ¤Ï <xref linkend="boot-parms"/> ¤ò¤´Í÷¤¯¤À¤µ¤¤¡£