* Update of supported subarches/flavors for powerpc.

* hardware-supported:
  - suppress m68k from arches table, unless building for m68k
  - show which subarches are supported by arm/armel
  - various minor updates and improvements

2 files changed, 18 insertions, 14 deletions

diff --git a/en/hardware/supported/i386.xml b/en/hardware/supported/i386.xml
index 850dcf8f9..db1f26355 100644
--- a/en/hardware/supported/i386.xml
+++ b/en/hardware/supported/i386.xml
@@ -19,15 +19,7 @@ are supported, including all varieties of Intel's "Pentium" series.
 This also includes 32-bit AMD and VIA (former Cyrix) processors, and
 processors like the Athlon XP and Intel P4 Xeon.
 
-</para>
-<note><para>
-
-If your system has a 64-bit processor from the AMD64 or Intel EM64T families,
-you will probably want to use the installer for the amd64 architecture instead
-of the installer for the (32-bit) i386 architecture.
-
-</para></note>
-<para>
+</para><para>
 
 However, Debian GNU/Linux &releasename; will <emphasis>not</emphasis> run
 on 386 or earlier processors.  Despite the architecture name "i386", support
@@ -59,9 +51,14 @@ be easily used by most Debian packages; now they can.
 
 </footnote>.
 
-</para><para>
-
 </para>
+<note><para>
+
+If your system has a 64-bit processor from the AMD64 or Intel EM64T families,
+you will probably want to use the installer for the amd64 architecture instead
+of the installer for the (32-bit) i386 architecture.
+
+</para></note>
    </sect3>
 
    <sect3 id="bus"><title>I/O Bus</title>
diff --git a/en/hardware/supported/powerpc.xml b/en/hardware/supported/powerpc.xml
index 1406b2e0c..bc13cb142 100644
--- a/en/hardware/supported/powerpc.xml
+++ b/en/hardware/supported/powerpc.xml
@@ -5,6 +5,10 @@
   <sect2 arch="powerpc"><title>CPU, Main Boards, and Video Support</title>
 <para>
 
+For &debian; &release; only the PMac (Power-Macintosh or PowerMac) and PreP
+subarchitectures are supported.
+
+<!--
 There are four major supported <emphasis>&architecture;</emphasis>
 subarchitectures: PMac (Power-Macintosh or PowerMac), PReP, APUS (Amiga 
 Power-UP System), and CHRP machines. Each subarchitecture has its own boot
@@ -16,6 +20,7 @@ supporting different CPU variants.
 Ports to other <emphasis>&architecture;</emphasis> architectures, such
 as the Be-Box and MBX architecture, are underway but not yet supported
 by Debian. We may have a 64-bit port in the future.
+-->
 
 </para>
 
@@ -23,7 +28,7 @@ by Debian. We may have a 64-bit port in the future.
 
 <para>
 
-There are four flavours of the powerpc kernel in Debian, based on the
+There are two flavours of the powerpc kernel in Debian, based on the
 CPU type:
 
 <variablelist>
@@ -63,6 +68,7 @@ POWER4 architecture, and use this kernel flavour.
 </para></listitem>
 </varlistentry>
 
+<!--
 <varlistentry>
 <term>prep</term>
 <listitem><para>
@@ -81,6 +87,7 @@ currently disabled.
 
 </para></listitem>
 </varlistentry>
+-->
 </variablelist>
 
 </para>
@@ -297,7 +304,7 @@ and, for older hardware,
 
    </sect3>
 
-   <sect3><title>CHRP subarchitecture</title>
+   <sect3><title>CHRP subarchitecture (unsupported)</title>
 
 <para>
 
@@ -326,7 +333,7 @@ and, for older hardware,
 
    </sect3>
 
-   <sect3><title>APUS subarchitecture</title>
+   <sect3><title>APUS subarchitecture (unsupported)</title>
 
 <para>