Fri Sep 10 21:24:18 UTC 2010

en-US/Account_Configuration-common.xml                              |   82 -
 en-US/Account_Configuration-x86.xml                                 |   52 +
 en-US/Account_Configuration_common-figure-1.xml                     |   14 
 en-US/Account_Configuration_common-indexterm-1.xml                  |    8 
 en-US/Account_Configuration_common-indexterm-2.xml                  |    9 
 en-US/Account_Configuration_common-note-1.xml                       |   12 
 en-US/Account_Configuration_common-note-2.xml                       |   11 
 en-US/Account_Configuration_common-note-3.xml                       |   12 
 en-US/Account_Configuration_common-para-1.xml                       |    8 
 en-US/Account_Configuration_common-para-2.xml                       |    8 
 en-US/Account_Configuration_common-para-3.xml                       |   12 
 en-US/Account_Configuration_common-para-4.xml                       |    8 
 en-US/Account_Configuration_common-para-5.xml                       |   10 
 en-US/Account_Configuration_common-para-6.xml                       |    1 
 en-US/Account_Configuration_common-para-7.xml                       |   11 
 en-US/Account_Configuration_common-para-8.xml                       |   10 
 en-US/Account_Configuration_common-title.xml                        |    3 
 en-US/Adding_Partitions-section-2-indexterm-1.xml                   |    3 
 en-US/Adding_Partitions-section-2-indexterm-2.xml                   |    3 
 en-US/Adding_Partitions-section-2-indexterm-3.xml                   |    5 
 en-US/Adding_Partitions-section-2-indexterm-4.xml                   |    3 
 en-US/Adding_Partitions-section-2-itemizedlist-1-listitem-0.xml     |    5 
 en-US/Adding_Partitions-section-2-itemizedlist-1-listitem-1.xml     |    1 
 en-US/Adding_Partitions-section-2-itemizedlist-1-listitem-2.xml     |    1 
 en-US/Adding_Partitions-section-2-itemizedlist-1-listitem-2a.xml    |    1 
 en-US/Adding_Partitions-section-2-itemizedlist-1-listitem-3.xml     |    5 
 en-US/Adding_Partitions-section-2-itemizedlist-1-listitem-4.xml     |    5 
 en-US/Adding_Partitions-section-2-itemizedlist-1-listitem-5.xml     |    5 
 en-US/Adding_Partitions-section-2-itemizedlist-1-listitem-6.xml     |    5 
 en-US/Adding_Partitions-section-2-itemizedlist-1-listitem-8.xml     |   10 
 en-US/Adding_Partitions-section-2-itemizedlist-1.xml                |   30 
 en-US/Adding_Partitions-section-2-itemizedlist-2.xml                |   30 
 en-US/Adding_Partitions-section-2-para-1.xml                        |    5 
 en-US/Adding_Partitions-x86.xml                                     |   10 
 en-US/Adding_Partitions_common-indexterm-1.xml                      |    3 
 en-US/Adding_Partitions_common-indexterm-2.xml                      |    3 
 en-US/Adding_Partitions_common-indexterm-3.xml                      |    3 
 en-US/Adding_Partitions_common-title-1.xml                          |    3 
 en-US/Adding_Partitions_x86_ppc-listitem-1.xml                      |    5 
 en-US/Adding_Partitions_x86_ppc-listitem-2.xml                      |    3 
 en-US/Adding_Partitions_x86_ppc-listitem-3.xml                      |    3 
 en-US/Adding_Partitions_x86_ppc-listitem-4.xml                      |    3 
 en-US/Adding_Partitions_x86_ppc-listitem-5.xml                      |    3 
 en-US/Adding_Partitions_x86_ppc-listitem-6.xml                      |    3 
 en-US/Adding_Partitions_x86_ppc-title-2.xml                         |    3 
 en-US/Advice_on_Partitions.xml                                      |   14 
 en-US/Assign_Storage_Devices-common-important-indexterm-1.xml       |    5 
 en-US/Assign_Storage_Devices-common-important-para-1.xml            |    8 
 en-US/Assign_Storage_Devices-common-important-title-1.xml           |    5 
 en-US/Assign_Storage_Devices-x86.xml                                |   17 
 en-US/Automatic_Partitioning_common-caution-1.xml                   |    7 
 en-US/Automatic_Partitioning_common-indexterm-1.xml                 |    3 
 en-US/Automatic_Partitioning_common-indexterm-2.xml                 |    3 
 en-US/Automatic_Partitioning_common-note-1.xml                      |    9 
 en-US/Automatic_Partitioning_common-para-3.xml                      |    3 
 en-US/Automatic_Partitioning_common-para-4.xml                      |    3 
 en-US/Automatic_Partitioning_common-varlistentry-1.xml              |    5 
 en-US/Automatic_Partitioning_common-varlistentry-3.xml              |    2 
 en-US/Automatic_Partitioning_x86_ppc-tip-para-1.xml                 |    3 
 en-US/Automatic_Partitioning_x86_ppc-tip-para-2.xml                 |    3 
 en-US/Automatic_Partitioning_x86_ppc-tip-para-3.xml                 |    3 
 en-US/Beginning_Installation-x86.xml                                |   25 
 en-US/Beginning_Installation_Hard_Disk-x86.xml                      |    9 
 en-US/Beginning_Installation_Hard_Disk_common-indexterm-1.xml       |    3 
 en-US/Beginning_Installation_Hard_Disk_common-indexterm-10.xml      |    1 
 en-US/Beginning_Installation_Hard_Disk_common-indexterm-2.xml       |    3 
 en-US/Beginning_Installation_Hard_Disk_common-indexterm-3.xml       |    1 
 en-US/Beginning_Installation_Hard_Disk_common-indexterm-4.xml       |    3 
 en-US/Beginning_Installation_Hard_Disk_common-indexterm-5.xml       |    1 
 en-US/Beginning_Installation_Hard_Disk_common-indexterm-6.xml       |    1 
 en-US/Beginning_Installation_Hard_Disk_common-indexterm-7.xml       |    3 
 en-US/Beginning_Installation_Hard_Disk_common-indexterm-8.xml       |    1 
 en-US/Beginning_Installation_Hard_Disk_common-indexterm-9.xml       |    3 
 en-US/Beginning_Installation_Hard_Disk_common-note-1.xml            |    1 
 en-US/Beginning_Installation_Hard_Disk_common-note-2.xml            |    1 
 en-US/Beginning_Installation_Hard_Disk_common-para-1.xml            |    3 
 en-US/Beginning_Installation_Hard_Disk_common-para-10.xml           |    1 
 en-US/Beginning_Installation_Hard_Disk_common-para-11.xml           |    8 
 en-US/Beginning_Installation_Hard_Disk_common-para-3.xml            |    3 
 en-US/Beginning_Installation_Hard_Disk_common-para-5.xml            |    3 
 en-US/Beginning_Installation_Hard_Disk_common-para-6.xml            |    7 
 en-US/Beginning_Installation_Hard_Disk_common-para-8.xml            |    7 
 en-US/Beginning_Installation_Hard_Disk_common-para-9.xml            |    1 
 en-US/Beginning_Installation_Hard_Disk_common-screen-1.xml          |    7 
 en-US/Beginning_Installation_Hard_Disk_common-table-1.xml           |   13 
 en-US/Beginning_Installation_Hard_Disk_common-title-1.xml           |    3 
 en-US/Beginning_Installation_Hard_Disk_x86_ppc-figure-1.xml         |    3 
 en-US/Beginning_Installation_NFS-x86.xml                            |   13 
 en-US/Beginning_Installation_NFS_common-figure-1.xml                |    3 
 en-US/Beginning_Installation_NFS_common-indexterm-1.xml             |    3 
 en-US/Beginning_Installation_NFS_common-indexterm-2.xml             |    3 
 en-US/Beginning_Installation_NFS_common-indexterm-3.xml             |    3 
 en-US/Beginning_Installation_NFS_common-indexterm-4.xml             |    3 
 en-US/Beginning_Installation_NFS_common-para-1.xml                  |    5 
 en-US/Beginning_Installation_NFS_common-para-2.xml                  |    3 
 en-US/Beginning_Installation_NFS_common-para-4.xml                  |    5 
 en-US/Beginning_Installation_NFS_common-para-5.xml                  |    5 
 en-US/Beginning_Installation_NFS_common-para-6.xml                  |    7 
 en-US/Beginning_Installation_NFS_common-para-7.xml                  |    8 
 en-US/Beginning_Installation_NFS_common-title-1.xml                 |    3 
 en-US/Beginning_Installation_Network-x86.xml                        |   23 
 en-US/Beginning_Installation_Network_x86_ppc-indexterm-1.xml        |    3 
 en-US/Beginning_Installation_Network_x86_ppc-indexterm-2.xml        |    3 
 en-US/Beginning_Installation_Network_x86_ppc-indexterm-3.xml        |    3 
 en-US/Beginning_Installation_Network_x86_ppc-list-1.xml             |   18 
 en-US/Beginning_Installation_Network_x86_ppc-para-1.xml             |    3 
 en-US/Beginning_Installation_Network_x86_ppc-para-2.xml             |    3 
 en-US/Beginning_Installation_Network_x86_ppc-para-3.xml             |    3 
 en-US/Beginning_Installation_Network_x86_ppc-para-4.xml             |    3 
 en-US/Beginning_Installation_Network_x86_ppc-para-5.xml             |    3 
 en-US/Beginning_Installation_Network_x86_ppc-para-6.xml             |    1 
 en-US/Beginning_Installation_Network_x86_ppc-para-7.xml             |   13 
 en-US/Beginning_Installation_Network_x86_ppc-para-8.xml             |   14 
 en-US/Beginning_Installation_Network_x86_ppc-title.xml              |    3 
 en-US/Beginning_Installation_URL-common-figure-1.xml                |    3 
 en-US/Beginning_Installation_URL-common-indexterm-1.xml             |    1 
 en-US/Beginning_Installation_URL-common-indexterm-2.xml             |    3 
 en-US/Beginning_Installation_URL-common-indexterm-3.xml             |    3 
 en-US/Beginning_Installation_URL-common-indexterm-4.xml             |   13 
 en-US/Beginning_Installation_URL-common-indexterm-5.xml             |   12 
 en-US/Beginning_Installation_URL-common-indexterm-6.xml             |   10 
 en-US/Beginning_Installation_URL-common-para-1.xml                  |    6 
 en-US/Beginning_Installation_URL-common-para-2-Fedora.xml           |    8 
 en-US/Beginning_Installation_URL-common-para-2.xml                  |    9 
 en-US/Beginning_Installation_URL-common-para-3.xml                  |    7 
 en-US/Beginning_Installation_URL-common-para-4.xml                  |    8 
 en-US/Beginning_Installation_URL-common-para-5.xml                  |    8 
 en-US/Beginning_Installation_URL-common-title-1.xml                 |    3 
 en-US/Beginning_Installation_URL-x86.xml                            |   38 
 en-US/Beginning_Installation_x86_ppc-indexterm-1.xml                |    3 
 en-US/Beginning_Installation_x86_ppc-indexterm-2.xml                |    3 
 en-US/Beginning_Installation_x86_ppc-indexterm-3.xml                |    5 
 en-US/Beginning_Installation_x86_ppc-indexterm-4.xml                |    5 
 en-US/Beginning_Installation_x86_ppc-indexterm-5.xml                |    5 
 en-US/Beginning_Installation_x86_ppc-indexterm-6.xml                |    5 
 en-US/Beginning_Installation_x86_ppc-para-1.xml                     |    3 
 en-US/Beginning_Installation_x86_ppc-para-3.xml                     |    5 
 en-US/Beginning_Installation_x86_ppc-title-1.xml                    |    3 
 en-US/Book_Info.xml                                                 |    2 
 en-US/Boot-x86.xml                                                  |   40 
 en-US/Boot_Init_Shutdown.xml                                        |   57 -
 en-US/Boot_Order-para-2.xml                                         |    1 
 en-US/Boot_Order-para-3.xml                                         |    3 
 en-US/Boot_Order-para-4.xml                                         |    3 
 en-US/Boot_Order-para-5.xml                                         |    1 
 en-US/Boot_x86_ppc-para-1.xml                                       |    2 
 en-US/Boot_x86_ppc-para-4.xml                                       |    2 
 en-US/Boot_x86_ppc-para-5.xml                                       |    2 
 en-US/Boot_x86_ppc-table-1.xml                                      |   24 
 en-US/Boot_x86_ppc-variablelist-1.xml                               |    9 
 en-US/Complete-x86.xml                                              |   17 
 en-US/Complete_common-para-1.xml                                    |    3 
 en-US/Complete_common-para-3.xml                                    |   11 
 en-US/Complete_common-para-5.xml                                    |   11 
 en-US/Complete_common-title-1.xml                                   |    3 
 en-US/Complete_x86-para-2.xml                                       |    3 
 en-US/Create_LVM-common-important-1.xml                             |    4 
 en-US/Create_LVM-common-para-2.xml                                  |    2 
 en-US/Create_LVM-common-para-3.xml                                  |    7 
 en-US/Create_LVM-common-para-4.xml                                  |    7 
 en-US/Create_LVM-common-para-5.xml                                  |    9 
 en-US/Create_LVM-common-para-6.xml                                  |    8 
 en-US/Create_LVM-common-term-1.xml                                  |    8 
 en-US/Create_LVM-common-term-2.xml                                  |    7 
 en-US/Create_LVM-common-variablelist-1.xml                          |   32 
 en-US/Create_LVM-x86.xml                                            |    2 
 en-US/Create_Software_RAID-common-para-1.xml                        |    2 
 en-US/Create_Software_RAID-common-variablelist-1.xml                |    4 
 en-US/Create_Storage-common-listitem-3.xml                          |    2 
 en-US/DU-Preparing_a_driver_update_disk_ppc_x86-warning-1.xml       |    5 
 en-US/Disk_Partitioning_Advanced_Storage-x86.xml                    |    4 
 en-US/Disk_Partitioning_Advanced_Storage_common-para-3.xml          |    2 
 en-US/Disk_Partitioning_Graphical_common-para-1.xml                 |    3 
 en-US/Disk_Partitioning_Graphical_x86_ppc-para-1.xml                |    2 
 en-US/Disk_Partitioning_Scheme-x86.xml                              |    2 
 en-US/Disk_Partitioning_Scheme_common-indexterm-1.xml               |    3 
 en-US/Disk_Partitioning_Scheme_common-indexterm-2.xml               |    3 
 en-US/Disk_Partitioning_Scheme_common-indexterm-3.xml               |    3 
 en-US/Disk_Partitioning_Scheme_common-indexterm-4.xml               |    3 
 en-US/Disk_Partitioning_Scheme_common-indexterm-5.xml               |    3 
 en-US/Disk_Partitioning_Scheme_common-listitem-1.xml                |    3 
 en-US/Disk_Partitioning_Scheme_common-title.xml                     |    3 
 en-US/Disk_Partitioning_Scheme_x86_s390-para-1.xml                  |    1 
 en-US/Disk_Partitioning_Setup-x86.xml                               |    3 
 en-US/Disk_Partitioning_Setup_common-figure-1.xml                   |    3 
 en-US/Disk_Partitioning_Setup_common-important-1.xml                |   12 
 en-US/Disk_Partitioning_Setup_common-indexterm-1.xml                |    3 
 en-US/Disk_Partitioning_Setup_common-indexterm-2.xml                |    3 
 en-US/Disk_Partitioning_Setup_common-indexterm-6.xml                |    3 
 en-US/Disk_Partitioning_Setup_common-indexterm-7.xml                |    3 
 en-US/Disk_Partitioning_Setup_common-indexterm-8.xml                |    3 
 en-US/Disk_Partitioning_Setup_common-title.xml                      |    3 
 en-US/Disk_Partitioning_Setup_common-warning-1.xml                  |   12 
 en-US/Disk_Partitioning_X86_Partitions.xml                          |    9 
 en-US/Disk_Partitioning_common-indexterm-1.xml                      |    3 
 en-US/Disk_Partitioning_common-indexterm-2.xml                      |    5 
 en-US/Disk_Partitioning_common-indexterm-3.xml                      |    3 
 en-US/Disk_Partitioning_common-para-1.xml                           |    5 
 en-US/Disk_Partitioning_x86_ppc-para-1.xml                          |    3 
 en-US/Encrypt-x86.xml                                               |    8 
 en-US/Encrypt_common-para-1.xml                                     |    2 
 en-US/Encrypt_common-para-3.xml                                     |    7 
 en-US/Encrypt_common-warning-1.xml                                  |   13 
 en-US/Files_in_progress.txt                                         |   47 +
 en-US/Graphical_Installation-x86.xml                                |   96 --
 en-US/Graphical_Installation_User_Interface_x86-note-1.xml          |   24 
 en-US/Graphical_Installation_User_Interface_x86_ppc-note-Fedora.xml |   20 
 en-US/Graphical_Installation_User_Interface_x86_ppc-note-para-1.xml |    3 
 en-US/Graphical_Installation_User_Interface_x86_ppc-note-para-2.xml |    3 
 en-US/Graphical_Installation_common-important-1.xml                 |   14 
 en-US/Graphical_Installation_common-list-1.xml                      |   38 
 en-US/Graphical_Installation_common-list-item-1.xml                 |    3 
 en-US/Graphical_Installation_common-list-item-2.xml                 |    3 
 en-US/Graphical_Installation_common-list-item-3.xml                 |    3 
 en-US/Graphical_Installation_common-list-item-4.xml                 |    3 
 en-US/Graphical_Installation_common-list-item-5.xml                 |    3 
 en-US/Graphical_Installation_common-list-item-6.xml                 |    3 
 en-US/Graphical_Installation_common-note-1.xml                      |   31 
 en-US/Graphical_Installation_common-note-2.xml                      |    3 
 en-US/Graphical_Installation_common-para-1.xml                      |    3 
 en-US/Graphical_Installation_common-para-2.xml                      |    3 
 en-US/Graphical_Installation_common-section-1-indexterm-1.xml       |   12 
 en-US/Graphical_Installation_common-section-1-indexterm-2.xml       |   11 
 en-US/Graphical_Installation_common-section-1-mediaobject-1.xml     |   14 
 en-US/Graphical_Installation_common-section-1-mediaobject-2.xml     |   14 
 en-US/Graphical_Installation_common-section-1-para-1.xml            |   10 
 en-US/Graphical_Installation_common-section-1-title-1.xml           |    7 
 en-US/Graphical_Installation_common-section-1-title-2.xml           |    8 
 en-US/Graphical_Installation_common-section-1-title-3.xml           |    8 
 en-US/Graphical_Installation_common-section-2.xml                   |    3 
 en-US/Graphical_Installation_screenshots.xml                        |    1 
 en-US/Graphical_Installation_x86-Installation-methods.xml           |   39 
 en-US/Graphical_Installation_x86-common-section-1.xml               |  103 --
 en-US/Graphical_Installation_x86-para-5.xml                         |   11 
 en-US/Graphical_Installation_x86_Starting.xml                       |  116 +-
 en-US/Graphical_Installation_x86_ppc-para-1.xml                     |    5 
 en-US/Graphical_Installation_x86_ppc-para-3.xml                     |    6 
 en-US/Graphical_Installation_x86_ppc-para-4.xml                     |   10 
 en-US/Graphical_Installation_x86_ppc-para-6.xml                     |    3 
 en-US/Graphical_Installation_x86_ppc-table-1-title.xml              |    3 
 en-US/Graphical_and_Text_Interfaces.xml                             |   49 -
 en-US/Grub.xml                                                      |   63 -
 en-US/Important-Kickstart_and_Firstboot.xml                         |    3 
 en-US/Important_UEFI.xml                                            |    6 
 en-US/Important_UEFI_32.xml                                         |   11 
 en-US/Important_URL.xml                                             |   11 
 en-US/Initializing_Hard_Disk-x86.xml                                |    4 
 en-US/Initializing_Hard_Disk_common-para-4.xml                      |    9 
 en-US/Installation_Guide.xml                                        |   19 
 en-US/Installation_Method-x86.xml                                   |    7 
 en-US/Installation_Phase_2-common-para-1.xml                        |    7 
 en-US/Installation_Phase_2-common-title-1.xml                       |    6 
 en-US/Installation_Phase_2-x86.xml                                  |   27 
 en-US/Installing_Packages-x86.xml                                   |   13 
 en-US/Installing_Packages_common-figure-1.xml                       |   14 
 en-US/Installing_Packages_common-figure-2.xml                       |   14 
 en-US/Installing_Packages_common-note-1.xml                         |   13 
 en-US/Installing_Packages_common-para-1.xml                         |    3 
 en-US/Installing_Packages_common-para-2.xml                         |   13 
 en-US/Installing_Packages_common-para-2a.xml                        |    1 
 en-US/Installing_Packages_common-para-3.xml                         |    1 
 en-US/Installing_Packages_common-para-4.xml                         |   10 
 en-US/Installing_Packages_common-title.xml                          |    3 
 en-US/Key_Board_Configuration-x86.xml                               |    3 
 en-US/Key_Board_Configuration_x86_ppc-indexterm-1.xml               |    3 
 en-US/Key_Board_Configuration_x86_ppc-indexterm-2.xml               |    3 
 en-US/Key_Board_Configuration_x86_ppc-para-1.xml                    |    3 
 en-US/Key_Board_Configuration_x86_ppc-para-2.xml                    |    3 
 en-US/Key_Board_Configuration_x86_ppc-title-1.xml                   |    3 
 en-US/Kickstart-note-1.xml                                          |    1 
 en-US/Kickstart2.xml                                                |  370 ++++----
 en-US/Ksconfig.xml                                                  |   60 -
 en-US/Language_Selection-x86.xml                                    |   14 
 en-US/Language_Selection_common-indexterm.xml                       |    3 
 en-US/Language_Selection_common-para-1.xml                          |    3 
 en-US/Language_Selection_common-para-2.xml                          |    3 
 en-US/Language_Selection_common-para-3.xml                          |    9 
 en-US/Language_Selection_common-title.xml                           |    3 
 en-US/Making_Fedora_Media.xml                                       |   77 -
 en-US/Making_Media.xml                                              |  161 +++
 en-US/Making_Minimal_Boot_Media.xml                                 |  179 ++++
 en-US/Making_USB_media.xml                                          |   29 
 en-US/Netboot_DHCP.xml                                              |    7 
 en-US/Netboot_TFTP.xml                                              |    9 
 en-US/Netconfig-common-tip-2.xml                                    |   19 
 en-US/Netconfig-x86.xml                                             |  118 ++
 en-US/Netconfig_common-figure-1.xml                                 |   16 
 en-US/Netconfig_common-figure-3.xml                                 |   16 
 en-US/Netconfig_common-figure-4.xml                                 |   17 
 en-US/Netconfig_common-important-1.xml                              |   15 
 en-US/Netconfig_common-indexterm-1.xml                              |    9 
 en-US/Netconfig_common-indexterm-2.xml                              |    9 
 en-US/Netconfig_common-indexterm-3.xml                              |    9 
 en-US/Netconfig_common-indexterm-4.xml                              |    9 
 en-US/Netconfig_common-indexterm-5.xml                              |    9 
 en-US/Netconfig_common-note-1.xml                                   |   12 
 en-US/Netconfig_common-note-2.xml                                   |   12 
 en-US/Netconfig_common-para-10.xml                                  |    9 
 en-US/Netconfig_common-para-11.xml                                  |    9 
 en-US/Netconfig_common-para-12.xml                                  |    9 
 en-US/Netconfig_common-para-13.xml                                  |    9 
 en-US/Netconfig_common-para-14.xml                                  |    9 
 en-US/Netconfig_common-para-15.xml                                  |    9 
 en-US/Netconfig_common-para-16.xml                                  |    9 
 en-US/Netconfig_common-para-17.xml                                  |    9 
 en-US/Netconfig_common-para-18.xml                                  |    9 
 en-US/Netconfig_common-para-19.xml                                  |    9 
 en-US/Netconfig_common-para-2.xml                                   |    9 
 en-US/Netconfig_common-para-20.xml                                  |    9 
 en-US/Netconfig_common-para-6.xml                                   |    9 
 en-US/Netconfig_common-section-1.xml                                |   22 
 en-US/Netconfig_common-section-2.xml                                |   25 
 en-US/Netconfig_common-section-3.xml                                |   93 ++
 en-US/Netconfig_common-section-4.xml                                |   37 
 en-US/Netconfig_common-section-5.xml                                |  122 ++
 en-US/Netconfig_common-title-1.xml                                  |    7 
 en-US/Netconfig_common-title-3.xml                                  |    7 
 en-US/Netconfig_common-title-4.xml                                  |    7 
 en-US/Netconfig_common-variablelist-2.xml                           |   68 +
 en-US/Other_Disk_Devices-x86.xml                                    |    2 
 en-US/Package_Selection-x86.xml                                     |   22 
 en-US/Package_Selection_Customizing-common-figure-1.xml             |   17 
 en-US/Package_Selection_Customizing-common-figure-2.xml             |   16 
 en-US/Package_Selection_Customizing-common-itemizedlist-1.xml       |   34 
 en-US/Package_Selection_Customizing-common-itemizedlist-2.xml       |   24 
 en-US/Package_Selection_Customizing-common-note-1.xml               |   13 
 en-US/Package_Selection_Customizing-common-para-1.xml               |   11 
 en-US/Package_Selection_Customizing-common-para-10.xml              |   10 
 en-US/Package_Selection_Customizing-common-para-11.xml              |   10 
 en-US/Package_Selection_Customizing-common-para-12.xml              |    9 
 en-US/Package_Selection_Customizing-common-para-2.xml               |   10 
 en-US/Package_Selection_Customizing-common-para-3.xml               |   10 
 en-US/Package_Selection_Customizing-common-para-4.xml               |   10 
 en-US/Package_Selection_Customizing-common-para-5.xml               |   10 
 en-US/Package_Selection_Customizing-common-para-6.xml               |    9 
 en-US/Package_Selection_Customizing-common-para-7.xml               |   10 
 en-US/Package_Selection_Customizing-common-para-8.xml               |   11 
 en-US/Package_Selection_Customizing-common-para-9.xml               |   10 
 en-US/Package_Selection_Customizing-common-title-1.xml              |   11 
 en-US/Package_Selection_Customizing-common-title-2.xml              |   11 
 en-US/Package_Selection_Customizing-x86.xml                         |  237 +----
 en-US/Package_Selection_common-imagecap-1.xml                       |    3 
 en-US/Package_Selection_common-imagecap-2.xml                       |    3 
 en-US/Package_Selection_common-indexterm-1.xml                      |    3 
 en-US/Package_Selection_common-indexterm-2.xml                      |    3 
 en-US/Package_Selection_common-indexterm-3.xml                      |    3 
 en-US/Package_Selection_common-indexterm-4.xml                      |    3 
 en-US/Package_Selection_common-indexterm-5.xml                      |    3 
 en-US/Package_Selection_common-indexterm-6.xml                      |    3 
 en-US/Package_Selection_common-note-1.xml                           |   15 
 en-US/Package_Selection_common-note-2.xml                           |    1 
 en-US/Package_Selection_common-para-1.xml                           |    3 
 en-US/Package_Selection_common-para-2.xml                           |    3 
 en-US/Package_Selection_common-para-3.xml                           |    3 
 en-US/Package_Selection_common-para-4.xml                           |    3 
 en-US/Package_Selection_common-para-7.xml                           |   10 
 en-US/Package_Selection_common-title-1.xml                          |    3 
 en-US/Partitions-x86.xml                                            |    7 
 en-US/Partitions_common-caution-1.xml                               |    3 
 en-US/Partitions_common-imagecap-1.xml                              |    3 
 en-US/Partitions_common-imagecap-10.xml                             |    3 
 en-US/Partitions_common-imagecap-2.xml                              |    3 
 en-US/Partitions_common-imagecap-3.xml                              |    3 
 en-US/Partitions_common-imagecap-4.xml                              |    3 
 en-US/Partitions_common-imagecap-5.xml                              |    3 
 en-US/Partitions_common-imagecap-6.xml                              |    3 
 en-US/Partitions_common-imagecap-7.xml                              |    3 
 en-US/Partitions_common-imagecap-8.xml                              |    3 
 en-US/Partitions_common-imagecap-9.xml                              |    3 
 en-US/Partitions_common-indexterm-1.xml                             |    3 
 en-US/Partitions_common-indexterm-10.xml                            |    3 
 en-US/Partitions_common-indexterm-11.xml                            |    1 
 en-US/Partitions_common-indexterm-12.xml                            |    3 
 en-US/Partitions_common-indexterm-13.xml                            |    3 
 en-US/Partitions_common-indexterm-14.xml                            |    3 
 en-US/Partitions_common-indexterm-15.xml                            |    3 
 en-US/Partitions_common-indexterm-16.xml                            |    3 
 en-US/Partitions_common-indexterm-17.xml                            |    3 
 en-US/Partitions_common-indexterm-18.xml                            |    3 
 en-US/Partitions_common-indexterm-19.xml                            |    3 
 en-US/Partitions_common-indexterm-2.xml                             |    3 
 en-US/Partitions_common-indexterm-3.xml                             |    3 
 en-US/Partitions_common-indexterm-4.xml                             |    3 
 en-US/Partitions_common-indexterm-5.xml                             |    3 
 en-US/Partitions_common-indexterm-6.xml                             |    1 
 en-US/Partitions_common-indexterm-7.xml                             |    3 
 en-US/Partitions_common-indexterm-8.xml                             |    1 
 en-US/Partitions_common-indexterm-9.xml                             |    3 
 en-US/Partitions_common-itemizedlist-1.xml                          |    3 
 en-US/Partitions_common-itemizedlist-2.xml                          |    3 
 en-US/Partitions_common-itemizedlist-3.xml                          |    3 
 en-US/Partitions_common-note-1.xml                                  |    3 
 en-US/Partitions_common-note-3.xml                                  |    3 
 en-US/Partitions_common-para-1.xml                                  |    3 
 en-US/Partitions_common-para-10.xml                                 |    3 
 en-US/Partitions_common-para-11.xml                                 |    3 
 en-US/Partitions_common-para-12.xml                                 |    3 
 en-US/Partitions_common-para-13.xml                                 |    3 
 en-US/Partitions_common-para-14.xml                                 |    3 
 en-US/Partitions_common-para-15.xml                                 |    3 
 en-US/Partitions_common-para-16.xml                                 |    3 
 en-US/Partitions_common-para-17.xml                                 |    3 
 en-US/Partitions_common-para-18.xml                                 |    3 
 en-US/Partitions_common-para-19.xml                                 |    3 
 en-US/Partitions_common-para-2.xml                                  |    3 
 en-US/Partitions_common-para-20.xml                                 |    3 
 en-US/Partitions_common-para-21.xml                                 |    3 
 en-US/Partitions_common-para-22.xml                                 |    3 
 en-US/Partitions_common-para-23.xml                                 |    3 
 en-US/Partitions_common-para-24.xml                                 |    3 
 en-US/Partitions_common-para-3.xml                                  |    3 
 en-US/Partitions_common-para-4.xml                                  |    3 
 en-US/Partitions_common-para-5.xml                                  |    3 
 en-US/Partitions_common-para-6.xml                                  |    3 
 en-US/Partitions_common-para-7.xml                                  |    3 
 en-US/Partitions_common-para-8.xml                                  |    3 
 en-US/Partitions_common-para-9.xml                                  |    3 
 en-US/Partitions_common-table-title-1.xml                           |    3 
 en-US/Partitions_common-term-1.xml                                  |    3 
 en-US/Partitions_common-title-10.xml                                |    3 
 en-US/Partitions_common-title-2.xml                                 |    3 
 en-US/Partitions_common-title-3.xml                                 |    3 
 en-US/Partitions_common-title-4.xml                                 |    3 
 en-US/Partitions_common-title-5.xml                                 |    3 
 en-US/Partitions_common-title-6.xml                                 |    3 
 en-US/Partitions_common-title-7.xml                                 |    3 
 en-US/Partitions_common-title-8.xml                                 |    3 
 en-US/Partitions_common-title-9.xml                                 |    3 
 en-US/Partitions_common-title.xml                                   |    3 
 en-US/Partitions_complete-note-1.xml                                |    3 
 en-US/Preface.xml                                                   |    7 
 en-US/Prepare_To_Install-common-Boot_Media.xml                      |    3 
 en-US/Preparing-common-title-1.xml                                  |    5 
 en-US/Procedure-dd_Image_to_USB.xml                                 |   19 
 en-US/Rescue_Mode.xml                                               |   17 
 en-US/Revision_History.xml                                          |   16 
 en-US/Specialized_Storage_Devices-x86.xml                           |   14 
 en-US/Specialized_Storage_Devices_common-figure-1.xml               |    4 
 en-US/Specialized_Storage_Devices_common-figure-4.xml               |   14 
 en-US/Specialized_Storage_Devices_common-figure-5.xml               |   14 
 en-US/Specialized_Storage_Devices_common-important-1.xml            |   15 
 en-US/Specialized_Storage_Devices_common-para-6.xml                 |    2 
 en-US/Specialized_Storage_Devices_common-para-7.xml                 |    7 
 en-US/Steps-x86.xml                                                 |    8 
 en-US/Steps_Cdrom-x86.xml                                           |  112 --
 en-US/Steps_Diskspace-x86.xml                                       |    5 
 en-US/Steps_Diskspace_x86_ppc_Itemized_List.xml                     |    5 
 en-US/Steps_Diskspace_x86_ppc_oneline_paragraph.xml                 |    1 
 en-US/Steps_Hd_Install-x86.xml                                      |  120 +-
 en-US/Steps_Hd_Install_common-indexterm-1.xml                       |   12 
 en-US/Steps_Hd_Install_common-indexterm-2.xml                       |   13 
 en-US/Steps_Hd_Install_common-itemizedlist-1.xml                    |   23 
 en-US/Steps_Hd_Install_common-para-1.xml                            |   11 
 en-US/Steps_Hd_Install_common-para-2.xml                            |    8 
 en-US/Steps_Hd_Install_common-para-3.xml                            |    8 
 en-US/Steps_Hd_Install_common-para-4.xml                            |    8 
 en-US/Steps_Hd_Install_common-para-5.xml                            |    8 
 en-US/Steps_Hd_Install_common-para-6.xml                            |    8 
 en-US/Steps_Hd_Install_common-screen-1.xml                          |    9 
 en-US/Steps_Hd_Install_common-title-1.xml                           |    9 
 en-US/Steps_Hd_Install_x86_note_1.xml                               |    3 
 en-US/Steps_Hd_Install_x86_ppc_note_1.xml                           |   11 
 en-US/Steps_Hd_Install_x86_ppc_note_para_1.xml                      |    7 
 en-US/Steps_Hd_Install_x86_ppc_para_1.xml                           |    7 
 en-US/Steps_Hd_Install_x86_ppc_s390_listitem_1.xml                  |    7 
 en-US/Steps_Hd_Install_x86_ppc_s390_listitem_1a.xml                 |    6 
 en-US/Steps_Hd_Install_x86_ppc_s390_listitem_2.xml                  |   10 
 en-US/Steps_Hd_Install_x86_ppc_s390_listitem_2b.xml                 |   10 
 en-US/Steps_Hd_Install_x86_ppc_s390_para_0.xml                      |    8 
 en-US/Steps_Hd_Install_x86_ppc_s390_para_1.xml                      |    5 
 en-US/Steps_Hd_Install_x86_ppc_s390_para_2.xml                      |    7 
 en-US/Steps_Network_Install-x86.xml                                 |   26 
 en-US/Steps_Network_Install_common-title-1.xml                      |    6 
 en-US/Steps_Network_Install_section_2-common-para-1.xml             |    2 
 en-US/Steps_Network_Install_section_2-common-para-2.xml             |    7 
 en-US/Steps_Network_Install_section_2-common-para-3.xml             |    7 
 en-US/Steps_Network_Install_section_2-common-para-7.xml             |    2 
 en-US/Steps_Network_Install_section_2-common-para-8.xml             |    2 
 en-US/Steps_Network_Install_section_2-common-para-9.xml             |    8 
 en-US/Steps_Network_Install_section_2-common-screen-1.xml           |   23 
 en-US/Steps_Network_Install_x86_ppc_note.xml                        |    2 
 en-US/Steps_Network_Install_x86_ppc_note_2.xml                      |    5 
 en-US/Steps_Network_Install_x86_ppc_s390_itemized_list_1.xml        |   60 -
 en-US/Steps_Network_Install_x86_ppc_s390_note_1.xml                 |    7 
 en-US/Steps_Network_Install_x86_ppc_s390_para_1.xml                 |    3 
 en-US/Steps_Network_Install_x86_ppc_s390_para_2.xml                 |    5 
 en-US/Steps_Network_Install_x86_ppc_s390_para_3.xml                 |    5 
 en-US/Steps_Network_Install_x86_ppc_s390_section_1.xml              |   58 -
 en-US/Steps_Network_Install_x86_ppc_s390_section_2.xml              |   71 -
 en-US/Steps_Network_Install_x86_section_1.xml                       |   46 -
 en-US/Steps_Network_Install_x86_section_2.xml                       |   89 +-
 en-US/Steps_Upgrade-common.xml                                      |    3 
 en-US/Storage_Devices-x86.xml                                       |    4 
 en-US/Swap_Partrecommend.xml                                        |    5 
 en-US/System_Requirements_Table.xml                                 |    7 
 en-US/Systems_with_Intel_BIOS_RAID.xml                              |    2 
 en-US/TUI-common-listitem-1.xml                                     |   10 
 en-US/TUI-common-listitem-2.xml                                     |   10 
 en-US/TUI-common-listitem-3.xml                                     |   10 
 en-US/TUI-common-listitem-4.xml                                     |   10 
 en-US/TUI-common-listitem-5.xml                                     |   10 
 en-US/TUI-common-para-1.xml                                         |    8 
 en-US/TUI-common-title-1.xml                                        |    6 
 en-US/TUI-x86.xml                                                   |   56 +
 en-US/Time_Zone-x86.xml                                             |   12 
 en-US/Time_Zone_common-figure-1.xml                                 |    3 
 en-US/Time_Zone_common-indexterm-1.xml                              |    3 
 en-US/Time_Zone_common-indexterm-2.xml                              |    3 
 en-US/Time_Zone_common-indexterm-3.xml                              |    3 
 en-US/Time_Zone_common-indexterm-4.xml                              |    3 
 en-US/Time_Zone_common-indexterm-5.xml                              |    3 
 en-US/Time_Zone_common-indexterm-6.xml                              |    3 
 en-US/Time_Zone_common-indexterm-7.xml                              |    1 
 en-US/Time_Zone_common-itemizedlist-1.xml                           |    3 
 en-US/Time_Zone_common-note-1.xml                                   |   16 
 en-US/Time_Zone_common-para-1.xml                                   |    3 
 en-US/Time_Zone_common-para-2.xml                                   |    3 
 en-US/Time_Zone_common-para-4.xml                                   |    1 
 en-US/Time_Zone_common-para-5.xml                                   |   10 
 en-US/Time_Zone_common-para-6.xml                                   |    7 
 en-US/Time_Zone_common-tip-1.xml                                    |    6 
 en-US/Time_Zone_common-title.xml                                    |    3 
 en-US/Trouble-x86.xml                                               |   23 
 en-US/Trouble_After_Booting_GUI-indexterm-1.xml                     |    3 
 en-US/Trouble_After_Booting_GUI-indexterm-2.xml                     |    3 
 en-US/Trouble_After_Booting_GUI-indexterm-3.xml                     |    3 
 en-US/Trouble_After_Booting_GUI-para-1.xml                          |    3 
 en-US/Trouble_After_Booting_GUI-para-10.xml                         |    3 
 en-US/Trouble_After_Booting_GUI-para-2.xml                          |    3 
 en-US/Trouble_After_Booting_GUI-para-3.xml                          |    3 
 en-US/Trouble_After_Booting_GUI-para-4.xml                          |    3 
 en-US/Trouble_After_Booting_GUI-para-5.xml                          |    3 
 en-US/Trouble_After_Booting_GUI-para-6.xml                          |    3 
 en-US/Trouble_After_Booting_GUI-para-7.xml                          |    3 
 en-US/Trouble_After_Booting_GUI-para-8.xml                          |    3 
 en-US/Trouble_After_Booting_GUI-para-9.xml                          |    3 
 en-US/Trouble_After_Booting_GUI-screen-1.xml                        |    3 
 en-US/Trouble_After_Booting_GUI-screen-2.xml                        |    3 
 en-US/Trouble_After_Booting_GUI-warning-1.xml                       |    3 
 en-US/Trouble_After_Booting_GUI_x86_ppc-title-1.xml                 |    3 
 en-US/Trouble_After_Booting_Problems-Apache.xml                     |    1 
 en-US/Trouble_After_Booting_Problems-Printer.xml                    |    1 
 en-US/Trouble_After_Booting_Problems_Login-indexterm-1.xml          |    3 
 en-US/Trouble_After_Booting_Problems_Login-para-1.xml               |    3 
 en-US/Trouble_After_Booting_Problems_Login-para-10.xml              |    3 
 en-US/Trouble_After_Booting_Problems_Login-para-11.xml              |    5 
 en-US/Trouble_After_Booting_Problems_Login-para-2.xml               |    3 
 en-US/Trouble_After_Booting_Problems_Login-para-4.xml               |    3 
 en-US/Trouble_After_Booting_Problems_Login-para-5.xml               |    3 
 en-US/Trouble_After_Booting_Problems_Login-para-6.xml               |    3 
 en-US/Trouble_After_Booting_Problems_Login-para-7.xml               |    3 
 en-US/Trouble_After_Booting_Problems_Login-para-8.xml               |    3 
 en-US/Trouble_After_Booting_Problems_Login-para-9.xml               |    3 
 en-US/Trouble_After_Booting_Problems_Login-screen-1.xml             |    3 
 en-US/Trouble_After_Booting_Problems_Login-screen-2.xml             |    8 
 en-US/Trouble_After_Booting_Problems_Login-title-1.xml              |    3 
 en-US/Trouble_After_Booting_X_Server_Non_Root.xml                   |    3 
 en-US/Trouble_After_Booting_X_Windows.xml                           |    3 
 en-US/Trouble_After_common-indexterm-1.xml                          |    3 
 en-US/Trouble_After_common-title-1.xml                              |    3 
 en-US/Trouble_Begin_GUI-indexterm-1.xml                             |    3 
 en-US/Trouble_Begin_GUI-indexterm-2.xml                             |    3 
 en-US/Trouble_Begin_GUI-note-1.xml                                  |    3 
 en-US/Trouble_Begin_GUI-para-1.xml                                  |    3 
 en-US/Trouble_Begin_GUI-title.xml                                   |    3 
 en-US/Trouble_Begin_x86_ppc_indexterm-1.xml                         |    3 
 en-US/Trouble_Begin_x86_ppc_title-1.xml                             |    3 
 en-US/Trouble_During-x86.xml                                        |   19 
 en-US/Trouble_During_common-other-partitioning-indexterm-1.xml      |    3 
 en-US/Trouble_During_common-other-partitioning-listitem-1.xml       |    3 
 en-US/Trouble_During_common-other-partitioning-listitem-2.xml       |   13 
 en-US/Trouble_During_common-other-partitioning-listitem-3.xml       |   12 
 en-US/Trouble_During_common-other-partitioning-para-1.xml           |    3 
 en-US/Trouble_During_common-other-partitioning-para-2.xml           |    3 
 en-US/Trouble_During_common-other-partitioning-tip-1.xml            |    3 
 en-US/Trouble_During_common-other-partitioning-title-1.xml          |    3 
 en-US/Trouble_During_common-partitions-indexterm-1.xml              |    3 
 en-US/Trouble_During_common-partitions-indexterm-2.xml              |    1 
 en-US/Trouble_During_common-partitions-para-1.xml                   |    5 
 en-US/Trouble_During_common-partitions-para-2.xml                   |    3 
 en-US/Trouble_During_common-partitions-para-3.xml                   |    3 
 en-US/Trouble_During_common-python-errors.xml                       |   14 
 en-US/Trouble_During_common-title-1.xml                             |    3 
 en-US/Trouble_During_x86_ppc-para-1.xml                             |    3 
 en-US/Trouble_During_x86_ppc-para-3.xml                             |    5 
 en-US/Trouble_During_x86_ppc-screen-1.xml                           |    4 
 en-US/Trouble_During_x86_ppc-section-2-figure-1.xml                 |    1 
 en-US/Trouble_During_x86_ppc-section-2-indexterms-2.xml             |    3 
 en-US/Trouble_During_x86_ppc-section-2-indexterms-3.xml             |    3 
 en-US/Trouble_During_x86_ppc-section-2-indexterms.xml               |    3 
 en-US/Trouble_During_x86_ppc-section-2-para-1.xml                   |    3 
 en-US/Trouble_During_x86_ppc-section-2-para-2.xml                   |    1 
 en-US/Trouble_During_x86_ppc-section-2-variablelist-1.xml           |   10 
 en-US/Trouble_During_x86_ppc-sectiontitle-2.xml                     |    3 
 en-US/Trouble_No_Boot-Sig11-indexterm-1.xml                         |    3 
 en-US/Trouble_No_Boot-Sig11-para-1.xml                              |    3 
 en-US/Trouble_No_Boot-Sig11-para-2.xml                              |    3 
 en-US/Trouble_No_Boot-Sig11-para-3.xml                              |    3 
 en-US/Trouble_No_Boot-Sig11-para-7.xml                              |    5 
 en-US/Trouble_No_Boot-Sig11-para-8.xml                              |    3 
 en-US/Trouble_No_Boot-Sig11-screen-2.xml                            |    3 
 en-US/Trouble_No_Boot-Sig11-screen-3.xml                            |    3 
 en-US/Trouble_No_Boot-Sig11-title-1.xml                             |    3 
 en-US/Trouble_No_Boot-indexterm-1.xml                               |    3 
 en-US/Trouble_No_Boot-title-1.xml                                   |    3 
 en-US/Trouble_Updating_common-partitions-title.xml                  |    9 
 en-US/Trouble_common-indexterm-1.xml                                |    1 
 en-US/Trouble_common-indexterm-2.xml                                |    1 
 en-US/Trouble_common-indexterm-3.xml                                |    1 
 en-US/Trouble_common-indexterm-4.xml                                |    1 
 en-US/Trouble_common-indexterm-5.xml                                |    1 
 en-US/Trouble_common-indexterm-6.xml                                |    1 
 en-US/Trouble_common-indexterm-7.xml                                |    1 
 en-US/Trouble_common-indexterm-8.xml                                |    1 
 en-US/Trouble_common-para-1.xml                                     |    1 
 en-US/Trouble_common-para-2.xml                                     |    1 
 en-US/Trouble_common-para-3.xml                                     |    1 
 en-US/Trouble_common-para-4.xml                                     |    8 
 en-US/Trouble_common-variablelist-1.xml                             |   46 -
 en-US/Trouble_common-varlistentry-1.xml                             |   12 
 en-US/Trouble_common-varlistentry-2.xml                             |   13 
 en-US/Trouble_common-varlistentry-3.xml                             |   15 
 en-US/Trouble_common-varlistentry-4.xml                             |   17 
 en-US/Trouble_common-varlistentry-5.xml                             |   19 
 en-US/Understanding_LVM.xml                                         |    6 
 en-US/Upgrade-x86.xml                                               |    7 
 en-US/Upgrade_common-para-1.xml                                     |    3 
 en-US/Upgrade_common-section-2-para-1.xml                           |    6 
 en-US/Upgrade_common-section-2-para-2.xml                           |    4 
 en-US/Upgrade_common-section-2-title.xml                            |    6 
 en-US/Upgrade_common-title-1.xml                                    |    6 
 en-US/Upgrading-common-note-1.xml                                   |    2 
 en-US/Upgrading-common-note-2.xml                                   |    2 
 en-US/Upgrading-common-para-1.xml                                   |    2 
 en-US/Upgrading-common-para-2.xml                                   |    2 
 en-US/Upgrading-common-para-3.xml                                   |    2 
 en-US/Upgrading-common-para-4.xml                                   |    2 
 en-US/Upgrading-common-para-5.xml                                   |    2 
 en-US/Upgrading-common-para-9.xml                                   |    2 
 en-US/Upgrading-x86.xml                                             |  114 ++
 en-US/Verifying_Media.xml                                           |    2 
 en-US/Welcome-x86.xml                                               |    1 
 en-US/Write_changes_to_disk.xml                                     |   34 
 en-US/Write_changes_to_disk_common-figure-1.xml                     |   15 
 en-US/Write_changes_to_disk_common-para-1.xml                       |    8 
 en-US/Write_changes_to_disk_common-para-2.xml                       |    8 
 en-US/Write_changes_to_disk_common-para-3.xml                       |    8 
 en-US/Write_changes_to_disk_common-para-5.xml                       |    8 
 en-US/Write_changes_to_disk_common-title-1.xml                      |    6 
 en-US/Write_changes_to_disk_common-title-2.xml                      |    6 
 en-US/Write_changes_to_disk_x86-para-4.xml                          |    8 
 en-US/Write_changes_to_disk_x86.xml                                 |   32 
 en-US/X86_Bios_Tip.xml                                              |    1 
 en-US/X86_Bootloader.xml                                            |   45 -
 en-US/X86_Trouble_After_Grub.xml                                    |    1 
 en-US/adminoptions.xml                                              |   99 +-
 en-US/expert-quickstart.xml                                         |    7 
 en-US/ext4-and-btrfs.xml                                            |    5 
 en-US/firstboot.xml                                                 |  428 ++++++----
 en-US/iSCSI.xml                                                     |   16 
 en-US/images/accountconfig/acct-rhel5.png                           |binary
 en-US/images/begininstall/ftp.png                                   |binary
 en-US/images/begininstall/hd.png                                    |binary
 en-US/images/begininstall/http.png                                  |binary
 en-US/images/begininstall/nfs.png                                   |binary
 en-US/images/begininstall/retrieving-stage2.png                     |binary
 en-US/images/diskless/add-host.png                                  |binary
 en-US/images/diskpartadvanced/advanced_storage-rhel5-s390-fcp.png   |binary
 en-US/images/diskpartadvanced/advanced_storage-rhel5-s390.png       |binary
 en-US/images/diskpartadvanced/advanced_storage-rhel5.png            |binary
 en-US/images/diskpartadvanced/advanced_storage-s390.png             |binary
 en-US/images/diskpartadvanced/fcp-config.png                        |binary
 en-US/images/diskpartauto/autopart-rhel5.png                        |binary
 en-US/images/diskpartauto/autopart-rhel5.s390.png                   |binary
 en-US/images/diskpartitioning/ddmain-s390.png                       |binary
 en-US/images/diskpartitioning/ent-ddmain-pseries.png                |binary
 en-US/images/diskpartitioning/ent-ddmain-rhel5.png                  |binary
 en-US/images/diskpartitioning/ia64-ddmain.png                       |binary
 en-US/images/diskpartitioning/part-add-rhel5.png                    |binary
 en-US/images/diskpartitioning/s390-dasd.png                         |binary
 en-US/images/diskpartitioning/s390-lvm-lv.png                       |binary
 en-US/images/diskpartitioning/s390-lvm-pv.png                       |binary
 en-US/images/diskpartitioning/s390-lvm-vg.png                       |binary
 en-US/images/diskpartitioning/s390-part-add.png                     |binary
 en-US/images/diskpartsetup/disk-setup-rhel5-s390.png                |binary
 en-US/images/diskpartsetup/disk-setup-rhel5.png                     |binary
 en-US/images/driverupdates/USB_stick.png                            |binary
 en-US/images/driverupdates/boot_screen.png                          |binary
 en-US/images/driverupdates/driver_disk_partition.png                |binary
 en-US/images/driverupdates/driver_disk_prompt.png                   |binary
 en-US/images/driverupdates/driver_disk_select_iso.png               |binary
 en-US/images/driverupdates/driver_disk_source.png                   |binary
 en-US/images/driverupdates/installed_packages.png                   |binary
 en-US/images/driverupdates/installing_packages.png                  |binary
 en-US/images/driverupdates/iso_image.png                            |binary
 en-US/images/driverupdates/nodriver.png                             |binary
 en-US/images/driverupdates/verifying_disc.png                       |binary
 en-US/images/driverupdates/write_to_disc.png                        |binary
 en-US/images/firstboot/fb-auth-advanced.png                         |binary
 en-US/images/firstboot/fb-authentication.png                        |binary
 en-US/images/firstboot/fb-kdump.png                                 |binary
 en-US/images/firstboot/fb-kdump1.png                                |binary
 en-US/images/firstboot/fb-review.png                                |binary
 en-US/images/firstboot/fb-rhlogin.png                               |binary
 en-US/images/firstboot/fb-server.png                                |binary
 en-US/images/firstboot/fb-setup.png                                 |binary
 en-US/images/firstboot/fb-updatesetup.png                           |binary
 en-US/images/firstboot/fb-welcome-rhel6-alpha.png                   |binary
 en-US/images/guimode/vnc_option.png                                 |binary
 en-US/images/guimode/widget1.png                                    |binary
 en-US/images/guimode/widget2.png                                    |binary
 en-US/images/initializing/initializing-s390-dasd.png                |binary
 en-US/images/initializing/initializing-s390-fcp.png                 |binary
 en-US/images/install_number/install_number-s390.png                 |binary
 en-US/images/install_number/install_number.png                      |binary
 en-US/images/ksconfig/ksconfig-xconfig-general.png                  |binary
 en-US/images/ksconfig/ksconfig-xconfig-monitor.png                  |binary
 en-US/images/ksconfig/ksconfig-xconfig-videocard.png                |binary
 en-US/images/langselection/lang.png                                 |binary
 en-US/images/langselection/lang2.png                                |binary
 en-US/images/netconfig/hostname-no-localhost.png                    |binary
 en-US/images/netconfig/net-edit-rhel5-s390.png                      |binary
 en-US/images/netconfig/net-edit-rhel5.png                           |binary
 en-US/images/netconfig/net-rhel5-s390.png                           |binary
 en-US/images/netconfig/net-rhel5.png                                |binary
 en-US/images/netconfig/network-connections-802.1x.png               |binary
 en-US/images/netconfig/network-connections-ipv4-manual-routes.png   |binary
 en-US/images/netconfig/network-connections-ipv4-manual.png          |binary
 en-US/images/netconfig/network-connections-ipv6-ignore.png          |binary
 en-US/images/netconfig/network-connections-ipv6-manual-routes.png   |binary
 en-US/images/netconfig/network-connections-wired.png                |binary
 en-US/images/netconfig/network-connections-wireless.png             |binary
 en-US/images/netconfig/network-connections.png                      |binary
 en-US/images/pkgselection/installing-packages.png                   |binary
 en-US/images/pkgselection/pkg-group-context.png                     |binary
 en-US/images/pkgselection/starting-installation.png                 |binary
 en-US/images/pseries/sms-console.png                                |binary
 en-US/images/rhn/obtaining_rhel.png                                 |binary
 en-US/images/s390/s390_overview.png                                 |binary
 en-US/images/storagedevices/assignstoragedevices-s390.png           |binary
 en-US/images/storagedevices/selectstoragedevices-multipath.png      |binary
 en-US/images/storagedevices/selectstoragedevices-s390-basic.png     |binary
 en-US/images/storagedevices/selectstoragedevices-s390-multipath.png |binary
 en-US/images/storagedevices/selectstoragedevices-s390-san.png       |binary
 en-US/images/storagedevices/selectstoragedevices-san.png            |binary
 en-US/images/storagedevices/storagedevices-specialized.png          |binary
 en-US/images/storagedevices/unformatted-dasd-s390.png               |binary
 en-US/images/timezone/timezone-rhel5.png                            |binary
 en-US/images/vnc/loader-vnc-or-text.png                             |binary
 en-US/images/vnc/vnc-configuration.png                              |binary
 en-US/images/welcome/install-number-beta1-rhel5.png                 |binary
 en-US/images/welcome/welcome-alpa1-rhel6.png                        |binary
 en-US/images/welcome/welcome-beta1-rhel5.png                        |binary
 en-US/images/x86-bootloader/x86-adv-bootloader-rhel5.png            |binary
 en-US/images/x86-bootloader/x86-bootloader-rhel5.png                |binary
 en-US/medialess.xml                                                 |   19 
 en-US/networkconfig-fedora.xml                                      |  158 ---
 en-US/new-users.xml                                                 |   10 
 en-US/no_busybox.xml                                                |   15 
 en-US/pre_and_post_commands.xml                                     |  288 ++++++
 en-US/pxe-server-manual.xml                                         |    9 
 en-US/pxe-server-para-1.xml                                         |    5 
 en-US/pxe-server-para-2.xml                                         |    3 
 en-US/pxe-server.xml                                                |   19 
 en-US/techref.xml                                                   |    9 
 en-US/upgrading-fedora.xml                                          |  114 --
 en-US/vnc_Installation_Chapter.xml                                  |   14 
 en-US/vnc_Modes_Chapter.xml                                         |    7 
 en-US/vnc_References_Chapter.xml                                    |    1 
 769 files changed, 5286 insertions(+), 2922 deletions(-)

New commits:
commit 623f24b547132316613d2c3a9bd446b91d486c9b
Author: Ruediger Landmann <r.landmann at redhat.com>
Date:   Sat Sep 11 07:21:07 2010 +1000

    revert some screenshots

diff --git a/en-US/images/boot/boot_screen.png b/en-US/images/boot/boot_screen.png
index 5c25075..9bfcbed 100644
Binary files a/en-US/images/boot/boot_screen.png and b/en-US/images/boot/boot_screen.png differ
diff --git a/en-US/images/firstboot/fb-license.png b/en-US/images/firstboot/fb-license.png
index b2357d7..575b3a7 100644
Binary files a/en-US/images/firstboot/fb-license.png and b/en-US/images/firstboot/fb-license.png differ
diff --git a/en-US/images/firstboot/fb-profile.png b/en-US/images/firstboot/fb-profile.png
index f93f0b5..b173bc4 100644
Binary files a/en-US/images/firstboot/fb-profile.png and b/en-US/images/firstboot/fb-profile.png differ
diff --git a/en-US/images/firstboot/fb-welcome.png b/en-US/images/firstboot/fb-welcome.png
index 47b80ec..46815ce 100644
Binary files a/en-US/images/firstboot/fb-welcome.png and b/en-US/images/firstboot/fb-welcome.png differ
diff --git a/en-US/images/pkgselection/pkg-group.png b/en-US/images/pkgselection/pkg-group.png
index f075133..5b44bd0 100644
Binary files a/en-US/images/pkgselection/pkg-group.png and b/en-US/images/pkgselection/pkg-group.png differ
diff --git a/en-US/images/welcome/welcome.png b/en-US/images/welcome/welcome.png
index 690cbce..b92011f 100644
Binary files a/en-US/images/welcome/welcome.png and b/en-US/images/welcome/welcome.png differ


commit 899497d086787a380c44fccbb06514bbb9af3486
Author: Ruediger Landmann <r.landmann at redhat.com>
Date:   Sat Sep 11 07:13:57 2010 +1000

    import from downstream

diff --git a/en-US/Account_Configuration-common.xml b/en-US/Account_Configuration-common.xml
deleted file mode 100644
index 1a6fc4f..0000000
--- a/en-US/Account_Configuration-common.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
-]>
-
-<section id="sn-account_configuration">
-	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Account_Configuration_common-title.xml"/>
-	<!-- Account Configuration -->
-	<indexterm significance="normal">
-		<primary>root password</primary>
-	</indexterm>
-	<indexterm significance="normal">
-		<primary>password</primary>
-		<secondary>setting root</secondary>
-	</indexterm>
-	<para>
-		Setting up a root account and password is one of the most important steps during your installation. Your root account is similar to the administrator account used on Microsoft Windows machines. The root account is used to install packages, upgrade RPMs, and perform most system maintenance. Logging in as root gives you complete control over your system.
-	</para>
-	 
-	<note>
-		<title>Note</title>
-
-		<para>
-			The root user (also known as the superuser) has complete access to the entire system; for this reason, logging in as the root user is best done <emphasis>only</emphasis> to perform system maintenance or administration.
-		</para>
-	</note>
-	<figure float="0"><title>Root Password</title>
-		<mediaobject>
-			<imageobject><imagedata fileref="images/accountconfig/rootpassword.png" format="PNG"/></imageobject>
-			<textobject><para>
-					Setting your root password.
-				</para>
-			</textobject>
-		</mediaobject>
-	</figure>
-	<para>
-		Use the root account only for system administration. Create a non-root account for your general use and <command>su -</command> to root when you need to fix something quickly. These basic rules minimize the chances of a typo or an
-		incorrect command doing damage to your system.
-	</para>
-	<note><title>Note</title>
-		<para>
-			To become root, type <command>su -</command> at the shell prompt in a terminal window and then press <keycap >Enter</keycap>. Then, enter the root password and press <keycap >Enter</keycap>.
-		</para>
-	</note>
-	<para>
-		The installation program prompts you to set a root password<footnote>
-		<para>
-			A root password is the administrative password for your Fedora system. You should only log in as root when needed for system maintenance. The root account does not operate within the restrictions placed on normal user accounts, so
-			changes made as root can have implications for your entire system.
-		</para>
-		</footnote> for your system. <emphasis>You cannot proceed to the next stage of the installation process without entering a root password.</emphasis>
-	</para>
-	 
-	<para>
-		The root password must be at least six characters long; the password you type is not echoed to the screen. You must enter the password twice; if the two passwords do not match, the installation program asks you to enter them again.
-	</para>
-	 
-	<para>
-		You should make the root password something you can remember, but not something that is easy for someone else to guess. Your name, your phone number, <firstterm>qwerty</firstterm>, <firstterm>password, root</firstterm>, <firstterm>123456</firstterm>, and
-		<firstterm>anteater</firstterm> are all examples of bad passwords. Good passwords mix numerals with upper and lower case letters and do not contain dictionary words: <firstterm>Aard387vark</firstterm> or <firstterm>420BMttNT</firstterm>, for example.
-		Remember that the password is case-sensitive. If you write down your password, keep it in a secure place. However, it is recommended that you do not write down this or any password you create.
-	</para>
-	 
-	<note>
-		<title>Note</title>
-
-		<para>
-			Do not use one of the example passwords offered in this manual. Using one of these passwords could be considered a security risk.
-		</para>
-	</note>
-	<note><title>Note</title>
-		<para>
-			To change your root password after you have completed the installation, use the <application>Root Password Tool</application>.
-		</para>
-		<para>
-			Type the <command >system-config-rootpassword</command> command in a shell prompt to launch the <application>Root Password Tool</application>. If you are not root, it prompts you for the root password to continue.
-		</para>
-	</note>
-	
-	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Account_Configuration_common-para-6.xml"/>
-	<!-- Enter the root password into the Root Password field.... -->
-	
-</section>
diff --git a/en-US/Account_Configuration-x86.xml b/en-US/Account_Configuration-x86.xml
new file mode 100644
index 0000000..25c9070
--- /dev/null
+++ b/en-US/Account_Configuration-x86.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0"?>
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+]>
+
+<section id="sn-account_configuration-x86">
+
+	<xi:include href="Account_Configuration_common-title.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+	<!-- Account Configuration -->
+	
+	<!-- begin indexterms -->
+	<xi:include href="Account_Configuration_common-indexterm-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+	<xi:include href="Account_Configuration_common-indexterm-2.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+	<!-- end indexterms -->
+	
+	<xi:include href="Account_Configuration_common-para-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+	<!-- Setting up a root account and password is one of the most important steps during your installation. -->
+	
+	<xi:include href="Account_Configuration_common-note-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+	<!-- The root user (also known as the superuser) has complete access to the entire system... -->
+	
+	<xi:include href="Account_Configuration_common-figure-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+	<!-- Setting your root password -->
+	
+	<xi:include href="Account_Configuration_common-para-2.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+	<!-- Use the root account only for system administration. -->
+	
+	<xi:include href="Account_Configuration_common-note-2.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+	<!-- To become root, type <command>su -</command> at the shell prompt -->
+	
+	<xi:include href="Account_Configuration_common-para-3.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+	<!-- The installation program prompts you to set a root password -->
+	 
+	<xi:include href="Account_Configuration_common-para-4.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+	<!-- The root password must be at least six characters long -->
+	 
+	<xi:include href="Account_Configuration_common-para-5.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+	<!-- You should make the root password something you can remember -->
+	 
+	<xi:include href="Account_Configuration_common-note-3.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+	<!-- Do not use one of the example passwords offered in this manual. -->
+	
+	<xi:include href="Account_Configuration_common-para-7.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+	<!-- To change your root password after you have completed the installation-->
+	
+	<xi:include href="Account_Configuration_common-para-8.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+	<!-- Type the system-config-rootpassword command -->
+	
+	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Account_Configuration_common-para-6.xml"/>
+	<!-- Enter the root password into the Root Password field.... -->
+	
+</section>
+
diff --git a/en-US/Account_Configuration_common-figure-1.xml b/en-US/Account_Configuration_common-figure-1.xml
new file mode 100644
index 0000000..b0016cf
--- /dev/null
+++ b/en-US/Account_Configuration_common-figure-1.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+]>
+
+<figure float="0"><title>Root Password</title>
+	<mediaobject>
+		<imageobject><imagedata fileref="images/accountconfig/rootpassword.png" format="PNG"/></imageobject>
+		<textobject><para>
+				Setting your root password.
+			</para>
+		</textobject>
+	</mediaobject>
+</figure>
+
diff --git a/en-US/Account_Configuration_common-indexterm-1.xml b/en-US/Account_Configuration_common-indexterm-1.xml
new file mode 100644
index 0000000..a0e4276
--- /dev/null
+++ b/en-US/Account_Configuration_common-indexterm-1.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+]>
+
+<indexterm significance="normal">
+	<primary>root password</primary>
+</indexterm>
+
diff --git a/en-US/Account_Configuration_common-indexterm-2.xml b/en-US/Account_Configuration_common-indexterm-2.xml
new file mode 100644
index 0000000..6de7a4f
--- /dev/null
+++ b/en-US/Account_Configuration_common-indexterm-2.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+]>
+
+<indexterm significance="normal">
+	<primary>password</primary>
+	<secondary>setting root</secondary>
+</indexterm>
+
diff --git a/en-US/Account_Configuration_common-note-1.xml b/en-US/Account_Configuration_common-note-1.xml
new file mode 100644
index 0000000..406947c
--- /dev/null
+++ b/en-US/Account_Configuration_common-note-1.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+]>
+
+<note>
+	<title>Note</title>
+
+	<para>
+		The root user (also known as the superuser) has complete access to the entire system; for this reason, logging in as the root user is best done <emphasis>only</emphasis> to perform system maintenance or administration.
+	</para>
+</note>
+
diff --git a/en-US/Account_Configuration_common-note-2.xml b/en-US/Account_Configuration_common-note-2.xml
new file mode 100644
index 0000000..5144f1e
--- /dev/null
+++ b/en-US/Account_Configuration_common-note-2.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+]>
+
+<note>
+	<title>Note</title>
+	<para>
+		To become root, type <command>su -</command> at the shell prompt in a terminal window and then press <keycap >Enter</keycap>. Then, enter the root password and press <keycap >Enter</keycap>.
+	</para>
+</note>
+
diff --git a/en-US/Account_Configuration_common-note-3.xml b/en-US/Account_Configuration_common-note-3.xml
new file mode 100644
index 0000000..c3e5793
--- /dev/null
+++ b/en-US/Account_Configuration_common-note-3.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+]>
+
+<note>
+	<title>Note</title>
+	<para>
+		Do not use one of the example passwords offered in this manual. Using one of these passwords could be considered a security risk.
+	</para>
+</note>
+
+
diff --git a/en-US/Account_Configuration_common-para-1.xml b/en-US/Account_Configuration_common-para-1.xml
new file mode 100644
index 0000000..0699b1a
--- /dev/null
+++ b/en-US/Account_Configuration_common-para-1.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+]>
+
+<para>
+	Setting up a root account and password is one of the most important steps during your installation. The root account is used to install packages, upgrade RPMs, and perform most system maintenance. Logging in as root gives you complete control over your system.
+</para>
+
diff --git a/en-US/Account_Configuration_common-para-2.xml b/en-US/Account_Configuration_common-para-2.xml
new file mode 100644
index 0000000..89abc10
--- /dev/null
+++ b/en-US/Account_Configuration_common-para-2.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+]>
+
+<para>
+	Use the root account only for system administration. Create a non-root account for your general use and use the <command>su</command> command to change to root only when you need to perform tasks that require superuser authorization. These basic rules minimize the changes of a typo or an incorrect command doing damage to your system.
+</para>
+
diff --git a/en-US/Account_Configuration_common-para-3.xml b/en-US/Account_Configuration_common-para-3.xml
new file mode 100644
index 0000000..1990859
--- /dev/null
+++ b/en-US/Account_Configuration_common-para-3.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+]>
+
+<para>
+	The installation program prompts you to set a root password<footnote>
+	<para>
+		A root password is the administrative password for your Fedora system. You should only log in as root when needed for system maintenance. The root account does not operate within the restrictions placed on normal user accounts, so changes made as root can have implications for your entire system.
+	</para>
+	</footnote> for your system. <emphasis>You cannot proceed to the next stage of the installation process without entering a root password.</emphasis>
+</para>
+
diff --git a/en-US/Account_Configuration_common-para-4.xml b/en-US/Account_Configuration_common-para-4.xml
new file mode 100644
index 0000000..f3e7037
--- /dev/null
+++ b/en-US/Account_Configuration_common-para-4.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+]>
+
+<para>
+	The root password must be at least six characters long; the password you type is not echoed to the screen. You must enter the password twice; if the two passwords do not match, the installation program asks you to enter them again.
+</para>
+
diff --git a/en-US/Account_Configuration_common-para-5.xml b/en-US/Account_Configuration_common-para-5.xml
new file mode 100644
index 0000000..82aee05
--- /dev/null
+++ b/en-US/Account_Configuration_common-para-5.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+]>
+
+<para>
+	You should make the root password something you can remember, but not something that is easy for someone else to guess. Your name, your phone number, <firstterm>qwerty</firstterm>, <firstterm>password, root</firstterm>, <firstterm>123456</firstterm>, and
+	<firstterm>anteater</firstterm> are all examples of bad passwords. Good passwords mix numerals with upper and lower case letters and do not contain dictionary words: <firstterm>Aard387vark</firstterm> or <firstterm>420BMttNT</firstterm>, for example.
+	Remember that the password is case-sensitive. If you write down your password, keep it in a secure place. However, it is recommended that you do not write down this or any password you create.
+</para>
+
diff --git a/en-US/Account_Configuration_common-para-6.xml b/en-US/Account_Configuration_common-para-6.xml
index 62917bb..622b63c 100644
--- a/en-US/Account_Configuration_common-para-6.xml
+++ b/en-US/Account_Configuration_common-para-6.xml
@@ -13,3 +13,4 @@
     correctly. After you set the root password, select
     <guibutton>Next</guibutton> to proceed.
   </para>
+
diff --git a/en-US/Account_Configuration_common-para-7.xml b/en-US/Account_Configuration_common-para-7.xml
new file mode 100644
index 0000000..ed4b4f6
--- /dev/null
+++ b/en-US/Account_Configuration_common-para-7.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+]>
+
+
+	<para>
+		To change your root password after you have completed the installation, use the <application>Root Password Tool</application>.
+	</para>
+
+
+
diff --git a/en-US/Account_Configuration_common-para-8.xml b/en-US/Account_Configuration_common-para-8.xml
new file mode 100644
index 0000000..14e8359
--- /dev/null
+++ b/en-US/Account_Configuration_common-para-8.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+]>
+
+
+	<para>
+		Type the <command>system-config-users</command> command in a shell prompt to launch the <application>User Manager</application>, a powerful user management and configuration tool. If you are not root, it prompts you for the root password to continue.
+	</para>
+
+
diff --git a/en-US/Account_Configuration_common-title.xml b/en-US/Account_Configuration_common-title.xml
index 29c6c9d..a8f02f9 100644
--- a/en-US/Account_Configuration_common-title.xml
+++ b/en-US/Account_Configuration_common-title.xml
@@ -2,4 +2,5 @@
 <!DOCTYPE title PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
 ]>
 
-<title>Set the Root Password</title>
\ No newline at end of file
+<title>Set the Root Password</title>
+
diff --git a/en-US/Adding_Partitions-section-2-indexterm-1.xml b/en-US/Adding_Partitions-section-2-indexterm-1.xml
index 2bf145f..32991ab 100644
--- a/en-US/Adding_Partitions-section-2-indexterm-1.xml
+++ b/en-US/Adding_Partitions-section-2-indexterm-1.xml
@@ -7,4 +7,5 @@
 
 <indexterm significance="normal">
 	<primary>file system types</primary>
-</indexterm>
\ No newline at end of file
+</indexterm>
+
diff --git a/en-US/Adding_Partitions-section-2-indexterm-2.xml b/en-US/Adding_Partitions-section-2-indexterm-2.xml
index 520afac..9591eb6 100644
--- a/en-US/Adding_Partitions-section-2-indexterm-2.xml
+++ b/en-US/Adding_Partitions-section-2-indexterm-2.xml
@@ -9,4 +9,5 @@
 	<primary>partitioning</primary>
 	<secondary>creating new</secondary>
 	<tertiary>file system type</tertiary>
-</indexterm>
\ No newline at end of file
+</indexterm>
+
diff --git a/en-US/Adding_Partitions-section-2-indexterm-3.xml b/en-US/Adding_Partitions-section-2-indexterm-3.xml
index 773ec45..7771e3d 100644
--- a/en-US/Adding_Partitions-section-2-indexterm-3.xml
+++ b/en-US/Adding_Partitions-section-2-indexterm-3.xml
@@ -3,8 +3,9 @@
 ]>
 
 <indexterm significance="normal">
-	<primary><application>Partitioning</application>
+	<primary>Partitioning
 	</primary>
 	<secondary>adding partitions</secondary>
 	<tertiary>file system type</tertiary>
-</indexterm>
\ No newline at end of file
+</indexterm>
+
diff --git a/en-US/Adding_Partitions-section-2-indexterm-4.xml b/en-US/Adding_Partitions-section-2-indexterm-4.xml
index 66bfb67..5b4ec04 100644
--- a/en-US/Adding_Partitions-section-2-indexterm-4.xml
+++ b/en-US/Adding_Partitions-section-2-indexterm-4.xml
@@ -8,4 +8,5 @@
 <indexterm significance="normal">
 	<primary>adding partitions</primary>
 	<secondary>file system type</secondary>
-</indexterm>
\ No newline at end of file
+</indexterm>
+
diff --git a/en-US/Adding_Partitions-section-2-itemizedlist-1-listitem-0.xml b/en-US/Adding_Partitions-section-2-itemizedlist-1-listitem-0.xml
index 384f9f2..eadbe66 100644
--- a/en-US/Adding_Partitions-section-2-itemizedlist-1-listitem-0.xml
+++ b/en-US/Adding_Partitions-section-2-itemizedlist-1-listitem-0.xml
@@ -7,12 +7,13 @@
 		<guilabel>Btrfs</guilabel> &mdash; Btrfs is under development as a file system capable of addressing and managing more files, larger files, and larger volumes than the ext2, ext3, and ext4 file systems. Btrfs is designed to make the file system tolerant of errors, and to facilitate the detection and repair of errors when they occur. It uses checksums to ensure the validity of data and metadata, and maintains snapshots of the file system that can be used for backup or repair. 
 	</para>
 	<para>
-		Because Btrfs is still experimental and under development, the installation program does not offer it by default. If you want to create a Btrfs partition on a drive, you must commence the installation process with the boot option <command>btrfs</command>. Refer to <xref linkend="ap-admin-options"/> for instructions. 
+		Because Btrfs is still experimental and under development, the installation program does not offer it by default. If you want to create a Btrfs partition on a drive, you must commence the installation process with the boot option <command> btrfs</command>. Refer to <xref linkend="ap-admin-options"/> for instructions. 
 	</para>
 	<warning>
 	<title>Btrfs is still experimental</title>
 	<para>
-		Fedora &PRODVER; includes Btrfs as a technology preview to allow you to experiment with this file system. You should not choose Btrfs for partitions that will contain valuable data or that are essential for the operation of important systems. 
+		Fedora&nbsp;&PRODVER; includes Btrfs as a technology preview to allow you to experiment with this file system. You should not choose Btrfs for partitions that will contain valuable data or that are essential for the operation of important systems. 
 	</para>
 	</warning>
 </listitem>
+
diff --git a/en-US/Adding_Partitions-section-2-itemizedlist-1-listitem-1.xml b/en-US/Adding_Partitions-section-2-itemizedlist-1-listitem-1.xml
index 9f24b16..5293897 100644
--- a/en-US/Adding_Partitions-section-2-itemizedlist-1-listitem-1.xml
+++ b/en-US/Adding_Partitions-section-2-itemizedlist-1-listitem-1.xml
@@ -9,3 +9,4 @@
 		<guilabel>ext2</guilabel> &mdash; An ext2 file system supports standard Unix file types (regular files, directories, symbolic links, etc). It provides the ability to assign long file names, up to 255 characters.
 	</para>
 </listitem>
+
diff --git a/en-US/Adding_Partitions-section-2-itemizedlist-1-listitem-2.xml b/en-US/Adding_Partitions-section-2-itemizedlist-1-listitem-2.xml
index 39aa956..585791a 100644
--- a/en-US/Adding_Partitions-section-2-itemizedlist-1-listitem-2.xml
+++ b/en-US/Adding_Partitions-section-2-itemizedlist-1-listitem-2.xml
@@ -12,3 +12,4 @@
 		</footnote> the file system. 
 	</para>
 </listitem>
+
diff --git a/en-US/Adding_Partitions-section-2-itemizedlist-1-listitem-2a.xml b/en-US/Adding_Partitions-section-2-itemizedlist-1-listitem-2a.xml
index 61935f0..6f4410a 100644
--- a/en-US/Adding_Partitions-section-2-itemizedlist-1-listitem-2a.xml
+++ b/en-US/Adding_Partitions-section-2-itemizedlist-1-listitem-2a.xml
@@ -7,3 +7,4 @@
 		<guilabel>ext4</guilabel> &mdash; The ext4 file system is based on the ext3 file system and features a number of improvements. These include support for larger file systems and larger files, faster and more efficient allocation of disk space, no limit on the number of subdirectories within a directory, faster file system checking, and more robust journalling. The ext4 file system is selected by default and is highly recommended. 
 	</para>
 </listitem>
+
diff --git a/en-US/Adding_Partitions-section-2-itemizedlist-1-listitem-3.xml b/en-US/Adding_Partitions-section-2-itemizedlist-1-listitem-3.xml
index 11d03a1..50387e0 100644
--- a/en-US/Adding_Partitions-section-2-itemizedlist-1-listitem-3.xml
+++ b/en-US/Adding_Partitions-section-2-itemizedlist-1-listitem-3.xml
@@ -4,6 +4,7 @@
 
 <listitem>
 	<para>
-		<guilabel>physical volume (LVM)</guilabel> &mdash; Creating one or more physical volume (LVM) partitions allows you to create an LVM logical volume. LVM can improve performance when using physical disks. <!-- Reference to RHEL Deployment Guide: For more information regarding LVM, refer to the <citetitle>Red Hat Enterprise Linux Deployment Guide</citetitle>. -->
+		<guilabel>physical volume (LVM)</guilabel> &mdash; Creating one or more physical volume (LVM) partitions allows you to create an LVM logical volume. LVM can improve performance when using physical disks. For more information regarding LVM, refer to the <citetitle>Fedora Deployment Guide</citetitle>.
 	</para>
-</listitem>
\ No newline at end of file
+</listitem>
+
diff --git a/en-US/Adding_Partitions-section-2-itemizedlist-1-listitem-4.xml b/en-US/Adding_Partitions-section-2-itemizedlist-1-listitem-4.xml
index 1cba297..818b5ff 100644
--- a/en-US/Adding_Partitions-section-2-itemizedlist-1-listitem-4.xml
+++ b/en-US/Adding_Partitions-section-2-itemizedlist-1-listitem-4.xml
@@ -4,6 +4,7 @@
 
 <listitem>
 	<para>
-		<guilabel>software RAID</guilabel> &mdash; Creating two or more software RAID partitions allows you to create a RAID device. <!-- Reference to RHEL Deployment Guide: For more information regarding RAID, refer to the chapter <citetitle>RAID (Redundant Array of Independent Disks)</citetitle> in the <citetitle>Red Hat Enterprise Linux Deployment Guide</citetitle>. -->
+		<guilabel>software RAID</guilabel> &mdash; Creating two or more software RAID partitions allows you to create a RAID device. For more information regarding RAID, refer to the chapter <citetitle>RAID (Redundant Array of Independent Disks)</citetitle> in the <citetitle>Fedora Deployment Guide</citetitle>.
 	</para>
-</listitem>
\ No newline at end of file
+</listitem>
+
diff --git a/en-US/Adding_Partitions-section-2-itemizedlist-1-listitem-5.xml b/en-US/Adding_Partitions-section-2-itemizedlist-1-listitem-5.xml
index 4b5adae..22d3896 100644
--- a/en-US/Adding_Partitions-section-2-itemizedlist-1-listitem-5.xml
+++ b/en-US/Adding_Partitions-section-2-itemizedlist-1-listitem-5.xml
@@ -4,6 +4,7 @@
 
 <listitem>
 	<para>
-		<guilabel>swap</guilabel> &mdash; Swap partitions are used to support virtual memory. In other words, data is written to a swap partition when there is not enough RAM to store the data your system is processing. <!-- Reference to RHEL Deployment Guide: Refer to the <citetitle>Red Hat Enterprise Linux Deployment Guide</citetitle> for additional information. -->
+		<guilabel>swap</guilabel> &mdash; Swap partitions are used to support virtual memory. In other words, data is written to a swap partition when there is not enough RAM to store the data your system is processing. Refer to the <citetitle>Fedora Deployment Guide</citetitle> for additional information.
 	</para>
-</listitem>
\ No newline at end of file
+</listitem>
+
diff --git a/en-US/Adding_Partitions-section-2-itemizedlist-1-listitem-6.xml b/en-US/Adding_Partitions-section-2-itemizedlist-1-listitem-6.xml
index b8e95be..5300403 100644
--- a/en-US/Adding_Partitions-section-2-itemizedlist-1-listitem-6.xml
+++ b/en-US/Adding_Partitions-section-2-itemizedlist-1-listitem-6.xml
@@ -7,6 +7,7 @@
 
 <listitem>
 	<para>
-		<guilabel>vfat</guilabel> &mdash; The VFAT file system is a Linux file system that is compatible with Microsoft Windows long filenames on the FAT file system. This file system must be used for the <filename >/boot/efi/</filename> partition on Itanium systems.
+		<guilabel>vfat</guilabel> &mdash; The VFAT file system is a Linux file system that is compatible with Microsoft Windows long filenames on the FAT file system.
 	</para>
-</listitem>
\ No newline at end of file
+</listitem>
+
diff --git a/en-US/Adding_Partitions-section-2-itemizedlist-1-listitem-8.xml b/en-US/Adding_Partitions-section-2-itemizedlist-1-listitem-8.xml
new file mode 100644
index 0000000..8fcefc4
--- /dev/null
+++ b/en-US/Adding_Partitions-section-2-itemizedlist-1-listitem-8.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<!DOCTYPE listitem PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+]>
+
+<listitem>
+	<para>
+		<guilabel>standard partition</guilabel> &mdash; A standard partition can contain a file system or swap space, or it can provide a container for software RAID or an LVM physical volume. 
+	</para>
+</listitem>
+
diff --git a/en-US/Adding_Partitions-section-2-itemizedlist-1.xml b/en-US/Adding_Partitions-section-2-itemizedlist-1.xml
index faa90ac..9aa53c0 100644
--- a/en-US/Adding_Partitions-section-2-itemizedlist-1.xml
+++ b/en-US/Adding_Partitions-section-2-itemizedlist-1.xml
@@ -6,31 +6,19 @@
 
 <itemizedlist>
 
-	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Adding_Partitions-section-2-itemizedlist-1-listitem-0.xml"/>
-	<!-- btrfs -->
+	<title>Partition types</title>
 	
-	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Adding_Partitions-section-2-itemizedlist-1-listitem-1.xml"/>
-	<!-- ext2 -->
-
-	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Adding_Partitions-section-2-itemizedlist-1-listitem-2.xml"/>
-	<!-- ext3 -->
-	
-	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Adding_Partitions-section-2-itemizedlist-1-listitem-2a.xml"/>
-	<!-- ext4 -->
-	
-	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Adding_Partitions-section-2-itemizedlist-1-listitem-3.xml"/>
-	<!-- LVM -->
-	
-	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Adding_Partitions-section-2-itemizedlist-1-listitem-4.xml"/>
-	<!-- Sofware RAID -->
+	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Adding_Partitions-section-2-itemizedlist-1-listitem-8.xml"/>
+	<!-- standard partition -->
 	
 	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Adding_Partitions-section-2-itemizedlist-1-listitem-5.xml"/>
 	<!-- swap -->
 	
-	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Adding_Partitions-section-2-itemizedlist-1-listitem-6.xml"/>
-	<!-- vfat -->
+	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Adding_Partitions-section-2-itemizedlist-1-listitem-4.xml"/>
+	<!-- Sofware RAID -->
 	
-	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Adding_Partitions-section-2-itemizedlist-1-listitem-7.xml"/>
-	<!-- xfs -->
+	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Adding_Partitions-section-2-itemizedlist-1-listitem-3.xml"/>
+	<!-- LVM -->
 	
-</itemizedlist>
\ No newline at end of file
+</itemizedlist>
+
diff --git a/en-US/Adding_Partitions-section-2-itemizedlist-2.xml b/en-US/Adding_Partitions-section-2-itemizedlist-2.xml
new file mode 100644
index 0000000..4dab177
--- /dev/null
+++ b/en-US/Adding_Partitions-section-2-itemizedlist-2.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0"?>
+<!DOCTYPE itemizedlist PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+]>
+
+<!-- Nota Bene that this file is now only used from the x86 version. The list is now included in Adding_Partitions-ppc.xml as items, as vfat does appear in the PPC list -->
+
+<itemizedlist>
+
+	<title>File systems</title>
+	
+	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Adding_Partitions-section-2-itemizedlist-1-listitem-2a.xml"/>
+	<!-- ext4 -->
+	
+	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Adding_Partitions-section-2-itemizedlist-1-listitem-2.xml"/>
+	<!-- ext3 -->
+	
+	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Adding_Partitions-section-2-itemizedlist-1-listitem-1.xml"/>
+	<!-- ext2 -->
+
+	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Adding_Partitions-section-2-itemizedlist-1-listitem-7.xml"/>
+	<!-- xfs -->
+	
+	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Adding_Partitions-section-2-itemizedlist-1-listitem-6.xml"/>
+	<!-- vfat -->
+	
+	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Adding_Partitions-section-2-itemizedlist-1-listitem-0.xml"/>
+	<!-- btrfs -->
+	
+</itemizedlist>
+
diff --git a/en-US/Adding_Partitions-section-2-para-1.xml b/en-US/Adding_Partitions-section-2-para-1.xml
index e6b5820..d359128 100644
--- a/en-US/Adding_Partitions-section-2-para-1.xml
+++ b/en-US/Adding_Partitions-section-2-para-1.xml
@@ -3,5 +3,6 @@
 ]>
 
 <para>
-	Fedora allows you to create different partition types, based on the file system they will use. The following is a brief description of the different file systems available, and how they can be utilized.
-</para>
\ No newline at end of file
+	Fedora allows you to create different partition types and file systems. The following is a brief description of the different partition types and file systems available, and how they can be used.
+</para>
+
diff --git a/en-US/Adding_Partitions-x86.xml b/en-US/Adding_Partitions-x86.xml
index 136d19c..6fa5b5e 100644
--- a/en-US/Adding_Partitions-x86.xml
+++ b/en-US/Adding_Partitions-x86.xml
@@ -83,11 +83,15 @@
 		<!-- End Index terms -->
 		
 		<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Adding_Partitions-section-2-para-1.xml"/>
-		<!-- Red Hat Enterprise Linux allows you to create different partition types -->
+		<!-- Fedora allows you to create different partition types -->
 		
 		<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Adding_Partitions-section-2-itemizedlist-1.xml"/>
-		<!-- ext2, ext3, physical volume (LVM) etc... -->
+		<!-- Partition types -->
+		
+		<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Adding_Partitions-section-2-itemizedlist-2.xml"/>
+		<!-- File systems -->
 		
 	</section>	
 </section>
-		
\ No newline at end of file
+		
+
diff --git a/en-US/Adding_Partitions_common-indexterm-1.xml b/en-US/Adding_Partitions_common-indexterm-1.xml
index 78e63d6..7ef85ff 100644
--- a/en-US/Adding_Partitions_common-indexterm-1.xml
+++ b/en-US/Adding_Partitions_common-indexterm-1.xml
@@ -9,4 +9,5 @@
 	<primary><application>Disk Partitioner</application>
 	</primary>
 	<secondary>adding partitions</secondary>
-</indexterm>
\ No newline at end of file
+</indexterm>
+
diff --git a/en-US/Adding_Partitions_common-indexterm-2.xml b/en-US/Adding_Partitions_common-indexterm-2.xml
index ebd741c..35f1039 100644
--- a/en-US/Adding_Partitions_common-indexterm-2.xml
+++ b/en-US/Adding_Partitions_common-indexterm-2.xml
@@ -7,4 +7,5 @@
 
 <indexterm significance="normal">
 		<primary>adding partitions</primary>
-	</indexterm>
\ No newline at end of file
+	</indexterm>
+
diff --git a/en-US/Adding_Partitions_common-indexterm-3.xml b/en-US/Adding_Partitions_common-indexterm-3.xml
index a06522c..e49fb8b 100644
--- a/en-US/Adding_Partitions_common-indexterm-3.xml
+++ b/en-US/Adding_Partitions_common-indexterm-3.xml
@@ -8,4 +8,5 @@
 <indexterm significance="normal">
 		<primary>partitioning</primary>
 		<secondary>creating new</secondary>
-	</indexterm>
\ No newline at end of file
+	</indexterm>
+
diff --git a/en-US/Adding_Partitions_common-title-1.xml b/en-US/Adding_Partitions_common-title-1.xml
index 38f0a61..a416cd8 100644
--- a/en-US/Adding_Partitions_common-title-1.xml
+++ b/en-US/Adding_Partitions_common-title-1.xml
@@ -5,4 +5,5 @@
 
 ]>
 
-<title>Adding Partitions</title>
\ No newline at end of file
+<title>Adding Partitions</title>
+
diff --git a/en-US/Adding_Partitions_x86_ppc-listitem-1.xml b/en-US/Adding_Partitions_x86_ppc-listitem-1.xml
index 9e4b062..ae57293 100644
--- a/en-US/Adding_Partitions_x86_ppc-listitem-1.xml
+++ b/en-US/Adding_Partitions_x86_ppc-listitem-1.xml
@@ -7,6 +7,7 @@
 
 <listitem>
 	<para>
-		<guilabel>Mount Point</guilabel>: Enter the partition's mount point. For example, if this partition should be the root partition, enter <userinput>/</userinput>; enter <userinput>/boot</userinput> for the <filename>/boot</filename> partition, and so on. You can also use the pull-down menu to choose the correct mount point for your partition. For a swap partition the mount point should not be set - setting the filesystem type to swap is sufficient.
+		<guilabel>Mount Point</guilabel>: Enter the partition's mount point. For example, if this partition should be the root partition, enter <userinput>/</userinput>; enter <userinput>/boot</userinput> for the <filename>/boot</filename> partition, and so on. You can also use the pull-down menu to choose the correct mount point for your partition. For a swap partition the mount point should not be set â€” setting the filesystem type to <literal>swap</literal> is sufficient.
 	</para>
-</listitem>
\ No newline at end of file
+</listitem>
+
diff --git a/en-US/Adding_Partitions_x86_ppc-listitem-2.xml b/en-US/Adding_Partitions_x86_ppc-listitem-2.xml
index f12ca6f..1431cbd 100644
--- a/en-US/Adding_Partitions_x86_ppc-listitem-2.xml
+++ b/en-US/Adding_Partitions_x86_ppc-listitem-2.xml
@@ -6,4 +6,5 @@
 	<para>
 		<guilabel>Allowable Drives</guilabel>: This field contains a list of the hard disks installed on your system. If a hard disk's box is highlighted, then a desired partition can be created on that hard disk. If the box is <emphasis>not</emphasis> checked, then the partition will <emphasis>never</emphasis> be created on that hard disk. By using different checkbox settings, you can have <application>anaconda</application> place partitions where you need them, or let <application>anaconda</application> decide where partitions should go.
 	</para>
-</listitem>
\ No newline at end of file
+</listitem>
+
diff --git a/en-US/Adding_Partitions_x86_ppc-listitem-3.xml b/en-US/Adding_Partitions_x86_ppc-listitem-3.xml
index 3e08fed..104612b 100644
--- a/en-US/Adding_Partitions_x86_ppc-listitem-3.xml
+++ b/en-US/Adding_Partitions_x86_ppc-listitem-3.xml
@@ -9,4 +9,5 @@
 	<para>
 		<guilabel>Size (MB)</guilabel>: Enter the size (in megabytes) of the partition. Note, this field starts with 200 MB; unless changed, only a 200 MB partition will be created.
 	</para>
-</listitem>
\ No newline at end of file
+</listitem>
+
diff --git a/en-US/Adding_Partitions_x86_ppc-listitem-4.xml b/en-US/Adding_Partitions_x86_ppc-listitem-4.xml
index 1d7ee30..299427e 100644
--- a/en-US/Adding_Partitions_x86_ppc-listitem-4.xml
+++ b/en-US/Adding_Partitions_x86_ppc-listitem-4.xml
@@ -14,4 +14,5 @@
 	<para>
 		If you choose <guilabel>Fill all space up to (MB)</guilabel>, you must give size constraints in the field to the right of this option. This allows you to keep a certain amount of space free on your hard drive for future use.
 	</para>
-</listitem>
\ No newline at end of file
+</listitem>
+
diff --git a/en-US/Adding_Partitions_x86_ppc-listitem-5.xml b/en-US/Adding_Partitions_x86_ppc-listitem-5.xml
index 60975ab..136395c 100644
--- a/en-US/Adding_Partitions_x86_ppc-listitem-5.xml
+++ b/en-US/Adding_Partitions_x86_ppc-listitem-5.xml
@@ -9,4 +9,5 @@
 	<para>
 		<guibutton>OK</guibutton>: Select <guibutton>OK</guibutton> once you are satisfied with the settings and wish to create the partition.
 	</para>
-</listitem>
\ No newline at end of file
+</listitem>
+
diff --git a/en-US/Adding_Partitions_x86_ppc-listitem-6.xml b/en-US/Adding_Partitions_x86_ppc-listitem-6.xml
index 09de374..3ea88e3 100644
--- a/en-US/Adding_Partitions_x86_ppc-listitem-6.xml
+++ b/en-US/Adding_Partitions_x86_ppc-listitem-6.xml
@@ -9,4 +9,5 @@
 	<para>
 		<guibutton>Cancel</guibutton>: Select <guibutton>Cancel</guibutton> if you do not want to create the partition.
 	</para>
-</listitem>
\ No newline at end of file
+</listitem>
+
diff --git a/en-US/Adding_Partitions_x86_ppc-title-2.xml b/en-US/Adding_Partitions_x86_ppc-title-2.xml
index 5299ff8..6b8d4f6 100644
--- a/en-US/Adding_Partitions_x86_ppc-title-2.xml
+++ b/en-US/Adding_Partitions_x86_ppc-title-2.xml
@@ -5,4 +5,5 @@
 
 ]>
 
-<title>File System Types</title>
\ No newline at end of file
+<title>File System Types</title>
+
diff --git a/en-US/Advice_on_Partitions.xml b/en-US/Advice_on_Partitions.xml
index 72c077d..6a42037 100644
--- a/en-US/Advice_on_Partitions.xml
+++ b/en-US/Advice_on_Partitions.xml
@@ -19,6 +19,9 @@
 	  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.</para>
+      </listitem>
       <listitem>
 	<para>Each kernel installed on your system requires
 	  approximately 10 MB on the <filename
@@ -37,7 +40,11 @@
 	    class="directory">/var</filename> directory has enough space
 	  to download pending updates and hold your other
 	  content.</para>
-	<important>
+	  
+	  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Disk_Partitioning_Setup_common-warning-1.xml"/>
+	  <!-- Warning: The Red Hat Update Agent downloads updated packages... -->
+	
+	<!-- FIG <important>
 	  <title>Pending Updates</title>
 	  <para>Because Fedora is a rapidly progressing collection of
 	    software, many updates may be available late in a release
@@ -45,7 +52,7 @@
 	    installation later to minimize this issue. Refer to <xref
 	      linkend="sn-additional-repos"/> for more information.
 	  </para>
-	</important>
+	</important> -->
       </listitem>
       <listitem>
 	<para>The <filename class="directory">/usr</filename> directory
@@ -100,7 +107,7 @@
 	      <tbody>
 		  <row>
 		    <entry><filename class="partition">/boot</filename></entry>
-		    <entry>250 MB <systemitem class="filesystem">ext4</systemitem>
+		    <entry>250 MB <systemitem class="filesystem">ext3</systemitem>
 		      partition</entry>
 		  </row>
 		  <row>
@@ -144,3 +151,4 @@
 	</para>
     </example>
   </section>
+
diff --git a/en-US/Assign_Storage_Devices-common-important-indexterm-1.xml b/en-US/Assign_Storage_Devices-common-important-indexterm-1.xml
new file mode 100644
index 0000000..e66e747
--- /dev/null
+++ b/en-US/Assign_Storage_Devices-common-important-indexterm-1.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0"?>
+<!DOCTYPE indexterm PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+]>
+
+<indexterm> <primary>Chain loading</primary> </indexterm>
diff --git a/en-US/Assign_Storage_Devices-common-important-para-1.xml b/en-US/Assign_Storage_Devices-common-important-para-1.xml
new file mode 100644
index 0000000..8c569ff
--- /dev/null
+++ b/en-US/Assign_Storage_Devices-common-important-para-1.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+]>
+
+
+<para>
+	If any storage device contains a boot loader that will chain load the Fedora boot loader, include that storage device among the <guilabel>Install Target Devices</guilabel>. Storage devices that you identify as <guilabel>Install Target Devices</guilabel> remain visible to <application>anaconda</application> during boot loader configuration. 
+</para>
diff --git a/en-US/Assign_Storage_Devices-common-important-title-1.xml b/en-US/Assign_Storage_Devices-common-important-title-1.xml
new file mode 100644
index 0000000..2013561
--- /dev/null
+++ b/en-US/Assign_Storage_Devices-common-important-title-1.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0"?>
+<!DOCTYPE title PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+]>
+
+<title>Important â€” chain loading</title>
diff --git a/en-US/Assign_Storage_Devices-x86.xml b/en-US/Assign_Storage_Devices-x86.xml
index 609c4cd..93569d4 100644
--- a/en-US/Assign_Storage_Devices-x86.xml
+++ b/en-US/Assign_Storage_Devices-x86.xml
@@ -8,7 +8,7 @@
 	<!-- Storage Devices -->
 	
 	<para>
-		If you selected more than one storage device on the storage devices selection screen (refer to <xref linkend="Storage_Devices-x86"/>) system, <application>anaconda</application> asks you to select which of these devices should be available for installation of the operating system, and which should only be attached to the file system for data storage. 
+		If you selected more than one storage device on the storage devices selection screen (refer to <xref linkend="Storage_Devices-x86"/>), <application>anaconda</application> asks you to select which of these devices should be available for installation of the operating system, and which should only be attached to the file system for data storage. If you selected only one storage device, <application>anaconda</application> does not present you with this screen. 
 	</para>
 	
 	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Assign_Storage_Devices-common-para-1.xml"/>
@@ -29,6 +29,21 @@
 	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Assign_Storage_Devices-common-para-5.xml"/>
 	<!-- The list of devices available as installation targets includes -->
 	
+	<important>
+		<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Assign_Storage_Devices-common-important-title-1.xml"/>
+		<!-- Important â€” chain loading -->
+		
+		<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Assign_Storage_Devices-common-important-indexterm-1.xml"/>
+		<!-- Chain loading -->
+		
+		<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Assign_Storage_Devices-common-important-para-1.xml"/>
+		<!-- If any storage device contains a boot loader that will chain load the Fedora boot loader -->
+		
+		<para>
+			Storage devices that you identify as <guilabel>Install Target Devices</guilabel> on this screen are not automatically erased by the installation process unless you selected the <guilabel>Use All Space</guilabel> option on the partioning screen (refer to <xref linkend="s1-diskpartsetup-x86"/>). 
+		</para>
+	</important>
+
 	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Assign_Storage_Devices-common-para-6.xml"/>
 	<!-- When you have finished identifying devices to be used for installation -->
 
diff --git a/en-US/Automatic_Partitioning_common-caution-1.xml b/en-US/Automatic_Partitioning_common-caution-1.xml
index 04e6dd5..1031756 100644
--- a/en-US/Automatic_Partitioning_common-caution-1.xml
+++ b/en-US/Automatic_Partitioning_common-caution-1.xml
@@ -6,9 +6,10 @@
 ]>
 
 <warning>
-	<title>Warning</title>
+	<title>Warning â€” Back up your data</title>
 
 	<para>
-		It is always a good idea to back up any data that you have on your systems. For example, if you are upgrading or creating a dual-boot system, you should back up any data you wish to keep on your drive(s). Mistakes do happen and can result in the loss of all your data.
+		It is always a good idea to back up any data that you have on your systems. For example, if you are upgrading or creating a dual-boot system, you should back up any data you wish to keep on your storage devices. Mistakes do happen and can result in the loss of all your data.
 	</para>
-</warning>
\ No newline at end of file
+</warning>
+
diff --git a/en-US/Automatic_Partitioning_common-indexterm-1.xml b/en-US/Automatic_Partitioning_common-indexterm-1.xml
index edee67e..d871be5 100644
--- a/en-US/Automatic_Partitioning_common-indexterm-1.xml
+++ b/en-US/Automatic_Partitioning_common-indexterm-1.xml
@@ -9,4 +9,5 @@
 <indexterm significance="normal">
 	<primary>partitioning</primary>
 	<secondary>automatic</secondary>
-</indexterm>
\ No newline at end of file
+</indexterm>
+
diff --git a/en-US/Automatic_Partitioning_common-indexterm-2.xml b/en-US/Automatic_Partitioning_common-indexterm-2.xml
index 50f377c..26e0048 100644
--- a/en-US/Automatic_Partitioning_common-indexterm-2.xml
+++ b/en-US/Automatic_Partitioning_common-indexterm-2.xml
@@ -7,4 +7,5 @@
 
 <indexterm significance="normal">
 	<primary>automatic partitioning</primary>
-</indexterm>
\ No newline at end of file
+</indexterm>
+
diff --git a/en-US/Automatic_Partitioning_common-note-1.xml b/en-US/Automatic_Partitioning_common-note-1.xml
index 8b34f18..c439e11 100644
--- a/en-US/Automatic_Partitioning_common-note-1.xml
+++ b/en-US/Automatic_Partitioning_common-note-1.xml
@@ -1,15 +1,16 @@
 <?xml version="1.0"?>
-<!DOCTYPE caution PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+<!DOCTYPE important PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
 ]>
 
   <important>
-    <title>Installing in text mode</title>
+    <title>Important â€” Installing in text mode</title>
 
 	<para>
-		If you install Fedora in text mode, you can only use the default partitioning schemes described in this section. Therefore, although you can choose to use a whole drive, to remove existing Linux partitions, or to use the free space on the drive, you cannot customize the partition layout. That is, you cannot add or remove partitions or file systems beyond those that the installer automatically adds or removes. If you require a customized layout at installation time, you should perform a graphical installation over a VNC connection or a kickstart installation.
+		If you install Fedora in text mode, you can only use the default partitioning schemes described in this section. You cannot add or remove partitions or file systems beyond those that the installer automatically adds or removes. If you require a customized layout at installation time, you should perform a graphical installation over a VNC connection or a kickstart installation.
 	</para>
 
 	<para>
 		Furthermore, advanced options such as LVM, encrypted filesystems, and resizable filesystems are available only in graphical mode and kickstart. 
 	</para>
-  </important>
\ No newline at end of file
+  </important>
+
diff --git a/en-US/Automatic_Partitioning_common-para-3.xml b/en-US/Automatic_Partitioning_common-para-3.xml
index 629ad8e..9a91171 100644
--- a/en-US/Automatic_Partitioning_common-para-3.xml
+++ b/en-US/Automatic_Partitioning_common-para-3.xml
@@ -5,4 +5,5 @@
 <para>
 	To review and make any necessary changes to the partitions created by automatic partitioning, select the <guilabel>Review</guilabel> option. After selecting <guilabel>Review</guilabel> and clicking <guibutton>Next</guibutton> to move forward, the partitions created for you by <application>anaconda</application> appear. You can make modifications to these partitions if they do not meet your needs.
 </para>
-	
\ No newline at end of file
+	
+
diff --git a/en-US/Automatic_Partitioning_common-para-4.xml b/en-US/Automatic_Partitioning_common-para-4.xml
index 5ed0b92..c0663b0 100644
--- a/en-US/Automatic_Partitioning_common-para-4.xml
+++ b/en-US/Automatic_Partitioning_common-para-4.xml
@@ -7,4 +7,5 @@
 
 <para>
 	Click <guibutton>Next</guibutton> once you have made your selections to proceed.
-</para>
\ No newline at end of file
+</para>
+
diff --git a/en-US/Automatic_Partitioning_common-varlistentry-1.xml b/en-US/Automatic_Partitioning_common-varlistentry-1.xml
index 7e88634..251d30b 100644
--- a/en-US/Automatic_Partitioning_common-varlistentry-1.xml
+++ b/en-US/Automatic_Partitioning_common-varlistentry-1.xml
@@ -11,7 +11,10 @@
 		<warning>
 			<title>Warning</title>
 			<para>
-				If you select this option, all data on the selected hard drive(s) is removed by the installation program. Do not select this option if you have information that you want to keep on the hard drive(s) where you are installing Fedora.
+				If you select this option, all data on the selected hard drives is removed by the installation program. Do not select this option if you have information that you want to keep on the hard drives where you are installing Fedora.
+			</para>
+			<para>
+				In particular, do not select this option when you configure a system to chain load the Fedora boot loader from another boot loader.
 			</para>
 		</warning>
 	</listitem>
diff --git a/en-US/Automatic_Partitioning_common-varlistentry-3.xml b/en-US/Automatic_Partitioning_common-varlistentry-3.xml
index 573070e..0334ae3 100644
--- a/en-US/Automatic_Partitioning_common-varlistentry-3.xml
+++ b/en-US/Automatic_Partitioning_common-varlistentry-3.xml
@@ -6,7 +6,7 @@
 	<term>Shrink Current System</term>
 	<listitem>
 		<para>
-			Select this option to resize your current data and partitions manually and install a default Red Hat Enterprise Linux layout in the space that is freed.
+			Select this option to resize your current data and partitions manually and install a default Fedora layout in the space that is freed.
 		</para>
 		<warning>
 			<title>Warning</title>
diff --git a/en-US/Automatic_Partitioning_x86_ppc-tip-para-1.xml b/en-US/Automatic_Partitioning_x86_ppc-tip-para-1.xml
index 6c16c4e..3a0d04a 100644
--- a/en-US/Automatic_Partitioning_x86_ppc-tip-para-1.xml
+++ b/en-US/Automatic_Partitioning_x86_ppc-tip-para-1.xml
@@ -7,4 +7,5 @@
 
 <para>
 	If you have a RAID card, be aware that some BIOSes do not support booting from the RAID card. In cases such as these, the <filename>/boot/</filename> partition must be created on a partition outside of the RAID array, such as on a separate hard drive. An internal hard drive is necessary to use for partition creation with problematic RAID cards.
-</para>
\ No newline at end of file
+</para>
+
diff --git a/en-US/Automatic_Partitioning_x86_ppc-tip-para-2.xml b/en-US/Automatic_Partitioning_x86_ppc-tip-para-2.xml
index 2150171..b34ab35 100644
--- a/en-US/Automatic_Partitioning_x86_ppc-tip-para-2.xml
+++ b/en-US/Automatic_Partitioning_x86_ppc-tip-para-2.xml
@@ -7,4 +7,5 @@
 
 <para>
 	A <filename>/boot/</filename> partition is also necessary for software RAID setups.
-</para>
\ No newline at end of file
+</para>
+
diff --git a/en-US/Automatic_Partitioning_x86_ppc-tip-para-3.xml b/en-US/Automatic_Partitioning_x86_ppc-tip-para-3.xml
index fe49710..01fa118 100644
--- a/en-US/Automatic_Partitioning_x86_ppc-tip-para-3.xml
+++ b/en-US/Automatic_Partitioning_x86_ppc-tip-para-3.xml
@@ -7,4 +7,5 @@
 
 <para>
 	If you have chosen to automatically partition your system, you should select <guilabel>Review</guilabel> and manually edit your <filename>/boot/</filename> partition.
-</para>
\ No newline at end of file
+</para>
+
diff --git a/en-US/Beginning_Installation-x86.xml b/en-US/Beginning_Installation-x86.xml
index 863590a..e666703 100644
--- a/en-US/Beginning_Installation-x86.xml
+++ b/en-US/Beginning_Installation-x86.xml
@@ -3,12 +3,9 @@
 ]>
 
 <section id="s1-begininstall-cd-inst-x86">	
-		
-	<!-- Installing from CD-ROM -->
-	
 	
 	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Beginning_Installation_x86_ppc-title-1.xml"/>
-	<!-- Title: Installing from CD-ROM or DVD -->
+	<!-- Title: Installing from DVD -->
 	
 	<!-- Index terms -->
 	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Beginning_Installation_x86_ppc-indexterm-1.xml"/>
@@ -20,13 +17,10 @@
 	<!-- End of Index terms -->
 
 	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Beginning_Installation_x86_ppc-para-1.xml"/>
-	<!-- To install Fedora from a CD-ROM, -->
+	<!-- To install Fedora from a DVD -->
 
-	<!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Beginning_Installation_x86_ppc-note-1.xml"/> -->
-	<!-- The first CD-ROM is required when booting the installation program, -->
-	
 	<para>
-		The installation program then probes your system and attempts to identify your CD-ROM drive. It starts by looking for an IDE (also known as an ATAPI) CD-ROM drive.
+		The installation program then probes your system and attempts to identify your DVD drive. It starts by looking for an IDE (also known as an ATAPI) DVD drive.
 	</para>
 
 	<note>
@@ -39,21 +33,22 @@
 			<primary>canceling the installation</primary>
 		</indexterm>
 		<para>
-			To abort the installation process at this time, reboot your machine and then eject the boot media. You can safely cancel the installation at any point before the <guilabel>About to Install</guilabel> screen. Refer to
-			<xref linkend="s1-installpkgs-x86"/> for more information.
+			To abort the installation process at this time, reboot your machine and then eject the boot media. You can safely cancel the installation at any point before the <guilabel>Write changes to disk</guilabel> screen. Refer to
+			<xref linkend="Write_changes_to_disk-x86"/> for more information.
 		</para>
 	</note>
 
 	<indexterm significance="normal">
-		<primary>CD-ROM</primary>
+		<primary>DVD</primary>
 		<secondary>SCSI</secondary>
 	</indexterm>
 	
 	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Beginning_Installation_x86_ppc-para-3.xml"/>
-	<!-- If your CD-ROM drive is not detected... -->
+	<!-- If your DVD drive is not detected... -->
 	
 	<para>
-		If the DVD/CD-ROM drive is found and the driver loaded, the installer will present you with the option to perform a media check on the DVD/CD-ROM. This will take some time, and you may opt to skip over this step. However, if you later encounter problems with the installer, you should reboot and perform the media check before calling for support. From the media check dialog, continue to the next stage of the installation process (refer to <xref linkend="sn-welcome-x86"/>).
+		If the DVD drive is found and the driver loaded, the installer will present you with the option to perform a media check on the DVD. This will take some time, and you may opt to skip over this step. However, if you later encounter problems with the installer, you should reboot and perform the media check before calling for support. From the media check dialog, continue to the next stage of the installation process (refer to <xref linkend="sn-welcome-x86"/>).
 	</para>
 
-</section>
\ No newline at end of file
+</section>
+
diff --git a/en-US/Beginning_Installation_Hard_Disk-x86.xml b/en-US/Beginning_Installation_Hard_Disk-x86.xml
index 9034375..8f366ca 100644
--- a/en-US/Beginning_Installation_Hard_Disk-x86.xml
+++ b/en-US/Beginning_Installation_Hard_Disk-x86.xml
@@ -41,6 +41,9 @@
 		<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Beginning_Installation_Hard_Disk_common-note-2.xml"/>
 		<!-- An entry without a leading slash may call the installation to fail. -->
 		
-		<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Beginning_Installation_Hard_Disk_common-para-11.xml"/>
-		<!-- Select OK to continue. Proceed with... -->
-	</section>	
\ No newline at end of file
+		<para>
+		  Select <guibutton>OK</guibutton> to continue.  Proceed with <xref
+		    linkend="ch-guimode-x86"/>.
+		</para>
+	</section>	
+
diff --git a/en-US/Beginning_Installation_Hard_Disk_common-indexterm-1.xml b/en-US/Beginning_Installation_Hard_Disk_common-indexterm-1.xml
index 1f4382d..7f7b416 100644
--- a/en-US/Beginning_Installation_Hard_Disk_common-indexterm-1.xml
+++ b/en-US/Beginning_Installation_Hard_Disk_common-indexterm-1.xml
@@ -4,4 +4,5 @@
 
 <indexterm significance="normal">
 		<primary>hard drive installation</primary>
-	</indexterm>
\ No newline at end of file
+	</indexterm>
+
diff --git a/en-US/Beginning_Installation_Hard_Disk_common-indexterm-10.xml b/en-US/Beginning_Installation_Hard_Disk_common-indexterm-10.xml
index c89c149..b4be999 100644
--- a/en-US/Beginning_Installation_Hard_Disk_common-indexterm-10.xml
+++ b/en-US/Beginning_Installation_Hard_Disk_common-indexterm-10.xml
@@ -6,3 +6,4 @@
     <primary>file systems</primary>
     <secondary>ext4</secondary>
 </indexterm> 
+
diff --git a/en-US/Beginning_Installation_Hard_Disk_common-indexterm-2.xml b/en-US/Beginning_Installation_Hard_Disk_common-indexterm-2.xml
index 6594b22..6f67266 100644
--- a/en-US/Beginning_Installation_Hard_Disk_common-indexterm-2.xml
+++ b/en-US/Beginning_Installation_Hard_Disk_common-indexterm-2.xml
@@ -5,4 +5,5 @@
 <indexterm significance="normal">
 		<primary>installation</primary>
 		<secondary>hard drive</secondary>
-	</indexterm>
\ No newline at end of file
+	</indexterm>
+
diff --git a/en-US/Beginning_Installation_Hard_Disk_common-indexterm-3.xml b/en-US/Beginning_Installation_Hard_Disk_common-indexterm-3.xml
index 700f48b..ce6fd80 100644
--- a/en-US/Beginning_Installation_Hard_Disk_common-indexterm-3.xml
+++ b/en-US/Beginning_Installation_Hard_Disk_common-indexterm-3.xml
@@ -6,3 +6,4 @@
     <primary>ext2</primary>
     <see>file systems</see>
 </indexterm>
+
diff --git a/en-US/Beginning_Installation_Hard_Disk_common-indexterm-4.xml b/en-US/Beginning_Installation_Hard_Disk_common-indexterm-4.xml
index 18aafa3..22adecb 100644
--- a/en-US/Beginning_Installation_Hard_Disk_common-indexterm-4.xml
+++ b/en-US/Beginning_Installation_Hard_Disk_common-indexterm-4.xml
@@ -5,4 +5,5 @@
 <indexterm significance="normal">
     <primary>file systems</primary>
     <secondary>ext2</secondary>
-</indexterm>
\ No newline at end of file
+</indexterm>
+
diff --git a/en-US/Beginning_Installation_Hard_Disk_common-indexterm-5.xml b/en-US/Beginning_Installation_Hard_Disk_common-indexterm-5.xml
index 02181fe..a423ffd 100644
--- a/en-US/Beginning_Installation_Hard_Disk_common-indexterm-5.xml
+++ b/en-US/Beginning_Installation_Hard_Disk_common-indexterm-5.xml
@@ -6,3 +6,4 @@
     <primary>ext3</primary>
     <see>file systems</see>
 </indexterm>
+
diff --git a/en-US/Beginning_Installation_Hard_Disk_common-indexterm-6.xml b/en-US/Beginning_Installation_Hard_Disk_common-indexterm-6.xml
index a8b0aae..049fde8 100644
--- a/en-US/Beginning_Installation_Hard_Disk_common-indexterm-6.xml
+++ b/en-US/Beginning_Installation_Hard_Disk_common-indexterm-6.xml
@@ -6,3 +6,4 @@
     <primary>file systems</primary>
     <secondary>ext3</secondary>
 </indexterm> 
+
diff --git a/en-US/Beginning_Installation_Hard_Disk_common-indexterm-7.xml b/en-US/Beginning_Installation_Hard_Disk_common-indexterm-7.xml
index 6f640c5..f39f68b 100644
--- a/en-US/Beginning_Installation_Hard_Disk_common-indexterm-7.xml
+++ b/en-US/Beginning_Installation_Hard_Disk_common-indexterm-7.xml
@@ -5,4 +5,5 @@
 <indexterm significance="normal">
     <primary>vfat</primary>
     <see>file systems</see>
-</indexterm>
\ No newline at end of file
+</indexterm>
+
diff --git a/en-US/Beginning_Installation_Hard_Disk_common-indexterm-8.xml b/en-US/Beginning_Installation_Hard_Disk_common-indexterm-8.xml
index 69858e8..21935d6 100644
--- a/en-US/Beginning_Installation_Hard_Disk_common-indexterm-8.xml
+++ b/en-US/Beginning_Installation_Hard_Disk_common-indexterm-8.xml
@@ -6,3 +6,4 @@
     <primary>file systems</primary>
     <secondary>vfat</secondary>
 </indexterm> 
+
diff --git a/en-US/Beginning_Installation_Hard_Disk_common-indexterm-9.xml b/en-US/Beginning_Installation_Hard_Disk_common-indexterm-9.xml
index 4815239..f669b3a 100644
--- a/en-US/Beginning_Installation_Hard_Disk_common-indexterm-9.xml
+++ b/en-US/Beginning_Installation_Hard_Disk_common-indexterm-9.xml
@@ -5,4 +5,5 @@
 <indexterm significance="normal">
     <primary>ext4</primary>
     <see>file systems</see>
-</indexterm>
\ No newline at end of file
+</indexterm>
+
diff --git a/en-US/Beginning_Installation_Hard_Disk_common-note-1.xml b/en-US/Beginning_Installation_Hard_Disk_common-note-1.xml
index 2606265..4fab6f7 100644
--- a/en-US/Beginning_Installation_Hard_Disk_common-note-1.xml
+++ b/en-US/Beginning_Installation_Hard_Disk_common-note-1.xml
@@ -8,3 +8,4 @@
     You cannot use ISO files on partitions controlled by LVM (Logical Volume Management).
   </para>
 </important>
+
diff --git a/en-US/Beginning_Installation_Hard_Disk_common-note-2.xml b/en-US/Beginning_Installation_Hard_Disk_common-note-2.xml
index dc2bf33..5e1f3ee 100644
--- a/en-US/Beginning_Installation_Hard_Disk_common-note-2.xml
+++ b/en-US/Beginning_Installation_Hard_Disk_common-note-2.xml
@@ -8,3 +8,4 @@
     An entry without a leading slash may cause the installation to fail.
   </para>
 </important>
+
diff --git a/en-US/Beginning_Installation_Hard_Disk_common-para-1.xml b/en-US/Beginning_Installation_Hard_Disk_common-para-1.xml
index 34f0b4a..67bf329 100644
--- a/en-US/Beginning_Installation_Hard_Disk_common-para-1.xml
+++ b/en-US/Beginning_Installation_Hard_Disk_common-para-1.xml
@@ -3,5 +3,6 @@
 ]>
 
 <para>
-	The <guilabel>Select Partition</guilabel> screen applies only if you are installing from a disk partition (that is, if you used the <literal>askmethod</literal> boot options and selected <guimenuitem>Hard Drive</guimenuitem> in the <guilabel>Installation Method</guilabel> dialog). This dialog allows you to name the disk partition and directory from which you are installing Fedora. If you used the <literal>repo=hd</literal> boot option, you already specified a partition.
+	The <guilabel>Select Partition</guilabel> screen applies only if you are installing from a disk partition (that is, you selected <guimenuitem>Hard Drive</guimenuitem> in the <guilabel>Installation Method</guilabel> dialog). This dialog allows you to name the disk partition and directory from which you are installing Fedora. If you used the <literal>repo=hd</literal> boot option, you already specified a partition.
 </para>
+
diff --git a/en-US/Beginning_Installation_Hard_Disk_common-para-10.xml b/en-US/Beginning_Installation_Hard_Disk_common-para-10.xml
index a7cddcb..f4c9862 100644
--- a/en-US/Beginning_Installation_Hard_Disk_common-para-10.xml
+++ b/en-US/Beginning_Installation_Hard_Disk_common-para-10.xml
@@ -5,3 +5,4 @@
 <para>
   Also specify the <guilabel>Directory holding images</guilabel>. Enter the full directory path from the drive that contains the ISO image files.  The following table shows some examples of how to enter this information:
 </para>
+
diff --git a/en-US/Beginning_Installation_Hard_Disk_common-para-11.xml b/en-US/Beginning_Installation_Hard_Disk_common-para-11.xml
deleted file mode 100644
index 4c9a012..0000000
--- a/en-US/Beginning_Installation_Hard_Disk_common-para-11.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE indexterm PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
-]>
-
-<para>
-  Select <guibutton>OK</guibutton> to continue.  Proceed with <xref
-    linkend="sn-welcome-x86"/>.
-</para>
diff --git a/en-US/Beginning_Installation_Hard_Disk_common-para-3.xml b/en-US/Beginning_Installation_Hard_Disk_common-para-3.xml
index e969f52..28d8763 100644
--- a/en-US/Beginning_Installation_Hard_Disk_common-para-3.xml
+++ b/en-US/Beginning_Installation_Hard_Disk_common-para-3.xml
@@ -8,4 +8,5 @@
 <para>
 		If the ISO images are in the root (top-level) directory of a partition, enter a <filename>/</filename>. If the ISO images are located in a subdirectory of a mounted partition, enter the name of the directory holding the ISO images within that partition. For example, if the partition on which the ISO images is normally mounted as <filename>/home/</filename>, and the images are in <filename>/home/new/</filename>, you would enter
 		<filename>/new/</filename>.
-	</para>
\ No newline at end of file
+	</para>
+
diff --git a/en-US/Beginning_Installation_Hard_Disk_common-para-5.xml b/en-US/Beginning_Installation_Hard_Disk_common-para-5.xml
index e8aed77..a11dec0 100644
--- a/en-US/Beginning_Installation_Hard_Disk_common-para-5.xml
+++ b/en-US/Beginning_Installation_Hard_Disk_common-para-5.xml
@@ -3,6 +3,7 @@
 ]>
 
 <para>
-  The ISO files must be located on a hard drive that is either internal to the computer, or attached to the machine by USB. In addition the <filename>install.img</filename> file from within the ISO files must be copied to a directory named <filename class="directory">images</filename> Use this option to install Fedora on computers that are without a network connection or CD/DVD drives.
+	The ISO image must be located on a hard drive that is either internal to the computer on which you will install Fedora, or on a hard drive that is attached to that computer by USB.
 </para>
 
+
diff --git a/en-US/Beginning_Installation_Hard_Disk_common-para-6.xml b/en-US/Beginning_Installation_Hard_Disk_common-para-6.xml
deleted file mode 100644
index ec364c1..0000000
--- a/en-US/Beginning_Installation_Hard_Disk_common-para-6.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE indexterm PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
-]>
-
-<para>
-  To extract the <filename>install.img</filename> from the ISO follow the procedure:
-</para>
diff --git a/en-US/Beginning_Installation_Hard_Disk_common-para-8.xml b/en-US/Beginning_Installation_Hard_Disk_common-para-8.xml
deleted file mode 100644
index a01925b..0000000
--- a/en-US/Beginning_Installation_Hard_Disk_common-para-8.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE indexterm PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
-]>
-
-<para>
-  Before you begin installation from a hard drive, check the partition type to ensure that Fedora can read it. To check a partition's file system under Windows, use the <application>Disk Management</application> tool. To check a partition's file system under Linux, use the <command>fdisk</command> utility.
-</para>
\ No newline at end of file
diff --git a/en-US/Beginning_Installation_Hard_Disk_common-para-9.xml b/en-US/Beginning_Installation_Hard_Disk_common-para-9.xml
index 1de7004..e187f84 100644
--- a/en-US/Beginning_Installation_Hard_Disk_common-para-9.xml
+++ b/en-US/Beginning_Installation_Hard_Disk_common-para-9.xml
@@ -5,3 +5,4 @@
 <para>
   Select the partition containing the ISO files from the list of available partitions. Internal IDE, SATA, SCSI, and USB drive device names begin with <filename>/dev/sd</filename>. Each individual drive has its own letter, for example <filename>/dev/sda</filename>. Each partition on a drive is numbered, for example <filename>/dev/sda1</filename>.
 </para>
+
diff --git a/en-US/Beginning_Installation_Hard_Disk_common-screen-1.xml b/en-US/Beginning_Installation_Hard_Disk_common-screen-1.xml
index 085e8cd..0b9e5a8 100644
--- a/en-US/Beginning_Installation_Hard_Disk_common-screen-1.xml
+++ b/en-US/Beginning_Installation_Hard_Disk_common-screen-1.xml
@@ -3,7 +3,8 @@
 ]>
 
 <screen>
-  <command>mount -t iso9660 /path/to/Fedora&PRODVER;.iso /mnt/point -o loop,ro</command>
-  <command>cp -pr /mnt/point/images /path/images/</command>
-  <command>umount /mnt/point</command>
+  <command><![CDATA[mount -t iso9660 /path/to/RHEL6.iso /mnt/point -o loop,ro]]></command>
+  <command><![CDATA[cp -pr /mnt/point/images /path/images/]]></command>
+  <command><![CDATA[umount /mnt/point]]></command>
 </screen>
+
diff --git a/en-US/Beginning_Installation_Hard_Disk_common-table-1.xml b/en-US/Beginning_Installation_Hard_Disk_common-table-1.xml
index 228629f..c131be1 100644
--- a/en-US/Beginning_Installation_Hard_Disk_common-table-1.xml
+++ b/en-US/Beginning_Installation_Hard_Disk_common-table-1.xml
@@ -2,7 +2,9 @@
 <!DOCTYPE indexterm PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
 ]>
 
-<table id="table-Location_of_ISO_images" frame='all'><title>Location of ISO images for different partition types</title>
+<!-- FIXME <table id="table-Location_of_ISO_images" frame='all'> -->
+<table frame='all'>
+<title>Location of ISO images for different partition types</title>
     <tgroup cols='4' align='left' colsep='1' rowsep='1'>
       <thead>
 	  <row>
@@ -16,15 +18,16 @@
 	  <row>
 	    <entry>VFAT</entry>
 	    <entry>D:\</entry>
-	    <entry>D:\Downloads\F&PRODVER;</entry>
-	    <entry>/Downloads/F&PRODVER;</entry>
+	    <entry>D:\Downloads\RHEL&PRODVER;</entry>
+	    <entry>/Downloads/RHEL&PRODVER;</entry>
 	  </row>
 	  <row>
 	    <entry>ext2, ext3, ext4</entry>
 	    <entry>/home</entry>
-	    <entry>/home/user1/F&PRODVER;</entry>
-	    <entry>/user1/F&PRODVER;</entry>
+	    <entry>/home/user1/RHEL&PRODVER;</entry>
+	    <entry>/user1/RHEL&PRODVER;</entry>
 	  </row>
       </tbody>
     </tgroup>
 </table>
+
diff --git a/en-US/Beginning_Installation_Hard_Disk_common-title-1.xml b/en-US/Beginning_Installation_Hard_Disk_common-title-1.xml
index f58d61f..f1d13f3 100644
--- a/en-US/Beginning_Installation_Hard_Disk_common-title-1.xml
+++ b/en-US/Beginning_Installation_Hard_Disk_common-title-1.xml
@@ -7,4 +7,5 @@
 
 <title>Installing from a Hard Drive</title>
 
-<!-- Beginning_Installation_Hard_Disk_common-title-1.xml -->
\ No newline at end of file
+<!-- Beginning_Installation_Hard_Disk_common-title-1.xml -->
+
diff --git a/en-US/Beginning_Installation_Hard_Disk_x86_ppc-figure-1.xml b/en-US/Beginning_Installation_Hard_Disk_x86_ppc-figure-1.xml
index 72ab6b8..8aa9618 100644
--- a/en-US/Beginning_Installation_Hard_Disk_x86_ppc-figure-1.xml
+++ b/en-US/Beginning_Installation_Hard_Disk_x86_ppc-figure-1.xml
@@ -13,4 +13,5 @@
 				</para>
 			</textobject>
 		</mediaobject>
-	</figure>
\ No newline at end of file
+	</figure>
+
diff --git a/en-US/Beginning_Installation_NFS-x86.xml b/en-US/Beginning_Installation_NFS-x86.xml
index d9b03b4..1d78700 100644
--- a/en-US/Beginning_Installation_NFS-x86.xml
+++ b/en-US/Beginning_Installation_NFS-x86.xml
@@ -20,9 +20,12 @@
 	<!-- Enter the domain name or IP address of your NFS server ... -->
 	
 	<para>
-		Next, enter the name of the exported directory. If you followed the setup described in <xref linkend="s1-steps-network-installs-x86"/>, you would enter the directory <filename><replaceable>/export/directory/</replaceable></filename>.
+		Next, enter the name of the exported directory. If you followed the setup described in <xref linkend="s1-steps-network-installs-x86-nfs"/>, you would enter the directory <filename><replaceable>/export/directory/</replaceable></filename>.
 	</para>
 	
+	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Beginning_Installation_NFS_common-para-7.xml"/>
+	<!-- NFS mount options -->
+	
 	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Beginning_Installation_NFS_common-para-4.xml"/>
 	<!-- If the NFS Server is exporting a mirror... -->
 	
@@ -35,6 +38,8 @@
 	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Beginning_Installation_NFS_common-para-5.xml"/>
 	<!-- If the NFS server is exporting ... -->
 	
-	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Beginning_Installation_NFS_common-para-6.xml"/>
-	<!-- Next, the Welcome dialog appears -->
-</section>
\ No newline at end of file
+	<para>
+		Proceed with <xref linkend="ch-guimode-x86"/>.
+	</para>
+</section>
+
diff --git a/en-US/Beginning_Installation_NFS_common-figure-1.xml b/en-US/Beginning_Installation_NFS_common-figure-1.xml
index be0bc84..cbea123 100644
--- a/en-US/Beginning_Installation_NFS_common-figure-1.xml
+++ b/en-US/Beginning_Installation_NFS_common-figure-1.xml
@@ -13,4 +13,5 @@
 			</para>
 		</textobject>
 	</mediaobject>
-</figure>
\ No newline at end of file
+</figure>
+
diff --git a/en-US/Beginning_Installation_NFS_common-indexterm-1.xml b/en-US/Beginning_Installation_NFS_common-indexterm-1.xml
index c074258..c0e45ed 100644
--- a/en-US/Beginning_Installation_NFS_common-indexterm-1.xml
+++ b/en-US/Beginning_Installation_NFS_common-indexterm-1.xml
@@ -9,4 +9,5 @@
 <indexterm significance="normal">
 		<primary>NFS</primary>
 		<secondary>installation</secondary>
-	</indexterm>
\ No newline at end of file
+	</indexterm>
+
diff --git a/en-US/Beginning_Installation_NFS_common-indexterm-2.xml b/en-US/Beginning_Installation_NFS_common-indexterm-2.xml
index f2deaac..43db158 100644
--- a/en-US/Beginning_Installation_NFS_common-indexterm-2.xml
+++ b/en-US/Beginning_Installation_NFS_common-indexterm-2.xml
@@ -8,4 +8,5 @@
 <indexterm significance="normal">
 		<primary>installation</primary>
 		<secondary>NFS</secondary>
-	</indexterm>
\ No newline at end of file
+	</indexterm>
+
diff --git a/en-US/Beginning_Installation_NFS_common-indexterm-3.xml b/en-US/Beginning_Installation_NFS_common-indexterm-3.xml
index cb28f91..e6f9246 100644
--- a/en-US/Beginning_Installation_NFS_common-indexterm-3.xml
+++ b/en-US/Beginning_Installation_NFS_common-indexterm-3.xml
@@ -9,4 +9,5 @@
 		<primary>network</primary>
 		<secondary>installations</secondary>
 		<tertiary>NFS</tertiary>
-	</indexterm>
\ No newline at end of file
+	</indexterm>
+
diff --git a/en-US/Beginning_Installation_NFS_common-indexterm-4.xml b/en-US/Beginning_Installation_NFS_common-indexterm-4.xml
index 6ccc09f..c872c38 100644
--- a/en-US/Beginning_Installation_NFS_common-indexterm-4.xml
+++ b/en-US/Beginning_Installation_NFS_common-indexterm-4.xml
@@ -9,4 +9,5 @@
 		<primary>installation</primary>
 		<secondary>NFS</secondary>
 		<tertiary>server information</tertiary>
-	</indexterm>
\ No newline at end of file
+	</indexterm>
+
diff --git a/en-US/Beginning_Installation_NFS_common-para-1.xml b/en-US/Beginning_Installation_NFS_common-para-1.xml
index d9a15b5..f798e75 100644
--- a/en-US/Beginning_Installation_NFS_common-para-1.xml
+++ b/en-US/Beginning_Installation_NFS_common-para-1.xml
@@ -6,5 +6,6 @@
 ]>
 
 <para>
-	The NFS dialog applies only if you booted with the <literal>askmethod</literal> boot option and selected <guimenuitem>NFS Image</guimenuitem> in the <guilabel>Installation Method</guilabel> dialog. If you used the <literal>repo=nfs</literal>boot option, you already specified a server and path.
-</para>
\ No newline at end of file
+	The NFS dialog applies only if you selected <guimenuitem>NFS Image</guimenuitem> in the <guilabel>Installation Method</guilabel> dialog. If you used the <literal>repo=nfs</literal> boot option, you already specified a server and path.
+</para>
+
diff --git a/en-US/Beginning_Installation_NFS_common-para-2.xml b/en-US/Beginning_Installation_NFS_common-para-2.xml
index 946a767..d4db636 100644
--- a/en-US/Beginning_Installation_NFS_common-para-2.xml
+++ b/en-US/Beginning_Installation_NFS_common-para-2.xml
@@ -7,4 +7,5 @@
 
 <para>
 	Enter the domain name or IP address of your NFS server. For example, if you are installing from a host named <filename>eastcoast</filename> in the domain <filename>example.com</filename>, enter <filename>eastcoast.example.com</filename> in the <guilabel>NFS Server</guilabel> field.
-</para>
\ No newline at end of file
+</para>
+
diff --git a/en-US/Beginning_Installation_NFS_common-para-4.xml b/en-US/Beginning_Installation_NFS_common-para-4.xml
index eb1ad23..b6d91c1 100644
--- a/en-US/Beginning_Installation_NFS_common-para-4.xml
+++ b/en-US/Beginning_Installation_NFS_common-para-4.xml
@@ -4,5 +4,6 @@ open.org/docbook/xml/4.3/docbookx.dtd" [
 ]>
 
 <para>
-	If the NFS server is exporting a mirror of the Fedora installation tree, enter the directory which contains the root of the installation tree. If everything was specified properly, a message appears indicating that the installation program for Fedora is running.
-</para>
\ No newline at end of file
+	If the NFS server is exporting a mirror of the Fedora installation tree, enter the directory which contains the root of the installation tree. You will enter an Installation Key later on in the process which will determine which subdirectories are used to install from. If everything was specified properly, a message appears indicating that the installation program for Fedora is running.
+</para>
+
diff --git a/en-US/Beginning_Installation_NFS_common-para-5.xml b/en-US/Beginning_Installation_NFS_common-para-5.xml
index 84e1543..391ce56 100644
--- a/en-US/Beginning_Installation_NFS_common-para-5.xml
+++ b/en-US/Beginning_Installation_NFS_common-para-5.xml
@@ -3,5 +3,6 @@
 ]>
 
 <para>
-	If the NFS server is exporting the ISO images of the Fedora CD-ROMs, enter the directory which contains the ISO images.
-</para>
\ No newline at end of file
+	If the NFS server is exporting the ISO image of the Fedora DVD, enter the directory which contains the ISO image.
+</para>
+
diff --git a/en-US/Beginning_Installation_NFS_common-para-6.xml b/en-US/Beginning_Installation_NFS_common-para-6.xml
deleted file mode 100644
index 6be8e7b..0000000
--- a/en-US/Beginning_Installation_NFS_common-para-6.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
-]>
-
-<para>
-	Next, the <guilabel>Welcome</guilabel> dialog appears.
-</para>
\ No newline at end of file
diff --git a/en-US/Beginning_Installation_NFS_common-para-7.xml b/en-US/Beginning_Installation_NFS_common-para-7.xml
new file mode 100644
index 0000000..069a538
--- /dev/null
+++ b/en-US/Beginning_Installation_NFS_common-para-7.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+]>
+
+<para>
+	This dialog also allows you to specify NFS mount options. Refer to the <citetitle>Fedora Deployment Guide</citetitle> for a list of common NFS mount options, or consult the man pages for <command>mount</command> and <literal>nfs</literal> for a comprehensive list of options.
+</para>
+
diff --git a/en-US/Beginning_Installation_NFS_common-title-1.xml b/en-US/Beginning_Installation_NFS_common-title-1.xml
index 85c6494..241af68 100644
--- a/en-US/Beginning_Installation_NFS_common-title-1.xml
+++ b/en-US/Beginning_Installation_NFS_common-title-1.xml
@@ -5,4 +5,5 @@
 	  
 ]>
 
-<title>Installing via NFS</title>
\ No newline at end of file
+<title>Installing via NFS</title>
+
diff --git a/en-US/Beginning_Installation_Network-x86.xml b/en-US/Beginning_Installation_Network-x86.xml
index 7746cd6..839d422 100644
--- a/en-US/Beginning_Installation_Network-x86.xml
+++ b/en-US/Beginning_Installation_Network-x86.xml
@@ -41,13 +41,26 @@
 	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Beginning_Installation_Network_x86_ppc-para-6.xml"/>
 	<!-- These settings apply only during the installation process.  -->
 	
-	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Beginning_Installation_Network_x86_ppc-para-7.xml"/>
+	<!-- FIG <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Beginning_Installation_Network_x86_ppc-para-7.xml"/> -->
 	<!-- You can install from a Web, FTP, or NFS server either on...  -->
 	
-	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Beginning_Installation_Network_x86_ppc-para-8.xml"/>
+	<!-- FIG <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Beginning_Installation_Network_x86_ppc-para-8.xml"/> -->
 	<!-- The Fedora Project maintains a list of Web and FTP public...  -->
 	
-	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Beginning_Installation_Network_x86_ppc-list-1.xml"/>
-	<!-- If you are installing via NFS, proceed to...  -->
+	    <itemizedlist>
+      <listitem>
+	<para>
+	  If you are installing via NFS, proceed to <xref
+	    linkend="s1-begininstall-nfs-x86"/>.
+	</para>
+      </listitem>
+      <listitem>
+	<para>
+	  If you are installing via Web or FTP, proceed to <xref
+	    linkend="s1-begininstall-url-x86"/>.
+	</para>
+      </listitem>
+    </itemizedlist>
 	
-</section>
\ No newline at end of file
+</section>
+
diff --git a/en-US/Beginning_Installation_Network_x86_ppc-indexterm-1.xml b/en-US/Beginning_Installation_Network_x86_ppc-indexterm-1.xml
index c90c6d5..62674fd 100644
--- a/en-US/Beginning_Installation_Network_x86_ppc-indexterm-1.xml
+++ b/en-US/Beginning_Installation_Network_x86_ppc-indexterm-1.xml
@@ -8,4 +8,5 @@
 <indexterm significance="normal">
 		<primary>network installation</primary>
 		<secondary>performing</secondary>
-</indexterm>
\ No newline at end of file
+</indexterm>
+
diff --git a/en-US/Beginning_Installation_Network_x86_ppc-indexterm-2.xml b/en-US/Beginning_Installation_Network_x86_ppc-indexterm-2.xml
index dec1349..3342535 100644
--- a/en-US/Beginning_Installation_Network_x86_ppc-indexterm-2.xml
+++ b/en-US/Beginning_Installation_Network_x86_ppc-indexterm-2.xml
@@ -4,4 +4,5 @@
 
 <indexterm significance="normal">
 		<primary>TCP/IP configuration</primary>
-	</indexterm>
\ No newline at end of file
+	</indexterm>
+
diff --git a/en-US/Beginning_Installation_Network_x86_ppc-indexterm-3.xml b/en-US/Beginning_Installation_Network_x86_ppc-indexterm-3.xml
index 4d18dd6..b04560a 100644
--- a/en-US/Beginning_Installation_Network_x86_ppc-indexterm-3.xml
+++ b/en-US/Beginning_Installation_Network_x86_ppc-indexterm-3.xml
@@ -5,4 +5,5 @@
 <indexterm significance="normal">
     <primary>NFS (Network File System)</primary>
     <secondary>install from</secondary>
-  </indexterm>
\ No newline at end of file
+  </indexterm>
+
diff --git a/en-US/Beginning_Installation_Network_x86_ppc-list-1.xml b/en-US/Beginning_Installation_Network_x86_ppc-list-1.xml
deleted file mode 100644
index 431907b..0000000
--- a/en-US/Beginning_Installation_Network_x86_ppc-list-1.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
-]>
-
-    <itemizedlist>
-      <listitem>
-	<para>
-	  If you are installing via NFS, proceed to <xref
-	    linkend="s1-begininstall-nfs-x86"/>.
-	</para>
-      </listitem>
-      <listitem>
-	<para>
-	  If you are installing via Web or FTP, proceed to <xref
-	    linkend="s1-begininstall-url-x86"/>.
-	</para>
-      </listitem>
-    </itemizedlist>
diff --git a/en-US/Beginning_Installation_Network_x86_ppc-para-1.xml b/en-US/Beginning_Installation_Network_x86_ppc-para-1.xml
index 73bd3a9..cc1b9db 100644
--- a/en-US/Beginning_Installation_Network_x86_ppc-para-1.xml
+++ b/en-US/Beginning_Installation_Network_x86_ppc-para-1.xml
@@ -4,4 +4,5 @@
 
 <para>
 	If you are performing a network installation, the <guilabel>Configure TCP/IP</guilabel> dialog appears. This dialog asks for your IP and other network addresses. You can choose to configure the IP address and Netmask of the device via DHCP or manually. 
-</para>
\ No newline at end of file
+</para>
+
diff --git a/en-US/Beginning_Installation_Network_x86_ppc-para-2.xml b/en-US/Beginning_Installation_Network_x86_ppc-para-2.xml
index f296f02..d8d77bd 100644
--- a/en-US/Beginning_Installation_Network_x86_ppc-para-2.xml
+++ b/en-US/Beginning_Installation_Network_x86_ppc-para-2.xml
@@ -4,4 +4,5 @@
 
 <para>
 	Enter the IP address you are using during installation and press <keycap>Enter</keycap>. 
-</para>
\ No newline at end of file
+</para>
+
diff --git a/en-US/Beginning_Installation_Network_x86_ppc-para-3.xml b/en-US/Beginning_Installation_Network_x86_ppc-para-3.xml
index 795546f..51c1357 100644
--- a/en-US/Beginning_Installation_Network_x86_ppc-para-3.xml
+++ b/en-US/Beginning_Installation_Network_x86_ppc-para-3.xml
@@ -4,4 +4,5 @@
 
 <para>
   The installation program is network-aware and can use network settings for a number of functions.  For instance, if you boot the installer with the <literal>askmethod</literal> or <literal>repo=</literal> options, you can install Fedora from a network server using FTP, HTTP, or NFS protocols.  You can also instruct the installation program to consult additional software repositories later in the process.
-</para>
\ No newline at end of file
+</para>
+
diff --git a/en-US/Beginning_Installation_Network_x86_ppc-para-4.xml b/en-US/Beginning_Installation_Network_x86_ppc-para-4.xml
index 393ead5..ae328dc 100644
--- a/en-US/Beginning_Installation_Network_x86_ppc-para-4.xml
+++ b/en-US/Beginning_Installation_Network_x86_ppc-para-4.xml
@@ -4,4 +4,5 @@
 
 <para>
   By default, the installation program uses DHCP to automatically provide network settings. If you use a cable or DSL modem, router, firewall, or other network hardware to communicate with the Internet, DHCP is a suitable option. If your network has no DHCP server, clear the check box labeled <guilabel>Use dynamic IP configuration (DHCP)</guilabel>.
-</para>
\ No newline at end of file
+</para>
+
diff --git a/en-US/Beginning_Installation_Network_x86_ppc-para-5.xml b/en-US/Beginning_Installation_Network_x86_ppc-para-5.xml
index c7e6106..f39d200 100644
--- a/en-US/Beginning_Installation_Network_x86_ppc-para-5.xml
+++ b/en-US/Beginning_Installation_Network_x86_ppc-para-5.xml
@@ -3,6 +3,7 @@
 ]>
 
 <para>
-  The installation program supports the IPv4 and IPv6 protocols.
+  The installation program supports the IPv4 and IPv6 protocols. <!-- Refer also to <xref linkend="sn-networkconfig-fedora"/> for more information on configuring your network. -->
 </para>
 
+
diff --git a/en-US/Beginning_Installation_Network_x86_ppc-para-6.xml b/en-US/Beginning_Installation_Network_x86_ppc-para-6.xml
index 5210dcf..2b304f5 100644
--- a/en-US/Beginning_Installation_Network_x86_ppc-para-6.xml
+++ b/en-US/Beginning_Installation_Network_x86_ppc-para-6.xml
@@ -6,3 +6,4 @@
       When the installation process completes, it will transfer these settings to your system. 
     </para>
 
+
diff --git a/en-US/Beginning_Installation_Network_x86_ppc-para-7.xml b/en-US/Beginning_Installation_Network_x86_ppc-para-7.xml
deleted file mode 100644
index 4e121d9..0000000
--- a/en-US/Beginning_Installation_Network_x86_ppc-para-7.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
-]>
-
-    <para>
-      You can install from a Web, FTP, or NFS server either on your
-      local network or, if you are connected, on the Internet. You may
-      install Fedora from your own private mirror, or use one of the
-      public mirrors maintained by members of the community. To ensure
-      that the connection is as fast and reliable as possible, use a
-      server that is close to your own geographical location.
-    </para>
-
diff --git a/en-US/Beginning_Installation_Network_x86_ppc-para-8.xml b/en-US/Beginning_Installation_Network_x86_ppc-para-8.xml
deleted file mode 100644
index c51a865..0000000
--- a/en-US/Beginning_Installation_Network_x86_ppc-para-8.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
-]>
-
-    <para>
-      The Fedora Project maintains a list of Web and FTP public mirrors, sorted
-      by region, at <ulink
-	url="http://fedoraproject.org/wiki/Mirrors"/>. To determine the
-      complete directory path for the installation files, add
-      <filename>/&PRODVER;/Fedora/<replaceable>architecture</replaceable>/os/</filename> 
-      to the path shown on the web page.  A correct mirror location for
-      an <systemitem>i386</systemitem> system resembles the URL
-      <literal>http://mirror.example.com/pub/fedora/linux/releases/&PRODVER;/Fedora/i386/os</literal>.
-    </para>
diff --git a/en-US/Beginning_Installation_Network_x86_ppc-title.xml b/en-US/Beginning_Installation_Network_x86_ppc-title.xml
index 5d6ebc0..701cba2 100644
--- a/en-US/Beginning_Installation_Network_x86_ppc-title.xml
+++ b/en-US/Beginning_Installation_Network_x86_ppc-title.xml
@@ -4,4 +4,5 @@
 	  
 	  
 ]>
-<title>Performing a Network Installation</title>
\ No newline at end of file
+<title>Performing a Network Installation</title>
+
diff --git a/en-US/Beginning_Installation_URL-common-figure-1.xml b/en-US/Beginning_Installation_URL-common-figure-1.xml
index 4e878e3..00cb7c6 100644
--- a/en-US/Beginning_Installation_URL-common-figure-1.xml
+++ b/en-US/Beginning_Installation_URL-common-figure-1.xml
@@ -10,4 +10,5 @@
 			</para>
 		</textobject>
 	</mediaobject>
-</figure>
\ No newline at end of file
+</figure>
+
diff --git a/en-US/Beginning_Installation_URL-common-indexterm-1.xml b/en-US/Beginning_Installation_URL-common-indexterm-1.xml
index 4b954a7..78b0b5a 100644
--- a/en-US/Beginning_Installation_URL-common-indexterm-1.xml
+++ b/en-US/Beginning_Installation_URL-common-indexterm-1.xml
@@ -11,3 +11,4 @@
 	<tertiary>HTTP</tertiary>
 </indexterm>
 
+
diff --git a/en-US/Beginning_Installation_URL-common-indexterm-2.xml b/en-US/Beginning_Installation_URL-common-indexterm-2.xml
index 5df39fc..8453eba 100644
--- a/en-US/Beginning_Installation_URL-common-indexterm-2.xml
+++ b/en-US/Beginning_Installation_URL-common-indexterm-2.xml
@@ -8,4 +8,5 @@
 <indexterm significance="normal">
 	<primary>HTTP</primary>
 	<secondary>installation</secondary>
-</indexterm>
\ No newline at end of file
+</indexterm>
+
diff --git a/en-US/Beginning_Installation_URL-common-indexterm-3.xml b/en-US/Beginning_Installation_URL-common-indexterm-3.xml
index b7ffa50..b31671f 100644
--- a/en-US/Beginning_Installation_URL-common-indexterm-3.xml
+++ b/en-US/Beginning_Installation_URL-common-indexterm-3.xml
@@ -8,4 +8,5 @@
 <indexterm significance="normal">
 	<primary>installation</primary>
 	<secondary>HTTP</secondary>
-</indexterm>
\ No newline at end of file
+</indexterm>
+
diff --git a/en-US/Beginning_Installation_URL-common-indexterm-4.xml b/en-US/Beginning_Installation_URL-common-indexterm-4.xml
new file mode 100644
index 0000000..fb0dbc9
--- /dev/null
+++ b/en-US/Beginning_Installation_URL-common-indexterm-4.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<!DOCTYPE indexterm PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+	  
+	  
+	  
+]>
+
+<indexterm significance="normal">
+		<primary>network</primary>
+		<secondary>installations</secondary>
+		<tertiary>FTP</tertiary>
+	</indexterm>
+
diff --git a/en-US/Beginning_Installation_URL-common-indexterm-5.xml b/en-US/Beginning_Installation_URL-common-indexterm-5.xml
new file mode 100644
index 0000000..52afd6a
--- /dev/null
+++ b/en-US/Beginning_Installation_URL-common-indexterm-5.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<!DOCTYPE indexterm PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+	  
+	  
+	  
+]>
+
+<indexterm significance="normal">
+		<primary>FTP</primary>
+		<secondary>installation</secondary>
+	</indexterm>
+
diff --git a/en-US/Beginning_Installation_URL-common-indexterm-6.xml b/en-US/Beginning_Installation_URL-common-indexterm-6.xml
new file mode 100644
index 0000000..bd581f3
--- /dev/null
+++ b/en-US/Beginning_Installation_URL-common-indexterm-6.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<!DOCTYPE indexterm PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+]>
+
+<indexterm significance="normal">
+		<primary>installation</primary>
+		<secondary>FTP</secondary>
+	</indexterm>
+	
+
diff --git a/en-US/Beginning_Installation_URL-common-para-1.xml b/en-US/Beginning_Installation_URL-common-para-1.xml
index ac0fd76..57c65e2 100644
--- a/en-US/Beginning_Installation_URL-common-para-1.xml
+++ b/en-US/Beginning_Installation_URL-common-para-1.xml
@@ -3,6 +3,6 @@
 ]>
 
 <para>
-	The URL dialog applies only if you are installing from a FTP or HTTP server (if you selected <guimenuitem>URL</guimenuitem> in the <guilabel>Installation Method</guilabel> dialog). This dialog prompts you for information about
-	the FTP or HTTP server from which you are installing Fedora.
-</para>
\ No newline at end of file
+	The URL dialog applies only if you are installing from a FTP or HTTP server (if you selected <guimenuitem>URL</guimenuitem> in the <guilabel>Installation Method</guilabel> dialog). This dialog prompts you for information about the FTP or HTTP server from which you are installing Fedora. If you used the <literal>repo=ftp</literal> or <literal>repo=http</literal> boot option, you already specified a server and path.
+</para>
+
diff --git a/en-US/Beginning_Installation_URL-common-para-2-Fedora.xml b/en-US/Beginning_Installation_URL-common-para-2-Fedora.xml
deleted file mode 100644
index a3dd700..0000000
--- a/en-US/Beginning_Installation_URL-common-para-2-Fedora.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
-]>
-
-
-<para>
-	Enter the URL for the directory that contains the installation image file (<filename>install.img</filename>) on your chosen FTP or HTTP site and press <keycap>Enter</keycap>. By default, this directory will be named <filename>/pub/fedora/linux/releases/&PRODVER;/Fedora/<replaceable>arch</replaceable>/os/images/</filename>, where <replaceable>arch</replaceable> is replaced with the architecture type of your system, such as i386. The complete URL will therefore resemble this example:<filename>http://download.fedoraproject.org/pub/fedora/linux/releases/&PRODVER;/Fedora/i386/os/images</filename>. Specify the address of a proxy server, and if necessary, provide a port number, username, and password. If the system can reach the URL that you provided, and can find a file named <filename>install.img</filename> at that location, a message box appears indicating that files are being retrieved from the server.
-</para>
diff --git a/en-US/Beginning_Installation_URL-common-para-2.xml b/en-US/Beginning_Installation_URL-common-para-2.xml
new file mode 100644
index 0000000..f5ae7b7
--- /dev/null
+++ b/en-US/Beginning_Installation_URL-common-para-2.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+]>
+
+
+<para>
+	Specify the address of a proxy server, and if necessary, provide a port number, username, and password. If everything was specified properly, a message box appears indicating that files are being retrieved from the server.
+</para>
+
diff --git a/en-US/Beginning_Installation_URL-common-para-3.xml b/en-US/Beginning_Installation_URL-common-para-3.xml
deleted file mode 100644
index 6be8e7b..0000000
--- a/en-US/Beginning_Installation_URL-common-para-3.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
-]>
-
-<para>
-	Next, the <guilabel>Welcome</guilabel> dialog appears.
-</para>
\ No newline at end of file
diff --git a/en-US/Beginning_Installation_URL-common-para-4.xml b/en-US/Beginning_Installation_URL-common-para-4.xml
new file mode 100644
index 0000000..66354a4
--- /dev/null
+++ b/en-US/Beginning_Installation_URL-common-para-4.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+]>
+
+<para>
+	Enter the name or IP address of the FTP or HTTP site from which you are installing, and the name of the directory that contains the <filename>/images</filename> directory for your architecture. For example:
+</para>
+
diff --git a/en-US/Beginning_Installation_URL-common-para-5.xml b/en-US/Beginning_Installation_URL-common-para-5.xml
new file mode 100644
index 0000000..017a84a
--- /dev/null
+++ b/en-US/Beginning_Installation_URL-common-para-5.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+]>
+
+<para>
+	If your FTP or HTTP server requires user authentication, specify user and password as part of the URL as follows:
+</para>
+
diff --git a/en-US/Beginning_Installation_URL-common-title-1.xml b/en-US/Beginning_Installation_URL-common-title-1.xml
index bf7e57a..45f5c7b 100644
--- a/en-US/Beginning_Installation_URL-common-title-1.xml
+++ b/en-US/Beginning_Installation_URL-common-title-1.xml
@@ -2,4 +2,5 @@
 <!DOCTYPE title PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
 ]>
 
-<title>Installing via FTP or HTTP</title>
\ No newline at end of file
+<title>Installing via FTP or HTTP</title>
+
diff --git a/en-US/Beginning_Installation_URL-x86.xml b/en-US/Beginning_Installation_URL-x86.xml
index 2598a25..9a49609 100644
--- a/en-US/Beginning_Installation_URL-x86.xml
+++ b/en-US/Beginning_Installation_URL-x86.xml
@@ -12,22 +12,46 @@
 	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Beginning_Installation_URL-common-indexterm-1.xml"/>
 	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Beginning_Installation_URL-common-indexterm-2.xml"/>
 	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Beginning_Installation_URL-common-indexterm-3.xml"/>
+	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Beginning_Installation_URL-common-indexterm-4.xml"/>
+	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Beginning_Installation_URL-common-indexterm-5.xml"/>
+	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Beginning_Installation_URL-common-indexterm-6.xml"/>
 	<!-- End Index terms -->
 	
+	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Important_URL.xml"/>
+	
 	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Beginning_Installation_URL-common-para-1.xml"/>
 	<!-- The HTTP dialog applies only if you are installing... -->
 	
-	<!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Beginning_Installation_URL-common-para-2.xml"/> -->
-	<!-- RHEL version of paragraph -->
-	<!-- Enter the name or IP address of the HTTP site... -->
+	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Beginning_Installation_URL-common-para-4.xml"/>
+	<!-- Enter the name or IP address of the FTP or HTTP site from which you are installing, -->
 	
-	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Beginning_Installation_URL-common-para-2-Fedora.xml"/>
+	<para>
+		<filename>/mirrors/redhat/rhel-&PRODVER;/Server/i386/</filename>
+	</para>
+	
+	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Beginning_Installation_URL-common-para-2.xml"/>
 	<!-- Enter the name or IP address of the HTTP site... -->
 	
+	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Beginning_Installation_URL-common-para-5.xml"/>
+	<!-- If your FTP or HTTP server requires user authentication, specify user and password as part of the URL as follows: -->
+
+	<para>
+		<literal>{ftp|http}://&lt;user&gt;:&lt;password&gt;@&lt;hostname&gt;[:&lt;port&gt;]/&lt;directory>/</literal>
+	</para>	
+	<para>
+		For example:
+	</para>
+	<para>
+		<literal>http://install:rhel&PRODVER;pw@name.example.com/mirrors/redhat/rhel-&PRODVER;/Server/i386/</literal>
+	</para>
+	
 	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Beginning_Installation_URL-common-figure-1.xml"/>
 	<!-- HTTP Setup Dialog -->
 	
-	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Beginning_Installation_URL-common-para-3.xml"/>
-	<!-- Next, the Welcome dialog appears -->
+	<para>
+		Proceed with <xref linkend="ch-guimode-x86"/>.
+	</para>
+
 	
-</section>
\ No newline at end of file
+</section>
+
diff --git a/en-US/Beginning_Installation_x86_ppc-indexterm-1.xml b/en-US/Beginning_Installation_x86_ppc-indexterm-1.xml
index 4150c19..855e5ec 100644
--- a/en-US/Beginning_Installation_x86_ppc-indexterm-1.xml
+++ b/en-US/Beginning_Installation_x86_ppc-indexterm-1.xml
@@ -9,4 +9,5 @@
 <indexterm significance="normal"> 
 	<primary>installation</primary>
 	<secondary>starting</secondary>
-</indexterm>
\ No newline at end of file
+</indexterm>
+
diff --git a/en-US/Beginning_Installation_x86_ppc-indexterm-2.xml b/en-US/Beginning_Installation_x86_ppc-indexterm-2.xml
index d4dc669..fde7079 100644
--- a/en-US/Beginning_Installation_x86_ppc-indexterm-2.xml
+++ b/en-US/Beginning_Installation_x86_ppc-indexterm-2.xml
@@ -8,4 +8,5 @@
 <indexterm significance="normal">
 	<primary>starting</primary>
 	<secondary>installation</secondary>
-</indexterm>
\ No newline at end of file
+</indexterm>
+
diff --git a/en-US/Beginning_Installation_x86_ppc-indexterm-3.xml b/en-US/Beginning_Installation_x86_ppc-indexterm-3.xml
index 0cc18ac..fd295ae 100644
--- a/en-US/Beginning_Installation_x86_ppc-indexterm-3.xml
+++ b/en-US/Beginning_Installation_x86_ppc-indexterm-3.xml
@@ -6,6 +6,7 @@
 ]>
 
 <indexterm significance="normal">
-	<primary>CD-ROM</primary>
+	<primary>DVD</primary>
 	<secondary>IDE</secondary>
-</indexterm>
\ No newline at end of file
+</indexterm>
+
diff --git a/en-US/Beginning_Installation_x86_ppc-indexterm-4.xml b/en-US/Beginning_Installation_x86_ppc-indexterm-4.xml
index 633773f..06a688e 100644
--- a/en-US/Beginning_Installation_x86_ppc-indexterm-4.xml
+++ b/en-US/Beginning_Installation_x86_ppc-indexterm-4.xml
@@ -6,6 +6,7 @@
 ]>
 
 <indexterm significance="normal">
-	<primary>CD-ROM</primary>
+	<primary>DVD</primary>
 	<secondary>ATAPI</secondary>
-</indexterm>
\ No newline at end of file
+</indexterm>
+
diff --git a/en-US/Beginning_Installation_x86_ppc-indexterm-5.xml b/en-US/Beginning_Installation_x86_ppc-indexterm-5.xml
index f355e29..97e7acf 100644
--- a/en-US/Beginning_Installation_x86_ppc-indexterm-5.xml
+++ b/en-US/Beginning_Installation_x86_ppc-indexterm-5.xml
@@ -7,5 +7,6 @@
 
 <indexterm significance="normal">
 	<primary>installation</primary>
-	<secondary>CD-ROM</secondary>
-</indexterm>
\ No newline at end of file
+	<secondary>DVD</secondary>
+</indexterm>
+
diff --git a/en-US/Beginning_Installation_x86_ppc-indexterm-6.xml b/en-US/Beginning_Installation_x86_ppc-indexterm-6.xml
index fb3deac..e3a51b5 100644
--- a/en-US/Beginning_Installation_x86_ppc-indexterm-6.xml
+++ b/en-US/Beginning_Installation_x86_ppc-indexterm-6.xml
@@ -6,6 +6,7 @@
 ]>
 
 <indexterm significance="normal">
-	<primary>CD-ROM</primary>
+	<primary>DVD</primary>
 	<secondary>installation from</secondary>
-</indexterm>
\ No newline at end of file
+</indexterm>
+
diff --git a/en-US/Beginning_Installation_x86_ppc-para-1.xml b/en-US/Beginning_Installation_x86_ppc-para-1.xml
index 44a483c..efecdcd 100644
--- a/en-US/Beginning_Installation_x86_ppc-para-1.xml
+++ b/en-US/Beginning_Installation_x86_ppc-para-1.xml
@@ -3,5 +3,6 @@
 ]>
 
 <para>
-	To install Fedora from a DVD/CD-ROM, place the DVD or CD #1 in your DVD/CD-ROM drive and boot your system from the DVD/CD-ROM.<!--choose the <guilabel>Local CD-ROM</guilabel> option if you booted using the <command>linux askmethod</command>  and select <guibutton>OK</guibutton>. When prompted, insert the Fedora CD or DVD into your CD/DVD-ROM drive (if you did not boot from the CD). Once the disk is in the CD/DVD-ROM drive, select <guibutton>OK</guibutton>, and press <keycap>Enter</keycap>.--> Even if you booted from alternative media, you can still install Fedora from CD or DVD media.
+	To install Fedora from a DVD, place the DVD your DVD drive and boot your system from the DVD. Even if you booted from alternative media, you can still install Fedora from DVD media.
 </para>
+
diff --git a/en-US/Beginning_Installation_x86_ppc-para-3.xml b/en-US/Beginning_Installation_x86_ppc-para-3.xml
index fab5b53..dc81030 100644
--- a/en-US/Beginning_Installation_x86_ppc-para-3.xml
+++ b/en-US/Beginning_Installation_x86_ppc-para-3.xml
@@ -6,6 +6,7 @@
 ]>
 
 <para>
-	If your CD-ROM drive is not detected, and it is a SCSI CD-ROM, the installation program prompts you to choose a SCSI driver. Choose the driver that most closely resembles your adapter. You may specify options for the driver if necessary; however, most
+	If your DVD drive is not detected, and it is a SCSI DVD, the installation program prompts you to choose a SCSI driver. Choose the driver that most closely resembles your adapter. You may specify options for the driver if necessary; however, most
 	drivers detect your SCSI adapter automatically.
-</para>
\ No newline at end of file
+</para>
+
diff --git a/en-US/Beginning_Installation_x86_ppc-title-1.xml b/en-US/Beginning_Installation_x86_ppc-title-1.xml
index 40cfa16..10e8630 100644
--- a/en-US/Beginning_Installation_x86_ppc-title-1.xml
+++ b/en-US/Beginning_Installation_x86_ppc-title-1.xml
@@ -5,4 +5,5 @@
 
 ]>
 
-<title>Installing from DVD/CD-ROM</title>
\ No newline at end of file
+<title>Installing from DVD</title>
+
diff --git a/en-US/Book_Info.xml b/en-US/Book_Info.xml
index 0780836..e2405c5 100644
--- a/en-US/Book_Info.xml
+++ b/en-US/Book_Info.xml
@@ -5,7 +5,7 @@
 	<title>Installation Guide</title>
 	<subtitle>Installing Fedora 13 on x86, AMD64, and Intel 64 architectures</subtitle>
 	<productname>Fedora</productname>
-	<productnumber>13</productnumber>
+	<productnumber>14</productnumber>
 	<edition>1.0</edition>
 	<pubsnumber>1</pubsnumber>
 	<abstract>
diff --git a/en-US/Boot-x86.xml b/en-US/Boot-x86.xml
index 69f313c..16ded86 100644
--- a/en-US/Boot-x86.xml
+++ b/en-US/Boot-x86.xml
@@ -10,17 +10,23 @@
 	<indexterm>
 		<primary>BIOS (Basic Input/Output System)</primary>
 	</indexterm>
+	<indexterm>
+		<primary>UEFI (Unified Extensible Firmware Interface)</primary>
+	</indexterm>
 	<xi:include href="Boot_x86_ppc-indexterm-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-	<!-- CD/DVD media - booting -->
+	<!-- DVD media - booting -->
 	<xi:include href="Boot_x86_ppc-indexterm-2.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 	<!-- USB flash media - booting -->
 <!-- end indexterms -->
 
+	<xi:include href="Important_UEFI_32.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+	<!-- Fedora does not yet support -->
+
 	<xi:include href="Important_UEFI.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-	<!-- The CD and DVD media include boot catalog entries for both BIOS and UEFI firmware interfaces -->
+	<!-- The DVD includes boot catalog entries for both BIOS and UEFI firmware interfaces -->
 
 	<xi:include href="Boot_x86_ppc-para-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-	<!-- To start the installation program from a Fedrora CD, DVD, or minimal boot media, -->
+	<!-- To start the installation program from a Fedora DVD, or minimal boot media, -->
 	
 	<procedure>
 		<step>
@@ -59,8 +65,13 @@
 <!-- end x86-specific material -->
 
 	<xi:include href="Note_Aborting_Installation.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-	<!-- The CD and DVD media include boot catalog entries for both BIOS and UEFI firmware interfaces -->
-
+	<!-- The DVD media include boot catalog entries for both BIOS and UEFI firmware interfaces -->
+	
+	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Graphical_Installation_x86_Starting.xml"/>
+	<!-- Starting the Installation Program
+	     Booting the Installation Program on x86, AMD64,and Intel 64 systems
+	     Additional Boot Options
+	     Kernel Options-->
 
 	<section id="sn-boot-menu-x86">
 		<xi:include href="Boot_x86_ppc-title-2.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
@@ -69,10 +80,6 @@
 		<xi:include href="Boot_x86_ppc-para-2.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 		<!-- The boot media displays a graphical boot menu with several options. -->
 		
-		<para>
-			When using Fedora Live media, press any key during the initial boot countdown to bring up the <guilabel>Boot Options</guilabel> menu.
-		</para>
-      
 		<xi:include href="Boot_x86_ppc-figure-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 		<!-- The boot screen. -->
 		
@@ -92,7 +99,7 @@
 		<!-- Installing from a Different Source -->
 		
 		<xi:include href="Boot_x86_ppc-para-5.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-		<!-- You can install Red Hat Enterprise Linux from the ISO images stored  -->
+		<!-- You can install Fedora from the ISO images stored  -->
 		
 		<xi:include href="Boot_x86_ppc-para-6.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 		<!-- The following table summarizes the different boot methods  -->
@@ -104,6 +111,8 @@
 			Refer to <xref linkend="s1-installmethod-x86"/> for information about installing from locations other than the media with which you booted the system.
 		</para>
 	</section>
+
+
 	<section id="sn-booting-from-pxe-x86">
 		<xi:include href="Boot_x86_ppc-title-4.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 		<!-- Booting from the Network using PXE -->
@@ -131,14 +140,3 @@
 	</section>
 	
 </chapter>
-
-
-<!--
-Local variables:
-mode: xml
-fill-column: 72
-End:
--->
-<!-- 
-vim: softtabstop=2:shiftwidth=2:expandtab:textwidth=72 
--->
diff --git a/en-US/Boot_Init_Shutdown.xml b/en-US/Boot_Init_Shutdown.xml
index d4da316..fecb436 100644
--- a/en-US/Boot_Init_Shutdown.xml
+++ b/en-US/Boot_Init_Shutdown.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+<!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
 ]>
 
 <appendix id="ch-boot-init-shutdown"><title>Boot Process, Init, and Shutdown</title>
@@ -136,11 +136,11 @@
 			</para>
 			 
 			<para>
-				Other platforms use different programs to perform low-level tasks roughly equivalent to those of the BIOS on an x86 system. For instance, Itanium-based computers use the <firstterm>Extensible Firmware Interface</firstterm> (<firstterm>EFI</firstterm>) <firstterm>Shell</firstterm>.
+				Other platforms use different programs to perform low-level tasks roughly equivalent to those of the BIOS on an x86 system.
 			</para>
 			 
 			<para>
-				Once loaded, the BIOS tests the system, looks for and checks peripherals, and then locates a valid device with which to boot the system. Usually, it checks any diskette drives and CD-ROM drives present for bootable media, then, failing that, looks to the system's hard drives. In most cases, the order of the drives searched while booting is controlled with a setting in the BIOS, and it looks on the master IDE device on the primary IDE bus. The BIOS then loads into memory whatever program is residing in the first sector of this device, called the <firstterm>Master Boot Record</firstterm> or <firstterm>MBR</firstterm>. The MBR is only 512 bytes in size and contains machine code instructions for booting the machine, called a boot loader, along with the partition table. Once the BIOS finds and loads the boot loader program into memory, it yields control of the boot process to it.
+				Once loaded, the BIOS tests the system, looks for and checks peripherals, and then locates a valid device with which to boot the system. Usually, it checks any diskette drives and optical drives present for bootable media, then, failing that, looks to the system's hard drives. In most cases, the order of the drives searched while booting is controlled with a setting in the BIOS, and it looks on the master IDE device on the primary IDE bus. The BIOS then loads into memory whatever program is residing in the first sector of this device, called the <firstterm>Master Boot Record</firstterm> or <firstterm>MBR</firstterm>. The MBR is only 512 bytes in size and contains machine code instructions for booting the machine, called a boot loader, along with the partition table. Once the BIOS finds and loads the boot loader program into memory, it yields control of the boot process to it.
 			</para>
 		</section>
 		 
@@ -168,7 +168,7 @@
 				<secondary>role in boot process</secondary>
 			</indexterm>
 			<para>
-				This section looks at the default boot loader for the x86 platform, GRUB. <!-- (RHEL) Depending on the system's architecture, the boot process may differ slightly. Refer to <xref linkend="s3-boot-init-shutdown-other-architectures"/> for a brief overview of non-x86 boot loaders.--> For more information about configuring and using GRUB, see <xref linkend="ch-grub"/>.
+				This section looks at the default boot loader for the x86 platform, GRUB. Depending on the system's architecture, the boot process may differ slightly. Refer to <xref linkend="s3-boot-init-shutdown-other-architectures"/> for a brief overview of non-x86 boot loaders. For more information about configuring and using GRUB, see <xref linkend="ch-grub"/>.
 			</para>
 			 
 			<para>
@@ -176,16 +176,16 @@
 			</para>
 			 
 			<para>
-				GRUB has the advantage of being able to read ext2 and ext3 <footnote>
+				GRUB has the advantage of being able to read ext2, ext3, and ext4 <footnote>
 				<para>
-					GRUB reads ext3 file systems as ext2, disregarding the journal file. Refer to the chapter titled <citetitle>The ext3 File System</citetitle> in the <citetitle>Red Hat Enterprise Linux Deployment Guide</citetitle> for more information on the ext3 file system.
+					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> &mdash; at boot time. Refer to <xref linkend="s1-grub-configfile"/> for information on how to edit this file.
 			</para>
 			<important>
-			  <title>Btrfs</title>
+			  <title>Important â€” Supported file systems</title>
 			  <para>
-			    The <application>GRUB</application> bootloader does not support the Btrfs file system.
+			    The <application>GRUB</application> bootloader in Fedora&nbsp;&PRODVER; supports ext2, ext3, and ext4 file systems. It does not support other file systems such as VFAT, Btrfs or XFS. Furthermore, <application>GRUB</application> does not support LVM. 
 			  </para>
 			</important>
 			<note><title>Note</title>
@@ -197,18 +197,6 @@
 				Once the second stage boot loader is in memory, it presents the user with a graphical screen showing the different operating systems or kernels it has been configured to boot. On this screen a user can use the arrow keys to choose which operating system or kernel they wish to boot and press <keycap>Enter</keycap>. If no key is pressed, the boot loader loads the default selection after a configurable period of time has passed.
 			</para>
 			 
-			<!-- <note>
-				<title>Note</title>
-
-				<para>
-					If Symmetric Multi-Processor (SMP) kernel support is installed, more than one option is presented the first time the system is booted. In this situation GRUB displays <computeroutput>Fedora (<replaceable>&lt;kernel-version&gt;</replaceable>-smp)</computeroutput>, which is the SMP kernel, and <computeroutput>Fedora (<replaceable>&lt;kernel-version&gt;</replaceable>)</computeroutput>, which is for single processors.
-				</para>
-
-				<para>
-					If any problems occur using the SMP kernel, try selecting the a non-SMP kernel upon rebooting.
-				</para>
-			</note> -->
-			 
 			<para>
 				Once the second stage boot loader has determined which kernel to boot, it locates the corresponding kernel binary in the <filename>/boot/</filename> directory. The kernel binary is named using the following format &mdash; <filename>/boot/vmlinuz-<replaceable>&lt;kernel-version&gt;</replaceable></filename> file (where <filename><replaceable>&lt;kernel-version&gt;</replaceable></filename> corresponds to the kernel version specified in the boot loader's settings).
 			</para>
@@ -229,27 +217,24 @@
 				For a more detailed overview of the GRUB boot loader, refer to <xref linkend="ch-grub"/>.
 			</para>
 			 
-			<!-- (RHEL) <section id="s3-boot-init-shutdown-other-architectures">
+			<section id="s3-boot-init-shutdown-other-architectures">
 				<title>Boot Loaders for Other Architectures</title>
 				<indexterm significance="normal">
 					<primary><command>aboot</command>
 					</primary>
 				</indexterm>
-				<indexterm significance="normal">
-					<primary>ELILO</primary>
-				</indexterm>
 				<para>
 					Once the kernel loads and hands off the boot process to the <command>init</command> command, the same sequence of events occurs on every architecture. So the main difference between each architecture's boot process is in the application used to find and load the kernel.
 				</para>
 				 
 				<para>
-					For example, the Itanium architecture uses the ELILO boot loader, the IBM eServer pSeries architecture uses yaboot, and the IBM System z systems use the z/IPL boot loader.
-				</para> -->
+					For example, the IBM eServer pSeries architecture uses yaboot, and the IBM System&nbsp;z systems use the z/IPL boot loader.
+				</para>
 				 
-				<!-- <para>
-					Consult the <citetitle>Red Hat Enterprise Linux Installation Guide</citetitle> specific to these platforms for information on configuring their boot loaders.
-				</para> -->
-			<!-- (RHEL) </section> -->
+				<para>
+					Consult the sections of this guide specific to these platforms for information on configuring their boot loaders.
+				</para>
+			</section>
 		</section>
 		 
 		<section id="s2-boot-init-shutdown-kernel">
@@ -447,7 +432,7 @@ S99local -&gt; ../rc.local
 			<para>
 				After the <command>init</command> command has progressed through the appropriate <filename>rc</filename> directory for the runlevel, <application>Upstart</application> forks an <command>/sbin/mingetty</command> process for each virtual console (login prompt) allocated to the runlevel by the job definition in the <filename>/etc/event.d</filename> directory. Runlevels 2 through 5 have all six virtual consoles, while runlevel 1 (single user mode) has one, and runlevels 0 and 6 have none. The <command>/sbin/mingetty</command> process opens communication pathways to <firstterm>tty</firstterm> devices<footnote>
 				<para>
-					Refer to the Red Hat Enterprise Linux Deployment Guide for more information about <filename>tty</filename> devices.
+					Refer to the Fedora Deployment Guide for more information about <filename>tty</filename> devices.
 				</para>
 				</footnote>, sets their modes, prints the login prompt, accepts the user's username and password, and initiates the login process.
 			</para>
@@ -455,7 +440,7 @@ S99local -&gt; ../rc.local
 			<para>
 				In runlevel 5, <application>Upstart</application> runs a script called <filename>/etc/X11/prefdm</filename>. The <filename>prefdm</filename> script executes the preferred X display manager<footnote>
 				<para>
-					Refer to the Red Hat Enterprise Linux Deployment Guide for more information about display managers.
+					Refer to the Fedora Deployment Guide for more information about display managers.
 				</para>
 				</footnote> &mdash; <command>gdm</command>, <command>kdm</command>, or <command>xdm</command>, depending on the contents of the <filename>/etc/sysconfig/desktop</filename> file.
 			</para>
@@ -650,7 +635,7 @@ exec /sbin/mingetty tty2
 				</para>
 
 				<para>
-					For more information on single-user and rescue mode, refer to the chapter titled <citetitle>Basic System Recovery</citetitle> in the <citetitle>Red Hat Enterprise Linux Deployment Guide</citetitle>.
+					For more information on single-user and rescue mode, refer to the chapter titled <citetitle>Basic System Recovery</citetitle> in the <citetitle>Fedora Deployment Guide</citetitle>.
 				</para>
 			</warning>
 			 
@@ -725,7 +710,7 @@ exec /sbin/mingetty tty2
 			</itemizedlist>
 			 
 			<para>
-				Refer to the chapter titled <citetitle>Controlling Access to Services</citetitle> in the <citetitle>Red Hat Enterprise Linux Deployment Guide</citetitle> for more information regarding these tools.
+				Refer to the chapter titled <citetitle>Controlling Access to Services</citetitle> in the <citetitle>Fedora Deployment Guide</citetitle> for more information regarding these tools.
 			</para>
 		</section>
 	</section>
@@ -756,7 +741,7 @@ exec /sbin/mingetty tty2
 		</para>
 		 
 		<para>
-			PAM console users can use the <command>reboot</command> and <command>halt</command> commands to shut down the system while in runlevels 1 through 5. For more information about PAM console users, refer to the Red Hat Enterprise Linux Deployment Guide.
+			PAM console users can use the <command>reboot</command> and <command>halt</command> commands to shut down the system while in runlevels 1 through 5. For more information about PAM console users, refer to the Fedora Deployment Guide.
 		</para>
 		 
 		<para>
@@ -767,4 +752,6 @@ exec /sbin/mingetty tty2
 			Failure to wait for this message can mean that not all the hard drive partitions are unmounted, which can lead to file system corruption.
 		</para>
 	</section>
+
 </appendix>
+
diff --git a/en-US/Boot_Order-para-2.xml b/en-US/Boot_Order-para-2.xml
index dc4f0f4..e75f6a9 100644
--- a/en-US/Boot_Order-para-2.xml
+++ b/en-US/Boot_Order-para-2.xml
@@ -5,3 +5,4 @@
 <para>
 	If your computer does not allow you to select a boot device as it starts up, you might need to configure your system's <firstterm>Basic Input/Output System</firstterm> (<acronym>BIOS</acronym>) to boot from the media.
 </para>
+
diff --git a/en-US/Boot_Order-para-3.xml b/en-US/Boot_Order-para-3.xml
index 8113aee..f63a645 100644
--- a/en-US/Boot_Order-para-3.xml
+++ b/en-US/Boot_Order-para-3.xml
@@ -3,5 +3,6 @@
 ]>
 
 <para>
-	To change your BIOS settings on an x86, AMD64, or <trademark class="registered">Intel</trademark> 64 system, watch the instructions provided on your display when your computer first boots. A line of text appears, telling you which key to press to enter the BIOS settings.
+	To change your BIOS settings on an x86, AMD64, or Intel 64 system, watch the instructions provided on your display when your computer first boots. A line of text appears, telling you which key to press to enter the BIOS settings.
 </para>
+
diff --git a/en-US/Boot_Order-para-4.xml b/en-US/Boot_Order-para-4.xml
index 715bc28..60a2dd8 100644
--- a/en-US/Boot_Order-para-4.xml
+++ b/en-US/Boot_Order-para-4.xml
@@ -3,5 +3,6 @@
 ]>
 
 <para>
-	Once you have entered your BIOS setup program, find the section where you can alter your boot sequence. The default is often C, A or A, C (depending on whether you boot from your hard drive [C] or a diskette drive [A]). Change this sequence so that the CD-ROM is first in your boot order and that C or A (whichever is your typical boot default) is second. This instructs the computer to first look at the CD-ROM drive for bootable media; if it does not find bootable media on the CD-ROM drive, it then checks your hard drive or diskette drive.
+	Once you have entered your BIOS setup program, find the section where you can alter your boot sequence. The default is often C, A or A, C (depending on whether you boot from your hard drive [C] or a diskette drive [A]). Change this sequence so that the DVD is first in your boot order and that C or A (whichever is your typical boot default) is second. This instructs the computer to first look at the DVD drive for bootable media; if it does not find bootable media on the DVD drive, it then checks your hard drive or diskette drive.
 </para>
+
diff --git a/en-US/Boot_Order-para-5.xml b/en-US/Boot_Order-para-5.xml
index e3caff1..d89cd5b 100644
--- a/en-US/Boot_Order-para-5.xml
+++ b/en-US/Boot_Order-para-5.xml
@@ -5,3 +5,4 @@
 <para>
 	Save your changes before exiting the BIOS. For more information, refer to the documentation that came with your system.
 </para>
+
diff --git a/en-US/Boot_x86_ppc-para-1.xml b/en-US/Boot_x86_ppc-para-1.xml
index 3546650..073894b 100644
--- a/en-US/Boot_x86_ppc-para-1.xml
+++ b/en-US/Boot_x86_ppc-para-1.xml
@@ -3,6 +3,6 @@
  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
 
 <para>
-	To start the installation program from a Red Hat Enterprise Linux CD, DVD, or minimal boot media, follow this procedure:
+	To start the installation program from a Fedora DVD or from minimal boot media, follow this procedure:
 </para>
 
diff --git a/en-US/Boot_x86_ppc-para-4.xml b/en-US/Boot_x86_ppc-para-4.xml
index 6fbde22..2472ad1 100644
--- a/en-US/Boot_x86_ppc-para-4.xml
+++ b/en-US/Boot_x86_ppc-para-4.xml
@@ -3,6 +3,6 @@
  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
 
 <para>
-	If you boot the DVD, rescue CD, or minimal boot media, the boot menu options are:
+	The boot menu options are:
 </para>
 
diff --git a/en-US/Boot_x86_ppc-para-5.xml b/en-US/Boot_x86_ppc-para-5.xml
index c704311..6cdc41b 100644
--- a/en-US/Boot_x86_ppc-para-5.xml
+++ b/en-US/Boot_x86_ppc-para-5.xml
@@ -3,6 +3,6 @@
  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
 
 <para>
-	You can install Fedora from the ISO images stored on hard disk, or from a network using NFS, FTP, or HTTP methods. Experienced users frequently use one of these methods because it is often faster to read data from a hard disk or network server than from a CD or DVD.
+	You can install Fedora from the ISO images stored on hard disk, or from a network using NFS, FTP, or HTTP methods. Experienced users frequently use one of these methods because it is often faster to read data from a hard disk or network server than from a DVD.
 </para>
 
diff --git a/en-US/Boot_x86_ppc-table-1.xml b/en-US/Boot_x86_ppc-table-1.xml
index 1dfcc1a..0d26c77 100644
--- a/en-US/Boot_x86_ppc-table-1.xml
+++ b/en-US/Boot_x86_ppc-table-1.xml
@@ -2,26 +2,34 @@
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
 
-<table frame='all'><title>Boot methods and installation methods</title>
+<table frame='all'><title>Boot methods and installation sources</title>
 	<tgroup cols='2' align='left' colsep='1' rowsep='1'>
 		<thead>
 			<row>
 				<entry>Boot method</entry>
-				<entry>Installation method</entry>
+				<entry>Installation source</entry>
 			</row>
 		</thead>
 		<tbody>
 			<row>
-				<entry>DVD</entry>
-				<entry>DVD, network, or hard disk</entry>
+				<entry>Installation DVD</entry>
+				<entry>DVD, CD set, network, or hard disk</entry>
 			</row>
 			<row>
-				<entry>Minimal boot CD or USB, rescue CD</entry>
-				<entry>Network or hard disk</entry>
+				<entry>Set of installation CDs</entry>
+				<entry>DVD, CD set, network, or hard disk</entry>
+			</row>
+			<row>
+				<entry>Live CD</entry>
+				<entry>Live CD</entry>
 			</row>
 			<row>
-				<entry>Live CD or USB</entry>
-				<entry><application>Install to Hard Disk</application> application</entry>
+				<entry>Installation USB flash drive</entry>
+				<entry>USB flash drive, installation DVD, set of installation CDs, network, or hard disk</entry>
+			</row>
+			<row>
+				<entry>Minimal boot CD or USB, rescue CD</entry>
+				<entry>Network or hard disk</entry>
 			</row>
 		</tbody>
 	</tgroup>
diff --git a/en-US/Boot_x86_ppc-variablelist-1.xml b/en-US/Boot_x86_ppc-variablelist-1.xml
index c6eece6..c3aa0b5 100644
--- a/en-US/Boot_x86_ppc-variablelist-1.xml
+++ b/en-US/Boot_x86_ppc-variablelist-1.xml
@@ -43,14 +43,5 @@
 			</para>
 		</listitem>
 	</varlistentry>   -->
-	<!-- <section id="sn-verifying-livecd">
-      <title>Verifying the Live CD</title>
-      <para>If you boot from the Live CD, choose <guilabel>Verify and
-	  Boot</guilabel> from the boot menu.  The
-	verification process runs automatically during the boot process,
-	and if it succeeds, the Live CD continues loading.  If the
-	verification fails, create a new Live CD using the ISO image you
-	downloaded earlier.</para>
-    </section> -->
 </variablelist>
 
diff --git a/en-US/Complete-x86.xml b/en-US/Complete-x86.xml
index 6c5209f..1c213ef 100644
--- a/en-US/Complete-x86.xml
+++ b/en-US/Complete-x86.xml
@@ -15,20 +15,15 @@
 	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Complete_x86-para-2.xml"/>
 	<!-- The installation program prompts you to prepare your -->
 	 
-<!-- for RHEL only	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Complete_common-para-3.xml"/> -->
+	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Complete_common-para-3.xml"/>
 	<!-- After your computer's normal power-up sequence has completed -->
 	 
-<!-- for RHEL only	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Complete_common-itemizedlist-1.xml"/> -->
-	<!-- Press Enter - causes the default boot entry to be booted.,etc... -->
-	 
-<!-- for RHEL only	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Complete_common-para-4.xml"/> -->
-	<!-- Do whatever is appropriate to boot Red Hat Enterprise -->
-	 
-<!-- for RHEL only	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Complete_common-para-5.xml"/> -->
-	<!-- The first time you start your Red Hat Enterprise Linux -->
+	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Complete_common-para-5.xml"/>
+	<!-- The first time you start your Fedora system -->
 	
-<!-- for RHEL only	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Complete_common-para-6.xml"/> -->
-	<!-- For information on registering your Red Hat Enterprise Linux subscription -->
+	<!-- not in Beta <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Complete_common-para-6.xml"/> -->
+	<!-- For information on registering your Fedora subscription -->
 	     
 	      
 </section>
+
diff --git a/en-US/Complete_common-para-1.xml b/en-US/Complete_common-para-1.xml
index 894ed67..0fa32ab 100644
--- a/en-US/Complete_common-para-1.xml
+++ b/en-US/Complete_common-para-1.xml
@@ -4,4 +4,5 @@
 
 <para>
 	Congratulations! Your Fedora installation is now complete!
-</para>
\ No newline at end of file
+</para>
+
diff --git a/en-US/Complete_common-para-3.xml b/en-US/Complete_common-para-3.xml
new file mode 100644
index 0000000..d0d7985
--- /dev/null
+++ b/en-US/Complete_common-para-3.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+
+
+
+]> 
+
+<para>
+	After your computer's normal power-up sequence has completed, Fedora loads and starts. By default, the start process is hidden behind a graphical screen that displays a progress bar. Eventually, a <prompt>login:</prompt> prompt or a GUI login screen (if you installed the X Window System and chose to start X automatically) appears. 
+</para>
+
diff --git a/en-US/Complete_common-para-5.xml b/en-US/Complete_common-para-5.xml
new file mode 100644
index 0000000..53088a3
--- /dev/null
+++ b/en-US/Complete_common-para-5.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+
+
+
+]> 
+
+<para>
+	The first time you start your Fedora system in run level 5 (the graphical run level), the <application>FirstBoot</application> tool appears, which guides you through the Fedora configuration. Using this tool, you can set your system time and date, install software, register your machine with Red Hat Network, and more. <application>FirstBoot</application> lets you configure your environment at the beginning, so that you can get started using your Fedora system quickly.
+</para>
+
diff --git a/en-US/Complete_common-title-1.xml b/en-US/Complete_common-title-1.xml
index 3e59c52..9a3e917 100644
--- a/en-US/Complete_common-title-1.xml
+++ b/en-US/Complete_common-title-1.xml
@@ -5,4 +5,5 @@
 
 ]>
 
-<title>Installation Complete</title>
\ No newline at end of file
+<title>Installation Complete</title>
+
diff --git a/en-US/Complete_x86-para-2.xml b/en-US/Complete_x86-para-2.xml
index 1b9e6a5..203b012 100644
--- a/en-US/Complete_x86-para-2.xml
+++ b/en-US/Complete_x86-para-2.xml
@@ -7,4 +7,5 @@
 
 <para>
 	The installation program prompts you to prepare your system for reboot. Remember to remove any installation media if it is not ejected automatically upon reboot.
-</para>
\ No newline at end of file
+</para>
+
diff --git a/en-US/Create_LVM-common-important-1.xml b/en-US/Create_LVM-common-important-1.xml
index 7c81bfb..fad4a19 100644
--- a/en-US/Create_LVM-common-important-1.xml
+++ b/en-US/Create_LVM-common-important-1.xml
@@ -3,8 +3,8 @@
 ]>
 
 <important>
-	<title>Important â€” LVM Unavailable in Text Installs</title>
+	<title>Important â€” LVM Unavailable in Text-Mode Installations</title>
 	<para>
-		LVM initial set up is not available in a text-mode installation.  The installer allows you to edit pre-configured LVM volumes.  If you need to create an LVM configuration from scratch, hit <keycombo> <keycap function="alt">Alt</keycap> <keycap function="other" otherfunction="F2">F2</keycap> </keycombo> to use the terminal, and run the <command>lvm</command> command.  To return to the text-mode installation, hit <keycombo> <keycap function="alt">Alt</keycap> <keycap function="other" otherfunction="F1">F1</keycap> </keycombo>.
+		LVM initial set up is not available during text-mode installation. If you need to create an LVM configuration from scratch, press <keycombo> <keycap function="alt">Alt</keycap> <keycap function="other" otherfunction="F2">F2</keycap> </keycombo> to use a different virtual console, and run the <command>lvm</command> command.  To return to the text-mode installation, press <keycombo> <keycap function="alt">Alt</keycap> <keycap function="other" otherfunction="F1">F1</keycap> </keycombo>.
 	</para>
 </important>
diff --git a/en-US/Create_LVM-common-para-2.xml b/en-US/Create_LVM-common-para-2.xml
index 43405cc..32726de 100644
--- a/en-US/Create_LVM-common-para-2.xml
+++ b/en-US/Create_LVM-common-para-2.xml
@@ -3,5 +3,5 @@
 ]>
 
 <para>
-	To read more about LVM, refer to the <citetitle>Red Hat Enterprise Linux Deployment Guide</citetitle>. Note, LVM is only available in the graphical installation program.
+	To read more about LVM, refer to the <citetitle>Fedora Deployment Guide</citetitle>. Note, LVM is only available in the graphical installation program.
 </para>
diff --git a/en-US/Create_LVM-common-para-3.xml b/en-US/Create_LVM-common-para-3.xml
new file mode 100644
index 0000000..424cc18
--- /dev/null
+++ b/en-US/Create_LVM-common-para-3.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+]>
+
+<para>
+	Choose this option to create LVM volume groups from the available LVM physical volumes, or to add existing logical volumes to a volume group. 
+</para>
diff --git a/en-US/Create_LVM-common-para-4.xml b/en-US/Create_LVM-common-para-4.xml
new file mode 100644
index 0000000..23d9b77
--- /dev/null
+++ b/en-US/Create_LVM-common-para-4.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+]>
+
+<para>
+	To assign one or more physical volumes to a volume group, first name the volume group. Then select the physical volumes to be used in the volume group. Finally, configure logical volumes on any volume groups using the <guilabel>Add</guilabel>, <guilabel>Edit</guilabel> and <guilabel>Delete</guilabel> options.
+</para>
\ No newline at end of file
diff --git a/en-US/Create_LVM-common-para-5.xml b/en-US/Create_LVM-common-para-5.xml
new file mode 100644
index 0000000..01f9c4c
--- /dev/null
+++ b/en-US/Create_LVM-common-para-5.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+]>
+
+<para>
+	You may not remove a physical volume from a volume group if doing so would leave insufficient space for that group's logical volumes. Take for example a volume group made up of two 5 GB LVM physical volume partitions, which contains an 8 GB logical volume. The installer would not allow you to remove either of the component physical volumes, since that would leave only 5 GB in the group for an 8 GB logical volume. If you reduce the total size of any logical volumes appropriately, you may then remove a physical volume from the volume group. In the example, reducing the size of the logical volume to 4 GB would allow you to remove one of the 5 GB physical volumes.
+</para>
+			
+			
\ No newline at end of file
diff --git a/en-US/Create_LVM-common-para-6.xml b/en-US/Create_LVM-common-para-6.xml
new file mode 100644
index 0000000..e936cc1
--- /dev/null
+++ b/en-US/Create_LVM-common-para-6.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+]>
+
+<para>
+	Choose this option to create an LVM logical volume. Select a mount point, file system type, and size (in MB) just as if it were a standard disk partition. You can also choose a name for the logical volume and specify the volume group to which it will belong. 
+</para>
+			
\ No newline at end of file
diff --git a/en-US/Create_LVM-common-term-1.xml b/en-US/Create_LVM-common-term-1.xml
new file mode 100644
index 0000000..c74c722
--- /dev/null
+++ b/en-US/Create_LVM-common-term-1.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<!DOCTYPE term PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+]>
+
+<term><guilabel>Make LVM Volume Group</guilabel></term>
+
+
+
diff --git a/en-US/Create_LVM-common-term-2.xml b/en-US/Create_LVM-common-term-2.xml
new file mode 100644
index 0000000..3001c98
--- /dev/null
+++ b/en-US/Create_LVM-common-term-2.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<!DOCTYPE term PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+]>
+
+<term><guilabel>Make Logical Volume</guilabel></term>
+			
+			
\ No newline at end of file
diff --git a/en-US/Create_LVM-common-variablelist-1.xml b/en-US/Create_LVM-common-variablelist-1.xml
index 1c89e89..cd7dc54 100644
--- a/en-US/Create_LVM-common-variablelist-1.xml
+++ b/en-US/Create_LVM-common-variablelist-1.xml
@@ -3,14 +3,12 @@
 ]>
 
 <variablelist>
-
-
 	<varlistentry>
-		<term><guilabel>Make LVM Volume Group</guilabel></term>
+		<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Create_LVM-common-term-1.xml"/>
+		<!-- Make LVM Volume Group -->
 		<listitem>
-			<para>
-				Choose this option to create LVM volume groups from the available LVM physical volumes, or to add existing logical volumes to a volume group. 
-			</para>
+			<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Create_LVM-common-para-3.xml"/>
+			<!-- Choose this option to create LVM volume groups from the available LVM physical volumes -->
 
 			<figure float="0" ><title>Make LVM Volume Group</title>
 				<mediaobject>
@@ -21,22 +19,19 @@
 					</textobject>
 				</mediaobject>
 			</figure>
-			<para>
-				To assign one or more physical volumes to a volume group, first name the volume group. Then select the physical volumes to be used in the volume group. Finally, configure logical volumes on any volume groups using the <guilabel>Add</guilabel>, <guilabel>Edit</guilabel> and <guilabel>Delete</guilabel> options.
-			</para>
-			<para>
-				You may not remove a physical volume from a volume group if doing so would leave insufficient space for that group's logical volumes. Take for example a volume group made up of two 5 GB LVM physical volume partitions, which contains an 8 GB logical volume. The installer would not allow you to remove either of the component physical volumes, since that would leave only 5 GB in the group for an 8 GB logical volume. If you reduce the total size of any logical volumes appropriately, you may then remove a physical volume from the volume group. In the example, reducing the size of the logical volume to 4 GB would allow you to remove one of the 5 GB physical volumes.
-			</para>
+			<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Create_LVM-common-para-4.xml"/>
+			<!-- To assign one or more physical volumes to a volume group, -->
+			<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Create_LVM-common-para-5.xml"/>
+			<!-- You may not remove a physical volume from a volume group if doing so would leave -->
 		</listitem>
 	</varlistentry>
-
 	<varlistentry>
-		<term><guilabel>Make Logical Volume</guilabel></term>
+		<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Create_LVM-common-term-2.xml"/>
+		<!-- Make Logical Volume -->
+		
 		<listitem>
-			<para>
-				Choose this option to create an LVM logical volume. Select a mount point, file system type, and size (in MB) just as if it were a standard disk partition. You can also choose a name for the logical volume and specify the volume group to which it will belong. 
-			</para>
-
+			<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Create_LVM-common-para-6.xml"/>
+			<!-- Choose this option to create an LVM logical volume. -->
 			<figure float="0" ><title>Make Logical Volume</title>
 				<mediaobject>
 					<imageobject><imagedata fileref="images/diskpartitioning/lvm-lv.png" format="PNG"/></imageobject>
@@ -46,7 +41,6 @@
 					</textobject>
 				</mediaobject>
 			</figure>
-
 		</listitem>
 	</varlistentry>
 </variablelist>
diff --git a/en-US/Create_LVM-x86.xml b/en-US/Create_LVM-x86.xml
index 0cfa0e5..77592eb 100644
--- a/en-US/Create_LVM-x86.xml
+++ b/en-US/Create_LVM-x86.xml
@@ -13,7 +13,7 @@
 	<!-- Logical Volume Management (LVM) presents a simple logical view of underlying physical storage space -->
 	
 	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Create_LVM-common-para-2.xml"/>
-	<!-- To read more about LVM, refer to the Red Hat Enterprise Linux Deployment Guide -->
+	<!-- To read more about LVM, refer to the Fedora Deployment Guide -->
 	
 	<variablelist>
 		<varlistentry>
diff --git a/en-US/Create_Software_RAID-common-para-1.xml b/en-US/Create_Software_RAID-common-para-1.xml
index 0c867f5..139dd06 100644
--- a/en-US/Create_Software_RAID-common-para-1.xml
+++ b/en-US/Create_Software_RAID-common-para-1.xml
@@ -3,7 +3,7 @@
 ]>
 
 <para>
-	<firstterm>Redundant arrays of independent disks</firstterm> (RAIDs) are constructed from multiple storage devices that are arranged to provided increased performance and â€” in some configurations â€” greater fault tolerance. 
+	<firstterm>Redundant arrays of independent disks</firstterm> (RAIDs) are constructed from multiple storage devices that are arranged to provided increased performance and â€” in some configurations â€” greater fault tolerance. Refer to the <citetitle>Fedora Deployment Guide</citetitle> for a description of different kinds of RAIDs.
 </para>
 	
 
diff --git a/en-US/Create_Software_RAID-common-variablelist-1.xml b/en-US/Create_Software_RAID-common-variablelist-1.xml
index 8e0cc34..59b737a 100644
--- a/en-US/Create_Software_RAID-common-variablelist-1.xml
+++ b/en-US/Create_Software_RAID-common-variablelist-1.xml
@@ -24,7 +24,7 @@
 			</figure>
 			
 			<para>
-				Select the file system type as for a standard partion. 
+				Select the file system type as for a standard partition. 
 			</para>
 			
 			<para>
@@ -67,7 +67,7 @@
 				</listitem>
 				<listitem>
 					<para>
-						<guilabel>RAID 10</guilabel> â€” level 10 RAIDs are <firstterm>nested RAIDs</firstterm> or <firstterm>hybrid RAIDs</firstterm>. Level 10 RAIDs are constructed by distributing data over mirrored sets of storage devices. For example, a level 10 RAID contructed from four RAID partitions consists of two pairs of partitions in which one partition mirrors the other. Data is then distributed across both pairs of storage devices, as in a level 0 RAID. RAID 10 requires at least four RAID partitions.
+						<guilabel>RAID 10</guilabel> â€” level 10 RAIDs are <firstterm>nested RAIDs</firstterm> or <firstterm>hybrid RAIDs</firstterm>. Level 10 RAIDs are constructed by distributing data over mirrored sets of storage devices. For example, a level 10 RAID constructed from four RAID partitions consists of two pairs of partitions in which one partition mirrors the other. Data is then distributed across both pairs of storage devices, as in a level 0 RAID. RAID 10 requires at least four RAID partitions.
 					</para>
 				</listitem>
 			</itemizedlist>
diff --git a/en-US/Create_Storage-common-listitem-3.xml b/en-US/Create_Storage-common-listitem-3.xml
index c11ee28..bd4924c 100644
--- a/en-US/Create_Storage-common-listitem-3.xml
+++ b/en-US/Create_Storage-common-listitem-3.xml
@@ -4,7 +4,7 @@
 
 <listitem>
 	<para>
-		<guilabel>RAID Device</guilabel> â€” combine two or more RAID partitions into a software RAID device. When you choose this option, you can specify the type of RAID device to create (the <firstterm>RAID level</firstterm>. This option is only available when two or more RAID partitions are available on the system. 
+		<guilabel>RAID Device</guilabel> â€” combine two or more RAID partitions into a software RAID device. When you choose this option, you can specify the type of RAID device to create (the <firstterm>RAID level</firstterm>). This option is only available when two or more RAID partitions are available on the system. 
 	</para>
 </listitem>
 			
\ No newline at end of file
diff --git a/en-US/DU-Preparing_a_driver_update_disk_ppc_x86-warning-1.xml b/en-US/DU-Preparing_a_driver_update_disk_ppc_x86-warning-1.xml
index 8439888..5f54459 100644
--- a/en-US/DU-Preparing_a_driver_update_disk_ppc_x86-warning-1.xml
+++ b/en-US/DU-Preparing_a_driver_update_disk_ppc_x86-warning-1.xml
@@ -3,8 +3,9 @@
 ]>
 
 <warning>
-	<title>These instructions could destroy data</title>
+	<title>Warning â€” These instructions could destroy data</title>
 	<para>
-		If you perform this procedure with a disk or USB storage device that already contains data, this data will be destroyed with no warning. Make sure that you specify the correct disk or USB storage device, and make sure that this disk or storage device does not contain any data that you want to keep.
+		When you perform this procedure any data on the USB flash drive is destroyed with no warning. Make sure that you specify the correct USB flash drive, and make sure that this flash drive does not contain any data that you want to keep.
 	</para>
 </warning>
+
diff --git a/en-US/Disk_Partitioning_Advanced_Storage-x86.xml b/en-US/Disk_Partitioning_Advanced_Storage-x86.xml
index e251ead..34b500b 100644
--- a/en-US/Disk_Partitioning_Advanced_Storage-x86.xml
+++ b/en-US/Disk_Partitioning_Advanced_Storage-x86.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0"?>
 <!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+	  
+	  
+	  
 ]>
 	    
 <section id="s1-advanced-storage-x86">
@@ -68,3 +71,4 @@
 	</section>
 
 </section>
+
diff --git a/en-US/Disk_Partitioning_Advanced_Storage_common-para-3.xml b/en-US/Disk_Partitioning_Advanced_Storage_common-para-3.xml
index eb88154..30ae64b 100644
--- a/en-US/Disk_Partitioning_Advanced_Storage_common-para-3.xml
+++ b/en-US/Disk_Partitioning_Advanced_Storage_common-para-3.xml
@@ -6,5 +6,5 @@
 ]>
 
 <para>
-	Please note that you will be able to reattempt with a different ISCSI target IP should you enter it incorrectly, but in order to change the ISCSI initiator name you will need to restart the installation.
+	Note that you will be able to reattempt with a different ISCSI target IP should you enter it incorrectly, but to change the ISCSI initiator name you will need to restart the installation.
 </para>
\ No newline at end of file
diff --git a/en-US/Disk_Partitioning_Graphical_common-para-1.xml b/en-US/Disk_Partitioning_Graphical_common-para-1.xml
index 3b6fe6a..eb508c7 100644
--- a/en-US/Disk_Partitioning_Graphical_common-para-1.xml
+++ b/en-US/Disk_Partitioning_Graphical_common-para-1.xml
@@ -7,4 +7,5 @@
 
 <para>
 	Using your mouse, click once to highlight a particular field in the graphical display. Double-click to edit an existing partition or to create a partition out of existing free space.
-</para>
\ No newline at end of file
+</para>
+
diff --git a/en-US/Disk_Partitioning_Graphical_x86_ppc-para-1.xml b/en-US/Disk_Partitioning_Graphical_x86_ppc-para-1.xml
index dfa3671..c1c1c2d 100644
--- a/en-US/Disk_Partitioning_Graphical_x86_ppc-para-1.xml
+++ b/en-US/Disk_Partitioning_Graphical_x86_ppc-para-1.xml
@@ -3,6 +3,6 @@
 ]>
 
 <para>
-	The screen contains two panes. The top pane contains a graphical representation of the hard drive, logical volume, or RAID device selected in the lower pane.
+	The partitioning screen contains two panes. The top pane contains a graphical representation of the hard drive, logical volume, or RAID device selected in the lower pane.
 </para>
 
diff --git a/en-US/Disk_Partitioning_Scheme-x86.xml b/en-US/Disk_Partitioning_Scheme-x86.xml
index 093e389..bac972b 100644
--- a/en-US/Disk_Partitioning_Scheme-x86.xml
+++ b/en-US/Disk_Partitioning_Scheme-x86.xml
@@ -14,6 +14,6 @@
 	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Disk_Partitioning_Scheme_common-indexterm-5.xml"/>
 	<!-- End Index Terms -->
 	
-	<!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Disk_Partitioning_IA64_Partitions.xml"/> -->
 	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Disk_Partitioning_X86_Partitions.xml"/>
 </section>
+
diff --git a/en-US/Disk_Partitioning_Scheme_common-indexterm-1.xml b/en-US/Disk_Partitioning_Scheme_common-indexterm-1.xml
index 8d5cb5c..354fd64 100644
--- a/en-US/Disk_Partitioning_Scheme_common-indexterm-1.xml
+++ b/en-US/Disk_Partitioning_Scheme_common-indexterm-1.xml
@@ -8,4 +8,5 @@
 <indexterm significance="normal">
 		<primary>swap partition</primary>
 		<secondary>recommended partitioning</secondary>
-	</indexterm>
\ No newline at end of file
+	</indexterm>
+
diff --git a/en-US/Disk_Partitioning_Scheme_common-indexterm-2.xml b/en-US/Disk_Partitioning_Scheme_common-indexterm-2.xml
index 091eec0..27078cc 100644
--- a/en-US/Disk_Partitioning_Scheme_common-indexterm-2.xml
+++ b/en-US/Disk_Partitioning_Scheme_common-indexterm-2.xml
@@ -9,4 +9,5 @@
 <indexterm significance="normal">
 		<primary>partitioning</primary>
 		<secondary>recommended</secondary>
-	</indexterm>
\ No newline at end of file
+	</indexterm>
+
diff --git a/en-US/Disk_Partitioning_Scheme_common-indexterm-3.xml b/en-US/Disk_Partitioning_Scheme_common-indexterm-3.xml
index ed7c34f..dc9ece7 100644
--- a/en-US/Disk_Partitioning_Scheme_common-indexterm-3.xml
+++ b/en-US/Disk_Partitioning_Scheme_common-indexterm-3.xml
@@ -8,4 +8,5 @@
 <indexterm significance="normal">
 		<primary><filename>/boot/</filename> partition</primary>
 		<secondary>recommended partitioning</secondary>
-	</indexterm>
\ No newline at end of file
+	</indexterm>
+
diff --git a/en-US/Disk_Partitioning_Scheme_common-indexterm-4.xml b/en-US/Disk_Partitioning_Scheme_common-indexterm-4.xml
index f43c08f..bdb8670 100644
--- a/en-US/Disk_Partitioning_Scheme_common-indexterm-4.xml
+++ b/en-US/Disk_Partitioning_Scheme_common-indexterm-4.xml
@@ -8,4 +8,5 @@
 <indexterm significance="normal">
 		<primary><filename>/var/</filename> partition</primary>
 		<secondary>recommended partitioning</secondary>
-	</indexterm>
\ No newline at end of file
+	</indexterm>
+
diff --git a/en-US/Disk_Partitioning_Scheme_common-indexterm-5.xml b/en-US/Disk_Partitioning_Scheme_common-indexterm-5.xml
index 2278631..d36079c 100644
--- a/en-US/Disk_Partitioning_Scheme_common-indexterm-5.xml
+++ b/en-US/Disk_Partitioning_Scheme_common-indexterm-5.xml
@@ -5,4 +5,5 @@
 <indexterm significance="normal">
 		<primary>root <filename>/</filename> partition</primary>
 		<secondary>recommended partitioning</secondary>
-	</indexterm>
\ No newline at end of file
+	</indexterm>
+
diff --git a/en-US/Disk_Partitioning_Scheme_common-listitem-1.xml b/en-US/Disk_Partitioning_Scheme_common-listitem-1.xml
index e110585..34b1fb0 100644
--- a/en-US/Disk_Partitioning_Scheme_common-listitem-1.xml
+++ b/en-US/Disk_Partitioning_Scheme_common-listitem-1.xml
@@ -18,8 +18,9 @@
 	  <title>Root and <filename
 	  class="directory">/root</filename></title>
 	  <para>
-	    The <filename class="partition">/</filename> (or root) partition is the top of the directory structure. The <filename class="directory">/root</filename> directory (sometimes pronounced "slash-root") directory is the home directory of the user account for system administration.
+	    The <filename class="partition">/</filename> (or root) partition is the top of the directory structure. The <filename class="directory">/root</filename> directory<filename class="directory">/root</filename> (sometimes pronounced "slash-root") directory is the home directory of the user account for system administration.
 	  </para>
 	</important>
 	
 </listitem>
+
diff --git a/en-US/Disk_Partitioning_Scheme_common-title.xml b/en-US/Disk_Partitioning_Scheme_common-title.xml
index ad87d64..d9a5399 100644
--- a/en-US/Disk_Partitioning_Scheme_common-title.xml
+++ b/en-US/Disk_Partitioning_Scheme_common-title.xml
@@ -5,4 +5,5 @@
 
 ]>
 
-<title>Recommended Partitioning Scheme</title>
\ No newline at end of file
+<title>Recommended Partitioning Scheme</title>
+
diff --git a/en-US/Disk_Partitioning_Scheme_x86_s390-para-1.xml b/en-US/Disk_Partitioning_Scheme_x86_s390-para-1.xml
index 865d75e..9cd50c4 100644
--- a/en-US/Disk_Partitioning_Scheme_x86_s390-para-1.xml
+++ b/en-US/Disk_Partitioning_Scheme_x86_s390-para-1.xml
@@ -8,3 +8,4 @@
 	  The partition mounted on <filename>/boot/</filename> contains the operating system kernel (which allows your system to boot Fedora), along with files used during the bootstrap process. For most users, a 250 MB boot partition is sufficient. 
 	</para>
 </formalpara>
+
diff --git a/en-US/Disk_Partitioning_Setup-x86.xml b/en-US/Disk_Partitioning_Setup-x86.xml
index 1bcde44..5cc2f18 100644
--- a/en-US/Disk_Partitioning_Setup-x86.xml
+++ b/en-US/Disk_Partitioning_Setup-x86.xml
@@ -63,6 +63,9 @@
 	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Automatic_Partitioning_common-para-3.xml"/>
 	<!-- To review and make any necessary changes to the partitions... -->
 	
+	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Disk_Partitioning_Setup_common-important-1.xml"/>
+	<!-- Important - chain loading... -->
+	
 	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Automatic_Partitioning_common-para-4.xml"/>
 	<!-- Click Next once you have made your selection... -->
 	
diff --git a/en-US/Disk_Partitioning_Setup_common-figure-1.xml b/en-US/Disk_Partitioning_Setup_common-figure-1.xml
index 8e8404c..dfe3c08 100644
--- a/en-US/Disk_Partitioning_Setup_common-figure-1.xml
+++ b/en-US/Disk_Partitioning_Setup_common-figure-1.xml
@@ -10,4 +10,5 @@
 			</para>
 		</textobject>
 	</mediaobject>
-</figure>
\ No newline at end of file
+</figure>
+
diff --git a/en-US/Disk_Partitioning_Setup_common-important-1.xml b/en-US/Disk_Partitioning_Setup_common-important-1.xml
new file mode 100644
index 0000000..88e69fe
--- /dev/null
+++ b/en-US/Disk_Partitioning_Setup_common-important-1.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<!DOCTYPE important PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+]>
+
+<important>
+	<title>Important â€” chain loading</title>
+	<indexterm> <primary>Chain loading</primary> </indexterm>
+	<para>
+		To configure the Fedora boot loader to <firstterm>chain load</firstterm> from a different boot loader, you must specify the boot drive manually. If you chose any of the automatic partitioning options, you must now select the <guilabel>Review and modify partitioning layout</guilabel> option before you click <guibutton>Next</guibutton> or you cannot specify the correct boot drive.
+	</para>
+</important>
+
diff --git a/en-US/Disk_Partitioning_Setup_common-indexterm-1.xml b/en-US/Disk_Partitioning_Setup_common-indexterm-1.xml
index d2adf6b..3c1ca08 100644
--- a/en-US/Disk_Partitioning_Setup_common-indexterm-1.xml
+++ b/en-US/Disk_Partitioning_Setup_common-indexterm-1.xml
@@ -7,4 +7,5 @@
 
 <indexterm significance="normal">
 	<primary>disk partitioning</primary>
-</indexterm>
\ No newline at end of file
+</indexterm>
+
diff --git a/en-US/Disk_Partitioning_Setup_common-indexterm-2.xml b/en-US/Disk_Partitioning_Setup_common-indexterm-2.xml
index f32bdae..e7b3e9c 100644
--- a/en-US/Disk_Partitioning_Setup_common-indexterm-2.xml
+++ b/en-US/Disk_Partitioning_Setup_common-indexterm-2.xml
@@ -6,4 +6,5 @@
 ]>
 <indexterm significance="normal">
 	<primary>automatic partitioning</primary>
-</indexterm>
\ No newline at end of file
+</indexterm>
+
diff --git a/en-US/Disk_Partitioning_Setup_common-indexterm-6.xml b/en-US/Disk_Partitioning_Setup_common-indexterm-6.xml
index 68314c5..3f7ef8b 100644
--- a/en-US/Disk_Partitioning_Setup_common-indexterm-6.xml
+++ b/en-US/Disk_Partitioning_Setup_common-indexterm-6.xml
@@ -5,4 +5,5 @@
 <indexterm significance="normal">
 	<primary>RAID</primary>
 	<secondary>hardware</secondary>
-      </indexterm>
\ No newline at end of file
+      </indexterm>
+
diff --git a/en-US/Disk_Partitioning_Setup_common-indexterm-7.xml b/en-US/Disk_Partitioning_Setup_common-indexterm-7.xml
index 7ac1985..f5a76c3 100644
--- a/en-US/Disk_Partitioning_Setup_common-indexterm-7.xml
+++ b/en-US/Disk_Partitioning_Setup_common-indexterm-7.xml
@@ -5,4 +5,5 @@
 <indexterm significance="normal">
 	<primary>array</primary>
 	<see>RAID</see>
-      </indexterm>
\ No newline at end of file
+      </indexterm>
+
diff --git a/en-US/Disk_Partitioning_Setup_common-indexterm-8.xml b/en-US/Disk_Partitioning_Setup_common-indexterm-8.xml
index 612e659..77312a6 100644
--- a/en-US/Disk_Partitioning_Setup_common-indexterm-8.xml
+++ b/en-US/Disk_Partitioning_Setup_common-indexterm-8.xml
@@ -5,4 +5,5 @@
 <indexterm significance="normal">
 	<primary>RAID</primary>
 	<secondary>software</secondary>
-      </indexterm>
\ No newline at end of file
+      </indexterm>
+
diff --git a/en-US/Disk_Partitioning_Setup_common-title.xml b/en-US/Disk_Partitioning_Setup_common-title.xml
index 0042f2e..e64c761 100644
--- a/en-US/Disk_Partitioning_Setup_common-title.xml
+++ b/en-US/Disk_Partitioning_Setup_common-title.xml
@@ -5,4 +5,5 @@
 
 ]>
 
-<title>Disk Partitioning Setup</title>
\ No newline at end of file
+<title>Disk Partitioning Setup</title>
+
diff --git a/en-US/Disk_Partitioning_Setup_common-warning-1.xml b/en-US/Disk_Partitioning_Setup_common-warning-1.xml
new file mode 100644
index 0000000..07e58e8
--- /dev/null
+++ b/en-US/Disk_Partitioning_Setup_common-warning-1.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<!DOCTYPE warning PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+]>
+
+<warning>
+	<title>Warning</title>
+
+	<para>
+		The <!-- (RHEL) <application>Red Hat Update Agent</application> --> <application>PackageKit</application> update software downloads updated packages to <filename>/var/cache/yum/</filename> by default. If you partition the system manually, and create a separate <filename>/var/</filename> partition, be sure to create the partition large enough (3.0 GB or more) to download package updates.
+	</para>
+</warning>
+
diff --git a/en-US/Disk_Partitioning_X86_Partitions.xml b/en-US/Disk_Partitioning_X86_Partitions.xml
index eb34f17..c4c66cf 100644
--- a/en-US/Disk_Partitioning_X86_Partitions.xml
+++ b/en-US/Disk_Partitioning_X86_Partitions.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0"?>
 <!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
 ]>
-<section><title>x86, AMD64, and <trademark class="registered">Intel</trademark> 64 systems</title>
+<section><title>x86, AMD64, and Intel 64 systems</title>
 <para>
-	<emphasis>Unless you have a reason for doing otherwise, we recommend that you create the following partitions for x86, AMD64, and <trademark class="registered">Intel</trademark> 64 systems</emphasis>:
+	<emphasis>Unless you have a reason for doing otherwise, we recommend that you create the following partitions for x86, AMD64, and Intel 64 systems</emphasis>:
 </para>
 
     <itemizedlist>
@@ -69,7 +69,7 @@
     <para>
       If you create many partitions instead of one large <filename
 	class="partition">/</filename> partition, upgrades become
-      easier. Refer to the description the Edit
+      easier. Refer to the description of the Edit
 	option in <xref linkend="s1-diskpartitioning-x86"/> for more information.
     </para>
     
@@ -143,4 +143,5 @@
 <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Advice_on_Partitions.xml"/>
 <!-- Optimal partition setup depends on the usage for the Linux system -->
 
-</section>
\ No newline at end of file
+</section>
+
diff --git a/en-US/Disk_Partitioning_common-indexterm-1.xml b/en-US/Disk_Partitioning_common-indexterm-1.xml
index c6ff6ab..8c4cdde 100644
--- a/en-US/Disk_Partitioning_common-indexterm-1.xml
+++ b/en-US/Disk_Partitioning_common-indexterm-1.xml
@@ -8,4 +8,5 @@
 
 <indexterm significance="normal">
 	<primary>partitioning</primary>
-</indexterm>
\ No newline at end of file
+</indexterm>
+
diff --git a/en-US/Disk_Partitioning_common-indexterm-2.xml b/en-US/Disk_Partitioning_common-indexterm-2.xml
index cbfae69..fb8d492 100644
--- a/en-US/Disk_Partitioning_common-indexterm-2.xml
+++ b/en-US/Disk_Partitioning_common-indexterm-2.xml
@@ -3,6 +3,7 @@
 ]>
 
 <indexterm significance="normal">
-	<primary><application>Partitioning</application>
+	<primary>Partitioning
 	</primary>
-</indexterm>
\ No newline at end of file
+</indexterm>
+
diff --git a/en-US/Disk_Partitioning_common-indexterm-3.xml b/en-US/Disk_Partitioning_common-indexterm-3.xml
index f410176..35d5f30 100644
--- a/en-US/Disk_Partitioning_common-indexterm-3.xml
+++ b/en-US/Disk_Partitioning_common-indexterm-3.xml
@@ -8,4 +8,5 @@
 <indexterm significance="normal">
 	<primary>installation</primary>
 	<secondary>partitioning</secondary>
-</indexterm>
\ No newline at end of file
+</indexterm>
+
diff --git a/en-US/Disk_Partitioning_common-para-1.xml b/en-US/Disk_Partitioning_common-para-1.xml
index 071bfa8..5c1574c 100644
--- a/en-US/Disk_Partitioning_common-para-1.xml
+++ b/en-US/Disk_Partitioning_common-para-1.xml
@@ -3,5 +3,6 @@
 ]>
 
 <para>
-	 With the exception of certain esoteric situations, <application>anaconda</application> can handle the partitioning requirements for a typical installation.
-</para>
\ No newline at end of file
+	 <application>Anaconda</application> can handle the partitioning requirements for a typical installation.
+</para>
+
diff --git a/en-US/Disk_Partitioning_x86_ppc-para-1.xml b/en-US/Disk_Partitioning_x86_ppc-para-1.xml
index d71d759..f885a8d 100644
--- a/en-US/Disk_Partitioning_x86_ppc-para-1.xml
+++ b/en-US/Disk_Partitioning_x86_ppc-para-1.xml
@@ -4,4 +4,5 @@
 
 <para>
 	If you chose one of the automatic partitioning options and selected <guilabel>Review</guilabel>, you can either accept the current partition settings (click <guibutton>Next</guibutton>), or modify the setup manually in the partitioning screen.
-</para>
\ No newline at end of file
+</para>
+
diff --git a/en-US/Encrypt-x86.xml b/en-US/Encrypt-x86.xml
index f69e010..f9fb411 100644
--- a/en-US/Encrypt-x86.xml
+++ b/en-US/Encrypt-x86.xml
@@ -9,11 +9,19 @@
 	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Encrypt_common-para-1.xml"/>
 	<!-- Encrypt Partitions -->
 	
+	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Encrypt_common-para-3.xml"/>
+	<!-- Partitions are encrypted -->
+	
 	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Encrypt_common-figure-1.xml"/>
 	<!-- Enter passphrase for encrypted partition -->
 	
 	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Encrypt_common-para-2.xml"/>
 	<!-- Choose a phassphrase -->
 	
+	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Encrypt_common-warning-1.xml"/>
+	<!-- Warning â€” do not lose this passphrase -->
+	
+	
+	
 </section>
 
diff --git a/en-US/Encrypt_common-para-1.xml b/en-US/Encrypt_common-para-1.xml
index f407c75..7c6dd00 100644
--- a/en-US/Encrypt_common-para-1.xml
+++ b/en-US/Encrypt_common-para-1.xml
@@ -3,5 +3,5 @@
 ]>
 
 <para>
-	If you selected the <guilabel>Encrypt System</guilabel> option, the installater prompts you for a passphrase with which to encrypt the partitions on the system.
+	If you selected the <guilabel>Encrypt System</guilabel> option, the installer prompts you for a passphrase with which to encrypt the partitions on the system.
 </para>
diff --git a/en-US/Encrypt_common-para-3.xml b/en-US/Encrypt_common-para-3.xml
new file mode 100644
index 0000000..e0ceaee
--- /dev/null
+++ b/en-US/Encrypt_common-para-3.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+]>
+
+<para>
+	Partitions are encrypted using the <firstterm>Linux Unified Key Setup</firstterm> â€” refer to <xref linkend="Disk_Encryption_Guide"/> for more information.
+</para>
diff --git a/en-US/Encrypt_common-warning-1.xml b/en-US/Encrypt_common-warning-1.xml
new file mode 100644
index 0000000..25f91c4
--- /dev/null
+++ b/en-US/Encrypt_common-warning-1.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<!DOCTYPE warning PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+]>
+
+<warning>
+	<title>Warning â€” Do not lose this passphrase</title>
+	<para>
+		If you lose this passphrase, any encrypted partitions and the data on them will become completely inaccessible. There is no way to recover a lost passphrase. 
+	</para>
+	<para>
+		Note that if you perform a kickstart installation of Fedora, you can save encryption passphrases and create backup encryption passphrases during installation. Refer to <xref linkend="Disk_Encryption_Guide-Saving_Passphrases"/> and <xref linkend="Disk_Encryption_Guide-Creating_and_Saving_Backup_Passphrases"/>.
+	</para>
+</warning>
diff --git a/en-US/Files_in_progress.txt b/en-US/Files_in_progress.txt
new file mode 100644
index 0000000..04ba09b
--- /dev/null
+++ b/en-US/Files_in_progress.txt
@@ -0,0 +1,47 @@
+Graphical_Installation-x86.xml
+Graphical_Installation-ppc.xml
+Graphical_Installation-s390.xml
+
+
+
+Graphical_Installation_common-list-1.xml
+Graphical_Installation_common-listitem-1.xml
+Graphical_Installation_common-listitem-2.xml
+Graphical_Installation_common-listitem-3.xml
+Graphical_Installation_common-listitem-4.xml
+Graphical_Installation_common-listitem-5.xml
+Graphical_Installation_common-listitem-6.xml
+Graphical_Installation_common-note-1.xml
+Graphical_Installation_common-para-1.xml
+Graphical_Installation_common-para-2.xml
+Graphical_Installation_common-section-1.xml
+Graphical_Installation_common-section-2.xml
+Graphical_Installation_x86_ppc-para-1.xml
+Graphical_Installation_x86_ppc-para-2.xml
+Graphical_Installation_x86_ppc-para-3.xml
+Graphical_Installation_x86_ppc-para-4.xml
+Graphical_Installation_x86_ppc-para-5.xml
+Graphical_Installation_x86_ppc-para-6.xml
+Graphical_Installation_x86_ppc-table-1.xml
+Graphical_Installation_x86_ppc-table-1.xml
+Graphical_Installation_x86_Starting.xml
+Graphical_Installation_x86-Installation-methods.xml
+Graphical_Installation_ppc-common-section-1.xml
+Graphical_Installation_s390-common-section-1.xml
+Graphical_Installation_x86-common-section-1.xml
+
+Boot_Options-x86.xml
+Boot_Options-ppc.xml
+Boot_Options-s390.xml
+
+Verify whether these files have the same or different content in the book
+
+Boot_Options_common-para-1.xml
+Boot_Options_common-para-2.xml
+Boot_Options_common-variablelist-1.xml
+
+
+Right now I'm working in Graphical_Installation
+
+
+
diff --git a/en-US/Graphical_Installation-x86.xml b/en-US/Graphical_Installation-x86.xml
index f5ed8ec..b5cefab 100644
--- a/en-US/Graphical_Installation-x86.xml
+++ b/en-US/Graphical_Installation-x86.xml
@@ -2,20 +2,16 @@
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
 ]>
 	  
-<chapter id="ch-guimode-x86"><title>Installing on <trademark class="registered">Intel</trademark> and AMD Systems</title>
+<chapter id="ch-guimode-x86"><title>Installing using anaconda</title>
 	<indexterm significance="normal">
 		<primary>installation</primary>
 		<secondary>GUI</secondary>
-		<tertiary>CD-ROM</tertiary>
 	</indexterm>
 	
 	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Graphical_Installation_x86_ppc-para-1.xml"/>
 	<!-- This chapter explains how to perform a... -->
 	
- 	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Graphical_Installation_common-list-1.xml"/> 
-	<!-- Contains: Becoming familiar with the installation program's user interface, etc. -->
-	
-	<xi:include href="Graphical_and_Text_Interfaces.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ 	<xi:include href="TUI-x86.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 	<!-- Graphical Interface Usage - Installing in text mode does not prevent you from using a graphical interface. -->
 	
 	<section id="s1-guimode-interface-x86">
@@ -37,12 +33,9 @@
 		<!-- You can also navigate through the installation using the keyboard... -->
 
 
-		<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Graphical_Installation_User_Interface_x86_ppc-note-Fedora.xml"/>
+		<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Graphical_Installation_User_Interface_x86-note-1.xml"/>
 		<!-- If you are using an x86, AMD64, or Intel 64 system, and you do not... -->
 
-<!-- 		<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="IA64_starting-text-mode.xml"/> -->
-		<!-- If you are using an Itanium system, and you do not wish to use the GUI installation program... -->
-
 		<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Graphical_Installation_screenshots.xml"/>
 		<!-- Anaconda allows you to take screenshots during the installation process. -->
 
@@ -110,7 +103,7 @@
 			</entry>
 				
 			<entry>
-				installation dialog
+				graphical display
 			</entry>
 		</row>
 			
@@ -173,21 +166,7 @@
 				other messages
 			</entry>
 		</row>
-			
-		<row>
-			<entry>
-				6
-			</entry>
-				
-			<entry>
-				<keycombo><keycap>ctrl</keycap><keycap>alt</keycap><keycap>f6</keycap>
-				</keycombo>
-			</entry>
-				
-			<entry>
-				graphical display
-			</entry>
-		</row>
+
 	</tbody>
 </tgroup>
 				
@@ -195,68 +174,36 @@
 		</section>
 	</section>
 		
-	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"  href="Graphical_Installation_x86-common-section-1.xml"/>
-	<!-- The Text Mode Installation Program User Interface
-	     links to Graphical_Installation_common-section-2.xml:
-	     Using the Keyboard to Navigate -->
-	
-	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Graphical_Installation_x86_Starting.xml"/>
-	<!-- Starting the Installation Program
-	     Booting the Installation Program on x86, AMD64,and Intel 64 systems
-	     Booting the Installation Program on Itanium Systems
-	     Booting the Installation Program from an LS-120 Diskette
-	     Additional Boot Options
-	     Kernel Options-->
-	
- 	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Graphical_Installation_x86-Installation-methods.xml"/>
-	<!-- Selecting an Installation Method -->
-	
-	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Installation_Method-x86.xml"/>
-	<!-- Installation Method -->
-		
-	<xi:include href="Verifying_Media.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-	<!-- Verifying Media - The DVD offers an option to verify the integrity of the media. -->
-	
 	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Welcome-x86.xml"/>
 	<!-- Welcome to Fedora -->
 	
-	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Language_Selection-x86.xml"/>
-	<!-- Language Selection -->
-	
 	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Key_Board_Configuration-x86.xml"/>  
 	<!-- Keyboard Configuration -->
 	
-<!--	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Beginning_Installation_FTP-x86.xml"/>  -->
-	<!-- Installing via FTP -->
-	
-<!--	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Beginning_Installation_HTTP-x86.xml"/>  -->
-	<!-- Installing via HTTP -->
-	
 	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Storage_Devices-x86.xml"/>  
 	<!-- Storage devices -->
 	
-	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Assign_Storage_Devices-x86.xml"/>  
-	<!-- Assign Storage devices -->
-	
-	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Initializing_Hard_Disk-x86.xml"/>  
-	<!-- Initializing Hard Disk -->
-	
-<!--	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Installation_Number-x86.xml"/>   -->
+	<!-- Not in Beta 
+	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Installation_Number-x86.xml"/>  -->
 	<!-- Installation Number for RHEL-->
 	
-	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="upgrading-fedora.xml"/>  
-	<!-- The installation system automatically detects any existing... -->
-	
-	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="networkconfig-fedora.xml"/>  
+	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Netconfig-x86.xml"/>  
 	<!-- The installation system automatically detects any existing... -->
 	
 	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Time_Zone-x86.xml"/>  
 	<!-- Time Zone -->
-	<!-- for Fedora goes here -->
 	
-	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Account_Configuration-common.xml"/>
+	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Account_Configuration-x86.xml"/>
 	<!-- Account Configuration -->
-	<!-- for Fedora goes here -->
+	
+	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Assign_Storage_Devices-x86.xml"/>  
+	<!-- Assign Storage devices -->
+	
+	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Initializing_Hard_Disk-x86.xml"/>  
+	<!-- Initializing Hard Disk -->
+	
+	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Upgrading-x86.xml"/>  
+	<!-- The installation system automatically detects any existing... -->
 	
 	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Disk_Partitioning_Setup-x86.xml"/>
 	<!-- Disk Partitioning Setup -->
@@ -273,7 +220,7 @@
 	     Adding Partitions
 	     Editing Partitions-->
 	
-	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Write_changes_to_disk.xml"/> 
+	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Write_changes_to_disk_x86.xml"/> 
 	<!-- The installer prompts you to confirm the partitioning options that you selected. -->
 	
 	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="X86_Bootloader.xml"/> 
@@ -302,9 +249,6 @@
 	
 	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Complete-x86.xml"/>
 	<!-- Installation Complete -->
-	 
-<!--	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="IA64_Post_Installation.xml"/>   -->
-	<!-- Itanium Systems - Booting Your Machine and Post-Installation Setup -->
 
+</chapter>
 
-</chapter>
\ No newline at end of file
diff --git a/en-US/Graphical_Installation_User_Interface_x86-note-1.xml b/en-US/Graphical_Installation_User_Interface_x86-note-1.xml
new file mode 100644
index 0000000..7f5ebf3
--- /dev/null
+++ b/en-US/Graphical_Installation_User_Interface_x86-note-1.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+ "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
+
+		<note>
+			<title>Note</title>			
+			<para>
+				If you <!--are using an x86, AMD64, or Intel 64 system, and you--> do not wish to use the GUI installation program, the text mode installation program is also available. To start the text mode installation program, use the following command at the <prompt>boot:</prompt> prompt:
+			</para>
+<screen>
+<userinput>linux text</userinput>
+</screen>
+
+			<para>
+				Refer to <xref linkend="sn-boot-menu-x86"/> for a description of the Fedora boot menu and to <xref linkend="s1-guimode-textinterface-x86"/> for a brief overview of text mode installation instructions.
+			</para>
+			
+			<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Graphical_Installation_User_Interface_x86_ppc-note-para-1.xml"/>
+			<!-- It is highly recommended that installs... -->
+			
+			<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Graphical_Installation_User_Interface_x86_ppc-note-para-2.xml"/>
+			<!-- Users who must use the text mode... -->
+		</note>
+
diff --git a/en-US/Graphical_Installation_User_Interface_x86_ppc-note-Fedora.xml b/en-US/Graphical_Installation_User_Interface_x86_ppc-note-Fedora.xml
deleted file mode 100644
index 7fdc307..0000000
--- a/en-US/Graphical_Installation_User_Interface_x86_ppc-note-Fedora.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-		<note>
-			<title>Note</title>			
-			<para>
-				If you are using an x86, AMD64, or <trademark class="registered">Intel</trademark> 64 system, and you do not wish to use the GUI installation program, the text mode installation program is also available. To start the text mode installation program, press the <keycap>Esc</keycap> key while the Fedora boot menu is displayed, then use the following command at the <prompt>boot:</prompt> prompt:
-			</para>
-<screen>
-<userinput>linux text</userinput>
-</screen>
-
-			<!-- The following paragraph is in both x86 and ppc guides, but is included here because of the arch-specific link -->
-			<para>
-				Refer to <xref linkend="sn-boot-menu-x86"/> for a description of the Fedora boot menu and to <xref linkend="s1-guimode-textinterface-x86"/> for a brief overview of text mode installation instructions.
-			</para>
-			
-			<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Graphical_Installation_User_Interface_x86_ppc-note-para-1.xml"/>
-			<!-- It is highly recommended that installs... -->
-			
-			<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Graphical_Installation_User_Interface_x86_ppc-note-para-2.xml"/>
-			<!-- Users who must use the text mode... -->
-		</note>
\ No newline at end of file
diff --git a/en-US/Graphical_Installation_User_Interface_x86_ppc-note-para-1.xml b/en-US/Graphical_Installation_User_Interface_x86_ppc-note-para-1.xml
index 13ee25d..43e7736 100644
--- a/en-US/Graphical_Installation_User_Interface_x86_ppc-note-para-1.xml
+++ b/en-US/Graphical_Installation_User_Interface_x86_ppc-note-para-1.xml
@@ -7,4 +7,5 @@
 
 <para>
 	It is highly recommended that installs be performed using the GUI installation program. The GUI installation program offers the full functionality of the Fedora installation program, including LVM configuration which is not available during a text mode installation.
-</para>
\ No newline at end of file
+</para>
+
diff --git a/en-US/Graphical_Installation_User_Interface_x86_ppc-note-para-2.xml b/en-US/Graphical_Installation_User_Interface_x86_ppc-note-para-2.xml
index 3a9e6f5..8f8e07b 100644
--- a/en-US/Graphical_Installation_User_Interface_x86_ppc-note-para-2.xml
+++ b/en-US/Graphical_Installation_User_Interface_x86_ppc-note-para-2.xml
@@ -8,4 +8,5 @@
 
 <para>
 	Users who must use the text mode installation program can follow the GUI installation instructions and obtain all needed information.
-</para>
\ No newline at end of file
+</para>
+
diff --git a/en-US/Graphical_Installation_common-important-1.xml b/en-US/Graphical_Installation_common-important-1.xml
new file mode 100644
index 0000000..5e4905c
--- /dev/null
+++ b/en-US/Graphical_Installation_common-important-1.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+]>
+
+<important>
+	<title>Important â€” Graphical installation recommended</title>
+	<para>
+		We recommed that you install Fedora using the graphical interface. If you are installing Fedora on a system that lacks a graphical display, consider performing the installation over a VNC connection &ndash; see <xref linkend="vncwhitepaperadded"/>. If <application>anaconda</application> detects that you are installing in text mode on a system where installation over a VNC connection might be possible, <application>anaconda</application> asks you to verify your decision to install in text mode even though your options during installation are limited.
+	</para>
+	<para>
+		If your system has a graphical display, but graphical installation fails, try booting with the <command>xdriver=vesa</command> option &ndash; refer to <xref linkend="ap-admin-options"/>
+	</para>
+</important>
+
diff --git a/en-US/Graphical_Installation_common-list-1.xml b/en-US/Graphical_Installation_common-list-1.xml
deleted file mode 100644
index 74035a3..0000000
--- a/en-US/Graphical_Installation_common-list-1.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE itemizedlist PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
-	  
-	  
-	  
-]>
-	  
-<itemizedlist>
-	<listitem>
-		<para>
-			Becoming familiar with the installation program's user interface
-		</para>
-	</listitem>
-	
-	<listitem>
-		<para>
-			Starting the installation program
-		</para>
-	</listitem>
-	
-	<listitem>
-		<para>
-			Selecting an installation method
-		</para>
-	</listitem>
-	
-	<listitem>
-		<para>
-			Configuration steps during the installation (language, keyboard, mouse, partitioning, etc.)
-		</para>
-	</listitem>
-	
-	<listitem>
-		<para>
-			Finishing the installation
-		</para>
-	</listitem>
-</itemizedlist>
\ No newline at end of file
diff --git a/en-US/Graphical_Installation_common-list-item-1.xml b/en-US/Graphical_Installation_common-list-item-1.xml
index 74d2b17..8139264 100644
--- a/en-US/Graphical_Installation_common-list-item-1.xml
+++ b/en-US/Graphical_Installation_common-list-item-1.xml
@@ -10,4 +10,5 @@
 		Window &mdash; Windows (usually referred to as <firstterm>dialogs</firstterm> in this manual) appear on your screen throughout the installation process. At times, one window may overlay another; in these cases, you can only interact with the window
 		on top. When you are finished in that window, it disappears, allowing you to continue working in the window underneath.
 	</para>
-</listitem>
\ No newline at end of file
+</listitem>
+
diff --git a/en-US/Graphical_Installation_common-list-item-2.xml b/en-US/Graphical_Installation_common-list-item-2.xml
index 353c630..2d1740f 100644
--- a/en-US/Graphical_Installation_common-list-item-2.xml
+++ b/en-US/Graphical_Installation_common-list-item-2.xml
@@ -10,4 +10,5 @@
 		Checkbox &mdash; Checkboxes allow you to select or deselect a feature. The box displays either an asterisk (selected) or a space (unselected). When the cursor is within a checkbox, press <keycap>Space</keycap> to select or deselect a
 		feature.
 	</para>
-</listitem>
\ No newline at end of file
+</listitem>
+
diff --git a/en-US/Graphical_Installation_common-list-item-3.xml b/en-US/Graphical_Installation_common-list-item-3.xml
index 8bf3c28..03f994b 100644
--- a/en-US/Graphical_Installation_common-list-item-3.xml
+++ b/en-US/Graphical_Installation_common-list-item-3.xml
@@ -9,4 +9,5 @@
 	<para>
 		Text Input &mdash; Text input lines are regions where you can enter information required by the installation program. When the cursor rests on a text input line, you may enter and/or edit information on that line.
 	</para>
-</listitem>
\ No newline at end of file
+</listitem>
+
diff --git a/en-US/Graphical_Installation_common-list-item-4.xml b/en-US/Graphical_Installation_common-list-item-4.xml
index 8c428e8..cca3db3 100644
--- a/en-US/Graphical_Installation_common-list-item-4.xml
+++ b/en-US/Graphical_Installation_common-list-item-4.xml
@@ -9,4 +9,5 @@
 	<para>
 		Text Widget &mdash; Text widgets are regions of the screen for the display of text. At times, text widgets may also contain other widgets, such as checkboxes. If a text widget contains more information than can be displayed in the space reserved for it, a scroll bar appears; if you position the cursor within the text widget, you can then use the <keycap>Up</keycap> and <keycap>Down</keycap> arrow keys to scroll through all the information available. Your current position is shown on the scroll bar by a <guiicon>#</guiicon> character, which moves up and down the scroll bar as you scroll.
 	</para>
-</listitem>
\ No newline at end of file
+</listitem>
+
diff --git a/en-US/Graphical_Installation_common-list-item-5.xml b/en-US/Graphical_Installation_common-list-item-5.xml
index d2e0ca0..852c4d8 100644
--- a/en-US/Graphical_Installation_common-list-item-5.xml
+++ b/en-US/Graphical_Installation_common-list-item-5.xml
@@ -9,4 +9,5 @@
 	<para>
 		Scroll Bar &mdash; Scroll bars appear on the side or bottom of a window to control which part of a list or document is currently in the window's frame. The scroll bar makes it easy to move to any part of a file.
 	</para>
-</listitem>
\ No newline at end of file
+</listitem>
+
diff --git a/en-US/Graphical_Installation_common-list-item-6.xml b/en-US/Graphical_Installation_common-list-item-6.xml
index ab67f81..1b158b9 100644
--- a/en-US/Graphical_Installation_common-list-item-6.xml
+++ b/en-US/Graphical_Installation_common-list-item-6.xml
@@ -10,4 +10,5 @@
 		Button Widget &mdash; Button widgets are the primary method of interacting with the installation program. You progress through the windows of the installation program by navigating these buttons, using the <keycap>Tab</keycap> and
 		<keycap>Enter</keycap> keys. Buttons can be selected when they are highlighted.
 	</para>
-</listitem>
\ No newline at end of file
+</listitem>
+
diff --git a/en-US/Graphical_Installation_common-note-1.xml b/en-US/Graphical_Installation_common-note-1.xml
deleted file mode 100644
index f85eef8..0000000
--- a/en-US/Graphical_Installation_common-note-1.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE note PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
-]>
-
-<note>
-	<title>Note</title>
-	
-	<para>
-		While text mode installations are not explicitly documented, those using the text mode installation program can easily follow the GUI installation instructions. However, because text mode presents you with a simpler, more streamlined insatallation process, certain options that are available in graphical mode are not also available in text mode. These differences are noted in the description of the installation process in this guide, and include: 
-		
-		<itemizedlist>
-			<listitem>
-				<para>
-					customizing the partition layout.
-				</para>
-			</listitem>
-			<listitem>
-				<para>
-					customizing the bootloader configuration.
-				</para>
-			</listitem>
-			<listitem>
-				<para>
-					selecting packages during installation. 
-				</para>
-			</listitem>
-		</itemizedlist>
-		
-		Note also that manipulation of LVM (Logical Volume Management) disk volumes is only possible in graphical mode. In text mode it is only possible to view and accept the default LVM setup. 
-	</para>
-</note>
\ No newline at end of file
diff --git a/en-US/Graphical_Installation_common-note-2.xml b/en-US/Graphical_Installation_common-note-2.xml
index 3c1bb1c..699e686 100644
--- a/en-US/Graphical_Installation_common-note-2.xml
+++ b/en-US/Graphical_Installation_common-note-2.xml
@@ -8,4 +8,5 @@
 	<para>
 		Not every language supported in graphical installation mode is also supported in text mode. Specifically, languages written with a character set other than the Latin or Cyrillic alphabets are not available in text mode. If you choose a language written with a character set that is not supported in text mode, the installation program will present you with the English versions of the screens.
 	</para>
-</note>
\ No newline at end of file
+</note>
+
diff --git a/en-US/Graphical_Installation_common-para-1.xml b/en-US/Graphical_Installation_common-para-1.xml
index 0fd976a..f7e7eea 100644
--- a/en-US/Graphical_Installation_common-para-1.xml
+++ b/en-US/Graphical_Installation_common-para-1.xml
@@ -7,4 +7,5 @@
 
 <para>
 			If you have used a <firstterm>graphical user interface (GUI)</firstterm> before, you are already familiar with this process; use your mouse to navigate the screens, click buttons, or enter text fields.
-</para>
\ No newline at end of file
+</para>
+
diff --git a/en-US/Graphical_Installation_common-para-2.xml b/en-US/Graphical_Installation_common-para-2.xml
index 0e63a0c..93ac087 100644
--- a/en-US/Graphical_Installation_common-para-2.xml
+++ b/en-US/Graphical_Installation_common-para-2.xml
@@ -7,4 +7,5 @@
 	  
 <para>
 			You can also navigate through the installation using the keyboard. The <keycap>Tab</keycap> key allows you to move around the screen, the Up and Down arrow keys to scroll through lists, <keycap>+</keycap> and <keycap>-</keycap> keys expand and collapse lists, while <keycap>Space</keycap> and <keycap>Enter</keycap> selects or removes from selection a highlighted item. You can also use the <keycombo><keycap>Alt</keycap><keycap><replaceable>X</replaceable></keycap> </keycombo> key command combination as a way of clicking on buttons or making other screen selections, where <keycap><replaceable>X</replaceable></keycap> is replaced with any underlined letter appearing within that screen.
-</para>
\ No newline at end of file
+</para>
+
diff --git a/en-US/Graphical_Installation_common-section-1-indexterm-1.xml b/en-US/Graphical_Installation_common-section-1-indexterm-1.xml
new file mode 100644
index 0000000..a22d9f6
--- /dev/null
+++ b/en-US/Graphical_Installation_common-section-1-indexterm-1.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<!DOCTYPE indexterm PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+]>
+
+<indexterm significance="normal">
+	<primary>installation</primary>
+	<secondary>program</secondary>
+	<tertiary>text mode user interface</tertiary>
+</indexterm>
+
+
+
diff --git a/en-US/Graphical_Installation_common-section-1-indexterm-2.xml b/en-US/Graphical_Installation_common-section-1-indexterm-2.xml
new file mode 100644
index 0000000..40d78c4
--- /dev/null
+++ b/en-US/Graphical_Installation_common-section-1-indexterm-2.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<!DOCTYPE indexterm PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+]>
+
+<indexterm significance="normal">
+	<primary>user interface, text mode</primary>
+	<secondary>installation program</secondary>
+</indexterm>
+
+
+
diff --git a/en-US/Graphical_Installation_common-section-1-mediaobject-1.xml b/en-US/Graphical_Installation_common-section-1-mediaobject-1.xml
new file mode 100644
index 0000000..5333b3f
--- /dev/null
+++ b/en-US/Graphical_Installation_common-section-1-mediaobject-1.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<!DOCTYPE mediaobject PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+]>
+
+<mediaobject>
+	<imageobject><imagedata fileref="images/guimode/widget1.png" format="PNG"/></imageobject>
+	<textobject><para>
+			Installation Program Widgets as seen in <guilabel>URL Setup</guilabel>
+		</para>
+	</textobject>
+</mediaobject>
+
+
+
diff --git a/en-US/Graphical_Installation_common-section-1-mediaobject-2.xml b/en-US/Graphical_Installation_common-section-1-mediaobject-2.xml
new file mode 100644
index 0000000..e49ad90
--- /dev/null
+++ b/en-US/Graphical_Installation_common-section-1-mediaobject-2.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<!DOCTYPE mediaobject PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+]>
+
+<mediaobject>
+	<imageobject><imagedata fileref="images/guimode/widget2.png" format="PNG"/></imageobject>
+	<textobject><para>
+			Installation Program Widgets as seen in <guilabel>Choose a Language</guilabel>
+		</para>
+	</textobject>
+</mediaobject>
+
+
+
diff --git a/en-US/Graphical_Installation_common-section-1-para-1.xml b/en-US/Graphical_Installation_common-section-1-para-1.xml
new file mode 100644
index 0000000..8141c11
--- /dev/null
+++ b/en-US/Graphical_Installation_common-section-1-para-1.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+]>
+
+<para>
+	The widgets include:
+</para>
+
+
+
diff --git a/en-US/Graphical_Installation_common-section-1-title-1.xml b/en-US/Graphical_Installation_common-section-1-title-1.xml
new file mode 100644
index 0000000..e37b55f
--- /dev/null
+++ b/en-US/Graphical_Installation_common-section-1-title-1.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<!DOCTYPE title PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+]>
+
+<title>The Text Mode Installation Program User Interface</title>
+
+
diff --git a/en-US/Graphical_Installation_common-section-1-title-2.xml b/en-US/Graphical_Installation_common-section-1-title-2.xml
new file mode 100644
index 0000000..0b7b554
--- /dev/null
+++ b/en-US/Graphical_Installation_common-section-1-title-2.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<!DOCTYPE title PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+]>
+
+<title>Installation Program Widgets as seen in <guilabel>URL Setup</guilabel></title>
+
+
+
diff --git a/en-US/Graphical_Installation_common-section-1-title-3.xml b/en-US/Graphical_Installation_common-section-1-title-3.xml
new file mode 100644
index 0000000..f55b6e5
--- /dev/null
+++ b/en-US/Graphical_Installation_common-section-1-title-3.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<!DOCTYPE title PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+]>
+
+<title>Installation Program Widgets as seen in <guilabel>Choose a Language</guilabel></title>
+
+
+
diff --git a/en-US/Graphical_Installation_common-section-2.xml b/en-US/Graphical_Installation_common-section-2.xml
index 01ae379..a71712a 100644
--- a/en-US/Graphical_Installation_common-section-2.xml
+++ b/en-US/Graphical_Installation_common-section-2.xml
@@ -37,4 +37,5 @@
 			Unless a dialog box is waiting for your input, do not press any keys during the installation process (doing so may result in unpredictable behavior).
 		</para>
 	</warning>
-</section>
\ No newline at end of file
+</section>
+
diff --git a/en-US/Graphical_Installation_screenshots.xml b/en-US/Graphical_Installation_screenshots.xml
index 4e009fd..7cd22be 100644
--- a/en-US/Graphical_Installation_screenshots.xml
+++ b/en-US/Graphical_Installation_screenshots.xml
@@ -14,3 +14,4 @@
 		If you are performing a Kickstart installation, use the <option>autostep --autoscreenshot</option> option to generate a screenshot of each step of the installation automatically. Refer to <xref linkend="s1-kickstart2-file"/> for details of configuring a Kickstart file.
 	</para>
 </section>
+
diff --git a/en-US/Graphical_Installation_x86-Installation-methods.xml b/en-US/Graphical_Installation_x86-Installation-methods.xml
index 63573ab..ac8f41f 100644
--- a/en-US/Graphical_Installation_x86-Installation-methods.xml
+++ b/en-US/Graphical_Installation_x86-Installation-methods.xml
@@ -15,23 +15,44 @@
 	<indexterm significance="normal">
 		<primary>installation</primary>
 		<secondary>method</secondary>
-		<tertiary>CD-ROM</tertiary>
+		<tertiary>DVD</tertiary>
 	</indexterm>
 	<variablelist>
 		<varlistentry>
-			<term>	DVD/CD-ROM      </term>
+			<term>DVD</term>
 			<listitem>
 				<para>
-					If you have a DVD/CD-ROM drive and the Fedora CD-ROMs or DVD you can use this method. Refer to <xref linkend="s1-begininstall-cd-inst-x86"/>, for DVD/CD-ROM installation instructions.
+					If you have a DVD drive and the Fedora DVD you can use this method. Refer to <xref linkend="s1-begininstall-cd-inst-x86"/>, for DVD installation instructions.
 				</para>
 				<para>
-					If you booted the installation from a piece of media other than the installation CD-ROM or DVD, you can specify the CD-ROM or DVD as the installation source with the <command>linux askmethod</command> or <command>linux repo=cdrom:<replaceable>device</replaceable>:/<replaceable>device</replaceable></command> boot option, or by selecting <guimenuitem>Local CD/DVD</guimenuitem> on the <guimenu>Installation Method</guimenu> menu (refer to <xref linkend="s1-installationmethod-x86"/>).
+					If you booted the installation from a piece of media other than the installation DVD, you can specify the DVD as the installation source with the <command>linux askmethod</command> or <command>linux repo=cdrom:<replaceable>device</replaceable>:/<replaceable>device</replaceable></command> boot option, or by selecting <guimenuitem>Local CD/DVD</guimenuitem> on the <guimenu>Installation Method</guimenu> menu (refer to <xref linkend="s1-installationmethod-x86"/>).
+				</para>
+			</listitem>
+		</varlistentry>
+		
+		<varlistentry>
+			<term>CD set</term>
+			<listitem>
+				<para>
+					If you have a CD drive and the set of Fedora CDs you can use this method. Refer to <xref linkend="s1-begininstall-cd-inst-x86"/> for CD installation instructions.
+				</para>
+				<para>
+					If you booted the installation from a piece of media other than the set of installation CDs, you can specify the CD as the installation source with the <command>linux askmethod</command> or <command>linux repo=cdrom:<replaceable>device</replaceable>:/<replaceable>device</replaceable></command> boot option, or by selecting <guimenuitem>Local CD/DVD</guimenuitem> on the <guimenu>Installation Method</guimenu> menu (refer to <xref linkend="s1-installationmethod-x86"/>).
+				</para>
+			</listitem>
+		</varlistentry>
+		
+		<varlistentry>
+			<term>Live CD</term>
+			<listitem>
+				<para>
+					If you have a CD drive and the Fedora live CD you can use this method. The live CD desktop includes an icon labeled <guilabel>Install to Hard Drive</guilabel>.  Refer to <xref linkend="s1-begininstall-cd-inst-x86"/> for CD installation instructions.
 				</para>
 			</listitem>
 		</varlistentry>
 
 		<varlistentry>
-			<term>	Hard Drive       </term>
+			<term>Hard Drive</term>
 			<listitem>
 				<indexterm significance="normal">
 					<primary>installation</primary>
@@ -45,7 +66,7 @@
 		</varlistentry>
 
 		<varlistentry>
-			<term>	NFS       </term>
+			<term>NFS</term>
 			<listitem>
 				<indexterm significance="normal">
 					<primary>installation</primary>
@@ -59,7 +80,7 @@
 		</varlistentry>
 
 		<varlistentry>
-			<term>	URL       </term>
+			<term>URL</term>
 			<listitem>
 				<indexterm significance="normal">
 					<primary>installation</primary>
@@ -78,9 +99,9 @@
 	the next stage loads automatically from the DVD.  Proceed to
 	<xref linkend="s1-langselection-x86"/>.</para>
   <note>
-    <title>CD/DVD Activity</title>
+    <title>DVD Activity</title>
     <para>
-      If you boot any Fedora installation media, the installation
+      If you boot from a Fedora installation DVD, the installation
       program loads its next stage from that disc.  This happens
       regardless of which installation method you choose, unless you
       eject the disc before you proceed.  The installation program still
diff --git a/en-US/Graphical_Installation_x86-common-section-1.xml b/en-US/Graphical_Installation_x86-common-section-1.xml
index de60127..b3bcc61 100644
--- a/en-US/Graphical_Installation_x86-common-section-1.xml
+++ b/en-US/Graphical_Installation_x86-common-section-1.xml
@@ -3,75 +3,56 @@
 ]>
 
 <section id="s1-guimode-textinterface-x86">	
-	<title>The Text Mode Installation Program User Interface</title>
-	<indexterm significance="normal">
-		<primary>installation</primary>
-		<secondary>program</secondary>
-		<tertiary>text mode user interface</tertiary>
-	</indexterm>
-	<indexterm significance="normal">
-		<primary>user interface, text mode</primary>
-		<secondary>installation program</secondary>
-	</indexterm>
+	<xi:include href="Graphical_Installation_common-section-1-title-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+	<!-- The Text Mode Installation Program User Interface -->
 	
-	<note>
-		<para>
-		Graphical installation remains the recommended method for installing Fedora. If you are installing Fedora on a system that lacks a graphical display, consider performing the installation over a VNC connection &ndash; see <xref linkend="vncwhitepaperadded"/>.
-		</para>
-		<para>
-		If your system has a graphical display, but graphical installation fails, try booting with the <command>xdriver=vesa</command> option &ndash; see <xref linkend="ap-admin-options"/>
-		</para>
-	</note>
+	<xi:include href="Graphical_Installation_common-section-1-indexterm-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+	<!-- installation - program - text mode user interface -->
+	
+	<xi:include href="Graphical_Installation_common-section-1-indexterm-2.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+	<!-- user interface, text mode - installation program -->
+	
+	<xi:include href="Graphical_Installation_common-important-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+	<!-- Important â€” Graphical installation recommended -->
 	
 	<para>
-		The Fedora text mode installation program uses a screen-based interface that includes most of the on-screen <wordasword>widgets</wordasword> commonly found on graphical user interfaces. <xref linkend="fig-install-widget1-x86"/>, and
-		<xref linkend="fig-install-widget2-x86"/>, illustrate the screens that appear during the installation process.
-	</para>
-	<para>
-		The cursor is used to select (and interact with) a particular widget. As the cursor is moved from widget to widget, it may cause the widget to change color, or the cursor itself may only appear positioned in or
-		next to the widget. 
+		Both the loader and later <application>anaconda</application> use a screen-based interface that includes most of the on-screen <firstterm>widgets</firstterm> commonly found on graphical user interfaces. <xref linkend="fig-install-widget1-x86"/>, and <xref linkend="fig-install-widget2-x86"/>, illustrate widgets that appear on screens during the installation process.
 	</para>
-	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Graphical_Installation_common-note-1.xml"/>
+	
 	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Graphical_Installation_common-note-2.xml"/>
 	
-	<figure float="0" id="fig-install-widget1-x86"><title>Installation Program Widgets as seen in <guilabel>Boot Loader Configuration</guilabel></title>
-		<mediaobject>
-			<imageobject><imagedata fileref="images/guimode/widget1.png" format="PNG"/></imageobject>
-			<textobject><para>
-					Installation Program Widgets as seen in <guilabel>Boot Loader Configuration</guilabel>
-				</para>
-			</textobject>
-		</mediaobject>
+	<figure float="0" id="fig-install-widget1-x86">
+		<xi:include href="Graphical_Installation_common-section-1-title-2.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+		<!-- Installation Program Widgets as seen in Boot Loader Configuration -->
+		<xi:include href="Graphical_Installation_common-section-1-mediaobject-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 	</figure>
 	
-	<orderedlist>
-	<title>Legend</title>    
-	    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Graphical_Installation_common-list-item-1.xml"/>
-	    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Graphical_Installation_common-list-item-2.xml"/>
-	    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Graphical_Installation_common-list-item-3.xml"/>
-	</orderedlist>
-	
-	<!--
-	<figure float="0" id="fig-install-widget2">
-	-->
-	
 	<figure float="0" id="fig-install-widget2-x86">
-		<title>Installation Program Widgets as seen in the partitioning screen</title>
-		<mediaobject>
-			<imageobject><imagedata fileref="images/guimode/widget2.png" format="PNG"/></imageobject>
-			<textobject><para>
-					Installation Program Widgets as seen in the partitioning screen
-				</para>
-			</textobject>
-		</mediaobject>
+		<xi:include href="Graphical_Installation_common-section-1-title-3.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+		<!-- Installation Program Widgets as seen in the partitioning screen -->
+		<xi:include href="Graphical_Installation_common-section-1-mediaobject-2.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 	</figure>
-
-	<orderedlist>
-	<title>Legend</title>
-	    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Graphical_Installation_common-list-item-4.xml"/>
-	    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Graphical_Installation_common-list-item-5.xml"/>
-	    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Graphical_Installation_common-list-item-6.xml"/>
-	</orderedlist>
-
+	
+	<xi:include href="Graphical_Installation_common-section-1-para-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+	<!-- The widgets include: -->
+	
+	<itemizedlist>
+		<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Graphical_Installation_common-list-item-1.xml"/>
+		<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Graphical_Installation_common-list-item-2.xml"/>
+		<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Graphical_Installation_common-list-item-3.xml"/>
+		<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Graphical_Installation_common-list-item-4.xml"/>
+		<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Graphical_Installation_common-list-item-5.xml"/>
+		<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Graphical_Installation_common-list-item-6.xml"/>
+		<listitem>
+			<para>
+				Cursor &mdash; Although not a widget, the cursor is used to select (and interact with) a particular widget. As the cursor is moved from widget to widget, it may cause the widget to change color, or the cursor itself may only appear positioned in or
+				next to the widget. In <xref linkend="fig-install-widget1-x86"/>, the cursor is positioned on the <guibutton>OK</guibutton> button. <xref linkend="fig-install-widget2-x86"/>, shows the cursor on the <guibutton>Edit</guibutton>
+				button.
+			</para>
+		</listitem>
+	</itemizedlist>
+	
 	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Graphical_Installation_common-section-2.xml"/>
-</section>
\ No newline at end of file
+	
+</section>
+
diff --git a/en-US/Graphical_Installation_x86-para-5.xml b/en-US/Graphical_Installation_x86-para-5.xml
index 9d850e5..1f31d94 100644
--- a/en-US/Graphical_Installation_x86-para-5.xml
+++ b/en-US/Graphical_Installation_x86-para-5.xml
@@ -3,10 +3,7 @@
  
 ]> 
 
-  <para>These virtual consoles can be helpful if you encounter a problem
-    while installing Fedora.  Messages displayed on
-    the installation or system consoles can help pinpoint a
-    problem. Refer to <xref linkend="tb-guimode-console-x86"/> for a listing
-      of the virtual consoles, keystrokes used to switch to them, and their
-      contents.
-  </para>
\ No newline at end of file
+<para>
+	These virtual consoles can be helpful if you encounter a problem while installing Fedora.  Messages displayed on the installation or system consoles can help pinpoint a problem. Refer to <xref linkend="tb-guimode-console-x86"/> for a listing of the virtual consoles, keystrokes used to switch to them, and their contents.
+</para>
+
diff --git a/en-US/Graphical_Installation_x86_Starting.xml b/en-US/Graphical_Installation_x86_Starting.xml
index b28ee2d..1950373 100644
--- a/en-US/Graphical_Installation_x86_Starting.xml
+++ b/en-US/Graphical_Installation_x86_Starting.xml
@@ -13,34 +13,34 @@
 		<primary>starting</primary>
 		<secondary>installation</secondary>
 	</indexterm>
+	<xi:include href="Important_UEFI_32.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 	<xi:include href="Important_UEFI.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 	<para>
-		To start, first make sure that you have all necessary resources for the installation. If you have already read through <xref linkend="ch-steps-x86"/>, and followed the instructions, you should be ready to start the installation process. When you have verified that you are ready to begin, boot the installation program using the Fedora DVD or CD-ROM #1 or any boot media that you have created.
+		To start, first make sure that you have all necessary resources for the installation. If you have already read through <xref linkend="ch-steps-x86"/>, and followed the instructions, you should be ready to start the installation process. When you have verified that you are ready to begin, boot the installation program using the Fedora DVD or CD-ROM#1 or any boot media that you have created.
 	</para>
-	<!-- FIXME Not in F11
-	<note>
+	 
+	<!-- <note>
 		<title>Note</title>
 		<indexterm significance="normal">
 			<primary>driver diskette</primary>
 		</indexterm>
 		<para>
-			Occasionally, some hardware components require a <firstterm>driver diskette</firstterm> during the installation. A driver diskette adds support for hardware that is not otherwise supported by the installation program. Refer to <xref linkend="ch-driverdisk-x86"/> for more information.
+			Occasionally, some hardware components require a <firstterm>driver update</firstterm> during the installation. A driver update adds support for hardware that is not otherwise supported by the installation program. Refer to <xref linkend="chap-Updating_drivers_during_installation_on_Intel_and_AMD_systems"/> for more information.
 		</para>
-	</note>
-	 -->
+	</note> -->
+	 
 	<section id="s2-x86-starting-booting">
-		<title>Booting the Installation Program on x86, AMD64, and <trademark class="registered">Intel</trademark> 64 Systems</title>
+		<title>Booting the Installation Program on x86, AMD64, and Intel 64 Systems</title>
 		<indexterm significance="normal">
 			<primary>installation program</primary>
-			<secondary>x86, AMD64 and <trademark class="registered">Intel</trademark> 64</secondary>
+			<secondary>x86, AMD64 and Intel 64</secondary>
 			<tertiary>booting</tertiary>
 		</indexterm>
 		<indexterm significance="normal">
 			<primary>booting</primary>
 			<secondary>installation program</secondary>
-			<tertiary>x86, AMD64 and <trademark class="registered">Intel</trademark> 64</tertiary>
+			<tertiary>x86, AMD64 and Intel 64</tertiary>
 		</indexterm>
-		
 		<para>
 			You can boot the installation program using any one of the following media (depending upon what your system can support):
 		</para>
@@ -48,7 +48,19 @@
 		<itemizedlist>
 			<listitem>
 				<para>
-					<emphasis>Fedora DVD/CD-ROM</emphasis> &mdash; Your machine supports a bootable DVD/CD-ROM drive and you have the Fedora CD-ROM set or DVD.
+					<emphasis>Fedora DVD</emphasis> &mdash; Your machine supports a bootable DVD drive and you have the Fedora installation DVD.
+				</para>
+			</listitem>
+			
+			<listitem>
+				<para>
+					<emphasis>Set of Fedora CDs</emphasis> &mdash; Your machine supports a bootable CD drive and you have a set of Fedora installation CDs.
+				</para>
+			</listitem>
+			
+			<listitem>
+				<para>
+					<emphasis>Fedora live CD</emphasis> &mdash; Your machine supports a bootable CD drive and you have a Fedora live CD.
 				</para>
 			</listitem>
 
@@ -60,7 +72,7 @@
 
 			<listitem>
 				<para>
-					<emphasis>USB pen drive</emphasis> &mdash; Your machine supports booting from a USB device.
+					<emphasis>USB flash drive</emphasis> &mdash; Your machine supports booting from a USB device.
 				</para>
 			</listitem>
 			
@@ -72,7 +84,7 @@
 		</itemizedlist>
 		 
 		<para>
-			To create a boot CD-ROM or to prepare your USB pen drive for installation, refer to <xref linkend="sect-New_Users-Alternative_Boot_Methods"/>.
+			To create a boot CD-ROM or to prepare your USB flash drive for booting or installation, refer to <xref linkend="Making_Minimal_Boot_Media"/>.
 		</para>
 		 
 		<para>
@@ -84,7 +96,7 @@
 		<xi:include href="Boot_Order-para-4.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 		<xi:include href="Boot_Order-para-5.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 		<para>
-			After a short delay, a screen containing boot options appears.<!-- the RHEL <prompt>boot:</prompt> prompt should appear. The screen contains information on a variety of boot options. Each boot option also has one or more help screens associated with it. To access a help screen, press the appropriate function key as listed in the line at the bottom of the screen.-->
+			After a short delay, a screen containing the <prompt>boot:</prompt> prompt should appear. The screen contains information on a variety of boot options. Each boot option also has one or more help screens associated with it. To access a help screen, press the appropriate function key as listed in the line at the bottom of the screen.
 		</para>
 		 
 		<para>
@@ -109,9 +121,6 @@
 			Normally, you only need to press <keycap>Enter</keycap> to boot. Be sure to watch the boot messages to review if the Linux kernel detects your hardware. If your hardware is properly detected, continue to the next section. If it does not properly detect your hardware, you may need to restart the installation and use one of the boot options provided in <xref linkend="ap-admin-options"/>.
 		</para>
 	</section>
-	 
-<!--	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="IA64_Starting.xml"/> -->
-	<!-- Booting the Installation Program on Itanium Systems -->
 
 	<section id="s2-x86-starting-bootopts">
 		<title>Additional Boot Options</title>
@@ -119,20 +128,11 @@
 			<primary>boot options</primary>
 		</indexterm>
 		<para>
-			While it is easiest to boot using a CD-ROM or DVD and perform a graphical installation, sometimes there are installation scenarios where booting in a different manner may be needed. This section discusses additional boot options available for Fedora.
+			While it is easiest to boot using a DVD and perform a graphical installation, sometimes there are installation scenarios where booting in a different manner may be needed. This section discusses additional boot options available for Fedora.
 		</para>
-		 
-<!--	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="IA64_Additional_Boot_Options-para-1.xml"/> -->
-	<!-- For Itanium users: -->
-<!--	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="IA64_Additional_Boot_Options-para-2.xml"/> -->
-	<!-- To pass options to the boot loader on an Itanium... -->
-<!--	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="IA64_Additional_Boot_Options-screen-1.xml"/> -->
-	<!-- elilo linux option -->
-<!--	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="IA64_Additional_Boot_Options-para-3.xml"/> -->
-	<!-- For x86, AMD64, and Intel 64 users: -->
-		 
+		 	 
 		<para>
-			To pass options to the boot loader on an x86, AMD64, or <trademark class="registered">Intel</trademark> 64 system, use the instructions as provided in the boot loader option samples below.
+			To pass options to the boot loader on an x86, AMD64, or Intel 64 system, use the instructions as provided in the boot loader option samples below.
 		</para>
 	 
 		<note>
@@ -160,42 +160,65 @@
 <userinput>linux text</userinput>
 </screen>
 			</listitem>
+			
 			<listitem>
 				<para>
 			<indexterm significance="normal">
 				<primary>installation</primary>
-				<secondary>mediacheck</secondary>
+				<secondary>from network</secondary>
 			</indexterm>
 			<indexterm significance="normal">
 				<primary>boot options</primary>
-				<secondary>mediacheck</secondary>
+				<secondary>from network</secondary>
 			</indexterm>
-			<indexterm significance="normal">
-				<primary>troubleshooting</primary>
-				<secondary>CD-ROM failure</secondary>
-				<tertiary>CD-ROM verification</tertiary>
-			</indexterm>
-					ISO images have an md5sum embedded in them. To test the checksum integrity of an ISO image, at the installation boot prompt, type:
+
+					To specify an installation source, use the <command>linux repo=</command> option. For example:
 				</para>
 <screen>
-<userinput>linux mediacheck</userinput>
+<userinput>linux repo=cdrom:<replaceable>device</replaceable></userinput>
+</screen>
+<screen>
+<userinput>linux repo=ftp://<replaceable>username</replaceable>:<replaceable>password@</replaceable><replaceable>URL</replaceable></userinput>
+</screen>
+<screen>
+<userinput>linux repo=http://<replaceable>URL</replaceable></userinput>
+</screen>
+<screen>
+<userinput>linux repo=hd:<replaceable>device</replaceable></userinput>
+</screen>
+<screen>
+<userinput>linux repo=nfs<replaceable>:options</replaceable>:<replaceable>server</replaceable>:/<replaceable>path</replaceable></userinput>
+</screen>
+<screen>
+<userinput>linux repo=nfsiso<replaceable>:options</replaceable>:<replaceable>server</replaceable>:/<replaceable>path</replaceable></userinput>
 </screen>
 				<para>
-					The installation program prompts you to insert a CD or select an ISO image to test, and select <guibutton>OK</guibutton> to perform the checksum operation. This checksum operation can be performed on any Fedora CD and does not have to be performed in a specific order (for example, CD #1 does not have to be the first CD you verify). It is strongly recommended to perform this operation on any Fedora CD that was created from downloaded ISO images. This command works with the CD, DVD, hard drive ISO, and NFS ISO installation methods.
+					In these examples, <literal>cdrom</literal> refers to a CD or DVD drive, <literal>ftp</literal> refers to a location accessible by FTP, <literal>http</literal> refers to a location accessible by HTTP, <literal>hd</literal> refers to an ISO image file accessible on a hard drive partition, <literal>nfs</literal> refers to an expanded tree of installation files accessible by NFS, and <literal>nfsiso</literal> refers to an ISO image file accessible by NFS.  
 				</para>
 			</listitem>
+			
 			<listitem>
 				<para>
 			<indexterm significance="normal">
-				<primary><filename>boot.iso</filename>
-				</primary>
+				<primary>installation</primary>
+				<secondary>mediacheck</secondary>
 			</indexterm>
 			<indexterm significance="normal">
 				<primary>boot options</primary>
-				<secondary><filename>boot.iso</filename>
-				</secondary>
+				<secondary>mediacheck</secondary>
+			</indexterm>
+			<indexterm significance="normal">
+				<primary>troubleshooting</primary>
+				<secondary>DVD failure</secondary>
+				<tertiary>DVD verification</tertiary>
 			</indexterm>
-					The <filename>boot.iso</filename> image file is available for download from the same servers that host images of the Fedora installation disks &mdash; refer to <xref linkend="sect-Obtaining_Fedora-Downloading_Fedora"/>. This file is an image of a disc that you can burn to a CD and use to boot the installation program. To use this boot CD, your computer must be able to boot from its CD-ROM drive, and its BIOS settings must be configured to do so. 
+					ISO images have an SHA256 checksum embedded in them. To test the checksum integrity of an ISO image, at the installation boot prompt, type:
+				</para>
+<screen>
+<userinput>linux mediacheck</userinput>
+</screen>
+				<para>
+					The installation program prompts you to insert a disc or select an ISO image to test, and click <guibutton>OK</guibutton> to perform the checksum operation. This checksum operation can be performed on any Fedora disc and does not have to be performed in a specific order (for example, CD #1 does not have to be the first CD you verify). It is strongly recommended to perform this operation on any Fedora CD or DVD that was created from downloaded ISO images. This command works with the CD, DVD, hard drive ISO, and NFS ISO installation methods.
 				</para>
 			</listitem>
 			<listitem>
@@ -246,7 +269,7 @@
 			<title>Kernel Options</title>
 			 
 			<para>
-				Options can also be passed to the kernel. For example, to apply updates for the anaconda installation program from a floppy disk enter:
+				Options can also be passed to the kernel. For example, to apply updates for the anaconda installation program from a USB storage device enter:
 			</para>
 			<indexterm significance="normal">
 				<primary>kernel options</primary>
@@ -261,7 +284,7 @@
 <userinput>linux text updates</userinput>
 </screen>
 			<para>
-				This command will prompt you to insert a floppy diskette containing updates for anaconda. It is not needed if you are performing a network installation and have already placed the updates image contents in <command>rhupdates/</command> on the server. 
+				This command results in a prompt for the path to the device that contains updates for <application>anaconda</application>. It is not needed if you are performing a network installation and have already placed the updates image contents in <command>rhupdates/</command> on the server. 
 			</para>
 			 
 			<para>
@@ -278,3 +301,4 @@
 		</section>
 	</section>
 </section>
+
diff --git a/en-US/Graphical_Installation_x86_ppc-para-1.xml b/en-US/Graphical_Installation_x86_ppc-para-1.xml
index aed1753..90406ad 100644
--- a/en-US/Graphical_Installation_x86_ppc-para-1.xml
+++ b/en-US/Graphical_Installation_x86_ppc-para-1.xml
@@ -6,5 +6,6 @@
 ]>
 	  
 <para>
-	This chapter explains how to perform a Fedora installation from the DVD/CD-ROM, using the graphical, mouse-based installation program. The following topics are discussed:
-</para>
\ No newline at end of file
+	This chapter describes an installation using the graphical user interface of <application>anaconda</application>.
+</para>
+
diff --git a/en-US/Graphical_Installation_x86_ppc-para-3.xml b/en-US/Graphical_Installation_x86_ppc-para-3.xml
index 8032142..bf356c9 100644
--- a/en-US/Graphical_Installation_x86_ppc-para-3.xml
+++ b/en-US/Graphical_Installation_x86_ppc-para-3.xml
@@ -2,8 +2,10 @@
 <!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [	  
 ]>
 	  
-<para>The Fedora installation program offers more than the dialog boxes of the installation process. Several kinds of diagnostic messages are available to you, as well as a way to enter commands from a shell prompt. The installation program displays these messages on five <firstterm>virtual consoles</firstterm>, among which you can switch using a single keystroke combination.
-  </para>
+<para>
+	The Fedora installation program offers more than the dialog boxes of the installation process. Several kinds of diagnostic messages are available to you, as well as a way to enter commands from a shell prompt. The installation program displays these messages on five <firstterm>virtual consoles</firstterm>, among which you can switch using a single keystroke combination.
+</para>
+
 
 
 
diff --git a/en-US/Graphical_Installation_x86_ppc-para-4.xml b/en-US/Graphical_Installation_x86_ppc-para-4.xml
index fccff16..ba00e4b 100644
--- a/en-US/Graphical_Installation_x86_ppc-para-4.xml
+++ b/en-US/Graphical_Installation_x86_ppc-para-4.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0"?>
 <!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
-	  
-	  
-	  
 ]> 
 
- <para>A virtual console is a shell prompt in a non-graphical environment,
-    accessed from the physical machine, not remotely. Multiple virtual
-    consoles can be accessed simultaneously.</para>
\ No newline at end of file
+<para>
+	A virtual console is a shell prompt in a non-graphical environment, accessed from the physical machine, not remotely. Multiple virtual consoles can be accessed simultaneously.
+</para>
+
diff --git a/en-US/Graphical_Installation_x86_ppc-para-6.xml b/en-US/Graphical_Installation_x86_ppc-para-6.xml
index 517cbfe..094c858 100644
--- a/en-US/Graphical_Installation_x86_ppc-para-6.xml
+++ b/en-US/Graphical_Installation_x86_ppc-para-6.xml
@@ -6,4 +6,5 @@
 ]> 
 
   <para>Generally, there is no reason to leave the default console (virtual console #6) for graphical installations unless you are attempting to diagnose installation problems.
-  </para>
\ No newline at end of file
+  </para>
+
diff --git a/en-US/Graphical_Installation_x86_ppc-table-1-title.xml b/en-US/Graphical_Installation_x86_ppc-table-1-title.xml
index 4972558..9e8045b 100644
--- a/en-US/Graphical_Installation_x86_ppc-table-1-title.xml
+++ b/en-US/Graphical_Installation_x86_ppc-table-1-title.xml
@@ -5,4 +5,5 @@
 
 ]>
 
-<title>Console, Keystrokes, and Contents</title>
\ No newline at end of file
+<title>Console, Keystrokes, and Contents</title>
+
diff --git a/en-US/Graphical_and_Text_Interfaces.xml b/en-US/Graphical_and_Text_Interfaces.xml
deleted file mode 100644
index 5f5085e..0000000
--- a/en-US/Graphical_and_Text_Interfaces.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
- "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
-
-<section>
-	<title>Graphical and Text Interfaces</title>
-	<important>
-		<title>Graphical Interface Usage</title>
-		<para>
-			Installing in text mode does not prevent you from using a graphical interface on your system once it is installed.
-		</para>
-	</important>
-	<important>
-		<title>Important â€” Minimum RAM requirements</title>
-		<para>
-			If your system has less than 137&nbsp;MB of RAM, installation will not continue on any architecture.
-		</para>
-		<para>
-			Furthermore, installation from a hard drive or a network location requires an image of stage 2 of the installation program (<filename>installer.img</filename>) to be stored in memory. This additional requirement increases the minimum RAM required to at least 256&nbsp;MB for these installation methods.
-		</para>
-	</important>
-	<para>
-		Fedora &PRODVER; supports graphical and text-based installations. Only systems with more than 397&nbsp;MB of RAM can use the graphical installer. Systems with less RAM automatically scale back to using the text-based installer. Note that you must still have a minimum of 137&nbsp;MB of RAM for installation to proceed even in text mode, and some architectures and installation methods require more RAM than others. If you prefer to use the text-based installer, type <option>linux text</option> at the <prompt>boot:</prompt> prompt.
-	</para> 
-	<para>
-		If one of the following situations occurs, the installation program uses text mode:
-	</para>
-	<itemizedlist>
-		<listitem>
-			<para>
-				The installation system fails to identify the display hardware on your computer
-			</para>
-		</listitem>
-		<listitem>
-			<para>
-				Your computer has less the minimum amount of RAM required for graphical installation on your architecture with your chosen installation method (397&nbsp;MB at the very least).
-			</para>
-		</listitem>
-		<listitem>
-			<para>
-				You choose the text mode installation from the boot menu
-			</para>
-		</listitem>
-	</itemizedlist>
-	<para>
-		The text screens provide most of the same functions as the standard screens, although disk partitioning is simplified, and bootloader configuration and package selection are handled automatically in text mode. 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>
-</section>
-
diff --git a/en-US/Grub.xml b/en-US/Grub.xml
index 4fd33d8..80e51a9 100644
--- a/en-US/Grub.xml
+++ b/en-US/Grub.xml
@@ -12,13 +12,9 @@
 	<para>
 		When a computer running Linux is turned on, the operating system is loaded into memory by a special program called a <firstterm>boot loader</firstterm>. A boot loader usually exists on the system's primary hard drive (or other media device) and has the sole responsibility of loading the Linux kernel with its required files or (in some cases) other operating systems into memory.
 	</para>
-	<!-- (RHEL) <section id="s1-grub-arch">
+	<section id="s1-grub-arch">
 		<title>Boot Loaders and System Architecture</title>
-		<indexterm significance="normal">
-			<primary>ELILO</primary>
-			<seealso>boot loaders</seealso>
-		</indexterm>
-		<indexterm significance="normal">
+		<!-- <indexterm significance="normal">
 			<primary>OS/400</primary>
 			<seealso>boot loaders</seealso>
 		</indexterm>
@@ -29,12 +25,12 @@
 		<indexterm significance="normal">
 			<primary>z/IPL</primary>
 			<seealso>boot loaders</seealso>
-		</indexterm>
+		</indexterm> -->
 		<indexterm significance="normal">
 			<primary>GRUB</primary>
 			<seealso>boot loaders</seealso>
 		</indexterm>
-		<indexterm significance="normal">
+		<!-- <indexterm significance="normal">
 			<primary>boot loaders</primary>
 			<secondary>types of</secondary>
 			<tertiary>ELILO</tertiary>
@@ -53,14 +49,14 @@
 			<primary>boot loaders</primary>
 			<secondary>types of</secondary>
 			<tertiary>z/IPL</tertiary>
-		</indexterm>
+		</indexterm> -->
 		<indexterm significance="normal">
 			<primary>boot loaders</primary>
 			<secondary>types of</secondary>
 			<tertiary>GRUB</tertiary>
 		</indexterm>
-		<para>
-			Each architecture capable of running Fedora uses a different boot loader. The following table lists the boot loaders available for each architecture:
+		<!-- <para>
+			Each architecture capable of running Red Hat Enterprise Linux uses a different boot loader. The following table lists the boot loaders available for each architecture:
 		</para>
 		 
 		<table id="tb-grub-arch-loaders">
@@ -113,7 +109,7 @@
 					 
 					<row>
 						<entry>
-							<trademark class="registered">IBM</trademark> <trademark class="registered">System z</trademark>
+							<trademark class="registered">IBM</trademark> <trademark class="registered">System&nbsp;z</trademark>
 						</entry>
 						 
 						<entry>
@@ -123,7 +119,7 @@
 					 
 					<row>
 						<entry>
-							<trademark class="registered">IBM</trademark> <trademark class="registered">System z</trademark>
+							<trademark class="registered">IBM</trademark> <trademark class="registered">System&nbsp;z</trademark>
 						</entry>
 						 
 						<entry>
@@ -133,16 +129,6 @@
 					 
 					<row>
 						<entry>
-							<trademark class="registered">Intel</trademark> <trademark class="trade">Itanium</trademark>
-						</entry>
-						 
-						<entry>
-							ELILO
-						</entry>
-					</row>
-					 
-					<row>
-						<entry>
 							x86
 						</entry>
 						 
@@ -160,7 +146,7 @@
 		
 		<xi:include href="ext4-and-btrfs.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 		
-	<!-- (RHEL) </section> -->
+	</section>
 	<section id="s1-grub-whatis">
 		<title>GRUB</title>
 		<indexterm significance="normal">
@@ -300,8 +286,7 @@
 		</para>
 		 
 		<para>
-			Before installing GRUB, make sure to use the latest GRUB package available or use the GRUB package from the installation CD-ROMs. <!-- (RHEL) For instructions on installing packages, refer to the chapter titled <citetitle>Package Management with RPM</citetitle> in
-			the <citetitle>Red Hat Enterprise Linux Deployment Guide</citetitle>. -->
+			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>
@@ -325,7 +310,7 @@
 				<application>GRUB</application> cannot construct a software RAID. Therefore, the <filename>/boot</filename> directory must reside on a single, specific disk partition. The <filename>/boot</filename> directory cannot be striped across multiple disks, as in a level 0 RAID. To use a level 0 RAID on your system, place /boot on a separate partition outside the RAID.
 			</para>
 			<para>
-				Similarly, because the <filename>/boot</filename> directory must reside on a single, specific disk partition, <application>GRUB</application> cannot boot the system if the disk holding that partition fails or is removed from the system. This is true even if the disk is mirrored in a level 1 RAID. The following Red Hat Knowledgebase article describes how to make the system bootable from another disk in the mirrored set: <ulink url="http://kbase.redhat.com/faq/docs/DOC-7095">http://kbase.redhat.com/faq/docs/DOC-7095</ulink> 
+				Similarly, because the <filename>/boot</filename> directory must reside on a single, specific disk partition, <application>GRUB</application> cannot boot the system if the disk holding that partition fails or is removed from the system. This is true even if the disk is mirrored in a level 1 RAID. <!-- The following Red Hat Knowledgebase article describes how to make the system bootable from another disk in the mirrored set: <ulink url="http://kbase.redhat.com/faq/docs/DOC-7095">http://kbase.redhat.com/faq/docs/DOC-7095</ulink> -->
 			</para>
 			<para>
 				Note that these issues apply only to RAID that is implemented in software, where the individual disks that make up the array are still visible as individual disks on the system. These issues do not apply to hardware RAID where multiple disks are represented as a single device.
@@ -790,21 +775,6 @@
 			<para>
 				The following is a very basic GRUB menu configuration file designed to boot either Fedora or Microsoft Windows Vista:
 			</para>
-<!-- (RHEL) <screen>default=0 
-timeout=10 
-splashimage=(hd0,0)/grub/splash.xpm.gz 
-hiddenmenu 
-title Fedora Server (2.6.18-2.el5PAE)         
-root (hd0,0)         
-kernel /boot/vmlinuz-2.6.18-2.el5PAE ro root=LABEL=/1 rhgb quiet       
-initrd /boot/initrd-2.6.18-2.el5PAE.img
-
-# section to load Windows 
-title Windows         
-rootnoverify (hd0,0)         
-chainloader +1
-</screen> -->
-
 <screen>default=0 
 timeout=10 
 splashimage=(hd0,0)/grub/splash.xpm.gz 
@@ -820,6 +790,8 @@ rootnoverify (hd0,0)
 chainloader +1
 </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.
@@ -927,7 +899,7 @@ chainloader +1
 					</para>
 
 					<para>
-						For more information about securing GRUB, refer to the chapter titled <citetitle>Workstation Security</citetitle> in the <citetitle>Red Hat Enterprise Linux Deployment Guide</citetitle>.
+						For more information about securing GRUB, refer to the chapter titled <citetitle>Workstation Security</citetitle> in the <citetitle>Fedora Linux Deployment Guide</citetitle>.
 					</para>
 				</listitem>
 				
@@ -1088,7 +1060,7 @@ chainloader +1
 			</itemizedlist>
 		</section>
 		 
-		<section id="s2-grub-related-books">
+		<!-- <section id="s2-grub-related-books">
 			<title>Related Books</title>
 			<indexterm significance="normal">
 				<primary>GRUB</primary>
@@ -1106,6 +1078,7 @@ chainloader +1
 					</para>
 				</listitem>
 			</itemizedlist>
-		</section>
+		</section> -->
 	</section>
 </appendix>
+
diff --git a/en-US/Important-Kickstart_and_Firstboot.xml b/en-US/Important-Kickstart_and_Firstboot.xml
index c50a119..8fc6b5a 100644
--- a/en-US/Important-Kickstart_and_Firstboot.xml
+++ b/en-US/Important-Kickstart_and_Firstboot.xml
@@ -5,6 +5,7 @@
 <important>
 	<title>Important â€” Kickstart installations and Firstboot</title>
 	<para>
-		<application>Firstboot</application> does not run after a system is installed from this Kickstart file. Either specify a user with the <option>user</option> option in the Kickstart file before installing additional systems from it (refer to <xref linkend="s1-kickstart2-options"/> for details) or log into the installed system with a virtual console as root and add users with the <command>adduser</command> command. 
+		<application>Firstboot</application> does not run after a system is installed from a Kickstart file unless a desktop and the X Window System were included in the installation and graphical login was enabled. Either specify a user with the <option>user</option> option in the Kickstart file before installing additional systems from it (refer to <xref linkend="s1-kickstart2-options"/> for details) or log into the installed system with a virtual console as root and add users with the <command>adduser</command> command. 
 	</para>
 </important>
+
diff --git a/en-US/Important_UEFI.xml b/en-US/Important_UEFI.xml
index 2a7a23d..b6f231f 100644
--- a/en-US/Important_UEFI.xml
+++ b/en-US/Important_UEFI.xml
@@ -3,12 +3,12 @@
 ]>
 
 <important>
-	<title>Important â€” Booting Older Systems from CD or DVD Media</title>
+	<title>Important â€” UEFI for AMD64 and Intel 64</title>
 	<para>
-		The CD and DVD media include boot catalog entries for both BIOS and UEFI firmware interfaces. This allows you to boot systems based on either firmware interface from the same CD or DVD. However, some systems with very old BIOS implementations cannot handle media with more than one boot catalog entry. These systems will not boot from the CD or DVD and you must instead boot them from USB or PXE. 
+		Note that the boot configurations of UEFI and BIOS differ significantly from each other. Therefore, the installed system must boot using the same firmware that was used during installation. You cannot install the operating system on a system that uses BIOS and then boot this installation on a system that uses UEFI. 
 	</para>
 	<para>
-		Note that the boot configurations of UEFI and BIOS differ significantly from each other. Therefore, the installed system must boot using the same firmware that was used during installation. You cannot install the operating system on a system that uses BIOS and then boot this installation on a system that uses UEFI. 
+		Fedora&nbsp;&PRODVER; supports version 2.2 of the UEFI specification. Hardware that supports version 2.3 of the UEFI specification or later should boot and operate with Fedora&nbsp;&PRODVER;, but the additional functionality defined by these later specifications will not be available. The UEFI specifications are available from <ulink url="http://www.uefi.org/specs/agreement/"/>
 	</para>
 </important>
 
diff --git a/en-US/Important_UEFI_32.xml b/en-US/Important_UEFI_32.xml
new file mode 100644
index 0000000..df355ef
--- /dev/null
+++ b/en-US/Important_UEFI_32.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<!DOCTYPE important PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+]>
+
+<important>
+	<title>Important â€” UEFI for 32-bit x86 systems</title>
+	<para>
+		Fedora&nbsp;&PRODVER; does not support UEFI for 32-bit x86 systems.
+	</para>
+</important>
+
diff --git a/en-US/Important_URL.xml b/en-US/Important_URL.xml
new file mode 100644
index 0000000..d6817c5
--- /dev/null
+++ b/en-US/Important_URL.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<!DOCTYPE important PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+]>
+
+<important>
+	<title>Important â€” you must specify the protocol</title>
+	<para>
+		When you provide a URL to an installation source, you must explicitly specify <literal>http://</literal> or <literal>ftp://</literal> as the protocol.
+	</para>
+</important>
+
diff --git a/en-US/Initializing_Hard_Disk-x86.xml b/en-US/Initializing_Hard_Disk-x86.xml
index 8c91060..434e775 100644
--- a/en-US/Initializing_Hard_Disk-x86.xml
+++ b/en-US/Initializing_Hard_Disk-x86.xml
@@ -33,6 +33,10 @@
 	<!-- Certain RAID systems or other nonstandard configurations... -->
 	
 	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" 
+	href="Initializing_Hard_Disk_common-para-4.xml"/>
+	<!-- To enable automatic initializing of hard disks wherever necessary ... -->
+	
+	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" 
 	href="Initializing_Hard_Disk_common-note-1.xml"/>
 	<!-- Detach Unneeded Disks -->
 		
diff --git a/en-US/Initializing_Hard_Disk_common-para-4.xml b/en-US/Initializing_Hard_Disk_common-para-4.xml
new file mode 100644
index 0000000..a8db129
--- /dev/null
+++ b/en-US/Initializing_Hard_Disk_common-para-4.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+]>
+
+<para>
+	To enable automatic initializing of hard disks for which it turns out to be necessary, use the kickstart command <command>clearpart --initlabel</command> (refer to <xref linkend="ch-kickstart2"/>)
+</para>
+    
+
diff --git a/en-US/Installation_Guide.xml b/en-US/Installation_Guide.xml
index 915bf76..cfa7f79 100644
--- a/en-US/Installation_Guide.xml
+++ b/en-US/Installation_Guide.xml
@@ -24,12 +24,12 @@
 						hardware considerations, and hardware details that you may need during installation.
 					</para>
 				</listitem>
-				<listitem>
+				<!-- <listitem>
 					<para>
 						preparing to install Fedora over a network.
 					</para>
 				</listitem>
-				<!-- <listitem>
+				<listitem>
 					<para>
 						preparing driver media.
 					</para>
@@ -37,11 +37,7 @@
 			</itemizedlist>
 		</partintro>
 		<xi:include href="new-users.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-		<xi:include href="Making_Fedora_Media.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-		<xi:include href="Steps-x86.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-		<xi:include href="Preparing-x86.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-		<xi:include href="System_Requirements_Table.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-		
+		<xi:include href="Making_Media.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 	</part>
 	<part id="pt-The_installation_process">
 	<title>The installation process</title>
@@ -50,10 +46,16 @@
 				This part of the <citetitle>Fedora Installation Guide</citetitle> details the installation process itself, from various methods of booting the installer up to the point where the computer must restart to finalize the installation. This part of the manual also includes a chapter on troubleshooting problems with the installation process.
 			</para>
 	</partintro>
+		<xi:include href="Steps-x86.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+		<xi:include href="Preparing-x86.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+		<xi:include href="System_Requirements_Table.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 		<xi:include href="Boot-x86.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+		<xi:include href="Installation_Phase_2-x86.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 		<xi:include href="Graphical_Installation-x86.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 		<xi:include href="Trouble-x86.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 	</part>
+	
+	
 	<part id="pt-Advanced_installation_options">
 	<title>Advanced installation options</title>
 	<partintro>
@@ -88,7 +90,6 @@
 				</listitem>
 			</itemizedlist>
 	</partintro>
-		<!-- <xi:include href="DU-Updating_drivers_during_installation_x86.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> -->
 		<xi:include href="adminoptions.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 		<xi:include href="medialess.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> 
 		<xi:include href="pxe-server.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
@@ -140,6 +141,7 @@
 		<xi:include href="Understanding_LVM.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 		<xi:include href="Grub.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 		<xi:include href="Boot_Init_Shutdown.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+		<xi:include href="pre_and_post_commands.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 		<xi:include href="techref.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 	</part>
 	<xi:include href="Contributors_and_production_methods.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
@@ -147,3 +149,4 @@
 	<index />
 </book>
 
+
diff --git a/en-US/Installation_Method-x86.xml b/en-US/Installation_Method-x86.xml
index 916ba9e..0ac2b50 100644
--- a/en-US/Installation_Method-x86.xml
+++ b/en-US/Installation_Method-x86.xml
@@ -11,10 +11,11 @@
 	href="Installation_Method_common-indexterm.xml"/>
 
 	<para>
-		Use the arrow keys on your keyboard to select an installation method (refer to <xref linkend="fig-installationmethod-x86"/>). With your selected method highlighted, press the <keycap>Tab</keycap> key to move to the <guibutton>OK</guibutton> button and press the <keycap>Enter</keycap> key to confirm your choice.
+		If you booted the installation from minimal boot media or with the <command>askmethod</command> boot option, use the arrow keys on your keyboard to select an installation method (refer to <xref linkend="fig-installationmethod-x86"/>). With your selected method highlighted, press the <keycap>Tab</keycap> key to move to the <guibutton>OK</guibutton> button and press the <keycap>Enter</keycap> key to confirm your choice.
 	</para>
 
-	<figure float="0" id="fig-installationmethod-x86"><title>Language Selection</title>
+	<figure float="0" id="fig-installationmethod-x86">
+	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" 	href="Installation_Method_common-title.xml"/>
 		<mediaobject>
 			<imageobject><imagedata fileref="images/installationmethod/method.png" format="PNG"/></imageobject>
 			<textobject><para>
@@ -25,7 +26,7 @@
 	</figure>
 	
 	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Beginning_Installation-x86.xml"/>
-	<!-- Installing from CD-ROM or DVD-->
+	<!-- Installing from DVD-->
 	     
 	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Beginning_Installation_Hard_Disk-x86.xml"/>
 	<!-- Installing from a Hard Drive -->
diff --git a/en-US/Installation_Phase_2-common-para-1.xml b/en-US/Installation_Phase_2-common-para-1.xml
new file mode 100644
index 0000000..612ff2f
--- /dev/null
+++ b/en-US/Installation_Phase_2-common-para-1.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+]>
+
+<para>
+	Before the graphical installation program starts, you need to configure the language and installation source.
+</para>
\ No newline at end of file
diff --git a/en-US/Installation_Phase_2-common-title-1.xml b/en-US/Installation_Phase_2-common-title-1.xml
new file mode 100644
index 0000000..e989e28
--- /dev/null
+++ b/en-US/Installation_Phase_2-common-title-1.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<!DOCTYPE title PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+]>
+
+<title>Configuring Language and Installation Source</title>
+
diff --git a/en-US/Installation_Phase_2-x86.xml b/en-US/Installation_Phase_2-x86.xml
new file mode 100644
index 0000000..7954273
--- /dev/null
+++ b/en-US/Installation_Phase_2-x86.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0"?>
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+]>
+
+<chapter id="ch-Installation_Phase_2-x86">
+	<xi:include href="Installation_Phase_2-common-title-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+	<!-- Configuring Language and Installation Source -->
+	
+	<xi:include href="Installation_Phase_2-common-para-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+	<!-- Before the graphical installation program starts, you must choose a language -->
+	
+	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"  href="Graphical_Installation_x86-common-section-1.xml"/>
+	<!-- The Text Mode Installation Program User Interface
+	     links to Graphical_Installation_common-section-2.xml:
+	     Using the Keyboard to Navigate -->
+	     
+	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Language_Selection-x86.xml"/>
+	<!-- Language Selection -->
+	
+	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Installation_Method-x86.xml"/>
+	<!-- Installation Method -->
+	
+	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Verifying_Media.xml"/>
+	<!-- Verifying Media -->
+
+</chapter>
+
diff --git a/en-US/Installing_Packages-x86.xml b/en-US/Installing_Packages-x86.xml
index be006a1..6c9cf50 100644
--- a/en-US/Installing_Packages-x86.xml
+++ b/en-US/Installing_Packages-x86.xml
@@ -12,16 +12,21 @@
 	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Installing_Packages_common-para-1.xml"/>
 	<!-- At this point there is nothing left for you to do until -->
 	
+	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Installing_Packages_common-para-4.xml"/>
+	<!-- Depending on the available resources, you might see the following progress bar -->
+	
+	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Installing_Packages_common-figure-1.xml"/>
+	
 	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Installing_Packages_common-para-2.xml"/>
 	<!-- Fedora reports the installation progress on the screen -->
 	
+	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Installing_Packages_common-figure-2.xml"/>
+	
 	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Installing_Packages_common-para-2a.xml"/>
 	<!-- For your reference, a complete log of your installation can be found -->
 	
 	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Installing_Packages_common-para-3.xml"/>
 	<!-- After installation completes, select Reboot -->
-	
-	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Installing_Packages_common-note-1.xml"/>
-	<!-- Installing from a Live Image -->
-	
+
 </section>
+
diff --git a/en-US/Installing_Packages_common-figure-1.xml b/en-US/Installing_Packages_common-figure-1.xml
new file mode 100644
index 0000000..e561cf2
--- /dev/null
+++ b/en-US/Installing_Packages_common-figure-1.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+]>
+
+<figure float="0"><title>Starting installation</title>
+	<mediaobject>
+		<imageobject><imagedata fileref="images/pkgselection/starting-installation.png" format="PNG"/></imageobject>
+		<textobject><para>
+				The starting installation progress bar
+			</para>
+		</textobject>
+	</mediaobject>
+</figure>
+
diff --git a/en-US/Installing_Packages_common-figure-2.xml b/en-US/Installing_Packages_common-figure-2.xml
new file mode 100644
index 0000000..492550a
--- /dev/null
+++ b/en-US/Installing_Packages_common-figure-2.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+]>
+
+<figure float="0"><title>Packages completed</title>
+	<mediaobject>
+		<imageobject><imagedata fileref="images/pkgselection/installing-packages.png" format="PNG"/></imageobject>
+		<textobject><para>
+				The Packages Completed progress bar
+			</para>
+		</textobject>
+	</mediaobject>
+</figure>
+
diff --git a/en-US/Installing_Packages_common-note-1.xml b/en-US/Installing_Packages_common-note-1.xml
deleted file mode 100644
index aa766c3..0000000
--- a/en-US/Installing_Packages_common-note-1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
- "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-]>
-
-  <note>
-    <title>Installing from a Live Image</title>
-    <para>If you install from a Fedora Live image, no reboot prompt
-      appears.  You may continue to use the Live image as desired, and
-      reboot the system at any time to enjoy the newly installed
-      Fedora system.</para>
-  </note>
-  
\ No newline at end of file
diff --git a/en-US/Installing_Packages_common-para-1.xml b/en-US/Installing_Packages_common-para-1.xml
index 41122bb..92ac3f4 100644
--- a/en-US/Installing_Packages_common-para-1.xml
+++ b/en-US/Installing_Packages_common-para-1.xml
@@ -4,4 +4,5 @@
 
 <para>
 	At this point there is nothing left for you to do until all the packages have been installed. How quickly this happens depends on the number of packages you have selected and your computer's speed.
-</para>
\ No newline at end of file
+</para>
+
diff --git a/en-US/Installing_Packages_common-para-2.xml b/en-US/Installing_Packages_common-para-2.xml
index 9912d36..4665bc2 100644
--- a/en-US/Installing_Packages_common-para-2.xml
+++ b/en-US/Installing_Packages_common-para-2.xml
@@ -1,12 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
 ]>
 
-  <para>
-    Fedora reports the installation progress on the screen as it writes
-    the selected packages to your system.  Network and DVD installations
-    require no further action. If you are using CDs to install, Fedora
-    prompts you to change discs periodically. After you insert a disc,
-    select <guibutton>OK</guibutton> to resume the installation.
-  </para>
+<para>
+	Fedora reports the installation progress on the screen as it writes the selected packages to your system.
+</para>
+
diff --git a/en-US/Installing_Packages_common-para-2a.xml b/en-US/Installing_Packages_common-para-2a.xml
index e9487eb..911c0db 100644
--- a/en-US/Installing_Packages_common-para-2a.xml
+++ b/en-US/Installing_Packages_common-para-2a.xml
@@ -15,3 +15,4 @@
 	</indexterm>
 	For your reference, a complete log of your installation can be found in <filename>/root/install.log</filename> once you reboot your system.
 </para>
+
diff --git a/en-US/Installing_Packages_common-para-3.xml b/en-US/Installing_Packages_common-para-3.xml
index 4914f5c..3794014 100644
--- a/en-US/Installing_Packages_common-para-3.xml
+++ b/en-US/Installing_Packages_common-para-3.xml
@@ -8,3 +8,4 @@
     to restart your computer.  Fedora ejects any loaded discs before the
     computer reboots.
   </para>
+
diff --git a/en-US/Installing_Packages_common-para-4.xml b/en-US/Installing_Packages_common-para-4.xml
new file mode 100644
index 0000000..26d548c
--- /dev/null
+++ b/en-US/Installing_Packages_common-para-4.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+ "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+]>
+
+<para>
+	Depending on the available resources, you might see the following progress bar while the installer resolves dependencies of the packages you selected for installation:
+</para>
+	
+	
\ No newline at end of file
diff --git a/en-US/Installing_Packages_common-title.xml b/en-US/Installing_Packages_common-title.xml
index eae07d6..f6e45db 100644
--- a/en-US/Installing_Packages_common-title.xml
+++ b/en-US/Installing_Packages_common-title.xml
@@ -5,4 +5,5 @@
 
 ]>
 
-<title>Installing Packages</title>
\ No newline at end of file
+<title>Installing Packages</title>
+
diff --git a/en-US/Key_Board_Configuration-x86.xml b/en-US/Key_Board_Configuration-x86.xml
index cf874d3..6b5b382 100644
--- a/en-US/Key_Board_Configuration-x86.xml
+++ b/en-US/Key_Board_Configuration-x86.xml
@@ -38,4 +38,5 @@
 	<!-- Actually, despite the name, this is a tip. 
 	     
 	     To change your keyboard layout type after you have completed... -->
-</section>
\ No newline at end of file
+</section>
+
diff --git a/en-US/Key_Board_Configuration_x86_ppc-indexterm-1.xml b/en-US/Key_Board_Configuration_x86_ppc-indexterm-1.xml
index b221728..d6cb73c 100644
--- a/en-US/Key_Board_Configuration_x86_ppc-indexterm-1.xml
+++ b/en-US/Key_Board_Configuration_x86_ppc-indexterm-1.xml
@@ -8,4 +8,5 @@
 <indexterm significance="normal">
 	<primary>keymap</primary>
 	<secondary>selecting type of keyboard</secondary>
-</indexterm>
\ No newline at end of file
+</indexterm>
+
diff --git a/en-US/Key_Board_Configuration_x86_ppc-indexterm-2.xml b/en-US/Key_Board_Configuration_x86_ppc-indexterm-2.xml
index 210b1e7..f010f53 100644
--- a/en-US/Key_Board_Configuration_x86_ppc-indexterm-2.xml
+++ b/en-US/Key_Board_Configuration_x86_ppc-indexterm-2.xml
@@ -8,4 +8,5 @@
 <indexterm significance="normal">
 	<primary>keyboard</primary>
 	<secondary>configuration</secondary>
-</indexterm>
\ No newline at end of file
+</indexterm>
+
diff --git a/en-US/Key_Board_Configuration_x86_ppc-para-1.xml b/en-US/Key_Board_Configuration_x86_ppc-para-1.xml
index a2efc84..f7bc0f2 100644
--- a/en-US/Key_Board_Configuration_x86_ppc-para-1.xml
+++ b/en-US/Key_Board_Configuration_x86_ppc-para-1.xml
@@ -7,4 +7,5 @@
 
 <para>
 	Once you have made your selection, click <guibutton>Next</guibutton> to continue.
-</para>
\ No newline at end of file
+</para>
+
diff --git a/en-US/Key_Board_Configuration_x86_ppc-para-2.xml b/en-US/Key_Board_Configuration_x86_ppc-para-2.xml
index 09bfaaf..8f074af 100644
--- a/en-US/Key_Board_Configuration_x86_ppc-para-2.xml
+++ b/en-US/Key_Board_Configuration_x86_ppc-para-2.xml
@@ -12,4 +12,5 @@
 	<para>
 		Type the <command>system-config-keyboard</command> command in a shell prompt to launch the <application>Keyboard Configuration Tool</application>. If you are not root, it prompts you for the root password to continue.
 	</para>
-	</note>
\ No newline at end of file
+	</note>
+
diff --git a/en-US/Key_Board_Configuration_x86_ppc-title-1.xml b/en-US/Key_Board_Configuration_x86_ppc-title-1.xml
index cee248d..cfa61e4 100644
--- a/en-US/Key_Board_Configuration_x86_ppc-title-1.xml
+++ b/en-US/Key_Board_Configuration_x86_ppc-title-1.xml
@@ -5,4 +5,5 @@
 
 ]>
 
-<title>Keyboard Configuration</title>
\ No newline at end of file
+<title>Keyboard Configuration</title>
+
diff --git a/en-US/Kickstart-note-1.xml b/en-US/Kickstart-note-1.xml
index 56a1717..b8ea77a 100644
--- a/en-US/Kickstart-note-1.xml
+++ b/en-US/Kickstart-note-1.xml
@@ -7,3 +7,4 @@
 		If you select text mode for a kickstart installation, make sure that you specify choices for the partitioning, bootloader, and package selection options. These steps are automated in text mode, and <application>anaconda</application> cannot prompt you for missing information. If you do not provide choices for these options,  <application>anaconda</application> will stop the installation process.
 	</para>
 </important>
+
diff --git a/en-US/Kickstart2.xml b/en-US/Kickstart2.xml
index 6a68c1d..4512ac9 100644
--- a/en-US/Kickstart2.xml
+++ b/en-US/Kickstart2.xml
@@ -35,12 +35,18 @@
 		<para>
 			All kickstart scriptlets and the log files of their execution are stored in the <filename>/tmp</filename> directory to assist with debugging installation failures.
 		</para>
+		<!-- <note>
+			<title>Note â€” /tmp/netinfo no longer used</title>
+			<para>
+				<application>Anaconda</application> now configures network interfaces with <application>NetworkManager</application>. Consequently, kickstart users that referenced the network settings located in <filename>/tmp/netinfo</filename> in previous versions of Red hat Enterprise Linux must now source the <filename>ifcfg</filename> files in <filename>/etc/sysconfig/network-scripts</filename>.
+			</para>
+		</note> -->
 	</section>
 	<section id="s1-kickstart2-howuse">
 		<title>How Do You Perform a Kickstart Installation?</title>
 		 
 		<para>
-			Kickstart installations can be performed using a local CD-ROM, a local hard drive, or via NFS, FTP, or HTTP.
+			Kickstart installations can be performed using a local DVD, a local hard drive, or via NFS, FTP, or HTTP.
 		</para>
 		 
 		<para>
@@ -283,6 +289,14 @@ Boot loader configuration
 					<para>
 						where <replaceable>driveN</replaceable> is one of <literal>sda</literal>, <literal>sdb</literal>,..., <literal>hda</literal>,... etc.
 					</para>
+					<itemizedlist>
+						<listitem>
+							<para>
+								<command>--only-use</command> &mdash; specifies a list of disks for the installer to use. All other disks are ignored. For example, to use disk <systemitem>sda</systemitem> during installation and ignore all other disks: 
+							</para>
+<screen>ignoredisk --only-use=sda</screen>
+						</listitem>
+					</itemizedlist>
 				</listitem>
 			</varlistentry>
 
@@ -614,7 +628,7 @@ If the <command>clearpart</command> command is used, then the <command>--onpart<
 					<secondary><command>cmdline</command>
 					</secondary>
 				</indexterm>
-						Perform the installation in a completely non-interactive command line mode. Any prompts for interaction halts the install. This mode is useful on IBM System z systems with the x3270 console.
+						Perform the installation in a completely non-interactive command line mode. Any prompt for interaction halts the install. <!-- This mode is useful on IBM System&nbsp;z systems with the 3270 terminal under z/VM and operating system messages applet on LPAR. The recommended use is in conjunction with <command>RUNKS=1</command> and <command>ks=</command>. Refer to <xref linkend="ch-parmfiles-Kickstart_parameters"/>. -->
 					</para>
 				</listitem>
 			</varlistentry>
@@ -631,18 +645,12 @@ If the <command>clearpart</command> command is used, then the <command>--onpart<
 						On most PCI systems, the installation program autoprobes for Ethernet and SCSI cards properly. On older systems and some PCI systems, however, kickstart needs a hint to find the proper devices. The <command>device</command> command,
 						which tells the installation program to install extra modules, is in this format:
 					</para>
-<screen>device <replaceable>&lt;type&gt;</replaceable> <replaceable>&lt;moduleName&gt;</replaceable> --opts=<replaceable>&lt;options&gt;</replaceable>
+<screen>device <replaceable>&lt;moduleName&gt;</replaceable> --opts=<replaceable>&lt;options&gt;</replaceable>
 </screen>
 					<itemizedlist>
 
 <listitem>
 	<para>
-		<replaceable>&lt;type&gt;</replaceable> &mdash; Replace with either <command>scsi</command> or <command>eth</command>.
-	</para>
-</listitem>
-
-<listitem>
-	<para>
 		<replaceable>&lt;moduleName&gt;</replaceable> &mdash; Replace with the name of the kernel module which should be installed.
 	</para>
 </listitem>
@@ -795,11 +803,11 @@ driverdisk --source=nfs:host:/path/to/img</screen>
 					</secondary>
 				</indexterm>
 				<indexterm significance="normal">
-					<primary><application>Setup Agent</application>
+					<primary><application>Firstboot</application>
 					</primary>
 					<secondary>via Kickstart</secondary>
 				</indexterm>
-						Determine whether the <application>Setup Agent</application> starts the first time the system is booted. If enabled, the <command>firstboot</command> package must be installed. If not specified, this option is disabled
+						Determine whether the <application>Firstboot</application> starts the first time the system is booted. If enabled, the <package>firstboot</package> package must be installed. If not specified, this option is disabled
 						by default.
 					</para>
 
@@ -830,6 +838,20 @@ driverdisk --source=nfs:host:/path/to/img</screen>
 			</varlistentry>
 
 			<varlistentry>
+				<term><command>graphical</command> (optional) 	  </term>
+				<listitem>
+					<para>
+				<indexterm significance="normal">
+					<primary>kickstart file</primary>
+					<secondary><command>graphical</command>
+					</secondary>
+				</indexterm>
+						Perform the kickstart installation in graphical mode. This is the default.
+					</para>
+				</listitem>
+			</varlistentry>
+			
+			<varlistentry>
 				<term><command>halt</command> (optional) 	  </term>
 				<listitem>
 					<para>
@@ -839,7 +861,7 @@ driverdisk --source=nfs:host:/path/to/img</screen>
 					</secondary>
 				</indexterm>
 						Halt the system after the installation has successfully completed. This is similar to a manual installation, where anaconda displays a message and waits for the user to press a key before rebooting. During a kickstart installation, if no completion
-						method is specified, the <command>reboot</command> option is used as default.
+						method is specified, this option is used as the default.
 					</para>
 
 					<para>
@@ -853,20 +875,6 @@ driverdisk --source=nfs:host:/path/to/img</screen>
 			</varlistentry>
 
 			<varlistentry>
-				<term><command>graphical</command> (optional) 	  </term>
-				<listitem>
-					<para>
-				<indexterm significance="normal">
-					<primary>kickstart file</primary>
-					<secondary><command>graphical</command>
-					</secondary>
-				</indexterm>
-						Perform the kickstart installation in graphical mode. This is the default.
-					</para>
-				</listitem>
-			</varlistentry>
-			
-			<varlistentry>
 				<term><command>install</command> (optional) 	  </term>
 				<listitem>
 					<para>
@@ -890,7 +898,7 @@ driverdisk --source=nfs:host:/path/to/img</screen>
 
 <listitem>
 	<para>
-		<command>cdrom</command> &mdash; Install from the first CD-ROM drive on the system.
+		<command>cdrom</command> &mdash; Install from the first optical drive on the system.
 	</para>
 </listitem>
 						
@@ -1039,7 +1047,7 @@ driverdisk --source=nfs:host:/path/to/img</screen>
 			<varlistentry>
 				<term><command>iscsi</command> (optional)</term>
 				<listitem>
-					<para><indexterm significance="normal">
+					<para> <indexterm significance="normal">
 					<primary>kickstart file</primary>
 					<secondary><command>iscsi</command>
 					</secondary>
@@ -1111,12 +1119,12 @@ driverdisk --source=nfs:host:/path/to/img</screen>
 			<varlistentry>
 				<term><command>key</command> (optional)</term>
 				<listitem>
-					<para><indexterm significance="normal">
+					<para> <indexterm significance="normal">
 					<primary>kickstart file</primary>
 					<secondary><command>key</command>
 					</secondary>
 				</indexterm>
-						Specify an installation key, which is needed to aid in package selection and identify your system for support purposes. This command is specific to Red Hat Enterprise Linux; it has no meaning for Fedora and will be ignored.
+						Specify an installation key, which is needed to aid in package selection and identify a Red Hat Enterprise Linux system for support purposes. This command is specific to Red Hat Enterprise Linux and is meaningless in Fedora.
 					</para>
 
 					<itemizedlist>
@@ -1493,7 +1501,7 @@ logvol / --vgname=myvg --size=2000 --name=rootvol
 					
 <listitem>
 	<para>
-		<command>--device=</command> &mdash; Used to select a specific Ethernet device for installation. Note that using <command>--device=</command> is not effective unless the kickstart file is a local file (such as <command>ks=floppy</command>), since the installation program configures the network to find the kickstart file. For example:
+		<command>--device=</command> &mdash; Used to select a specific Ethernet device for installation. Note that using <command>--device=</command> is not effective unless the kickstart file is a local file (such as <command>ks=hd</command>), since the installation program configures the network to find the kickstart file. For example:
 	</para>
 <screen>network --bootproto=dhcp --device=eth0</screen>
 </listitem>
@@ -1560,7 +1568,7 @@ logvol / --vgname=myvg --size=2000 --name=rootvol
 						
 <listitem>
 	<para>
-		<command>--class=</command> &mdash; The DHCP class.
+		<command>--dhcpclass=</command> &mdash; The DHCP class.
 	</para>
 </listitem>
 						
@@ -1781,6 +1789,12 @@ All partitions created are formatted as part of the installation process unless
 
 <listitem>
 	<para>
+		<command>--fsoptions</command> &mdash;  Specifies a free form string of options to be used when mounting the filesystem. This string will be copied into the <filename>/etc/fstab</filename> file of the installed system and should be enclosed in quotes.
+	</para>
+</listitem>
+
+<listitem>
+	<para>
 		<command>--encrypted</command> &mdash; Specifies that this partition should be encrypted.  
 	</para>
 </listitem>
@@ -1813,7 +1827,7 @@ If partitioning fails for any reason, diagnostic messages appear on virtual cons
 			</varlistentry>
 
 			<varlistentry>
-				<term><indexterm significance="normal">
+				<term> <indexterm significance="normal">
 					<primary>kickstart file</primary>
 					<secondary><command>poweroff</command>
 					</secondary>
@@ -1822,7 +1836,7 @@ If partitioning fails for any reason, diagnostic messages appear on virtual cons
 				<listitem>
 					<para>
 						Shut down and power off the system after the installation has successfully completed. Normally during a manual installation, anaconda displays a message and waits for the user to press a key before rebooting. During a kickstart installation, if no
-						completion method is specified, the <command>reboot</command> option is used as default.
+						completion method is specified, the <command>halt</command> option is used as default.
 					</para>
 
 					<para>
@@ -1843,9 +1857,8 @@ interface) must be able to interact with the system kernel. Contact your manufac
 					</para>
 				</listitem>
 			</varlistentry>
-
 			<varlistentry>
-				<term><indexterm significance="normal">
+				<term> <indexterm significance="normal">
 					<primary>kickstart file</primary>
 					<secondary><command>raid</command>
 					</secondary>
@@ -1980,22 +1993,24 @@ raid /usr --level=5 --device=md1 raid.11 raid.12 raid.13
 					<para>
 						The <command>reboot</command> option is roughly equivalent to the <command>shutdown -r</command> command.
 					</para>
+					
+					<para>
+						Specify <command>reboot</command> to automate installation fully when installing in cmdline mode on System&nbsp;z.
+					</para>
 
+					<para>
+						For other completion methods, refer to the <command>halt</command>, <command>poweroff</command>, and <command>shutdown</command> kickstart options.
+					</para>
+					<para>
+						The <command>halt</command> option is the default completion method if no other methods are explicitly specified in the kickstart file.
+					</para>
+					
 					<note>
-						<title>Note</title>
-
 						<para>
-Use of the <command>reboot</command> option <emphasis>may</emphasis> result in an endless installation loop, depending on the installation media and method.
-						</para>
-
-						<para>
-The <command>reboot</command> option is the default completion method if no other methods are explicitly specified in the kickstart file.
+							Use of the <command>reboot</command> option <emphasis>may</emphasis> result in an endless installation loop, depending on the installation media and method.
 						</para>
 					</note>
-
-					<para>
-						For other completion methods, refer to the <command>halt</command>, <command>poweroff</command>, and <command>shutdown</command> kickstart options.
-					</para>
+					
 				</listitem>
 			</varlistentry>
 
@@ -2107,7 +2122,7 @@ If the <command>selinux</command> option is not present in the kickstart file, S
 						
 					</itemizedlist>
 					<para>
-						For complete information regarding SELinux for Fedora, refer to the <citetitle>Fedora &PRODVER; Security-Enhanced Linux User Guide</citetitle>.
+						For more information regarding SELinux for Fedora, refer to the <citetitle>Fedora Security Enhanced Linux User Guide</citetitle>.
 					</para>
 				</listitem>
 			</varlistentry>
@@ -2169,7 +2184,7 @@ If the <command>selinux</command> option is not present in the kickstart file, S
 					<secondary><command>shutdown</command>
 					</secondary>
 				</indexterm>
-						Shut down the system after the installation has successfully completed. During a kickstart installation, if no completion method is specified, the <command>reboot</command> option is used as default.
+						Shut down the system after the installation has successfully completed. During a kickstart installation, if no completion method is specified, the <command>halt</command> option is used as default.
 					</para>
 
 					<para>
@@ -2197,6 +2212,40 @@ If the <command>selinux</command> option is not present in the kickstart file, S
 			</varlistentry>
 
 			<varlistentry>
+				<term><command>sshpw</command> (optional) 	  </term>
+				<listitem>
+					<indexterm significance="normal">
+						<primary>kickstart file</primary>
+						<secondary><command>sshpw</command>
+						</secondary>
+					</indexterm>
+					<para>
+						The installer can start <application>ssh</application> to provide interactivity and inspection, just like it can with <application>telnet</application>. This command  controls the accounts created in the installation environment that may be remotely logged into. Each instance of this command creates a user. These users will not be created on the final system â€” they only exist for use while the installer is running.
+					</para>
+<screen>sshpw --username=<replaceable>&lt;name&gt;</replaceable> <replaceable>&lt;password&gt;</replaceable> [--iscrypted|--plaintext] [--lock]</screen>
+					<itemizedlist>
+						
+<listitem>
+	<para>
+		<command>--username</command> &mdash; Provides the name of the user. This option is required. 
+	</para>
+</listitem>
+<listitem>
+	<para>
+		<command>--iscrypted</command> &mdash; If this is present, the password argument is assumed to already be encrypted. <command>--plaintext</command> has the opposite effect &mdash; the password argument is assumed to not be encrypted. 
+	</para>
+</listitem>
+<listitem>
+	<para>
+		<command>--lock</command> &mdash; If this is present, the new user account is locked by default. That is, the user will not be able to login from the console. 
+	</para>
+</listitem>
+						
+					</itemizedlist>
+				</listitem>
+			</varlistentry>
+
+			<varlistentry>
 				<term><command>text</command> (optional) 	  </term>
 				<listitem>
 					<para>
@@ -2443,13 +2492,6 @@ logvol / --vgname=myvg --size=2000 --name=rootvol</screen>
 						
 <listitem>
 	<para>
-		<command>--resolution=</command> &mdash; Specify the default resolution for the X Window System on the installed system. Valid values are 640x480, 800x600, 1024x768, 1152x864, 1280x1024, 1400x1050, 1600x1200. Be sure to specify a resolution that is compatible with the video card and
-		monitor.
-	</para>
-</listitem>
-						
-<listitem>
-	<para>
 		<command>--depth=</command> &mdash; Specify the default color depth for the X Window System on the installed system. Valid values are 8, 16, 24, and 32. Be sure to specify a color depth that is compatible with the video card and monitor.
 	</para>
 </listitem>
@@ -2469,6 +2511,14 @@ logvol / --vgname=myvg --size=2000 --name=rootvol</screen>
 				</indexterm>
 						If <command>zerombr</command> is specified any invalid partition tables found on disks are initialized. This destroys all of the contents of disks with invalid partition tables.
 					</para>
+					<para>
+						Specific to System&nbsp;z: If <command>zerombr</command> is specified, any DASD visible to the installer which is not already low-level formatted gets automatically low-level formatted with <application>dasdfmt</application>. The command also prevents user choice during interactive installations. If <command>zerombr</command> is not specified and there is at least one unformatted DASD visible to the installer, a non-interactive kickstart installation will exit unsuccessfully. If <command>zerombr</command> is not specified and there is at least one unformatted DASD visible to the installer, an interactive installation exits if the user does not agree to format all visible and unformatted DASDs. To circumvent this, only activate those DASDs that you will use during installation. You can always add more DASDs after installation is complete.
+					</para>
+
+					
+					
+					
+					
 <!-- BZ#241666	 -->
 					
 		<para>Note that this command was previously specified as <command>zerombr yes</command>. This form is now deprecated; you should now simply specify <command>zerombr</command> in your kickstart file instead.</para>			
@@ -2484,10 +2534,10 @@ logvol / --vgname=myvg --size=2000 --name=rootvol</screen>
 					<secondary><command>zfcp</command>
 					</secondary>
 				</indexterm>
-					Define a Fiber channel device (IBM System z).
+					Define a Fiber channel device (IBM System&nbsp;z).
 					</para>
 					
-<para><command>zfcp [--devnum=<replaceable>&lt;devnum&gt;</replaceable>] [--fcplun=<replaceable>&lt;fcplun&gt;</replaceable>] [--scsiid=<replaceable>&lt;scsiid&gt;</replaceable>] [--scsilun=<replaceable>&lt;scsilun&gt;</replaceable>] [--wwpn=<replaceable>&lt;wwpn&gt;</replaceable>]</command></para>
+<para><command>zfcp [--devnum=<replaceable>&lt;devnum&gt;</replaceable>] [--wwpn=<replaceable>&lt;wwpn&gt;</replaceable>] [--fcplun=<replaceable>&lt;fcplun&gt;</replaceable>] </command></para>
 
 					<!-- <variablelist>
 						<varlistentry>
@@ -2595,12 +2645,26 @@ logvol /usr/local       --vgname=sysvg  --size=1 --grow --name=usrlocal
 			<primary>kickstart file</primary>
 			<secondary>package selection specification</secondary>
 		</indexterm>
+		<warning>
+			<title>Warning â€” <literal>@Everything</literal> is not supported</title>
+			<para>
+				You can use a kickstart file to install every available package by specifying <literal>@Everything</literal> or simply <literal>*</literal> in the <command>%packages</command> section. Red Hat does not support this type of installation. 
+			</para>
+			<para>
+				Moreover, using a kickstart file in this way will introduce package and file conflicts onto the installed system. Packages known to cause such problems are assigned to the <literal>@Conflicts (<replaceable>variant</replaceable>)</literal> group, where <replaceable>variant</replaceable> is <literal>Server</literal> or <literal>Client</literal>. If you specify <literal>@Everything</literal> in a kickstart file, be sure to exclude <literal>@Conflicts (<replaceable>variant</replaceable>)</literal> or the installation will fail:
+			</para>
+<programlisting>@Everything (Server)
+- at Conflicts</programlisting>
+			<para>
+				Note that Red Hat does not support the use of <literal>@Everything</literal> in a kickstart file, even if you exclude <literal>@Conflicts (<replaceable>variant</replaceable>)</literal>. 
+			</para>
+		</warning>
 		<para>
 			Use the <command>%packages</command> command to begin a kickstart file section that lists the packages you would like to install (this is for installations only, as package selection during upgrades is not supported).
 		</para>
 		 
 		<para>
-			Packages can be specified by group or by individual package name, including with globs using the asterisk. The installation program defines several groups that contain related packages. Refer to the <filename><replaceable>variant</replaceable>/repodata/comps-*.xml</filename> file on the first Fedora CD-ROM for a list of groups. Each group has an id, user visibility value, name, description, and package list. In the package list, the packages marked as mandatory are always installed if the group is selected, the packages marked default are selected by default if the group is selected, and the packages marked optional must be specifically selected even if the group is selected to be installed.
+			Packages can be specified by group or by individual package name, including with globs using the asterisk. The installation program defines several groups that contain related packages. Refer to the <filename><replaceable>variant</replaceable>/repodata/comps-*.xml</filename> file on the Fedora DVD for a list of groups. Each group has an id, user visibility value, name, description, and package list. In the package list, the packages marked as mandatory are always installed if the group is selected, the packages marked default are selected by default if the group is selected, and the packages marked optional must be specifically selected even if the group is selected to be installed.
 		</para>
 		 
 		<para>
@@ -2614,7 +2678,8 @@ logvol /usr/local       --vgname=sysvg  --size=1 --grow --name=usrlocal
 @ X Window System 
 @ GNOME Desktop Environment 
 @ Graphical Internet 
-@ Sound and Video dhcp</screen>
+@ Sound and Video 
+dhcp</screen>
 		<para>
 			As you can see, groups are specified, one to a line, starting with an <command>@</command> symbol, a space, and then the full group name as given in the <filename>comps.xml</filename> file. Groups can also be specified
 			using the id for the group, such as <computeroutput>gnome-desktop</computeroutput>. Specify individual packages with no additional characters (the <filename>dhcp</filename> line in the example above is an individual
@@ -2635,7 +2700,7 @@ logvol /usr/local       --vgname=sysvg  --size=1 --grow --name=usrlocal
 				<term><command>--nobase</command></term>
 				<listitem>
 					<para>
-						Do not install the @Base group. Use this option if you are trying to create a very small system.
+						Do not install the @Base group. Use this option to perform a minimal installation, for example, for a single-purpose server or desktop appliance.
 					</para>
 				</listitem>
 			</varlistentry>
@@ -2801,7 +2866,8 @@ fi
 					<para>
 						The following example copies the file <filename>/etc/resolv.conf</filename> to the file system that was just installed.
 					</para>
-<screen>%post --nochroot cp /etc/resolv.conf /mnt/sysimage/etc/resolv.conf</screen>
+<screen>%post --nochroot 
+cp /etc/resolv.conf /mnt/sysimage/etc/resolv.conf</screen>
 				</listitem>
 			</varlistentry>
 
@@ -2813,27 +2879,38 @@ fi
 					</para>
 				</listitem>
 			</varlistentry>
+			
+			<varlistentry>
+				<term><command>--log <replaceable>/path/to/logfile</replaceable></command></term>
+				<listitem>
+					<para>
+						Logs the output of the post-install script. Note that the path of the log file must take into account whether or not you use the <option>--nochroot</option> option.  For example, without <option>--nochroot</option>:
+					</para>
+<screen>%post --log=/root/ks-post.log</screen>
+					<para>
+						with <option>--nochroot</option>:
+					</para>
+<screen>%post --nochroot --log=/mnt/sysimage/root/ks-post.log</screen>
+				</listitem>
+			</varlistentry>
 		</variablelist>
 		 
 		<section id="s2-kickstart2-post-examples">
 			<title>Examples</title>
 			 
 			<para>
-				Register the system to a Red Hat Network Satellite:
+				Register the system to a Red Hat Network Satellite and log the output:
 			</para>
-<screen>%post
-( # Note that in this example we run the entire %post section as a subshell for logging.
+<screen>%post --log=/root/ks-post.log
 wget -O- http://proxy-or-sat.example.com/pub/bootstrap_script | /bin/bash
 /usr/sbin/rhnreg_ks --activationkey=<replaceable>&lt;activationkey&gt;</replaceable>
-# End the subshell and capture any output to a post-install log file.
-) 1>/root/post_install.log 2>&amp;1
 </screen>
 			<para>
 				Run a script named <filename>runme</filename> from an NFS share:
 			</para>
 <screen>mkdir /mnt/temp 
-mount -o nolock 10.10.0.2:/usr/new-machines /mnt/temp open -s -w -- 
-/mnt/temp/runme 
+mount -o nolock 10.10.0.2:/usr/new-machines /mnt/temp 
+openvt -s -w -- /mnt/temp/runme 
 umount /mnt/temp
 </screen>
 			<note>
@@ -2907,7 +2984,7 @@ umount /mnt/temp
 				<secondary>CD-ROM-based</secondary>
 			</indexterm>
 			<para>
-				To perform a CD-ROM-based kickstart installation, the kickstart file must be named <filename>ks.cfg</filename> and must be located in the boot CD-ROM's top-level directory. Since a CD-ROM is read-only, the file must be added to the directory used to create the image that is written to the CD-ROM. Refer to <xref linkend="sect-New_Users-Alternative_Boot_Methods"/> for instructions on creating boot media; however, before making the <filename>file.iso</filename> image file, copy the <filename>ks.cfg</filename> kickstart file to the <filename>isolinux/</filename> directory.
+				To perform a CD-ROM-based kickstart installation, the kickstart file must be named <filename>ks.cfg</filename> and must be located in the boot CD-ROM's top-level directory. Since a CD-ROM is read-only, the file must be added to the directory used to create the image that is written to the CD-ROM. Refer to <xref linkend="Making_Minimal_Boot_Media"/> for instructions on creating boot media; however, before making the <filename>file.iso</filename> image file, copy the <filename>ks.cfg</filename> kickstart file to the <filename>isolinux/</filename> directory.
 			</para>
 			<indexterm significance="normal">
 				<primary>kickstart installations</primary>
@@ -2922,13 +2999,13 @@ umount /mnt/temp
 				<filename>ks.cfg</filename> file.
 			</para>
 			<para>
-				Refer to <xref linkend="sect-New_Users-Alternative_Boot_Methods"/> for instructions on creating live USB media using the <filename>boot.iso</filename> image available for download from the same servers that host images of the Fedora installation disks &mdash; refer to <xref linkend="sect-Obtaining_Fedora-Downloading_Fedora"/>.
+				Refer to <xref linkend="Making_Minimal_Boot_Media"/> for instructions on creating live USB media using the <filename>boot.iso</filename> image file that you can download from the Software &amp; Download Center of the Red Hat customer portal.
 			</para>
 			<note>
 				<title>Note</title>
 
 				<para>
-					Creation of USB flash memory pen drives for booting is possible, but is heavily dependent on system hardware BIOS settings. Refer to your hardware manufacturer to see if your system supports booting to alternate devices.
+					Creation of USB flashdrives for booting is possible, but is heavily dependent on system hardware BIOS settings. Refer to your hardware manufacturer to see if your system supports booting to alternate devices.
 				</para>
 			</note>
 		</section>
@@ -2983,15 +3060,15 @@ umount /mnt/temp
 			<secondary>installation tree</secondary>
 		</indexterm>
 		<para>
-			The kickstart installation must access an <firstterm>installation tree</firstterm>. An installation tree is a copy of the binary Fedora CD-ROMs with the same directory structure.
+			The kickstart installation must access an <firstterm>installation tree</firstterm>. An installation tree is a copy of the binary Fedora DVD with the same directory structure.
 		</para>
 		 
 		<para>
-			If you are performing a CD-based installation, insert the Fedora CD-ROM #1 into the computer before starting the kickstart installation.
+			If you are performing a DVD-based installation, insert the Fedora installation DVD into the computer before starting the kickstart installation.
 		</para>
 		 
 		<para>
-			If you are performing a hard drive installation, make sure the ISO images of the binary Fedora CD-ROMs are on a hard drive in the computer.
+			If you are performing a hard drive installation, make sure the ISO images of the binary Fedora DVD are on a hard drive in the computer.
 		</para>
 		<indexterm significance="normal">
 			<primary>kickstart installations</primary>
@@ -3002,7 +3079,7 @@ umount /mnt/temp
 			<secondary>network-based</secondary>
 		</indexterm>
 		<para>
-			If you are performing a network-based (NFS, FTP, or HTTP) installation, you must make the installation tree available over the network. Refer to <xref linkend="s1-steps-network-installs-x86"/> for details.
+			If you are performing a network-based (NFS, FTP, or HTTP) installation, you must make the installation tree or ISO image available over the network. Refer to <xref linkend="s1-steps-network-installs-x86"/> for details.
 		</para>
 	</section>
 	<section id="s1-kickstart2-startinginstall">
@@ -3017,26 +3094,22 @@ umount /mnt/temp
 		</indexterm>
 		<xi:include href="Important-Kickstart_and_Firstboot.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> 
 		<para>
-			To begin a kickstart installation, you must boot the system from boot media you have made or the Fedora CD-ROM #1, and enter a special boot command at the boot prompt. The installation program looks for a kickstart file if the <command>ks</command> command line argument is passed to the kernel.
+			To begin a kickstart installation, you must boot the system from boot media you have made or the Fedora DVD, and enter a special boot command at the boot prompt. The installation program looks for a kickstart file if the <command>ks</command> command line argument is passed to the kernel.
 		</para>
 		 
 		<variablelist>
 			<varlistentry>
-				<term>CD-ROM #1 and Diskette</term>
+				<term>DVD and local storage</term>
 				<listitem>
 					<para>
 				<indexterm significance="normal">
 					<primary>kickstart installations</primary>
 					<secondary>starting</secondary>
-					<tertiary>from CD-ROM #1 with a diskette</tertiary>
+					<tertiary>from DVD with a diskette</tertiary>
 				</indexterm>
-						The <userinput>linux ks=floppy</userinput> command also works if the <filename>ks.cfg</filename> file is located on a vfat or ext2 file system on a diskette and you boot from the Fedora CD-ROM #1.
+						The <userinput>linux ks=</userinput> command also works if the <filename>ks.cfg</filename> file is located on a vfat or ext2 file system on local storage and you boot from the Fedora DVD.
 					</para>
 
-					<para>
-						An alternate boot command is to boot off the Fedora CD-ROM #1 and have the kickstart file on a vfat or ext2 file system on a diskette. To do so, enter the following command at the <prompt>boot:</prompt> prompt:
-					</para>
-<screen>linux ks=hd:fd0:/ks.cfg</screen>
 				</listitem>
 			</varlistentry>
 		</variablelist>
@@ -3048,7 +3121,7 @@ umount /mnt/temp
 					<para>
 						If you need to use a driver disk with kickstart, specify the <userinput>dd</userinput> option as well. For example, to boot off a boot diskette and use a driver disk, enter the following command at the <prompt>boot:</prompt> prompt:
 					</para>
-<screen>linux ks=floppy dd</screen>
+<screen>linux ks=hd:<replaceable>partition</replaceable>:/<replaceable>path</replaceable>/ks.cfg dd</screen>
 				</listitem>
 			</varlistentry>
 
@@ -3077,7 +3150,7 @@ umount /mnt/temp
 				<term><command>askmethod</command></term>
 				<listitem>
 					<para>
-						Do not automatically use the CD-ROM as the install source if we detect a Fedora CD in your CD-ROM drive.
+						Do not automatically use the DVD as the install source if we detect a Fedora DVD in your DVD drive.
 					</para>
 				</listitem>
 			</varlistentry>
@@ -3222,24 +3295,6 @@ umount /mnt/temp
 			</varlistentry>
 
 			<varlistentry>
-				<term><command>ks=floppy</command></term>
-				<listitem>
-					<para>
-						The installation program looks for the file <filename>ks.cfg</filename> on a vfat or ext2 file system on the diskette in <filename>/dev/fd0</filename>.
-					</para>
-				</listitem>
-			</varlistentry>
-
-			<varlistentry>
-				<term><command>ks=floppy:/<replaceable>&lt;path&gt;</replaceable></command></term>
-				<listitem>
-					<para>
-						The installation program looks for the kickstart file on the diskette in <filename>/dev/fd0</filename>, as file <replaceable>&lt;path&gt;</replaceable>.
-					</para>
-				</listitem>
-			</varlistentry>
-
-			<varlistentry>
 				<term><command>ks=hd:<replaceable>&lt;device&gt;</replaceable>:/<replaceable>&lt;file&gt;</replaceable></command></term>
 				<listitem>
 					<para>
@@ -3339,16 +3394,7 @@ umount /mnt/temp
 					</para>
 				</listitem>
 			</varlistentry>	
-			
-			<varlistentry>
-				<term><command>lowres</command></term>
-				<listitem>
-					<para>
-						Force GUI installer to run at 640x480.
-					</para>
-				</listitem>
-			</varlistentry>	
-			
+
 			<varlistentry>
 				<term><command>mediacheck</command></term>
 				<listitem>
@@ -3359,53 +3405,6 @@ umount /mnt/temp
 			</varlistentry>	
 			
 			<varlistentry>
-				<term><command>method=cdrom</command></term>
-				<listitem>
-					<para>
-						Do a CDROM based installation.
-					</para>
-				</listitem>
-			</varlistentry>	
-			
-			<varlistentry>
-				<term><command>method=ftp://<replaceable>&lt;path&gt;</replaceable></command></term>
-				<listitem>
-					<para>
-						Use &lt;path&gt; for an FTP installation.
-					</para>
-				</listitem>
-			</varlistentry>	
-			
-			<varlistentry>
-				<term><command>method=hd:<replaceable>&lt;dev&gt;</replaceable>:<replaceable>&lt;path&gt;</replaceable></command></term>
-<!--	BZ#250941, above replaces below			
-				<term><command>method=hd://<replaceable>&lt;dev&gt;</replaceable>/<replaceable>&lt;path&gt;</replaceable></command></term>-->
-				<listitem>
-					<para>
-						Use &lt;path&gt; on &lt;dev&gt; for a hard drive installation.
-					</para>
-				</listitem>
-			</varlistentry>	
-			
-			<varlistentry>
-				<term><command>method=http://<replaceable>&lt;path&gt;</replaceable></command></term>
-				<listitem>
-					<para>
-						Use &lt;path&gt; for an HTTP installation.
-					</para>
-				</listitem>
-			</varlistentry>	
-			
-			<varlistentry>
-				<term><command>method=nfs:<replaceable>&lt;path&gt;</replaceable></command></term>
-				<listitem>
-					<para>
-						Use &lt;path&gt; for an NFS installation.
-					</para>
-				</listitem>
-			</varlistentry>	
-			
-			<varlistentry>
 				<term><command>netmask=<replaceable>&lt;nm&gt;</replaceable></command></term>
 				<listitem>
 					<para>
@@ -3549,6 +3548,53 @@ umount /mnt/temp
 			
 			
 			<varlistentry>
+				<term><command>repo=cdrom</command></term>
+				<listitem>
+					<para>
+						Do a DVD based installation.
+					</para>
+				</listitem>
+			</varlistentry>	
+			
+			<varlistentry>
+				<term><command>repo=ftp://<replaceable>&lt;path&gt;</replaceable></command></term>
+				<listitem>
+					<para>
+						Use &lt;path&gt; for an FTP installation.
+					</para>
+				</listitem>
+			</varlistentry>	
+			
+			<varlistentry>
+				<term><command>repo=hd:<replaceable>&lt;dev&gt;</replaceable>:<replaceable>&lt;path&gt;</replaceable></command></term>
+<!--	BZ#250941, above replaces below			
+				<term><command>method=hd://<replaceable>&lt;dev&gt;</replaceable>/<replaceable>&lt;path&gt;</replaceable></command></term>-->
+				<listitem>
+					<para>
+						Use &lt;path&gt; on &lt;dev&gt; for a hard drive installation.
+					</para>
+				</listitem>
+			</varlistentry>	
+			
+			<varlistentry>
+				<term><command>repo=http://<replaceable>&lt;path&gt;</replaceable></command></term>
+				<listitem>
+					<para>
+						Use &lt;path&gt; for an HTTP installation.
+					</para>
+				</listitem>
+			</varlistentry>	
+			
+			<varlistentry>
+				<term><command>repo=nfs:<replaceable>&lt;path&gt;</replaceable></command></term>
+				<listitem>
+					<para>
+						Use &lt;path&gt; for an NFS installation.
+					</para>
+				</listitem>
+			</varlistentry>	
+			
+			<varlistentry>
 				<term><command>rescue</command></term>
 				<listitem>
 					<para>
@@ -3608,7 +3654,7 @@ umount /mnt/temp
 				<term><command>updates</command></term>
 				<listitem>
 					<para>
-						Prompt for floppy containing updates (bug fixes).
+						Prompt for storage device containing updates (bug fixes).
 					</para>
 				</listitem>
 			</varlistentry>
diff --git a/en-US/Ksconfig.xml b/en-US/Ksconfig.xml
index cbd46f3..5cb0270 100644
--- a/en-US/Ksconfig.xml
+++ b/en-US/Ksconfig.xml
@@ -18,7 +18,7 @@
 		<application>Kickstart Configurator</application> allows you to create or modify a kickstart file using a graphical user interface, so that you do not have to remember the correct syntax of the file.
 	</para>
 	<para>
-		To use <application>Kickstart Configurator</application>, you must be running the X Window System. To start <application>Kickstart Configurator</application>, select <guimenu>Applications</guimenu> (the main menu on the panel) =&gt; <guimenu>System Tools</guimenu> =&gt; <guimenuitem>Kickstart</guimenuitem>, or type the command <command>/usr/sbin/system-config-kickstart</command>.
+		To use <application>Kickstart Configurator</application>, you must be running the X Window System and <application>Kickstart Configurator</application> must be installed on your system. To start <application>Kickstart Configurator</application>, select <guimenu>Applications</guimenu> (the main menu on the panel) =&gt; <guimenu>System Tools</guimenu> =&gt; <guimenuitem>Kickstart</guimenuitem>, or type the command <command>/usr/sbin/system-config-kickstart</command>. If <application>Kickstart Configurator</application> does not appear on the menu or you cannot start it from the command line, run <command>su - yum install system-config-kickstart</command> to make sure that the package is installed, or search for the package in your graphical package manager.
 	</para>
 	<indexterm significance="normal">
 		<primary><application>Kickstart Configurator</application>
@@ -86,6 +86,14 @@
 		<para>
 			Enter the desired root password for the system in the <guilabel>Root Password</guilabel> text entry box. Type the same password in the <guilabel>Confirm Password</guilabel> text box. The second field is to make sure you do not mistype the password and then realize you do not know what it is after you have completed the installation. To save the password as an encrypted password in the file, select <guilabel>Encrypt root 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. Do not type an already encrypted password and select to encrypt it. Because a kickstart file is a plain text file that can be easily read, it is recommended that an encrypted password be used.
 		</para>
+		
+		<!-- <para>
+			Click <guilabel>Specify installation key</guilabel> to provide the key for this installation of Red Hat Enterprise Linux.
+		</para> -->
+		
+		<para>
+			Choosing <guilabel>Target Architecture</guilabel> specifies which specific hardware architecture distribution is used during installation.
+		</para>
 		 
 		<para>
 			Choosing <guilabel>Target Architecture</guilabel> specifies which specific hardware architecture distribution is used during installation.
@@ -142,7 +150,7 @@
 		<itemizedlist>
 			<listitem>
 				<para>
-					<guilabel>CD-ROM</guilabel> &mdash; Choose this option to install or upgrade from the Fedora CD-ROMs.
+					<guilabel>DVD</guilabel> &mdash; Choose this option to install or upgrade from the Fedora DVD.
 				</para>
 			</listitem>
 
@@ -166,7 +174,7 @@
 
 			<listitem>
 				<para>
-					<guilabel>Hard Drive</guilabel> &mdash; Choose this option to install or upgrade from a hard drive. Hard drive installations require the use of ISO (or CD-ROM) images. Be sure to verify that the ISO images are intact before you start the installation. To verify them, use an <command>md5sum</command> program as well as the <command>linux mediacheck</command> boot option as discussed in <xref linkend="sn-boot-mediacheck"/>. Enter the hard drive partition that contains the ISO images (for example, <filename>/dev/hda1</filename>) in the <guilabel>Hard Drive Partition</guilabel> text box. Enter the directory that contains the ISO images in the <guilabel>Hard Drive Directory</guilabel> text box.
+					<guilabel>Hard Drive</guilabel> &mdash; Choose this option to install or upgrade from a hard drive. Hard drive installations require the use of ISO images. Be sure to verify that the ISO images are intact before you start the installation. To verify them, use an <command>md5sum</command> program as well as the <command>linux mediacheck</command> boot option as discussed in <xref linkend="sn-boot-mediacheck"/>. Enter the hard drive partition that contains the ISO images (for example, <filename>/dev/hda1</filename>) in the <guilabel>Hard Drive Partition</guilabel> text box. Enter the directory that contains the ISO images in the <guilabel>Hard Drive Directory</guilabel> text box.
 				</para>
 			</listitem>
 		</itemizedlist>
@@ -245,7 +253,7 @@
 		</para>
 		 
 		<para>
-			To initialize the disk label to the default for the architecture of the system (for example, <command>msdos</command> for x86 and <command>gpt</command> for Itanium), select <guilabel>Initialize the disk label</guilabel> if you are installing on a brand new hard drive.
+			To initialize the disk label to the default for the architecture of the system (for example, <command>msdos</command> for x86), select <guilabel>Initialize the disk label</guilabel> if you are installing on a brand new hard drive.
 		</para>
 		
 		<note>
@@ -420,7 +428,7 @@
 		</para>
 		 
 		<para>
-			Networking is only required if you choose a networking-based installation method (NFS, FTP, or HTTP). Networking can always be configured after installation with the <application>Network Administration Tool</application> (<command>system-config-network</command>). Refer to the Red Hat Enterprise Linux Deployment Guide for details.
+			Networking is only required if you choose a networking-based installation method (NFS, FTP, or HTTP). Networking can always be configured after installation with the <application>Network Administration Tool</application> (<command>system-config-network</command>). Refer to the Fedora Deployment Guide for details.
 		</para>
 		 
 		<para>
@@ -491,7 +499,7 @@
 		 
 		<para>
 			These methods are not enabled by default. To enable one or more of these methods, click the appropriate tab, click the checkbox next to <guilabel>Enable</guilabel>, and enter the appropriate information for the authentication method.
-			Refer to the Red Hat Enterprise Linux Deployment Guide for more information about the options.
+			Refer to the Fedora Deployment Guide for more information about the options.
 		</para>
 	</section>
 	<section id="s1-redhat-config-kickstart-firewall">
@@ -690,38 +698,25 @@
 		<para>
 			You can add commands to run on the system immediately after the kickstart file has been parsed and before the installation begins. If you have configured the network in the kickstart file, the network is enabled before this section is processed. To include a pre-installation script, type it in the text area.
 		</para>
-		 
-		<para>
-			To specify a scripting language to use to execute the script, select the <guilabel>Use an interpreter</guilabel> option and enter the interpreter in the text box beside it. For example, <userinput>/usr/bin/python2.4</userinput> can be specified for a Python script. This option corresponds to using <command>%pre --interpreter <replaceable>/usr/bin/python2.4</replaceable></command> in your kickstart file.
-		</para>
 		
+		<xi:include href="no_busybox.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+		 
 		<para>
-			Many of the commands that are available in the pre-installation environment are provided by a version of <application>busybox</application> called <application>busybox-anaconda</application>. <application>Busybox</application>-supplied commands do not provide all features, but supply only the most commonly used features. The following list of available commands include commands provided by <application>busybox</application>:
+			To specify a scripting language to use to execute the script, select the <guilabel>Use an interpreter</guilabel> option and enter the interpreter in the text box beside it. For example, <userinput>/usr/bin/python2.6</userinput> can be specified for a Python script. This option corresponds to using <command>%pre --interpreter <replaceable>/usr/bin/python2.6</replaceable></command> in your kickstart file.
 		</para>
 		
-		<para><command>addgroup</command>, <command>adduser</command>, <command>adjtimex</command>, <command>ar</command>, <command>arping</command>, <command>ash</command>, <command>awk</command>, <command>basename</command>, <command>bbconfig</command>, <command>bunzip2</command>, <command>busybox</command>, <command>bzcat</command>, <command>cal</command>, <command>cat</command>, <command>catv</command>, <command>chattr</command>, <command>chgrp</command>, <command>chmod</command>, <command>chown</command>, <command>chroot</command>, <command>chvt</command>, <command>cksum</command>, <command>clear</command>, <command>cmp</command>, <command>comm</command>, <command>cp</command>, <command>cpio</command>, <command>crond</command>, <command>crontab</command>, <command>cut</command>, <command>date</command>, <command>dc</command>, <command>dd</command>, <command>deallocvt</command>, <command>delgroup</command>, <command>deluser</command>, <command>devfsd</command>, <command>df</co
 mmand>, <command>diff</command>, <command>dirname</command>, <command>dmesg</command>, <command>dnsd</command>, <command>dos2unix</command>, <command>dpkg</command>, <command>dpkg-deb</command>, <command>du</command>, <command>dumpkmap</command>, <command>dumpleases</command>, <command>e2fsck</command>, <command>e2label</command>, <command>echo</command>, <command>ed</command>, <command>egrep</command>, <command>eject</command>, <command>env</command>, <command>ether-wake</command>, <command>expr</command>, <command>fakeidentd</command>, <command>false</command>, <command>fbset</command>, <command>fdflush</command>, <command>fdformat</command>, <command>fdisk</command>, <command>fgrep</command>, <command>find</command>, <command>findfs</command>, <command>fold</command>, <command>free</command>, <command>freeramdisk</command>, <command>fsck</command>, <command>fsck.ext2</command>, <command>fsck.ext3</command>, <command>fsck.ext4</command>, <command>fsck.minix</command>, <com
 mand>ftpget</command>, <command>ftpput</command>, <command>fuser</command>, <command>getopt</command>, <command>getty</command>, <command>grep</command>, <command>gunzip</command>, <command>gzip</command>, <command>hdparm</command>, <command>head</command>, <command>hexdump</command>, <command>hostid</command>, <command>hostname</command>, <command>httpd</command>, <command>hush</command>, <command>hwclock</command>, <command>id</command>, <command>ifconfig</command>, <command>ifdown</command>, <command>ifup</command>, <command>inetd</command>, <command>insmod</command>, <command>install</command>, <command>ip</command>, <command>ipaddr</command>, <command>ipcalc</command>, <command>ipcrm</command>, <command>ipcs</command>, <command>iplink</command>, <command>iproute</command>, <command>iptunnel</command>, <command>kill</command>, <command>killall</command>, <command>lash</command>, <command>last</command>, <command>length</command>, <command>less</command>, <command>linux32
 </command>, <command>linux64</command>, <command>ln</command>, <command>load_policy</command>, <command>loadfont</command>, <command>loadkmap</command>, <command>login</command>, <command>logname</command>, <command>losetup</command>, <command>ls</command>, <command>lsattr</command>, <command>lsmod</command>, <command>lzmacat</command>, <command>makedevs</command>, <command>md5sum</command>, <command>mdev</command>, <command>mesg</command>, <command>mkdir</command>, <command>mke2fs</command>, <command>mkfifo</command>, <command>mkfs.ext2</command>, <command>mkfs.ext3</command>, <command>mkfs.ext4</command>, <command>mkfs.minix</command>, <command>mknod</command>, <command>mkswap</command>, <command>mktemp</command>, <command>modprobe</command>, <command>more</command>, <command>mount</command>, <command>mountpoint</command>, <command>msh</command>, <command>mt</command>, <command>mv</command>, <command>nameif</command>, <command>nc</command>, <command>netstat</command>, <com
 mand>nice</command>, <command>nohup</command>, <command>nslookup</command>, <command>od</command>, <command>openvt</command>, <command>passwd</command>, <command>patch</command>, <command>pidof</command>, <command>ping</command>, <command>ping6</command>, <command>pipe_progress</command>, <command>pivot_root</command>, <command>printenv</command>, <command>printf</command>, <command>ps</command>, <command>pwd</command>, <command>rdate</command>, <command>readlink</command>, <command>readprofile</command>, <command>realpath</command>, <command>renice</command>, <command>reset</command>, <command>rm</command>, <command>rmdir</command>, <command>rmmod</command>, <command>route</command>, <command>rpm</command>, <command>rpm2cpio</command>, <command>run-parts</command>, <command>runlevel</command>, <command>rx</command>, <command>sed</command>, <command>seq</command>, <command>setarch</command>, <command>setconsole</command>, <command>setkeycodes</command>, <command>setlogcons</
 command>, <command>setsid</command>, <command>sh</command>, <command>sha1sum</command>, <command>sleep</command>, <command>sort</command>, <command>start-stop-daemon</command>, <command>stat</command>, <command>strings</command>, <command>stty</command>, <command>su</command>, <command>sulogin</command>, <command>sum</command>, <command>swapoff</command>, <command>swapon</command>, <command>switch_root</command>, <command>sync</command>, <command>sysctl</command>, <command>tail</command>, <command>tar</command>, <command>tee</command>, <command>telnet</command>, <command>telnetd</command>, <command>test</command>, <command>tftp</command>, <command>time</command>, <command>top</command>, <command>touch</command>, <command>tr</command>, <command>traceroute</command>, <command>true</command>, <command>tty</command>, <command>tune2fs</command>, <command>udhcpc</command>, <command>udhcpd</command>, <command>umount</command>, <command>uname</command>, <command>uncompress</command>
 , <command>uniq</command>, <command>unix2dos</command>, <command>unlzma</command>, <command>unzip</command>, <command>uptime</command>, <command>usleep</command>, <command>uudecode</command>, <command>uuencode</command>, <command>vconfig</command>, <command>vi</command>, <command>vlock</command>, <command>watch</command>, <command>watchdog</command>, <command>wc</command>, <command>wget</command>, <command>which</command>, <command>who</command>, <command>whoami</command>, <command>xargs</command>, <command>yes</command>, <command>zcat</command>, <command>zcip</command></para>
-
-		<para>For a description of any of these commands, run:</para>
-		
-		<para><command>busybox <replaceable>command</replaceable> --help</command></para>
-		
 		<para>
-			In addition to the aforementioned commands, the following commands are provided in their full featured versions:
+			Only the most commonly used commands are available in the pre-installation environment:
 		</para>
-<!-- above replaces below: BZ#221934
 		<para>
-			Some of the previous commands are provided by <application>busybox</application> and some are provided in their full featured versions. In addition to the commands above the following commands are provided in their full featured versions:
+			<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>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>.
 		</para>
-		-->
-		<para><command>anaconda</command>, <command>bash</command>, <command>bzip2</command>, <command>jmacs</command>, <command>ftp</command>, <command>head</command>, <command>joe</command>, <command>kudzu-probe</command>, <command>list-harddrives</command>, <command>loadkeys</command>, <command>mtools</command>, <command>mbchk</command>, <command>mtools</command>, <command>mini-wm</command>, <command>mtools</command>, <command>jpico</command>, <command>pump</command>, <command>python</command>, <command>python2.4</command>, <command>raidstart</command>, <command>raidstop</command>, <command>rcp</command>, <command>rlogin</command>, <command>rsync</command>, <command>setxkbmap</command>, <command>sftp</command>, <command>shred</command>, <command>ssh</command>, <command>syslinux</command>, <command>syslogd</command>, <command>tac</command>, <command>termidx</command>, <command>vncconfig</command>, <command>vncpasswd</command>, <command>xkbcomp</command>, <command>Xorg</command>,
  <command>Xvnc</command>, <command>zcat</command></para>
-		 
-		<warning>
-			<title>Warning</title>
-
+		
+		<important>
 			<para>
 				Do not include the <command>%pre</command> command. It is added for you.
 			</para>
-		</warning>
+		</important>
 		
 		<note>
 			<para>
@@ -748,14 +743,14 @@
 		<para>
 			You can also add commands to execute on the system after the installation is completed. If the network is properly configured in the kickstart file, the network is enabled, and the script can include commands to access resources on the network. To include a post-installation script, type it in the text area.
 		</para>
-		 
-		<warning>
-			<title>Warning</title>
-
+		
+		<xi:include href="no_busybox.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+		
+		<important>
 			<para>
 				Do not include the <command>%post</command> command. It is added for you.
 			</para>
-		</warning>
+		</important>
 		 
 		<para>
 			For example, to change the message of the day for the newly installed system, add the following command to the <command>%post</command> section:
@@ -826,3 +821,4 @@
 		</para>
 	</section>
 </chapter>
+
diff --git a/en-US/Language_Selection-x86.xml b/en-US/Language_Selection-x86.xml
index e5f3a12..a70787d 100644
--- a/en-US/Language_Selection-x86.xml
+++ b/en-US/Language_Selection-x86.xml
@@ -11,23 +11,23 @@
 	href="Language_Selection_common-indexterm.xml"/>
 
 	<para>
-		Using your mouse, select a language to use for the installation (refer to <xref linkend="fig-langselection-x86"/>).
+		Use the arrow keys on your keyboard to select a language to use during the installation process (refer to <xref linkend="fig-langselection-x86"/>). With your selected language highlighted, press the <keycap>Tab</keycap> key to move to the <guibutton>OK</guibutton> button and press the <keycap>Enter</keycap> key to confirm your choice.
 	</para>
-
 	 
 	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" 
 	href="Language_Selection_common-para-1.xml"/>
 	<!-- The language you select here will become the default language... -->
 	
-	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" 
-	href="Language_Selection_common-para-3.xml"/>
-	<!-- To add support for additional languages, customize... -->
+	<para>
+      To add support for additional languages, customize the
+      installation at the package selection stage. For more information,
+      refer to <xref linkend="sn-package-selection-x86"/>.
+    </para>
 	
 	<figure float="0" id="fig-langselection-x86"><title>Language Selection</title>
 		<mediaobject>
 			<imageobject><imagedata fileref="images/langselection/lang.png" format="PNG"/></imageobject>
 			<textobject><para>
-
 					Language selection screen.
 				</para>
 			</textobject>
@@ -40,5 +40,3 @@
 		
 </section>
 
-
-
diff --git a/en-US/Language_Selection_common-indexterm.xml b/en-US/Language_Selection_common-indexterm.xml
index 594f05a..c1e5fc2 100644
--- a/en-US/Language_Selection_common-indexterm.xml
+++ b/en-US/Language_Selection_common-indexterm.xml
@@ -5,4 +5,5 @@
 <indexterm significance="normal">
 	<primary>language</primary>
 	<secondary>selecting</secondary>
-</indexterm>
\ No newline at end of file
+</indexterm>
+
diff --git a/en-US/Language_Selection_common-para-1.xml b/en-US/Language_Selection_common-para-1.xml
index d016ce9..a6ec9c9 100644
--- a/en-US/Language_Selection_common-para-1.xml
+++ b/en-US/Language_Selection_common-para-1.xml
@@ -4,4 +4,5 @@
 
 <para>
 	The language you select here will become the default language for the operating system once it is installed. Selecting the appropriate language also helps target your time zone configuration later in the installation. The installation program tries to define the appropriate time zone based on what you specify on this screen. 
-</para>
\ No newline at end of file
+</para>
+
diff --git a/en-US/Language_Selection_common-para-2.xml b/en-US/Language_Selection_common-para-2.xml
index e6e9859..ab385fe 100644
--- a/en-US/Language_Selection_common-para-2.xml
+++ b/en-US/Language_Selection_common-para-2.xml
@@ -4,4 +4,5 @@
 
 <para>
 	Once you select the appropriate language, click <guibutton>Next</guibutton> to continue.
-</para>
\ No newline at end of file
+</para>
+
diff --git a/en-US/Language_Selection_common-para-3.xml b/en-US/Language_Selection_common-para-3.xml
deleted file mode 100644
index 6c27fce..0000000
--- a/en-US/Language_Selection_common-para-3.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
-]>
-
-    <para>
-      To add support for additional languages, customize the
-      installation at the package selection stage. For more information,
-      refer to <xref linkend="sn-lang-packages"/>.
-    </para>
diff --git a/en-US/Language_Selection_common-title.xml b/en-US/Language_Selection_common-title.xml
index 5e94d8e..edbb11c 100644
--- a/en-US/Language_Selection_common-title.xml
+++ b/en-US/Language_Selection_common-title.xml
@@ -2,4 +2,5 @@
 <!DOCTYPE title PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
 ]>
 
-<title>Language Selection</title>
\ No newline at end of file
+<title>Language Selection</title>
+
diff --git a/en-US/Making_Fedora_Media.xml b/en-US/Making_Fedora_Media.xml
deleted file mode 100644
index 790ab0a..0000000
--- a/en-US/Making_Fedora_Media.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-"http://www.docbook.org/xml/4.4/docbookx.dtd" [
-]>
-
-<chapter  id="sn-making-media">
-    <title>Making Fedora Media</title>
-    <indexterm>
-	<primary>CD/DVD media</primary>
-	<secondary>making</secondary>
-	<seealso>ISO images</seealso>
-      </indexterm>
-      <indexterm>
-	<primary>USB flash media</primary>
-	<secondary>making</secondary>
-      </indexterm>
-    <para>
-	Use any of the methods described in this section to turn the ISO image file that you downloaded into a bootable DVD, CD, or USB device.
-    </para>
-    <section id="sn-making-disc-media">
-      <title>Making CD or DVD Discs</title>
-      <para>
-	You can make a CD or DVD from a distribution image file, a live image file, or a minimal boot media image file using the CD or DVD burning software on your computer.
-      </para>
-      
-<!-- this text is from Burn_the_image_file_to_CD.xml in the Fedora Installation Quick Start Guide -->
-	<para>
-		The exact series of steps that produces a CD from an image file varies greatly from computer to computer, depending on the operating system and disc burning software installed. Use this procedure as a general guide. You might be able to omit certain steps on your computer, or might have to perform some of the steps in a different order from the order described here.
-	</para>
-	<para>
-		Make sure that your disc burning software is capable of burning discs from image files. Although this is true of most disc burning software, exceptions exist.
-	</para>
-	<para>
-		In particular, note that the CD burning feature built into Windows XP and Windows Vista cannot burn CDs from images and that earlier Windows operating systems did not have any CD burning capability installed by default. Therefore, if your computer has a Windows operating system prior to Windows&nbsp;7 installed on it, you need a separate piece of software for this task. Examples of popular CD burning software for Windows that you might already have on your computer include <application>Nero Burning ROM</application> and <application>Roxio Creator</application>. If you use a Windows operating system on your computer and do not have disc burning software installed (or you are not sure that the software can burn discs from image files) <application>InfraRecorder</application> is a suitable alternative available from <ulink url="http://www.infrarecorder.org/"></ulink>, and is free and open-source. 
-	</para>
-	<para>
-		The <application>Disk Utility</application> software installed by default with Mac OS&nbsp;X on Apple computers has the capability to burn CDs from images built into it already. Most widely-used CD burning software for Linux, such as <application>Brasero</application> and <application>K3b</application>, also includes this capability.
-	</para>
-	<procedure>
-		<step>
-			<para>
-				Insert a blank, writeable CD into your computer's CD or DVD burner. On some computers, a window opens and displays various options when you insert the disc. If you see a window like this, look for an option to launch your chosen disc burning program. If you do not see an option like this, close the window and launch the program manually.
-			</para>
-		</step>
-		<step>
-			<para>
-				Launch your disc burning program. On some computers, you can do this by right-clicking (or control-clicking) on the image file and selecting a menu option with a label like <guilabel>Copy image to CD</guilabel>, or <guilabel>Copy CD or DVD image</guilabel>. Other computers might provide you with a menu option to launch your chosen disc burning program, either directly or with an option like <guimenuitem>Open With</guimenuitem>. If none of these options are available on your computer, launch the program from an icon on your desktop, in a menu of applications such as the <guimenu>Start</guimenu> menu on Windows operating systems, or in the Mac <filename>Applications</filename> folder.
-			</para>
-		</step>
-		<step>
-			<para>
-				In your disc burning program, select the option to burn a CD from an image file. For example, in <application>Nero Burning ROM</application>, this option is called <guimenuitem>Burn Image</guimenuitem> and is located on the <guimenu>File</guimenu> menu.
-			</para>
-			<para>
-				Note that you can skip this step when using certain CD burning software; for example, <application>Disk Utility</application> on Mac OS&nbsp;X does not require it.
-			</para>
-		</step>
-		<step>
-			<para>
-				Browse to the ISO CD image file that you downloaded previously and select it for burning.
-			</para>
-		</step>
-		<step>
-			<para>
-				Click the button that starts the burning process.
-			</para>
-		</step>
-	</procedure>
-<!-- end of text from Burn_the_image_file_to_CD.xml in the Fedora Installation Quick Start Guide -->
-
-	<para>
-		For more detail, including step-by-step instructions for various popular disc burning applications, refer to <citetitle>Making Fedora Discs</citetitle> available from <ulink url="http://docs.fedoraproject.org/readme-burning-isos/">http://docs.fedoraproject.org/readme-burning-isos/</ulink>
-	</para>
-    </section>
-
-<xi:include href="Making_USB_media.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>    
-</chapter>
diff --git a/en-US/Making_Media.xml b/en-US/Making_Media.xml
new file mode 100644
index 0000000..8fd0568
--- /dev/null
+++ b/en-US/Making_Media.xml
@@ -0,0 +1,161 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+"http://www.docbook.org/xml/4.4/docbookx.dtd" [
+]>
+
+<chapter  id="sn-making-media">
+    <title>Making Media</title>
+    <indexterm>
+	<primary>CD/DVD media</primary>
+	<secondary>making</secondary>
+	<seealso>ISO images</seealso>
+      </indexterm>
+      <indexterm>
+	<primary>USB flash media</primary>
+	<secondary>making</secondary>
+      </indexterm>
+    <para>
+	Use the methods described in this section to create the following types of installation and boot media:
+    </para>
+    <itemizedlist>
+	    <listitem>
+		    <para>
+			    an installation DVD
+		    </para>
+	    </listitem>
+	    <listitem>
+		    <para>
+			    an set of installation CDs
+		    </para>
+	    </listitem>
+	    <listitem>
+		    <para>
+			    a USB flash drive to use as an installation source
+		    </para>
+	    </listitem>
+	    <listitem>
+		    <para>
+			    a minimal boot CD or DVD that can boot the installer
+		    </para>
+	    </listitem>
+	    <listitem>
+		    <para>
+			    a USB flash drive to boot the installer
+		    </para>
+	    </listitem>
+    </itemizedlist>
+    <para>
+	    The following table indicates the types of boot and installation media available for different architectures and notes the image file that you need to produce the media.
+    </para>
+    
+	<table frame='all'>
+	    <title>Boot and installation media</title>
+	    <tgroup cols='5' align='left' colsep='1' rowsep='1'>
+		<colspec colname='c1'/>
+		<colspec colname='c2'/>
+		<colspec colname='c3'/>
+		<colspec colname='c4'/>
+		<colspec colname='c5'/>
+	      <thead>
+		  <row>
+		    <entry>Architecture</entry>
+		    <entry>Installation DVD or set of CDs</entry>
+		    <entry>Installation USB flash drive</entry>
+		    <entry>Boot CD or boot DVD</entry>
+		    <entry>Boot USB flash drive</entry>
+		  </row>
+	      </thead>
+	      <tbody>  
+		  <row>
+		    <entry>BIOS-based 32-bit x86</entry>
+		    <entry>x86 DVD ISO image file</entry>
+		    <entry>x86 DVD ISO image file</entry>
+		    <entry><filename>boot.iso</filename></entry>
+		    <entry><filename>boot.iso</filename></entry>
+		  </row>
+		  <row>
+		    <entry>UEFI-based 32-bit x86</entry>
+		    <entry namest="c2" nameend="c5" align="center">Not available</entry>
+		  </row>
+		  <row>
+		    <entry>BIOS-based AMD64 and Intel&nbsp;64</entry>
+		    <entry>x86_64 DVD ISO image file (to install 64-bit operating system) or x86 DVD ISO image file (to install 32-bit operating system)</entry>
+		    <entry>x86_64 DVD ISO image file (to install 64-bit operating system) or x86 DVD ISO image file (to install 32-bit operating system)</entry>
+		    <entry><filename>boot.iso</filename></entry>
+		    <entry><filename>boot.iso</filename></entry>
+		  </row>
+		  <row>
+		    <entry>UEFI-based AMD64 and Intel&nbsp;64</entry>
+		    <entry>x86_64 DVD ISO image file</entry>
+		    <entry>Not available</entry>
+		    <entry>Not available</entry>
+		    <entry><filename>efiboot.img</filename> (from x86_64 DVD ISO image file)</entry>
+		  </row>
+	      </tbody>
+	    </tgroup>
+	</table>
+
+	
+    <section id="sn-making-disc-media">
+      <title>Making an installation CD set or DVD</title>
+      <para>
+		You can make an installation CD set or DVD using the disc burning software on your computer.
+      </para>
+      
+<!-- this text is from Burn_the_image_file_to_CD.xml in the Fedora Installation Quick Start Guide -->
+	<para>
+		The exact series of steps that produces a CD or DVD from an ISO image file varies greatly from computer to computer, depending on the operating system and disc burning software installed. Use this procedure as a general guide. You might be able to omit certain steps on your computer, or might have to perform some of the steps in a different order from the order described here.
+	</para>
+	<para>
+		Make sure that your disc burning software is capable of burning discs from image files. Although this is true of most disc burning software, exceptions exist.
+	</para>
+	<para>
+		In particular, note that the disc burning feature built into Windows XP and Windows Vista cannot burn DVDs; and that earlier Windows operating systems did not have any disc burning capability installed by default at all. Therefore, if your computer has a Windows operating system prior to Windows&nbsp;7 installed on it, you need a separate piece of software for this task. Examples of popular disc burning software for Windows that you might already have on your computer include <application>Nero Burning ROM</application> and <application>Roxio Creator</application>. 
+	</para>
+	<para>
+		The <application>Disk Utility</application> software installed by default with Mac OS&nbsp;X on Apple computers has the capability to burn discs from images built into it already. Most widely-used CD burning software for Linux, such as <application>Brasero</application> and <application>K3b</application>, also includes this capability.
+	</para>
+	<procedure>
+		<step>
+			<para>
+				Download an ISO image file of a Fedora&nbsp;&PRODVER; disc as described in <xref linkend="ch-new-users"/>.
+			</para>
+		</step>
+		<step>
+			<para>
+				Insert a blank, writeable disc into your computer's disc burner. On some computers, a window opens and displays various options when you insert the disc. If you see a window like this, look for an option to launch your chosen disc burning program. If you do not see an option like this, close the window and launch the program manually.
+			</para>
+		</step>
+		<step>
+			<para>
+				Launch your disc burning program. On some computers, you can do this by right-clicking (or control-clicking) on the image file and selecting a menu option with a label like <guilabel>Copy image to CD</guilabel>, or <guilabel>Copy CD or DVD image</guilabel>. Other computers might provide you with a menu option to launch your chosen disc burning program, either directly or with an option like <guimenuitem>Open With</guimenuitem>. If none of these options are available on your computer, launch the program from an icon on your desktop, in a menu of applications such as the <guimenu>Start</guimenu> menu on Windows operating systems, or in the Mac <filename>Applications</filename> folder. 
+			</para>
+		</step>
+		<step>
+			<para>
+				In your disc burning program, select the option to burn a CD from an image file. For example, in <application>Nero Burning ROM</application>, this option is called <guimenuitem>Burn Image</guimenuitem> and is located on the <guimenu>File</guimenu> menu.
+			</para>
+			<para>
+				Note that you can skip this step when using certain CD burning software; for example, <application>Disk Utility</application> on Mac OS&nbsp;X does not require it.
+			</para>
+		</step>
+		<step>
+			<para>
+				Browse to the ISO image file that you downloaded previously and select it for burning.
+			</para>
+		</step>
+		<step>
+			<para>
+				Click the button that starts the burning process.
+			</para>
+		</step>
+	</procedure>
+<!-- end of text from Burn_the_image_file_to_CD.xml in the Fedora Installation Quick Start Guide -->
+	<para>
+		On some computers, the option to burn a disc from an ISO file is integrated into a <firstterm>context menu</firstterm> in the file browser. For example, when you right-click an ISO file on a computer with a Linux or UNIX operating system that runs the GNOME desktop, the <application>Nautilus</application> file browser presents you with the option to <guimenuitem>Write to disk</guimenuitem>.
+	</para>
+    </section>
+
+<xi:include href="Making_USB_media.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include> 
+<xi:include href="Making_Minimal_Boot_Media.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>  
+</chapter>
diff --git a/en-US/Making_Minimal_Boot_Media.xml b/en-US/Making_Minimal_Boot_Media.xml
new file mode 100644
index 0000000..d3d598c
--- /dev/null
+++ b/en-US/Making_Minimal_Boot_Media.xml
@@ -0,0 +1,179 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+"http://www.docbook.org/xml/4.4/docbookx.dtd" [
+]>
+
+<section id="Making_Minimal_Boot_Media">
+	<title>Making Minimal Boot Media</title>
+	<para>
+		A piece of <firstterm>minimal boot media</firstterm> is a CD, DVD, or USB flash drive that contains the software to boot the system and launch the installation program, but which does not contain the software that must be transferred to the system to create a Fedora installation. 
+	</para>
+	<para>
+		Use minimal boot media:
+	</para>
+		<itemizedlist>
+			<listitem>
+				<para>
+					to boot the system to install Fedora over a network
+				</para>
+			</listitem>
+			<listitem>
+				<para>
+					to boot the system to install Fedora from a hard drive
+				</para>
+			</listitem>
+			<listitem>
+				<para>
+					to use a kickstart file during installation (refer to <xref linkend="s2-kickstart2-boot-media"/>
+				</para>
+			</listitem>
+			<listitem>
+				<para>
+					to commence a network or hard-drive installation or to use an <application>anaconda</application> update or a kickstart file with a DVD installation. 
+				</para>
+			</listitem>
+		</itemizedlist>
+	<para>
+		You can use minimal boot media to start the installation process on 32-bit x86 systems, AMD64 or Intel&nbsp;64 systems, and POWER systems. The process by which you create minimal boot media for systems of these various types is identical except in the case of AMD64 and Intel&nbsp;64 systems with UEFI firmware interfaces â€” refer to <xref linkend="Making_Minimal_Boot_Media-UEFI"/>.
+	</para>
+	<para>
+		To make minimal boot media for 32-bit x86 systems, BIOS-based AMD64 or Intel&nbsp;64 systems, and POWER systems:
+	</para>
+	<procedure>
+		<step>
+			<para>
+				Download the ISO image file named <filename>boot.iso</filename> that is available at the same location as the images of the Fedora&nbsp;&PRODVER; installation DVD â€” refer to <xref linkend="ch-new-users"/>. 
+			</para>
+		</step>
+		<step>
+			<para>
+				Burn <filename>boot.iso</filename> to a blank CD or DVD using the same procedure detailed in <xref linkend="sn-making-disc-media"/> for the installation disc, or transfer the <filename>boot.iso</filename> file to a USB device with the <application>dd</application> command as detailed in <xref linkend="Making_USB_Media"/>. As the <filename>boot.iso</filename> file is only around 200&nbsp;MB in size, you do not need an especially large USB flash drive.
+			</para>
+		</step>
+	</procedure>
+	<section id="Making_Minimal_Boot_Media-UEFI">
+		<title>UEFI-based systems</title>
+		<para>
+			The Fedora Project does not provide an image to produce minimal boot CDs or DVDs for UEFI-based systems. Use a USB flash drive (as described in this section) to boot the Fedora&nbsp;&PRODVER; installer, or use the installation DVD with the <command>linux askmethod</command> option to boot the installer from DVD and continue installation from a different installation source â€” refer to <xref linkend="s1-installmethod-x86"/>.
+		</para>
+		<para>
+			Use the <filename>efidisk.img</filename> file in the <filename>images/</filename> directory on the Fedora&nbsp;&PRODVER; installation DVD to produce a bootable USB flash drive for UEFI-based systems. 
+		</para>
+		<procedure>
+			<step>
+				<para>
+					Download an ISO image file of the Fedora&nbsp;&PRODVER; installation DVD as described in <xref linkend="ch-new-users"/>.
+				</para>
+			</step>
+			<step>
+				<para>
+					Become root:
+				</para>
+<screen><command>su -</command></screen>
+			</step>
+			<step>
+				<para>
+					Create a mount point for the ISO image file:
+				</para>
+<screen><command>mkdir /mnt/dvdiso</command></screen>
+			</step>
+			<step>
+				<para>
+					Mount the image file:
+				</para>
+<screen><command>mount <replaceable>DVD.iso</replaceable> /mnt/dvdiso -o loop</command></screen>
+				<para>
+					Where <replaceable>DVD.iso</replaceable> is the name of the ISO image file, for example <filename>RHEL&PRODVER;-Server-x86_64-DVD.iso</filename>.
+				</para>
+			</step>
+			<step>
+				<para>
+					Transfer <filename>efidisk.img</filename> from the ISO image file to your USB flash drive:
+				</para>
+<screen><command>dd if=/mnt/dvdiso/images/efidisk.img of=/dev/<replaceable>device_name</replaceable></command></screen>
+				<para>
+					For example:
+				</para>
+<screen><command>dd if=/mnt/dvdiso/images/efidisk.img of=/dev/sdc</command></screen>
+			</step>
+			<step>
+				<para>
+					Unmount the ISO image file:
+				</para>
+<screen><command>umount /mnt/dvdiso</command></screen>
+			</step>
+		</procedure>
+	</section>
+
+	
+
+	
+
+	
+	
+<!--	<section>
+		<title>Alternative Method to Make Minimal USB Boot Media</title>
+		<para>
+			If you use <application>dd</application> to transfer the contents of <filename>boot.iso</filename> to a USB device, you necessarily destroy any data already stored on the device. The procedure described here requires more commands but is not destructive. Again, you must have a copy of the <filename>boot.iso</filename> file from a Red Hat Enterprise Linux installation DVD, and you need a USB storage device formatted with the VFAT file system and around 16&nbsp;MB of free space.
+		</para>
+		<procedure>
+			<step>
+				<para>
+					Become root:
+				</para>
+<screen><command>su -</command></screen>
+			</step>
+			<step>
+				<para>
+					Install the <application>SYSLINUX</application> bootloader on the USB storage device:
+				</para>
+<screen><command>syslinux /dev/<replaceable>sdX1</replaceable></command></screen>
+				<para>
+					where <replaceable>sdX</replaceable> is the device name.
+				</para>
+			</step>
+			<step>
+				<para>
+					Create mount points for <filename>boot.iso</filename> and the USB storage device:
+				</para>
+<screen><command>mkdir /mnt/isoboot /mnt/diskboot</command></screen>
+			</step>
+			<step>
+				<para>
+					Mount <filename>boot.iso</filename>:
+				</para>
+<screen><command>mount boot.iso /mnt/isoboot -o loop</command></screen>
+			</step>
+			<step>
+				<para>
+					Mount the USB storage device:
+				</para>
+<screen><command>mount /dev/<replaceable>sdX1</replaceable> /mnt/diskboot</command></screen>
+			</step>
+			<step>
+				<para>
+					Copy the <application>ISOLINUX</application> files from the <filename>boot.iso</filename> to the USB storage device:
+				</para>
+<screen><command>cp /mnt/isoboot/isolinux/* /mnt/diskboot</command></screen>
+			</step>
+			<step>
+				<para>
+					Use the <filename>isolinux.cfg</filename> file from <filename>boot.iso</filename> as the <filename>syslinux.cfg</filename> file for the USB device:
+				</para>
+<screen><command>grep -v local /mnt/isoboot/isolinux/isolinux.cfg > /mnt/diskboot/syslinux.cfg</command></screen>
+			</step>
+			<step>
+				<para>
+					Unmount <filename>boot.iso</filename>:
+				</para>
+<screen><command>umount /mnt/isoboot</command></screen>
+			</step>
+			<step>
+				<para>
+					Unmount the USB storage device:
+				</para>
+<screen><command>umount /mnt/diskboot</command></screen>
+			</step>
+		</procedure>
+	</section> -->
+</section>
diff --git a/en-US/Making_USB_media.xml b/en-US/Making_USB_media.xml
index 31ecb48..05dc282 100644
--- a/en-US/Making_USB_media.xml
+++ b/en-US/Making_USB_media.xml
@@ -4,13 +4,7 @@
 ]>
 
 <section id="Making_USB_Media">
-	<title>Making USB Media</title>
-	<important>
-		<title>Btrfs</title>
-		<para>
-			The <application>GRUB</application> bootloader does not support the Btrfs file system. You cannot create bootable USB media on media formatted as Btrfs. 
-		</para>
-	</important>
+	<title>Preparing a USB flash drive as an installation source</title>
 	<important>
 		<title>Unusual USB Media</title>
 		<para>
@@ -18,12 +12,11 @@
 		</para>
 	</important>
 	<para>
-		USB media often comes in the form of flash devices sometimes called <firstterm>pen drives</firstterm>, <firstterm>thumb disks</firstterm>, or <firstterm>keys</firstterm>; or as an externally connected hard disk device.  Almost all media of this type is formatted as a vfat file system.  You can create bootable USB media on media formatted as ext2, ext3, or vfat.
+		You can install Fedora on 32-bit x86 systems and BIOS-based AMD64 and Intel&nbsp;64 systems using a USB flash drive, provided that your hardware supports booting from this type of device. Note that you cannot install Fedora on <!--POWER systems or--> UEFI-based AMD64 and Intel&nbsp;64 systems from a USB flash drive, although you can use a USB flash drive to boot the Fedora installer on UEFI-based AMD64 and Intel&nbsp;64 systems â€” refer to <xref linkend="Making_Minimal_Boot_Media"/>.
 	</para>
-	<para>
-		  You can transfer a distribution image file, a live image file, or a minimal boot media image file to USB media. Make sure that sufficient free space is available on the device. You require around 4&nbsp;GB for a distribution DVD image, around 700&nbsp;MB for a live image or around 200&nbsp;MB for a minimal boot media image.
-	</para>
-	
+	<!-- <para>
+		You can transfer a distribution image file or a minimal boot media image file to USB media. Make sure that sufficient free space is available on the device. You require around 4&nbsp;GB for a distribution DVD image, or around 10&nbsp;MB for a minimal boot media image.
+	</para> -->
 	<section id="Making_USB_Media-Windows">
 		<title>Making Fedora USB Media on a Windows Operating System</title>
 		<xi:include href="Note_Nondestructive_Method.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
@@ -275,8 +268,20 @@
 				<para>
 					Use this method for the distribution image, the minimal boot media image, or on systems with a UNIX operating system (including Mac&nbsp;OX&nbsp;X).
 				</para>
+
 				<xi:include href="Procedure-dd_Image_to_USB.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
+				
 			</section>
 		</section>
 	</section>  
+	
+	
+	
+	
+	
+	
+	
+	
+
+
 </section>
diff --git a/en-US/Netboot_DHCP.xml b/en-US/Netboot_DHCP.xml
index 7f94507..e0f2626 100644
--- a/en-US/Netboot_DHCP.xml
+++ b/en-US/Netboot_DHCP.xml
@@ -24,14 +24,13 @@
 </indexterm>
 
 <para>
-	If a DHCP server does not already exist on the network, configure one. Refer to the Red Hat Enterprise Linux Deployment Guide for details. Make sure the configuration file contains the following so that PXE booting is enabled for systems which support it:
+	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>
 
-
 <para>
 	where the next-server <replaceable>&lt;server-ip&gt;</replaceable> should be replaced with the IP address of the <command>tftp</command> server.
 </para>
-</section>
\ No newline at end of file
+</section>
+
diff --git a/en-US/Netboot_TFTP.xml b/en-US/Netboot_TFTP.xml
index 58f2a72..d77fb46 100644
--- a/en-US/Netboot_TFTP.xml
+++ b/en-US/Netboot_TFTP.xml
@@ -9,19 +9,18 @@
 </indexterm>
 
 <para>
-	On the DHCP server, verify that the <filename>tftp-server</filename> package is installed with the command <command>rpm -q tftp-server</command>. <!-- If it is not installed, install it via Red Hat Network or the &PROD; CD-ROMs. <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="note_Installing_Packages.xml"/> -->
+	On the DHCP server, verify that the <filename>tftp-server</filename> package is installed with the command <command>rpm -q tftp-server</command>. 
 </para>
 
 <para>
 	<command>tftp</command> is an xinetd-based service; start it with the following commands:
 </para>
 
-<screen>
-<command>/sbin/chkconfig --level 345 xinetd on </command>
-<command>/sbin/chkconfig --level 345 tftp on</command>
-</screen>
+<screen><command>/sbin/chkconfig --level 345 xinetd on</command>
+<command>/sbin/chkconfig --level 345 tftp on</command></screen>
 
 <para>
 	These commands configure the <command>tftp</command> and <command>xinetd</command> services to immediately turn on and also configure them to start at boot time in runlevels 3, 4, and 5.
 </para>
 </section>
+
diff --git a/en-US/Netconfig-common-tip-2.xml b/en-US/Netconfig-common-tip-2.xml
new file mode 100644
index 0000000..ac861c0
--- /dev/null
+++ b/en-US/Netconfig-common-tip-2.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+<!DOCTYPE tip PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+<!ENTITY % RH_ENTITIES SYSTEM "./Common_Config/rh-entities.ent">
+%RH_ENTITIES;
+
+]>
+
+
+<note><title>Note</title>
+	<para>
+		To change your network configuration after you have completed the installation, use the <application>Network Administration Tool</application>.
+	</para>
+	<para>
+		Type the <command>system-config-network</command> command in a shell prompt to launch the <application>Network Administration Tool</application>. If you are not root, it prompts you for the root password to continue.
+	</para>
+	<!-- <para>
+		The <application>Network Administration Tool</application> is now deprecated and will be replaced by <application>NetworkManager</application> during the lifetime of Red Hat Enterprise Linux&nbsp;6.
+	</para> -->
+</note>
\ No newline at end of file
diff --git a/en-US/Netconfig-x86.xml b/en-US/Netconfig-x86.xml
new file mode 100644
index 0000000..35091fa
--- /dev/null
+++ b/en-US/Netconfig-x86.xml
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+ "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+]>
+
+<section id="sn-Netconfig-x86">
+
+	<xi:include href="Netconfig_common-title-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+	<!-- Network Configuration -->
+
+	<!-- Indexterms -->
+	<xi:include href="Netconfig_common-indexterm-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+	<xi:include href="Netconfig_common-indexterm-2.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+	<xi:include href="Netconfig_common-indexterm-3.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+	<xi:include href="Netconfig_common-indexterm-4.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+	<xi:include href="Netconfig_common-indexterm-5.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+	<!-- end Indexterms -->
+
+	<xi:include href="Netconfig_common-para-2.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+	<!-- Setup prompts you to supply a host name and domain name for this computer, -->
+	
+	<xi:include href="Netconfig_common-note-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+	<!-- Valid Hostnames -->
+	
+	<xi:include href="Netconfig_common-figure-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+	<!--  Setting the hostname -->
+	
+	<xi:include href="Netconfig_common-para-6.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+	<!-- If your Fedora system is connected directly to the Internet, -->
+	
+	<xi:include href="Netconfig_common-note-2.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+	<!-- Modem Configuration -->
+	
+	<section id="sn-Netconfig-x86-edit">
+		<xi:include href="Netconfig_common-title-3.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+		<!-- Edit Network Connections -->
+		
+		<xi:include href="Netconfig_common-important-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+		<!-- Manual configuration often necessary -->
+		
+		<xi:include href="Netconfig-common-tip-2.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+		<!-- system-config-network -->
+		
+		<xi:include href="Netconfig_common-para-10.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+		<!-- To configure a network connection manually -->
+		
+		<xi:include href="Netconfig_common-figure-3.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+		<!--  Configuring network connections -->
+		
+		<xi:include href="Netconfig_common-para-11.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+		<!-- To add a new connection, click -->
+		
+		<xi:include href="Netconfig_common-para-20.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+		<!-- When you have finished -->
+		
+		<xi:include href="Netconfig_common-section-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+		<!-- Common options -->
+	
+		<xi:include href="Netconfig_common-section-2.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+		<!-- The Wired tab -->
+		
+		<xi:include href="Netconfig_common-section-3.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+		<!-- The 802.1x Security tab -->
+		
+		<section>
+			<xi:include href="Netconfig_common-title-4.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+			<!-- The IPv4 Settings tab -->
+			
+			<xi:include href="Netconfig_common-para-14.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+			<!-- On the <guilabel>IPv4 Settings</guilabel> tab -->
+			
+			<xi:include href="Netconfig_common-para-16.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+			<!-- Use the Method drop-down menu -->
+			
+			<xi:include href="Netconfig_common-variablelist-2.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+			<!-- Automatic (DHCP) -->
+			
+			<xi:include href="Netconfig_common-para-17.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+			<!-- If you selected a method that requires you -->
+			
+			<xi:include href="Netconfig_common-para-18.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+			<!-- Optionally, enter a name for this network connection -->
+			
+			<xi:include href="Netconfig_common-para-19.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+			<!-- Deselect the Require IPv4 addressing for this connection to complete -->
+			
+			<xi:include href="Netconfig_common-figure-4.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+			<!-- The IPv4 Settings tab -->
+			
+			<xi:include href="Netconfig_common-section-4.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+			<!-- Editing IPv4 Routes -->
+			
+		</section>
+		
+		<xi:include href="Netconfig_common-section-5.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+		<!-- The IPv6 settings tab -->
+		
+		
+
+		
+	
+		
+	
+	
+		
+		
+		
+	
+		
+		
+	</section>
+
+
+	
+
+</section>
+
+
diff --git a/en-US/Netconfig_common-figure-1.xml b/en-US/Netconfig_common-figure-1.xml
new file mode 100644
index 0000000..c93a802
--- /dev/null
+++ b/en-US/Netconfig_common-figure-1.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+ "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+]>
+
+<figure float="0">
+	<title>Setting the hostname</title>
+	<mediaobject>
+		<imageobject><imagedata fileref="images/netconfig/hostname-no-localhost.png" format="PNG"/></imageobject>
+		<textobject><para>
+				Setting the hostname
+			</para>
+		</textobject>
+	</mediaobject>
+</figure>
+
diff --git a/en-US/Netconfig_common-figure-3.xml b/en-US/Netconfig_common-figure-3.xml
new file mode 100644
index 0000000..b6d2d16
--- /dev/null
+++ b/en-US/Netconfig_common-figure-3.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE figure PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+ "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+]>
+
+<figure float="0">
+	<title>Network Connections</title>
+	<mediaobject>
+		<imageobject><imagedata fileref="images/netconfig/network-connections.png" format="PNG"/></imageobject>
+		<textobject><para>
+				Configuring network connections.
+			</para>
+		</textobject>
+	</mediaobject>
+</figure>
+
diff --git a/en-US/Netconfig_common-figure-4.xml b/en-US/Netconfig_common-figure-4.xml
new file mode 100644
index 0000000..4e55d3e
--- /dev/null
+++ b/en-US/Netconfig_common-figure-4.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE figure PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+ "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+]>
+
+<figure float="0">
+	<title>The IPv4 Settings tab</title>
+	<mediaobject>
+		<imageobject><imagedata fileref="images/netconfig/network-connections-ipv4-manual.png" format="PNG"/></imageobject>
+		<textobject><para>
+				The IPv4 Settings tab
+			</para>
+		</textobject>
+	</mediaobject>
+</figure>
+
+		
\ No newline at end of file
diff --git a/en-US/Netconfig_common-important-1.xml b/en-US/Netconfig_common-important-1.xml
new file mode 100644
index 0000000..12cfa0a
--- /dev/null
+++ b/en-US/Netconfig_common-important-1.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE important PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+ "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+]>
+
+<important>
+	<title>Important â€” Manual configuration is often needed</title>
+	<para>
+		When a Fedora&nbsp;&PRODVER; installation boots for the first time, it activates any network interfaces that you configured during the installation process. However, the installer does not prompt you to configure network interfaces on some common installation paths, for example, when you install Fedora from a DVD to a local hard drive.
+	</para>
+	<para>
+		When you install Fedora from a local installation source to a local storage device, be sure to configure at least one network interface manually if you require network access when the system boots for the first time. 
+	</para>
+</important>
+
diff --git a/en-US/Netconfig_common-indexterm-1.xml b/en-US/Netconfig_common-indexterm-1.xml
new file mode 100644
index 0000000..8c050fd
--- /dev/null
+++ b/en-US/Netconfig_common-indexterm-1.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+ "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+]>
+
+<indexterm>
+	<primary>DHCP (Dynamic Host Configuration Protocol)</primary>
+</indexterm>
+
diff --git a/en-US/Netconfig_common-indexterm-2.xml b/en-US/Netconfig_common-indexterm-2.xml
new file mode 100644
index 0000000..d9d4e17
--- /dev/null
+++ b/en-US/Netconfig_common-indexterm-2.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+ "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+]>
+
+<indexterm>
+	<primary>IPv4</primary>
+</indexterm>
+
diff --git a/en-US/Netconfig_common-indexterm-3.xml b/en-US/Netconfig_common-indexterm-3.xml
new file mode 100644
index 0000000..9684632
--- /dev/null
+++ b/en-US/Netconfig_common-indexterm-3.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+ "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+]>
+
+<indexterm>
+	<primary>hostname</primary>
+</indexterm>
+
diff --git a/en-US/Netconfig_common-indexterm-4.xml b/en-US/Netconfig_common-indexterm-4.xml
new file mode 100644
index 0000000..9684632
--- /dev/null
+++ b/en-US/Netconfig_common-indexterm-4.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+ "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+]>
+
+<indexterm>
+	<primary>hostname</primary>
+</indexterm>
+
diff --git a/en-US/Netconfig_common-indexterm-5.xml b/en-US/Netconfig_common-indexterm-5.xml
new file mode 100644
index 0000000..2b70c2e
--- /dev/null
+++ b/en-US/Netconfig_common-indexterm-5.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+ "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+]>
+
+<indexterm> 
+	<primary>modem</primary>
+</indexterm>
+
diff --git a/en-US/Netconfig_common-note-1.xml b/en-US/Netconfig_common-note-1.xml
new file mode 100644
index 0000000..d0eb346
--- /dev/null
+++ b/en-US/Netconfig_common-note-1.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+ "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+]>
+
+<note>
+	<title>Valid Hostnames</title>
+	<para>
+		You may give your system any name provided that the full hostname is unique.  The hostname may include letters, numbers and hyphens. 
+	</para>
+</note>
+
diff --git a/en-US/Netconfig_common-note-2.xml b/en-US/Netconfig_common-note-2.xml
new file mode 100644
index 0000000..2111ade
--- /dev/null
+++ b/en-US/Netconfig_common-note-2.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+ "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+]>
+
+<note>
+	<title>Modem Configuration</title>
+	<para>
+		The installation program does not configure modems.  Configure these devices after installation with the <application>Network</application> utility. The settings for your modem are specific to your particular Internet Service Provider (ISP). 
+	</para>
+</note>
+
diff --git a/en-US/Netconfig_common-para-10.xml b/en-US/Netconfig_common-para-10.xml
new file mode 100644
index 0000000..efde059
--- /dev/null
+++ b/en-US/Netconfig_common-para-10.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+ "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+]>
+
+<para>
+	To configure a network connection manually, click the button <guibutton>Configure Network</guibutton>. The <guilabel>Network Connections</guilabel> dialog appears that allows you to configure wired, wireless, mobile broadband, VPN, and DSL connections for the system using the <application>NetworkManager</application> tool. A full description of all configurations possible with <application>NetworkManager</application> is beyond the scope of this guide. This section only details the most typical scenario of how to configure wired connections during installation. Configuration of other types of network is broadly similar, although the specific parameters that you must configure are necessarily different.
+</para>
+
diff --git a/en-US/Netconfig_common-para-11.xml b/en-US/Netconfig_common-para-11.xml
new file mode 100644
index 0000000..fd9f2ec
--- /dev/null
+++ b/en-US/Netconfig_common-para-11.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+ "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+]>
+
+<para>
+	To add a new connection or to modify or remove a connection configured earlier in the installation process, click the tab that corresponds to the type of connection. To add a new connection of that type, click <guibutton>Add</guibutton>. To modify an existing connection, select it in the list and click <guibutton>Edit</guibutton>. In either case, a dialog box appears with a set of tabs that is appropriate to the particular connection type, as described below. To remove a connection, select it in the list and click <guibutton>Delete</guibutton>.
+</para>
+
diff --git a/en-US/Netconfig_common-para-12.xml b/en-US/Netconfig_common-para-12.xml
new file mode 100644
index 0000000..5bfdba6
--- /dev/null
+++ b/en-US/Netconfig_common-para-12.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+ "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+]>
+
+<para>
+	Select <guilabel>Start automatically</guilabel> to start the connection automatically when the system boots.
+</para>
+
diff --git a/en-US/Netconfig_common-para-13.xml b/en-US/Netconfig_common-para-13.xml
new file mode 100644
index 0000000..afd1b63
--- /dev/null
+++ b/en-US/Netconfig_common-para-13.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+ "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+]>
+
+<para>
+	Select <guilabel>Available to all users</guilabel> to make the connection available to all users.
+</para>
+
diff --git a/en-US/Netconfig_common-para-14.xml b/en-US/Netconfig_common-para-14.xml
new file mode 100644
index 0000000..15d626a
--- /dev/null
+++ b/en-US/Netconfig_common-para-14.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+ "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+]>
+
+<para>
+	Use the <guilabel>IPv4 Settings tab</guilabel> tab to configure the IPv4 parameters for the previously selected network connection.
+</para>
+
diff --git a/en-US/Netconfig_common-para-15.xml b/en-US/Netconfig_common-para-15.xml
new file mode 100644
index 0000000..bd2bfc7
--- /dev/null
+++ b/en-US/Netconfig_common-para-15.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+ "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+]>
+
+<para>
+	Specify a name for the connection in the <guilabel>Connection name</guilabel> name field. 
+</para>
+
diff --git a/en-US/Netconfig_common-para-16.xml b/en-US/Netconfig_common-para-16.xml
new file mode 100644
index 0000000..36eedef
--- /dev/null
+++ b/en-US/Netconfig_common-para-16.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+ "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+]>
+
+<para>
+	Use the <guilabel>Method</guilabel> drop-down menu to specify which settings the system should attempt to obtain from a <firstterm>Dynamic Host Configuration Protocol</firstterm> (DHCP) service running on the network. Choose from the following options:
+</para>
+
diff --git a/en-US/Netconfig_common-para-17.xml b/en-US/Netconfig_common-para-17.xml
new file mode 100644
index 0000000..a167cc7
--- /dev/null
+++ b/en-US/Netconfig_common-para-17.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+ "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+]>
+
+<para>
+	If you selected a a method that requires you to supply manual parameters, enter details of the IP address for this interface, the netmask, and the gateway in the <guilabel>Addresses</guilabel> field. Use the <guibutton>Add</guibutton> and <guibutton>Delete</guibutton> buttons to add or remove addresses. Enter a comma-separated list of  DNS servers in the <guilabel>DNS servers</guilabel> field, and a comma-separated list of domains in the <guilabel>Search domains</guilabel> field for any domains that you want to include in name server lookups. 
+</para>
+
diff --git a/en-US/Netconfig_common-para-18.xml b/en-US/Netconfig_common-para-18.xml
new file mode 100644
index 0000000..bb3eac7
--- /dev/null
+++ b/en-US/Netconfig_common-para-18.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+ "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+]>
+
+<para>
+	Optionally, enter a name for this network connection in the <guilabel>DHCP client ID</guilabel> field. This name must be unique on the subnet. When you assign a meaningful DHCP client ID to a connection, it is easy to identify this connection when troubleshooting network problems.
+</para>
+
diff --git a/en-US/Netconfig_common-para-19.xml b/en-US/Netconfig_common-para-19.xml
new file mode 100644
index 0000000..b017d25
--- /dev/null
+++ b/en-US/Netconfig_common-para-19.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+ "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+]>
+
+<para>
+	Deselect the <guilabel>Require IPv4 addressing for this connection to complete</guilabel> check box to allow the system to make this connection on an IPv6-enabled network if IPv4 configuration fails but IPv6 configuration succeeds.
+</para>
+
diff --git a/en-US/Netconfig_common-para-2.xml b/en-US/Netconfig_common-para-2.xml
new file mode 100644
index 0000000..85f16f7
--- /dev/null
+++ b/en-US/Netconfig_common-para-2.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+ "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+]>
+
+<para>
+	  Setup prompts you to supply a host name for this computer, either as a <firstterm>fully-qualified domain name</firstterm> (FQDN) in the format <replaceable>hostname</replaceable>.<replaceable>domainname</replaceable> or as a <firstterm>short host name</firstterm> in the format <replaceable>hostname</replaceable>. Many networks have a <firstterm>Dynamic Host Configuration Protocol</firstterm> (DHCP) service that automatically supplies connected systems with a domain name. To allow the DHCP service to assign the domain name to this machine, specify the short host name only.
+</para>
+
diff --git a/en-US/Netconfig_common-para-20.xml b/en-US/Netconfig_common-para-20.xml
new file mode 100644
index 0000000..65eaf23
--- /dev/null
+++ b/en-US/Netconfig_common-para-20.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+ "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+]>
+
+<para>
+	When you have finished editing network settings, click <guilabel>Apply</guilabel> to activate your changes. Note that re-configuring your network settings might require you to re-connect using the new settings.
+</para>
+
diff --git a/en-US/Netconfig_common-para-6.xml b/en-US/Netconfig_common-para-6.xml
new file mode 100644
index 0000000..567ed10
--- /dev/null
+++ b/en-US/Netconfig_common-para-6.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+ "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+]>
+
+<para>
+	If your Fedora system is connected <emphasis>directly</emphasis> to the Internet, you must pay attention to additional considerations to avoid service interruptions or risk action by your upstream service provider.  A full discussion of these issues is beyond the scope of this document.
+</para>
+
diff --git a/en-US/Netconfig_common-section-1.xml b/en-US/Netconfig_common-section-1.xml
new file mode 100644
index 0000000..d6aed38
--- /dev/null
+++ b/en-US/Netconfig_common-section-1.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+ "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+]>
+
+<section>
+	<title>Options common to all types of connection</title>
+	<para>
+		Certain configuration options are common to all connection types.
+	</para>
+	
+	<xi:include href="Netconfig_common-para-15.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+	<!-- Specify a name for this connection in the  -->
+	
+	<xi:include href="Netconfig_common-para-12.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+	<!-- To start the connection automatically -->
+			
+	<xi:include href="Netconfig_common-para-13.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+	<!-- To make the connection available to all users -->
+			
+</section>
+
diff --git a/en-US/Netconfig_common-section-2.xml b/en-US/Netconfig_common-section-2.xml
new file mode 100644
index 0000000..8b112c5
--- /dev/null
+++ b/en-US/Netconfig_common-section-2.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE title PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+ "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+]>
+
+<section>
+
+	<title>The Wired tab</title>
+
+	<para>
+		Use the <guilabel>Wired</guilabel> tab to specify or change the <firstterm>media access control</firstterm> (MAC) address for the network adapter, and either set the <firstterm>maximum transmission unit</firstterm> (MTU, in bytes) that can pass through the interface.
+	</para>
+	
+	<figure float="0">
+		<title>The Wired tab</title>
+		<mediaobject>
+			<imageobject><imagedata fileref="images/netconfig/network-connections-wired.png" format="PNG"/></imageobject>
+			<textobject><para>
+					The Wired tab
+				</para>
+			</textobject>
+		</mediaobject>
+	</figure>
+
+</section>
\ No newline at end of file
diff --git a/en-US/Netconfig_common-section-3.xml b/en-US/Netconfig_common-section-3.xml
new file mode 100644
index 0000000..5ce2afe
--- /dev/null
+++ b/en-US/Netconfig_common-section-3.xml
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE title PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+ "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+]>
+
+<section>
+
+	<title>The 802.1x Security tab</title>
+
+	<para>
+		Use the <guilabel>802.1x Security</guilabel> tab to configure 802.1X <firstterm>port-based network access control</firstterm> (PNAC). Select <guilabel>Use 802.1X security for this connection</guilabel> to enable access control, then specify details of your network. The configuration options include:
+	</para>
+
+	<variablelist>
+		<varlistentry>
+			<term><guilabel>Authentication</guilabel></term>
+			<listitem>
+				<para>
+					Choose one of the following methods of authentication:
+				</para>
+				<itemizedlist>
+					<listitem>
+						<para>
+							<guilabel>TLS</guilabel> for <firstterm>Transport Layer Security</firstterm>
+						</para>
+					</listitem>
+					<listitem>
+						<para>
+							<guilabel>Tunneled TLS</guilabel> for <firstterm>Tunneled Transport Layer Security</firstterm>, otherwise known as TTLS, or EAP-TTLS
+						</para>
+					</listitem>
+					<listitem>
+						<para>
+							<guilabel>Protected EAP (PEAP)</guilabel> for <firstterm>Protected Extensible Authentication Protocol</firstterm>
+						</para>
+					</listitem>
+				</itemizedlist>
+			</listitem>
+		</varlistentry>
+		<varlistentry>
+			<term><guilabel>Identity</guilabel></term>
+			<listitem>
+				<para>
+					Provide the identity of this server.
+				</para>
+			</listitem>
+		</varlistentry>
+		<varlistentry>
+			<term><guilabel>User certificate</guilabel></term>
+			<listitem>
+				<para>
+					Browse to a personal X.509 certificate file encoded with <firstterm>Distinguished Encoding Rules</firstterm> (DER) or <firstterm>Privacy Enhanced Mail</firstterm> (PEM). 
+				</para>
+			</listitem>
+		</varlistentry>
+		<varlistentry>
+			<term><guilabel>CA certificate</guilabel></term>
+			<listitem>
+				<para>
+					Browse to a X.509 <firstterm>certificate authority</firstterm> certificate file encoded with <firstterm>Distinguished Encoding Rules</firstterm> (DER) or <firstterm>Privacy Enhanced Mail</firstterm> (PEM). 
+				</para>
+			</listitem>
+		</varlistentry>
+		<varlistentry>
+			<term><guilabel>Private key</guilabel></term>
+			<listitem>
+				<para>
+					Browse to a <firstterm>private key</firstterm> file encoded with <firstterm>Distinguished Encoding Rules</firstterm> (DER), <firstterm>Privacy Enhanced Mail</firstterm> (PEM), or the <firstterm>Personal Information Exchange Syntax Standard</firstterm> (PKCS#12).
+				</para>
+			</listitem>
+		</varlistentry>
+		<varlistentry>
+			<term><guilabel>Private key password</guilabel></term>
+			<listitem>
+				<para>
+					The password for the private key specified in the <guilabel>Private key</guilabel> field. Select <guilabel>Show password</guilabel> to make the password visible as you type it.
+				</para>
+			</listitem>
+		</varlistentry>
+	</variablelist>
+
+	<figure float="0">
+		<title>The 802.1x Security tab</title>
+		<mediaobject>
+			<imageobject><imagedata fileref="images/netconfig/network-connections-802.1x.png" format="PNG"/></imageobject>
+			<textobject><para>
+					The 802.1x Security tab
+				</para>
+			</textobject>
+		</mediaobject>
+	</figure>
+
+</section>
\ No newline at end of file
diff --git a/en-US/Netconfig_common-section-4.xml b/en-US/Netconfig_common-section-4.xml
new file mode 100644
index 0000000..40bfd76
--- /dev/null
+++ b/en-US/Netconfig_common-section-4.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE title PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+ "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+]>
+
+<section>
+
+	<title>Editing IPv4 routes</title>
+
+	<para>
+		Fedora configures a number of routes automatically based on the IP addresses of a device. To edit additional routes, click the <guibutton>Routes</guibutton> button. The <guilabel>Editing IPv4 routes</guilabel> dialog appears. 
+	</para>
+ 
+	<figure float="0">
+		<title>The Editing IPv4 Routes dialog</title>
+		<mediaobject>
+			<imageobject><imagedata fileref="images/netconfig/network-connections-ipv4-manual-routes.png" format="PNG"/></imageobject>
+			<textobject><para>
+					The Editing IPv4 Routes dialog
+				</para>
+			</textobject>
+		</mediaobject>
+	</figure>
+	
+	<para>
+		Click <guibutton>Add</guibutton> to add the IP address, netmask, gateway address, and metric for a new static route. 
+	</para>
+	
+	<para>
+		Select <guibutton>Ignore automatically obtained routes</guibutton> to make the interface use only the routes specified for it here. 
+	</para>
+	
+	<para>
+		Select <guibutton>Use this connection only for resources on its network</guibutton> to restrict connections only to the local network. 
+	</para>
+
+</section>
\ No newline at end of file
diff --git a/en-US/Netconfig_common-section-5.xml b/en-US/Netconfig_common-section-5.xml
new file mode 100644
index 0000000..17390b6
--- /dev/null
+++ b/en-US/Netconfig_common-section-5.xml
@@ -0,0 +1,122 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE title PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+ "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+]>
+
+<section>
+
+	<title>The IPv6 Settings tab</title>
+
+	<para>
+		Use the <guilabel>IPv6 Settings tab</guilabel> tab to configure the IPv6 parameters for the previously selected network connection.
+	</para>
+	
+	<xi:include href="Netconfig_common-para-16.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+	<!-- Use the Method drop-down menu -->
+	
+	<variablelist>
+		<varlistentry>
+			<term><guilabel>Ignore</guilabel></term>
+			
+				<listitem>
+					<para>
+						IPv6 is ignored for this connection.
+					</para>
+				</listitem>
+			
+		</varlistentry>
+		<varlistentry>
+			<term><guilabel>Automatic</guilabel></term>
+			
+				<listitem>
+					<para>
+						IPv6 parameters are configured by the DHCP service on the network.
+					</para>
+				</listitem>
+			
+		</varlistentry>
+		<varlistentry>
+			<term><guilabel>Automatic, addresses only</guilabel></term>
+			
+				<listitem>
+					<para>
+						The IPv6 address, prefix, and gateway address are configured by the DHCP service on the network, but DNS servers and search domains must be configured manually. 
+					</para>
+				</listitem>
+			
+		</varlistentry>
+		<varlistentry>
+			<term><guilabel>Manual</guilabel></term>
+			
+				<listitem>
+					<para>
+						IPv6 parameters are configured manually for a static configuration.
+					</para>
+				</listitem>
+			
+		</varlistentry>
+		<varlistentry>
+			<term><guilabel>Link-Local Only</guilabel></term>
+			
+				<listitem>
+					<para>
+						A <firstterm>link-local</firstterm> address with the fe80::/10 prefix is assigned to the interface. 
+					</para>
+				</listitem>
+			
+		</varlistentry>
+	</variablelist>
+		
+	<xi:include href="Netconfig_common-para-17.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+	<!-- If you selected a method that requires you -->
+      
+	<xi:include href="Netconfig_common-para-18.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+	<!-- Optionally, enter a name for this network connection -->
+	
+	<para>
+		Deselect the <guilabel>Require IPv6 addressing for this connection to complete</guilabel> check box to allow the system to make this connection on an IPv4-enabled network if IPv6 configuration fails but IPv4 configuration succeeds.
+	</para>
+	
+	<figure float="0">
+		<title>The IPv6 Settings tab</title>
+		<mediaobject>
+			<imageobject><imagedata fileref="images/netconfig/network-connections-ipv6-ignore.png" format="PNG"/></imageobject>
+			<textobject><para>
+					The IPv6 Settings tab
+				</para>
+			</textobject>
+		</mediaobject>
+	</figure>
+
+
+	<section>
+
+		<title>Editing IPv6 routes</title>
+
+		<para>
+			Fedora configures a number of routes automatically based on the IP addresses of a device. To edit additional routes, click the <guibutton>Routes</guibutton> button. The <guilabel>Editing IPv6 routes</guilabel> dialog appears. 
+		</para>
+	
+		<figure float="0">
+			<title>The Editing IPv6 Routes dialog</title>
+			<mediaobject>
+				<imageobject><imagedata fileref="images/netconfig/network-connections-ipv6-manual-routes.png" format="PNG"/></imageobject>
+				<textobject><para>
+						The Editing IPv6 Routes dialog
+					</para>
+				</textobject>
+			</mediaobject>
+		</figure>
+		
+		<para>
+			Click <guibutton>Add</guibutton> to add the IP address, netmask, gateway address, and metric for a new static route. 
+		</para>
+		
+		<para>
+			Select <guibutton>Use this connection only for resources on its network</guibutton> to restrict connections only to the local network. 
+		</para>
+
+	</section>
+
+
+</section>
diff --git a/en-US/Netconfig_common-title-1.xml b/en-US/Netconfig_common-title-1.xml
new file mode 100644
index 0000000..651b611
--- /dev/null
+++ b/en-US/Netconfig_common-title-1.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+ "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+]>
+
+<title>Setting the Hostname</title>
+
diff --git a/en-US/Netconfig_common-title-3.xml b/en-US/Netconfig_common-title-3.xml
new file mode 100644
index 0000000..dce7134
--- /dev/null
+++ b/en-US/Netconfig_common-title-3.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE title PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+ "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+]>
+
+<title>Edit Network Connections</title>
+
diff --git a/en-US/Netconfig_common-title-4.xml b/en-US/Netconfig_common-title-4.xml
new file mode 100644
index 0000000..99a0918
--- /dev/null
+++ b/en-US/Netconfig_common-title-4.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE title PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+ "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+]>
+
+<title>The IPv4 Settings tab</title>
+
diff --git a/en-US/Netconfig_common-variablelist-2.xml b/en-US/Netconfig_common-variablelist-2.xml
new file mode 100644
index 0000000..2e9c49c
--- /dev/null
+++ b/en-US/Netconfig_common-variablelist-2.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE variablelist PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+ "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+]>
+
+<variablelist>
+	<varlistentry>
+		<term><guilabel>Automatic (DHCP)</guilabel></term>
+		
+			<listitem>
+				<para>
+					IPv4 parameters are configured by the DHCP service on the network.
+				</para>
+			</listitem>
+		
+	</varlistentry>
+	<varlistentry>
+		<term><guilabel>Automatic (DHCP) addresses only</guilabel></term>
+		
+			<listitem>
+				<para>
+					The IPv4 address, netmask, and gateway address are configured by the DHCP service on the network, but DNS servers and search domains must be configured manually. 
+				</para>
+			</listitem>
+		
+	</varlistentry>
+	<varlistentry>
+		<term><guilabel>Manual</guilabel></term>
+		
+			<listitem>
+				<para>
+					IPv4 parameters are configured manually for a static configuration.
+				</para>
+			</listitem>
+		
+	</varlistentry>
+	<varlistentry>
+		<term><guilabel>Link-Local Only</guilabel></term>
+		
+			<listitem>
+				<para>
+					A <firstterm>link-local</firstterm> address in the 169.254/16 range is assigned to the interface. 
+				</para>
+			</listitem>
+		
+	</varlistentry>
+	<varlistentry>
+		<term><guilabel>Shared to other computers</guilabel></term>
+		
+			<listitem>
+				<para>
+					The system is configured to provide network access to other computers. The interface is assigned an address in the 10.42.x.1/24 range, a DHCP server and DNS server are started, and the interface is connected to the default network connection on the system with <firstterm>network address translation</firstterm> (NAT).
+				</para>
+			</listitem>
+		
+	</varlistentry>
+	<varlistentry>
+		<term><guilabel>Disabled</guilabel></term>
+		
+			<listitem>
+				<para>
+					IPv4 is disabled for this connection.
+				</para>
+			</listitem>
+		
+	</varlistentry>
+</variablelist>
+
diff --git a/en-US/Other_Disk_Devices-x86.xml b/en-US/Other_Disk_Devices-x86.xml
index 0b1bbad..b3b9ddc 100644
--- a/en-US/Other_Disk_Devices-x86.xml
+++ b/en-US/Other_Disk_Devices-x86.xml
@@ -47,7 +47,7 @@
 		<!-- FireWire and USB Disks -->
 		
 		<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Other_Disk_Devices-common-para-3.xml"/>
-		<!-- Some FireWire and USB hard disks may not be recognized by the Red Hat Enterprise Linux installation system. -->
+		<!-- Some FireWire and USB hard disks may not be recognized by the Fedora installation system. -->
 		
 		<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Other_Disk_Devices-common-note-1.xml"/>
 		<!-- Post-installation Usage -->
diff --git a/en-US/Package_Selection-x86.xml b/en-US/Package_Selection-x86.xml
index 41e8416..9f69498 100644
--- a/en-US/Package_Selection-x86.xml
+++ b/en-US/Package_Selection-x86.xml
@@ -22,7 +22,8 @@
 	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Package_Selection_common-para-2.xml"/>
 	<!-- The Package Installation Defaults screen... -->
 	
-	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Package_Selection_common-note-1.xml"/>
+	<!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Package_Selection_common-note-1.xml"/> -->
+	<!-- Fedora -->
 	<!-- Installing from a Live Image -->
 	
 	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Package_Selection_common-note-2.xml"/>
@@ -63,24 +64,6 @@
 	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Package_Selection_Customizing-x86.xml"/>
 	<!-- Select Customize now to specify the software packages for your final... -->
 	
-<!-- 	<note>
-		<title>Note</title>
-		
-		<para>
-			Users of Itanium systems who want support for developing or running 32-bit applications are encouraged to select the <guilabel>Compatibility Arch Support</guilabel> and
-			<guilabel>Compatibility Arch Development Support</guilabel> packages to install architecure specific support for their systems.
-		</para>
-	</note> -->
-<!--	BZ#250601, above replaces below:	
-		<para>
-			Users of AMD64, <trademark class="registered">Intel</trademark> 64, and Itanium systems who want support for developing or running 32-bit applications are encouraged to select the <guilabel>Compatibility Arch Support</guilabel> and
-			<guilabel>Compatibility Arch Development Support</guilabel> packages to install architecure specific support for their systems.
-		</para>-->
-
-	
-
-	
-	
 <!--	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Package_Selection_common-para-5.xml"/> -->
 	<!-- Select each component you wish to install. Selecting... -->
 	
@@ -88,3 +71,4 @@
 	<!-- Once a package group has been selected, click on... -->
 	
 </section>
+
diff --git a/en-US/Package_Selection_Customizing-common-figure-1.xml b/en-US/Package_Selection_Customizing-common-figure-1.xml
new file mode 100644
index 0000000..1440e64
--- /dev/null
+++ b/en-US/Package_Selection_Customizing-common-figure-1.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!DOCTYPE figure PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+ "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+]>
+
+
+<figure float="0" ><title>Package Group Details</title>
+	<mediaobject>
+		<imageobject><imagedata fileref="images/pkgselection/pkg-group-details.png" format="PNG"/></imageobject>
+		<textobject>
+			<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Package_Selection_common-imagecap-2.xml"/>
+			<!-- Choose to add or remove optional packages from this package group. -->
+		</textobject>
+	</mediaobject>
+</figure>
+
diff --git a/en-US/Package_Selection_Customizing-common-figure-2.xml b/en-US/Package_Selection_Customizing-common-figure-2.xml
new file mode 100644
index 0000000..4fcdee4
--- /dev/null
+++ b/en-US/Package_Selection_Customizing-common-figure-2.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!DOCTYPE figure PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+ "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+]>
+
+
+<figure float="0" ><title>Package Selection List Context Menu</title>
+	<mediaobject>
+		<imageobject><imagedata fileref="images/pkgselection/pkg-group-context.png" format="PNG"/></imageobject>
+		<textobject>
+			<para>The Context Menu allows presents you with options to select or deselect packages, and to select or deselect all optional packages in a group.</para>
+		</textobject>
+	</mediaobject>
+</figure>
+
diff --git a/en-US/Package_Selection_Customizing-common-itemizedlist-1.xml b/en-US/Package_Selection_Customizing-common-itemizedlist-1.xml
new file mode 100644
index 0000000..5f44ad2
--- /dev/null
+++ b/en-US/Package_Selection_Customizing-common-itemizedlist-1.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+ "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+]>
+
+<itemizedlist>
+	<listitem>
+		<para>
+			centralized logging through syslog
+		</para>
+	</listitem>
+	<listitem>
+		<para>
+			email through SMTP (Simple Mail Transfer Protocol)
+		</para>
+	</listitem>
+	<listitem>
+		<para>
+			network file sharing through NFS (Network File System)
+		</para>
+	</listitem>
+	<listitem>
+		<para>
+			remote access through SSH (Secure SHell)
+		</para>
+	</listitem>
+	<listitem>
+		<para>
+			resource advertising through mDNS (multicast DNS)
+		</para>
+	</listitem>
+</itemizedlist>
+
diff --git a/en-US/Package_Selection_Customizing-common-itemizedlist-2.xml b/en-US/Package_Selection_Customizing-common-itemizedlist-2.xml
new file mode 100644
index 0000000..cac6da2
--- /dev/null
+++ b/en-US/Package_Selection_Customizing-common-itemizedlist-2.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+ "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+]>
+
+<itemizedlist>
+	<listitem>
+		<para>
+			network file transfer through HTTP (HyperText Transfer Protocol)
+		</para>
+	</listitem>
+	<listitem>
+		<para>
+			printing through CUPS (Common UNIX Printing System)
+		</para>
+	</listitem>
+	<listitem>
+		<para>
+			remote desktop access through VNC (Virtual Network Computing)
+		</para>
+	</listitem>
+</itemizedlist>
+
diff --git a/en-US/Package_Selection_Customizing-common-note-1.xml b/en-US/Package_Selection_Customizing-common-note-1.xml
new file mode 100644
index 0000000..d7b1497
--- /dev/null
+++ b/en-US/Package_Selection_Customizing-common-note-1.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!DOCTYPE note PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+ "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+]>
+
+<note>
+	<title>Additional Language Support</title>
+	<para>
+		Your Fedora system automatically supports the language that you selected at the start of the installation process. To include support for additional languages, select the package group for those languages from the <guilabel>Languages</guilabel> category.
+	</para>
+</note>
+
diff --git a/en-US/Package_Selection_Customizing-common-para-1.xml b/en-US/Package_Selection_Customizing-common-para-1.xml
new file mode 100644
index 0000000..693fa79
--- /dev/null
+++ b/en-US/Package_Selection_Customizing-common-para-1.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+ "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+]>
+
+
+<para>
+	Select <guilabel>Customize now</guilabel> to specify the software packages for your final system in more detail. This option causes the installation process to display an additional customization screen when you select <guibutton>Next</guibutton>.
+</para>
+
diff --git a/en-US/Package_Selection_Customizing-common-para-10.xml b/en-US/Package_Selection_Customizing-common-para-10.xml
new file mode 100644
index 0000000..0df7aa3
--- /dev/null
+++ b/en-US/Package_Selection_Customizing-common-para-10.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!DOCTYPE title PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+ "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+]>
+
+<para>
+	Some automated processes on your Fedora system use the email service to send reports and messages to the system administrator. By default, the email, logging, and printing services do not accept connections from other systems. Fedora installs the NFS sharing, HTTP, and VNC components without enabling those services.
+</para>
+
diff --git a/en-US/Package_Selection_Customizing-common-para-11.xml b/en-US/Package_Selection_Customizing-common-para-11.xml
new file mode 100644
index 0000000..781464b
--- /dev/null
+++ b/en-US/Package_Selection_Customizing-common-para-11.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+ "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+]>
+
+<para>
+	You may configure your Fedora system after installation to offer email, file sharing, logging, printing and remote desktop access services. The SSH service is enabled by default. You may use NFS to access files on other systems without enabling the NFS sharing service.
+</para>
+
diff --git a/en-US/Package_Selection_Customizing-common-para-12.xml b/en-US/Package_Selection_Customizing-common-para-12.xml
new file mode 100644
index 0000000..3c3b11a
--- /dev/null
+++ b/en-US/Package_Selection_Customizing-common-para-12.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+ "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+]>
+
+<para>
+	In the package selection list on the right, you can use the context menu as a shortcut to select or de-select base and mandatory packages or all optional packages.
+</para>
\ No newline at end of file
diff --git a/en-US/Package_Selection_Customizing-common-para-2.xml b/en-US/Package_Selection_Customizing-common-para-2.xml
new file mode 100644
index 0000000..9315197
--- /dev/null
+++ b/en-US/Package_Selection_Customizing-common-para-2.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+ "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+]>
+
+<para>
+	Fedora divides the included software into <indexterm> <primary>package groups</primary> </indexterm> <firstterm>package groups</firstterm>. For ease of use, the package selection screen displays these groups as categories.
+</para>
+
diff --git a/en-US/Package_Selection_Customizing-common-para-3.xml b/en-US/Package_Selection_Customizing-common-para-3.xml
new file mode 100644
index 0000000..a3acc8a
--- /dev/null
+++ b/en-US/Package_Selection_Customizing-common-para-3.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+ "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+]>
+
+<para>
+	To view the package groups for a category, select the category from the list on the left. The list on the right displays the package groups for the currently selected category.
+</para>
+
diff --git a/en-US/Package_Selection_Customizing-common-para-4.xml b/en-US/Package_Selection_Customizing-common-para-4.xml
new file mode 100644
index 0000000..adb2945
--- /dev/null
+++ b/en-US/Package_Selection_Customizing-common-para-4.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+ "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+]>
+
+<para>
+	To specify a package group for installation, select the check box next to the group. The box at the bottom of the screen displays the details of the package group that is currently highlighted. <emphasis>None</emphasis> of the packages from a group will be installed unless the check box for that group is selected.
+</para>
+
diff --git a/en-US/Package_Selection_Customizing-common-para-5.xml b/en-US/Package_Selection_Customizing-common-para-5.xml
new file mode 100644
index 0000000..0cf350e
--- /dev/null
+++ b/en-US/Package_Selection_Customizing-common-para-5.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+ "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+]>
+
+<para>
+	If you select a package group, Fedora automatically installs the base and mandatory packages for that group. To change which optional packages within a selected group will be installed, select the <guibutton>Optional Packages</guibutton> button under the description of the group. Then use the check box next to an individual package name to change its selection.
+</para>
+
diff --git a/en-US/Package_Selection_Customizing-common-para-6.xml b/en-US/Package_Selection_Customizing-common-para-6.xml
new file mode 100644
index 0000000..98aa8f6
--- /dev/null
+++ b/en-US/Package_Selection_Customizing-common-para-6.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+ "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+]>
+
+<para>
+	After you choose the desired packages, select <guilabel>Next</guilabel> to proceed. The installer checks your selection, and automatically adds any extra packages required to use the software you selected. When you have finished selecting packages, click <guilabel>Close</guilabel> to save your optional package selections and return to the main package selection screen.
+</para>
\ No newline at end of file
diff --git a/en-US/Package_Selection_Customizing-common-para-7.xml b/en-US/Package_Selection_Customizing-common-para-7.xml
new file mode 100644
index 0000000..4ef20cc
--- /dev/null
+++ b/en-US/Package_Selection_Customizing-common-para-7.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+ "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+]>
+
+<para>
+	The packages that you select are not permanent. After you boot your system, use the <application>Add/Remove Software</application> tool to either install new software or remove installed packages. To run this tool, from the main menu, select <menuchoice> <guimenu>System</guimenu> <guisubmenu>Administration</guisubmenu> <guimenuitem>Add/Remove Software</guimenuitem> </menuchoice>. The Fedora software management system downloads the latest packages from network servers, rather than using those on the installation discs.
+</para>
+
diff --git a/en-US/Package_Selection_Customizing-common-para-8.xml b/en-US/Package_Selection_Customizing-common-para-8.xml
new file mode 100644
index 0000000..de27952
--- /dev/null
+++ b/en-US/Package_Selection_Customizing-common-para-8.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!DOCTYPE title PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+ "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+]>
+
+<para>
+	All Fedora installations include the following network services:
+</para>
+
+
diff --git a/en-US/Package_Selection_Customizing-common-para-9.xml b/en-US/Package_Selection_Customizing-common-para-9.xml
new file mode 100644
index 0000000..ece6451
--- /dev/null
+++ b/en-US/Package_Selection_Customizing-common-para-9.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!DOCTYPE title PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+ "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+]>
+
+<para>
+	The default installation also provides:
+</para>
+
diff --git a/en-US/Package_Selection_Customizing-common-title-1.xml b/en-US/Package_Selection_Customizing-common-title-1.xml
new file mode 100644
index 0000000..135611c
--- /dev/null
+++ b/en-US/Package_Selection_Customizing-common-title-1.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!DOCTYPE title PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+ "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+]>
+
+
+<title>
+	Customizing the Software Selection
+</title>
+
diff --git a/en-US/Package_Selection_Customizing-common-title-2.xml b/en-US/Package_Selection_Customizing-common-title-2.xml
new file mode 100644
index 0000000..29c81f3
--- /dev/null
+++ b/en-US/Package_Selection_Customizing-common-title-2.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!DOCTYPE title PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+ "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+]>
+
+<title>
+	Core Network Services
+</title>
+
+
diff --git a/en-US/Package_Selection_Customizing-x86.xml b/en-US/Package_Selection_Customizing-x86.xml
index e3ec488..9769fbc 100644
--- a/en-US/Package_Selection_Customizing-x86.xml
+++ b/en-US/Package_Selection_Customizing-x86.xml
@@ -4,183 +4,72 @@
  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
 ]>
 
-  <section id="sn-package-selection-x86">
-    <title>Customizing the Software Selection</title>
-    <para>
-      Select <guilabel>Customize now</guilabel> to specify the software
-      packages for your final system in more detail. This option causes
-      the installation process to display an additional customization
-      screen when you select <guibutton>Next</guibutton>.
-    </para>
-    <note>
-      <title>Installing Support for Additional Languages</title>
-
-      <para>
-      Select <guilabel>Customize now</guilabel> to install support for
-	additional languages. Refer to <xref
-	  linkend="sn-lang-packages"/> for more information on
-	configuring language support.
-      </para>
-    </note>
-
-	<figure float="0" id="fig-pkgselection-details-x86"><title>Package Group Details</title>
-		<mediaobject>
-			<imageobject><imagedata fileref="images/pkgselection/pkg-group-details.png" format="PNG"/></imageobject>
-			<textobject>
-				<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Package_Selection_common-imagecap-2.xml"/>
-				<!-- Choose to add or remove optional packages from this package group. -->
-			</textobject>
-		</mediaobject>
-	</figure>
-
-
-    <para>
-      Fedora divides the included software into
-      <indexterm>
-        <primary>package groups</primary>
-      </indexterm> <firstterm>package groups</firstterm>. For ease of
-      use, the package selection screen displays these groups as
-      categories.
-    </para>
+<section id="sn-package-selection-x86">
+
+	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Package_Selection_Customizing-common-title-1.xml"/>
+	<!-- Customizing the Software Selection -->
+	
+	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Package_Selection_Customizing-common-note-1.xml"/>
+	<!-- Your Fedora system automatically supports the language that you selected at the start of the installation process. -->
+	
+	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Package_Selection_Customizing-common-para-1.xml"/>
+	<!-- Select Customize now to specify the software packages for your final system in more detail. -->
+
+	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Package_Selection_Customizing-common-figure-1.xml"/>
+	<!-- Package Group Details -->
+	
+	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Package_Selection_Customizing-common-para-2.xml"/>
+	<!-- Fedora divides the included software into package groups -->
 
 	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Package_Selection_common-para-4.xml"/>
 	<!-- You can select package groups, which group components... -->
+	
+	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Package_Selection_Customizing-common-para-3.xml"/>
+	<!-- To view the package groups for a category, select the category from the list on the left. -->
+	
+	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Package_Selection_Customizing-common-para-4.xml"/>
+	<!-- To specify a package group for installation, select the check box next to the group. -->
+	
+	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Package_Selection_Customizing-common-para-5.xml"/>
+	<!-- If you select a package group, Fedora automatically installs the base and mandatory packages for that group. -->
+	
+	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Package_Selection_Customizing-common-para-12.xml"/>
+	<!-- In the package selection list on the right, you can use the context menu as a shortcut  -->
+	
+	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Package_Selection_Customizing-common-figure-2.xml"/>
+	<!-- Package Group Context Menu -->
+	
+	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Package_Selection_Customizing-common-para-6.xml"/>
+	<!-- After you choose the desired packages, select Next to proceed. -->
+	
+	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Package_Selection_Customizing-common-para-7.xml"/>
+	<!-- The packages that you select are not permanent. After you boot your system, use the Add/Remove Software tool to either install new software or remove installed packages. -->
+
+	<section id="sn-mandatory-services-x86">
+	
+		<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Package_Selection_Customizing-common-title-2.xml"/>
+		<!-- Core Network Services -->
+		
+		<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Package_Selection_Customizing-common-para-8.xml"/>
+		<!-- All Fedora installations include the following network services: -->
+		
+		<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Package_Selection_Customizing-common-itemizedlist-1.xml"/>
+		<!-- centralized logging through syslog -->
+
+		<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Package_Selection_Customizing-common-para-9.xml"/>
+		<!-- The default installation also provides: -->
+		
+		<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Package_Selection_Customizing-common-itemizedlist-2.xml"/>
+		<!-- network file transfer through HTTP (HyperText Transfer Protocol) -->
+
+		<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Package_Selection_Customizing-common-para-10.xml"/>
+		<!-- Some automated processes on your Fedora system use the email service to send reports and messages to the system administrator. -->
+		
+		<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Package_Selection_Customizing-common-para-11.xml"/>
+		<!-- You may configure your Fedora system after installation to offer email, file sharing, logging, printing and remote desktop access services. -->
+		
+	</section>
+</section>
 
-    <para>
-      To view the package groups for a category, select the category
-      from the list on the left. The list on the right displays the
-      package groups for the currently selected category.
-    </para>
-
-    <para>
-      To specify a package group for installation, select the check box
-      next to the group. The box at the bottom of the screen displays
-      the details of the package group that is currently highlighted.
-      <emphasis>None</emphasis> of the packages from a group will be
-      installed unless the check box for that group is selected.
-    </para>
-
-    <para>
-      If you select a package group, Fedora automatically installs the
-      base and mandatory packages for that group. To change which
-      optional packages within a selected group will be installed,
-      select the <guibutton>Optional Packages</guibutton> button under
-      the description of the group. Then use the check box next to an
-      individual package name to change its selection.
-    </para>
-    <para>
-      After you choose the desired packages, select
-      <guilabel>Next</guilabel> to proceed. Fedora checks your selection,
-      and automatically adds any extra packages required to use the
-      software you select. When you have finished selecting packages, click
-		<guilabel>Close</guilabel> to save your optional package selections and 
-		return to the main package 
-		selection screen.
-    </para>
-    <section id="sn-changing-selection">
-      <title>Changing Your Mind</title>
-      <para>
-	The packages that you select are not permanent. After you boot
-	your system, use the <application>Add/Remove Software</application> tool to
-	either install new software or remove installed packages. To run
-	this tool, from the main menu, select <menuchoice>
-	  <guimenu>System</guimenu>
-	  <guisubmenu>Administration</guisubmenu>
-	  <guimenuitem>Add/Remove Software</guimenuitem>
-	</menuchoice>. The Fedora software management system downloads
-	the latest packages from network servers, rather than using
-	those on the installation discs.
-      </para>
-    </section>
-    <section id="sn-lang-packages">
-      <title>Additional Language Support</title>
-
-      <para>
-	Your Fedora system automatically supports the language that you
-	selected at the start of the installation process. To include
-	support for additional languages, select the package group for
-	those languages from the <guilabel>Languages</guilabel>
-	category.
-      </para>
-
-    </section>
-    <section id="sn-mandatory-services">
-      <title>Core Network Services</title>
-
-      <para>
-	All Fedora installations include the following network
-	services:
-      </para>
-
-      <itemizedlist>
-	<listitem>
-	  <para>
-	    centralized logging through syslog
-	  </para>
-	</listitem>
-	<listitem>
-	  <para>
-	    email through SMTP (Simple Mail Transfer Protocol)
-	  </para>
-	</listitem>
-	<listitem>
-	  <para>
-	    network file sharing through NFS (Network File System)
-	  </para>
-	</listitem>
-	<listitem>
-	  <para>
-	    remote access through SSH (Secure SHell)
-	  </para>
-	</listitem>
-	<listitem>
-	  <para>
-	    resource advertising through mDNS (multicast DNS)
-	  </para>
-	</listitem>
-      </itemizedlist>
-
-      <para>
-	The default installation also provides:
-      </para>
-
-      <itemizedlist>
-	<listitem>
-	  <para>
-	    network file transfer through HTTP (HyperText Transfer
-	    Protocol)
-	  </para>
-	</listitem>
-	<listitem>
-	  <para>
-	    printing through CUPS (Common UNIX Printing System)
-	  </para>
-	</listitem>
-	<listitem>
-	  <para>
-	    remote desktop access through VNC (Virtual Network
-	    Computing)
-	  </para>
-	</listitem>
-      </itemizedlist>
-
-      <para>
-	Some automated processes on your Fedora system use the email
-	service to send reports and messages to the system
-	administrator. By default, the email, logging, and printing
-	services do not accept connections from other systems. Fedora
-	installs the NFS sharing, HTTP, and VNC components without
-	enabling those services.
-      </para>
-
-      <para>
-	You may configure your Fedora system after installation to offer
-	email, file sharing, logging, printing and remote desktop access
-	services. The SSH service is enabled by default. You may use NFS
-	to access files on other systems without enabling the NFS
-	sharing service.
-      </para>
-    </section>
-  </section>
 
 
diff --git a/en-US/Package_Selection_common-imagecap-1.xml b/en-US/Package_Selection_common-imagecap-1.xml
index 72fcd39..67652d3 100644
--- a/en-US/Package_Selection_common-imagecap-1.xml
+++ b/en-US/Package_Selection_common-imagecap-1.xml
@@ -7,4 +7,5 @@
 
 <para>
 	Choose which package groups you want to install.
-</para>
\ No newline at end of file
+</para>
+
diff --git a/en-US/Package_Selection_common-imagecap-2.xml b/en-US/Package_Selection_common-imagecap-2.xml
index ca0a421..2ab2c09 100644
--- a/en-US/Package_Selection_common-imagecap-2.xml
+++ b/en-US/Package_Selection_common-imagecap-2.xml
@@ -4,4 +4,5 @@
 
 <para>
 	Choose to add or remove optional packages from this package group.
-</para>
\ No newline at end of file
+</para>
+
diff --git a/en-US/Package_Selection_common-indexterm-1.xml b/en-US/Package_Selection_common-indexterm-1.xml
index af05f68..6d7116a 100644
--- a/en-US/Package_Selection_common-indexterm-1.xml
+++ b/en-US/Package_Selection_common-indexterm-1.xml
@@ -8,4 +8,5 @@
 <indexterm significance="normal">
 	<primary>packages</primary>
 	<secondary>installing</secondary>
-</indexterm>
\ No newline at end of file
+</indexterm>
+
diff --git a/en-US/Package_Selection_common-indexterm-2.xml b/en-US/Package_Selection_common-indexterm-2.xml
index 216a277..5b36259 100644
--- a/en-US/Package_Selection_common-indexterm-2.xml
+++ b/en-US/Package_Selection_common-indexterm-2.xml
@@ -8,4 +8,5 @@
 <indexterm significance="normal">
 	<primary>packages</primary>
 	<secondary>selecting</secondary>
-</indexterm>
\ No newline at end of file
+</indexterm>
+
diff --git a/en-US/Package_Selection_common-indexterm-3.xml b/en-US/Package_Selection_common-indexterm-3.xml
index bf131dc..87daa2c 100644
--- a/en-US/Package_Selection_common-indexterm-3.xml
+++ b/en-US/Package_Selection_common-indexterm-3.xml
@@ -8,4 +8,5 @@
 <indexterm significance="normal">
 	<primary>selecting</primary>
 	<secondary>packages</secondary>
-</indexterm>
\ No newline at end of file
+</indexterm>
+
diff --git a/en-US/Package_Selection_common-indexterm-4.xml b/en-US/Package_Selection_common-indexterm-4.xml
index a20792c..2e0235e 100644
--- a/en-US/Package_Selection_common-indexterm-4.xml
+++ b/en-US/Package_Selection_common-indexterm-4.xml
@@ -7,4 +7,5 @@
 
 <indexterm significance="normal">
 	<primary>installing packages</primary>
-</indexterm>
\ No newline at end of file
+</indexterm>
+
diff --git a/en-US/Package_Selection_common-indexterm-5.xml b/en-US/Package_Selection_common-indexterm-5.xml
index 1a2dbef..ac66217 100644
--- a/en-US/Package_Selection_common-indexterm-5.xml
+++ b/en-US/Package_Selection_common-indexterm-5.xml
@@ -8,4 +8,5 @@
 <indexterm significance="normal">
 	<primary>packages</primary>
 	<secondary>groups</secondary>
-</indexterm>
\ No newline at end of file
+</indexterm>
+
diff --git a/en-US/Package_Selection_common-indexterm-6.xml b/en-US/Package_Selection_common-indexterm-6.xml
index c33346c..efd9e5e 100644
--- a/en-US/Package_Selection_common-indexterm-6.xml
+++ b/en-US/Package_Selection_common-indexterm-6.xml
@@ -9,4 +9,5 @@
 	<primary>packages</primary>
 	<secondary>groups</secondary>
 	<tertiary>selecting</tertiary>
-</indexterm>
\ No newline at end of file
+</indexterm>
+
diff --git a/en-US/Package_Selection_common-note-1.xml b/en-US/Package_Selection_common-note-1.xml
deleted file mode 100644
index 781b590..0000000
--- a/en-US/Package_Selection_common-note-1.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
- "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-]>
-
-  <important>
-    <title>Installing from a Live Image</title>
-    <para>If you install from a Fedora Live image, you cannot make
-      package selections.  This installation method transfers a copy of
-      the Live image rather than installing packages from a repository.
-      To change the package selection, complete the installation, then
-      use the <application>Add/Remove Software</application> application
-      to make desired changes.</para>
-  </important>
diff --git a/en-US/Package_Selection_common-note-2.xml b/en-US/Package_Selection_common-note-2.xml
index 0597cea..5b04f8b 100644
--- a/en-US/Package_Selection_common-note-2.xml
+++ b/en-US/Package_Selection_common-note-2.xml
@@ -12,3 +12,4 @@
       use the <application>Add/Remove Software</application> application
       to make desired changes.</para>
   </important>
+
diff --git a/en-US/Package_Selection_common-para-1.xml b/en-US/Package_Selection_common-para-1.xml
index 75d6ff5..7ac167b 100644
--- a/en-US/Package_Selection_common-para-1.xml
+++ b/en-US/Package_Selection_common-para-1.xml
@@ -7,4 +7,5 @@
 
 <para>
 	Now that you have made most of the choices for your installation, you are ready to confirm the default package selection or customize packages for your system.
-</para>
\ No newline at end of file
+</para>
+
diff --git a/en-US/Package_Selection_common-para-2.xml b/en-US/Package_Selection_common-para-2.xml
index 732a41e..5bdebc3 100644
--- a/en-US/Package_Selection_common-para-2.xml
+++ b/en-US/Package_Selection_common-para-2.xml
@@ -4,4 +4,5 @@
 
 <para>
 	The <guilabel>Package Installation Defaults</guilabel> screen appears and details the default package set for your Fedora installation. This screen varies depending on the version of Fedora you are installing.
-</para>
\ No newline at end of file
+</para>
+
diff --git a/en-US/Package_Selection_common-para-3.xml b/en-US/Package_Selection_common-para-3.xml
index cd769ef..f5d3780 100644
--- a/en-US/Package_Selection_common-para-3.xml
+++ b/en-US/Package_Selection_common-para-3.xml
@@ -7,4 +7,5 @@
 
 <para>
 	To customize your package set further, select the <guilabel>Customize now</guilabel> option on the screen. Clicking <guibutton>Next</guibutton> takes you to the <guilabel>Package Group Selection</guilabel> screen.
-</para>
\ No newline at end of file
+</para>
+
diff --git a/en-US/Package_Selection_common-para-4.xml b/en-US/Package_Selection_common-para-4.xml
index 9fefe98..09a6a06 100644
--- a/en-US/Package_Selection_common-para-4.xml
+++ b/en-US/Package_Selection_common-para-4.xml
@@ -7,4 +7,5 @@
 
 <para>
 	You can select package groups, which group components together according to function (for example, <guilabel>X Window System</guilabel> and <guilabel>Editors</guilabel>), individual packages, or a combination of the two.
-</para>
\ No newline at end of file
+</para>
+
diff --git a/en-US/Package_Selection_common-para-7.xml b/en-US/Package_Selection_common-para-7.xml
index b17de01..eff4945 100644
--- a/en-US/Package_Selection_common-para-7.xml
+++ b/en-US/Package_Selection_common-para-7.xml
@@ -4,8 +4,8 @@
  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
 ]>
 
-  <para>
-    By default, the Fedora installation process loads a selection of
-    software that is suitable for a desktop system. To include or remove
-    software for common tasks, select the relevant items from the list:
-  </para>
+<para>
+	By default, the Fedora installation process loads a selection of software that is suitable for a system deployed as a basic server. Note that this installation does not include a graphical environment. To include a selection of software suitable for other roles, click the radio button that corresponds to one of the following options: 
+</para>
+
+
diff --git a/en-US/Package_Selection_common-title-1.xml b/en-US/Package_Selection_common-title-1.xml
index 1a2676c..0360c42 100644
--- a/en-US/Package_Selection_common-title-1.xml
+++ b/en-US/Package_Selection_common-title-1.xml
@@ -5,4 +5,5 @@
 
 ]>
 
-<title>Package Group Selection</title>
\ No newline at end of file
+<title>Package Group Selection</title>
+
diff --git a/en-US/Partitions-x86.xml b/en-US/Partitions-x86.xml
index c8ca77a..75f5dc8 100644
--- a/en-US/Partitions-x86.xml
+++ b/en-US/Partitions-x86.xml
@@ -535,7 +535,7 @@
 						 
 						<row>
 							<entry>
-								PPC PReP Boot
+								PReP Boot
 							</entry>
 							 
 							<entry>
@@ -646,7 +646,7 @@
 		 
 		<section id="s2-partitions-make-room-x86">
 			<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Partitions_common-title-6.xml"/>
-			<!-- Making Room For Red Hat Enterprise Linux -->
+			<!-- Making Room For Fedora -->
 			
 			<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Partitions_common-indexterm-16.xml"/>
 			
@@ -1069,7 +1069,7 @@
 			</para>
 			 
 			<para>
-				Keeping this in mind, we recommend that, unless you have a reason for doing otherwise, you should at least create the following partitions: <filename>swap</filename>, <filename>/boot/</filename> (or a <filename>/boot/efi/</filename> partition for Itanium systems), a <filename>/var/</filename> partition for Itanium systems, and <filename>/</filename> (root).
+				Keeping this in mind, we recommend that, unless you have a reason for doing otherwise, you should at least create the following partitions: <filename>swap</filename>, <filename>/boot/</filename>, and <filename>/</filename> (root).
 			</para>
 			 
 			<para>
@@ -1078,3 +1078,4 @@
 		</section>
 	</section>
 </appendix>
+
diff --git a/en-US/Partitions_common-caution-1.xml b/en-US/Partitions_common-caution-1.xml
index fbcaee6..62ffe33 100644
--- a/en-US/Partitions_common-caution-1.xml
+++ b/en-US/Partitions_common-caution-1.xml
@@ -12,4 +12,5 @@
 		If there was an operating system of some type installed on that partition, it needs to be reinstalled as well. Be aware that some computers sold with pre-installed operating systems may not include the CD-ROM media to reinstall the original
 		operating system. The best time to notice if this applies to your system is <emphasis>before</emphasis> you destroy your original partition and its operating system installation.
 	</para>
-							</warning>
\ No newline at end of file
+</warning>
+
diff --git a/en-US/Partitions_common-imagecap-1.xml b/en-US/Partitions_common-imagecap-1.xml
index 2f57e59..c9c1af5 100644
--- a/en-US/Partitions_common-imagecap-1.xml
+++ b/en-US/Partitions_common-imagecap-1.xml
@@ -6,4 +6,5 @@
 ]>
 <para>
 	Image of an unused disk drive.
-</para>
\ No newline at end of file
+</para>
+
diff --git a/en-US/Partitions_common-imagecap-10.xml b/en-US/Partitions_common-imagecap-10.xml
index 0fb476d..75a27f7 100644
--- a/en-US/Partitions_common-imagecap-10.xml
+++ b/en-US/Partitions_common-imagecap-10.xml
@@ -7,4 +7,5 @@
 
 <para>
 	Image of a disk drive being destructively repartitioned, where <wordasword>1</wordasword> represents before and <wordasword>2</wordasword> represents after.
-									</para>
\ No newline at end of file
+									</para>
+
diff --git a/en-US/Partitions_common-imagecap-2.xml b/en-US/Partitions_common-imagecap-2.xml
index 045dcb7..cc0f465 100644
--- a/en-US/Partitions_common-imagecap-2.xml
+++ b/en-US/Partitions_common-imagecap-2.xml
@@ -6,4 +6,5 @@
 ]>
 <para>
 	Image of a formatted disk drive.
-</para>
\ No newline at end of file
+</para>
+
diff --git a/en-US/Partitions_common-imagecap-3.xml b/en-US/Partitions_common-imagecap-3.xml
index 4e0c06d..f081116 100644
--- a/en-US/Partitions_common-imagecap-3.xml
+++ b/en-US/Partitions_common-imagecap-3.xml
@@ -6,4 +6,5 @@
 ]>
 <para>
 	Image of a disk drive with a different file system.
-</para>
\ No newline at end of file
+</para>
+
diff --git a/en-US/Partitions_common-imagecap-4.xml b/en-US/Partitions_common-imagecap-4.xml
index 251d12a..49d4e6a 100644
--- a/en-US/Partitions_common-imagecap-4.xml
+++ b/en-US/Partitions_common-imagecap-4.xml
@@ -6,4 +6,5 @@
 ]>
 <para>
 	Image of a disk drive with data written to it.
-</para>
\ No newline at end of file
+</para>
+
diff --git a/en-US/Partitions_common-imagecap-5.xml b/en-US/Partitions_common-imagecap-5.xml
index aaeee3a..3bad34c 100644
--- a/en-US/Partitions_common-imagecap-5.xml
+++ b/en-US/Partitions_common-imagecap-5.xml
@@ -6,4 +6,5 @@
 ]>
 <para>
 	Image of an unused disk drive with a partition table.
-</para>
\ No newline at end of file
+</para>
+
diff --git a/en-US/Partitions_common-imagecap-6.xml b/en-US/Partitions_common-imagecap-6.xml
index da8e6b6..499c446 100644
--- a/en-US/Partitions_common-imagecap-6.xml
+++ b/en-US/Partitions_common-imagecap-6.xml
@@ -6,4 +6,5 @@
 ]>
 <para>
 	Image of a disk drive with a single partition.
-</para>
\ No newline at end of file
+</para>
+
diff --git a/en-US/Partitions_common-imagecap-7.xml b/en-US/Partitions_common-imagecap-7.xml
index 4cfd999..991c32b 100644
--- a/en-US/Partitions_common-imagecap-7.xml
+++ b/en-US/Partitions_common-imagecap-7.xml
@@ -6,4 +6,5 @@
 ]>
 <para>
 	Image of a disk drive with an extended partition.
-</para>
\ No newline at end of file
+</para>
+
diff --git a/en-US/Partitions_common-imagecap-8.xml b/en-US/Partitions_common-imagecap-8.xml
index 204fbfe..d3c0a90 100644
--- a/en-US/Partitions_common-imagecap-8.xml
+++ b/en-US/Partitions_common-imagecap-8.xml
@@ -6,4 +6,5 @@
 ]>
 <para>
 	Image of a disk drive with unpartitioned free space, where <wordasword>1</wordasword> represents an undefined partition with unallocated space and <wordasword>2</wordasword> represents a defined partition with allocated space.
-</para>
\ No newline at end of file
+</para>
+
diff --git a/en-US/Partitions_common-imagecap-9.xml b/en-US/Partitions_common-imagecap-9.xml
index fda16f1..90f664e 100644
--- a/en-US/Partitions_common-imagecap-9.xml
+++ b/en-US/Partitions_common-imagecap-9.xml
@@ -6,4 +6,5 @@
 ]>
 <para>
 	Image of a disk drive with an unused partition, where <wordasword>1</wordasword> represents an unused partition and <wordasword>2</wordasword> represents reallocating an unused partition for Linux.
-</para>
\ No newline at end of file
+</para>
+
diff --git a/en-US/Partitions_common-indexterm-1.xml b/en-US/Partitions_common-indexterm-1.xml
index 076aba6..4b77ffa 100644
--- a/en-US/Partitions_common-indexterm-1.xml
+++ b/en-US/Partitions_common-indexterm-1.xml
@@ -8,4 +8,5 @@
 <indexterm significance="normal">
 	<primary>partitioning</primary>
 	<secondary>basic concepts</secondary>
-</indexterm>
\ No newline at end of file
+</indexterm>
+
diff --git a/en-US/Partitions_common-indexterm-10.xml b/en-US/Partitions_common-indexterm-10.xml
index 100abad..d5bbc75 100644
--- a/en-US/Partitions_common-indexterm-10.xml
+++ b/en-US/Partitions_common-indexterm-10.xml
@@ -8,4 +8,5 @@
 <indexterm significance="normal">
 	<primary>hard disk</primary>
 	<secondary>partition types</secondary>
-</indexterm>
\ No newline at end of file
+</indexterm>
+
diff --git a/en-US/Partitions_common-indexterm-11.xml b/en-US/Partitions_common-indexterm-11.xml
index b684c8f..2a2d27c 100644
--- a/en-US/Partitions_common-indexterm-11.xml
+++ b/en-US/Partitions_common-indexterm-11.xml
@@ -9,3 +9,4 @@
 	<primary>partitioning</primary>
 	<secondary>types of partitions</secondary>
 </indexterm>
+
diff --git a/en-US/Partitions_common-indexterm-12.xml b/en-US/Partitions_common-indexterm-12.xml
index c5b93a1..1af6303 100644
--- a/en-US/Partitions_common-indexterm-12.xml
+++ b/en-US/Partitions_common-indexterm-12.xml
@@ -8,4 +8,5 @@
 <indexterm significance="normal">
 	<primary>hard disk</primary>
 	<secondary>extended partitions</secondary>
-</indexterm>
\ No newline at end of file
+</indexterm>
+
diff --git a/en-US/Partitions_common-indexterm-13.xml b/en-US/Partitions_common-indexterm-13.xml
index 421a3fd..009b0a2 100644
--- a/en-US/Partitions_common-indexterm-13.xml
+++ b/en-US/Partitions_common-indexterm-13.xml
@@ -7,4 +7,5 @@
 
 <indexterm significance="normal">
 	<primary>extended partitions</primary>
-</indexterm>
\ No newline at end of file
+</indexterm>
+
diff --git a/en-US/Partitions_common-indexterm-14.xml b/en-US/Partitions_common-indexterm-14.xml
index a2ce6c7..4e5a6b4 100644
--- a/en-US/Partitions_common-indexterm-14.xml
+++ b/en-US/Partitions_common-indexterm-14.xml
@@ -8,4 +8,5 @@
 <indexterm significance="normal">
 	<primary>partition</primary>
 	<secondary>extended</secondary>
-</indexterm>
\ No newline at end of file
+</indexterm>
+
diff --git a/en-US/Partitions_common-indexterm-15.xml b/en-US/Partitions_common-indexterm-15.xml
index 6e6e98d..9d2631e 100644
--- a/en-US/Partitions_common-indexterm-15.xml
+++ b/en-US/Partitions_common-indexterm-15.xml
@@ -8,4 +8,5 @@
 <indexterm significance="normal">
 	<primary>partitioning</primary>
 	<secondary>extended partitions</secondary>
-</indexterm>
\ No newline at end of file
+</indexterm>
+
diff --git a/en-US/Partitions_common-indexterm-16.xml b/en-US/Partitions_common-indexterm-16.xml
index 87683ba..9303d11 100644
--- a/en-US/Partitions_common-indexterm-16.xml
+++ b/en-US/Partitions_common-indexterm-16.xml
@@ -8,4 +8,5 @@
 <indexterm significance="normal">
 	<primary>partitioning</primary>
 	<secondary>making room for partitions</secondary>
-</indexterm>
\ No newline at end of file
+</indexterm>
+
diff --git a/en-US/Partitions_common-indexterm-17.xml b/en-US/Partitions_common-indexterm-17.xml
index dfa68d4..1491de1 100644
--- a/en-US/Partitions_common-indexterm-17.xml
+++ b/en-US/Partitions_common-indexterm-17.xml
@@ -8,4 +8,5 @@
 <indexterm significance="normal">
 	<primary>partitioning</primary>
 	<secondary>using free space</secondary>
-</indexterm>
\ No newline at end of file
+</indexterm>
+
diff --git a/en-US/Partitions_common-indexterm-18.xml b/en-US/Partitions_common-indexterm-18.xml
index 89b4f2b..23c5d43 100644
--- a/en-US/Partitions_common-indexterm-18.xml
+++ b/en-US/Partitions_common-indexterm-18.xml
@@ -8,4 +8,5 @@
 <indexterm significance="normal">
 	<primary>partitioning</primary>
 	<secondary>using unused partition</secondary>
-</indexterm>
\ No newline at end of file
+</indexterm>
+
diff --git a/en-US/Partitions_common-indexterm-19.xml b/en-US/Partitions_common-indexterm-19.xml
index 0f87791..1726189 100644
--- a/en-US/Partitions_common-indexterm-19.xml
+++ b/en-US/Partitions_common-indexterm-19.xml
@@ -8,4 +8,5 @@
 <indexterm significance="normal">
 	<primary>partitioning</primary>
 	<secondary>using in-use partition</secondary>
-</indexterm>
\ No newline at end of file
+</indexterm>
+
diff --git a/en-US/Partitions_common-indexterm-2.xml b/en-US/Partitions_common-indexterm-2.xml
index 2986469..0f3ab16 100644
--- a/en-US/Partitions_common-indexterm-2.xml
+++ b/en-US/Partitions_common-indexterm-2.xml
@@ -8,4 +8,5 @@
 <indexterm significance="normal">
 	<primary>hard disk</primary>
 	<secondary>partitioning of</secondary>
-</indexterm>
\ No newline at end of file
+</indexterm>
+
diff --git a/en-US/Partitions_common-indexterm-3.xml b/en-US/Partitions_common-indexterm-3.xml
index 7b6ee63..5360e70 100644
--- a/en-US/Partitions_common-indexterm-3.xml
+++ b/en-US/Partitions_common-indexterm-3.xml
@@ -8,4 +8,5 @@
 <indexterm significance="normal">
 	<primary>hard disk</primary>
 	<secondary>basic concepts</secondary>
-</indexterm>
\ No newline at end of file
+</indexterm>
+
diff --git a/en-US/Partitions_common-indexterm-4.xml b/en-US/Partitions_common-indexterm-4.xml
index bd8ab08..5bf8364 100644
--- a/en-US/Partitions_common-indexterm-4.xml
+++ b/en-US/Partitions_common-indexterm-4.xml
@@ -8,4 +8,5 @@
 <indexterm significance="normal">
 	<primary>hard disk</primary>
 	<secondary>file system formats</secondary>
-</indexterm>
\ No newline at end of file
+</indexterm>
+
diff --git a/en-US/Partitions_common-indexterm-5.xml b/en-US/Partitions_common-indexterm-5.xml
index 6793843..7ff404e 100644
--- a/en-US/Partitions_common-indexterm-5.xml
+++ b/en-US/Partitions_common-indexterm-5.xml
@@ -8,4 +8,5 @@
 <indexterm significance="normal">
 	<primary>file system</primary>
 	<secondary>formats, overview of</secondary>
-</indexterm>
\ No newline at end of file
+</indexterm>
+
diff --git a/en-US/Partitions_common-indexterm-6.xml b/en-US/Partitions_common-indexterm-6.xml
index b4423ec..a3f2670 100644
--- a/en-US/Partitions_common-indexterm-6.xml
+++ b/en-US/Partitions_common-indexterm-6.xml
@@ -9,3 +9,4 @@
 	<primary>hard disk</primary>
 	<secondary>partition introduction</secondary>
 </indexterm>
+
diff --git a/en-US/Partitions_common-indexterm-7.xml b/en-US/Partitions_common-indexterm-7.xml
index 440a855..772a588 100644
--- a/en-US/Partitions_common-indexterm-7.xml
+++ b/en-US/Partitions_common-indexterm-7.xml
@@ -8,4 +8,5 @@
 <indexterm significance="normal">
 	<primary>partitioning</primary>
 	<secondary>introduction to</secondary>
-</indexterm>
\ No newline at end of file
+</indexterm>
+
diff --git a/en-US/Partitions_common-indexterm-8.xml b/en-US/Partitions_common-indexterm-8.xml
index b51153a..2202af5 100644
--- a/en-US/Partitions_common-indexterm-8.xml
+++ b/en-US/Partitions_common-indexterm-8.xml
@@ -9,3 +9,4 @@
 	<primary>partitioning</primary>
 	<secondary>how many partitions</secondary>
 </indexterm>
+
diff --git a/en-US/Partitions_common-indexterm-9.xml b/en-US/Partitions_common-indexterm-9.xml
index 3a4d3bb..fe06d0e 100644
--- a/en-US/Partitions_common-indexterm-9.xml
+++ b/en-US/Partitions_common-indexterm-9.xml
@@ -8,4 +8,5 @@
 <indexterm significance="normal">
 	<primary>partitioning</primary>
 	<secondary>primary partitions</secondary>
-</indexterm>
\ No newline at end of file
+</indexterm>
+
diff --git a/en-US/Partitions_common-itemizedlist-1.xml b/en-US/Partitions_common-itemizedlist-1.xml
index 75792d0..a39e806 100644
--- a/en-US/Partitions_common-itemizedlist-1.xml
+++ b/en-US/Partitions_common-itemizedlist-1.xml
@@ -21,4 +21,5 @@
 			</footnote>
 		</para>
 	</listitem>
-</itemizedlist>
\ No newline at end of file
+</itemizedlist>
+
diff --git a/en-US/Partitions_common-itemizedlist-2.xml b/en-US/Partitions_common-itemizedlist-2.xml
index b1aea0e..0709dd8 100644
--- a/en-US/Partitions_common-itemizedlist-2.xml
+++ b/en-US/Partitions_common-itemizedlist-2.xml
@@ -23,4 +23,5 @@
 			The partition's type
 		</para>
 	</listitem>
-</itemizedlist>
\ No newline at end of file
+</itemizedlist>
+
diff --git a/en-US/Partitions_common-itemizedlist-3.xml b/en-US/Partitions_common-itemizedlist-3.xml
index 22f09d5..26ef6d0 100644
--- a/en-US/Partitions_common-itemizedlist-3.xml
+++ b/en-US/Partitions_common-itemizedlist-3.xml
@@ -23,4 +23,5 @@
 			Free space in an actively used partition is available
 		</para>
 	</listitem>
-</itemizedlist>
\ No newline at end of file
+</itemizedlist>
+
diff --git a/en-US/Partitions_common-note-1.xml b/en-US/Partitions_common-note-1.xml
index c49ba0c..9dad957 100644
--- a/en-US/Partitions_common-note-1.xml
+++ b/en-US/Partitions_common-note-1.xml
@@ -11,4 +11,5 @@
 	<para>
 		This appendix is not necessarily applicable to non-x86-based architectures. However, the general concepts mentioned here may apply.
 	</para>
-</note>
\ No newline at end of file
+</note>
+
diff --git a/en-US/Partitions_common-note-3.xml b/en-US/Partitions_common-note-3.xml
index f29b44c..c62b7c7 100644
--- a/en-US/Partitions_common-note-3.xml
+++ b/en-US/Partitions_common-note-3.xml
@@ -8,4 +8,5 @@
 <para>
 	Keep in mind that the following illustrations are simplified in the interest of clarity and do not reflect the exact partition layout that you encounter when actually installing Fedora.
 </para>
-</note>
\ No newline at end of file
+</note>
+
diff --git a/en-US/Partitions_common-para-1.xml b/en-US/Partitions_common-para-1.xml
index d4184af..52784c3 100644
--- a/en-US/Partitions_common-para-1.xml
+++ b/en-US/Partitions_common-para-1.xml
@@ -7,4 +7,5 @@
 
 <para>
 	This appendix is not necessarily applicable to non-x86-based architectures. However, the general concepts mentioned here may apply.
-</para>
\ No newline at end of file
+</para>
+
diff --git a/en-US/Partitions_common-para-10.xml b/en-US/Partitions_common-para-10.xml
index e19fc91..79ec4eb 100644
--- a/en-US/Partitions_common-para-10.xml
+++ b/en-US/Partitions_common-para-10.xml
@@ -7,4 +7,5 @@
 
 <para>
 	Each partition table entry contains several important characteristics of the partition:
-</para>
\ No newline at end of file
+</para>
+
diff --git a/en-US/Partitions_common-para-11.xml b/en-US/Partitions_common-para-11.xml
index f2ac2d8..d555ba5 100644
--- a/en-US/Partitions_common-para-11.xml
+++ b/en-US/Partitions_common-para-11.xml
@@ -8,4 +8,5 @@
 <para>
 	Let us take a closer look at each of these characteristics. The starting and ending points actually define the partition's size and location on the disk. The "active" flag is used by some operating systems' boot loaders. In other words, the operating
 	system in the partition that is marked "active" is booted.
-</para>
\ No newline at end of file
+</para>
+
diff --git a/en-US/Partitions_common-para-12.xml b/en-US/Partitions_common-para-12.xml
index 71b9c05..64c3c53 100644
--- a/en-US/Partitions_common-para-12.xml
+++ b/en-US/Partitions_common-para-12.xml
@@ -8,4 +8,5 @@
 <para>
 	The partition's type can be a bit confusing. The type is a number that identifies the partition's anticipated usage. If that statement sounds a bit vague, that is because the meaning of the partition type is a bit vague. Some operating systems use the
 	partition type to denote a specific file system type, to flag the partition as being associated with a particular operating system, to indicate that the partition contains a bootable operating system, or some combination of the three.
-</para>
\ No newline at end of file
+</para>
+
diff --git a/en-US/Partitions_common-para-13.xml b/en-US/Partitions_common-para-13.xml
index 76633a8..d5d98b0 100644
--- a/en-US/Partitions_common-para-13.xml
+++ b/en-US/Partitions_common-para-13.xml
@@ -7,4 +7,5 @@
 
 <para>
 	In many cases, there is only a single partition spanning the entire disk, essentially duplicating the method used before partitions. The partition table has only one entry used, and it points to the start of the partition.
-</para>
\ No newline at end of file
+</para>
+
diff --git a/en-US/Partitions_common-para-14.xml b/en-US/Partitions_common-para-14.xml
index 5746d7f..29dbdd8 100644
--- a/en-US/Partitions_common-para-14.xml
+++ b/en-US/Partitions_common-para-14.xml
@@ -8,4 +8,5 @@
 <para>
 	Of course, over time it became obvious that four partitions would not be enough. As disk drives continued to grow, it became more and more likely that a person could configure four reasonably-sized partitions and still have disk space left over. There
 	needed to be some way of creating more partitions.
-</para>
\ No newline at end of file
+</para>
+
diff --git a/en-US/Partitions_common-para-15.xml b/en-US/Partitions_common-para-15.xml
index 50ff6f9..116231e 100644
--- a/en-US/Partitions_common-para-15.xml
+++ b/en-US/Partitions_common-para-15.xml
@@ -7,4 +7,5 @@
 
 <para>
 	As this figure implies, there is a difference between primary and logical partitions &mdash; there can only be four primary partitions, but there is no fixed limit to the number of logical partitions that can exist. However, due to the way in which partitions are accessed in Linux, you should avoid defining more than 12 logical partitions on a single disk drive.
-</para>
\ No newline at end of file
+</para>
+
diff --git a/en-US/Partitions_common-para-16.xml b/en-US/Partitions_common-para-16.xml
index fee1a54..6ddcf1d 100644
--- a/en-US/Partitions_common-para-16.xml
+++ b/en-US/Partitions_common-para-16.xml
@@ -5,4 +5,5 @@
 
 <para>
 	Now that we have discussed partitions in general, let us review how to use this knowledge to install Fedora.
-</para>
\ No newline at end of file
+</para>
+
diff --git a/en-US/Partitions_common-para-17.xml b/en-US/Partitions_common-para-17.xml
index 48ed516..c4f848b 100644
--- a/en-US/Partitions_common-para-17.xml
+++ b/en-US/Partitions_common-para-17.xml
@@ -7,4 +7,5 @@
 
 <para>
 	The following list presents some possible scenarios you may face when attempting to repartition your hard disk:
-</para>
\ No newline at end of file
+</para>
+
diff --git a/en-US/Partitions_common-para-18.xml b/en-US/Partitions_common-para-18.xml
index 8ffd957..ef57dd7 100644
--- a/en-US/Partitions_common-para-18.xml
+++ b/en-US/Partitions_common-para-18.xml
@@ -7,4 +7,5 @@
 
 <para>
 	Let us look at each scenario in order.
-</para>
\ No newline at end of file
+</para>
+
diff --git a/en-US/Partitions_common-para-19.xml b/en-US/Partitions_common-para-19.xml
index ccdaabc..14ed38e 100644
--- a/en-US/Partitions_common-para-19.xml
+++ b/en-US/Partitions_common-para-19.xml
@@ -7,4 +7,5 @@
 
 <para>
 	If you think about it, an unused hard disk also falls into this category. The only difference is that <emphasis>all</emphasis> the space is not part of any defined partition.
-</para>
\ No newline at end of file
+</para>
+
diff --git a/en-US/Partitions_common-para-2.xml b/en-US/Partitions_common-para-2.xml
index ba5396f..14407bf 100644
--- a/en-US/Partitions_common-para-2.xml
+++ b/en-US/Partitions_common-para-2.xml
@@ -7,4 +7,5 @@
 
 <para>
 	Hard disks perform a very simple function &mdash; they store data and reliably retrieve it on command.
-</para>
\ No newline at end of file
+</para>
+
diff --git a/en-US/Partitions_common-para-20.xml b/en-US/Partitions_common-para-20.xml
index 458ceea..38b5595 100644
--- a/en-US/Partitions_common-para-20.xml
+++ b/en-US/Partitions_common-para-20.xml
@@ -7,4 +7,5 @@
 
 <para>
 	Next, we will discuss a slightly more common situation.
-</para>
\ No newline at end of file
+</para>
+
diff --git a/en-US/Partitions_common-para-21.xml b/en-US/Partitions_common-para-21.xml
index 33ff356..b1eb370 100644
--- a/en-US/Partitions_common-para-21.xml
+++ b/en-US/Partitions_common-para-21.xml
@@ -8,4 +8,5 @@
 <para>
 	If you find yourself in this situation, you can use the space allocated to the unused partition. You first must delete the partition and then create the appropriate Linux partition(s) in its place. You can delete the unused partition and manually
 	create new partitions during the installation process.
-</para>
\ No newline at end of file
+</para>
+
diff --git a/en-US/Partitions_common-para-22.xml b/en-US/Partitions_common-para-22.xml
index 27aa8e8..68bdb49 100644
--- a/en-US/Partitions_common-para-22.xml
+++ b/en-US/Partitions_common-para-22.xml
@@ -8,4 +8,5 @@
 <para>
 	This is the most common situation. It is also, unfortunately, the hardest to handle. The main problem is that, even if you have enough free space, it is presently allocated to a partition that is already in use. If you purchased a computer with
 	pre-installed software, the hard disk most likely has one massive partition holding the operating system and data.
-</para>
\ No newline at end of file
+</para>
+
diff --git a/en-US/Partitions_common-para-23.xml b/en-US/Partitions_common-para-23.xml
index fd940bc..84f989a 100644
--- a/en-US/Partitions_common-para-23.xml
+++ b/en-US/Partitions_common-para-23.xml
@@ -7,4 +7,5 @@
 
 <para>
 	Aside from adding a new hard drive to your system, you have two choices:
-</para>
\ No newline at end of file
+</para>
+
diff --git a/en-US/Partitions_common-para-24.xml b/en-US/Partitions_common-para-24.xml
index b8be00f..68afd2a 100644
--- a/en-US/Partitions_common-para-24.xml
+++ b/en-US/Partitions_common-para-24.xml
@@ -8,4 +8,5 @@
 <para>
 	Basically, you delete the single large partition and create several smaller ones. As you might imagine, any data you had in the original partition is destroyed. This means that making a complete backup is necessary. For your own sake, make two
 	backups, use verification (if available in your backup software), and try to read data from your backup <emphasis>before</emphasis> you delete the partition.
-</para>
\ No newline at end of file
+</para>
+
diff --git a/en-US/Partitions_common-para-3.xml b/en-US/Partitions_common-para-3.xml
index df3c8be..20a1a37 100644
--- a/en-US/Partitions_common-para-3.xml
+++ b/en-US/Partitions_common-para-3.xml
@@ -7,4 +7,5 @@
 
 <para>
 	Not much to look at, is it? But if we are talking about disk drives on a basic level, it is adequate. Say that we would like to store some data on this drive. As things stand now, it will not work. There is something we need to do first.
-</para>
\ No newline at end of file
+</para>
+
diff --git a/en-US/Partitions_common-para-4.xml b/en-US/Partitions_common-para-4.xml
index 6c5e2fe..ee2a480 100644
--- a/en-US/Partitions_common-para-4.xml
+++ b/en-US/Partitions_common-para-4.xml
@@ -8,4 +8,5 @@
 <para>
 	Experienced computer users probably got this one on the first try. We need to <firstterm>format</firstterm> the drive. Formatting (usually known as "making a <firstterm>file system</firstterm>") writes information to the drive, creating order out of
 	the empty space in an unformatted drive.
-</para>
\ No newline at end of file
+</para>
+
diff --git a/en-US/Partitions_common-para-5.xml b/en-US/Partitions_common-para-5.xml
index 6bec429..3346e84 100644
--- a/en-US/Partitions_common-para-5.xml
+++ b/en-US/Partitions_common-para-5.xml
@@ -7,4 +7,5 @@
 
 <para>
 	Given that file systems make things like directories and files possible, these trade-offs are usually seen as a small price to pay.
-</para>
\ No newline at end of file
+</para>
+
diff --git a/en-US/Partitions_common-para-6.xml b/en-US/Partitions_common-para-6.xml
index 6e506df..4e1489f 100644
--- a/en-US/Partitions_common-para-6.xml
+++ b/en-US/Partitions_common-para-6.xml
@@ -7,4 +7,5 @@
 
 <para>
 	Of course, writing a file system to disk is only the beginning. The goal of this process is to actually <emphasis>store</emphasis> and <emphasis>retrieve</emphasis> data. Let us take a look at our drive after some files have been written to it.
-</para>
\ No newline at end of file
+</para>
+
diff --git a/en-US/Partitions_common-para-7.xml b/en-US/Partitions_common-para-7.xml
index fcfbad2..2346917 100644
--- a/en-US/Partitions_common-para-7.xml
+++ b/en-US/Partitions_common-para-7.xml
@@ -7,4 +7,5 @@
 
 <para>
 	As with most computer-related technologies, disk drives changed over time after their introduction. In particular, they got bigger. Not larger in physical size, but bigger in their capacity to store information. And, this additional capacity drove a fundamental change in the way disk drives were used.
-</para>
\ No newline at end of file
+</para>
+
diff --git a/en-US/Partitions_common-para-8.xml b/en-US/Partitions_common-para-8.xml
index 18144fd..d745bd3 100644
--- a/en-US/Partitions_common-para-8.xml
+++ b/en-US/Partitions_common-para-8.xml
@@ -7,4 +7,5 @@
 
 <para>
 	As disk drive capacities soared, some people began to wonder if having all of that formatted space in one big chunk was such a great idea. This line of thinking was driven by several issues, some philosophical, some technical. On the philosophical side, above a certain size, it seemed that the additional space provided by a larger drive created more clutter. On the technical side, some file systems were never designed to support anything above a certain capacity. Or the file systems <emphasis>could</emphasis> support larger drives with a greater capacity, but the overhead imposed by the file system to track files became excessive.
-</para>
\ No newline at end of file
+</para>
+
diff --git a/en-US/Partitions_common-para-9.xml b/en-US/Partitions_common-para-9.xml
index 2545def..13803a5 100644
--- a/en-US/Partitions_common-para-9.xml
+++ b/en-US/Partitions_common-para-9.xml
@@ -7,4 +7,5 @@
 
 <para>
 	The solution to this problem was to divide disks into <firstterm>partitions</firstterm>. Each partition can be accessed as if it was a separate disk. This is done through the addition of a <firstterm>partition table</firstterm>.
-</para>
\ No newline at end of file
+</para>
+
diff --git a/en-US/Partitions_common-table-title-1.xml b/en-US/Partitions_common-table-title-1.xml
index fe05457..1ddf41a 100644
--- a/en-US/Partitions_common-table-title-1.xml
+++ b/en-US/Partitions_common-table-title-1.xml
@@ -5,4 +5,5 @@
 
 ]>
 
-<title>Partition Types</title>
\ No newline at end of file
+<title>Partition Types</title>
+
diff --git a/en-US/Partitions_common-term-1.xml b/en-US/Partitions_common-term-1.xml
index c7b451b..8e82887 100644
--- a/en-US/Partitions_common-term-1.xml
+++ b/en-US/Partitions_common-term-1.xml
@@ -9,4 +9,5 @@
 		<primary>partitioning</primary>
 		<secondary>destructive</secondary>
 	</indexterm>
-<emphasis>Destructive Repartitioning</emphasis></term>
\ No newline at end of file
+<emphasis>Destructive Repartitioning</emphasis></term>
+
diff --git a/en-US/Partitions_common-title-10.xml b/en-US/Partitions_common-title-10.xml
index 6232af3..270fac6 100644
--- a/en-US/Partitions_common-title-10.xml
+++ b/en-US/Partitions_common-title-10.xml
@@ -5,4 +5,5 @@
 
 ]>
 
-<title>Disk Drive Being Destructively Repartitioned</title>
\ No newline at end of file
+<title>Disk Drive Being Destructively Repartitioned</title>
+
diff --git a/en-US/Partitions_common-title-2.xml b/en-US/Partitions_common-title-2.xml
index cc27ae7..ba2dd58 100644
--- a/en-US/Partitions_common-title-2.xml
+++ b/en-US/Partitions_common-title-2.xml
@@ -5,4 +5,5 @@
 
 ]>
 
-<title>Hard Disk Basic Concepts</title>
\ No newline at end of file
+<title>Hard Disk Basic Concepts</title>
+
diff --git a/en-US/Partitions_common-title-3.xml b/en-US/Partitions_common-title-3.xml
index 1013cca..9486e96 100644
--- a/en-US/Partitions_common-title-3.xml
+++ b/en-US/Partitions_common-title-3.xml
@@ -5,4 +5,5 @@
 
 ]>
 
-<title>It is Not What You Write, it is How You Write It</title>
\ No newline at end of file
+<title>It is Not What You Write, it is How You Write It</title>
+
diff --git a/en-US/Partitions_common-title-4.xml b/en-US/Partitions_common-title-4.xml
index afb506b..95daad6 100644
--- a/en-US/Partitions_common-title-4.xml
+++ b/en-US/Partitions_common-title-4.xml
@@ -5,4 +5,5 @@
 
 ]>
 
-<title>Partitions: Turning One Drive Into Many</title>
\ No newline at end of file
+<title>Partitions: Turning One Drive Into Many</title>
+
diff --git a/en-US/Partitions_common-title-5.xml b/en-US/Partitions_common-title-5.xml
index 20cfc3f..bbfdf7d 100644
--- a/en-US/Partitions_common-title-5.xml
+++ b/en-US/Partitions_common-title-5.xml
@@ -5,4 +5,5 @@
 
 ]>
 
-<title>Partitions within Partitions &mdash; An Overview of Extended Partitions</title>
\ No newline at end of file
+<title>Partitions within Partitions &mdash; An Overview of Extended Partitions</title>
+
diff --git a/en-US/Partitions_common-title-6.xml b/en-US/Partitions_common-title-6.xml
index c84103c..57c1e05 100644
--- a/en-US/Partitions_common-title-6.xml
+++ b/en-US/Partitions_common-title-6.xml
@@ -2,4 +2,5 @@
 <!DOCTYPE title PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
 ]>
 
-<title>Making Room For Fedora</title>
\ No newline at end of file
+<title>Making Room For Fedora</title>
+
diff --git a/en-US/Partitions_common-title-7.xml b/en-US/Partitions_common-title-7.xml
index 16168c3..eebdd3e 100644
--- a/en-US/Partitions_common-title-7.xml
+++ b/en-US/Partitions_common-title-7.xml
@@ -5,4 +5,5 @@
 
 ]>
 
-<title>Using Unpartitioned Free Space</title>
\ No newline at end of file
+<title>Using Unpartitioned Free Space</title>
+
diff --git a/en-US/Partitions_common-title-8.xml b/en-US/Partitions_common-title-8.xml
index 42281e3..90a4baa 100644
--- a/en-US/Partitions_common-title-8.xml
+++ b/en-US/Partitions_common-title-8.xml
@@ -5,4 +5,5 @@
 
 ]>
 
-<title>Using Space from an Unused Partition</title>
\ No newline at end of file
+<title>Using Space from an Unused Partition</title>
+
diff --git a/en-US/Partitions_common-title-9.xml b/en-US/Partitions_common-title-9.xml
index 688d027..94b8ce3 100644
--- a/en-US/Partitions_common-title-9.xml
+++ b/en-US/Partitions_common-title-9.xml
@@ -5,4 +5,5 @@
 
 ]>
 
-<title>Using Free Space from an Active Partition</title>
\ No newline at end of file
+<title>Using Free Space from an Active Partition</title>
+
diff --git a/en-US/Partitions_common-title.xml b/en-US/Partitions_common-title.xml
index b13122d..ffae87d 100644
--- a/en-US/Partitions_common-title.xml
+++ b/en-US/Partitions_common-title.xml
@@ -5,4 +5,5 @@
 
 ]>
 
-<title>An Introduction to Disk Partitions</title>
\ No newline at end of file
+<title>An Introduction to Disk Partitions</title>
+
diff --git a/en-US/Partitions_complete-note-1.xml b/en-US/Partitions_complete-note-1.xml
index c686f55..45324e6 100644
--- a/en-US/Partitions_complete-note-1.xml
+++ b/en-US/Partitions_complete-note-1.xml
@@ -11,4 +11,5 @@
 	<para>
 		While the diagrams in this chapter show the partition table as being separate from the actual disk drive, this is not entirely accurate. In reality, the partition table is stored at the very start of the disk, before any file system or user data. But for clarity, they are separate in our diagrams.
 	</para>
-</note>
\ No newline at end of file
+</note>
+
diff --git a/en-US/Preface.xml b/en-US/Preface.xml
index 0c4f452..fe16135 100644
--- a/en-US/Preface.xml
+++ b/en-US/Preface.xml
@@ -10,4 +10,11 @@
 			<xi:include href="Common_Content/Feedback.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
 		</xi:fallback>
 	</xi:include>
+	<section>
+		<title>Acknowledgements</title>
+		<para>
+			Certain portions of this text first appeared in the <citetitle>Fedora Installation Guide</citetitle>, copyright Â© 2009 Red Hat, Inc. and others, published by the Fedora Project at <ulink url="http://docs.fedoraproject.org/install-guide/"></ulink>.
+		</para>
+	</section>
 </preface>
+
diff --git a/en-US/Prepare_To_Install-common-Boot_Media.xml b/en-US/Prepare_To_Install-common-Boot_Media.xml
index 04acbc8..ac9b791 100644
--- a/en-US/Prepare_To_Install-common-Boot_Media.xml
+++ b/en-US/Prepare_To_Install-common-Boot_Media.xml
@@ -5,4 +5,5 @@
 
 <para>
 	Ensure that you have boot media available on CD, DVD, or a USB storage device such as a flash drive. 
-</para>
\ No newline at end of file
+</para>
+
diff --git a/en-US/Preparing-common-title-1.xml b/en-US/Preparing-common-title-1.xml
new file mode 100644
index 0000000..7fdb993
--- /dev/null
+++ b/en-US/Preparing-common-title-1.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0"?>
+<!DOCTYPE title PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+]>
+
+<title>Preparing for Installation</title>
diff --git a/en-US/Procedure-dd_Image_to_USB.xml b/en-US/Procedure-dd_Image_to_USB.xml
index 8e08ca9..5c8e6ca 100644
--- a/en-US/Procedure-dd_Image_to_USB.xml
+++ b/en-US/Procedure-dd_Image_to_USB.xml
@@ -1,30 +1,33 @@
 <?xml version='1.0' encoding='utf-8' ?>
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!DOCTYPE procedure PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
 ]>
 
 <procedure>
 	<step>
 		<para>
-			Plug in your USB media.
+			Plug in your USB flash drive.
 		</para>
 	</step>
+	
 	<step>
 		<para>
-			Find the device name for your USB media.  If the media has a volume name, look up the name in <filename class="directory">/dev/disk/by-label</filename>, or use the <command>findfs</command>:
+			Find the device name for your USB flash drive.  If the flash drive has a volume name, look up the name in <filename class="directory">/dev/disk/by-label</filename>, or use  <command>findfs</command>:
 		</para>
 <screen><command>su -c 'findfs LABEL="<replaceable>MyLabel</replaceable>"'</command></screen>
 		<para>
-			If the media does not have a volume name, or you do not know it, consult the <filename>/var/log/messages</filename> log for details:
+			If the media does not have a volume name, or you do not know it, run <command>dmesg</command> after you connect the USB flash drive. The device name, similar to <filename>/dev/sdc</filename>, appears in several lines towards the end of the output.
 		</para>
-<screen><command>su -c 'less /var/log/messages'</command></screen>
 	</step>
 	<step>
 		<para>
-			Use the <command>dd</command> command to write the ISO image to the media:
+			Use the <command>dd</command> command to transfer the ISO image to the USB device:
 		</para>
-<screen><command>su -c 'dd if=<replaceable>/path/to/image/file/imagefile.iso</replaceable> of=<replaceable>device</replaceable>'</command></screen>
+<screen><command>dd if=<replaceable>path/image_name.iso</replaceable> of=<replaceable>device</replaceable></command></screen>
 		<para>
-		where <filename><replaceable>/path/to/image/file</replaceable></filename> is the location of the image file that you downloaded and <filename><replaceable>device</replaceable></filename> is the USB media device.
+		where <replaceable>path/image_name.iso</replaceable> is the ISO image file of the installation DVD that you downloaded from the Red Hat Customer Portal and <filename><replaceable>device</replaceable></filename> is the USB flash drive. For example:
 		</para>
+<screen><command>dd if=~/Download/F&PRODVER;-Server-i386-DVD.iso of=/dev/sdc</command></screen>
 	</step>
 </procedure>
+
+
diff --git a/en-US/Rescue_Mode.xml b/en-US/Rescue_Mode.xml
index c14ec9c..9ded30a 100644
--- a/en-US/Rescue_Mode.xml
+++ b/en-US/Rescue_Mode.xml
@@ -11,6 +11,8 @@
 		When things go wrong, there are ways to fix problems. However, these methods require that you understand the system well. This chapter describes how to boot into rescue mode, single-user mode, and emergency mode, where you can use your own knowledge to
 		repair the system.
 	</para>
+<section id="Rescue_Mode-x86">
+<title>Rescue Mode</title>
 	<section id="s1-rescuemode-common-problems">
 		<title>Common Problems</title>
 		<indexterm significance="normal">
@@ -124,7 +126,7 @@
 		<itemizedlist>
 			<listitem>
 				<para>
-					By booting the system from an installation boot CD-ROM or DVD.
+					By booting the system from a boot CD-ROM or DVD.
 				</para>
 			</listitem>
 
@@ -136,7 +138,7 @@
 
 			<listitem>
 				<para>
-					By booting the system from the Fedora CD-ROM #1 or DVD.
+					By booting the system from the Fedora installation DVD.
 				</para>
 			</listitem>
 		</itemizedlist>
@@ -161,7 +163,12 @@
 		<para>
 			The following message is displayed:
 		</para>
-<blockquote><para>The rescue environment will now attempt to find your Linux installation and mount it under the directory /mnt/sysimage.  You can then make any changes required to your system.  If you want to proceed with this step choose 'Continue'. You can also choose to mount your file systems read-only instead of read-write by choosing 'Read-only'.  If for some reason this process fails you can choose 'Skip' and this step will be skipped and you will go directly to a command shell.</para></blockquote>
+<blockquote><para>The rescue environment will now attempt to find your Linux installation and 
+mount it under the directory /mnt/sysimage.  You can then make any changes 
+required to your system.  If you want to proceed with this step choose 
+'Continue'. You can also choose to mount your file systems read-only instead of
+read-write by choosing 'Read-only'.  If for some reason this process fails you 
+can choose 'Skip' and this step will be skipped and you will go directly to a command shell.</para></blockquote>
 
 		<para>
 			If you select <guibutton>Continue</guibutton>, it attempts to mount your file system under the directory <filename>/mnt/sysimage/</filename>. If it fails to mount a partition, it notifies you. If you select
@@ -397,4 +404,8 @@
 			<userinput>emergency</userinput>.
 		</para>
 	</section>
+</section>
+<!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Iseries_Rescuemode.xml"/> -->
+<!-- Rescue Mode on POWER Systems -->
 </chapter>
+
diff --git a/en-US/Revision_History.xml b/en-US/Revision_History.xml
index 441a05d..1d2173c 100644
--- a/en-US/Revision_History.xml
+++ b/en-US/Revision_History.xml
@@ -4,19 +4,22 @@
 
 <appendix id="appe-Publican-Revision_History">
 	<title>Revision History</title>
+	<!-- <para>
+		Note that revision numbers relate to the edition of this manual, not to version numbers of Red Hat Enterprise Linux.
+	</para> -->
 	<simpara>
 		<revhistory>
 			<revision>
-				<revnumber>13.0.1</revnumber>
-				<date>Fri Apr 30 2010</date>
+				<revnumber>1.0-0</revnumber>
+				<date>Thu Sep 9 2010</date>
 				<author>
-				    <firstname>Ruediger</firstname>
-				    <surname>Landmann</surname>
-				    <email>r.landmann at redhat.com</email>
+					<firstname>RÃ¼diger</firstname>
+					<surname>Landmann</surname>
+					<email>r.landmann at redhat.com</email>
 				</author>
 				<revdescription>
 					<simplelist>
-						<member>Update for F13</member>
+						<member>Import fixes from enterprise version</member>
 					</simplelist>
 				</revdescription>
 			</revision>
@@ -24,3 +27,4 @@
 	</simpara>
 </appendix>
 
+
diff --git a/en-US/Specialized_Storage_Devices-x86.xml b/en-US/Specialized_Storage_Devices-x86.xml
index c3bca66..d90407d 100644
--- a/en-US/Specialized_Storage_Devices-x86.xml
+++ b/en-US/Specialized_Storage_Devices-x86.xml
@@ -14,6 +14,12 @@
 	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Specialized_Storage_Devices_common-figure-1.xml"/>
 	<!-- Select storage devices -->
 		
+	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Specialized_Storage_Devices_common-figure-4.xml"/>
+	<!-- The Multipath tab -->
+	
+	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Specialized_Storage_Devices_common-figure-5.xml"/>
+	<!-- The Other SAN tab -->
+	
 	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Specialized_Storage_Devices_common-para-2.xml"/>
 	<!-- Devices are grouped under the following tabs: -->
 	
@@ -30,6 +36,9 @@
 	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Specialized_Storage_Devices_common-figure-2.xml"/>
 	<!-- The Storage Devices Search Tab -->
 	
+	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Specialized_Storage_Devices_common-para-7.xml"/>
+	<!-- The tab contains a drop-down menu to select searching by port, target, WWID, or LUN -->
+	
 	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Specialized_Storage_Devices_common-para-4.xml"/>
 	<!-- Each tab presents a list of devices detected by anaconda, with information about the device to help you to identify it. -->
 	
@@ -42,8 +51,11 @@
 	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Specialized_Storage_Devices_common-para-6.xml"/>
 	<!-- Note that the devices that you select here are not automatically wiped by the installation process. -->
 	
+	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Specialized_Storage_Devices_common-important-1.xml"/>
+	<!-- Important - chain loading -->
+	
 	<para>
-		If you selected only one storage device, click <guibutton>Next</guibutton> and proceed to <xref linkend="sn-initialize-hdd-x86"/>. If you selected two or more storage devices, click <guibutton>Next</guibutton> and proceed to <xref linkend="Assign_Storage_Devices-x86"/>.
+		when you have selected the storage devices to make available during installation, click <guibutton>Next</guibutton> and proceed to <xref linkend="sn-initialize-hdd-x86"/>
 	</para>
 	
 	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Disk_Partitioning_Advanced_Storage-x86.xml"/>
diff --git a/en-US/Specialized_Storage_Devices_common-figure-1.xml b/en-US/Specialized_Storage_Devices_common-figure-1.xml
index 1666633..3456ca2 100644
--- a/en-US/Specialized_Storage_Devices_common-figure-1.xml
+++ b/en-US/Specialized_Storage_Devices_common-figure-1.xml
@@ -2,11 +2,11 @@
 <!DOCTYPE figure PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
 ]>
 
-<figure float="0"><title>Select storage devices</title>
+<figure float="0"><title>Select storage devices â€” Basic devices</title>
 	<mediaobject>
 		<imageobject><imagedata fileref="images/storagedevices/selectstoragedevices.png" format="PNG"/></imageobject>
 		<textobject><para>
-				Screen to select available storage devices, with tabs for basic devices, firmware RAID, multipath devices, and other SAN devices.
+				The Basic Devices tab
 			</para>
 		</textobject>
 	</mediaobject>
diff --git a/en-US/Specialized_Storage_Devices_common-figure-4.xml b/en-US/Specialized_Storage_Devices_common-figure-4.xml
new file mode 100644
index 0000000..8f537f6
--- /dev/null
+++ b/en-US/Specialized_Storage_Devices_common-figure-4.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<!DOCTYPE figure PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+]>
+
+<figure float="0"><title>Select storage devices â€” Multipath Devices</title>
+	<mediaobject>
+		<imageobject><imagedata fileref="images/storagedevices/selectstoragedevices-multipath.png" format="PNG"/></imageobject>
+		<textobject><para>
+				The Multipath Devices tab
+			</para>
+		</textobject>
+	</mediaobject>
+</figure>
+	
\ No newline at end of file
diff --git a/en-US/Specialized_Storage_Devices_common-figure-5.xml b/en-US/Specialized_Storage_Devices_common-figure-5.xml
new file mode 100644
index 0000000..319de26
--- /dev/null
+++ b/en-US/Specialized_Storage_Devices_common-figure-5.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<!DOCTYPE figure PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+]>
+
+<figure float="0"><title>Select storage devices â€” Other SAN Devices</title>
+	<mediaobject>
+		<imageobject><imagedata fileref="images/storagedevices/selectstoragedevices-san.png" format="PNG"/></imageobject>
+		<textobject><para>
+				The Other SAN Devices tab
+			</para>
+		</textobject>
+	</mediaobject>
+</figure>
+	
\ No newline at end of file
diff --git a/en-US/Specialized_Storage_Devices_common-important-1.xml b/en-US/Specialized_Storage_Devices_common-important-1.xml
new file mode 100644
index 0000000..b18042d
--- /dev/null
+++ b/en-US/Specialized_Storage_Devices_common-important-1.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<!DOCTYPE important PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+]>
+
+<important>
+	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Assign_Storage_Devices-common-important-title-1.xml"/>
+	<!-- Important â€” chain loading -->
+	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Assign_Storage_Devices-common-important-indexterm-1.xml"/>
+	<!-- Chain loading -->
+	
+	<para>
+		Any storage devices that you do not select on this screen are hidden from <application>anaconda</application> entirely. To <firstterm>chain load</firstterm> the Fedora boot loader from a different boot loader, select all the devices presented in this screen.
+	</para>
+</important>
+
diff --git a/en-US/Specialized_Storage_Devices_common-para-6.xml b/en-US/Specialized_Storage_Devices_common-para-6.xml
index 85a5674..1f61879 100644
--- a/en-US/Specialized_Storage_Devices_common-para-6.xml
+++ b/en-US/Specialized_Storage_Devices_common-para-6.xml
@@ -3,5 +3,5 @@
 ]>
 
 <para>
-	Note that the devices that you select here are not automatically wiped by the installation process. Selecting a device on this screen does not, in itself, place data stored on the device at risk. Note also that any devices that you do not select here to form part of the installed system can be added to the system after installation by modifying the <filename>/etc/fstab</filename> file.
+	Note that the devices that you select here are not automatically erased by the installation process. Selecting a device on this screen does not, in itself, place data stored on the device at risk. Note also that any devices that you do not select here to form part of the installed system can be added to the system after installation by modifying the <filename>/etc/fstab</filename> file.
 </para>
diff --git a/en-US/Specialized_Storage_Devices_common-para-7.xml b/en-US/Specialized_Storage_Devices_common-para-7.xml
new file mode 100644
index 0000000..c36813d
--- /dev/null
+++ b/en-US/Specialized_Storage_Devices_common-para-7.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+]>
+
+<para>
+	The tab contains a drop-down menu to select searching by port, target, WWID, or LUN (with corresponding text boxes for these values). Searching by WWID or LUN requires  additional values in the corresponding text box. 
+</para>
diff --git a/en-US/Steps-x86.xml b/en-US/Steps-x86.xml
index a97a44f..046f3ac 100644
--- a/en-US/Steps-x86.xml
+++ b/en-US/Steps-x86.xml
@@ -3,7 +3,7 @@
 ]>
 
 <chapter id="ch-steps-x86">
-	<title>Planning for Installation</title>
+	<title>Planning for Installation on the x86 Architecture</title>
 
 	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Steps_Upgrade-common.xml"/>
 	<!-- Upgrade or Install? -->
@@ -17,7 +17,11 @@
 	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Steps_Diskspace-x86.xml"/>
 	<!-- Do You Have Enough Disk Space? -->
 	
+	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Graphical_Installation_x86-Installation-methods.xml"/>
+	<!-- Selecting an Installation Method -->
+	          
 	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Steps_Cdrom-x86.xml"/>
-	<!-- Can You Install Using the CD-ROM or DVD? -->
+	<!-- Can You Install Using the DVD? -->
 	
 </chapter>
+
diff --git a/en-US/Steps_Cdrom-x86.xml b/en-US/Steps_Cdrom-x86.xml
index 52f6098..44365b3 100644
--- a/en-US/Steps_Cdrom-x86.xml
+++ b/en-US/Steps_Cdrom-x86.xml
@@ -3,112 +3,30 @@
 ]>
 
 <section>
-	<title>Can You Install Using the CD-ROM or DVD?</title>
+	<title>Choose a boot method</title>
 	<indexterm significance="normal">
 		<primary>steps</primary>
-		<secondary>installing with CD-ROM or DVD</secondary>
-	</indexterm>
-	<indexterm significance="normal">
-		<primary>installation</primary>
-		<secondary>can you install with a CD-ROM or DVD</secondary>
+		<secondary>booting with CD-ROM or DVD</secondary>
 	</indexterm>
+
 	<para>
-		There are several methods that can be used to install Fedora.
+		You can use several methods to boot Fedora.
 	</para>
 
 	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Steps_Cdrom_x86_ppc_preamble.xml"/>
-	 
+
 	<para>
 		Your BIOS may need to be changed to allow booting from your DVD/CD-ROM drive. For more information about changing your BIOS, refer to <xref linkend="s2-x86-starting-booting"/>.
 	</para>
+	
+	<para>
+		Other than booting from an installation CD or DVD, you can also boot the Fedora installation program from <firstterm>minimal boot media</firstterm> in the form of a bootable CD or USB flash drive. After you boot the system with a piece of minimal boot media, you complete the installation from a different installation source, such as a local hard drive or a location on a network. Refer to <xref linkend="Making_Minimal_Boot_Media"/> for instructions on making boot CDs and USB flash drives.
+	</para>
+
+	<para>
+		Finally, you can boot the installer overthe network from a <firstterm>preboot execution environment</firstterm> (PXE) server. Refer to <xref linkend="ap-install-server"/>. Again, after you boot the system, you complete the installation from a different installation source, such as a local hard drive or a location on a network. 
+	</para>
 	 
-	<section id="sect-New_Users-Alternative_Boot_Methods">
-		<title>Alternative Boot Methods</title>
-		<indexterm significance="normal">
-			<primary>boot methods</primary>
-			<secondary>boot CD-ROM</secondary>
-		</indexterm>
-		<variablelist>
-			<varlistentry>
-				<term>Boot DVD/CD-ROM</term>
-				<listitem>
-					<para>
-				<indexterm significance="normal">
-					<primary>boot CD-ROM</primary>
-				</indexterm>
-						If you can boot using the DVD/CD-ROM drive, you can create your own CD-ROM to boot the installation program. This may be useful, for example, if you are performing an installation over a network or from a hard drive. Refer to
-						<xref linkend="s2-steps-make-cd"/> for further instructions.
-					</para>
-				</listitem>
-			</varlistentry>
-			<varlistentry>
-				<term>USB pen drive</term>
-				<listitem>
-					<para>
-				<indexterm significance="normal">
-					<primary>USB pen drive</primary>
-					<secondary>boot methods</secondary>
-				</indexterm>
-				<indexterm significance="normal">
-					<primary>boot methods</primary>
-					<secondary>USB pen drive</secondary>
-				</indexterm>
-						If you cannot boot from the DVD/CD-ROM drive, but you can boot using a USB device, such as a USB pen drive, the following alternative boot method is available:
-					</para>
-					<para>
-						Your BIOS must support booting from a USB device in order for this boot method to work.
-					</para>
-					<para>
-						Install the <package>livecd-tools</package> package on your system with your graphical package manager, or the following command:
-					</para>
-<screen><![CDATA[su -c 'yum -y install livecd-tools']]></screen>
-					<para>
-						Download the <filename>boot.iso</filename> image file as described in <xref linkend="sn-which-files"/> and 
-						use the <application>livecd-iso-to-disk</application> script to copy it to your USB device:
-					</para>
-<screen>livecd-iso-to-disk <replaceable>/path/to/image/file/boot.iso</replaceable> <replaceable>device</replaceable></screen>
-					<para>
-						Where <filename><replaceable>/path/to/image/file</replaceable></filename> is the location of <filename>boot.iso</filename> and <filename><replaceable>device</replaceable></filename> is the USB media device. For example:
-					</para>
-<screen>livecd-iso-to-disk '/home/username/Downloads/boot.iso' /dev/sdc1</screen>
-					<para>
-						If you use Red Hat Enterprise Linux or a Linux distribution derived from it, you can obtain the <package>livecd-tools</package> package from the <firstterm>Extra Packages for Enterprise Linux</firstterm> (EPEL) repository. Refer to <ulink url="http://fedoraproject.org/wiki/EPEL/FAQ#howtouse"></ulink> for details.
-					</para>
-					<para>
-						To create bootable USB media from the <filename>boot.iso</filename> file on a computer that uses Microsoft Windows or a Linux distribution other than Fedora, Red Hat Enterprise Linux, or those derived from Red Hat Enterprise Linux, you will need to find a tool that works for your chosen operating system. 
-					</para>
-					<para>
-						<application>UNetbootin</application> is a free and open-source graphical tool that can create live USB media from live image files on computers that use a wide range of different Linux distributions or Microsoft Windows. Refer to the documentation accompanying <application>UNetbootin</application> for a complete description of the tool and instructions on how to use it. 
-					</para>
-				</listitem>
-			</varlistentry>
-		</variablelist>
-	</section>
-	 
-	<section id="s2-steps-make-cd">
-		<title>Making an Installation Boot CD-ROM</title>
-		<indexterm significance="normal">
-			<primary>CD-ROM</primary>
-			<secondary>boot CD-ROM, creating</secondary>
-		</indexterm>
-		<indexterm significance="normal">
-			<primary>boot CD-ROM</primary>
-			<secondary>creating</secondary>
-		</indexterm>
-		<indexterm significance="normal">
-			<primary><filename>boot.iso</filename></primary>
-		</indexterm>
-		
-		<para>
-			The <filename>boot.iso</filename> image file is available for download from the same servers that host images of the Fedora installation disks &mdash; refer to <xref linkend="sect-Obtaining_Fedora-Downloading_Fedora"/>. This file is an image of a disc that you can burn to a CD and use to boot the installation program. To use this boot CD, your computer must be able to boot from its CD-ROM drive, and its BIOS settings must be configured to do so. 
-		</para>
-		
-		<important>
-			<title>Choose an option to burn a CD from an image</title>
-			<para>
-				When you burn the <filename>boot.iso</filename> image, make sure that you select the option to <literal>burn an image file to disc</literal> in your CD burning software. The exact wording of this option varies, depending on the software that you use, but should contain the word "image". Note that not all CD burning software includes this option. In particular, the CD burning software built into Microsoft Windows XP and Windows Vista does not offer this capability. There are many programs available that add this capability to Windows operating systems;  <application>Infrarecorder</application> is a free and open-source example available from <ulink url="http://www.infrarecorder.org/">http://www.infrarecorder.org/</ulink>.
-			</para>
-		</important>
-		
-	</section>
+
 </section>
+
diff --git a/en-US/Steps_Diskspace-x86.xml b/en-US/Steps_Diskspace-x86.xml
index 2abccb4..8bbf9d6 100644
--- a/en-US/Steps_Diskspace-x86.xml
+++ b/en-US/Steps_Diskspace-x86.xml
@@ -21,7 +21,7 @@
 	</para>
 	
 	<para>
-		The disk space used by Fedora must be separate from the disk space used by other OSes you may have installed on your system, such as Windows, OS/2, or even a different version of Linux. For x86, AMD64, and <trademark class="registered">Intel</trademark> 64 systems, at least two partitions (<filename>/</filename> and <filename>swap</filename>) must be dedicated to Fedora. <!-- (RHEL) For Itanium systems, at least three partitions (<filename>/</filename>, <filename>/boot/efi/</filename>, and <filename>swap</filename>) must be dedicated to Fedora. -->
+		The disk space used by Fedora must be separate from the disk space used by other OSes you may have installed on your system, such as Windows, OS/2, or even a different version of Linux. For x86, AMD64, and Intel 64 systems, at least two partitions (<filename>/</filename> and <filename>swap</filename>) must be dedicated to Fedora.
 	</para>
 	
 	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Steps_Diskspace_x86_ppc_oneline_paragraph.xml"/>
@@ -36,4 +36,5 @@
 		If you are not sure that you meet these conditions, or if you want to know how to create free disk space for your Fedora installation, refer to <xref linkend="ch-partitions-x86"/>.
 	</para>
 	
-</section>
\ No newline at end of file
+</section>
+
diff --git a/en-US/Steps_Diskspace_x86_ppc_Itemized_List.xml b/en-US/Steps_Diskspace_x86_ppc_Itemized_List.xml
index a02029c..67766c6 100644
--- a/en-US/Steps_Diskspace_x86_ppc_Itemized_List.xml
+++ b/en-US/Steps_Diskspace_x86_ppc_Itemized_List.xml
@@ -9,7 +9,7 @@
 		<para>
 			have enough <emphasis>unpartitioned<footnote>
 			<para>
-				Unpartitioned disk space means that available disk space on the hard drive(s) you are installing to has not been divided into sections for data. When you partition a disk, each partition behaves like a separate disk drive.
+				Unpartitioned disk space means that available disk space on the hard drives you are installing to has not been divided into sections for data. When you partition a disk, each partition behaves like a separate disk drive.
 			</para>
 			</footnote></emphasis> disk space for the installation of Fedora, or
 		</para>
@@ -20,4 +20,5 @@
 			have one or more partitions that may be deleted, thereby freeing up enough disk space to install Fedora.
 		</para>
 	</listitem>
-</itemizedlist>
\ No newline at end of file
+</itemizedlist>
+
diff --git a/en-US/Steps_Diskspace_x86_ppc_oneline_paragraph.xml b/en-US/Steps_Diskspace_x86_ppc_oneline_paragraph.xml
index 90de039..3c7d7a8 100644
--- a/en-US/Steps_Diskspace_x86_ppc_oneline_paragraph.xml
+++ b/en-US/Steps_Diskspace_x86_ppc_oneline_paragraph.xml
@@ -7,3 +7,4 @@
 <para>
 	Before you start the installation process, you must
 </para>
+
diff --git a/en-US/Steps_Hd_Install-x86.xml b/en-US/Steps_Hd_Install-x86.xml
index 7bb3214..f7d708d 100644
--- a/en-US/Steps_Hd_Install-x86.xml
+++ b/en-US/Steps_Hd_Install-x86.xml
@@ -2,21 +2,35 @@
 <!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
 ]>
 
-<section>
-	<title>Preparing for a Hard Drive Installation</title>
-	<indexterm significance="normal">
-		<primary>hard drive installation</primary>
-		<secondary>preparing for</secondary>
-	</indexterm>
-	<indexterm significance="normal">
-		<primary>installation</primary>
-		<secondary>hard drive</secondary>
-	</indexterm>
+<section id="s1-steps-hd-installs-x86">
+	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Steps_Hd_Install_common-title-1.xml"/>
+	<!-- Preparing for a Hard Drive Installation  -->
+
+<!-- indexterms -->
+	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Steps_Hd_Install_common-indexterm-1.xml"/>
+	<!-- hard drive installation, preparing for  -->
+	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Steps_Hd_Install_common-indexterm-2.xml"/>
+	<!-- installation, hard drive  -->
+<!-- indexterms -->
 
 	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Steps_Hd_Install_x86_ppc_note_1.xml"/>
+	<!-- only some file systems -->
+	
+	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Beginning_Installation_Hard_Disk_common-note-1.xml"/>
+	<!-- Cannot install from LVM partitions -->
+
+	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Steps_Hd_Install_x86_ppc_s390_para_0.xml"/>
+	<!-- Use this method to install Red Hat Enterprise Linux on systems -->
 	
-	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Steps_Hd_Install_x86_ppc_para_1.xml"/>
-	<!-- Hard drive installations require the use of the ISO (or CD-ROM) images. -->
+	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Steps_Hd_Install_common-para-6.xml"/>
+	<!-- Hard drive installations use the following files: -->
+	
+	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Steps_Hd_Install_common-itemizedlist-1.xml"/>
+	<!-- 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 xmlns:xi="http://www.w3.org/2001/XInclude" href="Prepare_To_Install-common-Boot_Media.xml"/>
 	<!-- Ensure that you have boot media available on CD, DVD, or a USB storage device... -->
@@ -24,59 +38,49 @@
 	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Steps_Hd_Install_x86_ppc_s390_para_1.xml"/>
 	<!-- To prepare your system for a hard drive installation, you must set the system up -->
 	
-	<itemizedlist>
-		<listitem>
-			<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Steps_Hd_Install_x86_ppc_s390_listitem_1.xml"/>
-			<!-- Using a set of CD-ROMs - Create CD-ROM ISO image files from each -->
+	<procedure>
+		<step>
+			<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Steps_Hd_Install_common-para-1.xml"/>
+			<!-- Obtain an ISO image of the -->
 			
-			<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Steps_Hd_Install_x86_ppc_s390_listitem_1a.xml"/>
-			<!-- screen -->
-		</listitem>
-		
-		<listitem>
-			<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Steps_Hd_Install_x86_ppc_s390_listitem_2.xml"/>
-			<!-- Using ISO images - transfer these images to the system to be installed -->
+			<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Steps_Network_Install_x86_ppc_s390_screen_1.xml"/>
+			<!-- dd if=/dev/<dvd> of=</location/of/disk/space>/RHEL6.iso -->
+				
+			<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Steps_Network_Install_x86_ppc_s390_para_4.xml"/>
+			<!-- where dvd refers to your DVD drive device -->
+		</step>
+		<step>
+			<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Steps_Hd_Install_common-para-2.xml"/>
+			<!-- Transfer the ISO image to the hard drive -->
 			
 			<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Beginning_Installation_Hard_Disk_common-para-5.xml"/>
 			<!-- The ISO files must be located on a hard drive that... -->
-
-			<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Steps_Hd_Install_x86_ppc_s390_listitem_2b.xml"/>
-			<!-- Verifying that ISO images are intact before you attempt an installation, -->
+		</step>
+		<step>
+			<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Steps_Hd_Install_common-para-4.xml"/>
+			<!-- Use a SHA256 checksum program to verify that the ISO image... -->
 			
-		</listitem>
-	</itemizedlist>
-
-	<indexterm significance="normal">
-		<primary>installation media</primary>
-		<secondary>testing</secondary>
-	</indexterm>
-	<indexterm significance="normal">
-		<primary>boot options</primary>
-		<secondary><command moreinfo="none">linux mediacheck</command>
-		</secondary>
-	</indexterm>
-	<indexterm significance="normal">
-		<primary>troubleshooting</primary>
-		<secondary>CD-ROM failure</secondary>
-		<tertiary>CD-ROM verification</tertiary>
-	</indexterm>
+			<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Steps_Hd_Install_common-screen-1.xml"/>
+			<!-- sha256sum name_of_image.iso -->
+			
+			<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Steps_Hd_Install_common-para-5.xml"/>
+			<!-- where name_of_image is the name of the ISO image file. -->
+		</step>
+		<step>
+			<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Steps_Hd_Install_common-para-3.xml"/>
+			<!-- Copy the images/ directory within the ISO files... -->
+			<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Beginning_Installation_Hard_Disk_common-screen-1.xml"/>
+		</step>
+		<step>
+			<para>
+				Verify that the 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>
+		</step>
+	</procedure>
 	
 	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Steps_Hd_Install_x86_note_1.xml"/>
 	<!-- The $PROD; installation program has the ability to test the integrity -->
+
 	
-	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Steps_Hd_Install_x86_ppc_s390_para_2.xml"/>
-	<!-- Additionally, if a file called updates.img exists in the  -->
-	
-	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Beginning_Installation_Hard_Disk_common-para-6.xml"/>
-	<!-- To extract the install.img from the iso follow... -->
-	
-	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Beginning_Installation_Hard_Disk_common-screen-1.xml"/>
-	<!-- mount -t iso9660 /path/to/Fedora10/iso /mnt/point... -->
-	
-	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Beginning_Installation_Hard_Disk_common-para-8.xml"/>
-	<!-- Before you begin installation from a hard drive, check... -->
-	
-	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Beginning_Installation_Hard_Disk_common-note-1.xml"/>
-	<!-- Cannot install from LVM partitions -->
+</section>
 
-</section>
\ No newline at end of file
diff --git a/en-US/Steps_Hd_Install_common-indexterm-1.xml b/en-US/Steps_Hd_Install_common-indexterm-1.xml
new file mode 100644
index 0000000..1449be5
--- /dev/null
+++ b/en-US/Steps_Hd_Install_common-indexterm-1.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<!DOCTYPE indexterm PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+]>
+
+<indexterm significance="normal">
+	<primary>hard drive installation</primary>
+	<secondary>preparing for</secondary>
+</indexterm>
+	
+
+	
+
diff --git a/en-US/Steps_Hd_Install_common-indexterm-2.xml b/en-US/Steps_Hd_Install_common-indexterm-2.xml
new file mode 100644
index 0000000..74b2a74
--- /dev/null
+++ b/en-US/Steps_Hd_Install_common-indexterm-2.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<!DOCTYPE indexterm PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+]>
+
+<indexterm significance="normal">
+	<primary>installation</primary>
+	<secondary>hard drive</secondary>
+</indexterm>
+
+	
+
+	
+
diff --git a/en-US/Steps_Hd_Install_common-itemizedlist-1.xml b/en-US/Steps_Hd_Install_common-itemizedlist-1.xml
new file mode 100644
index 0000000..6dd143c
--- /dev/null
+++ b/en-US/Steps_Hd_Install_common-itemizedlist-1.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+<!DOCTYPE itemizedlist PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+]>
+
+<itemizedlist>
+	<listitem>
+		<para>
+			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>
+	</listitem>
+	<listitem>
+		<para>
+			an <filename>install.img</filename> file extracted from the ISO image.
+		</para>
+	</listitem>
+	<listitem>
+		<para>
+			optionally, a <filename>product.img</filename> file extracted from the ISO image.
+		</para>
+	</listitem>
+</itemizedlist>
+	
+
diff --git a/en-US/Steps_Hd_Install_common-para-1.xml b/en-US/Steps_Hd_Install_common-para-1.xml
new file mode 100644
index 0000000..d50c13f
--- /dev/null
+++ b/en-US/Steps_Hd_Install_common-para-1.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+]>
+
+<para>
+	Obtain an ISO image of the Fedora installation DVD (refer to <xref linkend="ch-new-users"/>). Alternatively, if you have the DVD on physical media, you can create an image of it with the following command on a Linux system: 
+</para>
+
+
+	
+
diff --git a/en-US/Steps_Hd_Install_common-para-2.xml b/en-US/Steps_Hd_Install_common-para-2.xml
new file mode 100644
index 0000000..9f4ce95
--- /dev/null
+++ b/en-US/Steps_Hd_Install_common-para-2.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [	  
+]>
+
+<para>
+	Transfer the ISO image to the hard drive.
+</para>
+
diff --git a/en-US/Steps_Hd_Install_common-para-3.xml b/en-US/Steps_Hd_Install_common-para-3.xml
new file mode 100644
index 0000000..b7c36df
--- /dev/null
+++ b/en-US/Steps_Hd_Install_common-para-3.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [	  
+]>
+
+<para>
+	Copy the <filename>images/</filename> directory within the ISO file to a directory named <filename>images/</filename>. Enter the following commands:
+</para>
+
diff --git a/en-US/Steps_Hd_Install_common-para-4.xml b/en-US/Steps_Hd_Install_common-para-4.xml
new file mode 100644
index 0000000..30a2b99
--- /dev/null
+++ b/en-US/Steps_Hd_Install_common-para-4.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [	  
+]>
+
+<para>
+	Use a SHA256 checksum program to verify that the ISO image that you copied is intact. Many SHA256 checksum programs are available for various operating systems. On a Linux system, run:
+</para>
+
diff --git a/en-US/Steps_Hd_Install_common-para-5.xml b/en-US/Steps_Hd_Install_common-para-5.xml
new file mode 100644
index 0000000..9ace9ed
--- /dev/null
+++ b/en-US/Steps_Hd_Install_common-para-5.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [	  
+]>
+
+<para>
+	where <replaceable>name_of_image</replaceable> is the name of the ISO image file. The SHA256 checksum program displays a string of 64 characters called a <firstterm>hash</firstterm>. Compare this hash to the hash displayed for this particular image on the <guilabel>Download Software</guilabel> page on the Red Hat Network (refer to <xref linkend="ch-new-users"/>). The two hashes should be identical.
+</para>
+
diff --git a/en-US/Steps_Hd_Install_common-para-6.xml b/en-US/Steps_Hd_Install_common-para-6.xml
new file mode 100644
index 0000000..2726c09
--- /dev/null
+++ b/en-US/Steps_Hd_Install_common-para-6.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [	  
+]>
+
+<para>
+	Hard drive installations use the following files:
+</para>
+
diff --git a/en-US/Steps_Hd_Install_common-screen-1.xml b/en-US/Steps_Hd_Install_common-screen-1.xml
new file mode 100644
index 0000000..855212f
--- /dev/null
+++ b/en-US/Steps_Hd_Install_common-screen-1.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<!DOCTYPE screen PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+]>
+
+<screen><command>$ sha256sum <replaceable>name_of_image</replaceable>.iso</command></screen>
+
+
+	
+
diff --git a/en-US/Steps_Hd_Install_common-title-1.xml b/en-US/Steps_Hd_Install_common-title-1.xml
new file mode 100644
index 0000000..ab0cb52
--- /dev/null
+++ b/en-US/Steps_Hd_Install_common-title-1.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<!DOCTYPE title PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+]>
+
+<title>Preparing for a Hard Drive Installation</title>
+
+
+	
+
diff --git a/en-US/Steps_Hd_Install_x86_note_1.xml b/en-US/Steps_Hd_Install_x86_note_1.xml
index cfbc26c..230d6e6 100644
--- a/en-US/Steps_Hd_Install_x86_note_1.xml
+++ b/en-US/Steps_Hd_Install_x86_note_1.xml
@@ -16,4 +16,5 @@
 
 
 
-</note>
\ No newline at end of file
+</note>
+
diff --git a/en-US/Steps_Hd_Install_x86_ppc_note_1.xml b/en-US/Steps_Hd_Install_x86_ppc_note_1.xml
index c28d794..0901000 100644
--- a/en-US/Steps_Hd_Install_x86_ppc_note_1.xml
+++ b/en-US/Steps_Hd_Install_x86_ppc_note_1.xml
@@ -1,14 +1,15 @@
 <?xml version="1.0"?>
 <!DOCTYPE note PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
-<!ENTITY % RH_ENTITIES SYSTEM "./Common_Config/rh-entities.ent">
-%RH_ENTITIES;
-
 ]>
 
 <note>
-	<title>Note</title>
+	<title>Note â€” Not all file systems supported</title>
 
 	<para>
-		Hard drive installations only work from ext2, ext3, ext4, or FAT file systems. If you have a file system other than those listed here, such as reiserfs, you will not be able to perform a hard drive installation.
+		Hard drive installations only work from ext2, ext3, ext4, or FAT file systems. You cannot use a hard drives formatted for any other file system as an installation source for Fedora.
+	</para>
+	<para>
+		To check the file system of a hard drive partition on a Windows operating system, use the <application>Disk Management</application> tool. To check the file system of a hard drive partition on a Linux operating system, use the <application>fdisk</application> tool. 
 	</para>
 </note>
+
diff --git a/en-US/Steps_Hd_Install_x86_ppc_note_para_1.xml b/en-US/Steps_Hd_Install_x86_ppc_note_para_1.xml
index cd410f5..84ccbf2 100644
--- a/en-US/Steps_Hd_Install_x86_ppc_note_para_1.xml
+++ b/en-US/Steps_Hd_Install_x86_ppc_note_para_1.xml
@@ -2,8 +2,9 @@
 <!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
 ]>
 
-<!-- This is in the Step_Network_Install-ppc.xml file as well, so as to say yaboot in place of boot, and remove the Itanium reference -->
+<!-- This is in the Step_Network_Install-ppc.xml file as well, so as to say yaboot in place of boot -->
 
 <para>
-	The Fedora installation program has the ability to test the integrity of the installation media. It works with the CD / DVD, hard drive ISO, and NFS ISO installation methods. We recommend that you test all installation media before starting the installation process, and before reporting any installation-related bugs (many of the bugs reported are actually due to improperly-burned CDs). To use this test, type the following command at the <prompt>boot:</prompt> prompt<!-- (RHEL) (prepend with <command>elilo</command> for Itanium systems)-->:
-</para>
\ No newline at end of file
+	The Fedora installation program has the ability to test the integrity of the installation media. It works with the CD, DVD, hard drive ISO, and NFS ISO installation methods. We recommend that you test all installation media before starting the installation process, and before reporting any installation-related bugs (many of the bugs reported are actually due to improperly-burned discs). To use this test, type the following command at the <prompt>boot:</prompt> prompt:
+</para>
+
diff --git a/en-US/Steps_Hd_Install_x86_ppc_para_1.xml b/en-US/Steps_Hd_Install_x86_ppc_para_1.xml
deleted file mode 100644
index 6bc52a8..0000000
--- a/en-US/Steps_Hd_Install_x86_ppc_para_1.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
-]>
-
-<para>
-	Hard drive installations require the use of the ISO (or DVD/CD-ROM) images. An ISO image is a file containing an exact copy of a DVD/CD-ROM image. <!-- Because Fedora has so many packages included with its distribution, there are several ISO images available. -->After placing the required ISO images (the binary Fedora DVD/CD-ROMs) in a directory, choose to install from the hard drive. You can then point the installation program at that directory to perform the installation.
-</para>
\ No newline at end of file
diff --git a/en-US/Steps_Hd_Install_x86_ppc_s390_listitem_1.xml b/en-US/Steps_Hd_Install_x86_ppc_s390_listitem_1.xml
deleted file mode 100644
index 1c50cd7..0000000
--- a/en-US/Steps_Hd_Install_x86_ppc_s390_listitem_1.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
-]>
-
-<para>
-	Using a set of CD-ROMs, or a DVD &mdash; Create ISO image files from each installation CD-ROM, or from the DVD. For each CD-ROM (once for the DVD), execute the following command on a Linux system:
-</para>
\ No newline at end of file
diff --git a/en-US/Steps_Hd_Install_x86_ppc_s390_listitem_1a.xml b/en-US/Steps_Hd_Install_x86_ppc_s390_listitem_1a.xml
deleted file mode 100644
index d6db5b4..0000000
--- a/en-US/Steps_Hd_Install_x86_ppc_s390_listitem_1a.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
-]>
-
-<screen><command>dd if=/dev/cdrom of=/tmp/<replaceable>file-name</replaceable>.iso</command>
-</screen>
diff --git a/en-US/Steps_Hd_Install_x86_ppc_s390_listitem_2.xml b/en-US/Steps_Hd_Install_x86_ppc_s390_listitem_2.xml
deleted file mode 100644
index f0d9a17..0000000
--- a/en-US/Steps_Hd_Install_x86_ppc_s390_listitem_2.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
-	  
-	  
-	  
-]>
-
-<para>
-	Using ISO images &mdash; transfer these images to the system to be installed.
-</para>
\ No newline at end of file
diff --git a/en-US/Steps_Hd_Install_x86_ppc_s390_listitem_2b.xml b/en-US/Steps_Hd_Install_x86_ppc_s390_listitem_2b.xml
deleted file mode 100644
index 5d1a203..0000000
--- a/en-US/Steps_Hd_Install_x86_ppc_s390_listitem_2b.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
-
-
-
-]>
-
-<para>
-	Verifying that ISO images are intact before you attempt an installation, helps to avoid problems. To verify the ISO images are intact prior to performing an installation, use an <command>md5sum</command> program (many <command>md5sum</command> programs are available for various operating systems). An <command>md5sum</command> program should be available on the same Linux machine as the ISO images.
-</para>
\ No newline at end of file
diff --git a/en-US/Steps_Hd_Install_x86_ppc_s390_para_0.xml b/en-US/Steps_Hd_Install_x86_ppc_s390_para_0.xml
new file mode 100644
index 0000000..76d2919
--- /dev/null
+++ b/en-US/Steps_Hd_Install_x86_ppc_s390_para_0.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+]>
+
+<para>
+	Use this option to install Fedora on systems without a DVD drive or network connection.
+</para>	
+
diff --git a/en-US/Steps_Hd_Install_x86_ppc_s390_para_1.xml b/en-US/Steps_Hd_Install_x86_ppc_s390_para_1.xml
index 7e0c2d3..dff4642 100644
--- a/en-US/Steps_Hd_Install_x86_ppc_s390_para_1.xml
+++ b/en-US/Steps_Hd_Install_x86_ppc_s390_para_1.xml
@@ -6,7 +6,8 @@
 ]>
 
 <para>
-	To prepare your system for a hard drive installation, you must set the system up in one of the following ways:
+	To prepare a hard drive as an installation source, follow these steps:
 </para>
 	 
-	
\ No newline at end of file
+	
+
diff --git a/en-US/Steps_Hd_Install_x86_ppc_s390_para_2.xml b/en-US/Steps_Hd_Install_x86_ppc_s390_para_2.xml
deleted file mode 100644
index ccf22f8..0000000
--- a/en-US/Steps_Hd_Install_x86_ppc_s390_para_2.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
-]>
-
-<para>
-	Additionally, if a file called <filename>updates.img</filename> exists in the location from which you install, it is used for updates to <filename>anaconda</filename>, the installation program. Refer to the file <filename>install-methods.txt</filename> in the <filename>anaconda</filename> RPM package for detailed information on the various ways to install Fedora, as well as how to apply the installation program updates.
-</para>
\ No newline at end of file
diff --git a/en-US/Steps_Network_Install-x86.xml b/en-US/Steps_Network_Install-x86.xml
index 636c5f5..5ec0745 100644
--- a/en-US/Steps_Network_Install-x86.xml
+++ b/en-US/Steps_Network_Install-x86.xml
@@ -3,7 +3,10 @@
 ]>
 
 <section id="s1-steps-network-installs-x86">
-	<title>Preparing for a Network Installation</title>
+	<xi:include href="Steps_Network_Install_common-title-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+	<!--Preparing for a Network Installation -->
+
+		
 	<indexterm significance="normal">
 		<primary>network installation</primary>
 		<secondary>preparing for</secondary>
@@ -40,7 +43,7 @@
 	
 	
 	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Steps_Network_Install_x86_ppc_note.xml"/>
-	<!-- Make sure an installation CD (or any other type of CD) is not in your hosting -->
+	<!-- Make sure no installation DVD -->
 	
 	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Prepare_To_Install-common-Boot_Media.xml"/>
 	<!-- Ensure that you have boot media available on CD, DVD, or a USB storage device... -->
@@ -52,13 +55,13 @@
 	<!-- The NFS, FTP, or HTTP server to be used for installation over the network -->
 	
 	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Steps_Network_Install_x86_ppc_note_2.xml"/>
-	<!-- The Red Hat Enterprise Linux installation program has the ability -->
+	<!-- The Fedora installation program has the ability -->
 	
 	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Steps_Network_Install_x86_ppc_s390_note_1.xml"/>
 	<!-- In the following examples, the directory on the installation staging server -->
 	
 	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Steps_Network_Install_x86_ppc_s390_para_3.xml"/>
-	<!-- To copy the files from the installation CD-ROMs to a Linux machine -->
+	<!-- To copy the files from the installation DVD to a Linux machine -->
 	
 	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Steps_Network_Install_x86_ppc_s390_screen_1.xml"/>
 	<!-- dd if=/dev/<dvd> of=</location/of/disk/space>/RHEL6.iso -->
@@ -67,18 +70,19 @@
 	<!-- where dvd refers to your DVD drive device -->
 	
 	<para>
-		For details on how to prepare a network installation using a set of CD-ROMs, refer to the instructions in the <filename>README-en</filename> file on <systemitem>CD-ROM#1</systemitem>. 
+		To copy the files from the installation DVD to a Linux instance, which acts as an installation staging server, continue with either <xref linkend="s1-steps-network-installs-x86-ftp-http"/> or <xref linkend="s1-steps-network-installs-x86-nfs"/>.  
 	</para>
 	
 	<para>
-		To copy the files from the installation DVD or CD-ROMs to a Linux instance, which acts as an installation staging server, continue with either <xref linkend="s1-steps-network-installs-x86-ftp-http"/> or LINKMEÂ Preparing for an NFS installation.  
+		For details on how to prepare a network installation using a set of CD-ROMs, refer to the instructions in the <filename>README-en</filename> file on <systemitem>CD-ROM#1</systemitem>. 
 	</para>
 	
-	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Steps_Network_Install_x86_ppc_s390_section_1.xml"/>
+	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Steps_Network_Install_x86_section_1.xml"/>
 	<!-- Preparing for FTP and HTTP installation -->
 	
-	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Steps_Network_Install_x86_ppc_s390_section_2.xml"/>
+	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Steps_Network_Install_x86_section_2.xml"/>
 	<!-- Preparing for an NFS install -->
-	
-	
-</section>
\ No newline at end of file
+
+
+</section>
+
diff --git a/en-US/Steps_Network_Install_common-title-1.xml b/en-US/Steps_Network_Install_common-title-1.xml
new file mode 100644
index 0000000..a0aaabc
--- /dev/null
+++ b/en-US/Steps_Network_Install_common-title-1.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<!DOCTYPE title PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+]>
+
+<title>Preparing for a Network Installation</title>
+
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 37992d5..f7198a0 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
@@ -3,5 +3,5 @@
 ]>
 
 <para>
-	For NFS installation it is not necessary to extract files from the ISO image. It is sufficient to make the ISO image itself available on the network server via NFS. You can do this by moving the ISO image to the NFS exported directory:
+	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.
 </para>
diff --git a/en-US/Steps_Network_Install_section_2-common-para-2.xml b/en-US/Steps_Network_Install_section_2-common-para-2.xml
deleted file mode 100644
index d57e2d2..0000000
--- a/en-US/Steps_Network_Install_section_2-common-para-2.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
-]>
-
-<para>
-	You must also copy the <filename>install.img</filename> file from within the ISO files to a directory named <filename class="directory">images</filename>
-</para>
diff --git a/en-US/Steps_Network_Install_section_2-common-para-3.xml b/en-US/Steps_Network_Install_section_2-common-para-3.xml
deleted file mode 100644
index b6b77d2..0000000
--- a/en-US/Steps_Network_Install_section_2-common-para-3.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
-]>
-
-<para>
-	To extract the <filename>install.img</filename> file from the ISO, run these commands on the network server:
-</para>
diff --git a/en-US/Steps_Network_Install_section_2-common-para-7.xml b/en-US/Steps_Network_Install_section_2-common-para-7.xml
index 8b3edcd..b8ed196 100644
--- a/en-US/Steps_Network_Install_section_2-common-para-7.xml
+++ b/en-US/Steps_Network_Install_section_2-common-para-7.xml
@@ -3,6 +3,6 @@
 ]>
 
 <para>
-	On the network server, start the NFS daemon (on a Red Hat Enterprise Linux system, use <command>/sbin/service nfs start</command>). If NFS is already running, reload the configuration file (on a Red Hat Enterprise Linux system use <command>/sbin/service nfs reload</command>).
+	On the network server, start the NFS daemon (on a Fedora system, use <command>/sbin/service nfs start</command>). If NFS is already running, reload the configuration file (on a Fedora system use <command>/sbin/service nfs reload</command>).
 </para>
 
diff --git a/en-US/Steps_Network_Install_section_2-common-para-8.xml b/en-US/Steps_Network_Install_section_2-common-para-8.xml
index e89be8a..d1a07c9 100644
--- a/en-US/Steps_Network_Install_section_2-common-para-8.xml
+++ b/en-US/Steps_Network_Install_section_2-common-para-8.xml
@@ -3,6 +3,6 @@
 ]>
 
 <para>
-	Be sure to test the NFS share following the directions in the <citetitle>Red Hat Enterprise Linux Deployment Guide</citetitle>. Refer to your NFS documentation for details on starting and stopping the NFS server.
+	Be sure to test the NFS share following the directions in the <citetitle>Fedora Deployment Guide</citetitle>. Refer to your NFS documentation for details on starting and stopping the NFS server.
 </para>
 
diff --git a/en-US/Steps_Network_Install_section_2-common-para-9.xml b/en-US/Steps_Network_Install_section_2-common-para-9.xml
new file mode 100644
index 0000000..1a8d152
--- /dev/null
+++ b/en-US/Steps_Network_Install_section_2-common-para-9.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+]>
+
+<para>
+	Transfer the ISO image to the NFS exported directory. On a Linux system, run:
+</para>
+
diff --git a/en-US/Steps_Network_Install_section_2-common-screen-1.xml b/en-US/Steps_Network_Install_section_2-common-screen-1.xml
index 868b3ba..22cbc44 100644
--- a/en-US/Steps_Network_Install_section_2-common-screen-1.xml
+++ b/en-US/Steps_Network_Install_section_2-common-screen-1.xml
@@ -2,25 +2,6 @@
 <!DOCTYPE screen PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
 ]>
 
-<itemizedlist>
-			
-		<listitem>
-			<para>
-				For DVD:
-			</para>
-<screen><command>mv <replaceable>/location/of/disk/space/</replaceable>f&PRODVER;.iso <replaceable>/publicly/available/directory/</replaceable>
-</command></screen>
-		</listitem>
-		
-		<listitem>
-			<para>
-				For CDROMs:
-			</para>
-<screen><command>mv <replaceable>/location/of/disk/space/</replaceable>f&PRODVER;-disk*.iso <replaceable>/publicly/available/directory/</replaceable>
-</command></screen>
-		</listitem>
-	</itemizedlist>
-	
-	
-	
+<screen><command>mv <replaceable>/location/of/disk/space/</replaceable>RHEL&PRODVER;.iso <replaceable>/publicly/available/directory/</replaceable></command></screen>
+
 
diff --git a/en-US/Steps_Network_Install_x86_ppc_note.xml b/en-US/Steps_Network_Install_x86_ppc_note.xml
index 00537f2..6b364c2 100644
--- a/en-US/Steps_Network_Install_x86_ppc_note.xml
+++ b/en-US/Steps_Network_Install_x86_ppc_note.xml
@@ -9,7 +9,7 @@
 	<title>Note</title>
 	
 	<para>
-		Make sure no installation DVD (or any other type of DVD or CD) is in your system's CD/DVD drive if you are performing a network-based installation. Having a DVD or CD in the drive might cause unexpected errors.
+		Make sure no installation DVD (or any other type of DVD or CD) is in your system's CD or DVD drive if you are performing a network-based installation. Having a DVD or CD in the drive might cause unexpected errors.
 	</para>
 </note>
 
diff --git a/en-US/Steps_Network_Install_x86_ppc_note_2.xml b/en-US/Steps_Network_Install_x86_ppc_note_2.xml
index c43a8d8..8b791d5 100644
--- a/en-US/Steps_Network_Install_x86_ppc_note_2.xml
+++ b/en-US/Steps_Network_Install_x86_ppc_note_2.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE note PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
 ]>	
 
-<!-- Note that this has been replaced in the ppc file with an inline version that says yaboot in place of boot, and does not have the Itanium phrase -->
+<!-- Note that this has been replaced in the ppc file with an inline version that says yaboot in place of boot -->
 <note>
 	<title>Note</title>
 
@@ -12,4 +12,5 @@
 <screen>
 <userinput>linux mediacheck</userinput>
 </screen>
-</note>
\ No newline at end of file
+</note>
+
diff --git a/en-US/Steps_Network_Install_x86_ppc_s390_itemized_list_1.xml b/en-US/Steps_Network_Install_x86_ppc_s390_itemized_list_1.xml
deleted file mode 100644
index 01f3ff7..0000000
--- a/en-US/Steps_Network_Install_x86_ppc_s390_itemized_list_1.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE itemizedlist PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
-]>
-
-<itemizedlist>
-	<listitem>
-
-		<para>
-			Create an iso image from the installation disk(s) using the following command (for DVDs):
-			
-			
-		</para>
-		
-		<para>
-			<command>
-				dd if=/dev/<replaceable>dvd</replaceable> of=<replaceable>/location/of/disk/space/</replaceable>f&PRODVER;.iso
-			</command>
-		</para>
-		
-		<para>
-			where <replaceable>dvd</replaceable> refers to your DVD drive device.
-				</para>
-				
-		<para>For instructions on how to prepare a network installation using CD-ROMs, refer to the instructions on the <filename>README-en</filename> file in <filename>disk1</filename>.</para>
-<!--		above replaces below, BZ#240455
-		<itemizedlist>
-			<listitem>
-				<para>
-					For DVD:
-				</para>
-				
-				<para>
-					<command>
-						dd if=/dev/<replaceable>dvd</replaceable> of=<replaceable>/location/of/disk/space/</replaceable>RHEL5.iso
-					</command>
-				</para>
-				
-				<para>
-					where <replaceable>dvd</replaceable> refers to your DVD drive device.
-				</para>
-			</listitem>
-			
-			<listitem>
-				<para>
-					For CD-ROMs:
-				</para>
-				
-				<para>
-					<command>
-						dd if=/dev/<replaceable>cdrom</replaceable> of=<replaceable>/location/of/disk/space/</replaceable>disk<replaceable>X</replaceable>.iso
-					</command>
-				</para>
-				
-				<para>
-					where <replaceable>cdrom</replaceable> refers to your CD drive device, and <replaceable>X</replaceable> is the number of the disk that you are copying, beginning with 1 for the first disk, and so on.
-				</para>
-			</listitem>
-		</itemizedlist>-->
-	</listitem>
-</itemizedlist>
\ No newline at end of file
diff --git a/en-US/Steps_Network_Install_x86_ppc_s390_note_1.xml b/en-US/Steps_Network_Install_x86_ppc_s390_note_1.xml
index 498ee03..3286611 100644
--- a/en-US/Steps_Network_Install_x86_ppc_s390_note_1.xml
+++ b/en-US/Steps_Network_Install_x86_ppc_s390_note_1.xml
@@ -6,9 +6,10 @@
 	<title>Note</title>
 
 	<para>
-		The public directory used to access the installation files over FTP, NFS, or HTTP is mapped to local storage on the network server. For example, the local directory <filename>/var/www/inst/f&PRODVER;</filename> on the network server can be accessed as <filename>http://network.server.com/inst/f&PRODVER;</filename>. 
+		The public directory used to access the installation files over FTP, NFS, or HTTP is mapped to local storage on the network server. For example, the local directory <filename>/var/www/inst/rhel&PRODVER;</filename> on the network server can be accessed as <filename>http://network.server.com/inst/rhel&PRODVER;</filename>. 
 	</para>
 	<para>
-		In the following examples, the directory on the installation staging server that will contain the installation files will be specified as <filename><replaceable>/location/of/disk/space</replaceable></filename>. The directory that will be made publicly available via FTP, NFS, or HTTP will be specified as <replaceable>/publicly/available/directory</replaceable>. For example, <filename><replaceable>/location/of/disk/space</replaceable></filename> may be a directory you create called <filename>/var/isos</filename>. <filename><replaceable>/publicly/available/directory</replaceable></filename> might be <filename>/var/www/html/f&PRODVER;</filename>, for an HTTP install.
+		In the following examples, the directory on the installation staging server that will contain the installation files will be specified as <filename><replaceable>/location/of/disk/space</replaceable></filename>. The directory that will be made publicly available via FTP, NFS, or HTTP will be specified as <replaceable>/publicly/available/directory</replaceable>. For example, <filename><replaceable>/location/of/disk/space</replaceable></filename> may be a directory you create called <filename>/var/isos</filename>. <filename><replaceable>/publicly/available/directory</replaceable></filename> might be <filename>/var/www/html/rhel&PRODVER;</filename>, for an HTTP install.
 	</para>
-</note>
\ No newline at end of file
+</note>
+
diff --git a/en-US/Steps_Network_Install_x86_ppc_s390_para_1.xml b/en-US/Steps_Network_Install_x86_ppc_s390_para_1.xml
index cf4bc5d..e7766fc 100644
--- a/en-US/Steps_Network_Install_x86_ppc_s390_para_1.xml
+++ b/en-US/Steps_Network_Install_x86_ppc_s390_para_1.xml
@@ -4,4 +4,5 @@
 
 <para>
 	The Fedora installation medium must be available for either a network installation (via NFS, FTP, or HTTP) or installation via local storage. Use the following steps if you are performing an NFS, FTP, or HTTP installation. 
-</para>
\ No newline at end of file
+</para>
+
diff --git a/en-US/Steps_Network_Install_x86_ppc_s390_para_2.xml b/en-US/Steps_Network_Install_x86_ppc_s390_para_2.xml
index 7f3e90b..d34889d 100644
--- a/en-US/Steps_Network_Install_x86_ppc_s390_para_2.xml
+++ b/en-US/Steps_Network_Install_x86_ppc_s390_para_2.xml
@@ -6,5 +6,6 @@
 ]>
 
 <para>
-	The NFS, FTP, or HTTP server to be used for installation over the network must be a separate, network-accessible server. It must provide the complete contents of the installation DVD-ROM or the installation CD-ROMs.
-</para>
\ No newline at end of file
+	The NFS, FTP, or HTTP server to be used for installation over the network must be a separate, network-accessible server. It must provide the complete contents of the installation DVD-ROM or the installation CD-ROMs. 
+</para>
+
diff --git a/en-US/Steps_Network_Install_x86_ppc_s390_para_3.xml b/en-US/Steps_Network_Install_x86_ppc_s390_para_3.xml
index 5fb78fa..3697da2 100644
--- a/en-US/Steps_Network_Install_x86_ppc_s390_para_3.xml
+++ b/en-US/Steps_Network_Install_x86_ppc_s390_para_3.xml
@@ -6,5 +6,6 @@
 ]>
 
 <para>
-	In the following, you will require <firstterm>ISO images</firstterm>. An ISO image is a file containing an exact copy of the content of a DVD or CD-ROM. To create an ISO image from a DVD or a set of ISO images from a set of CD-ROMS use the following command: 
-</para>
\ No newline at end of file
+	In the following, you will require an <firstterm>ISO image</firstterm>. An ISO image is a file containing an exact copy of the content of a DVD. To create an ISO image from a DVD use the following command: 
+</para>
+
diff --git a/en-US/Steps_Network_Install_x86_ppc_s390_section_1.xml b/en-US/Steps_Network_Install_x86_ppc_s390_section_1.xml
deleted file mode 100644
index 640b498..0000000
--- a/en-US/Steps_Network_Install_x86_ppc_s390_section_1.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
-]>
-
-<section>
-	<title>Preparing for FTP and HTTP installation</title>
-	
-	<para>
-		Extract the files from the iso image of the installation DVD or the iso images of the installation CDs and place them in a directory that is shared over FTP or HTTP. 
-	</para>
-	<!-- 
-	<itemizedlist>
-		<listitem>
-			<para>
-				For DVD:
-			</para>
-			
-			<para>
-				<command>
-					mount -o loop <replaceable>/location/of/disk/space/</replaceable>f&PRODVER;.iso <replaceable>/publicly/available/directory</replaceable>/
-				</command>
-			</para>
-			
-			<para>
-				In this case <replaceable>/publicly/available/directory</replaceable> will be a directory that is shared via FTP or HTTP.
-			</para>
-			
-		</listitem>
-		
-		<listitem>
-			<para>
-				For CDROMs:
-			</para>
-			
-			<para>
-				<command>
-					mount -o loop <replaceable>/location/of/disk/space/</replaceable>disk<replaceable>X</replaceable>.iso <replaceable>/publicly/available/directory/</replaceable>disk<replaceable>X</replaceable>/
-				</command>
-			</para>
-			
-			<para>
-				Again, <replaceable>/publicly/available/directory</replaceable> will be a directory that is shared via FTP or HTTP. Do the above for each of the CDROM iso images, for example:
-			</para>
-			<example>
-			<title>Making a Fedora installation CD available on a HTTP server</title>
-			<para>
-				<command>
-					mount -o loop /var/isos/Fedora-&PRODVER;-i386-disk1.iso /var/www/html/f&PRODVER;-install/disk1/
-				</command>
-			</para>
-			</example>
-		</listitem>
-	</itemizedlist> -->
-	
-	<para>
-		Next, make sure that the  <!--<filename><replaceable>/publicly/available/directory</replaceable></filename>--> directory is shared via FTP or HTTP, and verify client access. You can check to see whether the directory is accessible from the server itself, and then from another machine on the same subnet that you will be installing to.
-	</para>
-</section>
\ No newline at end of file
diff --git a/en-US/Steps_Network_Install_x86_ppc_s390_section_2.xml b/en-US/Steps_Network_Install_x86_ppc_s390_section_2.xml
deleted file mode 100644
index a25f74b..0000000
--- a/en-US/Steps_Network_Install_x86_ppc_s390_section_2.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
-]>
-
-<section>
-	<title>Preparing for an NFS install</title>
-	
-	<para>
-		For NFS installation it is not necessary to mount the iso image. It is sufficient to make the iso image itself available via NFS. You can do this by moving the iso image or images to the NFS exported directory:
-	</para>
-	
-	<itemizedlist>
-			
-		<listitem>
-			<para>
-				For DVD:
-			</para>
-<screen><command>mv <replaceable>/location/of/disk/space/</replaceable>f&PRODVER;.iso <replaceable>/publicly/available/directory/</replaceable>
-</command></screen>
-		</listitem>
-		
-		<listitem>
-			<para>
-				For CDROMs:
-			</para>
-<screen><command>mv <replaceable>/location/of/disk/space/</replaceable>f&PRODVER;-disk*.iso <replaceable>/publicly/available/directory/</replaceable>
-</command></screen>
-		</listitem>
-	</itemizedlist>
-	<para>
-		In addition the <filename>install.img</filename> file from within the ISO files must be copied to a directory named <filename class="directory">images</filename>
-	</para>
-	<para>
-		Additionally, if a file called <filename>updates.img</filename> exists in the location from which you install, it is used for updates to <application>anaconda</application>, the installation program. Refer to the file <filename>install-methods.txt</filename> in the <application>anaconda</application> RPM package for detailed information on the various ways to install Fedora, as well as how to apply the installation program updates. 
-	</para>	
-	<para>
-		To extract the <filename>install.img</filename> from the ISO follow the procedure:
-	</para>
-	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Beginning_Installation_Hard_Disk_common-screen-1.xml"/>
-	<!-- <para>
-		<command>
-			mount -o loop <replaceable>/location/of/disk/space/</replaceable>RHEL5.iso <replaceable>/export/directory</replaceable>
-		</command>
-	</para>
-
-	<para>
-		This will make the files from the DVD available for sharing from <filename><replaceable>/export/directory</replaceable></filename> via HTTP, FTP, or NFS.
-	</para> -->
-		
-	<para>
-		Ensure that the <filename><replaceable>/publicly/available/directory</replaceable></filename> directory is exported via NFS via an entry in <filename>/etc/exports</filename>. 
-	</para>
-		
-	<para>
-		To export to a specific system:
-	</para>
-<screen><command><replaceable>/publicly/available/directory</replaceable> <replaceable>client.ip.address</replaceable>
-</command></screen>
-	<para>
-		To export to all systems use an entry such as:
-	</para>
-<screen><command><replaceable>/publicly/available/directory</replaceable> *
-</command></screen>
-	<para>
-		Start the NFS daemon (on a Fedora system, use <command>/sbin/service nfs start</command>). If NFS is already running, reload the configuration file (on a Fedora system use <command>/sbin/service nfs reload</command>).
-	</para>
-	
-	<!-- (RHEL) <para>
-		Be sure to test the NFS share following the directions in the &PROD; Deployment Guide.
-	</para> -->
-</section>
diff --git a/en-US/Steps_Network_Install_x86_section_1.xml b/en-US/Steps_Network_Install_x86_section_1.xml
index 6314f7a..f217df9 100644
--- a/en-US/Steps_Network_Install_x86_section_1.xml
+++ b/en-US/Steps_Network_Install_x86_section_1.xml
@@ -7,51 +7,7 @@
 	<!-- Preparing for FTP and HTTP Installation -->
 	
 	<xi:include href="Steps_Network_Install_section_1-common-para-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-	<!-- Extract the files from the iso image of the installation DVD or the iso images of the installation CDs -->
-	
-	<!-- 
-	<itemizedlist>
-		<listitem>
-			<para>
-				For DVD:
-			</para>
-			
-			<para>
-				<command>
-					mount -o loop <replaceable>/location/of/disk/space/</replaceable>f&PRODVER;.iso <replaceable>/publicly/available/directory</replaceable>/
-				</command>
-			</para>
-			
-			<para>
-				In this case <replaceable>/publicly/available/directory</replaceable> will be a directory that is shared via FTP or HTTP.
-			</para>
-			
-		</listitem>
-		
-		<listitem>
-			<para>
-				For CDROMs:
-			</para>
-			
-			<para>
-				<command>
-					mount -o loop <replaceable>/location/of/disk/space/</replaceable>disk<replaceable>X</replaceable>.iso <replaceable>/publicly/available/directory/</replaceable>disk<replaceable>X</replaceable>/
-				</command>
-			</para>
-			
-			<para>
-				Again, <replaceable>/publicly/available/directory</replaceable> will be a directory that is shared via FTP or HTTP. Do the above for each of the CDROM iso images, for example:
-			</para>
-			<example>
-			<title>Making a Fedora installation CD available on a HTTP server</title>
-			<para>
-				<command>
-					mount -o loop /var/isos/Fedora-&PRODVER;-i386-disk1.iso /var/www/html/f&PRODVER;-install/disk1/
-				</command>
-			</para>
-			</example>
-		</listitem>
-	</itemizedlist> -->
+	<!-- Extract the files from the iso image of the installation DVD -->
 	
 	<xi:include href="Steps_Network_Install_section_1-common-para-2.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 	<!-- Next, make sure that the directory is shared -->
diff --git a/en-US/Steps_Network_Install_x86_section_2.xml b/en-US/Steps_Network_Install_x86_section_2.xml
index 7220cb7..0b98893 100644
--- a/en-US/Steps_Network_Install_x86_section_2.xml
+++ b/en-US/Steps_Network_Install_x86_section_2.xml
@@ -9,41 +9,62 @@
 	<xi:include href="Steps_Network_Install_section_2-common-para-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 	<!-- For NFS installation it is not necessary to extract files from the ISO image.  -->
 	
-	<xi:include href="Steps_Network_Install_section_2-common-screen-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-	<!-- mv /location/of/disk/space/RHEL6.iso /publicly/available/directory/  -->
+	<procedure>
+		<step>
+			<xi:include href="Steps_Network_Install_section_2-common-para-9.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+			<!-- Transfer the ISO image to the NFS exported directory.  -->
+			
+			<xi:include href="Steps_Network_Install_section_2-common-screen-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+			<!-- mv /location/of/disk/space/RHEL6.iso /publicly/available/directory/  -->
+		</step>
+		<step>
+			<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Steps_Hd_Install_common-para-4.xml"/>
+			<!-- Use a SHA256 checksum program to verify that the ISO image... -->
+			
+			<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Steps_Hd_Install_common-screen-1.xml"/>
+			<!-- sha256sum name_of_image.iso -->
+			
+			<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Steps_Hd_Install_common-para-5.xml"/>
+			<!-- where name_of_image is the name of the ISO image file. -->
+		</step>
+		<step>
+			<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Steps_Hd_Install_common-para-3.xml"/>
+			<!-- Copy the images/ directory within the ISO files... -->
+			<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Beginning_Installation_Hard_Disk_common-screen-1.xml"/>
+		</step>
+		<step>
+			<para>
+				Verify that the 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>
+		</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"/>
+			<!-- To export to a specific system:  -->
+			
+			<xi:include href="Steps_Network_Install_section_2-common-screen-2.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+			<!-- /publicly/available/directory client.ip.address  -->
+			
+			<xi:include href="Steps_Network_Install_section_2-common-para-6.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+			<!-- To export to all systems use an entry such as:  -->
+			
+			<xi:include href="Steps_Network_Install_section_2-common-screen-3.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+			<!-- /publicly/available/directory * (ro)  -->
+		</step>
+		<step>
+			<xi:include href="Steps_Network_Install_section_2-common-para-7.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+			<!-- Start the NFS daemon (on a Fedora system, use  -->
+		</step>
+		<step>
+			<xi:include href="Steps_Network_Install_section_2-common-para-8.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+			<!-- Be sure to test the NFS share following the directions in the  -->
+		</step>
+	</procedure>
 	
-	<xi:include href="Steps_Network_Install_section_2-common-para-2.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-	<!-- You must also copy the install.img file from within the ISO files  -->
-	
-	<para>
-		Additionally, if a file called <filename>updates.img</filename> exists in the location from which you install, it is used for updates to <application>anaconda</application>, the installation program. Refer to the file <filename>install-methods.txt</filename> in the <application>anaconda</application> RPM package for detailed information on the various ways to install Fedora, as well as how to apply the installation program updates. 
-	</para>
-	
-	<xi:include href="Steps_Network_Install_section_2-common-para-3.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-	<!-- To extract the install.img file from the ISO  -->
-
-	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Beginning_Installation_Hard_Disk_common-screen-1.xml"/>
-	
-	<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"/>
-	<!-- To export to a specific system:  -->
-	
-	<xi:include href="Steps_Network_Install_section_2-common-screen-2.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-	<!-- /publicly/available/directory client.ip.address  -->
-	
-	<xi:include href="Steps_Network_Install_section_2-common-para-6.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-	<!-- To export to all systems use an entry such as:  -->
-	
-	<xi:include href="Steps_Network_Install_section_2-common-screen-3.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-	<!-- /publicly/available/directory * (ro)  -->
+	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Steps_Hd_Install_x86_note_1.xml"/>
+	<!-- The $PROD; installation program has the ability to test the integrity -->
 
-	<xi:include href="Steps_Network_Install_section_2-common-para-7.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-	<!-- Start the NFS daemon (on a Red Hat Enterprise Linux system, use  -->
-	
-	<xi:include href="Steps_Network_Install_section_2-common-para-8.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-	<!-- Be sure to test the NFS share following the directions in the  -->
-	
 </section>
 
diff --git a/en-US/Steps_Upgrade-common.xml b/en-US/Steps_Upgrade-common.xml
index 01d8ff6..7ee6ffa 100644
--- a/en-US/Steps_Upgrade-common.xml
+++ b/en-US/Steps_Upgrade-common.xml
@@ -8,4 +8,5 @@
 	<para>
 		For information to help you determine whether to perform an upgrade or an installation refer to <xref linkend="ch-upgrade-x86"/>.
 	</para>
-</section>
\ No newline at end of file
+</section>
+
diff --git a/en-US/Storage_Devices-x86.xml b/en-US/Storage_Devices-x86.xml
index 20ea612..2dd7b45 100644
--- a/en-US/Storage_Devices-x86.xml
+++ b/en-US/Storage_Devices-x86.xml
@@ -14,7 +14,7 @@
 	<!-- End Index terms -->
 	
 	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Storage_Devices_common-para-1.xml"/>
-	<!-- You can install Red Hat Enterprise Linux on a large variety of storage devices... -->
+	<!-- You can install Fedora on a large variety of storage devices... -->
 	
 	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Storage_Devices_common-figure-1.xml"/>
 	<!-- Storage devices -->
@@ -23,7 +23,7 @@
 	<!-- Basic Storage Devices -->
 	
 	<para>
-		If you select <guimenuitem>Basic Storage Devices</guimenuitem> and have only one storage device attached to your system, <application>anaconda</application> automatically detects the local storage attached to the system and does not require further input from you. Proceed to <xref linkend="sn-initialize-hdd-x86"/>. 
+		If you select <guimenuitem>Basic Storage Devices</guimenuitem>, <application>anaconda</application> automatically detects the local storage attached to the system and does not require further input from you. Proceed to <xref linkend="sn-Netconfig-x86"/>. 
 	</para>
 	
 	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Specialized_Storage_Devices-x86.xml"/>
diff --git a/en-US/Swap_Partrecommend.xml b/en-US/Swap_Partrecommend.xml
index bec246e..e87bafa 100644
--- a/en-US/Swap_Partrecommend.xml
+++ b/en-US/Swap_Partrecommend.xml
@@ -7,9 +7,7 @@
 	</para>
 
 		<para>In years past, the recommended amount of swap space increased linearly with the amount of RAM in the system. But because the amount of memory in modern systems has increased into the hundreds of gigabytes, it is now recognized that the amount of swap space that a system needs is a function of the memory workload running on that system. However, given that swap space is usually designated at install time, and that it can be difficult to determine beforehand the memory workload of a system, we recommend determining system swap using the following table.</para>
-		<table
-			id="table-Recommended_System_Swap_Space"
-			frame="all">
+		<table frame="all">
 			<title>Recommended System Swap Space</title>
 			<tgroup
 				cols="2"
@@ -57,3 +55,4 @@
 		</para>
 
 </listitem>
+
diff --git a/en-US/System_Requirements_Table.xml b/en-US/System_Requirements_Table.xml
index f01fc7e..2c38c94 100644
--- a/en-US/System_Requirements_Table.xml
+++ b/en-US/System_Requirements_Table.xml
@@ -18,6 +18,10 @@
 <!-- End index terms -->
 
 <para>
+	The most recent list of supported hardware can be found at <ulink url="http://hardware.redhat.com/hcl/">http://hardware.redhat.com/hcl/</ulink>.
+</para>
+
+<para>
 	The installation program automatically detects and installs your computer's hardware. Although you should make sure that your hardware meets the minimum requirements to install Fedora (refer to <xref linkend="sn-Is_Your_Hardware_Compatible-x86"/>) you do not usually need to supply the installation program with any specific details about your system.
 </para>
 
@@ -59,7 +63,7 @@
 		<itemizedlist>
 			<listitem>
 				<para>
-					The hard drive and directory that holds the image &ndash; see <xref linkend="table-Location_of_ISO_images" /> for examples.
+					The hard drive and directory that holds the image. <!-- FIXME  &ndash; see <xref linkend="table-Location_of_ISO_images" /> for examples. -->
 				</para>
 			</listitem>
 		</itemizedlist>		
@@ -146,3 +150,4 @@
 </itemizedlist>
 
 </chapter>
+
diff --git a/en-US/Systems_with_Intel_BIOS_RAID.xml b/en-US/Systems_with_Intel_BIOS_RAID.xml
index 77c02a0..4700c50 100644
--- a/en-US/Systems_with_Intel_BIOS_RAID.xml
+++ b/en-US/Systems_with_Intel_BIOS_RAID.xml
@@ -6,7 +6,7 @@
 <important>
 	<title>Important â€” Systems with Intel BIOS RAID sets</title>
 	<para>
-		Fedora&nbsp;&PRODVER; uses <application>mdraid</application> instead of <application>dmraid</application> for installation onto Intel BIOS RAID sets. These sets are detected automatically, and devices with Intel ISW metadata are recognized as mdraid instead of dmraid. Note that the device node names of any such devices under <application>mdraid</application> are different from their device node names under <application>dmraid</application>. Therefore, special precautions are necessary when you migrate systems with Intel BIOS RAID sets from operating systems or versions of operating systems that use <application>dmraid</application>.
+		Fedora&nbsp;&PRODVER; uses <application>mdraid</application> instead of <application>dmraid</application> for installation onto Intel BIOS RAID sets. These sets are detected automatically, and devices with Intel ISW metadata are recognized as mdraid instead of dmraid. Note that the device node names of any such devices under <application>mdraid</application> are different from their device node names under <application>dmraid</application>. Therefore, special precautions are necessary when you migrate systems with Intel BIOS RAID sets.
 	</para>
 	<para>
 		Local modifications to <filename>/etc/fstab</filename>, <filename>/etc/crypttab</filename> or other configuration files which refer to devices by their device node names will not work in Fedora&nbsp;&PRODVER;. Before migrating these files, you must therefore edit them to replace device node paths with device UUIDs instead. You can find the UUIDs of devices with the <command>blkid</command> command. 
diff --git a/en-US/TUI-common-listitem-1.xml b/en-US/TUI-common-listitem-1.xml
new file mode 100644
index 0000000..9aaccb1
--- /dev/null
+++ b/en-US/TUI-common-listitem-1.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<!DOCTYPE listitem PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+]>
+
+<listitem>
+	<para>
+		configuring advanced storage methods such as LVM, RAID, FCoE, zFCP, and iSCSI.
+	</para>
+</listitem>
+
diff --git a/en-US/TUI-common-listitem-2.xml b/en-US/TUI-common-listitem-2.xml
new file mode 100644
index 0000000..5a1b923
--- /dev/null
+++ b/en-US/TUI-common-listitem-2.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<!DOCTYPE listitem PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+]>
+
+<listitem>
+	<para>
+		customizing the partition layout
+	</para>
+</listitem>
+
diff --git a/en-US/TUI-common-listitem-3.xml b/en-US/TUI-common-listitem-3.xml
new file mode 100644
index 0000000..5187bbd
--- /dev/null
+++ b/en-US/TUI-common-listitem-3.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<!DOCTYPE listitem PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+]>
+
+<listitem>
+	<para>
+		customizing the bootloader layout
+	</para>
+</listitem>
+
diff --git a/en-US/TUI-common-listitem-4.xml b/en-US/TUI-common-listitem-4.xml
new file mode 100644
index 0000000..79a6220
--- /dev/null
+++ b/en-US/TUI-common-listitem-4.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<!DOCTYPE listitem PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+]>
+
+<listitem>
+	<para>
+		selecting packages during installation
+	</para>
+</listitem>
+
diff --git a/en-US/TUI-common-listitem-5.xml b/en-US/TUI-common-listitem-5.xml
new file mode 100644
index 0000000..fac683d
--- /dev/null
+++ b/en-US/TUI-common-listitem-5.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<!DOCTYPE listitem PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+]>
+
+<listitem>
+	<para>
+		configuring the installed system with <application>Firstboot</application>
+	</para>
+</listitem>
+
diff --git a/en-US/TUI-common-para-1.xml b/en-US/TUI-common-para-1.xml
new file mode 100644
index 0000000..e13d6f1
--- /dev/null
+++ b/en-US/TUI-common-para-1.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+]>
+
+<para>
+	While text mode installations are not explicitly documented, those using the text mode installation program can easily follow the GUI installation instructions. However, because text mode presents you with a simpler, more streamlined insatallation process, certain options that are available in graphical mode are not also available in text mode. These differences are noted in the description of the installation process in this guide, and include: 	
+</para>
+
diff --git a/en-US/TUI-common-title-1.xml b/en-US/TUI-common-title-1.xml
new file mode 100644
index 0000000..f4cff61
--- /dev/null
+++ b/en-US/TUI-common-title-1.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<!DOCTYPE title PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+]>
+
+<title>The Text Mode Installation Program User Interface</title>
+
diff --git a/en-US/TUI-x86.xml b/en-US/TUI-x86.xml
new file mode 100644
index 0000000..27361c0
--- /dev/null
+++ b/en-US/TUI-x86.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+ "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
+
+<section>
+	<xi:include href="TUI-common-title-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+	<!-- The Text Mode Installation Program User Interface -->
+	
+	<important>
+		<title>Important â€” Graphical Interface on the Installed System</title>
+		<para>
+			Installing in text mode does not prevent you from using a graphical interface on your system once it is installed.
+		</para>
+	</important>
+	
+	<para>
+		Apart from the graphical installer, <application>anaconda</application> also includes a text-based installer. 
+	</para>
+
+	<para>
+		If one of the following situations occurs, the installation program uses text mode:
+	</para>
+	<itemizedlist>
+		<listitem>
+			<para>
+				The installation system fails to identify the display hardware on your computer
+			</para>
+		</listitem>
+		<listitem>
+			<para>
+				You choose the text mode installation from the boot menu
+			</para>
+		</listitem>
+	</itemizedlist>
+	
+	<xi:include href="TUI-common-para-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+	<!-- While text mode installations are not explicitly documented -->
+	
+	<itemizedlist>
+		<xi:include href="TUI-common-listitem-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+		<!-- Manipulation of LVM -->
+		<xi:include href="TUI-common-listitem-2.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+		<!-- Customizing the partition layout -->
+		<xi:include href="TUI-common-listitem-3.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+		<!-- Customizing the bootloader configuration -->
+		<xi:include href="TUI-common-listitem-4.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+		<!-- Selection packages during installation -->
+		<xi:include href="TUI-common-listitem-5.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+		<!-- configuring the installed system with Firstboot -->
+	</itemizedlist>
+	
+	<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>
+</section>
+
diff --git a/en-US/Time_Zone-x86.xml b/en-US/Time_Zone-x86.xml
index 1bf478c..9afc984 100644
--- a/en-US/Time_Zone-x86.xml
+++ b/en-US/Time_Zone-x86.xml
@@ -17,9 +17,6 @@
 	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Time_Zone_common-indexterm-7.xml"/>
 	<!-- End Index Terms -->
 	
-	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Time_Zone_common-para-4.xml"/>
-	<!-- Specify a time zone even if you plan to use NTP...  -->
-	
 	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Time_Zone_common-para-1.xml"/>
 	<!-- Set your time zone by selecting the city closest  -->
 	
@@ -41,13 +38,16 @@
 	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Time_Zone_common-para-5.xml"/>
 	<!-- If Fedora is the only operating system on your computer, -->
 	
+	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Time_Zone_common-para-6.xml"/>
+	<!-- Select Next to proceed -->
+	
 	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Time_Zone_common-note-1.xml"/>
 	<!-- Windows and the System Clock -->
 	
 	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Time_Zone_common-tip-1.xml"/>
 	<!-- To change your time zone configuration after you have completed the installation, -->
 	
-	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Time_Zone_common-para-6.xml"/>
-	<!-- Select Next to proceed -->
 	
-</section>
\ No newline at end of file
+	
+</section>
+
diff --git a/en-US/Time_Zone_common-figure-1.xml b/en-US/Time_Zone_common-figure-1.xml
index d12cffa..0f56006 100644
--- a/en-US/Time_Zone_common-figure-1.xml
+++ b/en-US/Time_Zone_common-figure-1.xml
@@ -10,4 +10,5 @@
 			</para>
 		</textobject>
 	</mediaobject>
-</figure>
\ No newline at end of file
+</figure>
+
diff --git a/en-US/Time_Zone_common-indexterm-1.xml b/en-US/Time_Zone_common-indexterm-1.xml
index 17e1516..a59cd56 100644
--- a/en-US/Time_Zone_common-indexterm-1.xml
+++ b/en-US/Time_Zone_common-indexterm-1.xml
@@ -5,4 +5,5 @@
 <indexterm significance="normal">
 	<primary>time zone</primary>
 	<secondary>configuration</secondary>
-</indexterm>
\ No newline at end of file
+</indexterm>
+
diff --git a/en-US/Time_Zone_common-indexterm-2.xml b/en-US/Time_Zone_common-indexterm-2.xml
index fcfbef0..370e720 100644
--- a/en-US/Time_Zone_common-indexterm-2.xml
+++ b/en-US/Time_Zone_common-indexterm-2.xml
@@ -7,4 +7,5 @@
 
 <indexterm significance="normal">
 	<primary>clock</primary>
-</indexterm>
\ No newline at end of file
+</indexterm>
+
diff --git a/en-US/Time_Zone_common-indexterm-3.xml b/en-US/Time_Zone_common-indexterm-3.xml
index 65eee3a..77f04c5 100644
--- a/en-US/Time_Zone_common-indexterm-3.xml
+++ b/en-US/Time_Zone_common-indexterm-3.xml
@@ -8,4 +8,5 @@
 <indexterm significance="normal">
 	<primary>configuration</primary>
 	<secondary>time</secondary>
-</indexterm>
\ No newline at end of file
+</indexterm>
+
diff --git a/en-US/Time_Zone_common-indexterm-4.xml b/en-US/Time_Zone_common-indexterm-4.xml
index a6ef3dd..a3f7729 100644
--- a/en-US/Time_Zone_common-indexterm-4.xml
+++ b/en-US/Time_Zone_common-indexterm-4.xml
@@ -8,4 +8,5 @@
 <indexterm significance="normal">
 	<primary>configuration</primary>
 	<secondary>clock</secondary>
-</indexterm>
\ No newline at end of file
+</indexterm>
+
diff --git a/en-US/Time_Zone_common-indexterm-5.xml b/en-US/Time_Zone_common-indexterm-5.xml
index a6ef3dd..a3f7729 100644
--- a/en-US/Time_Zone_common-indexterm-5.xml
+++ b/en-US/Time_Zone_common-indexterm-5.xml
@@ -8,4 +8,5 @@
 <indexterm significance="normal">
 	<primary>configuration</primary>
 	<secondary>clock</secondary>
-</indexterm>
\ No newline at end of file
+</indexterm>
+
diff --git a/en-US/Time_Zone_common-indexterm-6.xml b/en-US/Time_Zone_common-indexterm-6.xml
index efa3188..ed58d89 100644
--- a/en-US/Time_Zone_common-indexterm-6.xml
+++ b/en-US/Time_Zone_common-indexterm-6.xml
@@ -8,4 +8,5 @@
 <indexterm significance="normal">
 	<primary>configuration</primary>
 	<secondary>time zone</secondary>
-</indexterm>
\ No newline at end of file
+</indexterm>
+
diff --git a/en-US/Time_Zone_common-indexterm-7.xml b/en-US/Time_Zone_common-indexterm-7.xml
index 2df7368..fcfa99a 100644
--- a/en-US/Time_Zone_common-indexterm-7.xml
+++ b/en-US/Time_Zone_common-indexterm-7.xml
@@ -6,3 +6,4 @@
 <indexterm significance="normal">
     <primary>NTP (Network Time Protocol)</primary>
     </indexterm>
+
diff --git a/en-US/Time_Zone_common-itemizedlist-1.xml b/en-US/Time_Zone_common-itemizedlist-1.xml
index 5f74d5a..9e85a7e 100644
--- a/en-US/Time_Zone_common-itemizedlist-1.xml
+++ b/en-US/Time_Zone_common-itemizedlist-1.xml
@@ -17,4 +17,5 @@
 			You can also scroll through the list at the bottom of the screen to select your time zone. Using your mouse, click on a location to highlight your selection.
 		</para>
 	</listitem>
-</itemizedlist>
\ No newline at end of file
+</itemizedlist>
+
diff --git a/en-US/Time_Zone_common-note-1.xml b/en-US/Time_Zone_common-note-1.xml
index 9862521..bb20325 100644
--- a/en-US/Time_Zone_common-note-1.xml
+++ b/en-US/Time_Zone_common-note-1.xml
@@ -3,13 +3,11 @@
  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
 ]>
 
-    <warning>
-      <title>Windows and the System Clock</title>
+<warning>
+	<title>Windows and the System Clock</title>
+
+	<para>
+		Do not enable the <guilabel>System clock uses UTC</guilabel> option if your machine also runs Microsoft Windows. Microsoft operating systems change the BIOS clock to match local time rather than UTC. This may cause unexpected behavior under Fedora.
+	</para>
+</warning>
 
-      <para>
-        Do not enable the <guilabel>System clock uses UTC</guilabel>
-	option if your machine also runs Microsoft Windows. Microsoft
-	operating systems change the BIOS clock to match local time
-	rather than UTC. This may cause unexpected behavior under Fedora.
-      </para>
-    </warning>
diff --git a/en-US/Time_Zone_common-para-1.xml b/en-US/Time_Zone_common-para-1.xml
index b1bec59..e3a5b1f 100644
--- a/en-US/Time_Zone_common-para-1.xml
+++ b/en-US/Time_Zone_common-para-1.xml
@@ -7,4 +7,5 @@
 
 <para>
 	Set your time zone by selecting the city closest to your computer's physical location. Click on the map to zoom in to a particular geographical region of the world.
-</para>
\ No newline at end of file
+</para>
+
diff --git a/en-US/Time_Zone_common-para-2.xml b/en-US/Time_Zone_common-para-2.xml
index ec87f69..cbaa072 100644
--- a/en-US/Time_Zone_common-para-2.xml
+++ b/en-US/Time_Zone_common-para-2.xml
@@ -7,4 +7,5 @@
 
 <para>
 	From here there are two ways for you to select your time zone:
-</para>
\ No newline at end of file
+</para>
+
diff --git a/en-US/Time_Zone_common-para-4.xml b/en-US/Time_Zone_common-para-4.xml
index df49536..bd4cce6 100644
--- a/en-US/Time_Zone_common-para-4.xml
+++ b/en-US/Time_Zone_common-para-4.xml
@@ -8,3 +8,4 @@
     use NTP (Network Time Protocol) to maintain the accuracy of
     the system clock.
   </para>
+
diff --git a/en-US/Time_Zone_common-para-5.xml b/en-US/Time_Zone_common-para-5.xml
index 727f1e6..49e4d4e 100644
--- a/en-US/Time_Zone_common-para-5.xml
+++ b/en-US/Time_Zone_common-para-5.xml
@@ -4,10 +4,6 @@
 ]>
 
 <para>
-      If Fedora is the only operating system on your computer, select
-      <guilabel>System clock uses UTC</guilabel>. The system clock is a
-      piece of hardware on your computer system. Fedora uses the timezone
-      setting to determine the offset between the local time and UTC on
-      the system clock. This behavior is standard for UNIX-like
-      operating systems.
-</para>
\ No newline at end of file
+      If Fedora is the only operating system on your computer, select <guilabel>System clock uses UTC</guilabel>. The system clock is a piece of hardware on your computer system. Fedora uses the timezone setting to determine the offset between the local time and UTC on the system clock. This behavior is standard for systems that use UNIX, Linux, and similar operating systems.
+</para>
+
diff --git a/en-US/Time_Zone_common-para-6.xml b/en-US/Time_Zone_common-para-6.xml
index 89f1d2b..8d1f025 100644
--- a/en-US/Time_Zone_common-para-6.xml
+++ b/en-US/Time_Zone_common-para-6.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
 ]>
 
     <para>
-      Select <guibutton>Next</guibutton> to proceed.
-    </para>
\ No newline at end of file
+      Click <guibutton>Next</guibutton> to proceed.
+    </para>
+
diff --git a/en-US/Time_Zone_common-tip-1.xml b/en-US/Time_Zone_common-tip-1.xml
index 9d7b33e..fbea1cf 100644
--- a/en-US/Time_Zone_common-tip-1.xml
+++ b/en-US/Time_Zone_common-tip-1.xml
@@ -12,4 +12,8 @@
 	<para>
 		Type the <command>system-config-date</command> command in a shell prompt to launch the <application>Time and Date Properties Tool</application>. If you are not root, it prompts you for the root password to continue.
 	</para>
-</note>
\ No newline at end of file
+	<para>
+		To run the <application>Time and Date Properties Tool</application> as a text-based application, use the command <command>timeconfig</command>.
+	</para>
+</note>
+
diff --git a/en-US/Time_Zone_common-title.xml b/en-US/Time_Zone_common-title.xml
index fed8ad5..8a190a1 100644
--- a/en-US/Time_Zone_common-title.xml
+++ b/en-US/Time_Zone_common-title.xml
@@ -2,4 +2,5 @@
 <!DOCTYPE title PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
 ]>
 
-<title>Time Zone Configuration</title>
\ No newline at end of file
+<title>Time Zone Configuration</title>
+
diff --git a/en-US/Trouble-x86.xml b/en-US/Trouble-x86.xml
index bb84dc1..c02b02d 100644
--- a/en-US/Trouble-x86.xml
+++ b/en-US/Trouble-x86.xml
@@ -4,7 +4,7 @@
 
 <chapter id="ch-trouble-x86">
 	
-	<title>Troubleshooting Installation on an <trademark class="registered">Intel</trademark> or AMD System</title>
+	<title>Troubleshooting Installation on an Intel or AMD System</title>
 	
 	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Trouble_common-indexterm-1.xml"/>
 	<!-- Index term -->
@@ -29,12 +29,20 @@
 	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Trouble_common-para-2.xml"/>
 	<!-- For debugging purposes, anaconda logs installation actions into files in the /tmp directory. -->
 	
-	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Trouble_common-variablelist-1.xml"/>
-	<!-- /tmp/anaconda.log General anaconda messages -->
+	<variablelist>
+		<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Trouble_common-varlistentry-1.xml"/>
+		<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Trouble_common-varlistentry-2.xml"/>
+		<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Trouble_common-varlistentry-3.xml"/>
+		<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Trouble_common-varlistentry-4.xml"/>
+		<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Trouble_common-varlistentry-5.xml"/>
+	</variablelist>
 	
 	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Trouble_common-para-3.xml"/>
 	<!-- If the installation fails, the messages from these files are consolidated into /tmp/anacdump.txt -->
 
+	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Trouble_common-para-4.xml"/>
+	<!-- All of the files above reside in the installer's ramdisk and are thus volatile.  -->
+	
 	<section>
 	<!-- Problems with Booting -->
 		
@@ -98,7 +106,7 @@
 			
 			
 			<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Trouble_No_Boot-Sig11-para-7.xml"/>
-			<!-- Another option is to perform a media check on your installation CD-ROMs. -->
+			<!-- Another option is to perform a media check on your installation DVD. -->
 			
 			<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Trouble_No_Boot-Sig11-screen-2.xml"/>
 			<!-- linux media check -->
@@ -147,12 +155,11 @@
 	
 	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Trouble_During-x86.xml"/> 
 	<!-- Trouble During the Installation
-	     No devices found to install Red Hat Enterprise Linux Error Message
+	     No devices found to install Fedora Error Message
 	     Saving Traceback Messages Without removeable media
 	     Trouble with Partition Tables
 	     Using Remaining Space
 	     Other Partitioning Problems
-	     Other Partitioning Problems for Itanium System Users
 	     Are You Seeing Python Errors?
 	     -->
 	
@@ -242,9 +249,6 @@
 			<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Trouble_After_Booting_Problems_Login-para-2.xml"/>
 			<!-- If you cannot remember your root password, boot your system as linux single -->
 			
-			<!-- (RHEL) <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Trouble_After_Booting_Problems_Login-para-3.xml"/> -->
-			<!-- Itanium users must enter boot commands with elilo followed by the boot command. -->
-			
 			<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Trouble_After_Booting_Problems_Login-para-4.xml"/>
 			<!-- If you are using an x86-based system and GRUB is your installed boot loader -->
 			
@@ -311,3 +315,4 @@
 	</section>
 	
 </chapter>
+
diff --git a/en-US/Trouble_After_Booting_GUI-indexterm-1.xml b/en-US/Trouble_After_Booting_GUI-indexterm-1.xml
index 05eaab0..27c76ae 100644
--- a/en-US/Trouble_After_Booting_GUI-indexterm-1.xml
+++ b/en-US/Trouble_After_Booting_GUI-indexterm-1.xml
@@ -9,4 +9,5 @@
 	<primary>troubleshooting</primary>
 	<secondary>after the installation</secondary>
 	<tertiary>booting into a graphical environment</tertiary>
-</indexterm>
\ No newline at end of file
+</indexterm>
+
diff --git a/en-US/Trouble_After_Booting_GUI-indexterm-2.xml b/en-US/Trouble_After_Booting_GUI-indexterm-2.xml
index 3785b47..33b6209 100644
--- a/en-US/Trouble_After_Booting_GUI-indexterm-2.xml
+++ b/en-US/Trouble_After_Booting_GUI-indexterm-2.xml
@@ -9,4 +9,5 @@
 	<primary>troubleshooting</primary>
 	<secondary>after the installation</secondary>
 	<tertiary>booting into the X Window System</tertiary>
-</indexterm>
\ No newline at end of file
+</indexterm>
+
diff --git a/en-US/Trouble_After_Booting_GUI-indexterm-3.xml b/en-US/Trouble_After_Booting_GUI-indexterm-3.xml
index 78149f4..342c020 100644
--- a/en-US/Trouble_After_Booting_GUI-indexterm-3.xml
+++ b/en-US/Trouble_After_Booting_GUI-indexterm-3.xml
@@ -9,4 +9,5 @@
 	<primary>troubleshooting</primary>
 	<secondary>after the installation</secondary>
 	<tertiary>booting into GNOME or KDE</tertiary>
-</indexterm>
\ No newline at end of file
+</indexterm>
+
diff --git a/en-US/Trouble_After_Booting_GUI-para-1.xml b/en-US/Trouble_After_Booting_GUI-para-1.xml
index c2a7d2d..98c45fc 100644
--- a/en-US/Trouble_After_Booting_GUI-para-1.xml
+++ b/en-US/Trouble_After_Booting_GUI-para-1.xml
@@ -5,4 +5,5 @@
 <para>
 	If you have installed the X Window System but are not seeing a graphical desktop environment once you log into your system, you can start the X Window System graphical interface using the command
 	<command moreinfo="none">startx</command>.
-</para>
\ No newline at end of file
+</para>
+
diff --git a/en-US/Trouble_After_Booting_GUI-para-10.xml b/en-US/Trouble_After_Booting_GUI-para-10.xml
index 92f2c89..7c08f3f 100644
--- a/en-US/Trouble_After_Booting_GUI-para-10.xml
+++ b/en-US/Trouble_After_Booting_GUI-para-10.xml
@@ -7,4 +7,5 @@
 
 <para>
 	The next time you log in after rebooting your system, you are presented with a graphical login prompt.
-</para>
\ No newline at end of file
+</para>
+
diff --git a/en-US/Trouble_After_Booting_GUI-para-2.xml b/en-US/Trouble_After_Booting_GUI-para-2.xml
index dcc026f..411047f 100644
--- a/en-US/Trouble_After_Booting_GUI-para-2.xml
+++ b/en-US/Trouble_After_Booting_GUI-para-2.xml
@@ -7,4 +7,5 @@
 
 <para>
 	Once you enter this command and press <keycap moreinfo="none">Enter</keycap>, the graphical desktop environment is displayed.
-</para>
\ No newline at end of file
+</para>
+
diff --git a/en-US/Trouble_After_Booting_GUI-para-3.xml b/en-US/Trouble_After_Booting_GUI-para-3.xml
index 36efc1f..edaa720 100644
--- a/en-US/Trouble_After_Booting_GUI-para-3.xml
+++ b/en-US/Trouble_After_Booting_GUI-para-3.xml
@@ -7,4 +7,5 @@
 
 <para>
 	Note, however, that this is just a one-time fix and does not change the log in process for future log ins.
-</para>
\ No newline at end of file
+</para>
+
diff --git a/en-US/Trouble_After_Booting_GUI-para-4.xml b/en-US/Trouble_After_Booting_GUI-para-4.xml
index d19b262..08a3ce5 100644
--- a/en-US/Trouble_After_Booting_GUI-para-4.xml
+++ b/en-US/Trouble_After_Booting_GUI-para-4.xml
@@ -8,4 +8,5 @@
 <para>
 	To set up your system so that you can log in at a graphical login screen, you must edit one file, <filename moreinfo="none">/etc/inittab</filename>, by changing just one number in the runlevel section. When you are finished, reboot the computer. The
 	next time you log in, you are presented with a graphical login prompt.
-</para>
\ No newline at end of file
+</para>
+
diff --git a/en-US/Trouble_After_Booting_GUI-para-5.xml b/en-US/Trouble_After_Booting_GUI-para-5.xml
index 1326998..1f1a776 100644
--- a/en-US/Trouble_After_Booting_GUI-para-5.xml
+++ b/en-US/Trouble_After_Booting_GUI-para-5.xml
@@ -7,4 +7,5 @@
 
 <para>
 	Open a shell prompt. If you are in your user account, become root by typing the <command moreinfo="none">su</command> command.
-</para>
\ No newline at end of file
+</para>
+
diff --git a/en-US/Trouble_After_Booting_GUI-para-6.xml b/en-US/Trouble_After_Booting_GUI-para-6.xml
index 2b20c9a..4f7e742 100644
--- a/en-US/Trouble_After_Booting_GUI-para-6.xml
+++ b/en-US/Trouble_After_Booting_GUI-para-6.xml
@@ -8,4 +8,5 @@
 <para>
 	Now, type <command moreinfo="none">gedit /etc/inittab</command> to edit the file with <application moreinfo="none">gedit</application>. The file <filename moreinfo="none">/etc/inittab</filename> opens. Within the first screen, a section of the file
 	which looks like the following appears:
-</para>
\ No newline at end of file
+</para>
+
diff --git a/en-US/Trouble_After_Booting_GUI-para-7.xml b/en-US/Trouble_After_Booting_GUI-para-7.xml
index d393653..505f82c 100644
--- a/en-US/Trouble_After_Booting_GUI-para-7.xml
+++ b/en-US/Trouble_After_Booting_GUI-para-7.xml
@@ -8,4 +8,5 @@
 <para>
 	To change from a console to a graphical login, you should change the number in the line <computeroutput moreinfo="none">id:3:initdefault:</computeroutput> from a <computeroutput moreinfo="none">3</computeroutput> to a
 	<computeroutput moreinfo="none">5</computeroutput>.
-</para>
\ No newline at end of file
+</para>
+
diff --git a/en-US/Trouble_After_Booting_GUI-para-8.xml b/en-US/Trouble_After_Booting_GUI-para-8.xml
index cc248bf..289c39d 100644
--- a/en-US/Trouble_After_Booting_GUI-para-8.xml
+++ b/en-US/Trouble_After_Booting_GUI-para-8.xml
@@ -7,4 +7,5 @@
 
 <para>
 	Your changed line should look like the following:
-</para>
\ No newline at end of file
+</para>
+
diff --git a/en-US/Trouble_After_Booting_GUI-para-9.xml b/en-US/Trouble_After_Booting_GUI-para-9.xml
index 7e6f7c1..d76146e 100644
--- a/en-US/Trouble_After_Booting_GUI-para-9.xml
+++ b/en-US/Trouble_After_Booting_GUI-para-9.xml
@@ -10,4 +10,5 @@
 	<keycombo moreinfo="none"><keycap moreinfo="none">Ctrl</keycap><keycap moreinfo="none">Q</keycap>
 	</keycombo>
 	keys. A window appears and asks if you would like to save the changes. Click <guibutton moreinfo="none">Save</guibutton>.
-</para>
\ No newline at end of file
+</para>
+
diff --git a/en-US/Trouble_After_Booting_GUI-screen-1.xml b/en-US/Trouble_After_Booting_GUI-screen-1.xml
index 95265b0..d5edf5d 100644
--- a/en-US/Trouble_After_Booting_GUI-screen-1.xml
+++ b/en-US/Trouble_After_Booting_GUI-screen-1.xml
@@ -11,4 +11,5 @@
 #   5 - X11 
 #   6 - reboot (Do NOT set initdefault to this) 
 #  id:3:initdefault:
-</screen>
\ No newline at end of file
+</screen>
+
diff --git a/en-US/Trouble_After_Booting_GUI-screen-2.xml b/en-US/Trouble_After_Booting_GUI-screen-2.xml
index c1c733a..7f9ef86 100644
--- a/en-US/Trouble_After_Booting_GUI-screen-2.xml
+++ b/en-US/Trouble_After_Booting_GUI-screen-2.xml
@@ -7,4 +7,5 @@
 
 <screen>
 	<computeroutput moreinfo="none">	id:5:initdefault:       </computeroutput>
-</screen>
\ No newline at end of file
+</screen>
+
diff --git a/en-US/Trouble_After_Booting_GUI-warning-1.xml b/en-US/Trouble_After_Booting_GUI-warning-1.xml
index f405f06..8291d25 100644
--- a/en-US/Trouble_After_Booting_GUI-warning-1.xml
+++ b/en-US/Trouble_After_Booting_GUI-warning-1.xml
@@ -11,4 +11,5 @@
 	<para>
 		Change <emphasis>only</emphasis> the number of the default runlevel from <filename moreinfo="none">3</filename> to <filename moreinfo="none">5</filename>.
 	</para>
-</warning>
\ No newline at end of file
+</warning>
+
diff --git a/en-US/Trouble_After_Booting_GUI_x86_ppc-title-1.xml b/en-US/Trouble_After_Booting_GUI_x86_ppc-title-1.xml
index 546d305..17abb62 100644
--- a/en-US/Trouble_After_Booting_GUI_x86_ppc-title-1.xml
+++ b/en-US/Trouble_After_Booting_GUI_x86_ppc-title-1.xml
@@ -5,4 +5,5 @@
 
 ]>
 
-<title>Booting into a Graphical Environment</title>
\ No newline at end of file
+<title>Booting into a Graphical Environment</title>
+
diff --git a/en-US/Trouble_After_Booting_Problems-Apache.xml b/en-US/Trouble_After_Booting_Problems-Apache.xml
index 0cda463..c06a7f9 100644
--- a/en-US/Trouble_After_Booting_Problems-Apache.xml
+++ b/en-US/Trouble_After_Booting_Problems-Apache.xml
@@ -22,3 +22,4 @@
 	</para>
 	<screen>127.0.0.1  localhost.localdomain  localhost</screen>
 </section>
+
diff --git a/en-US/Trouble_After_Booting_Problems-Printer.xml b/en-US/Trouble_After_Booting_Problems-Printer.xml
index d3e7504..a38a74b 100644
--- a/en-US/Trouble_After_Booting_Problems-Printer.xml
+++ b/en-US/Trouble_After_Booting_Problems-Printer.xml
@@ -20,3 +20,4 @@
 		Type the <command moreinfo="none">system-config-printer</command> command at a shell prompt to launch the <application moreinfo="none">Printer Configuration Tool</application>. If you are not root, it prompts you for the root password to continue.
 	</para>
 </section>
+
diff --git a/en-US/Trouble_After_Booting_Problems_Login-indexterm-1.xml b/en-US/Trouble_After_Booting_Problems_Login-indexterm-1.xml
index 40a76a2..f06a91a 100644
--- a/en-US/Trouble_After_Booting_Problems_Login-indexterm-1.xml
+++ b/en-US/Trouble_After_Booting_Problems_Login-indexterm-1.xml
@@ -9,4 +9,5 @@
 	<primary>troubleshooting</primary>
 	<secondary>after the installation</secondary>
 	<tertiary>logging in</tertiary>
-</indexterm>
\ No newline at end of file
+</indexterm>
+
diff --git a/en-US/Trouble_After_Booting_Problems_Login-para-1.xml b/en-US/Trouble_After_Booting_Problems_Login-para-1.xml
index 483ea83..a577df1 100644
--- a/en-US/Trouble_After_Booting_Problems_Login-para-1.xml
+++ b/en-US/Trouble_After_Booting_Problems_Login-para-1.xml
@@ -4,4 +4,5 @@
 
 <para>
 	If you did not create a user account in the <application>firstboot</application> screens, switch to a console by pressing <keycombo><keycap>Ctrl</keycap><keycap>Alt</keycap><keycap>F2</keycap></keycombo>, log in as root and use the password you assigned to root.
-</para>
\ No newline at end of file
+</para>
+
diff --git a/en-US/Trouble_After_Booting_Problems_Login-para-10.xml b/en-US/Trouble_After_Booting_Problems_Login-para-10.xml
index dd4d020..a166d69 100644
--- a/en-US/Trouble_After_Booting_Problems_Login-para-10.xml
+++ b/en-US/Trouble_After_Booting_Problems_Login-para-10.xml
@@ -8,4 +8,5 @@
 <para>
 	If you cannot remember your user account password, you must become root. To become root, type <command moreinfo="none">su -</command> and enter your root password when prompted. Then, type <command moreinfo="none">passwd &lt;username&gt;</command>.
 	This allows you to enter a new password for the specified user account.
-</para>
\ No newline at end of file
+</para>
+
diff --git a/en-US/Trouble_After_Booting_Problems_Login-para-11.xml b/en-US/Trouble_After_Booting_Problems_Login-para-11.xml
index fb113e8..cacdf7f 100644
--- a/en-US/Trouble_After_Booting_Problems_Login-para-11.xml
+++ b/en-US/Trouble_After_Booting_Problems_Login-para-11.xml
@@ -3,5 +3,6 @@
 ]>
 
 <para>
-	If the graphical login screen does not appear, check your hardware for compatibility issues. <!-- (RHEL) The <citetitle>Hardware Compatibility List</citetitle> can be found at:-->Linuxquestions.org maintains a Hardware Compatibility List at:
-</para>
\ No newline at end of file
+	If the graphical login screen does not appear, check your hardware for compatibility issues. The <citetitle>Hardware Compatibility List</citetitle> can be found at:
+</para>
+
diff --git a/en-US/Trouble_After_Booting_Problems_Login-para-2.xml b/en-US/Trouble_After_Booting_Problems_Login-para-2.xml
index 9b0c74a..f510175 100644
--- a/en-US/Trouble_After_Booting_Problems_Login-para-2.xml
+++ b/en-US/Trouble_After_Booting_Problems_Login-para-2.xml
@@ -7,4 +7,5 @@
 
 <para>
 	If you cannot remember your root password, boot your system as <command moreinfo="none">linux single</command>.
-</para>
\ No newline at end of file
+</para>
+
diff --git a/en-US/Trouble_After_Booting_Problems_Login-para-4.xml b/en-US/Trouble_After_Booting_Problems_Login-para-4.xml
index b1fb9f3..039d230 100644
--- a/en-US/Trouble_After_Booting_Problems_Login-para-4.xml
+++ b/en-US/Trouble_After_Booting_Problems_Login-para-4.xml
@@ -8,4 +8,5 @@
 <para>
 	If you are using an x86-based system and GRUB is your installed boot loader, type <command moreinfo="none">e</command> for edit when the GRUB boot screen has loaded. You are presented with a list of items in the configuration file for the boot label you
 	have selected.
-</para>
\ No newline at end of file
+</para>
+
diff --git a/en-US/Trouble_After_Booting_Problems_Login-para-5.xml b/en-US/Trouble_After_Booting_Problems_Login-para-5.xml
index 418a67d..e6af589 100644
--- a/en-US/Trouble_After_Booting_Problems_Login-para-5.xml
+++ b/en-US/Trouble_After_Booting_Problems_Login-para-5.xml
@@ -7,4 +7,5 @@
 
 <para>
 	Choose the line that starts with <filename moreinfo="none">kernel</filename> and type <command moreinfo="none">e</command> to edit this boot entry.
-</para>
\ No newline at end of file
+</para>
+
diff --git a/en-US/Trouble_After_Booting_Problems_Login-para-6.xml b/en-US/Trouble_After_Booting_Problems_Login-para-6.xml
index ba11fe9..ff0c472 100644
--- a/en-US/Trouble_After_Booting_Problems_Login-para-6.xml
+++ b/en-US/Trouble_After_Booting_Problems_Login-para-6.xml
@@ -7,4 +7,5 @@
 
 <para>
 	At the end of the <filename moreinfo="none">kernel</filename> line, add:
-</para>
\ No newline at end of file
+</para>
+
diff --git a/en-US/Trouble_After_Booting_Problems_Login-para-7.xml b/en-US/Trouble_After_Booting_Problems_Login-para-7.xml
index ade775c..03df6ae 100644
--- a/en-US/Trouble_After_Booting_Problems_Login-para-7.xml
+++ b/en-US/Trouble_After_Booting_Problems_Login-para-7.xml
@@ -7,4 +7,5 @@
 
 <para>
 	Press <keycap moreinfo="none">Enter</keycap> to exit edit mode.
-</para>
\ No newline at end of file
+</para>
+
diff --git a/en-US/Trouble_After_Booting_Problems_Login-para-8.xml b/en-US/Trouble_After_Booting_Problems_Login-para-8.xml
index 2d0fa57..72db21e 100644
--- a/en-US/Trouble_After_Booting_Problems_Login-para-8.xml
+++ b/en-US/Trouble_After_Booting_Problems_Login-para-8.xml
@@ -7,4 +7,5 @@
 
 <para>
 	Once the boot loader screen has returned, type <command moreinfo="none">b</command> to boot the system.
-</para>
\ No newline at end of file
+</para>
+
diff --git a/en-US/Trouble_After_Booting_Problems_Login-para-9.xml b/en-US/Trouble_After_Booting_Problems_Login-para-9.xml
index fc96d45..7178a96 100644
--- a/en-US/Trouble_After_Booting_Problems_Login-para-9.xml
+++ b/en-US/Trouble_After_Booting_Problems_Login-para-9.xml
@@ -9,4 +9,5 @@
 	Once you have booted into single user mode and have access to the
 	<prompt moreinfo="none">#</prompt>
 	prompt, you must type <command moreinfo="none">passwd root</command>, which allows you to enter a new password for root. At this point you can type <command moreinfo="none">shutdown -r now</command> to reboot the system with the new root password.
-</para>
\ No newline at end of file
+</para>
+
diff --git a/en-US/Trouble_After_Booting_Problems_Login-screen-1.xml b/en-US/Trouble_After_Booting_Problems_Login-screen-1.xml
index 3165f77..8ba7c56 100644
--- a/en-US/Trouble_After_Booting_Problems_Login-screen-1.xml
+++ b/en-US/Trouble_After_Booting_Problems_Login-screen-1.xml
@@ -7,4 +7,5 @@
 
 <screen>
 	<userinput moreinfo="none">single</userinput>
-</screen>
\ No newline at end of file
+</screen>
+
diff --git a/en-US/Trouble_After_Booting_Problems_Login-screen-2.xml b/en-US/Trouble_After_Booting_Problems_Login-screen-2.xml
index 76ee2ed..9c0b6f1 100644
--- a/en-US/Trouble_After_Booting_Problems_Login-screen-2.xml
+++ b/en-US/Trouble_After_Booting_Problems_Login-screen-2.xml
@@ -3,10 +3,6 @@
 ]>
 
 <screen>
-	<ulink url="http://www.linuxquestions.org/hcl/index.php">http://www.linuxquestions.org/hcl/index.php</ulink>
-</screen>
-
-<!-- (RHEL)
-<screen>
 	<ulink url="http://hardware.redhat.com/hcl/">http://hardware.redhat.com/hcl/</ulink>
-</screen> -->
\ No newline at end of file
+</screen> 
+
diff --git a/en-US/Trouble_After_Booting_Problems_Login-title-1.xml b/en-US/Trouble_After_Booting_Problems_Login-title-1.xml
index 7326b1a..a988fa9 100644
--- a/en-US/Trouble_After_Booting_Problems_Login-title-1.xml
+++ b/en-US/Trouble_After_Booting_Problems_Login-title-1.xml
@@ -5,4 +5,5 @@
 
 ]>
 
-<title>Problems When You Try to Log In</title>
\ No newline at end of file
+<title>Problems When You Try to Log In</title>
+
diff --git a/en-US/Trouble_After_Booting_X_Server_Non_Root.xml b/en-US/Trouble_After_Booting_X_Server_Non_Root.xml
index 3ca865a..cee1a45 100644
--- a/en-US/Trouble_After_Booting_X_Server_Non_Root.xml
+++ b/en-US/Trouble_After_Booting_X_Server_Non_Root.xml
@@ -29,4 +29,5 @@
 		A key indicator is 100% full or a percentage above 90% or 95% on a partition. The <filename moreinfo="none">/home/</filename> and <filename moreinfo="none">/tmp/</filename> partitions can sometimes fill up quickly with user files. You can make some room
 		on that partition by removing old files. After you free up some disk space, try running X as the user that was unsuccessful before.
 	</para>
-</section>
\ No newline at end of file
+</section>
+
diff --git a/en-US/Trouble_After_Booting_X_Windows.xml b/en-US/Trouble_After_Booting_X_Windows.xml
index 334ce84..212c8ae 100644
--- a/en-US/Trouble_After_Booting_X_Windows.xml
+++ b/en-US/Trouble_After_Booting_X_Windows.xml
@@ -23,4 +23,5 @@
 	<para>
 		Refer to <xref linkend="sn-switching-to-gui-login"/> for more detail on installing a desktop environment. 
 	</para>
-</section>
\ No newline at end of file
+</section>
+
diff --git a/en-US/Trouble_After_common-indexterm-1.xml b/en-US/Trouble_After_common-indexterm-1.xml
index 4be9c63..1d11ffe 100644
--- a/en-US/Trouble_After_common-indexterm-1.xml
+++ b/en-US/Trouble_After_common-indexterm-1.xml
@@ -8,4 +8,5 @@
 <indexterm significance="normal">
 	<primary>troubleshooting</primary>
 	<secondary>after the installation</secondary>
-</indexterm>
\ No newline at end of file
+</indexterm>
+
diff --git a/en-US/Trouble_After_common-title-1.xml b/en-US/Trouble_After_common-title-1.xml
index 20e6d7a..f3fe0c9 100644
--- a/en-US/Trouble_After_common-title-1.xml
+++ b/en-US/Trouble_After_common-title-1.xml
@@ -5,4 +5,5 @@
 
 ]>
 
-<title>Problems After Installation</title>
\ No newline at end of file
+<title>Problems After Installation</title>
+
diff --git a/en-US/Trouble_Begin_GUI-indexterm-1.xml b/en-US/Trouble_Begin_GUI-indexterm-1.xml
index 2db0aa4..8f7e708 100644
--- a/en-US/Trouble_Begin_GUI-indexterm-1.xml
+++ b/en-US/Trouble_Begin_GUI-indexterm-1.xml
@@ -9,4 +9,5 @@
 	<primary>troubleshooting</primary>
 	<secondary>beginning the installation</secondary>
 	<tertiary>GUI installation method unavailable</tertiary>
-</indexterm>
\ No newline at end of file
+</indexterm>
+
diff --git a/en-US/Trouble_Begin_GUI-indexterm-2.xml b/en-US/Trouble_Begin_GUI-indexterm-2.xml
index 9212c6e..cc4c805 100644
--- a/en-US/Trouble_Begin_GUI-indexterm-2.xml
+++ b/en-US/Trouble_Begin_GUI-indexterm-2.xml
@@ -9,4 +9,5 @@
 	<primary>troubleshooting</primary>
 	<secondary>beginning the installation</secondary>
 	<tertiary>frame buffer, disabling</tertiary>
-</indexterm>
\ No newline at end of file
+</indexterm>
+
diff --git a/en-US/Trouble_Begin_GUI-note-1.xml b/en-US/Trouble_Begin_GUI-note-1.xml
index d1bc320..8ec4779 100644
--- a/en-US/Trouble_Begin_GUI-note-1.xml
+++ b/en-US/Trouble_Begin_GUI-note-1.xml
@@ -11,4 +11,5 @@
 	<para>
 		To disable frame buffer support and allow the installation program to run in text mode, try using the <command moreinfo="none">nofb</command> boot option. This command may be necessary for accessibility with some screen reading hardware.
 	</para>
-</note>
\ No newline at end of file
+</note>
+
diff --git a/en-US/Trouble_Begin_GUI-para-1.xml b/en-US/Trouble_Begin_GUI-para-1.xml
index 5823489..49a0823 100644
--- a/en-US/Trouble_Begin_GUI-para-1.xml
+++ b/en-US/Trouble_Begin_GUI-para-1.xml
@@ -8,4 +8,5 @@
 <para>
 	There are some video cards that have trouble booting into the graphical installation program. If the installation program does not run using its default settings, it tries to run in a lower resolution mode. If that still fails, the installation program
 	attempts to run in text mode.
-</para>
\ No newline at end of file
+</para>
+
diff --git a/en-US/Trouble_Begin_GUI-title.xml b/en-US/Trouble_Begin_GUI-title.xml
index 18ea83e..8f27930 100644
--- a/en-US/Trouble_Begin_GUI-title.xml
+++ b/en-US/Trouble_Begin_GUI-title.xml
@@ -5,4 +5,5 @@
 
 ]>
 
-<title>Problems with Booting into the Graphical Installation</title>
\ No newline at end of file
+<title>Problems with Booting into the Graphical Installation</title>
+
diff --git a/en-US/Trouble_Begin_x86_ppc_indexterm-1.xml b/en-US/Trouble_Begin_x86_ppc_indexterm-1.xml
index b8c0bbe..4a12998 100644
--- a/en-US/Trouble_Begin_x86_ppc_indexterm-1.xml
+++ b/en-US/Trouble_Begin_x86_ppc_indexterm-1.xml
@@ -7,4 +7,5 @@
 <indexterm significance="normal">
 	<primary>troubleshooting</primary>
 	<secondary>beginning the installation</secondary>
-</indexterm>
\ No newline at end of file
+</indexterm>
+
diff --git a/en-US/Trouble_Begin_x86_ppc_title-1.xml b/en-US/Trouble_Begin_x86_ppc_title-1.xml
index 6857524..da9f460 100644
--- a/en-US/Trouble_Begin_x86_ppc_title-1.xml
+++ b/en-US/Trouble_Begin_x86_ppc_title-1.xml
@@ -5,4 +5,5 @@
 	  
 	  ]>
 
-<title>Trouble Beginning the Installation</title>
\ No newline at end of file
+<title>Trouble Beginning the Installation</title>
+
diff --git a/en-US/Trouble_During-x86.xml b/en-US/Trouble_During-x86.xml
index 98a4304..86f84ef 100644
--- a/en-US/Trouble_During-x86.xml
+++ b/en-US/Trouble_During-x86.xml
@@ -19,11 +19,11 @@
 		</indexterm>
 		
 		<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Trouble_During_x86_ppc-para-1.xml"/>
-		<!-- FIXME not in F11 
-		<para>
-			Check your hardware vendor's website to determine if a driver diskette image is available that fixes your problem. For more general information on driver diskettes, refer to <xref linkend="ch-driverdisk-x86"/>.
-		</para>
-		 -->
+
+		<!-- <para>
+			Check your hardware vendor's website to determine if a driver update is available that fixes your problem. For more general information on driver updates, refer to <xref linkend="chap-Updating_drivers_during_installation_on_Intel_and_AMD_systems"/>.
+		</para> -->
+
 		<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Trouble_During_x86_ppc-para-3.xml"/>
 		
 		<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Trouble_During_x86_ppc-screen-1.xml"/>
@@ -57,17 +57,17 @@
 	</section>
 	 
 	<section id="s2-trouble-part-tables-x86">
-		<title>Trouble with Partition Tables</title>
+		<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Trouble_Updating_common-partitions-title.xml"/>
 		
 		<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Trouble_During_common-partitions-indexterm-1.xml"/>
 		
 		<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Trouble_During_common-partitions-indexterm-2.xml"/>
 		
 		<para>
-			If you receive an error at the beginning of the installation process (<xref linkend="sn-initialize-hdd-x86"/>) that says something similar to:
+			If you receive an error after the <guilabel moreinfo="none">Disk Partitioning Setup</guilabel> (<xref linkend="s1-diskpartsetup-x86"/>) phase of the installation saying something similar to
 		</para>
 		
-		<blockquote><xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Trouble_During_common-partitions-para-1.xml"/></blockquote>
+		<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Trouble_During_common-partitions-para-1.xml"/>
 		 
 		<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Trouble_During_common-partitions-para-2.xml"/>
 		 
@@ -107,7 +107,7 @@
 		<itemizedlist>
 			<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Trouble_During_common-other-partitioning-listitem-1.xml"/>
 			
-			<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Trouble_During_common-other-partitioning-listitem-3.xml"/>
+			<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Trouble_During_common-other-partitioning-listitem-2.xml"/>
 		</itemizedlist>
 		
 		<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Trouble_During_common-other-partitioning-tip-1.xml"/>
@@ -117,3 +117,4 @@
 	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Trouble_During_common-python-errors.xml"/>
 	
 </section>
+
diff --git a/en-US/Trouble_During_common-other-partitioning-indexterm-1.xml b/en-US/Trouble_During_common-other-partitioning-indexterm-1.xml
index 1c83720..f0db992 100644
--- a/en-US/Trouble_During_common-other-partitioning-indexterm-1.xml
+++ b/en-US/Trouble_During_common-other-partitioning-indexterm-1.xml
@@ -9,4 +9,5 @@
 	<primary>troubleshooting</primary>
 	<secondary>during the installation</secondary>
 	<tertiary>completing partitions</tertiary>
-</indexterm>
\ No newline at end of file
+</indexterm>
+
diff --git a/en-US/Trouble_During_common-other-partitioning-listitem-1.xml b/en-US/Trouble_During_common-other-partitioning-listitem-1.xml
index edff9f2..2f55188 100644
--- a/en-US/Trouble_During_common-other-partitioning-listitem-1.xml
+++ b/en-US/Trouble_During_common-other-partitioning-listitem-1.xml
@@ -9,4 +9,5 @@
 	<para>
 		A <filename moreinfo="none">/</filename> (root) partition
 	</para>
-</listitem>
\ No newline at end of file
+</listitem>
+
diff --git a/en-US/Trouble_During_common-other-partitioning-listitem-2.xml b/en-US/Trouble_During_common-other-partitioning-listitem-2.xml
new file mode 100644
index 0000000..691b5dd
--- /dev/null
+++ b/en-US/Trouble_During_common-other-partitioning-listitem-2.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<!DOCTYPE listitem PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+	  <!ENTITY % RH_ENTITIES SYSTEM "./Common_Config/rh-entities.ent">
+	  %RH_ENTITIES;
+	  
+]>
+
+<listitem>
+	<para>
+		A &lt;swap&gt; partition of type swap
+	</para>
+</listitem>
+
diff --git a/en-US/Trouble_During_common-other-partitioning-listitem-3.xml b/en-US/Trouble_During_common-other-partitioning-listitem-3.xml
deleted file mode 100644
index b23dadb..0000000
--- a/en-US/Trouble_During_common-other-partitioning-listitem-3.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE listitem PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
-	  
-	  
-	  
-]>
-
-<listitem>
-	<para>
-		A &lt;swap&gt; partition of type swap
-	</para>
-</listitem>
diff --git a/en-US/Trouble_During_common-other-partitioning-para-1.xml b/en-US/Trouble_During_common-other-partitioning-para-1.xml
index 41102cb..7b55313 100644
--- a/en-US/Trouble_During_common-other-partitioning-para-1.xml
+++ b/en-US/Trouble_During_common-other-partitioning-para-1.xml
@@ -4,4 +4,5 @@
 
 <para>
 	If you create partitions manually, but cannot move to the next screen, you probably have not created all the partitions necessary for installation to proceed.
-</para>
\ No newline at end of file
+</para>
+
diff --git a/en-US/Trouble_During_common-other-partitioning-para-2.xml b/en-US/Trouble_During_common-other-partitioning-para-2.xml
index e3bf672..83953ed 100644
--- a/en-US/Trouble_During_common-other-partitioning-para-2.xml
+++ b/en-US/Trouble_During_common-other-partitioning-para-2.xml
@@ -7,4 +7,5 @@
 
 <para>
 	You must have the following partitions as a bare minimum:
-</para>
\ No newline at end of file
+</para>
+
diff --git a/en-US/Trouble_During_common-other-partitioning-tip-1.xml b/en-US/Trouble_During_common-other-partitioning-tip-1.xml
index a9a7c5f..31cdc5e 100644
--- a/en-US/Trouble_During_common-other-partitioning-tip-1.xml
+++ b/en-US/Trouble_During_common-other-partitioning-tip-1.xml
@@ -6,4 +6,5 @@
 	<para>
 		When defining a partition's type as swap, do not assign it a mount point. <application>Anaconda</application> automatically assigns the mount point for you.
 	</para>
-</note>
\ No newline at end of file
+</note>
+
diff --git a/en-US/Trouble_During_common-other-partitioning-title-1.xml b/en-US/Trouble_During_common-other-partitioning-title-1.xml
index af907e1..0dec618 100644
--- a/en-US/Trouble_During_common-other-partitioning-title-1.xml
+++ b/en-US/Trouble_During_common-other-partitioning-title-1.xml
@@ -5,4 +5,5 @@
 	  
 ]>
 
-<title>Other Partitioning Problems</title>
\ No newline at end of file
+<title>Other Partitioning Problems</title>
+
diff --git a/en-US/Trouble_During_common-partitions-indexterm-1.xml b/en-US/Trouble_During_common-partitions-indexterm-1.xml
index accf7ed..d25494e 100644
--- a/en-US/Trouble_During_common-partitions-indexterm-1.xml
+++ b/en-US/Trouble_During_common-partitions-indexterm-1.xml
@@ -9,4 +9,5 @@
 	<primary>troubleshooting</primary>
 	<secondary>during the installation</secondary>
 	<tertiary>partition tables</tertiary>
-</indexterm>
\ No newline at end of file
+</indexterm>
+
diff --git a/en-US/Trouble_During_common-partitions-indexterm-2.xml b/en-US/Trouble_During_common-partitions-indexterm-2.xml
index d25494e..c08a9ce 100644
--- a/en-US/Trouble_During_common-partitions-indexterm-2.xml
+++ b/en-US/Trouble_During_common-partitions-indexterm-2.xml
@@ -11,3 +11,4 @@
 	<tertiary>partition tables</tertiary>
 </indexterm>
 
+
diff --git a/en-US/Trouble_During_common-partitions-para-1.xml b/en-US/Trouble_During_common-partitions-para-1.xml
index 251ead4..6e01cf9 100644
--- a/en-US/Trouble_During_common-partitions-para-1.xml
+++ b/en-US/Trouble_During_common-partitions-para-1.xml
@@ -4,6 +4,7 @@
 
 <blockquote>
 	<para>
-		Error processing drive sda. Maybe it needs to be reinitialized. YOU WILL LOSE ALL DATA ON THIS DRIVE!
+		The partition table on device hda was unreadable. To create new partitions it must be initialized, causing the loss of ALL DATA on this drive.
 	</para>
-</blockquote>
\ No newline at end of file
+</blockquote>
+
diff --git a/en-US/Trouble_During_common-partitions-para-2.xml b/en-US/Trouble_During_common-partitions-para-2.xml
index a4a624c..7757758 100644
--- a/en-US/Trouble_During_common-partitions-para-2.xml
+++ b/en-US/Trouble_During_common-partitions-para-2.xml
@@ -7,4 +7,5 @@
 
 <para>
 	you may not have a partition table on that drive or the partition table on the drive may not be recognizable by the partitioning software used in the installation program.
-</para>
\ No newline at end of file
+</para>
+
diff --git a/en-US/Trouble_During_common-partitions-para-3.xml b/en-US/Trouble_During_common-partitions-para-3.xml
index 262015c..b8b4671 100644
--- a/en-US/Trouble_During_common-partitions-para-3.xml
+++ b/en-US/Trouble_During_common-partitions-para-3.xml
@@ -7,4 +7,5 @@
 
 <para>
 	No matter what type of installation you are performing, backups of the existing data on your systems should always be made.
-</para>
\ No newline at end of file
+</para>
+
diff --git a/en-US/Trouble_During_common-python-errors.xml b/en-US/Trouble_During_common-python-errors.xml
index 12f3520..510d5e5 100644
--- a/en-US/Trouble_During_common-python-errors.xml
+++ b/en-US/Trouble_During_common-python-errors.xml
@@ -39,12 +39,9 @@ p4  (dp5  S'progressWindow'  p6   &lt;failed&gt;<!--</computeroutput>-->
 <ulink url="http://fedoraproject.org/wiki/Anaconda/Updates">http://fedoraproject.org/wiki/Anaconda/Updates</ulink>
 </screen>
 		 
-		<!-- (RHEL) <para>
-			If you experience such an error, first try to download any available errata for <application moreinfo="none">anaconda</application>. Errata can be found at:
+		<para>
+			You can also find and download errata for <application moreinfo="none">anaconda</application> through your Red Hat Subscription. Log in to your account through the customer portal at <ulink url="https://access.redhat.com/login"></ulink>, click the <guilabel>Errata</guilabel> link at the top of the window, enter <literal>anaconda</literal> in the field marked <guilabel>Filter by Synopsis</guilabel>, and click <guibutton>go</guibutton>.
 		</para>
-<screen>
-<ulink url="http://www.redhat.com/support/errata/">http://www.redhat.com/support/errata/</ulink>
-</screen>-->
 		<para>
 			The <application>anaconda</application> website may also be a useful reference and can be found online at:
 		</para>
@@ -57,10 +54,11 @@ p4  (dp5  S'progressWindow'  p6   &lt;failed&gt;<!--</computeroutput>-->
 <screen>
 <ulink url="http://bugzilla.redhat.com/bugzilla/">http://bugzilla.redhat.com/bugzilla/</ulink>
 </screen>
-		<!-- (RHEL) <para>
+		<para>
 			Finally, if you are still facing problems related to this error, register your product and contact our support team. To register your product, go to:
 		</para>
 <screen>
 <ulink url="http://www.redhat.com/apps/activate/">http://www.redhat.com/apps/activate/</ulink>
-</screen> -->
-	</section>
\ No newline at end of file
+</screen> 
+	</section>
+
diff --git a/en-US/Trouble_During_common-title-1.xml b/en-US/Trouble_During_common-title-1.xml
index a749275..ecb64b1 100644
--- a/en-US/Trouble_During_common-title-1.xml
+++ b/en-US/Trouble_During_common-title-1.xml
@@ -3,4 +3,5 @@
 ]>
 
 
-<title><computeroutput moreinfo="none">No devices found to install Fedora </computeroutput> Error Message</title>
\ No newline at end of file
+<title><computeroutput moreinfo="none">No devices found to install Fedora </computeroutput> Error Message</title>
+
diff --git a/en-US/Trouble_During_x86_ppc-para-1.xml b/en-US/Trouble_During_x86_ppc-para-1.xml
index d2af105..df0cd0b 100644
--- a/en-US/Trouble_During_x86_ppc-para-1.xml
+++ b/en-US/Trouble_During_x86_ppc-para-1.xml
@@ -5,4 +5,5 @@
 
 <para>
 	If you receive an error message stating <computeroutput moreinfo="none">No devices found to install Fedora</computeroutput>, there is probably a SCSI controller that is not being recognized by the installation program.
-</para>
\ No newline at end of file
+</para>
+
diff --git a/en-US/Trouble_During_x86_ppc-para-3.xml b/en-US/Trouble_During_x86_ppc-para-3.xml
index 3a851de..5db4b31 100644
--- a/en-US/Trouble_During_x86_ppc-para-3.xml
+++ b/en-US/Trouble_During_x86_ppc-para-3.xml
@@ -3,5 +3,6 @@
 ]>
 
 <para>
-	You can also refer to the LinuxQuestions.org Hardware Compatibility List<!-- (RHEL) <citetitle>Red Hat Hardware Compatibility List</citetitle>-->, available online at:
-</para>
\ No newline at end of file
+	You can also refer to the <citetitle>Red Hat Hardware Compatibility List</citetitle>, available online at:
+</para>
+
diff --git a/en-US/Trouble_During_x86_ppc-screen-1.xml b/en-US/Trouble_During_x86_ppc-screen-1.xml
index 1d2c058..e38e19b 100644
--- a/en-US/Trouble_During_x86_ppc-screen-1.xml
+++ b/en-US/Trouble_During_x86_ppc-screen-1.xml
@@ -3,6 +3,6 @@
 ]>
 
 <para>
-	<ulink url="http://www.linuxquestions.org/hcl/index.php">http://www.linuxquestions.org/hcl/index.php</ulink>
-	<!-- (RHEL) <ulink url="http://hardware.redhat.com/hcl/">http://hardware.redhat.com/hcl/</ulink> -->
+	<ulink url="http://hardware.redhat.com/hcl/">http://hardware.redhat.com/hcl/</ulink>
 </para> 
+
diff --git a/en-US/Trouble_During_x86_ppc-section-2-figure-1.xml b/en-US/Trouble_During_x86_ppc-section-2-figure-1.xml
index ce12f7a..7389f31 100644
--- a/en-US/Trouble_During_x86_ppc-section-2-figure-1.xml
+++ b/en-US/Trouble_During_x86_ppc-section-2-figure-1.xml
@@ -11,3 +11,4 @@
 		</textobject>
 	</mediaobject>
 </figure>
+
diff --git a/en-US/Trouble_During_x86_ppc-section-2-indexterms-2.xml b/en-US/Trouble_During_x86_ppc-section-2-indexterms-2.xml
index d06312f..331523e 100644
--- a/en-US/Trouble_During_x86_ppc-section-2-indexterms-2.xml
+++ b/en-US/Trouble_During_x86_ppc-section-2-indexterms-2.xml
@@ -5,4 +5,5 @@
 <indexterm significance="normal">
 	<primary>traceback messages</primary>
 	<secondary>saving traceback messages without removeable media</secondary>
-</indexterm>
\ No newline at end of file
+</indexterm>
+
diff --git a/en-US/Trouble_During_x86_ppc-section-2-indexterms-3.xml b/en-US/Trouble_During_x86_ppc-section-2-indexterms-3.xml
index d06312f..331523e 100644
--- a/en-US/Trouble_During_x86_ppc-section-2-indexterms-3.xml
+++ b/en-US/Trouble_During_x86_ppc-section-2-indexterms-3.xml
@@ -5,4 +5,5 @@
 <indexterm significance="normal">
 	<primary>traceback messages</primary>
 	<secondary>saving traceback messages without removeable media</secondary>
-</indexterm>
\ No newline at end of file
+</indexterm>
+
diff --git a/en-US/Trouble_During_x86_ppc-section-2-indexterms.xml b/en-US/Trouble_During_x86_ppc-section-2-indexterms.xml
index f9f540e..c011cc0 100644
--- a/en-US/Trouble_During_x86_ppc-section-2-indexterms.xml
+++ b/en-US/Trouble_During_x86_ppc-section-2-indexterms.xml
@@ -6,4 +6,5 @@
 	<primary>troubleshooting</primary>
 	<secondary>during the installation</secondary>
 	<tertiary>saving traceback messages without removeable media</tertiary>
-</indexterm>
\ No newline at end of file
+</indexterm>
+
diff --git a/en-US/Trouble_During_x86_ppc-section-2-para-1.xml b/en-US/Trouble_During_x86_ppc-section-2-para-1.xml
index 561ef48..9952eca 100644
--- a/en-US/Trouble_During_x86_ppc-section-2-para-1.xml
+++ b/en-US/Trouble_During_x86_ppc-section-2-para-1.xml
@@ -5,4 +5,5 @@
 
 <para>
 	If <application>anaconda</application> encounters an error during the graphical installation process, it presents you with a crash reporting dialog box:
-</para>
\ No newline at end of file
+</para>
+
diff --git a/en-US/Trouble_During_x86_ppc-section-2-para-2.xml b/en-US/Trouble_During_x86_ppc-section-2-para-2.xml
index 4f4e04f..0bf434c 100644
--- a/en-US/Trouble_During_x86_ppc-section-2-para-2.xml
+++ b/en-US/Trouble_During_x86_ppc-section-2-para-2.xml
@@ -58,3 +58,4 @@
 		</varlistentry>
 	</variablelist>
 </para>
+
diff --git a/en-US/Trouble_During_x86_ppc-section-2-variablelist-1.xml b/en-US/Trouble_During_x86_ppc-section-2-variablelist-1.xml
index a67e38c..a721f5e 100644
--- a/en-US/Trouble_During_x86_ppc-section-2-variablelist-1.xml
+++ b/en-US/Trouble_During_x86_ppc-section-2-variablelist-1.xml
@@ -26,15 +26,6 @@
 			<para>
 				saves details of the error locally or remotely:
 			</para>
-			<figure float="0"><title>Choosing a Destination for Saving the Traceback</title>
-				<mediaobject>
-					<imageobject><imagedata fileref="images/crashreporting/crashreporting.png" format="PNG"/></imageobject>
-					<textobject><para>
-							The three options presented are <literal>Local disk</literal>, <literal>Bugzilla</literal>, or <literal>Remote server</literal>.
-						</para>
-					</textobject>
-				</mediaobject>
-			</figure>
 		</listitem>
 	</varlistentry>
 	<varlistentry>
@@ -46,3 +37,4 @@
 		</listitem>
 	</varlistentry>
 </variablelist>
+
diff --git a/en-US/Trouble_During_x86_ppc-sectiontitle-2.xml b/en-US/Trouble_During_x86_ppc-sectiontitle-2.xml
index 59bb872..ef960d7 100644
--- a/en-US/Trouble_During_x86_ppc-sectiontitle-2.xml
+++ b/en-US/Trouble_During_x86_ppc-sectiontitle-2.xml
@@ -2,4 +2,5 @@
 <!DOCTYPE title PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
 ]>
 
-<title>Saving traceback messages without removeable media</title>
\ No newline at end of file
+<title>Saving traceback messages</title>
+
diff --git a/en-US/Trouble_No_Boot-Sig11-indexterm-1.xml b/en-US/Trouble_No_Boot-Sig11-indexterm-1.xml
index 04aad30..b3025c7 100644
--- a/en-US/Trouble_No_Boot-Sig11-indexterm-1.xml
+++ b/en-US/Trouble_No_Boot-Sig11-indexterm-1.xml
@@ -9,4 +9,5 @@
 	<primary>troubleshooting</primary>
 	<secondary>booting</secondary>
 	<tertiary>signal 11 error</tertiary>
-</indexterm>
\ No newline at end of file
+</indexterm>
+
diff --git a/en-US/Trouble_No_Boot-Sig11-para-1.xml b/en-US/Trouble_No_Boot-Sig11-para-1.xml
index 1527abe..0428c35 100644
--- a/en-US/Trouble_No_Boot-Sig11-para-1.xml
+++ b/en-US/Trouble_No_Boot-Sig11-para-1.xml
@@ -7,4 +7,5 @@
 
 <para>
 	A signal 11 error, commonly know as a <firstterm>segmentation fault</firstterm>, means that the program accessed a memory location that was not assigned to it.  A signal 11 error may be due to a bug in one of the software programs that is installed, or faulty hardware.
-</para>
\ No newline at end of file
+</para>
+
diff --git a/en-US/Trouble_No_Boot-Sig11-para-2.xml b/en-US/Trouble_No_Boot-Sig11-para-2.xml
index 6fb1b11..aebe1f5 100644
--- a/en-US/Trouble_No_Boot-Sig11-para-2.xml
+++ b/en-US/Trouble_No_Boot-Sig11-para-2.xml
@@ -4,4 +4,5 @@
 
 <para>
 	If you receive a fatal signal 11 error during your installation, it is probably due to a hardware error in memory on your system's bus. Like other operating systems, Fedora places its own demands on your system's hardware. Some of this hardware may not be able to meet those demands, even if they work properly under another OS.
-</para>
\ No newline at end of file
+</para>
+
diff --git a/en-US/Trouble_No_Boot-Sig11-para-3.xml b/en-US/Trouble_No_Boot-Sig11-para-3.xml
index daaeff7..8383bbd 100644
--- a/en-US/Trouble_No_Boot-Sig11-para-3.xml
+++ b/en-US/Trouble_No_Boot-Sig11-para-3.xml
@@ -4,4 +4,5 @@
 
 <para>
 	Ensure that you have the latest installation updates and images. Review the online errata to see if newer versions are available. If the latest images still fail, it may be due to a problem with your hardware. Commonly, these errors are in your memory or CPU-cache. A possible solution for this error is turning off the CPU-cache in the BIOS, if your system supports this. You could also try to swap your memory around in the motherboard slots to check if the problem is either slot or memory related.
-</para>
\ No newline at end of file
+</para>
+
diff --git a/en-US/Trouble_No_Boot-Sig11-para-7.xml b/en-US/Trouble_No_Boot-Sig11-para-7.xml
index 7a3a763..09f895f 100644
--- a/en-US/Trouble_No_Boot-Sig11-para-7.xml
+++ b/en-US/Trouble_No_Boot-Sig11-para-7.xml
@@ -3,5 +3,6 @@
 ]>
 
 <para>
-	Another option is to perform a media check on your installation CD-ROMs. <application>Anaconda</application>, the installation program, has the ability to test the integrity of the installation media. It works with the CD, DVD, hard drive ISO, and NFS ISO installation methods. Red Hat recommends that you test all installation media before starting the installation process, and before reporting any installation-related bugs (many of the bugs reported are actually due to improperly-burned CDs). To use this test, type the following command at the <prompt>boot:</prompt> <!-- (RHEL) or <prompt>yaboot:</prompt> -->prompt<!-- (prepend with <command>elilo</command> for Itanium systems)-->:
-</para>
\ No newline at end of file
+	Another option is to perform a media check on your installation DVD. <application>Anaconda</application>, the installation program, has the ability to test the integrity of the installation media. It works with the DVD, hard drive ISO, and NFS ISO installation methods. Red Hat recommends that you test all installation media before starting the installation process, and before reporting any installation-related bugs (many of the bugs reported are actually due to improperly-burned DVDs). To use this test, type the following command at the <prompt>boot:</prompt> or <prompt>yaboot:</prompt> prompt:
+</para>
+
diff --git a/en-US/Trouble_No_Boot-Sig11-para-8.xml b/en-US/Trouble_No_Boot-Sig11-para-8.xml
index e91cb18..2bb1a2b 100644
--- a/en-US/Trouble_No_Boot-Sig11-para-8.xml
+++ b/en-US/Trouble_No_Boot-Sig11-para-8.xml
@@ -7,4 +7,5 @@
 
 <para>
 	For more information concerning signal 11 errors, refer to:
-</para>
\ No newline at end of file
+</para>
+
diff --git a/en-US/Trouble_No_Boot-Sig11-screen-2.xml b/en-US/Trouble_No_Boot-Sig11-screen-2.xml
index 472bbe7..0985357 100644
--- a/en-US/Trouble_No_Boot-Sig11-screen-2.xml
+++ b/en-US/Trouble_No_Boot-Sig11-screen-2.xml
@@ -7,4 +7,5 @@
 
 <screen>
 	<userinput moreinfo="none">linux mediacheck</userinput>
-</screen>
\ No newline at end of file
+</screen>
+
diff --git a/en-US/Trouble_No_Boot-Sig11-screen-3.xml b/en-US/Trouble_No_Boot-Sig11-screen-3.xml
index 720fb83..c0222bf 100644
--- a/en-US/Trouble_No_Boot-Sig11-screen-3.xml
+++ b/en-US/Trouble_No_Boot-Sig11-screen-3.xml
@@ -7,4 +7,5 @@
 
 <screen>
 	<ulink url="http://www.bitwizard.nl/sig11/">http://www.bitwizard.nl/sig11/</ulink>
-</screen>
\ No newline at end of file
+</screen>
+
diff --git a/en-US/Trouble_No_Boot-Sig11-title-1.xml b/en-US/Trouble_No_Boot-Sig11-title-1.xml
index f842d25..2da5d3b 100644
--- a/en-US/Trouble_No_Boot-Sig11-title-1.xml
+++ b/en-US/Trouble_No_Boot-Sig11-title-1.xml
@@ -5,4 +5,5 @@
 
 ]>
 
-<title>Is Your System Displaying Signal 11 Errors?</title>
\ No newline at end of file
+<title>Is Your System Displaying Signal 11 Errors?</title>
+
diff --git a/en-US/Trouble_No_Boot-indexterm-1.xml b/en-US/Trouble_No_Boot-indexterm-1.xml
index 263968d..3ff1644 100644
--- a/en-US/Trouble_No_Boot-indexterm-1.xml
+++ b/en-US/Trouble_No_Boot-indexterm-1.xml
@@ -8,4 +8,5 @@
 <indexterm significance="normal">
 	<primary>troubleshooting</primary>
 	<secondary>booting</secondary>
-</indexterm>
\ No newline at end of file
+</indexterm>
+
diff --git a/en-US/Trouble_No_Boot-title-1.xml b/en-US/Trouble_No_Boot-title-1.xml
index 9ae7290..e53dc87 100644
--- a/en-US/Trouble_No_Boot-title-1.xml
+++ b/en-US/Trouble_No_Boot-title-1.xml
@@ -2,4 +2,5 @@
 <!DOCTYPE title PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
 ]>
 
-<title>You are unable to boot Fedora</title>
\ No newline at end of file
+<title>You are unable to boot Fedora</title>
+
diff --git a/en-US/Trouble_Updating_common-partitions-title.xml b/en-US/Trouble_Updating_common-partitions-title.xml
new file mode 100644
index 0000000..57aa4bc
--- /dev/null
+++ b/en-US/Trouble_Updating_common-partitions-title.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<!DOCTYPE title PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+	  
+	  
+	  
+	  ]>
+
+<title>Trouble with Partition Tables</title>
+
diff --git a/en-US/Trouble_common-indexterm-1.xml b/en-US/Trouble_common-indexterm-1.xml
index 9516ad6..f72847e 100644
--- a/en-US/Trouble_common-indexterm-1.xml
+++ b/en-US/Trouble_common-indexterm-1.xml
@@ -5,3 +5,4 @@
 <indexterm significance="normal">
 	<primary>troubleshooting</primary>
 </indexterm>
+
diff --git a/en-US/Trouble_common-indexterm-2.xml b/en-US/Trouble_common-indexterm-2.xml
index 5136dec..dc3be62 100644
--- a/en-US/Trouble_common-indexterm-2.xml
+++ b/en-US/Trouble_common-indexterm-2.xml
@@ -5,3 +5,4 @@
 <indexterm significance="normal">
 	<primary>log files</primary>
 </indexterm>
+
diff --git a/en-US/Trouble_common-indexterm-3.xml b/en-US/Trouble_common-indexterm-3.xml
index 456a9fe..32073eb 100644
--- a/en-US/Trouble_common-indexterm-3.xml
+++ b/en-US/Trouble_common-indexterm-3.xml
@@ -5,3 +5,4 @@
 <indexterm significance="normal">
 	<primary>anaconda.log</primary>
 </indexterm>
+
diff --git a/en-US/Trouble_common-indexterm-4.xml b/en-US/Trouble_common-indexterm-4.xml
index ad4c14b..a3f1377 100644
--- a/en-US/Trouble_common-indexterm-4.xml
+++ b/en-US/Trouble_common-indexterm-4.xml
@@ -5,3 +5,4 @@
 <indexterm significance="normal">
 	<primary>program.log</primary>
 </indexterm>
+
diff --git a/en-US/Trouble_common-indexterm-5.xml b/en-US/Trouble_common-indexterm-5.xml
index fe17b3a..70bd339 100644
--- a/en-US/Trouble_common-indexterm-5.xml
+++ b/en-US/Trouble_common-indexterm-5.xml
@@ -5,3 +5,4 @@
 <indexterm significance="normal">
 	<primary>storage.log</primary>
 </indexterm>
+
diff --git a/en-US/Trouble_common-indexterm-6.xml b/en-US/Trouble_common-indexterm-6.xml
index 3308023..24bbfc8 100644
--- a/en-US/Trouble_common-indexterm-6.xml
+++ b/en-US/Trouble_common-indexterm-6.xml
@@ -5,3 +5,4 @@
 <indexterm significance="normal">
 	<primary>yum.log</primary>
 </indexterm>
+
diff --git a/en-US/Trouble_common-indexterm-7.xml b/en-US/Trouble_common-indexterm-7.xml
index 0deff66..ae330e3 100644
--- a/en-US/Trouble_common-indexterm-7.xml
+++ b/en-US/Trouble_common-indexterm-7.xml
@@ -5,3 +5,4 @@
 <indexterm significance="normal">
 	<primary>syslog</primary>
 </indexterm>
+
diff --git a/en-US/Trouble_common-indexterm-8.xml b/en-US/Trouble_common-indexterm-8.xml
index dd4a3cc..da9dcf8 100644
--- a/en-US/Trouble_common-indexterm-8.xml
+++ b/en-US/Trouble_common-indexterm-8.xml
@@ -5,3 +5,4 @@
 <indexterm significance="normal">
 	<primary>anacdump.txt</primary>
 </indexterm>
+
diff --git a/en-US/Trouble_common-para-1.xml b/en-US/Trouble_common-para-1.xml
index 3d954f8..7cdbd8a 100644
--- a/en-US/Trouble_common-para-1.xml
+++ b/en-US/Trouble_common-para-1.xml
@@ -6,3 +6,4 @@
 	This section discusses some common installation problems and their solutions.
 </para>
 
+
diff --git a/en-US/Trouble_common-para-2.xml b/en-US/Trouble_common-para-2.xml
index b930092..3e1c79a 100644
--- a/en-US/Trouble_common-para-2.xml
+++ b/en-US/Trouble_common-para-2.xml
@@ -6,3 +6,4 @@
 	For debugging purposes, <application>anaconda</application> logs installation actions into files in the <filename>/tmp</filename> directory. These files include:
 </para>
 
+
diff --git a/en-US/Trouble_common-para-3.xml b/en-US/Trouble_common-para-3.xml
index 9557098..c6a864a 100644
--- a/en-US/Trouble_common-para-3.xml
+++ b/en-US/Trouble_common-para-3.xml
@@ -5,3 +5,4 @@
 <para>
 	If the installation fails, the messages from these files are consolidated into <filename>/tmp/anacdump.txt</filename>.
 </para>
+
diff --git a/en-US/Trouble_common-para-4.xml b/en-US/Trouble_common-para-4.xml
new file mode 100644
index 0000000..b6d228d
--- /dev/null
+++ b/en-US/Trouble_common-para-4.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+]>
+
+<para>
+	All of the files above reside in the installer's ramdisk and are thus volatile. To make a permanent copy, copy those files to another system on the network using <command>scp</command> on the installation image (not the other way round).
+</para>
+
diff --git a/en-US/Trouble_common-variablelist-1.xml b/en-US/Trouble_common-variablelist-1.xml
deleted file mode 100644
index 5e603c7..0000000
--- a/en-US/Trouble_common-variablelist-1.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE variablelist PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
-]>
-
-<variablelist>
-	<varlistentry>
-		<term><filename>/tmp/anaconda.log</filename></term>
-		<listitem>
-			<para>
-				general <application>anaconda</application> messages
-			</para>
-		</listitem>
-	</varlistentry>
-	<varlistentry>
-		<term><filename>/tmp/program.log</filename></term>
-		<listitem>
-			<para>
-				all external programs run by <application>anaconda</application>
-			</para>
-		</listitem>
-	</varlistentry>
-	<varlistentry>
-		<term><filename>/tmp/storage.log</filename></term>
-		<listitem>
-			<para>
-				extensive storage module information
-			</para>
-		</listitem>
-	</varlistentry>
-	<varlistentry>
-		<term><filename>/tmp/yum.log</filename></term>
-		<listitem>
-			<para>
-				<application>yum</application> package installation messages
-			</para>
-		</listitem>
-	</varlistentry>
-	<varlistentry>
-		<term><filename>/tmp/syslog</filename></term>
-		<listitem>
-			<para>
-				hardware-related system messages
-			</para>
-		</listitem>
-	</varlistentry>
-</variablelist>
diff --git a/en-US/Trouble_common-varlistentry-1.xml b/en-US/Trouble_common-varlistentry-1.xml
new file mode 100644
index 0000000..f9053b1
--- /dev/null
+++ b/en-US/Trouble_common-varlistentry-1.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<!DOCTYPE varlistentry PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+]>
+
+	<varlistentry>
+		<term><filename>/tmp/anaconda.log</filename></term>
+		<listitem>
+			<para>
+				general <application>anaconda</application> messages
+			</para>
+		</listitem>
+	</varlistentry>
diff --git a/en-US/Trouble_common-varlistentry-2.xml b/en-US/Trouble_common-varlistentry-2.xml
new file mode 100644
index 0000000..81a571a
--- /dev/null
+++ b/en-US/Trouble_common-varlistentry-2.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<!DOCTYPE varlistentry PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+]>
+
+
+	<varlistentry>
+		<term><filename>/tmp/program.log</filename></term>
+		<listitem>
+			<para>
+				all external programs run by <application>anaconda</application>
+			</para>
+		</listitem>
+	</varlistentry>
diff --git a/en-US/Trouble_common-varlistentry-3.xml b/en-US/Trouble_common-varlistentry-3.xml
new file mode 100644
index 0000000..aebe4a6
--- /dev/null
+++ b/en-US/Trouble_common-varlistentry-3.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<!DOCTYPE varlistentry PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+]>
+
+
+
+	<varlistentry>
+		<term><filename>/tmp/storage.log</filename></term>
+		<listitem>
+			<para>
+				extensive storage module information
+			</para>
+		</listitem>
+	</varlistentry>
+
diff --git a/en-US/Trouble_common-varlistentry-4.xml b/en-US/Trouble_common-varlistentry-4.xml
new file mode 100644
index 0000000..00da1bb
--- /dev/null
+++ b/en-US/Trouble_common-varlistentry-4.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+<!DOCTYPE varlistentry PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+]>
+
+
+
+
+	<varlistentry>
+		<term><filename>/tmp/yum.log</filename></term>
+		<listitem>
+			<para>
+				<application>yum</application> package installation messages
+			</para>
+		</listitem>
+	</varlistentry>
+
+
diff --git a/en-US/Trouble_common-varlistentry-5.xml b/en-US/Trouble_common-varlistentry-5.xml
new file mode 100644
index 0000000..42a2bfe
--- /dev/null
+++ b/en-US/Trouble_common-varlistentry-5.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+<!DOCTYPE varlistentry PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+]>
+
+
+
+
+
+	<varlistentry>
+		<term><filename>/tmp/syslog</filename></term>
+		<listitem>
+			<para>
+				hardware-related system messages
+			</para>
+		</listitem>
+	</varlistentry>
+
+
+
diff --git a/en-US/Understanding_LVM.xml b/en-US/Understanding_LVM.xml
index 788aaa8..f9dff40 100644
--- a/en-US/Understanding_LVM.xml
+++ b/en-US/Understanding_LVM.xml
@@ -35,10 +35,13 @@
     <note>
       <title>The <filename>/boot</filename> Partition and LVM</title>
       <para>
-	The boot loader cannot read LVM volumes.  You must make a
+	On most architectures, the boot loader cannot read LVM volumes.  You must make a
 	standard, non-LVM disk partition for your <filename
 	  class="partition">/boot</filename> partition.
       </para>
+      <para>
+	      However, on System&nbsp;z, the <application>zipl</application> boot loader supports <filename>/boot</filename> on LVM logical volumes with linear mapping.
+      </para>
     </note>
 
     <para>To understand LVM better, imagine the physical volume as a
@@ -75,3 +78,4 @@
       </para>
     </note>
   </appendix>
+
diff --git a/en-US/Upgrade-x86.xml b/en-US/Upgrade-x86.xml
index a7dc2bc..73efd57 100644
--- a/en-US/Upgrade-x86.xml
+++ b/en-US/Upgrade-x86.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0"?>
 <!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
-
 ]>
 
 <chapter id="ch-upgrade-x86">
@@ -46,5 +45,9 @@
 			--><xref linkend="ch-guimode-x86"/><!--, <xref linkend="ch-guimode-ppc"/>, or <xref linkend="ch-guimode-s390"/>--> for further instructions.
 		</para>
 		
+		<!-- <para>
+			To perform a new installation of Red Hat Enterprise Linux on your system, select <guilabel>Perform a new Red Hat Enterprise Linux installation</guilabel> and refer to <xref linkend="ch-guimode-x86"/>, <xref linkend="ch-guimode-ppc"/>, or <xref linkend="ch-guimode-s390"/> for further instructions.
+		</para> -->
 	</section>
-</chapter> 
\ No newline at end of file
+</chapter> 
+
diff --git a/en-US/Upgrade_common-para-1.xml b/en-US/Upgrade_common-para-1.xml
index 6222078..631488e 100644
--- a/en-US/Upgrade_common-para-1.xml
+++ b/en-US/Upgrade_common-para-1.xml
@@ -4,4 +4,5 @@
 
 <para>
 	This chapter explains the various methods available for upgrading your Fedora system.
-</para>
\ No newline at end of file
+</para>
+
diff --git a/en-US/Upgrade_common-section-2-para-1.xml b/en-US/Upgrade_common-section-2-para-1.xml
index eeb40af..5cc726b 100644
--- a/en-US/Upgrade_common-section-2-para-1.xml
+++ b/en-US/Upgrade_common-section-2-para-1.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0"?>
 <!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
-
-
-
 ]>
 
 <para>
 	The <guilabel>Upgrade Examine</guilabel> screen appears if you have instructed the installation program to perform an upgrade.
-</para>
\ No newline at end of file
+</para>
+
diff --git a/en-US/Upgrade_common-section-2-para-2.xml b/en-US/Upgrade_common-section-2-para-2.xml
index 0dffe01..a851bd1 100644
--- a/en-US/Upgrade_common-section-2-para-2.xml
+++ b/en-US/Upgrade_common-section-2-para-2.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
-
 ]>
 
 <para>
 	To perform an upgrade, select <guilabel>Perform an upgrade of an existing installation</guilabel>. Click <guibutton>Next</guibutton> when you are ready to begin your upgrade.
-</para>
\ No newline at end of file
+</para>
+
diff --git a/en-US/Upgrade_common-section-2-title.xml b/en-US/Upgrade_common-section-2-title.xml
index a2f6c48..926a9e4 100644
--- a/en-US/Upgrade_common-section-2-title.xml
+++ b/en-US/Upgrade_common-section-2-title.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE title PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
-
-
-
 ]>
 
-<title>Upgrading Your System</title>
\ No newline at end of file
+<title>Upgrading Your System</title>
+
diff --git a/en-US/Upgrade_common-title-1.xml b/en-US/Upgrade_common-title-1.xml
index dfd813e..f6d9e7b 100644
--- a/en-US/Upgrade_common-title-1.xml
+++ b/en-US/Upgrade_common-title-1.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE title PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
-
-
-
 ]>
 
-<title>Upgrading Your Current System</title>
\ No newline at end of file
+<title>Upgrading Your Current System</title>
+
diff --git a/en-US/Upgrading-common-note-1.xml b/en-US/Upgrading-common-note-1.xml
index 1e03a5e..1fa973e 100644
--- a/en-US/Upgrading-common-note-1.xml
+++ b/en-US/Upgrading-common-note-1.xml
@@ -6,6 +6,6 @@
 <note>
 	<title>Manually Installed Software</title>
 	<para>
-		Software you have installed manually on your existing Fedora or Red Hat Linux system may behave differently after an upgrade.  You may need to manually reinstall or recompile this software after an upgrade to ensure it performs correctly on the updated system.
+		Software you have installed manually on your existing Fedora system may behave differently after an upgrade.  You may need to manually reinstall or recompile this software after an upgrade to ensure it performs correctly on the updated system.
 	</para>
 </note>
diff --git a/en-US/Upgrading-common-note-2.xml b/en-US/Upgrading-common-note-2.xml
index ad90b5e..ed22c2d 100644
--- a/en-US/Upgrading-common-note-2.xml
+++ b/en-US/Upgrading-common-note-2.xml
@@ -6,7 +6,7 @@
 <note>
 	<title>Installations are Recommended</title>
 	<para>
-		In general, the Fedora Project recommends that you keep user data on a separate <filename class="partition">/home</filename> partition and perform a fresh installation.  For more information on partitions and how to set them up, refer to <xref linkend="s1-diskpartsetup-x86"/>.
+		In general, Red Hat recommends that you keep user data on a separate <filename class="partition">/home</filename> partition and perform a fresh installation.  For more information on partitions and how to set them up, refer to <xref linkend="s1-diskpartsetup-x86"/>.
 	</para>
 </note>
 
diff --git a/en-US/Upgrading-common-para-1.xml b/en-US/Upgrading-common-para-1.xml
index 6ae74c3..a916706 100644
--- a/en-US/Upgrading-common-para-1.xml
+++ b/en-US/Upgrading-common-para-1.xml
@@ -4,6 +4,6 @@
 ]>
 
 <para>
-	The installation system automatically detects any existing installation of Red Hat Enterprise Linux.  The upgrade process updates the existing system software with new versions, but does not remove any data from users' home directories.  The existing partition structure on your hard drives does not change.  Your system configuration changes only if a package upgrade demands it.  Most package upgrades do not change system configuration, but rather install an additional configuration file for you to examine later.
+	The installation system automatically detects any existing installation of Fedora.  The upgrade process updates the existing system software with new versions, but does not remove any data from users' home directories.  The existing partition structure on your hard drives does not change.  Your system configuration changes only if a package upgrade demands it.  Most package upgrades do not change system configuration, but rather install an additional configuration file for you to examine later.
 </para>
 
diff --git a/en-US/Upgrading-common-para-2.xml b/en-US/Upgrading-common-para-2.xml
index 1987193..2a8f82d 100644
--- a/en-US/Upgrading-common-para-2.xml
+++ b/en-US/Upgrading-common-para-2.xml
@@ -4,5 +4,5 @@
 ]>
 
 <para>
-	Note that the installation medium that you are using might not contain all the software packages that you need to upgrade your computer. In particular, the Fedora live CD contains a relatively small subset of the packages available in Fedora. To update packages that are not included on the installation medium, make sure that you select the <literal>Fedora &PRODVER; - <replaceable>architecture</replaceable></literal> or the <literal>Fedora &PRODVER; - <replaceable>architecture</replaceable> - Updates</literal> repository the during package group selection &mdash; refer to <xref linkend="sn-additional-repos"/>.
+	Note that the installation medium that you are using might not contain all the software packages that you need to upgrade your computer. <!-- In particular, the Fedora live CD contains a relatively small subset of the packages available in Fedora. To update packages that are not included on the installation medium, make sure that you select the <literal>Fedora &PRODVER; - <replaceable>architecture</replaceable></literal> or the <literal>Fedora &PRODVER; - <replaceable>architecture</replaceable> - Updates</literal> repository the during package group selection &mdash; refer to <xref linkend="sn-additional-repos"/>. -->
 </para>
diff --git a/en-US/Upgrading-common-para-3.xml b/en-US/Upgrading-common-para-3.xml
index 650487d..f5a2e0f 100644
--- a/en-US/Upgrading-common-para-3.xml
+++ b/en-US/Upgrading-common-para-3.xml
@@ -4,6 +4,6 @@
 ]>
 
 <para>
-      If your system contains a Fedora or Red Hat Linux installation, a dialog appears asking whether you want to upgrade that installation. To perform an upgrade of an existing system, choose the appropriate installation from the drop-down list and select <guibutton>Next</guibutton>.  
+      If your system contains a Fedora installation, a dialog appears asking whether you want to upgrade that installation. To perform an upgrade of an existing system, choose the appropriate installation from the drop-down list and select <guibutton>Next</guibutton>.  
 </para>
 
diff --git a/en-US/Upgrading-common-para-4.xml b/en-US/Upgrading-common-para-4.xml
index bd350bb..e708733 100644
--- a/en-US/Upgrading-common-para-4.xml
+++ b/en-US/Upgrading-common-para-4.xml
@@ -4,6 +4,6 @@
 ]>
 
 <para>
-	If you choose to upgrade your system using the installation program, any software that is not part of the Fedora distribution that conflicts with software that is part of the distribution is overwritten.  Before you begin an upgrade this way, make a list of your system's current packages for later reference:
+	If you choose to upgrade your system using the installation program, any software not provided by Fedora that conflicts with Fedora software is overwritten.  Before you begin an upgrade this way, make a list of your system's current packages for later reference:
 </para>
 
diff --git a/en-US/Upgrading-common-para-5.xml b/en-US/Upgrading-common-para-5.xml
index 9fec8a5..2856618 100644
--- a/en-US/Upgrading-common-para-5.xml
+++ b/en-US/Upgrading-common-para-5.xml
@@ -4,6 +4,6 @@
 ]>
 
 <para>
-	After installation, consult this list to discover which packages you may need to rebuild or retrieve from sources other than the Fedora repositories.
+	After installation, consult this list to discover which packages you may need to rebuild or retrieve from sources other than Red Hat.
 </para>
 
diff --git a/en-US/Upgrading-common-para-9.xml b/en-US/Upgrading-common-para-9.xml
index ccdf7a9..e9e25f4 100644
--- a/en-US/Upgrading-common-para-9.xml
+++ b/en-US/Upgrading-common-para-9.xml
@@ -4,7 +4,7 @@
 ]>
 
 <para>
-	If the existing boot loader was installed by a Linux distribution, the installation system can modify it to load the new Fedora system. To update the existing Linux boot loader, select <guilabel>Update boot loader configuration</guilabel>.  This is the default behavior when you upgrade an existing Red Hat Linux or Fedora installation.
+	If the existing boot loader was installed by a Linux distribution, the installation system can modify it to load the new Fedora system. To update the existing Linux boot loader, select <guilabel>Update boot loader configuration</guilabel>.  This is the default behavior when you upgrade an existing Fedora installation.
 </para>
     
     
diff --git a/en-US/Upgrading-x86.xml b/en-US/Upgrading-x86.xml
new file mode 100644
index 0000000..4971eb5
--- /dev/null
+++ b/en-US/Upgrading-x86.xml
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+ "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+]>
+
+
+
+<section id="sn-upgrading-system-x86">
+
+	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Upgrading-common-title-1.xml"/>
+	<!-- Upgrading an existing system -->
+
+ 	<note>
+		<title>Preupgrade</title>
+		<para>
+			Fedora includes <application>preupgrade</application>, a command-line tool that allows you to upgrade easily to a new version from within your existing Fedora installation. 
+		</para>
+	</note> 
+	
+	<!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Upgrade_important-1.xml"/> -->
+	<!-- Upgrades not supported -->
+
+	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Upgrading-common-para-1.xml"/>
+	<!-- The installation system automatically detects any existing installation of Fedora. -->
+	
+	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Upgrading-common-para-2.xml"/>
+	<!-- Note that the installation medium that you are using might not contain all the software packages that you need to upgrade your computer. -->
+
+	<section id="sn-upgrade-examine-x86">
+	
+		<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Upgrading-common-title-2.xml"/>
+		<!-- The Upgrade Dialog -->
+		
+		<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Upgrading-common-para-3.xml"/>
+		<!-- If your system contains a Fedora installation... -->
+		
+		<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Upgrading-common-figure-1.xml"/>
+		<!-- The Upgrade Dialog -->
+		
+		<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Upgrading-common-note-1.xml"/>
+		<!-- Manually Installed Software -->
+
+	</section>
+
+	<section id="sn-upgrade-tree-x86">
+	
+		<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Upgrading-common-title-3.xml"/>
+		<!-- Upgrading Using the Installer -->
+		
+		<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Upgrading-common-note-2.xml"/>
+		<!-- Installations are Recommended -->
+		
+		<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Upgrading-common-para-4.xml"/>
+		<!-- If you choose to upgrade your system using the installation program... -->
+		
+<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Upgrading-common-screen-1.xml"/>
+
+		<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Upgrading-common-para-5.xml"/>
+		<!-- After installation, consult this list to discover which packages you may need to rebuild or retrieve... -->
+		
+		<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Upgrading-common-para-6.xml"/>
+		<!-- Next, make a backup of any system configuration data: -->
+
+<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Upgrading-common-screen-2.xml"/>
+
+		<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Upgrading-common-para-7.xml"/>
+		<!-- Make a complete backup of any important data before performing an upgrade. -->
+		
+		<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Upgrading-common-warning-1.xml"/>
+		<!-- Storing Backups -->
+
+		<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Upgrading-common-para-8.xml"/>
+		<!-- For more information on completing the upgrade process later... -->
+	</section>
+
+	<section id="sn-upgrading-bootloader-x86">
+	
+		<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Upgrading-common-title-4.xml"/>
+		<!-- Upgrading Boot Loader Configuration -->
+		
+		<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Upgrading-common-indexterm-1.xml"/>
+		
+		<indexterm>
+			<primary>boot loader</primary>
+			<seealso>GRUB</seealso>
+		</indexterm>
+		
+		<para>
+			Your completed Fedora installation must be registered in the <firstterm>boot loader</firstterm> to boot properly. A boot loader is software on your machine that locates and starts the operating system.  Refer to <xref linkend="ch-grub" /> for more information about boot loaders.
+		</para>
+		
+		<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Upgrading-common-figure-2.xml"/>
+		<!-- The Update Boot Loader Dialog -->
+		
+		<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Upgrading-common-para-9.xml"/>
+		<!-- If the existing boot loader was installed by a Linux distribution... -->
+		
+		<para>
+			<firstterm>GRUB</firstterm> is the standard boot loader for Fedora on 32-bit and 64-bit x86 architectures. If your machine uses another boot loader, such as BootMagic, System Commander, or the loader installed by Microsoft Windows, then the Fedora installation system cannot update it. In this case, select <guilabel>Skip boot loader updating</guilabel>.  When the installation process completes, refer to the documentation for your product for assistance.
+		</para>
+
+		<para>
+			Install a new boot loader as part of an upgrade process only if you are certain you want to replace the existing boot loader. If you install a new boot loader, you may not be able to boot other operating systems on the same machine until you have configured the new boot loader. Select <guilabel>Create new boot loader configuration</guilabel> to remove the existing boot loader and install GRUB.
+		</para>
+
+		<para>
+			After you make your selection, click <guibutton>Next</guibutton> to continue. If you selected the <guilabel>Create new boot loader configuration</guilabel> option, refer to <xref linkend="s1-x86-bootloader"/>. If you chose to update or skip boot loader configuration, installation continues without further input from you. 
+		</para>
+
+	</section>
+
+</section>
+
+
diff --git a/en-US/Verifying_Media.xml b/en-US/Verifying_Media.xml
index c388669..56f6cf6 100644
--- a/en-US/Verifying_Media.xml
+++ b/en-US/Verifying_Media.xml
@@ -5,7 +5,7 @@
 <section>
 	<title>Verifying Media</title>
 	<para>
-		The DVD offers an option to verify the integrity of the media.  Recording errors sometimes occur while producing CD or DVD media.  An error in the data for package chosen in the installation program can cause the installation to abort.  To minimize the chances of data errors affecting the installation, verify the media before installing.
+		The DVD offers an option to verify the integrity of the media.  Recording errors sometimes occur while producing DVD media.  An error in the data for package chosen in the installation program can cause the installation to abort.  To minimize the chances of data errors affecting the installation, verify the media before installing.
 	</para>
 	<para>
 		If the verification succeeds, the installation process proceeds normally.  If the process fails, create a new DVD using the ISO image you downloaded earlier.
diff --git a/en-US/Welcome-x86.xml b/en-US/Welcome-x86.xml
index b476b14..22171a1 100644
--- a/en-US/Welcome-x86.xml
+++ b/en-US/Welcome-x86.xml
@@ -20,3 +20,4 @@
 		Click on the <guibutton>Next</guibutton> button to continue.
 	</para>
 </section>
+
diff --git a/en-US/Write_changes_to_disk.xml b/en-US/Write_changes_to_disk.xml
deleted file mode 100644
index 2a6a071..0000000
--- a/en-US/Write_changes_to_disk.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version='1.0'?>
-<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docarticle/xml/4.5/docarticlex.dtd" [
-]>
-
-<section id="Write_changes_to_disk">
-	<title>Write changes to disk</title>
-	<para>
-		The installer prompts you to confirm the partitioning options that you selected. Click <guibutton>Write changes to disk</guibutton> to allow the installer to partition your hard drive and install Fedora.
-	</para>
-	<figure float="0" id="fig-Writing_storage_configuration_to_disk"><title>Writing storage configuration to disk</title>
-		<mediaobject>
-			<imageobject><imagedata fileref="images/diskpartitioning/write_changes.png" format="PNG"/></imageobject>
-			<textobject><para>
-					The <guilabel>Writing storage configuration to disk</guilabel> dialog box lets you choose to <guibutton>Write changes to disk</guibutton> or to <guibutton>Go back</guibutton>.
-				</para>
-			</textobject>
-		</mediaobject>
-	</figure>
-	<para>
-		If you are certain that you want to proceed, click <guibutton>Write changes to disk</guibutton>.
-	</para>
-	<warning>
-		<title>Last chance to cancel safely</title>
-		<para>
-			Up to this point in the installation process, the installer has made no lasting changes to your computer. When you click <guibutton>Write changes to disk</guibutton>, the installer will allocate space on your hard drive and start to transfer Fedora into this space. Depending on the partitioning option that you chose, this process might include erasing data that already exists on your computer. 
-		</para>
-		<para>
-			To revise any of the choices that you made up to this point, click <guibutton>Go back</guibutton>. To cancel installation completely, switch off your computer. To switch off most computers at this stage, press the power button and hold it down for a few seconds.
-		</para>
-		<para>
-			After you click <guibutton>Write changes to disk</guibutton>, allow the installation process to complete. If the process is interrupted (for example, by you switching off or resetting the computer, or by a power outage) you will probably not be able to use your computer until you restart and complete the Fedora installation process, or install a different operating system.
-		</para>
-	</warning>
-</section>
\ No newline at end of file
diff --git a/en-US/Write_changes_to_disk_common-figure-1.xml b/en-US/Write_changes_to_disk_common-figure-1.xml
new file mode 100644
index 0000000..e4d452a
--- /dev/null
+++ b/en-US/Write_changes_to_disk_common-figure-1.xml
@@ -0,0 +1,15 @@
+<?xml version='1.0'?>
+<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docarticle/xml/4.5/docarticlex.dtd" [
+]>
+
+<figure float="0">
+<title>Writing storage configuration to disk</title>
+	<mediaobject>
+		<imageobject><imagedata fileref="images/diskpartitioning/write_changes.png" format="PNG"/></imageobject>
+		<textobject><para>
+				The <guilabel>Writing storage configuration to disk</guilabel> dialog box lets you choose to <guibutton>Write changes to disk</guibutton> or to <guibutton>Go back</guibutton>.
+			</para>
+		</textobject>
+	</mediaobject>
+</figure>
+
diff --git a/en-US/Write_changes_to_disk_common-para-1.xml b/en-US/Write_changes_to_disk_common-para-1.xml
new file mode 100644
index 0000000..215c1a5
--- /dev/null
+++ b/en-US/Write_changes_to_disk_common-para-1.xml
@@ -0,0 +1,8 @@
+<?xml version='1.0'?>
+<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docarticle/xml/4.5/docarticlex.dtd" [
+]>
+
+<para>
+	The installer prompts you to confirm the partitioning options that you selected. Click <guibutton>Write changes to disk</guibutton> to allow the installer to partition your hard drive and install Fedora.
+</para>
+
diff --git a/en-US/Write_changes_to_disk_common-para-2.xml b/en-US/Write_changes_to_disk_common-para-2.xml
new file mode 100644
index 0000000..e1f08cd
--- /dev/null
+++ b/en-US/Write_changes_to_disk_common-para-2.xml
@@ -0,0 +1,8 @@
+<?xml version='1.0'?>
+<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docarticle/xml/4.5/docarticlex.dtd" [
+]>
+
+<para>
+	If you are certain that you want to proceed, click <guibutton>Write changes to disk</guibutton>.
+</para>
+
diff --git a/en-US/Write_changes_to_disk_common-para-3.xml b/en-US/Write_changes_to_disk_common-para-3.xml
new file mode 100644
index 0000000..8deb88f
--- /dev/null
+++ b/en-US/Write_changes_to_disk_common-para-3.xml
@@ -0,0 +1,8 @@
+<?xml version='1.0'?>
+<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docarticle/xml/4.5/docarticlex.dtd" [
+]>
+
+<para>
+	Up to this point in the installation process, the installer has made no lasting changes to your computer. When you click <guibutton>Write changes to disk</guibutton>, the installer will allocate space on your hard drive and start to transfer Fedora into this space. Depending on the partitioning option that you chose, this process might include erasing data that already exists on your computer. 
+</para>
+
diff --git a/en-US/Write_changes_to_disk_common-para-5.xml b/en-US/Write_changes_to_disk_common-para-5.xml
new file mode 100644
index 0000000..6bd7d17
--- /dev/null
+++ b/en-US/Write_changes_to_disk_common-para-5.xml
@@ -0,0 +1,8 @@
+<?xml version='1.0'?>
+<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docarticle/xml/4.5/docarticlex.dtd" [
+]>
+
+<para>
+	After you click <guibutton>Write changes to disk</guibutton>, allow the installation process to complete. If the process is interrupted (for example, by you switching off or resetting the computer, or by a power outage) you will probably not be able to use your computer until you restart and complete the Fedora installation process, or install a different operating system.
+</para>
+
diff --git a/en-US/Write_changes_to_disk_common-title-1.xml b/en-US/Write_changes_to_disk_common-title-1.xml
new file mode 100644
index 0000000..547d72b
--- /dev/null
+++ b/en-US/Write_changes_to_disk_common-title-1.xml
@@ -0,0 +1,6 @@
+<?xml version='1.0'?>
+<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docarticle/xml/4.5/docarticlex.dtd" [
+]>
+
+<title>Write changes to disk</title>
+
diff --git a/en-US/Write_changes_to_disk_common-title-2.xml b/en-US/Write_changes_to_disk_common-title-2.xml
new file mode 100644
index 0000000..ed831cd
--- /dev/null
+++ b/en-US/Write_changes_to_disk_common-title-2.xml
@@ -0,0 +1,6 @@
+<?xml version='1.0'?>
+<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docarticle/xml/4.5/docarticlex.dtd" [
+]>
+
+<title>Last chance to cancel safely</title>
+
diff --git a/en-US/Write_changes_to_disk_x86-para-4.xml b/en-US/Write_changes_to_disk_x86-para-4.xml
new file mode 100644
index 0000000..9b7f4bb
--- /dev/null
+++ b/en-US/Write_changes_to_disk_x86-para-4.xml
@@ -0,0 +1,8 @@
+<?xml version='1.0'?>
+<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docarticle/xml/4.5/docarticlex.dtd" [
+]>
+
+<para>
+	To revise any of the choices that you made up to this point, click <guibutton>Go back</guibutton>. To cancel installation completely, switch off your computer. To switch off most computers at this stage, press the power button and hold it down for a few seconds.
+</para>
+
diff --git a/en-US/Write_changes_to_disk_x86.xml b/en-US/Write_changes_to_disk_x86.xml
new file mode 100644
index 0000000..e46fd4b
--- /dev/null
+++ b/en-US/Write_changes_to_disk_x86.xml
@@ -0,0 +1,32 @@
+<?xml version='1.0'?>
+<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docarticle/xml/4.5/docarticlex.dtd" [
+]>
+
+<section id="Write_changes_to_disk-x86">
+	<xi:include href="Write_changes_to_disk_common-title-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+	<!-- Write changes to disk -->
+	
+	<xi:include href="Write_changes_to_disk_common-para-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+	<!-- The installer prompts you to confirm the partitioning options that you selected.-->
+	
+	<xi:include href="Write_changes_to_disk_common-figure-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+	<!-- Writing storage configuration to disk -->
+	
+	<xi:include href="Write_changes_to_disk_common-para-2.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+	<!-- If you are certain that you want to proceed, -->
+	
+	<warning>
+		<xi:include href="Write_changes_to_disk_common-title-2.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+		<!-- Last chance to cancel safely -->
+		
+		<xi:include href="Write_changes_to_disk_common-para-3.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+		<!-- Up to this point in the installation process, the installer has made no lasting changes -->
+		
+		<xi:include href="Write_changes_to_disk_x86-para-4.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+		<!-- To revise any of the choices that you made up to this point,  -->
+		
+		<xi:include href="Write_changes_to_disk_common-para-5.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+		<!-- After you click Write changes to disk -->
+	</warning>
+</section>
+
diff --git a/en-US/X86_Bios_Tip.xml b/en-US/X86_Bios_Tip.xml
index 6b61b19..5305191 100644
--- a/en-US/X86_Bios_Tip.xml
+++ b/en-US/X86_Bios_Tip.xml
@@ -17,3 +17,4 @@
 <ulink url="http://www.pcguide.com/ref/hdd/bios/sizeMB504-c.html">http://www.pcguide.com/ref/hdd/bios/sizeMB504-c.html</ulink>
 </screen>
 </note>
+
diff --git a/en-US/X86_Bootloader.xml b/en-US/X86_Bootloader.xml
index c10dd52..fd36030 100644
--- a/en-US/X86_Bootloader.xml
+++ b/en-US/X86_Bootloader.xml
@@ -3,7 +3,7 @@
 ]>
 
 <section id="s1-x86-bootloader">
-	<title>x86, AMD64, and <trademark class="registered">Intel</trademark> 64 Boot Loader Configuration</title>
+	<title>x86, AMD64, and Intel 64 Boot Loader Configuration</title>
 	<indexterm significance="normal">
 		<primary>boot loader</primary>
 	</indexterm>
@@ -40,8 +40,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 DOS or Windows, by loading another boot loader).
+		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><para><ulink url="http://www.gnu.org/software/grub/grub-legacy.en.html"/></para></footnote> 
 	</para>
 	
 	  <note>
@@ -187,7 +186,7 @@
 	</para>
 	 
 	<para>
-		If you are installing a boot loader, you should create a password to protect your system. Without a boot loader password, users with access to your system can pass options to the kernel which can compromise your system security. With a boot loader password in place, the password must first be entered before selecting any non-standard boot options. However, it is still possible for someone with physical access to the machine to boot from a diskette, CD-ROM, or USB media if the BIOS supports it. Security plans which include boot loader passwords should also address alternate boot methods.
+		If you are installing a boot loader, you should create a password to protect your system. Without a boot loader password, users with access to your system can pass options to the kernel which can compromise your system security. With a boot loader password in place, the password must first be entered before selecting any non-standard boot options. However, it is still possible for someone with physical access to the machine to boot from a diskette, CD-ROM, DVD, or USB media if the BIOS supports it. Security plans which include boot loader passwords should also address alternate boot methods.
 	</para>
 	<indexterm significance="normal">
 		<primary>boot loader password</primary>
@@ -255,9 +254,6 @@
 	<section id="x86-bootloader-adv">
 		<title>Advanced Boot Loader Configuration</title>
 		 
-		<para>
-			Now that you have chosen which boot loader to install, you can also determine where you want the boot loader to be installed. You may install the boot loader in one of two places:
-		</para>
 		<indexterm significance="normal">
 			<primary>boot loader</primary>
 			<secondary>MBR</secondary>
@@ -269,6 +265,14 @@
 		<indexterm significance="normal">
 			<primary>OS/2 boot manager</primary>
 		</indexterm>
+		<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Assign_Storage_Devices-common-important-indexterm-1.xml"/>
+		<!-- Chain loading -->
+		
+		<para>
+			Now that you have chosen which boot loader to install, you can also determine where you want the boot loader to be installed. You may install the boot loader in one of two places:
+		</para>
+		
+		
 		<itemizedlist>
 			<listitem>
 				<para>
@@ -343,14 +347,14 @@
 		<itemizedlist>
 			<listitem>
 				<para>
-					Boot an x86, AMD64, or <trademark class="registered">Intel</trademark> 64 system from any installation medium, such as CD, DVD, USB, or PXE, and type <userinput>linux rescue</userinput> at the installation boot prompt. <!-- (RHEL) Itanium users should type <userinput>elilo linux rescue</userinput> to enter rescue mode. --> Refer to <xref linkend="ap-rescuemode"/> for a more complete description of rescue mode.
+					Boot an x86, AMD64, or Intel 64 system from any installation medium, such as CD, DVD, USB, or PXE, and type <userinput>linux rescue</userinput> at the installation boot prompt. Refer to <xref linkend="ap-rescuemode"/> for a more complete description of rescue mode.
 				</para>
 			</listitem>
 		</itemizedlist>
 		 
-		<!-- Reference to RHEL Deployment Guide: <para>
-			For additional information, refer to the <citetitle>Red Hat Enterprise Linux Deployment Guide</citetitle>.
-		</para> -->
+		<para>
+			For additional information, refer to the <citetitle>Fedora Deployment Guide</citetitle>.
+		</para>
 	</section>
 	 
 	<section id="s2-x86-bootloader-alt">
@@ -451,15 +455,15 @@ Commercial boot loaders 	</term>				<listitem>
 					</para>
 				</listitem>
 			</varlistentry>
-		</variablelist>
+		</variablelist> -->
 		 
-		(RHEL) <note>
-			<title>Note</title>
+		<note>
+			<title>Important</title>
 
 			<para>
-				Boot loaders such as LOADLIN and System Commander are considered to be third-party boot loaders and are not supported by Red Hat.
+				Red Hat does not support third-party boot loaders.
 			</para>
-		</note> -->
+		</note>
 	</section>
 <!--	 
 	<section id="s2-x86-bootloader-smp">
@@ -495,16 +499,17 @@ Commercial boot loaders 	</term>				<listitem>
 			<title>Note</title>
 
 			<para>
-				An SMP kernel is installed by default on <trademark class="registered">Intel</trademark> <trademark class="registered">Pentium</trademark> 4 systems with hyperthreading.
+				An SMP kernel is installed by default on Intel <trademark class="registered">Pentium</trademark> 4 systems with hyperthreading.
 			</para>
 		</note>
 		 
 		<para>
-			The two GRUB entries are <computeroutput>Red Hat Enterprise Linux (<replaceable>kernel version</replaceable>)</computeroutput> and <computeroutput>Red Hat Enterprise Linux (<replaceable>kernel
-			version</replaceable>-smp)</computeroutput>. The <computeroutput>Red Hat Enterprise Linux (<replaceable>kernel version</replaceable>-smp)</computeroutput> boots by default. However, if you have trouble with the SMP kernel, you can elect
-			to boot the <computeroutput>Red Hat Enterprise Linux (<replaceable>kernel version</replaceable>)</computeroutput> entry instead. You retain all the functionality as before, but only operate with a single processor.
+			The two GRUB entries are <computeroutput>Fedora (<replaceable>kernel version</replaceable>)</computeroutput> and <computeroutput>Fedora (<replaceable>kernel
+			version</replaceable>-smp)</computeroutput>. The <computeroutput>Fedora (<replaceable>kernel version</replaceable>-smp)</computeroutput> boots by default. However, if you have trouble with the SMP kernel, you can elect
+			to boot the <computeroutput>Fedora (<replaceable>kernel version</replaceable>)</computeroutput> entry instead. You retain all the functionality as before, but only operate with a single processor.
 		</para>
 	
 		
 	</section> -->
 </section>
+
diff --git a/en-US/X86_Trouble_After_Grub.xml b/en-US/X86_Trouble_After_Grub.xml
index 0de7e0e..977f96f 100644
--- a/en-US/X86_Trouble_After_Grub.xml
+++ b/en-US/X86_Trouble_After_Grub.xml
@@ -37,3 +37,4 @@
 		You may re-enable the graphical boot screen by uncommenting (or adding) the above line back into the <filename>grub.conf</filename> file.
 	</para>
 </section>
+
diff --git a/en-US/adminoptions.xml b/en-US/adminoptions.xml
index 67db021..b847fca 100644
--- a/en-US/adminoptions.xml
+++ b/en-US/adminoptions.xml
@@ -18,7 +18,8 @@
     If you specify more than one option, separate each of the options by
     a single space. For example:
   </para>
-<screen><userinput>linux <replaceable>option1</replaceable> <replaceable>option2</replaceable> <replaceable>option3</replaceable></userinput>
+<screen>
+<userinput>linux <replaceable>option1</replaceable> <replaceable>option2</replaceable> <replaceable>option3</replaceable></userinput>
 </screen>
   <note>
     <title>Anaconda Boot Options</title>
@@ -99,7 +100,8 @@
         <userinput>gr</userinput> identify the Greek language and the
         Greek keyboard layout:
       </para>
-<screen><userinput>linux lang=<replaceable>el_GR</replaceable> keymap=<replaceable>gr</replaceable></userinput>
+<screen>
+<userinput>linux lang=<replaceable>el_GR</replaceable> keymap=<replaceable>gr</replaceable></userinput>
 </screen>
     </section>
 
@@ -107,14 +109,13 @@
       <title>Configuring the Interface</title>
 
       <para>
-        You may force the installation system to use the lowest possible
-        screen resolution (800x600) with the <option>lowres</option>
-        option. To use a specific display resolution, enter
+        To use a specific display resolution, enter
         <option>resolution=<replaceable>setting</replaceable></option>
         as a boot option. For example, to set the display resolution to
-        1024x768, enter:
+        1024Ã—768, enter:
       </para>
-<screen><userinput>linux resolution=<replaceable>1024x768</replaceable></userinput>
+<screen>
+<userinput>linux resolution=<replaceable>1024x768</replaceable></userinput>
 </screen>
       <para>
         To run the installation process in
@@ -123,7 +124,8 @@
         </indexterm>
         <option>text</option> mode, enter:
       </para>
-<screen><userinput>linux text</userinput>
+<screen>
+<userinput>linux text</userinput>
 </screen>
       <para>
         To enable support for a
@@ -152,10 +154,11 @@
 	<para>
 		The boot option
 	</para>
-<screen><userinput>linux updates</userinput>
+<screen>
+  <userinput>linux updates</userinput>
 </screen>
 	<para>
-		presents you with a prompt that asks you for a floppy disk containing <application>anaconda</application> updates. You do not need to specify this option if you are performing a network installation and have already placed the updates image contents in <filename>rhupdates/</filename> on the server.
+		presents you with a prompt that asks you for a disk image containing <application>anaconda</application> updates. You do not need to specify this option if you are performing a network installation and have already placed the updates image contents in <filename>rhupdates/</filename> on the server.
 	</para>
 	<para>
 		To load the <application>anaconda</application> updates from a network location instead, use:
@@ -199,7 +202,7 @@
 	  </thead>
 	  <tbody>
 	    <row>
-	      <entry>CD or DVD drive</entry>
+	      <entry>DVD drive</entry>
 	      <entry><option>repo=cdrom:<replaceable>device</replaceable></option></entry>
 	    </row>
 	    <row>
@@ -249,7 +252,8 @@
         system that uses the IP address
         <systemitem class="ipaddress">192.168.1.10</systemitem>:
       </para>
-<screen><userinput>linux ip=<replaceable>192.168.1.10</replaceable> netmask=<replaceable>255.255.255.0</replaceable> gateway=<replaceable>192.168.1.1</replaceable> dns=<replaceable>192.168.1.2,192.168.1.3</replaceable></userinput>
+<screen>
+<userinput>linux ip=<replaceable>192.168.1.10</replaceable> netmask=<replaceable>255.255.255.0</replaceable> gateway=<replaceable>192.168.1.1</replaceable> dns=<replaceable>192.168.1.2,192.168.1.3</replaceable></userinput>
 </screen>
       <!-- <note>
         <title>Configuring the Installed System</title>
@@ -266,17 +270,15 @@
   <section id="sn-remoteaccess-installation">
     <title>Enabling Remote Access to the Installation System</title>
 <!-- SE: Note that there is also a "display" option that redirects anaconda's X display to an X server on another system. -->
-    <para>
+    <indexterm>
+        <primary>VNC (Virtual Network Computing)</primary>
+      </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
-      <indexterm>
-        <primary>VNC (Virtual Network Computing)</primary>
-      </indexterm>
-      VNC (Virtual Network Computing) display protocol. A number of
-      providers offer VNC clients for Microsoft Windows and Mac OS, as
-      well as UNIX-based systems.
+      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>
@@ -310,7 +312,8 @@
         To enable remote graphical access to the installation system,
         enter two options at the prompt:
       </para>
-<screen><userinput>linux vnc vncpassword=<replaceable>qwerty</replaceable></userinput>
+<screen>
+<userinput>linux vnc vncpassword=<replaceable>qwerty</replaceable></userinput>
 </screen>
       <para>
         The <option>vnc</option> option enables the VNC service. The
@@ -368,7 +371,8 @@ Press &lt;enter&gt; for a shell</screen>
         <application>vncviewer</application> as a listener. In a
         terminal window, enter the command:
       </para>
-<screen><userinput>vncviewer -listen</userinput>
+<screen>
+ <userinput>vncviewer -listen</userinput>
 </screen>
       <note>
         <title>Firewall Reconfiguration Required</title>
@@ -408,7 +412,8 @@ Press &lt;enter&gt; for a shell</screen>
         <prompt>boot:</prompt>
         prompt:
       </para>
-<screen><userinput>linux vnc vncpassword=<replaceable>qwerty</replaceable> vncconnect=<replaceable>desktop.mydomain.com:5500</replaceable></userinput>
+<screen>
+<userinput>linux vnc vncpassword=<replaceable>qwerty</replaceable> vncconnect=<replaceable>desktop.mydomain.com:5500</replaceable></userinput>
 </screen>
     </section>
 
@@ -425,7 +430,8 @@ Press &lt;enter&gt; for a shell</screen>
         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>
+<userinput>linux text telnet</userinput>
 </screen>
       <para>
         You may then connect to the installation system with the
@@ -433,7 +439,8 @@ Press &lt;enter&gt; for a shell</screen>
         command requires the name or IP address of the installation
         system:
       </para>
-<screen><userinput>telnet computer.mydomain.com</userinput>
+<screen>
+<userinput>telnet computer.mydomain.com</userinput>
 </screen>
       <warning>
         <title>Telnet Access Requires No Password</title>
@@ -474,7 +481,8 @@ Press &lt;enter&gt; for a shell</screen>
       <prompt>boot:</prompt>
       prompt:
     </para>
-<screen><userinput>linux syslog=<replaceable>192.168.1.20:514</replaceable></userinput>
+<screen>
+<userinput>linux syslog=<replaceable>192.168.1.20:514</replaceable></userinput>
 </screen>
     <section id="sn-remote-logging-logserver">
       <title>Configuring a Log Server</title>
@@ -506,13 +514,14 @@ Press &lt;enter&gt; for a shell</screen>
         <systemitem class="username">root</systemitem> privileges to
         edit the file <filename>/etc/rsyslog.conf</filename>. Uncomment the
 	following lines by removing the hash preceding them:</para>
-<screen><computeroutput>$ModLoad imudp.so</computeroutput> 
-<computeroutput>$UDPServerRun 514</computeroutput></screen>
+<screen><computeroutput>$ModLoad imudp.so</computeroutput>
+	<computeroutput>$UDPServerRun 514</computeroutput></screen>
       <para>
         Restart the <command>rsyslog</command> service to apply the
         change:
       </para>
-<screen><userinput>su -c '/sbin/service rsyslog restart'</userinput>
+<screen>
+<userinput>su -c '/sbin/service rsyslog restart'</userinput>
 </screen>
       <para>
         Enter the <systemitem class="username">root</systemitem>
@@ -549,10 +558,10 @@ Press &lt;enter&gt; for a shell</screen>
 	<!-- Every installation produces a Kickstart file -->
 	
 	<xi:include href="Automating_installation-para-2.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> 
-	<!-- The Red Hat Enterprise Linux installation system automatically writes -->
+	<!-- The Fedora installation system automatically writes -->
       
     </note>
-	    <xi:include href="Important-Kickstart_and_Firstboot.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> 
+    <xi:include href="Important-Kickstart_and_Firstboot.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> 
     <para>
       Fedora includes a graphical application to create and modify
       Kickstart files by selecting the options that you require. Use the
@@ -574,7 +583,8 @@ Press &lt;enter&gt; for a shell</screen>
       the <option>ks</option> option to specify the name and location of
       the file:
     </para>
-<screen><userinput>linux ks=<replaceable>location/kickstart-file.cfg</replaceable></userinput>
+<screen>
+ <userinput>linux ks=<replaceable>location/kickstart-file.cfg</replaceable></userinput>
 </screen>
     <para>
       You may use Kickstart files that are held on either removable
@@ -595,7 +605,7 @@ Press &lt;enter&gt; for a shell</screen>
 	  </thead>
 	  <tbody>
 	      <row>
-		<entry>CD or DVD drive</entry>
+		<entry>DVD drive</entry>
 		<entry><option>ks=<replaceable>cdrom:/directory/ks.cfg</replaceable></option></entry>
 	      </row>
 	      <row>
@@ -631,7 +641,8 @@ Press &lt;enter&gt; for a shell</screen>
       the application
       <wordasword>http://server.mydomain.com/kickstart.cgi</wordasword>:
     </para>
-<screen><userinput>linux ks=http://server.mydomain.com/kickstart.cgi kssendmac</userinput>
+<screen>
+<userinput>linux ks=http://server.mydomain.com/kickstart.cgi kssendmac</userinput>
 </screen>
   </section>
   <section id="sn-bootoptions-hardware">
@@ -689,6 +700,10 @@ Press &lt;enter&gt; for a shell</screen>
 		<entry><option>headless</option></entry>
 	      </row>
 	      <row>
+		<entry>Disable probing for SCSI and RAID storage hardware</entry>
+		<entry><option>nostorage</option></entry>
+	      </row>
+	      <row>
 		<entry>Disable passing keyboard and mouse information to stage 2 of the installation program</entry>
 		<entry><option>nopass</option></entry>
 	      </row>
@@ -774,6 +789,7 @@ Press &lt;enter&gt; for a shell</screen>
   <section id="sn-boot-modes">
     <title>Using the Maintenance Boot Modes</title>
 
+<!-- Not in RHEL6 Beta 1
     <section id="sn-memtest">
       <title>Loading the Memory (RAM) Testing Mode</title>
 
@@ -808,24 +824,24 @@ Press &lt;enter&gt; for a shell</screen>
         <keycap>Esc</keycap> at any time.
       </para>
     </section>
-    
+-->
     <section id="sn-boot-mediacheck">
     <title>Verifying boot media</title>
 	    <para>
-		    You can test the integrity of an ISO-based installation source before using it to install Fedora. These sources include CD, DVD, and ISO images stored on a local hard drive or on an NFS server. Verifying that the ISO images are instace before you attempt an installation helps to avoid problems that are often encountered during installation.
+		    You can test the integrity of an ISO-based installation source before using it to install Fedora. These sources include DVD, and ISO images stored on a hard drive or NFS server. Verifying that the ISO images are intact before you attempt an installation helps to avoid problems that are often encountered during installation.
 	    </para>
 	    <para>
-		    Fedora offers you three ways to test installation ISOs:
+		    Fedora offers you two ways to test installation ISOs:
 	    </para>
 	    <itemizedlist>
-		    <listitem>
+<!-- FIG		    <listitem>
 			    <para>
 				    select the <guilabel>Verify and Boot</guilabel> option on the Fedora Live CD. To access the Live CD boot menu, press any key within ten seconds of the splash screen appearing.
 			    </para>
-		    </listitem>
+		    </listitem> -->
 		    <listitem>
 			    <para>
-				    select <guilabel>OK</guilabel> at the prompt to test the media before installation when booting from the Fedora distribution CD set or DVD
+				    select <guilabel>OK</guilabel> at the prompt to test the media before installation when booting from the Fedora DVD
 			    </para>
 		    </listitem>
 		    <listitem>
@@ -880,7 +896,7 @@ Press &lt;enter&gt; for a shell</screen>
 	  </para>
 	  
 	  <para>
-		However, the installation program may not correctly detect a previous version of Fedora if the contents of the <filename>/etc/fedora-release</filename> file have changed. The boot option <option>upgradeany</option> relaxes the test that the installation program performs and allows you to upgrade a Fedora installation that the installation program has not correctly identified.
+		However, the installation program may not correctly detect a previous version of Fedora if the contents of the <filename>/etc/redhat-release</filename> file have changed. The boot option <option>upgradeany</option> relaxes the test that the installation program performs and allows you to upgrade a Fedora installation that the installation program has not correctly identified.
 	  </para>
     
     </section>
@@ -894,3 +910,4 @@ mode: xml
 fill-column: 72
 End:
 -->
+
diff --git a/en-US/expert-quickstart.xml b/en-US/expert-quickstart.xml
index 0e1435a..23a1316 100644
--- a/en-US/expert-quickstart.xml
+++ b/en-US/expert-quickstart.xml
@@ -60,7 +60,7 @@
 	<para>Download the ISO images for the full distribution on CD or
 	  DVD. Create CD or DVD media from the ISO files using your
 	  preferred application, or put the images on a Windows FAT32 or
-	  Linux ext2/ext3 partition.</para>
+	  Linux ext2, ext3, or ext4 partition.</para>
       </listitem>
       <listitem>
 	<para>Download the <filename>boot.iso</filename> image for a
@@ -70,11 +70,6 @@
 	online repository to complete the installation.</para>
       </listitem>
       <listitem>
-	<para>Download the <filename>netinst.iso</filename> image for
-	  a reduced-size boot CD.  Write the image to the appropriate
-	  physical media to create bootable media.</para>
-      </listitem>
-      <listitem>
 	<para>Download the <filename>vmlinuz</filename> kernel file and
 	  the <filename>initrd.img</filename> ramdisk image from the
 	  distribution's <filename
diff --git a/en-US/ext4-and-btrfs.xml b/en-US/ext4-and-btrfs.xml
index 1f24f0c..2befd7b 100644
--- a/en-US/ext4-and-btrfs.xml
+++ b/en-US/ext4-and-btrfs.xml
@@ -4,8 +4,9 @@
  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
 
 <important>
-	<title>Btrfs</title>
+	<title>Important â€” Supported file systems</title>
 		<para>
-			  The <application>GRUB</application> bootloader does not support the Btrfs file system. You cannot use a btrfs partition for <filename>/boot</filename>.
+			  The <application>GRUB</application> bootloader in Fedora&nbsp;&PRODVER; supports only the ext2, ext3, and ext4 (recommended) file systems. You cannot use any other file system for <filename>/boot</filename>, such as Btrfs, XFS, or VFAT.
 		</para>
 </important>
+
diff --git a/en-US/firstboot.xml b/en-US/firstboot.xml
index 4626582..d6f45f2 100644
--- a/en-US/firstboot.xml
+++ b/en-US/firstboot.xml
@@ -6,31 +6,35 @@
 <!-- $Id: -->
 
 <chapter id="ch-firstboot">
-  <title>Firstboot</title>
-  <indexterm>
-    <primary>Firstboot</primary>
-  </indexterm>
-  <para>
-    <application>Firstboot</application> launches the first time
-    that you start a new Fedora system. Use <application>Firstboot</application> to configure the system for use before you log
-    in.
-  </para>
+	<title>Firstboot</title>
+	<indexterm>
+		<primary>Firstboot</primary>
+	</indexterm>
+	<important>
+		<title>Important â€” Firstboot not available after text-mode installation</title>
+		<para>
+			Firstboot is only available on systems after a graphical installation or after a kickstart installation where a desktop and the X window system were installed and graphical login was enabled.  If you performed a text-mode installation or a kickstart installation that did not include a desktop and the X window system, the <application>Firstboot</application> configuration tool does not appear.
+		</para>
+	</important>
+	<para>
+		<application>Firstboot</application> launches the first time that you start a new Fedora system. Use <application>Firstboot</application> to configure the system for use before you log in.
+	</para>
   
-<figure float="0"><title>Firstboot welcome screen</title>
-	<mediaobject>
-		<imageobject><imagedata fileref="images/firstboot/fb-welcome.png" format="PNG"/></imageobject>
-		<textobject><para>
-				Firstboot welcome screen
-			</para>
-		</textobject>
-	</mediaobject>
-</figure>
+	<figure float="0"><title>Firstboot welcome screen</title>
+		<mediaobject>
+			<imageobject><imagedata fileref="images/firstboot/fb-welcome.png" format="PNG"/></imageobject>
+			<textobject><para>
+					Firstboot welcome screen
+				</para>
+			</textobject>
+		</mediaobject>
+	</figure>
+  
+	<para>
+		Select <guibutton>Forward</guibutton> to start <application>Firstboot</application>.
+	</para>
   
-  <para>
-    Select <guibutton>Forward</guibutton> to start 
-    <application>Firstboot</application>.
-  </para>
-  <note>
+<!--  <note>
     <title>Graphical Interface Required</title>
 
     <para>
@@ -38,119 +42,288 @@
       interface.  If you did not install one, or if Fedora has trouble
       starting it, you may see a slightly different setup screen.
     </para>
-  </note>
-  <section id="sn-firstboot-license">
-    <title>License Agreement</title>
+  </note> -->
+  
+	<section id="sn-firstboot-license">
+		<title>License Agreement</title>
 
-    <para>
-      This screen displays the overall licensing terms for
-      Fedora. Each software package in Fedora is covered by its own
-      license.  All licensing guidelines for Fedora are located at
-      <ulink url="http://fedoraproject.org/wiki/Legal/Licenses"/>.
-    </para>
+		<para>
+		      This screen displays the overall licensing terms for Fedora. Each software package in Fedora is covered by its own license.  All licensing guidelines for Fedora are located at <ulink url="http://fedoraproject.org/wiki/Legal/Licenses"/>. 
+		</para>
 
-<figure float="0"><title>Firstboot license screen</title>
-	<mediaobject>
-		<imageobject><imagedata fileref="images/firstboot/fb-license.png" format="PNG"/></imageobject>
-		<textobject><para>
-				Firstboot license screen
+		<figure float="0"><title>Firstboot license screen</title>
+			<mediaobject>
+				<imageobject><imagedata fileref="images/firstboot/fb-license.png" format="PNG"/></imageobject>
+				<textobject><para>
+						Firstboot license screen
+					</para>
+				</textobject>
+			</mediaobject>
+		</figure>
+		<para>
+			If you agree to the terms of the licence, select <guilabel>Yes, I agree to the License Agreement</guilabel> and click <guibutton>Forward</guibutton>.
+		</para>
+	</section>
+<!--  
+	<section id="sn-firstboot-updates">
+		<title>Set Up Software Updates</title>
+		<para>
+			Use the <guilabel>Set Up Software Updates</guilabel> screen to register your system with the Red Hat Network (RHN) and configure the system to receive updates from RHN itself, or from a Satellite server. To register your system, select <guilabel>Yes, I'd like to register now</guilabel> and click <guibutton>Forward</guibutton>.
+		</para>
+		<figure float="0"><title>Set Up Software Updates</title>
+			<mediaobject>
+				<imageobject><imagedata fileref="images/firstboot/fb-setup.png" format="PNG"/></imageobject>
+				<textobject><para>
+						Firstboot Set Up Software Updates screen
+					</para>
+				</textobject>
+			</mediaobject>
+		</figure>
+		<para>
+			If you choose not to register your system now, run <application>rhn_register</application> from a terminal on the installed system.
+		</para>
+		
+		<section id="sn-firstboot-server">
+			<title>Choose Server</title>
+			<para>
+				Use the <guilabel>Choose Server</guilabel> screen to choose whether to receive updates directly from RHN or from a Red Hat Network Satellite or Red Hat Network Proxy. Click <guibutton>Advanced Network Configuration</guibutton> to configure a proxy server if necessary. 
 			</para>
-		</textobject>
-	</mediaobject>
-</figure>
+			<figure float="0"><title>Choose Server</title>
+				<mediaobject>
+					<imageobject><imagedata fileref="images/firstboot/fb-server.png" format="PNG"/></imageobject>
+					<textobject><para>
+							Firstboot Choose Server screen
+						</para>
+					</textobject>
+				</mediaobject>
+			</figure>
+		</section>
+		
+		<section id="sn-firstboot-rhlogin">
+			<title>Red Hat Login</title>
+			<para>
+				Provide your login and password for the Red Hat Network in the <guilabel>Red Hat Login</guilabel> screen. If you have lost your login or password, visit <ulink url="http://www.redhat.com/wapps/sso/rhn/lostPassword.html"/> or, if you use a Red Hat Satellite, consult the <firstterm>organization administrator</firstterm> for your Red Hat Satellite.
+			</para>
+			<figure float="0"><title>Red Hat Login</title>
+				<mediaobject>
+					<imageobject><imagedata fileref="images/firstboot/fb-rhlogin.png" format="PNG"/></imageobject>
+					<textobject><para>
+							Firstboot Red Hat Login screen
+						</para>
+					</textobject>
+				</mediaobject>
+			</figure>
+		</section>
+		
+		<section id="sn-firstboot-profile">
+			<title>Create Profile</title>
+			<para>
+				Give this system a name in the <guilabel>Create Profile</guilabel> so that you can readily identify when you use the management features of the Red Hat Network. This stage of the registration process also submits a profile of the system hardware and a list of the packages installed on the system to the Red Hat Network. Click the <guibutton>View Hardware Profile</guibutton> or <guibutton>View Package Profile</guibutton> buttons to see the information that will be sent. Deselect the hardware profile or package profile check boxes if you do not want to send these profiles to the Red Hat Network.
+			</para>
+			<figure float="0"><title>Create Profile</title>
+				<mediaobject>
+					<imageobject><imagedata fileref="images/firstboot/fb-profile.png" format="PNG"/></imageobject>
+					<textobject><para>
+							Firstboot Create Profile screen
+						</para>
+					</textobject>
+				</mediaobject>
+			</figure>
+		</section>
+		
+		<section id="sn-firstboot-review">
+			<title>Review Subscription</title>
+			<para>
+				The <guilabel>Review Subscription</guilabel> screen contains information about the software channels from which this system will receive updates and about Red Hat Network service levels. Review this information, then click <guibutton>Forward</guibutton>.
+			</para>
+			<figure float="0"><title>Review Subscription</title>
+				<mediaobject>
+					<imageobject><imagedata fileref="images/firstboot/fb-review.png" format="PNG"/></imageobject>
+					<textobject><para>
+							Firstboot Review Subscription screen
+						</para>
+					</textobject>
+				</mediaobject>
+			</figure>
+		</section>
+		
+		<section id="sn-firstboot-updatesetup">
+			<title>Finish Updates Setup</title>
+			<para>
+				The <guilabel>Finish Updates Setup</guilabel> screen confirms that you have configured updates for this system. Click <guibutton>Forward</guibutton> to create a user account as described in <xref linkend="sn-firstboot-systemuser"/>.
+			</para>
+			<figure float="0"><title>Finish Updates Setup</title>
+				<mediaobject>
+					<imageobject><imagedata fileref="images/firstboot/fb-updatesetup.png" format="PNG"/></imageobject>
+					<textobject><para>
+							Firstboot Finish Updates Setup screen
+						</para>
+					</textobject>
+				</mediaobject>
+			</figure>
+		</section>
+		
+	</section>
+-->  
+	<section id="sn-firstboot-systemuser">
+		<title>Create User</title>
 
+		<para>
+			Create a user account for yourself with this screen. Always use this account to log in to your Fedora system, rather than using the <systemitem class="username">root</systemitem> account.
+		</para>
 
-    <para>
-      If you agree to the terms of the licence, select <guibutton>Forward</guibutton>.
-    </para>
-  </section>
-  <section id="sn-firstboot-systemuser">
-    <title>System User</title>
+		<figure float="0"><title>Firstboot create user screen</title>
+		  <mediaobject>
+			  <imageobject><imagedata fileref="images/firstboot/fb-createuser.png" format="PNG"/></imageobject>
+			  <textobject><para>
+					  Firstboot create user screen
+				  </para>
+			  </textobject>
+		  </mediaobject>
+		</figure>
 
-    <para>
-      Create a user account for yourself with this screen. Always use
-      this account to log in to your Fedora system, rather than using the
-      <systemitem class="username">root</systemitem> account.
-    </para>
-    
-<figure float="0"><title>Firstboot create user screen</title>
-	<mediaobject>
-		<imageobject><imagedata fileref="images/firstboot/fb-createuser.png" format="PNG"/></imageobject>
-		<textobject><para>
-				Firstboot create user screen
+
+		<para>
+			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>
+			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>
+		<important>
+			<title>Important â€” Create at least one user account</title>
+			<para>
+				If you do not create at least one user account in this step, you will not be able to log in to the Fedora graphical environment. If you skipped this step during installation, refer to <xref linkend="Trouble_After_Booting-GUI"/>.
 			</para>
-		</textobject>
-	</mediaobject>
-</figure>
+		</important>
+		<note>
+			<title>Note â€” Creating Extra User Accounts</title>
+			<para>
+				To add additional user accounts to your system after the installation is complete, choose <menuchoice> <guimenu>System</guimenu> <guisubmenu>Administration</guisubmenu> <guimenuitem>Users &amp; Groups</guimenuitem> </menuchoice>.
+			</para>
+		</note>
+		
+		<section id="sn-firstboot-authentication">
+			<title>Authentication Configuration</title>
+			
+			<para>
+				If you clicked <guibutton>Use Network Login</guibutton> on the <guilabel>Create User</guilabel> screen, you must now specify how users are to be authenticated on the system. Use the drop-down menu to select from the following types of user database:
+			</para>
+			<itemizedlist>
+				<listitem>
+					<para>
+						<guimenuitem>Local accounts only</guimenuitem> (for use when the user database on the network is not accessible)
+					</para>
+				</listitem>
+				<listitem>
+					<para>
+						<guimenuitem>LDAP</guimenuitem> (Lightweight Directory Access Protocol)
+					</para>
+				</listitem>
+				<listitem>
+					<para>
+						<guimenuitem>NIS</guimenuitem> (Network Information Service)
+					</para>
+				</listitem>
+				<listitem>
+					<para>
+						<guimenuitem>Winbind</guimenuitem> (for use with Microsoft Active Directory)
+					</para>
+				</listitem>
+			</itemizedlist>
+			<figure float="0"><title>Firstboot Authentication Configuration screen</title>
+			  <mediaobject>
+				  <imageobject><imagedata fileref="images/firstboot/fb-authentication.png" format="PNG"/></imageobject>
+				  <textobject><para>
+						  Firstboot Authentication Configuration screen
+					  </para>
+				  </textobject>
+			  </mediaobject>
+			</figure>
+			<para>
+				When you select the type of user database appropriate for your network, you must provide additional details relevant to that database type. For example, if you select <literal>LDAP</literal>, you must specify the <firstterm>base distinguished name</firstterm> for LDAP searches, and the address of the LDAP server. You must also select an <guilabel>Authentication Method</guilabel> relevant to the type of user database that you chose, for example, a Kerberos password, LDAP password, or NIS password. 
+			</para>
+			<para>
+				The <guilabel>Advanced Options</guilabel> tab lets you enable other authentication mechanisms, including fingerprint readers, smart cards, and local access control in <filename>/etc/security/access.conf</filename>. 
+			</para>
+			<figure float="0"><title>Firstboot authentication Advanced Options screen</title>
+			  <mediaobject>
+				  <imageobject><imagedata fileref="images/firstboot/fb-auth-advanced.png" format="PNG"/></imageobject>
+				  <textobject><para>
+						  Firstboot authentication Advanced Options screen
+					  </para>
+				  </textobject>
+			  </mediaobject>
+			</figure>
+		</section>
+	</section>
 
-    
-    <para>
-      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. Refer to
-      <xref linkend="sn-account_configuration" /> for guidelines on selecting a
-      secure password.
-    </para>
-    <para>
-      To configure Fedora to use network services for authentication or
-      user information, select <guibutton>Use Network
-      Login...</guibutton>.
-    </para>
-    <important>
-      <title>Create at least one user account</title>
-      <para>
-      If you do not create at least one user account in this step, you will not be able to log in to the Fedora graphical environment. If you skipped this step during installation, refer to <xref linkend="Trouble_After_Booting-GUI"/>.
-      </para>
-    </important>
-    <note>
-      <title>Creating Extra User Accounts</title>
-      <para>
-        To add additional user accounts to your system after the
-        installation is complete, choose <menuchoice>
-        <guimenu>System</guimenu>
-        <guisubmenu>Administration</guisubmenu> <guimenuitem>Users &amp;
-        Groups</guimenuitem> </menuchoice>.
-      </para>
-    </note>
-  </section>
-  
-<section id="sn-firstboot-datetime">
-    <title>Date and Time</title>
-    
-    <indexterm>
-        <primary>NTP (Network Time Protocol)</primary>
-      </indexterm>
+	<section id="sn-firstboot-datetime">
+		<title>Date and Time</title>
+	    
+		<indexterm>
+			<primary>NTP (Network Time Protocol)</primary>
+		</indexterm>
 
-    <para>
-      Use this screen to adjust the date and time of the system clock. To change these settings after installation, click <menuchoice> <guimenu>System</guimenu> <guisubmenu>Administration</guisubmenu> <guimenuitem>Date &amp; Time</guimenuitem> </menuchoice>.
-    </para>
-    
-    
+		<para>
+			Use this screen to adjust the date and time of the system clock. To change these settings after installation, click <menuchoice> <guimenu>System</guimenu> <guisubmenu>Administration</guisubmenu> <guimenuitem>Date &amp; Time</guimenuitem> </menuchoice>. 
+		</para>
+	    
+		<figure float="0"><title>Firstboot date and time screen</title>
+			<mediaobject>
+				<imageobject><imagedata fileref="images/firstboot/fb-datetime.png" format="PNG"/></imageobject>
+				<textobject><para>
+						Firstboot date and time screen
+					</para>
+				</textobject>
+			</mediaobject>
+		</figure>
 
-<!--     <para>
-      The initial display enables you to set the date and time of your
-      system manually.
-    </para> -->
-    
-<figure float="0"><title>Firstboot date and time screen</title>
-	<mediaobject>
-		<imageobject><imagedata fileref="images/firstboot/fb-datetime.png" format="PNG"/></imageobject>
-		<textobject><para>
-				Firstboot date and time screen
-			</para>
-		</textobject>
-	</mediaobject>
-</figure>
+		<para>
+			Click the <guilabel>Synchronize date and time over the network</guilabel> checkbox to configure your system to use <firstterm>Network Time Protocol</firstterm> (NTP) servers to maintain the accuracy of the clock. NTP provides time synchronization service to computers on the same network. Many public NTP servers are available on the Internet. 
+		</para>
 
-<para>
-      Click the <guilabel>Synchronize date and time over the network</guilabel> checkbox to configure your system to use <firstterm>Network Time Protocol</firstterm> (NTP) servers to maintain the accuracy of the clock. NTP provides time synchronization service to computers on the same network. Many public NTP servers are available on the Internet.
-    </para>
+	    
 
-    
+	</section>
+<!--
+	<section id="sn-firstboot-kdump">
+		<title>Kdump</title>
+	    
+		<indexterm>
+			<primary>kdump</primary>
+		</indexterm>
 
-  </section>
-  
-  <section id="sn-smolt">
+		<para>
+			Use this screen to select whether or not to use the <application>Kdump</application> kernel crash dumping mechanism on this system. Note that if you select this option, you will need to reserve memory for <application>Kdump</application> and that this memory will not be available for any other purpose.
+		</para>
+	    
+		<figure float="0"><title>Kdump screen</title>
+			<mediaobject>
+				<imageobject><imagedata fileref="images/firstboot/fb-kdump.png" format="PNG"/></imageobject>
+				<textobject><para>
+						Kdump screen
+					</para>
+				</textobject>
+			</mediaobject>
+		</figure>
+
+		<para>
+			If you do not want to use <application>Kdump</application> on this system, click <guibutton>Next</guibutton>. If you want to use <application>Kdump</application>, select the <guilabel>Enable kdump</guilabel> option, then select an amount of memory to reserve for <application>Kdump</application> and click <guibutton>Next</guibutton>.
+		</para>
+	    
+		<figure float="0"><title>Kdump enabled</title>
+			<mediaobject>
+				<imageobject><imagedata fileref="images/firstboot/fb-kdump1.png" format="PNG"/></imageobject>
+				<textobject><para>
+						Kdump enabled
+					</para>
+				</textobject>
+			</mediaobject>
+		</figure>
+	   
+	  </section>
+-->  
+ <section id="sn-smolt">
     <title>Hardware Profile</title>
     <para>
       <application>Firstboot</application> displays a screen that
@@ -187,12 +360,7 @@
         Fedora system.
       </para>
     </important>
-  </section>
+  </section> 
 </chapter>
 
-<!--
-Local variables:
-mode: xml
-fill-column: 72
-End:
--->
+
diff --git a/en-US/iSCSI.xml b/en-US/iSCSI.xml
index 2d6dfa3..04eb4fb 100644
--- a/en-US/iSCSI.xml
+++ b/en-US/iSCSI.xml
@@ -4,7 +4,8 @@
  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
 
 <appendix id="ISCSI_disks">
-<title>ISCSI disks</title>
+	<title>ISCSI disks</title>
+
 	<para><firstterm>Internet Small Computer System Interface</firstterm> (iSCSI) is a protocol that allows computers to communicate with storage devices by SCSI requests and responses carried over TCP/IP. Because iSCSI is based on the standard SCSI protocols, it uses some terminology from SCSI. The device on the SCSI bus to which requests get sent (and which answers these requests) is known as the <firstterm>target</firstterm> and the device issuing requests is known as the <firstterm>initiator</firstterm>. In other words, an iSCSI disk is a target and the iSCSI software equivalent of a SCSI controller or SCSI Host Bus Adapter (HBA) is called an initiator. This appendix only covers Linux as an iSCSI initiator: how Linux uses iSCSI disks, but not how Linux hosts iSCSI disks.</para>
 
 	<para>Linux has a software iSCSI initiator in the kernel that takes the place and form of a SCSI HBA driver and therefore allows Linux to use iSCSI disks. However, as iSCSI is a fully network-based protocol, iSCSI initiator support needs more than just the ability to send SCSI packets over the network. Before Linux can use an iSCSI target, Linux must find the target on the network and make a connection to it. In some cases, Linux must send authentication information to gain access to the target. Linux must also detect any failure of the network connection and must establish a new connection, including logging in again if necessary.</para>
@@ -14,7 +15,7 @@
 	<para>Both <application>iscsiadm</application> and <application>iscsid</application> are part of the <application>iscsi-initiator-utils</application> package under Fedora.</para>
 
 
-	<section id="sn-iSCSI_in_Fedora-iSCSI_disks_in_anaconda">
+	<section id="sn-iSCSI_disks_in_anaconda">
 	<title>iSCSI disks in <application>anaconda</application></title>
 		<para><application>Anaconda</application> can discover (and then log in to) iSCSI disks in two ways:</para>
 
@@ -23,11 +24,13 @@
 				<para>When anaconda starts, it checks if the BIOS or add-on boot ROMs of the system support <firstterm>iSCSI Boot Firmware Table</firstterm> (iBFT), a BIOS extension for systems which can boot from iSCSI. If the BIOS supports iBFT, <application>anaconda</application> will read the iSCSI target information for the configured boot disk from the BIOS and log in to this target, making it available as an installation target.</para>
 			</listitem>
 			<listitem>
-				<para>The initial partitioning screen presents you with an <guilabel>Advanced storage configuration</guilabel> button that allows you to add iSCSI target information like the discovery IP-address. <application>Anaconda</application> will probe the given IP-address and log in to any targets that it finds. See <xref linkend="s1-advanced-storage-x86"/> for the details that you can specify for iSCSI targets.</para>
+				<para>
+					If you select the <guilabel>Specialized Storage Devices</guilabel> option during installation, the storage device selection screen presents you with an <guilabel>Add Advanced Target</guilabel> button. If you click this button, you can add iSCSI target information like the discovery IP address. <application>Anaconda</application> probes the given IP address and logs in to any targets that it finds. See <xref linkend="s1-advanced-storage-x86"/> for the details that you can specify for iSCSI targets.
+				</para>
 			</listitem>
 		</orderedlist>
 
-		<para>While <application>anaconda</application> uses <application>iscsiadm</application> to find and log into iSCSI targets, <application>iscsiadm</application> automatically stores any information about these targets iscsiadm iSCSI database. <application>Anaconda</application> then copies this database to the installed system and marks any iSCSI targets not used for <filename>/</filename> so that the system will automatically log in to them when it starts. If <filename>/</filename> is placed on an iSCSI target, <application>initrd</application> will log into this target and <application>anaconda</application> does not include this target in start up scripts to avoid multiple attempts to log into the same target.</para>
+		<para>While <application>anaconda</application> uses <application>iscsiadm</application> to find and log into iSCSI targets, <application>iscsiadm</application> automatically stores any information about these targets in the iscsiadm iSCSI database. <application>Anaconda</application> then copies this database to the installed system and marks any iSCSI targets not used for <filename>/</filename> so that the system will automatically log in to them when it starts. If <filename>/</filename> is placed on an iSCSI target, <application>initrd</application> will log into this target and <application>anaconda</application> does not include this target in start up scripts to avoid multiple attempts to log into the same target.</para>
 
 		<para>If <filename>/</filename> is placed on an iSCSI target, <application>anaconda</application> sets <application>NetworkManager</application> to ignore any network interfaces that were active during the installation process. These interfaces will also be configured by <application>initrd</application> when the system starts. If <application>NetworkManager</application> were to reconfigure these interfaces, the system would lose its connection to <filename>/</filename>.</para>
 	</section>
@@ -57,4 +60,7 @@
 		
 		<para>If <application>iscsid</application> is not needed as the system starts, it will not start automatically. If you start <application>iscsiadm</application>,  <application>iscsiadm</application> will start <application>iscsid</application> in turn.</para>
 	</section>
-</appendix>
\ No newline at end of file
+
+
+</appendix>
+
diff --git a/en-US/images/accountconfig/acct-rhel5.png b/en-US/images/accountconfig/acct-rhel5.png
new file mode 100644
index 0000000..da425a3
Binary files /dev/null and b/en-US/images/accountconfig/acct-rhel5.png differ
diff --git a/en-US/images/begininstall/ftp.png b/en-US/images/begininstall/ftp.png
new file mode 100644
index 0000000..84dff79
Binary files /dev/null and b/en-US/images/begininstall/ftp.png differ
diff --git a/en-US/images/begininstall/hd.png b/en-US/images/begininstall/hd.png
index 410a6f6..dadd5b2 100644
Binary files a/en-US/images/begininstall/hd.png and b/en-US/images/begininstall/hd.png differ
diff --git a/en-US/images/begininstall/http.png b/en-US/images/begininstall/http.png
new file mode 100644
index 0000000..8dcf1d0
Binary files /dev/null and b/en-US/images/begininstall/http.png differ
diff --git a/en-US/images/begininstall/nfs.png b/en-US/images/begininstall/nfs.png
index 4fdc008..977936d 100644
Binary files a/en-US/images/begininstall/nfs.png and b/en-US/images/begininstall/nfs.png differ
diff --git a/en-US/images/begininstall/retrieving-stage2.png b/en-US/images/begininstall/retrieving-stage2.png
new file mode 100644
index 0000000..828cdbc
Binary files /dev/null and b/en-US/images/begininstall/retrieving-stage2.png differ
diff --git a/en-US/images/boot/boot_screen.png b/en-US/images/boot/boot_screen.png
index 9bfcbed..5c25075 100644
Binary files a/en-US/images/boot/boot_screen.png and b/en-US/images/boot/boot_screen.png differ
diff --git a/en-US/images/diskless/add-host.png b/en-US/images/diskless/add-host.png
new file mode 100644
index 0000000..7614d3f
Binary files /dev/null and b/en-US/images/diskless/add-host.png differ
diff --git a/en-US/images/diskpartadvanced/advanced_storage-rhel5-s390-fcp.png b/en-US/images/diskpartadvanced/advanced_storage-rhel5-s390-fcp.png
new file mode 100644
index 0000000..7c598a0
Binary files /dev/null and b/en-US/images/diskpartadvanced/advanced_storage-rhel5-s390-fcp.png differ
diff --git a/en-US/images/diskpartadvanced/advanced_storage-rhel5-s390.png b/en-US/images/diskpartadvanced/advanced_storage-rhel5-s390.png
new file mode 100644
index 0000000..a4d6457
Binary files /dev/null and b/en-US/images/diskpartadvanced/advanced_storage-rhel5-s390.png differ
diff --git a/en-US/images/diskpartadvanced/advanced_storage-rhel5.png b/en-US/images/diskpartadvanced/advanced_storage-rhel5.png
new file mode 100644
index 0000000..783e8ab
Binary files /dev/null and b/en-US/images/diskpartadvanced/advanced_storage-rhel5.png differ
diff --git a/en-US/images/diskpartadvanced/advanced_storage-s390.png b/en-US/images/diskpartadvanced/advanced_storage-s390.png
new file mode 100644
index 0000000..31ee798
Binary files /dev/null and b/en-US/images/diskpartadvanced/advanced_storage-s390.png differ
diff --git a/en-US/images/diskpartadvanced/fcp-config.png b/en-US/images/diskpartadvanced/fcp-config.png
new file mode 100644
index 0000000..52c0b53
Binary files /dev/null and b/en-US/images/diskpartadvanced/fcp-config.png differ
diff --git a/en-US/images/diskpartauto/autopart-rhel5.png b/en-US/images/diskpartauto/autopart-rhel5.png
new file mode 100644
index 0000000..6bacfef
Binary files /dev/null and b/en-US/images/diskpartauto/autopart-rhel5.png differ
diff --git a/en-US/images/diskpartauto/autopart-rhel5.s390.png b/en-US/images/diskpartauto/autopart-rhel5.s390.png
new file mode 100644
index 0000000..89a3942
Binary files /dev/null and b/en-US/images/diskpartauto/autopart-rhel5.s390.png differ
diff --git a/en-US/images/diskpartitioning/ddmain-s390.png b/en-US/images/diskpartitioning/ddmain-s390.png
new file mode 100644
index 0000000..e33bf40
Binary files /dev/null and b/en-US/images/diskpartitioning/ddmain-s390.png differ
diff --git a/en-US/images/diskpartitioning/ent-ddmain-pseries.png b/en-US/images/diskpartitioning/ent-ddmain-pseries.png
new file mode 100644
index 0000000..c5a0031
Binary files /dev/null and b/en-US/images/diskpartitioning/ent-ddmain-pseries.png differ
diff --git a/en-US/images/diskpartitioning/ent-ddmain-rhel5.png b/en-US/images/diskpartitioning/ent-ddmain-rhel5.png
new file mode 100644
index 0000000..dcac2bb
Binary files /dev/null and b/en-US/images/diskpartitioning/ent-ddmain-rhel5.png differ
diff --git a/en-US/images/diskpartitioning/ia64-ddmain.png b/en-US/images/diskpartitioning/ia64-ddmain.png
new file mode 100644
index 0000000..4716e48
Binary files /dev/null and b/en-US/images/diskpartitioning/ia64-ddmain.png differ
diff --git a/en-US/images/diskpartitioning/part-add-rhel5.png b/en-US/images/diskpartitioning/part-add-rhel5.png
new file mode 100644
index 0000000..3c974bc
Binary files /dev/null and b/en-US/images/diskpartitioning/part-add-rhel5.png differ
diff --git a/en-US/images/diskpartitioning/s390-dasd.png b/en-US/images/diskpartitioning/s390-dasd.png
new file mode 100644
index 0000000..39802d5
Binary files /dev/null and b/en-US/images/diskpartitioning/s390-dasd.png differ
diff --git a/en-US/images/diskpartitioning/s390-lvm-lv.png b/en-US/images/diskpartitioning/s390-lvm-lv.png
new file mode 100644
index 0000000..b27ac23
Binary files /dev/null and b/en-US/images/diskpartitioning/s390-lvm-lv.png differ
diff --git a/en-US/images/diskpartitioning/s390-lvm-pv.png b/en-US/images/diskpartitioning/s390-lvm-pv.png
new file mode 100644
index 0000000..3456b7e
Binary files /dev/null and b/en-US/images/diskpartitioning/s390-lvm-pv.png differ
diff --git a/en-US/images/diskpartitioning/s390-lvm-vg.png b/en-US/images/diskpartitioning/s390-lvm-vg.png
new file mode 100644
index 0000000..298127a
Binary files /dev/null and b/en-US/images/diskpartitioning/s390-lvm-vg.png differ
diff --git a/en-US/images/diskpartitioning/s390-part-add.png b/en-US/images/diskpartitioning/s390-part-add.png
new file mode 100644
index 0000000..f673c07
Binary files /dev/null and b/en-US/images/diskpartitioning/s390-part-add.png differ
diff --git a/en-US/images/diskpartsetup/disk-setup-rhel5-s390.png b/en-US/images/diskpartsetup/disk-setup-rhel5-s390.png
new file mode 100644
index 0000000..1b71725
Binary files /dev/null and b/en-US/images/diskpartsetup/disk-setup-rhel5-s390.png differ
diff --git a/en-US/images/diskpartsetup/disk-setup-rhel5.png b/en-US/images/diskpartsetup/disk-setup-rhel5.png
new file mode 100644
index 0000000..83de405
Binary files /dev/null and b/en-US/images/diskpartsetup/disk-setup-rhel5.png differ
diff --git a/en-US/images/driverupdates/USB_stick.png b/en-US/images/driverupdates/USB_stick.png
new file mode 100644
index 0000000..9e9e729
Binary files /dev/null and b/en-US/images/driverupdates/USB_stick.png differ
diff --git a/en-US/images/driverupdates/boot_screen.png b/en-US/images/driverupdates/boot_screen.png
new file mode 100644
index 0000000..96a90ea
Binary files /dev/null and b/en-US/images/driverupdates/boot_screen.png differ
diff --git a/en-US/images/driverupdates/driver_disk_partition.png b/en-US/images/driverupdates/driver_disk_partition.png
new file mode 100644
index 0000000..534d036
Binary files /dev/null and b/en-US/images/driverupdates/driver_disk_partition.png differ
diff --git a/en-US/images/driverupdates/driver_disk_prompt.png b/en-US/images/driverupdates/driver_disk_prompt.png
new file mode 100644
index 0000000..56f9c42
Binary files /dev/null and b/en-US/images/driverupdates/driver_disk_prompt.png differ
diff --git a/en-US/images/driverupdates/driver_disk_select_iso.png b/en-US/images/driverupdates/driver_disk_select_iso.png
new file mode 100644
index 0000000..00fcf17
Binary files /dev/null and b/en-US/images/driverupdates/driver_disk_select_iso.png differ
diff --git a/en-US/images/driverupdates/driver_disk_source.png b/en-US/images/driverupdates/driver_disk_source.png
new file mode 100644
index 0000000..b7843c3
Binary files /dev/null and b/en-US/images/driverupdates/driver_disk_source.png differ
diff --git a/en-US/images/driverupdates/installed_packages.png b/en-US/images/driverupdates/installed_packages.png
new file mode 100644
index 0000000..c09c4fb
Binary files /dev/null and b/en-US/images/driverupdates/installed_packages.png differ
diff --git a/en-US/images/driverupdates/installing_packages.png b/en-US/images/driverupdates/installing_packages.png
new file mode 100644
index 0000000..3335f16
Binary files /dev/null and b/en-US/images/driverupdates/installing_packages.png differ
diff --git a/en-US/images/driverupdates/iso_image.png b/en-US/images/driverupdates/iso_image.png
new file mode 100644
index 0000000..a35ac7a
Binary files /dev/null and b/en-US/images/driverupdates/iso_image.png differ
diff --git a/en-US/images/driverupdates/nodriver.png b/en-US/images/driverupdates/nodriver.png
new file mode 100644
index 0000000..e8c6880
Binary files /dev/null and b/en-US/images/driverupdates/nodriver.png differ
diff --git a/en-US/images/driverupdates/verifying_disc.png b/en-US/images/driverupdates/verifying_disc.png
new file mode 100644
index 0000000..7d9c36a
Binary files /dev/null and b/en-US/images/driverupdates/verifying_disc.png differ
diff --git a/en-US/images/driverupdates/write_to_disc.png b/en-US/images/driverupdates/write_to_disc.png
new file mode 100644
index 0000000..5044213
Binary files /dev/null and b/en-US/images/driverupdates/write_to_disc.png differ
diff --git a/en-US/images/firstboot/fb-auth-advanced.png b/en-US/images/firstboot/fb-auth-advanced.png
new file mode 100644
index 0000000..0a46fb1
Binary files /dev/null and b/en-US/images/firstboot/fb-auth-advanced.png differ
diff --git a/en-US/images/firstboot/fb-authentication.png b/en-US/images/firstboot/fb-authentication.png
new file mode 100644
index 0000000..938505a
Binary files /dev/null and b/en-US/images/firstboot/fb-authentication.png differ
diff --git a/en-US/images/firstboot/fb-kdump.png b/en-US/images/firstboot/fb-kdump.png
new file mode 100644
index 0000000..667c1eb
Binary files /dev/null and b/en-US/images/firstboot/fb-kdump.png differ
diff --git a/en-US/images/firstboot/fb-kdump1.png b/en-US/images/firstboot/fb-kdump1.png
new file mode 100644
index 0000000..2dcd493
Binary files /dev/null and b/en-US/images/firstboot/fb-kdump1.png differ
diff --git a/en-US/images/firstboot/fb-license.png b/en-US/images/firstboot/fb-license.png
index 575b3a7..b2357d7 100644
Binary files a/en-US/images/firstboot/fb-license.png and b/en-US/images/firstboot/fb-license.png differ
diff --git a/en-US/images/firstboot/fb-profile.png b/en-US/images/firstboot/fb-profile.png
index b173bc4..f93f0b5 100644
Binary files a/en-US/images/firstboot/fb-profile.png and b/en-US/images/firstboot/fb-profile.png differ
diff --git a/en-US/images/firstboot/fb-review.png b/en-US/images/firstboot/fb-review.png
new file mode 100644
index 0000000..ab1353a
Binary files /dev/null and b/en-US/images/firstboot/fb-review.png differ
diff --git a/en-US/images/firstboot/fb-rhlogin.png b/en-US/images/firstboot/fb-rhlogin.png
new file mode 100644
index 0000000..9c154b6
Binary files /dev/null and b/en-US/images/firstboot/fb-rhlogin.png differ
diff --git a/en-US/images/firstboot/fb-server.png b/en-US/images/firstboot/fb-server.png
new file mode 100644
index 0000000..e197c0d
Binary files /dev/null and b/en-US/images/firstboot/fb-server.png differ
diff --git a/en-US/images/firstboot/fb-setup.png b/en-US/images/firstboot/fb-setup.png
new file mode 100644
index 0000000..5185ca6
Binary files /dev/null and b/en-US/images/firstboot/fb-setup.png differ
diff --git a/en-US/images/firstboot/fb-updatesetup.png b/en-US/images/firstboot/fb-updatesetup.png
new file mode 100644
index 0000000..bc336ec
Binary files /dev/null and b/en-US/images/firstboot/fb-updatesetup.png differ
diff --git a/en-US/images/firstboot/fb-welcome-rhel6-alpha.png b/en-US/images/firstboot/fb-welcome-rhel6-alpha.png
new file mode 100644
index 0000000..dc730d7
Binary files /dev/null and b/en-US/images/firstboot/fb-welcome-rhel6-alpha.png differ
diff --git a/en-US/images/firstboot/fb-welcome.png b/en-US/images/firstboot/fb-welcome.png
index 46815ce..47b80ec 100644
Binary files a/en-US/images/firstboot/fb-welcome.png and b/en-US/images/firstboot/fb-welcome.png differ
diff --git a/en-US/images/guimode/vnc_option.png b/en-US/images/guimode/vnc_option.png
new file mode 100644
index 0000000..4426b20
Binary files /dev/null and b/en-US/images/guimode/vnc_option.png differ
diff --git a/en-US/images/guimode/widget1.png b/en-US/images/guimode/widget1.png
index abdd1be..f3d926a 100644
Binary files a/en-US/images/guimode/widget1.png and b/en-US/images/guimode/widget1.png differ
diff --git a/en-US/images/guimode/widget2.png b/en-US/images/guimode/widget2.png
index b809b58..cc981c8 100644
Binary files a/en-US/images/guimode/widget2.png and b/en-US/images/guimode/widget2.png differ
diff --git a/en-US/images/initializing/initializing-s390-dasd.png b/en-US/images/initializing/initializing-s390-dasd.png
new file mode 100644
index 0000000..f6d7aa9
Binary files /dev/null and b/en-US/images/initializing/initializing-s390-dasd.png differ
diff --git a/en-US/images/initializing/initializing-s390-fcp.png b/en-US/images/initializing/initializing-s390-fcp.png
new file mode 100644
index 0000000..3b929c6
Binary files /dev/null and b/en-US/images/initializing/initializing-s390-fcp.png differ
diff --git a/en-US/images/install_number/install_number-s390.png b/en-US/images/install_number/install_number-s390.png
new file mode 100644
index 0000000..6e329ff
Binary files /dev/null and b/en-US/images/install_number/install_number-s390.png differ
diff --git a/en-US/images/install_number/install_number.png b/en-US/images/install_number/install_number.png
new file mode 100644
index 0000000..5d1737f
Binary files /dev/null and b/en-US/images/install_number/install_number.png differ
diff --git a/en-US/images/ksconfig/ksconfig-xconfig-general.png b/en-US/images/ksconfig/ksconfig-xconfig-general.png
new file mode 100644
index 0000000..80ef724
Binary files /dev/null and b/en-US/images/ksconfig/ksconfig-xconfig-general.png differ
diff --git a/en-US/images/ksconfig/ksconfig-xconfig-monitor.png b/en-US/images/ksconfig/ksconfig-xconfig-monitor.png
new file mode 100644
index 0000000..3cc2b3b
Binary files /dev/null and b/en-US/images/ksconfig/ksconfig-xconfig-monitor.png differ
diff --git a/en-US/images/ksconfig/ksconfig-xconfig-videocard.png b/en-US/images/ksconfig/ksconfig-xconfig-videocard.png
new file mode 100644
index 0000000..d56816e
Binary files /dev/null and b/en-US/images/ksconfig/ksconfig-xconfig-videocard.png differ
diff --git a/en-US/images/langselection/lang.png b/en-US/images/langselection/lang.png
index 7f28901..cc981c8 100644
Binary files a/en-US/images/langselection/lang.png and b/en-US/images/langselection/lang.png differ
diff --git a/en-US/images/langselection/lang2.png b/en-US/images/langselection/lang2.png
new file mode 100644
index 0000000..7f28901
Binary files /dev/null and b/en-US/images/langselection/lang2.png differ
diff --git a/en-US/images/netconfig/hostname-no-localhost.png b/en-US/images/netconfig/hostname-no-localhost.png
new file mode 100644
index 0000000..6bbe61a
Binary files /dev/null and b/en-US/images/netconfig/hostname-no-localhost.png differ
diff --git a/en-US/images/netconfig/net-edit-rhel5-s390.png b/en-US/images/netconfig/net-edit-rhel5-s390.png
new file mode 100644
index 0000000..bba4dee
Binary files /dev/null and b/en-US/images/netconfig/net-edit-rhel5-s390.png differ
diff --git a/en-US/images/netconfig/net-edit-rhel5.png b/en-US/images/netconfig/net-edit-rhel5.png
new file mode 100644
index 0000000..9f02d13
Binary files /dev/null and b/en-US/images/netconfig/net-edit-rhel5.png differ
diff --git a/en-US/images/netconfig/net-rhel5-s390.png b/en-US/images/netconfig/net-rhel5-s390.png
new file mode 100644
index 0000000..76d77a8
Binary files /dev/null and b/en-US/images/netconfig/net-rhel5-s390.png differ
diff --git a/en-US/images/netconfig/net-rhel5.png b/en-US/images/netconfig/net-rhel5.png
new file mode 100644
index 0000000..c94bd6a
Binary files /dev/null and b/en-US/images/netconfig/net-rhel5.png differ
diff --git a/en-US/images/netconfig/network-connections-802.1x.png b/en-US/images/netconfig/network-connections-802.1x.png
new file mode 100644
index 0000000..74654a7
Binary files /dev/null and b/en-US/images/netconfig/network-connections-802.1x.png differ
diff --git a/en-US/images/netconfig/network-connections-ipv4-manual-routes.png b/en-US/images/netconfig/network-connections-ipv4-manual-routes.png
new file mode 100644
index 0000000..d1048f1
Binary files /dev/null and b/en-US/images/netconfig/network-connections-ipv4-manual-routes.png differ
diff --git a/en-US/images/netconfig/network-connections-ipv4-manual.png b/en-US/images/netconfig/network-connections-ipv4-manual.png
new file mode 100644
index 0000000..04e1cf4
Binary files /dev/null and b/en-US/images/netconfig/network-connections-ipv4-manual.png differ
diff --git a/en-US/images/netconfig/network-connections-ipv6-ignore.png b/en-US/images/netconfig/network-connections-ipv6-ignore.png
new file mode 100644
index 0000000..b2dbb9d
Binary files /dev/null and b/en-US/images/netconfig/network-connections-ipv6-ignore.png differ
diff --git a/en-US/images/netconfig/network-connections-ipv6-manual-routes.png b/en-US/images/netconfig/network-connections-ipv6-manual-routes.png
new file mode 100644
index 0000000..ece4d93
Binary files /dev/null and b/en-US/images/netconfig/network-connections-ipv6-manual-routes.png differ
diff --git a/en-US/images/netconfig/network-connections-wired.png b/en-US/images/netconfig/network-connections-wired.png
new file mode 100644
index 0000000..e5978cd
Binary files /dev/null and b/en-US/images/netconfig/network-connections-wired.png differ
diff --git a/en-US/images/netconfig/network-connections-wireless.png b/en-US/images/netconfig/network-connections-wireless.png
new file mode 100644
index 0000000..01c241d
Binary files /dev/null and b/en-US/images/netconfig/network-connections-wireless.png differ
diff --git a/en-US/images/netconfig/network-connections.png b/en-US/images/netconfig/network-connections.png
new file mode 100644
index 0000000..29e85af
Binary files /dev/null and b/en-US/images/netconfig/network-connections.png differ
diff --git a/en-US/images/pkgselection/installing-packages.png b/en-US/images/pkgselection/installing-packages.png
new file mode 100644
index 0000000..f69aa02
Binary files /dev/null and b/en-US/images/pkgselection/installing-packages.png differ
diff --git a/en-US/images/pkgselection/pkg-group-context.png b/en-US/images/pkgselection/pkg-group-context.png
new file mode 100644
index 0000000..f4234f3
Binary files /dev/null and b/en-US/images/pkgselection/pkg-group-context.png differ
diff --git a/en-US/images/pkgselection/pkg-group.png b/en-US/images/pkgselection/pkg-group.png
index 5b44bd0..f075133 100644
Binary files a/en-US/images/pkgselection/pkg-group.png and b/en-US/images/pkgselection/pkg-group.png differ
diff --git a/en-US/images/pkgselection/starting-installation.png b/en-US/images/pkgselection/starting-installation.png
new file mode 100644
index 0000000..134540b
Binary files /dev/null and b/en-US/images/pkgselection/starting-installation.png differ
diff --git a/en-US/images/pseries/sms-console.png b/en-US/images/pseries/sms-console.png
new file mode 100644
index 0000000..e8666ed
Binary files /dev/null and b/en-US/images/pseries/sms-console.png differ
diff --git a/en-US/images/rhn/obtaining_rhel.png b/en-US/images/rhn/obtaining_rhel.png
new file mode 100644
index 0000000..c969d89
Binary files /dev/null and b/en-US/images/rhn/obtaining_rhel.png differ
diff --git a/en-US/images/s390/s390_overview.png b/en-US/images/s390/s390_overview.png
new file mode 100644
index 0000000..82aef0f
Binary files /dev/null and b/en-US/images/s390/s390_overview.png differ
diff --git a/en-US/images/storagedevices/assignstoragedevices-s390.png b/en-US/images/storagedevices/assignstoragedevices-s390.png
new file mode 100644
index 0000000..4118c71
Binary files /dev/null and b/en-US/images/storagedevices/assignstoragedevices-s390.png differ
diff --git a/en-US/images/storagedevices/selectstoragedevices-multipath.png b/en-US/images/storagedevices/selectstoragedevices-multipath.png
new file mode 100644
index 0000000..7f057cd
Binary files /dev/null and b/en-US/images/storagedevices/selectstoragedevices-multipath.png differ
diff --git a/en-US/images/storagedevices/selectstoragedevices-s390-basic.png b/en-US/images/storagedevices/selectstoragedevices-s390-basic.png
new file mode 100644
index 0000000..2372810
Binary files /dev/null and b/en-US/images/storagedevices/selectstoragedevices-s390-basic.png differ
diff --git a/en-US/images/storagedevices/selectstoragedevices-s390-multipath.png b/en-US/images/storagedevices/selectstoragedevices-s390-multipath.png
new file mode 100644
index 0000000..7f057cd
Binary files /dev/null and b/en-US/images/storagedevices/selectstoragedevices-s390-multipath.png differ
diff --git a/en-US/images/storagedevices/selectstoragedevices-s390-san.png b/en-US/images/storagedevices/selectstoragedevices-s390-san.png
new file mode 100644
index 0000000..636842a
Binary files /dev/null and b/en-US/images/storagedevices/selectstoragedevices-s390-san.png differ
diff --git a/en-US/images/storagedevices/selectstoragedevices-san.png b/en-US/images/storagedevices/selectstoragedevices-san.png
new file mode 100644
index 0000000..636842a
Binary files /dev/null and b/en-US/images/storagedevices/selectstoragedevices-san.png differ
diff --git a/en-US/images/storagedevices/storagedevices-specialized.png b/en-US/images/storagedevices/storagedevices-specialized.png
new file mode 100644
index 0000000..607f21c
Binary files /dev/null and b/en-US/images/storagedevices/storagedevices-specialized.png differ
diff --git a/en-US/images/storagedevices/unformatted-dasd-s390.png b/en-US/images/storagedevices/unformatted-dasd-s390.png
new file mode 100644
index 0000000..9195013
Binary files /dev/null and b/en-US/images/storagedevices/unformatted-dasd-s390.png differ
diff --git a/en-US/images/timezone/timezone-rhel5.png b/en-US/images/timezone/timezone-rhel5.png
new file mode 100644
index 0000000..8895d3f
Binary files /dev/null and b/en-US/images/timezone/timezone-rhel5.png differ
diff --git a/en-US/images/vnc/loader-vnc-or-text.png b/en-US/images/vnc/loader-vnc-or-text.png
new file mode 100644
index 0000000..1d317ab
Binary files /dev/null and b/en-US/images/vnc/loader-vnc-or-text.png differ
diff --git a/en-US/images/vnc/vnc-configuration.png b/en-US/images/vnc/vnc-configuration.png
new file mode 100644
index 0000000..5fdd4cd
Binary files /dev/null and b/en-US/images/vnc/vnc-configuration.png differ
diff --git a/en-US/images/welcome/install-number-beta1-rhel5.png b/en-US/images/welcome/install-number-beta1-rhel5.png
new file mode 100644
index 0000000..5003aac
Binary files /dev/null and b/en-US/images/welcome/install-number-beta1-rhel5.png differ
diff --git a/en-US/images/welcome/welcome-alpa1-rhel6.png b/en-US/images/welcome/welcome-alpa1-rhel6.png
new file mode 100644
index 0000000..f91bb0f
Binary files /dev/null and b/en-US/images/welcome/welcome-alpa1-rhel6.png differ
diff --git a/en-US/images/welcome/welcome-beta1-rhel5.png b/en-US/images/welcome/welcome-beta1-rhel5.png
new file mode 100644
index 0000000..2858405
Binary files /dev/null and b/en-US/images/welcome/welcome-beta1-rhel5.png differ
diff --git a/en-US/images/welcome/welcome.png b/en-US/images/welcome/welcome.png
index b92011f..690cbce 100644
Binary files a/en-US/images/welcome/welcome.png and b/en-US/images/welcome/welcome.png differ
diff --git a/en-US/images/x86-bootloader/x86-adv-bootloader-rhel5.png b/en-US/images/x86-bootloader/x86-adv-bootloader-rhel5.png
new file mode 100644
index 0000000..1bdd71e
Binary files /dev/null and b/en-US/images/x86-bootloader/x86-adv-bootloader-rhel5.png differ
diff --git a/en-US/images/x86-bootloader/x86-bootloader-rhel5.png b/en-US/images/x86-bootloader/x86-bootloader-rhel5.png
new file mode 100644
index 0000000..600e49e
Binary files /dev/null and b/en-US/images/x86-bootloader/x86-bootloader-rhel5.png differ
diff --git a/en-US/medialess.xml b/en-US/medialess.xml
index df6fb2a..3b9b1ff 100644
--- a/en-US/medialess.xml
+++ b/en-US/medialess.xml
@@ -11,14 +11,14 @@
 			This procedure assumes you are already using Fedora or another relatively modern Linux distribution, and the <application>GRUB</application> boot loader. It also assumes you are a somewhat experienced Linux user.
 		</para>
 	</important>
-	<note>
+<!-- FIG	<note>
 		<title>Preupgrade</title>
 		<para>
 			If you have an earlier version of Fedora installed on your system, you might be able to upgrade to Fedora &PRODVER; without making additional physical media by using the <application>preupgrade</application> tool. Refer to <xref linkend="ch-upgrade-x86"/> for details of using <application>preupgrade</application>. 
 		</para>
-	</note>
+	</note> -->
 	<para>
-		This section discusses how to install Fedora to your system without making any additional physical media.  Instead, you can use your existing <application>GRUB</application> boot loader to start the installation program.
+		This section discusses how to install Fedora on your system without making any additional physical media.  Instead, you can use your existing <application>GRUB</application> boot loader to start the installation program.
 	</para>
 
   <section id="sn-medialess-getting-files">
@@ -26,11 +26,11 @@
     <para>To perform an installation without media or a PXE server, your
       system must have two files stored locally, a kernel and an initial
       RAM disk.</para>
-    <procedure>
+<!--    <procedure>
       <step>
 	<para>Download a Live image or DVD distribution, or to locate an
 	  installation mirror, visit <ulink
-	    url="http://mirrors.fedoraproject.org/publiclist/Fedora/13/"/>.</para>
+	    url="http://mirrors.fedoraproject.org/publiclist/Fedora/11/"/>.</para>
       </step>
       <step>
 	<para>Locate the <filename
@@ -62,9 +62,9 @@
 	    perform a network installation.</para>
 	</note>
       </step>
-      <step>
+      <step> -->
 	<para>Copy the <filename>vmlinuz</filename> and
-	  <filename>initrd.img</filename> files from the chosen source
+	  <filename>initrd.img</filename> files from <!-- the chosen source --> a Fedora DVD (or DVD image) 
 	  to the <filename class="directory">/boot/</filename>
 	  directory, renaming them to
 	  <filename>vmlinuz-install</filename> and
@@ -72,8 +72,8 @@
 	  <systemitem class="username">root</systemitem> privileges to
 	  write files into the <filename
 	    class="directory">/boot/</filename> directory.</para>
-      </step>
-    </procedure>
+ <!--     </step>
+    </procedure> -->
   </section>
   <section id="sn-medialess-editing-grub-conf">
     <title>Editing the <application>GRUB</application>
@@ -134,3 +134,4 @@
       connecting to the remote system.</para>
   </section>
 </chapter>
+
diff --git a/en-US/networkconfig-fedora.xml b/en-US/networkconfig-fedora.xml
deleted file mode 100644
index d5f71e6..0000000
--- a/en-US/networkconfig-fedora.xml
+++ /dev/null
@@ -1,158 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
- "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-]>
-
-<!-- $Id: -->
-
-<section id="sn-networkconfig-fedora">
-  <title>Setting the Hostname</title>
-
-<!-- Indexterms -->
-<indexterm>
-      <primary>DHCP (Dynamic Host Configuration Protocol)</primary>
-    </indexterm>
-  <indexterm>
-    <primary>IPv4</primary>
-  </indexterm>
-  <indexterm>
-	<primary>hostname</primary>
-      </indexterm>
-  <indexterm> <primary>modem</primary>
-	</indexterm>
-<!-- end Indexterms -->
-
-    <para>
-	    Fedora contains support for both IPv4 and IPv6. However, by default, the installation program configures network interfaces on your computer for IPv4, and to use DHCP via <application>NetworkManager</application>. Currently <application>NetworkManager</application> does not support IPv6. If your network only supports IPv6 you should use <application>system-config-network</application> after installation to configure your network interfaces.
-    </para>
-
-  <para>
-	  Setup prompts you to supply a host name and domain name for this computer, in the format <replaceable>hostname</replaceable>.<replaceable>domainname</replaceable>. Many networks have a  DHCP (Dynamic Host Configuration Protocol) service that automatically supplies connected systems with a domain name, leaving the user to enter a hostname.
-  </para>
-  
-  <para>
-	  Unless you have a specific need to customize the host name and domain name, the default setting  <literal>localhost.localdomain</literal> is a good choice for most users.
-  </para>
-
-    	<figure float="0" id="fig-networkconfig-fedora"><title>Setting the hostname</title>
-		<mediaobject>
-			<imageobject><imagedata fileref="images/netconfig/hostname.png" format="PNG"/></imageobject>
-			<textobject><para>
-					Setting the hostname
-				</para>
-			</textobject>
-		</mediaobject>
-	</figure>
-    
-    <para>
-	    To set up a network that is behind an Internet firewall or router, you may want to use <systemitem class="fqdomainname"><replaceable>hostname</replaceable>.localdomain</systemitem> for your Fedora system.  If you have more than one computer on this network, you should give each one a separate host name in this domain.
-      </para>
-    <note>
-      <title>Valid Hostnames</title>
-      <para>
-	You may give your system any name provided that the full
-	hostname is unique.  The hostname may include letters, numbers
-	and hyphens.
-      </para>
-    </note>
-    
-        <para>
-	      On some networks, the DHCP provider also provides the name of the computer, or hostname. The complete hostname includes both the name of the machine and the name of the domain of which it is a member, such as <systemitem class="fqdomainname"><replaceable>machine1.example.com</replaceable></systemitem>. The machine name (or "short hostname") is <systemitem class="systemname"><replaceable>machine1</replaceable></systemitem>, and the <indexterm> <primary>domain name</primary> </indexterm> domain name is <systemitem class="domainname"><replaceable>example.com</replaceable></systemitem>.
-    </para>
-    
-    <para>If your Fedora system is connected
-      <emphasis>directly</emphasis> to the Internet, you must pay
-      attention to additional considerations to avoid service
-      interruptions or risk action by your upstream service provider.  A
-      full discussion of these issues is beyond the scope of this
-      document.</para>
-    
-
- <note>
-      <title>Modem Configuration</title>
-      <para>
-	The installation program does not configure modems.  Configure these devices after installation
-	with the <application>Network</application> utility. The
-	settings for your modem are specific to your particular Internet
-	Service Provider (ISP).
-      </para>
-    </note>
-
-<!--	<section id="sn-networkconfig-fedora_manual-configuration">
-	<title>Manual configuration</title>
-		<para>
-			Installations that require certain advanced configurations cannot succeed without network connectivity during the installation process, for example, installations on systems with ISCSI drives. In situations where successful installation depends upon correct network settings, the installation program will present you with a dialog that allows you to confirm these details. 
-		</para>
-		
-		    	<figure float="0" id="fig-networkconfig-net-edit"><title>Manual network configuration</title>
-				<mediaobject>
-					<imageobject><imagedata fileref="images/netconfig/net-edit.png" format="PNG"/></imageobject>
-					<textobject><para>
-							Manual network configuration
-						</para>
-					</textobject>
-				</mediaobject>
-			</figure>
-	
-		<para>
-			If your network does not have DHCP enabled, or if you need to override the DHCP settings, select the network interface that you plan to use from the <guilabel>Interfaces</guilabel> menu. Clear the checkbox for <guilabel>Use dynamic IP configuration (DHCP)</guilabel>. You can now enter an IPv4 address and netmask for this system in the form <replaceable>address</replaceable>&nbsp;/&nbsp;<replaceable>netmask</replaceable>, along with the gateway address and nameserver address for your network. 
-		</para>
-		
-		<para>
-			Click <guilabel>OK</guilabel> to accept these settings and continue.
-		</para>
-			  
-	</section>
-
-
-      <section id="sn-hostname">
-    <title>Hostname</title>
-  <section id="sn-network-misc-settings">
-    <title>Miscellaneous Settings</title>
-    <para>
-      To manually configure a network interface, you may also provide
-      other network settings for your computer. All of these settings
-      are the IP addresses of other systems on the network.
-    </para>
-
-    <para>
-      A <firstterm>gateway</firstterm> <indexterm>
-	<primary>gateway</primary>
-      </indexterm> is the device that provides access to other networks.
-      Gateways are also referred to as <indexterm>
-	<primary>router</primary>
-	<see>gateway</see>
-      </indexterm> <firstterm>routers</firstterm>.  If your system
-      connects to other networks through a gateway, enter its IP address
-      in the <guilabel>Gateway</guilabel> box.
-    </para>
-
-    <para>
-      Most software relies on the <indexterm>
-	<primary>DNS (Domain Name Service)</primary>
-      </indexterm> <firstterm>DNS</firstterm> (Domain Name Service)
-      provider to locate machines and services on the network.  DNS
-      converts hostnames to IP addresses and vice versa.  A Fedora system
-      may use more than one DNS server.  If the primary DNS server does
-      not respond, the computer sends any query to the secondary DNS
-      server, and so on.  To assign DNS servers, type their IP addresses
-      into the <guilabel>Primary DNS</guilabel> or <guilabel>Secondary
-	DNS</guilabel> boxes.
-    </para>
-
-    <para>
-      Select <guibutton>Next</guibutton> once you are satisfied with the
-      network settings for your system.
-    </para>
-
-  </section>
-Commented out this section since network configuration is really transparent now. DJN
--->
-</section>
-
-<!--
-Local variables:
-mode: xml
-fill-column: 72
-End:
--->
diff --git a/en-US/new-users.xml b/en-US/new-users.xml
index c7dc34f..2daf822 100644
--- a/en-US/new-users.xml
+++ b/en-US/new-users.xml
@@ -227,6 +227,12 @@
       </listitem>
       <listitem>
 	<formalpara>
+	  <title>Full Distribution on a set of CDs</title>
+	  <para>If the DVD image is too large for you to download conveniently, or you want to have a broad choice of software to install on a system with a CD drive but no DVD drive, you can download the full distribution as a set of CDs. The total size of the images that make up the CD set is approximately the same as the size of the DVD image. You can download the images that make up the CD set directly from a mirror, or via BitTorrent.</para>
+	</formalpara>
+      </listitem>
+      <listitem>
+	<formalpara>
 	  <title>Live Image</title>
 	  <para>If you want to try Fedora before you install it on
 	    your computer, download the Live image version. If your
@@ -290,6 +296,10 @@
 		<entry><filename>fedora/linux/releases/&PRODVER;/Fedora/<replaceable>arch</replaceable>/iso/Fedora-&PRODVER;-<replaceable>arch</replaceable>-DVD.iso</filename></entry>
 	      </row>
 	      <row>
+		<entry>Full distribution on a set of CDs</entry>
+		<entry><filename>fedora/linux/releases/&PRODVER;/Fedora/<replaceable>arch</replaceable>/iso/Fedora-&PRODVER;-<replaceable>arch</replaceable>-disc1.iso</filename>, <filename>fedora/linux/releases/&PRODVER;/Fedora/<replaceable>arch</replaceable>/iso/Fedora-&PRODVER;-<replaceable>arch</replaceable>-disc2.iso</filename>, <filename>fedora/linux/releases/&PRODVER;/Fedora/<replaceable>arch</replaceable>/iso/Fedora-&PRODVER;-<replaceable>arch</replaceable>-disc3.iso</filename>, and similar.</entry>
+	      </row>
+	      <row>
 		<entry>Live image</entry>
 		<entry><filename>fedora/linux/releases/&PRODVER;/Live/<replaceable>arch</replaceable>/iso/Fedora-&PRODVER;-<replaceable>arch</replaceable>-Live.iso</filename>, 
 		  <filename>fedora/linux/releases/&PRODVER;/Live/<replaceable>arch</replaceable>/iso/Fedora-&PRODVER;-KDE-<replaceable>arch</replaceable>-Live.iso</filename></entry>
diff --git a/en-US/no_busybox.xml b/en-US/no_busybox.xml
new file mode 100644
index 0000000..0f67299
--- /dev/null
+++ b/en-US/no_busybox.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<!DOCTYPE table PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+]> 
+
+<important>
+	<title>Important â€” anaconda no longer uses busybox</title>
+	<para>
+		The version of <application>anaconda</application> in previous releases of Fedora included a version of <application>busybox</application> that provided shell commands in the pre-installation and post-installation environments. The version of <application>anaconda</application> in Fedora&nbsp;14 no longer includes <application>busybox</application>, and uses GNU <application>bash</application> commands instead. 
+	</para>
+	<para>
+		Refer to <xref linkend="Alternatives_to_busybox"/> for more information.
+	</para>
+</important>
+  
+		
\ No newline at end of file
diff --git a/en-US/pre_and_post_commands.xml b/en-US/pre_and_post_commands.xml
new file mode 100644
index 0000000..6a8567d
--- /dev/null
+++ b/en-US/pre_and_post_commands.xml
@@ -0,0 +1,288 @@
+<?xml version="1.0"?>
+<!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+]> 
+
+<appendix id ="Alternatives_to_busybox">
+
+<title>Alternatives to busybox commands</title>
+
+<para>
+	Unlike previous releases of Fedora, Fedora&nbsp;14 does not include a version of <application>busybox</application> to provide shell commands in the pre-installation and post-installation environments. <xref linkend="tbl-command_alternatives"/> contains a list of <application>busybox</application> commands, equivalent ways to implement the same functionality in <application>bash</application>, and the availability of these alternatives in the %pre and %post environments. The table also indicates the exact path to the command, although you do not generally need to specify the path because the <envar>PATH</envar> environment variable is set in the installation environment.
+</para>
+
+<para>
+	If a command is only available in %post, the command is running on the target system and its availability therefore depends on whether the package that provides the command is installed. Every command that appears in the "New command or alternative" column of  <xref linkend="tbl-command_alternatives"/> is available for Fedora&nbsp;14, although not every command is available on every installed system. 
+</para>
+
+<para>
+	Where a command is listed as unavailable, you might be able to create equivalent functionality with a Python script. The Python language is available to %pre and %post script authors, complete with a set of Python modules ready for use.  Therefore, if a particular command is not available to you in the installation environment, we recommend that you use Python as the script language.
+</para>
+
+
+
+<table id ="tbl-command_alternatives">
+<title>Alternatives to busybox commands</title>
+<tgroup cols='4' align='left' colsep='1' rowsep='1'>
+<colspec colname='c1'/>
+<colspec colname='c2'/>
+<colspec colname='c3'/>
+<colspec colname='c4'/>
+<thead>
+<row>
+  <entry><phrase>Busybox command</phrase></entry>
+  <entry><parameter>%pre</parameter></entry>
+  <entry><parameter>%post</parameter></entry>
+  <entry>New command or alternative</entry>
+</row> 
+</thead>
+<tbody>
+<row><entry><command>addgroup</command></entry><entry><phrase>no</phrase></entry><entry><phrase>yes</phrase></entry><entry><command>/usr/sbin/groupadd</command></entry></row> 
+<row><entry><command>adduser</command></entry><entry><phrase>no</phrase></entry><entry><phrase>yes</phrase></entry><entry><command>/usr/sbin/useradd</command></entry></row> 
+<row><entry><command>adjtimex</command></entry><entry><phrase>no</phrase></entry><entry><phrase>no</phrase></entry><entry><phrase>none</phrase></entry></row> 
+<row><entry><command>ar</command></entry><entry><phrase>no</phrase></entry><entry><phrase>yes</phrase></entry><entry><command>/usr/bin/ar</command></entry></row> 
+<row><entry><command>arping</command></entry><entry><phrase>yes</phrase></entry><entry><phrase>yes</phrase></entry><entry><phrase><command>/sbin/arping</command> or <command>/usr/sbin/arping</command></phrase></entry></row> 
+<row><entry><command>ash</command></entry><entry><phrase>yes</phrase></entry><entry><phrase>yes</phrase></entry><entry><command>/bin/bash</command></entry></row> 
+<row><entry><command>awk</command></entry><entry><phrase>yes</phrase></entry><entry><phrase>yes</phrase></entry><entry><phrase><command>/sbin/awk</command>, <command>/sbin/gawk</command>, or <command>/usr/bin/gawk</command> <footnote><para>Fedora&nbsp;14 ships with GNU <application>awk</application> rather than the busybox <application>awk</application> in the installation environment.</para> </footnote></phrase></entry></row> 
+<row><entry><command>basename</command></entry><entry><phrase>yes</phrase></entry><entry><phrase>yes</phrase></entry><entry><phrase><command>/bin/bash</command> <footnote><para>GNU bash can provide basename functionality using string manipulation. If <envar>var="/usr/bin/command"</envar>, then <command>echo ${var##*/}</command> gives <command>command</command>.</para> </footnote>, <command>/usr/bin/basename</command></phrase></entry></row> 
+<row><entry><command>bbconfig</command></entry><entry><phrase>no</phrase></entry><entry><phrase>no</phrase></entry><entry><phrase>none â€” this command is a specific to <application>Busybox</application></phrase></entry></row> 
+<row><entry><command>bunzip2</command></entry><entry><phrase>yes</phrase></entry><entry><phrase>yes</phrase></entry><entry><phrase><command>/usr/bin/bunzip2</command>, <command>/usr/bin/bzip2 -d</command></phrase></entry></row> 
+<row><entry><command>busybox</command></entry><entry><phrase>no</phrase></entry><entry><phrase>no</phrase></entry><entry><phrase>none</phrase></entry></row> 
+<row><entry><command>bzcat</command></entry><entry><phrase>yes</phrase></entry><entry><phrase>yes</phrase></entry><entry><phrase><command>/usr/bin/bzcat</command>, <command>/usr/bin/bzip2 -dc</command></phrase></entry></row> 
+<row><entry><command>cal</command></entry><entry><phrase>no</phrase></entry><entry><phrase>yes</phrase></entry><entry><command>/usr/bin/cal</command></entry></row> 
+<row><entry><command>cat</command></entry><entry><phrase>yes</phrase></entry><entry><phrase>yes</phrase></entry><entry><command>/usr/bin/cat</command></entry></row> 
+<row><entry><command>catv</command></entry><entry><phrase>no</phrase></entry><entry><phrase>no</phrase></entry><entry><phrase><command>cat -vET</command> or <command>cat -A</command></phrase></entry></row> 
+<row><entry><command>chattr</command></entry><entry><phrase>yes</phrase></entry><entry><phrase>yes</phrase></entry><entry><command>/usr/bin/chattr</command></entry></row> 
+<row><entry><command>chgrp</command></entry><entry><phrase>yes</phrase></entry><entry><phrase>yes</phrase></entry><entry><command>/usr/bin/chgrp</command></entry></row> 
+<row><entry><command>chmod</command></entry><entry><phrase>yes</phrase></entry><entry><phrase>yes</phrase></entry><entry><command>/usr/bin/chmod</command></entry></row> 
+<row><entry><command>chown</command></entry><entry><phrase>yes</phrase></entry><entry><phrase>yes</phrase></entry><entry><command>/usr/bin/chown</command></entry></row> 
+<row><entry><command>chroot</command></entry><entry><phrase>yes</phrase></entry><entry><phrase>yes</phrase></entry><entry><command>/usr/sbin/chroot</command></entry></row> 
+<row><entry><command>chvt</command></entry><entry><phrase>yes</phrase></entry><entry><phrase>yes</phrase></entry><entry><command>/usr/bin/chvt</command></entry></row> 
+<row><entry><command>cksum</command></entry><entry><phrase>no</phrase></entry><entry><phrase>yes</phrase></entry><entry><command>/usr/bin/cksum</command></entry></row> 
+<row><entry><command>clear</command></entry><entry><phrase>yes</phrase></entry><entry><phrase>yes</phrase></entry><entry><command>/usr/bin/clear</command></entry></row> 
+<row><entry><command>cmp</command></entry><entry><phrase>no</phrase></entry><entry><phrase>yes</phrase></entry><entry><command>/usr/bin/cmp</command></entry></row> 
+<row><entry><command>comm</command></entry><entry><phrase>no</phrase></entry><entry><phrase>yes</phrase></entry><entry><command>/usr/bin/comm</command></entry></row> 
+<row><entry><command>cp</command></entry><entry><phrase>yes</phrase></entry><entry><phrase>yes</phrase></entry><entry><command>/usr/bin/cp</command></entry></row> 
+<row><entry><command>cpio</command></entry><entry><phrase>yes</phrase></entry><entry><phrase>yes</phrase></entry><entry><command>/usr/bin/cpio</command></entry></row> 
+<row><entry><command>crond</command></entry><entry><phrase>no</phrase></entry><entry><phrase>no</phrase></entry><entry><phrase>none â€” no daemons available to scriptlets</phrase></entry></row> 
+<row><entry><command>crontab</command></entry><entry><phrase>no</phrase></entry><entry><phrase>yes</phrase></entry><entry><command>/usr/bin/crontab</command></entry></row> 
+<row><entry><command>cut</command></entry><entry><phrase>yes</phrase></entry><entry><phrase>yes</phrase></entry><entry><command>/usr/bin/cut</command></entry></row> 
+<row><entry><command>date</command></entry><entry><phrase>yes</phrase></entry><entry><phrase>yes</phrase></entry><entry><command>/usr/bin/date</command></entry></row> 
+<row><entry><command>dc</command></entry><entry><phrase>no</phrase></entry><entry><phrase>yes</phrase></entry><entry><command>/usr/bin/dc</command></entry></row> 
+<row><entry><command>dd</command></entry><entry><phrase>yes</phrase></entry><entry><phrase>yes</phrase></entry><entry><command>/usr/bin/dd</command></entry></row> 
+<row><entry><command>deallocvt</command></entry><entry><phrase>no</phrase></entry><entry><phrase>yes</phrase></entry><entry><command>/usr/bin/deallocvt</command></entry></row> 
+<row><entry><command>delgroup</command></entry><entry><phrase>no</phrase></entry><entry><phrase>yes</phrase></entry><entry><command>/usr/sbin/groupdel</command></entry></row> 
+<row><entry><command>deluser</command></entry><entry><phrase>no</phrase></entry><entry><phrase>yes</phrase></entry><entry><command>/usr/sbin/userdel</command></entry></row> 
+<row><entry><command>devfsd</command></entry><entry><phrase>no</phrase></entry><entry><phrase>no</phrase></entry><entry><phrase>none â€” Fedora does not use <application>devfs</application></phrase></entry></row> 
+<row><entry><command>df</command></entry><entry><phrase>yes</phrase></entry><entry><phrase>yes</phrase></entry><entry><command>/usr/bin/df</command></entry></row> 
+<row><entry><command>diff</command></entry><entry><phrase>no</phrase></entry><entry><phrase>yes</phrase></entry><entry><command>/usr/bin/diff</command></entry></row> 
+<row><entry><command>dirname</command></entry><entry><phrase>yes</phrase></entry><entry><phrase>yes</phrase></entry><entry><phrase><command>/bin/bash</command> <footnote><para>GNU bash can provide dirname functionality using string manipulation.  If <envar>var="/usr/bin/command"</envar>, then <command>echo ${var%/*}</command> gives <filename>/usr/bin</filename>.
+</para> </footnote>, <command>/usr/bin/dirname</command></phrase></entry></row> 
+<row><entry><command>dmesg</command></entry><entry><phrase>yes</phrase></entry><entry><phrase>yes</phrase></entry><entry><command>/usr/bin/dmesg</command></entry></row> 
+<row><entry><command>dnsd</command></entry><entry><phrase>no</phrase></entry><entry><phrase>no</phrase></entry><entry><phrase>none â€” no daemons available to scriptlets</phrase></entry></row> 
+<row><entry><command>dos2unix</command></entry><entry><phrase>no</phrase></entry><entry><phrase>no</phrase></entry><entry><command>sed 's/.$//'</command></entry></row> 
+<row><entry><command>dpkg</command></entry><entry><phrase>no</phrase></entry><entry><phrase>no</phrase></entry><entry><phrase>none â€” no support for Debian packages</phrase></entry></row> 
+<row><entry><command>dpkg-deb</command></entry><entry><phrase>no</phrase></entry><entry><phrase>no</phrase></entry><entry><phrase>none â€” no support for Debian packages</phrase></entry></row> 
+<row><entry><command>du</command></entry><entry><phrase>yes</phrase></entry><entry><phrase>yes</phrase></entry><entry><command>/usr/bin/du</command></entry></row> 
+<row><entry><command>dumpkmap</command></entry><entry><phrase>no</phrase></entry><entry><phrase>no</phrase></entry><entry><phrase>none</phrase></entry></row> 
+<row><entry><command>dumpleases</command></entry><entry><phrase>no</phrase></entry><entry><phrase>no</phrase></entry><entry><phrase>none</phrase></entry></row> 
+<row><entry><command>e2fsck</command></entry><entry><phrase>yes</phrase></entry><entry><phrase>yes</phrase></entry><entry><command>/usr/sbin/e2fsck</command></entry></row> 
+<row><entry><command>e2label</command></entry><entry><phrase>yes</phrase></entry><entry><phrase>yes</phrase></entry><entry><command>/usr/sbin/e2label</command></entry></row> 
+<row><entry><command>echo</command></entry><entry><phrase>yes</phrase></entry><entry><phrase>yes</phrase></entry><entry><command>/usr/bin/echo</command></entry></row> 
+<row><entry><command>ed</command></entry><entry><phrase>no</phrase></entry><entry><phrase>no</phrase></entry><entry><phrase><command>/sbin/sed</command>, <command>/usr/bin/sed</command></phrase></entry></row> 
+<row><entry><command>egrep</command></entry><entry><phrase>yes</phrase></entry><entry><phrase>yes</phrase></entry><entry><phrase><command>/sbin/egrep</command>, <command>/usr/bin/egrep</command></phrase></entry></row> 
+<row><entry><command>eject</command></entry><entry><phrase>yes</phrase></entry><entry><phrase>yes</phrase></entry><entry><command>/usr/bin/eject</command></entry></row> 
+<row><entry><command>env</command></entry><entry><phrase>yes</phrase></entry><entry><phrase>yes</phrase></entry><entry><command>/usr/bin/env</command></entry></row> 
+<row><entry><command>ether-wake</command></entry><entry><phrase>no</phrase></entry><entry><phrase>no</phrase></entry><entry><phrase>none</phrase></entry></row> 
+<row><entry><command>expr</command></entry><entry><phrase>yes</phrase></entry><entry><phrase>yes</phrase></entry><entry><command>/usr/bin/expr</command></entry></row> 
+<row><entry><command>fakeidentd</command></entry><entry><phrase>no</phrase></entry><entry><phrase>no</phrase></entry><entry><phrase>none â€” no daemons available to scriptlets</phrase></entry></row> 
+<row><entry><command>false</command></entry><entry><phrase>yes</phrase></entry><entry><phrase>yes</phrase></entry><entry><command>/usr/bin/false</command></entry></row> 
+<row><entry><command>fbset</command></entry><entry><phrase>no</phrase></entry><entry><phrase>yes</phrase></entry><entry><command>/usr/sbin/fbset</command></entry></row> 
+<row><entry><command>fdflush</command></entry><entry><phrase>no</phrase></entry><entry><phrase>no</phrase></entry><entry><phrase>none</phrase></entry></row> 
+<row><entry><command>fdformat</command></entry><entry><phrase>no</phrase></entry><entry><phrase>yes</phrase></entry><entry><command>/usr/bin/fdformat</command></entry></row> 
+<row><entry><command>fdisk</command></entry><entry><phrase>yes</phrase></entry><entry><phrase>yes</phrase></entry><entry><command>/usr/sbin/fdisk</command></entry></row> 
+<row><entry><command>fgrep</command></entry><entry><phrase>yes</phrase></entry><entry><phrase>yes</phrase></entry><entry><command>/sbin/fgrep</command>, <command>/usr/bin/fgrep</command></entry></row> 
+<row><entry><command>find</command></entry><entry><phrase>yes</phrase></entry><entry><phrase>yes</phrase></entry><entry><command>/usr/bin/find</command></entry></row> 
+<row><entry><command>findfs</command></entry><entry><phrase>no</phrase></entry><entry><phrase>no</phrase></entry><entry><phrase>none</phrase></entry></row> 
+<row><entry><command>fold</command></entry><entry><phrase>no</phrase></entry><entry><phrase>yes</phrase></entry><entry><command>/usr/bin/fold</command></entry></row> 
+<row><entry><command>free</command></entry><entry><phrase>no</phrase></entry><entry><phrase>yes</phrase></entry><entry><command>/usr/bin/free</command></entry></row> 
+<row><entry><command>freeramdisk</command></entry><entry><phrase>no</phrase></entry><entry><phrase>no</phrase></entry><entry><phrase>none</phrase></entry></row> 
+<row><entry><command>fsck</command></entry><entry><phrase>yes</phrase></entry><entry><phrase>yes</phrase></entry><entry><command>/usr/sbin/fsck</command></entry></row> 
+<row><entry><command>fsck.ext2</command></entry><entry><phrase>yes</phrase></entry><entry><phrase>yes</phrase></entry><entry><command>/usr/sbin/fsck.ext2</command>, <command>/usr/sbin/e2fsck</command></entry></row> 
+<row><entry><command>fsck.ext3</command></entry><entry><phrase>yes</phrase></entry><entry><phrase>yes</phrase></entry><entry><command>/usr/sbin/fsck.ext3</command>, <command>/usr/sbin/e2fsck</command></entry></row> 
+<row><entry><command>fsck.minix</command></entry><entry><phrase>no</phrase></entry><entry><phrase>no</phrase></entry><entry><phrase>none â€” no support for the Minix file system</phrase></entry></row> 
+<row><entry><command>ftpget</command></entry><entry><phrase>yes</phrase></entry><entry><phrase>yes</phrase></entry><entry><phrase><command>/usr/bin/ftp</command> or Python <application>ftplib</application> module</phrase></entry></row> 
+<row><entry><command>ftpput</command></entry><entry><phrase>yes</phrase></entry><entry><phrase>yes</phrase></entry><entry><phrase><command>/usr/bin/ftp</command> or Python <application>ftplib</application> module</phrase></entry></row> 
+<row><entry><command>fuser</command></entry><entry><phrase>no</phrase></entry><entry><phrase>yes</phrase></entry><entry><command>/sbin/fuser</command></entry></row> 
+<row><entry><command>getopt</command></entry><entry><phrase>no</phrase></entry><entry><phrase>yes</phrase></entry><entry><command>/usr/bin/getopt</command></entry></row> 
+<row><entry><command>getty</command></entry><entry><phrase>no</phrase></entry><entry><phrase>no</phrase></entry><entry><phrase>none</phrase></entry></row> 
+<row><entry><command>grep</command></entry><entry><phrase>yes</phrase></entry><entry><phrase>yes</phrase></entry><entry><command>/sbin/grep</command>, <command>/usr/bin/grep</command></entry></row> 
+<row><entry><command>gunzip</command></entry><entry><phrase>yes</phrase></entry><entry><phrase>yes</phrase></entry><entry><command>/usr/bin/gunzip</command>, <command>/usr/bin/gzip -d</command></entry></row> 
+<row><entry><command>gzip</command></entry><entry><phrase>yes</phrase></entry><entry><phrase>yes</phrase></entry><entry><command>/usr/bin/gzip</command></entry></row> 
+<row><entry><command>hdparm</command></entry><entry><phrase>yes</phrase></entry><entry><phrase>yes</phrase></entry><entry><command>/usr/sbin/hdparm</command></entry></row> 
+<row><entry><command>head</command></entry><entry><phrase>yes</phrase></entry><entry><phrase>yes</phrase></entry><entry><command>/usr/bin/head</command></entry></row> 
+<row><entry><command>hexdump</command></entry><entry><phrase>no</phrase></entry><entry><phrase>yes</phrase></entry><entry><command>/usr/bin/hexdump</command></entry></row> 
+<row><entry><command>hostid</command></entry><entry><phrase>no</phrase></entry><entry><phrase>yes</phrase></entry><entry><command>/usr/bin/hostid or Python</command></entry></row> 
+<row><entry><command>hostname</command></entry><entry><phrase>yes</phrase></entry><entry><phrase>yes</phrase></entry><entry><command>/sbin/hostname</command>, <command>/usr/bin/hostname</command></entry></row> 
+<row><entry><command>httpd</command></entry><entry><phrase>no</phrase></entry><entry><phrase>no</phrase></entry><entry><phrase>none â€” no daemons available to scriptlets</phrase></entry></row> 
+<row><entry><command>hush</command></entry><entry><phrase>no</phrase></entry><entry><phrase>no</phrase></entry><entry><phrase>none</phrase></entry></row> 
+<row><entry><command>hwclock</command></entry><entry><phrase>yes</phrase></entry><entry><phrase>yes</phrase></entry><entry><command>/usr/sbin/hwclock</command></entry></row> 
+<row><entry><command>id</command></entry><entry><phrase>no</phrase></entry><entry><phrase>yes</phrase></entry><entry><command>/usr/bin/id</command> or Python</entry></row> 
+<row><entry><command>ifconfig</command></entry><entry><phrase>yes</phrase></entry><entry><phrase>yes</phrase></entry><entry><command>/sbin/ifconfig</command>, <command>/usr/sbin/ifconfig</command></entry></row> 
+<row><entry><command>ifdown</command></entry><entry><phrase>no</phrase></entry><entry><phrase>no</phrase></entry><entry><command>ifconfig <replaceable>device</replaceable> down</command></entry></row> 
+<row><entry><command>ifup</command></entry><entry><phrase>no</phrase></entry><entry><phrase>no</phrase></entry><entry><command>ifconfig <replaceable>device</replaceable> up</command></entry></row> 
+<row><entry><command>inetd</command></entry><entry><phrase>no</phrase></entry><entry><phrase>no</phrase></entry><entry><phrase>none â€” no daemons available to scriptlets</phrase></entry></row> 
+<row><entry><command>insmod</command></entry><entry><phrase>yes</phrase></entry><entry><phrase>yes</phrase></entry><entry><command>/sbin/insmod</command>, <command>/usr/sbin/insmod</command></entry></row> 
+<row><entry><command>install</command></entry><entry><phrase>no</phrase></entry><entry><phrase>yes</phrase></entry><entry><command>/usr/bin/install or mkdir/cp/chmod/chown/chgrp</command></entry></row> 
+<row><entry><command>ip</command></entry><entry><phrase>yes</phrase></entry><entry><phrase>yes</phrase></entry><entry><command>/sbin/ip</command>, <command>/usr/sbin/ip</command></entry></row> 
+<row><entry><command>ipaddr</command></entry><entry><phrase>no</phrase></entry><entry><phrase>no</phrase></entry><entry><command>ifconfig</command> or <command>ip</command></entry></row> 
+<row><entry><command>ipcalc</command></entry><entry><phrase>yes</phrase></entry><entry><phrase>yes</phrase></entry><entry><command>/sbin/ipcalc</command>, <command>/usr/bin/ipcalc</command></entry></row> 
+<row><entry><command>ipcrm</command></entry><entry><phrase>no</phrase></entry><entry><phrase>yes</phrase></entry><entry><command>/usr/bin/ipcrm</command></entry></row> 
+<row><entry><command>ipcs</command></entry><entry><phrase>no</phrase></entry><entry><phrase>yes</phrase></entry><entry><command>/usr/bin/ipcs</command></entry></row> 
+<row><entry><command>iplink</command></entry><entry><phrase>no</phrase></entry><entry><phrase>no</phrase></entry><entry><command>ip</command></entry></row> 
+<row><entry><command>iproute</command></entry><entry><phrase>no</phrase></entry><entry><phrase>no</phrase></entry><entry><command>ip</command></entry></row> 
+<row><entry><command>iptunnel</command></entry><entry><phrase>no</phrase></entry><entry><phrase>yes</phrase></entry><entry><command>/sbin/iptunnel</command></entry></row> 
+<row><entry><command>kill</command></entry><entry><phrase>yes</phrase></entry><entry><phrase>yes</phrase></entry><entry><command>/sbin/kill</command>, <command>/usr/bin/kill</command></entry></row> 
+<row><entry><command>killall</command></entry><entry><phrase>yes</phrase></entry><entry><phrase>yes</phrase></entry><entry><command>/usr/bin/killall</command></entry></row> 
+<row><entry><command>lash</command></entry><entry><phrase>no</phrase></entry><entry><phrase>no</phrase></entry><entry><phrase>none</phrase></entry></row> 
+<row><entry><command>last</command></entry><entry><phrase>no</phrase></entry><entry><phrase>yes</phrase></entry><entry><command>/usr/bin/last</command></entry></row> 
+<row><entry><command>length</command></entry><entry><phrase>no</phrase></entry><entry><phrase>no</phrase></entry><entry><phrase>Python or bash</phrase></entry></row> 
+<row><entry><command>less</command></entry><entry><phrase>yes</phrase></entry><entry><phrase>yes</phrase></entry><entry><command>/usr/bin/less</command></entry></row> 
+<row><entry><command>linux32</command></entry><entry><phrase>no</phrase></entry><entry><phrase>no</phrase></entry><entry><phrase>none</phrase></entry></row> 
+<row><entry><command>linux64</command></entry><entry><phrase>no</phrase></entry><entry><phrase>no</phrase></entry><entry><phrase>none</phrase></entry></row> 
+<row><entry><command>ln</command></entry><entry><phrase>yes</phrase></entry><entry><phrase>yes</phrase></entry><entry><command>/sbin/ln</command>, <command>/usr/bin/ln</command></entry></row> 
+<row><entry><command>load_policy</command></entry><entry><phrase>yes</phrase></entry><entry><phrase>yes</phrase></entry><entry><command>/sbin/load_policy</command>, <command>/usr/sbin/load_policy</command></entry></row> 
+<row><entry><command>loadfont</command></entry><entry><phrase>no</phrase></entry><entry><phrase>no</phrase></entry><entry><phrase>none</phrase></entry></row> 
+<row><entry><command>loadkmap</command></entry><entry><phrase>no</phrase></entry><entry><phrase>no</phrase></entry><entry><phrase>none</phrase></entry></row> 
+<row><entry><command>login</command></entry><entry><phrase>yes</phrase></entry><entry><phrase>yes</phrase></entry><entry><command>/usr/bin/login</command></entry></row> 
+<row><entry><command>logname</command></entry><entry><phrase>no</phrase></entry><entry><phrase>yes</phrase></entry><entry><command>/usr/bin/logname</command></entry></row> 
+<row><entry><command>losetup</command></entry><entry><phrase>yes</phrase></entry><entry><phrase>yes</phrase></entry><entry><command>/usr/bin/losetup</command></entry></row> 
+<row><entry><command>ls</command></entry><entry><phrase>yes</phrase></entry><entry><phrase>yes</phrase></entry><entry><command>/usr/bin/ls</command></entry></row> 
+<row><entry><command>lsattr</command></entry><entry><phrase>yes</phrase></entry><entry><phrase>yes</phrase></entry><entry><command>/usr/bin/lsattr</command></entry></row> 
+<row><entry><command>lsmod</command></entry><entry><phrase>yes</phrase></entry><entry><phrase>yes</phrase></entry><entry><command>/usr/bin/lsmod</command></entry></row> 
+<row><entry><command>lzmacat</command></entry><entry><phrase>no</phrase></entry><entry><phrase>yes</phrase></entry><entry><command>/usr/bin/lzmadec</command></entry></row> 
+<row><entry><command>makedevs</command></entry><entry><phrase>no</phrase></entry><entry><phrase>no</phrase></entry><entry><command>/usr/bin/mknod</command></entry></row> 
+<row><entry><command>md5sum</command></entry><entry><phrase>yes</phrase></entry><entry><phrase>yes</phrase></entry><entry><command>/usr/bin/md5sum</command></entry></row> 
+<row><entry><command>mdev</command></entry><entry><phrase>no</phrase></entry><entry><phrase>no</phrase></entry><entry><phrase>none</phrase></entry></row> 
+<row><entry><command>mesg</command></entry><entry><phrase>no</phrase></entry><entry><phrase>yes</phrase></entry><entry><command>/usr/bin/mesg</command></entry></row> 
+<row><entry><command>mkdir</command></entry><entry><phrase>yes</phrase></entry><entry><phrase>yes</phrase></entry><entry><command>/sbin/mkdir</command>, <command>/usr/bin/mkdir</command></entry></row> 
+<row><entry><command>mke2fs</command></entry><entry><phrase>yes</phrase></entry><entry><phrase>yes</phrase></entry><entry><command>/usr/sbin/mke2fs</command></entry></row> 
+<row><entry><command>mkfifo</command></entry><entry><phrase>no</phrase></entry><entry><phrase>yes</phrase></entry><entry><command>/usr/bin/mkfifo</command></entry></row> 
+<row><entry><command>mkfs.ext2</command></entry><entry><phrase>yes</phrase></entry><entry><phrase>yes</phrase></entry><entry><command>/usr/sbin/mkfs.ext2</command></entry></row> 
+<row><entry><command>mkfs.ext3</command></entry><entry><phrase>yes</phrase></entry><entry><phrase>yes</phrase></entry><entry><command>/usr/sbin/mkfs.ext3</command></entry></row> 
+<row><entry><command>mkfs.minix</command></entry><entry><phrase>no</phrase></entry><entry><phrase>no</phrase></entry><entry><phrase>none â€” no support for Minix filesystem</phrase></entry></row> 
+<row><entry><command>mknod</command></entry><entry><phrase>yes</phrase></entry><entry><phrase>yes</phrase></entry><entry><command>/usr/bin/mknod</command></entry></row> 
+<row><entry><command>mkswap</command></entry><entry><phrase>yes</phrase></entry><entry><phrase>yes</phrase></entry><entry><command>/usr/sbin/mkswap</command></entry></row> 
+<row><entry><command>mktemp</command></entry><entry><phrase>yes</phrase></entry><entry><phrase>yes</phrase></entry><entry><command>/usr/bin/mktemp</command></entry></row> 
+<row><entry><command>modprobe</command></entry><entry><phrase>yes</phrase></entry><entry><phrase>yes</phrase></entry><entry><command>/sbin/modprobe</command>, <command>/usr/sbin/modprobe</command></entry></row> 
+<row><entry><command>more</command></entry><entry><phrase>yes</phrase></entry><entry><phrase>yes</phrase></entry><entry><command>/usr/bin/more</command></entry></row> 
+<row><entry><command>mount</command></entry><entry><phrase>yes</phrase></entry><entry><phrase>yes</phrase></entry><entry><command>/sbin/mount</command>, <command>/usr/bin/mount</command></entry></row> 
+<row><entry><command>mountpoint</command></entry><entry><phrase>no</phrase></entry><entry><phrase>no</phrase></entry><entry><phrase>Look at the output of the mount command</phrase></entry></row> 
+<row><entry><command>msh</command></entry><entry><phrase>no</phrase></entry><entry><phrase>no</phrase></entry><entry><phrase>none</phrase></entry></row> 
+<row><entry><command>mt</command></entry><entry><phrase>yes</phrase></entry><entry><phrase>yes</phrase></entry><entry><command>/usr/bin/mt</command></entry></row> 
+<row><entry><command>mv</command></entry><entry><phrase>yes</phrase></entry><entry><phrase>yes</phrase></entry><entry><command>/usr/bin/mv</command></entry></row> 
+<row><entry><command>nameif</command></entry><entry><phrase>no</phrase></entry><entry><phrase>no</phrase></entry><entry><phrase>none</phrase></entry></row> 
+<row><entry><command>nc</command></entry><entry><phrase>no</phrase></entry><entry><phrase>yes</phrase></entry><entry><command>/usr/bin/nc</command></entry></row> 
+<row><entry><command>netstat</command></entry><entry><phrase>no</phrase></entry><entry><phrase>yes</phrase></entry><entry><command>/bin/netstat</command></entry></row> 
+<row><entry><command>nice</command></entry><entry><phrase>no</phrase></entry><entry><phrase>yes</phrase></entry><entry><command>/bin/nice</command></entry></row> 
+<row><entry><command>nohup</command></entry><entry><phrase>no</phrase></entry><entry><phrase>yes</phrase></entry><entry><command>/usr/bin/nohup</command></entry></row> 
+<row><entry><command>nslookup</command></entry><entry><phrase>yes</phrase></entry><entry><phrase>yes</phrase></entry><entry><command>/usr/bin/nslookup</command></entry></row> 
+<row><entry><command>od</command></entry><entry><phrase>no</phrase></entry><entry><phrase>yes</phrase></entry><entry><command>/usr/bin/od</command></entry></row> 
+<row><entry><command>openvt</command></entry><entry><phrase>yes</phrase></entry><entry><phrase>yes</phrase></entry><entry><command>/usr/bin/openvt</command></entry></row> 
+<row><entry><command>passwd</command></entry><entry><phrase>no</phrase></entry><entry><phrase>yes</phrase></entry><entry><command>/usr/bin/passwd</command></entry></row> 
+<row><entry><command>patch</command></entry><entry><phrase>no</phrase></entry><entry><phrase>yes</phrase></entry><entry><command>/usr/bin/patch</command></entry></row> 
+<row><entry><command>pidof</command></entry><entry><phrase>yes</phrase></entry><entry><phrase>yes</phrase></entry><entry><command>/usr/sbin/pidof</command></entry></row> 
+<row><entry><command>ping</command></entry><entry><phrase>yes</phrase></entry><entry><phrase>yes</phrase></entry><entry><command>/usr/bin/ping</command></entry></row> 
+<row><entry><command>ping6</command></entry><entry><phrase>no</phrase></entry><entry><phrase>yes</phrase></entry><entry><command>/bin/ping6</command></entry></row> 
+<row><entry><command>pipe_progress</command></entry><entry><phrase>no</phrase></entry><entry><phrase>no</phrase></entry><entry><phrase>none</phrase></entry></row> 
+<row><entry><command>pivot_root</command></entry><entry><phrase>no</phrase></entry><entry><phrase>yes</phrase></entry><entry><command>/sbin/pivot_root</command></entry></row> 
+<row><entry><command>printenv</command></entry><entry><phrase>no</phrase></entry><entry><phrase>yes</phrase></entry><entry><command>/usr/bin/printenv</command></entry></row> 
+<row><entry><command>printf</command></entry><entry><phrase>no</phrase></entry><entry><phrase>yes</phrase></entry><entry><command>/usr/bin/printf</command></entry></row> 
+<row><entry><command>ps</command></entry><entry><phrase>yes</phrase></entry><entry><phrase>yes</phrase></entry><entry><command>/usr/bin/ps</command></entry></row> 
+<row><entry><command>pwd</command></entry><entry><phrase>yes</phrase></entry><entry><phrase>yes</phrase></entry><entry><command>/usr/bin/pwd</command></entry></row> 
+<row><entry><command>rdate</command></entry><entry><phrase>no</phrase></entry><entry><phrase>yes</phrase></entry><entry><command>/usr/bin/rdate</command></entry></row> 
+<row><entry><command>readlink</command></entry><entry><phrase>yes</phrase></entry><entry><phrase>yes</phrase></entry><entry><command>/sbin/readlink</command>, <command>/usr/bin/readlink</command></entry></row> 
+<row><entry><command>readprofile</command></entry><entry><phrase>no</phrase></entry><entry><phrase>yes</phrase></entry><entry><command>/usr/sbin/readprofile</command></entry></row> 
+<row><entry><command>realpath</command></entry><entry><phrase>no</phrase></entry><entry><phrase>no</phrase></entry><entry><phrase>Python <code>os.path.realpath()</code></phrase></entry></row> 
+<row><entry><command>renice</command></entry><entry><phrase>no</phrase></entry><entry><phrase>yes</phrase></entry><entry><command>/usr/bin/renice</command></entry></row> 
+<row><entry><command>reset</command></entry><entry><phrase>no</phrase></entry><entry><phrase>yes</phrase></entry><entry><command>/usr/bin/reset</command></entry></row> 
+<row><entry><command>rm</command></entry><entry><phrase>yes</phrase></entry><entry><phrase>yes</phrase></entry><entry><command>/sbin/rm</command>, <command>/usr/bin/rm</command></entry></row> 
+<row><entry><command>rmdir</command></entry><entry><phrase>yes</phrase></entry><entry><phrase>yes</phrase></entry><entry><command>/sbin/rmdir</command>, <command>/usr/bin/rmdir</command></entry></row> 
+<row><entry><command>rmmod</command></entry><entry><phrase>yes</phrase></entry><entry><phrase>yes</phrase></entry><entry><command>/sbin/rmmod</command>, <command>/usr/bin/rmmod</command></entry></row> 
+<row><entry><command>route</command></entry><entry><phrase>yes</phrase></entry><entry><phrase>yes</phrase></entry><entry><command>/sbin/route</command>, <command>/usr/sbin/route</command></entry></row> 
+<row><entry><command>rpm</command></entry><entry><phrase>yes</phrase></entry><entry><phrase>yes</phrase></entry><entry><command>/usr/bin/rpm</command></entry></row> 
+<row><entry><command>rpm2cpio</command></entry><entry><phrase>no</phrase></entry><entry><phrase>yes</phrase></entry><entry><command>/usr/bin/rpm2cpio</command></entry></row> 
+<row><entry><command>run-parts</command></entry><entry><phrase>no</phrase></entry><entry><phrase>no</phrase></entry><entry><phrase>none</phrase></entry></row> 
+<row><entry><command>runlevel</command></entry><entry><phrase>no</phrase></entry><entry><phrase>no</phrase></entry><entry><phrase>none</phrase></entry></row> 
+<row><entry><command>rx</command></entry><entry><phrase>no</phrase></entry><entry><phrase>no</phrase></entry><entry><phrase>none</phrase></entry></row> 
+<row><entry><command>sed</command></entry><entry><phrase>yes</phrase></entry><entry><phrase>yes</phrase></entry><entry><command>/sbin/sed</command>, <command>/usr/bin/sed</command></entry></row> 
+<row><entry><command>seq</command></entry><entry><phrase>no</phrase></entry><entry><phrase>yes</phrase></entry><entry><command>/usr/bin/seq</command></entry></row> 
+<row><entry><command>setarch</command></entry><entry><phrase>no</phrase></entry><entry><phrase>yes</phrase></entry><entry><command>/usr/bin/setarch</command></entry></row> 
+<row><entry><command>setconsole</command></entry><entry><phrase>no</phrase></entry><entry><phrase>no</phrase></entry><entry><phrase>none</phrase></entry></row> 
+<row><entry><command>setkeycodes</command></entry><entry><phrase>no</phrase></entry><entry><phrase>yes</phrase></entry><entry><command>/usr/bin/setkeycodes</command></entry></row> 
+<row><entry><command>setlogcons</command></entry><entry><phrase>no</phrase></entry><entry><phrase>no</phrase></entry><entry><phrase>none</phrase></entry></row> 
+<row><entry><command>setsid</command></entry><entry><phrase>no</phrase></entry><entry><phrase>yes</phrase></entry><entry><command>/usr/bin/setsid</command></entry></row> 
+<row><entry><command>sh</command></entry><entry><phrase>yes</phrase></entry><entry><phrase>yes</phrase></entry><entry><command>/sbin/sh</command>, <command>/usr/bin/sh</command></entry></row> 
+<row><entry><command>sha1sum</command></entry><entry><phrase>yes</phrase></entry><entry><phrase>yes</phrase></entry><entry><command>/usr/bin/sha1sum</command></entry></row> 
+<row><entry><command>sleep</command></entry><entry><phrase>yes</phrase></entry><entry><phrase>yes</phrase></entry><entry><command>/sbin/sleep</command>, <command>/usr/bin/sleep</command></entry></row> 
+<row><entry><command>sort</command></entry><entry><phrase>yes</phrase></entry><entry><phrase>yes</phrase></entry><entry><command>/usr/bin/sort</command></entry></row> 
+<row><entry><command>start-stop-daemon</command></entry><entry><phrase>no</phrase></entry><entry><phrase>no</phrase></entry><entry><phrase>none</phrase></entry></row> 
+<row><entry><command>stat</command></entry><entry><phrase>no</phrase></entry><entry><phrase>yes</phrase></entry><entry><phrase><command>/usr/bin/stat</command> or Python <code>os.stat()</code></phrase></entry></row> 
+<row><entry><command>strings</command></entry><entry><phrase>no</phrase></entry><entry><phrase>yes</phrase></entry><entry><command>/usr/bin/strings</command></entry></row> 
+<row><entry><command>stty</command></entry><entry><phrase>no</phrase></entry><entry><phrase>yes</phrase></entry><entry><command>/bin/stty</command></entry></row> 
+<row><entry><command>su</command></entry><entry><phrase>no</phrase></entry><entry><phrase>yes</phrase></entry><entry><command>/bin/su</command></entry></row> 
+<row><entry><command>sulogin</command></entry><entry><phrase>no</phrase></entry><entry><phrase>yes</phrase></entry><entry><command>/sbin/sulogin</command></entry></row> 
+<row><entry><command>sum</command></entry><entry><phrase>no</phrase></entry><entry><phrase>yes</phrase></entry><entry><command>/usr/bin/sum</command></entry></row> 
+<row><entry><command>swapoff</command></entry><entry><phrase>yes</phrase></entry><entry><phrase>yes</phrase></entry><entry><command>/usr/sbin/swapoff</command></entry></row> 
+<row><entry><command>swapon</command></entry><entry><phrase>yes</phrase></entry><entry><phrase>yes</phrase></entry><entry><command>/usr/sbin/swapon</command></entry></row> 
+<row><entry><command>switch_root</command></entry><entry><phrase>no</phrase></entry><entry><phrase>yes</phrase></entry><entry><command>/sbin/switch_root</command></entry></row> 
+<row><entry><command>sync</command></entry><entry><phrase>yes</phrase></entry><entry><phrase>yes</phrase></entry><entry><command>/usr/bin/sync</command></entry></row> 
+<row><entry><command>sysctl</command></entry><entry><phrase>no</phrase></entry><entry><phrase>yes</phrase></entry><entry><command>/sbin/sysctl</command></entry></row> 
+<row><entry><command>tail</command></entry><entry><phrase>yes</phrase></entry><entry><phrase>yes</phrase></entry><entry><command>/usr/bin/tail</command></entry></row> 
+<row><entry><command>tar</command></entry><entry><phrase>yes</phrase></entry><entry><phrase>yes</phrase></entry><entry><command>/usr/bin/tar</command></entry></row> 
+<row><entry><command>tee</command></entry><entry><phrase>yes</phrase></entry><entry><phrase>yes</phrase></entry><entry><command>/usr/bin/tee</command></entry></row> 
+<row><entry><command>telnet</command></entry><entry><phrase>yes</phrase></entry><entry><phrase>yes</phrase></entry><entry><command>/usr/bin/telnet</command></entry></row> 
+<row><entry><command>telnetd</command></entry><entry><phrase>no</phrase></entry><entry><phrase>no</phrase></entry><entry><phrase>none â€” no daemons available to scriptlets</phrase></entry></row> 
+<row><entry><command>test</command></entry><entry><phrase>no</phrase></entry><entry><phrase>yes</phrase></entry><entry><phrase><command>/usr/bin/test</command> or <code>[</code> in bash</phrase></entry></row> 
+<row><entry><command>tftp</command></entry><entry><phrase>no</phrase></entry><entry><phrase>yes</phrase></entry><entry><command>/usr/bin/tftp</command></entry></row> 
+<row><entry><command>time</command></entry><entry><phrase>no</phrase></entry><entry><phrase>yes</phrase></entry><entry><phrase><command>/usr/bin/time</command> or Python</phrase></entry></row> 
+<row><entry><command>top</command></entry><entry><phrase>yes</phrase></entry><entry><phrase>yes</phrase></entry><entry><command>/usr/bin/top</command></entry></row> 
+<row><entry><command>touch</command></entry><entry><phrase>yes</phrase></entry><entry><phrase>yes</phrase></entry><entry><command>/sbin/touch</command>, <command>/usr/bin/touch</command></entry></row> 
+<row><entry><command>tr</command></entry><entry><phrase>no</phrase></entry><entry><phrase>yes</phrase></entry><entry><phrase><command>/usr/bin/tr</command> or Python</phrase></entry></row> 
+<row><entry><command>traceroute</command></entry><entry><phrase>no</phrase></entry><entry><phrase>yes</phrase></entry><entry><command>/bin/traceroute</command></entry></row> 
+<row><entry><command>true</command></entry><entry><phrase>yes</phrase></entry><entry><phrase>yes</phrase></entry><entry><command>/usr/bin/true</command></entry></row> 
+<row><entry><command>tty</command></entry><entry><phrase>no</phrase></entry><entry><phrase>yes</phrase></entry><entry><command>/usr/bin/tty</command></entry></row> 
+<row><entry><command>tune2fs</command></entry><entry><phrase>yes</phrase></entry><entry><phrase>yes</phrase></entry><entry><command>/usr/sbin/tune2fs</command></entry></row> 
+<row><entry><command>udhcpc</command></entry><entry><phrase>no</phrase></entry><entry><phrase>no</phrase></entry><entry><command>/sbin/dhclient</command></entry></row> 
+<row><entry><command>udhcpd</command></entry><entry><phrase>no</phrase></entry><entry><phrase>no</phrase></entry><entry><phrase>none â€” no daemons available to scriptlets</phrase></entry></row> 
+<row><entry><command>umount</command></entry><entry><phrase>yes</phrase></entry><entry><phrase>yes</phrase></entry><entry><command>/sbin/umount</command>, <command>/usr/bin/umount</command></entry></row> 
+<row><entry><command>uname</command></entry><entry><phrase>no</phrase></entry><entry><phrase>yes</phrase></entry><entry><phrase><command>/bin/uname</command> or Python <code>os.uname()</code></phrase></entry></row> 
+<row><entry><command>uncompress</command></entry><entry><phrase>no</phrase></entry><entry><phrase>no</phrase></entry><entry><phrase>none</phrase></entry></row> 
+<row><entry><command>uniq</command></entry><entry><phrase>yes</phrase></entry><entry><phrase>yes</phrase></entry><entry><command>/usr/bin/uniq</command></entry></row> 
+<row><entry><command>unix2dos</command></entry><entry><phrase>no</phrase></entry><entry><phrase>no</phrase></entry><entry><command>sed 's/$//'</command></entry></row> 
+<row><entry><command>unlzma</command></entry><entry><phrase>no</phrase></entry><entry><phrase>yes</phrase></entry><entry><command>/usr/bin/unlzma</command></entry></row> 
+<row><entry><command>unzip</command></entry><entry><phrase>no</phrase></entry><entry><phrase>yes</phrase></entry><entry><command>/usr/bin/unzip</command></entry></row> 
+<row><entry><command>uptime</command></entry><entry><phrase>no</phrase></entry><entry><phrase>yes</phrase></entry><entry><phrase><command>/usr/bin/uptime</command> or Python reading <filename>/proc/uptime</filename></phrase></entry></row> 
+<row><entry><command>usleep</command></entry><entry><phrase>no</phrase></entry><entry><phrase>yes</phrase></entry><entry><phrase><command>/bin/usleep</command> or Python</phrase></entry></row> 
+<row><entry><command>uudecode</command></entry><entry><phrase>no</phrase></entry><entry><phrase>yes</phrase></entry><entry><phrase><command>/usr/bin/uudecode</command> or Python</phrase></entry></row> 
+<row><entry><command>uuencode</command></entry><entry><phrase>no</phrase></entry><entry><phrase>yes</phrase></entry><entry><phrase><command>/usr/bin/uuencode</command> or Python</phrase></entry></row> 
+<row><entry><command>vconfig</command></entry><entry><phrase>yes</phrase></entry><entry><phrase>yes</phrase></entry><entry><command>/usr/sbin/vconfig</command></entry></row> 
+<row><entry><command>vi</command></entry><entry><phrase>yes</phrase></entry><entry><phrase>yes</phrase></entry><entry><command>/usr/bin/vi</command></entry></row> 
+<row><entry><command>vlock</command></entry><entry><phrase>no</phrase></entry><entry><phrase>no</phrase></entry><entry><phrase>none</phrase></entry></row> 
+<row><entry><command>watch</command></entry><entry><phrase>no</phrase></entry><entry><phrase>yes</phrase></entry><entry><command>/usr/bin/watch</command></entry></row> 
+<row><entry><command>watchdog</command></entry><entry><phrase>no</phrase></entry><entry><phrase>no</phrase></entry><entry><phrase>none</phrase></entry></row> 
+<row><entry><command>wc</command></entry><entry><phrase>yes</phrase></entry><entry><phrase>yes</phrase></entry><entry><command>/usr/bin/wc</command></entry></row> 
+<row><entry><command>wget</command></entry><entry><phrase>yes</phrase></entry><entry><phrase>yes</phrase></entry><entry><command>/sbin/wget</command>, <command>/usr/bin/wget</command></entry></row> 
+<row><entry><command>which</command></entry><entry><phrase>no</phrase></entry><entry><phrase>yes</phrase></entry><entry><command>/usr/bin/which</command></entry></row> 
+<row><entry><command>who</command></entry><entry><phrase>no</phrase></entry><entry><phrase>yes</phrase></entry><entry><command>/usr/bin/who</command></entry></row> 
+<row><entry><command>whoami</command></entry><entry><phrase>no</phrase></entry><entry><phrase>yes</phrase></entry><entry><command>/usr/bin/whoami</command></entry></row> 
+<row><entry><command>xargs</command></entry><entry><phrase>yes</phrase></entry><entry><phrase>yes</phrase></entry><entry><command>/usr/bin/xargs</command></entry></row> 
+<row><entry><command>yes</command></entry><entry><phrase>no</phrase></entry><entry><phrase>yes</phrase></entry><entry><command>/usr/bin/yes</command></entry></row> 
+<row><entry><command>zcat</command></entry><entry><phrase>yes</phrase></entry><entry><phrase>yes</phrase></entry><entry><command>/usr/bin/zcat</command></entry></row> 
+<row><entry><command>zcip</command></entry><entry><phrase>no</phrase></entry><entry><phrase>no</phrase></entry><entry><phrase><application>NetworkManager</application> should take care of this</phrase></entry></row> 
+</tbody>
+</tgroup>
+</table>
+
+</appendix>
+
+
diff --git a/en-US/pxe-server-manual.xml b/en-US/pxe-server-manual.xml
index f25ceed..4d8be04 100644
--- a/en-US/pxe-server-manual.xml
+++ b/en-US/pxe-server-manual.xml
@@ -122,14 +122,14 @@
 		<itemizedlist>
 			<listitem>
 				<para>
-					<guilabel>Operating system identifier</guilabel> &mdash; Provide a unique name using one word to identify the Fedora version and variant. It is used as the directory name in the
+					<guilabel>Operating system identifier</guilabel> &mdash; Provide a unique name using one word to identify the Red Hat Enterprise Linux version and variant. It is used as the directory name in the
 					<filename>/tftpboot/linux-install/</filename> directory.
 				</para>
 			</listitem>
 
 			<listitem>
 				<para>
-					<guilabel>Description</guilabel> &mdash; Provide a brief description of the Fedora version and variant.
+					<guilabel>Description</guilabel> &mdash; Provide a brief description of the Red Hat Enterprise Linux version and variant.
 				</para>
 			</listitem>
 
@@ -418,10 +418,11 @@ pxeboot -a -K <replaceable>&lt;kickstart&gt;</replaceable> -O <replaceable>&lt;o
 			For instructions on how to configure the network interface card with PXE support to boot from the network, consult the documentation for the NIC. It varies slightly per card.
 		</para>
 		<para>
-			If your NIC does not support PXE booting, you can still PXE boot your system by using the <application>gPXE</application> bootloader. The Fedora Project does not distribute <application>gPXE</application> &mdash; refer to the Etherboot Project website at <ulink url="http://etherboot.org/wiki/start"></ulink> for more information.
+			If your NIC does not support PXE booting, you can still PXE boot your system by using the <application>gPXE</application> bootloader. Red Hat does not distribute <application>gPXE</application> &mdash; refer to the Etherboot Project website at <ulink url="http://etherboot.org/wiki/start"></ulink> for more information.
 		</para>
 		<para>
 			After the system boots the installation program, refer to the <xref linkend="ch-guimode-x86"/>.
 		</para>
 	</section>
-</section>
\ No newline at end of file
+</section>
+
diff --git a/en-US/pxe-server-para-1.xml b/en-US/pxe-server-para-1.xml
index dd89386..dacfe24 100644
--- a/en-US/pxe-server-para-1.xml
+++ b/en-US/pxe-server-para-1.xml
@@ -3,5 +3,6 @@
 ]>
 
 <para>
-	Fedora allows for installation over a network using the NFS, FTP, or HTTP protocols. A network installation can be started from a boot CD-ROM, a bootable flash memory drive, or by using the <command>askmethod</command> boot option with the Fedora CD #1 or DVD. Alternatively, if the system to be installed contains a network interface card (NIC) with Pre-Execution Environment (PXE) support, it can be configured to boot from files on another networked system rather than local media such as a CD-ROM.
-</para>
\ No newline at end of file
+	Fedora allows for installation over a network using the NFS, FTP, or HTTP protocols. A network installation can be started from a boot CD-ROM, a bootable flash memory drive, or by using the <command>askmethod</command> boot option with the Fedora DVD. Alternatively, if the system to be installed contains a network interface card (NIC) with Pre-Execution Environment (PXE) support, it can be configured to boot from files on another networked system rather than local media such as a DVD.
+</para>
+
diff --git a/en-US/pxe-server-para-2.xml b/en-US/pxe-server-para-2.xml
index e6ea745..09703da 100644
--- a/en-US/pxe-server-para-2.xml
+++ b/en-US/pxe-server-para-2.xml
@@ -4,4 +4,5 @@
 
 <para>
 	For a PXE network installation, the client's NIC with PXE support sends out a broadcast request for DHCP information. The DHCP server provides the client with an IP address, other network information such as name server, the IP address or hostname of the <command>tftp</command> server (which provides the files necessary to start the installation program), and the location of the files on the <command>tftp</command> server. This is possible because of PXELINUX, which is part of the <filename>syslinux</filename> package.
-</para>
\ No newline at end of file
+</para>
+
diff --git a/en-US/pxe-server.xml b/en-US/pxe-server.xml
index 88b3595..ff8e103 100644
--- a/en-US/pxe-server.xml
+++ b/en-US/pxe-server.xml
@@ -29,7 +29,7 @@
   
   <para>In the past, administrators needed to perform a great deal of
     manual configuration to produce an installation server.  However, if
-    you have a Red Hat Enterprise Linux, CentOS, or Fedora server on your local network,
+    you have a server running Fedora or a similar operating system on your local network,
     you can use <package>cobbler</package> to perform these
     tasks. To configure a PXE server manually, see <xref linkend="sn-pxe-server-manual"/>.</para> 
   <para>To perform the tasks in this section, switch to the <systemitem
@@ -114,19 +114,19 @@
       process.</para>
     <para>Locate the distribution on the network.  The location may be
       on the local network or reached at a remote site via FTP, HTTP, or
-      rsync protocols.  Note the URI, which will be in one of the
-      following forms:</para>
-    <itemizedlist>
+      rsync protocols.  <!-- Note the URI, which will be in one of the
+      following forms: --></para>
+<!--    <itemizedlist>
       <listitem>
-	<para><uri>http://mirror.example.com/pub/fedora/linux/releases/&PRODVER;/Fedora/<replaceable>arch</replaceable>/os</uri></para>
+	<para><uri>http://mirror.example.com/pub/fedora/linux/releases/11/Fedora/<replaceable>arch</replaceable>/os</uri></para>
       </listitem>
       <listitem>
-	<para><uri>ftp://mirror.example.com/pub/fedora/linux/releases/&PRODVER;/Fedora/<replaceable>arch</replaceable>/os</uri></para>
+	<para><uri>ftp://mirror.example.com/pub/fedora/linux/releases/11/Fedora/<replaceable>arch</replaceable>/os</uri></para>
       </listitem>
       <listitem>
-	<para><uri>rsync://mirror.example.com/fedora/linux/releases/&PRODVER;/Fedora/<replaceable>arch</replaceable>/os</uri></para>
+	<para><uri>rsync://mirror.example.com/fedora/linux/releases/11/Fedora/<replaceable>arch</replaceable>/os</uri></para>
       </listitem>
-    </itemizedlist>
+    </itemizedlist> -->
   </section>
   <section id="sn-cobbler-import">
     <title>Importing the Distribution</title>
@@ -147,7 +147,7 @@
 	  <replaceable>network_URI</replaceable> with the URI you found
 	  in <xref linkend="sn-cobbler-mirror"/>, and
 	  <replaceable>distro_name</replaceable> as above:</para>
-	<screen><command>cobbler import --patch=<replaceable>network_URI</replaceable> --name=<replaceable>distro_name</replaceable></command></screen>
+	<screen><command>cobbler import --path=<replaceable>network_URI</replaceable> --name=<replaceable>distro_name</replaceable></command></screen>
 	<important>
 	  <title>Importing a Source</title>
 	  <para>When <command>cobbler</command> imports a distribution
@@ -221,3 +221,4 @@
   <xi:include href="pxe-server-manual.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
   <!-- The following steps must be performed to prepare for a PXE installation: -->
 </chapter>
+
diff --git a/en-US/techref.xml b/en-US/techref.xml
index 28c79f5..999cc98 100644
--- a/en-US/techref.xml
+++ b/en-US/techref.xml
@@ -9,12 +9,11 @@
 <appendix id="ap-techref">
   <title>Other Technical Documentation</title>
   <para>
-    This document provides a reference for using the Fedora installation
-    software, known as <command>anaconda</command>. To learn more about
+    To learn more about
     <indexterm>
       <primary>Anaconda</primary>
     </indexterm>
-    <command>anaconda</command>, visit the project Web page:
+    <application>anaconda</application>, the Fedora installation program, visit the project Web page:
     <ulink url="http://www.fedoraproject.org/wiki/Anaconda"/>.
   </para>
   <para>
@@ -223,8 +222,7 @@
 	  computer. Fedora also includes tools to install and manage the
 	  secondary systems on a Fedora host. You may select
 	  virtualization support during the installation process, or at
-	  any time thereafter. Refer to <ulink
-	    url="http://www.fedoraproject.org/wiki/Tools/Virtualization"/> 
+	  any time thereafter. Refer to the <citetitle>Fedora Virtualization Guide</citetitle> available from <ulink url="http://docs.fedoraproject.org/" />  
 	  for more information.
         </para>
       </listitem>
@@ -238,3 +236,4 @@ mode: xml
 fill-column: 72
 End:
 -->
+
diff --git a/en-US/upgrading-fedora.xml b/en-US/upgrading-fedora.xml
deleted file mode 100644
index 66acd86..0000000
--- a/en-US/upgrading-fedora.xml
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
- "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-]>
-
-<section id="sn-upgrading-system-x86">
-
-	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Upgrading-common-title-1.xml"/>
-	<!-- Upgrading an existing system -->
-
-	<note>
-		<title>Preupgrade</title>
-		<para>
-			Fedora includes <application>preupgrade</application>, a command-line tool that allows you to upgrade easily to a new version from within your existing Fedora installation. 
-		</para>
-	</note>
-	
-	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Upgrading-common-para-1.xml"/>
-	<!-- The installation system automatically detects any existing installation of Red Hat Enterprise Linux. -->
-	
-	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Upgrading-common-para-2.xml"/>
-	<!-- Note that the installation medium that you are using might not contain all the software packages that you need to upgrade your computer. -->
-	
-	<section id="sn-upgrade-examine-x86">
-	
-		<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Upgrading-common-title-2.xml"/>
-		<!-- The Upgrade Dialog -->
-		
-		<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Upgrading-common-para-3.xml"/>
-		<!-- If your system contains a Fedora or Red Hat Linux installation... -->
-		
-		<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Upgrading-common-figure-1.xml"/>
-		<!-- The Upgrade Dialog -->
-		
-		<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Upgrading-common-note-1.xml"/>
-		<!-- Manually Installed Software -->
-
-	</section>
-	
-	<section id="sn-upgrade-tree-x86">
-	
-		<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Upgrading-common-title-3.xml"/>
-		<!-- Upgrading Using the Installer -->
-		
-		<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Upgrading-common-note-2.xml"/>
-		<!-- Installations are Recommended -->
-		
-		<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Upgrading-common-para-4.xml"/>
-		<!-- If you choose to upgrade your system using the installation program... -->
-		
-<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Upgrading-common-screen-1.xml"/>
-
-		<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Upgrading-common-para-5.xml"/>
-		<!-- After installation, consult this list to discover which packages you may need to rebuild or retrieve... -->
-		
-		<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Upgrading-common-para-6.xml"/>
-		<!-- Next, make a backup of any system configuration data: -->
-
-<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Upgrading-common-screen-2.xml"/>
-
-		<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Upgrading-common-para-7.xml"/>
-		<!-- Make a complete backup of any important data before performing an upgrade. -->
-		
-		<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Upgrading-common-warning-1.xml"/>
-		<!-- Storing Backups -->
-
-		<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Upgrading-common-para-8.xml"/>
-		<!-- For more information on completing the upgrade process later... -->
-	</section>
-
-	<section id="sn-upgrading-bootloader-x86">
-	
-		<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Upgrading-common-title-4.xml"/>
-		<!-- Upgrading Boot Loader Configuration -->
-		
-		<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Upgrading-common-indexterm-1.xml"/>
-		
-		<indexterm>
-			<primary>boot loader</primary>
-			<seealso>GRUB</seealso>
-		</indexterm>
-		
-		<para>
-			Your completed Red Hat Enterprise Linux installation must be registered in the <firstterm>boot loader</firstterm> to boot properly. A boot loader is software on your machine that locates and starts the operating system.  Refer to <xref linkend="ch-grub" /> for more information about boot loaders.
-		</para>
-		
-		<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Upgrading-common-figure-2.xml"/>
-		<!-- The Update Boot Loader Dialog -->
-		
-		<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Upgrading-common-para-9.xml"/>
-		<!-- If the existing boot loader was installed by a Linux distribution... -->
-		
-		<para>
-			<firstterm>GRUB</firstterm> is the standard boot loader for Fedora on 32-bit and 64-bit x86 architectures. If your machine uses another boot loader, such as BootMagic, System Commander, or the loader installed by Microsoft Windows, then the Fedora installation system cannot update it. In this case, select <guilabel>Skip boot loader updating</guilabel>.  When the installation process completes, refer to the documentation for your product for assistance.
-		</para>
-
-		<para>
-			Install a new boot loader as part of an upgrade process only if you are certain you want to replace the existing boot loader. If you install a new boot loader, you may not be able to boot other operating systems on the same machine until you have configured the new boot loader. Select <guilabel>Create new boot loader configuration</guilabel> to remove the existing boot loader and install GRUB.
-		</para>
-
-		<para>
-			After you make your selection, click <guibutton>Next</guibutton> to continue. If you selected the <guilabel>Create new boot loader configuration</guilabel> option, refer to <xref linkend="s1-x86-bootloader"/>. If you chose to update or skip boot loader configuration, installation continues without further input from you. 
-		</para>
-
-	</section>
-
-</section>
-
-<!--
-Local variables:
-mode: xml
-fill-column: 72
-End:
--->
diff --git a/en-US/vnc_Installation_Chapter.xml b/en-US/vnc_Installation_Chapter.xml
index e8f3943..b64815d 100644
--- a/en-US/vnc_Installation_Chapter.xml
+++ b/en-US/vnc_Installation_Chapter.xml
@@ -63,14 +63,12 @@
 					<listitem>
 						<para>
 							Booting the
-							installation DVD or
-							CD.
+							installation DVD.
 						</para>
 
 						<para>
 							If booting the
-							installation media
-							(CD or DVD), make
+							installation DVD, make
 							sure
 							<command>vnc</command>
 							is passed as a boot
@@ -87,7 +85,9 @@
 							prompt:
 						</para>
 
-<screen>boot: <userinput>linux vnc</userinput></screen>
+
+<screen>boot: <userinput>linux vnc</userinput>
+</screen>
 
 					</listitem>
 
@@ -118,7 +118,8 @@
 						</para>
 
 
-<screen>boot: <userinput>linux vncconnect=<replaceable>HOST</replaceable></userinput></screen>
+<screen>boot: <userinput>linux vncconnect=<replaceable>HOST</replaceable></userinput>
+</screen>
 
 					</listitem>
 				</orderedlist>
@@ -237,3 +238,4 @@
 		</para>
 	</section>
 </section>
+
diff --git a/en-US/vnc_Modes_Chapter.xml b/en-US/vnc_Modes_Chapter.xml
index 988aec0..1695a51 100644
--- a/en-US/vnc_Modes_Chapter.xml
+++ b/en-US/vnc_Modes_Chapter.xml
@@ -45,7 +45,8 @@
 		</para>
 
 
-<screen>Running anaconda <replaceable>VERSION</replaceable>, the <replaceable>PRODUCT</replaceable> system installer - please wait...</screen>
+<screen>Running anaconda <replaceable>VERSION</replaceable>, the <replaceable>PRODUCT</replaceable> system installer - please wait...
+</screen>
 
 
 		<para>
@@ -114,7 +115,8 @@
 		</para>
 
 
-<screen>boot: <userinput>linux vncconnect=<replaceable>HOST</replaceable></userinput></screen>
+<screen>boot: <userinput>linux vncconnect=<replaceable>HOST</replaceable></userinput>
+</screen>
 
 
 		<para>
@@ -132,3 +134,4 @@
 		</para>
 	</section>
 </section>
+
diff --git a/en-US/vnc_References_Chapter.xml b/en-US/vnc_References_Chapter.xml
index 871d556..26e1ee2 100644
--- a/en-US/vnc_References_Chapter.xml
+++ b/en-US/vnc_References_Chapter.xml
@@ -37,3 +37,4 @@
 		</listitem>
 	</itemizedlist>
 </section>
+


