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

1 files changed, 9 insertions, 21 deletions

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.