usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From snoopd...@apache.org
Subject [4/4] usergrid git commit: Fixes to new 2.1.0 (unreleased) deployment guide, and add it to the table of contents (that's why so many files changed)
Date Thu, 04 Feb 2016 17:55:40 GMT
Fixes to new 2.1.0 (unreleased) deployment guide, and add it to the table of contents (that's why so many files changed)


Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/a77ec46e
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/a77ec46e
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/a77ec46e

Branch: refs/heads/master
Commit: a77ec46e85a9e4cafdab9311527e89e737c16d19
Parents: 4218c19
Author: Dave Johnson <snoopdave@apache.org>
Authored: Thu Feb 4 09:55:34 2016 -0800
Committer: Dave Johnson <snoopdave@apache.org>
Committed: Thu Feb 4 09:55:34 2016 -0800

----------------------------------------------------------------------
 content/docs/README.html                        |   2 +-
 content/docs/_sources/index.txt                 |   2 +-
 .../_sources/installation/deployment-guide.txt  |  73 +++++---
 .../file-storage-configuration.html             |   2 +-
 content/docs/assets-and-files/folders.html      |   2 +-
 .../assets-and-files/legacy-asset-support.html  |   2 +-
 .../assets-and-files/retrieving-assets.html     |   2 +-
 .../docs/assets-and-files/uploading-assets.html |   2 +-
 .../creating-and-incrementing-counters.html     |   2 +-
 .../events-and-counters.html                    |   2 +-
 .../retrieving-counters.html                    |   2 +-
 .../docs/data-queries/advanced-query-usage.html |   2 +-
 .../docs/data-queries/operators-and-types.html  |   2 +-
 content/docs/data-queries/query-parameters.html |   2 +-
 .../docs/data-queries/querying-your-data.html   |   2 +-
 content/docs/data-storage/collections.html      |   2 +-
 content/docs/data-storage/data-store-dbms.html  |   2 +-
 content/docs/data-storage/entities.html         |   2 +-
 .../docs/data-storage/optimizing-access.html    |   2 +-
 .../entity-connections/connecting-entities.html |   2 +-
 .../disconnecting-entities.html                 |   2 +-
 .../entity-connections/retrieving-entities.html |   2 +-
 content/docs/genindex.html                      |   2 +-
 content/docs/geolocation/geolocation.html       |   2 +-
 .../creating-a-new-application.html             |   2 +-
 .../docs/getting-started/creating-account.html  |   2 +-
 .../getting-started/using-a-sandbox-app.html    |   2 +-
 content/docs/getting-started/using-the-api.html |   2 +-
 content/docs/index.html                         |  15 +-
 content/docs/installation/deployment-guide.html | 170 ++++++++++++++-----
 .../docs/installation/ug1-deploy-to-tomcat.html |   2 +-
 .../installation/ug1-launcher-quick-start.html  |   6 +-
 .../docs/installation/ug2-deploy-to-tomcat.html |  31 +---
 content/docs/introduction/async-vs-sync.html    |   2 +-
 content/docs/introduction/data-model.html       |   2 +-
 content/docs/introduction/overview.html         |   2 +-
 .../docs/introduction/usergrid-features.html    |   2 +-
 content/docs/jersey2skeleton/README.html        |   2 +-
 content/docs/orgs-and-apps/admin-user.html      |   2 +-
 content/docs/orgs-and-apps/application.html     |   2 +-
 content/docs/orgs-and-apps/managing.html        |   2 +-
 content/docs/orgs-and-apps/organization.html    |   2 +-
 .../push-notifications/adding-push-support.html |   2 +-
 .../creating-and-managing-notifications.html    |   2 +-
 .../push-notifications/creating-notifiers.html  |   2 +-
 .../push-notifications/getting-started.html     |   2 +-
 .../managing-users-and-devices.html             |   2 +-
 content/docs/push-notifications/overview.html   |   2 +-
 .../docs/push-notifications/registering.html    |   2 +-
 content/docs/push-notifications/tbd.html        |   2 +-
 .../push-notifications/troubleshooting.html     |   2 +-
 content/docs/push-notifications/tutorial.html   |   2 +-
 .../docs/push-notifications/users-devices.html  |   2 +-
 content/docs/reference/contribute-code.html     |   2 +-
 content/docs/reference/presos-and-videos.html   |   6 +-
 content/docs/rest-endpoints/api-docs.html       |   2 +-
 content/docs/sdks/ios-new.html                  |   2 +-
 content/docs/sdks/sdk-outline.html              |   2 +-
 content/docs/sdks/tbd.html                      |   2 +-
 content/docs/search.html                        |   2 +-
 content/docs/searchindex.js                     |   2 +-
 .../docs/security-and-auth/app-security.html    |   2 +-
 .../authenticating-api-requests.html            |   2 +-
 ...nticating-users-and-application-clients.html |   2 +-
 .../changing-token-time-live-ttl.html           |   2 +-
 .../docs/security-and-auth/facebook-sign.html   |   2 +-
 .../revoking-tokens-logout.html                 |   2 +-
 .../security-and-auth/securing-your-app.html    |   2 +-
 .../user-authentication-types.html              |   2 +-
 .../security-and-auth/using-permissions.html    |   2 +-
 content/docs/security-and-auth/using-roles.html |   2 +-
 content/docs/user-management/activity.html      |   2 +-
 content/docs/user-management/group.html         |   2 +-
 content/docs/user-management/groups.html        |   2 +-
 .../docs/user-management/messagee-example.html  |   2 +-
 .../docs/user-management/user-connections.html  |   2 +-
 .../docs/user-management/user-management.html   |   2 +-
 .../docs/user-management/working-user-data.html |   2 +-
 docs/index.rst                                  |   2 +-
 docs/installation/deployment-guide.md           |  73 +++++---
 website/run.sh                                  |   1 +
 81 files changed, 329 insertions(+), 192 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/usergrid/blob/a77ec46e/content/docs/README.html
----------------------------------------------------------------------
diff --git a/content/docs/README.html b/content/docs/README.html
index 561166c..5b57a86 100644
--- a/content/docs/README.html
+++ b/content/docs/README.html
@@ -186,7 +186,7 @@
 <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/ug2-deploy-to-tomcat.html">Usergrid 2: Deploy to Tomcat</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>

http://git-wip-us.apache.org/repos/asf/usergrid/blob/a77ec46e/content/docs/_sources/index.txt
----------------------------------------------------------------------
diff --git a/content/docs/_sources/index.txt b/content/docs/_sources/index.txt
index 0003f26..6c81816 100644
--- a/content/docs/_sources/index.txt
+++ b/content/docs/_sources/index.txt
@@ -165,7 +165,7 @@ Apache Usergrid Documentation
 
    installation/ug1-deploy-to-tomcat
    installation/ug1-launcher-quick-start
-   installation/ug2-deploy-to-tomcat
+   installation/deployment-guide
     
 .. _about:
 

http://git-wip-us.apache.org/repos/asf/usergrid/blob/a77ec46e/content/docs/_sources/installation/deployment-guide.txt
----------------------------------------------------------------------
diff --git a/content/docs/_sources/installation/deployment-guide.txt b/content/docs/_sources/installation/deployment-guide.txt
index 86a7506..afbb636 100644
--- a/content/docs/_sources/installation/deployment-guide.txt
+++ b/content/docs/_sources/installation/deployment-guide.txt
@@ -1,8 +1,8 @@
-# Usergrid 2.1.0 Deployment Guide
+# Usergrid 2.1.0 (unreleased) Deployment Guide
 
 ## DRAFT 
 
-This document explains how to deploy the Usergrid Backend-as-a-Service (BaaS), 
+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. 
 
@@ -102,8 +102,8 @@ a three or more node cluster is recommended.
 __Use the right Java.__ Cassandra requires Java and we recommend that you use the same version of Java 
 for Cassandra as you use to run Tomcat and ElasticSearch.
 
-__Refer to the [Apache Cassandra documentation](http://wiki.apache.org/cassandra/GettingStarted) 
-for instructions on how to install Cassandra__. The [Datastax documentation for Cassandra 1.2](http://docs.datastax.com/en/cassandra/1.2/cassandra/features/featuresTOC.html) is also helpful. 
+__Refer to the__ [Apache Cassandra documentation](http://wiki.apache.org/cassandra/GettingStarted) 
+__for instructions on how to install Cassandra__. The [Datastax documentation for Cassandra 1.2](http://docs.datastax.com/en/cassandra/1.2/cassandra/features/featuresTOC.html) is also helpful. 
 Once you are up and running make a note of these things:
 
    * The name of the Cassandra cluster
@@ -121,9 +121,9 @@ a cluster in production.
 __Use the right Java__. ElasticSearch requires Java and you *must* ensure that you use the 
 same version of Java for ElasticSearch as you do for running Tomcat.
 
-__Refer to the 
+__Refer to the__ 
 [ElasticSearch 1.4 documentation](https://www.elastic.co/guide/en/elasticsearch/reference/1.4/index.html) 
-for instructions on how to install__. Once you are up and running make a note of these things:
+__for instructions on how to install__. Once you are up and running make a note of these things:
 
    * The name of the ElasticSearch cluster
    * Hostname or IP address of each ElasticSearch node
@@ -141,7 +141,7 @@ The Usergrid Stack is contained in a file named ROOT.war, a standard Java EE WAR
 ready for deployment to Tomcat. On each machine that will run the Usergrid Stack 
 you must install the Java SE 8 JDK and Tomcat 7+. 
 
-__Refer to the [Apache Tomcat 7](https://tomcat.apache.org/tomcat-7.0-doc/setup.html) documentation for  instructions on how to install__. Once Tomcat installed, you need to create and edit some configuration files.
+__Refer to the__ [Apache Tomcat 7](https://tomcat.apache.org/tomcat-7.0-doc/setup.html) __documentation for  instructions on how to install__. Once Tomcat installed, you need to create and edit some configuration files.
 
 
 ### Stack STEP #4: Configure Usergrid Stack & Logging
@@ -170,19 +170,52 @@ shell variables, e.g. `${USERGRID_CLUSTER_NAME}`. Here's a guide to the things y
 
 __Table 1: Values to set in Example Properties file:__
 
-| Value       | Description |
-|-------------|-------------|
-| __BASEURL__ | This is the base URL for the Usergrid installation, e.g. `https://api.example.com`. |
-| __USERGRID_CLUSTER_NAME__ | This is your name for your Usergrid installation. |
-| __CASSANDRA_CLUSTER_NAME__ | Name of Cassandra cluster, must match what's in Cassandra configuration. |
-| __CASSANDRA_HOSTS__ | Comma-separated lists of Cassandra hosts, with port numbers if you are not using the default 9120. The default for this property is `localhost:9120` |
-| __ELASTICSEARCH_CLUSTER_NAME__ | Name of ElasticSearch cluster, must match what's in ElasticSearch configuration. |
-| __ELASTICSEARCH_HOSTS__ | Comma-separated lists of ElasticSearch hosts, with port numbers if you are not using the default 9300. The default for this property is `localhost:9300` |
-| __SUPER_USER_EMAIL__ | Email address of person responsible for the superuser account. |
-| __SUPER_USER_PASSWORD__ | Password for the superuser account. |
-| __TEST_ADMIN_USER_EMAIL__ | If `usergrid.setup-test-account=true`, as shown below, Usergrid will create a test account and you should specify a valid email here. |
-| __TEST_ADMIN_USER_PASSWORD__ | Password for the username 'test' account. |
-   
+<table class="usergrid-table">
+<tr>
+  <th>Value</th>
+  <th>Description</th>
+</tr>
+<tr>
+    <td>__BASEURL__</td>
+    <td>This is the base URL for the Usergrid installation, e.g. `https://api.example.com`. </td>
+</tr>
+<tr>
+    <td>__USERGRID_CLUSTER_NAME__</td>
+    <td>This is your name for your Usergrid installation. </td>
+</tr>
+<tr>
+    <td>__CASSANDRA_CLUSTER_NAME__</td>
+    <td>Name of Cassandra cluster, must match what's in Cassandra configuration. </td>
+</tr>
+<tr>
+    <td>__CASSANDRA_HOSTS__</td>
+    <td>Comma-separated lists of Cassandra hosts, with port numbers if you are not using the default 9120. The default for this property is `localhost:9120` </td>
+</tr>
+<tr>
+    <td>__ELASTICSEARCH_CLUSTER_NAME__</td>
+    <td>Name of ElasticSearch cluster, must match what's in ElasticSearch configuration. </td>
+</tr>
+<tr>
+    <td>__ELASTICSEARCH_HOSTS__</td>
+    <td>Comma-separated lists of ElasticSearch hosts, with port numbers if you are not using the default 9300. The default for this property is `localhost:9300` </td>
+</tr>
+<tr>
+    <td>__SUPER_USER_EMAIL__</td>
+    <td>Email address of person responsible for the superuser account. </td>
+</tr>
+<tr>
+    <td>__SUPER_USER_PASSWORD__</td>
+    <td>Password for the superuser account. </td>
+</tr>
+<tr>
+    <td>__TEST_ADMIN_USER_EMAIL__</td>
+    <td>If `usergrid.setup-test-account=true`, as shown below, Usergrid will create a test account and you should specify a valid email here. </td>
+</tr>
+<tr>
+    <td>__TEST_ADMIN_USER_PASSWORD__</td>
+    <td>Password for the username 'test' account. </td>
+</tr>
+</table>   
    
 Make sure you set all of the above properties when you edit this example for your installation.   
    

http://git-wip-us.apache.org/repos/asf/usergrid/blob/a77ec46e/content/docs/assets-and-files/file-storage-configuration.html
----------------------------------------------------------------------
diff --git a/content/docs/assets-and-files/file-storage-configuration.html b/content/docs/assets-and-files/file-storage-configuration.html
index 877164b..b10568a 100644
--- a/content/docs/assets-and-files/file-storage-configuration.html
+++ b/content/docs/assets-and-files/file-storage-configuration.html
@@ -186,7 +186,7 @@
 <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/ug2-deploy-to-tomcat.html">Usergrid 2: Deploy to Tomcat</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>

http://git-wip-us.apache.org/repos/asf/usergrid/blob/a77ec46e/content/docs/assets-and-files/folders.html
----------------------------------------------------------------------
diff --git a/content/docs/assets-and-files/folders.html b/content/docs/assets-and-files/folders.html
index 616413c..7d09aa0 100644
--- a/content/docs/assets-and-files/folders.html
+++ b/content/docs/assets-and-files/folders.html
@@ -192,7 +192,7 @@
 <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/ug2-deploy-to-tomcat.html">Usergrid 2: Deploy to Tomcat</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>

http://git-wip-us.apache.org/repos/asf/usergrid/blob/a77ec46e/content/docs/assets-and-files/legacy-asset-support.html
----------------------------------------------------------------------
diff --git a/content/docs/assets-and-files/legacy-asset-support.html b/content/docs/assets-and-files/legacy-asset-support.html
index 7085315..5636b15 100644
--- a/content/docs/assets-and-files/legacy-asset-support.html
+++ b/content/docs/assets-and-files/legacy-asset-support.html
@@ -186,7 +186,7 @@
 <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/ug2-deploy-to-tomcat.html">Usergrid 2: Deploy to Tomcat</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>

http://git-wip-us.apache.org/repos/asf/usergrid/blob/a77ec46e/content/docs/assets-and-files/retrieving-assets.html
----------------------------------------------------------------------
diff --git a/content/docs/assets-and-files/retrieving-assets.html b/content/docs/assets-and-files/retrieving-assets.html
index 2cb0706..1aed322 100644
--- a/content/docs/assets-and-files/retrieving-assets.html
+++ b/content/docs/assets-and-files/retrieving-assets.html
@@ -196,7 +196,7 @@
 <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/ug2-deploy-to-tomcat.html">Usergrid 2: Deploy to Tomcat</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>

http://git-wip-us.apache.org/repos/asf/usergrid/blob/a77ec46e/content/docs/assets-and-files/uploading-assets.html
----------------------------------------------------------------------
diff --git a/content/docs/assets-and-files/uploading-assets.html b/content/docs/assets-and-files/uploading-assets.html
index afdb065..aef16ef 100644
--- a/content/docs/assets-and-files/uploading-assets.html
+++ b/content/docs/assets-and-files/uploading-assets.html
@@ -197,7 +197,7 @@
 <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/ug2-deploy-to-tomcat.html">Usergrid 2: Deploy to Tomcat</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>

http://git-wip-us.apache.org/repos/asf/usergrid/blob/a77ec46e/content/docs/counters-and-events/creating-and-incrementing-counters.html
----------------------------------------------------------------------
diff --git a/content/docs/counters-and-events/creating-and-incrementing-counters.html b/content/docs/counters-and-events/creating-and-incrementing-counters.html
index c40f42a..2bed73b 100644
--- a/content/docs/counters-and-events/creating-and-incrementing-counters.html
+++ b/content/docs/counters-and-events/creating-and-incrementing-counters.html
@@ -193,7 +193,7 @@
 <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/ug2-deploy-to-tomcat.html">Usergrid 2: Deploy to Tomcat</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>

http://git-wip-us.apache.org/repos/asf/usergrid/blob/a77ec46e/content/docs/counters-and-events/events-and-counters.html
----------------------------------------------------------------------
diff --git a/content/docs/counters-and-events/events-and-counters.html b/content/docs/counters-and-events/events-and-counters.html
index 46ced7a..7c6f292 100644
--- a/content/docs/counters-and-events/events-and-counters.html
+++ b/content/docs/counters-and-events/events-and-counters.html
@@ -188,7 +188,7 @@
 <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/ug2-deploy-to-tomcat.html">Usergrid 2: Deploy to Tomcat</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>

http://git-wip-us.apache.org/repos/asf/usergrid/blob/a77ec46e/content/docs/counters-and-events/retrieving-counters.html
----------------------------------------------------------------------
diff --git a/content/docs/counters-and-events/retrieving-counters.html b/content/docs/counters-and-events/retrieving-counters.html
index 6cdf0ca..9cd653e 100644
--- a/content/docs/counters-and-events/retrieving-counters.html
+++ b/content/docs/counters-and-events/retrieving-counters.html
@@ -197,7 +197,7 @@
 <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/ug2-deploy-to-tomcat.html">Usergrid 2: Deploy to Tomcat</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>

http://git-wip-us.apache.org/repos/asf/usergrid/blob/a77ec46e/content/docs/data-queries/advanced-query-usage.html
----------------------------------------------------------------------
diff --git a/content/docs/data-queries/advanced-query-usage.html b/content/docs/data-queries/advanced-query-usage.html
index 3b79b51..4e9ebac 100644
--- a/content/docs/data-queries/advanced-query-usage.html
+++ b/content/docs/data-queries/advanced-query-usage.html
@@ -191,7 +191,7 @@
 <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/ug2-deploy-to-tomcat.html">Usergrid 2: Deploy to Tomcat</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>

http://git-wip-us.apache.org/repos/asf/usergrid/blob/a77ec46e/content/docs/data-queries/operators-and-types.html
----------------------------------------------------------------------
diff --git a/content/docs/data-queries/operators-and-types.html b/content/docs/data-queries/operators-and-types.html
index 5017206..0cbf8cf 100644
--- a/content/docs/data-queries/operators-and-types.html
+++ b/content/docs/data-queries/operators-and-types.html
@@ -195,7 +195,7 @@
 <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/ug2-deploy-to-tomcat.html">Usergrid 2: Deploy to Tomcat</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>

http://git-wip-us.apache.org/repos/asf/usergrid/blob/a77ec46e/content/docs/data-queries/query-parameters.html
----------------------------------------------------------------------
diff --git a/content/docs/data-queries/query-parameters.html b/content/docs/data-queries/query-parameters.html
index 7c354cc..63ec412 100644
--- a/content/docs/data-queries/query-parameters.html
+++ b/content/docs/data-queries/query-parameters.html
@@ -195,7 +195,7 @@
 <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/ug2-deploy-to-tomcat.html">Usergrid 2: Deploy to Tomcat</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>

http://git-wip-us.apache.org/repos/asf/usergrid/blob/a77ec46e/content/docs/data-queries/querying-your-data.html
----------------------------------------------------------------------
diff --git a/content/docs/data-queries/querying-your-data.html b/content/docs/data-queries/querying-your-data.html
index 923c61a..f99b2e7 100644
--- a/content/docs/data-queries/querying-your-data.html
+++ b/content/docs/data-queries/querying-your-data.html
@@ -196,7 +196,7 @@
 <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/ug2-deploy-to-tomcat.html">Usergrid 2: Deploy to Tomcat</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>

http://git-wip-us.apache.org/repos/asf/usergrid/blob/a77ec46e/content/docs/data-storage/collections.html
----------------------------------------------------------------------
diff --git a/content/docs/data-storage/collections.html b/content/docs/data-storage/collections.html
index 2f197aa..5edccb6 100644
--- a/content/docs/data-storage/collections.html
+++ b/content/docs/data-storage/collections.html
@@ -214,7 +214,7 @@
 <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/ug2-deploy-to-tomcat.html">Usergrid 2: Deploy to Tomcat</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>

http://git-wip-us.apache.org/repos/asf/usergrid/blob/a77ec46e/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 97ba7a3..6bb8208 100644
--- a/content/docs/data-storage/data-store-dbms.html
+++ b/content/docs/data-storage/data-store-dbms.html
@@ -188,7 +188,7 @@
 <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/ug2-deploy-to-tomcat.html">Usergrid 2: Deploy to Tomcat</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>

http://git-wip-us.apache.org/repos/asf/usergrid/blob/a77ec46e/content/docs/data-storage/entities.html
----------------------------------------------------------------------
diff --git a/content/docs/data-storage/entities.html b/content/docs/data-storage/entities.html
index 40c0439..36b77c3 100644
--- a/content/docs/data-storage/entities.html
+++ b/content/docs/data-storage/entities.html
@@ -227,7 +227,7 @@
 <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/ug2-deploy-to-tomcat.html">Usergrid 2: Deploy to Tomcat</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>

http://git-wip-us.apache.org/repos/asf/usergrid/blob/a77ec46e/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 9f8c7b2..5dba798 100644
--- a/content/docs/data-storage/optimizing-access.html
+++ b/content/docs/data-storage/optimizing-access.html
@@ -196,7 +196,7 @@
 <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/ug2-deploy-to-tomcat.html">Usergrid 2: Deploy to Tomcat</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>

http://git-wip-us.apache.org/repos/asf/usergrid/blob/a77ec46e/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 7f2ed4b..39afcde 100644
--- a/content/docs/entity-connections/connecting-entities.html
+++ b/content/docs/entity-connections/connecting-entities.html
@@ -191,7 +191,7 @@
 <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/ug2-deploy-to-tomcat.html">Usergrid 2: Deploy to Tomcat</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>

http://git-wip-us.apache.org/repos/asf/usergrid/blob/a77ec46e/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 ce246ba..780f442 100644
--- a/content/docs/entity-connections/disconnecting-entities.html
+++ b/content/docs/entity-connections/disconnecting-entities.html
@@ -191,7 +191,7 @@
 <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/ug2-deploy-to-tomcat.html">Usergrid 2: Deploy to Tomcat</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>

http://git-wip-us.apache.org/repos/asf/usergrid/blob/a77ec46e/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 8788f8b..418f1ee 100644
--- a/content/docs/entity-connections/retrieving-entities.html
+++ b/content/docs/entity-connections/retrieving-entities.html
@@ -194,7 +194,7 @@
 <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/ug2-deploy-to-tomcat.html">Usergrid 2: Deploy to Tomcat</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>

http://git-wip-us.apache.org/repos/asf/usergrid/blob/a77ec46e/content/docs/genindex.html
----------------------------------------------------------------------
diff --git a/content/docs/genindex.html b/content/docs/genindex.html
index 9522579..b555c8b 100644
--- a/content/docs/genindex.html
+++ b/content/docs/genindex.html
@@ -187,7 +187,7 @@
 <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/ug2-deploy-to-tomcat.html">Usergrid 2: Deploy to Tomcat</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>

http://git-wip-us.apache.org/repos/asf/usergrid/blob/a77ec46e/content/docs/geolocation/geolocation.html
----------------------------------------------------------------------
diff --git a/content/docs/geolocation/geolocation.html b/content/docs/geolocation/geolocation.html
index 0b8eed5..df7a9f7 100644
--- a/content/docs/geolocation/geolocation.html
+++ b/content/docs/geolocation/geolocation.html
@@ -193,7 +193,7 @@
 <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/ug2-deploy-to-tomcat.html">Usergrid 2: Deploy to Tomcat</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>

http://git-wip-us.apache.org/repos/asf/usergrid/blob/a77ec46e/content/docs/getting-started/creating-a-new-application.html
----------------------------------------------------------------------
diff --git a/content/docs/getting-started/creating-a-new-application.html b/content/docs/getting-started/creating-a-new-application.html
index 3b7cb8f..ac7e107 100644
--- a/content/docs/getting-started/creating-a-new-application.html
+++ b/content/docs/getting-started/creating-a-new-application.html
@@ -192,7 +192,7 @@
 <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/ug2-deploy-to-tomcat.html">Usergrid 2: Deploy to Tomcat</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>

http://git-wip-us.apache.org/repos/asf/usergrid/blob/a77ec46e/content/docs/getting-started/creating-account.html
----------------------------------------------------------------------
diff --git a/content/docs/getting-started/creating-account.html b/content/docs/getting-started/creating-account.html
index f17481f..19ec5c0 100644
--- a/content/docs/getting-started/creating-account.html
+++ b/content/docs/getting-started/creating-account.html
@@ -191,7 +191,7 @@
 <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/ug2-deploy-to-tomcat.html">Usergrid 2: Deploy to Tomcat</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>

http://git-wip-us.apache.org/repos/asf/usergrid/blob/a77ec46e/content/docs/getting-started/using-a-sandbox-app.html
----------------------------------------------------------------------
diff --git a/content/docs/getting-started/using-a-sandbox-app.html b/content/docs/getting-started/using-a-sandbox-app.html
index 21c1d8d..1b2ad34 100644
--- a/content/docs/getting-started/using-a-sandbox-app.html
+++ b/content/docs/getting-started/using-a-sandbox-app.html
@@ -193,7 +193,7 @@
 <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/ug2-deploy-to-tomcat.html">Usergrid 2: Deploy to Tomcat</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>

http://git-wip-us.apache.org/repos/asf/usergrid/blob/a77ec46e/content/docs/getting-started/using-the-api.html
----------------------------------------------------------------------
diff --git a/content/docs/getting-started/using-the-api.html b/content/docs/getting-started/using-the-api.html
index 333b4cb..a377a9c 100644
--- a/content/docs/getting-started/using-the-api.html
+++ b/content/docs/getting-started/using-the-api.html
@@ -199,7 +199,7 @@
 <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/ug2-deploy-to-tomcat.html">Usergrid 2: Deploy to Tomcat</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>

http://git-wip-us.apache.org/repos/asf/usergrid/blob/a77ec46e/content/docs/index.html
----------------------------------------------------------------------
diff --git a/content/docs/index.html b/content/docs/index.html
index caa61a4..04d267c 100644
--- a/content/docs/index.html
+++ b/content/docs/index.html
@@ -187,7 +187,7 @@
 <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/ug2-deploy-to-tomcat.html">Usergrid 2: Deploy to Tomcat</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>
@@ -735,10 +735,15 @@
 <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/ug2-deploy-to-tomcat.html">Usergrid 2: Deploy to Tomcat</a><ul>
-<li class="toctree-l2"><a class="reference internal" href="installation/ug2-deploy-to-tomcat.html#requirements">Requirements</a></li>
-<li class="toctree-l2"><a class="reference internal" href="installation/ug2-deploy-to-tomcat.html#running">Running</a></li>
-<li class="toctree-l2"><a class="reference internal" href="installation/ug2-deploy-to-tomcat.html#example-usergrid-deployment-properties-file">Example <strong>usergrid-deployment.properties</strong> file</a></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>

http://git-wip-us.apache.org/repos/asf/usergrid/blob/a77ec46e/content/docs/installation/deployment-guide.html
----------------------------------------------------------------------
diff --git a/content/docs/installation/deployment-guide.html b/content/docs/installation/deployment-guide.html
index d958109..79ee683 100644
--- a/content/docs/installation/deployment-guide.html
+++ b/content/docs/installation/deployment-guide.html
@@ -8,7 +8,7 @@
   
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   
-  <title>Usergrid 2.1.0 Deployment Guide &mdash; Apache Usergrid 1.0 documentation</title>
+  <title>Usergrid 2.1.0 (unreleased) Deployment Guide &mdash; Apache Usergrid 1.0 documentation</title>
   
 
   
@@ -30,7 +30,9 @@
   
 
   
-    <link rel="top" title="Apache Usergrid 1.0 documentation" href="../index.html"/> 
+    <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"/> 
 
   
   <script src="../_static/js/modernizr.min.js"></script>
@@ -183,10 +185,34 @@
 <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>
+<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"><a class="reference internal" href="ug2-deploy-to-tomcat.html">Usergrid 2: Deploy to Tomcat</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>
@@ -216,7 +242,7 @@
   <ul class="wy-breadcrumbs">
     <li><a href="../index.html">Docs</a> &raquo;</li>
       
-    <li>Usergrid 2.1.0 Deployment Guide</li>
+    <li>Usergrid 2.1.0 (unreleased) Deployment Guide</li>
       <li class="wy-breadcrumbs-aside">
         
           
@@ -230,13 +256,14 @@
           <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
            <div itemprop="articleBody">
             
-  <div class="section" id="usergrid-2-1-0-deployment-guide">
-<h1>Usergrid 2.1.0 Deployment Guide<a class="headerlink" href="#usergrid-2-1-0-deployment-guide" title="Permalink to this headline">¶</a></h1>
+  <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 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>
+<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>
@@ -335,8 +362,8 @@ recommended.</p>
 <p><strong>Use the right Java.</strong> Cassandra requires Java and we recommend that
 you use the same version of Java for Cassandra as you use to run Tomcat
 and ElasticSearch.</p>
-<p><strong>Refer to the `Apache Cassandra
-documentation &lt;http://wiki.apache.org/cassandra/GettingStarted&gt;`__ for
+<p><strong>Refer to the</strong> <a class="reference external" href="http://wiki.apache.org/cassandra/GettingStarted">Apache Cassandra
+documentation</a> <strong>for
 instructions on how to install Cassandra</strong>. The <a class="reference external" href="http://docs.datastax.com/en/cassandra/1.2/cassandra/features/featuresTOC.html">Datastax documentation
 for Cassandra
 1.2</a>
@@ -357,10 +384,10 @@ you should run a cluster in production.</p>
 <p><strong>Use the right Java</strong>. ElasticSearch requires Java and you <em>must</em>
 ensure that you use the same version of Java for ElasticSearch as you do
 for running Tomcat.</p>
-<p><strong>Refer to the `ElasticSearch 1.4
-documentation &lt;https://www.elastic.co/guide/en/elasticsearch/reference/1.4/index.html&gt;`__
-for instructions on how to install</strong>. Once you are up and running make a
-note of these things:</p>
+<p><strong>Refer to the</strong> <a class="reference external" href="https://www.elastic.co/guide/en/elasticsearch/reference/1.4/index.html">ElasticSearch 1.4
+documentation</a>
+<strong>for instructions on how to install</strong>. Once you are up and running make
+a note of these things:</p>
 <ul class="simple">
 <li>The name of the ElasticSearch cluster</li>
 <li>Hostname or IP address of each ElasticSearch node</li>
@@ -378,10 +405,10 @@ zero, otherwise the cluster will report status YELLOW.</p>
 <p>The Usergrid Stack is contained in a file named ROOT.war, a standard
 Java EE WAR ready for deployment to Tomcat. On each machine that will
 run the Usergrid Stack you must install the Java SE 8 JDK and Tomcat 7+.</p>
-<p><strong>Refer to the `Apache Tomcat
-7 &lt;https://tomcat.apache.org/tomcat-7.0-doc/setup.html&gt;`__ documentation
-for instructions on how to install</strong>. Once Tomcat installed, you need to
-create and edit some configuration files.</p>
+<p><strong>Refer to the</strong> <a class="reference external" href="https://tomcat.apache.org/tomcat-7.0-doc/setup.html">Apache Tomcat
+7</a>
+<strong>documentation for instructions on how to install</strong>. Once Tomcat
+installed, you need to create and edit some configuration files.</p>
 </div>
 <div class="section" id="stack-step-4-configure-usergrid-stack-logging">
 <h3>Stack STEP #4: Configure Usergrid Stack &amp; Logging<a class="headerlink" href="#stack-step-4-configure-usergrid-stack-logging" title="Permalink to this headline">¶</a></h3>
@@ -410,27 +437,81 @@ 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>
 <p><strong>Table 1: Values to set in Example Properties file:</strong></p>
-<p>| Value | Description | |&#8212;&#8212;&#8212;&#8212;-|&#8212;&#8212;&#8212;&#8212;-| |
-<strong>BASEURL</strong> | This is the base URL for the Usergrid installation, e.g.
-<code class="docutils literal"><span class="pre">https://api.example.com</span></code>. | | <strong>USERGRID_CLUSTER_NAME</strong> | This
-is your name for your Usergrid installation. | |
-<strong>CASSANDRA_CLUSTER_NAME</strong> | Name of Cassandra cluster, must match
-what&#8217;s in Cassandra configuration. | | <strong>CASSANDRA_HOSTS</strong> |
-Comma-separated lists of Cassandra hosts, with port numbers if you are
+<table class="usergrid-table">
+<tr>
+  <th><p>Value</p>
+</th>
+  <th><p>Description</p>
+</th>
+</tr>
+<tr>
+    <td><p><strong>BASEURL</strong></p>
+</td>
+    <td><p>This is the base URL for the Usergrid installation, e.g.
+<code class="docutils literal"><span class="pre">https://api.example.com</span></code>.</p>
+</td>
+</tr>
+<tr>
+    <td><p><strong>USERGRID_CLUSTER_NAME</strong></p>
+</td>
+    <td><p>This is your name for your Usergrid installation.</p>
+</td>
+</tr>
+<tr>
+    <td><p><strong>CASSANDRA_CLUSTER_NAME</strong></p>
+</td>
+    <td><p>Name of Cassandra cluster, must match what&#8217;s in Cassandra configuration.</p>
+</td>
+</tr>
+<tr>
+    <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> | | <strong>ELASTICSEARCH_CLUSTER_NAME</strong> | Name of
-ElasticSearch cluster, must match what&#8217;s in ElasticSearch configuration.
-| | <strong>ELASTICSEARCH_HOSTS</strong> | Comma-separated lists of ElasticSearch
-hosts, with port numbers if you are not using the default 9300. The
-default for this property is <code class="docutils literal"><span class="pre">localhost:9300</span></code> | |
-<strong>SUPER_USER_EMAIL</strong> | Email address of person responsible for the
-superuser account. | | <strong>SUPER_USER_PASSWORD</strong> | Password for the
-superuser account. | | <strong>TEST_ADMIN_USER_EMAIL</strong> | If
-<code class="docutils literal"><span class="pre">usergrid.setup-test-account=true</span></code>, as shown below, Usergrid will
-create a test account and you should specify a valid email here. | |
-<strong>TEST_ADMIN_USER_PASSWORD</strong> | Password for the username &#8216;test&#8217;
-account. |</p>
-<p>Make sure you set all of the above properties when you edit this example
+<code class="docutils literal"><span class="pre">localhost:9120</span></code></p>
+</td>
+</tr>
+<tr>
+    <td><p><strong>ELASTICSEARCH_CLUSTER_NAME</strong></p>
+</td>
+    <td><p>Name of ElasticSearch cluster, must match what&#8217;s in ElasticSearch
+configuration.</p>
+</td>
+</tr>
+<tr>
+    <td><p><strong>ELASTICSEARCH_HOSTS</strong></p>
+</td>
+    <td><p>Comma-separated lists of ElasticSearch hosts, with port numbers if you
+are not using the default 9300. The default for this property is
+<code class="docutils literal"><span class="pre">localhost:9300</span></code></p>
+</td>
+</tr>
+<tr>
+    <td><p><strong>SUPER_USER_EMAIL</strong></p>
+</td>
+    <td><p>Email address of person responsible for the superuser account.</p>
+</td>
+</tr>
+<tr>
+    <td><p><strong>SUPER_USER_PASSWORD</strong></p>
+</td>
+    <td><p>Password for the superuser account.</p>
+</td>
+</tr>
+<tr>
+    <td><p><strong>TEST_ADMIN_USER_EMAIL</strong></p>
+</td>
+    <td><p>If <code class="docutils literal"><span class="pre">usergrid.setup-test-account=true</span></code>, as shown below, Usergrid will
+create a test account and you should specify a valid email here.</p>
+</td>
+</tr>
+<tr>
+    <td><p><strong>TEST_ADMIN_USER_PASSWORD</strong></p>
+</td>
+    <td><p>Password for the username &#8216;test&#8217; account.</p>
+</td>
+</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}
@@ -701,6 +782,15 @@ 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/a77ec46e/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 e9d3a55..eb7ecae 100644
--- a/content/docs/installation/ug1-deploy-to-tomcat.html
+++ b/content/docs/installation/ug1-deploy-to-tomcat.html
@@ -201,7 +201,7 @@
 </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="ug2-deploy-to-tomcat.html">Usergrid 2: Deploy to Tomcat</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>

http://git-wip-us.apache.org/repos/asf/usergrid/blob/a77ec46e/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 6efe471..9659de2 100644
--- a/content/docs/installation/ug1-launcher-quick-start.html
+++ b/content/docs/installation/ug1-launcher-quick-start.html
@@ -31,7 +31,7 @@
 
   
     <link rel="top" title="Apache Usergrid 1.0 documentation" href="../index.html"/>
-        <link rel="next" title="Usergrid 2: Deploy to Tomcat" href="ug2-deploy-to-tomcat.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"/> 
 
   
@@ -200,7 +200,7 @@
 <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="ug2-deploy-to-tomcat.html">Usergrid 2: Deploy to Tomcat</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>
@@ -340,7 +340,7 @@ use it to create a collection with some data in it:</p>
   
     <div class="rst-footer-buttons" role="navigation" aria-label="footer navigation">
       
-        <a href="ug2-deploy-to-tomcat.html" class="btn btn-neutral float-right" title="Usergrid 2: Deploy to Tomcat" accesskey="n">Next <span class="fa fa-arrow-circle-right"></span></a>
+        <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>

http://git-wip-us.apache.org/repos/asf/usergrid/blob/a77ec46e/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 d6c039a..40f0541 100644
--- a/content/docs/installation/ug2-deploy-to-tomcat.html
+++ b/content/docs/installation/ug2-deploy-to-tomcat.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>
@@ -185,24 +183,10 @@
 <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">
+<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 current"><a class="current reference internal" href="">Usergrid 2: Deploy 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="#running">Running</a><ul>
-<li class="toctree-l3"><a class="reference internal" href="#running-usergrid">Running Usergrid</a><ul>
-<li class="toctree-l4"><a class="reference internal" href="#build-the-java-sdk">Build The Java SDK</a></li>
-<li class="toctree-l4"><a class="reference internal" href="#build-the-stack-itself">Build The Stack Itself</a></li>
-<li class="toctree-l4"><a class="reference internal" href="#deploying-the-stack-locally">Deploying the Stack Locally</a></li>
-<li class="toctree-l4"><a class="reference internal" href="#running-the-portal-locally">Running The Portal Locally</a></li>
-</ul>
-</li>
-</ul>
-</li>
-<li class="toctree-l2"><a class="reference internal" href="#example-usergrid-deployment-properties-file">Example <strong>usergrid-deployment.properties</strong> file</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>
@@ -469,15 +453,6 @@ sake of ordered lists I put Cassandra first.</td></tr>
           </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/a77ec46e/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 159ebb8..e7a6b8a 100644
--- a/content/docs/introduction/async-vs-sync.html
+++ b/content/docs/introduction/async-vs-sync.html
@@ -192,7 +192,7 @@
 <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/ug2-deploy-to-tomcat.html">Usergrid 2: Deploy to Tomcat</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>

http://git-wip-us.apache.org/repos/asf/usergrid/blob/a77ec46e/content/docs/introduction/data-model.html
----------------------------------------------------------------------
diff --git a/content/docs/introduction/data-model.html b/content/docs/introduction/data-model.html
index 5dc9bb1..12675be 100644
--- a/content/docs/introduction/data-model.html
+++ b/content/docs/introduction/data-model.html
@@ -197,7 +197,7 @@
 <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/ug2-deploy-to-tomcat.html">Usergrid 2: Deploy to Tomcat</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>

http://git-wip-us.apache.org/repos/asf/usergrid/blob/a77ec46e/content/docs/introduction/overview.html
----------------------------------------------------------------------
diff --git a/content/docs/introduction/overview.html b/content/docs/introduction/overview.html
index e6fa544..86b5763 100644
--- a/content/docs/introduction/overview.html
+++ b/content/docs/introduction/overview.html
@@ -188,7 +188,7 @@
 <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/ug2-deploy-to-tomcat.html">Usergrid 2: Deploy to Tomcat</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>

http://git-wip-us.apache.org/repos/asf/usergrid/blob/a77ec46e/content/docs/introduction/usergrid-features.html
----------------------------------------------------------------------
diff --git a/content/docs/introduction/usergrid-features.html b/content/docs/introduction/usergrid-features.html
index f39e211..3c39d1a 100644
--- a/content/docs/introduction/usergrid-features.html
+++ b/content/docs/introduction/usergrid-features.html
@@ -210,7 +210,7 @@
 <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/ug2-deploy-to-tomcat.html">Usergrid 2: Deploy to Tomcat</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>

http://git-wip-us.apache.org/repos/asf/usergrid/blob/a77ec46e/content/docs/jersey2skeleton/README.html
----------------------------------------------------------------------
diff --git a/content/docs/jersey2skeleton/README.html b/content/docs/jersey2skeleton/README.html
index b651d36..a446ed9 100644
--- a/content/docs/jersey2skeleton/README.html
+++ b/content/docs/jersey2skeleton/README.html
@@ -186,7 +186,7 @@
 <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/ug2-deploy-to-tomcat.html">Usergrid 2: Deploy to Tomcat</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>

http://git-wip-us.apache.org/repos/asf/usergrid/blob/a77ec46e/content/docs/orgs-and-apps/admin-user.html
----------------------------------------------------------------------
diff --git a/content/docs/orgs-and-apps/admin-user.html b/content/docs/orgs-and-apps/admin-user.html
index 234e34e..7161b9b 100644
--- a/content/docs/orgs-and-apps/admin-user.html
+++ b/content/docs/orgs-and-apps/admin-user.html
@@ -247,7 +247,7 @@
 <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/ug2-deploy-to-tomcat.html">Usergrid 2: Deploy to Tomcat</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>

http://git-wip-us.apache.org/repos/asf/usergrid/blob/a77ec46e/content/docs/orgs-and-apps/application.html
----------------------------------------------------------------------
diff --git a/content/docs/orgs-and-apps/application.html b/content/docs/orgs-and-apps/application.html
index e897160..2329dfd 100644
--- a/content/docs/orgs-and-apps/application.html
+++ b/content/docs/orgs-and-apps/application.html
@@ -208,7 +208,7 @@
 <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/ug2-deploy-to-tomcat.html">Usergrid 2: Deploy to Tomcat</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>

http://git-wip-us.apache.org/repos/asf/usergrid/blob/a77ec46e/content/docs/orgs-and-apps/managing.html
----------------------------------------------------------------------
diff --git a/content/docs/orgs-and-apps/managing.html b/content/docs/orgs-and-apps/managing.html
index 9b1072e..cda13f3 100644
--- a/content/docs/orgs-and-apps/managing.html
+++ b/content/docs/orgs-and-apps/managing.html
@@ -188,7 +188,7 @@
 <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/ug2-deploy-to-tomcat.html">Usergrid 2: Deploy to Tomcat</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>

http://git-wip-us.apache.org/repos/asf/usergrid/blob/a77ec46e/content/docs/orgs-and-apps/organization.html
----------------------------------------------------------------------
diff --git a/content/docs/orgs-and-apps/organization.html b/content/docs/orgs-and-apps/organization.html
index 40dad2e..a378119 100644
--- a/content/docs/orgs-and-apps/organization.html
+++ b/content/docs/orgs-and-apps/organization.html
@@ -256,7 +256,7 @@
 <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/ug2-deploy-to-tomcat.html">Usergrid 2: Deploy to Tomcat</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>

http://git-wip-us.apache.org/repos/asf/usergrid/blob/a77ec46e/content/docs/push-notifications/adding-push-support.html
----------------------------------------------------------------------
diff --git a/content/docs/push-notifications/adding-push-support.html b/content/docs/push-notifications/adding-push-support.html
index 9722be8..3e52c08 100644
--- a/content/docs/push-notifications/adding-push-support.html
+++ b/content/docs/push-notifications/adding-push-support.html
@@ -217,7 +217,7 @@
 <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/ug2-deploy-to-tomcat.html">Usergrid 2: Deploy to Tomcat</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>

http://git-wip-us.apache.org/repos/asf/usergrid/blob/a77ec46e/content/docs/push-notifications/creating-and-managing-notifications.html
----------------------------------------------------------------------
diff --git a/content/docs/push-notifications/creating-and-managing-notifications.html b/content/docs/push-notifications/creating-and-managing-notifications.html
index efcc164..b520bf8 100644
--- a/content/docs/push-notifications/creating-and-managing-notifications.html
+++ b/content/docs/push-notifications/creating-and-managing-notifications.html
@@ -225,7 +225,7 @@
 <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/ug2-deploy-to-tomcat.html">Usergrid 2: Deploy to Tomcat</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>

http://git-wip-us.apache.org/repos/asf/usergrid/blob/a77ec46e/content/docs/push-notifications/creating-notifiers.html
----------------------------------------------------------------------
diff --git a/content/docs/push-notifications/creating-notifiers.html b/content/docs/push-notifications/creating-notifiers.html
index 308a648..4bf8358 100644
--- a/content/docs/push-notifications/creating-notifiers.html
+++ b/content/docs/push-notifications/creating-notifiers.html
@@ -198,7 +198,7 @@
 <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/ug2-deploy-to-tomcat.html">Usergrid 2: Deploy to Tomcat</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>

http://git-wip-us.apache.org/repos/asf/usergrid/blob/a77ec46e/content/docs/push-notifications/getting-started.html
----------------------------------------------------------------------
diff --git a/content/docs/push-notifications/getting-started.html b/content/docs/push-notifications/getting-started.html
index bad6ba9..7235bea 100644
--- a/content/docs/push-notifications/getting-started.html
+++ b/content/docs/push-notifications/getting-started.html
@@ -203,7 +203,7 @@
 <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/ug2-deploy-to-tomcat.html">Usergrid 2: Deploy to Tomcat</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>

http://git-wip-us.apache.org/repos/asf/usergrid/blob/a77ec46e/content/docs/push-notifications/managing-users-and-devices.html
----------------------------------------------------------------------
diff --git a/content/docs/push-notifications/managing-users-and-devices.html b/content/docs/push-notifications/managing-users-and-devices.html
index d7afe4f..f903682 100644
--- a/content/docs/push-notifications/managing-users-and-devices.html
+++ b/content/docs/push-notifications/managing-users-and-devices.html
@@ -203,7 +203,7 @@
 <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/ug2-deploy-to-tomcat.html">Usergrid 2: Deploy to Tomcat</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>

http://git-wip-us.apache.org/repos/asf/usergrid/blob/a77ec46e/content/docs/push-notifications/overview.html
----------------------------------------------------------------------
diff --git a/content/docs/push-notifications/overview.html b/content/docs/push-notifications/overview.html
index 89f9142..788d247 100644
--- a/content/docs/push-notifications/overview.html
+++ b/content/docs/push-notifications/overview.html
@@ -209,7 +209,7 @@
 <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/ug2-deploy-to-tomcat.html">Usergrid 2: Deploy to Tomcat</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>

http://git-wip-us.apache.org/repos/asf/usergrid/blob/a77ec46e/content/docs/push-notifications/registering.html
----------------------------------------------------------------------
diff --git a/content/docs/push-notifications/registering.html b/content/docs/push-notifications/registering.html
index fd262d8..9e45cdd 100644
--- a/content/docs/push-notifications/registering.html
+++ b/content/docs/push-notifications/registering.html
@@ -197,7 +197,7 @@
 <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/ug2-deploy-to-tomcat.html">Usergrid 2: Deploy to Tomcat</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>

http://git-wip-us.apache.org/repos/asf/usergrid/blob/a77ec46e/content/docs/push-notifications/tbd.html
----------------------------------------------------------------------
diff --git a/content/docs/push-notifications/tbd.html b/content/docs/push-notifications/tbd.html
index b0619fa..23b3092 100644
--- a/content/docs/push-notifications/tbd.html
+++ b/content/docs/push-notifications/tbd.html
@@ -186,7 +186,7 @@
 <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/ug2-deploy-to-tomcat.html">Usergrid 2: Deploy to Tomcat</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>

http://git-wip-us.apache.org/repos/asf/usergrid/blob/a77ec46e/content/docs/push-notifications/troubleshooting.html
----------------------------------------------------------------------
diff --git a/content/docs/push-notifications/troubleshooting.html b/content/docs/push-notifications/troubleshooting.html
index a41b33e..66a429a 100644
--- a/content/docs/push-notifications/troubleshooting.html
+++ b/content/docs/push-notifications/troubleshooting.html
@@ -204,7 +204,7 @@
 <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/ug2-deploy-to-tomcat.html">Usergrid 2: Deploy to Tomcat</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>

http://git-wip-us.apache.org/repos/asf/usergrid/blob/a77ec46e/content/docs/push-notifications/tutorial.html
----------------------------------------------------------------------
diff --git a/content/docs/push-notifications/tutorial.html b/content/docs/push-notifications/tutorial.html
index 76a2483..f654600 100644
--- a/content/docs/push-notifications/tutorial.html
+++ b/content/docs/push-notifications/tutorial.html
@@ -208,7 +208,7 @@
 <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/ug2-deploy-to-tomcat.html">Usergrid 2: Deploy to Tomcat</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>

http://git-wip-us.apache.org/repos/asf/usergrid/blob/a77ec46e/content/docs/push-notifications/users-devices.html
----------------------------------------------------------------------
diff --git a/content/docs/push-notifications/users-devices.html b/content/docs/push-notifications/users-devices.html
index 04ec406..5796cf6 100644
--- a/content/docs/push-notifications/users-devices.html
+++ b/content/docs/push-notifications/users-devices.html
@@ -186,7 +186,7 @@
 <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/ug2-deploy-to-tomcat.html">Usergrid 2: Deploy to Tomcat</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>

http://git-wip-us.apache.org/repos/asf/usergrid/blob/a77ec46e/content/docs/reference/contribute-code.html
----------------------------------------------------------------------
diff --git a/content/docs/reference/contribute-code.html b/content/docs/reference/contribute-code.html
index 1bfe2a9..6b2eaab 100644
--- a/content/docs/reference/contribute-code.html
+++ b/content/docs/reference/contribute-code.html
@@ -187,7 +187,7 @@
 <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/ug2-deploy-to-tomcat.html">Usergrid 2: Deploy to Tomcat</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 class="current">


Mime
View raw message