added the remaining suggestions about nubus and non-powerpc macs (closes: #364546)

restructured the chapter about powerpc supported hardware, moved unsupported machines to the end
updated the information about existing kernel flavours

1 files changed, 100 insertions, 61 deletions

diff --git a/en/hardware/supported/powerpc.xml b/en/hardware/supported/powerpc.xml
index 7b5d53aad..9f2aee72c 100644
--- a/en/hardware/supported/powerpc.xml
+++ b/en/hardware/supported/powerpc.xml
@@ -6,8 +6,8 @@
 <para>
 
 There are four major supported <emphasis>&architecture;</emphasis>
-subarchitectures: PMac (Power-Macintosh), PReP, APUS (Amiga Power-UP
-System), and CHRP machines. Each subarchitecture has its own boot
+subarchitectures: PMac (Power-Macintosh or PowerMac), PReP, APUS (Amiga 
+Power-UP System), and CHRP machines. Each subarchitecture has its own boot
 methods. In addition, there are four different kernel flavours,
 supporting different CPU variants.
 
@@ -32,43 +32,51 @@ CPU type:
 <listitem><para>
 
 Most systems use this kernel flavour, which supports the PowerPC 601,
-603, 604, 740, 750, and 7400 processors. All Apple Power Macintosh
-systems up to and including the G4 use one of these processors.
+603, 604, 740, 750, and 7400 processors. All Apple PowerMac machines 
+up to and including the one marketed as G4 use one of these processors.
 
 </para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term>power3</term>
+<term>power64</term>
 <listitem><para>
 
+The power64 kernel flavour supports the following CPUs:
+
+</para><para>
+
 The POWER3 processor is used in older IBM 64-bit server systems: known
 models include the IntelliStation POWER Model 265, the pSeries 610 and
 640, and the RS/6000 7044-170, 7043-260, and 7044-270.
 
-</para></listitem>
-</varlistentry>
-
-<varlistentry>
-<term>power4</term>
-<listitem><para>
+</para><para>
 
 The POWER4 processor is used in more recent IBM 64-bit server systems:
 known models include the pSeries 615, 630, 650, 655, 670, and 690.
 
 </para><para>
 
-The Apple G5 is also based on the POWER4 architecture, and uses this
+The Apple G5s are also based on the POWER4 architecture, and uses this
 kernel flavour.
 
 </para></listitem>
 </varlistentry>
 
 <varlistentry>
+<term>prep</term>
+<listitem><para>
+
+This kernel flavour supports the prep subarchitecture.
+
+</para></listitem>
+</varlistentry>
+
+<varlistentry>
 <term>apus</term>
 <listitem><para>
 
-This kernel flavour supports the Amiga Power-UP System.
+This kernel flavour supports the Amiga Power-UP System, though it is currently disabled.
 
 </para></listitem>
 </varlistentry>
@@ -83,61 +91,23 @@ This kernel flavour supports the Amiga Power-UP System.
 <para>
 
 Apple (and briefly a few other manufacturers &mdash; Power Computing, for
-example) makes a series of Macintosh computers based on the PowerPC
+example) made a series of Macintosh computers based on the PowerPC
 processor. For purposes of architecture support, they are categorized
-as NuBus, OldWorld PCI, and NewWorld.
-
-</para><para>
-
-Macintosh computers using the 680x0 series of processors are not in
-the PowerPC family but are instead m68k machines. Those models start
-with <quote>Mac II</quote> or have a 3-digit model number such as Centris 650
-or Quadra 950. Apple's pre-iMac PowerPC model numbers have four digits.
-
-</para><para>
-
-NuBus systems are not currently supported by debian/powerpc. The
-monolithic Linux/PPC kernel architecture does not have support for
-these machines; instead, one must use the MkLinux Mach microkernel,
-which Debian does not yet support. These include the following:
-
-<itemizedlist>
-<listitem><para>
-
-Power Macintosh 6100, 7100, 8100
-
-</para></listitem>
-<listitem><para>
-
-Performa 5200, 6200, 6300
-
-</para></listitem>
-<listitem><para>
-
-Powerbook 1400, 2300, and 5300
-
-</para></listitem>
-<listitem><para>
-
-Workgroup Server 6150, 8150, 9150
-
-</para></listitem>
-</itemizedlist>
-
-A linux kernel for these machines and limited support is available at
-<ulink url="http://nubus-pmac.sourceforge.net/"></ulink>
+as NuBus (not supported by Debian), OldWorld, and NewWorld.
 
 </para><para>
 
 OldWorld systems are most Power Macintoshes with a floppy drive and a
 PCI bus. Most 603, 603e, 604, and 604e based Power Macintoshes are
-OldWorld machines. The beige colored G3 systems are also OldWorld.
+OldWorld machines. Those pre-iMac PowerPC models from Apple use a 
+four digit naming scheme, except for the beige colored G3 systems, which 
+are also OldWorld.
 
 </para><para>
 
 The so called NewWorld PowerMacs are any PowerMacs in translucent
-colored plastic cases. That includes all iMacs, iBooks, G4 systems,
-blue colored G3 systems, and most PowerBooks manufactured in and after
+colored plastic cases and later models. That includes all iMacs, 
+iBooks, G4 systems, blue colored G3 systems, and most PowerBooks manufactured in and after
 1999. The NewWorld PowerMacs are also known for using the <quote>ROM in
 RAM</quote> system for MacOS, and were manufactured from mid-1998 onwards.
 
@@ -164,7 +134,7 @@ and, for older hardware,
 
 <tbody>
 <row>
-  <entry morerows="22">Apple</entry>
+  <entry morerows="27">Apple</entry>
   <entry>iMac Bondi Blue, 5 Flavors, Slot Loading</entry>
   <entry>NewWorld</entry>
 </row><row>
@@ -281,7 +251,7 @@ and, for older hardware,
 </para>
 
    </sect3>
-
+   
    <sect3><title>PReP subarchitecture</title>
 
 <para>
@@ -378,4 +348,73 @@ and, for older hardware,
 
 </para>
    </sect3>
-  </sect2>
+
+   <sect3><title>unsupported Nubus PowerMac subarchitecture</title>
+
+<para>
+
+NuBus systems are not currently supported by debian/powerpc. The
+monolithic Linux/PPC kernel architecture does not have support for
+these machines; instead, one must use the MkLinux Mach microkernel,
+which Debian does not yet support. These include the following:
+
+<itemizedlist>
+<listitem><para>
+
+Power Macintosh 6100, 7100, 8100
+
+</para></listitem>
+<listitem><para>
+
+Performa 5200, 6200, 6300
+
+</para></listitem>
+<listitem><para>
+
+Powerbook 1400, 2300, and 5300
+
+</para></listitem>
+<listitem><para>
+
+Workgroup Server 6150, 8150, 9150
+
+</para></listitem>
+</itemizedlist>
+
+A linux kernel for these machines and limited support is available at
+<ulink url="http://nubus-pmac.sourceforge.net/"></ulink>
+
+</para>
+
+   </sect3>
+
+   <sect3><title>non PowerPC Macs</title>
+
+<para>
+
+Macintosh computers using the 680x0 series of processors are <emphasis>not</emphasis>
+in the PowerPC family but are instead m68k machines. Those models start 
+with <quote>Mac II</quote> series, go on to the   
+<quote>LC</quote> family, then the Centris series, and culminate in  
+the Quadras and Performas. These models usually have a Roman numeral or 3-digit  
+model number such as Mac IIcx, LCIII or Quadra 950. 
+
+<para></para>
+
+This model range started with the Mac II (Mac II, IIx, IIcx, IIci,  
+IIsi, IIvi, IIvx, IIfx), then the LC (LC, LCII, III, III+, 475, 520,  
+550, 575, 580, 630), then the Mac TV, then the Centris (610, 650,  
+660AV), the Quadra (605, 610, 630, 650, 660AV, 700, 800, 840AV, 900,  
+950), and finally the Performa 200-640CD.
+
+<para></para>
+
+In laptops, it started with the Mac Portable, then the PowerBook  
+100-190cs and the PowerBook Duo 210-550c (excluding PowerBook 500  
+which is Nubus, please see the section above).
+
+</para>
+
+   </sect3>
+
+ </sect2>