Mon Jul 13 06:27:34 UTC 2009

en-US/Advice_on_Partitions.xml                                |    7 -
 en-US/Boot_Order-para-1.xml                                   |    7 +
 en-US/Boot_Order-para-2.xml                                   |    7 +
 en-US/Boot_Order-para-3.xml                                   |    7 +
 en-US/Boot_Order-para-4.xml                                   |    7 +
 en-US/Boot_Order-para-5.xml                                   |    7 +
 en-US/Disk_Partitioning_X86_Partitions.xml                    |    7 -
 en-US/Graphical_Installation_x86-Installation-methods.xml     |    6 -
 en-US/Graphical_Installation_x86_Starting.xml                 |   21 +---
 en-US/Grub.xml                                                |   45 ++++++++++
 en-US/Key_Board_Configuration-x86.xml                         |    4 
 en-US/Steps_Hardware-x86.xml                                  |    5 +
 en-US/Trouble-x86.xml                                         |    6 -
 en-US/Trouble_After_Booting_Problems_Login-para-1.xml         |    2 
 en-US/Trouble_After_Booting_X_Server_Non_Root.xml             |    2 
 en-US/Trouble_After_Booting_X_Windows.xml                     |    3 
 en-US/Trouble_During-x86.xml                                  |    2 
 en-US/Trouble_During_common-other-partitioning-listitem-2.xml |    7 -
 en-US/Trouble_During_common-other-partitioning-listitem-3.xml |   12 ++
 en-US/Upgrade-x86.xml                                         |   14 +++
 en-US/X86_Bootloader.xml                                      |    2 
 en-US/adminoptions.xml                                        |   33 ++++---
 en-US/beginninginstallation.xml                               |   26 +----
 en-US/ext4-and-btrfs.xml                                      |   11 ++
 en-US/firstboot.xml                                           |   16 ++-
 en-US/medialess.xml                                           |   33 ++++---
 en-US/networkconfig-fedora.xml                                |    4 
 en-US/nextsteps.xml                                           |    3 
 en-US/pxe-server-manual.xml                                   |    4 
 en-US/upgrading-fedora.xml                                    |   11 ++
 en-US/vnc_References_Chapter.xml                              |    2 
 en-US/vnc_Viewer_Chapter.xml                                  |    9 --
 32 files changed, 231 insertions(+), 101 deletions(-)

New commits:
commit ba322d8dcc461379d0dc79e9a2a16f3b87d7d606
Author: Ruediger Landmann <r.landmann at redhat.com>
Date:   Mon Jul 13 16:26:55 2009 +1000

    Multiple fixes suggested in BZ#498991

diff --git a/en-US/Advice_on_Partitions.xml b/en-US/Advice_on_Partitions.xml
index d12b69b..45e2fb7 100644
--- a/en-US/Advice_on_Partitions.xml
+++ b/en-US/Advice_on_Partitions.xml
@@ -26,12 +26,7 @@
 	  plan to install a great many kernels, the default partition
 	  size of 100 MB for <filename
 	    class="partition">/boot</filename> should suffice.</para>
-	    <important>
-	    <title>ext4 and Btrfs</title>
-	    <para>
-	      The <application>GRUB</application> bootloader does not support the ext4 or Btrfs file systems. You cannot use an ext4 or btrfs partition for <filename>/boot</filename>.
-	    </para>
-	  </important>
+	    <xi:include href="ext4-and-btrfs.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
       </listitem>
       <listitem>
 	<para>The <filename class="directory">/var</filename> directory
diff --git a/en-US/Boot_Order-para-1.xml b/en-US/Boot_Order-para-1.xml
new file mode 100644
index 0000000..43e4d51
--- /dev/null
+++ b/en-US/Boot_Order-para-1.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+]>
+
+<para>
+	You might need to press a specific key or combination of keys to boot from the media. On most computers, a message appears briefly on the screen very soon after you turn on the computer. Typically, it is worded something like <literal>Press F10 to select boot device</literal>, although the specific wording and the key that you must press varies widely from computer to computer. Consult the documentation for your computer or motherboard, or seek support from the hardware manufacturer or vendor. On Apple computers, the <keycap>C</keycap> key boots the system from the DVD drive. On older Apple hardware you might need to  press <keycombo><keycap>Cmd</keycap> <keycap>Opt</keycap><keycap>Shift</keycap><keycap>Del</keycap></keycombo> to boot from the DVD drive.
+</para>
diff --git a/en-US/Boot_Order-para-2.xml b/en-US/Boot_Order-para-2.xml
new file mode 100644
index 0000000..dc4f0f4
--- /dev/null
+++ b/en-US/Boot_Order-para-2.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+]>
+
+<para>
+	If your computer does not allow you to select a boot device as it starts up, you might need to configure your system's <firstterm>Basic Input/Output System</firstterm> (<acronym>BIOS</acronym>) to boot from the media.
+</para>
diff --git a/en-US/Boot_Order-para-3.xml b/en-US/Boot_Order-para-3.xml
new file mode 100644
index 0000000..8113aee
--- /dev/null
+++ b/en-US/Boot_Order-para-3.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+]>
+
+<para>
+	To change your BIOS settings on an x86, AMD64, or <trademark class="registered">Intel</trademark> 64 system, watch the instructions provided on your display when your computer first boots. A line of text appears, telling you which key to press to enter the BIOS settings.
+</para>
diff --git a/en-US/Boot_Order-para-4.xml b/en-US/Boot_Order-para-4.xml
new file mode 100644
index 0000000..715bc28
--- /dev/null
+++ b/en-US/Boot_Order-para-4.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+]>
+
+<para>
+	Once you have entered your BIOS setup program, find the section where you can alter your boot sequence. The default is often C, A or A, C (depending on whether you boot from your hard drive [C] or a diskette drive [A]). Change this sequence so that the CD-ROM is first in your boot order and that C or A (whichever is your typical boot default) is second. This instructs the computer to first look at the CD-ROM drive for bootable media; if it does not find bootable media on the CD-ROM drive, it then checks your hard drive or diskette drive.
+</para>
diff --git a/en-US/Boot_Order-para-5.xml b/en-US/Boot_Order-para-5.xml
new file mode 100644
index 0000000..e3caff1
--- /dev/null
+++ b/en-US/Boot_Order-para-5.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+]>
+
+<para>
+	Save your changes before exiting the BIOS. For more information, refer to the documentation that came with your system.
+</para>
diff --git a/en-US/Disk_Partitioning_X86_Partitions.xml b/en-US/Disk_Partitioning_X86_Partitions.xml
index faee292..df974b6 100644
--- a/en-US/Disk_Partitioning_X86_Partitions.xml
+++ b/en-US/Disk_Partitioning_X86_Partitions.xml
@@ -36,12 +36,7 @@
 		
 		<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Disk_Partitioning_Scheme_x86_s390-para-1.xml"/>
 		<!-- A /boot/ partition (100MB) - the partition mounted... -->
-		<important>
-		  <title>ext4 and Btrfs</title>
-		  <para>
-		    The <application>GRUB</application> bootloader does not support the ext4 or Btrfs file systems. You cannot use an ext4 or Btrfs partition for /boot/.
-		  </para>
-		</important>
+		<xi:include href="ext4-and-btrfs.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 		<note><title>Note</title>
 			<para>
 				If your hard drive is more than 1024 cylinders (and your system was manufactured more than two years ago), you may need to create a <filename>/boot/</filename> partition if you want the <filename>/</filename> (root)
diff --git a/en-US/Graphical_Installation_x86-Installation-methods.xml b/en-US/Graphical_Installation_x86-Installation-methods.xml
index f4342c2..f24d779 100644
--- a/en-US/Graphical_Installation_x86-Installation-methods.xml
+++ b/en-US/Graphical_Installation_x86-Installation-methods.xml
@@ -36,7 +36,7 @@
 					<tertiary>hard drive</tertiary>
 				</indexterm>
 				<para>
-					If you have copied the Fedora ISO images to a local hard drive, you can use this method. You need a boot CD-ROM (use the <command>linux askmethod</command> boot option). Refer to <xref linkend="s1-begininstall-hd-x86"/>, for hard drive installation instructions.
+					If you have copied the Fedora ISO images to a local hard drive, you can use this method. You need a boot CD-ROM (use the <command>linux askmethod</command> or <command>linux repo=hd:<replaceable>device</replaceable>:/<replaceable>path</replaceable></command> boot option). Refer to <xref linkend="s1-begininstall-hd-x86"/>, for hard drive installation instructions.
 				</para>
 			</listitem>
 		</varlistentry>
@@ -50,7 +50,7 @@
 					<tertiary>NFS image</tertiary>
 				</indexterm>
 				<para>
-					If you are installing from an NFS server using ISO images or a mirror image of Fedora, you can use this method. You need a boot CD-ROM (use the <command>linux askmethod</command> boot option). Refer to <xref linkend="s1-begininstall-nfs-x86"/> for network installation instructions. Note that NFS installations may also be performed in GUI mode.
+					If you are installing from an NFS server using ISO images or a mirror image of Fedora, you can use this method. You need a boot CD-ROM (use the <command>linux askmethod</command> or <command>linux repo=nfs:<replaceable>server</replaceable> <replaceable>:options</replaceable>:/<replaceable>path</replaceable></command> boot option). Refer to <xref linkend="s1-begininstall-nfs-x86"/> for network installation instructions. Note that NFS installations may also be performed in GUI mode.
 				</para>
 			</listitem>
 		</varlistentry>
@@ -64,7 +64,7 @@
 					<tertiary>URL</tertiary>
 				</indexterm>
 				<para>
-					If you are installing directly from an HTTP (Web) server or FTP server, use this method. You need a boot CD-ROM (use the <command>linux askmethod</command> boot option). Refer to  <xref linkend="s1-begininstall-url-x86"/>, for FTP and HTTP installation
+					If you are installing directly from an HTTP (Web) server or FTP server, use this method. You need a boot CD-ROM (use the <command>linux askmethod</command>, <command>linux repo=ftp://<replaceable>user</replaceable>:<replaceable>password</replaceable>@<replaceable>host</replaceable>/<replaceable>path</replaceable></command>, or <command>linux repo=http://<replaceable>host</replaceable>/<replaceable>path</replaceable></command> boot option). Refer to  <xref linkend="s1-begininstall-url-x86"/>, for FTP and HTTP installation
 					instructions.
 				</para>
 			</listitem>
diff --git a/en-US/Graphical_Installation_x86_Starting.xml b/en-US/Graphical_Installation_x86_Starting.xml
index d179d92..ba5c6f8 100644
--- a/en-US/Graphical_Installation_x86_Starting.xml
+++ b/en-US/Graphical_Installation_x86_Starting.xml
@@ -74,22 +74,15 @@
 		</para>
 		 
 		<para>
-			Insert the boot media and reboot the system. Your BIOS settings may need to be changed to allow you to boot from the CD-ROM or USB device.
+			Insert the boot media and reboot the system.
 		</para>
-		<note><title>Note</title>
-			<para>
-				To change your BIOS settings on an x86, AMD64, or <trademark class="registered">Intel</trademark> 64 system, watch the instructions provided on your display when your computer first boots. A line of text appears, telling you which key to press to enter the BIOS settings.
-			</para>
-			<para>
-				Once you have entered your BIOS setup program, find the section where you can alter your boot sequence. The default is often C, A or A, C (depending on whether you boot from your hard drive [C] or a diskette drive [A]). Change this sequence so that the CD-ROM is first in your boot order and that C or A (whichever is your typical boot default) is second. This instructs the computer to first look at the CD-ROM drive for bootable media; if it does not find bootable media on the CD-ROM drive, it then checks your hard drive or diskette drive.
-			</para>
-			<para>
-				Save your changes before exiting the BIOS. For more information, refer to the documentation that came with your system.
-			</para>
-		</note>
+		<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"/>
 		<para>
-			After a short delay, a screen containing the <prompt>boot:</prompt> prompt should appear. The screen contains information on a variety of boot options. Each boot option also has one or more help screens associated with it. To access a help screen, press the appropriate function key as listed in the line at the bottom of
-			the screen.
+			After a short delay, a screen containing boot options appears.<!-- the RHEL <prompt>boot:</prompt> prompt should appear. The screen contains information on a variety of boot options. Each boot option also has one or more help screens associated with it. To access a help screen, press the appropriate function key as listed in the line at the bottom of the screen.-->
 		</para>
 		 
 		<para>
diff --git a/en-US/Grub.xml b/en-US/Grub.xml
index 6cd901a..2d408dc 100644
--- a/en-US/Grub.xml
+++ b/en-US/Grub.xml
@@ -157,6 +157,9 @@
 		<para>
 			This appendix discusses commands and configuration options for the GRUB boot loader included with Fedora for the x86 architecture.
 		</para>
+		
+		<xi:include href="ext4-and-btrfs.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+		
 	<!-- (RHEL) </section> -->
 	<section id="s1-grub-whatis">
 		<title>GRUB</title>
@@ -326,6 +329,9 @@
 			<para>
 				<ulink url="http://www.dur.ac.uk/a.d.stribblehill/mirrored_grub.html">http://www.dur.ac.uk/a.d.stribblehill/mirrored_grub.html</ulink> -->
 			</para>
+			<para>
+				Installing GRUB on each disk in the array might ensure that your system can boot from any of the disks individually if the array itself is inaccessible. Refer to <ulink url="http://tldp.org/HOWTO/Software-RAID-HOWTO-7.html#ss7.3"></ulink> for an explanation and example of this strategy.
+			</para>
 		</important>
 	</section>
 	<section id="s1-grub-terminology">
@@ -895,6 +901,21 @@ chainloader +1
 						<command>kernel <replaceable></path/to/kernel></replaceable> <replaceable><option-1></replaceable> <replaceable><option-N></replaceable></command> — Specifies the kernel file to load when booting the
 						operating system. Replace <replaceable></path/to/kernel></replaceable> with an absolute path from the partition specified by the root directive. Multiple options can be passed to the kernel when it is loaded.
 					</para>
+					<para>
+						These options include:
+						<itemizedlist>
+							<listitem>
+								<para>
+									<literal>rhgb</literal> (<firstterm>Red Hat graphical boot</firstterm>) — displays an animation during the boot process, rather than lines of text.
+								</para>
+							</listitem>
+							<listitem>
+								<para>
+									<literal>quiet</literal> — suppresses all but the most important messages in the part of the boot sequence before the Red Hat graphical boot animation begins.
+								</para>
+							</listitem>
+						</itemizedlist>
+					</para>
 				</listitem>
 
 				<listitem>
@@ -911,6 +932,26 @@ chainloader +1
 						For more information about securing GRUB, refer to the chapter titled <citetitle>Workstation Security</citetitle> in the <citetitle>Red Hat Enterprise Linux Deployment Guide</citetitle>.
 					</para>
 				</listitem>
+				
+				<listitem>
+					<para>
+						<command>map</command> — Swaps the numbers assigned to two hard drives. For example:
+					</para>
+<screen>map (hd0) (hd3)
+map (hd3) (hd0)</screen>
+					<para>
+						assigns the number <literal>0</literal> to the fourth hard drive, and the number <literal>3</literal> to the first hard drive. This option is especially useful if you configure your system with an option to boot a Windows operating system, becausehe Windows boot loader must find the Windows installation on the first hard drive.
+					</para>
+					<para>
+						For example, if your Windows installation is on the fourth hard drive, the following entry in <filename>grub.conf</filename> will allow the Windows boot loader to load Windows correctly:
+					</para>
+<screen>title Windows
+map (hd0) (hd3)
+map (hd3) (hd0)
+rootnoverify (hd3,0)
+chainloader +1
+</screen>
+				</listitem>
 
 				<listitem>
 					<para>
@@ -1061,6 +1102,10 @@ chainloader +1
 					<para>
 						<citetitle>Red Hat Enterprise Linux Deployment Guide</citetitle>; Red Hat, Inc. — The <citetitle>Workstation Security</citetitle> chapter explains, in a concise manner, how to secure the GRUB boot loader.
 					</para>
+					<para>
+					You can find the current version of the <citetitle>Red Hat Enterprise Linux Deployment Guide</citetitle> at <ulink url="http://www.redhat.com/docs/manuals/enterprise/"></ulink>. In the version of the book for Red Hat Enterprise Linux 5, the relevant section is <citetitle>43.1.2. BIOS and Boot Loader Security</citetitle>: <ulink url="
+					http://www.redhat.com/docs/en-US/Red_Hat_Enterprise_Linux/5/html/Deployment_Guide/ch-sec-network.html#s1-wstation-boot-sec"></ulink>.
+					</para>
 				</listitem>
 			</itemizedlist>
 		</section>
diff --git a/en-US/Key_Board_Configuration-x86.xml b/en-US/Key_Board_Configuration-x86.xml
index 7fc3517..cf874d3 100644
--- a/en-US/Key_Board_Configuration-x86.xml
+++ b/en-US/Key_Board_Configuration-x86.xml
@@ -30,6 +30,10 @@
 		</mediaobject>
 	</figure>
 	
+	<para>
+		Fedora includes support for more than one keyboard layout for many languages. In particular, most European languages include a <literal>latin1</literal> option, which uses <firstterm>dead keys</firstterm> to access certain characters, such as those with diacritical marks. When you press a dead key, nothing will appear on your screen until you press another key to "complete" the character. For example, to type <literal>Ã©</literal> on a latin1 keyboard layout, you would press (and release) the <keycap>'</keycap> key, and then press the <literal>E</literal> key. By contrast, you access this character on some other keyboards by pressing and holding down a key (such as <keycap>Alt-Gr</keycap>) while you press the <literal>E</literal> key. Other keyboards might have a dedicated key for this character.
+	</para>
+	
 	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Key_Board_Configuration_x86_ppc-para-2.xml"/>
 	<!-- Actually, despite the name, this is a tip. 
 	     
diff --git a/en-US/Steps_Hardware-x86.xml b/en-US/Steps_Hardware-x86.xml
index 6d268d5..6bd0d55 100644
--- a/en-US/Steps_Hardware-x86.xml
+++ b/en-US/Steps_Hardware-x86.xml
@@ -20,5 +20,10 @@
 	<para>
 		The most recent list of supported hardware can be found <!-- (RHEL) at: <ulink url="http://hardware.redhat.com/hcl/">http://hardware.redhat.com/hcl/</ulink> --> in the Release Notes for Fedora &PRODVER;, available at <ulink url="http://docs.fedoraproject.org/release-notes">http://docs.fedoraproject.org/release-notes</ulink> .  
 	</para>
+	<para>
+		At the end of a successful Fedora installation process, the installation program offers you the option to provide details of your hardware configuration anonymously to the Fedora Project (refer to <xref linkend="sn-smolt"/>). You can view the statistics gathered by this method at <ulink url="http://smolt.fedoraproject.org/static/stats/devices.html"></ulink>. Viewing the list of hardware that makes up systems on which other people have successfully installed Fedora might help you determine how suitable your hardware is. 
+	</para>
+	<xi:include href="Trouble_During_x86_ppc-para-3.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+	<xi:include href="Trouble_During_x86_ppc-screen-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 
 </section>
diff --git a/en-US/Trouble-x86.xml b/en-US/Trouble-x86.xml
index 9e3d137..4104aa8 100644
--- a/en-US/Trouble-x86.xml
+++ b/en-US/Trouble-x86.xml
@@ -113,7 +113,7 @@
 			<!-- There are some video cards that have trouble booting -->
 			
 			<para>
-				One possible solution is to try using the <command moreinfo="none">resolution=</command> boot option. This option may be most helpful for laptop users. Another solution to try is the <command>driver=</command> option to specify the driver that should be loaded for your video card. If this works, it should be reported as a bug as the installer has failed to autodetect your videocard. Refer to <xref linkend="ap-admin-options"/> for more information on boot options.
+				One possible solution is to use only a basic video driver during installation. You can do this either by selecting <guilabel>Install system with basic video driver</guilabel> on the boot menu, or using the <command moreinfo="none">xdriver=vesa</command> boot option at the boot prompt. Alternatively, you can force the installer to use a specific screen resolution with the <command moreinfo="none">resolution=</command> boot option. This option may be most helpful for laptop users. Another solution to try is the <command>driver=</command> option to specify the driver that should be loaded for your video card. If this works, you should report it as a bug, because the installer failed to detect your video card automatically. Refer to <xref linkend="ap-admin-options"/> for more information on boot options.
 			</para>
 			
 			<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Trouble_Begin_GUI-note-1.xml"/>
@@ -145,7 +145,7 @@
 		<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="X86_Trouble_After_Grub.xml"/>
 		<!-- Trouble With the Graphical GRUB Screen on an x86-based System? -->
 	
-		<section>
+		<section id="Trouble_After_Booting-GUI">
 			<!-- Booting into a Graphical Environment -->
 			
 			<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Trouble_After_Booting_GUI_x86_ppc-title-1.xml"/>
@@ -259,7 +259,7 @@
 		<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Trouble_After_Booting_Problems-Printer.xml"/>
 		<!-- Your Printer Does Not Work -->
 		
-		<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Trouble_After_Sound.xml"/>
+		<!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Trouble_After_Sound.xml"/> -->
 		<!-- Problems with Sound Configuration -->
 		
 		<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Trouble_After_Booting_Problems-Apache.xml"/>
diff --git a/en-US/Trouble_After_Booting_Problems_Login-para-1.xml b/en-US/Trouble_After_Booting_Problems_Login-para-1.xml
index a31e4a2..483ea83 100644
--- a/en-US/Trouble_After_Booting_Problems_Login-para-1.xml
+++ b/en-US/Trouble_After_Booting_Problems_Login-para-1.xml
@@ -3,5 +3,5 @@
 ]>
 
 <para>
-	If you did not create a user account in the <application>firstboot</application> screens, log in as root and use the password you assigned to root.
+	If you did not create a user account in the <application>firstboot</application> screens, switch to a console by pressing <keycombo><keycap>Ctrl</keycap><keycap>Alt</keycap><keycap>F2</keycap></keycombo>, log in as root and use the password you assigned to root.
 </para>
\ No newline at end of file
diff --git a/en-US/Trouble_After_Booting_X_Server_Non_Root.xml b/en-US/Trouble_After_Booting_X_Server_Non_Root.xml
index 1cfea39..3ca865a 100644
--- a/en-US/Trouble_After_Booting_X_Server_Non_Root.xml
+++ b/en-US/Trouble_After_Booting_X_Server_Non_Root.xml
@@ -13,7 +13,7 @@
 		<tertiary>X server crashes</tertiary>
 	</indexterm>
 	<para>
-		If you are having trouble with the X server crashing when anyone other than root logs in, you may have a full file system (or, a lack of available hard drive space).
+		If you are having trouble with the X server crashing when anyone logs in, you may have a full file system (or, a lack of available hard drive space).
 	</para>
 	
 	<para>
diff --git a/en-US/Trouble_After_Booting_X_Windows.xml b/en-US/Trouble_After_Booting_X_Windows.xml
index 4cc5052..334ce84 100644
--- a/en-US/Trouble_After_Booting_X_Windows.xml
+++ b/en-US/Trouble_After_Booting_X_Windows.xml
@@ -20,4 +20,7 @@
 	<para>
 		If you elect to upgrade, select the X Window System packages, and choose GNOME, KDE, or both, during the upgrade package selection process.
 	</para>
+	<para>
+		Refer to <xref linkend="sn-switching-to-gui-login"/> for more detail on installing a desktop environment. 
+	</para>
 </section>
\ No newline at end of file
diff --git a/en-US/Trouble_During-x86.xml b/en-US/Trouble_During-x86.xml
index 658360f..43a1b03 100644
--- a/en-US/Trouble_During-x86.xml
+++ b/en-US/Trouble_During-x86.xml
@@ -105,6 +105,8 @@
 			<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Trouble_During_common-other-partitioning-listitem-1.xml"/>
 
 			<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Trouble_During_common-other-partitioning-listitem-2.xml"/>
+			
+			<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Trouble_During_common-other-partitioning-listitem-3.xml"/>
 		</itemizedlist>
 		
 		<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Trouble_During_common-other-partitioning-tip-1.xml"/>
diff --git a/en-US/Trouble_During_common-other-partitioning-listitem-2.xml b/en-US/Trouble_During_common-other-partitioning-listitem-2.xml
index 6d84062..a71aa79 100644
--- a/en-US/Trouble_During_common-other-partitioning-listitem-2.xml
+++ b/en-US/Trouble_During_common-other-partitioning-listitem-2.xml
@@ -1,12 +1,9 @@
 <?xml version="1.0"?>
 <!DOCTYPE listitem PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
-	  
-	  
-	  
 ]>
 
 <listitem>
 	<para>
-		A <swap> partition of type swap
+		A <filename>/boot</filename> partition with a file system type that GRUB can read (for example ext3), if you chose ext4 or btrfs for <filename>/</filename> (root). 
 	</para>
-</listitem>
\ No newline at end of file
+</listitem>
diff --git a/en-US/Trouble_During_common-other-partitioning-listitem-3.xml b/en-US/Trouble_During_common-other-partitioning-listitem-3.xml
new file mode 100644
index 0000000..b23dadb
--- /dev/null
+++ b/en-US/Trouble_During_common-other-partitioning-listitem-3.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<!DOCTYPE listitem PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+	  
+	  
+	  
+]>
+
+<listitem>
+	<para>
+		A <swap> partition of type swap
+	</para>
+</listitem>
diff --git a/en-US/Upgrade-x86.xml b/en-US/Upgrade-x86.xml
index 011e9ad..db15902 100644
--- a/en-US/Upgrade-x86.xml
+++ b/en-US/Upgrade-x86.xml
@@ -18,6 +18,20 @@
 		<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Upgrade_common-section-2-title.xml"/>
 		<!-- Title: Upgrading Your System -->
 		
+		<para>
+			In most cases, the simplest way to upgrade an existing Fedora installation is with the <application>preupgrade</application> tool. When a new version of Fedora is available, <application>preupgrade</application> downloads the packages necessary to upgrade your installation, and initiates the upgrade process.
+		</para>
+		<para>
+			Install <application>preupgrade</application> with your graphical package manager, or type <command>yum install preupgrade</command> at the command line and press <keycap>Enter</keycap>. 
+		</para>
+		<para>
+			To run <application>preupgrade</application>, type <command>preupgrade</command> at the command line and press <keycap>Enter</keycap>. 
+		</para>
+
+		<para>
+			You can also upgrade a Fedora installation by starting the installation process by any of the methods described in <xref linkend="ch-guimode-x86"/>. If the installer detects a previous Fedora installation on the system, it will ask you whether you want to upgrade that installation — refer to <xref linkend="sn-upgrade-examine"/>
+		</para>
+		
 		<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Upgrade_common-section-2-para-1.xml"/>
 		<!-- The Upgrade Examine screen appears -->
 		
diff --git a/en-US/X86_Bootloader.xml b/en-US/X86_Bootloader.xml
index cd92ec6..907a42c 100644
--- a/en-US/X86_Bootloader.xml
+++ b/en-US/X86_Bootloader.xml
@@ -336,7 +336,7 @@
 		<itemizedlist>
 			<listitem>
 				<para>
-					Using the CD-ROM to boot an x86, AMD64, or <trademark class="registered">Intel</trademark> 64 system, type <userinput>linux rescue</userinput> at the installation boot prompt. <!-- (RHEL) Itanium users should type <userinput>elilo linux rescue</userinput> to enter rescue mode. -->
+					Boot an x86, AMD64, or <trademark class="registered">Intel</trademark> 64 system from any installation medium, such as CD, DVD, USB, or PXE, and type <userinput>linux rescue</userinput> at the installation boot prompt. <!-- (RHEL) Itanium users should type <userinput>elilo linux rescue</userinput> to enter rescue mode. --> Refer to <xref linkend="ap-rescuemode"/> for a more complete description of rescue mode.
 				</para>
 			</listitem>
 		</itemizedlist>
diff --git a/en-US/adminoptions.xml b/en-US/adminoptions.xml
index a657584..971bde2 100644
--- a/en-US/adminoptions.xml
+++ b/en-US/adminoptions.xml
@@ -188,7 +188,7 @@
       <para>
         To specify the installation method from the
         <prompt>boot:</prompt>
-        prompt, use the <option>method</option> option. Refer to
+        prompt, use the <option>repo</option> option. Refer to
         <xref linkend="tb-installmethods"/> for the supported
         installation methods.
       </para>    
@@ -205,23 +205,27 @@
 	  <tbody>
 	    <row>
 	      <entry>CD or DVD drive</entry>
-	      <entry><option>method=<replaceable>cdrom</replaceable></option></entry>
+	      <entry><option>repo=cdrom:<replaceable>device</replaceable></option></entry>
 	    </row>
 	    <row>
 	      <entry>Hard Drive</entry>
-	      <entry><option>method=<replaceable>hd://device/</replaceable></option></entry>
+	      <entry><option>repo=hd:<replaceable>device</replaceable>/<replaceable>path</replaceable></option></entry>
 	    </row>
 	    <row>
 	      <entry>HTTP Server</entry>
-	      <entry><option>method=<replaceable>http://server.mydomain.com/directory/</replaceable></option></entry>
+	      <entry><option>repo=http://<replaceable>host</replaceable>/<replaceable>path</replaceable></option></entry>
 	    </row>
 	    <row>
 	      <entry>FTP Server</entry>
-	      <entry><option>method=<replaceable>ftp://server.mydomain.com/directory/</replaceable></option></entry>
+	      <entry><option>repo=ftp://<replaceable>username</replaceable>:<replaceable>password</replaceable>@<replaceable>host</replaceable>/<replaceable>path</replaceable></option></entry>
 	    </row>
 	    <row>
 	      <entry>NFS Server</entry>
-	      <entry><option>method=<replaceable>nfs:server.mydomain.com:/directory/</replaceable></option></entry>
+	      <entry><option>repo=nfs:<replaceable>server</replaceable>:/<replaceable>path</replaceable></option></entry>
+	    </row>
+	    <row>
+	      <entry>ISO images on an NFS Server</entry>
+	      <entry><option>repo=nfsiso:<replaceable>server</replaceable>:/<replaceable>path</replaceable></option></entry>
 	    </row>
 	  </tbody>
 	</tgroup>
@@ -287,10 +291,9 @@
           <primary>VNC (Virtual Network Computing)</primary>
           <secondary>installing client</secondary>
         </indexterm>
-        Fedora includes <application>vncviewer</application>, the client
-        provided by the developers of VNC. To obtain
+        Fedora includes the VNC client <application>vncviewer</application>. To obtain
         <application>vncviewer</application>, install the
-        <filename>vnc</filename> package.
+        <package>tigervnc</package> package.
       </para>
     </note>
     <para>
@@ -908,16 +911,22 @@ Press <enter> for a shell</screen>
       </para>
 
       <para>
-        Fedora includes the <application>Memtest86</application>
+        Fedora includes the <application>Memtest86+</application>
 	memory testing application.  To boot your computer in
         <indexterm>
           <primary>memory testing mode</primary>
         </indexterm> memory testing mode, choose <guimenuitem>Memory
 	  test</guimenuitem> at the boot menu. The first test starts
-	immediately. By default, <application>Memtest86</application>
+	immediately. By default, <application>Memtest86+</application>
 	carries out a total of ten tests.
       </para>
-
+      
+	<para>
+		In most cases, a single successful pass with <application>Memtest86+</application> is sufficient to verify that your RAM is in good condition. In some rare circumstances, however, errors that went undetected on the first pass might appear on subsequent passes. To perform a thorough test of the RAM on an important system, leave <application>Memtest86+</application> running overnight or for a few days.
+	</para>
+	<para>
+		For more information on using <application>Memtest86+</application>, refer to the <citetitle>Memtest86+ FAQ</citetitle> available at <ulink url="http://forum.canardpc.com/showthread.php?t=28864"></ulink>.
+	</para>
       <para>
         To halt the tests and reboot your computer, enter
         <keycap>Esc</keycap> at any time.
diff --git a/en-US/beginninginstallation.xml b/en-US/beginninginstallation.xml
index 860a83a..7eaf73e 100644
--- a/en-US/beginninginstallation.xml
+++ b/en-US/beginninginstallation.xml
@@ -33,27 +33,11 @@
 	<para>Insert the media in your computer and turn it on.</para>
       </step>
     </procedure>
-    <para>You may need to press a specific key or combination of keys to
-      boot from the media, or configure your system's <firstterm>Basic
-	Input/Output System</firstterm>, or <acronym>BIOS</acronym>, to
-      boot from the media.  On most computers you must select the boot
-      or BIOS option promptly after turning on the computer.  Most
-      Windows-compatible computer systems use a special key such as
-      <keycap>F1</keycap>, <keycap>F2</keycap>, <keycap>F12</keycap>, or
-      <keycap>Del</keycap> to start the BIOS configuration menu.  On
-      Apple computers, the <keycap>C</keycap> key boots the system from
-      the DVD drive. On older Apple hardware you may need to  press <keycap>Cmd</keycap>
-+<keycap>Opt</keycap>+<keycap>Shift</keycap>+<keycap>Del</keycap> to 
-boot from DVD drive.</para>
-    <note>
-      <title>Configuring the BIOS</title>
-      <para>If you are not sure what capabilities your computer has, or
-	how to configure the BIOS, consult the documentation provided by
-	the manufacturer.  Detailed information on hardware
-	specifications and configuration is beyond the scope of this
-	document.</para>
-    </note>
-
+	<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>
diff --git a/en-US/ext4-and-btrfs.xml b/en-US/ext4-and-btrfs.xml
new file mode 100644
index 0000000..6db307d
--- /dev/null
+++ b/en-US/ext4-and-btrfs.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">
+
+<important>
+	<title>ext4 and Btrfs</title>
+		<para>
+			  The <application>GRUB</application> bootloader does not support the ext4 or Btrfs file systems. You cannot use an ext4 or btrfs partition for <filename>/boot</filename>.
+		</para>
+</important>
diff --git a/en-US/firstboot.xml b/en-US/firstboot.xml
index 308a24f..7322746 100644
--- a/en-US/firstboot.xml
+++ b/en-US/firstboot.xml
@@ -91,6 +91,17 @@
       <xref linkend="sn-account_configuration" /> for guidelines on selecting a
       secure password.
     </para>
+    <para>
+      To configure Fedora to use network services for authentication or
+      user information, select <guibutton>Use Network
+      Login...</guibutton>.
+    </para>
+    <important>
+      <title>Create at least one user account</title>
+      <para>
+      If you do not create at least one user account in this step, you will not be able to log in to the Fedora graphical environment. If you skipped this step during installation, refer to <xref linkend="Trouble_After_Booting-GUI"/>.
+      </para>
+    </important>
     <note>
       <title>Creating Extra User Accounts</title>
       <para>
@@ -101,11 +112,6 @@
         Groups</guimenuitem> </menuchoice>.
       </para>
     </note>
-    <para>
-      To configure Fedora to use network services for authentication or
-      user information, select <guibutton>Use Network
-      Login...</guibutton>.
-    </para>
   </section>
   
 <section id="sn-firstboot-datetime">
diff --git a/en-US/medialess.xml b/en-US/medialess.xml
index a425ccf..d79d3ee 100644
--- a/en-US/medialess.xml
+++ b/en-US/medialess.xml
@@ -4,18 +4,23 @@
 ]>
 
 <chapter id='ap-medialess-install'>
-  <title>Installing Without Media</title>
-  <para>This section discusses how to install Fedora to your system
-    without making any additional physical media.  Instead, you can use
-    your existing <application>GRUB</application> boot loader to start
-    the installation program.</para>
-  <important>
-    <title>Linux Required</title>
-    <para>This procedure assumes you are already using Fedora or
-      another relatively modern Linux distribution, and the
-      <application>GRUB</application> boot loader.  It also assumes you
-      are a somewhat experienced Linux user.</para>
-  </important>
+	<title>Installing Without Media</title>
+	<important>
+		<title>Linux Required</title>
+		<para>
+			This procedure assumes you are already using Fedora or another relatively modern Linux distribution, and the <application>GRUB</application> boot loader. It also assumes you are a somewhat experienced Linux user.
+		</para>
+	</important>
+	<note>
+		<title>Preupgrade</title>
+		<para>
+			If you have an earlier version of Fedora installed on your system, you might be able to upgrade to Fedora &PRODVER; without making additional physical media by using the <application>preupgrade</application> tool. Refer to <xref linkend="ch-upgrade-x86"/> for details of using <application>preupgrade</application>. 
+		</para>
+	</note>
+	<para>
+		This section discusses how to install Fedora to your system without making any additional physical media.  Instead, you can use your existing <application>GRUB</application> boot loader to start the installation program.
+	</para>
+
   <section id="sn-medialess-getting-files">
     <title>Retrieving Boot Files</title>
     <para>To perform an installation without media or a PXE server, your
@@ -45,7 +50,7 @@
 	      wish to install via the network, locate the desired
 	      release. In general, once you find a suitable mirror,
 	      browse to the
-	      <filename>releases/11/Fedora/<replaceable>arch</replaceable>/os/isolinux/</filename> 
+	      <filename>releases/&PRODVER;/Fedora/<replaceable>arch</replaceable>/os/isolinux/</filename> 
 	      folder.</para>
 	  </listitem>
 	</itemizedlist>
@@ -97,7 +102,7 @@
 	<para><option>ip=</option></para>
       </listitem>
       <listitem>
-	<para><option>method=</option></para>
+	<para><option>repo=</option></para>
       </listitem>
       <listitem>
 	<para><option>lang=</option></para>
diff --git a/en-US/networkconfig-fedora.xml b/en-US/networkconfig-fedora.xml
index 0014d4e..4ce0512 100644
--- a/en-US/networkconfig-fedora.xml
+++ b/en-US/networkconfig-fedora.xml
@@ -29,6 +29,10 @@
   <para>
 	  Setup prompts you to supply a host name and domain name for this computer, in the format <replaceable>hostname</replaceable>.<replaceable>domainname</replaceable>. Many networks have a  DHCP (Dynamic Host Configuration Protocol) service that automatically supplies connected systems with a domain name, leaving the user to enter a hostname.
   </para>
+  
+  <para>
+	  Unless you have a specific need to customize the host name and domain name, the default setting  <literal>localhost.localdomain</literal> is a good choice for most users.
+  </para>
 
     	<figure float="0" id="fig-networkconfig-fedora"><title>Setting the hostname</title>
 		<mediaobject>
diff --git a/en-US/nextsteps.xml b/en-US/nextsteps.xml
index 1cfbb28..99819da 100644
--- a/en-US/nextsteps.xml
+++ b/en-US/nextsteps.xml
@@ -147,6 +147,9 @@
       listing for your original system.  You can now use that listing to
       determine how to bring your new system close to the original
       system state.</para>
+	<para>
+		You can obtain a list of <firstterm>orphaned</firstterm> packages (that is, packages that are no longer in the repositories) from the <application>package-cleanup</application> tool. Install the <package>yum-utils</package> package and then run <command>package-cleanup --orphans</command>. The tool will show you orphaned packages and packages that are partially uninstalled but for which the <application>%postun</application> script failed.
+	</para>
     <para>Most software repository configurations are stored in packages
       that end with the term <literal>release</literal>.  Check the old
       package list for the repositories that were installed:</para>
diff --git a/en-US/pxe-server-manual.xml b/en-US/pxe-server-manual.xml
index 9b8deec..4af9a43 100644
--- a/en-US/pxe-server-manual.xml
+++ b/en-US/pxe-server-manual.xml
@@ -417,7 +417,9 @@ pxeboot -a -K <replaceable><kickstart></replaceable> -O <replaceable><o
 		<para>
 			For instructions on how to configure the network interface card with PXE support to boot from the network, consult the documentation for the NIC. It varies slightly per card.
 		</para>
-		 
+		<para>
+			If your NIC does not support PXE booting, you can still PXE boot your system by using the <application>gPXE</application> bootloader. The Fedora Project does not distribute <application>gPXE</application> — refer to the Etherboot Project website at <ulink url="http://etherboot.org/wiki/start"></ulink> for more information.
+		</para>
 		<para>
 			After the system boots the installation program, refer to the <xref linkend="ch-guimode-x86"/>.
 		</para>
diff --git a/en-US/upgrading-fedora.xml b/en-US/upgrading-fedora.xml
index 40ceb98..e2254c5 100644
--- a/en-US/upgrading-fedora.xml
+++ b/en-US/upgrading-fedora.xml
@@ -8,6 +8,13 @@
 <section id="sn-upgrading-system">
   <title>Upgrading an Existing System</title>
 
+	<note>
+		<title>Preupgrade</title>
+		<para>
+			Fedora includes <application>preupgrade</application>, a command-line tool that allows you to upgrade easily to a new version from within your existing Fedora installation. 
+		</para>
+	</note>
+
   <para>
     The installation system automatically detects any existing
     installation of Fedora.  The upgrade process updates the existing
@@ -19,6 +26,10 @@
     configuration file for you to examine later.
   </para>
 
+	<para>
+		Note that the installation medium that you are using might not contain all the software packages that you need to upgrade your computer. In particular, the Fedora live CD contains a relatively small subset of the packages available in Fedora. To update packages that are not included on the installation medium, make sure that you select the <literal>Fedora &PRODVER; - <replaceable>architecture</replaceable></literal> or the <literal>Fedora &PRODVER; - <replaceable>architecture</replaceable> - Updates</literal> repository the during package group selection — refer to <xref linkend="sn-additional-repos"/>.
+	</para>
+
   <section id="sn-upgrade-examine">
     <title>Upgrade Examine</title>
 
diff --git a/en-US/vnc_References_Chapter.xml b/en-US/vnc_References_Chapter.xml
index 78687d6..c7697ee 100644
--- a/en-US/vnc_References_Chapter.xml
+++ b/en-US/vnc_References_Chapter.xml
@@ -14,7 +14,7 @@
 
 		<listitem>
 			<para>
-				TightVNC: <ulink url="http://www.tightvnc.com/">http://www.tightvnc.com/</ulink>
+				TigerVNC: <ulink url="http://http://tigervnc.sourceforge.net/">http://tigervnc.sourceforge.net/</ulink>
 			</para>
 		</listitem>
 
diff --git a/en-US/vnc_Viewer_Chapter.xml b/en-US/vnc_Viewer_Chapter.xml
index 5a2aada..fc06b91 100644
--- a/en-US/vnc_Viewer_Chapter.xml
+++ b/en-US/vnc_Viewer_Chapter.xml
@@ -32,16 +32,11 @@
 	<itemizedlist>
 		<listitem>
 			<para>
-				<command>vncviewer</command> is available on
-				<application>Red Hat Enterprise
-				Linux</application> and <application>Fedora
-				Linux</application> by installing the
-				<filename>vnc</filename> package:
+				VNC clients are available in the repositories of most Linux distributions. Use your package manager to search for a client for your chosen distribution. For example, on Fedora, install the <!-- RHEL vnc --><package>tigervnc</package> package:
 			</para>
-
 			<para>
 				<screen>
-# <userinput>yum install vnc</userinput>
+# <userinput>yum install tigervnc</userinput><!-- RHEL vnc -->
 				</screen>
 			</para>
 		</listitem>



