* 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

6 files changed, 54 insertions, 42 deletions

diff --git a/debian/changelog b/debian/changelog
index 0b1a0145b..d15f6d8a4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -32,8 +32,13 @@ installation-guide (2008xxxx) UNRELEASED; urgency=medium
 
   [ Frans Pop ]
   * Restructure supported hardware section.
+  * 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
 
- -- Frans Pop <fjp@debian.org>  Fri, 03 Oct 2008 18:04:50 +0200
+ -- Frans Pop <fjp@debian.org>  Fri, 03 Oct 2008 18:52:25 +0200
 
 installation-guide (20080520) unstable; urgency=medium
 
diff --git a/en/boot-installer/powerpc.xml b/en/boot-installer/powerpc.xml
index 8f38312a6..95d4cc870 100644
--- a/en/boot-installer/powerpc.xml
+++ b/en/boot-installer/powerpc.xml
@@ -44,6 +44,7 @@ CD at the OF prompt, such as
 
 &boot-installer-intro-hd.xml;
 
+<!--
   <sect3><title>Booting CHRP from OpenFirmware</title>
 
 <para>
@@ -52,6 +53,7 @@ CD at the OF prompt, such as
 
 </para>
    </sect3>
+-->
 
    <sect3><title>Booting OldWorld PowerMacs from MacOS</title>
 <para>
diff --git a/en/hardware/hardware-supported.xml b/en/hardware/hardware-supported.xml
index 44e30472d..027c6bb79 100644
--- a/en/hardware/hardware-supported.xml
+++ b/en/hardware/hardware-supported.xml
@@ -26,7 +26,7 @@ information can be found.
   <sect2><title>Supported Architectures</title>
 <para>
 
-Debian &release; supports twelve major architectures and several
+Debian &release; supports eleven major architectures and several
 variations of each architecture known as <quote>flavors</quote>.
 
 </para><para>
@@ -64,10 +64,14 @@ variations of each architecture known as <quote>flavors</quote>.
 
 <row>
   <entry morerows="4">ARM</entry>
-  <entry morerows="4">arm</entry>
+  <entry morerows="1">arm</entry>
   <entry>Netwinder and CATS</entry>
   <entry>netwinder</entry>
 </row><row>
+  <entry>Versatile</entry>
+  <entry>versatile</entry>
+</row><row>
+  <entry morerows="2">arm and armel</entry>
   <entry>Intel IOP32x</entry>
   <entry>iop32x</entry>
 </row><row>
@@ -76,9 +80,6 @@ variations of each architecture known as <quote>flavors</quote>.
 </row><row>
   <entry>Marvell Orion</entry>
   <entry>orion5x</entry>
-</row><row>
-  <entry>Versatile</entry>
-  <entry>versatile</entry>
 </row>
 
 <row>
@@ -139,32 +140,29 @@ variations of each architecture known as <quote>flavors</quote>.
   <entry>sb1a-bcm91480b</entry>
 </row>
 
-<row>
+<row arch="m68k">
   <entry morerows="5">Motorola 680x0</entry>
   <entry morerows="5">m68k</entry>
   <entry>Atari</entry>
   <entry>atari</entry>
-</row><row>
+</row><row arch="m68k">
   <entry>Amiga</entry>
   <entry>amiga</entry>
-</row><row>
+</row><row arch="m68k">
   <entry>68k Macintosh</entry>
   <entry>mac</entry>
-</row><row>
+</row><row arch="m68k">
   <entry morerows="2">VME</entry>
   <entry>bvme6000</entry>
-</row><row>
+</row><row arch="m68k">
   <entry>mvme147</entry>
-</row><row>
+</row><row arch="m68k">
   <entry>mvme16x</entry>
 </row>
 
 <row>
-  <entry morerows="2">IBM/Motorola PowerPC</entry>
-  <entry morerows="2">powerpc</entry>
-  <entry>CHRP</entry>
-  <entry>chrp</entry>
-</row><row>
+  <entry morerows="1">IBM/Motorola PowerPC</entry>
+  <entry morerows="1">powerpc</entry>
   <entry>PowerMac</entry>
   <entry>pmac</entry>
 </row><row>
@@ -234,10 +232,11 @@ as well.
   <sect2 arch="x86" id="laptops"><title>Laptops</title>
 <para>
 
-Laptops are also supported.  Laptops are often specialized or contain
-proprietary hardware.  To see if your particular laptop works well
-with GNU/Linux, see the
-<ulink url="&url-x86-laptop;">Linux Laptop pages</ulink>
+Laptops are also supported and nowadays most laptops work out of the box.
+In case a laptop contains specialized or proprietary hardware, some specific
+functions may not be supported.  To see if your particular laptop works well
+with GNU/Linux, see for example the
+<ulink url="&url-x86-laptop;">Linux Laptop pages</ulink>.
 
 </para>
    </sect2>
@@ -248,9 +247,10 @@ with GNU/Linux, see the
 
 Multiprocessor support &mdash; also called <quote>symmetric multiprocessing</quote>
 or SMP &mdash; is available for this architecture.  The standard Debian
-&release; kernel image was compiled with SMP support.  This should not
-prevent installation, since the SMP kernel should boot on non-SMP systems;
-the kernel will simply cause a bit more overhead.
+&release; kernel image has been compiled with SMP support.  The standard
+kernel is also usable on non-SMP systems, but has a slight overhead which
+will cause a small reduction in performance. For normal system use this
+will hardly be noticable.
 
 </para><para>
 
@@ -271,7 +271,7 @@ section of the kernel config.
 
 Multiprocessor support &mdash; also called <quote>symmetric
 multiprocessing</quote> or SMP &mdash; is available for this architecture.
-The standard Debian &release; kernel image was compiled with
+The standard Debian &release; kernel image has been compiled with
 <firstterm>SMP-alternatives</firstterm> support. This means that the kernel
 will detect the number of processors (or processor cores) and will
 automatically deactivate SMP on uniprocessor systems.
diff --git a/en/hardware/network-cards.xml b/en/hardware/network-cards.xml
index 0f28e37d6..5e9b1d741 100644
--- a/en/hardware/network-cards.xml
+++ b/en/hardware/network-cards.xml
@@ -84,9 +84,7 @@ url="&url-slug-firmware;">Slug-Firmware site</ulink>.
 
 </para><para arch="x86">
 
-As for ISDN, the D-channel protocol for the (old) German 1TR6 is not
-supported; Spellcaster BRI ISDN boards are also not supported by the
-&d-i;. Using ISDN during the installation is not supported.
+ISDN is supported, but not during the installation.
 
 </para>
 
@@ -131,6 +129,9 @@ be made to work under &debian;, but are not supported during the installation.
 
 </para><para>
 
+The use of wireless networking during installation is still under development
+and whether it will work depends on the type of adaptor and the configuration
+of your wireless access point.
 If there is no other NIC you can use during the installation, it is still
 possible to install &debian; using a full CD-ROM or DVD image. Use the same
 procedure as described above for NICs that require firmware.
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>