- Reorganize supported hardware table; add amd64

- Add minimalistic 'CPU, Main Boards, and Video Support' section for amd64
- Add variant for SMP-alternatives to descriptions of SMP support and activate for amd64
- Remove an unused arch-condition

4 files changed, 106 insertions, 52 deletions

diff --git a/en/hardware/hardware-supported.xml b/en/hardware/hardware-supported.xml
index a515df480..61a00d7b8 100644
--- a/en/hardware/hardware-supported.xml
+++ b/en/hardware/hardware-supported.xml
@@ -44,34 +44,17 @@ variations of each architecture known as <quote>flavors</quote>.
 
 <tbody>
 <row>
-  <entry morerows="2">Intel x86-based</entry>
-  <entry morerows="2">i386</entry>
-  <entry morerows="2"></entry>
-  <entry>vanilla</entry>
-</row><row>
-  <entry>speakup</entry>
-</row><row>
-  <entry>linux26</entry>
+  <entry>Intel x86-based</entry>
+  <entry>i386</entry>
+  <entry></entry>
+  <entry></entry>
 </row>
 
 <row>
-  <entry morerows="5">Motorola 680x0</entry>
-  <entry morerows="5">m68k</entry>
-  <entry>Atari</entry>
-  <entry>atari</entry>
-</row><row>
-  <entry>Amiga</entry>
-  <entry>amiga</entry>
-</row><row>
-  <entry>68k Macintosh</entry>
-  <entry>mac</entry>
-</row><row>
-  <entry morerows="2">VME</entry>
-  <entry>bvme6000</entry>
-</row><row>
-  <entry>mvme147</entry>
-</row><row>
-  <entry>mvme16x</entry>
+  <entry>AMD64 &amp; Intel EM64t</entry>
+  <entry>amd64</entry>
+  <entry></entry>
+  <entry></entry>
 </row>
 
 <row>
@@ -82,15 +65,6 @@ variations of each architecture known as <quote>flavors</quote>.
 </row>
 
 <row>
-  <entry morerows="1">Sun SPARC</entry>
-  <entry morerows="1">sparc</entry>
-  <entry morerows="1"></entry>
-  <entry>sun4cdm</entry>
-</row><row>
-  <entry>sun4u</entry>
-</row>
-
-<row>
   <entry morerows="2">ARM and StrongARM</entry>
   <entry morerows="2">arm</entry>
   <entry>Netwinder and CATS</entry>
@@ -104,22 +78,6 @@ variations of each architecture known as <quote>flavors</quote>.
 </row>
 
 <row>
-  <entry morerows="3">IBM/Motorola PowerPC</entry>
-  <entry morerows="3">powerpc</entry>
-  <entry>CHRP</entry>
-  <entry>chrp</entry>
-</row><row>
-  <entry>PowerMac</entry>
-  <entry>pmac</entry>
-</row><row>
-  <entry>PReP</entry>
-  <entry>prep</entry>
-</row><row>
-  <entry>APUS</entry>
-  <entry>apus</entry>
-</row>
-
-<row>
   <entry morerows="1">HP PA-RISC</entry>
   <entry morerows="1">hppa</entry>
   <entry>PA-RISC 1.1</entry>
@@ -171,6 +129,51 @@ variations of each architecture known as <quote>flavors</quote>.
 </row>
 
 <row>
+  <entry morerows="5">Motorola 680x0</entry>
+  <entry morerows="5">m68k</entry>
+  <entry>Atari</entry>
+  <entry>atari</entry>
+</row><row>
+  <entry>Amiga</entry>
+  <entry>amiga</entry>
+</row><row>
+  <entry>68k Macintosh</entry>
+  <entry>mac</entry>
+</row><row>
+  <entry morerows="2">VME</entry>
+  <entry>bvme6000</entry>
+</row><row>
+  <entry>mvme147</entry>
+</row><row>
+  <entry>mvme16x</entry>
+</row>
+
+<row>
+  <entry morerows="3">IBM/Motorola PowerPC</entry>
+  <entry morerows="3">powerpc</entry>
+  <entry>CHRP</entry>
+  <entry>chrp</entry>
+</row><row>
+  <entry>PowerMac</entry>
+  <entry>pmac</entry>
+</row><row>
+  <entry>PReP</entry>
+  <entry>prep</entry>
+</row><row>
+  <entry>APUS</entry>
+  <entry>apus</entry>
+</row>
+
+<row>
+  <entry morerows="1">Sun SPARC</entry>
+  <entry morerows="1">sparc</entry>
+  <entry morerows="1"></entry>
+  <entry>sun4cdm</entry>
+</row><row>
+  <entry>sun4u</entry>
+</row>
+
+<row>
   <entry morerows="1">IBM S/390</entry>
   <entry morerows="1">s390</entry>
   <entry>IPL from VM-reader and DASD</entry>
@@ -209,6 +212,7 @@ as well.
 
 <!-- supported cpu docs -->
 &supported-alpha.xml;
+&supported-amd64.xml;
 &supported-arm.xml;
 &supported-hppa.xml;
 &supported-i386.xml;
@@ -293,6 +297,22 @@ to do this in <xref linkend="kernel-baking"/>.  At this time
 section of the kernel config.
 
 </para>
+   </sect2>
+
+
+  <sect2 condition="smp-alternatives">
+<title>Multiple Processors</title>
+
+<para>
+
+Multi-processor support &mdash; also called <quote>symmetric
+multi-processing</quote> or SMP &mdash; is available for this architecture.
+The standard Debian &release; kernel image was compiled with
+<firstterm>SMP-alternatives</firstterm> support. This means that the kernel
+will detect if your system has multiple processors and will automatically
+activate SMP when needed.
+
+</para>
 
   </sect2>
 
diff --git a/en/hardware/supported/amd64.xml b/en/hardware/supported/amd64.xml
new file mode 100644
index 000000000..a1651a2d8
--- /dev/null
+++ b/en/hardware/supported/amd64.xml
@@ -0,0 +1,34 @@
+<!-- retain these comments for translator revision tracking -->
+<!-- $Id: i386.xml 39614 2006-08-07 15:50:11Z fjp $ -->
+
+
+  <sect2 arch="amd64"><title>CPU, Main Boards, and Video Support</title>
+<para>
+
+Complete information concerning supported peripherals can be found at
+<ulink url="&url-hardware-howto;">Linux Hardware Compatibility HOWTO</ulink>.
+This section merely outlines the basics.
+
+</para>
+
+   <sect3><title>CPU</title>
+<para>
+
+Both AMD64 and Intel EM64t processors are supported.
+
+</para>
+   </sect3>
+
+<!-- Not sure if this is relevant for AMD64; AFAIK only PCI supported
+   <sect3 id="bus"><title>I/O Bus</title>
+<para>
+
+The system bus is the part of the motherboard which allows the CPU to
+communicate with peripherals such as storage devices.  Your computer
+must use the PCI bus.
+
+</para>
+   </sect3>
+-->
+  </sect2>
+
diff --git a/en/hardware/supported/i386.xml b/en/hardware/supported/i386.xml
index 9c8438575..c1a709bf7 100644
--- a/en/hardware/supported/i386.xml
+++ b/en/hardware/supported/i386.xml
@@ -2,7 +2,7 @@
 <!-- $Id$ -->
 
 
-  <sect2 arch="x86"><title>CPU, Main Boards, and Video Support</title>
+  <sect2 arch="i386"><title>CPU, Main Boards, and Video Support</title>
 <para>
 
 Complete information concerning supported peripherals can be found at
diff --git a/en/install-methods/floppy/i386.xml b/en/install-methods/floppy/i386.xml
index fa2f1cd81..059ad6c3f 100644
--- a/en/install-methods/floppy/i386.xml
+++ b/en/install-methods/floppy/i386.xml
@@ -9,7 +9,7 @@
 
 <para>
 
-If you have access to an i386 machine, you can use one of the
+If you have access to an i386 or amd64 machine, you can use one of the
 following programs to copy images to floppies.
 
 </para><para>