summaryrefslogtreecommitdiff
path: root/build
diff options
context:
space:
mode:
authorSteve McIntyre <93sam@debian.org>2015-04-14 00:11:36 +0000
committerSteve McIntyre <93sam@debian.org>2015-04-14 00:11:36 +0000
commitbe4b195546ac6aa3345b05cda54a164224f470ec (patch)
treea96b30013e0a17061aad2cabe9812f7c31bf8524 /build
parent8e724d6087d462e9a4460d7e6f2e0639bdcebca9 (diff)
downloadinstallation-guide-be4b195546ac6aa3345b05cda54a164224f470ec.zip
Tweaks for installer boot options:
* Move USB to the top of the list, easiest for most people * Split out the USB paragraph ready for inclusion for non-x86 * Mention the slight differences between BIOS and UEFI boot menu and interactions (adding extra keycap entries needed)
Diffstat (limited to 'build')
-rw-r--r--build/entities/common.ent2
-rw-r--r--build/templates/docstruct.ent1
2 files changed, 3 insertions, 0 deletions
diff --git a/build/entities/common.ent b/build/entities/common.ent
index 04e9dede3..27504bf54 100644
--- a/build/entities/common.ent
+++ b/build/entities/common.ent
@@ -27,6 +27,8 @@
"<phrase arch='any-amd64'>64-bit PC</phrase><phrase arch='arm'>ARM</phrase><phrase arch='hppa'>PA-RISC</phrase><phrase arch='any-i386'>32-bit PC</phrase><phrase arch='ia64'>IA-64</phrase><phrase arch='mips'>Mips</phrase><phrase arch='mipsel'>Mipsel</phrase><phrase arch='powerpc'>PowerPC</phrase><phrase arch='ppc64el'>64-bit PowerPC (little-endian)</phrase><phrase arch='sparc'>SPARC</phrase><phrase arch='s390'>S/390</phrase>">
<!-- general things from installer -->
+<!ENTITY ekey "<keycap>e</keycap>">
+<!ENTITY f10key "<keycap>F10</keycap>">
<!ENTITY enterkey "<keycap>Enter</keycap>">
<!ENTITY escapekey "<keycap>Esc</keycap>">
<!ENTITY tabkey "<keycap>Tab</keycap>">
diff --git a/build/templates/docstruct.ent b/build/templates/docstruct.ent
index 5045a4db9..78f61b889 100644
--- a/build/templates/docstruct.ent
+++ b/build/templates/docstruct.ent
@@ -80,6 +80,7 @@
<!ENTITY boot-installer-x86.xml SYSTEM "##SRCPATH##/boot-installer/x86.xml">
<!ENTITY boot-installer-ia64.xml SYSTEM "##SRCPATH##/boot-installer/ia64.xml">
<!ENTITY boot-installer-intro-cd.xml SYSTEM "##SRCPATH##/boot-installer/intro-cd.xml">
+ <!ENTITY boot-installer-intro-usb.xml SYSTEM "##SRCPATH##/boot-installer/intro-usb.xml">
<!ENTITY boot-installer-intro-hd.xml SYSTEM "##SRCPATH##/boot-installer/intro-hd.xml">
<!ENTITY boot-installer-intro-net.xml SYSTEM "##SRCPATH##/boot-installer/intro-net.xml">
<!ENTITY boot-installer-intro-firmware.xml SYSTEM "##SRCPATH##/boot-installer/intro-firmware.xml">