Updating the quickstart and machine type section

2 files changed, 36 insertions, 10 deletions

diff --git a/genome-docs/genome-docs-1.0.0/en-US/Cookbook.xml b/genome-docs/genome-docs-1.0.0/en-US/Cookbook.xml
index 66b9441..fd4a7ec 100644
--- a/genome-docs/genome-docs-1.0.0/en-US/Cookbook.xml
+++ b/genome-docs/genome-docs-1.0.0/en-US/Cookbook.xml
@@ -488,6 +488,13 @@ git commit -m "Priming the dev_workstation module"
 # This sets up the 'public' git repositories
 # and the puppet working directory
 genome-sync save --workingdir=/tmp/working
+
+# This is probably a bug in puppet, but you
+# need to restart the puppetmaster when you introduce
+# a new module
+su -
+service puppetmaster restart
+exit
 			</screen>
 		</para>
 		<para>
@@ -500,7 +507,8 @@ genome-sync save --workingdir=/tmp/working
 			class.  Machines can consist of multiple puppet classes,
 			but in this case, we are starting simple.  To do this, run 
 			these steps (on the &PRODUCT; Appliance):
-			<screen>
+		</para>
+		<screen>
 # Make sure the permissions are okay on the machine_types.rb file
 su -
 chown genome:genome /etc/genome/machine_types.rb
@@ -525,23 +533,27 @@ end
 git add .
 git commit -m "Adding the new developer-workstation machine"
 git push
-
-# Update as root to make the &PRODUCT; Appliance
-# aware of the module you just synced.
+		</screen>
+		<para>
+			After you have pushed your changes, they will be
+			applied the next time puppet runs on the repo, which
+			is usually in 5 to 10 minutes.  However, for the sake
+			of this example, we will manually kick off a puppet
+			run:
+		</para>
+		<screen>
+# Force a puppet run
 su -
-service puppetmaster restart
 puppetd --test
-			</screen>
-		</para>
+		</screen>
 		<para>
 			At this point, you should see your new machine type listed
                         on your &PRODUCT; Appliance at http://$GENOME/genome/machine_types.html
 		</para>
-
 		<para>
 			<link linkend="genome-sync">genome-sync</link> is a
 			great way to handle moving custom machine types from
-			one Repo Appliance to another.
+			one &PRODUCT; Appliance to another.
 		</para>
 	</section>
 
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 b90b1ae..7774ccb 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
@@ -144,7 +144,7 @@ it as your own.  It must be a single word and should be short (e.g. username).
 Enter your system prefix:  johndoe
 
 Now, you can select your machine type.
-To see a description of these machine types visit: http://GENOME-APPLIANCE.domain.com/genome/machine_types.html
+To see a description of these machine types visit: http://GENOME-APPLIANCE/genome/machine_types.html
 1. django-example
 Select your machine type: 1
 
@@ -175,5 +175,19 @@ Retrying in 5 seconds
 Your new system is being provisioned on cloud-7.example.org.
 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
+	    minutes, your machine should have finished installing and will be
+	    ready for use.
+	</para>
+	<para>
+	    At this point, you are ready to move onto some more interesting
+	    scenarios like adding more &PRODUCT; Appliances for the various
+	    teams in your organization or creating custom machine types for
+	    your own use.  You can find most of these examples in the Cookbook,
+	    like <link linkend="genome-AddMachineType">creating your own
+	    machine type</link>.
+	</para>
     </section>
 </chapter>