From be4b195546ac6aa3345b05cda54a164224f470ec Mon Sep 17 00:00:00 2001
From: Steve McIntyre <93sam@debian.org>
Date: Tue, 14 Apr 2015 00:11:36 +0000
Subject: 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)
---
en/boot-installer/intro-cd.xml | 5 ++---
en/boot-installer/x86.xml | 50 +++++++++++++++++++++++-------------------
2 files changed, 29 insertions(+), 26 deletions(-)
(limited to 'en')
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 @@
-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
configure your system for booting off a CD as described in
,
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 @@
+
+ Booting from USB Memory Stick
+
+&boot-installer-intro-usb.xml;
+
+
+
Booting from a CD-ROM
&boot-installer-intro-cd.xml;
@@ -185,21 +192,6 @@ initrd /boot/newinstall/initrd.gz
From here on, there should be no difference between GRUB
or LILO.
-
-
-
-
- Booting from USB Memory Stick
-
-
-Let's assume you have prepared everything from and . 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
-boot: prompt. Here you can enter optional boot arguments, or
-just hit &enterkey;.
-
@@ -323,10 +315,20 @@ Graphical install
Advanced options >
Help
Install with speech synthesis
-
-Press ENTER to boot or TAB to edit a menu entry
+
+
+
+
+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.
+
+
+
+
+
Depending on the installation method you are using, the Graphical
install
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.
-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.
--
cgit v1.2.3