http://git-wip-us.apache.org/repos/asf/usergrid/blob/33a3e219/content/docs/data-storage/data-store-dbms.html
----------------------------------------------------------------------
diff --git a/content/docs/data-storage/data-store-dbms.html 
b/content/docs/data-storage/data-store-dbms.html
index 6bb8208..c02b6e5 100644
--- a/content/docs/data-storage/data-store-dbms.html
+++ b/content/docs/data-storage/data-store-dbms.html
@@ -32,7 +32,7 @@
   
     <link rel="top" title="Apache Usergrid 1.0 documentation" 
href="../index.html"/>
         <link rel="next" title="Data Store Best Practices" 
href="optimizing-access.html"/>
-        <link rel="prev" title="Using the API" 
href="../getting-started/using-the-api.html"/> 
+        <link rel="prev" title="Using the API" 
href="../using-usergrid/using-the-api.html"/> 
 
   
   <script src="../_static/js/modernizr.min.js"></script>
@@ -80,19 +80,19 @@
         
           
           
-              <p class="caption"><span 
class="caption-text">Introduction</span></p>
+              <p class="caption"><span class="caption-text">Getting 
Started</span></p>
 <ul>
-<li class="toctree-l1"><a class="reference internal" 
href="../introduction/overview.html">Documentation Overview</a></li>
+<li class="toctree-l1"><a class="reference internal" 
href="../introduction/overview.html">Getting Started</a></li>
 <li class="toctree-l1"><a class="reference internal" 
href="../introduction/usergrid-features.html">Usergrid Features</a></li>
 <li class="toctree-l1"><a class="reference internal" 
href="../introduction/data-model.html">Usergrid Data model</a></li>
 <li class="toctree-l1"><a class="reference internal" 
href="../introduction/async-vs-sync.html">Async vs. sync calls</a></li>
 </ul>
-<p class="caption"><span class="caption-text">Getting Started</span></p>
+<p class="caption"><span class="caption-text">Using Usergrid</span></p>
 <ul>
-<li class="toctree-l1"><a class="reference internal" 
href="../getting-started/creating-account.html">Creating an Usergrid 
Account</a></li>
-<li class="toctree-l1"><a class="reference internal" 
href="../getting-started/creating-a-new-application.html">Creating a new 
application</a></li>
-<li class="toctree-l1"><a class="reference internal" 
href="../getting-started/using-a-sandbox-app.html">Using a Sandbox 
Application</a></li>
-<li class="toctree-l1"><a class="reference internal" 
href="../getting-started/using-the-api.html">Using the API</a></li>
+<li class="toctree-l1"><a class="reference internal" 
href="../using-usergrid/creating-account.html">Creating a Usergrid 
Account</a></li>
+<li class="toctree-l1"><a class="reference internal" 
href="../using-usergrid/creating-a-new-application.html">Creating a new 
application</a></li>
+<li class="toctree-l1"><a class="reference internal" 
href="../using-usergrid/using-a-sandbox-app.html">Using a Sandbox 
Application</a></li>
+<li class="toctree-l1"><a class="reference internal" 
href="../using-usergrid/using-the-api.html">Using the API</a></li>
 </ul>
 <p class="caption"><span class="caption-text">Data Storage</span></p>
 <ul class="current">
@@ -184,12 +184,6 @@
 <ul>
 <li class="toctree-l1"><a class="reference internal" 
href="../sdks/tbd.html">COMING SOON...</a></li>
 </ul>
-<p class="caption"><span class="caption-text">Installing the Stack</span></p>
-<ul>
-<li class="toctree-l1"><a class="reference internal" 
href="../installation/ug1-deploy-to-tomcat.html">Usegrid 1: Deploying to 
Tomcat</a></li>
-<li class="toctree-l1"><a class="reference internal" 
href="../installation/ug1-launcher-quick-start.html">Usegrid 1: Launcher 
Quick-start</a></li>
-<li class="toctree-l1"><a class="reference internal" 
href="../installation/deployment-guide.html">Usergrid 2.1.0 (unreleased) 
Deployment Guide</a></li>
-</ul>
 <p class="caption"><span class="caption-text">More about Usergrid</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" 
href="../reference/presos-and-videos.html">Presentations &amp; Videos</a></li>
@@ -378,7 +372,7 @@ column family.</p>
         <a href="optimizing-access.html" class="btn btn-neutral float-right" 
title="Data Store Best Practices" accesskey="n">Next <span class="fa 
fa-arrow-circle-right"></span></a>
       
       
-        <a href="../getting-started/using-the-api.html" class="btn 
btn-neutral" title="Using the API" accesskey="p"><span class="fa 
fa-arrow-circle-left"></span> Previous</a>
+        <a href="../using-usergrid/using-the-api.html" class="btn btn-neutral" 
title="Using the API" accesskey="p"><span class="fa 
fa-arrow-circle-left"></span> Previous</a>
       
     </div>
   

http://git-wip-us.apache.org/repos/asf/usergrid/blob/33a3e219/content/docs/data-storage/entities.html
----------------------------------------------------------------------
diff --git a/content/docs/data-storage/entities.html 
b/content/docs/data-storage/entities.html
index 36b77c3..627284b 100644
--- a/content/docs/data-storage/entities.html
+++ b/content/docs/data-storage/entities.html
@@ -80,19 +80,19 @@
         
           
           
-              <p class="caption"><span 
class="caption-text">Introduction</span></p>
+              <p class="caption"><span class="caption-text">Getting 
Started</span></p>
 <ul>
-<li class="toctree-l1"><a class="reference internal" 
href="../introduction/overview.html">Documentation Overview</a></li>
+<li class="toctree-l1"><a class="reference internal" 
href="../introduction/overview.html">Getting Started</a></li>
 <li class="toctree-l1"><a class="reference internal" 
href="../introduction/usergrid-features.html">Usergrid Features</a></li>
 <li class="toctree-l1"><a class="reference internal" 
href="../introduction/data-model.html">Usergrid Data model</a></li>
 <li class="toctree-l1"><a class="reference internal" 
href="../introduction/async-vs-sync.html">Async vs. sync calls</a></li>
 </ul>
-<p class="caption"><span class="caption-text">Getting Started</span></p>
+<p class="caption"><span class="caption-text">Using Usergrid</span></p>
 <ul>
-<li class="toctree-l1"><a class="reference internal" 
href="../getting-started/creating-account.html">Creating an Usergrid 
Account</a></li>
-<li class="toctree-l1"><a class="reference internal" 
href="../getting-started/creating-a-new-application.html">Creating a new 
application</a></li>
-<li class="toctree-l1"><a class="reference internal" 
href="../getting-started/using-a-sandbox-app.html">Using a Sandbox 
Application</a></li>
-<li class="toctree-l1"><a class="reference internal" 
href="../getting-started/using-the-api.html">Using the API</a></li>
+<li class="toctree-l1"><a class="reference internal" 
href="../using-usergrid/creating-account.html">Creating a Usergrid 
Account</a></li>
+<li class="toctree-l1"><a class="reference internal" 
href="../using-usergrid/creating-a-new-application.html">Creating a new 
application</a></li>
+<li class="toctree-l1"><a class="reference internal" 
href="../using-usergrid/using-a-sandbox-app.html">Using a Sandbox 
Application</a></li>
+<li class="toctree-l1"><a class="reference internal" 
href="../using-usergrid/using-the-api.html">Using the API</a></li>
 </ul>
 <p class="caption"><span class="caption-text">Data Storage</span></p>
 <ul class="current">
@@ -223,12 +223,6 @@
 <ul>
 <li class="toctree-l1"><a class="reference internal" 
href="../sdks/tbd.html">COMING SOON...</a></li>
 </ul>
-<p class="caption"><span class="caption-text">Installing the Stack</span></p>
-<ul>
-<li class="toctree-l1"><a class="reference internal" 
href="../installation/ug1-deploy-to-tomcat.html">Usegrid 1: Deploying to 
Tomcat</a></li>
-<li class="toctree-l1"><a class="reference internal" 
href="../installation/ug1-launcher-quick-start.html">Usegrid 1: Launcher 
Quick-start</a></li>
-<li class="toctree-l1"><a class="reference internal" 
href="../installation/deployment-guide.html">Usergrid 2.1.0 (unreleased) 
Deployment Guide</a></li>
-</ul>
 <p class="caption"><span class="caption-text">More about Usergrid</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" 
href="../reference/presos-and-videos.html">Presentations &amp; Videos</a></li>

http://git-wip-us.apache.org/repos/asf/usergrid/blob/33a3e219/content/docs/data-storage/optimizing-access.html
----------------------------------------------------------------------
diff --git a/content/docs/data-storage/optimizing-access.html 
b/content/docs/data-storage/optimizing-access.html
index 5dba798..d6f4ed7 100644
--- a/content/docs/data-storage/optimizing-access.html
+++ b/content/docs/data-storage/optimizing-access.html
@@ -80,19 +80,19 @@
         
           
           
-              <p class="caption"><span 
class="caption-text">Introduction</span></p>
+              <p class="caption"><span class="caption-text">Getting 
Started</span></p>
 <ul>
-<li class="toctree-l1"><a class="reference internal" 
href="../introduction/overview.html">Documentation Overview</a></li>
+<li class="toctree-l1"><a class="reference internal" 
href="../introduction/overview.html">Getting Started</a></li>
 <li class="toctree-l1"><a class="reference internal" 
href="../introduction/usergrid-features.html">Usergrid Features</a></li>
 <li class="toctree-l1"><a class="reference internal" 
href="../introduction/data-model.html">Usergrid Data model</a></li>
 <li class="toctree-l1"><a class="reference internal" 
href="../introduction/async-vs-sync.html">Async vs. sync calls</a></li>
 </ul>
-<p class="caption"><span class="caption-text">Getting Started</span></p>
+<p class="caption"><span class="caption-text">Using Usergrid</span></p>
 <ul>
-<li class="toctree-l1"><a class="reference internal" 
href="../getting-started/creating-account.html">Creating an Usergrid 
Account</a></li>
-<li class="toctree-l1"><a class="reference internal" 
href="../getting-started/creating-a-new-application.html">Creating a new 
application</a></li>
-<li class="toctree-l1"><a class="reference internal" 
href="../getting-started/using-a-sandbox-app.html">Using a Sandbox 
Application</a></li>
-<li class="toctree-l1"><a class="reference internal" 
href="../getting-started/using-the-api.html">Using the API</a></li>
+<li class="toctree-l1"><a class="reference internal" 
href="../using-usergrid/creating-account.html">Creating a Usergrid 
Account</a></li>
+<li class="toctree-l1"><a class="reference internal" 
href="../using-usergrid/creating-a-new-application.html">Creating a new 
application</a></li>
+<li class="toctree-l1"><a class="reference internal" 
href="../using-usergrid/using-a-sandbox-app.html">Using a Sandbox 
Application</a></li>
+<li class="toctree-l1"><a class="reference internal" 
href="../using-usergrid/using-the-api.html">Using the API</a></li>
 </ul>
 <p class="caption"><span class="caption-text">Data Storage</span></p>
 <ul class="current">
@@ -192,12 +192,6 @@
 <ul>
 <li class="toctree-l1"><a class="reference internal" 
href="../sdks/tbd.html">COMING SOON...</a></li>
 </ul>
-<p class="caption"><span class="caption-text">Installing the Stack</span></p>
-<ul>
-<li class="toctree-l1"><a class="reference internal" 
href="../installation/ug1-deploy-to-tomcat.html">Usegrid 1: Deploying to 
Tomcat</a></li>
-<li class="toctree-l1"><a class="reference internal" 
href="../installation/ug1-launcher-quick-start.html">Usegrid 1: Launcher 
Quick-start</a></li>
-<li class="toctree-l1"><a class="reference internal" 
href="../installation/deployment-guide.html">Usergrid 2.1.0 (unreleased) 
Deployment Guide</a></li>
-</ul>
 <p class="caption"><span class="caption-text">More about Usergrid</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" 
href="../reference/presos-and-videos.html">Presentations &amp; Videos</a></li>

http://git-wip-us.apache.org/repos/asf/usergrid/blob/33a3e219/content/docs/entity-connections/connecting-entities.html
----------------------------------------------------------------------
diff --git a/content/docs/entity-connections/connecting-entities.html 
b/content/docs/entity-connections/connecting-entities.html
index 39afcde..f1063cc 100644
--- a/content/docs/entity-connections/connecting-entities.html
+++ b/content/docs/entity-connections/connecting-entities.html
@@ -80,19 +80,19 @@
         
           
           
-              <p class="caption"><span 
class="caption-text">Introduction</span></p>
+              <p class="caption"><span class="caption-text">Getting 
Started</span></p>
 <ul>
-<li class="toctree-l1"><a class="reference internal" 
href="../introduction/overview.html">Documentation Overview</a></li>
+<li class="toctree-l1"><a class="reference internal" 
href="../introduction/overview.html">Getting Started</a></li>
 <li class="toctree-l1"><a class="reference internal" 
href="../introduction/usergrid-features.html">Usergrid Features</a></li>
 <li class="toctree-l1"><a class="reference internal" 
href="../introduction/data-model.html">Usergrid Data model</a></li>
 <li class="toctree-l1"><a class="reference internal" 
href="../introduction/async-vs-sync.html">Async vs. sync calls</a></li>
 </ul>
-<p class="caption"><span class="caption-text">Getting Started</span></p>
+<p class="caption"><span class="caption-text">Using Usergrid</span></p>
 <ul>
-<li class="toctree-l1"><a class="reference internal" 
href="../getting-started/creating-account.html">Creating an Usergrid 
Account</a></li>
-<li class="toctree-l1"><a class="reference internal" 
href="../getting-started/creating-a-new-application.html">Creating a new 
application</a></li>
-<li class="toctree-l1"><a class="reference internal" 
href="../getting-started/using-a-sandbox-app.html">Using a Sandbox 
Application</a></li>
-<li class="toctree-l1"><a class="reference internal" 
href="../getting-started/using-the-api.html">Using the API</a></li>
+<li class="toctree-l1"><a class="reference internal" 
href="../using-usergrid/creating-account.html">Creating a Usergrid 
Account</a></li>
+<li class="toctree-l1"><a class="reference internal" 
href="../using-usergrid/creating-a-new-application.html">Creating a new 
application</a></li>
+<li class="toctree-l1"><a class="reference internal" 
href="../using-usergrid/using-a-sandbox-app.html">Using a Sandbox 
Application</a></li>
+<li class="toctree-l1"><a class="reference internal" 
href="../using-usergrid/using-the-api.html">Using the API</a></li>
 </ul>
 <p class="caption"><span class="caption-text">Data Storage</span></p>
 <ul>
@@ -187,12 +187,6 @@
 <ul>
 <li class="toctree-l1"><a class="reference internal" 
href="../sdks/tbd.html">COMING SOON...</a></li>
 </ul>
-<p class="caption"><span class="caption-text">Installing the Stack</span></p>
-<ul>
-<li class="toctree-l1"><a class="reference internal" 
href="../installation/ug1-deploy-to-tomcat.html">Usegrid 1: Deploying to 
Tomcat</a></li>
-<li class="toctree-l1"><a class="reference internal" 
href="../installation/ug1-launcher-quick-start.html">Usegrid 1: Launcher 
Quick-start</a></li>
-<li class="toctree-l1"><a class="reference internal" 
href="../installation/deployment-guide.html">Usergrid 2.1.0 (unreleased) 
Deployment Guide</a></li>
-</ul>
 <p class="caption"><span class="caption-text">More about Usergrid</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" 
href="../reference/presos-and-videos.html">Presentations &amp; Videos</a></li>

http://git-wip-us.apache.org/repos/asf/usergrid/blob/33a3e219/content/docs/entity-connections/disconnecting-entities.html
----------------------------------------------------------------------
diff --git a/content/docs/entity-connections/disconnecting-entities.html 
b/content/docs/entity-connections/disconnecting-entities.html
index 780f442..ff56845 100644
--- a/content/docs/entity-connections/disconnecting-entities.html
+++ b/content/docs/entity-connections/disconnecting-entities.html
@@ -80,19 +80,19 @@
         
           
           
-              <p class="caption"><span 
class="caption-text">Introduction</span></p>
+              <p class="caption"><span class="caption-text">Getting 
Started</span></p>
 <ul>
-<li class="toctree-l1"><a class="reference internal" 
href="../introduction/overview.html">Documentation Overview</a></li>
+<li class="toctree-l1"><a class="reference internal" 
href="../introduction/overview.html">Getting Started</a></li>
 <li class="toctree-l1"><a class="reference internal" 
href="../introduction/usergrid-features.html">Usergrid Features</a></li>
 <li class="toctree-l1"><a class="reference internal" 
href="../introduction/data-model.html">Usergrid Data model</a></li>
 <li class="toctree-l1"><a class="reference internal" 
href="../introduction/async-vs-sync.html">Async vs. sync calls</a></li>
 </ul>
-<p class="caption"><span class="caption-text">Getting Started</span></p>
+<p class="caption"><span class="caption-text">Using Usergrid</span></p>
 <ul>
-<li class="toctree-l1"><a class="reference internal" 
href="../getting-started/creating-account.html">Creating an Usergrid 
Account</a></li>
-<li class="toctree-l1"><a class="reference internal" 
href="../getting-started/creating-a-new-application.html">Creating a new 
application</a></li>
-<li class="toctree-l1"><a class="reference internal" 
href="../getting-started/using-a-sandbox-app.html">Using a Sandbox 
Application</a></li>
-<li class="toctree-l1"><a class="reference internal" 
href="../getting-started/using-the-api.html">Using the API</a></li>
+<li class="toctree-l1"><a class="reference internal" 
href="../using-usergrid/creating-account.html">Creating a Usergrid 
Account</a></li>
+<li class="toctree-l1"><a class="reference internal" 
href="../using-usergrid/creating-a-new-application.html">Creating a new 
application</a></li>
+<li class="toctree-l1"><a class="reference internal" 
href="../using-usergrid/using-a-sandbox-app.html">Using a Sandbox 
Application</a></li>
+<li class="toctree-l1"><a class="reference internal" 
href="../using-usergrid/using-the-api.html">Using the API</a></li>
 </ul>
 <p class="caption"><span class="caption-text">Data Storage</span></p>
 <ul>
@@ -187,12 +187,6 @@
 <ul>
 <li class="toctree-l1"><a class="reference internal" 
href="../sdks/tbd.html">COMING SOON...</a></li>
 </ul>
-<p class="caption"><span class="caption-text">Installing the Stack</span></p>
-<ul>
-<li class="toctree-l1"><a class="reference internal" 
href="../installation/ug1-deploy-to-tomcat.html">Usegrid 1: Deploying to 
Tomcat</a></li>
-<li class="toctree-l1"><a class="reference internal" 
href="../installation/ug1-launcher-quick-start.html">Usegrid 1: Launcher 
Quick-start</a></li>
-<li class="toctree-l1"><a class="reference internal" 
href="../installation/deployment-guide.html">Usergrid 2.1.0 (unreleased) 
Deployment Guide</a></li>
-</ul>
 <p class="caption"><span class="caption-text">More about Usergrid</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" 
href="../reference/presos-and-videos.html">Presentations &amp; Videos</a></li>

http://git-wip-us.apache.org/repos/asf/usergrid/blob/33a3e219/content/docs/entity-connections/retrieving-entities.html
----------------------------------------------------------------------
diff --git a/content/docs/entity-connections/retrieving-entities.html 
b/content/docs/entity-connections/retrieving-entities.html
index 418f1ee..b2347ee 100644
--- a/content/docs/entity-connections/retrieving-entities.html
+++ b/content/docs/entity-connections/retrieving-entities.html
@@ -80,19 +80,19 @@
         
           
           
-              <p class="caption"><span 
class="caption-text">Introduction</span></p>
+              <p class="caption"><span class="caption-text">Getting 
Started</span></p>
 <ul>
-<li class="toctree-l1"><a class="reference internal" 
href="../introduction/overview.html">Documentation Overview</a></li>
+<li class="toctree-l1"><a class="reference internal" 
href="../introduction/overview.html">Getting Started</a></li>
 <li class="toctree-l1"><a class="reference internal" 
href="../introduction/usergrid-features.html">Usergrid Features</a></li>
 <li class="toctree-l1"><a class="reference internal" 
href="../introduction/data-model.html">Usergrid Data model</a></li>
 <li class="toctree-l1"><a class="reference internal" 
href="../introduction/async-vs-sync.html">Async vs. sync calls</a></li>
 </ul>
-<p class="caption"><span class="caption-text">Getting Started</span></p>
+<p class="caption"><span class="caption-text">Using Usergrid</span></p>
 <ul>
-<li class="toctree-l1"><a class="reference internal" 
href="../getting-started/creating-account.html">Creating an Usergrid 
Account</a></li>
-<li class="toctree-l1"><a class="reference internal" 
href="../getting-started/creating-a-new-application.html">Creating a new 
application</a></li>
-<li class="toctree-l1"><a class="reference internal" 
href="../getting-started/using-a-sandbox-app.html">Using a Sandbox 
Application</a></li>
-<li class="toctree-l1"><a class="reference internal" 
href="../getting-started/using-the-api.html">Using the API</a></li>
+<li class="toctree-l1"><a class="reference internal" 
href="../using-usergrid/creating-account.html">Creating a Usergrid 
Account</a></li>
+<li class="toctree-l1"><a class="reference internal" 
href="../using-usergrid/creating-a-new-application.html">Creating a new 
application</a></li>
+<li class="toctree-l1"><a class="reference internal" 
href="../using-usergrid/using-a-sandbox-app.html">Using a Sandbox 
Application</a></li>
+<li class="toctree-l1"><a class="reference internal" 
href="../using-usergrid/using-the-api.html">Using the API</a></li>
 </ul>
 <p class="caption"><span class="caption-text">Data Storage</span></p>
 <ul>
@@ -190,12 +190,6 @@
 <ul>
 <li class="toctree-l1"><a class="reference internal" 
href="../sdks/tbd.html">COMING SOON...</a></li>
 </ul>
-<p class="caption"><span class="caption-text">Installing the Stack</span></p>
-<ul>
-<li class="toctree-l1"><a class="reference internal" 
href="../installation/ug1-deploy-to-tomcat.html">Usegrid 1: Deploying to 
Tomcat</a></li>
-<li class="toctree-l1"><a class="reference internal" 
href="../installation/ug1-launcher-quick-start.html">Usegrid 1: Launcher 
Quick-start</a></li>
-<li class="toctree-l1"><a class="reference internal" 
href="../installation/deployment-guide.html">Usergrid 2.1.0 (unreleased) 
Deployment Guide</a></li>
-</ul>
 <p class="caption"><span class="caption-text">More about Usergrid</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" 
href="../reference/presos-and-videos.html">Presentations &amp; Videos</a></li>

http://git-wip-us.apache.org/repos/asf/usergrid/blob/33a3e219/content/docs/genindex.html
----------------------------------------------------------------------
diff --git a/content/docs/genindex.html b/content/docs/genindex.html
index b555c8b..0c31229 100644
--- a/content/docs/genindex.html
+++ b/content/docs/genindex.html
@@ -79,19 +79,19 @@
         
           
           
-              <p class="caption"><span 
class="caption-text">Introduction</span></p>
+              <p class="caption"><span class="caption-text">Getting 
Started</span></p>
 <ul>
-<li class="toctree-l1"><a class="reference internal" 
href="introduction/overview.html">Documentation Overview</a></li>
+<li class="toctree-l1"><a class="reference internal" 
href="introduction/overview.html">Getting Started</a></li>
 <li class="toctree-l1"><a class="reference internal" 
href="introduction/usergrid-features.html">Usergrid Features</a></li>
 <li class="toctree-l1"><a class="reference internal" 
href="introduction/data-model.html">Usergrid Data model</a></li>
 <li class="toctree-l1"><a class="reference internal" 
href="introduction/async-vs-sync.html">Async vs. sync calls</a></li>
 </ul>
-<p class="caption"><span class="caption-text">Getting Started</span></p>
+<p class="caption"><span class="caption-text">Using Usergrid</span></p>
 <ul>
-<li class="toctree-l1"><a class="reference internal" 
href="getting-started/creating-account.html">Creating an Usergrid 
Account</a></li>
-<li class="toctree-l1"><a class="reference internal" 
href="getting-started/creating-a-new-application.html">Creating a new 
application</a></li>
-<li class="toctree-l1"><a class="reference internal" 
href="getting-started/using-a-sandbox-app.html">Using a Sandbox 
Application</a></li>
-<li class="toctree-l1"><a class="reference internal" 
href="getting-started/using-the-api.html">Using the API</a></li>
+<li class="toctree-l1"><a class="reference internal" 
href="using-usergrid/creating-account.html">Creating a Usergrid Account</a></li>
+<li class="toctree-l1"><a class="reference internal" 
href="using-usergrid/creating-a-new-application.html">Creating a new 
application</a></li>
+<li class="toctree-l1"><a class="reference internal" 
href="using-usergrid/using-a-sandbox-app.html">Using a Sandbox 
Application</a></li>
+<li class="toctree-l1"><a class="reference internal" 
href="using-usergrid/using-the-api.html">Using the API</a></li>
 </ul>
 <p class="caption"><span class="caption-text">Data Storage</span></p>
 <ul>
@@ -183,12 +183,6 @@
 <ul>
 <li class="toctree-l1"><a class="reference internal" 
href="sdks/tbd.html">COMING SOON...</a></li>
 </ul>
-<p class="caption"><span class="caption-text">Installing the Stack</span></p>
-<ul>
-<li class="toctree-l1"><a class="reference internal" 
href="installation/ug1-deploy-to-tomcat.html">Usegrid 1: Deploying to 
Tomcat</a></li>
-<li class="toctree-l1"><a class="reference internal" 
href="installation/ug1-launcher-quick-start.html">Usegrid 1: Launcher 
Quick-start</a></li>
-<li class="toctree-l1"><a class="reference internal" 
href="installation/deployment-guide.html">Usergrid 2.1.0 (unreleased) 
Deployment Guide</a></li>
-</ul>
 <p class="caption"><span class="caption-text">More about Usergrid</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" 
href="reference/presos-and-videos.html">Presentations &amp; Videos</a></li>

http://git-wip-us.apache.org/repos/asf/usergrid/blob/33a3e219/content/docs/geolocation/geolocation.html
----------------------------------------------------------------------
diff --git a/content/docs/geolocation/geolocation.html 
b/content/docs/geolocation/geolocation.html
index df7a9f7..7fa130d 100644
--- a/content/docs/geolocation/geolocation.html
+++ b/content/docs/geolocation/geolocation.html
@@ -80,19 +80,19 @@
         
           
           
-              <p class="caption"><span 
class="caption-text">Introduction</span></p>
+              <p class="caption"><span class="caption-text">Getting 
Started</span></p>
 <ul>
-<li class="toctree-l1"><a class="reference internal" 
href="../introduction/overview.html">Documentation Overview</a></li>
+<li class="toctree-l1"><a class="reference internal" 
href="../introduction/overview.html">Getting Started</a></li>
 <li class="toctree-l1"><a class="reference internal" 
href="../introduction/usergrid-features.html">Usergrid Features</a></li>
 <li class="toctree-l1"><a class="reference internal" 
href="../introduction/data-model.html">Usergrid Data model</a></li>
 <li class="toctree-l1"><a class="reference internal" 
href="../introduction/async-vs-sync.html">Async vs. sync calls</a></li>
 </ul>
-<p class="caption"><span class="caption-text">Getting Started</span></p>
+<p class="caption"><span class="caption-text">Using Usergrid</span></p>
 <ul>
-<li class="toctree-l1"><a class="reference internal" 
href="../getting-started/creating-account.html">Creating an Usergrid 
Account</a></li>
-<li class="toctree-l1"><a class="reference internal" 
href="../getting-started/creating-a-new-application.html">Creating a new 
application</a></li>
-<li class="toctree-l1"><a class="reference internal" 
href="../getting-started/using-a-sandbox-app.html">Using a Sandbox 
Application</a></li>
-<li class="toctree-l1"><a class="reference internal" 
href="../getting-started/using-the-api.html">Using the API</a></li>
+<li class="toctree-l1"><a class="reference internal" 
href="../using-usergrid/creating-account.html">Creating a Usergrid 
Account</a></li>
+<li class="toctree-l1"><a class="reference internal" 
href="../using-usergrid/creating-a-new-application.html">Creating a new 
application</a></li>
+<li class="toctree-l1"><a class="reference internal" 
href="../using-usergrid/using-a-sandbox-app.html">Using a Sandbox 
Application</a></li>
+<li class="toctree-l1"><a class="reference internal" 
href="../using-usergrid/using-the-api.html">Using the API</a></li>
 </ul>
 <p class="caption"><span class="caption-text">Data Storage</span></p>
 <ul>
@@ -189,12 +189,6 @@
 <ul>
 <li class="toctree-l1"><a class="reference internal" 
href="../sdks/tbd.html">COMING SOON...</a></li>
 </ul>
-<p class="caption"><span class="caption-text">Installing the Stack</span></p>
-<ul>
-<li class="toctree-l1"><a class="reference internal" 
href="../installation/ug1-deploy-to-tomcat.html">Usegrid 1: Deploying to 
Tomcat</a></li>
-<li class="toctree-l1"><a class="reference internal" 
href="../installation/ug1-launcher-quick-start.html">Usegrid 1: Launcher 
Quick-start</a></li>
-<li class="toctree-l1"><a class="reference internal" 
href="../installation/deployment-guide.html">Usergrid 2.1.0 (unreleased) 
Deployment Guide</a></li>
-</ul>
 <p class="caption"><span class="caption-text">More about Usergrid</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" 
href="../reference/presos-and-videos.html">Presentations &amp; Videos</a></li>

http://git-wip-us.apache.org/repos/asf/usergrid/blob/33a3e219/content/docs/index.html
----------------------------------------------------------------------
diff --git a/content/docs/index.html b/content/docs/index.html
index 04d267c..95d5d7a 100644
--- a/content/docs/index.html
+++ b/content/docs/index.html
@@ -31,7 +31,7 @@
 
   
     <link rel="top" title="Apache Usergrid 1.0 documentation" href="#"/>
-        <link rel="next" title="Documentation Overview" 
href="introduction/overview.html"/> 
+        <link rel="next" title="Getting Started" 
href="introduction/overview.html"/> 
 
   
   <script src="_static/js/modernizr.min.js"></script>
@@ -79,19 +79,19 @@
         
           
           
-              <p class="caption"><span 
class="caption-text">Introduction</span></p>
+              <p class="caption"><span class="caption-text">Getting 
Started</span></p>
 <ul>
-<li class="toctree-l1"><a class="reference internal" 
href="introduction/overview.html">Documentation Overview</a></li>
+<li class="toctree-l1"><a class="reference internal" 
href="introduction/overview.html">Getting Started</a></li>
 <li class="toctree-l1"><a class="reference internal" 
href="introduction/usergrid-features.html">Usergrid Features</a></li>
 <li class="toctree-l1"><a class="reference internal" 
href="introduction/data-model.html">Usergrid Data model</a></li>
 <li class="toctree-l1"><a class="reference internal" 
href="introduction/async-vs-sync.html">Async vs. sync calls</a></li>
 </ul>
-<p class="caption"><span class="caption-text">Getting Started</span></p>
+<p class="caption"><span class="caption-text">Using Usergrid</span></p>
 <ul>
-<li class="toctree-l1"><a class="reference internal" 
href="getting-started/creating-account.html">Creating an Usergrid 
Account</a></li>
-<li class="toctree-l1"><a class="reference internal" 
href="getting-started/creating-a-new-application.html">Creating a new 
application</a></li>
-<li class="toctree-l1"><a class="reference internal" 
href="getting-started/using-a-sandbox-app.html">Using a Sandbox 
Application</a></li>
-<li class="toctree-l1"><a class="reference internal" 
href="getting-started/using-the-api.html">Using the API</a></li>
+<li class="toctree-l1"><a class="reference internal" 
href="using-usergrid/creating-account.html">Creating a Usergrid Account</a></li>
+<li class="toctree-l1"><a class="reference internal" 
href="using-usergrid/creating-a-new-application.html">Creating a new 
application</a></li>
+<li class="toctree-l1"><a class="reference internal" 
href="using-usergrid/using-a-sandbox-app.html">Using a Sandbox 
Application</a></li>
+<li class="toctree-l1"><a class="reference internal" 
href="using-usergrid/using-the-api.html">Using the API</a></li>
 </ul>
 <p class="caption"><span class="caption-text">Data Storage</span></p>
 <ul>
@@ -183,12 +183,6 @@
 <ul>
 <li class="toctree-l1"><a class="reference internal" 
href="sdks/tbd.html">COMING SOON...</a></li>
 </ul>
-<p class="caption"><span class="caption-text">Installing the Stack</span></p>
-<ul>
-<li class="toctree-l1"><a class="reference internal" 
href="installation/ug1-deploy-to-tomcat.html">Usegrid 1: Deploying to 
Tomcat</a></li>
-<li class="toctree-l1"><a class="reference internal" 
href="installation/ug1-launcher-quick-start.html">Usegrid 1: Launcher 
Quick-start</a></li>
-<li class="toctree-l1"><a class="reference internal" 
href="installation/deployment-guide.html">Usergrid 2.1.0 (unreleased) 
Deployment Guide</a></li>
-</ul>
 <p class="caption"><span class="caption-text">More about Usergrid</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" 
href="reference/presos-and-videos.html">Presentations &amp; Videos</a></li>
@@ -233,17 +227,22 @@
             
   <div class="section" id="apache-usergrid-documentation">
 <h1>Apache Usergrid Documentation<a class="headerlink" 
href="#apache-usergrid-documentation" title="Permalink to this 
headline">¶</a></h1>
-<div class="toctree-wrapper compound" id="introduction">
-<p class="caption"><span class="caption-text">Introduction</span><a 
class="headerlink" href="#introduction" title="Permalink to this 
toctree">¶</a></p>
+<div class="toctree-wrapper compound" id="getting-started">
+<p class="caption"><span class="caption-text">Getting Started</span><a 
class="headerlink" href="#getting-started" title="Permalink to this 
toctree">¶</a></p>
 <ul>
-<li class="toctree-l1"><a class="reference internal" 
href="introduction/overview.html">Documentation Overview</a></li>
+<li class="toctree-l1"><a class="reference internal" 
href="introduction/overview.html">Getting Started</a><ul>
+<li class="toctree-l2"><a class="reference internal" 
href="introduction/overview.html#for-application-developers">For Application 
Developers</a></li>
+<li class="toctree-l2"><a class="reference internal" 
href="introduction/overview.html#for-deployment-and-operations-folks">For 
Deployment and Operations folks</a></li>
+<li class="toctree-l2"><a class="reference internal" 
href="introduction/overview.html#for-open-source-contributoes">For Open Source 
contributoes</a></li>
+</ul>
+</li>
 <li class="toctree-l1"><a class="reference internal" 
href="introduction/usergrid-features.html">Usergrid Features</a><ul>
 <li class="toctree-l2"><a class="reference internal" 
href="introduction/usergrid-features.html#data-storage-management">Data storage 
&amp; management</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="introduction/usergrid-features.html#flexible-data-querying">Flexible data 
querying</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="introduction/usergrid-features.html#social">Social</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="introduction/usergrid-features.html#user-management">User 
management</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="introduction/usergrid-features.html#geolocation">Geolocation</a></li>
-<li class="toctree-l2"><a class="reference internal" 
href="introduction/usergrid-features.html#push-notifications-coming-soon">Push 
notifications (Coming soon...)</a></li>
+<li class="toctree-l2"><a class="reference internal" 
href="introduction/usergrid-features.html#push-notifications">Push 
notifications</a></li>
 </ul>
 </li>
 <li class="toctree-l1"><a class="reference internal" 
href="introduction/data-model.html">Usergrid Data model</a><ul>
@@ -264,33 +263,33 @@
 </ul>
 </div>
 <div class="toctree-wrapper compound" id="id1">
-<span id="getting-started"></span><p class="caption"><span 
class="caption-text">Getting Started</span><a class="headerlink" href="#id1" 
title="Permalink to this toctree">¶</a></p>
+<span id="using-usergrid"></span><p class="caption"><span 
class="caption-text">Using Usergrid</span><a class="headerlink" href="#id1" 
title="Permalink to this toctree">¶</a></p>
 <ul>
-<li class="toctree-l1"><a class="reference internal" 
href="getting-started/creating-account.html">Creating an Usergrid 
Account</a><ul>
-<li class="toctree-l2"><a class="reference internal" 
href="getting-started/creating-account.html#next-steps">Next steps</a></li>
+<li class="toctree-l1"><a class="reference internal" 
href="using-usergrid/creating-account.html">Creating a Usergrid Account</a><ul>
+<li class="toctree-l2"><a class="reference internal" 
href="using-usergrid/creating-account.html#next-steps">Next steps</a></li>
 </ul>
 </li>
-<li class="toctree-l1"><a class="reference internal" 
href="getting-started/creating-a-new-application.html">Creating a new 
application</a><ul>
-<li class="toctree-l2"><a class="reference internal" 
href="getting-started/creating-a-new-application.html#creating-an-application">Creating
 an application</a></li>
-<li class="toctree-l2"><a class="reference internal" 
href="getting-started/creating-a-new-application.html#securing-an-application">Securing
 an application</a></li>
+<li class="toctree-l1"><a class="reference internal" 
href="using-usergrid/creating-a-new-application.html">Creating a new 
application</a><ul>
+<li class="toctree-l2"><a class="reference internal" 
href="using-usergrid/creating-a-new-application.html#creating-an-application">Creating
 an application</a></li>
+<li class="toctree-l2"><a class="reference internal" 
href="using-usergrid/creating-a-new-application.html#securing-an-application">Securing
 an application</a></li>
 </ul>
 </li>
-<li class="toctree-l1"><a class="reference internal" 
href="getting-started/using-a-sandbox-app.html">Using a Sandbox 
Application</a><ul>
-<li class="toctree-l2"><a class="reference internal" 
href="getting-started/using-a-sandbox-app.html#what-is-the-sandbox-application">What
 is the sandbox application?</a></li>
-<li class="toctree-l2"><a class="reference internal" 
href="getting-started/using-a-sandbox-app.html#is-the-sandbox-secure">Is the 
sandbox secure?</a></li>
-<li class="toctree-l2"><a class="reference internal" 
href="getting-started/using-a-sandbox-app.html#creating-a-new-sandbox-application">Creating
 a New Sandbox Application</a></li>
+<li class="toctree-l1"><a class="reference internal" 
href="using-usergrid/using-a-sandbox-app.html">Using a Sandbox 
Application</a><ul>
+<li class="toctree-l2"><a class="reference internal" 
href="using-usergrid/using-a-sandbox-app.html#what-is-the-sandbox-application">What
 is the sandbox application?</a></li>
+<li class="toctree-l2"><a class="reference internal" 
href="using-usergrid/using-a-sandbox-app.html#is-the-sandbox-secure">Is the 
sandbox secure?</a></li>
+<li class="toctree-l2"><a class="reference internal" 
href="using-usergrid/using-a-sandbox-app.html#creating-a-new-sandbox-application">Creating
 a New Sandbox Application</a></li>
 </ul>
 </li>
-<li class="toctree-l1"><a class="reference internal" 
href="getting-started/using-the-api.html">Using the API</a><ul>
-<li class="toctree-l2"><a class="reference internal" 
href="getting-started/using-the-api.html#supported-http-methods">Supported HTTP 
methods</a></li>
-<li class="toctree-l2"><a class="reference internal" 
href="getting-started/using-the-api.html#base-url">Base URL</a></li>
-<li class="toctree-l2"><a class="reference internal" 
href="getting-started/using-the-api.html#request-construction">Request 
construction</a></li>
-<li class="toctree-l2"><a class="reference internal" 
href="getting-started/using-the-api.html#accessing-collections">Accessing 
collections</a></li>
-<li class="toctree-l2"><a class="reference internal" 
href="getting-started/using-the-api.html#accessing-entities">Accessing 
entities</a></li>
-<li class="toctree-l2"><a class="reference internal" 
href="getting-started/using-the-api.html#issuing-queries">Issuing 
queries</a></li>
-<li class="toctree-l2"><a class="reference internal" 
href="getting-started/using-the-api.html#authentication-oauth">Authentication 
(OAuth)</a></li>
-<li class="toctree-l2"><a class="reference internal" 
href="getting-started/using-the-api.html#response-format">Response 
format</a></li>
-<li class="toctree-l2"><a class="reference internal" 
href="getting-started/using-the-api.html#sdks">SDKs</a></li>
+<li class="toctree-l1"><a class="reference internal" 
href="using-usergrid/using-the-api.html">Using the API</a><ul>
+<li class="toctree-l2"><a class="reference internal" 
href="using-usergrid/using-the-api.html#supported-http-methods">Supported HTTP 
methods</a></li>
+<li class="toctree-l2"><a class="reference internal" 
href="using-usergrid/using-the-api.html#base-url">Base URL</a></li>
+<li class="toctree-l2"><a class="reference internal" 
href="using-usergrid/using-the-api.html#request-construction">Request 
construction</a></li>
+<li class="toctree-l2"><a class="reference internal" 
href="using-usergrid/using-the-api.html#accessing-collections">Accessing 
collections</a></li>
+<li class="toctree-l2"><a class="reference internal" 
href="using-usergrid/using-the-api.html#accessing-entities">Accessing 
entities</a></li>
+<li class="toctree-l2"><a class="reference internal" 
href="using-usergrid/using-the-api.html#issuing-queries">Issuing 
queries</a></li>
+<li class="toctree-l2"><a class="reference internal" 
href="using-usergrid/using-the-api.html#authentication-oauth">Authentication 
(OAuth)</a></li>
+<li class="toctree-l2"><a class="reference internal" 
href="using-usergrid/using-the-api.html#response-format">Response 
format</a></li>
+<li class="toctree-l2"><a class="reference internal" 
href="using-usergrid/using-the-api.html#sdks">SDKs</a></li>
 </ul>
 </li>
 </ul>
@@ -711,43 +710,6 @@
 <li class="toctree-l1"><a class="reference internal" 
href="sdks/tbd.html">COMING SOON...</a></li>
 </ul>
 </div>
-<div class="toctree-wrapper compound" id="installing-the-stack">
-<span id="installation"></span><p class="caption"><span 
class="caption-text">Installing the Stack</span><a class="headerlink" 
href="#installing-the-stack" title="Permalink to this toctree">¶</a></p>
-<ul>
-<li class="toctree-l1"><a class="reference internal" 
href="installation/ug1-deploy-to-tomcat.html">Usegrid 1: Deploying to 
Tomcat</a><ul>
-<li class="toctree-l2"><a class="reference internal" 
href="installation/ug1-deploy-to-tomcat.html#requirements">Requirements</a></li>
-<li class="toctree-l2"><a class="reference internal" 
href="installation/ug1-deploy-to-tomcat.html#download">Download</a></li>
-<li class="toctree-l2"><a class="reference internal" 
href="installation/ug1-deploy-to-tomcat.html#building">Building</a></li>
-<li class="toctree-l2"><a class="reference internal" 
href="installation/ug1-deploy-to-tomcat.html#install-and-configure-cassandra">Install
 and configure Cassandra</a></li>
-<li class="toctree-l2"><a class="reference internal" 
href="installation/ug1-deploy-to-tomcat.html#install-and-configure-tomcat">Install
 and configure Tomcat</a></li>
-<li class="toctree-l2"><a class="reference internal" 
href="installation/ug1-deploy-to-tomcat.html#add-usergrid-war-to-tomcat">Add 
Usergrid WAR to Tomcat</a></li>
-<li class="toctree-l2"><a class="reference internal" 
href="installation/ug1-deploy-to-tomcat.html#add-usergrid-configuration-file-to-tomcat">Add
 Usergrid configuration file to Tomcat</a></li>
-<li class="toctree-l2"><a class="reference internal" 
href="installation/ug1-deploy-to-tomcat.html#run-usergrid-database-super-user-setup">Run
 Usergrid Database &amp; Super User Setup</a></li>
-<li class="toctree-l2"><a class="reference internal" 
href="installation/ug1-deploy-to-tomcat.html#build-the-usergrid-console">Build 
the Usergrid Console</a></li>
-<li class="toctree-l2"><a class="reference internal" 
href="installation/ug1-deploy-to-tomcat.html#login-to-the-usergrid-console-get-started">Login
 to the Usergrid Console &amp; get started</a></li>
-<li class="toctree-l2"><a class="reference internal" 
href="installation/ug1-deploy-to-tomcat.html#example-usergrid-custom-properties-file">Example
 <strong>usergrid-custom.properties</strong> file</a></li>
-</ul>
-</li>
-<li class="toctree-l1"><a class="reference internal" 
href="installation/ug1-launcher-quick-start.html">Usegrid 1: Launcher 
Quick-start</a><ul>
-<li class="toctree-l2"><a class="reference internal" 
href="installation/ug1-launcher-quick-start.html#requirements">Requirements</a></li>
-<li class="toctree-l2"><a class="reference internal" 
href="installation/ug1-launcher-quick-start.html#download">Download</a></li>
-<li class="toctree-l2"><a class="reference internal" 
href="installation/ug1-launcher-quick-start.html#running">Running</a></li>
-<li class="toctree-l2"><a class="reference internal" 
href="installation/ug1-launcher-quick-start.html#getting-started-with-the-http-api">Getting
 Started with the HTTP API</a></li>
-</ul>
-</li>
-<li class="toctree-l1"><a class="reference internal" 
href="installation/deployment-guide.html">Usergrid 2.1.0 (unreleased) 
Deployment Guide</a><ul>
-<li class="toctree-l2"><a class="reference internal" 
href="installation/deployment-guide.html#draft">DRAFT</a></li>
-<li class="toctree-l2"><a class="reference internal" 
href="installation/deployment-guide.html#intended-audience">Intended 
audience</a></li>
-<li class="toctree-l2"><a class="reference internal" 
href="installation/deployment-guide.html#prerequsites">Prerequsites</a></li>
-<li class="toctree-l2"><a class="reference internal" 
href="installation/deployment-guide.html#getting-started">Getting 
Started</a></li>
-<li class="toctree-l2"><a class="reference internal" 
href="installation/deployment-guide.html#deploying-the-usergrid-stack">Deploying
 the Usergrid Stack</a></li>
-<li class="toctree-l2"><a class="reference internal" 
href="installation/deployment-guide.html#deploying-the-usergrid-portal">Deploying
 the Usergrid Portal</a></li>
-<li class="toctree-l2"><a class="reference internal" 
href="installation/deployment-guide.html#additional-resources">Additional 
Resources</a></li>
-<li class="toctree-l2"><a class="reference internal" 
href="installation/deployment-guide.html#the-end">The End</a></li>
-</ul>
-</li>
-</ul>
-</div>
 <div class="toctree-wrapper compound" id="more-about-usergrid">
 <span id="about"></span><p class="caption"><span class="caption-text">More 
about Usergrid</span><a class="headerlink" href="#more-about-usergrid" 
title="Permalink to this toctree">¶</a></p>
 <ul>
@@ -760,8 +722,9 @@
 </ul>
 </li>
 <li class="toctree-l1"><a class="reference internal" 
href="reference/contribute-code.html">How to Contribute Code &amp; Docs</a><ul>
-<li class="toctree-l2"><a class="reference internal" 
href="reference/contribute-code.html#code-contributions">Code 
Contributions</a></li>
-<li class="toctree-l2"><a class="reference internal" 
href="reference/contribute-code.html#website-and-documentation-contributions">Website
 and Documentation Contributions</a></li>
+<li class="toctree-l2"><a class="reference internal" 
href="reference/contribute-code.html#contribute-via-github">Contribute via 
GitHub</a></li>
+<li class="toctree-l2"><a class="reference internal" 
href="reference/contribute-code.html#building-usergrid">Building 
Usergrid</a></li>
+<li class="toctree-l2"><a class="reference internal" 
href="reference/contribute-code.html#building-the-website-and-documentation">Building
 the Website and Documentation</a></li>
 </ul>
 </li>
 </ul>
@@ -775,7 +738,7 @@
   
     <div class="rst-footer-buttons" role="navigation" aria-label="footer 
navigation">
       
-        <a href="introduction/overview.html" class="btn btn-neutral 
float-right" title="Documentation Overview" accesskey="n">Next <span class="fa 
fa-arrow-circle-right"></span></a>
+        <a href="introduction/overview.html" class="btn btn-neutral 
float-right" title="Getting Started" accesskey="n">Next <span class="fa 
fa-arrow-circle-right"></span></a>
       
       
     </div>

http://git-wip-us.apache.org/repos/asf/usergrid/blob/33a3e219/content/docs/installation/deployment-guide.html
----------------------------------------------------------------------
diff --git a/content/docs/installation/deployment-guide.html 
b/content/docs/installation/deployment-guide.html
index 79ee683..fadb6a0 100644
--- a/content/docs/installation/deployment-guide.html
+++ b/content/docs/installation/deployment-guide.html
@@ -30,9 +30,7 @@
   
 
   
-    <link rel="top" title="Apache Usergrid 1.0 documentation" 
href="../index.html"/>
-        <link rel="next" title="Presentations &amp; Videos" 
href="../reference/presos-and-videos.html"/>
-        <link rel="prev" title="Usegrid 1: Launcher Quick-start" 
href="ug1-launcher-quick-start.html"/> 
+    <link rel="top" title="Apache Usergrid 1.0 documentation" 
href="../index.html"/> 
 
   
   <script src="../_static/js/modernizr.min.js"></script>
@@ -80,19 +78,19 @@
         
           
           
-              <p class="caption"><span 
class="caption-text">Introduction</span></p>
+              <p class="caption"><span class="caption-text">Getting 
Started</span></p>
 <ul>
-<li class="toctree-l1"><a class="reference internal" 
href="../introduction/overview.html">Documentation Overview</a></li>
+<li class="toctree-l1"><a class="reference internal" 
href="../introduction/overview.html">Getting Started</a></li>
 <li class="toctree-l1"><a class="reference internal" 
href="../introduction/usergrid-features.html">Usergrid Features</a></li>
 <li class="toctree-l1"><a class="reference internal" 
href="../introduction/data-model.html">Usergrid Data model</a></li>
 <li class="toctree-l1"><a class="reference internal" 
href="../introduction/async-vs-sync.html">Async vs. sync calls</a></li>
 </ul>
-<p class="caption"><span class="caption-text">Getting Started</span></p>
+<p class="caption"><span class="caption-text">Using Usergrid</span></p>
 <ul>
-<li class="toctree-l1"><a class="reference internal" 
href="../getting-started/creating-account.html">Creating an Usergrid 
Account</a></li>
-<li class="toctree-l1"><a class="reference internal" 
href="../getting-started/creating-a-new-application.html">Creating a new 
application</a></li>
-<li class="toctree-l1"><a class="reference internal" 
href="../getting-started/using-a-sandbox-app.html">Using a Sandbox 
Application</a></li>
-<li class="toctree-l1"><a class="reference internal" 
href="../getting-started/using-the-api.html">Using the API</a></li>
+<li class="toctree-l1"><a class="reference internal" 
href="../using-usergrid/creating-account.html">Creating a Usergrid 
Account</a></li>
+<li class="toctree-l1"><a class="reference internal" 
href="../using-usergrid/creating-a-new-application.html">Creating a new 
application</a></li>
+<li class="toctree-l1"><a class="reference internal" 
href="../using-usergrid/using-a-sandbox-app.html">Using a Sandbox 
Application</a></li>
+<li class="toctree-l1"><a class="reference internal" 
href="../using-usergrid/using-the-api.html">Using the API</a></li>
 </ul>
 <p class="caption"><span class="caption-text">Data Storage</span></p>
 <ul>
@@ -184,36 +182,6 @@
 <ul>
 <li class="toctree-l1"><a class="reference internal" 
href="../sdks/tbd.html">COMING SOON...</a></li>
 </ul>
-<p class="caption"><span class="caption-text">Installing the Stack</span></p>
-<ul class="current">
-<li class="toctree-l1"><a class="reference internal" 
href="ug1-deploy-to-tomcat.html">Usegrid 1: Deploying to Tomcat</a></li>
-<li class="toctree-l1"><a class="reference internal" 
href="ug1-launcher-quick-start.html">Usegrid 1: Launcher Quick-start</a></li>
-<li class="toctree-l1 current"><a class="current reference internal" 
href="">Usergrid 2.1.0 (unreleased) Deployment Guide</a><ul>
-<li class="toctree-l2"><a class="reference internal" 
href="#draft">DRAFT</a></li>
-<li class="toctree-l2"><a class="reference internal" 
href="#intended-audience">Intended audience</a></li>
-<li class="toctree-l2"><a class="reference internal" 
href="#prerequsites">Prerequsites</a></li>
-<li class="toctree-l2"><a class="reference internal" 
href="#getting-started">Getting Started</a></li>
-<li class="toctree-l2"><a class="reference internal" 
href="#deploying-the-usergrid-stack">Deploying the Usergrid Stack</a><ul>
-<li class="toctree-l3"><a class="reference internal" 
href="#stack-step-1-setup-cassandra">Stack STEP #1: Setup Cassandra</a></li>
-<li class="toctree-l3"><a class="reference internal" 
href="#stack-step-2-setup-elasticsearch">Stack STEP #2: Setup 
ElasticSearch</a></li>
-<li class="toctree-l3"><a class="reference internal" 
href="#stack-step-3-setup-tomcat">Stack STEP #3: Setup Tomcat</a></li>
-<li class="toctree-l3"><a class="reference internal" 
href="#stack-step-4-configure-usergrid-stack-logging">Stack STEP #4: Configure 
Usergrid Stack &amp; Logging</a><ul>
-<li class="toctree-l4"><a class="reference internal" 
href="#example-usergrid-stack-properties-file">Example Usergrid Stack 
Properties File</a></li>
-<li class="toctree-l4"><a class="reference internal" 
href="#configure-logging">Configure Logging</a></li>
-</ul>
-</li>
-<li class="toctree-l3"><a class="reference internal" 
href="#stack-step-5-deploy-root-war-to-tomcat">Stack STEP #5: Deploy ROOT.war 
to Tomcat</a><ul>
-<li class="toctree-l4"><a class="reference internal" 
href="#initialize-the-usergrid-database">Initialize the Usergrid 
Database</a></li>
-</ul>
-</li>
-</ul>
-</li>
-<li class="toctree-l2"><a class="reference internal" 
href="#deploying-the-usergrid-portal">Deploying the Usergrid Portal</a></li>
-<li class="toctree-l2"><a class="reference internal" 
href="#additional-resources">Additional Resources</a></li>
-<li class="toctree-l2"><a class="reference internal" href="#the-end">The 
End</a></li>
-</ul>
-</li>
-</ul>
 <p class="caption"><span class="caption-text">More about Usergrid</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" 
href="../reference/presos-and-videos.html">Presentations &amp; Videos</a></li>
@@ -258,13 +226,10 @@
             
   <div class="section" id="usergrid-2-1-0-unreleased-deployment-guide">
 <h1>Usergrid 2.1.0 (unreleased) Deployment Guide<a class="headerlink" 
href="#usergrid-2-1-0-unreleased-deployment-guide" title="Permalink to this 
headline">¶</a></h1>
-<div class="section" id="draft">
-<h2>DRAFT<a class="headerlink" href="#draft" title="Permalink to this 
headline">¶</a></h2>
 <p>This document explains how to deploy the Usergrid v2.1.0
 Backend-as-a-Service (BaaS), which comprises the Usergrid Stack, a Java
 web application, and the Usergrid Portal, which is an HTML5/JavaScript
 application.</p>
-</div>
 <div class="section" id="intended-audience">
 <h2>Intended audience<a class="headerlink" href="#intended-audience" 
title="Permalink to this headline">¶</a></h2>
 <p>You should be able to follow this guide if you are a developer, system
@@ -300,19 +265,8 @@ running the Usergrid Portal</li>
 </div>
 <div class="section" id="getting-started">
 <h2>Getting Started<a class="headerlink" href="#getting-started" 
title="Permalink to this headline">¶</a></h2>
-<p>Deploying Usergrid starts with downloaded the Apache Usergrid release.
-There are three ways to go:</p>
-<ol class="arabic simple">
-<li>Clone the Usergrid Git repo, get the <code class="docutils literal"><span 
class="pre">usergrid-2.1.0</span></code> tag (not
-available yet) and build Usergrid yourself.</li>
-<li>Download the official Apache Usergrid 2.1.0 source-code release (not
-available yet) and build Usergrid</li>
-<li>Download the Apache Usergrid 2.1.0 binary release (not available).</li>
-</ol>
-<p>The easist way to go is option #3 and so that&#8217;s what we will do in 
this
-document.</p>
-<p><strong>Get started by downloading the Apache Usergrid 2.1.0</strong> 
binary release
-from the Usergrid releases page:</p>
+<p><strong>Download the Apache Usergrid 2.1.0 binary release</strong> from the 
official
+Usergrid releases page:</p>
 <ul class="simple">
 <li><a class="reference external" 
href="https://usergrid.apache.org/releases";>Apache Usergrid Releases</a></li>
 </ul>
@@ -434,8 +388,73 @@ use as your own.</p>
 <h4>Example Usergrid Stack Properties File<a class="headerlink" 
href="#example-usergrid-stack-properties-file" title="Permalink to this 
headline">¶</a></h4>
 <p>Below is an minimal example Usergrid properties file with the parts you
 need to change indicated like shell variables, e.g.
-<code class="docutils literal"><span 
class="pre">${USERGRID_CLUSTER_NAME}</span></code>. Here&#8217;s a guide to the 
things you need to
-set:</p>
+<code class="docutils literal"><span 
class="pre">${USERGRID_CLUSTER_NAME}</span></code>.</p>
+<p>Example 1: usergrid-deployment.properties file</p>
+<div class="highlight-python"><div 
class="highlight"><pre>usergrid.cluster_name=${USERGRID_CLUSTER_NAME}
+
+cassandra.url=${CASSANDRA_HOSTS}
+cassanrda.cluster=${CASSANDRA_CLUSTER_NAME}
+
+elasticsearch.cluster_name=${ELASTICSEARCH_CLUSTER_NAME}
+elasticsearch.hosts=${ELASTIC_SEARCH_HOSTS}
+
+######################################################
+# Admin and test user setup
+
+usergrid.sysadmin.login.allowed=true
+usergrid.sysadmin.login.name=superuser
+usergrid.sysadmin.login.password=${SUPER_USER_PASSWORD}
+usergrid.sysadmin.login.email=${SUPER_USER_EMAIL}
+
+usergrid.sysadmin.email=${SUPER_USER_EMAIL}
+usergrid.sysadmin.approve.users=true
+usergrid.sysadmin.approve.organizations=true
+
+# Base mailer account - default for all outgoing messages
+usergrid.management.mailer=Admin &lt;${SUPER_USER_EMAIL}&gt;
+
+usergrid.setup-test-account=true
+usergrid.test-account.app=test-app
+usergrid.test-account.organization=test-organization
+usergrid.test-account.admin-user.username=test
+usergrid.test-account.admin-user.name=Test User
+usergrid.test-account.admin-user.email=${TEST_ADMIN_USER_EMAIL}
+usergrid.test-account.admin-user.password=${TEST_ADMIN_USER_PASSWORD}
+
+######################################################
+# Auto-confirm and sign-up notifications settings
+
+usergrid.management.admin_users_require_confirmation=false
+usergrid.management.admin_users_require_activation=false
+
+usergrid.management.organizations_require_activation=false
+usergrid.management.notify_sysadmin_of_new_organizations=true
+usergrid.management.notify_sysadmin_of_new_admin_users=true
+
+######################################################
+# URLs
+
+# Redirect path when request come in for TLD
+usergrid.redirect_root=${BASEURL}/status
+
+usergrid.view.management.organizations.organization.activate=${BASEURL}/accounts/welcome
+usergrid.view.management.organizations.organization.confirm=${BASEURL}/accounts/welcome
+
+usergrid.view.management.users.user.activate=${BASEURL}/accounts/welcome
+usergrid.view.management.users.user.confirm=${BASEURL}/accounts/welcome
+
+usergrid.admin.confirmation.url=${BASEURL}/management/users/%s/confirm
+usergrid.user.confirmation.url=${BASEURL}/%s/%s/users/%s/confirm
+usergrid.organization.activation.url=${BASEURL}/management/organizations/%s/activate
+usergrid.admin.activation.url=${BASEURL}/management/users/%s/activate
+usergrid.user.activation.url=${BASEURL}%s/%s/users/%s/activate
+
+usergrid.admin.resetpw.url=${BASEURL}/management/users/%s/resetpw
+usergrid.user.resetpw.url=${BASEURL}/%s/%s/users/%s/resetpw
+</pre></div>
+</div>
+<p>Here&#8217;s a guide to the things you need to set in the above properties
+file.</p>
 <p><strong>Table 1: Values to set in Example Properties file:</strong></p>
 <table class="usergrid-table">
 <tr>
@@ -467,8 +486,8 @@ set:</p>
     <td><p><strong>CASSANDRA_HOSTS</strong></p>
 </td>
     <td><p>Comma-separated lists of Cassandra hosts, with port numbers if you 
are
-not using the default 9120. The default for this property is
-<code class="docutils literal"><span 
class="pre">localhost:9120</span></code></p>
+not using the default 9160. The default for this property is
+<code class="docutils literal"><span 
class="pre">localhost:9160</span></code></p>
 </td>
 </tr>
 <tr>
@@ -513,87 +532,23 @@ create a test account and you should specify a valid 
email here.</p>
 </tr>
 </table><p>Make sure you set all of the above properties when you edit this 
example
 for your installation.</p>
-<p>Example 1: usergrid-deployment.properties file</p>
-<div class="highlight-python"><div 
class="highlight"><pre>usergrid.cluster_name=${USERGRID_CLUSTER_NAME}
-
-cassandra.url=${CASSANDRA_HOSTS}
-cassanrda.cluster=${CASSANDRA_CLUSTER_NAME}
-
-elasticsearch.cluster_name=${ELASTICSEARCH_CLUSTER_NAME}
-elasticsearch.hosts=${ELASTIC_SEARCH_HOSTS}
-
-######################################################
-# Admin and test user setup
-
-usergrid.sysadmin.login.allowed=true
-usergrid.sysadmin.login.name=superuser
-usergrid.sysadmin.login.password=${SUPER_USER_PASSWORD}
-usergrid.sysadmin.login.email=${SUPER_USER_EMAIL}
-
-usergrid.sysadmin.email=${SUPER_USER_EMAIL}
-usergrid.sysadmin.approve.users=true
-usergrid.sysadmin.approve.organizations=true
-
-# Base mailer account - default for all outgoing messages
-usergrid.management.mailer=Admin &lt;${SUPER_USER_EMAIL}&gt;
-
-usergrid.setup-test-account=true
-usergrid.test-account.app=test-app
-usergrid.test-account.organization=test-organization
-usergrid.test-account.admin-user.username=test
-usergrid.test-account.admin-user.name=Test User
-usergrid.test-account.admin-user.email=${TEST_ADMIN_USER_EMAIL}
-usergrid.test-account.admin-user.password=${TEST_ADMIN_USER_PASSWORD}
-
-######################################################
-# Auto-confirm and sign-up notifications settings
-
-usergrid.management.admin_users_require_confirmation=false
-usergrid.management.admin_users_require_activation=false
-
-usergrid.management.organizations_require_activation=false
-usergrid.management.notify_sysadmin_of_new_organizations=true
-usergrid.management.notify_sysadmin_of_new_admin_users=true
-
-######################################################
-# URLs
-
-# Redirect path when request come in for TLD
-usergrid.redirect_root=${BASEURL}/status
-
-usergrid.view.management.organizations.organization.activate=${BASEURL}/accounts/welcome
-usergrid.view.management.organizations.organization.confirm=${BASEURL}/accounts/welcome
-
-usergrid.view.management.users.user.activate=${BASEURL}/accounts/welcome
-usergrid.view.management.users.user.confirm=${BASEURL}/accounts/welcome
-
-usergrid.admin.confirmation.url=${BASEURL}/management/users/%s/confirm
-usergrid.user.confirmation.url=${BASEURL}/%s/%s/users/%s/confirm
-usergrid.organization.activation.url=${BASEURL}/management/organizations/%s/activate
-usergrid.admin.activation.url=${BASEURL}/management/users/%s/activate
-usergrid.user.activation.url=${BASEURL}%s/%s/users/%s/activate
-
-usergrid.admin.resetpw.url=${BASEURL}/management/users/%s/resetpw
-usergrid.user.resetpw.url=${BASEURL}/%s/%s/users/%s/resetpw
-</pre></div>
-</div>
 </div>
 <div class="section" id="configure-logging">
 <h4>Configure Logging<a class="headerlink" href="#configure-logging" 
title="Permalink to this headline">¶</a></h4>
 <p>Usegrid includes the Apache Log4j logging system and you can control the
 levels of logs for each Usergrid package and even down to the class
-level by providing your own <strong>log4j.properties</strong> file.</p>
+level by providing your own <code class="docutils literal"><span 
class="pre">log4j.properties</span></code> file.</p>
 <p>To configure logging you need to:</p>
 <ol class="arabic simple">
-<li>Create a <strong>log4j.properties</strong> file and place it on the 
computer where
+<li>Create a <code class="docutils literal"><span 
class="pre">log4j.properties</span></code> file and place it on the computer 
where
 Tomcat is running</li>
-<li>Add <strong>-D</strong> system property to Tomcat so that Tomcat can find 
your
+<li>Add <code class="docutils literal"><span class="pre">-D</span></code> 
system property to Tomcat so that Tomcat can find your
 Log4j properties file.</li>
 </ol>
 <div class="section" id="example-logging-configuration">
 <h5>Example Logging Configuration<a class="headerlink" 
href="#example-logging-configuration" title="Permalink to this 
headline">¶</a></h5>
 <p>The Log4j properties file below is a good starting point for Usergrid.
-It configures ERROR level logging for the 3rd party libraries that
+It configures <code class="docutils literal"><span 
class="pre">ERROR</span></code> level logging for the 3rd party libraries that
 Usergrid depends on, and INFO level logging for Usergrid. Plus, it
 configures some noisy parts of Usergrid to be quiet.</p>
 <p>Example 2: log4.properties file</p>
@@ -722,7 +677,8 @@ message like this:</p>
 </pre></div>
 </div>
 <p>If you don&#8217;t see a success message, then refer to the Tomcat logs for
-error message and seek help from the Usergrid community.</p>
+error message and seek help from the <a class="reference external" 
href="http://usergrid.apache.org/community";>Usergrid
+community</a>.</p>
 <p>Now that you&#8217;ve gotten Usergrid up and running, you&#8217;re ready to 
deploy
 the Usergrid Portal.</p>
 </div>
@@ -756,7 +712,8 @@ editing the <code class="docutils literal"><span 
class="pre">portal/config.js</s
 </div>
 <p>To set the hostname that you will be using for your Usergrid
 installation.</p>
-<p>Start your web server and Portal should be up and running!</p>
+<p>Start your web server and Portal should be up and running at
+<a class="reference external" 
href="http://localhost:8080/portal";>http://localhost:8080/portal</a> or 
wherever you deployed it.</p>
 </div>
 <div class="section" id="additional-resources">
 <h2>Additional Resources<a class="headerlink" href="#additional-resources" 
title="Permalink to this headline">¶</a></h2>
@@ -782,15 +739,6 @@ instances running Cassandra and ElasticSearch.</p>
           </div>
           <footer>
   
-    <div class="rst-footer-buttons" role="navigation" aria-label="footer 
navigation">
-      
-        <a href="../reference/presos-and-videos.html" class="btn btn-neutral 
float-right" title="Presentations &amp; Videos" accesskey="n">Next <span 
class="fa fa-arrow-circle-right"></span></a>
-      
-      
-        <a href="ug1-launcher-quick-start.html" class="btn btn-neutral" 
title="Usegrid 1: Launcher Quick-start" accesskey="p"><span class="fa 
fa-arrow-circle-left"></span> Previous</a>
-      
-    </div>
-  
 
   <hr/>
 

http://git-wip-us.apache.org/repos/asf/usergrid/blob/33a3e219/content/docs/installation/ug1-deploy-to-tomcat.html
----------------------------------------------------------------------
diff --git a/content/docs/installation/ug1-deploy-to-tomcat.html 
b/content/docs/installation/ug1-deploy-to-tomcat.html
index eb7ecae..c772d4b 100644
--- a/content/docs/installation/ug1-deploy-to-tomcat.html
+++ b/content/docs/installation/ug1-deploy-to-tomcat.html
@@ -30,9 +30,7 @@
   
 
   
-    <link rel="top" title="Apache Usergrid 1.0 documentation" 
href="../index.html"/>
-        <link rel="next" title="Usegrid 1: Launcher Quick-start" 
href="ug1-launcher-quick-start.html"/>
-        <link rel="prev" title="COMING SOON..." href="../sdks/tbd.html"/> 
+    <link rel="top" title="Apache Usergrid 1.0 documentation" 
href="../index.html"/> 
 
   
   <script src="../_static/js/modernizr.min.js"></script>
@@ -80,19 +78,19 @@
         
           
           
-              <p class="caption"><span 
class="caption-text">Introduction</span></p>
+              <p class="caption"><span class="caption-text">Getting 
Started</span></p>
 <ul>
-<li class="toctree-l1"><a class="reference internal" 
href="../introduction/overview.html">Documentation Overview</a></li>
+<li class="toctree-l1"><a class="reference internal" 
href="../introduction/overview.html">Getting Started</a></li>
 <li class="toctree-l1"><a class="reference internal" 
href="../introduction/usergrid-features.html">Usergrid Features</a></li>
 <li class="toctree-l1"><a class="reference internal" 
href="../introduction/data-model.html">Usergrid Data model</a></li>
 <li class="toctree-l1"><a class="reference internal" 
href="../introduction/async-vs-sync.html">Async vs. sync calls</a></li>
 </ul>
-<p class="caption"><span class="caption-text">Getting Started</span></p>
+<p class="caption"><span class="caption-text">Using Usergrid</span></p>
 <ul>
-<li class="toctree-l1"><a class="reference internal" 
href="../getting-started/creating-account.html">Creating an Usergrid 
Account</a></li>
-<li class="toctree-l1"><a class="reference internal" 
href="../getting-started/creating-a-new-application.html">Creating a new 
application</a></li>
-<li class="toctree-l1"><a class="reference internal" 
href="../getting-started/using-a-sandbox-app.html">Using a Sandbox 
Application</a></li>
-<li class="toctree-l1"><a class="reference internal" 
href="../getting-started/using-the-api.html">Using the API</a></li>
+<li class="toctree-l1"><a class="reference internal" 
href="../using-usergrid/creating-account.html">Creating a Usergrid 
Account</a></li>
+<li class="toctree-l1"><a class="reference internal" 
href="../using-usergrid/creating-a-new-application.html">Creating a new 
application</a></li>
+<li class="toctree-l1"><a class="reference internal" 
href="../using-usergrid/using-a-sandbox-app.html">Using a Sandbox 
Application</a></li>
+<li class="toctree-l1"><a class="reference internal" 
href="../using-usergrid/using-the-api.html">Using the API</a></li>
 </ul>
 <p class="caption"><span class="caption-text">Data Storage</span></p>
 <ul>
@@ -184,25 +182,6 @@
 <ul>
 <li class="toctree-l1"><a class="reference internal" 
href="../sdks/tbd.html">COMING SOON...</a></li>
 </ul>
-<p class="caption"><span class="caption-text">Installing the Stack</span></p>
-<ul class="current">
-<li class="toctree-l1 current"><a class="current reference internal" 
href="">Usegrid 1: Deploying to Tomcat</a><ul>
-<li class="toctree-l2"><a class="reference internal" 
href="#requirements">Requirements</a></li>
-<li class="toctree-l2"><a class="reference internal" 
href="#download">Download</a></li>
-<li class="toctree-l2"><a class="reference internal" 
href="#building">Building</a></li>
-<li class="toctree-l2"><a class="reference internal" 
href="#install-and-configure-cassandra">Install and configure Cassandra</a></li>
-<li class="toctree-l2"><a class="reference internal" 
href="#install-and-configure-tomcat">Install and configure Tomcat</a></li>
-<li class="toctree-l2"><a class="reference internal" 
href="#add-usergrid-war-to-tomcat">Add Usergrid WAR to Tomcat</a></li>
-<li class="toctree-l2"><a class="reference internal" 
href="#add-usergrid-configuration-file-to-tomcat">Add Usergrid configuration 
file to Tomcat</a></li>
-<li class="toctree-l2"><a class="reference internal" 
href="#run-usergrid-database-super-user-setup">Run Usergrid Database &amp; 
Super User Setup</a></li>
-<li class="toctree-l2"><a class="reference internal" 
href="#build-the-usergrid-console">Build the Usergrid Console</a></li>
-<li class="toctree-l2"><a class="reference internal" 
href="#login-to-the-usergrid-console-get-started">Login to the Usergrid Console 
&amp; get started</a></li>
-<li class="toctree-l2"><a class="reference internal" 
href="#example-usergrid-custom-properties-file">Example 
<strong>usergrid-custom.properties</strong> file</a></li>
-</ul>
-</li>
-<li class="toctree-l1"><a class="reference internal" 
href="ug1-launcher-quick-start.html">Usegrid 1: Launcher Quick-start</a></li>
-<li class="toctree-l1"><a class="reference internal" 
href="deployment-guide.html">Usergrid 2.1.0 (unreleased) Deployment 
Guide</a></li>
-</ul>
 <p class="caption"><span class="caption-text">More about Usergrid</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" 
href="../reference/presos-and-videos.html">Presentations &amp; Videos</a></li>
@@ -455,15 +434,6 @@ 
usergrid.user.resetpw.url=https://localhost:8080/%s/%s/users/%s/resetpw
           </div>
           <footer>
   
-    <div class="rst-footer-buttons" role="navigation" aria-label="footer 
navigation">
-      
-        <a href="ug1-launcher-quick-start.html" class="btn btn-neutral 
float-right" title="Usegrid 1: Launcher Quick-start" accesskey="n">Next <span 
class="fa fa-arrow-circle-right"></span></a>
-      
-      
-        <a href="../sdks/tbd.html" class="btn btn-neutral" title="COMING 
SOON..." accesskey="p"><span class="fa fa-arrow-circle-left"></span> 
Previous</a>
-      
-    </div>
-  
 
   <hr/>
 

http://git-wip-us.apache.org/repos/asf/usergrid/blob/33a3e219/content/docs/installation/ug1-launcher-quick-start.html
----------------------------------------------------------------------
diff --git a/content/docs/installation/ug1-launcher-quick-start.html 
b/content/docs/installation/ug1-launcher-quick-start.html
index 9659de2..3e142e1 100644
--- a/content/docs/installation/ug1-launcher-quick-start.html
+++ b/content/docs/installation/ug1-launcher-quick-start.html
@@ -30,9 +30,7 @@
   
 
   
-    <link rel="top" title="Apache Usergrid 1.0 documentation" 
href="../index.html"/>
-        <link rel="next" title="Usergrid 2.1.0 (unreleased) Deployment Guide" 
href="deployment-guide.html"/>
-        <link rel="prev" title="Usegrid 1: Deploying to Tomcat" 
href="ug1-deploy-to-tomcat.html"/> 
+    <link rel="top" title="Apache Usergrid 1.0 documentation" 
href="../index.html"/> 
 
   
   <script src="../_static/js/modernizr.min.js"></script>
@@ -80,19 +78,19 @@
         
           
           
-              <p class="caption"><span 
class="caption-text">Introduction</span></p>
+              <p class="caption"><span class="caption-text">Getting 
Started</span></p>
 <ul>
-<li class="toctree-l1"><a class="reference internal" 
href="../introduction/overview.html">Documentation Overview</a></li>
+<li class="toctree-l1"><a class="reference internal" 
href="../introduction/overview.html">Getting Started</a></li>
 <li class="toctree-l1"><a class="reference internal" 
href="../introduction/usergrid-features.html">Usergrid Features</a></li>
 <li class="toctree-l1"><a class="reference internal" 
href="../introduction/data-model.html">Usergrid Data model</a></li>
 <li class="toctree-l1"><a class="reference internal" 
href="../introduction/async-vs-sync.html">Async vs. sync calls</a></li>
 </ul>
-<p class="caption"><span class="caption-text">Getting Started</span></p>
+<p class="caption"><span class="caption-text">Using Usergrid</span></p>
 <ul>
-<li class="toctree-l1"><a class="reference internal" 
href="../getting-started/creating-account.html">Creating an Usergrid 
Account</a></li>
-<li class="toctree-l1"><a class="reference internal" 
href="../getting-started/creating-a-new-application.html">Creating a new 
application</a></li>
-<li class="toctree-l1"><a class="reference internal" 
href="../getting-started/using-a-sandbox-app.html">Using a Sandbox 
Application</a></li>
-<li class="toctree-l1"><a class="reference internal" 
href="../getting-started/using-the-api.html">Using the API</a></li>
+<li class="toctree-l1"><a class="reference internal" 
href="../using-usergrid/creating-account.html">Creating a Usergrid 
Account</a></li>
+<li class="toctree-l1"><a class="reference internal" 
href="../using-usergrid/creating-a-new-application.html">Creating a new 
application</a></li>
+<li class="toctree-l1"><a class="reference internal" 
href="../using-usergrid/using-a-sandbox-app.html">Using a Sandbox 
Application</a></li>
+<li class="toctree-l1"><a class="reference internal" 
href="../using-usergrid/using-the-api.html">Using the API</a></li>
 </ul>
 <p class="caption"><span class="caption-text">Data Storage</span></p>
 <ul>
@@ -184,24 +182,6 @@
 <ul>
 <li class="toctree-l1"><a class="reference internal" 
href="../sdks/tbd.html">COMING SOON...</a></li>
 </ul>
-<p class="caption"><span class="caption-text">Installing the Stack</span></p>
-<ul class="current">
-<li class="toctree-l1"><a class="reference internal" 
href="ug1-deploy-to-tomcat.html">Usegrid 1: Deploying to Tomcat</a></li>
-<li class="toctree-l1 current"><a class="current reference internal" 
href="">Usegrid 1: Launcher Quick-start</a><ul>
-<li class="toctree-l2"><a class="reference internal" 
href="#requirements">Requirements</a></li>
-<li class="toctree-l2"><a class="reference internal" 
href="#download">Download</a><ul>
-<li class="toctree-l3"><a class="reference internal" 
href="#download2">Download2</a><ul>
-<li class="toctree-l4"><a class="reference internal" 
href="#building-3">Building 3</a></li>
-</ul>
-</li>
-</ul>
-</li>
-<li class="toctree-l2"><a class="reference internal" 
href="#running">Running</a></li>
-<li class="toctree-l2"><a class="reference internal" 
href="#getting-started-with-the-http-api">Getting Started with the HTTP 
API</a></li>
-</ul>
-</li>
-<li class="toctree-l1"><a class="reference internal" 
href="deployment-guide.html">Usergrid 2.1.0 (unreleased) Deployment 
Guide</a></li>
-</ul>
 <p class="caption"><span class="caption-text">More about Usergrid</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" 
href="../reference/presos-and-videos.html">Presentations &amp; Videos</a></li>
@@ -338,15 +318,6 @@ use it to create a collection with some data in it:</p>
           </div>
           <footer>
   
-    <div class="rst-footer-buttons" role="navigation" aria-label="footer 
navigation">
-      
-        <a href="deployment-guide.html" class="btn btn-neutral float-right" 
title="Usergrid 2.1.0 (unreleased) Deployment Guide" accesskey="n">Next <span 
class="fa fa-arrow-circle-right"></span></a>
-      
-      
-        <a href="ug1-deploy-to-tomcat.html" class="btn btn-neutral" 
title="Usegrid 1: Deploying to Tomcat" accesskey="p"><span class="fa 
fa-arrow-circle-left"></span> Previous</a>
-      
-    </div>
-  
 
   <hr/>
 

http://git-wip-us.apache.org/repos/asf/usergrid/blob/33a3e219/content/docs/installation/ug2-deploy-to-tomcat.html
----------------------------------------------------------------------
diff --git a/content/docs/installation/ug2-deploy-to-tomcat.html 
b/content/docs/installation/ug2-deploy-to-tomcat.html
index 40f0541..73cafc7 100644
--- a/content/docs/installation/ug2-deploy-to-tomcat.html
+++ b/content/docs/installation/ug2-deploy-to-tomcat.html
@@ -78,19 +78,19 @@
         
           
           
-              <p class="caption"><span 
class="caption-text">Introduction</span></p>
+              <p class="caption"><span class="caption-text">Getting 
Started</span></p>
 <ul>
-<li class="toctree-l1"><a class="reference internal" 
href="../introduction/overview.html">Documentation Overview</a></li>
+<li class="toctree-l1"><a class="reference internal" 
href="../introduction/overview.html">Getting Started</a></li>
 <li class="toctree-l1"><a class="reference internal" 
href="../introduction/usergrid-features.html">Usergrid Features</a></li>
 <li class="toctree-l1"><a class="reference internal" 
href="../introduction/data-model.html">Usergrid Data model</a></li>
 <li class="toctree-l1"><a class="reference internal" 
href="../introduction/async-vs-sync.html">Async vs. sync calls</a></li>
 </ul>
-<p class="caption"><span class="caption-text">Getting Started</span></p>
+<p class="caption"><span class="caption-text">Using Usergrid</span></p>
 <ul>
-<li class="toctree-l1"><a class="reference internal" 
href="../getting-started/creating-account.html">Creating an Usergrid 
Account</a></li>
-<li class="toctree-l1"><a class="reference internal" 
href="../getting-started/creating-a-new-application.html">Creating a new 
application</a></li>
-<li class="toctree-l1"><a class="reference internal" 
href="../getting-started/using-a-sandbox-app.html">Using a Sandbox 
Application</a></li>
-<li class="toctree-l1"><a class="reference internal" 
href="../getting-started/using-the-api.html">Using the API</a></li>
+<li class="toctree-l1"><a class="reference internal" 
href="../using-usergrid/creating-account.html">Creating a Usergrid 
Account</a></li>
+<li class="toctree-l1"><a class="reference internal" 
href="../using-usergrid/creating-a-new-application.html">Creating a new 
application</a></li>
+<li class="toctree-l1"><a class="reference internal" 
href="../using-usergrid/using-a-sandbox-app.html">Using a Sandbox 
Application</a></li>
+<li class="toctree-l1"><a class="reference internal" 
href="../using-usergrid/using-the-api.html">Using the API</a></li>
 </ul>
 <p class="caption"><span class="caption-text">Data Storage</span></p>
 <ul>
@@ -182,12 +182,6 @@
 <ul>
 <li class="toctree-l1"><a class="reference internal" 
href="../sdks/tbd.html">COMING SOON...</a></li>
 </ul>
-<p class="caption"><span class="caption-text">Installing the Stack</span></p>
-<ul>
-<li class="toctree-l1"><a class="reference internal" 
href="ug1-deploy-to-tomcat.html">Usegrid 1: Deploying to Tomcat</a></li>
-<li class="toctree-l1"><a class="reference internal" 
href="ug1-launcher-quick-start.html">Usegrid 1: Launcher Quick-start</a></li>
-<li class="toctree-l1"><a class="reference internal" 
href="deployment-guide.html">Usergrid 2.1.0 (unreleased) Deployment 
Guide</a></li>
-</ul>
 <p class="caption"><span class="caption-text">More about Usergrid</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" 
href="../reference/presos-and-videos.html">Presentations &amp; Videos</a></li>

http://git-wip-us.apache.org/repos/asf/usergrid/blob/33a3e219/content/docs/introduction/async-vs-sync.html
----------------------------------------------------------------------
diff --git a/content/docs/introduction/async-vs-sync.html 
b/content/docs/introduction/async-vs-sync.html
index e7a6b8a..648f315 100644
--- a/content/docs/introduction/async-vs-sync.html
+++ b/content/docs/introduction/async-vs-sync.html
@@ -31,7 +31,7 @@
 
   
     <link rel="top" title="Apache Usergrid 1.0 documentation" 
href="../index.html"/>
-        <link rel="next" title="Creating an Usergrid Account" 
href="../getting-started/creating-account.html"/>
+        <link rel="next" title="Creating a Usergrid Account" 
href="../using-usergrid/creating-account.html"/>
         <link rel="prev" title="Usergrid Data model" href="data-model.html"/> 
 
   
@@ -80,9 +80,9 @@
         
           
           
-              <p class="caption"><span 
class="caption-text">Introduction</span></p>
+              <p class="caption"><span class="caption-text">Getting 
Started</span></p>
 <ul class="current">
-<li class="toctree-l1"><a class="reference internal" 
href="overview.html">Documentation Overview</a></li>
+<li class="toctree-l1"><a class="reference internal" 
href="overview.html">Getting Started</a></li>
 <li class="toctree-l1"><a class="reference internal" 
href="usergrid-features.html">Usergrid Features</a></li>
 <li class="toctree-l1"><a class="reference internal" 
href="data-model.html">Usergrid Data model</a></li>
 <li class="toctree-l1 current"><a class="current reference internal" 
href="">Async vs. sync calls</a><ul>
@@ -91,12 +91,12 @@
 </ul>
 </li>
 </ul>
-<p class="caption"><span class="caption-text">Getting Started</span></p>
+<p class="caption"><span class="caption-text">Using Usergrid</span></p>
 <ul>
-<li class="toctree-l1"><a class="reference internal" 
href="../getting-started/creating-account.html">Creating an Usergrid 
Account</a></li>
-<li class="toctree-l1"><a class="reference internal" 
href="../getting-started/creating-a-new-application.html">Creating a new 
application</a></li>
-<li class="toctree-l1"><a class="reference internal" 
href="../getting-started/using-a-sandbox-app.html">Using a Sandbox 
Application</a></li>
-<li class="toctree-l1"><a class="reference internal" 
href="../getting-started/using-the-api.html">Using the API</a></li>
+<li class="toctree-l1"><a class="reference internal" 
href="../using-usergrid/creating-account.html">Creating a Usergrid 
Account</a></li>
+<li class="toctree-l1"><a class="reference internal" 
href="../using-usergrid/creating-a-new-application.html">Creating a new 
application</a></li>
+<li class="toctree-l1"><a class="reference internal" 
href="../using-usergrid/using-a-sandbox-app.html">Using a Sandbox 
Application</a></li>
+<li class="toctree-l1"><a class="reference internal" 
href="../using-usergrid/using-the-api.html">Using the API</a></li>
 </ul>
 <p class="caption"><span class="caption-text">Data Storage</span></p>
 <ul>
@@ -188,12 +188,6 @@
 <ul>
 <li class="toctree-l1"><a class="reference internal" 
href="../sdks/tbd.html">COMING SOON...</a></li>
 </ul>
-<p class="caption"><span class="caption-text">Installing the Stack</span></p>
-<ul>
-<li class="toctree-l1"><a class="reference internal" 
href="../installation/ug1-deploy-to-tomcat.html">Usegrid 1: Deploying to 
Tomcat</a></li>
-<li class="toctree-l1"><a class="reference internal" 
href="../installation/ug1-launcher-quick-start.html">Usegrid 1: Launcher 
Quick-start</a></li>
-<li class="toctree-l1"><a class="reference internal" 
href="../installation/deployment-guide.html">Usergrid 2.1.0 (unreleased) 
Deployment Guide</a></li>
-</ul>
 <p class="caption"><span class="caption-text">More about Usergrid</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" 
href="../reference/presos-and-videos.html">Presentations &amp; Videos</a></li>
@@ -293,7 +287,7 @@ execution completes.</p>
   
     <div class="rst-footer-buttons" role="navigation" aria-label="footer 
navigation">
       
-        <a href="../getting-started/creating-account.html" class="btn 
btn-neutral float-right" title="Creating an Usergrid Account" 
accesskey="n">Next <span class="fa fa-arrow-circle-right"></span></a>
+        <a href="../using-usergrid/creating-account.html" class="btn 
btn-neutral float-right" title="Creating a Usergrid Account" accesskey="n">Next 
<span class="fa fa-arrow-circle-right"></span></a>
       
       
         <a href="data-model.html" class="btn btn-neutral" title="Usergrid Data 
model" accesskey="p"><span class="fa fa-arrow-circle-left"></span> Previous</a>

http://git-wip-us.apache.org/repos/asf/usergrid/blob/33a3e219/content/docs/introduction/data-model.html
----------------------------------------------------------------------
diff --git a/content/docs/introduction/data-model.html 
b/content/docs/introduction/data-model.html
index 12675be..2626ac6 100644
--- a/content/docs/introduction/data-model.html
+++ b/content/docs/introduction/data-model.html
@@ -80,9 +80,9 @@
         
           
           
-              <p class="caption"><span 
class="caption-text">Introduction</span></p>
+              <p class="caption"><span class="caption-text">Getting 
Started</span></p>
 <ul class="current">
-<li class="toctree-l1"><a class="reference internal" 
href="overview.html">Documentation Overview</a></li>
+<li class="toctree-l1"><a class="reference internal" 
href="overview.html">Getting Started</a></li>
 <li class="toctree-l1"><a class="reference internal" 
href="usergrid-features.html">Usergrid Features</a></li>
 <li class="toctree-l1 current"><a class="current reference internal" 
href="">Usergrid Data model</a><ul>
 <li class="toctree-l2"><a class="reference internal" 
href="#organizations">Organizations</a></li>
@@ -96,12 +96,12 @@
 </li>
 <li class="toctree-l1"><a class="reference internal" 
href="async-vs-sync.html">Async vs. sync calls</a></li>
 </ul>
-<p class="caption"><span class="caption-text">Getting Started</span></p>
+<p class="caption"><span class="caption-text">Using Usergrid</span></p>
 <ul>
-<li class="toctree-l1"><a class="reference internal" 
href="../getting-started/creating-account.html">Creating an Usergrid 
Account</a></li>
-<li class="toctree-l1"><a class="reference internal" 
href="../getting-started/creating-a-new-application.html">Creating a new 
application</a></li>
-<li class="toctree-l1"><a class="reference internal" 
href="../getting-started/using-a-sandbox-app.html">Using a Sandbox 
Application</a></li>
-<li class="toctree-l1"><a class="reference internal" 
href="../getting-started/using-the-api.html">Using the API</a></li>
+<li class="toctree-l1"><a class="reference internal" 
href="../using-usergrid/creating-account.html">Creating a Usergrid 
Account</a></li>
+<li class="toctree-l1"><a class="reference internal" 
href="../using-usergrid/creating-a-new-application.html">Creating a new 
application</a></li>
+<li class="toctree-l1"><a class="reference internal" 
href="../using-usergrid/using-a-sandbox-app.html">Using a Sandbox 
Application</a></li>
+<li class="toctree-l1"><a class="reference internal" 
href="../using-usergrid/using-the-api.html">Using the API</a></li>
 </ul>
 <p class="caption"><span class="caption-text">Data Storage</span></p>
 <ul>
@@ -193,12 +193,6 @@
 <ul>
 <li class="toctree-l1"><a class="reference internal" 
href="../sdks/tbd.html">COMING SOON...</a></li>
 </ul>
-<p class="caption"><span class="caption-text">Installing the Stack</span></p>
-<ul>
-<li class="toctree-l1"><a class="reference internal" 
href="../installation/ug1-deploy-to-tomcat.html">Usegrid 1: Deploying to 
Tomcat</a></li>
-<li class="toctree-l1"><a class="reference internal" 
href="../installation/ug1-launcher-quick-start.html">Usegrid 1: Launcher 
Quick-start</a></li>
-<li class="toctree-l1"><a class="reference internal" 
href="../installation/deployment-guide.html">Usergrid 2.1.0 (unreleased) 
Deployment Guide</a></li>
-</ul>
 <p class="caption"><span class="caption-text">More about Usergrid</span></p>
 <ul>
 <li class="toctree-l1"><a class="reference internal" 
href="../reference/presos-and-videos.html">Presentations &amp; Videos</a></li>

Reply via email to