[install-guide] for final commit of F16

Jack Reed jjr at fedoraproject.org
Tue Nov 8 04:54:25 UTC 2011


commit b624f130f5e073b5d7601a001fec557130b1a7d0
Author: Jack Reed <jreed at redhat.com>
Date:   Tue Nov 8 14:53:37 2011 +1000

    for final commit of F16

 en-US/.directory                                   |    5 +
 en-US/Advice_on_Partitions.xml                     |    6 -
 en-US/Boot_Init_Shutdown.xml                       |    6 +-
 en-US/Create_Storage-x86.xml                       |    5 +-
 en-US/DiskEncryptionUserGuide.xml                  |    3 +-
 .../Disk_Partitioning_Scheme_common-listitem-2.xml |   14 ++
 en-US/Disk_Partitioning_X86_Partitions.xml         |   11 ++-
 en-US/Grub.xml                                     |  132 +++++++++-----------
 en-US/Important_BIOS_boot_partition.xml            |   12 ++
 en-US/Important_single_iso.xml                     |   12 ++
 en-US/Kickstart2.xml                               |   40 +++----
 en-US/Ksconfig.xml                                 |    7 +-
 en-US/Making_USB_media.xml                         |   10 +-
 en-US/Netboot_DHCP.xml                             |    9 ++-
 en-US/Rescue_Mode.xml                              |    6 +-
 en-US/Rescuemode_Drivers.xml                       |   14 +-
 en-US/Steps_Hd_Install-x86.xml                     |   19 ++--
 en-US/Steps_Hd_Install_common-para-6.xml           |    2 +-
 ...eps_Network_Install_section_2-common-para-1.xml |    2 +-
 en-US/Steps_Network_Install_x86_section_2.xml      |   12 +-
 en-US/TUI-x86.xml                                  |    3 +
 en-US/Trouble_After_Ram.xml                        |   91 ++++++++------
 en-US/Upgrade_common-section-1.xml                 |   12 +-
 en-US/X86_Bootloader.xml                           |   20 +++-
 en-US/X86_Trouble_After_Grub.xml                   |   21 +++-
 en-US/X86_Uninstall-Linux-bootloader.xml           |   28 +++--
 en-US/adminoptions.xml                             |   36 +-----
 en-US/expert-quickstart.xml                        |    5 +-
 en-US/firstboot.xml                                |   21 +++
 .../images/firstboot/fb-createuser-usermanager.png |  Bin 0 -> 26854 bytes
 en-US/images/firstboot/fb-createuser.png           |  Bin 35676 -> 37344 bytes
 en-US/medialess.xml                                |   26 +++--
 en-US/new-users.xml                                |   20 ++-
 en-US/nextsteps.xml                                |   28 +---
 en-US/pxe-server.xml                               |   10 ++-
 en-US/vnc_Installation_Chapter.xml                 |    8 +-
 en-US/vnc_Modes_Chapter.xml                        |    6 +-
 37 files changed, 377 insertions(+), 285 deletions(-)
---
diff --git a/en-US/.directory b/en-US/.directory
new file mode 100644
index 0000000..8d9770e
--- /dev/null
+++ b/en-US/.directory
@@ -0,0 +1,5 @@
+[Dolphin]
+AdditionalInfoV2=Details_Size,Details_Date,CustomizedDetails
+Timestamp=2011,10,19,9,55,15
+Version=2
+ViewMode=1
diff --git a/en-US/Advice_on_Partitions.xml b/en-US/Advice_on_Partitions.xml
index 659fb7b..1a2d313 100644
--- a/en-US/Advice_on_Partitions.xml
+++ b/en-US/Advice_on_Partitions.xml
@@ -9,12 +9,6 @@
 		Optimal partition setup depends on the usage for the Linux system in question. The following tips may help you decide how to allocate your disk space.
 	</para>
 	 <itemizedlist>
-		<listitem>
-			<para>
-				If you expect that you or other users will store data on the system, create a separate partition for the <filename>/home</filename> directory within a volume group. With a separate <filename>/home</filename> partition, you may upgrade or reinstall Fedora without erasing user data files.
-			</para>
-
-		</listitem>
 		 <listitem>
 			<para>
 				Consider encrypting any partitions that might contain sensitive data. Encryption prevents unauthorized people from accessing the data on the partitions, even if they have access to the physical storage device. In most cases, you should at least encrypt the <filename>/home</filename> partition.
diff --git a/en-US/Boot_Init_Shutdown.xml b/en-US/Boot_Init_Shutdown.xml
index bae2ad6..5713bee 100644
--- a/en-US/Boot_Init_Shutdown.xml
+++ b/en-US/Boot_Init_Shutdown.xml
@@ -188,7 +188,7 @@
 					GRUB has the advantage of being able to read ext2, ext3, and ext4 <footnote> <para>
 						GRUB reads ext3 and ext4 file systems as ext2, disregarding the journal file.
 					</para>
-				</footnote> partitions and load its configuration file &mdash; <filename>/boot/grub/grub.conf</filename> (for BIOS) or <filename>/boot/efi/EFI/redhat/grub.conf</filename> (for UEFI) &mdash; at boot time. Refer to <xref linkend="s1-grub-configfile" /> for information on how to edit this file.
+				</footnote> partitions and load its configuration file &mdash; <filename>/boot/grub2/grub.cfg</filename> (for BIOS) or <filename>/boot/efi/EFI/redhat/grub.cfg</filename> (for UEFI) &mdash; at boot time. Refer to <xref linkend="s1-grub-configfile" /> for information on how to edit this file.
 				</para>
 				<important>
 					<title>Important — Supported file systems</title>
@@ -207,7 +207,7 @@
 					For instructions on using the boot loader to supply command line arguments to the kernel, refer to <xref linkend="ch-grub" />. For information on changing the runlevel at the boot loader prompt, refer <xref linkend="s1-grub-runlevels" />.
 				</para>
 				<para>
-					The boot loader then places one or more appropriate <firstterm>initramfs</firstterm> images into memory. Next, the kernel decompresses these images from memory to <filename>/sysroot/</filename>, a RAM-based virtual file system, via <command>cpio</command>. The <filename>initramfs</filename> is used by the kernel to load drivers and modules necessary to boot the system. This is particularly important if SCSI hard drives are present or if the systems use the ext3 or ext4 file system.
+					The boot loader then places one or more appropriate <filename>initramfs</filename> images into memory. The <filename>initramfs</filename> is used by the kernel to load drivers and modules necessary to boot the system. This is particularly important if SCSI hard drives are present or if the systems use the ext3 or ext4 file system.
 				</para>
 				<para>
 					Once the kernel and the <filename>initramfs</filename> image(s) are loaded into memory, the boot loader hands control of the boot process to the kernel.
@@ -243,7 +243,7 @@
 
 			</indexterm>
 			 <para>
-				When the kernel is loaded, it immediately initializes and configures the computer's memory and configures the various hardware attached to the system, including all processors, I/O subsystems, and storage devices. It then looks for the compressed <filename>initramfs</filename> image(s) in a predetermined location in memory, decompresses it directly to <filename>/sysroot/</filename>, and loads all necessary drivers. Next, it initializes virtual devices related to the file system, such as LVM or software RAID, before completing the <filename>initramfs</filename> processes and freeing up all the memory the disk image once occupied.
+				When the kernel is loaded, it immediately initializes and configures the computer's memory and configures the various hardware attached to the system, including all processors, I/O subsystems, and storage devices. It then looks for the compressed <filename>initramfs</filename> image(s) in a predetermined location in memory, decompresses it directly to <filename>/sysroot/</filename> via <command>cpio</command>, and loads all necessary drivers. Next, it initializes virtual devices related to the file system, such as LVM or software RAID, before completing the <filename>initramfs</filename> processes and freeing up all the memory the disk image once occupied.
 			</para>
 			 <para>
 				The kernel then creates a root device, mounts the root partition read-only, and frees any unused memory.
diff --git a/en-US/Create_Storage-x86.xml b/en-US/Create_Storage-x86.xml
index 15d773d..5524471 100644
--- a/en-US/Create_Storage-x86.xml
+++ b/en-US/Create_Storage-x86.xml
@@ -5,7 +5,10 @@
 ]>
 <section id="Create_Storage-x86">
 	<xi:include href="Create_Storage-common-title-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-	 <!--  Create Storage  --> <xi:include href="Create_Storage-common-para-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+	 <!--  Create Storage  --> 
+	  <xi:include href="Important_BIOS_boot_partition.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+	 <!--  Important — non-EFI x86 systems need a BIOS boot partition --> 
+	 <xi:include href="Create_Storage-common-para-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
 	 <!--  The Create Storage dialog allows you to create new storage partitions  --> <xi:include href="Create_Storage-common-figure-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
 	 <!--  Creating Storage  --> <xi:include href="Create_Storage-common-para-2.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
 	 <!--  Options are grouped under Create Partition, Create Software RAID and Create LVM as follows  --> <itemizedlist>
diff --git a/en-US/DiskEncryptionUserGuide.xml b/en-US/DiskEncryptionUserGuide.xml
index 5ed3b46..f0b0564 100644
--- a/en-US/DiskEncryptionUserGuide.xml
+++ b/en-US/DiskEncryptionUserGuide.xml
@@ -309,7 +309,7 @@
 	 <section>
 		<title>Creating Encrypted Block Devices on the Installed System After Installation </title>
 		 <para>
-			Encrypted block devices can be created and configured after installation.
+		      Encrypted block devices can be created and configured after installation, using either the following method or <application>Disk Utility</application>.
 		</para>
 		 <section>
 			<title>Create the block devices </title>
@@ -369,7 +369,6 @@
 <programlisting>cryptsetup luksFormat &lt;device&gt;</programlisting>
 			 <para>
 				<note>
-					<title>Tip</title>
 					 <para>
 						For more information, read the <command>cryptsetup(8)</command> man page.
 					</para>
diff --git a/en-US/Disk_Partitioning_Scheme_common-listitem-2.xml b/en-US/Disk_Partitioning_Scheme_common-listitem-2.xml
new file mode 100644
index 0000000..15e59f1
--- /dev/null
+++ b/en-US/Disk_Partitioning_Scheme_common-listitem-2.xml
@@ -0,0 +1,14 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE listitem PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "Installation_Guide.ent">
+%BOOK_ENTITIES;
+]>
+<listitem>
+	<formalpara>
+		<title>A <filename>home</filename> partition (at least 100 MB)</title>
+		 <para>
+			To store user data separately from system data, create a dedicated partition within a volume group for the <filename>/home</filename> directory. This will enable you to upgrade or reinstall Fedora without erasing user data files.
+		</para>
+	</formalpara>
+</listitem>
+
diff --git a/en-US/Disk_Partitioning_X86_Partitions.xml b/en-US/Disk_Partitioning_X86_Partitions.xml
index 7988e06..d0b5603 100644
--- a/en-US/Disk_Partitioning_X86_Partitions.xml
+++ b/en-US/Disk_Partitioning_X86_Partitions.xml
@@ -27,6 +27,12 @@
 			</para>
 
 		</listitem>
+		<listitem>
+			<para>
+				A <filename class="partition">/home</filename> partition
+			</para>
+
+		</listitem>
 
 	</itemizedlist>
 	 <itemizedlist>
@@ -58,9 +64,12 @@
 		 <!--  A root partition (500 MB - 5.0 GB) - this is where / (the root directory) is
 		     and
 		A 500MB partition allows you to install...  -->
+		<xi:include href="Disk_Partitioning_Scheme_common-listitem-2.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+		 <!--  A home partition (at least 100MB) - 
+		   A separate partition for the /home directory within a volume group -->
 	</itemizedlist>
 	 <para>
-		Many systems have more partitions than the minimum listed above. Choose partitions based on your particular system needs. For example, consider creating a separate <filename class="partition">/home</filename> partition on systems that store user data. Refer to <xref linkend="sn-partitioning-advice" /> for more information.
+		Many systems have more partitions than the minimum listed above. Choose partitions based on your particular system needs. Refer to <xref linkend="sn-partitioning-advice" /> for more information.
 	</para>
 	 <para>
 		If you create many partitions instead of one large <filename class="partition">/</filename> partition, upgrades become easier. Refer to the description of the Edit option in <xref linkend="s1-diskpartitioning-x86" /> for more information.
diff --git a/en-US/Grub.xml b/en-US/Grub.xml
index ac9c91f..3c96ac8 100644
--- a/en-US/Grub.xml
+++ b/en-US/Grub.xml
@@ -160,41 +160,54 @@
 				This section describes the specific role GRUB plays when booting a BIOS-based x86 system. For a look at the overall boot process, refer to <xref linkend="s1-boot-init-shutdown-process" />.
 			</para>
 			 <para>
-				GRUB loads itself into memory in the following stages:
+				GRUB consists of the following images:
 			</para>
-			 <orderedlist continuation="restarts" inheritnum="ignore">
+			 <itemizedlist>
 				<listitem>
 					<para>
-						<emphasis>The Stage 1 or primary boot loader is read into memory by the BIOS from the MBR <footnote> <para>
+						<filename>boot.img</filename>: the first image to load in GRUB on BIOS-based x86 systems, which is written to either a master boot record (MBR) or the boot sector of a    partition.<footnote> <para>
 							For more on the system BIOS and the MBR, refer to <xref linkend="s2-boot-init-shutdown-bios" />.
 						</para>
-						 </footnote>.</emphasis> The primary boot loader exists on less than 512 bytes of disk space within the MBR and is capable of loading either the Stage 1.5 or Stage 2 boot loader.
+						 </footnote>.Because a PC boot sector is 512 bytes, the size of this image is exactly 512 bytes. 
 					</para>
 					<para>
-						BIOS cannot read partition tables or file systems. It initializes the hardware, reads the MBR, then depends entirely on the stage 1 bootloader to continue the boot process. 
+						BIOS cannot read partition tables or file systems. It initializes the hardware, reads the MBR, then depends entirely on <filename>boot.img</filename> to continue the boot process. This image is similar to Stage 1 in GRUB Legacy.
 					</para>
 
 				</listitem>
 				 <listitem>
 					<para>
-						<emphasis>The Stage 1.5 boot loader is read into memory by the Stage 1 boot loader, if necessary.</emphasis> Some hardware requires an intermediate step to get to the Stage 2 boot loader. This is sometimes true when the <filename>/boot/</filename> partition is above the 1024 cylinder head of the hard drive or when using LBA mode. The Stage 1.5 boot loader is found either on the <filename>/boot/</filename> partition or on a small part of the MBR and the <filename>/boot/</filename> partition.
+						<filename>diskboot.img</filename>: the first sector of the core image once the system boots from a hard disk. It reads the remaining parts of the core image to memory before initializing the kernel. 
 					</para>
 
 				</listitem>
 				 <listitem>
 					<para>
-						<emphasis>The Stage 2 or secondary boot loader is read into memory.</emphasis> The secondary boot loader displays the GRUB menu and command environment. This interface allows the user to select which kernel or operating system to boot, pass arguments to the kernel, or look at system parameters.
+						<filename>cdboot.img</filename>: the first sector of the core image once the system is booted from a CD-ROM drive, similar to <filename>diskboot.img</filename>.
+					</para>
+
+				</listitem>
+				<listitem>
+					<para>
+						<filename>core.img</filename>: GRUB's core image, built dynamically by the <application>grub-mkimage</application> program using the kernel image and a list of modules. It typically has sufficent modules to access <filename>/boot/grub2</filename>, and loads the rest from the file system at run-time.
 					</para>
 
 				</listitem>
+
 				 <listitem>
 					<para>
-						<emphasis>The secondary boot loader reads the operating system or kernel as well as the contents of <filename>/boot/sysroot/</filename> into memory.</emphasis> Once GRUB determines which operating system or kernel to start, it loads it into memory and transfers control of the machine to that operating system.
+						<filename>kernel.img</filename>: the location of GRUB's basic run-time functions. Although built into all core images, it is rarely used directly. 
 					</para>
 
 				</listitem>
+				<listitem>
+					<para>
+						<filename>*.mod</filename>: the remainder of GRUB is located in dynamically loadable modules. These modules load automatically or are built into the core image if they are    essential, or can be initialized manually by the <command>insmod</command> command.
+					</para>
 
-			</orderedlist>
+				</listitem>
+
+			</itemizedlist>
 			 <para>
 				The method used to boot Linux is called <firstterm>direct loading</firstterm> because the boot loader loads the operating system directly. There is no intermediary between the boot loader and the kernel.
 			</para>
@@ -289,7 +302,7 @@
 				</listitem>
 				 <listitem>
 					<para>
-						<emphasis>GRUB can read ext2 partitions.</emphasis> This functionality allows GRUB to access its configuration file, <filename>/boot/grub/grub.conf</filename>, every time the system boots, eliminating the need for the user to write a new version of the first stage boot loader to the MBR when configuration changes are made. The only time a user needs to reinstall GRUB on the MBR is if the physical location of the <filename>/boot/</filename> partition is moved on the disk. For details on installing GRUB to the MBR, refer to <xref linkend="s1-grub-installing" />.
+						<emphasis>GRUB can read ext2 partitions.</emphasis> This functionality allows GRUB to access its configuration file, <filename>/boot/grub2/grub.cfg</filename>, every time the system boots, eliminating the need for the user to write a new version of the first stage boot loader to the MBR when configuration changes are made. The only time a user needs to reinstall GRUB on the MBR is if the physical location of the <filename>/boot/</filename> partition is moved on the disk. For details on installing GRUB to the MBR, refer to <xref linkend="s1-grub-installing" />.
 					</para>
 
 				</listitem>
@@ -315,11 +328,11 @@
 			Before installing GRUB, make sure to use the latest GRUB package available or use the GRUB package from the installation DVD. For instructions on installing packages, refer to the chapter titled <citetitle>Package Management with RPM</citetitle> in the <citetitle>Fedora Deployment Guide</citetitle>.
 		</para>
 		 <para>
-			Once the GRUB package is installed, open a root shell prompt and run the command <command>/sbin/grub-install <replaceable>&lt;location&gt;</replaceable></command>, where <replaceable>&lt;location&gt;</replaceable> is the location that the GRUB Stage 1 boot loader should be installed. For example, the following command installs GRUB to the MBR of the master IDE device on the primary IDE bus:
+			Once the GRUB package is installed, open a root shell prompt and run the command <command>grub-install <replaceable>&lt;location&gt;</replaceable></command>, where <replaceable>&lt;location&gt;</replaceable> is the location that the GRUB Stage 1 boot loader should be installed. For example, the following command installs GRUB to the MBR of the master IDE device on the primary IDE bus:
 		</para>
 		
 <screen>
-<command>/sbin/grub-install /dev/hda</command></screen>
+<command>grub-install /dev/hda</command></screen>
 		 <para>
 			The next time the system boots, the GRUB graphical boot loader menu appears before the kernel loads into memory.
 		</para>
@@ -375,7 +388,7 @@
 				The <replaceable>&lt;bios-device-number&gt;</replaceable> is the BIOS device number. The primary IDE hard drive is numbered <command>0</command> and a secondary IDE hard drive is numbered <command>1</command>. This syntax is roughly equivalent to that used for devices by the kernel. For example, the <command>a</command> in <command>hda</command> for the kernel is analogous to the <command>0</command> in <command>hd0</command> for GRUB, the <command>b</command> in <command>hdb</command> is analogous to the <command>1</command> in <command>hd1</command>, and so on.
 			</para>
 			 <para>
-				The <replaceable>&lt;partition-number&gt;</replaceable> specifies the number of a partition on a device. Like the <replaceable>&lt;bios-device-number&gt;</replaceable>, most types of partitions are numbered starting at <command>0</command>. However, BSD partitions are specified using letters, with <command>a</command> corresponding to <command>0</command>, <command>b</command> corresponding to <command>1</command>, and so on.
+				The <replaceable>&lt;partition-number&gt;</replaceable> specifies the number of a partition on a device. Unlike the <replaceable>&lt;bios-device-number&gt;</replaceable>, most types of partitions are numbered starting at <command>1</command>. However, BSD partitions are specified using letters, with <command>a</command> corresponding to <command>1</command>, <command>b</command> corresponding to <command>2</command>, and so on.
 			</para>
 			 <note>
 				<title>Note</title>
@@ -384,8 +397,15 @@
 				</para>
 
 			</note>
+			<important>
+				<title>GRUB2 features new partition numbering</title>
+				 <para>
+				      Fedora &PRODVER; incorporates GRUB2, which numbers partitions and devices differently. Instead of 0, partition numbering begins at 1. However, device numbering still begins at 0. 
+				</para>
+
+			</important>
 			 <para>
-				To give an example, if a system has more than one hard drive, GRUB refers to the first hard drive as <command>(hd0)</command> and the second as <command>(hd1)</command>. Likewise, GRUB refers to the first partition on the first drive as <command>(hd0,0)</command> and the third partition on the second hard drive as <command>(hd1,2)</command>.
+				To give an example, if a system has more than one hard drive, GRUB refers to the first hard drive as <command>(hd0)</command> and the second as <command>(hd1)</command>. Likewise, GRUB refers to the first partition on the first drive as <command>(hd1,1)</command> and the third partition on the second hard drive as <command>(hd2,3)</command>.
 			</para>
 			 <para>
 				In general the following rules apply when naming devices and partitions under GRUB:
@@ -451,7 +471,7 @@
 			</para>
 			
 <screen>
-<command>(hd0,0)+1</command></screen>
+<command>(hd1,1)+1</command></screen>
 			 <para>
 				The following shows the <command>chainloader</command> command with a similar blocklist designation at the GRUB command line after setting the correct device and partition as root:
 			</para>
@@ -473,13 +493,13 @@
 				The use of the term <emphasis>root file system</emphasis> has a different meaning in regard to GRUB. It is important to remember that GRUB's root file system has nothing to do with the Linux root file system.
 			</para>
 			 <para>
-				The GRUB root file system is the top level of the specified device. For example, the image file <command>(hd0,0)/grub/splash.xpm.gz</command> is located within the <filename>/grub/</filename> directory at the top-level (or root) of the <command>(hd0,0)</command> partition (which is actually the <filename>/boot/</filename> partition for the system).
+				The GRUB root file system is the top level of the specified device. For example, the image file <command>(hd1,1)/grub/splash.xpm.gz</command> is located within the <filename>/grub/</filename> directory at the top-level (or root) of the <command>(hd1,1)</command> partition (which is actually the <filename>/boot/</filename> partition for the system).
 			</para>
 			 <para>
-				Next, the <command>kernel</command> command is executed with the location of the kernel file as an option. Once the Linux kernel boots, it sets up the root file system that Linux users are familiar with. The original GRUB root file system and its mounts are forgotten; they only existed to boot the kernel file.
+				Next, the <command>linux</command> command is executed with the location of the kernel file as an option. Once the Linux kernel boots, it sets up the root file system that Linux users are familiar with. The original GRUB root file system and its mounts are forgotten; they only existed to boot the kernel file.
 			</para>
 			 <para>
-				Refer to the <command>root</command> and <command>kernel</command> commands in <xref linkend="s1-grub-commands" /> for more information.
+				Refer to the <command>root</command> and <command>linux</command> commands in <xref linkend="s1-grub-commands" /> for more information.
 			</para>
 
 		</section>
@@ -667,7 +687,7 @@
 				 <itemizedlist>
 					<listitem>
 						<para>
-							<command><replaceable>&lt;stage-1&gt;</replaceable></command> &mdash; Signifies a device, partition, and file where the first boot loader image can be found, such as <command>(hd0,0)/grub/stage1</command>.
+							<command><replaceable>&lt;stage-1&gt;</replaceable></command> &mdash; Signifies a device, partition, and file where the first boot loader image can be found, such as <command>(hd1,1)/grub/stage1</command>.
 						</para>
 
 					</listitem>
@@ -679,7 +699,7 @@
 					</listitem>
 					 <listitem>
 						<para>
-							<command><replaceable>&lt;stage-2&gt;</replaceable></command> &mdash; Passes the stage 2 boot loader location to the stage 1 boot loader, such as <command>(hd0,0)/grub/stage2</command>.
+							<command><replaceable>&lt;stage-2&gt;</replaceable></command> &mdash; Passes the stage 2 boot loader location to the stage 1 boot loader, such as <command>(hd1,1)/grub/stage2</command>.
 						</para>
 
 					</listitem>
@@ -702,14 +722,14 @@
 			</listitem>
 			 <listitem>
 				<para>
-					<command>kernel <replaceable>&lt;/path/to/kernel&gt;</replaceable> <replaceable>&lt;option-1&gt;</replaceable> <replaceable>&lt;option-N&gt;</replaceable></command> ... &mdash; Specifies the kernel file to load when booting the operating system. Replace <replaceable>&lt;/path/to/kernel&gt;</replaceable> with an absolute path from the partition specified by the root command. Replace <replaceable>&lt;option-1&gt;</replaceable> with options for the Linux kernel, such as <command>root=/dev/VolGroup00/LogVol00</command> to specify the device on which the root partition for the system is located. Multiple options can be passed to the kernel in a space separated list.
+					<command>linux <replaceable>&lt;/path/to/linux&gt;</replaceable> <replaceable>&lt;option-1&gt;</replaceable> <replaceable>&lt;option-N&gt;</replaceable></command> ... &mdash; Specifies the kernel file to load when booting the operating system. Replace <replaceable>&lt;/path/to/linux&gt;</replaceable> with an absolute path from the partition specified by the root command. Replace <replaceable>&lt;option-1&gt;</replaceable> with options for the Linux kernel, such as <command>set root=/dev/VolGroup00/LogVol00</command> to specify the device on which the root partition for the system is located. Multiple options can be passed to the kernel in a space separated list.
 				</para>
 				 <para>
 					The following is an example <command>kernel</command> command:
 				</para>
 				
 <screen>
-<command>kernel /vmlinuz-2.6.8-1.523 ro root=/dev/VolGroup00/LogVol00</command></screen>
+<command>linux /vmlinuz-2.6.8-1.523 ro root=/dev/VolGroup00/LogVol00</command></screen>
 				 <para>
 					The option in the previous example specifies that the root file system for Linux is located on the <command>hda5</command> partition.
 				</para>
@@ -717,20 +737,14 @@
 			</listitem>
 			 <listitem>
 				<para>
-					<command>root (<replaceable>&lt;device-type&gt;</replaceable><replaceable>&lt;device-number&gt;</replaceable>,<replaceable>&lt;partition&gt;</replaceable>)</command> &mdash; Configures the root partition for GRUB, such as <command>(hd0,0)</command>, and mounts the partition.
+					<command>set root=(<replaceable>&lt;device-type&gt;</replaceable><replaceable>&lt;device-number&gt;</replaceable>,<replaceable>&lt;partition&gt;</replaceable>)</command> &mdash; Configures the root partition for GRUB, such as <command>(hd1,1)</command>, and mounts the partition.
 				</para>
 				 <para>
 					The following is an example <command>root</command> command:
 				</para>
 				
 <screen>
-<command>root (hd0,0)</command></screen>
-
-			</listitem>
-			 <listitem>
-				<para>
-					<command>rootnoverify (<replaceable>&lt;device-type&gt;</replaceable><replaceable>&lt;device-number&gt;</replaceable>,<replaceable>&lt;partition&gt;</replaceable>)</command> &mdash; Configures the root partition for GRUB, just like the <command>root</command> command, but does not mount the partition.
-				</para>
+<command>set root=(hd0,0)</command></screen>
 
 			</listitem>
 
@@ -749,7 +763,7 @@
 
 		</indexterm>
 		 <para>
-			The configuration file (<filename>/boot/grub/grub.conf</filename>), which is used to create the list of operating systems to boot in GRUB's menu interface, essentially allows the user to select a pre-set group of commands to execute. The commands given in <xref linkend="s1-grub-commands" /> can be used, as well as some special commands that are only available in the configuration file.
+		   The configuration file (<filename>/boot/grub2/grub.cfg</filename>), which is used to create the list of operating systems to boot in GRUB's menu interface, essentially allows the user to select a pre-set group of commands to execute. The commands given in <xref linkend="s1-grub-commands" /> can be used, as well as some special commands that are only available in the configuration file. Changes to <filename>grub.cfg</filename> are enacted by editing <filename>etc/default/grub</filename> and files in the <filename>etc/grub.d</filename> directory, particularly <filename>10_linux</filename> and <filename>40_custom</filename>, and then running the <command>grub2-mkconfig</command> command with root privileges.
 		</para>
 		 <section id="s2-grub-configfile-structure">
 			<title>Configuration File Structure</title>
@@ -771,36 +785,19 @@
 
 			</indexterm>
 			 <para>
-				The GRUB menu interface configuration file is <filename>/boot/grub/grub.conf</filename>. The commands to set the global preferences for the menu interface are placed at the top of the file, followed by stanzas for each operating kernel or operating system listed in the menu.
+			   The GRUB menu interface configuration file is <filename>/boot/grub2/grub.cfg</filename>.The commands to set the global preferences for the menu interface are placed at the top of the file, followed by stanzas for each operating kernel or operating system listed in the menu.
 			</para>
 			 <para>
-				The following is a very basic GRUB menu configuration file designed to boot either Fedora or Microsoft Windows Vista:
+				The following is a very basic GRUB menu configuration file designed to boot Fedora:
 			</para>
 			
-<screen>default=0 
-timeout=10 
-splashimage=(hd0,0)/grub/splash.xpm.gz 
-hiddenmenu 
-title Fedora (2.6.27.19-170.2.35.fc10.i686)
-root (hd0,1)
-kernel /vmlinuz-2.6.27.19-170.2.35.fc10.i686 ro root=UUID=04a07c13-e6bf-6d5a-b207-002689545705 rhgb quiet
-initrd /initrd-2.6.27.19-170.2.35.fc10.i686.img 
-
-# section to load Windows 
-title Windows         
-rootnoverify (hd0,0)         
-chainloader +1
+<screen>
+menuentry 'Fedora Linux, with Linux 3.1.0-0.rc6.git0.3.fc16.x86_64'
+set root='(hd0,1)'
+linux /vmlinuz-2.6.27.19-170.2.35.fc10.i686 ro root=UUID=04a07c13-e6bf-6d5a-b207-002689545705 rhgb quiet
+initrd /initramfs-3.1.0-0.rc6.git0.3.fc16.x86_64.img
 </screen>
-			 <para>
-				This file configures GRUB to build a menu with Fedora as the default operating system and sets it to autoboot after 10 seconds. Two sections are given, one for each operating system entry, with commands specific to the system disk partition table.
-			</para>
-			 <note>
-				<title>Note</title>
-				 <para>
-					Note that the default is specified as an integer. This refers to the first <command>title</command> line in the GRUB configuration file. For the <command>Windows</command> section to be set as the default in the previous example, change the <command>default=0</command> to <command>default=1</command>.
-				</para>
 
-			</note>
 			 <para>
 				Configuring a GRUB menu configuration file to boot multiple operating systems is beyond the scope of this chapter. Consult <xref linkend="s1-grub-additional-resources" /> for a list of additional resources.
 			</para>
@@ -860,7 +857,7 @@ chainloader +1
 				</listitem>
 				 <listitem>
 					<para>
-						<command>kernel <replaceable>&lt;/path/to/kernel&gt;</replaceable> <replaceable>&lt;option-1&gt;</replaceable> <replaceable>&lt;option-N&gt;</replaceable></command> &mdash; Specifies the kernel file to load when booting the operating system. Replace <replaceable>&lt;/path/to/kernel&gt;</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.
+						<command>linux <replaceable>&lt;/path/to/linux&gt;</replaceable> <replaceable>&lt;option-1&gt;</replaceable> <replaceable>&lt;option-N&gt;</replaceable></command> &mdash; Specifies the kernel file to load when booting the operating system. Replace <replaceable>&lt;/path/to/linux&gt;</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: 
@@ -917,36 +914,37 @@ chainloader +1
 </screen>
 
 				</listitem>
-				 <listitem>
+				<listitem>
 					<para>
-						<command>root (<replaceable>&lt;device-type&gt;</replaceable><replaceable>&lt;device-number&gt;</replaceable>,<replaceable>&lt;partition&gt;</replaceable>)</command> &mdash; Configures the root partition for GRUB, such as <command>(hd0,0)</command>, and mounts the partition.
+						<command>menuentry <replaceable>"title"</replaceable></command> &mdash; Specifies a title to be used with a particular group of commands used to load a kernel or operating system.
 					</para>
 
 				</listitem>
 				 <listitem>
 					<para>
-						<command>rootnoverify (<replaceable>&lt;device-type&gt;</replaceable><replaceable>&lt;device-number&gt;</replaceable>,<replaceable>&lt;partition&gt;</replaceable>)</command> &mdash; Configures the root partition for GRUB, just like the <command>root</command> command, but does not mount the partition.
+						<command>root (<replaceable>&lt;device-type&gt;</replaceable><replaceable>&lt;device-number&gt;</replaceable>,<replaceable>&lt;partition&gt;</replaceable>)</command> &mdash; Configures the root partition for GRUB, such as <command>(hd1,1)</command>, and mounts the partition.
 					</para>
 
 				</listitem>
 				 <listitem>
 					<para>
-						<command>timeout=<replaceable>&lt;integer&gt;</replaceable></command> &mdash; Specifies the interval, in seconds, that GRUB waits before loading the entry designated in the <command>default</command> command.
+						<command>rootnoverify (<replaceable>&lt;device-type&gt;</replaceable><replaceable>&lt;device-number&gt;</replaceable>,<replaceable>&lt;partition&gt;</replaceable>)</command> &mdash; Configures the root partition for GRUB, just like the <command>root</command> command, but does not mount the partition.
 					</para>
 
 				</listitem>
 				 <listitem>
 					<para>
-						<command>splashimage=<replaceable>&lt;path-to-image&gt;</replaceable></command> &mdash; Specifies the location of the splash screen image to be used when GRUB boots.
+						<command>timeout=<replaceable>&lt;integer&gt;</replaceable></command> &mdash; Specifies the interval, in seconds, that GRUB waits before loading the entry designated in the <command>default</command> command.
 					</para>
 
 				</listitem>
 				 <listitem>
 					<para>
-						<command>title <replaceable>group-title</replaceable></command> &mdash; Specifies a title to be used with a particular group of commands used to load a kernel or operating system.
+						<command>splashimage=<replaceable>&lt;path-to-image&gt;</replaceable></command> &mdash; Specifies the location of the splash screen image to be used when GRUB boots.
 					</para>
 
 				</listitem>
+				
 
 			</itemizedlist>
 			 <para>
@@ -974,13 +972,13 @@ chainloader +1
 		 <itemizedlist>
 			<listitem>
 				<para>
-					When the GRUB menu bypass screen appears at boot time, press any key to enter the GRUB menu (within the first three seconds).
+					At boot time, press the <keycap>Esc</keycap> key to reach the GRUB splash screen, then press any key to enter the GRUB menu (within the first three seconds).
 				</para>
 
 			</listitem>
 			 <listitem>
 				<para>
-					Press the <keycap>a</keycap> key to append to the <command>kernel</command> command.
+					Press the <keycap>a</keycap> key to append to the <command>linux </command> command.
 				</para>
 
 			</listitem>
@@ -1049,12 +1047,6 @@ chainloader +1
 					</para>
 
 				</listitem>
-				 <listitem>
-					<para>
-						<ulink url="http://kbase.redhat.com/faq/docs/DOC-6864">http://kbase.redhat.com/faq/docs/DOC-6864</ulink> &mdash; Details booting operating systems other than Linux.
-					</para>
-
-				</listitem>
 				 <!--  DEAD LINK <listitem>
 					<para>
 						<ulink url="http://www.linuxgazette.com/issue64/kohli.html">http://www.linuxgazette.com/issue64/kohli.html</ulink> &mdash; An introductory article discussing the configuration of GRUB on a system from scratch, including an overview of GRUB command
diff --git a/en-US/Important_BIOS_boot_partition.xml b/en-US/Important_BIOS_boot_partition.xml
new file mode 100644
index 0000000..d6406b8
--- /dev/null
+++ b/en-US/Important_BIOS_boot_partition.xml
@@ -0,0 +1,12 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE important PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "Installation_Guide.ent">
+%BOOK_ENTITIES;
+]>
+<important>
+    <title>Important — non-EFI x86 systems need a BIOS boot partition</title>
+	<para>
+	  If you are creating a custom partition layout on a non-EFI x86 system, you are strongly advised to create a separate, 1MB BIOS boot partition. This will be used by the GRUB boot loader for storage.
+	</para>
+</important>
+
diff --git a/en-US/Important_single_iso.xml b/en-US/Important_single_iso.xml
new file mode 100644
index 0000000..5c932c2
--- /dev/null
+++ b/en-US/Important_single_iso.xml
@@ -0,0 +1,12 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE important PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "Installation_Guide.ent">
+%BOOK_ENTITIES;
+]>
+<important>
+    <title>Contents of ISO directory</title> 
+	<para>
+	  The directory specified must only contain the ISO image file being used for this installation, otherwise <application>anaconda</application> will be unable to locate it.
+	</para>
+</important>
+
diff --git a/en-US/Kickstart2.xml b/en-US/Kickstart2.xml
index 1511002..7bade31 100644
--- a/en-US/Kickstart2.xml
+++ b/en-US/Kickstart2.xml
@@ -787,12 +787,6 @@ driverdisk --source=nfs:host:/path/to/img</screen>
 
 		<listitem>
 <para>
-	<command>--telnet</command>
-</para>
-		</listitem>
-
-		<listitem>
-<para>
 	<command>--smtp</command>
 </para>
 		</listitem>
@@ -1060,20 +1054,6 @@ driverdisk --source=nfs:host:/path/to/img</screen>
 			</varlistentry>-->
 			
 			<varlistentry>
-				<term><command>interactive</command> (optional) 	  </term>
-
-				<listitem>
-					<indexterm significance="normal">
-						<primary>kickstart file</primary>
-						<secondary><command>interactive</command> </secondary>
-					</indexterm>	
-					<para>
-						Perform an interactive installation, but use the information in the kickstart file to provide defaults. During the installation, <application>anaconda</application> still prompts you at every stage. Either accept the values from the kickstart file by clicking <guibutton>Next</guibutton> or change the values and click <guibutton>Next</guibutton> to continue. Refer also to the <command>autostep</command> command.
-					</para>
-				</listitem>
-			</varlistentry>
-
-			<varlistentry>
 				<term><command>iscsi</command> (optional)</term>
 				<listitem>
 					<para> <indexterm significance="normal">
@@ -1374,7 +1354,12 @@ driverdisk --source=nfs:host:/path/to/img</screen>
 	<para>
 		<command>--backuppassphrase=</command> &mdash; Add a randomly-generated passphrase to each encrypted volume. Store these passphrases in separate files in <filename>/root</filename>, encrypted using the X.509 certificate specified with <command>--escrowcert</command>. This option is only meaningful if <command>--escrowcert</command> is specified. 
 	</para>
-</listitem>	
+</listitem>
+<listitem>
+	<para>
+		<command>--label=</command> &mdash; assign a label to an individual volume.
+	</para>
+</listitem>
 					</itemizedlist>
 
 					<para>
@@ -2031,6 +2016,11 @@ All partitions created are formatted as part of the installation process unless
 		<command>--backuppassphrase=</command> &mdash; Add a randomly-generated passphrase to each encrypted partition. Store these passphrases in separate files in <filename>/root</filename>, encrypted using the X.509 certificate specified with <command>--escrowcert</command>. This option is only meaningful if <command>--escrowcert</command> is specified. 
 	</para>
 </listitem>
+<listitem>
+	<para>
+		<command>--label=</command> &mdash; assign a label to an individual partition.
+	</para>
+</listitem>
 					</itemizedlist>
 
 					<note>
@@ -2117,7 +2107,13 @@ interface) must be able to interact with the system kernel. Contact your manufac
 		<command>--spares=</command> &mdash; Specifies the number of spare drives allocated for the RAID array. Spare drives are used to rebuild the array in case of drive failure.
 	</para>
 </listitem>
-						
+
+<listitem>
+	<para>
+		<command>--grow=</command> &mdash; Only supported for RAID0. Tells the RAID device to grow to fill available space (if any), or up to the maximum size setting.
+	</para>
+</listitem>
+
 <listitem>
 	<para>
 		<command>--fsprofile</command> &mdash; Specifies a <firstterm>usage type</firstterm> to be passed to the program that makes a filesystem on this partition. A usage type defines a variety of tuning parameters to be used when making a filesystem. For this option to work, the filesystem must support the concept of usage types and there must be a configuration file that lists valid types. For ext2, ext3, and ext4, this configuration file is <filename>/etc/mke2fs.conf</filename>. 
diff --git a/en-US/Ksconfig.xml b/en-US/Ksconfig.xml
index d22b705..5092f1b 100644
--- a/en-US/Ksconfig.xml
+++ b/en-US/Ksconfig.xml
@@ -238,7 +238,10 @@
 		</para>
 		 <para>
 			You can password protect the GRUB boot loader by configuring a GRUB password. Select <guilabel>Use GRUB password</guilabel>, and enter a password in the <guilabel>Password</guilabel> field. Type the same password in the <guilabel>Confirm Password</guilabel> text field. To save the password as an encrypted password in the file, select <guilabel>Encrypt GRUB password</guilabel>. If the encryption option is selected, when the file is saved, the plain text password that you typed is encrypted and written to the kickstart file. If the password you typed was already encrypted, unselect the encryption option.
-		</para>
+		 </para>
+		 <para>
+			Whenever you are required to enter this password, you will also be asked for a username, which is <command>root</command>.
+		 </para> 
 		 <para>
 			If <guilabel>Upgrade an existing installation</guilabel> is selected on the <guilabel>Installation Method</guilabel> page, select <guilabel>Upgrade existing boot loader</guilabel> to upgrade the existing boot loader configuration, while preserving the old entries.
 		</para>
@@ -796,7 +799,7 @@
 			Only the most commonly used commands are available in the pre-installation environment:
 		</para>
 		 <para>
-			<command>arping</command>, <command>awk</command>, <command>basename</command>, <command>bash</command>, <command>bunzip2</command>, <command>bzcat</command>, <command>cat</command>, <command>chattr</command>, <command>chgrp</command>, <command>chmod</command>, <command>chown</command>, <command>chroot</command>, <command>chvt</command>, <command>clear</command>, <command>cp</command>, <command>cpio</command>, <command>cut</command>, <command>date</command>, <command>dd</command>, <command>df</command>, <command>dirname</command>, <command>dmesg</command>, <command>du</command>, <command>e2fsck</command>, <command>e2label</command>, <command>echo</command>, <command>egrep</command>, <command>eject</command>, <command>env</command>, <command>expr</command>, <command>false</command>, <command>fdisk</command>, <command>fgrep</command>, <command>find</command>, <command>fsck</command>, <command>fsck.ext2</command>, <command>fsck.ext3</command>, <command>ftp</command>, <comman
 d>grep</command>, <command>gunzip</command>, <command>gzip</command>, <command>hdparm</command>, <command>head</command>, <command>hostname</command>, <command>hwclock</command>, <command>ifconfig</command>, <command>insmod</command>, <command>ip</command>, <command>ipcalc</command>, <command>kill</command>, <command>killall</command>, <command>less</command>, <command>ln</command>, <command>load_policy</command>, <command>login</command>, <command>losetup</command>, <command>ls</command>, <command>lsattr</command>, <command>lsmod</command>, <command>lvm</command>, <command>md5sum</command>, <command>mkdir</command>, <command>mke2fs</command>, <command>mkfs.ext2</command>, <command>mkfs.ext3</command>, <command>mknod</command>, <command>mkswap</command>, <command>mktemp</command>, <command>modprobe</command>, <command>more</command>, <command>mount</command>, <command>mt</command>, <command>mv</command>, <command>nslookup</command>, <command>openvt</command>, <command>pidof<
 /command>, <command>ping</command>, <command>ps</command>, <command>pwd</command>, <command>readlink</command>, <command>rm</command>, <command>rmdir</command>, <command>rmmod</command>, <command>route</command>, <command>rpm</command>, <command>sed</command>, <command>sh</command>, <command>sha1sum</command>, <command>sleep</command>, <command>sort</command>, <command>swapoff</command>, <command>swapon</command>, <command>sync</command>, <command>tail</command>, <command>tar</command>, <command>tee</command>, <command>telnet</command>, <command>top</command>, <command>touch</command>, <command>true</command>, <command>tune2fs</command>, <command>umount</command>, <command>uniq</command>, <command>vconfig</command>, <command>vi</command>, <command>wc</command>, <command>wget</command>, <command>xargs</command>, <command>zcat</command>.
+			<command>arping</command>, <command>awk</command>, <command>basename</command>, <command>bash</command>, <command>bunzip2</command>, <command>bzcat</command>, <command>cat</command>, <command>chattr</command>, <command>chgrp</command>, <command>chmod</command>, <command>chown</command>, <command>chroot</command>, <command>chvt</command>, <command>clear</command>, <command>cp</command>, <command>cpio</command>, <command>cut</command>, <command>date</command>, <command>dd</command>, <command>df</command>, <command>dirname</command>, <command>dmesg</command>, <command>du</command>, <command>e2fsck</command>, <command>e2label</command>, <command>echo</command>, <command>egrep</command>, <command>eject</command>, <command>env</command>, <command>expr</command>, <command>false</command>, <command>fdisk</command>, <command>fgrep</command>, <command>find</command>, <command>fsck</command>, <command>fsck.ext2</command>, <command>fsck.ext3</command>, <command>ftp</command>, <comman
 d>grep</command>, <command>gunzip</command>, <command>gzip</command>, <command>hdparm</command>, <command>head</command>, <command>hostname</command>, <command>hwclock</command>, <command>ifconfig</command>, <command>insmod</command>, <command>ip</command>, <command>ipcalc</command>, <command>kill</command>, <command>killall</command>, <command>less</command>, <command>ln</command>, <command>load_policy</command>, <command>login</command>, <command>losetup</command>, <command>ls</command>, <command>lsattr</command>, <command>lsmod</command>, <command>lvm</command>, <command>md5sum</command>, <command>mkdir</command>, <command>mke2fs</command>, <command>mkfs.ext2</command>, <command>mkfs.ext3</command>, <command>mknod</command>, <command>mkswap</command>, <command>mktemp</command>, <command>modprobe</command>, <command>more</command>, <command>mount</command>, <command>mt</command>, <command>mv</command>, <command>nslookup</command>, <command>openvt</command>, <command>pidof<
 /command>, <command>ping</command>, <command>ps</command>, <command>pwd</command>, <command>readlink</command>, <command>rm</command>, <command>rmdir</command>, <command>rmmod</command>, <command>route</command>, <command>rpm</command>, <command>sed</command>, <command>sh</command>, <command>sha1sum</command>, <command>sleep</command>, <command>sort</command>, <command>swapoff</command>, <command>swapon</command>, <command>sync</command>, <command>tail</command>, <command>tar</command>, <command>tee</command>, <command>top</command>, <command>touch</command>, <command>true</command>, <command>tune2fs</command>, <command>umount</command>, <command>uniq</command>, <command>vconfig</command>, <command>vi</command>, <command>wc</command>, <command>wget</command>, <command>xargs</command>, <command>zcat</command>.
 		</para>
 		 <important>
 			<para>
diff --git a/en-US/Making_USB_media.xml b/en-US/Making_USB_media.xml
index de914da..ffb58cf 100644
--- a/en-US/Making_USB_media.xml
+++ b/en-US/Making_USB_media.xml
@@ -59,12 +59,14 @@
 	<section id="Making_USB_Media-UNIX_Linux">
 		<title>Making Fedora USB Media in UNIX, Linux, and Similar Operating Systems</title>
 		<para>
-			A graphical tool is available to create Fedora USB media on systems that run Fedora, Fedora, or operating systems derived from either of these. To create Fedora USB media on other UNIX or Linux operating systems (including Mac&nbsp;OS&nbsp;X), use the command-line method described in <xref linkend="Making_USB_Media-UNIX_Linux-RHEL_Fedora-dd"/>.
+			A graphical tool is available to create Fedora USB media on systems that run Fedora or operating systems derived from Fedora. To create Fedora USB media on other UNIX or Linux operating systems (including Mac&nbsp;OS&nbsp;X), use the command-line method described in <xref linkend="Making_USB_Media-UNIX_Linux-RHEL_Fedora-dd"/>.
 		</para>
 		<section id="Making_USB_Media-UNIX_Linux-RHEL_Fedora">
-			<title>Creating Fedora USB Media in Fedora, Fedora, and similar Linux distributions</title>
+			<title>Creating Fedora USB Media in Fedora and similar Linux distributions</title>
 			<para>
-				Graphical and command-line tools are available to create Fedora USB media on computers that run Fedora, Fedora, and Linux distributions derived from Fedora. The graphical tool and the works only with the Fedora live image. To create Fedora USB media from the distribution image or minimal boot media image, use the command-line method described in <xref linkend="Making_USB_Media-UNIX_Linux-RHEL_Fedora-dd"/>.
+				Graphical and command-line tools are available to create Fedora USB media on computers that run Fedora and Linux distributions derived from Fedora. The graphical tool works only with Fedora live images. To create Fedora USB
+				media from the distribution image or minimal boot media image, use one of the
+				command-line methods described in <xref linkend="Making_USB_Media-UNIX_Linux-RHEL_Fedora-livecd-tools"/> and <xref linkend="Making_USB_Media-UNIX_Linux-RHEL_Fedora-dd"/>.
 			</para>
 			<section id="Making_USB_Media-UNIX_Linux-RHEL_Fedora-graphical">
 				<title>Making Fedora USB Media with a graphical tool</title>
@@ -157,7 +159,7 @@
 		<section id="Making_USB_Media-UNIX_Linux-other">
 			<title>Making Fedora USB Media in other Linux Distributions</title>
 			<para>
-				To create Fedora USB media on a computer that uses a Linux distribution other than Fedora, Fedora, and those derived from Fedora, use one of the command-line procedures detailed in this section. 
+				To create Fedora USB media on a computer that uses a Linux distribution other than Fedora and those derived from Fedora, use one of the command-line procedures detailed in this section. 
 			</para>
 			<section id="Making_USB_Media-UNIX_Linux-other_livecd-tools">
 				<title>Making Fedora USB Media with <application>livecd-tools</application></title>
diff --git a/en-US/Netboot_DHCP.xml b/en-US/Netboot_DHCP.xml
index e0f2626..a56dabc 100644
--- a/en-US/Netboot_DHCP.xml
+++ b/en-US/Netboot_DHCP.xml
@@ -27,7 +27,14 @@
 	If a DHCP server does not already exist on the network, configure one. Refer to the Fedora Deployment Guide for details. Make sure the configuration file contains the following so that PXE booting is enabled for systems which support it:
 </para>
 
-<programlisting>allow booting; allow bootp; class "pxeclients" {    match if substring(option vendor-class-identifier, 0, 9) = "PXEClient";    next-server <replaceable>&lt;server-ip&gt;</replaceable>; filename "linux-install/pxelinux.0"; }</programlisting>
+<programlisting>
+allow booting;
+allow bootp; 
+class "pxeclients" {    
+    match if substring(option vendor-class-identifier, 0, 9) = "PXEClient";    
+    next-server <replaceable>&lt;server-ip&gt;</replaceable>; 
+    filename "linux-install/pxelinux.0"; }
+</programlisting>
 
 <para>
 	where the next-server <replaceable>&lt;server-ip&gt;</replaceable> should be replaced with the IP address of the <command>tftp</command> server.
diff --git a/en-US/Rescue_Mode.xml b/en-US/Rescue_Mode.xml
index b08bfe0..d6bb406 100644
--- a/en-US/Rescue_Mode.xml
+++ b/en-US/Rescue_Mode.xml
@@ -61,7 +61,7 @@
 					This problem is often caused by the installation of another operating system after you have installed Fedora. Some other operating systems assume that you have no other operating system(s) on your computer. They overwrite the Master Boot Record (MBR) that originally contained the GRUB boot loader. If the boot loader is overwritten in this manner, you cannot boot Fedora unless you can get into rescue mode and reconfigure the boot loader.
 				</para>
 				 <para>
-					Another common problem occurs when using a partitioning tool to resize a partition or create a new partition from free space after installation, and it changes the order of your partitions. If the partition number of your <filename>/</filename> partition changes, the boot loader might not be able to find it to mount the partition. To fix this problem, boot in rescue mode and modify the <filename>/boot/grub/grub.conf</filename> file.
+					Another common problem occurs when using a partitioning tool to resize a partition or create a new partition from free space after installation, and it changes the order of your partitions. If the partition number of your <filename>/</filename> partition changes, the boot loader might not be able to find it to mount the partition. To fix this problem, boot in rescue mode and modify the <filename>/etc/grub.d/10_linux</filename> file.
 				</para>
 				 <para>
 					For instructions on how to reinstall the GRUB boot loader from a rescue environment, refer to <xref linkend="s2-rescuemode-boot-reinstall-bootloader" />.
@@ -300,7 +300,7 @@
 					</listitem>
 					 <listitem>
 						<para>
-							Review the <filename>/boot/grub/grub.conf</filename> file, as additional entries may be needed for GRUB to control additional operating systems.
+							Review the <filename>/etc/grub.d/10_linux</filename> file, as additional entries may be needed in the <filename>/etc/grub.d/40_custom</filename> for GRUB to control additional operating systems.
 						</para>
 
 					</listitem>
@@ -348,7 +348,7 @@
 			 <orderedlist continuation="restarts" inheritnum="ignore">
 				<listitem>
 					<para>
-						At the GRUB splash screen at boot time, press any key to enter the GRUB interactive menu.
+						Press the <keycap>Esc</keycap> key at boot time to load the GRUB splash screen, then press any key to enter the GRUB interactive menu.
 					</para>
 
 				</listitem>
diff --git a/en-US/Rescuemode_Drivers.xml b/en-US/Rescuemode_Drivers.xml
index 05dc6f4..d2d80c2 100644
--- a/en-US/Rescuemode_Drivers.xml
+++ b/en-US/Rescuemode_Drivers.xml
@@ -104,7 +104,7 @@
 	<section id="rescuemode_drivers-blacklisting">
 		<title>Blacklisting a driver</title>
 		<para>
-			As described in <xref linkend="s1-rescuemode-boot"/>, the <option>rdblacklist</option> kernel option <firstterm>blacklists</firstterm> a driver at boot time. To continue to blacklist the driver on subsequent boots, add the <option>rdblacklist</option> option to the line in <filename>/boot/grub/grub.conf</filename> that describes your kernel. To blacklist the driver when the root device is mounted, add a blacklist entry in a file under <filename>/etc/modprobe.d/</filename>. 
+			As described in <xref linkend="s1-rescuemode-boot"/>, the <option>rdblacklist</option> kernel option <firstterm>blacklists</firstterm> a driver at boot time. To continue to blacklist the driver on subsequent boots, add the <option>rdblacklist</option> option to the line in <filename>/etc/grub.d/10_linux</filename> that describes your kernel. To blacklist the driver when the root device is mounted, add a blacklist entry in a file under <filename>/etc/modprobe.d/</filename>. 
 		</para>
 		<procedure>
 			<step>
@@ -114,20 +114,20 @@
 			</step>
 			<step>
 				<para>
-					Open the <filename>/mnt/sysimage/boot/grub/grub.conf</filename> file with the <application>vi</application> text editor:
+					Open the <filename>/mnt/sysimage/etc/grub.d/10_linux</filename> file with the <application>vi</application> text editor:
 				</para>
-<screen><command>vi /mnt/sysimage/boot/grub/grub.conf</command></screen>
+<screen><command>vi /mnt/sysimage/etc/grub.d/10_linux</command></screen>
 			</step>
 			<step>
 				<para>
-					Identify the default kernel used to boot the system. Each kernel is specified in the <filename>grub.conf</filename> file with a group of lines that begins <literal>title</literal>. The default kernel is specified by the <parameter>default</parameter> parameter near the start of the file. A value of <literal>0</literal> refers to the kernel described in the first group of lines, a value of <literal>1</literal> refers to the kernel described in the second group, and higher values refer to subsequent kernels in turn.
+					Identify the default kernel used to boot the system. Each kernel is specified in the <filename>10_linux</filename> file with a group of lines that begins <literal>menuentry</literal>. The default kernel is specified by the <parameter>default</parameter> parameter in <filename>/etc/default/grub</filename>. A value of <literal>0</literal> refers to the first menu entry in the custom script files in <filename>/etc/grub.d</filename>, a value of <literal>1</literal> refers to the second menu entry, and higher values refer to subsequent kernels in turn. Check the script prior to <filename>10_linux</filename>, named <filename>00_header</filename>, to ensure you specify the correct kernel.
 				</para>
 			</step>
 			<step>
 				<para>
-					Edit the <literal>kernel</literal> line of the group to include the option <option> rdblacklist=<replaceable>name_of_driver</replaceable></option>, where <replaceable>name_of_driver</replaceable> is the driver that you need to blacklist. For example, to blacklist the driver named <application>foobar</application>:
+					Edit the <literal>linux</literal> line of the menu entry to include the option <option> rdblacklist=<replaceable>name_of_driver</replaceable></option>, where <replaceable>name_of_driver</replaceable> is the driver that you need to blacklist. For example, to blacklist the driver named <application>foobar</application>:
 				</para>
-<programlisting>kernel /vmlinuz-2.6.32-71.18-2.el6.i686 ro root=/dev/sda1 rhgb quiet rdblacklist=foobar</programlisting>
+<programlisting>linux /vmlinuz-2.6.32-71.18-2.el6.i686 ro root=/dev/sda1 rhgb quiet rdblacklist=foobar</programlisting>
 			</step>
 			<step>
 				<para>
@@ -142,7 +142,7 @@
 			</step>
 			<step>
 				<para>
-					Reboot the system. You no longer need to supply <option>rdblacklist</option> manually as a kernel option until you next update the default kernel. If you update the default kernel before the problem with the driver has been fixed, you must edit <filename>grub.conf</filename> again to ensure that the faulty driver is not loaded at boot time.
+					Reboot the system. You no longer need to supply <option>rdblacklist</option> manually as a kernel option until you next update the default kernel. If you update the default kernel before the problem with the driver has been fixed, you must edit <filename>10_linux</filename> again to ensure that the faulty driver is not loaded at boot time.
 				</para>
 			</step>
 		</procedure>
diff --git a/en-US/Steps_Hd_Install-x86.xml b/en-US/Steps_Hd_Install-x86.xml
index a070daf..c23649c 100644
--- a/en-US/Steps_Hd_Install-x86.xml
+++ b/en-US/Steps_Hd_Install-x86.xml
@@ -11,8 +11,8 @@
 	 <!--  only some file systems  --> <xi:include href="Beginning_Installation_Hard_Disk_common-note-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
 	 <!--  Cannot install from LVM partitions  --> <xi:include href="Steps_Hd_Install_x86_ppc_s390_para_0.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
 	 <!--  Use this method to install Fedora on systems  --> <xi:include href="Steps_Hd_Install_common-para-6.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-	 <!--  Hard drive installations use the following files:  --> <xi:include href="Steps_Hd_Install_common-itemizedlist-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-	 <!--  an ISO image file of the installation DVD  --> <para>
+	 <!--  Hard drive installations use the following files:  --> <!-- <xi:include href="Steps_Hd_Install_common-itemizedlist-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+	    an ISO image file of the installation DVD  --> <para>
 		With these files present on a hard drive, you can choose <guimenuitem>Hard drive</guimenuitem> as the installation source when you boot the installation program (refer to <xref linkend="s1-installationmethod-x86" />).
 	</para>
 	 <xi:include href="Prepare_To_Install-common-Boot_Media.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
@@ -35,22 +35,23 @@
 			 <!--  sha256sum name_of_image.iso  --> <xi:include href="Steps_Hd_Install_common-para-5.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
 			 <!--  where name_of_image is the name of the ISO image file.  -->
 		</step>
-		 <step>
-			<xi:include href="Steps_Hd_Install_common-para-3.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-			 <!--  Copy the images/ directory within the ISO files...  --> 
+		<!--<step>
+		<xi:include href="Steps_Hd_Install_common-para-3.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+			  Copy the images/ directory within the ISO files...
 			 <xi:include href="Beginning_Installation_Hard_Disk_common-screen-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
 			 <xi:include href="Steps_Hd_Install_common-para-7.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-			 <!--  where path_to_image is the path to the ISO image file...  -->
+			  where path_to_image is the path to the ISO image file...
 			 <xi:include href="Beginning_Installation_Hard_Disk_common-screen-2.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
 			 <xi:include href="Steps_Hd_Install_common-para-8.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-			 <!--  The ISO image file and an /images/ directory are now present...  -->
-		</step>
+			  The ISO image file and an /images/ directory are now present...
+			 
+		 </step>
 		 <step>
 			<para>
 				Verify that the <filename>images/</filename> directory contains at least the <filename>install.img</filename> file, without which installation cannot proceed. Optionally, the <filename>images/</filename> directory should contain the <filename>product.img</filename> file, without which only the packages for a <guilabel>Minimal</guilabel> installation will be available during the package group selection stage (refer to <xref linkend="s1-pkgselection-x86" />).
 			</para>
 		<xi:include href="Important_images_directory.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-		</step>
+	      </step> -->
 
 	</procedure>
 	
diff --git a/en-US/Steps_Hd_Install_common-para-6.xml b/en-US/Steps_Hd_Install_common-para-6.xml
index c19c207..18b2ebe 100644
--- a/en-US/Steps_Hd_Install_common-para-6.xml
+++ b/en-US/Steps_Hd_Install_common-para-6.xml
@@ -4,6 +4,6 @@
 %BOOK_ENTITIES;
 ]>
 <para>
-	Hard drive installations use the following files:
+	Hard drive installations use an <firstterm>ISO image</firstterm> of the installation DVD. An ISO image is a file that contains an exact copy of the content of a DVD.
 </para>
 
diff --git a/en-US/Steps_Network_Install_section_2-common-para-1.xml b/en-US/Steps_Network_Install_section_2-common-para-1.xml
index d528fa7..24c7205 100644
--- a/en-US/Steps_Network_Install_section_2-common-para-1.xml
+++ b/en-US/Steps_Network_Install_section_2-common-para-1.xml
@@ -4,6 +4,6 @@
 %BOOK_ENTITIES;
 ]>
 <para>
-	For NFS installation it is not necessary to extract all the files from the ISO image. It is sufficient to make the ISO image itself, the <filename>install.img</filename> file, and optionally the <filename>product.img</filename> file available on the network server via NFS.
+	For NFS installation it is not necessary to extract all the files from the ISO image. It is sufficient to make the ISO image available on the network server via NFS.
 </para>
 
diff --git a/en-US/Steps_Network_Install_x86_section_2.xml b/en-US/Steps_Network_Install_x86_section_2.xml
index 3256845..a97c1b9 100644
--- a/en-US/Steps_Network_Install_x86_section_2.xml
+++ b/en-US/Steps_Network_Install_x86_section_2.xml
@@ -20,22 +20,22 @@
 			 <!--  sha256sum name_of_image.iso  --> <xi:include href="Steps_Hd_Install_common-para-5.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
 			 <!--  where name_of_image is the name of the ISO image file.  -->
 		</step>
-		 <step>
-			<xi:include href="Steps_Hd_Install_common-para-3.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-			 <!--  Copy the images/ directory within the ISO files...  --> 
+		 <!-- <step>
+			 <xi:include href="Steps_Hd_Install_common-para-3.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+			   Copy the images/ directory within the ISO files... 
 			 <xi:include href="Beginning_Installation_Hard_Disk_common-screen-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
 			 <xi:include href="Steps_Hd_Install_common-para-7.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-			 <!--  where path_to_image is the path to the ISO image file...  -->
+			    where path_to_image is the path to the ISO image file... 
 			 <xi:include href="Beginning_Installation_Hard_Disk_common-screen-2.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
 			 <xi:include href="Steps_Hd_Install_common-para-8.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-			 <!--  The ISO image file and an /images/ directory are now present...  -->
+			   The ISO image file and an /images/ directory are now present...
 		</step>
 		 <step>
 			<para>
 				Verify that the <filename>images/</filename> directory contains at least the <filename>install.img</filename> file, without which installation cannot proceed. Optionally, the <filename>images/</filename> directory should contain the <filename>product.img</filename> file, without which only the packages for a <guilabel>Minimal</guilabel> installation will be available during the package group selection stage (refer to <xref linkend="s1-pkgselection-x86" />).
 			</para>
 		<xi:include href="Important_images_directory.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-		</step>
+	      </step> -->
 		 <step>
 			<xi:include href="Steps_Network_Install_section_2-common-para-4.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
 			 <!--  Ensure that the /publicly_available_directory directory is exported via NFS   --> <xi:include href="Steps_Network_Install_section_2-common-para-5.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
diff --git a/en-US/TUI-x86.xml b/en-US/TUI-x86.xml
index ca975c2..7925138 100644
--- a/en-US/TUI-x86.xml
+++ b/en-US/TUI-x86.xml
@@ -45,6 +45,9 @@
 	 <para>
 		If you choose to install Fedora in text mode, you can still configure your system to use a graphical interface after installation. Refer to <xref linkend="sn-switching-to-gui-login" /> for instructions.
 	</para>
+	<para>
+		To configure options not available in text mode, consider using a boot option. For example, the <command>linux ip</command> option can be used to configure network settings. Refer to <xref linkend="sn-bootoptions-installer" /> for instructions.
+	</para>	
 </section>
 
 
diff --git a/en-US/Trouble_After_Ram.xml b/en-US/Trouble_After_Ram.xml
index 18c01a3..5a1d4f8 100644
--- a/en-US/Trouble_After_Ram.xml
+++ b/en-US/Trouble_After_Ram.xml
@@ -11,60 +11,75 @@
 		 <tertiary>RAM not recognized</tertiary>
 
 	</indexterm>
+	
 	 <para>
-		Sometimes, the kernel does not recognize all of your memory (RAM). You can check this with the <command moreinfo="none">cat /proc/meminfo</command> command.
-	</para>
-	 <para>
-		Verify that the displayed quantity is the same as the known amount of RAM in your system. If they are not equal, add the following line to the <filename moreinfo="none">/boot/grub/grub.conf</filename>:
-	</para>
+		Sometimes, the kernel does not recognize all of your memory (RAM). The following procedure will allow you to confirm this and then adjust the kernel if necessary.
+	 </para>
+	 
+	 <procedure>
+	   <step>
+	      <para>
+		Run the <command moreinfo="none">cat /proc/meminfo</command> command and verify that the displayed quantity is the same as the known amount of RAM in your system. If they are not equal, you can first make a temporary change to confirm whether editing the kernel will be effective. 
+	      </para>
+	  </step>
+	  <step>
+	      <para>
+		Reboot, and once you have loaded the GRUB boot screen, type <command moreinfo="none">e</command> for edit.
+	      </para>
+	  </step>
+	  <step>
+	      <para>
+		You are presented with a list of items in the configuration file for the boot label you have selected. Choose the line that starts with <computeroutput moreinfo="none">kernel</computeroutput> and type <command moreinfo="none">e</command> to edit this boot entry.
+	      </para>
+	  </step>    
+	  <step>    
+	      <para>
+		At the end of the <computeroutput moreinfo="none">kernel</computeroutput> line, add
+	      </para>
+	
+<screen>
+<userinput moreinfo="none">mem=<replaceable>xx</replaceable>M</userinput></screen>
+	      <para>
+		where <replaceable>xx</replaceable> equals the amount of RAM in your system, then press <keycap moreinfo="none">Enter</keycap> to exit edit mode.
+	      </para>
+	 </step>
+	 <step>
+		<para>
+		Once the boot loader screen has returned, type <command moreinfo="none">b</command> to boot the system.
+		</para>
+	 </step>
+	 <step>
+		<para>
+		Run <command moreinfo="none">cat /proc/meminfo</command> again. If the known amount of RAM in your system is now displayed, add the following line to the <filename moreinfo="none">/etc/grub.d/10_linux</filename> file to make the change permanent:
+		</para>
 	
 <screen>
 <userinput moreinfo="none">mem=<replaceable>xx</replaceable>M</userinput></screen>
 	 <para>
 		Replace <replaceable>xx</replaceable> with the amount of RAM you have in megabytes.
 	</para>
+	 </step>
+	 <step>
+		<para>
+		To update the <filename>grub.cfg</filename> file so that the change will take effect, run <command>grub2-mkconfig</command> with root privileges.
+		</para>
+	</step>
+      </procedure>
 	 <para>
-		In <filename moreinfo="none">/boot/grub/grub.conf</filename>, the above example would look similar to the following:
+		In <filename moreinfo="none">10_linux</filename>, the above example would look similar to the following:
 	</para>
 	
 <screen>
-# NOTICE: You have a /boot partition. This means that 
-#  all kernel paths are relative to /boot/ 
 default=0 
 timeout=30 
 splashimage=(hd0,0)/grub/splash.xpm.gz 
- title Fedora Client (2.6.32.130.el6.i686)
-root (hd0,1)
-kernel /vmlinuz-(2.6.32.130.el6.i686 ro root=UUID=04a07c13-e6bf-6d5a-b207-002689545705 mem=1024M
+menuentry 'Fedora Linux, with Linux 3.1.0-0.rc6.git0.3.fc16.x86_64'
+set root=(hd0,1)
+linux /vmlinuz-(2.6.32.130.el6.i686 ro root=UUID=04a07c13-e6bf-6d5a-b207-002689545705 mem=8192M
 initrd /initrd-(2.6.32.130.el6.i686.img
 </screen>
-	 <para>
-		Once you reboot, the changes made to <filename moreinfo="none">grub.conf</filename> are reflected on your system.
-	</para>
-	 <para>
-		Once you have loaded the GRUB boot screen, type <command moreinfo="none">e</command> for edit. You are presented with a list of items in the configuration file for the boot label you have selected.
-	</para>
-	 <para>
-		Choose the line that starts with <computeroutput moreinfo="none">kernel</computeroutput> and type <command moreinfo="none">e</command> to edit this boot entry.
-	</para>
-	 <para>
-		At the end of the <computeroutput moreinfo="none">kernel</computeroutput> line, add
-	</para>
-	
-<screen>
-<userinput moreinfo="none">mem=<replaceable>xx</replaceable>M</userinput></screen>
-	 <para>
-		where <replaceable>xx</replaceable> equals the amount of RAM in your system.
-	</para>
-	 <para>
-		Press <keycap moreinfo="none">Enter</keycap> to exit edit mode.
-	</para>
-	 <para>
-		Once the boot loader screen has returned, type <command moreinfo="none">b</command> to boot the system.
-	</para>
-	 <para>
-		Remember to replace <replaceable>xx</replaceable> with the amount of RAM in your system. Press <keycap moreinfo="none">Enter</keycap> to boot.
-	</para>
+
+
 </section>
 
 
diff --git a/en-US/Upgrade_common-section-1.xml b/en-US/Upgrade_common-section-1.xml
index 5e91e74..bb0e190 100644
--- a/en-US/Upgrade_common-section-1.xml
+++ b/en-US/Upgrade_common-section-1.xml
@@ -10,12 +10,9 @@
 	<indexterm significance="normal">
 		<primary>re-installation</primary>
 	</indexterm>
+
 	<para>
-		While upgrading from Fedora&nbsp;&PREVVER; is supported, you are more likely to have a consistent experience by backing up your data and then installing this release of Fedora&nbsp;&PRODVER; over your previous Fedora installation.
-	</para>
-	
-	<para>
-		To upgrade from Fedora&nbsp;&PREVVER; you should bring your system up to date before performing the upgrade.
+		Before upgrading to Fedora&nbsp;&PRODVER; you should first bring your current version up to date. However, it is not then necessary to upgrade to intermediate versions. For example, you can upgrade from Fedora 14 to Fedora&nbsp;&PRODVER; directly.
 	</para>
 	
 	<para>
@@ -43,15 +40,16 @@
 		
 		<listitem>
 			<para>
-				If you have one of Red Hat's layered products (such as the Cluster Suite) installed, it may need to be manually upgraded after the upgrade has been completed.
+				Third party or ISV applications may not work correctly following the upgrade.
 			</para>
 		</listitem>
 		
 		<listitem>
 			<para>
-				Third party or ISV applications may not work correctly following the upgrade.
+			  If you have additional third-party package repositories (such as <package>rpmfusion</package>) enabled, note that software installed from those repositories may not function properly after a system upgrade.  Fedora does not maintain third-party packages and cannot guarantee that such repositories are up-to-date.
 			</para>
 		</listitem>
+		
 	</itemizedlist>
 	
 	<para>
diff --git a/en-US/X86_Bootloader.xml b/en-US/X86_Bootloader.xml
index 37511e6..abb675c 100644
--- a/en-US/X86_Bootloader.xml
+++ b/en-US/X86_Bootloader.xml
@@ -48,7 +48,7 @@
 
 	</important>
 	 <para>
-		GRUB (GRand Unified Bootloader), which is installed by default, is a very powerful boot loader. GRUB can load a variety of free operating systems, as well as proprietary operating systems with chain-loading (the mechanism for loading unsupported operating systems, such as Windows, by loading another boot loader). Note that the version of GRUB in Fedora&nbsp;&PRODVER; is an old and stable version now known as "GRUB Legacy" since upstream development moved to GRUB&nbsp;2.<footnote>
+		GRUB (GRand Unified Bootloader), which is installed by default, is a very powerful boot loader. GRUB can load a variety of free operating systems, as well as proprietary operating systems with chain-loading (the mechanism for loading unsupported operating systems, such as Windows, by loading another boot loader). Note that Fedora&nbsp;&PRODVER; uses GRUB&nbsp;2. GRUB Legacy is no longer actively developed.<footnote>
 		<para>
 			<ulink url="http://www.gnu.org/software/grub/grub-legacy.en.html" />
 		</para>
@@ -100,7 +100,7 @@
 	 <para>
 		By default, the installation program installs GRUB in the master boot record or <abbrev>MBR</abbrev>, of the device for the root file system. To decline installation of a new boot loader, unselect <guilabel>Install boot loader on /dev/sda</guilabel>.
 	</para>
-	 <warning>
+	<warning>
 		<title>Warning</title>
 		 <para>
 			If you choose not to install GRUB for any reason, you will not be able to boot the system directly, and you must use another boot method (such as a commercial boot loader application). Use this option only if you are sure you have another way of booting the system!
@@ -197,12 +197,16 @@
 	 <para>
 		Once selected, enter a password and confirm it.
 	</para>
+	<para>
+	    Whenever you are required to enter this password, you will also be asked for a username, which is <command>root</command>.
+	</para> 
 	 <para>
-		<application>GRUB</application> stores the password in encrypted form, so it <emphasis>cannot</emphasis> be read or recovered. If you forget the boot password, boot the system normally and then change the password entry in the <filename>/boot/grub/grub.conf</filename> file. If you cannot boot, you may be able to use the "rescue" mode on the Fedora installation DVD to reset the GRUB password.
+	   <application>GRUB</application> stores the password in encrypted form, so it <emphasis>cannot</emphasis> be read or recovered. If you forget the boot password, boot the system normally and then change the password entry in the <filename>/etc/grub.d/00_header</filename> file. Then, run <command>grub2-mkconfig</command> with root privileges to update the <filename>grub.cfg</filename> file with your updated password. If you cannot boot, you may be able to use the <systemitem>rescue mode</systemitem> on the Fedora installation DVD to reset the GRUB password.
 	</para>
-	 <para>
+
+	<!-- <para>
 		If you do need to change the <application>GRUB</application> password, use the <command>grub-md5-crypt</command> utility. For information on using this utility, use the command <command>man grub-md5-crypt</command> in a terminal window to read the manual pages.
-	</para>
+	      </para> -->
 	 <important>
 		<title>GRUB recognizes only the QWERTY keyboard layout</title>
 		 <para>
@@ -289,6 +293,12 @@
 		 <para>
 			Click the <guibutton>Change Drive Order</guibutton> button if you would like to rearrange the drive order or if your BIOS does not return the correct drive order. Changing the drive order may be useful if you have multiple SCSI adapters, or both SCSI and IDE adapters, and you want to boot from the SCSI device.
 		</para>
+		<warning>
+		    <title>If installing from USB, ensure boot loader is installed to hard drive</title>
+		      <para>
+			If you are installing Fedora from a USB, the boot loader will by default be installed to the MBR on the USB rather than the MBR on the hard drive. This will prevent the system booting once the installation is complete. To avoid this, select <guibutton>Change Device</guibutton> and reverse the order of the BIOS drives. <filename>/dev/sda</filename> is typically the hard drive and should be first in the BIOS Drive Order.
+		      </para>
+		</warning>
 		 <!--  <para>
 			The <guilabel>Force LBA32 (not normally required)</guilabel> option allows you to exceed the 1024 cylinder limit for the <filename>/boot/</filename> partition. If you have a system which supports the LBA32 extension for booting operating systems above the 1024 cylinder limit, and you want to place your <filename>/boot/</filename> partition above cylinder 1024, you should select this option.
 		</para>  --><xi:include href="X86_Bios_Tip.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
diff --git a/en-US/X86_Trouble_After_Grub.xml b/en-US/X86_Trouble_After_Grub.xml
index ec8f20e..899dd92 100644
--- a/en-US/X86_Trouble_After_Grub.xml
+++ b/en-US/X86_Trouble_After_Grub.xml
@@ -12,11 +12,14 @@
 
 	</indexterm>
 	 <para>
-		If you are experiencing problems with GRUB, you may need to disable the graphical boot screen. To do this, become the root user and edit the <filename>/boot/grub/grub.conf</filename> file.
-	</para>
+		If you are experiencing problems with GRUB, you may need to disable the graphical boot screen. To do this, temporarily alter the setting at boot time before changing it permanently.
+	 </para>
 	 <para>
-		Within the <filename>grub.conf</filename> file, comment out the line which begins with <computeroutput>splashimage</computeroutput> by inserting the <computeroutput>#</computeroutput> character at the beginning of the line.
-	</para>
+		At boot time, press <keycap>Esc</keycap> to reach the GRUB splash screen. Select the GRUB line, and type <keycap>e</keycap>.
+	 </para>
+	 <para>
+		Edit the kernel line to remove <command>rhgb</command>.
+	 </para>
 	 <para>
 		Press <keycap>Enter</keycap> to exit the editing mode.
 	</para>
@@ -24,10 +27,16 @@
 		Once the boot loader screen has returned, type <command>b</command> to boot the system.
 	</para>
 	 <para>
-		Once you reboot, the <filename>grub.conf</filename> file is reread and any changes you have made take effect.
+		 If your problems with GRUB are now resolved and you want to make the change permanent, become the root user and edit the <filename>/etc/default/grub</filename> file.
+	</para>
+	 <para>
+		Within the <filename>grub</filename> file, comment out the line which begins with <computeroutput>GRUB_TERMINAL=console</computeroutput> by inserting the <computeroutput>#</computeroutput> character at the beginning of the line.
+	</para>
+	 <para>
+		Refresh the <filename>grub.cfg</filename> file by running <command>grub2-mkconfig</command> with root privileges. The changes you have made will then take effect.
 	</para>
 	 <para>
-		You may re-enable the graphical boot screen by uncommenting (or adding) the above line back into the <filename>grub.conf</filename> file.
+		You may re-enable the graphical boot screen by uncommenting (or adding) the above line back into the <filename>/etc/default/grub</filename> file.
 	</para>
 </section>
 
diff --git a/en-US/X86_Uninstall-Linux-bootloader.xml b/en-US/X86_Uninstall-Linux-bootloader.xml
index 43a04d5..2b30603 100644
--- a/en-US/X86_Uninstall-Linux-bootloader.xml
+++ b/en-US/X86_Uninstall-Linux-bootloader.xml
@@ -21,36 +21,44 @@
 		</listitem>
 		 <listitem>
 			<para>
-				Type <command>gedit&nbsp;/boot/grub/grub.conf</command> and press <keycap>Enter</keycap>. This opens the <filename>grub.conf</filename> file in the <application>gedit</application> text editor.
+				Type <command>gedit&nbsp;etc/grub.d/10_linux</command> and press <keycap>Enter</keycap>. This opens the <filename>10_linux</filename> file in the <application>gedit</application> text editor.
 			</para>
 
 		</listitem>
 		 <listitem>
 			<para>
-				A typical Fedora entry in the <filename>grub.conf</filename> file consists of four lines: 
+				A typical Fedora entry in the <filename>10_linux</filename> file consists of four lines: 
 				<example>
-					<title>Example Fedora entry in <filename>grub.conf</filename></title>
+					<title>Example Fedora entry in <filename>10_linux</filename></title>
 					 <para>
-						title Fedora (2.6.32.130.el6.i686)
+						menuentry "Fedora (2.6.32.130.el6.i686)"
 					</para>
 					 <para>
-						root (hd0,1)
+						set root=(hd0,1)
 					</para>
 					 <para>
-						kernel /vmlinuz-2.6.32.130.el6.i686 ro root=UUID=04a07c13-e6bf-6d5a-b207-002689545705 rhgb quiet
+						linux /vmlinuz-2.6.32.130.el6.i686 ro root=UUID=04a07c13-e6bf-6d5a-b207-002689545705 rhgb quiet
 					</para>
 					 <para>
 						initrd /initrd-2.6.32.130.el6.i686.img
 					</para>
 
 				</example>
-				 Depending on the configuration of your system, there may be multiple Fedora entries in <filename>grub.conf</filename>, each corresponding to a different version of the Linux kernel. Delete each of the Fedora entries from the file.
+				Depending on the configuration of your system, there may be multiple Fedora entries in <filename>10_linux</filename>, each corresponding to a different version of the Linux kernel. Delete each of the Fedora entries from these files
+			</para>
+			 <para>
+				 Save the updated <filename>10_linux</filename> file and close <application>gedit</application>.
+			</para>
+		</listitem>
+		<listitem>
+			<para>
+				Type <command>gedit&nbsp;etc/default/grub</command> and press <keycap>Enter</keycap>.
 			</para>
 
 		</listitem>
 		 <listitem>
 			<para>
-				<filename>Grub.conf</filename> contains a line that specifies the default operating system to boot, in the format <literal>default=<replaceable>N</replaceable></literal> where <replaceable>N</replaceable> is a number equal to or greater than 0. If <replaceable>N</replaceable> is set to 0, <application>GRUB</application> will boot the first operating system in the list. If <replaceable>N</replaceable> is set to 1, it will boot the second operating system, and so forth.
+				The file <filename>etc/default/grub</filename> contains a line that specifies the default operating system to boot, in the format <literal>default=<replaceable>N</replaceable></literal> where <replaceable>N</replaceable> is a number equal to or greater than 0. If <replaceable>N</replaceable> is set to 0, <application>GRUB</application> will boot the first operating system in the list. If <replaceable>N</replaceable> is set to 1, it will boot the second operating system, and so forth. Alternatively, the default value can be the full menu entry.
 			</para>
 			 <para>
 				Identify the entry for the operating system that you want <application>GRUB</application> to boot by default and note its place in the order within the list.
@@ -58,8 +66,8 @@
 			 <para>
 				Make sure that the <literal>default=</literal> line contains the number <emphasis>one below</emphasis> the number of your chosen default operating system in the list.
 			</para>
-			 <para>
-				Save the updated <filename>grub.conf</filename> file and close <application>gedit</application>
+			<para>
+			  Save the updated <filename>grub</filename> file and close <application>gedit</application>. If you have Fedora entries in the other script files in the <filename>/etc/grub.d</filename> directory, use this procedure to remove them in the same way.
 			</para>
 
 		</listitem>
diff --git a/en-US/adminoptions.xml b/en-US/adminoptions.xml
index ac79ff7..875ec72 100644
--- a/en-US/adminoptions.xml
+++ b/en-US/adminoptions.xml
@@ -318,7 +318,7 @@
 
 		</indexterm>
 		 <para>
-			You may access either graphical or text interfaces for the installation system from any other system. Access to a text mode display requires <application>telnet</application>, which is installed by default on Fedora systems. To remotely access the graphical display of an installation system, use client software that supports the VNC (Virtual Network Computing) display protocol.
+			You may access a graphical interface for the installation system from any other system. To remotely access the graphical display of an installation system, use client software that supports the VNC (Virtual Network Computing) display protocol.
 		</para>
 		 <note>
 			<title>Installing a VNC Client on Fedora</title>
@@ -414,7 +414,7 @@ Press &lt;enter&gt; for a shell</screen>
 
 			</indexterm>
 			 <para>
-				To enable remote access to a text mode installation, use the <option>sshd=1</option> option at the <prompt>boot:</prompt> prompt:
+				To enable remote access to a text mode installation to monitor and debug the installer, use the <option>sshd=1</option> option at the <prompt>boot:</prompt> prompt:
 			</para>
 			<!-- SE: The "text" option is necessary to stop the installer switching to graphical mode and losing the telnet interface. This is expected behavior.  -->
 <screen>
@@ -423,37 +423,7 @@ Press &lt;enter&gt; for a shell</screen>
 				You can then connect to the installation system with the <command>ssh</command> utility. The <command>ssh</command> command requires the name or IP address of the installation system, and a password if you specified one (for example, in a kickstart file).
 			</para>
 
-		</section>
-		
-		 <section id="sn-telnet-installation">
-			<title>Enabling Remote Access with Telnet</title>
-			 <para>
-				To enable remote access to a text mode installation, use the 
-				<indexterm>
-					<primary>Telnet</primary>
-
-				</indexterm>
-				 <option>telnet</option> option at the <prompt>boot:</prompt> prompt:
-			</para>
-			<!-- SE: The "text" option is necessary to stop the installer switching to graphical mode and losing the telnet interface. This is expected behavior.  -->
-<screen>
-<userinput>linux text telnet</userinput></screen>
-			 <para>
-				You may then connect to the installation system with the <command>telnet</command> utility. The <command>telnet</command> command requires the name or IP address of the installation system:
-			</para>
-			
-<screen>
-<userinput>telnet computer.mydomain.com</userinput></screen>
-			 <warning>
-				<title>Telnet Access Requires No Password</title>
-				 <para>
-					To ensure the security of the installation process, only use the <option>telnet</option> option to install systems on networks with restricted access.
-				</para>
-
-			</warning>
-
-		</section>
-		
+		</section>		
 
 	</section>
 	
diff --git a/en-US/expert-quickstart.xml b/en-US/expert-quickstart.xml
index 97c57bf..882f914 100644
--- a/en-US/expert-quickstart.xml
+++ b/en-US/expert-quickstart.xml
@@ -106,8 +106,9 @@
     <para>Boot from the desired media, with any options appropriate for
       your hardware and installation mode. Refer to <xref
     linkend="ap-admin-options"/> for more information about boot
-      options.  If you boot from the Live CD, select the "Install to
-      Hard Disk" option from the desktop to run the installation program.
+      options.  If you boot from the Live CD, select the <guilabel>Install to
+	Hard Disk</guilabel> option from the desktop to run the installation program.
+	(Alternatively, the option can be found in <menuchoice> <guimenu>Applications</guimenu> <guisubmenu>System Tools</guisubmenu> </menuchoice>.)
       If you boot from minimal media or a downloaded kernel, select a
       network or hard disk resource from which to install.</para>
     <para>Proceed through all the steps of the installation program. The
diff --git a/en-US/firstboot.xml b/en-US/firstboot.xml
index d6f45f2..cb5045a 100644
--- a/en-US/firstboot.xml
+++ b/en-US/firstboot.xml
@@ -187,8 +187,29 @@
 			Enter a user name and your full name, and then enter your chosen password. Type your password once more in the <guilabel>Confirm Password</guilabel> box to ensure that it is correct. <!-- FIXME Refer to <xref linkend="sn-account_configuration" /> for guidelines on selecting a secure password. -->
 		</para>
 		<para>
+			Check the <guilabel>Add to Administrators group</guilabel> box if you would like administrative privileges. This will place you in the wheel group, which gives you access to all administrative functions, including installing and updating software, creating and altering configuration files, and administering other users.
+		</para>
+		<para>
 			To configure Fedora to use network services for authentication of user information, click <guibutton>Use Network Login</guibutton>. Refer to <xref linkend="sn-firstboot-authentication"/> for further details.
 		</para>
+		<para>
+		  To create additional users or customise your first user account, click <guibutton>Advanced</guibutton> to open the <application>User Manager</application>.
+		</para>
+		
+		<figure float="0"><title>User Manager</title>
+		  <mediaobject>
+			  <imageobject><imagedata fileref="images/firstboot/fb-createuser-usermanager.png" format="PNG"/></imageobject>
+			  <textobject><para>
+					  Firstboot user manager screen
+				  </para>
+			  </textobject>
+		  </mediaobject>
+		</figure>
+		
+		<para>
+		  In <application>User Manager</application> you can edit various properties, such as a private group for the user, the preferred login shell, and user and group IDs.
+		</para>
+		
 		<important>
 			<title>Important — Create at least one user account</title>
 			<para>
diff --git a/en-US/images/firstboot/fb-createuser-usermanager.png b/en-US/images/firstboot/fb-createuser-usermanager.png
new file mode 100644
index 0000000..01c75fb
Binary files /dev/null and b/en-US/images/firstboot/fb-createuser-usermanager.png differ
diff --git a/en-US/images/firstboot/fb-createuser.png b/en-US/images/firstboot/fb-createuser.png
index 773b0df..2bab681 100644
Binary files a/en-US/images/firstboot/fb-createuser.png and b/en-US/images/firstboot/fb-createuser.png differ
diff --git a/en-US/medialess.xml b/en-US/medialess.xml
index d1f21c2..57d53ed 100644
--- a/en-US/medialess.xml
+++ b/en-US/medialess.xml
@@ -71,18 +71,19 @@
 	 <section id="sn-medialess-editing-grub-conf">
 		<title>Editing the <application>GRUB</application> Configuration</title>
 		 <para>
-			The <application>GRUB</application> boot loader uses the configuration file <filename>/boot/grub/grub.conf</filename>. To configure <application>GRUB</application> to boot from the new files, add a boot stanza to <filename>/boot/grub/grub.conf</filename> that refers to them.
+		   The <application>GRUB</application> boot loader uses the configuration files <filename>/etc/default/grub</filename> and the scripts in <filename>etc/grub.d/</filename>. To configure <application>GRUB</application> to boot from the new files, add a boot stanza to <filename>/etc/grub.d/40_custom</filename> that refers to them.
 		</para>
 		 <para>
 			A minimal boot stanza looks like the following listing:
 		</para>
 		 
-<screen>title Installation
-        root (hd0,0)
-        kernel /vmlinuz-install
-        initrd /initrd.img-install</screen>
+<screen>menuentry "Fedora Linux" {
+        set root=(hd0,0)
+        linux /vmlinuz-install
+        initrd /initrd.img-install
+	}</screen>
 		 <para>
-			You may wish to add options to the end of the <option>kernel</option> line of the boot stanza. These options set preliminary options in <application>Anaconda</application> which the user normally sets interactively. For a list of available installer boot options, refer to <xref linkend="ap-admin-options" />.
+			You may wish to add options to the end of the <option>linux</option> line of the boot stanza. These options set preliminary options in <application>Anaconda</application> which the user normally sets interactively. For a list of available installer boot options, refer to <xref linkend="ap-admin-options" />.
 		</para>
 		 <para>
 			The following options are generally useful for medialess installations:
@@ -127,10 +128,19 @@
 
 		</itemizedlist>
 		 <para>
-			When you are finished, change the <option>default</option> option in <filename>/boot/grub/grub.conf</filename> to point to the new first stanza you added:
+		   When you are finished, run <command>grub2-mkconfig</command> with root privileges and open the <filename>grub.cfg</filename> file to view the updated configuration. Locate your new menu entry stanza and determine its place in the stanza order.
+		 </para>
+		 <para>
+		   Finally, change the <option>GRUB_DEFAULT</option> option in <filename>/etc/default/grub</filename> to point to the new stanza you added. 0 will refer to the first stanza, 1 to the second, and so on. For example:
+		</para>
+		 
+<screen>GRUB_DEFAULT=0</screen>
+
+		<para>
+		  Alternatively, specify the menu entry title. This is particularly useful if you have a number of menu entries across the various script files.
 		</para>
 		 
-<screen>default 0</screen>
+<screen>GRUB_DEFAULT="Fedora Linux"</screen>
 
 	</section>
 	
diff --git a/en-US/new-users.xml b/en-US/new-users.xml
index 76e309f..fe57418 100644
--- a/en-US/new-users.xml
+++ b/en-US/new-users.xml
@@ -136,6 +136,11 @@
 	<para>Minimal boot CD and USB flash disk images are not
 	  available through BitTorrent.</para>
       </note>
+      <important>
+	<title>Verify your download</title>
+	<para>Once you have downloaded an ISO, verify it for security and integrity. To follow a web-based guide, visit <ulink
+	  url="https://fedoraproject.org/en/verify"/>.</para>
+      </important>
     </section>
   </section>
   <section id="sn-which-arch">
@@ -165,12 +170,12 @@
 	  </thead>
 	  <tbody>
 	      <row>
-		<entry>Intel (except Atom 230, Atom 330, Core 2 Duo, Centrino Core2 Duo, and recent vintage Xeon);
+		<entry>Intel (except Atom 230, Atom 330, Atom N-Series [450 and higher], Core 2 Duo, Centrino Core2 Duo, and recent vintage Xeon);
 		  AMD (except Athlon 64, Athlon x2, Sempron 64, and Opteron); VIA C3, C7</entry>
 		<entry><systemitem>i386</systemitem></entry>
 	      </row>
 	      <row>
-		<entry>Intel Atom 230, Atom 330, Core 2 Duo, Centrino Core 2 Duo, and Xeon; AMD
+		<entry>Intel Atom 230, Atom 330, Atom N-Series (450 and higher), Core 2 Duo, Centrino Core 2 Duo, and Xeon; AMD
 		  Athlon 64, Athlon x2, Sempron64, and Opteron; Apple MacBook, MacBook Pro, and MacBook Air</entry>
 		<entry><systemitem>x86_64</systemitem></entry>
 	      </row>
@@ -195,10 +200,10 @@
     </note>
     <note>
       <title>Intel Atom Processor Architectures Vary</title>
-      <para>The N and Z Series Atom processors are based on the 
-	<systemitem>i386</systemitem> architecture. The 230 and 330 Series 
+      <para>The Z Series and N200 Series Atom processors are based on the 
+	<systemitem>i386</systemitem> architecture. The 230 and 330 Series and the rest of the N Series 
 	Atom processors are based on the<systemitem>x86_64</systemitem> 
-	architecture. Refer to <ulink url="http://ark.intel.com/cpugroup.aspx?familyID=29035"/> for more details. </para>
+	architecture. Refer to <ulink url="http://ark.intel.com/products/family/29035"/> for more details. </para>
     </note>
   </section>
   <section id="sn-which-files">
@@ -233,8 +238,9 @@
 	    computer supports booting from CD or USB, you can boot the
 	    operating system without making any changes to your hard
 	    disk. The Live image also provides an <literal>Install to
-	      Hard Disk</literal> desktop shortcut. If you decide you
-	    like what you see, and want to install it, simply activate
+	    Hard Disk</literal> desktop shortcut (alternatively, the shortcut can be found in 
+	    <menuchoice> <guimenu>Applications</guimenu> <guisubmenu>System Tools</guisubmenu> </menuchoice>). 
+	    If you decide you like what you see, and want to install it, simply activate
 	    the selection to copy Fedora to your hard disk.  You can
 	    download the Live image directly from a mirror, or using
 	    BitTorrent.</para>
diff --git a/en-US/nextsteps.xml b/en-US/nextsteps.xml
index 7436b5e..b0500fe 100644
--- a/en-US/nextsteps.xml
+++ b/en-US/nextsteps.xml
@@ -213,31 +213,17 @@
 			</step>
 			 <step>
 				<para>
-					Run the following command to edit the <filename>/etc/inittab</filename> file:
+					Run the following commands to change the run level:
 				</para>
 				
-<screen><command>vi /etc/inittab</command></screen>
-
-			</step>
-			 <step>
-				<para>
-					Press the <keycap>I</keycap> key to enter <literal>insert</literal> mode.
-				</para>
-
-			</step>
-			 <step>
-				<para>
-					Find the line that includes the text <literal>initdefault</literal>. Change the numeral <literal>3</literal> to <literal>5</literal>.
-				</para>
-
-			</step>
-			 <step>
-				<para>
-					Type <literal>:wq</literal> and press the <keycap>Enter</keycap> key to save the file and exit the <application>vi</application> text editor.
-				</para>
+<screen>
+  <command>rm -f /etc/systemd/system/default.target</command>
+  <command>ln -s /lib/systemd/system/graphical.target</command>
+  <command>/etc/systemd/system/default.target</command>
+</screen>
 
 			</step>
-
+			 
 		</procedure>
 		
 		 <para>
diff --git a/en-US/pxe-server.xml b/en-US/pxe-server.xml
index ff8e103..94a8b2f 100644
--- a/en-US/pxe-server.xml
+++ b/en-US/pxe-server.xml
@@ -84,8 +84,14 @@
 	<para>To mount a DVD ISO image, use the following
 	  command:</para>
 	<screen><command><![CDATA[mount -ro loop,context=system_u:object_r:httpd_sys_content_t:s0 /path/to/image.iso /mnt/dvd]]></command></screen>
-      </step>
-      <step>
+    <note>
+      <title>If SELinux enabled, use the default label</title>
+      <para>
+	If SELinux is enabled, use the default <command>iso9660_t</command> label instead of <command>httpd_sys_content_t</command>.
+      </para>
+    </note>
+    </step>
+    <step>
 	<para>To support NFS installation, create a file
 	  <filename>/etc/exports</filename> and add the following line
 	  to it:</para>
diff --git a/en-US/vnc_Installation_Chapter.xml b/en-US/vnc_Installation_Chapter.xml
index 9b3fc21..3938915 100644
--- a/en-US/vnc_Installation_Chapter.xml
+++ b/en-US/vnc_Installation_Chapter.xml
@@ -47,10 +47,10 @@
 							Boot over the network.
 						</para>
 						 <para>
-							If the target system is configured with a static IP address, add the <command>vnc</command> command to the kickstart file. If the target system is using DHCP, add <command>vncconnect=<replaceable>HOST</replaceable></command> to the boot arguments for the target system. HOST is the IP address or DNS host name of the VNC viewer system. Enter the following at the prompt:
+							If the target system is configured with a static IP address, add the <command>vnc</command> command to the kickstart file. If the target system is using DHCP, add <command>vnc vncconnect=<replaceable>HOST</replaceable>[:<replaceable>port</replaceable>]</command> to the boot arguments for the target system. HOST is the IP address or DNS host name of the VNC viewer system. Specifying the port is optional. Enter the following at the prompt:
 						</para>
 						 
-<screen>boot: <userinput>linux vncconnect=<replaceable>HOST</replaceable></userinput></screen>
+<screen>boot: <userinput>linux vnc vncconnect=<replaceable>HOST</replaceable>[:<replaceable>port</replaceable>]</userinput></screen>
 
 					</listitem>
 
@@ -87,7 +87,7 @@
 			If your target system will be booting over the network, VNC is still available. Just add the <command>vnc</command> command to the kickstart file for the system. You will be able to connect to the target system using your VNC viewer and monitor the installation progress. The address to use is the one the system is configured with via the kickstart file.
 		</para>
 		 <para>
-			If you are using DHCP for the target system, the reverse <command>vncconnect</command> method may work better for you. Rather than adding the <command>vnc</command> boot parameter to the kickstart file, add the <command>vncconnect=<replaceable>HOST</replaceable></command> parameter to the list of boot arguments for the target system. For HOST, put the IP address or DNS host name of the VNC viewer system. See the next section for more details on using the vncconnect mode.
+			If you are using DHCP for the target system, the reverse <command>vnc vncconnect</command> method may work better for you. Rather than adding the <command>vnc</command> boot parameter to the kickstart file, add the <command>vnc vncconnect=<replaceable>HOST</replaceable>[:<replaceable>port</replaceable>]</command> parameter to the list of boot arguments for the target system. For HOST, put the IP address or DNS host name of the VNC viewer system. Specifying the port is optional. See the next section for more details on using the vncconnect mode.
 		</para>
 
 	</section>
@@ -108,7 +108,7 @@
 
 		</important>
 		 <para>
-			If you continue to have trouble, consider using the <command>vncconnect</command> parameter. In this mode of operation, you start the viewer on your system first telling it to listen for an incoming connection. Pass <command>vncconnect=<replaceable>HOST</replaceable></command> at the boot prompt and the installer will attempt to connect to the specified HOST (either a hostname or IP address).
+			If you continue to have trouble, consider using the <command>vnc vncconnect</command> parameter. In this mode of operation, you start the viewer on your system first telling it to listen for an incoming connection. Pass <command>vnc vncconnect=<replaceable>HOST</replaceable>[:<replaceable>port</replaceable>]</command> at the boot prompt and the installer will attempt to connect to the specified HOST (either a hostname or IP address). Specifying the port is optional.
 		</para>
 
 	</section>
diff --git a/en-US/vnc_Modes_Chapter.xml b/en-US/vnc_Modes_Chapter.xml
index 0579dab..3719f1f 100644
--- a/en-US/vnc_Modes_Chapter.xml
+++ b/en-US/vnc_Modes_Chapter.xml
@@ -70,12 +70,12 @@
 			The VNC connect mode changes how VNC is started. Rather than anaconda starting up and waiting for you to connect, the VNC connect mode allows anaconda to automatically connect to your view. You won't need to know the IP address of the target system in this case.
 		</para>
 		 <para>
-			To activate the VNC connect mode, pass the <command>vncconnect</command> boot parameter:
+			To activate the VNC connect mode, pass the <command>vnc vncconnect</command> boot parameter:
 		</para>
 		 
-<screen>boot: <userinput>linux vncconnect=<replaceable>HOST</replaceable></userinput></screen>
+		<screen>boot: <userinput>linux vnc vncconnect=<replaceable>HOST</replaceable>[:<replaceable>port</replaceable>]</userinput></screen>
 		 <para>
-			Replace HOST with your VNC viewer's IP address or DNS host name. Before starting the installation process on the target system, start up your VNC viewer and have it wait for an incoming connection.
+			Replace HOST with your VNC viewer's IP address or DNS host name. Specifying the port is optional. Before starting the installation process on the target system, start up your VNC viewer and have it wait for an incoming connection.
 		</para>
 		 <para>
 			Start the installation and when your VNC viewer displays the graphical installer, you are ready to go.


More information about the docs-commits mailing list