[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>AMD64 Ѥ 2.4 󥫡ͥбˤ¤꤫̤Ϥʤᡢ2.6 
ͥΤߤбƤޤˡgilibc  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>