diff --git a/doc/source/getting_started/on_devstack.rst b/doc/source/getting_started/on_devstack.rst
index cbfacb41c0..74f89070f3 100644
--- a/doc/source/getting_started/on_devstack.rst
+++ b/doc/source/getting_started/on_devstack.rst
@@ -58,10 +58,10 @@ Heat needs to launch instances with a keypair, so we need to generate one
 
 Launching a stack
 -----------------
-Now lets launch a stack, assuming that DEST is left as the default /opt/stack::
+Now lets launch a stack, using an example template from the heat-templates repository::
 
-    heat stack-create teststack -f
-    /opt/stack/heat/templates/WordPress_Single_Instance.template -P "InstanceType=m1.large;DBUsername=wp;DBPassword=verybadpassword;KeyName=heat_key;LinuxDistribution=F16"
+    heat stack-create teststack -u
+    https://raw.github.com/openstack/heat-templates/master/cfn/WordPress_Single_Instance.template -P "InstanceType=m1.large;DBUsername=wp;DBPassword=verybadpassword;KeyName=heat_key;LinuxDistribution=F16"
 
 Which will respond::
 
diff --git a/doc/source/getting_started/on_fedora.rst b/doc/source/getting_started/on_fedora.rst
index d217edfb4b..9bf57c7ae4 100644
--- a/doc/source/getting_started/on_fedora.rst
+++ b/doc/source/getting_started/on_fedora.rst
@@ -205,7 +205,7 @@ Launch a Wordpress instance
 
 ::
 
-    heat-cfn create wordpress --template-file=templates/WordPress_Single_Instance.template --parameters="InstanceType=m1.xlarge;DBUsername=${USER};DBPassword=verybadpass;KeyName=${USER}_key"
+    heat-cfn create wordpress --template-url=https://raw.github.com/openstack/heat-templates/master/cfn/WordPress_Single_Instance.template --parameters="InstanceType=m1.xlarge;DBUsername=${USER};DBPassword=verybadpass;KeyName=${USER}_key"
 
 List stacks
 -----------
diff --git a/doc/source/getting_started/on_ubuntu.rst b/doc/source/getting_started/on_ubuntu.rst
index d15e1f64cf..b9324050c7 100644
--- a/doc/source/getting_started/on_ubuntu.rst
+++ b/doc/source/getting_started/on_ubuntu.rst
@@ -192,7 +192,7 @@ Run the debian wordpress example
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 ::
 
-    heat stack-create wordpress --template-file=templates/WordPress_Single_Instance_deb.template --parameters="InstanceType=m1.xlarge;DBUsername=${USER};DBPassword=verybadpassword;KeyName=${USER}_key;LinuxDistribution=U10"
+    heat stack-create wordpress --template-url=https://raw.github.com/openstack/heat-templates/master/cfn/WordPress_Single_Instance_deb.template --parameters="InstanceType=m1.xlarge;DBUsername=${USER};DBPassword=verybadpassword;KeyName=${USER}_key;LinuxDistribution=U10"
 
 List stacks
 ~~~~~~~~~~~