Updating the docs to mention the new Genome/Cloud combincation appliance

2 files changed, 44 insertions, 48 deletions

diff --git a/genome-docs/genome-docs-1.0.0/en-US/QuickStart.xml b/genome-docs/genome-docs-1.0.0/en-US/QuickStart.xml
index 7774ccb..0b5781f 100644
--- a/genome-docs/genome-docs-1.0.0/en-US/QuickStart.xml
+++ b/genome-docs/genome-docs-1.0.0/en-US/QuickStart.xml
@@ -40,14 +40,24 @@
         </para>
         <important>
             <para>
-		When using the default setup with Fedora, you need two machines and one will need to have
-                hardware virtualization support.  Check the following link to see if your machine meets the
-                requirements: <ulink url="http://kvm.qumranet.com/kvmwiki/FAQ#head-a78f5f083749cb9c2e57d7d4efaf2ecf25b9db60">KVM Information</ulink>
-                Also check the system requirements for the <link linkend="genome-appliance-systemreqs">Genome Appliance</link>
-                and the <link linkend="genome-cloud-appliance-systemreqs">Cloud Appliance</link> before beginning the quick start.
-		If you don't have a machine that supports hardware virtualization, you won't be able to
-                use Fedora for your <link linkend="genome-cloud-appliance-systemreqs">Cloud Appliance</link>
-                but you can still use any distribution that supports Xen (e.g. Red Hat Enterprise Linux).
+		    When using the default quick start setup with Fedora, you
+		    only need to dedicate one machine for your &PRODUCT;
+		    environment.  This machine <emphasis>must</emphasis> have
+		    hardware virtualization support.  Check the following link
+		    to see if your machine meets the requirements: <ulink
+			    url="http://kvm.qumranet.com/kvmwiki/FAQ#head-a78f5f083749cb9c2e57d7d4efaf2ecf25b9db60">KVM
+			    Information</ulink> Also check the system
+		    requirements for the <link
+			    linkend="genome-appliance-systemreqs">Genome
+			    Appliance</link> and the <link
+			    linkend="genome-cloud-appliance-systemreqs">Cloud
+			    Appliance</link> before beginning the quick start.
+		    If you don't have a machine that supports hardware
+		    virtualization, you won't be able to use Fedora for your
+		    <link linkend="genome-cloud-appliance-systemreqs">Cloud
+			    Appliance</link> but you can still use any
+		    distribution that supports Xen (e.g. Red Hat Enterprise
+		    Linux).
             </para>
         </important>
     </section>
@@ -56,61 +66,47 @@
         <itemizedlist>
             <listitem>
                 <simpara>
-                    Download and burn the 
-                    <ulink url="http://ftp.redhat.com/pub/redhat/genome/isos/Genome-Fedora-8-i386-CD.iso">Genome Appliance boot CD</ulink>
-                </simpara>
-            </listitem>
-            <listitem>
-                <simpara>
-                    Download and burn the 
-                    <ulink url="http://ftp.redhat.com/pub/redhat/genome/isos/Cloud-Fedora-8-i386-CD.iso">Cloud Appliance boot CD</ulink>
+		    Download and burn the <ulink
+			    url="http://ftp.redhat.com/pub/redhat/genome/isos/Genome-Combo-Fedora-9-i386-CD.iso">Genome/Cloud
+			    Appliance boot CD</ulink>
                 </simpara>
             </listitem>
         </itemizedlist>
-    </section>
-    <section id="quickstart-Genome">
-        <title>Setting Up the Genome Appliance</title>
-        <para>
-            Choose a server to be the Genome Appliance and boot with the Genome Appliance CD. 
-            At the boot menu, choose the default option (Install from Kickstart).
-            Booting the CD will kickstart the server with the appropriate Genome Appliance 
-            operating system.  After the kickstart finishes, the genome-firstboot service 
-            will start and initialize the server as a Genome Appliance.
-        </para>
+
         <important>
             <simpara>
-                The kickstart reboots the server when it completes.  Be sure to remove the 
-                CD from the drive when the kickstart finishes to ensure it does not try to 
-                run the kickstart after rebooting.
+		    The quick start guide uses a combination <link
+			    linkend="genome-appliances">Genome</link>	and
+		    <link linkend="genome-cloud-appliance">Cloud</link>
+		    appliance distribution for purpose of getting up and
+		    running without further ado.
             </simpara>
         </important>
     </section>
-    <section id="quickstart-Cloud">
-        <title>Setting Up the Cloud Appliance</title>
-        <para>
-            Choose a server to be the Cloud Appliance and boot with the Cloud Appliance CD.
-            Booting the CD will kickstart the server with the appropriate Cloud Appliance
-            operating system.
-        </para>
+    <section id="quickstart-Genome">
+        <title>Setting Up the Appliance</title>
+
         <para>
-            This server now serves as both the Cloud Appliance and the first
-            <glossterm linkend="glossary-cloudmember">cloud member</glossterm>.  You can always add 
-            additional cloud members.
+	    Boot a machine with the Genome Appliance CD.  At the boot menu,
+	    choose the default option (Install from Kickstart).  That will
+	    begin the installation process.
         </para>
         <important>
             <simpara>
-                The kickstart reboots the server when it completes.  Be sure to remove the 
-                CD from the drive when the kickstart finishes to ensure it does not try to 
-                run the kickstart after rebooting.
+		All data on the machine will be lost once the kickstart begins.
+		When it completes the machine will reboot.  Be sure to remove
+		the CD from the drive when the kickstart finishes to ensure it
+		does not try to run start the entire process over again.
             </simpara>
         </important>
     </section>
     <section id="quickstart-FirstDistro">
         <title>Setting Up the First Distro</title>
         <para>
-            While there are several ways to import a distro into cobbler, we highly recommend downloading
-            and mounting an ISO image and importing it.  Run these commands on the &PRODUCT; machine to 
-            import the Fedora distribution.
+	    While there are several ways to import a distro into cobbler, we
+	    highly recommend downloading and mounting an ISO image and
+	    importing it.  Run these commands on the &PRODUCT;/Cloud Appliance
+	    to import the Fedora distribution.
         </para>
         <screen>
 mkdir /mnt/Fedora-9-i386
@@ -157,7 +153,7 @@ Select your cobbler profile (This determines the OS):  2
 
 Your system is now being provisioned
 Trying to determine the ip address.
-We'll try and maximum of 10 times.
+We'll try and maximum of 20 times.
 Polling for cobbler status...
 Retrying in 5 seconds
 Polling for cobbler status...
@@ -177,7 +173,7 @@ The IP address of the new system is 1.2.3.4.
         </screen>
 	<para>
 	    Once you have created that machine, you should be able to see it
-	    in the cloud at http://CLOUD-APPLIANCE/cloud/status.html.  In a few
+	    in the cloud at http://COMBO-APPLIANCE/cloud/status.html.  In a few
 	    minutes, your machine should have finished installing and will be
 	    ready for use.
 	</para>
diff --git a/genome-docs/genome-docs.spec b/genome-docs/genome-docs.spec
index 7843318..1171181 100644
--- a/genome-docs/genome-docs.spec
+++ b/genome-docs/genome-docs.spec
@@ -1,6 +1,6 @@
 Name:           genome-docs
 Version:        1.0.0
-Release:        34%{?dist}
+Release:        35%{?dist}
 Summary:        Genome documentation 
 
 Group:          Applications/System