[install-guide/f18: 1/3] Fixing conditional tagging that displayed 3 IQSG images and an admonition in the IG

Jack Reed jjr at fedoraproject.org
Sun Feb 10 23:55:18 UTC 2013


commit bdf40230be2835a4491f26a384bd2a662680f103
Author: Jack Reed <jreed at redhat.com>
Date:   Fri Feb 8 15:47:50 2013 +1000

    Fixing conditional tagging that displayed 3 IQSG images and an admonition in the IG

 en-US/Disk_Partitioning_Setup-x86.xml             |    3 +-
 en-US/Disk_Partitioning_Setup_common-figure-2.xml |    5 ++-
 en-US/Graphical_Installation_install-hub.xml      |   32 ++++++++-------------
 en-US/Package_Selection-x86.xml                   |    3 +-
 en-US/Write_changes_to_disk_common-figure-1.xml   |    5 ++-
 en-US/Write_changes_to_disk_x86.xml               |    1 -
 6 files changed, 22 insertions(+), 27 deletions(-)
---
diff --git a/en-US/Disk_Partitioning_Setup-x86.xml b/en-US/Disk_Partitioning_Setup-x86.xml
index ce9c14a..63269f4 100644
--- a/en-US/Disk_Partitioning_Setup-x86.xml
+++ b/en-US/Disk_Partitioning_Setup-x86.xml
@@ -39,8 +39,7 @@
 	 <!--  To encrypt all partitions except the /boot partition...   --> <xi:include href="Automatic_Partitioning_quickstart-note-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude" condition="quick-start" />
 	 <!--  During installation, all data will be erased...  --> <xi:include href="Automatic_Partitioning_common-para-6.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
 	 <!--  Click Continue once you have made your selections...   --> <xi:include href="Automatic_Partitioning_common-para-3.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-	 <!--  The Installation Options dialog now appears...  --> <xi:include href="Disk_Partitioning_Setup_common-figure-2.xml" xmlns:xi="http://www.w3.org/2001/XInclude" condition="install-guide" />
-	 <!--  Choose automatic partitioning or manual partitioning...  --> <xi:include href="Disk_Partitioning_Setup_quickstart-figure-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude" condition="quick-start" />
+	 <!--  The Installation Options dialog now appears...  --> <xi:include href="Disk_Partitioning_Setup_common-figure-2.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
 	 <!--  Choose automatic partitioning or manual partitioning...  --> <xi:include href="Automatic_Partitioning_common-para-7.xml" xmlns:xi="http://www.w3.org/2001/XInclude" condition="install-guide" />
 	 <!--  If there is sufficient space...  -->  <xi:include href="Automatic_Partitioning_quickstart-para-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude" condition="quick-start" />
 	 <!--  To create and edit the partitions yourself...  --> <xi:include href="Automatic_Partitioning_quickstart-para-2.xml" xmlns:xi="http://www.w3.org/2001/XInclude" condition="quick-start" />
diff --git a/en-US/Disk_Partitioning_Setup_common-figure-2.xml b/en-US/Disk_Partitioning_Setup_common-figure-2.xml
index 80b4306..c1c6066 100644
--- a/en-US/Disk_Partitioning_Setup_common-figure-2.xml
+++ b/en-US/Disk_Partitioning_Setup_common-figure-2.xml
@@ -6,9 +6,12 @@
 <figure float="0">
 	<title>Installation Options dialog</title>
 	 <mediaobject>
-		<imageobject>
+		<imageobject condition="install-guide">
 			<imagedata fileref="images/diskpartsetup/install-options.png" format="PNG" width="444" />
 		</imageobject>
+		<imageobject condition="quick-start">
+			<imagedata fileref="images/diskpartsetup/install-options-live.png" format="PNG" width="444" />
+		</imageobject>
 		 <textobject>
 			<para>
 				Edit the partition configuration and select custom partitioning
diff --git a/en-US/Graphical_Installation_install-hub.xml b/en-US/Graphical_Installation_install-hub.xml
index 62a5917..9cda869 100644
--- a/en-US/Graphical_Installation_install-hub.xml
+++ b/en-US/Graphical_Installation_install-hub.xml
@@ -10,29 +10,19 @@
   <para>
     The Installation Summary Menu is the central screen for setting up an installation.
   </para>
-  <figure float="0" condition="install-guide">
-		<title>The Installation Summary Menu</title>
-		 <mediaobject>
-			<imageobject>
-				<imagedata fileref="images/preinstallhub/preinstall_hub.png" format="PNG" width="444" />
-			</imageobject>
-			 <textobject>
-				<para>
-					Installation Summary Menu screen
-				</para>
 
-			</textobject>
-
-		</mediaobject>
-
-	</figure>
-	
-	  <figure float="0" condition="quick-start">
+  
+  <figure float="0" >
 		<title>The Installation Summary Menu</title>
 		 <mediaobject>
-			<imageobject>
-				<imagedata fileref="images/preinstallhub/preinstall_hub-live.png" format="PNG" width="444" />
+			<imageobject condition="install-guide">
+				<imagedata fileref="images/preinstallhub/preinstall_hub.png" format="PNG" width="444"/>
 			</imageobject>
+			
+			<imageobject condition="quick-start">
+				<imagedata fileref="images/preinstallhub/preinstall_hub-live.png" format="PNG" width="444"/>
+			</imageobject>
+			
 			 <textobject>
 				<para>
 					Installation Summary Menu screen
@@ -42,7 +32,9 @@
 
 		</mediaobject>
 
-	</figure>
+</figure>
+
+	
 	<para>
 	  Instead of directing you through consecutive screens, the Fedora installer allows you to configure your installation in the order you choose.
 	</para>
diff --git a/en-US/Package_Selection-x86.xml b/en-US/Package_Selection-x86.xml
index d09a4c5..253fac2 100644
--- a/en-US/Package_Selection-x86.xml
+++ b/en-US/Package_Selection-x86.xml
@@ -14,8 +14,7 @@
 	 <!--  End Index terms  --> <!-- <xi:include href="Package_Selection_common-para-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> -->
 	 <!--  Now that you have made most of the choices..  --> <!-- <xi:include href="Package_Selection_common-para-2.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> -->
 	 <!--  The Package Installation Defaults screen...  --> <!--  <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 href="Package_Selection_common-note-2.xml" xmlns:xi="http://www.w3.org/2001/XInclude" condition="install-guide" />
-	 <!--  Installing in text mode  --> <xi:include href="Package_Selection_quickstart-note-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude" condition="quick-start" />
-	 <!--  DVD or six-CD set only  --> <figure float="0" id="fig-pkgselection-group-x86">
+	 <!--  Installing in text mode  --> <figure float="0" id="fig-pkgselection-group-x86">
 		<title>Software Selection</title>
 		 <mediaobject>
 			<imageobject>
diff --git a/en-US/Write_changes_to_disk_common-figure-1.xml b/en-US/Write_changes_to_disk_common-figure-1.xml
index cbbc071..5182c91 100644
--- a/en-US/Write_changes_to_disk_common-figure-1.xml
+++ b/en-US/Write_changes_to_disk_common-figure-1.xml
@@ -7,8 +7,11 @@
 	<title>Ready to install</title>
 	 <mediaobject>
 		<imageobject>
-			<imagedata fileref="images/diskpartitioning/write_changes.png" format="PNG" width="444" />
+			<imagedata fileref="images/diskpartitioning/write_changes.png" format="PNG" width="444" condition="install-guide"/>
 		</imageobject>
+		<imageobject>
+			<imagedata fileref="images/diskpartitioning/write_changes-live.png" format="PNG" width="444" condition="quick-start"/>
+		</imageobject>		
 		 <textobject>
 			<para>
 				When all required items on the Installation Summary Menu have been attended to, the installation can begin.
diff --git a/en-US/Write_changes_to_disk_x86.xml b/en-US/Write_changes_to_disk_x86.xml
index a13e103..f9f119b 100644
--- a/en-US/Write_changes_to_disk_x86.xml
+++ b/en-US/Write_changes_to_disk_x86.xml
@@ -7,7 +7,6 @@
 	<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" condition="install-guide" />
-	 <!--  Writing storage configuration to disk  --> <xi:include href="Write_changes_to_disk_quickstart-figure-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude" condition="quick-start" />
 	 <!--  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" />


More information about the docs-commits mailing list