diff options
author | Steve McIntyre <93sam@debian.org> | 2015-04-14 00:11:36 +0000 |
---|---|---|
committer | Steve McIntyre <93sam@debian.org> | 2015-04-14 00:11:36 +0000 |
commit | be4b195546ac6aa3345b05cda54a164224f470ec (patch) | |
tree | a96b30013e0a17061aad2cabe9812f7c31bf8524 | |
parent | 8e724d6087d462e9a4460d7e6f2e0639bdcebca9 (diff) | |
download | installation-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)
-rw-r--r-- | build/entities/common.ent | 2 | ||||
-rw-r--r-- | build/templates/docstruct.ent | 1 | ||||
-rw-r--r-- | en/boot-installer/intro-cd.xml | 5 | ||||
-rw-r--r-- | en/boot-installer/x86.xml | 50 |
4 files changed, 32 insertions, 26 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"> diff --git a/en/boot-installer/intro-cd.xml b/en/boot-installer/intro-cd.xml index 2017ebd30..7caf6d901 100644 --- a/en/boot-installer/intro-cd.xml +++ b/en/boot-installer/intro-cd.xml @@ -3,9 +3,8 @@ <para> -The easiest route for most people will be to use a set of &debian; CDs. -If you have a CD set, and if your machine supports booting directly off -the CD, great! Simply +If you have a CD set, and if your machine supports booting directly +off the CD, great! Simply <phrase arch="x86"> configure your system for booting off a CD as described in <xref linkend="boot-dev-select"/>, diff --git a/en/boot-installer/x86.xml b/en/boot-installer/x86.xml index 239011b48..90e64d3a4 100644 --- a/en/boot-installer/x86.xml +++ b/en/boot-installer/x86.xml @@ -1,6 +1,13 @@ <!-- retain these comments for translator revision tracking --> <!-- $Id$ --> + <sect2 arch="any-x86" condition="bootable-usb" id="usb-boot"> + <title>Booting from USB Memory Stick</title> + +&boot-installer-intro-usb.xml; + + </sect2> + <sect2 arch="any-x86"><title>Booting from a CD-ROM</title> &boot-installer-intro-cd.xml; @@ -188,21 +195,6 @@ or <command>LILO</command>. </para> </sect2> - <sect2 arch="any-x86" condition="bootable-usb" id="usb-boot"> - <title>Booting from USB Memory Stick</title> -<para> - -Let's assume you have prepared everything from <xref -linkend="boot-dev-select"/> and <xref linkend="boot-usb-files"/>. Now -just plug your USB stick into some free USB connector and reboot the -computer. The system should boot up, and unless you have used the flexible -way to build the stick and not enabled it, you should be presented with the -<prompt>boot:</prompt> prompt. Here you can enter optional boot arguments, or -just hit &enterkey;. - -</para> - </sect2> - <sect2 arch="x86" condition="supports-floppy-boot" id="floppy-boot"> <title>Booting from Floppies</title> <para> @@ -323,10 +315,20 @@ Graphical install Advanced options > Help Install with speech synthesis - -Press ENTER to boot or TAB to edit a menu entry </screen></informalexample> +</para> + +<note><para> + +This graphical screen will look very slightly different depending on +how your computer has booted (BIOS or UEFI), but the same options will +be shown. + +</para></note> + +<para> + Depending on the installation method you are using, the <quote>Graphical install</quote> option may not be available. Bi-arch images additionally have a 64 bit variant for each install option, right below it, thus almost doubling the @@ -348,12 +350,14 @@ automated installs. </para><para> -If you wish or need to add any boot parameters for either the installer -or the kernel, press &tabkey;. This will display the default boot command -for the selected menu entry and allow to add additional options. The help -screens (see below) list some common possible options. Press &enterkey; to -boot the installer with your options; pressing &escapekey; will return you -to the boot menu and undo any changes you made. +If you wish or need to add any boot parameters for either the +installer or the kernel, press &tabkey; (BIOS boot) or &ekey; (UEFI +boot). This will display the boot command for the selected menu entry +and allow you to edit it to suit your needs. The help screens (see +below) list some common possible options. Press &enterkey; (BIOS boot) +or &f10key; (UEFI boot) to boot the installer with your options; +pressing &escapekey; will return you to the boot menu and undo any +changes you made. </para><para> |