summaryrefslogtreecommitdiff
path: root/en
diff options
context:
space:
mode:
authorSamuel Thibault <sthibault@debian.org>2012-07-17 05:10:15 +0000
committerSamuel Thibault <sthibault@debian.org>2012-07-17 05:10:15 +0000
commit24ccf3e458898b29df67bbf8816d6219cfce4f72 (patch)
tree90f351b5b8fc23aab30ba56d8e1990248aab2291 /en
parent588e56db3549472d93c789038f2043ec4b02bb0d (diff)
downloadinstallation-guide-24ccf3e458898b29df67bbf8816d6219cfce4f72.zip
Add armhf, s390x architectures, comment hppa architecture
Diffstat (limited to 'en')
-rw-r--r--en/appendix/chroot-install.xml8
-rw-r--r--en/hardware/hardware-supported.xml17
2 files changed, 20 insertions, 5 deletions
diff --git a/en/appendix/chroot-install.xml b/en/appendix/chroot-install.xml
index 3a63fcf00..5e05dd577 100644
--- a/en/appendix/chroot-install.xml
+++ b/en/appendix/chroot-install.xml
@@ -174,18 +174,16 @@ of the http URL: <userinput>file:/cdrom/debian/</userinput>
Substitute one of the following for <replaceable>ARCH</replaceable>
in the <command>debootstrap</command> command:
-<userinput>alpha</userinput>,
<userinput>amd64</userinput>,
-<userinput>arm</userinput>,
<userinput>armel</userinput>,
-<userinput>hppa</userinput>,
+<userinput>armhf</userinput>,
<userinput>i386</userinput>,
<userinput>ia64</userinput>,
-<userinput>m68k</userinput>,
<userinput>mips</userinput>,
<userinput>mipsel</userinput>,
<userinput>powerpc</userinput>,
-<userinput>s390</userinput>, or
+<userinput>s390</userinput>,
+<userinput>s390x</userinput>, or
<userinput>sparc</userinput>.
<informalexample><screen>
diff --git a/en/hardware/hardware-supported.xml b/en/hardware/hardware-supported.xml
index add2137b7..66d69ff64 100644
--- a/en/hardware/hardware-supported.xml
+++ b/en/hardware/hardware-supported.xml
@@ -75,6 +75,13 @@ variations of each architecture known as <quote>flavors</quote>.
</row>
<row>
+ <entry>ARM with hardware FPU</entry>
+ <entry>armhf</entry>
+ <entry>Freescale</entry>
+ <entry>mx5</entry>
+</row>
+
+<row>
<entry morerows="1">HP PA-RISC</entry>
<entry morerows="1">hppa</entry>
<entry>PA-RISC 1.1</entry>
@@ -149,6 +156,16 @@ variations of each architecture known as <quote>flavors</quote>.
<entry>tape</entry>
</row>
+<row>
+ <entry morerows="1">64bit IBM S/390</entry>
+ <entry morerows="1">s390x</entry>
+ <entry>IPL from VM-reader and DASD</entry>
+ <entry>generic</entry>
+</row><row>
+ <entry>IPL from tape</entry>
+ <entry>tape</entry>
+</row>
+
</tbody></tgroup></informaltable>
</para><para>