diff --git a/doc/src/docbkx/openstack-identity-service-starter/gettingstartedkeystone.xml b/doc/src/docbkx/openstack-identity-service-starter/gettingstartedkeystone.xml
index d43c0fec38..7593ca5fee 100644
--- a/doc/src/docbkx/openstack-identity-service-starter/gettingstartedkeystone.xml
+++ b/doc/src/docbkx/openstack-identity-service-starter/gettingstartedkeystone.xml
@@ -488,31 +488,36 @@ use = egg:swift#catch_errors
       Image Service, the Object Storage service, as well as Identity itself. Since there is just one
       zone in this example, it represents all the services across the single region (but could also
       represent all the regions). The last two values are flags which indicate the template is
-      enabled and global. Note that the URLs contain a %tenant_id% string which Keystone populates
-      at runtime.</para>
+      enabled and global. If an endpoint template is global, all tenants automatically have access
+      to the endpoint. Note that the URLs contain a %tenant_id% string which Keystone populates
+      at runtime. </para>
+
   <literallayout class="monospaced">  HOST_IP=127.0.0.1
   bin/keystone-manage  endpointTemplates add RegionOne swift http://$HOST_IP:8080/v1/AUTH_%tenant_id% http://$HOST_IP:8080/ http://$HOST_IP:8080/v1/AUTH_%tenant_id% 1 1
   bin/keystone-manage  endpointTemplates add RegionOne nova_compat http://$HOST_IP:8774/v1.0/ http://$HOST_IP:8774/v1.0  http://$HOST_IP:8774/v1.0 1 1
   bin/keystone-manage  endpointTemplates add RegionOne nova http://$HOST_IP:8774/v1.1/%tenant_id% http://$HOST_IP:8774/v1.1/%tenant_id%  http://$HOST_IP:8774/v1.1/%tenant_id% 1 1
   bin/keystone-manage  endpointTemplates add RegionOne glance http://$HOST_IP:9292/v1.1/%tenant_id% http://$HOST_IP:9292/v1.1/%tenant_id% http://$HOST_IP:9292/v1.1/%tenant_id% 1 1
   bin/keystone-manage  endpointTemplates add RegionOne identity http://$HOST_IP:5000/v2.0 http://$HOST_IP:35357/v2.0 http://$HOST_IP:5000/v2.0 1 1</literallayout>
-  
+
+
 <para>  Now you add a default token for the admin user to get when requesting a token.</para>
   <literallayout class="monospaced">bin/keystone-manage  token add 999888777666 admin admin 2015-02-05T00:00</literallayout>
 
-  <para>This section adds the tenant endpoints for each user created above.</para>
-  <literallayout class="monospaced">  bin/keystone-manage  endpoint add admin swift
-  bin/keystone-manage  endpoint add admin nova_compat
-  bin/keystone-manage  endpoint add admin nova
-  bin/keystone-manage  endpoint add admin glance
-  bin/keystone-manage  endpoint add admin identity
+  <para> If an endpoint template is not global, endpoints must be manually added using the
+      tenant name and endpoint template ID. You can retrieve the endpoint template
+      id by doing:</para>
 
-  bin/keystone-manage  endpoint add demo swift
-  bin/keystone-manage  endpoint add demo nova_compat
-  bin/keystone-manage  endpoint add demo nova
-  bin/keystone-manage  endpoint add demo glance
-  bin/keystone-manage  endpoint add demo identity</literallayout>
-  
+      <literallayout class="monospaced">  bin/keystone-manage   endpointTemplates list</literallayout>
+
+  <para>You can then add endpoints manually by doing:</para>
+
+  <literallayout class="monospaced">  bin/keystone-manage   endpoint add $TENANT $ENDPOINT_TEMPLATE_ID</literallayout>
+
+  <para>For example (assuming the new endpoint template has an ID of 6):</para>
+  <literallayout class="monospaced">  bin/keystone-manage  endpointTemplates add RegionTwo nova http://$HOST_IP:8774/v1.1/%tenant_id% http://$HOST_IP:8774/v1.1/%tenant_id%  http://$HOST_IP:8774/v1.1/%tenant_id% 1 0
+  bin/keystone-manage  endpoint add admin 6
+  bin/keystone-manage  endpoint add demo 6
+  </literallayout>
   
   
   <para>You can configure Identity and Compute with a single region or multiple regions using