http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/ec2b3e4f/website/publish/docs/creating-new-application-admin-console/index.html
----------------------------------------------------------------------
diff --git 
a/website/publish/docs/creating-new-application-admin-console/index.html 
b/website/publish/docs/creating-new-application-admin-console/index.html
deleted file mode 100644
index e7b9bee..0000000
--- a/website/publish/docs/creating-new-application-admin-console/index.html
+++ /dev/null
@@ -1,294 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-
-<head>
-    <meta charset="utf-8">
-    <title>Apache Usergrid (incubating) — Creating a New Application with 
the Admin Console</title>
-    <meta http-equiv="x-ua-compatible" content="ie=edge" />
-    <meta name="viewport" content="width=device-width, initial-scale=1, 
minimum-scale=1, maximum-scale=1" />
-    <meta name="keywords" content="Apache Usergrid, Usergrid, BaaS, 
Backend-as-a-Service">
-    <meta name="description" content="An open-source Backend-as-a-Service 
stack for web & mobile applications, based on RESTful APIs." />
-    <meta property="og:title" content="Apache Usergrid" />
-    <meta property="og:description" content="An open-source 
Backend-as-a-Service stack for web & mobile applications, based on RESTful 
APIs." />
-    <!-- Loading Typekit -->
-    <script type="text/javascript" src="//use.typekit.net/ddl7izx.js"></script>
-    <script type="text/javascript">try{Typekit.load();}catch(e){}</script>
-    <!-- Loading Bootstrap -->
-    <link href="/bootstrap/bootstrap.min.css" rel="stylesheet" type='text/css'>
-    <link href="/css/bootflat.css" rel="stylesheet" type='text/css'>
-    <link href="/css/usergrid-site.css" rel="stylesheet" type='text/css'>
-    <link 
href="https://fonts.googleapis.com/css?family=Open+Sans:200,400,500,300,600,800,700,400italic,600italic,700italic,800italic,300italic";
 rel="stylesheet" type="text/css">
-    <link href="/css/font-awesome.min.css" rel="stylesheet" type='text/css'>
-
-    
-
-    <!-- HTML5 shim, for IE6-8 support of HTML5 elements. All other JS at the 
end of file. -->
-    <!--[if lt IE 9]>
-      <script src="js/html5shiv.js"></script>
-      <script src="js/respond.min.js"></script>
-    <![endif]-->
-</head>
-<body>
-
-    <header class="navbar navbar-inverse navbar-fixed-top bf-docs-nav 
secondary" role="banner">
-    <div class="container">
-        <div class="navbar-header">
-            <button class="navbar-toggle" type="button" data-toggle="collapse" 
data-target=".bf-navbar-collapse">
-                <span class="sr-only">Toggle navigation</span>
-                <span class="icon-bar"></span>
-                <span class="icon-bar"></span>
-                <span class="icon-bar"></span>
-            </button>
-        </div>
-        <a href="/" class="navbar-brand">
-                <img id="home-logo" 
src="/img/apache_usergrid_logo_white_small.png" />
-            </a>
-        <nav class="collapse navbar-collapse bf-navbar-collapse" 
role="navigation">
-            <ul class="nav navbar-nav navbar-right">
-                <li class=""><a href="/community/"><span class="icns 
icon-group"></span></a></li>
-                <li><a href="http://usergrid.readthedocs.org/"; 
target="_blank"><span class="icns icon-book"></span></a></li>
-                <li><a href="http://github.com/apache/incubator-usergrid"; 
target="_blank"><span class="icns icon-github-sign"></span></a></li>
-                <!--<li><a href="https://trello.com/b/exQmJIOn/usergrid"; 
target="_blank"><span class="icns icon-trello"></span></a></li>-->
-                <li><a 
href="https://issues.apache.org/jira/secure/RapidBoard.jspa?rapidView=23&view=planning&selectedIssue=USERGRID-362&epics=visible";
 target="_blank"><span class="icns icon-bug"></span></a></li>
-                <li><a href="http://stackoverflow.com/search?q=usergrid"; 
target="_blank"><span class="icns icon-stackexchange"></span></a></li>
-                <li><a href="/community/#live"><span class="icns 
icon-comments"></span></a></li>
-                <!--<li><a 
href="https://groups.google.com/forum/#!forum/usergrid"; target="_blank"><span 
class="icns icon-envelope"></span></a></li>-->
-                <li><a href="https://twitter.com/usergrid"; 
target="_blank"><span class="icns icon-twitter"></span></a></li>
-                <li><a 
href="https://cwiki.apache.org/confluence/display/usergrid/"; 
target="_blank"><span class="icns icon-wiki"></span></a></li>
-                <li><a href="/releases/"><span class="icns 
icon-releases"></span></a></li>
-            </ul>
-        </nav>
-    </div>
-    </header>
-
-
-
-<div class="container bf-docs-container">    
-    <div class="row">
-        <div class="col-md-3">
-            <div class="bf-sidebar hidden-print" role="complementary">
-                <ul class="nav nav-list">
-                    <li><a 
href="/docs/getting-up-and-running-locally/">Getting Up &amp; Running 
Locally</a></li>
-                    <li><a href="/docs/deploy-local/">Deploying to local 
Tomcat &amp; Cassandra</a></li>
-                    <li><a 
href="https://github.com/apache/incubator-usergrid/tree/master/ugc#usergrid-command-line-ugc";><code>ugc</code>
 — the Command-line Client</a></li>
-
-                    <li class="nav-header"><span>Concepts</span></li>
-                    <li>
-                        <a href="/docs/organizations-admins/">Organizations & 
Admins</a>
-                        <ul>
-                            <li>
-                                <a href="/docs/applications/">Applications</a>
-                                <ul>
-                                    <li><a 
href="/docs/roles-and-permissions/">Roles & Permissions</a></li>
-                                    <!--<li><a href="#">Queues</a></li>-->
-                                    <li><a 
href="/docs/events-and-counters/">Events & Counters</a></li>
-                                    <li><a 
href="/docs/relationships/">Relationships (Joins)</a></li>
-                                    <li>
-                                        <a 
href="/docs/collections">Collections</a>
-                                        <ul>
-                                            <li><a 
href="/docs/query-language/">Query Language</a></li>
-                                            <li><a 
href="/docs/users-devices/">Users & Devices</a></li>
-                                            <li><a 
href="/docs/groups/">Groups</a></li>
-                                            <li><a 
href="/docs/activities/">Activities</a></li>
-                                            <li><a 
href="/docs/assets/">Assets</a></li>
-                                        </ul>
-                                    </li>
-                                </ul>
-                            </li>
-                        </ul>
-                    </li>
-
-
-                    <li class="nav-header"><span>Usage</span></li>
-                    <!-- <li>REST API — Coming Soon</li> -->
-                    <li><a class="icns-apple" 
href="https://github.com/apache/incubator-usergrid/tree/master/sdks/ios";>iOS 
SDK</a></li>
-                    <li><a class="icns-android" 
href="https://github.com/apache/incubator-usergrid/tree/master/sdks/android";>Android
 SDK</a></li>
-                    <li><a class="icns-html5" href="">HTML5 / JavaScript 
SDK</a></li>
-                    <li><a class="icns-windows" 
href="https://github.com/apache/incubator-usergrid/tree/master/sdks/dotnet";>Windows
 8 / Windows Phone / .net SDK</a></li>
-                    <li><a 
href="https://github.com/apache/incubator-usergrid/tree/master/sdks/nodejs";>Node.js
 module</a></li>
-                    <li><a 
href="https://github.com/apache/incubator-usergrid/tree/master/sdks/ruby";>Ruby 
gem</a></li>
-                    <li><a 
href="https://github.com/apache/incubator-usergrid/tree/master/sdks/ruby-on-rails";>Ruby
 on Rails gem</a></li>
-                    <li><a 
href="https://github.com/apache/incubator-usergrid/tree/master/sdks/php";>PHP 
library</a></li>
-                    <li><a 
href="https://github.com/apache/incubator-usergrid/tree/master/sdks/java";>Java 
library</a></li>
-
-                    <!--<li class="nav-header"><span>Internals</span></li>
-                    <li>Design & Goals — Coming Soon</li>
-                    <li>Java Architecture — Coming Soon</li>
-                    <li>Cassandra Schema — Coming Soon</li>-->
-
-                    <li class="nav-header"><span>Operations</span></li>
-                    <!--<li>Deploying — Coming Soon</li>-->
-                    <!-- <li>Monitoring — Coming Soon</li> -->
-                    <li><a href="/docs/upgrading/">Upgrading</a></li>
-                    <!-- <li>Security — Coming Soon</li> -->
-
-                    <li class="nav-header"><span>Presentations & 
Videos</span></li>
-                    <li><a href="/docs/presentations/">Presentations</a></li>
-                    <li><a href="/docs/videos/">Videos</a></li>
-
-                    <li class="nav-header"><span>We need your help!</span></li>
-                    <li><a href="/docs/contribute-code/">How to Contribute 
Code & Docs</a></li>
-                    <!--
-                    <li><a href="/docs/contribute-docs">How to contribute 
docs</a></li>
-                    -->
-                </ul>
-            </div>
-        </div>
-
-        <div class="col-md-9 main-article" role="main">
-            <div class="page-article">
-                <div class="page-header">
-                    <h1>Creating a New Application with the Admin Console</h1>
-                    <!-- TODO: reenable this when we sync SVN to GitHub
-                  <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>
-<li>
-<a href="#creating-a-new-application-with-the-admin-console">Creating a New 
Application with the Admin Console</a><ul>
-<li><a href="#next-steps">Next Steps</a></li>
-</ul>
-</li>
-</ul>
-</div>
-<h1 id="creating-a-new-application-with-the-admin-console">Creating a New 
Application with the Admin Console</h1>
-<p>You can use the admin portal to create Apache Usergrid applications. An App 
Services application represents the data associated with your app. Through an 
application, you handle the entities associated with your app, including users, 
devices, events, and so on.</p>
-<blockquote>
-<p>For more about how data in Apache Usergrid fits together, see <a 
href="/app-services-data-model-1">App Services Data model</a>.</p>
-</blockquote>
-<p>Conceptually speaking, an application is like a database. You can create 
multiple applications within your Apache Usergrid organization. </p>
-<p> </p>
-<p>You’ll typically have one Apache Usergrid application for each of your 
apps. But you might want to create different applications representing sandbox, 
development, and production instances of your app.</p>
-<p>To create a new application with the admin console:</p>
-<ol style="list-style-type: decimal">
-<li>In the admin console, from the dropdown menu at the far top left, select 
the organization to which you will add the new application.</li>
-<li>Click the <strong>ADD NEW APP</strong> button, located at the top of the 
screen, next to the application drop-down.</li>
-<li>In the dialog box, enter a new application name, then click the 
<strong>Create</strong> button.</li>
-<li>Your new application will automatically be selected in the applications 
drop-down menu.</li>
-</ol>
-<h3 id="next-steps">Next Steps</h3>
-<p>After you’ve created a new application, finish up by thinking about the 
following:</p>
-<ul>
-<li>
-<p>Have you taken steps to make your application secure?</p>
-<p>If this is going to be a production application used by an app publicly, be 
sure to configure security roles that provide only the level of access your 
users will need. (You should never use a sandbox application as a public 
database. A sandbox is for experimenting with example data.)</p>
-<p>For more on security, see <a href="/securing-your-app">Securing your 
app</a>. For more about sandbox applications, see <a 
href="/using-sandbox-application">Using a Sandbox Application</a>.</p>
-</li>
-</ul>
-            </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/creating-new-application-admin-console.md";>this
 article on github</a>.</div> 
-                -->
-            </div>
-        </div>
-    </div>
-</div>
-
-
-<footer class="bf-footer" role="contentinfo">
-    <div class="container">
-        <div class="row">
-            <div class="col-md-2">
-                <ul class="nav nav-list">
-                    <li class="nav-header"><a href="/">Home</a></li>
-                    <li class="nav-header"><a 
href="/community/">Community</a></li>
-                        <li><a href="/community/#events">Events</a></li>
-                        <li><a href="/community/#mailing-lists">Mailing 
Lists</a></li>
-                        <li><a 
href="/community/#deployments">Deployments</a></li>
-                        <li><a href="/community/#committers">Commiters</a></li>
-                </ul>
-            </div>
-            <div class="col-md-2">
-                <ul class="nav nav-list">
-                    <li class="nav-header"><a 
href="https://github.com/apache/incubator-usergrid/"; 
target="_blank">Code</a></li>
-                    <li><a 
href="https://github.com/apache/incubator-usergrid/blob/master/stack"; 
target="_blank">Server Stack</a></li>
-                    <li><a 
href="https://github.com/apache/incubator-usergrid/blob/master/portal"; 
target="_blank">Admin Portal</a></li>
-                    <li><a 
href="https://github.com/apache/incubator-usergrid/blob/master/ugc"; 
target="_blank">ugc command line</a></li>
-                    <li><a 
href="https://github.com/apache/incubator-usergrid/blob/master/sdks/ios"; 
target="_blank">iOS SDK</a></li>
-                    <li><a 
href="https://github.com/apache/incubator-usergrid/blob/master/sdks/android"; 
target="_blank">Android SDK</a></li>
-                    <li><a 
href="https://github.com/apache/incubator-usergrid/blob/master/sdks/html5-javascript";
 target="_blank">HTML5/JS SDK</a></li>
-                    <li><a 
href="https://github.com/apache/incubator-usergrid/blob/master/sdks/nodejs"; 
target="_blank">node.js module</a></li>
-                    <li><a 
href="https://github.com/apache/incubator-usergrid/blob/master/sdks/ruby-on-rails";
 target="_blank">Ruby on Rails gem</a></li>
-                    <li><a 
href="https://github.com/apache/incubator-usergrid/blob/master/sdks/ruby"; 
target="_blank">Ruby gem</a></li>
-                    <li><a 
href="https://github.com/apache/incubator-usergrid/blob/master/sdks/php"; 
target="_blank">PHP SDK</a></li>
-                    <li><a 
href="https://github.com/apache/incubator-usergrid/blob/master/sdks/java"; 
target="_blank">Java SDK</a></li>
-                    <li><a 
href="https://github.com/apache/incubator-usergrid/blob/master/sdks/dotnet"; 
target="_blank">.NET / Windows SDK</a></li>
-                </ul>
-            </div>
-            <div class="col-md-2">
-                <ul class="nav nav-list">
-                    <li class="nav-header">Resources</li>
-                    <li><a href="http://github.com/apache/incubator-usergrid"; 
target="_blank">GitHub Code</a></li>
-                    <li><a href="http://usergrid.readthedocs.org/"; 
target="_blank">Docs</a></li>
-                    <li><a 
href="https://issues.apache.org/jira/secure/RapidBoard.jspa?rapidView=23&view=planning&selectedIssue=USERGRID-362&epics=visible";
 target="_blank">JIRA Bug Tracker</a></li>
-                    <li><a href="http://stackoverflow.com/search?q=usergrid"; 
target="_blank">StackOverflow</a></li>
-                    <li><a href="/community/#live">Live Chat</a></li>
-                    <li><a href="https://twitter.com/usergrid"; 
target="_blank">Twitter</a></li>
-                    <li><a 
href="http://incubator.apache.org/projects/usergrid.html"; 
target="_blank">Podling Listing</a></li>
-                    <li><a 
href="https://github.com/apache/incubator-usergrid/blob/master/stack#requirements";
 target="_blank">Getting Started</a></li>
-                    <li><a 
href="https://cwiki.apache.org/confluence/display/usergrid/GitHub+Based+Contribution+Workflow";
 target="_blank">Contribution Guidelines</a></li>
-                </ul>
-            </div>
-            <div class="col-md-2">
-                <ul class="nav nav-list">
-                    <li class="nav-header">Apache</li>
-                    <li><a href="http://www.apache.org/licenses/"; 
target="_blank">License</a></li>
-                    <li><a 
href="http://www.apache.org/foundation/sponsorship.html"; 
target="_blank">Sponsorship</a></li>
-                    <li><a href="http://www.apache.org/foundation/thanks.html"; 
target="_blank">Thanks</a></li>
-                    <li><a 
href="http://www.apache.org/security/";>Security</a></li>
-                    <li><a href="http://www.apache.org/"; 
target="_blank">Apache Foundation</a></li>
-                </ul>
-            </div>
-            <div class="col-md-4">
-                <a class="twitter-timeline" 
href="https://twitter.com/search?q=%23usergrid"; 
data-widget-id="401499136807038976"  data-related="usergrid" height="400px" 
style="overflow:hidden">Tweets about "usergrid"</a>
-                <script>!function(d,s,id){var 
js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+"://platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script>
-            </div> 
-        <!--
-            <div class="col-md-4">
-                <div class="input-group form-search">
-                    <input type="text" class="form-control search-query">
-                    <span class="input-group-btn">
-                        <button type="submit" class="btn btn-primary" 
data-type="last">Search</button>
-                    </span>
-                </div>
-            </div> -->
-        </div> 
-        <div class="row">
-            <div id="copyright">
-                <img src="/img/egg-logo.png" /><br/><br/>
-                <p>Apache Usergrid is an effort undergoing incubation at The 
Apache Software Foundation (ASF), sponsored by the Apache Incubator PMC. 
Incubation is required of all newly accepted projects until a further review 
indicates that the infrastructure, communications, and decision making process 
have stabilized in a manner consistent with other successful ASF projects. 
While incubation status is not necessarily a reflection of the completeness or 
stability of the code, it does indicate that the project has yet to be fully 
endorsed by the ASF.</p>
-                <p>Copyright © 2013 The Apache Software Foundation, Licensed 
under the Apache License, Version 2.0.<br>
-                Apache and the Apache feather logos are trademarks of The 
Apache Software Foundation.</p>
-                <p class="credits">Site designed & assembled with love by <a 
href="https://github.com/ryuneeee";>@ryuneeee</a> + <a 
href="https://github.com/realbeast";>@realbeast</a> + <a 
href="https://twitter.com/timanglade";>@timanglade</a>.</p>
-            </div>
-        </div>
-    </div>
-</footer>
-
-<script type="text/javascript" src="/js/head.js"></script>
-<script type="text/javascript">
-    head.js("/js/jquery-1.10.1.min.js", "/js/bootstrap.min.js", 
"/js/usergrid-site.js");
-</script>
-<script>
-  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new 
Date();a=s.createElement(o),
-  
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-
-  ga('create', 'UA-45815079-1', 'apache.org');
-  ga('send', 'pageview');
-
-</script>
-
-
-
-</body>
-</html>

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/ec2b3e4f/website/publish/docs/data-model/index.html
----------------------------------------------------------------------
diff --git a/website/publish/docs/data-model/index.html 
b/website/publish/docs/data-model/index.html
deleted file mode 100644
index 5ce65bb..0000000
--- a/website/publish/docs/data-model/index.html
+++ /dev/null
@@ -1,362 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-
-<head>
-    <meta charset="utf-8">
-    <title>Apache Usergrid (incubating) — Apache Usergrid Data model</title>
-    <meta http-equiv="x-ua-compatible" content="ie=edge" />
-    <meta name="viewport" content="width=device-width, initial-scale=1, 
minimum-scale=1, maximum-scale=1" />
-    <meta name="keywords" content="Apache Usergrid, Usergrid, BaaS, 
Backend-as-a-Service">
-    <meta name="description" content="An open-source Backend-as-a-Service 
stack for web & mobile applications, based on RESTful APIs." />
-    <meta property="og:title" content="Apache Usergrid" />
-    <meta property="og:description" content="An open-source 
Backend-as-a-Service stack for web & mobile applications, based on RESTful 
APIs." />
-    <!-- Loading Typekit -->
-    <script type="text/javascript" src="//use.typekit.net/ddl7izx.js"></script>
-    <script type="text/javascript">try{Typekit.load();}catch(e){}</script>
-    <!-- Loading Bootstrap -->
-    <link href="/bootstrap/bootstrap.min.css" rel="stylesheet" type='text/css'>
-    <link href="/css/bootflat.css" rel="stylesheet" type='text/css'>
-    <link href="/css/usergrid-site.css" rel="stylesheet" type='text/css'>
-    <link 
href="https://fonts.googleapis.com/css?family=Open+Sans:200,400,500,300,600,800,700,400italic,600italic,700italic,800italic,300italic";
 rel="stylesheet" type="text/css">
-    <link href="/css/font-awesome.min.css" rel="stylesheet" type='text/css'>
-
-    
-
-    <!-- HTML5 shim, for IE6-8 support of HTML5 elements. All other JS at the 
end of file. -->
-    <!--[if lt IE 9]>
-      <script src="js/html5shiv.js"></script>
-      <script src="js/respond.min.js"></script>
-    <![endif]-->
-</head>
-<body>
-
-    <header class="navbar navbar-inverse navbar-fixed-top bf-docs-nav 
secondary" role="banner">
-    <div class="container">
-        <div class="navbar-header">
-            <button class="navbar-toggle" type="button" data-toggle="collapse" 
data-target=".bf-navbar-collapse">
-                <span class="sr-only">Toggle navigation</span>
-                <span class="icon-bar"></span>
-                <span class="icon-bar"></span>
-                <span class="icon-bar"></span>
-            </button>
-        </div>
-        <a href="/" class="navbar-brand">
-                <img id="home-logo" 
src="/img/apache_usergrid_logo_white_small.png" />
-            </a>
-        <nav class="collapse navbar-collapse bf-navbar-collapse" 
role="navigation">
-            <ul class="nav navbar-nav navbar-right">
-                <li class=""><a href="/community/"><span class="icns 
icon-group"></span></a></li>
-                <li><a href="http://usergrid.readthedocs.org/"; 
target="_blank"><span class="icns icon-book"></span></a></li>
-                <li><a href="http://github.com/apache/incubator-usergrid"; 
target="_blank"><span class="icns icon-github-sign"></span></a></li>
-                <!--<li><a href="https://trello.com/b/exQmJIOn/usergrid"; 
target="_blank"><span class="icns icon-trello"></span></a></li>-->
-                <li><a 
href="https://issues.apache.org/jira/secure/RapidBoard.jspa?rapidView=23&view=planning&selectedIssue=USERGRID-362&epics=visible";
 target="_blank"><span class="icns icon-bug"></span></a></li>
-                <li><a href="http://stackoverflow.com/search?q=usergrid"; 
target="_blank"><span class="icns icon-stackexchange"></span></a></li>
-                <li><a href="/community/#live"><span class="icns 
icon-comments"></span></a></li>
-                <!--<li><a 
href="https://groups.google.com/forum/#!forum/usergrid"; target="_blank"><span 
class="icns icon-envelope"></span></a></li>-->
-                <li><a href="https://twitter.com/usergrid"; 
target="_blank"><span class="icns icon-twitter"></span></a></li>
-                <li><a 
href="https://cwiki.apache.org/confluence/display/usergrid/"; 
target="_blank"><span class="icns icon-wiki"></span></a></li>
-                <li><a href="/releases/"><span class="icns 
icon-releases"></span></a></li>
-            </ul>
-        </nav>
-    </div>
-    </header>
-
-
-
-<div class="container bf-docs-container">    
-    <div class="row">
-        <div class="col-md-3">
-            <div class="bf-sidebar hidden-print" role="complementary">
-                <ul class="nav nav-list">
-                    <li><a 
href="/docs/getting-up-and-running-locally/">Getting Up &amp; Running 
Locally</a></li>
-                    <li><a href="/docs/deploy-local/">Deploying to local 
Tomcat &amp; Cassandra</a></li>
-                    <li><a 
href="https://github.com/apache/incubator-usergrid/tree/master/ugc#usergrid-command-line-ugc";><code>ugc</code>
 — the Command-line Client</a></li>
-
-                    <li class="nav-header"><span>Concepts</span></li>
-                    <li>
-                        <a href="/docs/organizations-admins/">Organizations & 
Admins</a>
-                        <ul>
-                            <li>
-                                <a href="/docs/applications/">Applications</a>
-                                <ul>
-                                    <li><a 
href="/docs/roles-and-permissions/">Roles & Permissions</a></li>
-                                    <!--<li><a href="#">Queues</a></li>-->
-                                    <li><a 
href="/docs/events-and-counters/">Events & Counters</a></li>
-                                    <li><a 
href="/docs/relationships/">Relationships (Joins)</a></li>
-                                    <li>
-                                        <a 
href="/docs/collections">Collections</a>
-                                        <ul>
-                                            <li><a 
href="/docs/query-language/">Query Language</a></li>
-                                            <li><a 
href="/docs/users-devices/">Users & Devices</a></li>
-                                            <li><a 
href="/docs/groups/">Groups</a></li>
-                                            <li><a 
href="/docs/activities/">Activities</a></li>
-                                            <li><a 
href="/docs/assets/">Assets</a></li>
-                                        </ul>
-                                    </li>
-                                </ul>
-                            </li>
-                        </ul>
-                    </li>
-
-
-                    <li class="nav-header"><span>Usage</span></li>
-                    <!-- <li>REST API — Coming Soon</li> -->
-                    <li><a class="icns-apple" 
href="https://github.com/apache/incubator-usergrid/tree/master/sdks/ios";>iOS 
SDK</a></li>
-                    <li><a class="icns-android" 
href="https://github.com/apache/incubator-usergrid/tree/master/sdks/android";>Android
 SDK</a></li>
-                    <li><a class="icns-html5" href="">HTML5 / JavaScript 
SDK</a></li>
-                    <li><a class="icns-windows" 
href="https://github.com/apache/incubator-usergrid/tree/master/sdks/dotnet";>Windows
 8 / Windows Phone / .net SDK</a></li>
-                    <li><a 
href="https://github.com/apache/incubator-usergrid/tree/master/sdks/nodejs";>Node.js
 module</a></li>
-                    <li><a 
href="https://github.com/apache/incubator-usergrid/tree/master/sdks/ruby";>Ruby 
gem</a></li>
-                    <li><a 
href="https://github.com/apache/incubator-usergrid/tree/master/sdks/ruby-on-rails";>Ruby
 on Rails gem</a></li>
-                    <li><a 
href="https://github.com/apache/incubator-usergrid/tree/master/sdks/php";>PHP 
library</a></li>
-                    <li><a 
href="https://github.com/apache/incubator-usergrid/tree/master/sdks/java";>Java 
library</a></li>
-
-                    <!--<li class="nav-header"><span>Internals</span></li>
-                    <li>Design & Goals — Coming Soon</li>
-                    <li>Java Architecture — Coming Soon</li>
-                    <li>Cassandra Schema — Coming Soon</li>-->
-
-                    <li class="nav-header"><span>Operations</span></li>
-                    <!--<li>Deploying — Coming Soon</li>-->
-                    <!-- <li>Monitoring — Coming Soon</li> -->
-                    <li><a href="/docs/upgrading/">Upgrading</a></li>
-                    <!-- <li>Security — Coming Soon</li> -->
-
-                    <li class="nav-header"><span>Presentations & 
Videos</span></li>
-                    <li><a href="/docs/presentations/">Presentations</a></li>
-                    <li><a href="/docs/videos/">Videos</a></li>
-
-                    <li class="nav-header"><span>We need your help!</span></li>
-                    <li><a href="/docs/contribute-code/">How to Contribute 
Code & Docs</a></li>
-                    <!--
-                    <li><a href="/docs/contribute-docs">How to contribute 
docs</a></li>
-                    -->
-                </ul>
-            </div>
-        </div>
-
-        <div class="col-md-9 main-article" role="main">
-            <div class="page-article">
-                <div class="page-header">
-                    <h1>Apache Usergrid Data model</h1>
-                    <!-- TODO: reenable this when we sync SVN to GitHub
-                  <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>
-<li>
-<a href="#apache-usergrid-data-model">Apache Usergrid Data model</a><ul>
-<li><a href="#organizations">Organizations</a></li>
-<li><a href="#applications">Applications</a></li>
-<li><a href="#collections">Collections</a></li>
-<li>
-<a href="#entities">Entities</a><ul>
-<li><a href="#default-entities">Default entities</a></li>
-</ul>
-</li>
-<li>
-<a href="#properties">Properties</a><ul>
-<li><a href="#default-properties">Default properties</a></li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<h1 id="apache-usergrid-data-model">Apache Usergrid Data model</h1>
-<p>Apache Usergrid models the data for your apps as application-specific 
collections of data entities managed within an organization. The following is 
an overview of the component hierarchy that makes up the Apache Usergrid data 
model, and is intended to help you understand how data is stored, managed and 
accessed in Apache Usergrid.</p>
-<h2 id="organizations">Organizations</h2>
-<p>An <em>organization</em> contains one or more applications, and represents 
administrator-level access to Apache Usergrid. Multiple Apache Usergrid 
accounts may be given administrator access to an organization. App Services 
accounts can also be members of multiple organizations.</p>
-<p>An organization with the same name as your username is automatically 
created for you when you sign up for Apache Usergrid. By default, you are 
assigned as the administrator of this organization.</p>
-<h2 id="applications">Applications</h2>
-<p>In Apache Usergrid, you can create one or more <em>applications</em> within 
an organization. Applications represent an instance of application data 
associated with an app, and you may create as many applications as you wish. 
This allows you to utilize the Apache Usergrid backend in a way that 
corresponds to your development process. For example, you might create separate 
applications for development and production instances of your app. By default, 
all organization have a sandbox application (see <a 
href="/using-sandbox-application">Using a Sandbox Application</a> for important 
information regarding the default sandbox application).</p>
-<p>Each application provides the infrastructure for storing, retrieving, 
updating and deleting the entities and collections associated with a specific 
app instance.</p>
-<h2 id="collections">Collections</h2>
-<p>Apache Usergrid stores all data entities in uniquely-named 
<em>collections</em>. Collections are created automatically by Apache Usergrid 
for every entity type, including custom entities, and are named using the 
plural form of the entity type they store. For example, all user entities are 
stored in the /users collection, and all device entities in the /devices 
collection. An entity can belong to only one collection.</p>
-<p>Currently, collections cannot be renamed or deleted; however, all of the 
data entities in a collection can be updated or deleted.</p>
-<h2 id="entities">Entities</h2>
-<p>An <em>entity</em> represents a basic, JSON-formatted data object that is 
used by your app, such as a user, device, event or asset. Unlike records in 
conventional database tables, which have a very rigid schema that defines what 
they can store and how they can be related to each other, Apache Usergrid 
entities are very flexible. This makes Apache Usergrid a powerful solution for 
managing data for modern applications, where people, places, and content often 
need to be associated in a way that is most appropriate from a user 
perspective.</p>
-<p>Here is a simple example of an entity:</p>
-<pre><code>{
-  "uuid" : "5c0c1789-d503-11e1-b36a-12313b01d5c1",
-  "type" : "user",
-  "created" : 1343074620374,
-  "modified" : 1355442681264,
-  "username" : "john.doe",
-  "email" : "jdo...@mail.com",
-  "name" : "John Doe"
-}</code></pre>
-<h3 id="default-entities">Default entities</h3>
-<p>The following entity types are predefined in Apache Usergrid. For more 
details, see <a href="/default-data-entities">Default Data Entities</a>.</p>
-<ul>
-<li>user</li>
-<li>group</li>
-<li>role</li>
-<li>application</li>
-<li>activity</li>
-<li>device</li>
-<li>asset</li>
-<li>folder</li>
-<li>event</li>
-<li>notifier</li>
-<li>notification</li>
-<li>receipt</li>
-</ul>
-<h2 id="properties">Properties</h2>
-<p>A data entity is a set of <em>properties</em>, which can each contain any 
JSON-representable value, including a nested JSON document. All entities have 
predefined properties, but you are free to define any number of custom 
properties for any entity. Default properties require specific data types for 
validation purposes, while custom properties can be any JSON data type. Most 
predefined and all application-defined entity properties are indexed, allowing 
you to query collections quickly and easily.</p>
-<p>Individual or multiple properties can be updated in a single operation; 
however, partial updating of nested JSON documents is not supported. This means 
that all properties of a nested document must be provided in a PUT request for 
the update of the nested document to be processed, even if the some of the 
values have not changed.</p>
-<h3 id="default-properties">Default properties</h3>
-<p>At a minimum, each entity is defined by two properties, both of which are 
strings: type and UUID. The entity ‘type’ is the singular form of the 
collection the entity is stored in. For example, an entity in the ‘users’ 
collection has an entity type of ‘user’. The entity ‘UUID’ is an 
immutable universally unique identifier, which can be used to reference the 
entity. A UUID is automatically generated by Apache Usergrid for every entity 
when it is created. You can also create custom entities and entity properties; 
however, Apache Usergrid reserves certain entity types with pre-defined 
properties by default. For a complete list of reserved entities and properties, 
see <a href="/default-data-entities">Default Data Entities</a>.</p>
-<p>When you access the system via the API, you’ll always provide your 
organization UUID or name, application UUID or name, and typically the UUID or 
name of the entity you’re modifying or retrieving.</p>
-<p>All entities have the following default properties:</p>
-<table>
-<thead>
-<tr class="header">
-<th align="left">Property</th>
-<th align="left">Type</th>
-<th align="left">Description</th>
-</tr>
-</thead>
-<tbody>
-<tr class="odd">
-<td align="left">uuid</td>
-<td align="left">UUID</td>
-<td align="left">Entity unique id</td>
-</tr>
-<tr class="even">
-<td align="left">type</td>
-<td align="left">string</td>
-<td align="left">entity type (for example, 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/Coordinated_Universal_Time";>UTC 
timestamp</a> in milliseconds of when the entity was created</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/Coordinated_Universal_Time";>UTC 
timestamp</a> in milliseconds of when the entity was last modified</td>
-</tr>
-</tbody>
-</table>
-<p>Dynamic entities also have an optional name property that is a string 
identifier.</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/data-model.md";>this
 article on github</a>.</div> 
-                -->
-            </div>
-        </div>
-    </div>
-</div>
-
-
-<footer class="bf-footer" role="contentinfo">
-    <div class="container">
-        <div class="row">
-            <div class="col-md-2">
-                <ul class="nav nav-list">
-                    <li class="nav-header"><a href="/">Home</a></li>
-                    <li class="nav-header"><a 
href="/community/">Community</a></li>
-                        <li><a href="/community/#events">Events</a></li>
-                        <li><a href="/community/#mailing-lists">Mailing 
Lists</a></li>
-                        <li><a 
href="/community/#deployments">Deployments</a></li>
-                        <li><a href="/community/#committers">Commiters</a></li>
-                </ul>
-            </div>
-            <div class="col-md-2">
-                <ul class="nav nav-list">
-                    <li class="nav-header"><a 
href="https://github.com/apache/incubator-usergrid/"; 
target="_blank">Code</a></li>
-                    <li><a 
href="https://github.com/apache/incubator-usergrid/blob/master/stack"; 
target="_blank">Server Stack</a></li>
-                    <li><a 
href="https://github.com/apache/incubator-usergrid/blob/master/portal"; 
target="_blank">Admin Portal</a></li>
-                    <li><a 
href="https://github.com/apache/incubator-usergrid/blob/master/ugc"; 
target="_blank">ugc command line</a></li>
-                    <li><a 
href="https://github.com/apache/incubator-usergrid/blob/master/sdks/ios"; 
target="_blank">iOS SDK</a></li>
-                    <li><a 
href="https://github.com/apache/incubator-usergrid/blob/master/sdks/android"; 
target="_blank">Android SDK</a></li>
-                    <li><a 
href="https://github.com/apache/incubator-usergrid/blob/master/sdks/html5-javascript";
 target="_blank">HTML5/JS SDK</a></li>
-                    <li><a 
href="https://github.com/apache/incubator-usergrid/blob/master/sdks/nodejs"; 
target="_blank">node.js module</a></li>
-                    <li><a 
href="https://github.com/apache/incubator-usergrid/blob/master/sdks/ruby-on-rails";
 target="_blank">Ruby on Rails gem</a></li>
-                    <li><a 
href="https://github.com/apache/incubator-usergrid/blob/master/sdks/ruby"; 
target="_blank">Ruby gem</a></li>
-                    <li><a 
href="https://github.com/apache/incubator-usergrid/blob/master/sdks/php"; 
target="_blank">PHP SDK</a></li>
-                    <li><a 
href="https://github.com/apache/incubator-usergrid/blob/master/sdks/java"; 
target="_blank">Java SDK</a></li>
-                    <li><a 
href="https://github.com/apache/incubator-usergrid/blob/master/sdks/dotnet"; 
target="_blank">.NET / Windows SDK</a></li>
-                </ul>
-            </div>
-            <div class="col-md-2">
-                <ul class="nav nav-list">
-                    <li class="nav-header">Resources</li>
-                    <li><a href="http://github.com/apache/incubator-usergrid"; 
target="_blank">GitHub Code</a></li>
-                    <li><a href="http://usergrid.readthedocs.org/"; 
target="_blank">Docs</a></li>
-                    <li><a 
href="https://issues.apache.org/jira/secure/RapidBoard.jspa?rapidView=23&view=planning&selectedIssue=USERGRID-362&epics=visible";
 target="_blank">JIRA Bug Tracker</a></li>
-                    <li><a href="http://stackoverflow.com/search?q=usergrid"; 
target="_blank">StackOverflow</a></li>
-                    <li><a href="/community/#live">Live Chat</a></li>
-                    <li><a href="https://twitter.com/usergrid"; 
target="_blank">Twitter</a></li>
-                    <li><a 
href="http://incubator.apache.org/projects/usergrid.html"; 
target="_blank">Podling Listing</a></li>
-                    <li><a 
href="https://github.com/apache/incubator-usergrid/blob/master/stack#requirements";
 target="_blank">Getting Started</a></li>
-                    <li><a 
href="https://cwiki.apache.org/confluence/display/usergrid/GitHub+Based+Contribution+Workflow";
 target="_blank">Contribution Guidelines</a></li>
-                </ul>
-            </div>
-            <div class="col-md-2">
-                <ul class="nav nav-list">
-                    <li class="nav-header">Apache</li>
-                    <li><a href="http://www.apache.org/licenses/"; 
target="_blank">License</a></li>
-                    <li><a 
href="http://www.apache.org/foundation/sponsorship.html"; 
target="_blank">Sponsorship</a></li>
-                    <li><a href="http://www.apache.org/foundation/thanks.html"; 
target="_blank">Thanks</a></li>
-                    <li><a 
href="http://www.apache.org/security/";>Security</a></li>
-                    <li><a href="http://www.apache.org/"; 
target="_blank">Apache Foundation</a></li>
-                </ul>
-            </div>
-            <div class="col-md-4">
-                <a class="twitter-timeline" 
href="https://twitter.com/search?q=%23usergrid"; 
data-widget-id="401499136807038976"  data-related="usergrid" height="400px" 
style="overflow:hidden">Tweets about "usergrid"</a>
-                <script>!function(d,s,id){var 
js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+"://platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script>
-            </div> 
-        <!--
-            <div class="col-md-4">
-                <div class="input-group form-search">
-                    <input type="text" class="form-control search-query">
-                    <span class="input-group-btn">
-                        <button type="submit" class="btn btn-primary" 
data-type="last">Search</button>
-                    </span>
-                </div>
-            </div> -->
-        </div> 
-        <div class="row">
-            <div id="copyright">
-                <img src="/img/egg-logo.png" /><br/><br/>
-                <p>Apache Usergrid is an effort undergoing incubation at The 
Apache Software Foundation (ASF), sponsored by the Apache Incubator PMC. 
Incubation is required of all newly accepted projects until a further review 
indicates that the infrastructure, communications, and decision making process 
have stabilized in a manner consistent with other successful ASF projects. 
While incubation status is not necessarily a reflection of the completeness or 
stability of the code, it does indicate that the project has yet to be fully 
endorsed by the ASF.</p>
-                <p>Copyright © 2013 The Apache Software Foundation, Licensed 
under the Apache License, Version 2.0.<br>
-                Apache and the Apache feather logos are trademarks of The 
Apache Software Foundation.</p>
-                <p class="credits">Site designed & assembled with love by <a 
href="https://github.com/ryuneeee";>@ryuneeee</a> + <a 
href="https://github.com/realbeast";>@realbeast</a> + <a 
href="https://twitter.com/timanglade";>@timanglade</a>.</p>
-            </div>
-        </div>
-    </div>
-</footer>
-
-<script type="text/javascript" src="/js/head.js"></script>
-<script type="text/javascript">
-    head.js("/js/jquery-1.10.1.min.js", "/js/bootstrap.min.js", 
"/js/usergrid-site.js");
-</script>
-<script>
-  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new 
Date();a=s.createElement(o),
-  
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-
-  ga('create', 'UA-45815079-1', 'apache.org');
-  ga('send', 'pageview');
-
-</script>
-
-
-
-</body>
-</html>

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/ec2b3e4f/website/publish/docs/data-query-overview/index.html
----------------------------------------------------------------------
diff --git a/website/publish/docs/data-query-overview/index.html 
b/website/publish/docs/data-query-overview/index.html
deleted file mode 100644
index ca6c105..0000000
--- a/website/publish/docs/data-query-overview/index.html
+++ /dev/null
@@ -1,293 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-
-<head>
-    <meta charset="utf-8">
-    <title>Apache Usergrid (incubating) — Apache Usergrid data query 
overview</title>
-    <meta http-equiv="x-ua-compatible" content="ie=edge" />
-    <meta name="viewport" content="width=device-width, initial-scale=1, 
minimum-scale=1, maximum-scale=1" />
-    <meta name="keywords" content="Apache Usergrid, Usergrid, BaaS, 
Backend-as-a-Service">
-    <meta name="description" content="An open-source Backend-as-a-Service 
stack for web & mobile applications, based on RESTful APIs." />
-    <meta property="og:title" content="Apache Usergrid" />
-    <meta property="og:description" content="An open-source 
Backend-as-a-Service stack for web & mobile applications, based on RESTful 
APIs." />
-    <!-- Loading Typekit -->
-    <script type="text/javascript" src="//use.typekit.net/ddl7izx.js"></script>
-    <script type="text/javascript">try{Typekit.load();}catch(e){}</script>
-    <!-- Loading Bootstrap -->
-    <link href="/bootstrap/bootstrap.min.css" rel="stylesheet" type='text/css'>
-    <link href="/css/bootflat.css" rel="stylesheet" type='text/css'>
-    <link href="/css/usergrid-site.css" rel="stylesheet" type='text/css'>
-    <link 
href="https://fonts.googleapis.com/css?family=Open+Sans:200,400,500,300,600,800,700,400italic,600italic,700italic,800italic,300italic";
 rel="stylesheet" type="text/css">
-    <link href="/css/font-awesome.min.css" rel="stylesheet" type='text/css'>
-
-    
-
-    <!-- HTML5 shim, for IE6-8 support of HTML5 elements. All other JS at the 
end of file. -->
-    <!--[if lt IE 9]>
-      <script src="js/html5shiv.js"></script>
-      <script src="js/respond.min.js"></script>
-    <![endif]-->
-</head>
-<body>
-
-    <header class="navbar navbar-inverse navbar-fixed-top bf-docs-nav 
secondary" role="banner">
-    <div class="container">
-        <div class="navbar-header">
-            <button class="navbar-toggle" type="button" data-toggle="collapse" 
data-target=".bf-navbar-collapse">
-                <span class="sr-only">Toggle navigation</span>
-                <span class="icon-bar"></span>
-                <span class="icon-bar"></span>
-                <span class="icon-bar"></span>
-            </button>
-        </div>
-        <a href="/" class="navbar-brand">
-                <img id="home-logo" 
src="/img/apache_usergrid_logo_white_small.png" />
-            </a>
-        <nav class="collapse navbar-collapse bf-navbar-collapse" 
role="navigation">
-            <ul class="nav navbar-nav navbar-right">
-                <li class=""><a href="/community/"><span class="icns 
icon-group"></span></a></li>
-                <li><a href="http://usergrid.readthedocs.org/"; 
target="_blank"><span class="icns icon-book"></span></a></li>
-                <li><a href="http://github.com/apache/incubator-usergrid"; 
target="_blank"><span class="icns icon-github-sign"></span></a></li>
-                <!--<li><a href="https://trello.com/b/exQmJIOn/usergrid"; 
target="_blank"><span class="icns icon-trello"></span></a></li>-->
-                <li><a 
href="https://issues.apache.org/jira/secure/RapidBoard.jspa?rapidView=23&view=planning&selectedIssue=USERGRID-362&epics=visible";
 target="_blank"><span class="icns icon-bug"></span></a></li>
-                <li><a href="http://stackoverflow.com/search?q=usergrid"; 
target="_blank"><span class="icns icon-stackexchange"></span></a></li>
-                <li><a href="/community/#live"><span class="icns 
icon-comments"></span></a></li>
-                <!--<li><a 
href="https://groups.google.com/forum/#!forum/usergrid"; target="_blank"><span 
class="icns icon-envelope"></span></a></li>-->
-                <li><a href="https://twitter.com/usergrid"; 
target="_blank"><span class="icns icon-twitter"></span></a></li>
-                <li><a 
href="https://cwiki.apache.org/confluence/display/usergrid/"; 
target="_blank"><span class="icns icon-wiki"></span></a></li>
-                <li><a href="/releases/"><span class="icns 
icon-releases"></span></a></li>
-            </ul>
-        </nav>
-    </div>
-    </header>
-
-
-
-<div class="container bf-docs-container">    
-    <div class="row">
-        <div class="col-md-3">
-            <div class="bf-sidebar hidden-print" role="complementary">
-                <ul class="nav nav-list">
-                    <li><a 
href="/docs/getting-up-and-running-locally/">Getting Up &amp; Running 
Locally</a></li>
-                    <li><a href="/docs/deploy-local/">Deploying to local 
Tomcat &amp; Cassandra</a></li>
-                    <li><a 
href="https://github.com/apache/incubator-usergrid/tree/master/ugc#usergrid-command-line-ugc";><code>ugc</code>
 — the Command-line Client</a></li>
-
-                    <li class="nav-header"><span>Concepts</span></li>
-                    <li>
-                        <a href="/docs/organizations-admins/">Organizations & 
Admins</a>
-                        <ul>
-                            <li>
-                                <a href="/docs/applications/">Applications</a>
-                                <ul>
-                                    <li><a 
href="/docs/roles-and-permissions/">Roles & Permissions</a></li>
-                                    <!--<li><a href="#">Queues</a></li>-->
-                                    <li><a 
href="/docs/events-and-counters/">Events & Counters</a></li>
-                                    <li><a 
href="/docs/relationships/">Relationships (Joins)</a></li>
-                                    <li>
-                                        <a 
href="/docs/collections">Collections</a>
-                                        <ul>
-                                            <li><a 
href="/docs/query-language/">Query Language</a></li>
-                                            <li><a 
href="/docs/users-devices/">Users & Devices</a></li>
-                                            <li><a 
href="/docs/groups/">Groups</a></li>
-                                            <li><a 
href="/docs/activities/">Activities</a></li>
-                                            <li><a 
href="/docs/assets/">Assets</a></li>
-                                        </ul>
-                                    </li>
-                                </ul>
-                            </li>
-                        </ul>
-                    </li>
-
-
-                    <li class="nav-header"><span>Usage</span></li>
-                    <!-- <li>REST API — Coming Soon</li> -->
-                    <li><a class="icns-apple" 
href="https://github.com/apache/incubator-usergrid/tree/master/sdks/ios";>iOS 
SDK</a></li>
-                    <li><a class="icns-android" 
href="https://github.com/apache/incubator-usergrid/tree/master/sdks/android";>Android
 SDK</a></li>
-                    <li><a class="icns-html5" href="">HTML5 / JavaScript 
SDK</a></li>
-                    <li><a class="icns-windows" 
href="https://github.com/apache/incubator-usergrid/tree/master/sdks/dotnet";>Windows
 8 / Windows Phone / .net SDK</a></li>
-                    <li><a 
href="https://github.com/apache/incubator-usergrid/tree/master/sdks/nodejs";>Node.js
 module</a></li>
-                    <li><a 
href="https://github.com/apache/incubator-usergrid/tree/master/sdks/ruby";>Ruby 
gem</a></li>
-                    <li><a 
href="https://github.com/apache/incubator-usergrid/tree/master/sdks/ruby-on-rails";>Ruby
 on Rails gem</a></li>
-                    <li><a 
href="https://github.com/apache/incubator-usergrid/tree/master/sdks/php";>PHP 
library</a></li>
-                    <li><a 
href="https://github.com/apache/incubator-usergrid/tree/master/sdks/java";>Java 
library</a></li>
-
-                    <!--<li class="nav-header"><span>Internals</span></li>
-                    <li>Design & Goals — Coming Soon</li>
-                    <li>Java Architecture — Coming Soon</li>
-                    <li>Cassandra Schema — Coming Soon</li>-->
-
-                    <li class="nav-header"><span>Operations</span></li>
-                    <!--<li>Deploying — Coming Soon</li>-->
-                    <!-- <li>Monitoring — Coming Soon</li> -->
-                    <li><a href="/docs/upgrading/">Upgrading</a></li>
-                    <!-- <li>Security — Coming Soon</li> -->
-
-                    <li class="nav-header"><span>Presentations & 
Videos</span></li>
-                    <li><a href="/docs/presentations/">Presentations</a></li>
-                    <li><a href="/docs/videos/">Videos</a></li>
-
-                    <li class="nav-header"><span>We need your help!</span></li>
-                    <li><a href="/docs/contribute-code/">How to Contribute 
Code & Docs</a></li>
-                    <!--
-                    <li><a href="/docs/contribute-docs">How to contribute 
docs</a></li>
-                    -->
-                </ul>
-            </div>
-        </div>
-
-        <div class="col-md-9 main-article" role="main">
-            <div class="page-article">
-                <div class="page-header">
-                    <h1>Apache Usergrid data query overview</h1>
-                    <!-- TODO: reenable this when we sync SVN to GitHub
-                  <small><a target="_blank" 
href="https://github.com/usergrid/website/blob/master/content/docs/data-query-overview.md";>contribute
 to this article on github</a></small>
-                    -->
-                </div>
-                <div class="toc">
-       <ul>
-<li><a href="#apache-usergrid-data-query-overview">Apache Usergrid data query 
overview</a></li>
-</ul>
-</div>
-<h1 id="apache-usergrid-data-query-overview">Apache Usergrid data query 
overview</h1>
-<p>You can write code to query for data you’ve stored in your Apache 
Usergrid application. You’ll most likely use queries as filters to retrieve 
specific entities. For example, you might want to get data about users who are 
“following” a specific other user, businesses in specific geographical 
locations, and so on.</p>
-<p>The following example retrieves a list of restaurants (from a restaurants 
collection) whose name property contains the value “diner”, sorting the 
list in ascending order by name:</p>
-<pre><code>/restaurants?ql=select * where name contains 'diner' order by name 
asc</code></pre>
-<blockquote>
-<p><strong>Note:</strong>Query examples in this content are shown unencoded to 
make them easier to read. Keep in mind that you might need to encode query 
strings if you’re sending them as part of URLs, such as when you’re 
executing them with the cURL tool.</p>
-</blockquote>
-<p>Having retrieved the list of restaurants, your code could display the list 
to your users. You could also use a query to retrieve a list of diners that are 
located within a particular geographical area (such as near your user’s 
current location).</p>
-<blockquote>
-<p><strong>Important:</strong> By default, results from queries of your Apache 
Usergrid data are limited to 10 items at a time. You can control this with the 
<code>limit</code> parameter, as discussed in <a 
href="/working-queries">Working with queries</a>.</p>
-</blockquote>
-<p>You query your Apache Usergrid data by using a query syntax that’s like 
Structured Query Language (SQL), the query language for relational databases. 
Unlike a relational database, where you specify tables and columns containing 
the data you want to query, in your Apache Usergrid queries you specify 
collections and entities.</p>
-<blockquote>
-<p><strong>Note:</strong> The syntax of Apache Usergrid queries only 
<em>resembles</em> SQL to make queries familiar and easier to write. However, 
the language isn’t SQL. Only the syntax items documented here are 
supported.</p>
-</blockquote>
-<p>The examples in these topics illustrate queries using simple strings to 
make the queries easier to read. You can also use one of the Apigee SDKs, which 
provide functions through which you can pass query strings, and in some cases 
shortcuts for bypassing queries altogether.</p>
-<blockquote>
-<p><strong>Note:</strong> Queries replace filters, which are deprecated.</p>
-</blockquote>
-<p>For more detail about support for queries your Apache Usergrid database, 
see the following topics:</p>
-<ul>
-<li><a href="/basic-query-syntax">Basic query syntax</a></li>
-<li><a href="/query-response-values">Query response values</a></li>
-<li><a href="/data-types-supported-queries">Data types supported in 
queries</a></li>
-<li><a href="/querying-data-admin-portal">Querying data from the admin 
portal</a></li>
-<li><a href="/working-queries">Working with queries</a></li>
-</ul>
-            </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/data-query-overview.md";>this
 article on github</a>.</div> 
-                -->
-            </div>
-        </div>
-    </div>
-</div>
-
-
-<footer class="bf-footer" role="contentinfo">
-    <div class="container">
-        <div class="row">
-            <div class="col-md-2">
-                <ul class="nav nav-list">
-                    <li class="nav-header"><a href="/">Home</a></li>
-                    <li class="nav-header"><a 
href="/community/">Community</a></li>
-                        <li><a href="/community/#events">Events</a></li>
-                        <li><a href="/community/#mailing-lists">Mailing 
Lists</a></li>
-                        <li><a 
href="/community/#deployments">Deployments</a></li>
-                        <li><a href="/community/#committers">Commiters</a></li>
-                </ul>
-            </div>
-            <div class="col-md-2">
-                <ul class="nav nav-list">
-                    <li class="nav-header"><a 
href="https://github.com/apache/incubator-usergrid/"; 
target="_blank">Code</a></li>
-                    <li><a 
href="https://github.com/apache/incubator-usergrid/blob/master/stack"; 
target="_blank">Server Stack</a></li>
-                    <li><a 
href="https://github.com/apache/incubator-usergrid/blob/master/portal"; 
target="_blank">Admin Portal</a></li>
-                    <li><a 
href="https://github.com/apache/incubator-usergrid/blob/master/ugc"; 
target="_blank">ugc command line</a></li>
-                    <li><a 
href="https://github.com/apache/incubator-usergrid/blob/master/sdks/ios"; 
target="_blank">iOS SDK</a></li>
-                    <li><a 
href="https://github.com/apache/incubator-usergrid/blob/master/sdks/android"; 
target="_blank">Android SDK</a></li>
-                    <li><a 
href="https://github.com/apache/incubator-usergrid/blob/master/sdks/html5-javascript";
 target="_blank">HTML5/JS SDK</a></li>
-                    <li><a 
href="https://github.com/apache/incubator-usergrid/blob/master/sdks/nodejs"; 
target="_blank">node.js module</a></li>
-                    <li><a 
href="https://github.com/apache/incubator-usergrid/blob/master/sdks/ruby-on-rails";
 target="_blank">Ruby on Rails gem</a></li>
-                    <li><a 
href="https://github.com/apache/incubator-usergrid/blob/master/sdks/ruby"; 
target="_blank">Ruby gem</a></li>
-                    <li><a 
href="https://github.com/apache/incubator-usergrid/blob/master/sdks/php"; 
target="_blank">PHP SDK</a></li>
-                    <li><a 
href="https://github.com/apache/incubator-usergrid/blob/master/sdks/java"; 
target="_blank">Java SDK</a></li>
-                    <li><a 
href="https://github.com/apache/incubator-usergrid/blob/master/sdks/dotnet"; 
target="_blank">.NET / Windows SDK</a></li>
-                </ul>
-            </div>
-            <div class="col-md-2">
-                <ul class="nav nav-list">
-                    <li class="nav-header">Resources</li>
-                    <li><a href="http://github.com/apache/incubator-usergrid"; 
target="_blank">GitHub Code</a></li>
-                    <li><a href="http://usergrid.readthedocs.org/"; 
target="_blank">Docs</a></li>
-                    <li><a 
href="https://issues.apache.org/jira/secure/RapidBoard.jspa?rapidView=23&view=planning&selectedIssue=USERGRID-362&epics=visible";
 target="_blank">JIRA Bug Tracker</a></li>
-                    <li><a href="http://stackoverflow.com/search?q=usergrid"; 
target="_blank">StackOverflow</a></li>
-                    <li><a href="/community/#live">Live Chat</a></li>
-                    <li><a href="https://twitter.com/usergrid"; 
target="_blank">Twitter</a></li>
-                    <li><a 
href="http://incubator.apache.org/projects/usergrid.html"; 
target="_blank">Podling Listing</a></li>
-                    <li><a 
href="https://github.com/apache/incubator-usergrid/blob/master/stack#requirements";
 target="_blank">Getting Started</a></li>
-                    <li><a 
href="https://cwiki.apache.org/confluence/display/usergrid/GitHub+Based+Contribution+Workflow";
 target="_blank">Contribution Guidelines</a></li>
-                </ul>
-            </div>
-            <div class="col-md-2">
-                <ul class="nav nav-list">
-                    <li class="nav-header">Apache</li>
-                    <li><a href="http://www.apache.org/licenses/"; 
target="_blank">License</a></li>
-                    <li><a 
href="http://www.apache.org/foundation/sponsorship.html"; 
target="_blank">Sponsorship</a></li>
-                    <li><a href="http://www.apache.org/foundation/thanks.html"; 
target="_blank">Thanks</a></li>
-                    <li><a 
href="http://www.apache.org/security/";>Security</a></li>
-                    <li><a href="http://www.apache.org/"; 
target="_blank">Apache Foundation</a></li>
-                </ul>
-            </div>
-            <div class="col-md-4">
-                <a class="twitter-timeline" 
href="https://twitter.com/search?q=%23usergrid"; 
data-widget-id="401499136807038976"  data-related="usergrid" height="400px" 
style="overflow:hidden">Tweets about "usergrid"</a>
-                <script>!function(d,s,id){var 
js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+"://platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script>
-            </div> 
-        <!--
-            <div class="col-md-4">
-                <div class="input-group form-search">
-                    <input type="text" class="form-control search-query">
-                    <span class="input-group-btn">
-                        <button type="submit" class="btn btn-primary" 
data-type="last">Search</button>
-                    </span>
-                </div>
-            </div> -->
-        </div> 
-        <div class="row">
-            <div id="copyright">
-                <img src="/img/egg-logo.png" /><br/><br/>
-                <p>Apache Usergrid is an effort undergoing incubation at The 
Apache Software Foundation (ASF), sponsored by the Apache Incubator PMC. 
Incubation is required of all newly accepted projects until a further review 
indicates that the infrastructure, communications, and decision making process 
have stabilized in a manner consistent with other successful ASF projects. 
While incubation status is not necessarily a reflection of the completeness or 
stability of the code, it does indicate that the project has yet to be fully 
endorsed by the ASF.</p>
-                <p>Copyright © 2013 The Apache Software Foundation, Licensed 
under the Apache License, Version 2.0.<br>
-                Apache and the Apache feather logos are trademarks of The 
Apache Software Foundation.</p>
-                <p class="credits">Site designed & assembled with love by <a 
href="https://github.com/ryuneeee";>@ryuneeee</a> + <a 
href="https://github.com/realbeast";>@realbeast</a> + <a 
href="https://twitter.com/timanglade";>@timanglade</a>.</p>
-            </div>
-        </div>
-    </div>
-</footer>
-
-<script type="text/javascript" src="/js/head.js"></script>
-<script type="text/javascript">
-    head.js("/js/jquery-1.10.1.min.js", "/js/bootstrap.min.js", 
"/js/usergrid-site.js");
-</script>
-<script>
-  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new 
Date();a=s.createElement(o),
-  
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-
-  ga('create', 'UA-45815079-1', 'apache.org');
-  ga('send', 'pageview');
-
-</script>
-
-
-
-</body>
-</html>

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/ec2b3e4f/website/publish/docs/data-types-supported-queries/index.html
----------------------------------------------------------------------
diff --git a/website/publish/docs/data-types-supported-queries/index.html 
b/website/publish/docs/data-types-supported-queries/index.html
deleted file mode 100644
index e3b99d0..0000000
--- a/website/publish/docs/data-types-supported-queries/index.html
+++ /dev/null
@@ -1,307 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-
-<head>
-    <meta charset="utf-8">
-    <title>Apache Usergrid (incubating) — Data types supported in 
queries</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="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><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="#">Getting Up & Running Locally</a></li>
-                    <li><a href="#"><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="#">Roles & 
Permissions</a></li>
-                                    <li><a href="#">Queues</a></li>
-                                    <li><a href="#">Events & Counters</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="#">Activities</a></li>
-                                            <li><a href="#">Assets</a></li>
-                                        </ul>
-                                    </li>
-                                </ul>
-                            </li>
-                        </ul>
-                    </li>
-
-
-                    <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 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 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>
-                </ul>
-            </div>
-        </div>
-
-        <div class="col-md-9 main-article" role="main">
-            <div class="page-article">
-                <div class="page-header">
-                    <h1>Data types supported in queries</h1>
-                  <small><a 
href="https://github.com/timanglade/usergrid-site/blob/master/content/docs/data-types-supported-queries/";>contribute
 to this article on github</a></small>
-                </div>
-                <div class="toc">
-       <ul>
-<li><a href="#data-types-supported-in-queries">Data types supported in 
queries</a></li>
-</ul>
-</div>
-<h1 id="data-types-supported-in-queries"><a 
href="#data-types-supported-in-queries">Data types supported in queries</a></h1>
-<p>As you develop queries for your Apache Usergrid data, remember that entity 
properties each conform to a particular data type (whether the entity is 
included by default or an entity you defined). Your queries must acknowledge 
this, testing with values that conform to each property’s data type. (You can 
view the list of property data types for the default entities at <a 
href="/default-data-entities">Default Data Entities</a>.)</p>
-<p>For example, in the default entity <code>User</code>, the <code>name</code> 
property is stored as a <code>string</code>, the created date as a 
<code>long</code>, and metadata is stored as a JSON object. Your queries must 
be data type-aware so that you can be sure that query results are as you expect 
them to be.</p>
-<p>So imagine you define an entity with a <code>price</code> property whose 
value might be <code>100.00</code>. Querying for <code>100</code> will return 
no results even if there are occurrences of <code>100.00</code> as 
<code>price</code> values in your data set. That’s because the database 
expected a decimal-delimited <code>float</code> value in your query.</p>
-<table>
-<col width="33%">
-<col width="33%">
-<col width="33%">
-<thead><tr class="header">
-<th align="left">Data Type</th>
-<th align="left">Examples</th>
-<th align="left">Notes</th>
-</tr></thead>
-<tbody>
-<tr class="odd">
-<td align="left"><p><code>string</code></p></td>
-<td align="left"><p><code>'value'</code>, <code>unicode '\uFFFF'</code>, 
<code>octal '\0707'</code></p></td>
-<td align="left"><p> </p></td>
-</tr>
-<tr class="even">
-<td align="left"><p><code>long</code></p></td>
-<td align="left"><pre><code>1357412326021</code></pre></td>
-<td align="left"><p>Timestamps are typically stored as <code>long</code> 
values.</p></td>
-</tr>
-<tr class="odd">
-<td align="left"><p><code>float</code></p></td>
-<td align="left">
-<pre><code>10.1, -10.1, 10e10,</code></pre>
-<p>10e-10, 10E10, 10E-10</p>
-</td>
-<td align="left"><p>Your query must be specific about the value you’re 
looking for, down to the value (if any) after the decimal point.</p></td>
-</tr>
-<tr class="even">
-<td align="left"><p><code>boolean</code></p></td>
-<td align="left"><pre><code>true | false</code></pre></td>
-<td align="left"><p> </p></td>
-</tr>
-<tr class="odd">
-<td align="left"><p><code>UUID</code></p></td>
-<td align="left">
-<pre><code>ee912c4b-5769-11e2-</code></pre>
-<p>924d-02e81ac5a17b</p>
-</td>
-<td align="left">
-<p>UUID types are typically used for the unique IDs of entities. The value 
must conform to the following format (do not enclose with quotation marks): 
xxxxxxxx-xxxx-xxxx- xxxx-xxxxxxxxxxxx</p>
-<p>.</p>
-</td>
-</tr>
-<tr class="even">
-<td align="left"><p><code>object</code></p></td>
-<td align="left">
-<p>For a JSON object like this one:</p>
-<pre><code>{
- "items": [
-  {
-   "name": "rocks"
-  },
-  {
-   "name": "boats"
-  }
- ]
-}</code></pre>
-<p>… you can use dot notation to reach property values in the object:</p>
-<pre><code>/mycollection/thing</code></pre>
-<p>?ql=“select * where ite ms.name = ‘rocks’”</p>
-</td>
-<td align="left"><p>Objects are often used to contain entity metadata, such as 
the activities associated with a user, the users associated with a role, and so 
on.</p></td>
-</tr>
-</tbody>
-</table>
-            </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="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-types-supported-queries/";>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 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>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

Reply via email to