Installation guide updates:

  - updated supported hardware for armel and armhf
  - removed ia64 and s390 from the supported architecture list for Jessie
  - updated several common entities for Jessie
  - some other tiny fixes/updates for Jessie

6 files changed, 82 insertions, 43 deletions

diff --git a/debian/changelog b/debian/changelog
index b4997b6bd..64663a317 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,8 +8,17 @@ installation-guide (201312xx) UNRELEASED; urgency=low
 
   [ Karsten Merker ]
   * Update and extend the "Supported Hardware" section for armel
-    and armhf.
-
+    and armhf:
+      - update the architecture/subarch/flavor table
+      - add general information about armel and armhf
+      - add information about platform-specific and multiplatform kernels
+      - update the platform support status
+  * Disable the "Booting the SS4000-E" section as it describes hardware
+    which is not supported in Jessie anymore (Intel iop32-based NAS).
+  * Remove ia64 and s390 from the supported architecture list
+    for Jessie.
+  * Update several common entities for Jessie.
+ 
  -- Martin Michlmayr <tbm@cyrius.com>  Sat, 14 Dec 2013 10:20:37 +0000
 
 installation-guide (20131009) unstable; urgency=low
diff --git a/en/bookinfo.xml b/en/bookinfo.xml
index 7650ff220..e4b7b7e27 100644
--- a/en/bookinfo.xml
+++ b/en/bookinfo.xml
@@ -48,7 +48,7 @@ Its condition is "translation-status".
 </abstract>
 
 <copyright>
- <year>2004 &ndash; 2013</year>
+ <year>2004 &ndash; 2014</year>
  <holder>the Debian Installer team</holder>
 </copyright>
 
diff --git a/en/boot-installer/arm.xml b/en/boot-installer/arm.xml
index 57e4485c8..c3c367442 100644
--- a/en/boot-installer/arm.xml
+++ b/en/boot-installer/arm.xml
@@ -14,6 +14,7 @@
 
   </sect2>
 
+<!--
 
   <sect2 arch="arm" id="boot-firmware"><title>Booting from Firmware</title>
 
@@ -144,3 +145,5 @@ The installer will now start as usual.
 </para>
    </sect3>
   </sect2>
+
+-->
diff --git a/en/hardware/hardware-supported.xml b/en/hardware/hardware-supported.xml
index 0c6b84208..8fba8762b 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; GNU/Linux &release; supports eleven major architectures and several
+&debian; GNU/Linux &release; supports nine major architectures and several
 variations of each architecture known as <quote>flavors</quote>.
 
 </para><para>
@@ -56,11 +56,8 @@ variations of each architecture known as <quote>flavors</quote>.
 </row>
 
 <row>
-  <entry morerows="4">ARM</entry>
-  <entry morerows="4">armel</entry>
-  <entry>Intel IOP32x</entry>
-  <entry>iop32x</entry>
-</row><row>
+  <entry morerows="3">ARM</entry>
+  <entry morerows="3">armel</entry>
   <entry>Intel IXP4xx</entry>
   <entry>ixp4xx</entry>
 </row><row>
@@ -88,15 +85,6 @@ variations of each architecture known as <quote>flavors</quote>.
   <entry>armmp-lpae</entry>
 </row>
 
-
-
-<row>
-  <entry>Intel IA-64</entry>
-  <entry>ia64</entry>
-  <entry></entry>
-  <entry></entry>
-</row>
-
 <row>
   <entry morerows="3">MIPS (big endian)</entry>
   <entry morerows="3">mips</entry>
@@ -116,7 +104,6 @@ variations of each architecture known as <quote>flavors</quote>.
 <row>
   <entry morerows="1">MIPS (little endian)</entry>
   <entry morerows="1">mipsel</entry>
-</row><row>
   <entry>MIPS Malta (32 bit)</entry>
   <entry>4kc-malta</entry>
 </row><row>
@@ -143,12 +130,14 @@ variations of each architecture known as <quote>flavors</quote>.
   <entry>sun4v</entry>
 </row>
 
+<!--
 <row>
   <entry>IBM S/390</entry>
   <entry>s390</entry>
   <entry>IPL from VM-reader and DASD</entry>
   <entry>generic</entry>
 </row>
+-->
 
 <row>
   <entry>64bit IBM S/390</entry>
@@ -259,8 +248,8 @@ with GNU/Linux, see for example the
 Multiprocessor support &mdash; also called <quote>symmetric
 multiprocessing</quote> or SMP &mdash; is available for this
 architecture.  Having multiple processors in a computer was originally
-only an issue for high-end server systems but has become quite common in
-recent years even for rather low-end desktop computers and laptops with
+only an issue for high-end server systems but has become common in
+recent years nearly everywhere with
 the introduction of so called <quote>multi-core</quote> processors.  These contain
 two or more processor units, called <quote>cores</quote>, in one physical chip.
 
@@ -285,10 +274,9 @@ will detect the number of processors (or processor cores) and will
 automatically deactivate SMP on uniprocessor systems.
 
 </para><para>
-
 Having multiple processors in a computer was originally
-only an issue for high-end server systems but has become quite common in
-recent years even for rather low-end desktop computers and laptops with
+only an issue for high-end server systems but has become common in
+recent years nearly everywhere with
 the introduction of so called <quote>multi-core</quote> processors.  These contain
 two or more processor units, called <quote>cores</quote>, in one physical chip.
 
diff --git a/en/hardware/supported-peripherals.xml b/en/hardware/supported-peripherals.xml
index 4a75b35d2..8edfd4890 100644
--- a/en/hardware/supported-peripherals.xml
+++ b/en/hardware/supported-peripherals.xml
@@ -6,7 +6,7 @@
 <para arch="not-s390">
 
 &arch-kernel; supports a large variety of hardware devices such as mice,
-printers, scanners, PCMCIA and USB devices.  However, most of these
+printers, scanners, PCMCIA/CardBus/ExpressCard and USB devices.  However, most of these
 devices are not required while installing the system.
 
 </para><para arch="x86">
diff --git a/en/hardware/supported/arm.xml b/en/hardware/supported/arm.xml
index f56a1ae57..b312722a3 100644
--- a/en/hardware/supported/arm.xml
+++ b/en/hardware/supported/arm.xml
@@ -11,7 +11,7 @@ architecture, where all systems share a common system firmware (BIOS or/and
 UEFI) which handles the board-specific basic hardware initialization in a
 standardized way.
 
-The ARM architecture is used mainly in so-called "systems-on-chip" (SOCs). 
+The ARM architecture is used mainly in so-called <quote>systems-on-chip</quote> (SOCs). 
 These SOCs are designed by many different companies with vastly varying
 hardware components even for the very basic functionality required to bring
 the system up.  Systems using them usually lack a common system firmware
@@ -25,7 +25,7 @@ mainboard's BIOS in the PC world.
 
 At the beginning of the ARM support in the Linux kernel, this resulted in
 the requirement of having a seperate kernel for each ARM system in contrast
-to the "one-fits-all" kernel for PC systems.  As this approach does not
+to the <quote>one-fits-all</quote> kernel for PC systems.  As this approach does not
 scale to a large number of different systems, work has started to be able to
 provide a single ARM kernel that can run on different ARM systems.  Support
 for newer ARM systems gets implemented in a way that allows the use of such
@@ -84,20 +84,6 @@ platform-specific kernels.
 <variablelist>
 
 <varlistentry>
-<term>IOP32x</term>
-<listitem><para>
-
-Intel's I/O Processor (IOP) line is found in a number of products related
-to data storage and processing.  &debian; currently supports the IOP32x
-platform, featuring the IOP 80219 and 32x chips commonly found in Network
-Attached Storage (NAS) devices.  &debian; explicitly supports two such
-devices: the <ulink url="&url-arm-cyrius-glantank;">GLAN Tank</ulink> from
-IO-Data and the <ulink url="&url-arm-cyrius-n2100;">Thecus N2100</ulink>.
-
-</para></listitem>
-</varlistentry>
-
-<varlistentry>
 <term>Kirkwood</term>
 <listitem><para>
 
@@ -144,16 +130,38 @@ test and run &debian; on ARM if you don't have the hardware.
 </para>
 </sect3>
 
+<sect3 arch="arm"><title>Platforms no longer supported by Debian/armel</title>
+
+<variablelist>
+<varlistentry>
+<term>IOP32x</term>
+<listitem><para>
+
+Intel's I/O Processor (IOP) line is found in a number of products
+related to data storage and processing, such as the <ulink
+url="&url-arm-cyrius-glantank;">GLAN Tank</ulink> from IO-Data and the
+<ulink url="&url-arm-cyrius-n2100;">Thecus N2100</ulink>.  &debian; has
+supported the IOP32x platform in &debian; 7, but does not support
+it anymore from version 8 on due to hardware constraints of the platform
+which make it unsuitable for the installation of newer &debian; releases.
+
+</para></listitem>
+</varlistentry>
+</variablelist>
+
+
+</sect3>
+
 <sect3 arch="arm"><title>Platforms supported by Debian/armhf</title>
 
   <para>
-  The following platforms are supported by &debian;/armhf using the
+  The following systems are known to work with &debian;/armhf using the
   multiplatform (armmp) kernel:
 
   <variablelist>
 
       <varlistentry>
-        <term>Freescale MX53 Quick Start Board, Codename "LOCO"</term>
+        <term>Freescale MX53 Quick Start Board</term>
         <listitem>
           <para>   
             The IMX53QSB is a development board based on the i.MX53 SOC.
@@ -161,8 +169,39 @@ test and run &debian; on ARM if you don't have the hardware.
         </listitem>
       </varlistentry>
 
+<!--
+      <varlistentry>
+        <term>Versatile Express</term>
+        <listitem>
+          <para>   
+            The Versatile Express is a development board series from ARM
+            consisting of a baseboard which can be equipped with various CPU
+            daughterboards.
+          </para>
+        </listitem>
+      </varlistentry>
+-->
+
     </variablelist>
   </para>
+
+  <para>
+    
+    Generally, the ARM multiplatform support in the Linux kernel allows
+    running &d-i; on armhf systems not explicitly listed above, as long as
+    the kernel used by &d-i; has support for the target system's components
+    and a device-tree file for the target is available.  In these cases, the
+    installer can usually provide a working userland installation, but it
+    probably cannot automatically make the system bootable, as doing that in
+    many cases requires device-specific information.
+   
+  </para>
+  <para>
+    When using &d-i; on such systems, you have to manually make the system 
+    bootable at the end of the installation, e.g. by running the required
+    commands in a shell started from within &d-i;.
+  </para>
+
 </sect3>
 
   </sect2>