Bring ARM up to date with reality: remove unsupported flavours, add NSLU2.

3 files changed, 18 insertions, 22 deletions

diff --git a/debian/changelog b/debian/changelog
index 3bf31be50..a2507133d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -41,6 +41,10 @@ installation-guide (2006XXXX) UNRELEASED; urgency=low
   * Document DHCP preseeding. Note that this documents it as of netcfg 1.24
     and preseed 1.13.
 
+  [ Martin Michlmayr ]
+  * Bring ARM up to date with reality: remove unsupported flavours, add
+    NSLU2.
+
  -- Joey Hess <joeyh@debian.org>  Tue, 21 Feb 2006 16:46:06 -0500
 
 installation-guide (20060102) unstable; urgency=low
diff --git a/en/hardware/hardware-supported.xml b/en/hardware/hardware-supported.xml
index 440d64e23..50c68726f 100644
--- a/en/hardware/hardware-supported.xml
+++ b/en/hardware/hardware-supported.xml
@@ -93,14 +93,14 @@ variations of each architecture known as <quote>flavors</quote>.
 <row>
   <entry morerows="3">ARM and StrongARM</entry>
   <entry morerows="3">arm</entry>
-  <entry morerows="3"></entry>
+  <entry>Netwinder and CATS</entry>
   <entry>netwinder</entry>
 </row><row>
-  <entry>riscpc</entry>
-</row><row>
-  <entry>shark</entry>
+  <entry>Linksys NSLU2</entry>
+  <entry>nslu2</entry>
 </row><row>
-  <entry>lart</entry>
+  <entry>RiscPC and Riscstation</entry>
+  <entry>riscpc</entry>
 </row>
 
 <row>
diff --git a/en/hardware/supported/arm.xml b/en/hardware/supported/arm.xml
index dcd55b6ca..53482f9d6 100644
--- a/en/hardware/supported/arm.xml
+++ b/en/hardware/supported/arm.xml
@@ -15,7 +15,7 @@ a number of the most common systems. The Debian userland however may be used by
 <para>
 
 Most ARM CPUs may be run in either endian mode (big or little). However,
-almost every current system implementation uses little-endian mode.
+the majority of current system implementation uses little-endian mode.
 Debian currently only supports little-endian ARM systems.
 
 </para>
@@ -25,12 +25,14 @@ Debian currently only supports little-endian ARM systems.
 The commonly supported systems are
 
 <variablelist>
+
 <varlistentry>
 <term>Netwinder</term>
 <listitem><para>
 
 This is actually the name for the group of machines
-based upon the StrongARM 110 CPU and Intel 21285 Northbridge. It
+based upon the StrongARM 110 CPU and Intel 21285 Northbridge (also known
+as Footbridge). It
 comprises of machines like: Netwinder (possibly one of the most common ARM
 boxes), CATS (also known as the EB110ATX), EBSA 285 and Compaq
 personal server (cps, aka skiff).
@@ -39,13 +41,13 @@ personal server (cps, aka skiff).
 </varlistentry>
 
 <varlistentry>
-<term>Bast</term>
+<term>NSLU2</term>
 <listitem><para>
 
-This is a modern ARM 920 board with a 266MHz Samsung
-processor. It has integrated IDE, USB, Serial, Parallel, audio, video,
-flash and two ethernet ports. This system has a good bootloader which
-is also found on the CATS and Riscstation systems.
+The Linksys NSLU2 (Network Storage Link for USB 2.0 Disk Drives) is a small
+device which allows you to easily provide storage via the network.  It
+comes with an Ethernet connection and two USB ports to which hard drives
+can be connected.
 
 </para></listitem>
 </varlistentry>
@@ -79,16 +81,6 @@ simple bootloader.
 </para></listitem>
 </varlistentry>
 
-<varlistentry>
-<term>LART</term>
-<listitem><para>
-
-This is a modular open hardware platform intended to be built
-by enthusiasts. To be useful to install Debian it requires its KSB
-expansion board.
-
-</para></listitem>
-</varlistentry>
 </variablelist>
 
 </para>