usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From timangl...@apache.org
Subject svn commit: r1550366 [2/4] - in /incubator/usergrid/site/publish/docs: activities/ applications/ assets/ collections/ contributing/ events-and-counters/ getting-up-and-running-locally/ group/ groups/ overview/ query-language/ relationships/ roles-and-p...
Date Thu, 12 Dec 2013 07:55:46 GMT
Modified: incubator/usergrid/site/publish/docs/events-and-counters/index.html
URL: http://svn.apache.org/viewvc/incubator/usergrid/site/publish/docs/events-and-counters/index.html?rev=1550366&r1=1550365&r2=1550366&view=diff
==============================================================================
--- incubator/usergrid/site/publish/docs/events-and-counters/index.html (original)
+++ incubator/usergrid/site/publish/docs/events-and-counters/index.html Thu Dec 12 07:55:45 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,21 +126,11 @@
             <div class="page-article">
                 <div class="page-header">
                     <h1>Events and counters</h1>
-                  <small><a href="https://github.com/timanglade/usergrid-site/blob/master/content/docs/events-and-counters/">contribute to this article on github</a></small>
+                  <small><a target="_blank" href="https://github.com/usergrid/website/blob/master/content/docs/events-and-counters.md">contribute to this article on github</a></small>
                 </div>
                 <div class="toc">
 	<ul>
 <li>
-<a href="#events-and-counters">Events and counters</a><ul>
-<li>
-<a href="#creating-a-new-event">Creating a new event</a><ul>
-<li><a href="#request-uri">Request URI</a></li>
-<li><a href="#parameters">Parameters</a></li>
-<li><a href="#example---request">Example - Request</a></li>
-<li><a href="#example---response">Example - Response</a></li>
-</ul>
-</li>
-<li>
 <a href="#event-properties">Event properties</a><ul>
 <li><a href="#categorizing-events">Categorizing events</a></li>
 </ul>
@@ -152,115 +144,10 @@
 </ul>
 </li>
 </ul>
-</li>
-</ul>
 </div>
-<h1 id="events-and-counters"><a href="#events-and-counters">Events and counters</a></h1>
-<p><strong>Beta Feature</strong><br><br> Please note that this is currently a beta feature. As a result, some functionality may not work as expected.</p>
 <p>Events are typically used for application logging. For example, they could be used to log error messages that a system administrator might review at a later time. The event mechanism is optimized to handle large numbers of events, so it is an ideal mechanism for logging in your application.</p>
 <p>You can link events to specific users, groups, or custom-defined categories. When created with these links, events offer a powerful tool for running highly targeted, custom reports.</p>
 <p>Events are also the primary way to store custom counter data for analytics. See Counters (below) for further details.</p>
-<p><strong>Note:</strong> Although not shown in the API examples below, you need to provide a valid access token with each API call. See <a href="/authenticating-users-and-application-clients">Authenticating users and application clients</a> for details.</p>
-<p>Using App services APIs you can create an event.</p>
-<h2 id="creating-a-new-event"><a href="#creating-a-new-event">Creating a new event</a></h2>
-<p>Use the POST method to create a new event in the events collection.</p>
-<h3 id="request-uri"><a href="#request-uri">Request URI</a></h3>
-<p>POST /{org_id}/{app_id}/events {request body}</p>
-<h3 id="parameters"><a href="#parameters">Parameters</a></h3>
-<table>
-<col width="50%">
-<col width="50%">
-<thead><tr class="header">
-<th align="left">Parameter</th>
-<th align="left">Description</th>
-</tr></thead>
-<tbody>
-<tr class="odd">
-<td align="left"><p>arg uuid|string org_id</p></td>
-<td align="left"><p>Organization UUID or organization name</p></td>
-</tr>
-<tr class="even">
-<td align="left"><p>arg uuid|string app_id</p></td>
-<td align="left"><p>Application UUID or application name</p></td>
-</tr>
-<tr class="odd">
-<td align="left"><p>request body</p></td>
-<td align="left">
-<p>One or more sets of event properties. You must provide a timestamp property, but if you set it to 0 it is assigned by the system.</p>
-<pre><code>{
-  "timestamp":0,
-  "category" : "advertising",
-  "counters" : {
-    "ad_clicks" : 5
-  }
-}</code></pre>
-</td>
-</tr>
-</tbody>
-</table><h3 id="example---request"><a href="#example---request">Example - Request</a></h3>
-<ul>
-<li><a href="#curl_create_event">cURL</a></li>
-<li><a href="#javascript_create_event">JavaScript (HTML5)</a></li>
-<li><a href="#ruby_create_event">Ruby</a></li>
-<li><a href="#nodejs_create_event">Node.js</a></li>
-</ul><!-- --><pre><code>curl -X POST "https://api.usergrid.com/my-org/my-app/events" -d '{"timestamp":0, "category" : "advertising", "counters" : {"ad_clicks" : 5}}'</code></pre>
-<p>The example assumes use of the <a href="https://github.com/apigee/usergrid-javascript-sdk">JavaScript (HTML5) SDK</a>.</p>
-<pre><code>var options = {
-    method:'POST',
-    endpoint:'events',
-    body:{timestamp:0, category:'advertising', counters:{ad_clicks : 5}}
-};
-client.request(options, function (err, data) {
-    if (err) {
-        //error
-    } else {
-        //success - data will contain raw results from API call
-    }
-});</code></pre>
-<p>The example assumes use of the <a href="https://github.com/scottganyo/usergrid_iron">Ruby SDK</a>.</p>
-<pre><code>app = Usergrid::Application.new 'https://api.usergrid.com/my-org/my-app/'
-result = app.create_event timestamp: '0', category: 'advertising', counters: { ad_clicks: 5 }
-mynewevent = result.entity   </code></pre>
-<p>The example assumes use of the <a href="https://github.com/apigee/usergrid-node-module">Node.js module</a>.</p>
-<pre><code>var options = {
-    method:'POST',
-    endpoint:'events',
-    body:{timestamp:0, category:'advertising', counters:{ad_clicks : 5}}
-};
-client.request(options, function (err, data) {
-    if (err) {
-        //error
-    } else {
-        //success - data will contain raw results from API call
-    }
-});</code></pre>
-<h3 id="example---response"><a href="#example---response">Example - Response</a></h3>
-<pre><code>{
-      "action": "post",
-      "application": "7fb8d891-477d-11e1-b2bd-22000a1c4e22",
-      "params": {},
-      "path": "/events",
-      "uri": "https://api.usergrid.com/22000a1c4e22-7fb8d891-477d-11e1-b2bd/7fb8d891-477d-11e1-b2bd-22000a1c4e22/events",
-      "entities": [
-        {
-          "uuid": "ce07ea3c-68b5-11e1-a586-9227e40e3559",
-          "type": "event",
-          "created": 1331166585282,
-          "modified": 1331166585282,
-          "counters": {
-            "ad_clicks": 5
-          },
-          "metadata": {
-            "path": "/events/ce07ea3c-68b5-11e1-a586-9227e40e3559"
-          },
-          "timestamp": 1331166585282
-        }
-      ],
-      "timestamp": 1331166585018,
-      "duration": 919,
-      "organization": "my-org",
-      "applicationName": "my-app"
-}</code></pre>
 <h2 id="event-properties"><a href="#event-properties">Event properties</a></h2>
 <p>You can pass various system-defined properties for an event. For example, you can specify a user property, with a uuid as its value. This will link the event to the user and can be used to query against the events queue (see Categorization below). The same is true for the group property. Pass it with a uuid as the value and the event will be linked to the group. To include a uuid of a user or group, add the uuid to the request body, for example:</p>
 <pre><code>POST https://api.usergrid.com/my-org/my-app/events {"timestamp":0, "category" : "advertising", "counters" :  {"ad_clicks" : 5},"user" : "1234891-477d-11e1-b2bd-22005a1c4e22", "group" : "75577d891-347d-2231-b5bd-23400a1c4e22"}</code></pre>
@@ -357,7 +244,7 @@ client.request(options, function (err, d
 </tr>
 </tbody>
 </table><h3 id="categorizing-events"><a href="#categorizing-events">Categorizing events</a></h3>
-<p>As mentioned previously, you can link an event to a user or a group. This enables you to categorize and qualify event data for use in tracking and analysis. For example, linking events to users and groups, enables you to track how often people use a feature. Not only can you determine the total number of users that used the feature, but also which groups contain users that made the most use of the feature. Or, you could provide a location with the event, so you could see how often a feature was used by people in San Francisco versus Los Angeles.</p>
+<p>As mentioned previously, you can link an event to a user or a group using a standard <a href="/docs/relationships">Relationship</a>. This enables you to categorize and qualify event data for use in tracking and analysis. For example, linking events to users and groups, enables you to track how often people use a feature. Not only can you determine the total number of users that used the feature, but also which groups contain users that made the most use of the feature. Or, you could provide a location with the event, so you could see how often a feature was used by people in San Francisco versus Los Angeles.</p>
 <h2 id="counters"><a href="#counters">Counters</a></h2>
 <p>User-defined counters are used in conjunction with events to keep statistics on many aspects of an application. User-defined counters are JSON objects that are added to events when they are posted. The act of posting an event increments the counter. Once created, user-defined counters can be used to get reports.</p>
 <p><strong>Note:</strong> It may take up to 30 seconds for a counter to be updated.</p>
@@ -400,13 +287,18 @@ client.request(options, function (err, d
 }</code></pre>
 <h3 id="counter-hierarchy"><a href="#counter-hierarchy">Counter hierarchy</a></h3>
 <p>Counters are hierarchical in their structure and in the way they are incremented. Each level of the hierarchy is separated by the dot “.” operator. The hierarchical structure can be useful if you want to store or view statistics in a hierarchical way. For example, suppose you want to log errors that your app generates. One way to do this, is to fire an event every time an error occurs, by creating a counter called “errors”. However, you can get more detail by adding additional parameters to the counter. Imagine that you want to track errors in a specific module and function within that module, say module_1, function_1, you could use a counter like this:</p>
-<p>errors.module_1.function_1</p>
+<pre><code>errors.module_1.function_1</code></pre>
 <p>And then for a different function in the same module:</p>
-<p>errors.module_1.function_2</p>
+<pre><code>errors.module_1.function_2</code></pre>
 <p>And then for a different function in a different module:</p>
-<p>errors.module_2.function_3</p>
+<pre><code>errors.module_2.function_3</code></pre>
 <p>If each of the preceding examples were called once, the resulting values would be:</p>
-<p>errors = 3<br><br> errors.module_1 = 2<br><br> errors.module_1.function_1 = 1<br><br> errors.module_1.function_2 = 1<br><br> errors.module_2 = 1<br><br> errors.module_2.function_3 = 1</p>
+<pre><code>errors = 3
+errors.module_1 = 2
+errors.module_1.function_1 = 1
+errors.module_1.function_2 = 1
+errors.module_2 = 1
+errors.module_2.function_3 = 1</code></pre>
 <p>This tells you that there were 3 errors in the application, with 2 of those errors in module_1. You can then drill down further to see errors in specific functions.</p>
 <h3 id="using-counters-in-time-series-queries"><a href="#using-counters-in-time-series-queries">Using counters in time series queries</a></h3>
 <p>Knowing the value of a counter is useful. However, you often need to know how the value varies over time. Fortunately, the API provides a method for you to view this data over any time interval or level of granularity.</p>
@@ -477,8 +369,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/events-and-counters/">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/events-and-counters.md">this article on github</a>.</div>
         </div>
     </div>
 </div>
@@ -491,7 +383,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>
@@ -547,7 +439,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>

Added: incubator/usergrid/site/publish/docs/getting-up-and-running-locally/index.html
URL: http://svn.apache.org/viewvc/incubator/usergrid/site/publish/docs/getting-up-and-running-locally/index.html?rev=1550366&view=auto
==============================================================================
--- incubator/usergrid/site/publish/docs/getting-up-and-running-locally/index.html (added)
+++ incubator/usergrid/site/publish/docs/getting-up-and-running-locally/index.html Thu Dec 12 07:55:45 2013
@@ -0,0 +1,281 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+    <meta charset="utf-8">
+    <title>Apache Usergrid (incubating) — Getting Up & Running Locally</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>
+            <a href="/" class="navbar-brand">
+                <img id="home-logo" src="/img/apache_usergrid_logo_white_small.png" />
+            </a>
+        </div>
+        <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 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>
+                <li><a href="http://stackoverflow.com/search?q=usergrid" target="_blank"><span class="icns icon-stackexchange"></span></a></li>
+                <li><a href="http://webchat.freenode.net/?channels=%23usergrid&uio=d4" target="_blank"><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>
+            </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 & 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>
+                                <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/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>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>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>
+
+        <div class="col-md-9 main-article" role="main">
+            <div class="page-article">
+                <div class="page-header">
+                    <h1>Getting Up & Running Locally</h1>
+                  <small><a target="_blank" href="https://github.com/usergrid/website/blob/master/content/docs/getting-up-and-running-locally.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="#running">Running</a></li>
+<li><a href="#getting-started-with-the-http-api">Getting Started with the HTTP API</a></li>
+</ul>
+</div>
+<h2 id="requirements"><a href="#requirements">Requirements</a></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"><a href="#download">Download</a></h2>
+<p>Start by <a href="https://github.com/usergrid/usergrid/archive/master.zip">downloading our latest code</a> and extract it.</p>
+<h2 id="building"><a href="#building">Building</a></h2>
+<p>From the command line, navigate to stack directory and type the following:</p>
+<pre><code>mvn clean install -DskipTests=true</code></pre>
+<h2 id="running"><a href="#running">Running</a></h2>
+<p>Usergrid-core contains the persistence layer and shared utilities for powering the Usergrid service. The services layer is contained in usergrid-services and exposes a higher-level API that’s used by the usergrid-rest web services tier.</p>
+<p>You can run Usergrid from the command-line from the jar in the usergrid/standalone project:</p>
+<pre><code>cd launcher; java -jar target/usergrid-launcher-*.jar</code></pre>
+<p>After startup, your instance will be available on localhost, port 8080. To check it’s running properly, you can try loading our status page:</p>
+<pre><code>curl http://localhost:8080/status</code></pre>
+<p>You can also run it as a webapp in Tomcat, by deploying the ROOT.war file generated in the usergrid/rest project.</p>
+<h2 id="getting-started-with-the-http-api"><a href="#getting-started-with-the-http-api">Getting Started with the HTTP API</a></h2>
+<p>Start by creating an Organization. It’s the top-level structure in Usergrid: all Apps and Administrators must belong to an Organization. Here’s how you create one:</p>
+<pre><code>curl -X POST  \
+     -d 'organization=myfirstorg&amp;username=myadmin&amp;name=Admin&amp;email=admin@example.com&amp;password=password' \
+     http://localhost:8080/management/organizations</code></pre>
+<p>You can see that creating an Organization creates an Administrator in the process. Let’s authenticate as him:</p>
+<pre><code>curl 'http://localhost:8080/management/token?grant_type=password&amp;username=myadmin&amp;password=password'</code></pre>
+<p>This will return an access_token. We’ll use this to authenticate the next two calls. Next, let’s create an Application:</p>
+<pre><code>curl -H "Authorization: Bearer [the management token from above]" \
+     -H "Content-Type: application/json" \
+     -X POST -d '{ "name":"myapp" }' \
+     http://localhost:8080/management/orgs/myfirstorg/apps</code></pre>
+<p>… And a User for the Application:</p>
+<pre><code>curl -H "Authorization: Bearer [the management token from above]" \
+     -X POST "http://localhost:8080/myfirstorg/myapp/users" \
+     -d '{ "username":"myuser", "password":"mypassword", "email":"user@example.com" }'</code></pre>
+<p>Let’s now generate an access token for this Application User:</p>
+<pre><code>curl 'http://localhost:8080/myfirstorg/myapp/token?grant_type=password&amp;username=myuser&amp;password=mypassword'</code></pre>
+<p>This will also send back an access_token, but limited in scope. Let’s use it to create a collection with some data in it:</p>
+<pre><code>curl -H "Authorization: Bearer [the user token]" \
+     -X POST -d '[ { "cat":"fluffy" }, { "fish": { "gold":2, "oscar":1 } } ]' \
+     http://localhost:8080/myfirstorg/myapp/pets</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/getting-up-and-running-locally.md">this article on github</a>.</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>
+                    <!-- <li class="nav-header"><a href="#">Docs</a></li> -->
+                </ul>
+            </div>
+            <div class="col-md-2">
+                <ul class="nav nav-list">
+                    <li class="nav-header"><a href="https://github.com/usergrid/usergrid/" target="_blank">Code</a></li>
+                    <li><a href="https://github.com/usergrid/usergrid/blob/master/stack" target="_blank">Server Stack</a></li>
+                    <li><a href="https://github.com/usergrid/usergrid/blob/master/portal" target="_blank">Admin Portal</a></li>
+                    <li><a href="https://github.com/usergrid/usergrid/blob/master/ugc" target="_blank">ugc command line</a></li>
+                    <li><a href="https://github.com/usergrid/usergrid/blob/master/sdks/ios" target="_blank">iOS SDK</a></li>
+                    <li><a href="https://github.com/usergrid/usergrid/blob/master/sdks/android" target="_blank">Android SDK</a></li>
+                    <li><a href="https://github.com/usergrid/usergrid/blob/master/sdks/html5-javascript" target="_blank">HTML5/JS SDK</a></li>
+                    <li><a href="https://github.com/usergrid/usergrid/blob/master/sdks/nodejs" target="_blank">node.js module</a></li>
+                    <li><a href="https://github.com/usergrid/usergrid/blob/master/sdks/ruby-on-rails" target="_blank">Ruby on Rails gem</a></li>
+                    <li><a href="https://github.com/usergrid/usergrid/blob/master/sdks/ruby" target="_blank">Ruby gem</a></li>
+                    <li><a href="https://github.com/usergrid/usergrid/blob/master/sdks/php" target="_blank">PHP SDK</a></li>
+                    <li><a href="https://github.com/usergrid/usergrid/blob/master/sdks/java" target="_blank">Java SDK</a></li>
+                    <li><a href="https://github.com/usergrid/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/usergrid/usergrid" target="_blank">GitHub Code</a></li>
+                        <li><a href="https://issues.apache.org/jira/browse/USERGRID" target="_blank">JIRA Bug Tracker</a></li>
+                        <li><a href="http://stackoverflow.com/search?q=usergrid" target="_blank">StackOverflow</a></li>
+                        <li><a href="http://webchat.freenode.net/?channels=%23usergrid&uio=d4">IRC</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/usergrid/usergrid/blob/master/LICENSE" target="_blank">License</a></li>
+                        <li><a href="https://github.com/usergrid/usergrid/blob/master/stack#requirements" target="_blank">Getting Started</a></li>
+                        <li><a href="https://github.com/usergrid/usergrid/blob/master/stack#contributing" target="_blank">Contribution Guidelines</a></li>
+                </ul>
+            </div>
+            <div class="col-md-2"></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>
\ No newline at end of file

Modified: incubator/usergrid/site/publish/docs/group/index.html
URL: http://svn.apache.org/viewvc/incubator/usergrid/site/publish/docs/group/index.html?rev=1550366&r1=1550365&r2=1550366&view=diff
==============================================================================
--- incubator/usergrid/site/publish/docs/group/index.html (original)
+++ incubator/usergrid/site/publish/docs/group/index.html Thu Dec 12 07:55:45 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>
@@ -66,26 +66,27 @@
             <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="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>
                                         <ul>
-                                            <li><a href="#">Query Language</a></li>
-                                            <li><a href="#">Users & Devices</a></li>
-                                            <li><a href="#">Groups</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/group/">Groups</a></li>
                                             <li><a href="#">Activities</a></li>
-                                            <li><a href="#">Assets</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>Group</h1>
-                  <small><a href="https://github.com/timanglade/usergrid-site/blob/master/content/docs/group/">contribute to this article on github</a></small>
+                  <small><a target="_blank" href="https://github.com/usergrid/website/blob/master/content/docs/group.md">contribute to this article on github</a></small>
                 </div>
                 <div class="toc">
 	<ul>
@@ -1116,8 +1118,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/group/">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/group.md">this article on github</a>.</div>
         </div>
     </div>
 </div>
@@ -1130,7 +1132,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>
@@ -1186,7 +1188,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>

Added: incubator/usergrid/site/publish/docs/groups/index.html
URL: http://svn.apache.org/viewvc/incubator/usergrid/site/publish/docs/groups/index.html?rev=1550366&view=auto
==============================================================================
--- incubator/usergrid/site/publish/docs/groups/index.html (added)
+++ incubator/usergrid/site/publish/docs/groups/index.html Thu Dec 12 07:55:45 2013
@@ -0,0 +1,339 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+    <meta charset="utf-8">
+    <title>Apache Usergrid (incubating) — Groups</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>
+            <a href="/" class="navbar-brand">
+                <img id="home-logo" src="/img/apache_usergrid_logo_white_small.png" />
+            </a>
+        </div>
+        <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 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>
+                <li><a href="http://stackoverflow.com/search?q=usergrid" target="_blank"><span class="icns icon-stackexchange"></span></a></li>
+                <li><a href="http://webchat.freenode.net/?channels=%23usergrid&uio=d4" target="_blank"><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>
+            </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 & 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>
+                                <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/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>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>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>
+
+        <div class="col-md-9 main-article" role="main">
+            <div class="page-article">
+                <div class="page-header">
+                    <h1>Groups</h1>
+                  <small><a target="_blank" href="https://github.com/usergrid/website/blob/master/content/docs/groups.md">contribute to this article on github</a></small>
+                </div>
+                <div class="toc">
+	<ul>
+<li><a href="#general-properties">General properties</a></li>
+<li><a href="#set-properties">Set properties</a></li>
+<li><a href="#collections">Collections</a></li>
+</ul>
+</div>
+<p>You can organize app users into groups. Groups have their own Activity Feed, their own permissions and be a useful alternative to Roles, depending on how you model your data. Groups were originaly designed to emulate Facebook Groups, so they will tend to function about the same way Facebook Groups would.</p>
+<p>Groups are hierarchical. Every member of the group /groups/california/san-francisco is also a member of the group /groups/california.</p>
+<p>Groups are also a great way to model things such a topic subscriptions. For example, you could allow people to subscribe (i.e. become a member of the group and be alerted via Activities) to /groups/memes/dogs/doge or subscribe to all /groups/memes/dogs</p>
+<h3 id="general-properties"><a href="#general-properties">General properties</a></h3>
+<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">Group’s unique entity ID</td>
+</tr>
+<tr class="even">
+<td align="left">type</td>
+<td align="left">string</td>
+<td align="left">Type of entity, in this case “user”</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">path</td>
+<td align="left">string</td>
+<td align="left">Valid slash-delimited group path (mandatory)</td>
+</tr>
+<tr class="even">
+<td align="left">title</td>
+<td align="left">string</td>
+<td align="left">Display name</td>
+</tr>
+</tbody>
+</table><h3 id="set-properties"><a href="#set-properties">Set properties</a></h3>
+<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">connections</td>
+<td align="left">string</td>
+<td align="left">Set of connection types (e.g., likes)</td>
+</tr>
+<tr class="even">
+<td align="left">rolenames</td>
+<td align="left">string</td>
+<td align="left">Set of roles assigned to a group</td>
+</tr>
+<tr class="odd">
+<td align="left">credentials</td>
+<td align="left">string</td>
+<td align="left">Set of group credentials</td>
+</tr>
+</tbody>
+</table><h3 id="collections"><a href="#collections">Collections</a></h3>
+<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 in the group</td>
+</tr>
+<tr class="even">
+<td align="left">activities</td>
+<td align="left">activity</td>
+<td align="left">Collection of activities a user has performed</td>
+</tr>
+<tr class="odd">
+<td align="left">feed</td>
+<td align="left">activity</td>
+<td align="left">Inbox of activity notifications a group has received</td>
+</tr>
+<tr class="even">
+<td align="left">roles</td>
+<td align="left">role</td>
+<td align="left">Set of roles to which a group 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/groups.md">this article on github</a>.</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>
+                    <!-- <li class="nav-header"><a href="#">Docs</a></li> -->
+                </ul>
+            </div>
+            <div class="col-md-2">
+                <ul class="nav nav-list">
+                    <li class="nav-header"><a href="https://github.com/usergrid/usergrid/" target="_blank">Code</a></li>
+                    <li><a href="https://github.com/usergrid/usergrid/blob/master/stack" target="_blank">Server Stack</a></li>
+                    <li><a href="https://github.com/usergrid/usergrid/blob/master/portal" target="_blank">Admin Portal</a></li>
+                    <li><a href="https://github.com/usergrid/usergrid/blob/master/ugc" target="_blank">ugc command line</a></li>
+                    <li><a href="https://github.com/usergrid/usergrid/blob/master/sdks/ios" target="_blank">iOS SDK</a></li>
+                    <li><a href="https://github.com/usergrid/usergrid/blob/master/sdks/android" target="_blank">Android SDK</a></li>
+                    <li><a href="https://github.com/usergrid/usergrid/blob/master/sdks/html5-javascript" target="_blank">HTML5/JS SDK</a></li>
+                    <li><a href="https://github.com/usergrid/usergrid/blob/master/sdks/nodejs" target="_blank">node.js module</a></li>
+                    <li><a href="https://github.com/usergrid/usergrid/blob/master/sdks/ruby-on-rails" target="_blank">Ruby on Rails gem</a></li>
+                    <li><a href="https://github.com/usergrid/usergrid/blob/master/sdks/ruby" target="_blank">Ruby gem</a></li>
+                    <li><a href="https://github.com/usergrid/usergrid/blob/master/sdks/php" target="_blank">PHP SDK</a></li>
+                    <li><a href="https://github.com/usergrid/usergrid/blob/master/sdks/java" target="_blank">Java SDK</a></li>
+                    <li><a href="https://github.com/usergrid/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/usergrid/usergrid" target="_blank">GitHub Code</a></li>
+                        <li><a href="https://issues.apache.org/jira/browse/USERGRID" target="_blank">JIRA Bug Tracker</a></li>
+                        <li><a href="http://stackoverflow.com/search?q=usergrid" target="_blank">StackOverflow</a></li>
+                        <li><a href="http://webchat.freenode.net/?channels=%23usergrid&uio=d4">IRC</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/usergrid/usergrid/blob/master/LICENSE" target="_blank">License</a></li>
+                        <li><a href="https://github.com/usergrid/usergrid/blob/master/stack#requirements" target="_blank">Getting Started</a></li>
+                        <li><a href="https://github.com/usergrid/usergrid/blob/master/stack#contributing" target="_blank">Contribution Guidelines</a></li>
+                </ul>
+            </div>
+            <div class="col-md-2"></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>
\ No newline at end of file

Modified: incubator/usergrid/site/publish/docs/overview/index.html
URL: http://svn.apache.org/viewvc/incubator/usergrid/site/publish/docs/overview/index.html?rev=1550366&r1=1550365&r2=1550366&view=diff
==============================================================================
--- incubator/usergrid/site/publish/docs/overview/index.html (original)
+++ incubator/usergrid/site/publish/docs/overview/index.html Thu Dec 12 07:55:45 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>App Security Overview</h1>
-                  <small><a href="https://github.com/timanglade/usergrid-site/blob/master/content/docs/overview/">contribute to this article on github</a></small>
+                  <small><a target="_blank" href="https://github.com/usergrid/website/blob/master/content/docs/overview.md">contribute to this article on github</a></small>
                 </div>
                 <div class="toc">
 	<ul>
@@ -150,8 +152,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/overview/">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/overview.md">this article on github</a>.</div>
         </div>
     </div>
 </div>
@@ -164,7 +166,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>
@@ -220,7 +222,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>



Mime
View raw message