Thu Apr 29 11:27:31 UTC 2010

en-US/Initializing_Hard_Disk-x86.xml              |    5 
 en-US/Initializing_Hard_Disk_common-indexterm.xml |    1 
 en-US/Initializing_Hard_Disk_common-note-1.xml    |    1 
 en-US/Initializing_Hard_Disk_common-para-1.xml    |    3 
 en-US/Initializing_Hard_Disk_common-para-2.xml    |    3 
 en-US/Initializing_Hard_Disk_common-para-3.xml    |    9 
 en-US/Initializing_Hard_Disk_common-title.xml     |    1 
 en-US/Upgrade-x86.xml                             |    2 
 en-US/Upgrading-common-figure-1.xml               |   14 +
 en-US/Upgrading-common-figure-2.xml               |   14 +
 en-US/Upgrading-common-indexterm-1.xml            |   11 +
 en-US/Upgrading-common-note-1.xml                 |   11 +
 en-US/Upgrading-common-note-2.xml                 |   12 +
 en-US/Upgrading-common-para-1.xml                 |    9 
 en-US/Upgrading-common-para-2.xml                 |    8 
 en-US/Upgrading-common-para-3.xml                 |    9 
 en-US/Upgrading-common-para-4.xml                 |    9 
 en-US/Upgrading-common-para-5.xml                 |    9 
 en-US/Upgrading-common-para-6.xml                 |    9 
 en-US/Upgrading-common-para-7.xml                 |    9 
 en-US/Upgrading-common-para-8.xml                 |   10 
 en-US/Upgrading-common-para-9.xml                 |   11 +
 en-US/Upgrading-common-screen-1.xml               |    8 
 en-US/Upgrading-common-screen-2.xml               |    8 
 en-US/Upgrading-common-title-1.xml                |    8 
 en-US/Upgrading-common-title-2.xml                |    8 
 en-US/Upgrading-common-title-3.xml                |    8 
 en-US/Upgrading-common-title-4.xml                |    8 
 en-US/Upgrading-common-warning-1.xml              |   13 +
 en-US/adminoptions.xml                            |    4 
 en-US/networkconfig-fedora.xml                    |    6 
 en-US/nextsteps.xml                               |    2 
 en-US/upgrading-fedora.xml                        |  232 ++++++++--------------
 33 files changed, 323 insertions(+), 152 deletions(-)

New commits:
commit 3f36880298e4c0dfb1d7f929526106ab6064d8eb
Author: Ruediger Landmann <r.landmann at redhat.com>
Date:   Thu Apr 29 21:26:50 2010 +1000

    Update sections 7.14 and 7.15

diff --git a/en-US/Initializing_Hard_Disk-x86.xml b/en-US/Initializing_Hard_Disk-x86.xml
index 9be45d1..8c91060 100644
--- a/en-US/Initializing_Hard_Disk-x86.xml
+++ b/en-US/Initializing_Hard_Disk-x86.xml
@@ -14,6 +14,10 @@
 	href="Initializing_Hard_Disk_common-para-1.xml"/>
 	<!-- If no readable partition tables are found on existing hard disks... -->
 	
+	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" 
+	href="Initializing_Hard_Disk_common-para-3.xml"/>
+	<!-- The installation program presents you with a separate dialog for each disk... -->
+	
 	<figure float="0" id="fig-initializing-x86"><title>Warning screen &ndash; initializing hard drive</title>
 		<mediaobject>
 			<imageobject><imagedata fileref="images/initializing/initializing.png" format="PNG"/></imageobject>
@@ -33,3 +37,4 @@
 	<!-- Detach Unneeded Disks -->
 		
 </section>
+
diff --git a/en-US/Initializing_Hard_Disk_common-indexterm.xml b/en-US/Initializing_Hard_Disk_common-indexterm.xml
index 4272f8b..a1cc0a2 100644
--- a/en-US/Initializing_Hard_Disk_common-indexterm.xml
+++ b/en-US/Initializing_Hard_Disk_common-indexterm.xml
@@ -6,3 +6,4 @@
 	<primary>Hard disk</primary>
 	<secondary>initializing</secondary>
 </indexterm>
+
diff --git a/en-US/Initializing_Hard_Disk_common-note-1.xml b/en-US/Initializing_Hard_Disk_common-note-1.xml
index ba9e805..4371646 100644
--- a/en-US/Initializing_Hard_Disk_common-note-1.xml
+++ b/en-US/Initializing_Hard_Disk_common-note-1.xml
@@ -9,3 +9,4 @@
 	afterward, power off the system, detach it, and restart the
 	installation.</para>
     </warning>
+
diff --git a/en-US/Initializing_Hard_Disk_common-para-1.xml b/en-US/Initializing_Hard_Disk_common-para-1.xml
index e60db28..0be9422 100644
--- a/en-US/Initializing_Hard_Disk_common-para-1.xml
+++ b/en-US/Initializing_Hard_Disk_common-para-1.xml
@@ -5,4 +5,5 @@
     <para>
       If no readable partition tables are found on existing hard disks, the installation program asks to initialize the hard disk. This operation makes any existing data on the hard disk unreadable.  If your system has a brand new hard disk with no operating system installed, or you have removed all partitions on the hard disk, click <guibutton>Re-initialize drive</guibutton>.
     </para>
-    
\ No newline at end of file
+    
+
diff --git a/en-US/Initializing_Hard_Disk_common-para-2.xml b/en-US/Initializing_Hard_Disk_common-para-2.xml
index 3b0c20f..3d798b6 100644
--- a/en-US/Initializing_Hard_Disk_common-para-2.xml
+++ b/en-US/Initializing_Hard_Disk_common-para-2.xml
@@ -5,4 +5,5 @@
     <para>
       Certain RAID systems or other nonstandard configurations may be unreadable to the installation program and the prompt to initialize the hard disk may appear.  The installation program responds to the physical disk structures it is able to detect.
     </para>
-    
\ No newline at end of file
+    
+
diff --git a/en-US/Initializing_Hard_Disk_common-para-3.xml b/en-US/Initializing_Hard_Disk_common-para-3.xml
new file mode 100644
index 0000000..b1a9060
--- /dev/null
+++ b/en-US/Initializing_Hard_Disk_common-para-3.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>
+	The installation program presents you with a separate dialog for each disk on which it cannot read a valid partition table. Click the <guibutton>Ignore all</guibutton> button or <guibutton>Re-initialize all</guibutton> button to apply the same answer to all devices. 
+</para>
+    
+
diff --git a/en-US/Initializing_Hard_Disk_common-title.xml b/en-US/Initializing_Hard_Disk_common-title.xml
index 20a8a50..3e12d0b 100644
--- a/en-US/Initializing_Hard_Disk_common-title.xml
+++ b/en-US/Initializing_Hard_Disk_common-title.xml
@@ -3,3 +3,4 @@
 ]>
 
 <title>Initializing the Hard Disk</title>
+
diff --git a/en-US/Upgrade-x86.xml b/en-US/Upgrade-x86.xml
index db15902..a7dc2bc 100644
--- a/en-US/Upgrade-x86.xml
+++ b/en-US/Upgrade-x86.xml
@@ -29,7 +29,7 @@
 		</para>
 
 		<para>
-			You can also upgrade a Fedora installation by starting the installation process by any of the methods described in <xref linkend="ch-guimode-x86"/>. If the installer detects a previous Fedora installation on the system, it will ask you whether you want to upgrade that installation &mdash; refer to <xref linkend="sn-upgrade-examine"/>
+			You can also upgrade a Fedora installation by starting the installation process by any of the methods described in <xref linkend="ch-guimode-x86"/>. If the installer detects a previous Fedora installation on the system, it will ask you whether you want to upgrade that installation &mdash; refer to <xref linkend="sn-upgrade-examine-x86"/>
 		</para>
 		
 		<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Upgrade_common-section-2-para-1.xml"/>
diff --git a/en-US/Upgrading-common-figure-1.xml b/en-US/Upgrading-common-figure-1.xml
new file mode 100644
index 0000000..0a6ec47
--- /dev/null
+++ b/en-US/Upgrading-common-figure-1.xml
@@ -0,0 +1,14 @@
+<?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 Upgrade Dialog</title>
+	<mediaobject>
+		<imageobject><imagedata fileref="images/upgrading/upgrading.png" format="PNG"/></imageobject>
+		<textobject><para>
+				The Upgrade Dialog
+			</para>
+		</textobject>
+	</mediaobject>
+</figure>
diff --git a/en-US/Upgrading-common-figure-2.xml b/en-US/Upgrading-common-figure-2.xml
new file mode 100644
index 0000000..cd3356e
--- /dev/null
+++ b/en-US/Upgrading-common-figure-2.xml
@@ -0,0 +1,14 @@
+<?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 Upgrade Boot Loader Dialog</title>
+	<mediaobject>
+		<imageobject><imagedata fileref="images/upgrading/upgradebootloader.png" format="PNG"/></imageobject>
+		<textobject><para>
+				The dialog includes three radio buttons, labeled <guilabel>Update boot loader configuration</guilabel>, <guilabel>Skip boot loader updating</guilabel>, and <guilabel>Create new boot loader configuration</guilabel>
+			</para>
+		</textobject>
+	</mediaobject>
+</figure>
diff --git a/en-US/Upgrading-common-indexterm-1.xml b/en-US/Upgrading-common-indexterm-1.xml
new file mode 100644
index 0000000..2c73900
--- /dev/null
+++ b/en-US/Upgrading-common-indexterm-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" [
+]>
+
+<indexterm>
+	<primary>boot loader</primary>
+	<secondary>upgrading</secondary>
+</indexterm>
+      
+      
diff --git a/en-US/Upgrading-common-note-1.xml b/en-US/Upgrading-common-note-1.xml
new file mode 100644
index 0000000..1e03a5e
--- /dev/null
+++ b/en-US/Upgrading-common-note-1.xml
@@ -0,0 +1,11 @@
+<?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>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.
+	</para>
+</note>
diff --git a/en-US/Upgrading-common-note-2.xml b/en-US/Upgrading-common-note-2.xml
new file mode 100644
index 0000000..ad90b5e
--- /dev/null
+++ b/en-US/Upgrading-common-note-2.xml
@@ -0,0 +1,12 @@
+<?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>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"/>.
+	</para>
+</note>
+
diff --git a/en-US/Upgrading-common-para-1.xml b/en-US/Upgrading-common-para-1.xml
new file mode 100644
index 0000000..6ae74c3
--- /dev/null
+++ b/en-US/Upgrading-common-para-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" [
+]>
+
+<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.
+</para>
+
diff --git a/en-US/Upgrading-common-para-2.xml b/en-US/Upgrading-common-para-2.xml
new file mode 100644
index 0000000..1987193
--- /dev/null
+++ b/en-US/Upgrading-common-para-2.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+ "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+]>
+
+<para>
+	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
new file mode 100644
index 0000000..650487d
--- /dev/null
+++ b/en-US/Upgrading-common-para-3.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 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>.  
+</para>
+
diff --git a/en-US/Upgrading-common-para-4.xml b/en-US/Upgrading-common-para-4.xml
new file mode 100644
index 0000000..bd350bb
--- /dev/null
+++ b/en-US/Upgrading-common-para-4.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 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:
+</para>
+
diff --git a/en-US/Upgrading-common-para-5.xml b/en-US/Upgrading-common-para-5.xml
new file mode 100644
index 0000000..9fec8a5
--- /dev/null
+++ b/en-US/Upgrading-common-para-5.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 installation, consult this list to discover which packages you may need to rebuild or retrieve from sources other than the Fedora repositories.
+</para>
+
diff --git a/en-US/Upgrading-common-para-6.xml b/en-US/Upgrading-common-para-6.xml
new file mode 100644
index 0000000..4f725df
--- /dev/null
+++ b/en-US/Upgrading-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>
+	Next, make a backup of any system configuration data:
+</para>
+
diff --git a/en-US/Upgrading-common-para-7.xml b/en-US/Upgrading-common-para-7.xml
new file mode 100644
index 0000000..546a4ca
--- /dev/null
+++ b/en-US/Upgrading-common-para-7.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>
+	Make a complete backup of any important data before performing an upgrade.  Important data may include the contents of your entire <filename class="directory">/home</filename> directory as well as content from services such as an Apache, FTP, or SQL server, or a source code management system. Although upgrades are not destructive, if you perform one improperly there is a small possibility of data loss.
+</para>
+
diff --git a/en-US/Upgrading-common-para-8.xml b/en-US/Upgrading-common-para-8.xml
new file mode 100644
index 0000000..4c6f153
--- /dev/null
+++ b/en-US/Upgrading-common-para-8.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>
+	For more information on completing the upgrade process later, refer to <xref linkend="sn-finishing-upgrade"/>.
+</para>
+
+
diff --git a/en-US/Upgrading-common-para-9.xml b/en-US/Upgrading-common-para-9.xml
new file mode 100644
index 0000000..ccdf7a9
--- /dev/null
+++ b/en-US/Upgrading-common-para-9.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>
+	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.
+</para>
+    
+    
+      
diff --git a/en-US/Upgrading-common-screen-1.xml b/en-US/Upgrading-common-screen-1.xml
new file mode 100644
index 0000000..018eb07
--- /dev/null
+++ b/en-US/Upgrading-common-screen-1.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE screen PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+ "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+]>
+
+<screen><command>rpm -qa --qf '%{NAME} %{VERSION}-%{RELEASE} %{ARCH}\n' > ~/old-pkglist.txt</command></screen>
+
+
diff --git a/en-US/Upgrading-common-screen-2.xml b/en-US/Upgrading-common-screen-2.xml
new file mode 100644
index 0000000..82ffb50
--- /dev/null
+++ b/en-US/Upgrading-common-screen-2.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE screen PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+ "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+]>
+
+<screen><command>su -c 'tar czf /tmp/etc-`date +%F`.tar.gz /etc' </command>
+<command>su -c 'mv /tmp/etc-*.tar.gz /home'</command></screen>
+
diff --git a/en-US/Upgrading-common-title-1.xml b/en-US/Upgrading-common-title-1.xml
new file mode 100644
index 0000000..ee9978a
--- /dev/null
+++ b/en-US/Upgrading-common-title-1.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+ "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+]>
+
+<title>
+	Upgrading an Existing System
+</title>
diff --git a/en-US/Upgrading-common-title-2.xml b/en-US/Upgrading-common-title-2.xml
new file mode 100644
index 0000000..75b1ba5
--- /dev/null
+++ b/en-US/Upgrading-common-title-2.xml
@@ -0,0 +1,8 @@
+<?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 Upgrade Dialog
+</title>
diff --git a/en-US/Upgrading-common-title-3.xml b/en-US/Upgrading-common-title-3.xml
new file mode 100644
index 0000000..121acd3
--- /dev/null
+++ b/en-US/Upgrading-common-title-3.xml
@@ -0,0 +1,8 @@
+<?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>
+	Upgrading Using the Installer
+</title>
diff --git a/en-US/Upgrading-common-title-4.xml b/en-US/Upgrading-common-title-4.xml
new file mode 100644
index 0000000..873eee4
--- /dev/null
+++ b/en-US/Upgrading-common-title-4.xml
@@ -0,0 +1,8 @@
+<?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>
+	Upgrading Boot Loader Configuration
+</title>
diff --git a/en-US/Upgrading-common-warning-1.xml b/en-US/Upgrading-common-warning-1.xml
new file mode 100644
index 0000000..43881fd
--- /dev/null
+++ b/en-US/Upgrading-common-warning-1.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE warning PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+ "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+]>
+
+<warning>
+	<title>Storing Backups</title>
+	<para>
+		Note that the above examples store backup materials in a <filename class="directory">/home</filename> directory.  If your <filename class="directory">/home</filename> directory is not a separate partition, <emphasis>you should not follow these examples verbatim!</emphasis>  Store your backups on another device such as CD or DVD discs or an external hard disk.
+	</para>
+</warning>
+
+
diff --git a/en-US/adminoptions.xml b/en-US/adminoptions.xml
index 4c5e4ce..f8bbd10 100644
--- a/en-US/adminoptions.xml
+++ b/en-US/adminoptions.xml
@@ -257,7 +257,7 @@
 <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>
+      <!-- <note>
         <title>Configuring the Installed System</title>
 
         <para>
@@ -266,7 +266,7 @@
           <xref linkend="sn-networkconfig-fedora_manual-configuration"/> for more information on
           configuring the network settings for the installed system.
         </para>
-      </note>
+      </note> -->
     </section>
   </section>
   <section id="sn-remoteaccess-installation">
diff --git a/en-US/networkconfig-fedora.xml b/en-US/networkconfig-fedora.xml
index 4ce0512..d5f71e6 100644
--- a/en-US/networkconfig-fedora.xml
+++ b/en-US/networkconfig-fedora.xml
@@ -6,7 +6,7 @@
 <!-- $Id: -->
 
 <section id="sn-networkconfig-fedora">
-  <title>Network Configuration</title>
+  <title>Setting the Hostname</title>
 
 <!-- Indexterms -->
 <indexterm>
@@ -78,7 +78,7 @@
       </para>
     </note>
 
-	<section id="sn-networkconfig-fedora_manual-configuration">
+<!--	<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. 
@@ -104,7 +104,7 @@
 			  
 	</section>
 
-<!-- 
+
       <section id="sn-hostname">
     <title>Hostname</title>
   <section id="sn-network-misc-settings">
diff --git a/en-US/nextsteps.xml b/en-US/nextsteps.xml
index e1e8a1e..5cf9eda 100644
--- a/en-US/nextsteps.xml
+++ b/en-US/nextsteps.xml
@@ -146,7 +146,7 @@
     <para>If you chose to upgrade your system from a previous release rather
       than perform a fresh installation, you may want to examine the
       differences in the package set.  <xref
-	linkend="sn-upgrade-tree"/> advised you to create a package
+	linkend="sn-upgrade-tree-x86"/> advised you to create a package
       listing for your original system.  You can now use that listing to
       determine how to bring your new system close to the original
       system state.</para>
diff --git a/en-US/upgrading-fedora.xml b/en-US/upgrading-fedora.xml
index e2254c5..66acd86 100644
--- a/en-US/upgrading-fedora.xml
+++ b/en-US/upgrading-fedora.xml
@@ -3,10 +3,10 @@
  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
 ]>
 
-<!-- $Id: -->
+<section id="sn-upgrading-system-x86">
 
-<section id="sn-upgrading-system">
-  <title>Upgrading an Existing System</title>
+	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Upgrading-common-title-1.xml"/>
+	<!-- Upgrading an existing system -->
 
 	<note>
 		<title>Preupgrade</title>
@@ -14,149 +14,95 @@
 			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>
-    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>
-
-	<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"/>.
-	</para>
-
-  <section id="sn-upgrade-examine">
-    <title>Upgrade Examine</title>
-
-    <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>.  
-    </para>
-	<figure float="0" id="fig-upgrading-fedora"><title>The upgrade screen</title>
-		<mediaobject>
-			<imageobject><imagedata fileref="images/upgrading/upgrading.png" format="PNG"/></imageobject>
-			<textobject><para>
-					The upgrade screen.
-				</para>
-			</textobject>
-		</mediaobject>
-	</figure>
-    <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.
-      </para>
-    </note>
-  </section>
-
-  <section id="sn-upgrade-tree">
-    <title>Upgrading Using the Installer</title>
-    <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"/>.</para>
-    </note>
-    <para>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>
-
-    <screen><command><![CDATA[rpm -qa --qf '%{NAME} %{VERSION}-%{RELEASE} %{ARCH}\n' > ~/old-pkglist.txt]]></command></screen>
-
-    <para>After installation, consult this list to discover which
-      packages you may need to rebuild or retrieve from non-Fedora
-      software repositories.</para>
-    <para>Next, make a backup of any system configuration data:</para>
-
-    <screen><command><![CDATA[su -c 'tar czf /tmp/etc-`date +%F`.tar.gz /etc'
-su -c 'mv /tmp/etc-*.tar.gz /home']]></command></screen>
-
-    <para>Make a complete backup of any important data before performing
-      an upgrade.  Important data may include the contents of your
-      entire <filename class="directory">/home</filename> directory as
-      well as content from services such as an Apache, FTP, or SQL
-      server, or a source code management system. Although upgrades are
-      not destructive, if you perform one improperly there is a small
-      possibility of data loss.</para>
-    <warning>
-      <title>Storing Backups</title>
-      <para>Note that the above examples store backup materials in a
-	<filename class="directory">/home</filename> directory.  If your
-	<filename class="directory">/home</filename> directory is not a
-	separate partition, <emphasis>you should not follow these
-	  examples verbatim!</emphasis>  Store your backups on another
-	device such as CD or DVD discs or an external hard disk.</para>
-    </warning>
-    <para>For more information on completing the upgrade process later,
-      refer to <xref linkend="sn-finishing-upgrade"/>.</para>
-    </section>
-
-  <section id="sn-upgrading-bootloader">
-    <title>Upgrading Boot Loader Configuration</title>
-
-    <para>
-      <indexterm>
-	<primary>boot loader</primary>
-	<secondary>upgrading</secondary>
-      </indexterm> Your completed Fedora installation must be registered
-      in the <indexterm>
-	<primary>boot loader</primary>
-	<seealso>GRUB</seealso>
-      </indexterm> <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="s1-x86-bootloader" />
-      for more information about boot loaders.
-    </para>
-    <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 Fedora or Red Hat Linux installation.
-    </para>
-
-    <para>
-      <firstterm>GRUB</firstterm> is the standard boot loader for Fedora.
-	If your machine uses another boot loader, such as
-	<trademark>BootMagic</trademark>, <trademark>System
-	Commander</trademark>,  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>
+			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.
-    </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>
 
 </section>
 


