summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorKarsten Merker <merker@debian.org>2014-12-17 18:44:43 +0000
committerKarsten Merker <merker@debian.org>2014-12-17 18:44:43 +0000
commit5bf1e8fadfc6a99e5714dd4181c0885f5db48f1a (patch)
treeae381b5a38316847d0a909f44ba0c0dbfc75a813 /doc
parent5faed16a07e922b3f742747a82065bf609d4d1c4 (diff)
downloadinstallation-guide-5bf1e8fadfc6a99e5714dd4181c0885f5db48f1a.zip
Installation-Guide:
Add new conditionals (<arch=armel>, <arch=armhf> and <arch=arm64>) to allow distinguishing between the different arm architectures in Debian, and use them to fix the broken architure-dependent links in the "Where to Find Installation Images" section for armel/armhf.
Diffstat (limited to 'doc')
-rw-r--r--doc/cheatsheet.xml21
1 files changed, 19 insertions, 2 deletions
diff --git a/doc/cheatsheet.xml b/doc/cheatsheet.xml
index f029023e2..0f7eee0da 100644
--- a/doc/cheatsheet.xml
+++ b/doc/cheatsheet.xml
@@ -113,11 +113,11 @@ condition. For example,
<code>
<para arch="x86">
-A paragraph only interesting for Linux i386 or amd64 users.
+A paragraph only interesting for Linux/i386 or Linux/amd64 users.
</para>
<para arch="i386">
-A paragraph only interesting for Linux i386 users.
+A paragraph only interesting for Linux/i386 users.
</para>
<para arch="linux-any">
@@ -128,6 +128,23 @@ A paragraph only interesting for Linux users.
A paragraph only interesting for amd64 users, whatever the kernel.
</para>
+<para arch="arm">
+A paragraph only interesting for users of Linux on any arm-based platform,
+encompassing armel, armhf and arm64.
+</para>
+
+<para arch="armel">
+A paragraph only interesting for Linux/armel users.
+</para>
+
+<para arch="armhf">
+A paragraph only interesting for Linux/armhf users.
+</para>
+
+<para arch="arm64">
+A paragraph only interesting for Linux/arm64 users.
+</para>
+
<sect3 condition="bootable-from-hard-disk">
A section pertaining only to computers which
can boot from their hard disk.