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

Re: sarge release-note 1.55 to 1.64



田���。

喜瀬�ん�武井�ん�御教示�り���������。
御指摘頂��内容を�り込ん��最終版��。

--
田� 一平 <ippei1@xxxxxxxxxxxx>
Debian Description Translation Project [DDTP] 
日本語�ームコーディ�ータ
http://www.debian.or.jp/devel/doc/Description-ja.html


===================================================================
RCS file: /cvs/debian-doc/ddp/manuals.sgml/release-notes/en/release-notes.en.sgml,v
retrieving revision 1.55
retrieving revision 1.64
diff -u -r1.55 -r1.64
--- ddp/manuals.sgml/release-notes/en/release-notes.en.sgml	2005/06/02 21:54:16	1.55
+++ ddp/manuals.sgml/release-notes/en/release-notes.en.sgml	2005/06/17 21:35:46	1.64
@@ -1,7 +1,7 @@
 <!DOCTYPE debiandoc PUBLIC "-//DebianDoc//DTD DebianDoc//EN" [
   <!entity % dynamicdata  SYSTEM "../dynamic.ent"       > %dynamicdata;
   <!entity % shareddata   SYSTEM "../release-notes.ent" > %shareddata;
-  <!entity docid "$Id: release-notes.en.sgml,v 1.55 2005/06/02 21:54:16 jseidel Exp $">
+  <!entity docid "$Id: release-notes.en.sgml,v 1.64 2005/06/17 21:35:46 fjp Exp $">
 ]>
 
 <!-- Be careful with automatic reformatting. Please note that the indentation
@@ -27,14 +27,65 @@
         <url id="&url-release-notes;">. If your version is more than a month
         old, you might wish to download the latest version.]</p>
 
-        <p>Please note that previous editions of the release notes contained
-        information about upgrading from releases older than than the previous
-        release. However such content often complicated the documentation so we
-        have decided to only discuss upgrades from &debian; 3.0 ('woody'). If
-        you need to upgrade from older releases please read previous editions of
-        the release notes.</p>
+        <p>Please note that starting with &debian; &release;, we only support
+        and document upgrading from the previous release of Debian (in this case,
+        the upgrade from &oldreleasename;). If you need to upgrade from older
+        releases, we suggest you read previous editions of the release notes.</p>

<p>&debian; &release; ¤ò»ÈÍѳ«»Ï¤¹¤ë¤Ë¤¢¤¿¤ê¡¢Debian ¤Î 1 ¤ÄÁ°¤Î¥ê¥ê¡¼¥¹¤«¤é¤Î
¥¢¥Ã¥×¥°¥ì¡¼¥É (¤³¤Î¾ì¹ç¡¢&oldreleasename; ¤«¤é¤Î¥¢¥Ã¥×¥°¥ì¡¼¥É) ¤Ë¤Î¤ßÂбþ¤«¤Ä
ʸ½ñ²½¤µ¤ì¤Æ¤¤¤ë¤³¤È¤ËÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£¤è¤ê¸Å¤¤¥ê¥ê¡¼¥¹¤«¤é¤Î¥¢¥Ã¥×¥°¥ì¡¼¥É¤¬
ɬÍפʤ顢²áµî¤Î¥ê¥ê¡¼¥¹¥Î¡¼¥È¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£</p>

+
+        <sect id="changes"><heading>Changes in the Release Notes</heading> 

<sect id="changes"><heading>¥ê¥ê¡¼¥¹¥Î¡¼¥È¤ÎÊѹ¹ÅÀ</heading> 

+
+          <p>This section lists changes in the Release Notes since the original
+          version that was published with &debian; &release;r0. Minor textual
+          corrections are omitted.</p>

<p>¤³¤Î¥»¥¯¥·¥ç¥ó¤Ç¤Ï¡¢&debian; &release;r0 ¤È¶¦¤Ë¸øÉ½¤µ¤ì¤¿¸µ¥Ð¡¼¥¸¥ç¥ó°Ê¹ß¤Î
¥ê¥ê¡¼¥¹¥Î¡¼¥È¤ÎÊѹ¹ÅÀ¤¬½Ò¤Ù¤é¤ì¤Æ¤¤¤Þ¤¹¡£º³ºÙ¤Ê»ú¶ç¤Î½¤Àµ¤Ï½ü¤¤¤Æ¤¢¤ê¤Þ¤¹¡£</p>

+          
+          <p><list>
+
+<![ %i386 [
+            <item><p>Add basic information on the AMD64 port in
+            <ref id="whats-new">.</p></item>

<item><p><ref id="whats-new">¤Ë¡¢AMD64 ¤Ø¤Î°Ü¿¢¤Ë´Ø¤¹¤ë
´ðËܾðÊó¤òÄɲá£</p></item>

+]]>
+
+<![ %available-2.6 [
+<![ %not-s390 [
+            <item><p>Improved description on module loading for ALSA in
+            <ref id="2.6-sound">.</p></item>

<item><p><ref id="2.6-sound">¤Î¡¢ALSA Íѥ⥸¥å¡¼¥ë¤Î¥í¡¼¥É¤Ë
´Ø¤¹¤ëµ­½Ò¤ò²þÁ±¡£</p></item>

+]]>
+]]>
+
+<![ %upgradekernel [
+<![ %mips-mipsel [
+            <item><p>Warning about "module mismatches" in
+            <ref id="kernel-upgrade-howto"> asks to abort,
+            not to continue.</p></item>

<item><p><ref id="kernel-upgrade-howto">¤Î "¥â¥¸¥å¡¼¥ëÉÔÀ°¹ç" ¤Ë
´Ø¤¹¤ë·Ù¹ð¤Ç¡¢·Ñ³¤¹¤ë¤«¤É¤¦¤«¤Ç¤Ê¤¯¡¢ÃæÃǤ¹¤ë¤«¤É¤¦¤«¤ò¼ÁÌä¡£</p></item>

+]]>
+]]>
+
+<![ %mipsel [
+            <item><p>Add installation issue with DHCP for Cobalt machines in
+            <ref id="cobalt">.</p></item>

<item><p><ref id="cobalt">¤Ç¡¢Cobalt ¥Þ¥·¥óÍѤΠDHCP ¤ò»È¤Ã¤¿¥¤¥ó¥¹¥È¡¼¥ë¤Ë
´Ø¤¹¤ë»ö¹à¤òÄɲá£</p></item>

+]]>
+
+<![ %not-amd64 [
+            <item><p>Document upgrading from raidtools2 to mdadm in
+            <ref id="mdadm">.

<item><p><ref id="mdadm">¤Ë¡¢raidtools2 ¤«¤é mdadm ¤Ø¤Î¥¢¥Ã¥×¥°¥ì¡¼¥É¤Ë´Ø¤¹¤ë
µ­½Ò¤òÄɲá£</p></item>

+<![ %upgradekernel [
+            This section may also be relevant while upgrading the kernel as
+            part of the upgrade.

¤³¤Î¥»¥¯¥·¥ç¥ó¤Ï¡¢¥¢¥Ã¥×¥°¥ì¡¼¥É¤Î°ìÉô¤È¤·¤Æ¤Î¥«¡¼¥Í¥ë¥¢¥Ã¥×¥°¥ì¡¼¥É¤Ë¤â
Í­ÍѤǤ·¤ç¤¦¡£

+]]>
+            </p></item>
+
+            <item><p><prgn/aptitude/ uses a different method for registering
+            packages that are on hold than <prgn/apt-get/ and <prgn/dselect/.
+            Properly document how hold status can be checked and set in
+            <ref id="upgrading">.</p></item>

## ºÇ¸å¤Îʸ¾Ï¡¢º£¤Ò¤È¤Ä¼«¿®¤¢¤ê¤Þ¤»¤ó¡£
<item><p>hold ¾õÂ֤ˤ¢¤ë¥Ñ¥Ã¥±¡¼¥¸¤òµ­Ï¿¤¹¤ë¤Î¤Ë¡¢<prgn/aptitude/ ¤Ï
<prgn/apt-get/ ¤ä <prgn/dselect/ ¤È¤Ï°Û¤Ê¤ë¼êË¡¤òÍѤ¤¤Þ¤¹¡£hold ¾õÂÖ¤Î
¥Á¥§¥Ã¥¯¤ª¤è¤ÓÀßÄêÊýË¡¤Ë´Ø¤¹¤ëŬÀÚ¤ÊÀâÌÀ¤ò <ref id="upgrading"> ¤ËÄɲá£</p></item>

+]]>
+
+          </list></p>
+
+        </sect>
 
       </chapt>
+
       <chapt id="whats-new"><heading>What's new in &debian; &release;</heading>
 
         <p>The list of supported architectures has not changed since the
@@ -60,6 +111,17 @@
           information for your architecture at the <url id="&url-ports;"
           name="Debian port web pages">.</p>
 
+<![ %i386-amd64 [
+        <p>Owners of an AMD64 system now also have the option of installing
+        the AMD64 port. Note that, although a complete port based on
+        unpatched sources is available, the AMD64 architecture is not
+        officially supported. Despite being unofficial, this port has complete
+        security support by the &debian; security team, and is supported by
+        the volatile and backports services. More information on the status
+        of the AMD64 port is available from the <url id="&url-port-amd64;"
+        name="AMD64 port web pages">.</p>

<p>AMD64 ¥·¥¹¥Æ¥à¤ò»È¤Ã¤Æ¤¤¤ë¿Í¤Ï¡¢AMD64 °Ü¿¢ÈǤò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¥ª¥×¥·¥ç¥ó¤¬
¤¢¤ê¤Þ¤¹¡£¥Ñ¥Ã¥Á¤¬Åö¤Æ¤é¤ì¤Æ¤¤¤Ê¤¤¥½¡¼¥¹¤ò¸µ¤Ë¤·¤¿´°Á´¤Ê°Ü¿¢¤Ç¤¹¤¬¡¢AMD64 ¥¢¡¼
¥­¥Æ¥¯¥Á¥ã¤Ï¸ø¼°¤Ë¤Ï¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤Ê¤¤¤³¤È¤ËÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£Èó¸ø¼°¤Ç¤Ï¤¢¤ê
¤Þ¤¹¤¬¡¢¤³¤Î°Ü¿¢ÈÇ¤Ë¤Ï &debian; ¥»¥­¥å¥ê¥Æ¥£¥Á¡¼¥à¤Ë¤è¤ë´°Á´¤Ê¥»¥­¥å¥ê¥Æ¥£¥µ¥Ý¡¼
¥È¤¬¤¢¤ê¡¢volatile ¤ª¤è¤Ó¥Ð¥Ã¥¯¥Ý¡¼¥È¥µ¡¼¥Ó¥¹¤Ë¤âÂбþ¤·¤Æ¤¤¤Þ¤¹¡£AMD64 °Ü¿¢ÈǤÎ
¾õÂ֤˴ؤ¹¤ë¤è¤ê¾Ü¤·¤¤¾ðÊó¤Ï¡¢<url id="&url-port-amd64;" name="AMD64 °Ü¿¢ÈÇ
¥¦¥§¥Ö¥Ú¡¼¥¸">¤ÇÆþ¼ê¤Ç¤­¤Þ¤¹¡£</p>

+]]>
+
 <![ %secondrelease [
 
           <p>This is only the second official release of &debian; for the
@@ -74,6 +136,7 @@
 ]]>
 
 <![ %not-m68k [
+<![ %not-amd64 [
           <p>&debian; &release; for the &arch-title; architecture ships with
           kernel version &kernelversion;.</p>
 
@@ -83,7 +146,15 @@
           kernel packages include the 2.6.8.1 kernel release and selected other
           patches.</p>
 ]]>
-]]> <!-- %m68k -->
+]]> <!-- %not-amd64 -->
+]]> <!-- %not-m68k -->
+
+<![ %amd64 [
+          <p>For the &arch-title; architecture only a 2.6 kernel is available
+          with kernel version &kernelversion-2.6;. Note that Debian's 2.6.8
+          kernel packages include the 2.6.8.1 kernel release and selected
+          other patches.</p> 

<p>&arch-title; ¥¢¡¼¥­¥Æ¥¯¥Á¥ãÍѤȤ·¤Æ¤Ï¡¢¥«¡¼¥Í¥ë¥Ð¡¼¥¸¥ç¥ó &kernelversion-2.6;
¤È¤¤¤¦ 2.6 ·ÏÎó¤Î¥«¡¼¥Í¥ë¤Î¤ß¤¬ÍøÍѲÄǽ¤Ç¤¹¡£Debian ¤Î 2.6.8 ¥«¡¼¥Í¥ë¥Ñ¥Ã¥±¡¼¥¸
¤Ë¤Ï¡¢2.6.8.1 ¥«¡¼¥Í¥ë¥ê¥ê¡¼¥¹¤Ë³Æ¼ï¤Î¥Ñ¥Ã¥Á¤òŬÍѤ·¤¿¤â¤Î¤Ç¤¢¤ë¤³¤È¤ËÃí°Õ¤·¤Æ
¤¯¤À¤µ¤¤¡£</p>

+]]>
 <![ %m68k [
           <p>&debian; &release; for the &arch-title; architecture ships with
           kernel versions 2.2.25 and 2.4.27. For some subarchitectures 2.6.8
@@ -178,7 +249,6 @@
           when completed.</p>
 
 <![ %i386 [ 
-
           <p>For the &arch-title; architecture, a special set of installation
           floppy disk images, "speakup", is available for the blind.
           These images have a special kernel that supports braille displays.
@@ -186,7 +256,6 @@
           documentation. See the <url id="&url-installer;index#speakup"
           name="debian-installer release page"> for further information
           on these images.</p>
-
 ]]>
 
 <!-- FJP: Maybe a short description of available installation methods could be
@@ -241,6 +310,17 @@
           information please see the Installation Guide.</p>
 ]]>
 
+<![ %amd64 [
+        <p>Because support for AMD64 in 2.4 kernels is limited and rudimentary,
+        only 2.6 kernels are supported. Additionally, the glibc needs a tls and
+        nptl aware kernel, features not supported by 2.4 kernels at all.</p>

<p>2.4 ·ÏÎ󥫡¼¥Í¥ë¤Ç¤Î AMD64 ¤Ø¤ÎÂбþÉϼå¤Ç½éÊâŪ¤Ê¤¿¤á¡¢2.6 ·ÏÎó¤Î¥«¡¼¥Í¥ë
¤Î¤ß¤¬Âбþ¤·¤Æ¤¤¤Þ¤¹¡£¤µ¤é¤Ë¡¢glibc ¤Ï tls ¤È nptl ¤ËÂбþ¤·¤¿¥«¡¼¥Í¥ë¤òɬÍ×
¤È¤·¡¢¤¤¤º¤ì¤â 2.4 ·ÏÎó¤Î¥«¡¼¥Í¥ë¤Ç¤Ï¤Þ¤Ã¤¿¤¯Âбþ¤·¤Æ¤¤¤Þ¤»¤ó¡£</p>

+
+        <p>The &releasename; release for the AMD64 architecture is not 
+        available in the official &debian; archive. For this reason, the
+        mirror list is different than for the official released architectures
+        and can be found at <url id="&url-debian-mirrors;">.</p>

<p>AMD64 ¥¢¡¼¥­¥Æ¥¯¥Á¥ãÍѤΠ&releasename; ¥ê¥ê¡¼¥¹¤Ï¡¢¸ø¼°¤Î &debian; ¥¢¡¼
¥«¥¤¥Ö¤«¤é¤ÏÆþ¼ê¤Ç¤­¤Þ¤»¤ó¡£¤³¤Î¤¿¤á¸ø¼°¥ê¥ê¡¼¥¹¤µ¤ì¤¿¥¢¡¼¥­¥Æ¥¯¥Á¥ãÍѤΤâ¤Î
¤È¤Ï¥ß¥é¡¼¥ê¥¹¥È¤¬°Û¤Ê¤Ã¤Æ¤ª¤ê¡¢<url id="&url-debian-mirrors;"> ¤Ë¤¢¤ê¤Þ¤¹¡£</p>

+]]>
+
 <![ %alpha [
         <p>The new installer can only be used to install on alpha systems which
         support the SRM console. Be sure to switch your system to SRM before
@@ -252,6 +332,24 @@
         </p>
 ]]>
 
+<![ %mipsel [
+      <sect id="cobalt"><heading>Issue with DHCP on Cobalt machines</heading>

<sect id="cobalt"><heading>Cobalt ¥Þ¥·¥ó¾å¤Î DHCP ¤Ë´Ø¤¹¤ë»ö¹à</heading>

+
+        <p>CoLo, the Cobalt boot loader which is used to load the installer via
+        DHCP and NFS, has some known bugs in its DHCP client implementation.
+        This may result in failures to obtain an IP address from the server.
+        This has been confirmed to be the case with a Windows 2000 DHCP server
+        and may apply to other DHCP servers. If you experience problems
+        obtaining an IP address via DHCP and you are confident that your DHCP
+        server is configured properly, please download a <url 
+        id="http://people.debian.org/~tbm/sarge/cobalt/vmlinux.gz";
+        name="newer version of CoLo"> and replace <file>/nfsroot/vmlinux.gz</file>
+        with it on your DHCP/NFS server. The DHCP problems have been addressed in
+        this version.</p>

<p>DHCP ¤ä NFS ·Ðͳ¤Ç¥¤¥ó¥¹¥È¡¼¥é¤ò¥í¡¼¥É¤¹¤ë¤Î¤Ë»È¤ï¤ì¤ë Cobalt ÍÑ¥Ö¡¼¥È
¥í¡¼¥À¤Î CoLo ¤Ë¤Ï¡¢DHCP ¥¯¥é¥¤¥¢¥ó¥È¼ÂÁõ¤Ë´ûÃΤΥХ°¤¬¤¢¤ê¤Þ¤¹¡£¤³¤ì¤Ë¤è¤ê¡¢
¥µ¡¼¥Ð¤«¤é¤Î IP ¥¢¥É¥ì¥¹¼èÆÀ¤Ë¼ºÇÔ¤¹¤ë¤«¤â¤·¤ì¤Þ¤»¤ó¡£Windows 2000 ¤Î DHCP
¥µ¡¼¥Ð¤Ç¤Ï¤³¤ÎÌäÂ꤬µ¯¤­¤ë¤³¤È¤¬³Îǧ¤µ¤ì¤Æ¤ª¤ê¡¢Â¾¤Î DHCP ¥µ¡¼¥Ð¤Ç¤âµ¯¤­¤ë
²ÄǽÀ­¤¬¤¢¤ê¤Þ¤¹¡£DHCP ·Ðͳ¤Ç¤Î IP ¥¢¥É¥ì¥¹¤Ë¼ºÇÔ¤·¡¢DHCP ¥µ¡¼¥Ð¼«ÂΤÏŬÀÚ
¤ËÀßÄꤵ¤ì¤Æ¤¤¤ë¼«¿®¤¬¤¢¤ë¤Ê¤é¡¢
<url id="http://people.debian.org/~tbm/sarge/cobalt/vmlinux.gz";
name="CoLo ¤Î¿·¥Ð¡¼¥¸¥ç¥ó">¤ò¥À¥¦¥ó¥í¡¼¥É¤·¤Æ¡¢DHCP/NFS ¥µ¡¼¥Ð¤Ë¤¢¤ë
<file>/nfsroot/vmlinux.gz</file> ¤òÃÖ¤­´¹¤¨¤Æ¤¯¤À¤µ¤¤¡£DHCP ¤ÎÌäÂê¤Ï¡¢¤³¤Î
¥Ð¡¼¥¸¥ç¥ó¤Ç¤ÏÂн褵¤ì¤Æ¤¤¤Þ¤¹¡£</p>

+
+      </sect>
+]]>
+
 <![ %sparc [ 
       <sect id="sparc_kbd"><heading>Issues with keyboards on &arch-title;</heading>
 
@@ -304,6 +402,7 @@
       </chapt>
 
 
+<![ %not-amd64 [
       <chapt id="upgrading"><heading>Upgrades from previous releases</heading>
 
 <!-- For doc-writers' convenience:
@@ -440,12 +539,24 @@
 
           <p>It is desirable to remove any holds before upgrading. If any
           package that is essential for the upgrade is on hold, the upgrade
-          will fail. You can identify packages on hold with
+          will fail.

## Á´ÃÊÍî¤òÌõ¤·¤Þ¤¹¡£
<p>¥¢¥Ã¥×¥°¥ì¡¼¥ÉÁ°¤Ë¡¢¤¢¤é¤æ¤ë hold ¾õÂÖ¤ò²ò½ü¤·¤Æ¤ª¤¤¤¿¤Û¤¦¤¬¤è¤¤¤Ç
¤·¤ç¤¦¡£¥¢¥Ã¥×¥°¥ì¡¼¥É¤ËÉԲķç¤Ê¥Ñ¥Ã¥±¡¼¥¸¤¬ hold ¾õÂ֤ˤ¢¤ë¤Ê¤é¡¢
¥¢¥Ã¥×¥°¥ì¡¼¥É¤Ë¼ºÇÔ¤¹¤ë¤Ç¤·¤ç¤¦¡£

+          
+<![ %has-woody-aptitude [
+          Note that <prgn/aptitude/ uses a different method for registering
+          packages that are on hold than <prgn/apt-get/ and <prgn/dselect/.
+          You can identify packages on hold for <prgn/aptitude/ with

hold ¾õÂ֤ˤ¢¤ë¥Ñ¥Ã¥±¡¼¥¸¤òµ­Ï¿¤¹¤ë¤Î¤Ë¡¢<prgn/aptitude/ ¤Ï <prgn/apt-get/ ¤ä
<prgn/dselect/ ¤È¤Ï°Û¤Ê¤ë¼êË¡¤òÍѤ¤¤ë¤³¤È¤ËÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£<prgn/aptitude/
¤Ç¤Ï¡¢°Ê²¼¤Î¤è¤¦¤Ë¼Â¹Ô¤·¤Æ hold ¾õÂ֤ˤ¢¤ë¥Ñ¥Ã¥±¡¼¥¸¤ò¸¡½Ð¤Ç¤­¤Þ¤¹:

  
           <example>
-<!-- FJP: dpkg \-\-audit does not show held packages, at least not for Woody.
-# dpkg \-\-audit
--->
+# aptitude search "~ahold" | grep "^.h"
+          </example></p>
+          
+          <p>If you want to check which packages you had on hold for
+          <prgn/apt-get/, you should use

<p><prgn/apt-get/ ¤Ç¤É¤Î¥Ñ¥Ã¥±¡¼¥¸¤¬ hold ¾õÂ֤ˤ¢¤ë¤Î¤«¤òÄ´¤Ù¤¿¤±¤ì¤Ð¡¢
°Ê²¼¤Î¤è¤¦¤Ë¼Â¹Ô¤·¤Æ¤¯¤À¤µ¤¤:

+]]>
+<![ %no-woody-aptitude [
+          You can identify packages on hold with

°Ê²¼¤Î¤è¤¦¤Ë¼Â¹Ô¤·¤Æ¡¢hold ¾õÂ֤ˤ¢¤ë¥Ñ¥Ã¥±¡¼¥¸¤ò¸¡½Ð¤Ç¤­¤Þ¤¹:

+]]>
+          <example>
 # dpkg --get-selections | grep hold
           </example></p>
 
@@ -454,10 +565,11 @@
           it from being upgraded.
 
 <![ %has-woody-aptitude [
-          The `hold' package state can be changed by using <prgn/aptitude/:
+          The "hold" package state for <prgn/aptitude/ can be changed using
+          (replace <tt/hold/ with <tt/unhold/ to unset the "hold" state):

¥Ñ¥Ã¥±¡¼¥¸¤Î "hold" ¾õÂÖ¤ò <prgn/aptitude/ ¤ÇÊѹ¹¤¹¤ë¤Ë¤Ï¡¢°Ê²¼¤Î¤è¤¦¤Ë¼Â¹Ô
¤·¤Æ¤¯¤À¤µ¤¤ ("hold" ¾õÂÖ¤ò²ò½ü¤¹¤ë¤Ë¤Ï <tt/hold/ ¤ò <tt/unhold/ ¤ÇÃÖ¤­´¹¤¨
¤Þ¤¹):

 
           <example>
-# aptitude hold | unhold &lt;package name&gt;
+# aptitude hold <var>package_name</var>
           </example>
 ]]>
 <![ %no-woody-aptitude [
@@ -832,6 +944,28 @@
           and/or perl. The solution proved to be to <tt>install aptitude perl</tt>
           instead of <tt>install aptitude</tt>.</p>
 
+<![ %no-woody-aptitude [
+          <p><prgn/aptitude/ uses a different method for registering packages
+          that are on hold than <prgn/apt-get/ and <prgn/dselect/. This means
+          that if you have any packages on hold, you will need to also set
+          them on hold for <prgn/aptitude/ before proceeding.</p>

<p>hold ¾õÂ֤ˤ¢¤ë¥Ñ¥Ã¥±¡¼¥¸¤òµ­Ï¿¤¹¤ë¤Î¤Ë¡¢<prgn/aptitude/ ¤Ï <prgn/apt-get/ ¤ä
<prgn/dselect/ ¤È¤Ï°Û¤Ê¤ë¼êË¡¤òÍѤ¤¤Þ¤¹¡£¤³¤Î¤³¤È¤Ï hold ¾õÂ֤ˤ·¤Æ¤¢¤ë¥Ñ¥Ã¥±¡¼¥¸
¤¬¤¢¤ì¤Ð¡¢½èÍý¤ÎÁ°¤Ë <prgn/aptitude/ ¤Ç¤â hold ÀßÄꤷ¤Ê¤±¤ì¤Ð¤Ê¤é¤Ê¤¤¤³¤È¤ò°ÕÌ£
¤·¤Þ¤¹¡£</p>

+          
+          <p>First list packages on hold for <prgn/apt-get/ using:

<p>ºÇ½é¤Ë¡¢°Ê²¼¤Î¤è¤¦¤Ë¼Â¹Ô¤·¤Æ <prgn/apt-get/ ¤Ç hold ¤µ¤ì¤Æ¤¤¤ë¥Ñ¥Ã¥±¡¼¥¸¤ò
ɽ¼¨¤µ¤»¤Æ¤¯¤À¤µ¤¤:

+          <example>
+# dpkg --get-selections | grep hold
+          </example></p>
+
+          <p>Next set these same packages on hold for <prgn/aptitude/ with:

<p>¼¡¤Ë¡¢¤½¤ì¤é¤Î¥Ñ¥Ã¥±¡¼¥¸¤ò <prgn/aptitude/ ¤Ç hold ¤·¤Æ¤¯¤À¤µ¤¤:

+          <example>
+# aptitude hold <var>package_name</var>
+          </example></p>
+
+          <p>You can check which packages are on hold for <prgn/aptitude/ using:

<p><prgn/aptitude/ ¤Ç hold ¤µ¤ì¤Æ¤¤¤ë¥Ñ¥Ã¥±¡¼¥¸¤òÄ´¤Ù¤ë¤Ë¤Ï¡¢°Ê²¼¤Î¤è¤¦¤Ë
¼Â¹Ô¤·¤Æ¤¯¤À¤µ¤¤:

+          <example>
+# aptitude search "~ahold" | grep "^.h"
+          </example></p>
+]]>
+
         </sect1>
 
         <sect1 id="upgrading_doc-base"><heading>Upgrading doc-base</heading>
@@ -919,7 +1053,7 @@
           using <prgn/aptitude/ or
 
           <example>
-# dpkg --remove <var>packagename</var>
+# dpkg --remove <var>package_name</var>
           </example>
 
           to eliminate some of the offending packages, or
@@ -933,7 +1067,7 @@
           command like
 
           <example>
-# dpkg --install <var>/path/to/packagename.deb</var>
+# dpkg --install <var>/path/to/package_name.deb</var>
           </example></p>
 
           <p>File conflicts should not occur if you upgrade from a "pure"
@@ -951,7 +1085,7 @@
           package mentioned on the <em/last/ line of the error message:
 
           <example>
-# dpkg -r --force-depends <var>packagename</var>
+# dpkg -r --force-depends <var>package_name</var>
           </example></p>
 
           <p>After fixing things up, you should be able to resume the
@@ -1000,8 +1134,8 @@
 
 <![ %available-2.6 [
 
-	 <p>&debian; comes with a &kernelversion; kernel which is in the 2.4
-	 series, the older stable Linux kernel series. You may wish to use a 2.6
+	 <p>If you are currently using a kernel from the 2.4 series,
+	 the older stable Linux kernel series, you may wish to upgrade to a 2.6
 	 series kernel for better hardware support or improved performance.</p>

## Á´ÃÊÍî¤òÌõ¤·¤Þ¤¹¡£
<p>Linux ¥«¡¼¥Í¥ë¤Î¸Å¤¤°ÂÄêÈǤǤ¢¤ë 2.4 ·ÏÎó¤ò»È¤Ã¤Æ¤¤¤ë¤Î¤Ê¤é¡¢¤è¤êÍ¥¤ì¤¿
¥Ï¡¼¥É¥¦¥§¥¢Âбþ¤È²þÎɤµ¤ì¤¿¥Ñ¥Õ¥©¡¼¥Þ¥ó¥¹¤òµá¤á¤Æ¡¢2.6 ·ÏÎó¤Î¥«¡¼¥Í¥ë¤Ë
¥¢¥Ã¥×¥°¥ì¡¼¥É¤·¤¿¤¯¤Ê¤ë¤«¤â¤·¤ì¤Þ¤»¤ó¡£</p>

 
          <p>However, you a strongly advised <strong/not/ to upgrade to a 2.6
@@ -1038,10 +1172,67 @@
          <package>kernel-package</package> tool and read the documentation
          in <file>/usr/share/doc/kernel-package</file>.</p>
          
-         </sect1>
-         </sect>
+        </sect1>
+
+        <sect1 id="mdadm"><heading>Upgrading from raidtools2 to mdadm</heading>

<sect1 id="mdadm"><heading>raidtools2 ¤«¤é mdadm ¤Ø¤Î¥¢¥Ã¥×¥°¥ì¡¼¥É</heading>

+
+         <p><package/raidtools2/ is no longer maintained by its upstream
+         developers and has been replaced by the <package/mdadm/ package.
+         <prgn/mdadm/ is a single program that can perform almost any RAID
+         management task without a configuration file; by default it does
+         not use one.</p>

<p><package/raidtools2/ ¤Ï¤â¤Ï¤ä¾åή³«È¯¼Ô¤Ë¤è¤Ã¤ÆÊݼ餵¤ì¤Æ¤ª¤é¤º¡¢
<package/mdadm/ ¥Ñ¥Ã¥±¡¼¥¸¤ËÃÖ¤­´¹¤¨¤é¤ì¤Þ¤·¤¿¡£<package/mdadm/ ¤Ï¡¢
¤Û¤Ü¤¢¤é¤æ¤ë RAID ´ÉÍý¥¿¥¹¥¯¤ò¼Â¹Ô¤Ç¤­¤ëñ°ì¤Î¥×¥í¥°¥é¥à¤Ç¡¢ÀßÄê¥Õ¥¡
¥¤¥ë¤òɬÍפȤ·¤Þ¤»¤ó - ¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï¡¢1 ¤Ä¤â»È¤¤¤Þ¤»¤ó¡£</p>

+
+         <p>The remainder of this section gives some upgrade hints for users of
+         <package/raidtools2/.</p>

<p>¤³¤Î¥»¥¯¥·¥ç¥ó¤Î°Ê¹ß¤ÎÉôʬ¤Ç¤Ï¡¢<package/raidtools2/ ¤Î¥æ¡¼¥¶¤Ë¥¢¥Ã¥×¥°¥ì¡¼¥É
¤Î¥Ò¥ó¥È¤ò¤¤¤¯¤Ä¤«Ä󶡤·¤Þ¤¹¡£</p>

+
+<![ %sparc [
+         <p>If your RAID array was created on a 2.2 Linux kernel patched with
+         RAID support, the superblock was created incorrectly, or at least in
+         a way that is incompatible with 2.4 and later kernels. In order to fix
+         this problem, you have to execute the following two commands:

<p>¤¢¤Ê¤¿¤Î RAID ¥¢¥ì¥¤¤¬ RAID Âбþ¥Ñ¥Ã¥ÁÉÕ¤­¤Î Linux ¥«¡¼¥Í¥ë 2.2 ¾å¤ÇºîÀ®¤µ¤ì¤¿
¤Î¤Ê¤é¡¢¥¹¡¼¥Ñ¡¼¥Ö¥í¥Ã¥¯¤¬¸í¤Ã¤ÆºîÀ®¤µ¤ì¤Æ¤¤¤ë¤«¡¢¾¯¤Ê¤¯¤È¤â 2.4 °Ê¹ß¤Î¥«¡¼¥Í¥ë
¤È¤ÏÈó¸ß´¹¤ÎÊýË¡¤ÇºîÀ®¤µ¤ì¤Æ¤¤¤Þ¤¹¡£</p>

+
+         <example>
+# mdadm --examine --sparc2.2
+# mdadm --assemble --update=sparc2.2
+         </example></p>
+]]>
+
+         <p>As mentioned above, in many cases <prgn/mdadm/ can work without
+         configuration file. If you use a kernel that automatically configures
+         the RAID array for you, can skip this paragraph &mdash; you merely have to
+         install the package <package/mdadm/ and the RAID will be detected during
+         the boot process. The standard kernels in Debian have support for the
+         configuration of RAID arrays on boot. You also need to make sure that
+         the partitions are set to type "Linux raid autodetect" (id <tt/fd/). The
+         following command will list the current type of partitions:

<p>¾å½Ò¤·¤¿¤è¤¦¤Ë¡¢Â¿¤¯¤Î¾ì¹ç <prgn/mdadm/ ¤ÏÀßÄê¥Õ¥¡¥¤¥ë¤Ê¤·¤Çưºî²Äǽ¤Ç¤¹¡£
ÀìÍѤΠRAID ¥¢¥ì¥¤¤ò¼«Æ°Åª¤ËÀßÄꤷ¤Æ¤¯¤ì¤ë¥«¡¼¥Í¥ë¤ò»È¤Ã¤Æ¤¤¤ë¤Î¤Ê¤é¡¢¤³¤Î
Àá¤ÏÈô¤Ð¤·¤Æ¤â¤«¤Þ¤¤¤Þ¤»¤ó &mdash; <package/mdadm/¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤À¤±¤Ç¡¢
RAID ¤Ïµ¯Æ°¥×¥í¥»¥¹Ãæ¤Ë¸¡½Ð¤µ¤ì¤ë¤Ç¤·¤ç¤¦¡£Debian ¤Îɸ½àŪ¤Ê¥«¡¼¥Í¥ë¤Ï¡¢
µ¯Æ°»þ¤Î RAID ¥¢¥ì¥¤ÀßÄê¤ËÂбþ¤·¤Æ¤¤¤Þ¤¹¡£¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤¬ "Linux raid
autodetect" (id <tt/fd/) ¤ËÀßÄꤵ¤ì¤Æ¤¤¤ë¤³¤È¤ò³Îǧ¤¹¤ëɬÍפ⤢¤ë¤Ç¤·¤ç¤¦¡£
°Ê²¼¤Î¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤¹¤ì¤Ð¡¢¸½ºß¤Î¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤Î¼ïÎब°ìÍ÷ɽ¼¨¤µ¤ì¤Þ¤¹:

+
+         <example>
+# fdisk -l <var>disk_device</var>
+         </example></p>
 
-         <sect id="obsolete"><heading>Obsolete packages</heading>
+         <p>If you have a mixed setup with some RAID arrays that are auto-configured
+         and some that are not, you have to create a configuration file.</p>

<p>¼«Æ°Åª¤ËÀßÄꤵ¤ì¤¿ RAID ¥¢¥ì¥¤¤È¤½¤¦¤Ç¤Ï¤Ê¤¤¤â¤Î¤¬º®ºß¤·¤¿ÀßÄê¤È¤Ê¤Ã¤Æ
¤¤¤ë¤Ê¤é¡¢ÀßÄê¥Õ¥¡¥¤¥ë¤òºîÀ®¤·¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£</p>

+
+         <p>To migrate from the configuration file <file>/etc/raidtab</file>
+         (<package/raidtools2/) to <file>/etc/mdadm/mdadm.conf</file>
+         (<package/mdadm/), please execute:

<p><file>/etc/raidtab</file>(<package/raidtools2/) ¤«¤é <file>/etc/mdadm/mdadm.conf</file>
(<package/mdadm/) ¤Ø°Ü¹Ô¤¹¤ë¤Ë¤Ï¡¢°Ê²¼¤Î¤è¤¦¤Ë¼Â¹Ô¤·¤Æ¤¯¤À¤µ¤¤:

+
+         <example>
+# echo 'DEVICE /dev/hd*[0-9] /dev/sd*[0-9]' &gt; /etc/mdadm/mdadm.conf
+# mdadm --examine --scan &gt;&gt; /etc/mdadm/mdadm.conf
+         </example></p>
+
+         <p>These commands will generate a configuration file with the existing
+         arrays on the system.</p>

<p>¤³¤ì¤é¤Î¥³¥Þ¥ó¥É¤Ï¡¢¥·¥¹¥Æ¥à¤Î´û¸¤Î¥¢¥ì¥¤¤Ë´Ø¤¹¤ëÀßÄê¥Õ¥¡¥¤¥ë¤òÀ¸À®
¤·¤Þ¤¹¡£</p>

+
+         <p>You should also make sure that the RAID arrays are started automatically
+         on boot. Check the file <file>/etc/default/mdadm</file> to see if the variable
+         AUTOSTART is set to <tt/true/.</p>

<p>µ¯Æ°»þ¤Ë¡¢RAID ¥¢¥ì¥¤¤¬¼«Æ°Åª¤Ë³«»Ï¤µ¤ì¤ë¤³¤È¤â³Îǧ¤¹¤Ù¤­¤Ç¤¹¡£ÊÑ¿ô
AUTOSTART ¤¬ <tt/true/ ¤È¤Ê¤Ã¤Æ¤¤¤ë¤«¤ò³Îǧ¤¹¤ë¤Ë¤Ï¡¢<file>/etc/default/mdadm</file>
¥Õ¥¡¥¤¥ë¤òÄ´¤Ù¤Æ¤¯¤À¤µ¤¤¡£</p>

+
+        </sect1>
+        </sect>
+
+        <sect id="obsolete"><heading>Obsolete packages</heading>

<sect id="obsolete"><heading>»þÂåÃÙ¤ì (Obsolete) ¤Ê¥Ñ¥Ã¥±¡¼¥¸</heading>
 
 <!-- JFS: Providing a full listing might be useful, especially if we can
 point to the Bug that was opened when the bug was removed. This list should
@@ -1106,7 +1297,7 @@
          id="&url-bts;cgi-bin/pkgreport.cgi?pkg=ftp.debian.org&#38;archive=yes"
          name="ftp.debian.org pseudo-package">.</p>
 
-         <sect1 id="dummy"><heading>Dummy packages</heading>
+        <sect1 id="dummy"><heading>Dummy packages</heading>
 
 <!-- JFS: If the appendix is kept this section should point there and the packages described here should be moved to that section -->
 
@@ -1126,9 +1317,10 @@
          an upgrade but are, instead, used to keep track of the current
          available version of a program over time.</p>
 
-         </sect1>
-         </sect>
+        </sect1>
+        </sect>
       </chapt>
+]]> <!-- %not-amd64 -->
 
 <!-- FJP: Add more info here on dealing with obsolete packages?
           Also how to purge packages that were deleted but still have conffiles
@@ -1137,6 +1329,14 @@
         <chapt id="information">
         <heading>Issues to be aware of for &releasename;</heading>
 
+<![ %amd64 [
+          <p>Since there is no &oldreleasename; release of &debian; for the
+          AMD64 architecture, the following sections are intended for users 
+          currently running a 2.4 based i386 installation and planning to
+          reinstall their systems to fully exploit the capabilities of the
+          AMD64 architecture.</p>

<p>AMD64 ¥¢¡¼¥­¥Æ¥¯¥Á¥ãÍѤΠ&debian; &oldreleasename; ¥ê¥ê¡¼¥¹¤Ï̵¤¤¤¿¤á¡¢
°Ê²¼¤Î¥»¥¯¥·¥ç¥ó¤Ç¤Ï¸½ºß¤Ï 2.4 ¥Ù¡¼¥¹¤Î i386 ÍѤò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Æ»È¤Ã¤Æ¤ª
¤ê¡¢¥·¥¹¥Æ¥à¤òºÆ¥¤¥ó¥¹¥È¡¼¥ë¤·¤Æ AMD64 ¥¢¡¼¥­¥Æ¥¯¥Á¥ã¤ÎǽÎϤò´°Á´¤Ëȯ´ø¤µ
¤»¤è¤¦¤È·×²è¤·¤Æ¤¤¤ë¥æ¡¼¥¶¤òÂоݤȤ·¤Æ¤¤¤Þ¤¹¡£</p>

+]]>
+
 <!-- Controversial, disabled for now, please translate though
         <sect id="german-quotes"><heading>Problems with German Quotes</heading>
         
@@ -1210,7 +1410,7 @@
           module names may have changed. If this happens you will have to update
           this file with the new module names.</p>
 
-<![ %i386 [
+<![ %i386-amd64 [
           <p>For some SATA disk controllers, the device assigned to a drive and
           its partitions may change from <file>/dev/hdX</file> to
           <file>/dev/sdX</file>. If this happens, you will have to modify your
@@ -1227,6 +1427,7 @@
           prevents you booting the old kernel.</p>
 
 <![ %not-s390 [
+<![ %not-amd64 [
         <sect1 id="2.6-keyboard">
         <heading>Keyboard configuration</heading>
 
@@ -1259,6 +1460,7 @@
           first case you will not be affected by this issue.</p>
 ]]>
         </sect1>
+]]> <!-- %not-amd64 -->
 
         <sect1 id="2.6-mouse">
         <heading>Mouse configuration</heading>
@@ -1279,11 +1481,16 @@
         <sect1 id="2.6-sound">
         <heading>Sound configuration</heading>
 
-          <p>For the 2.6 kernel series the ALSA sound drivers are preferred over
-          the OSS sound drivers. If you install <package/alsa-base/, ALSA modules
-          for your soundcard should be loaded automatically; this will also
-          automatically blacklist OSS modules for <package/discover/ and
-          <package/hotplug/ to prevent them from loading. If you have OSS modules
+          <p>For the 2.6 kernel series the ALSA sound drivers are recommended
+          over the older OSS sound drivers. ALSA sound drivers are provided
+          as modules by default. In order for sound to work, the ALSA modules
+          appropriate for your sound hardware need to be loaded. In general
+          this will happen automatically if you have, in addition to the
+          <package>alsa-base</package> package, either the
+          <package>hotplug</package> package or the <package>discover</package>
+          package installed. The <package>alsa-base</package> package also
+          "blacklists" OSS modules to prevent <prgn>hotplug</prgn> and
+          <prgn>discover</prgn> from loading them. If you have OSS modules
           listed in <file>/etc/modules</file>, you should remove them.</p>

<p>2.6 ¥«¡¼¥Í¥ëÍѤȤ·¤Æ¤Ï¡¢OSS ¥µ¥¦¥ó¥É¥É¥é¥¤¥Ð¤è¤ê¤â ALSA ¥µ¥¦¥ó¥É¥É¥é
¥¤¥Ð¤¬¿ä¾©¤µ¤ì¤Þ¤¹¡£ALSA ¥µ¥¦¥ó¥É¥É¥é¥¤¥Ð¤Ï¡¢¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï¥â¥¸¥å¡¼¥ë¤È
¤·¤ÆÄ󶡤µ¤ì¤Þ¤¹¡£¥µ¥¦¥ó¥É¤òÌĤ餹¤Ë¤Ï¡¢¤¢¤Ê¤¿¤Î¥µ¥¦¥ó¥É¥Ï¡¼¥É¥¦¥§¥¢¤Ë
¹ç¤Ã¤¿¥â¥¸¥å¡¼¥ë¤¬¥í¡¼¥É¤µ¤ì¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£°ìÈ̤˳ºÅö¥â¥¸¥å¡¼¥ë¤¬¤¢¤ê¡¢
<package>alsa-base</package> ¤Ë²Ã¤¨¤Æ <package>hotplug</package> ¥Ñ¥Ã¥±¡¼
¥¸¤« <package>discover</package> ¥Ñ¥Ã¥±¡¼¥¸¤Î¤¤¤º¤ì¤«¤¬¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ
¤¤¤ì¤Ð¡¢¼«Æ°Åª¤Ë¥í¡¼¥É¤µ¤ì¤Þ¤¹¡£<package>alsa-base</package> ¥Ñ¥Ã¥±¡¼¥¸¤Ï
¤Þ¤¿¡¢OSS ¥â¥¸¥å¡¼¥ë¤¬ <prgn>hotplug</prgn> ¤ä <prgn>discover</prgn> ¤Ë
¤è¤Ã¤Æ¥í¡¼¥É¤µ¤ì¤Ê¤¤¤è¤¦¤½¤ì¤é¤ò "¥Ö¥é¥Ã¥¯¥ê¥¹¥È²½" ¤·¤Þ¤¹¡£
<file>/etc/modules</file> Æâ¤Ë OSS ¥â¥¸¥å¡¼¥ë¤Îµ­½Ò¤¬¤¢¤ë¤Ê¤é¡¢¤½¤ì¤é¤ò
ºï½ü¤¹¤Ù¤­¤Ç¤¹¡£</p>
 
         </sect1>
@@ -1317,7 +1524,7 @@
         </sect>
 ]]> <!-- %available-2.6 -->
 
-<![ %i386 [
+<![ %i386-amd64 [
         <sect id="x-mouse">
         <heading>X Window System fails to load</heading>
 
@@ -1330,7 +1537,9 @@
           in <file>/etc/modules</file>.</p>
 
         </sect>
+]]>
 
+<![ %i386 [
         <sect id="x-transmeta">
         <heading>X Window System on Transmeta Crusoe systems</heading>
 
@@ -1532,7 +1741,7 @@
          </example></p>
 
                 <p>During the install the package may complain about module mismatches
-                and ask if the installation should continue. Answer <tt>YES</tt> to that
+                and ask if the installation should abort. Answer <tt>NO</tt> to that
                 question as these mismatches will be resolved as soon as you reboot with
                 the new kernel.</p>

## Á´ÃÊÍî¤òÌõ¤·¤Þ¤¹¡£
<p>¥¤¥ó¥¹¥È¡¼¥ëÃæ¤Ë¥Ñ¥Ã¥±¡¼¥¸¤¬¥â¥¸¥å¡¼¥ë¤ÎÉÔÀ°¹ç¤¬¤¢¤ë¤È·Ù¹ð¤·¡¢¥¤¥ó¥¹
¥È¡¼¥ë¤òÃæÃǤ¹¤ë¤«¤É¤¦¤«¤ò¿Ò¤Í¤Æ¤¯¤ë¤«¤â¤·¤ì¤Þ¤»¤ó¡£¤³¤ì¤é¤ÎÉÔÀ°¹ç¤Ï¿·¤·
¤¤¥«¡¼¥Í¥ë¤ÇºÆµ¯Æ°¤¹¤ì¤Ð¤¹¤°¤Ë²ò·è¤¹¤ë¤¿¤á¡¢¼ÁÌä¤Ë¤Ï <tt>NO</tt> ¤ÈÅú¤¨
¤Æ¤¯¤À¤µ¤¤¡£</p>
 
@@ -1566,7 +1775,7 @@
 
                 <p>Then install the package using <tt>dpkg -i</tt>. It may
                 complain about module mismatches (from <package>modutils</package>)
-                and ask if the installation should continue. Answer <tt>YES</tt>
+                and ask if the installation should abort. Answer <tt>NO</tt>
                 to that question as these mismatches will be resolved as soon
                 as you reboot with the new kernel.</p>

## Á´ÃÊÍî¤òÌõ¤·¤Þ¤¹¡£
<p>¤½¤ì¤«¤é <tt>dpkg -i</tt> ¤ò»È¤Ã¤Æ¥Ñ¥Ã¥±¡¼¥¸¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Æ¤¯¤À¤µ¤¤¡£
(<package>modutils</package> ¤¬) ¥â¥¸¥å¡¼¥ë¤ÎÉÔÀ°¹ç¤¬¤¢¤ë¤È·Ù¹ð¤·¡¢¥¤¥ó¥¹
¥È¡¼¥ë¤òÃæÃǤ¹¤ë¤«¤É¤¦¤«¤ò¿Ò¤Í¤Æ¤¯¤ë¤«¤â¤·¤ì¤Þ¤»¤ó¡£¤³¤ì¤é¤ÎÉÔÀ°¹ç¤Ï¿·¤·
¤¤¥«¡¼¥Í¥ë¤ÇºÆµ¯Æ°¤¹¤ì¤Ð¤¹¤°¤Ë²ò·è¤¹¤ë¤¿¤á¡¢¼ÁÌä¤Ë¤Ï <tt>NO</tt> ¤ÈÅú¤¨
¤Æ¤¯¤À¤µ¤¤¡£</p>
 
@@ -1640,15 +1849,19 @@
                <item><p>You should first verify that the new one boots and all hardware
                needed for the upgrade works (e.g. network adaptors).</p></item>
 
-<![ %not-mips-mipsel [
                <tag>Make your system bootable</tag>
                <item>
+
+<![ %not-mips-mipsel [
                <p>You will probably have to adapt your boot loader configuration
                <file>&bootloader-conf;</file>. Note that the kernel now uses an
                initrd while the Debian kernels in &oldreleasename; did not.</p>
-               </item>
 ]]>
 
+               <p>If you currently use <package/raidtools2/, you should read
+               <ref id="mdadm"> before you reboot.</p>

<p>¸½ºß¤Ï <package/raidtools2/ ¤ò»È¤Ã¤Æ¤¤¤ë¤Î¤Ê¤é¡¢ºÆµ¯Æ°¤¹¤ëÁ°¤Ë
<ref id="mdadm"> ¤òÆÉ¤à¤Ù¤­¤Ç¤¹¡£</p>

+               </item>
+
                <tag>Reboot to the new kernel</tag>
                <tag>Check your system</tag>
                <item><p>Check especially input devices, display devices, devices
@@ -1662,6 +1875,7 @@
     </appendix>
 ]]>
 
+<![ %not-amd64 [
     <appendix id="old-stuff">
     <heading>Managing your &oldreleasename; system</heading>
 
@@ -1737,6 +1951,7 @@
        </sect>
 
     </appendix>
+]]> <!-- %not-amd64 -->
 
   </book>
 </debiandoc>