Installation-Guide: Rework the architecture table for Stretch.

- armel:

  Marvell Kirkwood (flavor "kirkwood") and Marvell Orion
  (flavor "orion5x") have been merged into a new flavor
  "marvell".

- mips

  SGI Indy/Indigo2 support (flavors r4k-ip22 and r5k-ip22)
  has been removed.

- mipsel

  A Longsoon-3 flavor has been added.

- powerpc

  PowerMac (flavor "pmac") and PReP (flavor "prep") support
  has been removed.

1 files changed, 27 insertions, 13 deletions

diff --git a/en/hardware/hardware-supported.xml b/en/hardware/hardware-supported.xml
index a2796eb83..bfe23a873 100644
--- a/en/hardware/hardware-supported.xml
+++ b/en/hardware/hardware-supported.xml
@@ -56,13 +56,10 @@ variations of each architecture known as <quote>flavors</quote>.
 </row>
 
 <row>
-  <entry morerows="2">ARM</entry>
-  <entry morerows="2">armel</entry>
-  <entry>Marvell Kirkwood</entry>
-  <entry>kirkwood</entry>
-</row><row>
-  <entry>Marvell Orion</entry>
-  <entry>orion5x</entry>
+  <entry morerows="1">ARM</entry>
+  <entry morerows="1">armel</entry>
+  <entry>Marvell Kirkwood and Orion</entry>
+  <entry>marvell</entry>
 </row><row>
   <entry>Versatile</entry>
   <entry>versatile</entry>
@@ -86,39 +83,56 @@ variations of each architecture known as <quote>flavors</quote>.
 </row>
 
 <row>
-  <entry morerows="3">MIPS (big endian)</entry>
-  <entry morerows="3">mips</entry>
+  <entry morerows="2">MIPS (big endian)</entry>
+  <entry morerows="2">mips</entry>
+<!--
   <entry>SGI IP22 (Indy/Indigo 2)</entry>
   <entry>r4k-ip22</entry>
 </row><row>
   <entry>SGI IP32 (O2)</entry>
   <entry>r5k-ip32</entry>
 </row><row>
+-->
   <entry>MIPS Malta (32 bit)</entry>
   <entry>4kc-malta</entry>
 </row><row>
   <entry>MIPS Malta (64 bit)</entry>
   <entry>5kc-malta</entry>
+</row><row>
+  <entry>Cavium Octeon</entry>
+  <entry>octeon</entry>
 </row>
 
 <row>
-  <entry morerows="1">MIPS (little endian)</entry>
-  <entry morerows="1">mipsel</entry>
+  <entry morerows="3">MIPS (little endian)</entry>
+  <entry morerows="3">mipsel</entry>
   <entry>MIPS Malta (32 bit)</entry>
   <entry>4kc-malta</entry>
 </row><row>
   <entry>MIPS Malta (64 bit)</entry>
   <entry>5kc-malta</entry>
+</row><row>
+  <entry>Cavium Octeon</entry>
+  <entry>octeon</entry>
+</row><row>
+  <entry>Loongson 3A</entry>
+  <entry>loongson-3</entry>
 </row>
 
+
+
 <row>
-  <entry morerows="1">IBM/Motorola PowerPC</entry>
-  <entry morerows="1">powerpc</entry>
+  <entry morerows="0">IBM/Motorola PowerPC</entry>
+  <entry morerows="0">powerpc</entry>
+  <entry></entry>
+  <entry></entry>
+<!--
   <entry>PowerMac</entry>
   <entry>pmac</entry>
 </row><row>
   <entry>PReP</entry>
   <entry>prep</entry>
+-->
 </row>
 
 <row>