summaryrefslogtreecommitdiff
path: root/en/boot-installer
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 /en/boot-installer
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 'en/boot-installer')
-rw-r--r--en/boot-installer/intro-cd.xml5
-rw-r--r--en/boot-installer/x86.xml50
2 files changed, 29 insertions, 26 deletions
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>