[install-guide] Adding 'Packages Installed' Figure to IG, and tidying up XML

[Jack Reed]

commit c6698a58a074b6ab39952ae9a9d5ac7905ae887b
Author: Jack Reed <jreed at redhat.com>
Date:   Mon May 20 11:54:37 2013 +1000

    Adding 'Packages Installed' Figure to IG, and tidying up XML

 en-US/Complete-x86.xml                |    3 ++-
 en-US/Complete_common-figure-1.xml    |   15 +++++++++++++++
 en-US/Disk_Partitioning_Setup-x86.xml |    2 +-
 en-US/Reboot-quickstart.xml           |   11 ++---------
 4 files changed, 20 insertions(+), 11 deletions(-)
---
diff --git a/en-US/Complete-x86.xml b/en-US/Complete-x86.xml
index caa4880..307fc0d 100644
--- a/en-US/Complete-x86.xml
+++ b/en-US/Complete-x86.xml
@@ -6,7 +6,8 @@
 <section id="s1-complete-x86">
 	<xi:include href="Complete_common-title-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
 	 <!--  Installation Complete  --> <xi:include href="Complete_common-para-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-	 <!--  Congratulations! Your installation is now complete!  --> <xi:include href="Complete_x86-para-2.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+	 <!--  Congratulations! Your installation is now complete!  --> <xi:include href="Complete_common-figure-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+	 <!--  Packages installed  --> <xi:include href="Complete_x86-para-2.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
 	 <!--  The installation program prompts you to prepare your  --> <xi:include href="Complete_common-para-3.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
 	 <!--  After your computer's normal power-up sequence has completed  --> <xi:include href="Complete_common-para-5.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
 	 <!--  The first time you start your Fedora  --> <!--  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  -->
diff --git a/en-US/Complete_common-figure-1.xml b/en-US/Complete_common-figure-1.xml
new file mode 100644
index 0000000..182a40e
--- /dev/null
+++ b/en-US/Complete_common-figure-1.xml
@@ -0,0 +1,15 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE title PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "Installation_Guide.ent">
+%BOOK_ENTITIES;
+]>
+<figure float="0" id="fig-reboot"><title>Packages installed</title>
+		<mediaobject>
+			<imageobject><imagedata fileref="images/reboot/reboot.png" format="PNG" width="444"/></imageobject>
+			<textobject><para>
+					The menu presented when the desktop loads, offering the choice to try Fedora or install it to the hard drive.
+				</para>
+			</textobject>
+		</mediaobject>
+</figure>
+
diff --git a/en-US/Disk_Partitioning_Setup-x86.xml b/en-US/Disk_Partitioning_Setup-x86.xml
index 0325a76..abf3d3b 100644
--- a/en-US/Disk_Partitioning_Setup-x86.xml
+++ b/en-US/Disk_Partitioning_Setup-x86.xml
@@ -59,7 +59,7 @@
 	 <!--  Important - multipath and non-multipath...  --> 
 	 
 	 
-	 <xi:include href="Specialized_Storage_Devices-x86.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+	 <xi:include href="Specialized_Storage_Devices-x86.xml" xmlns:xi="http://www.w3.org/2001/XInclude" condition="install-guide" />
 	 <!--  Specialized and Networked Disks  --> <xi:include href="X86_Bootloader.xml" xmlns:xi="http://www.w3.org/2001/XInclude" condition="install-guide"/>
 	 <!--  x86, AMD64, and Intel 64 Boot Loader Configuration  --> 
 	 
diff --git a/en-US/Reboot-quickstart.xml b/en-US/Reboot-quickstart.xml
index b854627..ba953b4 100644
--- a/en-US/Reboot-quickstart.xml
+++ b/en-US/Reboot-quickstart.xml
@@ -8,15 +8,8 @@
 		Once the packages are installed and you have set the root password, click the <guibutton>Quit</guibutton> button that will appear at the bottom of the screen to exit to the Live Desktop.
 	</para>
 	
-	<figure float="0" id="fig-reboot"><title>Packages installed</title>
-		<mediaobject>
-			<imageobject><imagedata fileref="images/reboot/reboot.png" format="PNG" width="444"/></imageobject>
-			<textobject><para>
-					The menu presented when the desktop loads, offering the choice to try Fedora or install it to the hard drive.
-				</para>
-			</textobject>
-		</mediaobject>
-	</figure>	
+	<xi:include href="Complete_common-figure-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+	 <!--  Packages installed  -->
 	
 	<para>
 		Click <guilabel>Live System User</guilabel> in the top right of the Live Desktop. Click <guilabel>Power Off</guilabel> from the drop-down menu that appears, then <guilabel>Restart</guilabel> to reboot your system and begin the Firstboot process.