http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2a55601f/content/docs/deploy-local/index.html
----------------------------------------------------------------------
diff --git a/content/docs/deploy-local/index.html 
b/content/docs/deploy-local/index.html
deleted file mode 100644
index 07f50ad..0000000
--- a/content/docs/deploy-local/index.html
+++ /dev/null
@@ -1,401 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-
-<head>
-    <meta charset="utf-8">
-    <title>Apache Usergrid (incubating) — Deploy to local Tomcat & 
Cassandra</title>
-    <meta http-equiv="x-ua-compatible" content="ie=edge" />
-    <meta name="viewport" content="width=device-width, initial-scale=1, 
minimum-scale=1, maximum-scale=1" />
-    <meta name="keywords" content="Apache Usergrid, Usergrid, BaaS, 
Backend-as-a-Service">
-    <meta name="description" content="An open-source Backend-as-a-Service 
stack for web & mobile applications, based on RESTful APIs." />
-    <meta property="og:title" content="Apache Usergrid" />
-    <meta property="og:description" content="An open-source 
Backend-as-a-Service stack for web & mobile applications, based on RESTful 
APIs." />
-    <!-- Loading Typekit -->
-    <script type="text/javascript" src="//use.typekit.net/ddl7izx.js"></script>
-    <script type="text/javascript">try{Typekit.load();}catch(e){}</script>
-    <!-- Loading Bootstrap -->
-    <link href="/bootstrap/bootstrap.min.css" rel="stylesheet" type='text/css'>
-    <link href="/css/bootflat.css" rel="stylesheet" type='text/css'>
-    <link href="/css/usergrid-site.css" rel="stylesheet" type='text/css'>
-    <link 
href="https://fonts.googleapis.com/css?family=Open+Sans:200,400,500,300,600,800,700,400italic,600italic,700italic,800italic,300italic";
 rel="stylesheet" type="text/css">
-    <link href="/css/font-awesome.min.css" rel="stylesheet" type='text/css'>
-
-    
-
-    <!-- HTML5 shim, for IE6-8 support of HTML5 elements. All other JS at the 
end of file. -->
-    <!--[if lt IE 9]>
-      <script src="js/html5shiv.js"></script>
-      <script src="js/respond.min.js"></script>
-    <![endif]-->
-</head>
-<body>
-
-    <header class="navbar navbar-inverse navbar-fixed-top bf-docs-nav 
secondary" role="banner">
-    <div class="container">
-        <div class="navbar-header">
-            <button class="navbar-toggle" type="button" data-toggle="collapse" 
data-target=".bf-navbar-collapse">
-                <span class="sr-only">Toggle navigation</span>
-                <span class="icon-bar"></span>
-                <span class="icon-bar"></span>
-                <span class="icon-bar"></span>
-            </button>
-        </div>
-        <a href="/" class="navbar-brand">
-                <img id="home-logo" 
src="/img/apache_usergrid_logo_white_small.png" />
-            </a>
-        <nav class="collapse navbar-collapse bf-navbar-collapse" 
role="navigation">
-            <ul class="nav navbar-nav navbar-right">
-                <li class=""><a href="/community/"><span class="icns 
icon-group"></span></a></li>
-                <li><a href="http://usergrid.readthedocs.org/"; 
target="_blank"><span class="icns icon-book"></span></a></li>
-                <li><a href="http://github.com/apache/incubator-usergrid"; 
target="_blank"><span class="icns icon-github-sign"></span></a></li>
-                <!--<li><a href="https://trello.com/b/exQmJIOn/usergrid"; 
target="_blank"><span class="icns icon-trello"></span></a></li>-->
-                <li><a 
href="https://issues.apache.org/jira/secure/RapidBoard.jspa?rapidView=23&view=planning&selectedIssue=USERGRID-362&epics=visible";
 target="_blank"><span class="icns icon-bug"></span></a></li>
-                <li><a href="http://stackoverflow.com/search?q=usergrid"; 
target="_blank"><span class="icns icon-stackexchange"></span></a></li>
-                <li><a href="/community/#live"><span class="icns 
icon-comments"></span></a></li>
-                <!--<li><a 
href="https://groups.google.com/forum/#!forum/usergrid"; target="_blank"><span 
class="icns icon-envelope"></span></a></li>-->
-                <li><a href="https://twitter.com/usergrid"; 
target="_blank"><span class="icns icon-twitter"></span></a></li>
-                <li><a 
href="https://cwiki.apache.org/confluence/display/usergrid/"; 
target="_blank"><span class="icns icon-wiki"></span></a></li>
-                <li><a href="/releases/"><span class="icns 
icon-releases"></span></a></li>
-            </ul>
-        </nav>
-    </div>
-    </header>
-
-
-
-<div class="container bf-docs-container">    
-    <div class="row">
-        <div class="col-md-3">
-            <div class="bf-sidebar hidden-print" role="complementary">
-                <ul class="nav nav-list">
-                    <li><a 
href="/docs/getting-up-and-running-locally/">Getting Up &amp; Running 
Locally</a></li>
-                    <li><a href="/docs/deploy-local/">Deploying to local 
Tomcat &amp; Cassandra</a></li>
-                    <li><a 
href="https://github.com/apache/incubator-usergrid/tree/master/ugc#usergrid-command-line-ugc";><code>ugc</code>
 — the Command-line Client</a></li>
-
-                    <li class="nav-header"><span>Concepts</span></li>
-                    <li>
-                        <a href="/docs/organizations-admins/">Organizations & 
Admins</a>
-                        <ul>
-                            <li>
-                                <a href="/docs/applications/">Applications</a>
-                                <ul>
-                                    <li><a 
href="/docs/roles-and-permissions/">Roles & Permissions</a></li>
-                                    <!--<li><a href="#">Queues</a></li>-->
-                                    <li><a 
href="/docs/events-and-counters/">Events & Counters</a></li>
-                                    <li><a 
href="/docs/relationships/">Relationships (Joins)</a></li>
-                                    <li>
-                                        <a 
href="/docs/collections">Collections</a>
-                                        <ul>
-                                            <li><a 
href="/docs/query-language/">Query Language</a></li>
-                                            <li><a 
href="/docs/users-devices/">Users & Devices</a></li>
-                                            <li><a 
href="/docs/groups/">Groups</a></li>
-                                            <li><a 
href="/docs/activities/">Activities</a></li>
-                                            <li><a 
href="/docs/assets/">Assets</a></li>
-                                        </ul>
-                                    </li>
-                                </ul>
-                            </li>
-                        </ul>
-                    </li>
-
-
-                    <li class="nav-header"><span>Usage</span></li>
-                    <!-- <li>REST API — Coming Soon</li> -->
-                    <li><a class="icns-apple" 
href="https://github.com/apache/incubator-usergrid/tree/master/sdks/ios";>iOS 
SDK</a></li>
-                    <li><a class="icns-android" 
href="https://github.com/apache/incubator-usergrid/tree/master/sdks/android";>Android
 SDK</a></li>
-                    <li><a class="icns-html5" href="">HTML5 / JavaScript 
SDK</a></li>
-                    <li><a class="icns-windows" 
href="https://github.com/apache/incubator-usergrid/tree/master/sdks/dotnet";>Windows
 8 / Windows Phone / .net SDK</a></li>
-                    <li><a 
href="https://github.com/apache/incubator-usergrid/tree/master/sdks/nodejs";>Node.js
 module</a></li>
-                    <li><a 
href="https://github.com/apache/incubator-usergrid/tree/master/sdks/ruby";>Ruby 
gem</a></li>
-                    <li><a 
href="https://github.com/apache/incubator-usergrid/tree/master/sdks/ruby-on-rails";>Ruby
 on Rails gem</a></li>
-                    <li><a 
href="https://github.com/apache/incubator-usergrid/tree/master/sdks/php";>PHP 
library</a></li>
-                    <li><a 
href="https://github.com/apache/incubator-usergrid/tree/master/sdks/java";>Java 
library</a></li>
-
-                    <!--<li class="nav-header"><span>Internals</span></li>
-                    <li>Design & Goals — Coming Soon</li>
-                    <li>Java Architecture — Coming Soon</li>
-                    <li>Cassandra Schema — Coming Soon</li>-->
-
-                    <li class="nav-header"><span>Operations</span></li>
-                    <!--<li>Deploying — Coming Soon</li>-->
-                    <!-- <li>Monitoring — Coming Soon</li> -->
-                    <li><a href="/docs/upgrading/">Upgrading</a></li>
-                    <!-- <li>Security — Coming Soon</li> -->
-
-                    <li class="nav-header"><span>Presentations & 
Videos</span></li>
-                    <li><a href="/docs/presentations/">Presentations</a></li>
-                    <li><a href="/docs/videos/">Videos</a></li>
-
-                    <li class="nav-header"><span>We need your help!</span></li>
-                    <li><a href="/docs/contribute-code/">How to Contribute 
Code & Docs</a></li>
-                    <!--
-                    <li><a href="/docs/contribute-docs">How to contribute 
docs</a></li>
-                    -->
-                </ul>
-            </div>
-        </div>
-
-        <div class="col-md-9 main-article" role="main">
-            <div class="page-article">
-                <div class="page-header">
-                    <h1>Deploy to local Tomcat & Cassandra</h1>
-                    <!-- TODO: reenable this when we sync SVN to GitHub
-                  <small><a target="_blank" 
href="https://github.com/usergrid/website/blob/master/content/docs/deploy-local.md";>contribute
 to this article on github</a></small>
-                    -->
-                </div>
-                <div class="toc">
-       <ul>
-<li><a href="#requirements">Requirements</a></li>
-<li><a href="#download">Download</a></li>
-<li><a href="#building">Building</a></li>
-<li><a href="#install-and-configure-cassandra">Install and configure 
Cassandra</a></li>
-<li><a href="#install-and-configure-tomcat">Install and configure 
Tomcat</a></li>
-<li><a href="#add-usergrid-war-to-tomcat">Add Usergrid WAR to Tomcat</a></li>
-<li><a href="#add-usergrid-configuration-file-to-tomcat">Add Usergrid 
configuration file to Tomcat</a></li>
-<li><a href="#run-usergrid-database-super-user-setup">Run Usergrid Database 
&amp; Super User Setup</a></li>
-<li><a href="#login-to-the-usergrid-console-get-started">Login to the Usergrid 
Console &amp; get started</a></li>
-<li><a href="#example-usergrid-deployment.properties-file">Example 
usergrid-deployment.properties file</a></li>
-</ul>
-</div>
-<p>This is a guide that explains how to install and run Usergrid using stock 
Tomcat and Cassandra on a single computer.</p>
-<p>NOTE: running Cassandra on a single computer is something you should do 
ONLY for testing purposes. You don’t want to run one node in production even 
just to start out. To get the benefit of Cassandra’s architecture, which is 
designed to support linear scalability. You should be running a Cassandra 
cluster with at least three nodes.</p>
-<p>For more information:</p>
-<ul>
-<li><a 
href="http://planetcassandra.org/blog/post/cassandra-faq-can-i-start-with-a-single-node/";>Cassandra
 FAQ: Can I Start With a Single Node?</a></li>
-<li><a 
href="http://stackoverflow.com/questions/18462530/why-dont-you-start-off-with-a-single-small-cassandra-server-as-you-usually";>Why
 don’t you start off with a “single &amp; small” Cassandra server</a></li>
-</ul>
-<h2 id="requirements">Requirements</h2>
-<ul>
-<li><a 
href="http://www.oracle.com/technetwork/java/javase/downloads/index.html";>JDK 
1.7</a></li>
-<li><a href="http://maven.apache.org/";>Maven</a></li>
-</ul>
-<h2 id="download">Download</h2>
-<p>Use GitHub to clone the <a 
href="https://github.com/apache/incubator-usergrid";>apache/incubator-usergrid</a>
 repo.</p>
-<p>Or you can start by <a 
href="https://github.com/apache/incubator-usergrid/archive/master.zip";>downloading
 our latest code</a> and extract it.</p>
-<h2 id="building">Building</h2>
-<p>From the command line, navigate to stack directory and type the 
following:</p>
-<pre><code>mvn clean package -DskipTests=true</code></pre>
-<p>Once you are done the Usergrid application will be package as a Java EE WAR 
file at the location <strong>stack/rest/target/ROOT.war</strong>.</p>
-<h2 id="install-and-configure-cassandra">Install and configure Cassandra</h2>
-<p>Install Cassandra, don’t edit configuration files as we just want default 
values for this simple setup. Here are the <a 
href="http://wiki.apache.org/cassandra/GettingStarted";>instructions for 
installing Cassandra</a></p>
-<h2 id="install-and-configure-tomcat">Install and configure Tomcat</h2>
-<p>Follow instructions, don’t edit configuration files as we just want 
default values for this simple setup. Here are the <a 
href="http://tomcat.apache.org/tomcat-7.0-doc/setup.html";>instructions for 
installing Tomcat 7</a></p>
-<h2 id="add-usergrid-war-to-tomcat">Add Usergrid WAR to Tomcat</h2>
-<p>Remove the existing tomcat/webapps/ROOT directory.</p>
-<p>Place the Usergrid ROOT.war file into the tomcat/webapps directory</p>
-<h2 id="add-usergrid-configuration-file-to-tomcat">Add Usergrid configuration 
file to Tomcat</h2>
-<p>Create a <strong>usergrid-deployment.properties</strong> file and place it 
in Tomcat’s <strong>lib</strong> directory. You can find an example 
properties file below that should work well for a local Tomcat &amp; Cassandra 
setup. You will probably only need to change the properties below to use your 
email address and preferred password for the install.</p>
-<pre><code>usergrid.sysadmin.login.allowed=true
-usergrid.sysadmin.login.name=superuser
-usergrid.sysadmin.login.password=pw123
-usergrid.sysadmin.email=m...@example.com
-usergrid.sysadmin.login.email=mys...@example.com
-usergrid.management.mailer=Myself&lt;mys...@example.com&gt;
-usergrid.test-account.admin-user.email=mys...@example.com
-usergrid.test-account.admin-user.password=test</code></pre>
-<h2 id="run-usergrid-database-super-user-setup">Run Usergrid Database &amp; 
Super User Setup</h2>
-<p>Start Tomcat and use your web browser to visit the URLs below. While you do 
this you might want to watch the logs under tomcat/logs for clues, just in case 
anything goes wrong.</p>
-<p>Database setup URL - <a 
href="http://localhost:8080/system/database/setup";>http://localhost:8080/system/database/setup</a></p>
-<p>When prompted to login use the sysadmin credentials that you specified in 
your usergrid-deployment.properties file. Based on the example above that would 
be superuser and pw123. If the operation is successful you should a message 
like the one below in your browser. If not, check your logs for clues about 
what went wrong.</p>
-<pre><code>{
-  "action" : "cassandra setup",
-  "status" : "ok",
-  "timestamp" : 1379424622947,
-  "duration" : 76
-}</code></pre>
-<p>Superuser setup URL - <a 
href="http://localhost:8080/system/superuser/setup";>http://localhost:8080/system/superuser/setup</a></p>
-<p>You should not be prompted for login because you already logged into for 
the Database Setup. If setup works, you should see a message like this:</p>
-<pre><code>{
-  "action" : "superuser setup",
-  "status" : "ok",
-  "timestamp" : 1379424667936,
-  "duration" : 2
-}</code></pre>
-<h2 id="login-to-the-usergrid-console-get-started">Login to the Usergrid 
Console &amp; get started</h2>
-<p>You should now be able to login to the Usergrid console and start 
configuring applications, users and more.</p>
-<p>You can use an static version of the portal to get started:</p>
-<p><a 
href="http://apigee.github.io/usergrid-portal/?api_url=http://localhost:8080";>http://apigee.github.io/usergrid-portal/?api_url=http://localhost:8080</a></p>
-<h2 id="example-usergrid-deployment.properties-file">Example 
usergrid-deployment.properties file</h2>
-<p>Here’s a complete example properties file to get you started.</p>
-<pre><code># Minimal Usergrid configuration properties for local Tomcat and 
Cassandra 
-#
-# The cassandra configuration options. 
-
-# The cassandra host to use
-cassandra.url=localhost:9160
-
-# The strategy to use when creating the keyspace. This is the default. 
-# We recommend creating the keyspace with this default, then editing it 
-# via the cassandra CLI to meet the client's needs.
-cassandra.keyspace.strategy=org.apache.cassandra.locator.SimpleStrategy
- 
-# The default replication factor for the simple strategy. Again, leave the 
-# default, create the app, then use the cassandra cli to set the replication 
-# factor options. This can become complicated with different topologies and 
-# is more a Cassandra administration issue than a UG issue.
-cassandra.keyspace.strategy.options.replication_factor=1
- 
-######################################################
-# Custom mail transport. Not usually used for local testing
-
-#mail.transport.protocol=smtps
-#mail.smtps.host=email-smtp.us-east-1.amazonaws.com
-#mail.smtps.port=465
-#mail.smtps.auth=true
-#mail.smtps.quitwait=false
-#mail.smtps.username=
-#mail.smtps.password=
-
-######################################################
-# Admin and test user setup (change these to be their super user
-
-usergrid.sysadmin.login.name=superuser
-usergrid.sysadmin.login.email=mys...@example.com     &lt;--- Change this
-usergrid.sysadmin.login.password=pw123               &lt;--- Change this
-usergrid.sysadmin.login.allowed=true
-usergrid.sysadmin.email=mys...@example.com           &lt;--- Change this
-
-# Enable or disable this to require superadmin approval of users
-usergrid.sysadmin.approve.users=false
-
-######################################################
-# 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=false
-usergrid.management.notify_sysadmin_of_new_admin_users=false
-
-######################################################
-# URLs
-# Redirect path when request come in for TLD
-
-usergrid.redirect_root=https://localhost:8080/status
-usergrid.view.management.organizations.organization.activate=https://localhost:8080/accounts/welcome
-usergrid.view.management.organizations.organization.confirm=https://localhost:8080/accounts/welcome
-usergrid.view.management.users.user.activate=https://localhost:8080/accounts/welcome
-usergrid.view.management.users.user.confirm=https://localhost:8080/accounts/welcome
-usergrid.organization.activation.url=https://localhost:8080/management/organizations/%s/activate
-usergrid.admin.activation.url=https://localhost:8080/management/users/%s/activate
-usergrid.admin.resetpw.url=https://localhost:8080/management/users/%s/resetpw
-usergrid.admin.confirmation.url=https://localhost:8080/management/users/%s/confirm
-usergrid.user.activation.url=https://localhost:8080%s/%s/users/%s/activate
-usergrid.user.confirmation.url=https://localhost:8080/%s/%s/users/%s/confirm
-usergrid.user.resetpw.url=https://localhost:8080/%s/%s/users/%s/resetpw</code></pre>
-            </div>
-        </div>
-    </div>
-    <div class="row">
-        <div class="col-md-3"></div>
-        <div class="col-md-9">
-            <div class="github-callout">
-                <strong>Questions?</strong> Please do <a href="/community">ask 
on the mailing-lists</a>!<br/>
-                <!--
-                <strong>Found an error?</strong> We’d greatly appreciate a 
pull request about <a target="_blank" 
href="https://github.com/usergrid/website/blob/master/content/docs/deploy-local.md";>this
 article on github</a>.</div> 
-                -->
-            </div>
-        </div>
-    </div>
-</div>
-
-
-<footer class="bf-footer" role="contentinfo">
-    <div class="container">
-        <div class="row">
-            <div class="col-md-2">
-                <ul class="nav nav-list">
-                    <li class="nav-header"><a href="/">Home</a></li>
-                    <li class="nav-header"><a 
href="/community/">Community</a></li>
-                        <li><a href="/community/#events">Events</a></li>
-                        <li><a href="/community/#mailing-lists">Mailing 
Lists</a></li>
-                        <li><a 
href="/community/#deployments">Deployments</a></li>
-                        <li><a href="/community/#committers">Commiters</a></li>
-                </ul>
-            </div>
-            <div class="col-md-2">
-                <ul class="nav nav-list">
-                    <li class="nav-header"><a 
href="https://github.com/apache/incubator-usergrid/"; 
target="_blank">Code</a></li>
-                    <li><a 
href="https://github.com/apache/incubator-usergrid/blob/master/stack"; 
target="_blank">Server Stack</a></li>
-                    <li><a 
href="https://github.com/apache/incubator-usergrid/blob/master/portal"; 
target="_blank">Admin Portal</a></li>
-                    <li><a 
href="https://github.com/apache/incubator-usergrid/blob/master/ugc"; 
target="_blank">ugc command line</a></li>
-                    <li><a 
href="https://github.com/apache/incubator-usergrid/blob/master/sdks/ios"; 
target="_blank">iOS SDK</a></li>
-                    <li><a 
href="https://github.com/apache/incubator-usergrid/blob/master/sdks/android"; 
target="_blank">Android SDK</a></li>
-                    <li><a 
href="https://github.com/apache/incubator-usergrid/blob/master/sdks/html5-javascript";
 target="_blank">HTML5/JS SDK</a></li>
-                    <li><a 
href="https://github.com/apache/incubator-usergrid/blob/master/sdks/nodejs"; 
target="_blank">node.js module</a></li>
-                    <li><a 
href="https://github.com/apache/incubator-usergrid/blob/master/sdks/ruby-on-rails";
 target="_blank">Ruby on Rails gem</a></li>
-                    <li><a 
href="https://github.com/apache/incubator-usergrid/blob/master/sdks/ruby"; 
target="_blank">Ruby gem</a></li>
-                    <li><a 
href="https://github.com/apache/incubator-usergrid/blob/master/sdks/php"; 
target="_blank">PHP SDK</a></li>
-                    <li><a 
href="https://github.com/apache/incubator-usergrid/blob/master/sdks/java"; 
target="_blank">Java SDK</a></li>
-                    <li><a 
href="https://github.com/apache/incubator-usergrid/blob/master/sdks/dotnet"; 
target="_blank">.NET / Windows SDK</a></li>
-                </ul>
-            </div>
-            <div class="col-md-2">
-                <ul class="nav nav-list">
-                    <li class="nav-header">Resources</li>
-                    <li><a href="http://github.com/apache/incubator-usergrid"; 
target="_blank">GitHub Code</a></li>
-                    <li><a href="http://usergrid.readthedocs.org/"; 
target="_blank">Docs</a></li>
-                    <li><a 
href="https://issues.apache.org/jira/secure/RapidBoard.jspa?rapidView=23&view=planning&selectedIssue=USERGRID-362&epics=visible";
 target="_blank">JIRA Bug Tracker</a></li>
-                    <li><a href="http://stackoverflow.com/search?q=usergrid"; 
target="_blank">StackOverflow</a></li>
-                    <li><a href="/community/#live">Live Chat</a></li>
-                    <li><a href="https://twitter.com/usergrid"; 
target="_blank">Twitter</a></li>
-                    <li><a 
href="http://incubator.apache.org/projects/usergrid.html"; 
target="_blank">Podling Listing</a></li>
-                    <li><a 
href="https://github.com/apache/incubator-usergrid/blob/master/stack#requirements";
 target="_blank">Getting Started</a></li>
-                    <li><a 
href="https://cwiki.apache.org/confluence/display/usergrid/GitHub+Based+Contribution+Workflow";
 target="_blank">Contribution Guidelines</a></li>
-                </ul>
-            </div>
-            <div class="col-md-2">
-                <ul class="nav nav-list">
-                    <li class="nav-header">Apache</li>
-                    <li><a href="http://www.apache.org/licenses/"; 
target="_blank">License</a></li>
-                    <li><a 
href="http://www.apache.org/foundation/sponsorship.html"; 
target="_blank">Sponsorship</a></li>
-                    <li><a href="http://www.apache.org/foundation/thanks.html"; 
target="_blank">Thanks</a></li>
-                    <li><a 
href="http://www.apache.org/security/";>Security</a></li>
-                    <li><a href="http://www.apache.org/"; 
target="_blank">Apache Foundation</a></li>
-                </ul>
-            </div>
-            <div class="col-md-4">
-                <a class="twitter-timeline" 
href="https://twitter.com/search?q=%23usergrid"; 
data-widget-id="401499136807038976"  data-related="usergrid" height="400px" 
style="overflow:hidden">Tweets about "usergrid"</a>
-                <script>!function(d,s,id){var 
js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+"://platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script>
-            </div> 
-        <!--
-            <div class="col-md-4">
-                <div class="input-group form-search">
-                    <input type="text" class="form-control search-query">
-                    <span class="input-group-btn">
-                        <button type="submit" class="btn btn-primary" 
data-type="last">Search</button>
-                    </span>
-                </div>
-            </div> -->
-        </div> 
-        <div class="row">
-            <div id="copyright">
-                <img src="/img/egg-logo.png" /><br/><br/>
-                <p>Apache Usergrid is an effort undergoing incubation at The 
Apache Software Foundation (ASF), sponsored by the Apache Incubator PMC. 
Incubation is required of all newly accepted projects until a further review 
indicates that the infrastructure, communications, and decision making process 
have stabilized in a manner consistent with other successful ASF projects. 
While incubation status is not necessarily a reflection of the completeness or 
stability of the code, it does indicate that the project has yet to be fully 
endorsed by the ASF.</p>
-                <p>Copyright © 2013 The Apache Software Foundation, Licensed 
under the Apache License, Version 2.0.<br>
-                Apache and the Apache feather logos are trademarks of The 
Apache Software Foundation.</p>
-                <p class="credits">Site designed & assembled with love by <a 
href="https://github.com/ryuneeee";>@ryuneeee</a> + <a 
href="https://github.com/realbeast";>@realbeast</a> + <a 
href="https://twitter.com/timanglade";>@timanglade</a>.</p>
-            </div>
-        </div>
-    </div>
-</footer>
-
-<script type="text/javascript" src="/js/head.js"></script>
-<script type="text/javascript">
-    head.js("/js/jquery-1.10.1.min.js", "/js/bootstrap.min.js", 
"/js/usergrid-site.js");
-</script>
-<script>
-  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new 
Date();a=s.createElement(o),
-  
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-
-  ga('create', 'UA-45815079-1', 'apache.org');
-  ga('send', 'pageview');
-
-</script>
-
-
-
-</body>
-</html>

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2a55601f/content/docs/device/index.html
----------------------------------------------------------------------
diff --git a/content/docs/device/index.html b/content/docs/device/index.html
deleted file mode 100644
index b668dca..0000000
--- a/content/docs/device/index.html
+++ /dev/null
@@ -1,332 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-
-<head>
-    <meta charset="utf-8">
-    <title>Apache Usergrid (incubating) — Device</title>
-    <meta http-equiv="x-ua-compatible" content="ie=edge" />
-    <meta name="viewport" content="width=device-width, initial-scale=1, 
minimum-scale=1, maximum-scale=1" />
-    <meta name="keywords" content="Apache Usergrid, Usergrid, BaaS, 
Backend-as-a-Service">
-    <meta name="description" content="An open-source Backend-as-a-Service 
stack for web & mobile applications, based on RESTful APIs." />
-    <meta property="og:title" content="Apache Usergrid" />
-    <meta property="og:description" content="An open-source 
Backend-as-a-Service stack for web & mobile applications, based on RESTful 
APIs." />
-    <!-- Loading Typekit -->
-    <script type="text/javascript" src="//use.typekit.net/ddl7izx.js"></script>
-    <script type="text/javascript">try{Typekit.load();}catch(e){}</script>
-    <!-- Loading Bootstrap -->
-    <link href="/bootstrap/bootstrap.min.css" rel="stylesheet" type='text/css'>
-    <link href="/css/bootflat.css" rel="stylesheet" type='text/css'>
-    <link href="/css/usergrid-site.css" rel="stylesheet" type='text/css'>
-    <link 
href="https://fonts.googleapis.com/css?family=Open+Sans:200,400,500,300,600,800,700,400italic,600italic,700italic,800italic,300italic";
 rel="stylesheet" type="text/css">
-    <link href="/css/font-awesome.min.css" rel="stylesheet" type='text/css'>
-
-    
-
-    <!-- HTML5 shim, for IE6-8 support of HTML5 elements. All other JS at the 
end of file. -->
-    <!--[if lt IE 9]>
-      <script src="js/html5shiv.js"></script>
-      <script src="js/respond.min.js"></script>
-    <![endif]-->
-</head>
-<body>
-
-    <header class="navbar navbar-inverse navbar-fixed-top bf-docs-nav 
secondary" role="banner">
-    <div class="container">
-        <div class="navbar-header">
-            <button class="navbar-toggle" type="button" data-toggle="collapse" 
data-target=".bf-navbar-collapse">
-                <span class="sr-only">Toggle navigation</span>
-                <span class="icon-bar"></span>
-                <span class="icon-bar"></span>
-                <span class="icon-bar"></span>
-            </button>
-        </div>
-        <a href="/" class="navbar-brand">
-                <img id="home-logo" 
src="/img/apache_usergrid_logo_white_small.png" />
-            </a>
-        <nav class="collapse navbar-collapse bf-navbar-collapse" 
role="navigation">
-            <ul class="nav navbar-nav navbar-right">
-                <li class=""><a href="/community/"><span class="icns 
icon-group"></span></a></li>
-                <li><a href="http://usergrid.readthedocs.org/"; 
target="_blank"><span class="icns icon-book"></span></a></li>
-                <li><a href="http://github.com/apache/incubator-usergrid"; 
target="_blank"><span class="icns icon-github-sign"></span></a></li>
-                <!--<li><a href="https://trello.com/b/exQmJIOn/usergrid"; 
target="_blank"><span class="icns icon-trello"></span></a></li>-->
-                <li><a 
href="https://issues.apache.org/jira/secure/RapidBoard.jspa?rapidView=23&view=planning&selectedIssue=USERGRID-362&epics=visible";
 target="_blank"><span class="icns icon-bug"></span></a></li>
-                <li><a href="http://stackoverflow.com/search?q=usergrid"; 
target="_blank"><span class="icns icon-stackexchange"></span></a></li>
-                <li><a href="/community/#live"><span class="icns 
icon-comments"></span></a></li>
-                <!--<li><a 
href="https://groups.google.com/forum/#!forum/usergrid"; target="_blank"><span 
class="icns icon-envelope"></span></a></li>-->
-                <li><a href="https://twitter.com/usergrid"; 
target="_blank"><span class="icns icon-twitter"></span></a></li>
-                <li><a 
href="https://cwiki.apache.org/confluence/display/usergrid/"; 
target="_blank"><span class="icns icon-wiki"></span></a></li>
-                <li><a href="/releases/"><span class="icns 
icon-releases"></span></a></li>
-            </ul>
-        </nav>
-    </div>
-    </header>
-
-
-
-<div class="container bf-docs-container">    
-    <div class="row">
-        <div class="col-md-3">
-            <div class="bf-sidebar hidden-print" role="complementary">
-                <ul class="nav nav-list">
-                    <li><a 
href="/docs/getting-up-and-running-locally/">Getting Up &amp; Running 
Locally</a></li>
-                    <li><a href="/docs/deploy-local/">Deploying to local 
Tomcat &amp; Cassandra</a></li>
-                    <li><a 
href="https://github.com/apache/incubator-usergrid/tree/master/ugc#usergrid-command-line-ugc";><code>ugc</code>
 — the Command-line Client</a></li>
-
-                    <li class="nav-header"><span>Concepts</span></li>
-                    <li>
-                        <a href="/docs/organizations-admins/">Organizations & 
Admins</a>
-                        <ul>
-                            <li>
-                                <a href="/docs/applications/">Applications</a>
-                                <ul>
-                                    <li><a 
href="/docs/roles-and-permissions/">Roles & Permissions</a></li>
-                                    <!--<li><a href="#">Queues</a></li>-->
-                                    <li><a 
href="/docs/events-and-counters/">Events & Counters</a></li>
-                                    <li><a 
href="/docs/relationships/">Relationships (Joins)</a></li>
-                                    <li>
-                                        <a 
href="/docs/collections">Collections</a>
-                                        <ul>
-                                            <li><a 
href="/docs/query-language/">Query Language</a></li>
-                                            <li><a 
href="/docs/users-devices/">Users & Devices</a></li>
-                                            <li><a 
href="/docs/groups/">Groups</a></li>
-                                            <li><a 
href="/docs/activities/">Activities</a></li>
-                                            <li><a 
href="/docs/assets/">Assets</a></li>
-                                        </ul>
-                                    </li>
-                                </ul>
-                            </li>
-                        </ul>
-                    </li>
-
-
-                    <li class="nav-header"><span>Usage</span></li>
-                    <!-- <li>REST API — Coming Soon</li> -->
-                    <li><a class="icns-apple" 
href="https://github.com/apache/incubator-usergrid/tree/master/sdks/ios";>iOS 
SDK</a></li>
-                    <li><a class="icns-android" 
href="https://github.com/apache/incubator-usergrid/tree/master/sdks/android";>Android
 SDK</a></li>
-                    <li><a class="icns-html5" href="">HTML5 / JavaScript 
SDK</a></li>
-                    <li><a class="icns-windows" 
href="https://github.com/apache/incubator-usergrid/tree/master/sdks/dotnet";>Windows
 8 / Windows Phone / .net SDK</a></li>
-                    <li><a 
href="https://github.com/apache/incubator-usergrid/tree/master/sdks/nodejs";>Node.js
 module</a></li>
-                    <li><a 
href="https://github.com/apache/incubator-usergrid/tree/master/sdks/ruby";>Ruby 
gem</a></li>
-                    <li><a 
href="https://github.com/apache/incubator-usergrid/tree/master/sdks/ruby-on-rails";>Ruby
 on Rails gem</a></li>
-                    <li><a 
href="https://github.com/apache/incubator-usergrid/tree/master/sdks/php";>PHP 
library</a></li>
-                    <li><a 
href="https://github.com/apache/incubator-usergrid/tree/master/sdks/java";>Java 
library</a></li>
-
-                    <!--<li class="nav-header"><span>Internals</span></li>
-                    <li>Design & Goals — Coming Soon</li>
-                    <li>Java Architecture — Coming Soon</li>
-                    <li>Cassandra Schema — Coming Soon</li>-->
-
-                    <li class="nav-header"><span>Operations</span></li>
-                    <!--<li>Deploying — Coming Soon</li>-->
-                    <!-- <li>Monitoring — Coming Soon</li> -->
-                    <li><a href="/docs/upgrading/">Upgrading</a></li>
-                    <!-- <li>Security — Coming Soon</li> -->
-
-                    <li class="nav-header"><span>Presentations & 
Videos</span></li>
-                    <li><a href="/docs/presentations/">Presentations</a></li>
-                    <li><a href="/docs/videos/">Videos</a></li>
-
-                    <li class="nav-header"><span>We need your help!</span></li>
-                    <li><a href="/docs/contribute-code/">How to Contribute 
Code & Docs</a></li>
-                    <!--
-                    <li><a href="/docs/contribute-docs">How to contribute 
docs</a></li>
-                    -->
-                </ul>
-            </div>
-        </div>
-
-        <div class="col-md-9 main-article" role="main">
-            <div class="page-article">
-                <div class="page-header">
-                    <h1>Device</h1>
-                    <!-- TODO: reenable this when we sync SVN to GitHub
-                  <small><a target="_blank" 
href="https://github.com/usergrid/website/blob/master/content/docs/device.md";>contribute
 to this article on github</a></small>
-                    -->
-                </div>
-                <div class="toc">
-       <ul>
-<li>
-<a href="#device">Device</a><ul>
-<li><a href="#device-properties">Device properties</a></li>
-<li><a href="#associated-collection-property">Associated collection 
property</a></li>
-</ul>
-</li>
-</ul>
-</div>
-<h1 id="device">Device</h1>
-<p>Using App services APIs you can create, retrieve, update, delete, and query 
device entities. See You do not have access to view this node for descriptions 
of these APIs.</p>
-<h2 id="device-properties">Device properties</h2>
-<p>The following are the system-defined properties for device entities. You 
can create application-specific properties for a device entity in addition to 
the system-defined properties. The system-defined properties are reserved. You 
cannot use these names to create other properties for a device entity. In 
addition the devices name is reserved for the devices collection — you 
can’t use it to name another collection.</p>
-<table>
-<thead>
-<tr class="header">
-<th align="left">Property</th>
-<th align="left">Type</th>
-<th align="left">Description</th>
-</tr>
-</thead>
-<tbody>
-<tr class="odd">
-<td align="left">uuid</td>
-<td align="left">UUID</td>
-<td align="left">Entity unique ID</td>
-</tr>
-<tr class="even">
-<td align="left">type</td>
-<td align="left">string</td>
-<td align="left">Entity type (e.g., device)</td>
-</tr>
-<tr class="odd">
-<td align="left">created</td>
-<td align="left">long</td>
-<td align="left">
-<a href="http://en.wikipedia.org/wiki/Unix_time";>UNIX timestamp</a> of entity 
creation</td>
-</tr>
-<tr class="even">
-<td align="left">modified</td>
-<td align="left">long</td>
-<td align="left">
-<a href="http://en.wikipedia.org/wiki/Unix_time";>UNIX timestamp</a> of entity 
modification</td>
-</tr>
-<tr class="odd">
-<td align="left">name</td>
-<td align="left">string</td>
-<td align="left">Device name (mandatory)</td>
-</tr>
-</tbody>
-</table>
-<h2 id="associated-collection-property">Associated collection property</h2>
-<p>Devices have the following associated collection.</p>
-<table>
-<thead>
-<tr class="header">
-<th align="left">Collection</th>
-<th align="left">Type</th>
-<th align="left">Description</th>
-</tr>
-</thead>
-<tbody>
-<tr class="odd">
-<td align="left">users</td>
-<td align="left">user</td>
-<td align="left">Collection of users to which a device belongs</td>
-</tr>
-</tbody>
-</table>
-<p> </p>
-            </div>
-        </div>
-    </div>
-    <div class="row">
-        <div class="col-md-3"></div>
-        <div class="col-md-9">
-            <div class="github-callout">
-                <strong>Questions?</strong> Please do <a href="/community">ask 
on the mailing-lists</a>!<br/>
-                <!--
-                <strong>Found an error?</strong> We’d greatly appreciate a 
pull request about <a target="_blank" 
href="https://github.com/usergrid/website/blob/master/content/docs/device.md";>this
 article on github</a>.</div> 
-                -->
-            </div>
-        </div>
-    </div>
-</div>
-
-
-<footer class="bf-footer" role="contentinfo">
-    <div class="container">
-        <div class="row">
-            <div class="col-md-2">
-                <ul class="nav nav-list">
-                    <li class="nav-header"><a href="/">Home</a></li>
-                    <li class="nav-header"><a 
href="/community/">Community</a></li>
-                        <li><a href="/community/#events">Events</a></li>
-                        <li><a href="/community/#mailing-lists">Mailing 
Lists</a></li>
-                        <li><a 
href="/community/#deployments">Deployments</a></li>
-                        <li><a href="/community/#committers">Commiters</a></li>
-                </ul>
-            </div>
-            <div class="col-md-2">
-                <ul class="nav nav-list">
-                    <li class="nav-header"><a 
href="https://github.com/apache/incubator-usergrid/"; 
target="_blank">Code</a></li>
-                    <li><a 
href="https://github.com/apache/incubator-usergrid/blob/master/stack"; 
target="_blank">Server Stack</a></li>
-                    <li><a 
href="https://github.com/apache/incubator-usergrid/blob/master/portal"; 
target="_blank">Admin Portal</a></li>
-                    <li><a 
href="https://github.com/apache/incubator-usergrid/blob/master/ugc"; 
target="_blank">ugc command line</a></li>
-                    <li><a 
href="https://github.com/apache/incubator-usergrid/blob/master/sdks/ios"; 
target="_blank">iOS SDK</a></li>
-                    <li><a 
href="https://github.com/apache/incubator-usergrid/blob/master/sdks/android"; 
target="_blank">Android SDK</a></li>
-                    <li><a 
href="https://github.com/apache/incubator-usergrid/blob/master/sdks/html5-javascript";
 target="_blank">HTML5/JS SDK</a></li>
-                    <li><a 
href="https://github.com/apache/incubator-usergrid/blob/master/sdks/nodejs"; 
target="_blank">node.js module</a></li>
-                    <li><a 
href="https://github.com/apache/incubator-usergrid/blob/master/sdks/ruby-on-rails";
 target="_blank">Ruby on Rails gem</a></li>
-                    <li><a 
href="https://github.com/apache/incubator-usergrid/blob/master/sdks/ruby"; 
target="_blank">Ruby gem</a></li>
-                    <li><a 
href="https://github.com/apache/incubator-usergrid/blob/master/sdks/php"; 
target="_blank">PHP SDK</a></li>
-                    <li><a 
href="https://github.com/apache/incubator-usergrid/blob/master/sdks/java"; 
target="_blank">Java SDK</a></li>
-                    <li><a 
href="https://github.com/apache/incubator-usergrid/blob/master/sdks/dotnet"; 
target="_blank">.NET / Windows SDK</a></li>
-                </ul>
-            </div>
-            <div class="col-md-2">
-                <ul class="nav nav-list">
-                    <li class="nav-header">Resources</li>
-                    <li><a href="http://github.com/apache/incubator-usergrid"; 
target="_blank">GitHub Code</a></li>
-                    <li><a href="http://usergrid.readthedocs.org/"; 
target="_blank">Docs</a></li>
-                    <li><a 
href="https://issues.apache.org/jira/secure/RapidBoard.jspa?rapidView=23&view=planning&selectedIssue=USERGRID-362&epics=visible";
 target="_blank">JIRA Bug Tracker</a></li>
-                    <li><a href="http://stackoverflow.com/search?q=usergrid"; 
target="_blank">StackOverflow</a></li>
-                    <li><a href="/community/#live">Live Chat</a></li>
-                    <li><a href="https://twitter.com/usergrid"; 
target="_blank">Twitter</a></li>
-                    <li><a 
href="http://incubator.apache.org/projects/usergrid.html"; 
target="_blank">Podling Listing</a></li>
-                    <li><a 
href="https://github.com/apache/incubator-usergrid/blob/master/stack#requirements";
 target="_blank">Getting Started</a></li>
-                    <li><a 
href="https://cwiki.apache.org/confluence/display/usergrid/GitHub+Based+Contribution+Workflow";
 target="_blank">Contribution Guidelines</a></li>
-                </ul>
-            </div>
-            <div class="col-md-2">
-                <ul class="nav nav-list">
-                    <li class="nav-header">Apache</li>
-                    <li><a href="http://www.apache.org/licenses/"; 
target="_blank">License</a></li>
-                    <li><a 
href="http://www.apache.org/foundation/sponsorship.html"; 
target="_blank">Sponsorship</a></li>
-                    <li><a href="http://www.apache.org/foundation/thanks.html"; 
target="_blank">Thanks</a></li>
-                    <li><a 
href="http://www.apache.org/security/";>Security</a></li>
-                    <li><a href="http://www.apache.org/"; 
target="_blank">Apache Foundation</a></li>
-                </ul>
-            </div>
-            <div class="col-md-4">
-                <a class="twitter-timeline" 
href="https://twitter.com/search?q=%23usergrid"; 
data-widget-id="401499136807038976"  data-related="usergrid" height="400px" 
style="overflow:hidden">Tweets about "usergrid"</a>
-                <script>!function(d,s,id){var 
js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+"://platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script>
-            </div> 
-        <!--
-            <div class="col-md-4">
-                <div class="input-group form-search">
-                    <input type="text" class="form-control search-query">
-                    <span class="input-group-btn">
-                        <button type="submit" class="btn btn-primary" 
data-type="last">Search</button>
-                    </span>
-                </div>
-            </div> -->
-        </div> 
-        <div class="row">
-            <div id="copyright">
-                <img src="/img/egg-logo.png" /><br/><br/>
-                <p>Apache Usergrid is an effort undergoing incubation at The 
Apache Software Foundation (ASF), sponsored by the Apache Incubator PMC. 
Incubation is required of all newly accepted projects until a further review 
indicates that the infrastructure, communications, and decision making process 
have stabilized in a manner consistent with other successful ASF projects. 
While incubation status is not necessarily a reflection of the completeness or 
stability of the code, it does indicate that the project has yet to be fully 
endorsed by the ASF.</p>
-                <p>Copyright © 2013 The Apache Software Foundation, Licensed 
under the Apache License, Version 2.0.<br>
-                Apache and the Apache feather logos are trademarks of The 
Apache Software Foundation.</p>
-                <p class="credits">Site designed & assembled with love by <a 
href="https://github.com/ryuneeee";>@ryuneeee</a> + <a 
href="https://github.com/realbeast";>@realbeast</a> + <a 
href="https://twitter.com/timanglade";>@timanglade</a>.</p>
-            </div>
-        </div>
-    </div>
-</footer>
-
-<script type="text/javascript" src="/js/head.js"></script>
-<script type="text/javascript">
-    head.js("/js/jquery-1.10.1.min.js", "/js/bootstrap.min.js", 
"/js/usergrid-site.js");
-</script>
-<script>
-  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new 
Date();a=s.createElement(o),
-  
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-
-  ga('create', 'UA-45815079-1', 'apache.org');
-  ga('send', 'pageview');
-
-</script>
-
-
-
-</body>
-</html>

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2a55601f/content/docs/displaying-app-services-api-calls-curl-commands/index.html
----------------------------------------------------------------------
diff --git 
a/content/docs/displaying-app-services-api-calls-curl-commands/index.html 
b/content/docs/displaying-app-services-api-calls-curl-commands/index.html
deleted file mode 100644
index 2c08421..0000000
--- a/content/docs/displaying-app-services-api-calls-curl-commands/index.html
+++ /dev/null
@@ -1,291 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-
-<head>
-    <meta charset="utf-8">
-    <title>Apache Usergrid (incubating) — Displaying Apache Usergrid API 
calls as Curl commands</title>
-    <meta http-equiv="x-ua-compatible" content="ie=edge" />
-    <meta name="viewport" content="width=device-width, initial-scale=1, 
minimum-scale=1, maximum-scale=1" />
-    <meta name="keywords" content="Apache Usergrid, Usergrid, BaaS, 
Backend-as-a-Service">
-    <meta name="description" content="An open-source Backend-as-a-Service 
stack for web & mobile applications, based on RESTful APIs." />
-    <meta property="og:title" content="Apache Usergrid" />
-    <meta property="og:description" content="An open-source 
Backend-as-a-Service stack for web & mobile applications, based on RESTful 
APIs." />
-    <!-- Loading Typekit -->
-    <script type="text/javascript" src="//use.typekit.net/ddl7izx.js"></script>
-    <script type="text/javascript">try{Typekit.load();}catch(e){}</script>
-    <!-- Loading Bootstrap -->
-    <link href="/bootstrap/bootstrap.min.css" rel="stylesheet" type='text/css'>
-    <link href="/css/bootflat.css" rel="stylesheet" type='text/css'>
-    <link href="/css/usergrid-site.css" rel="stylesheet" type='text/css'>
-    <link 
href="https://fonts.googleapis.com/css?family=Open+Sans:200,400,500,300,600,800,700,400italic,600italic,700italic,800italic,300italic";
 rel="stylesheet" type="text/css">
-    <link href="/css/font-awesome.min.css" rel="stylesheet" type='text/css'>
-
-    
-
-    <!-- HTML5 shim, for IE6-8 support of HTML5 elements. All other JS at the 
end of file. -->
-    <!--[if lt IE 9]>
-      <script src="js/html5shiv.js"></script>
-      <script src="js/respond.min.js"></script>
-    <![endif]-->
-</head>
-<body>
-
-    <header class="navbar navbar-inverse navbar-fixed-top bf-docs-nav 
secondary" role="banner">
-    <div class="container">
-        <div class="navbar-header">
-            <button class="navbar-toggle" type="button" data-toggle="collapse" 
data-target=".bf-navbar-collapse">
-                <span class="sr-only">Toggle navigation</span>
-                <span class="icon-bar"></span>
-                <span class="icon-bar"></span>
-                <span class="icon-bar"></span>
-            </button>
-        </div>
-        <a href="/" class="navbar-brand">
-                <img id="home-logo" 
src="/img/apache_usergrid_logo_white_small.png" />
-            </a>
-        <nav class="collapse navbar-collapse bf-navbar-collapse" 
role="navigation">
-            <ul class="nav navbar-nav navbar-right">
-                <li class=""><a href="/community/"><span class="icns 
icon-group"></span></a></li>
-                <li><a href="http://usergrid.readthedocs.org/"; 
target="_blank"><span class="icns icon-book"></span></a></li>
-                <li><a href="http://github.com/apache/incubator-usergrid"; 
target="_blank"><span class="icns icon-github-sign"></span></a></li>
-                <!--<li><a href="https://trello.com/b/exQmJIOn/usergrid"; 
target="_blank"><span class="icns icon-trello"></span></a></li>-->
-                <li><a 
href="https://issues.apache.org/jira/secure/RapidBoard.jspa?rapidView=23&view=planning&selectedIssue=USERGRID-362&epics=visible";
 target="_blank"><span class="icns icon-bug"></span></a></li>
-                <li><a href="http://stackoverflow.com/search?q=usergrid"; 
target="_blank"><span class="icns icon-stackexchange"></span></a></li>
-                <li><a href="/community/#live"><span class="icns 
icon-comments"></span></a></li>
-                <!--<li><a 
href="https://groups.google.com/forum/#!forum/usergrid"; target="_blank"><span 
class="icns icon-envelope"></span></a></li>-->
-                <li><a href="https://twitter.com/usergrid"; 
target="_blank"><span class="icns icon-twitter"></span></a></li>
-                <li><a 
href="https://cwiki.apache.org/confluence/display/usergrid/"; 
target="_blank"><span class="icns icon-wiki"></span></a></li>
-                <li><a href="/releases/"><span class="icns 
icon-releases"></span></a></li>
-            </ul>
-        </nav>
-    </div>
-    </header>
-
-
-
-<div class="container bf-docs-container">    
-    <div class="row">
-        <div class="col-md-3">
-            <div class="bf-sidebar hidden-print" role="complementary">
-                <ul class="nav nav-list">
-                    <li><a 
href="/docs/getting-up-and-running-locally/">Getting Up &amp; Running 
Locally</a></li>
-                    <li><a href="/docs/deploy-local/">Deploying to local 
Tomcat &amp; Cassandra</a></li>
-                    <li><a 
href="https://github.com/apache/incubator-usergrid/tree/master/ugc#usergrid-command-line-ugc";><code>ugc</code>
 — the Command-line Client</a></li>
-
-                    <li class="nav-header"><span>Concepts</span></li>
-                    <li>
-                        <a href="/docs/organizations-admins/">Organizations & 
Admins</a>
-                        <ul>
-                            <li>
-                                <a href="/docs/applications/">Applications</a>
-                                <ul>
-                                    <li><a 
href="/docs/roles-and-permissions/">Roles & Permissions</a></li>
-                                    <!--<li><a href="#">Queues</a></li>-->
-                                    <li><a 
href="/docs/events-and-counters/">Events & Counters</a></li>
-                                    <li><a 
href="/docs/relationships/">Relationships (Joins)</a></li>
-                                    <li>
-                                        <a 
href="/docs/collections">Collections</a>
-                                        <ul>
-                                            <li><a 
href="/docs/query-language/">Query Language</a></li>
-                                            <li><a 
href="/docs/users-devices/">Users & Devices</a></li>
-                                            <li><a 
href="/docs/groups/">Groups</a></li>
-                                            <li><a 
href="/docs/activities/">Activities</a></li>
-                                            <li><a 
href="/docs/assets/">Assets</a></li>
-                                        </ul>
-                                    </li>
-                                </ul>
-                            </li>
-                        </ul>
-                    </li>
-
-
-                    <li class="nav-header"><span>Usage</span></li>
-                    <!-- <li>REST API — Coming Soon</li> -->
-                    <li><a class="icns-apple" 
href="https://github.com/apache/incubator-usergrid/tree/master/sdks/ios";>iOS 
SDK</a></li>
-                    <li><a class="icns-android" 
href="https://github.com/apache/incubator-usergrid/tree/master/sdks/android";>Android
 SDK</a></li>
-                    <li><a class="icns-html5" href="">HTML5 / JavaScript 
SDK</a></li>
-                    <li><a class="icns-windows" 
href="https://github.com/apache/incubator-usergrid/tree/master/sdks/dotnet";>Windows
 8 / Windows Phone / .net SDK</a></li>
-                    <li><a 
href="https://github.com/apache/incubator-usergrid/tree/master/sdks/nodejs";>Node.js
 module</a></li>
-                    <li><a 
href="https://github.com/apache/incubator-usergrid/tree/master/sdks/ruby";>Ruby 
gem</a></li>
-                    <li><a 
href="https://github.com/apache/incubator-usergrid/tree/master/sdks/ruby-on-rails";>Ruby
 on Rails gem</a></li>
-                    <li><a 
href="https://github.com/apache/incubator-usergrid/tree/master/sdks/php";>PHP 
library</a></li>
-                    <li><a 
href="https://github.com/apache/incubator-usergrid/tree/master/sdks/java";>Java 
library</a></li>
-
-                    <!--<li class="nav-header"><span>Internals</span></li>
-                    <li>Design & Goals — Coming Soon</li>
-                    <li>Java Architecture — Coming Soon</li>
-                    <li>Cassandra Schema — Coming Soon</li>-->
-
-                    <li class="nav-header"><span>Operations</span></li>
-                    <!--<li>Deploying — Coming Soon</li>-->
-                    <!-- <li>Monitoring — Coming Soon</li> -->
-                    <li><a href="/docs/upgrading/">Upgrading</a></li>
-                    <!-- <li>Security — Coming Soon</li> -->
-
-                    <li class="nav-header"><span>Presentations & 
Videos</span></li>
-                    <li><a href="/docs/presentations/">Presentations</a></li>
-                    <li><a href="/docs/videos/">Videos</a></li>
-
-                    <li class="nav-header"><span>We need your help!</span></li>
-                    <li><a href="/docs/contribute-code/">How to Contribute 
Code & Docs</a></li>
-                    <!--
-                    <li><a href="/docs/contribute-docs">How to contribute 
docs</a></li>
-                    -->
-                </ul>
-            </div>
-        </div>
-
-        <div class="col-md-9 main-article" role="main">
-            <div class="page-article">
-                <div class="page-header">
-                    <h1>Displaying Apache Usergrid API calls as Curl 
commands</h1>
-                    <!-- TODO: reenable this when we sync SVN to GitHub
-                  <small><a target="_blank" 
href="https://github.com/usergrid/website/blob/master/content/docs/displaying-app-services-api-calls-curl-commands.md";>contribute
 to this article on github</a></small>
-                    -->
-                </div>
-                <div class="toc">
-       <ul>
-<li><a 
href="#displaying-apache-usergrid-api-calls-as-curl-commands">Displaying Apache 
Usergrid API calls as Curl commands</a></li>
-</ul>
-</div>
-<h1 id="displaying-apache-usergrid-api-calls-as-curl-commands">Displaying 
Apache Usergrid API calls as Curl commands</h1>
-<p> </p>
-<p>If you use a web application, such as the JavaScript (HTML 5) version of 
Messagee (see <a href="/html-5-example-messagee">HTML 5 example - 
Messagee</a>), you can easily see the equivalent Curl syntax for each API call 
that the web application makes. The calls are displayed in the console area of 
any of the following browsers:  Chrome, Internet Explorer (in the debugger), 
Firefox (in Firebug), and Safari.</p>
-<p>This is possible because web applications such as the JavaScript version of 
Message takes advantage of a JavaScript SDK provied by Apigee (see <a 
href="/html5javascript-sdk">HTML5/JavaScript SDK</a>) to issue Apache Usergrid 
API calls. The SDK automatically translates each API call into a Curl command, 
which is displayed in the console. If you use any web application that is built 
on the JavaScript SDK, you can view the applications API’s calls in Curl 
syntax.</p>
-<p>The <a href="http://apigee.com/usergrid/";>admin portal</a> is another 
example of a web application that is built on the JavaScript SDK and issues App 
Services API calls from JavaScript. When a user clicks a button in the admin 
portal, such as “Users”, the admin portal makes an API request to retrieve 
the appropriate data. In addition, the JavaScript SDK in the web application 
automatically translates the API call into the following Curl command:</p>
-<pre><code>curl -X GET 
"https://api.usergrid.com/edort1/sandbox/users?ql=order%20by%20username”</code></pre>
-<p>The request retrieves the users in the application and orders the result by 
username.</p>
-<p>If you turn on the JavaScript console, here’s what it displays for the 
call. This example shows the JavaScript console display in the Chrome browser. 
You can turn on the JavaScript console in Chrome by clicking the “wrench” 
button (customize and control Chrome) and then selecting Tools &gt; JavaScript 
console. </p>
-<div class="figure">
-<img src="/docs/sites/docs/files/jsconsole_chrome.png" alt="Curl command in 
Chrome console"><p class="caption">Curl command in Chrome console</p>
-</div>
-<p>Notice that in addition to displaying the API call in Curl syntax, the 
console displays the time to retrieve the user entities.</p>
-<p>To display the JavaScript console in Internet Explorer, you need to turn on 
the debugger. You do that by selecting F12 developer tools in the tools menu. 
Here’s what the Curl version of the API call looks like in Internet 
Explorer’s console.</p>
-<div class="figure">
-<img src="/docs/sites/docs/files/jsconsole_ie.png" alt="Curl command in 
Internet Explorer console"><p class="caption">Curl command in Internet Explorer 
console</p>
-</div>
-<p>Here’s what the curl version of the API call looks like in Firefox’s 
JavaScript console.</p>
-<div class="figure">
-<img src="/docs/sites/docs/files/jsconsole_firefox.png" alt="Curl command in 
Firefox console"><p class="caption">Curl command in Firefox console</p>
-</div>
-<p>You need to have the <a href="http://getfirebug.com/";>Firebug tool</a> 
installed and enabled in your Firefox browser to view the curl commands in the 
console.</p>
-<p>And here’s what the API call looks like in the Safari console. The 
console is part of Safari’s Web Inspector tool (<a 
href="https://developer.apple.com/technologies/safari/developer-tools.html";>https://developer.apple.com/technologies/safari/developer-tools.html</a>).</p>
-<div class="figure">
-<img src="/docs/sites/docs/files/jsconsole_safari.png" alt="Curl command in 
SaFARI"><p class="caption">Curl command in SaFARI</p>
-</div>
-            </div>
-        </div>
-    </div>
-    <div class="row">
-        <div class="col-md-3"></div>
-        <div class="col-md-9">
-            <div class="github-callout">
-                <strong>Questions?</strong> Please do <a href="/community">ask 
on the mailing-lists</a>!<br/>
-                <!--
-                <strong>Found an error?</strong> We’d greatly appreciate a 
pull request about <a target="_blank" 
href="https://github.com/usergrid/website/blob/master/content/docs/displaying-app-services-api-calls-curl-commands.md";>this
 article on github</a>.</div> 
-                -->
-            </div>
-        </div>
-    </div>
-</div>
-
-
-<footer class="bf-footer" role="contentinfo">
-    <div class="container">
-        <div class="row">
-            <div class="col-md-2">
-                <ul class="nav nav-list">
-                    <li class="nav-header"><a href="/">Home</a></li>
-                    <li class="nav-header"><a 
href="/community/">Community</a></li>
-                        <li><a href="/community/#events">Events</a></li>
-                        <li><a href="/community/#mailing-lists">Mailing 
Lists</a></li>
-                        <li><a 
href="/community/#deployments">Deployments</a></li>
-                        <li><a href="/community/#committers">Commiters</a></li>
-                </ul>
-            </div>
-            <div class="col-md-2">
-                <ul class="nav nav-list">
-                    <li class="nav-header"><a 
href="https://github.com/apache/incubator-usergrid/"; 
target="_blank">Code</a></li>
-                    <li><a 
href="https://github.com/apache/incubator-usergrid/blob/master/stack"; 
target="_blank">Server Stack</a></li>
-                    <li><a 
href="https://github.com/apache/incubator-usergrid/blob/master/portal"; 
target="_blank">Admin Portal</a></li>
-                    <li><a 
href="https://github.com/apache/incubator-usergrid/blob/master/ugc"; 
target="_blank">ugc command line</a></li>
-                    <li><a 
href="https://github.com/apache/incubator-usergrid/blob/master/sdks/ios"; 
target="_blank">iOS SDK</a></li>
-                    <li><a 
href="https://github.com/apache/incubator-usergrid/blob/master/sdks/android"; 
target="_blank">Android SDK</a></li>
-                    <li><a 
href="https://github.com/apache/incubator-usergrid/blob/master/sdks/html5-javascript";
 target="_blank">HTML5/JS SDK</a></li>
-                    <li><a 
href="https://github.com/apache/incubator-usergrid/blob/master/sdks/nodejs"; 
target="_blank">node.js module</a></li>
-                    <li><a 
href="https://github.com/apache/incubator-usergrid/blob/master/sdks/ruby-on-rails";
 target="_blank">Ruby on Rails gem</a></li>
-                    <li><a 
href="https://github.com/apache/incubator-usergrid/blob/master/sdks/ruby"; 
target="_blank">Ruby gem</a></li>
-                    <li><a 
href="https://github.com/apache/incubator-usergrid/blob/master/sdks/php"; 
target="_blank">PHP SDK</a></li>
-                    <li><a 
href="https://github.com/apache/incubator-usergrid/blob/master/sdks/java"; 
target="_blank">Java SDK</a></li>
-                    <li><a 
href="https://github.com/apache/incubator-usergrid/blob/master/sdks/dotnet"; 
target="_blank">.NET / Windows SDK</a></li>
-                </ul>
-            </div>
-            <div class="col-md-2">
-                <ul class="nav nav-list">
-                    <li class="nav-header">Resources</li>
-                    <li><a href="http://github.com/apache/incubator-usergrid"; 
target="_blank">GitHub Code</a></li>
-                    <li><a href="http://usergrid.readthedocs.org/"; 
target="_blank">Docs</a></li>
-                    <li><a 
href="https://issues.apache.org/jira/secure/RapidBoard.jspa?rapidView=23&view=planning&selectedIssue=USERGRID-362&epics=visible";
 target="_blank">JIRA Bug Tracker</a></li>
-                    <li><a href="http://stackoverflow.com/search?q=usergrid"; 
target="_blank">StackOverflow</a></li>
-                    <li><a href="/community/#live">Live Chat</a></li>
-                    <li><a href="https://twitter.com/usergrid"; 
target="_blank">Twitter</a></li>
-                    <li><a 
href="http://incubator.apache.org/projects/usergrid.html"; 
target="_blank">Podling Listing</a></li>
-                    <li><a 
href="https://github.com/apache/incubator-usergrid/blob/master/stack#requirements";
 target="_blank">Getting Started</a></li>
-                    <li><a 
href="https://cwiki.apache.org/confluence/display/usergrid/GitHub+Based+Contribution+Workflow";
 target="_blank">Contribution Guidelines</a></li>
-                </ul>
-            </div>
-            <div class="col-md-2">
-                <ul class="nav nav-list">
-                    <li class="nav-header">Apache</li>
-                    <li><a href="http://www.apache.org/licenses/"; 
target="_blank">License</a></li>
-                    <li><a 
href="http://www.apache.org/foundation/sponsorship.html"; 
target="_blank">Sponsorship</a></li>
-                    <li><a href="http://www.apache.org/foundation/thanks.html"; 
target="_blank">Thanks</a></li>
-                    <li><a 
href="http://www.apache.org/security/";>Security</a></li>
-                    <li><a href="http://www.apache.org/"; 
target="_blank">Apache Foundation</a></li>
-                </ul>
-            </div>
-            <div class="col-md-4">
-                <a class="twitter-timeline" 
href="https://twitter.com/search?q=%23usergrid"; 
data-widget-id="401499136807038976"  data-related="usergrid" height="400px" 
style="overflow:hidden">Tweets about "usergrid"</a>
-                <script>!function(d,s,id){var 
js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+"://platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script>
-            </div> 
-        <!--
-            <div class="col-md-4">
-                <div class="input-group form-search">
-                    <input type="text" class="form-control search-query">
-                    <span class="input-group-btn">
-                        <button type="submit" class="btn btn-primary" 
data-type="last">Search</button>
-                    </span>
-                </div>
-            </div> -->
-        </div> 
-        <div class="row">
-            <div id="copyright">
-                <img src="/img/egg-logo.png" /><br/><br/>
-                <p>Apache Usergrid is an effort undergoing incubation at The 
Apache Software Foundation (ASF), sponsored by the Apache Incubator PMC. 
Incubation is required of all newly accepted projects until a further review 
indicates that the infrastructure, communications, and decision making process 
have stabilized in a manner consistent with other successful ASF projects. 
While incubation status is not necessarily a reflection of the completeness or 
stability of the code, it does indicate that the project has yet to be fully 
endorsed by the ASF.</p>
-                <p>Copyright © 2013 The Apache Software Foundation, Licensed 
under the Apache License, Version 2.0.<br>
-                Apache and the Apache feather logos are trademarks of The 
Apache Software Foundation.</p>
-                <p class="credits">Site designed & assembled with love by <a 
href="https://github.com/ryuneeee";>@ryuneeee</a> + <a 
href="https://github.com/realbeast";>@realbeast</a> + <a 
href="https://twitter.com/timanglade";>@timanglade</a>.</p>
-            </div>
-        </div>
-    </div>
-</footer>
-
-<script type="text/javascript" src="/js/head.js"></script>
-<script type="text/javascript">
-    head.js("/js/jquery-1.10.1.min.js", "/js/bootstrap.min.js", 
"/js/usergrid-site.js");
-</script>
-<script>
-  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new 
Date();a=s.createElement(o),
-  
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-
-  ga('create', 'UA-45815079-1', 'apache.org');
-  ga('send', 'pageview');
-
-</script>
-
-
-
-</body>
-</html>

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2a55601f/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
new file mode 100644
index 0000000..d1bcda8
--- /dev/null
+++ b/content/docs/entity-connections/connecting-entities.html
@@ -0,0 +1,378 @@
+
+
+<!DOCTYPE html>
+<!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]-->
+<!--[if gt IE 8]><!--> <html class="no-js" lang="en" > <!--<![endif]-->
+<head>
+  <meta charset="utf-8">
+  
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  
+  <title>Connecting entities &mdash; Apache Usergrid 1.0 documentation</title>
+  
+
+  
+  
+
+  
+
+  
+  
+    
+
+  
+
+  
+  
+    <link rel="stylesheet" href="../_static/css/theme.css" type="text/css" />
+  
+
+  
+
+  
+    <link rel="top" title="Apache Usergrid 1.0 documentation" 
href="../index.html"/>
+        <link rel="next" title="Retrieving connections" 
href="retrieving-entities.html"/>
+        <link rel="prev" title="Advanced query usage" 
href="../data-queries/advanced-query-usage.html"/> 
+
+  
+  <script src="../_static/js/modernizr.min.js"></script>
+
+</head>
+
+<body class="wy-body-for-nav" role="document">
+
+  <div class="wy-grid-for-nav">
+
+    
+    <nav data-toggle="wy-nav-shift" class="wy-nav-side">
+      <div class="wy-side-nav-search">
+        
+
+        
+          <a href="../index.html" class="icon icon-home"> Apache Usergrid
+        
+
+        
+        </a>
+
+        
+          
+          
+            <div class="version">
+              1.0
+            </div>
+          
+        
+
+        
+<div role="search">
+  <form id="rtd-search-form" class="wy-form" action="../search.html" 
method="get">
+    <input type="text" name="q" placeholder="Search docs" />
+    <input type="hidden" name="check_keywords" value="yes" />
+    <input type="hidden" name="area" value="default" />
+  </form>
+</div>
+
+        
+      </div>
+
+      <div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" 
aria-label="main navigation">
+        
+          
+          
+              <p class="caption"><span 
class="caption-text">Introduction</span></p>
+<ul>
+<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>
+<ul>
+<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/creating-account.html">Creating an Usergrid 
Account</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>
+</ul>
+<p class="caption"><span class="caption-text">Data Storage</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" 
href="../data-storage/data-store-dbms.html">The Usergrid Data Store</a></li>
+<li class="toctree-l1"><a class="reference internal" 
href="../data-storage/optimizing-access.html">Data Store Best Practices</a></li>
+<li class="toctree-l1"><a class="reference internal" 
href="../data-storage/collections.html">Collections</a></li>
+<li class="toctree-l1"><a class="reference internal" 
href="../data-storage/entities.html">Entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Data Queries</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" 
href="../data-queries/querying-your-data.html">Querying your data</a></li>
+<li class="toctree-l1"><a class="reference internal" 
href="../data-queries/query-parameters.html">Query parameters &amp; 
clauses</a></li>
+<li class="toctree-l1"><a class="reference internal" 
href="../data-queries/operators-and-types.html">Query operators &amp; data 
types</a></li>
+<li class="toctree-l1"><a class="reference internal" 
href="../data-queries/advanced-query-usage.html">Advanced query usage</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Entity Connections</span></p>
+<ul class="current">
+<li class="toctree-l1 current"><a class="current reference internal" 
href="">Connecting entities</a><ul>
+<li class="toctree-l2"><a class="reference internal" 
href="#request-syntax">Request syntax</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" 
href="retrieving-entities.html">Retrieving connections</a></li>
+<li class="toctree-l1"><a class="reference internal" 
href="disconnecting-entities.html">Disconnecting entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Security &amp; 
Authentication</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" 
href="../security-and-auth/app-security.html">Security &amp; token 
authentication</a></li>
+<li class="toctree-l1"><a class="reference internal" 
href="../security-and-auth/using-permissions.html">Using permissions</a></li>
+<li class="toctree-l1"><a class="reference internal" 
href="../security-and-auth/authenticating-users-and-application-clients.html">Authenticating
 users &amp; app clients</a></li>
+<li class="toctree-l1"><a class="reference internal" 
href="../security-and-auth/user-authentication-types.html">Authentication 
levels</a></li>
+<li class="toctree-l1"><a class="reference internal" 
href="../security-and-auth/changing-token-time-live-ttl.html">Changing token 
expiration (time-to-live)</a></li>
+<li class="toctree-l1"><a class="reference internal" 
href="../security-and-auth/authenticating-api-requests.html">Authenticating API 
requests</a></li>
+<li class="toctree-l1"><a class="reference internal" 
href="../security-and-auth/revoking-tokens-logout.html">Revoking tokens 
(logout)</a></li>
+<li class="toctree-l1"><a class="reference internal" 
href="../security-and-auth/facebook-sign.html">Facebook sign in</a></li>
+<li class="toctree-l1"><a class="reference internal" 
href="../security-and-auth/securing-your-app.html">Security best 
practices</a></li>
+</ul>
+<p class="caption"><span class="caption-text">User Management &amp; Social 
Graph</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" 
href="../user-management/user-management.html">User management &amp; social 
graph</a></li>
+<li class="toctree-l1"><a class="reference internal" 
href="../user-management/working-user-data.html">Working with User Data</a></li>
+<li class="toctree-l1"><a class="reference internal" 
href="../user-management/group.html">Working with group data</a></li>
+<li class="toctree-l1"><a class="reference internal" 
href="../user-management/activity.html">Activity</a></li>
+<li class="toctree-l1"><a class="reference internal" 
href="../user-management/user-connections.html">Social Graph 
Connections</a></li>
+<li class="toctree-l1"><a class="reference internal" 
href="../user-management/user-connections.html#creating-other-connections">Creating
 other connections</a></li>
+<li class="toctree-l1"><a class="reference internal" 
href="../user-management/messagee-example.html">App Example - Messagee</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Geo-location</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" 
href="../geolocation/geolocation.html">Geolocating your Entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Assets &amp; Files</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" 
href="../asset-and-files/uploading-assets.html">Uploading assets</a></li>
+<li class="toctree-l1"><a class="reference internal" 
href="../asset-and-files/retrieving-assets.html">Retrieving assets</a></li>
+<li class="toctree-l1"><a class="reference internal" 
href="../asset-and-files/folders.html">Folders</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Counters &amp; Events</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" 
href="../counters-and-events/events-and-counters.html">Counters &amp; 
events</a></li>
+<li class="toctree-l1"><a class="reference internal" 
href="../counters-and-events/creating-and-incrementing-counters.html">Creating 
&amp; incrementing counters</a></li>
+<li class="toctree-l1"><a class="reference internal" 
href="../counters-and-events/creating-and-incrementing-counters.html#decrementing-resetting-counters">Decrementing/resetting
 counters</a></li>
+<li class="toctree-l1"><a class="reference internal" 
href="../counters-and-events/creating-and-incrementing-counters.html#using-counters-hierarchically">Using
 counters hierarchically</a></li>
+<li class="toctree-l1"><a class="reference internal" 
href="../counters-and-events/retrieving-counters.html">Retrieving 
counters</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Organizations &amp; 
Applications</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" 
href="../orgs-and-apps/managing.html">Organization &amp; application 
management</a></li>
+<li class="toctree-l1"><a class="reference internal" 
href="../orgs-and-apps/organization.html">Organization</a></li>
+<li class="toctree-l1"><a class="reference internal" 
href="../orgs-and-apps/application.html">Application</a></li>
+</ul>
+<p class="caption"><span class="caption-text">API Reference</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" 
href="../rest-endpoints/api-docs.html">Methods</a></li>
+<li class="toctree-l1"><a class="reference internal" 
href="../rest-endpoints/api-docs.html#models">Models</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Client SDKs</span></p>
+<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/ug2-deploy-to-tomcat.html">Usergrid 2: Deploy to 
Tomcat</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>
+<li class="toctree-l1"><a class="reference internal" 
href="../reference/contribute-code.html">How to Contribute Code &amp; 
Docs</a></li>
+</ul>
+
+          
+        
+      </div>
+      &nbsp;
+    </nav>
+
+    <section data-toggle="wy-nav-shift" class="wy-nav-content-wrap">
+
+      
+      <nav class="wy-nav-top" role="navigation" aria-label="top navigation">
+        <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
+        <a href="../index.html">Apache Usergrid</a>
+      </nav>
+
+
+      
+      <div class="wy-nav-content">
+        <div class="rst-content">
+          <div role="navigation" aria-label="breadcrumbs navigation">
+  <ul class="wy-breadcrumbs">
+    <li><a href="../index.html">Docs</a> &raquo;</li>
+      
+    <li>Connecting entities</li>
+      <li class="wy-breadcrumbs-aside">
+        
+          
+            <a href="../_sources/entity-connections/connecting-entities.txt" 
rel="nofollow"> View page source</a>
+          
+        
+      </li>
+  </ul>
+  <hr/>
+</div>
+          <div role="main" class="document" itemscope="itemscope" 
itemtype="http://schema.org/Article";>
+           <div itemprop="articleBody">
+            
+  <div class="section" id="connecting-entities">
+<h1>Connecting entities<a class="headerlink" href="#connecting-entities" 
title="Permalink to this headline">¶</a></h1>
+<p>When creating a connection, if you specify the collection of the entity
+being connected to, you can create the connection using the value of its
+&#8216;name&#8217; property or its UUID.</p>
+<div class="section" id="request-syntax">
+<h2>Request syntax<a class="headerlink" href="#request-syntax" 
title="Permalink to this headline">¶</a></h2>
+<p>To create a connection, the entity being connected to can either be
+specified by just its UUID, or both its collection and the value of its
+&#8216;name&#8217; property.</p>
+<p>Connect by UUID</p>
+<div class="highlight-python"><div class="highlight"><pre>curl -X POST 
https://api.usergrid.com/&lt;org&gt;/&lt;app&gt;/&lt;connecting_collection&gt;/&lt;connecting_entity&gt;/&lt;relationship&gt;/&lt;connected_entity&gt;
+</pre></div>
+</div>
+<p>Connect by &#8216;name&#8217; property</p>
+<div class="highlight-python"><div class="highlight"><pre>curl -X POST 
https://api.usergrid.com/&lt;org&gt;/&lt;app&gt;/&lt;connecting_collection&gt;/&lt;connecting_entity&gt;/&lt;relationship&gt;/&lt;connected_collection&gt;/&lt;connected_entity&gt;
+</pre></div>
+</div>
+<p>Parameters</p>
+<table border="1" class="docutils">
+<colgroup>
+<col width="28%" />
+<col width="72%" />
+</colgroup>
+<thead valign="bottom">
+<tr class="row-odd"><th class="head">Parameter</th>
+<th class="head">Description</th>
+</tr>
+</thead>
+<tbody valign="top">
+<tr class="row-even"><td>org</td>
+<td>Organization UUID or organization name</td>
+</tr>
+<tr class="row-odd"><td>app</td>
+<td>Application UUID or application name</td>
+</tr>
+<tr class="row-even"><td>connecting_collection</td>
+<td>Name or UUID of the collection of the connecting entity.</td>
+</tr>
+<tr class="row-odd"><td>connecting_entity</td>
+<td>Name or UUID of the connecting entity.</td>
+</tr>
+<tr class="row-even"><td>relationship</td>
+<td>Type of connection being created (e.g., likes)</td>
+</tr>
+<tr class="row-odd"><td>connected_collection</td>
+<td>Name or UUID of the collection of the entity being connected to.</td>
+</tr>
+<tr class="row-even"><td>connected_entity</td>
+<td>Name or UUID of the entity being connected to.</td>
+</tr>
+</tbody>
+</table>
+<p>If the connecting entity is a &#8216;user&#8217; entity, the 
&#8216;username&#8217; should be
+used rather than the &#8216;name&#8217;.</p>
+<p>&#8216;connected_collection&#8217; is not required if the entity being 
connected to
+is specified by its UUID.</p>
+<p>Example request</p>
+<div class="highlight-python"><div class="highlight"><pre>curl -X POST 
http://api.usergrid.com/your-org/your-app/users/Arthur/likes/6c56ffda-9e75-11e3-99fd-8dd1801e534c
+</pre></div>
+</div>
+<p>Example Response</p>
+<div class="highlight-python"><div class="highlight"><pre><span 
class="p">{</span>
+    <span class="s">&quot;action&quot;</span> <span class="p">:</span> <span 
class="s">&quot;post&quot;</span><span class="p">,</span>
+    <span class="s">&quot;application&quot;</span> <span class="p">:</span> 
<span class="s">&quot;db1e60a0-417f-11e3-9586-0f1ff3650d20&quot;</span><span 
class="p">,</span>
+    <span class="s">&quot;params&quot;</span> <span class="p">:</span> <span 
class="p">{</span> <span class="p">},</span>
+    <span class="s">&quot;path&quot;</span> <span class="p">:</span> <span 
class="s">&quot;/users/174785aa-8ea8-11e3-ae1f-eb20e5bce407/likes&quot;</span><span
 class="p">,</span>
+    <span class="s">&quot;uri&quot;</span> <span class="p">:</span> <span 
class="s">&quot;https://api.usergrid.com/my-org/my-app/users/174785aa-8ea8-11e3-ae1f-eb20e5bce407/likes&quot;</span><span
 class="p">,</span>
+    <span class="s">&quot;entities&quot;</span> <span class="p">:</span> <span 
class="p">[</span> <span class="p">{</span>
+        <span class="s">&quot;uuid&quot;</span> <span class="p">:</span> <span 
class="s">&quot;6c56ffda-9e75-11e3-99fd-8dd1801e534c&quot;</span><span 
class="p">,</span>
+        <span class="s">&quot;type&quot;</span> <span class="p">:</span> <span 
class="s">&quot;user&quot;</span><span class="p">,</span>
+        <span class="s">&quot;name&quot;</span> <span class="p">:</span> <span 
class="s">&quot;Arthur&quot;</span><span class="p">,</span>
+        <span class="s">&quot;created&quot;</span> <span class="p">:</span> 
<span class="mi">1393371291725</span><span class="p">,</span>
+        <span class="s">&quot;modified&quot;</span> <span class="p">:</span> 
<span class="mi">1393371291725</span><span class="p">,</span>
+        <span class="s">&quot;metadata&quot;</span> <span class="p">:</span> 
<span class="p">{</span>
+            <span class="s">&quot;path&quot;</span> <span class="p">:</span> 
<span 
class="s">&quot;/users/174785aa-8ea8-11e3-ae1f-eb20e5bce407/likes/6c56ffda-9e75-11e3-99fd-8dd1801e534c&quot;</span>
+        <span class="p">}</span>
+    <span class="p">}</span> <span class="p">],</span>
+    <span class="s">&quot;timestamp&quot;</span> <span class="p">:</span> 
<span class="mi">1393371455487</span><span class="p">,</span>
+    <span class="s">&quot;duration&quot;</span> <span class="p">:</span> <span 
class="mi">77</span><span class="p">,</span>
+    <span class="s">&quot;organization&quot;</span> <span class="p">:</span> 
<span class="s">&quot;your-org&quot;</span><span class="p">,</span>
+    <span class="s">&quot;applicationName&quot;</span> <span 
class="p">:</span> <span class="s">&quot;your-app&quot;</span>
+<span class="p">}</span>
+</pre></div>
+</div>
+</div>
+</div>
+
+
+           </div>
+          </div>
+          <footer>
+  
+    <div class="rst-footer-buttons" role="navigation" aria-label="footer 
navigation">
+      
+        <a href="retrieving-entities.html" class="btn btn-neutral float-right" 
title="Retrieving connections" accesskey="n">Next <span class="fa 
fa-arrow-circle-right"></span></a>
+      
+      
+        <a href="../data-queries/advanced-query-usage.html" class="btn 
btn-neutral" title="Advanced query usage" accesskey="p"><span class="fa 
fa-arrow-circle-left"></span> Previous</a>
+      
+    </div>
+  
+
+  <hr/>
+
+  <div role="contentinfo">
+    <p>
+        &copy; Copyright 2013-2015, Apache Usergrid.
+
+    </p>
+  </div>
+  Built with <a href="http://sphinx-doc.org/";>Sphinx</a> using a <a 
href="https://github.com/snide/sphinx_rtd_theme";>theme</a> provided by <a 
href="https://readthedocs.org";>Read the Docs</a>.
+
+</footer>
+
+        </div>
+      </div>
+
+    </section>
+
+  </div>
+  
+
+
+  
+
+    <script type="text/javascript">
+        var DOCUMENTATION_OPTIONS = {
+            URL_ROOT:'../',
+            VERSION:'1.0',
+            COLLAPSE_INDEX:false,
+            FILE_SUFFIX:'.html',
+            HAS_SOURCE:  true
+        };
+    </script>
+      <script type="text/javascript" src="../_static/jquery.js"></script>
+      <script type="text/javascript" src="../_static/underscore.js"></script>
+      <script type="text/javascript" src="../_static/doctools.js"></script>
+
+  
+
+  
+  
+    <script type="text/javascript" src="../_static/js/theme.js"></script>
+  
+
+  
+  
+  <script type="text/javascript">
+      jQuery(function () {
+          SphinxRtdTheme.StickyNav.enable();
+      });
+  </script>
+   
+
+</body>
+</html>
\ No newline at end of file

Reply via email to