en-US/Boot_x86_ppc-figure-1.xml en-US/Boot_x86_ppc-indexterm-1.xml en-US/Boot_x86_ppc-indexterm-2.xml en-US/Boot_x86_ppc-para-1.xml en-US/Boot_x86_ppc-para-2.xml en-US/Boot_x86_ppc-para-3.xml en-US/Boot_x86_ppc-para-4.xml en-US/Boot_x86_ppc-para-5.xml en-US/Boot_x86_ppc-para-6.xml en-US/Boot_x86_ppc-table-1.xml en-US/Boot_x86_ppc-title-1.xml en-US/Boot_x86_ppc-title-2.xml en-US/Boot_x86_ppc-title-3.xml en-US/Boot_x86_ppc-variablelist-1.xml en-US/Boot-x86.xml en-US/Graphical_Installation_User_Interface_x86_ppc-note-Fedora.xml en-US/Graphical_Installation_x86-Installation-methods.xml en-US/Important_UEFI.xml en-US/Note_Aborting_Installation.xml
Rüdiger Landmann
rlandmann at fedoraproject.org
Thu Apr 29 02:23:48 UTC 2010
en-US/Boot-x86.xml | 293 +++-------
en-US/Boot_x86_ppc-figure-1.xml | 16
en-US/Boot_x86_ppc-indexterm-1.xml | 9
en-US/Boot_x86_ppc-indexterm-2.xml | 9
en-US/Boot_x86_ppc-para-1.xml | 8
en-US/Boot_x86_ppc-para-2.xml | 8
en-US/Boot_x86_ppc-para-3.xml | 8
en-US/Boot_x86_ppc-para-4.xml | 8
en-US/Boot_x86_ppc-para-5.xml | 8
en-US/Boot_x86_ppc-para-6.xml | 8
en-US/Boot_x86_ppc-table-1.xml | 29
en-US/Boot_x86_ppc-title-1.xml | 6
en-US/Boot_x86_ppc-title-2.xml | 6
en-US/Boot_x86_ppc-title-3.xml | 9
en-US/Boot_x86_ppc-variablelist-1.xml | 47 +
en-US/Graphical_Installation_User_Interface_x86_ppc-note-Fedora.xml | 2
en-US/Graphical_Installation_x86-Installation-methods.xml | 2
en-US/Important_UEFI.xml | 1
en-US/Note_Aborting_Installation.xml | 11
19 files changed, 289 insertions(+), 199 deletions(-)
New commits:
commit 09e8bcfa431eeb3ef4cc7754e1ce9aedd75a24d4
Author: Ruediger Landmann <r.landmann at redhat.com>
Date: Thu Apr 29 12:23:09 2010 +1000
revise section 6.2
diff --git a/en-US/Boot-x86.xml b/en-US/Boot-x86.xml
index 019aa80..e8cb1d0 100644
--- a/en-US/Boot-x86.xml
+++ b/en-US/Boot-x86.xml
@@ -2,209 +2,108 @@
<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
-<!-- $Id: -->
-<chapter id="ch-beginninginstallation">
- <title>Booting the Installer</title>
+<chapter id="ch-Boot-x86">
+ <xi:include href="Boot_x86_ppc-title-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ <!-- Booting the Installer -->
- <indexterm>
- <primary>BIOS (Basic Input/Output System)</primary>
- </indexterm>
- <indexterm>
- <primary>CD/DVD media</primary>
- <secondary>booting</secondary>
- </indexterm>
- <indexterm>
- <primary>USB flash media</primary>
- <secondary>booting</secondary>
- </indexterm>
- <xi:include href="Important_UEFI.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
- <para>To start the installation program from minimal boot media, a
- Live image, or the distribution DVD, follow this procedure:</para>
- <procedure>
- <step>
- <para>Power off your computer system.</para>
- </step>
- <step>
- <para>Disconnect any external FireWire or USB disks that you do
- not need for installation. Refer to <xref
- linkend="sn-partitioning-fw-usb-x86"/> for more
- information.</para>
- </step>
- <step>
- <para>Insert the media in your computer and turn it on.</para>
- </step>
- </procedure>
+<!-- start indexterms -->
+ <indexterm>
+ <primary>BIOS (Basic Input/Output System)</primary>
+ </indexterm>
+ <xi:include href="Boot_x86_ppc-indexterm-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ <!-- CD/DVD media - booting -->
+ <xi:include href="Boot_x86_ppc-indexterm-2.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ <!-- USB flash media - booting -->
+<!-- end indexterms -->
+
+ <xi:include href="Important_UEFI.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ <!-- The CD and DVD media include boot catalog entries for both BIOS and UEFI firmware interfaces -->
+
+ <xi:include href="Boot_x86_ppc-para-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ <!-- To start the installation program from a Fedrora CD, DVD, or minimal boot media, -->
+
+ <procedure>
+ <step>
+ <para>
+ Disconnect any external FireWire or USB disks that you do not need for installation. Refer to <xref linkend="sn-partitioning-fw-usb-x86"/> for more information.
+ </para>
+ </step>
+ <step>
+ <para>
+ Power on your computer system.
+ </para>
+ </step>
+ <step>
+ <para>
+ Insert the media in your computer.
+ </para>
+ </step>
+ <step>
+ <para>
+ Power off your computer with the boot media still inside.
+ </para>
+ </step>
+ <step>
+ <para>
+ Power on your computer system.
+ </para>
+ </step>
+ </procedure>
+
+<!-- the following paras describe BIOS settings and are therefore relevant only to x86 -->
<xi:include href="Boot_Order-para-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
<xi:include href="Boot_Order-para-2.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
<xi:include href="Boot_Order-para-3.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
<xi:include href="Boot_Order-para-4.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
<xi:include href="Boot_Order-para-5.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
- <note>
- <title>Aborting the Installation</title>
- <para>
- To abort the installation, either press <keycombo><keycap>Ctrl
- </keycap><keycap>Alt</keycap><keycap>Del</keycap></keycombo>
- or power off your computer with the power switch. You may
- abort the installation process without consequence at any time
- prior to selecting <guibutton>Write changes to disk</guibutton>
- on the <guilabel>Write partitioning to disk</guilabel> screen.
- Fedora makes no permanent changes to your computer until
- that point. Please be aware that stopping the installation
- after partitioning has begun can leave your computer unusable.
- </para>
- </note>
- <section id="sn-boot-menu">
- <title>The Boot Menu</title>
- <para>The boot media displays a graphical boot menu with several
- options. If no key is hit within 60 seconds, the default boot
- option runs. To choose the default, either wait for the timer to
- run out or hit <keycap>Enter</keycap> on the keyboard. To select
- a different option than the default, use the arrow keys on your
- keyboard, and hit <keycap>Enter</keycap> when the correct option
- is highlighted. If you want to customize the boot options for a
- particular option, hit the <keycap>Tab</keycap> key.</para>
- <note>
- <title>Using Boot Options</title>
- <para>For a listing and explanation of common boot options, refer
- to <xref linkend="ap-admin-options"/>.</para>
- </note>
- <para>When using Fedora Live media, press any key during the initial
- boot countdown to bring up the <guilabel>Boot Options</guilabel>
- menu. The boot options include:</para>
- <itemizedlist>
- <listitem>
- <formalpara>
- <title>Boot</title>
- <para>This option is the default. If you select this option,
- only the kernel and startup programs load into memory. This
- option takes less time to load. As you use programs, they
- are loaded from the disc, which takes more time. This mode
- can be used on machines with less total memory.</para>
- </formalpara>
- </listitem>
- <listitem>
- <formalpara>
- <title>Verify and Boot</title>
- <para>This option lets you verify the disc before you run the
- Live CD environment. Refer to <xref
- linkend="sn-verifying-media"/> for more information on the
- verification process.</para>
- </formalpara>
- </listitem>
- <listitem>
- <formalpara>
- <title>Memory Test</title>
- <para>
- This option runs an exhaustive test on the memory on your
- system. For more information, refer to <xref
- linkend="sn-memtest"/>.
- </para>
- </formalpara>
- </listitem>
- <listitem>
- <formalpara>
- <title>Boot from local drive</title>
- <para>
- This option boots the system from the first installed disk.
- If you booted this disc accidentally, use this option to
- boot from the hard disk immediately without starting the
- installer.
- </para>
- </formalpara>
- </listitem>
- </itemizedlist>
- <para>If you boot the DVD, rescue CD, or minimal boot media, the
- boot menu options include:</para>
- <itemizedlist>
- <listitem>
- <formalpara>
- <title>Install or upgrade an existing system</title>
- <para>This option is the default. Choose this option to
- install Fedora onto your computer system using the
- graphical installation program.</para>
- </formalpara>
- </listitem>
- <listitem>
- <formalpara>
- <title>Install system with basic video driver</title>
- <para>This option allows you to install Fedora in graphical mode even if the installation program is unable to load the correct driver for your video card. If your screen appears distorted or goes blank when using the the <guilabel>Install or upgrade an existing system</guilabel> option, restart your computer and try this option instead.</para>
- </formalpara>
- </listitem>
- <listitem>
- <formalpara>
- <title>Rescue installed system</title>
- <para>Choose this option to repair a problem with your
- installed Fedora system that prevents you from booting
- normally. Although Fedora is an exceptionally stable
- computing platform, it is still possible for occasional
- problems to occur that prevent booting. The rescue
- environment contains utility programs that allow you fix a
- wide variety of these problems.</para>
- </formalpara>
- </listitem>
- <listitem>
- <formalpara>
- <title>Boot from local drive</title>
- <para>
- (as for Live CD)
- </para>
- </formalpara>
- </listitem>
- <listitem>
- <formalpara>
- <title>Memory Test</title>
- <para>
- (as for Live CD)
- </para>
- </formalpara>
- </listitem>
- </itemizedlist>
- </section>
- <section id="sn-install-diff-source">
- <title>Installing from a Different Source</title>
- <para>All boot media except the distribution DVD present a menu that
- allows you to choose the installation source, such as the network
- or a hard disk. If you are booting the distribution DVD and do
- not want to install from the DVD, hit <keycap>Tab</keycap> at the
- boot menu. Add a space and the option <option>linux askmethod</option>
- to the end of the line that appears below the menu.</para>
- <para>You can install Fedora from the ISO images stored on hard
- disk, or from a network using NFS, FTP, or HTTP methods.
- Experienced users frequently use one of these methods because it
- is often faster to read data from a hard disk or network server
- than from a CD or DVD.</para>
- <para>The following table summarizes the different boot methods and
- recommended installation methods to use with each:</para>
- <table frame='all'><title>Boot methods and installation methods</title>
- <tgroup cols='2' align='left' colsep='1' rowsep='1'>
- <thead>
- <row>
- <entry>Boot method</entry>
- <entry>Installation method</entry>
- </row>
- </thead>
- <tbody>
- <row>
- <entry>DVD</entry>
- <entry>DVD, network, or hard disk</entry>
- </row>
- <row>
- <entry>Minimal boot CD or USB, rescue CD</entry>
- <entry>Network or hard disk</entry>
- </row>
- <row>
- <entry>Live CD or USB</entry>
- <entry><application>Install to Hard Disk</application>
- application</entry>
- </row>
- </tbody>
- </tgroup>
- </table>
- <para><xref
- linkend="s1-installmethod"/> contains detailed
- information about installing from alternate locations.
- </para>
- </section>
+<!-- end x86-specific material -->
+
+ <xi:include href="Note_Aborting_Installation.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ <!-- The CD and DVD media include boot catalog entries for both BIOS and UEFI firmware interfaces -->
+
+
+ <section id="sn-boot-menu-x86">
+ <xi:include href="Boot_x86_ppc-title-2.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ <!-- The Boot Menu -->
+
+ <xi:include href="Boot_x86_ppc-para-2.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ <!-- The boot media displays a graphical boot menu with several options. -->
+
+ <para>
+ When using Fedora Live media, press any key during the initial boot countdown to bring up the <guilabel>Boot Options</guilabel> menu.
+ </para>
+
+ <xi:include href="Boot_x86_ppc-figure-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ <!-- The boot screen. -->
+
+ <xi:include href="Boot_x86_ppc-para-3.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ <!-- For a listing and explanation of common boot options, refer -->
+
+ <xi:include href="Boot_x86_ppc-para-4.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ <!-- If you boot the DVD, rescue CD, or minimal boot media, the boot menu options include: -->
+
+ <xi:include href="Boot_x86_ppc-variablelist-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ <!-- Install or upgrade an existing system -->
+
+ </section>
+
+ <section id="sn-install-diff-source-x86">
+ <xi:include href="Boot_x86_ppc-title-3.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ <!-- Installing from a Different Source -->
+
+ <xi:include href="Boot_x86_ppc-para-5.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ <!-- You can install Red Hat Enterprise Linux from the ISO images stored -->
+
+ <xi:include href="Boot_x86_ppc-para-6.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ <!-- The following table summarizes the different boot methods -->
+
+ <xi:include href="Boot_x86_ppc-table-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ <!-- Boot methods and installation methods -->
+
+ <para>
+ Refer to <xref linkend="s1-installmethod-x86"/> for information about installing from locations other than the media with which you booted the system.
+ </para>
+ </section>
<section id="sn-verifying-media">
<title>Verifying Media</title>
<para>The distribution DVD media and the Live CD media offer an
diff --git a/en-US/Boot_x86_ppc-figure-1.xml b/en-US/Boot_x86_ppc-figure-1.xml
new file mode 100644
index 0000000..8ed14dc
--- /dev/null
+++ b/en-US/Boot_x86_ppc-figure-1.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+ "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+]>
+
+<figure float="0">
+ <title>The boot screen</title>
+ <mediaobject>
+ <imageobject><imagedata fileref="images/boot/boot_screen.png" format="PNG"/></imageobject>
+ <textobject><para>
+ The boot screen
+ </para>
+ </textobject>
+ </mediaobject>
+</figure>
+
diff --git a/en-US/Boot_x86_ppc-indexterm-1.xml b/en-US/Boot_x86_ppc-indexterm-1.xml
new file mode 100644
index 0000000..4d9d0ed
--- /dev/null
+++ b/en-US/Boot_x86_ppc-indexterm-1.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE indexterm PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+ "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
+
+<indexterm>
+ <primary>CD/DVD media</primary>
+ <secondary>booting</secondary>
+</indexterm>
+
diff --git a/en-US/Boot_x86_ppc-indexterm-2.xml b/en-US/Boot_x86_ppc-indexterm-2.xml
new file mode 100644
index 0000000..a806ce0
--- /dev/null
+++ b/en-US/Boot_x86_ppc-indexterm-2.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE indexterm PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+ "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
+
+<indexterm>
+ <primary>USB media</primary>
+ <secondary>booting</secondary>
+</indexterm>
+
diff --git a/en-US/Boot_x86_ppc-para-1.xml b/en-US/Boot_x86_ppc-para-1.xml
new file mode 100644
index 0000000..3546650
--- /dev/null
+++ b/en-US/Boot_x86_ppc-para-1.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+ "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
+
+<para>
+ To start the installation program from a Red Hat Enterprise Linux CD, DVD, or minimal boot media, follow this procedure:
+</para>
+
diff --git a/en-US/Boot_x86_ppc-para-2.xml b/en-US/Boot_x86_ppc-para-2.xml
new file mode 100644
index 0000000..aa60d74
--- /dev/null
+++ b/en-US/Boot_x86_ppc-para-2.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+ "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
+
+<para>
+ The boot media displays a graphical boot menu with several options. If no key is hit within 60 seconds, the default boot option runs. To choose the default, either wait for the timer to run out or hit <keycap>Enter</keycap> on the keyboard. To select a different option than the default, use the arrow keys on your keyboard, and hit <keycap>Enter</keycap> when the correct option is highlighted. If you want to customize the boot options for a particular option, press the <keycap>Tab</keycap> key.
+</para>
+
diff --git a/en-US/Boot_x86_ppc-para-3.xml b/en-US/Boot_x86_ppc-para-3.xml
new file mode 100644
index 0000000..2c7524d
--- /dev/null
+++ b/en-US/Boot_x86_ppc-para-3.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+ "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
+
+<para>
+ For a listing and explanation of common boot options, refer to <xref linkend="ap-admin-options"/>.
+</para>
+
diff --git a/en-US/Boot_x86_ppc-para-4.xml b/en-US/Boot_x86_ppc-para-4.xml
new file mode 100644
index 0000000..6fbde22
--- /dev/null
+++ b/en-US/Boot_x86_ppc-para-4.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+ "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
+
+<para>
+ If you boot the DVD, rescue CD, or minimal boot media, the boot menu options are:
+</para>
+
diff --git a/en-US/Boot_x86_ppc-para-5.xml b/en-US/Boot_x86_ppc-para-5.xml
new file mode 100644
index 0000000..c704311
--- /dev/null
+++ b/en-US/Boot_x86_ppc-para-5.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+ "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
+
+<para>
+ You can install Fedora from the ISO images stored on hard disk, or from a network using NFS, FTP, or HTTP methods. Experienced users frequently use one of these methods because it is often faster to read data from a hard disk or network server than from a CD or DVD.
+</para>
+
diff --git a/en-US/Boot_x86_ppc-para-6.xml b/en-US/Boot_x86_ppc-para-6.xml
new file mode 100644
index 0000000..2d910c2
--- /dev/null
+++ b/en-US/Boot_x86_ppc-para-6.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+ "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
+
+<para>
+ The following table summarizes the different boot methods and recommended installation methods to use with each:
+</para>
+
diff --git a/en-US/Boot_x86_ppc-table-1.xml b/en-US/Boot_x86_ppc-table-1.xml
new file mode 100644
index 0000000..1dfcc1a
--- /dev/null
+++ b/en-US/Boot_x86_ppc-table-1.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+ "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
+
+<table frame='all'><title>Boot methods and installation methods</title>
+ <tgroup cols='2' align='left' colsep='1' rowsep='1'>
+ <thead>
+ <row>
+ <entry>Boot method</entry>
+ <entry>Installation method</entry>
+ </row>
+ </thead>
+ <tbody>
+ <row>
+ <entry>DVD</entry>
+ <entry>DVD, network, or hard disk</entry>
+ </row>
+ <row>
+ <entry>Minimal boot CD or USB, rescue CD</entry>
+ <entry>Network or hard disk</entry>
+ </row>
+ <row>
+ <entry>Live CD or USB</entry>
+ <entry><application>Install to Hard Disk</application> application</entry>
+ </row>
+ </tbody>
+ </tgroup>
+</table>
+
diff --git a/en-US/Boot_x86_ppc-title-1.xml b/en-US/Boot_x86_ppc-title-1.xml
new file mode 100644
index 0000000..0d32370
--- /dev/null
+++ b/en-US/Boot_x86_ppc-title-1.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+ "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
+
+<title>Booting the Installer</title>
+
diff --git a/en-US/Boot_x86_ppc-title-2.xml b/en-US/Boot_x86_ppc-title-2.xml
new file mode 100644
index 0000000..6a25b30
--- /dev/null
+++ b/en-US/Boot_x86_ppc-title-2.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+ "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
+
+<title>The Boot Menu</title>
+
diff --git a/en-US/Boot_x86_ppc-title-3.xml b/en-US/Boot_x86_ppc-title-3.xml
new file mode 100644
index 0000000..7a9b500
--- /dev/null
+++ b/en-US/Boot_x86_ppc-title-3.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+ "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
+
+
+<title>
+ Installing from a Different Source
+</title>
+
diff --git a/en-US/Boot_x86_ppc-variablelist-1.xml b/en-US/Boot_x86_ppc-variablelist-1.xml
new file mode 100644
index 0000000..c3aa0b5
--- /dev/null
+++ b/en-US/Boot_x86_ppc-variablelist-1.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE variablelist PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+ "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
+
+<variablelist>
+ <varlistentry>
+ <term>Install or upgrade an existing system</term>
+ <listitem>
+ <para>
+ This option is the default. Choose this option to install Fedora onto your computer system using the graphical installation program.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>Install system with basic video driver</term>
+ <listitem>
+ <para>
+ This option allows you to install Fedora in graphical mode even if the installation program is unable to load the correct driver for your video card. If your screen appears distorted or goes blank when using the the <guilabel>Install or upgrade an existing system</guilabel> option, restart your computer and try this option instead.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>Rescue installed system</term>
+ <listitem>
+ <para>
+ Choose this option to repair a problem with your installed Fedora system that prevents you from booting normally. Although Fedora is an exceptionally stable computing platform, it is still possible for occasional problems to occur that prevent booting. The rescue environment contains utility programs that allow you fix a wide variety of these problems.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>Boot from local drive</term>
+ <listitem>
+ <para>
+ This option boots the system from the first installed disk. If you booted this disc accidentally, use this option to boot from the hard disk immediately without starting the installer.
+ </para>
+ </listitem>
+ </varlistentry>
+ <!-- Not in RHEL6 Beta <varlistentry>
+ <term>Memory Test</term>
+ <listitem>
+ <para>
+ This option runs an exhaustive test on the memory on your system. For more information, refer to <xref linkend="sn-memtest"/>.
+ </para>
+ </listitem>
+ </varlistentry> -->
+</variablelist>
+
diff --git a/en-US/Graphical_Installation_User_Interface_x86_ppc-note-Fedora.xml b/en-US/Graphical_Installation_User_Interface_x86_ppc-note-Fedora.xml
index 95d129e..7fdc307 100644
--- a/en-US/Graphical_Installation_User_Interface_x86_ppc-note-Fedora.xml
+++ b/en-US/Graphical_Installation_User_Interface_x86_ppc-note-Fedora.xml
@@ -9,7 +9,7 @@
<!-- The following paragraph is in both x86 and ppc guides, but is included here because of the arch-specific link -->
<para>
- Refer to <xref linkend="sn-boot-menu"/> for a description of the Fedora boot menu and to <xref linkend="s1-guimode-textinterface-x86"/> for a brief overview of text mode installation instructions.
+ Refer to <xref linkend="sn-boot-menu-x86"/> for a description of the Fedora boot menu and to <xref linkend="s1-guimode-textinterface-x86"/> for a brief overview of text mode installation instructions.
</para>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Graphical_Installation_User_Interface_x86_ppc-note-para-1.xml"/>
diff --git a/en-US/Graphical_Installation_x86-Installation-methods.xml b/en-US/Graphical_Installation_x86-Installation-methods.xml
index f24d779..8a57f23 100644
--- a/en-US/Graphical_Installation_x86-Installation-methods.xml
+++ b/en-US/Graphical_Installation_x86-Installation-methods.xml
@@ -2,7 +2,7 @@
<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
]>
-<section id="s1-installmethod">
+<section id="s1-installmethod-x86">
<title>Selecting an Installation Method</title>
<indexterm significance="normal">
<primary>installation</primary>
diff --git a/en-US/Important_UEFI.xml b/en-US/Important_UEFI.xml
index 75ab6cf..2a7a23d 100644
--- a/en-US/Important_UEFI.xml
+++ b/en-US/Important_UEFI.xml
@@ -11,3 +11,4 @@
Note that the boot configurations of UEFI and BIOS differ significantly from each other. Therefore, the installed system must boot using the same firmware that was used during installation. You cannot install the operating system on a system that uses BIOS and then boot this installation on a system that uses UEFI.
</para>
</important>
+
diff --git a/en-US/Note_Aborting_Installation.xml b/en-US/Note_Aborting_Installation.xml
new file mode 100644
index 0000000..38bed17
--- /dev/null
+++ b/en-US/Note_Aborting_Installation.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+ "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
+
+<note>
+<title>Note — Aborting the Installation</title>
+ <para>
+ To abort the installation, either press <keycombo><keycap>Ctrl </keycap><keycap>Alt</keycap><keycap>Del</keycap></keycombo> or power off your computer with the power switch. You may abort the installation process without consequence at any time prior to selecting <guibutton>Write changes to disk</guibutton> on the <guilabel>Write partitioning to disk</guilabel> screen. Fedora makes no permanent changes to your computer until that point. Please be aware that stopping the installation after partitioning has begun can leave your computer unusable.
+ </para>
+</note>
+
More information about the docs-commits
mailing list