You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by ti...@apache.org on 2013/12/20 10:15:13 UTC

svn commit: r1552550 [5/13] - in /incubator/usergrid/site: content/community/ content/docs/ layouts/ lib/helpers/ publish/community/ publish/docs/access-token/ publish/docs/activity/ publish/docs/admin-portal/ publish/docs/admin-user/ publish/docs/app-...

Modified: incubator/usergrid/site/publish/docs/applications/index.html
URL: http://svn.apache.org/viewvc/incubator/usergrid/site/publish/docs/applications/index.html?rev=1552550&r1=1552549&r2=1552550&view=diff
==============================================================================
--- incubator/usergrid/site/publish/docs/applications/index.html (original)
+++ incubator/usergrid/site/publish/docs/applications/index.html Fri Dec 20 09:15:11 2013
@@ -129,11 +129,23 @@
                   <small><a target="_blank" href="https://github.com/usergrid/website/blob/master/content/docs/applications.md">contribute to this article on github</a></small>
                 </div>
                 <div class="toc">
-	
+	<ul>
+<li>
+<a href="#applications">Applications</a><ul>
+<li><a href="#application-properties">Application properties</a></li>
+<li><a href="#set-properties">Set properties</a></li>
+<li><a href="#collections">Collections</a></li>
+</ul>
+</li>
+</ul>
 </div>
-<p>Each Organization can contain multiple Applications. You can access applications entities using their app name or UUID, prefixed with the organization name or UUID:</p>
-<pre><code>http://api.usergrid.com/org_name_or_uuid/app_name_or_uuid/</code></pre>
+<h2 id="applications"><a href="#applications">Applications</a></h2>
+<p>You can create a new application in an organization through the <a href="/admin-portal">Admin portal</a>. The Admin portal creates the new application by issuing a post against the management endpoint (see the “Creating an organization application” section in <a href="/organization">Organization</a> for details). If you need to create an application programmatically in your app, you can also use the API to do this. You can access application entities using your app name or UUID, prefixed with the organization name or UUID:</p>
+<p><a href="http://api.usergrid.com/">https://api.usergrid.com</a>/{org_name|uuid}/{app_name|uuid}</p>
 <p>Most mobile apps never access the application entity directly. For example you might have a server-side web app that accesses the application entity for configuration purposes. If you want to access your application entity programmatically, you can use the API.</p>
+<h3 id="application-properties"><a href="#application-properties">Application properties</a></h3>
+<p>The following are the system-defined properties for application entities. You can create application-specific properties for an application entity in addition to the system-defined properties. The system-defined properties are reserved. You cannot use these names to create other properties for an application entity. In addition the applications name is reserved for the applications collection — you can’t use it to name another collection.</p>
+<p>The look-up properties for the entities of type application are uuid and name, that is, you can use the uuid and name properties to reference an application entity in an API call. However, you can search on a role using any property of the application entity. See <a href="/queries-and-parameters">Queries and parameters</a> for details on searching.</p>
 <table>
 <thead><tr class="header">
 <th align="left">Property</th>
@@ -209,6 +221,101 @@
 <td align="left">Time to live value for an access token obtained within the application</td>
 </tr>
 </tbody>
+</table><h3 id="set-properties"><a href="#set-properties">Set properties</a></h3>
+<p>The set properties for applications are listed in the table below.</p>
+<table>
+<thead><tr class="header">
+<th align="left">Set</th>
+<th align="left">Type</th>
+<th align="left">Description</th>
+</tr></thead>
+<tbody>
+<tr class="odd">
+<td align="left">collections</td>
+<td align="left">string</td>
+<td align="left">Set of collections</td>
+</tr>
+<tr class="even">
+<td align="left">rolenames</td>
+<td align="left">string</td>
+<td align="left">Set of roles assigned to an application</td>
+</tr>
+<tr class="odd">
+<td align="left">counters</td>
+<td align="left">string</td>
+<td align="left">Set of counters assigned to an application</td>
+</tr>
+<tr class="even">
+<td align="left">oauthproviders</td>
+<td align="left">string</td>
+<td align="left">Set of OAuth providers for the application</td>
+</tr>
+<tr class="odd">
+<td align="left">credentials</td>
+<td align="left">string</td>
+<td align="left">Set of credentials required to run the application</td>
+</tr>
+</tbody>
+</table><h3 id="collections"><a href="#collections">Collections</a></h3>
+<p>The collections for applications are listed in the table below.</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</td>
+</tr>
+<tr class="even">
+<td align="left">groups</td>
+<td align="left">group</td>
+<td align="left">Collection of groups</td>
+</tr>
+<tr class="odd">
+<td align="left">folders</td>
+<td align="left">folder</td>
+<td align="left">Collection of assets that represent folder-like objects</td>
+</tr>
+<tr class="even">
+<td align="left">events</td>
+<td align="left">event</td>
+<td align="left">Collection of events posted by the application</td>
+</tr>
+<tr class="odd">
+<td align="left">assets</td>
+<td align="left">asset</td>
+<td align="left">Collection of assets that represent file-like objects</td>
+</tr>
+<tr class="even">
+<td align="left">activities</td>
+<td align="left">activity</td>
+<td align="left">Collection of activity stream actions</td>
+</tr>
+<tr class="odd">
+<td align="left">devices</td>
+<td align="left">device</td>
+<td align="left">Collection of devices in the service</td>
+</tr>
+<tr class="even">
+<td align="left">notifiers</td>
+<td align="left">notifier</td>
+<td align="left">Collection of notifiers used for push notifications</td>
+</tr>
+<tr class="odd">
+<td align="left">notifications</td>
+<td align="left">notification</td>
+<td align="left">Collection of push notifications that have been sent or are scheduled to be sent</td>
+</tr>
+<tr class="even">
+<td align="left">receipts</td>
+<td align="left">receipt</td>
+<td align="left">Collection of receipts from push notifications that were sent</td>
+</tr>
+</tbody>
 </table>
             </div>
         </div>

Modified: incubator/usergrid/site/publish/docs/authenticating-users-and-application-clients/index.html
URL: http://svn.apache.org/viewvc/incubator/usergrid/site/publish/docs/authenticating-users-and-application-clients/index.html?rev=1552550&r1=1552549&r2=1552550&view=diff
==============================================================================
--- incubator/usergrid/site/publish/docs/authenticating-users-and-application-clients/index.html (original)
+++ incubator/usergrid/site/publish/docs/authenticating-users-and-application-clients/index.html Fri Dec 20 09:15:11 2013
@@ -45,8 +45,8 @@
         </div>
         <nav class="collapse navbar-collapse bf-navbar-collapse" role="navigation">
             <ul class="nav navbar-nav navbar-right">
-                <!--<li class="active"><a href="/docs/"><span class="icns icon-book"></span></a></li>-->
                 <li class=""><a href="/community/"><span class="icns icon-group"></span></a></li>
+                <li class="active"><a href="/docs/"><span class="icns icon-book"></span></a></li>
                 <li><a href="http://github.com/usergrid/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/browse/USERGRID" target="_blank"><span class="icns icon-bug"></span></a></li>
@@ -65,27 +65,28 @@
         <div class="col-md-3">
             <div class="bf-sidebar hidden-print" role="complementary">
                 <ul class="nav nav-list">
-                    <li><a href="#">Getting Up & Running Locally</a></li>
-                    <li><a href="#"><code>ugc</code> — the Command-line Client</a></li>
+                    <li><a href="/docs/getting-up-and-running-locally/">Getting Up & Running Locally</a></li>
+                    <li><a href="https://github.com/usergrid/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>
+                                <a href="/docs/applications/">Applications</a>
                                 <ul>
-                                    <li><a href="#">Roles & Permissions</a></li>
-                                    <li><a href="#">Queues</a></li>
-                                    <li><a href="#">Events & Counters</a></li>
+                                    <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="#">Collections</a>
+                                        <a href="/docs/collections">Collections</a>
                                         <ul>
-                                            <li><a href="#">Query Language</a></li>
-                                            <li><a href="#">Users & Devices</a></li>
-                                            <li><a href="#">Groups</a></li>
-                                            <li><a href="#">Activities</a></li>
-                                            <li><a href="#">Assets</a></li>
+                                            <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>
@@ -95,27 +96,28 @@
 
 
                     <li class="nav-header"><span>Usage</span></li>
-                    <li><a href="/docs/rest-api">REST API</a></li>
-                    <li><a class="icns-apple" href="#">iOS SDK</a></li>
-                    <li><a class="icns-android" href="#">Android SDK</a></li>
-                    <li><a class="icns-html5" href="/docs/html5-javascript-sdk">HTML5 / JavaScript SDK</a></li>
-                    <li><a class="icns-windows" href="#">Windows 8 / Windows Phone / .net SDK</a></li>
-                    <li><a href="/docs/nodejs-module">Node.js module</a></li>
-                    <li><a href="/docs/ruby-gem">Ruby gem</a></li>
-                    <li><a href="#">Ruby on Rails gem</a></li>
-                    <li><a href="#">PHP library</a></li>
+                    <li>REST API — Coming Soon</li>
+                    <li><a class="icns-apple" href="https://github.com/usergrid/usergrid/tree/master/sdks/ios">iOS SDK</a></li>
+                    <li><a class="icns-android" href="https://github.com/usergrid/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/usergrid/usergrid/tree/master/sdks/dotnet">Windows 8 / Windows Phone / .net SDK</a></li>
+                    <li><a href="https://github.com/usergrid/usergrid/tree/master/sdks/nodejs">Node.js module</a></li>
+                    <li><a href="https://github.com/usergrid/usergrid/tree/master/sdks/ruby">Ruby gem</a></li>
+                    <li><a href="https://github.com/usergrid/usergrid/tree/master/sdks/ruby-on-rails">Ruby on Rails gem</a></li>
+                    <li><a href="https://github.com/usergrid/usergrid/tree/master/sdks/php">PHP library</a></li>
+                    <li><a href="https://github.com/usergrid/usergrid/tree/master/sdks/java">Java library</a></li>
 
                     <li class="nav-header"><span>Internals</span></li>
-                    <li><a href="#">Design & Goals</a></li>
-                    <li><a href="#">Java Architecture</a></li>
-                    <li><a href="#">Cassandra Schema</a></li>
-                    <li><a href="#">Contributing</a></li>
+                    <li>Design & Goals — Coming Soon</li>
+                    <li>Java Architecture — Coming Soon</li>
+                    <li>Cassandra Schema — Coming Soon</li>
+                    <li><a href="/docs/contributing/">Contributing</a></li>
 
                     <li class="nav-header"><span>Operations</span></li>
-                    <li><a href="#">Deploying</a></li>
-                    <li><a href="#">Monitoring</a></li>
-                    <li><a href="#">Upgrading</a></li>
-                    <li><a href="#">Security</a></li>
+                    <li>Deploying — Coming Soon</li>
+                    <li>Monitoring — Coming Soon</li>
+                    <li><a href="/docs/upgrading/">Upgrading</a></li>
+                    <li>Security — Coming Soon</li>
                 </ul>
             </div>
         </div>
@@ -124,7 +126,7 @@
             <div class="page-article">
                 <div class="page-header">
                     <h1>Authenticating users and application clients</h1>
-                  <small><a href="https://github.com/timanglade/usergrid-site/blob/master/content/docs/authenticating-users-and-application-clients/">contribute to this article on github</a></small>
+                  <small><a target="_blank" href="https://github.com/usergrid/website/blob/master/content/docs/authenticating-users-and-application-clients.md">contribute to this article on github</a></small>
                 </div>
                 <div class="toc">
 	<ul>
@@ -307,8 +309,8 @@
         <div class="col-md-3"></div>
         <div class="col-md-9">
             <div class="github-callout">
-                <strong>Questions?</strong> Please do <a href="https://groups.google.com/forum/#!forum/usergrid">ask on the mailing-list</a>!<br/>
-                <strong>Found an error?</strong> We’d greatly appreciate a pull request about <a href="https://github.com/timanglade/usergrid-site/blob/master/content/docs/authenticating-users-and-application-clients/">this article on github</a>.</div>
+                <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/authenticating-users-and-application-clients.md">this article on github</a>.</div>
         </div>
     </div>
 </div>
@@ -321,7 +323,7 @@
                 <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/#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>
@@ -377,7 +379,7 @@
         <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 name of Apache TLP sponsor. 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>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>

Modified: incubator/usergrid/site/publish/docs/authentication-and-access-app-services-0/index.html
URL: http://svn.apache.org/viewvc/incubator/usergrid/site/publish/docs/authentication-and-access-app-services-0/index.html?rev=1552550&r1=1552549&r2=1552550&view=diff
==============================================================================
--- incubator/usergrid/site/publish/docs/authentication-and-access-app-services-0/index.html (original)
+++ incubator/usergrid/site/publish/docs/authentication-and-access-app-services-0/index.html Fri Dec 20 09:15:11 2013
@@ -45,8 +45,8 @@
         </div>
         <nav class="collapse navbar-collapse bf-navbar-collapse" role="navigation">
             <ul class="nav navbar-nav navbar-right">
-                <!--<li class="active"><a href="/docs/"><span class="icns icon-book"></span></a></li>-->
                 <li class=""><a href="/community/"><span class="icns icon-group"></span></a></li>
+                <li class="active"><a href="/docs/"><span class="icns icon-book"></span></a></li>
                 <li><a href="http://github.com/usergrid/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/browse/USERGRID" target="_blank"><span class="icns icon-bug"></span></a></li>
@@ -65,27 +65,28 @@
         <div class="col-md-3">
             <div class="bf-sidebar hidden-print" role="complementary">
                 <ul class="nav nav-list">
-                    <li><a href="#">Getting Up & Running Locally</a></li>
-                    <li><a href="#"><code>ugc</code> — the Command-line Client</a></li>
+                    <li><a href="/docs/getting-up-and-running-locally/">Getting Up & Running Locally</a></li>
+                    <li><a href="https://github.com/usergrid/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>
+                                <a href="/docs/applications/">Applications</a>
                                 <ul>
-                                    <li><a href="#">Roles & Permissions</a></li>
-                                    <li><a href="#">Queues</a></li>
-                                    <li><a href="#">Events & Counters</a></li>
+                                    <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="#">Collections</a>
+                                        <a href="/docs/collections">Collections</a>
                                         <ul>
-                                            <li><a href="#">Query Language</a></li>
-                                            <li><a href="#">Users & Devices</a></li>
-                                            <li><a href="#">Groups</a></li>
-                                            <li><a href="#">Activities</a></li>
-                                            <li><a href="#">Assets</a></li>
+                                            <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>
@@ -95,27 +96,28 @@
 
 
                     <li class="nav-header"><span>Usage</span></li>
-                    <li><a href="/docs/rest-api">REST API</a></li>
-                    <li><a class="icns-apple" href="#">iOS SDK</a></li>
-                    <li><a class="icns-android" href="#">Android SDK</a></li>
-                    <li><a class="icns-html5" href="/docs/html5-javascript-sdk">HTML5 / JavaScript SDK</a></li>
-                    <li><a class="icns-windows" href="#">Windows 8 / Windows Phone / .net SDK</a></li>
-                    <li><a href="/docs/nodejs-module">Node.js module</a></li>
-                    <li><a href="/docs/ruby-gem">Ruby gem</a></li>
-                    <li><a href="#">Ruby on Rails gem</a></li>
-                    <li><a href="#">PHP library</a></li>
+                    <li>REST API — Coming Soon</li>
+                    <li><a class="icns-apple" href="https://github.com/usergrid/usergrid/tree/master/sdks/ios">iOS SDK</a></li>
+                    <li><a class="icns-android" href="https://github.com/usergrid/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/usergrid/usergrid/tree/master/sdks/dotnet">Windows 8 / Windows Phone / .net SDK</a></li>
+                    <li><a href="https://github.com/usergrid/usergrid/tree/master/sdks/nodejs">Node.js module</a></li>
+                    <li><a href="https://github.com/usergrid/usergrid/tree/master/sdks/ruby">Ruby gem</a></li>
+                    <li><a href="https://github.com/usergrid/usergrid/tree/master/sdks/ruby-on-rails">Ruby on Rails gem</a></li>
+                    <li><a href="https://github.com/usergrid/usergrid/tree/master/sdks/php">PHP library</a></li>
+                    <li><a href="https://github.com/usergrid/usergrid/tree/master/sdks/java">Java library</a></li>
 
                     <li class="nav-header"><span>Internals</span></li>
-                    <li><a href="#">Design & Goals</a></li>
-                    <li><a href="#">Java Architecture</a></li>
-                    <li><a href="#">Cassandra Schema</a></li>
-                    <li><a href="#">Contributing</a></li>
+                    <li>Design & Goals — Coming Soon</li>
+                    <li>Java Architecture — Coming Soon</li>
+                    <li>Cassandra Schema — Coming Soon</li>
+                    <li><a href="/docs/contributing/">Contributing</a></li>
 
                     <li class="nav-header"><span>Operations</span></li>
-                    <li><a href="#">Deploying</a></li>
-                    <li><a href="#">Monitoring</a></li>
-                    <li><a href="#">Upgrading</a></li>
-                    <li><a href="#">Security</a></li>
+                    <li>Deploying — Coming Soon</li>
+                    <li>Monitoring — Coming Soon</li>
+                    <li><a href="/docs/upgrading/">Upgrading</a></li>
+                    <li>Security — Coming Soon</li>
                 </ul>
             </div>
         </div>
@@ -124,7 +126,7 @@
             <div class="page-article">
                 <div class="page-header">
                     <h1>Authentication and access in App services</h1>
-                  <small><a href="https://github.com/timanglade/usergrid-site/blob/master/content/docs/authentication-and-access-app-services-0/">contribute to this article on github</a></small>
+                  <small><a target="_blank" href="https://github.com/usergrid/website/blob/master/content/docs/authentication-and-access-app-services-0.md">contribute to this article on github</a></small>
                 </div>
                 <div class="toc">
 	<ul>
@@ -299,8 +301,8 @@
         <div class="col-md-3"></div>
         <div class="col-md-9">
             <div class="github-callout">
-                <strong>Questions?</strong> Please do <a href="https://groups.google.com/forum/#!forum/usergrid">ask on the mailing-list</a>!<br/>
-                <strong>Found an error?</strong> We’d greatly appreciate a pull request about <a href="https://github.com/timanglade/usergrid-site/blob/master/content/docs/authentication-and-access-app-services-0/">this article on github</a>.</div>
+                <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/authentication-and-access-app-services-0.md">this article on github</a>.</div>
         </div>
     </div>
 </div>
@@ -313,7 +315,7 @@
                 <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/#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>
@@ -369,7 +371,7 @@
         <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 name of Apache TLP sponsor. 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>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>

Modified: incubator/usergrid/site/publish/docs/client-authorization/index.html
URL: http://svn.apache.org/viewvc/incubator/usergrid/site/publish/docs/client-authorization/index.html?rev=1552550&r1=1552549&r2=1552550&view=diff
==============================================================================
--- incubator/usergrid/site/publish/docs/client-authorization/index.html (original)
+++ incubator/usergrid/site/publish/docs/client-authorization/index.html Fri Dec 20 09:15:11 2013
@@ -45,8 +45,8 @@
         </div>
         <nav class="collapse navbar-collapse bf-navbar-collapse" role="navigation">
             <ul class="nav navbar-nav navbar-right">
-                <!--<li class="active"><a href="/docs/"><span class="icns icon-book"></span></a></li>-->
                 <li class=""><a href="/community/"><span class="icns icon-group"></span></a></li>
+                <li class="active"><a href="/docs/"><span class="icns icon-book"></span></a></li>
                 <li><a href="http://github.com/usergrid/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/browse/USERGRID" target="_blank"><span class="icns icon-bug"></span></a></li>
@@ -65,27 +65,28 @@
         <div class="col-md-3">
             <div class="bf-sidebar hidden-print" role="complementary">
                 <ul class="nav nav-list">
-                    <li><a href="#">Getting Up & Running Locally</a></li>
-                    <li><a href="#"><code>ugc</code> — the Command-line Client</a></li>
+                    <li><a href="/docs/getting-up-and-running-locally/">Getting Up & Running Locally</a></li>
+                    <li><a href="https://github.com/usergrid/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>
+                                <a href="/docs/applications/">Applications</a>
                                 <ul>
-                                    <li><a href="#">Roles & Permissions</a></li>
-                                    <li><a href="#">Queues</a></li>
-                                    <li><a href="#">Events & Counters</a></li>
+                                    <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="#">Collections</a>
+                                        <a href="/docs/collections">Collections</a>
                                         <ul>
-                                            <li><a href="#">Query Language</a></li>
-                                            <li><a href="#">Users & Devices</a></li>
-                                            <li><a href="#">Groups</a></li>
-                                            <li><a href="#">Activities</a></li>
-                                            <li><a href="#">Assets</a></li>
+                                            <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>
@@ -95,27 +96,28 @@
 
 
                     <li class="nav-header"><span>Usage</span></li>
-                    <li><a href="/docs/rest-api">REST API</a></li>
-                    <li><a class="icns-apple" href="#">iOS SDK</a></li>
-                    <li><a class="icns-android" href="#">Android SDK</a></li>
-                    <li><a class="icns-html5" href="/docs/html5-javascript-sdk">HTML5 / JavaScript SDK</a></li>
-                    <li><a class="icns-windows" href="#">Windows 8 / Windows Phone / .net SDK</a></li>
-                    <li><a href="/docs/nodejs-module">Node.js module</a></li>
-                    <li><a href="/docs/ruby-gem">Ruby gem</a></li>
-                    <li><a href="#">Ruby on Rails gem</a></li>
-                    <li><a href="#">PHP library</a></li>
+                    <li>REST API — Coming Soon</li>
+                    <li><a class="icns-apple" href="https://github.com/usergrid/usergrid/tree/master/sdks/ios">iOS SDK</a></li>
+                    <li><a class="icns-android" href="https://github.com/usergrid/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/usergrid/usergrid/tree/master/sdks/dotnet">Windows 8 / Windows Phone / .net SDK</a></li>
+                    <li><a href="https://github.com/usergrid/usergrid/tree/master/sdks/nodejs">Node.js module</a></li>
+                    <li><a href="https://github.com/usergrid/usergrid/tree/master/sdks/ruby">Ruby gem</a></li>
+                    <li><a href="https://github.com/usergrid/usergrid/tree/master/sdks/ruby-on-rails">Ruby on Rails gem</a></li>
+                    <li><a href="https://github.com/usergrid/usergrid/tree/master/sdks/php">PHP library</a></li>
+                    <li><a href="https://github.com/usergrid/usergrid/tree/master/sdks/java">Java library</a></li>
 
                     <li class="nav-header"><span>Internals</span></li>
-                    <li><a href="#">Design & Goals</a></li>
-                    <li><a href="#">Java Architecture</a></li>
-                    <li><a href="#">Cassandra Schema</a></li>
-                    <li><a href="#">Contributing</a></li>
+                    <li>Design & Goals — Coming Soon</li>
+                    <li>Java Architecture — Coming Soon</li>
+                    <li>Cassandra Schema — Coming Soon</li>
+                    <li><a href="/docs/contributing/">Contributing</a></li>
 
                     <li class="nav-header"><span>Operations</span></li>
-                    <li><a href="#">Deploying</a></li>
-                    <li><a href="#">Monitoring</a></li>
-                    <li><a href="#">Upgrading</a></li>
-                    <li><a href="#">Security</a></li>
+                    <li>Deploying — Coming Soon</li>
+                    <li>Monitoring — Coming Soon</li>
+                    <li><a href="/docs/upgrading/">Upgrading</a></li>
+                    <li>Security — Coming Soon</li>
                 </ul>
             </div>
         </div>
@@ -124,7 +126,7 @@
             <div class="page-article">
                 <div class="page-header">
                     <h1>Client authorization</h1>
-                  <small><a href="https://github.com/timanglade/usergrid-site/blob/master/content/docs/client-authorization/">contribute to this article on github</a></small>
+                  <small><a target="_blank" href="https://github.com/usergrid/website/blob/master/content/docs/client-authorization.md">contribute to this article on github</a></small>
                 </div>
                 <div class="toc">
 	<ul>
@@ -236,8 +238,8 @@ client.request(options, function (err, d
         <div class="col-md-3"></div>
         <div class="col-md-9">
             <div class="github-callout">
-                <strong>Questions?</strong> Please do <a href="https://groups.google.com/forum/#!forum/usergrid">ask on the mailing-list</a>!<br/>
-                <strong>Found an error?</strong> We’d greatly appreciate a pull request about <a href="https://github.com/timanglade/usergrid-site/blob/master/content/docs/client-authorization/">this article on github</a>.</div>
+                <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/client-authorization.md">this article on github</a>.</div>
         </div>
     </div>
 </div>
@@ -250,7 +252,7 @@ client.request(options, function (err, d
                 <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/#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>
@@ -306,7 +308,7 @@ client.request(options, function (err, d
         <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 name of Apache TLP sponsor. 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>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>

Modified: incubator/usergrid/site/publish/docs/creating-collections/index.html
URL: http://svn.apache.org/viewvc/incubator/usergrid/site/publish/docs/creating-collections/index.html?rev=1552550&r1=1552549&r2=1552550&view=diff
==============================================================================
--- incubator/usergrid/site/publish/docs/creating-collections/index.html (original)
+++ incubator/usergrid/site/publish/docs/creating-collections/index.html Fri Dec 20 09:15:11 2013
@@ -45,8 +45,8 @@
         </div>
         <nav class="collapse navbar-collapse bf-navbar-collapse" role="navigation">
             <ul class="nav navbar-nav navbar-right">
-                <!--<li class="active"><a href="/docs/"><span class="icns icon-book"></span></a></li>-->
                 <li class=""><a href="/community/"><span class="icns icon-group"></span></a></li>
+                <li class="active"><a href="/docs/"><span class="icns icon-book"></span></a></li>
                 <li><a href="http://github.com/usergrid/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/browse/USERGRID" target="_blank"><span class="icns icon-bug"></span></a></li>
@@ -65,27 +65,28 @@
         <div class="col-md-3">
             <div class="bf-sidebar hidden-print" role="complementary">
                 <ul class="nav nav-list">
-                    <li><a href="#">Getting Up & Running Locally</a></li>
-                    <li><a href="#"><code>ugc</code> — the Command-line Client</a></li>
+                    <li><a href="/docs/getting-up-and-running-locally/">Getting Up & Running Locally</a></li>
+                    <li><a href="https://github.com/usergrid/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>
+                                <a href="/docs/applications/">Applications</a>
                                 <ul>
-                                    <li><a href="#">Roles & Permissions</a></li>
-                                    <li><a href="#">Queues</a></li>
-                                    <li><a href="#">Events & Counters</a></li>
+                                    <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="#">Collections</a>
+                                        <a href="/docs/collections">Collections</a>
                                         <ul>
-                                            <li><a href="#">Query Language</a></li>
-                                            <li><a href="#">Users & Devices</a></li>
-                                            <li><a href="#">Groups</a></li>
-                                            <li><a href="#">Activities</a></li>
-                                            <li><a href="#">Assets</a></li>
+                                            <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>
@@ -95,27 +96,28 @@
 
 
                     <li class="nav-header"><span>Usage</span></li>
-                    <li><a href="/docs/rest-api">REST API</a></li>
-                    <li><a class="icns-apple" href="#">iOS SDK</a></li>
-                    <li><a class="icns-android" href="#">Android SDK</a></li>
-                    <li><a class="icns-html5" href="/docs/html5-javascript-sdk">HTML5 / JavaScript SDK</a></li>
-                    <li><a class="icns-windows" href="#">Windows 8 / Windows Phone / .net SDK</a></li>
-                    <li><a href="/docs/nodejs-module">Node.js module</a></li>
-                    <li><a href="/docs/ruby-gem">Ruby gem</a></li>
-                    <li><a href="#">Ruby on Rails gem</a></li>
-                    <li><a href="#">PHP library</a></li>
+                    <li>REST API — Coming Soon</li>
+                    <li><a class="icns-apple" href="https://github.com/usergrid/usergrid/tree/master/sdks/ios">iOS SDK</a></li>
+                    <li><a class="icns-android" href="https://github.com/usergrid/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/usergrid/usergrid/tree/master/sdks/dotnet">Windows 8 / Windows Phone / .net SDK</a></li>
+                    <li><a href="https://github.com/usergrid/usergrid/tree/master/sdks/nodejs">Node.js module</a></li>
+                    <li><a href="https://github.com/usergrid/usergrid/tree/master/sdks/ruby">Ruby gem</a></li>
+                    <li><a href="https://github.com/usergrid/usergrid/tree/master/sdks/ruby-on-rails">Ruby on Rails gem</a></li>
+                    <li><a href="https://github.com/usergrid/usergrid/tree/master/sdks/php">PHP library</a></li>
+                    <li><a href="https://github.com/usergrid/usergrid/tree/master/sdks/java">Java library</a></li>
 
                     <li class="nav-header"><span>Internals</span></li>
-                    <li><a href="#">Design & Goals</a></li>
-                    <li><a href="#">Java Architecture</a></li>
-                    <li><a href="#">Cassandra Schema</a></li>
-                    <li><a href="#">Contributing</a></li>
+                    <li>Design & Goals — Coming Soon</li>
+                    <li>Java Architecture — Coming Soon</li>
+                    <li>Cassandra Schema — Coming Soon</li>
+                    <li><a href="/docs/contributing/">Contributing</a></li>
 
                     <li class="nav-header"><span>Operations</span></li>
-                    <li><a href="#">Deploying</a></li>
-                    <li><a href="#">Monitoring</a></li>
-                    <li><a href="#">Upgrading</a></li>
-                    <li><a href="#">Security</a></li>
+                    <li>Deploying — Coming Soon</li>
+                    <li>Monitoring — Coming Soon</li>
+                    <li><a href="/docs/upgrading/">Upgrading</a></li>
+                    <li>Security — Coming Soon</li>
                 </ul>
             </div>
         </div>
@@ -124,7 +126,7 @@
             <div class="page-article">
                 <div class="page-header">
                     <h1>Creating Collections</h1>
-                  <small><a href="https://github.com/timanglade/usergrid-site/blob/master/content/docs/creating-collections/">contribute to this article on github</a></small>
+                  <small><a target="_blank" href="https://github.com/usergrid/website/blob/master/content/docs/creating-collections.md">contribute to this article on github</a></small>
                 </div>
                 <div class="toc">
 	<ul>
@@ -467,8 +469,8 @@ dataClient.request(options,function (err
         <div class="col-md-3"></div>
         <div class="col-md-9">
             <div class="github-callout">
-                <strong>Questions?</strong> Please do <a href="https://groups.google.com/forum/#!forum/usergrid">ask on the mailing-list</a>!<br/>
-                <strong>Found an error?</strong> We’d greatly appreciate a pull request about <a href="https://github.com/timanglade/usergrid-site/blob/master/content/docs/creating-collections/">this article on github</a>.</div>
+                <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/creating-collections.md">this article on github</a>.</div>
         </div>
     </div>
 </div>
@@ -481,7 +483,7 @@ dataClient.request(options,function (err
                 <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/#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>
@@ -537,7 +539,7 @@ dataClient.request(options,function (err
         <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 name of Apache TLP sponsor. 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>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>

Modified: incubator/usergrid/site/publish/docs/creating-custom-data-entities/index.html
URL: http://svn.apache.org/viewvc/incubator/usergrid/site/publish/docs/creating-custom-data-entities/index.html?rev=1552550&r1=1552549&r2=1552550&view=diff
==============================================================================
--- incubator/usergrid/site/publish/docs/creating-custom-data-entities/index.html (original)
+++ incubator/usergrid/site/publish/docs/creating-custom-data-entities/index.html Fri Dec 20 09:15:11 2013
@@ -45,8 +45,8 @@
         </div>
         <nav class="collapse navbar-collapse bf-navbar-collapse" role="navigation">
             <ul class="nav navbar-nav navbar-right">
-                <!--<li class="active"><a href="/docs/"><span class="icns icon-book"></span></a></li>-->
                 <li class=""><a href="/community/"><span class="icns icon-group"></span></a></li>
+                <li class="active"><a href="/docs/"><span class="icns icon-book"></span></a></li>
                 <li><a href="http://github.com/usergrid/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/browse/USERGRID" target="_blank"><span class="icns icon-bug"></span></a></li>
@@ -65,27 +65,28 @@
         <div class="col-md-3">
             <div class="bf-sidebar hidden-print" role="complementary">
                 <ul class="nav nav-list">
-                    <li><a href="#">Getting Up & Running Locally</a></li>
-                    <li><a href="#"><code>ugc</code> — the Command-line Client</a></li>
+                    <li><a href="/docs/getting-up-and-running-locally/">Getting Up & Running Locally</a></li>
+                    <li><a href="https://github.com/usergrid/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>
+                                <a href="/docs/applications/">Applications</a>
                                 <ul>
-                                    <li><a href="#">Roles & Permissions</a></li>
-                                    <li><a href="#">Queues</a></li>
-                                    <li><a href="#">Events & Counters</a></li>
+                                    <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="#">Collections</a>
+                                        <a href="/docs/collections">Collections</a>
                                         <ul>
-                                            <li><a href="#">Query Language</a></li>
-                                            <li><a href="#">Users & Devices</a></li>
-                                            <li><a href="#">Groups</a></li>
-                                            <li><a href="#">Activities</a></li>
-                                            <li><a href="#">Assets</a></li>
+                                            <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>
@@ -95,27 +96,28 @@
 
 
                     <li class="nav-header"><span>Usage</span></li>
-                    <li><a href="/docs/rest-api">REST API</a></li>
-                    <li><a class="icns-apple" href="#">iOS SDK</a></li>
-                    <li><a class="icns-android" href="#">Android SDK</a></li>
-                    <li><a class="icns-html5" href="/docs/html5-javascript-sdk">HTML5 / JavaScript SDK</a></li>
-                    <li><a class="icns-windows" href="#">Windows 8 / Windows Phone / .net SDK</a></li>
-                    <li><a href="/docs/nodejs-module">Node.js module</a></li>
-                    <li><a href="/docs/ruby-gem">Ruby gem</a></li>
-                    <li><a href="#">Ruby on Rails gem</a></li>
-                    <li><a href="#">PHP library</a></li>
+                    <li>REST API — Coming Soon</li>
+                    <li><a class="icns-apple" href="https://github.com/usergrid/usergrid/tree/master/sdks/ios">iOS SDK</a></li>
+                    <li><a class="icns-android" href="https://github.com/usergrid/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/usergrid/usergrid/tree/master/sdks/dotnet">Windows 8 / Windows Phone / .net SDK</a></li>
+                    <li><a href="https://github.com/usergrid/usergrid/tree/master/sdks/nodejs">Node.js module</a></li>
+                    <li><a href="https://github.com/usergrid/usergrid/tree/master/sdks/ruby">Ruby gem</a></li>
+                    <li><a href="https://github.com/usergrid/usergrid/tree/master/sdks/ruby-on-rails">Ruby on Rails gem</a></li>
+                    <li><a href="https://github.com/usergrid/usergrid/tree/master/sdks/php">PHP library</a></li>
+                    <li><a href="https://github.com/usergrid/usergrid/tree/master/sdks/java">Java library</a></li>
 
                     <li class="nav-header"><span>Internals</span></li>
-                    <li><a href="#">Design & Goals</a></li>
-                    <li><a href="#">Java Architecture</a></li>
-                    <li><a href="#">Cassandra Schema</a></li>
-                    <li><a href="#">Contributing</a></li>
+                    <li>Design & Goals — Coming Soon</li>
+                    <li>Java Architecture — Coming Soon</li>
+                    <li>Cassandra Schema — Coming Soon</li>
+                    <li><a href="/docs/contributing/">Contributing</a></li>
 
                     <li class="nav-header"><span>Operations</span></li>
-                    <li><a href="#">Deploying</a></li>
-                    <li><a href="#">Monitoring</a></li>
-                    <li><a href="#">Upgrading</a></li>
-                    <li><a href="#">Security</a></li>
+                    <li>Deploying — Coming Soon</li>
+                    <li>Monitoring — Coming Soon</li>
+                    <li><a href="/docs/upgrading/">Upgrading</a></li>
+                    <li>Security — Coming Soon</li>
                 </ul>
             </div>
         </div>
@@ -124,7 +126,7 @@
             <div class="page-article">
                 <div class="page-header">
                     <h1>Creating Custom Data Entities</h1>
-                  <small><a href="https://github.com/timanglade/usergrid-site/blob/master/content/docs/creating-custom-data-entities/">contribute to this article on github</a></small>
+                  <small><a target="_blank" href="https://github.com/usergrid/website/blob/master/content/docs/creating-custom-data-entities.md">contribute to this article on github</a></small>
                 </div>
                 <div class="toc">
 	<ul>
@@ -1751,8 +1753,8 @@ client.createEntity(options, function (e
         <div class="col-md-3"></div>
         <div class="col-md-9">
             <div class="github-callout">
-                <strong>Questions?</strong> Please do <a href="https://groups.google.com/forum/#!forum/usergrid">ask on the mailing-list</a>!<br/>
-                <strong>Found an error?</strong> We’d greatly appreciate a pull request about <a href="https://github.com/timanglade/usergrid-site/blob/master/content/docs/creating-custom-data-entities/">this article on github</a>.</div>
+                <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/creating-custom-data-entities.md">this article on github</a>.</div>
         </div>
     </div>
 </div>
@@ -1765,7 +1767,7 @@ client.createEntity(options, function (e
                 <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/#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>
@@ -1821,7 +1823,7 @@ client.createEntity(options, function (e
         <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 name of Apache TLP sponsor. 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>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>

Modified: incubator/usergrid/site/publish/docs/creating-new-application-admin-console/index.html
URL: http://svn.apache.org/viewvc/incubator/usergrid/site/publish/docs/creating-new-application-admin-console/index.html?rev=1552550&r1=1552549&r2=1552550&view=diff
==============================================================================
--- incubator/usergrid/site/publish/docs/creating-new-application-admin-console/index.html (original)
+++ incubator/usergrid/site/publish/docs/creating-new-application-admin-console/index.html Fri Dec 20 09:15:11 2013
@@ -45,8 +45,8 @@
         </div>
         <nav class="collapse navbar-collapse bf-navbar-collapse" role="navigation">
             <ul class="nav navbar-nav navbar-right">
-                <!--<li class="active"><a href="/docs/"><span class="icns icon-book"></span></a></li>-->
                 <li class=""><a href="/community/"><span class="icns icon-group"></span></a></li>
+                <li class="active"><a href="/docs/"><span class="icns icon-book"></span></a></li>
                 <li><a href="http://github.com/usergrid/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/browse/USERGRID" target="_blank"><span class="icns icon-bug"></span></a></li>
@@ -65,27 +65,28 @@
         <div class="col-md-3">
             <div class="bf-sidebar hidden-print" role="complementary">
                 <ul class="nav nav-list">
-                    <li><a href="#">Getting Up & Running Locally</a></li>
-                    <li><a href="#"><code>ugc</code> — the Command-line Client</a></li>
+                    <li><a href="/docs/getting-up-and-running-locally/">Getting Up & Running Locally</a></li>
+                    <li><a href="https://github.com/usergrid/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>
+                                <a href="/docs/applications/">Applications</a>
                                 <ul>
-                                    <li><a href="#">Roles & Permissions</a></li>
-                                    <li><a href="#">Queues</a></li>
-                                    <li><a href="#">Events & Counters</a></li>
+                                    <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="#">Collections</a>
+                                        <a href="/docs/collections">Collections</a>
                                         <ul>
-                                            <li><a href="#">Query Language</a></li>
-                                            <li><a href="#">Users & Devices</a></li>
-                                            <li><a href="#">Groups</a></li>
-                                            <li><a href="#">Activities</a></li>
-                                            <li><a href="#">Assets</a></li>
+                                            <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>
@@ -95,27 +96,28 @@
 
 
                     <li class="nav-header"><span>Usage</span></li>
-                    <li><a href="/docs/rest-api">REST API</a></li>
-                    <li><a class="icns-apple" href="#">iOS SDK</a></li>
-                    <li><a class="icns-android" href="#">Android SDK</a></li>
-                    <li><a class="icns-html5" href="/docs/html5-javascript-sdk">HTML5 / JavaScript SDK</a></li>
-                    <li><a class="icns-windows" href="#">Windows 8 / Windows Phone / .net SDK</a></li>
-                    <li><a href="/docs/nodejs-module">Node.js module</a></li>
-                    <li><a href="/docs/ruby-gem">Ruby gem</a></li>
-                    <li><a href="#">Ruby on Rails gem</a></li>
-                    <li><a href="#">PHP library</a></li>
+                    <li>REST API — Coming Soon</li>
+                    <li><a class="icns-apple" href="https://github.com/usergrid/usergrid/tree/master/sdks/ios">iOS SDK</a></li>
+                    <li><a class="icns-android" href="https://github.com/usergrid/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/usergrid/usergrid/tree/master/sdks/dotnet">Windows 8 / Windows Phone / .net SDK</a></li>
+                    <li><a href="https://github.com/usergrid/usergrid/tree/master/sdks/nodejs">Node.js module</a></li>
+                    <li><a href="https://github.com/usergrid/usergrid/tree/master/sdks/ruby">Ruby gem</a></li>
+                    <li><a href="https://github.com/usergrid/usergrid/tree/master/sdks/ruby-on-rails">Ruby on Rails gem</a></li>
+                    <li><a href="https://github.com/usergrid/usergrid/tree/master/sdks/php">PHP library</a></li>
+                    <li><a href="https://github.com/usergrid/usergrid/tree/master/sdks/java">Java library</a></li>
 
                     <li class="nav-header"><span>Internals</span></li>
-                    <li><a href="#">Design & Goals</a></li>
-                    <li><a href="#">Java Architecture</a></li>
-                    <li><a href="#">Cassandra Schema</a></li>
-                    <li><a href="#">Contributing</a></li>
+                    <li>Design & Goals — Coming Soon</li>
+                    <li>Java Architecture — Coming Soon</li>
+                    <li>Cassandra Schema — Coming Soon</li>
+                    <li><a href="/docs/contributing/">Contributing</a></li>
 
                     <li class="nav-header"><span>Operations</span></li>
-                    <li><a href="#">Deploying</a></li>
-                    <li><a href="#">Monitoring</a></li>
-                    <li><a href="#">Upgrading</a></li>
-                    <li><a href="#">Security</a></li>
+                    <li>Deploying — Coming Soon</li>
+                    <li>Monitoring — Coming Soon</li>
+                    <li><a href="/docs/upgrading/">Upgrading</a></li>
+                    <li>Security — Coming Soon</li>
                 </ul>
             </div>
         </div>
@@ -124,7 +126,7 @@
             <div class="page-article">
                 <div class="page-header">
                     <h1>Creating a New Application with the Admin Console</h1>
-                  <small><a href="https://github.com/timanglade/usergrid-site/blob/master/content/docs/creating-new-application-admin-console/">contribute to this article on github</a></small>
+                  <small><a target="_blank" href="https://github.com/usergrid/website/blob/master/content/docs/creating-new-application-admin-console.md">contribute to this article on github</a></small>
                 </div>
                 <div class="toc">
 	<ul>
@@ -165,8 +167,8 @@
         <div class="col-md-3"></div>
         <div class="col-md-9">
             <div class="github-callout">
-                <strong>Questions?</strong> Please do <a href="https://groups.google.com/forum/#!forum/usergrid">ask on the mailing-list</a>!<br/>
-                <strong>Found an error?</strong> We’d greatly appreciate a pull request about <a href="https://github.com/timanglade/usergrid-site/blob/master/content/docs/creating-new-application-admin-console/">this article on github</a>.</div>
+                <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/creating-new-application-admin-console.md">this article on github</a>.</div>
         </div>
     </div>
 </div>
@@ -179,7 +181,7 @@
                 <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/#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>
@@ -235,7 +237,7 @@
         <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 name of Apache TLP sponsor. 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>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>

Modified: incubator/usergrid/site/publish/docs/data-model/index.html
URL: http://svn.apache.org/viewvc/incubator/usergrid/site/publish/docs/data-model/index.html?rev=1552550&r1=1552549&r2=1552550&view=diff
==============================================================================
--- incubator/usergrid/site/publish/docs/data-model/index.html (original)
+++ incubator/usergrid/site/publish/docs/data-model/index.html Fri Dec 20 09:15:11 2013
@@ -45,8 +45,8 @@
         </div>
         <nav class="collapse navbar-collapse bf-navbar-collapse" role="navigation">
             <ul class="nav navbar-nav navbar-right">
-                <!--<li class="active"><a href="/docs/"><span class="icns icon-book"></span></a></li>-->
                 <li class=""><a href="/community/"><span class="icns icon-group"></span></a></li>
+                <li class="active"><a href="/docs/"><span class="icns icon-book"></span></a></li>
                 <li><a href="http://github.com/usergrid/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/browse/USERGRID" target="_blank"><span class="icns icon-bug"></span></a></li>
@@ -65,27 +65,28 @@
         <div class="col-md-3">
             <div class="bf-sidebar hidden-print" role="complementary">
                 <ul class="nav nav-list">
-                    <li><a href="#">Getting Up & Running Locally</a></li>
-                    <li><a href="#"><code>ugc</code> — the Command-line Client</a></li>
+                    <li><a href="/docs/getting-up-and-running-locally/">Getting Up & Running Locally</a></li>
+                    <li><a href="https://github.com/usergrid/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>
+                                <a href="/docs/applications/">Applications</a>
                                 <ul>
-                                    <li><a href="#">Roles & Permissions</a></li>
-                                    <li><a href="#">Queues</a></li>
-                                    <li><a href="#">Events & Counters</a></li>
+                                    <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="#">Collections</a>
+                                        <a href="/docs/collections">Collections</a>
                                         <ul>
-                                            <li><a href="#">Query Language</a></li>
-                                            <li><a href="#">Users & Devices</a></li>
-                                            <li><a href="#">Groups</a></li>
-                                            <li><a href="#">Activities</a></li>
-                                            <li><a href="#">Assets</a></li>
+                                            <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>
@@ -95,27 +96,28 @@
 
 
                     <li class="nav-header"><span>Usage</span></li>
-                    <li><a href="/docs/rest-api">REST API</a></li>
-                    <li><a class="icns-apple" href="#">iOS SDK</a></li>
-                    <li><a class="icns-android" href="#">Android SDK</a></li>
-                    <li><a class="icns-html5" href="/docs/html5-javascript-sdk">HTML5 / JavaScript SDK</a></li>
-                    <li><a class="icns-windows" href="#">Windows 8 / Windows Phone / .net SDK</a></li>
-                    <li><a href="/docs/nodejs-module">Node.js module</a></li>
-                    <li><a href="/docs/ruby-gem">Ruby gem</a></li>
-                    <li><a href="#">Ruby on Rails gem</a></li>
-                    <li><a href="#">PHP library</a></li>
+                    <li>REST API — Coming Soon</li>
+                    <li><a class="icns-apple" href="https://github.com/usergrid/usergrid/tree/master/sdks/ios">iOS SDK</a></li>
+                    <li><a class="icns-android" href="https://github.com/usergrid/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/usergrid/usergrid/tree/master/sdks/dotnet">Windows 8 / Windows Phone / .net SDK</a></li>
+                    <li><a href="https://github.com/usergrid/usergrid/tree/master/sdks/nodejs">Node.js module</a></li>
+                    <li><a href="https://github.com/usergrid/usergrid/tree/master/sdks/ruby">Ruby gem</a></li>
+                    <li><a href="https://github.com/usergrid/usergrid/tree/master/sdks/ruby-on-rails">Ruby on Rails gem</a></li>
+                    <li><a href="https://github.com/usergrid/usergrid/tree/master/sdks/php">PHP library</a></li>
+                    <li><a href="https://github.com/usergrid/usergrid/tree/master/sdks/java">Java library</a></li>
 
                     <li class="nav-header"><span>Internals</span></li>
-                    <li><a href="#">Design & Goals</a></li>
-                    <li><a href="#">Java Architecture</a></li>
-                    <li><a href="#">Cassandra Schema</a></li>
-                    <li><a href="#">Contributing</a></li>
+                    <li>Design & Goals — Coming Soon</li>
+                    <li>Java Architecture — Coming Soon</li>
+                    <li>Cassandra Schema — Coming Soon</li>
+                    <li><a href="/docs/contributing/">Contributing</a></li>
 
                     <li class="nav-header"><span>Operations</span></li>
-                    <li><a href="#">Deploying</a></li>
-                    <li><a href="#">Monitoring</a></li>
-                    <li><a href="#">Upgrading</a></li>
-                    <li><a href="#">Security</a></li>
+                    <li>Deploying — Coming Soon</li>
+                    <li>Monitoring — Coming Soon</li>
+                    <li><a href="/docs/upgrading/">Upgrading</a></li>
+                    <li>Security — Coming Soon</li>
                 </ul>
             </div>
         </div>
@@ -124,7 +126,7 @@
             <div class="page-article">
                 <div class="page-header">
                     <h1>Apache Usergrid Data model</h1>
-                  <small><a href="https://github.com/timanglade/usergrid-site/blob/master/content/docs/data-model/">contribute to this article on github</a></small>
+                  <small><a target="_blank" href="https://github.com/usergrid/website/blob/master/content/docs/data-model.md">contribute to this article on github</a></small>
                 </div>
                 <div class="toc">
 	<ul>
@@ -230,8 +232,8 @@
         <div class="col-md-3"></div>
         <div class="col-md-9">
             <div class="github-callout">
-                <strong>Questions?</strong> Please do <a href="https://groups.google.com/forum/#!forum/usergrid">ask on the mailing-list</a>!<br/>
-                <strong>Found an error?</strong> We’d greatly appreciate a pull request about <a href="https://github.com/timanglade/usergrid-site/blob/master/content/docs/data-model/">this article on github</a>.</div>
+                <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/data-model.md">this article on github</a>.</div>
         </div>
     </div>
 </div>
@@ -244,7 +246,7 @@
                 <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/#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>
@@ -300,7 +302,7 @@
         <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 name of Apache TLP sponsor. 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>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>