BIOS -> UEFI update

10 files changed, 32 insertions, 26 deletions

diff --git a/en/boot-installer/arm.xml b/en/boot-installer/arm.xml
index 20bdb52c1..f37d6c973 100644
--- a/en/boot-installer/arm.xml
+++ b/en/boot-installer/arm.xml
@@ -298,7 +298,7 @@ source ${scriptaddr}
     </para>
     <para>
       The autoboot framework in modern U-Boot versions works similar to the
-      boot ordering options in a PC BIOS, i.e.  it checks a list of possible
+      boot ordering options in a PC BIOS/UEFI, i.e.  it checks a list of possible
       boot devices for a valid boot image and starts the first one it finds. 
       If there is no operating system installed, plugging in the USB stick
       and powering up the system should result in starting the installer. 
diff --git a/en/boot-installer/trouble.xml b/en/boot-installer/trouble.xml
index 8d47a2b22..4f6859e69 100644
--- a/en/boot-installer/trouble.xml
+++ b/en/boot-installer/trouble.xml
@@ -94,9 +94,9 @@ If the optical disc fails to boot, try the suggestions listed below.
 <itemizedlist>
   <listitem><para>
 
-Check that your BIOS actually supports booting from optical disc (only an
+Check that your BIOS/UEFI actually supports booting from optical disc (only an
 issue for very old systems) and that booting from such media is enabled in the
-BIOS.
+BIOS/UEFI.
 
   </para></listitem>
   <listitem><para>
diff --git a/en/boot-installer/x86.xml b/en/boot-installer/x86.xml
index 570cec236..5257dcb76 100644
--- a/en/boot-installer/x86.xml
+++ b/en/boot-installer/x86.xml
@@ -153,7 +153,7 @@ There are various ways to do a TFTP boot on i386.
 It could be that your Network Interface Card or Motherboard provides
 PXE boot functionality.
 This is a <trademark class="trade">Intel</trademark> re-implementation
-of TFTP boot. If so, you may be able to configure your BIOS to boot from the
+of TFTP boot. If so, you may be able to configure your BIOS/UEFI to boot from the
 network.
 
 </para>
diff --git a/en/hardware/supported/arm.xml b/en/hardware/supported/arm.xml
index dd7bafc12..b2de0bfec 100644
--- a/en/hardware/supported/arm.xml
+++ b/en/hardware/supported/arm.xml
@@ -53,7 +53,7 @@ up. System firmware interfaces have been increasingly standardised
 over time, but especially on older hardware firmware/boot interfaces
 vary a great deal, so on these systems the Linux kernel has to take
 care of many system-specific low-level issues which would be handled
-by the mainboard's BIOS in the PC world.
+by the mainboard's BIOS/UEFI in the PC world.
 </para>
 
 <para arch="armel;armhf">
diff --git a/en/howto/installation-howto.xml b/en/howto/installation-howto.xml
index ddd0c3820..09d2fdf34 100644
--- a/en/howto/installation-howto.xml
+++ b/en/howto/installation-howto.xml
@@ -77,7 +77,7 @@ to install. You only need the first image of such set.
 </para><para>
 
 Download whichever type you prefer and burn it to an optical disc.
-<phrase arch="any-x86">To boot the disc, you may need to change your BIOS
+<phrase arch="any-x86">To boot the disc, you may need to change your BIOS/UEFI
 configuration, as explained in <xref linkend="bios-setup" />.</phrase>
 <phrase arch="powerpc">
 To boot a PowerMac from CD, press the <keycap>c</keycap> key while booting. See
@@ -122,8 +122,11 @@ sticks. For details, see <xref linkend="boot-usb-files" />.
 
 </para><para arch="any-x86">
 
+While booting from USB storage is quite common on UEFI systems, this is somewhat
+different in the older BIOS world.
 Some BIOSes can boot USB storage directly, and some cannot. You may need to
-configure your BIOS to enable <quote>USB legacy support</quote>. The boot device
+configure your BIOS/UEFI to enable
+<quote>USB legacy support</quote> or <quote>Legacy support</quote>. The boot device
 selection menu should show <quote>removable drive</quote> or <quote>USB-HDD</quote>
 to get it to boot from the USB device. For helpful
 hints and details, see <xref linkend="usb-boot-x86" />.
diff --git a/en/install-methods/boot-drive-files.xml b/en/install-methods/boot-drive-files.xml
index 188feda52..1cf0274d9 100644
--- a/en/install-methods/boot-drive-files.xml
+++ b/en/install-methods/boot-drive-files.xml
@@ -8,6 +8,8 @@
 The installer may be booted using boot files placed on an
 existing hard drive partition, either launched from another operating
 system or by invoking a boot loader directly from the BIOS.
+On modern UEFI systems, the kernel may be booted directly from the UEFI
+partition without the need of a boot loader.
 
 </para><para>
 
diff --git a/en/partitioning/partition/x86.xml b/en/partitioning/partition/x86.xml
index cc6bb0c5e..274e587d1 100644
--- a/en/partitioning/partition/x86.xml
+++ b/en/partitioning/partition/x86.xml
@@ -15,7 +15,8 @@ partition and change its size.
 
 </para><para>
 
-The PC BIOS generally adds additional constraints for disk
+While modern UEFI systems don't have such limitations as listed below,
+the old PC BIOS generally adds additional constraints for disk
 partitioning.  There is a limit to how many <quote>primary</quote> and
 <quote>logical</quote> partitions a drive can contain.  Additionally, with pre
 1994&ndash;98 BIOSes, there are limits to where on the drive the BIOS can boot
diff --git a/en/preparing/bios-setup/i386.xml b/en/preparing/bios-setup/i386.xml
index 264003c61..37890bf5d 100644
--- a/en/preparing/bios-setup/i386.xml
+++ b/en/preparing/bios-setup/i386.xml
@@ -1,14 +1,14 @@
 <!-- retain these comments for translator revision tracking -->
 <!-- $Id$ -->
 
-  <sect2 arch="any-x86" id="bios-setup"><title>Invoking the BIOS Set-Up Menu</title>
+  <sect2 arch="any-x86" id="bios-setup"><title>Invoking the BIOS/UEFI Set-Up Menu</title>
 
 <para>
 
-The BIOS provides the basic functions needed to boot your machine and
+The BIOS/UEFI provides the basic functions needed to boot your machine and
 to allow your operating system to access your hardware.  Your system 
-provides a BIOS setup menu, which is used to configure the BIOS.
-To enter the BIOS setup menu you have to press  a key or key combination
+provides a BIOS/UEFI setup menu, which is used to configure the BIOS/UEFI.
+To enter the BIOS/UEFI setup menu you have to press a key or key combination
 after turning on the computer. Often it is the <keycap>Delete</keycap>
 or the <keycap>F2</keycap> key, but some manufacturers use other keys.
 Usually upon starting the computer there will be a message
@@ -21,7 +21,7 @@ stating which key to press to enter the setup screen.
 
 <para>
 
-Within the BIOS setup menu, you can select which devices shall be
+Within the BIOS/UEFI setup menu, you can select which devices shall be
 checked in which sequence for a bootable operating system. Possible choices
 usually include the internal harddisks, the CD/DVD-ROM drive and USB mass storage
 devices such as USB sticks or external USB harddisks. On modern systems there
@@ -35,43 +35,43 @@ are not already enabled.
 
 </para><para>
 
-Most BIOS versions allow you to call up a boot menu on system startup in
+Most BIOS/UEFI versions allow you to call up a boot menu on system startup in
 which you select from which device the computer should start for the
-current session. If this option is available, the BIOS usually displays
+current session. If this option is available, the BIOS/UEFI usually displays
 a short message like <quote>press <keycap>F12</keycap> for boot
 menu</quote> on system startup.
 The actual key used to select this menu varies from system to system;
 commonly used keys are <keycap>F12</keycap>, <keycap>F11</keycap> and
 <keycap>F8</keycap>. Choosing a device from this menu does not change
-the default boot order of the BIOS, i.e. you can start once from a 
+the default boot order of the BIOS/UEFI, i.e. you can start once from a
 USB stick while having configured the internal harddisk as the normal
 primary boot device.
 
 </para><para>
 
-If your BIOS does not provide you with a boot menu to do ad-hoc choices
-of the current boot device, you will have to change your BIOS setup to make
+If your BIOS/UEFI does not provide you with a boot menu to do ad-hoc choices
+of the current boot device, you will have to change your BIOS/UEFI setup to make
 the device from which the &d-i; shall be booted the primary boot device.
 
 </para><para>
 
-Unfortunately some computers contain buggy BIOS versions. Booting &d-i; from
+Unfortunately some computers may contain buggy BIOS/UEFI versions. Booting &d-i; from
 a USB stick might not work even if there is an appropriate option in the
-BIOS setup menu and the stick is selected as the primary boot device.  On
+BIOS/UEFI setup menu and the stick is selected as the primary boot device.  On
 some of these systems using a USB stick as boot medium is impossible; others
 can be tricked into booting from the stick by changing the device type in
-the BIOS setup from the default <quote>USB harddisk</quote> or <quote>USB
+the BIOS/UEFI setup from the default <quote>USB harddisk</quote> or <quote>USB
 stick</quote> to <quote>USB ZIP</quote> or <quote>USB CDROM</quote>. 
 <phrase condition="isohybrid-supported">
 In particular if you use an isohybrid installation image on a USB stick
 (see <xref linkend="usb-copy-isohybrid"/>), changing the device type to
 <quote>USB CDROM</quote> helps on some BIOSes which will not boot from a USB stick in 
 USB harddisk mode.</phrase>
-You may need to configure your BIOS to enable <quote>USB legacy support</quote>.
+You may need to configure your BIOS/UEFI to enable <quote>USB legacy support</quote>.
 
 </para><para>
 
-If you cannot manipulate the BIOS to boot directly from a USB stick you
+If you cannot manipulate the BIOS/UEFI to boot directly from a USB stick you
 still have the option of using an ISO copied to the stick. Boot &d-i;
 using <xref linkend="boot-drive-files"/> and, after scanning the hard
 drives for an installer ISO image, select the USB device and choose an
diff --git a/en/preparing/needed-info.xml b/en/preparing/needed-info.xml
index 2a0bef6f3..3a63ee6fa 100644
--- a/en/preparing/needed-info.xml
+++ b/en/preparing/needed-info.xml
@@ -151,7 +151,7 @@ The manuals that come with each piece of hardware.
 </para></listitem>
 <listitem><para>
 
-The BIOS setup screens of your computer. You can view these screens
+The BIOS/UEFI setup screens of your computer. You can view these screens
 when you start your computer by pressing a combination of keys. Check
 your manual for the combination. Often, it is the <keycap>Delete</keycap> 
 or the <keycap>F2</keycap> key, but some manufacturers use other keys
diff --git a/en/preparing/pre-install-bios-setup.xml b/en/preparing/pre-install-bios-setup.xml
index f6afe3f79..8c0296144 100644
--- a/en/preparing/pre-install-bios-setup.xml
+++ b/en/preparing/pre-install-bios-setup.xml
@@ -7,8 +7,8 @@
 
 This section will walk you through pre-installation hardware setup, if
 any, that you will need to do prior to installing &debian;.  Generally,
-this involves checking and possibly changing BIOS/system firmware settings for
-your system.  The <quote>BIOS</quote> or <quote>system firmware</quote> is the core software used by the
+this involves checking and possibly changing BIOS/UEFI/system firmware settings for
+your system.  The <quote>BIOS/UEFI</quote> or <quote>system firmware</quote> is the core software used by the
 hardware; it is most critically invoked during the bootstrap process
 (after power-up).