usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From snoopd...@apache.org
Subject [51/51] [abbrv] [partial] incubator-usergrid git commit: Switch over to new docs for the website.
Date Wed, 05 Aug 2015 14:56:37 GMT
Switch over to new docs for the website.


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

Branch: refs/heads/ug2-doc-update
Commit: 2a55601fd62be1921a10ec7344825d45415f7c5e
Parents: 373d2e7
Author: Dave Johnson <snoopdave@apache.org>
Authored: Wed Aug 5 10:55:15 2015 -0400
Committer: Dave Johnson <snoopdave@apache.org>
Committed: Wed Aug 5 10:55:15 2015 -0400

----------------------------------------------------------------------
 content/README.md                               |     7 +
 content/community/index.html                    |    19 +-
 content/docs/.gitkeep                           |     0
 content/docs/README.html                        |   370 +
 content/docs/_images/cassandra.png              |   Bin 0 -> 47467 bytes
 content/docs/_images/iOS10seeusermsg.jpg        |   Bin 0 -> 47979 bytes
 content/docs/_images/iOS1chooseapp.jpg          |   Bin 0 -> 43752 bytes
 content/docs/_images/iOS2register.jpg           |   Bin 0 -> 47339 bytes
 content/docs/_images/iOS5emptyfeed.jpg          |   Bin 0 -> 42009 bytes
 content/docs/_images/iOS6newmsg.jpg             |   Bin 0 -> 55357 bytes
 content/docs/_images/iOS7feed1msg.jpg           |   Bin 0 -> 45070 bytes
 content/docs/_images/login.png                  |   Bin 0 -> 162318 bytes
 content/docs/_images/portal1.png                |   Bin 0 -> 202277 bytes
 content/docs/_images/portal2.png                |   Bin 0 -> 178318 bytes
 content/docs/_images/portal3.png                |   Bin 0 -> 486403 bytes
 content/docs/_images/portal4.png                |   Bin 0 -> 166079 bytes
 content/docs/_images/portal5.png                |   Bin 0 -> 217950 bytes
 content/docs/_images/rdbms.png                  |   Bin 0 -> 40248 bytes
 content/docs/_images/reviews.png                |   Bin 0 -> 36333 bytes
 content/docs/_images/reviews2.png               |   Bin 0 -> 52726 bytes
 content/docs/_images/securitymodel0.png         |   Bin 0 -> 91321 bytes
 content/docs/_sources/README.txt                |    69 +
 .../docs/_sources/asset-and-files/assets.txt    |    20 +
 .../file-storage-configuration.txt              |    39 +
 .../docs/_sources/asset-and-files/folders.txt   |    85 +
 .../asset-and-files/legacy-asset-support.txt    |     0
 .../asset-and-files/retrieving-assets.txt       |    27 +
 .../asset-and-files/uploading-assets.txt        |    86 +
 .../creating-and-incrementing-counters.txt      |    74 +
 .../counters-and-events/events-and-counters.txt |     8 +
 .../counters-and-events/retrieving-counters.txt |   109 +
 .../data-queries/advanced-query-usage.txt       |    23 +
 .../data-queries/operators-and-types.txt        |   120 +
 .../_sources/data-queries/query-language.txt    |   427 +
 .../_sources/data-queries/query-parameters.txt  |   153 +
 .../data-queries/querying-your-data.txt         |   121 +
 .../docs/_sources/data-storage/collections.txt  |   254 +
 .../_sources/data-storage/data-store-dbms.txt   |   109 +
 content/docs/_sources/data-storage/entities.txt |   512 +
 .../_sources/data-storage/optimizing-access.txt |   185 +
 .../entity-connections/connecting-entities.txt  |    60 +
 .../disconnecting-entities.txt                  |    79 +
 .../entity-connections/relationships.txt        |    98 +
 .../entity-connections/retrieving-entities.txt  |    94 +
 .../docs/_sources/geolocation/geolocation.txt   |    72 +
 content/docs/_sources/geolocation/tbd.txt       |     1 +
 .../creating-a-new-application.txt              |    14 +
 .../getting-started/creating-account.txt        |    21 +
 .../getting-started/using-a-sandbox-app.txt     |    39 +
 .../_sources/getting-started/using-the-api.txt  |   150 +
 content/docs/_sources/index.txt                 |   160 +
 .../installation/ug1-deploy-to-tomcat.txt       |   179 +
 .../installation/ug1-launcher-quick-start.txt   |    72 +
 .../installation/ug2-deploy-to-tomcat.txt       |   167 +
 .../_sources/introduction/async-vs-sync.txt     |    25 +
 .../docs/_sources/introduction/data-model.txt   |    76 +
 .../_sources/introduction/usergrid-features.txt |    81 +
 .../docs/_sources/orgs-and-apps/admin-user.txt  |   352 +
 .../docs/_sources/orgs-and-apps/application.txt |   100 +
 .../docs/_sources/orgs-and-apps/managing.txt    |    50 +
 .../_sources/orgs-and-apps/organization.txt     |   435 +
 .../docs/_sources/push-notifications/tbd.txt    |     1 +
 .../push-notifications/users-devices.txt        |   108 +
 .../docs/_sources/reference/contribute-code.txt |    18 +
 .../_sources/reference/presos-and-videos.txt    |    31 +
 .../docs/_sources/rest-endpoints/api-docs.txt   |  3319 ++++++
 content/docs/_sources/sdks/ios.txt              |     1 +
 content/docs/_sources/sdks/java.txt             |     1 +
 content/docs/_sources/sdks/javascript.txt       |     3 +
 content/docs/_sources/sdks/tbd.txt              |     1 +
 content/docs/_sources/sdks/usage.txt            |    16 +
 .../_sources/security-and-auth/app-security.txt |    19 +
 .../authenticating-api-requests.txt             |    38 +
 ...enticating-users-and-application-clients.txt |   128 +
 .../changing-token-time-live-ttl.txt            |    61 +
 .../security-and-auth/facebook-sign.txt         |   158 +
 .../revoking-tokens-logout.txt                  |    32 +
 .../security-and-auth/securing-your-app.txt     |    44 +
 .../user-authentication-types.txt               |    63 +
 .../security-and-auth/using-permissions.txt     |   115 +
 .../docs/_sources/user-management/activity.txt  |   440 +
 content/docs/_sources/user-management/group.txt |   365 +
 .../docs/_sources/user-management/groups.txt    |    38 +
 .../user-management/messagee-example.txt        |   137 +
 .../user-management/user-connections.txt        |    40 +
 .../user-management/user-management.txt         |    42 +
 .../user-management/working-user-data.txt       |   278 +
 content/docs/_static/ajax-loader.gif            |   Bin 0 -> 673 bytes
 content/docs/_static/basic.css                  |   599 +
 content/docs/_static/comment-bright.png         |   Bin 0 -> 3500 bytes
 content/docs/_static/comment-close.png          |   Bin 0 -> 3578 bytes
 content/docs/_static/comment.png                |   Bin 0 -> 3445 bytes
 content/docs/_static/css/badge_only.css         |     4 +
 content/docs/_static/css/badge_only.css.map     |     7 +
 content/docs/_static/css/theme.css              |  5514 +++++++++
 content/docs/_static/css/theme.css.map          |     7 +
 content/docs/_static/doctools.js                |   263 +
 content/docs/_static/down-pressed.png           |   Bin 0 -> 347 bytes
 content/docs/_static/down.png                   |   Bin 0 -> 347 bytes
 content/docs/_static/file.png                   |   Bin 0 -> 358 bytes
 content/docs/_static/fonts/FontAwesome.otf      |   Bin 0 -> 62856 bytes
 content/docs/_static/fonts/Inconsolata-Bold.ttf |   Bin 0 -> 47064 bytes
 content/docs/_static/fonts/Inconsolata.ttf      |   Bin 0 -> 63184 bytes
 content/docs/_static/fonts/Lato-Bold.ttf        |   Bin 0 -> 82368 bytes
 content/docs/_static/fonts/Lato-Regular.ttf     |   Bin 0 -> 81980 bytes
 content/docs/_static/fonts/RobotoSlab-Bold.ttf  |   Bin 0 -> 36596 bytes
 .../docs/_static/fonts/RobotoSlab-Regular.ttf   |   Bin 0 -> 36276 bytes
 .../docs/_static/fonts/fontawesome-webfont.eot  |   Bin 0 -> 38205 bytes
 .../docs/_static/fonts/fontawesome-webfont.svg  |   414 +
 .../docs/_static/fonts/fontawesome-webfont.ttf  |   Bin 0 -> 80652 bytes
 .../docs/_static/fonts/fontawesome-webfont.woff |   Bin 0 -> 44432 bytes
 content/docs/_static/jquery-1.11.1.js           | 10308 +++++++++++++++++
 content/docs/_static/jquery.js                  |     4 +
 content/docs/_static/js/modernizr.min.js        |     4 +
 content/docs/_static/js/theme.js                |   131 +
 content/docs/_static/minus.png                  |   Bin 0 -> 173 bytes
 content/docs/_static/plus.png                   |   Bin 0 -> 173 bytes
 content/docs/_static/pygments.css               |    63 +
 content/docs/_static/searchtools.js             |   622 +
 content/docs/_static/underscore-1.3.1.js        |   999 ++
 content/docs/_static/underscore.js              |    31 +
 content/docs/_static/up-pressed.png             |   Bin 0 -> 345 bytes
 content/docs/_static/up.png                     |   Bin 0 -> 345 bytes
 content/docs/_static/websupport.js              |   808 ++
 content/docs/access-token/index.html            |   472 -
 content/docs/activity/index.html                |  1338 ---
 content/docs/admin-portal/index.html            |   626 -
 content/docs/admin-user/index.html              |   967 --
 content/docs/app-security/index.html            |   281 -
 content/docs/application/index.html             |   459 -
 content/docs/applications/index.html            |   458 -
 content/docs/asset-and-files/assets.html        |   331 +
 .../file-storage-configuration.html             |   319 +
 content/docs/asset-and-files/folders.html       |   388 +
 .../asset-and-files/legacy-asset-support.html   |   277 +
 .../docs/asset-and-files/retrieving-assets.html |   356 +
 .../docs/asset-and-files/uploading-assets.html  |   416 +
 content/docs/assets/index.html                  |   319 -
 .../index.html                                  |   439 -
 .../index.html                                  |   432 -
 content/docs/client-authorization/index.html    |   370 -
 content/docs/collections/index.html             |   278 -
 content/docs/contribute-code/index.html         |   279 -
 .../creating-and-incrementing-counters.html     |   406 +
 .../events-and-counters.html                    |   303 +
 .../retrieving-counters.html                    |   458 +
 content/docs/creating-collections/index.html    |   612 -
 .../creating-custom-data-entities/index.html    |  1937 ----
 .../index.html                                  |   294 -
 content/docs/data-model/index.html              |   362 -
 .../docs/data-queries/advanced-query-usage.html |   321 +
 .../docs/data-queries/operators-and-types.html  |   461 +
 content/docs/data-queries/query-language.html   |   730 ++
 content/docs/data-queries/query-parameters.html |   511 +
 .../docs/data-queries/querying-your-data.html   |   453 +
 content/docs/data-query-overview/index.html     |   293 -
 content/docs/data-storage/collections.html      |   670 ++
 content/docs/data-storage/data-store-dbms.html  |   423 +
 content/docs/data-storage/entities.html         |  1014 ++
 .../docs/data-storage/optimizing-access.html    |   557 +
 content/docs/default-data-entities/index.html   |  1288 --
 content/docs/deleting-collections/index.html    |   655 --
 content/docs/deleting-data-entities/index.html  |   678 --
 content/docs/deploy-local/index.html            |   401 -
 content/docs/device/index.html                  |   332 -
 .../index.html                                  |   291 -
 .../entity-connections/connecting-entities.html |   378 +
 .../disconnecting-entities.html                 |   395 +
 .../docs/entity-connections/relationships.html  |   379 +
 .../entity-connections/retrieving-entities.html |   419 +
 content/docs/events-and-counters 2/index.html   |   612 -
 content/docs/events-and-counters/index.html     |   502 -
 content/docs/facebook-sign/index.html           |   400 -
 content/docs/features/index.html                |   342 -
 content/docs/folder/index.html                  |   341 -
 content/docs/genindex.html                      |   282 +
 content/docs/geolocation/geolocation.html       |   413 +
 content/docs/geolocation/index.html             |   310 -
 content/docs/geolocation/tbd.html               |   280 +
 .../creating-a-new-application.html             |   320 +
 .../docs/getting-started/creating-account.html  |   327 +
 .../getting-started/using-a-sandbox-app.html    |   357 +
 content/docs/getting-started/using-the-api.html |   491 +
 .../getting-up-and-running-locally/index.html   |   309 -
 content/docs/group 2/index.html                 |  1301 ---
 content/docs/group/index.html                   |  1301 ---
 content/docs/groups/index.html                  |   375 -
 content/docs/html-5-example-messagee/index.html |   421 -
 content/docs/index.html                         |   961 +-
 .../docs/installation/ug1-deploy-to-tomcat.html |   506 +
 .../installation/ug1-launcher-quick-start.html  |   388 +
 .../docs/installation/ug2-deploy-to-tomcat.html |   509 +
 content/docs/introduction/async-vs-sync.html    |   341 +
 content/docs/introduction/data-model.html       |   449 +
 .../docs/introduction/usergrid-features.html    |   449 +
 .../index.html                                  |   357 -
 content/docs/messagee-example/index.html        |   421 -
 content/docs/nodejs-module/index.html           |   307 -
 content/docs/objects.inv                        |   Bin 0 -> 663 bytes
 content/docs/old-forks/index.html               |   285 -
 content/docs/organization/index.html            |  1354 ---
 content/docs/organizations-admins 2/index.html  |  1807 ---
 content/docs/organizations-admins/index.html    |   329 -
 content/docs/orgs-and-apps/admin-user.html      |   780 ++
 content/docs/orgs-and-apps/application.html     |   495 +
 content/docs/orgs-and-apps/managing.html        |   340 +
 content/docs/orgs-and-apps/organization.html    |  1017 ++
 content/docs/overview/index.html                |   279 -
 content/docs/presentations/index.html           |   293 -
 content/docs/push-notifications/tbd.html        |   280 +
 .../docs/push-notifications/users-devices.html  |   537 +
 content/docs/query-language/index.html          |   549 -
 .../docs/querying-data-admin-portal/index.html  |   289 -
 .../querying-your-app-services-data/index.html  |   308 -
 content/docs/reference/contribute-code.html     |   315 +
 content/docs/reference/presos-and-videos.html   |   335 +
 content/docs/relationships/index.html           |   309 -
 content/docs/rest-api/index.html                |   273 -
 content/docs/rest-endpoints/api-docs.html       |  4192 +++++++
 content/docs/rest-endpoints/index.html          |   732 --
 content/docs/retrieving-collections/index.html  |   767 --
 .../docs/retrieving-data-entities/index.html    |  1336 ---
 content/docs/role/index.html                    |  1314 ---
 content/docs/roles-and-permissions/index.html   |   274 -
 content/docs/ruby-gem/index.html                |   279 -
 content/docs/sdks/ios.html                      |   280 +
 content/docs/sdks/java.html                     |   280 +
 content/docs/sdks/javascript.html               |   280 +
 content/docs/sdks/tbd.html                      |   291 +
 content/docs/sdks/usage.html                    |   308 +
 content/docs/search.html                        |   293 +
 content/docs/searchindex.js                     |     1 +
 content/docs/securing-your-app/index.html       |   289 -
 .../docs/security-and-auth/app-security.html    |   320 +
 .../authenticating-api-requests.html            |   367 +
 ...nticating-users-and-application-clients.html |   528 +
 .../changing-token-time-live-ttl.html           |   389 +
 .../docs/security-and-auth/facebook-sign.html   |   506 +
 .../revoking-tokens-logout.html                 |   342 +
 .../security-and-auth/securing-your-app.html    |   398 +
 .../user-authentication-types.html              |   399 +
 .../security-and-auth/using-permissions.html    |   510 +
 content/docs/security-model/index.html          |   293 -
 content/docs/updating-collections/index.html    |   706 --
 content/docs/updating-data-entities/index.html  |  1270 --
 content/docs/upgrading/index.html               |   265 -
 .../docs/uploading-files-and-assets/index.html  |   436 -
 content/docs/user-management/activity.html      |   867 ++
 content/docs/user-management/group.html         |   824 ++
 content/docs/user-management/groups.html        |   398 +
 .../docs/user-management/messagee-example.html  |   485 +
 .../docs/user-management/user-connections.html  |   358 +
 .../docs/user-management/user-management.html   |   372 +
 .../docs/user-management/working-user-data.html |   700 ++
 content/docs/user/index.html                    |  2202 ----
 content/docs/users-devices/index.html           |   512 -
 content/docs/using-api/index.html               |   384 -
 .../docs/using-sandbox-application/index.html   |   295 -
 content/docs/videos/index.html                  |   279 -
 content/index.html                              |     9 +-
 content/releases/index.html                     |     9 +-
 docs/README.md                                  |    49 +-
 docs/update-api-docs.sh                         |     4 +-
 docs/update-website.sh                          |     6 +
 website/README.md                               |    50 +-
 website/content/community/index.html            |    10 +-
 website/content/docs/access-token.md            |   194 -
 website/content/docs/activity.md                |  1128 --
 website/content/docs/admin-portal.md            |   509 -
 website/content/docs/admin-user.md              |   781 --
 website/content/docs/app-security.md            |    42 -
 website/content/docs/application.md             |    90 -
 website/content/docs/applications.md            |    85 -
 website/content/docs/assets.md                  |    24 -
 ...henticating-users-and-application-clients.md |   485 -
 .../authentication-and-access-app-services-0.md |   271 -
 website/content/docs/client-authorization.md    |   114 -
 website/content/docs/collections.md             |    25 -
 website/content/docs/contribute-code.md         |    26 -
 website/content/docs/creating-collections.md    |   340 -
 .../docs/creating-custom-data-entities.md       |  1639 ---
 .../creating-new-application-admin-console.md   |    55 -
 website/content/docs/data-model.md              |   146 -
 website/content/docs/data-query-overview.md     |    62 -
 website/content/docs/default-data-entities.md   |  1175 --
 website/content/docs/deleting-collections.md    |   382 -
 website/content/docs/deleting-data-entities.md  |   394 -
 website/content/docs/deploy-local.md            |   174 -
 website/content/docs/device.md                  |    41 -
 ...ying-app-services-api-calls-curl-commands.md |    74 -
 website/content/docs/events-and-counters 2.md   |   396 -
 website/content/docs/events-and-counters.md     |   272 -
 website/content/docs/facebook-sign.md           |   232 -
 website/content/docs/features.md                |   198 -
 website/content/docs/folder.md                  |    45 -
 website/content/docs/geolocation.md             |    87 -
 .../docs/getting-up-and-running-locally.md      |    74 -
 website/content/docs/group 2.md                 |   936 --
 website/content/docs/group.md                   |   936 --
 website/content/docs/groups.md                  |    42 -
 website/content/docs/html-5-example-messagee.md |   192 -
 website/content/docs/index.html                 |     9 -
 ...managing-access-defining-permission-rules.md |   218 -
 website/content/docs/messagee-example.md        |   192 -
 website/content/docs/nodejs-module.md           |    61 -
 website/content/docs/old-forks.md               |    35 -
 website/content/docs/organization.md            |  1266 --
 website/content/docs/organizations-admins 2.md  |  1814 ---
 website/content/docs/organizations-admins.md    |    39 -
 website/content/docs/overview.md                |    41 -
 website/content/docs/presentations.md           |    25 -
 website/content/docs/query-language.md          |   465 -
 .../content/docs/querying-data-admin-portal.md  |    40 -
 .../docs/querying-your-app-services-data.md     |    81 -
 website/content/docs/relationships.md           |   104 -
 website/content/docs/rest-api.md                |    17 -
 website/content/docs/rest-endpoints.md          |   918 --
 website/content/docs/retrieving-collections.md  |   484 -
 .../content/docs/retrieving-data-entities.md    |  1092 --
 website/content/docs/role.md                    |  1000 --
 website/content/docs/roles-and-permissions.md   |    22 -
 website/content/docs/ruby-gem.md                |    28 -
 website/content/docs/securing-your-app.md       |    83 -
 website/content/docs/security-model.md          |    40 -
 website/content/docs/updating-collections.md    |   436 -
 website/content/docs/updating-data-entities.md  |  1008 --
 website/content/docs/upgrading.md               |     7 -
 .../content/docs/uploading-files-and-assets.md  |   289 -
 website/content/docs/user.md                    |  1892 ---
 website/content/docs/users-devices.md           |   112 -
 website/content/docs/using-api.md               |   219 -
 .../content/docs/using-sandbox-application.md   |    71 -
 website/content/docs/videos.md                  |    15 -
 website/layouts/default.html                    |    69 -
 website/layouts/footer.html                     |     4 +-
 website/layouts/header.html                     |     5 +-
 website/tmp/checksums                           |     4 +-
 website/tmp/compiled_content                    |    67 +-
 website/tmp/dependencies                        |   Bin 6586 -> 2372 bytes
 339 files changed, 64104 insertions(+), 63081 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2a55601f/content/README.md
----------------------------------------------------------------------
diff --git a/content/README.md b/content/README.md
new file mode 100644
index 0000000..0bbec7e
--- /dev/null
+++ b/content/README.md
@@ -0,0 +1,7 @@
+# Generated Website and Docs Content
+
+__DO NOT EDIT FILES IN THIS DIRECTORY__
+
+The files here were generated by tools in the ``/docs`` and ``/website`` directories.
+
+See the README files there for information about updating the docs and website.
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2a55601f/content/community/index.html
----------------------------------------------------------------------
diff --git a/content/community/index.html b/content/community/index.html
index 320f6c6..c78171e 100644
--- a/content/community/index.html
+++ b/content/community/index.html
@@ -215,10 +215,11 @@
         <nav class="collapse navbar-collapse bf-navbar-collapse" role="navigation">
             <ul class="nav navbar-nav navbar-right">
                 <li class="active"><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="docs" 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="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>-->
@@ -269,7 +270,7 @@
 			</div>
 			<div class="col-md-3">
 				<h3>&nbsp;</h3>
-    	    	<p><i>Want to organize a Usergrid event? <a href="mailto:timanglade@apache.org">Contact us!</a></i><p>
+    	    	<p><i>Want to organize a Usergrid event? <a href="mailto:snoopdave@apache.org">Contact us!</a></i><p>
 			</div>
 		</div>
 	</div>
@@ -284,12 +285,12 @@
 		</div>
 		<div class="row">
     	<div class="col-md-3 done">
-    	    	<h3><a href="http://events.linuxfoundation.org/events/apachecon-north-america/">HipChat</a></h3>
-    	    	<p>Much of the Usergrid team hangs around in this HipChat Room: <a href="http://www.hipchat.com/goLqupL1B" target="_blank">http://www.hipchat.com/goLqupL1B</a>. Come by and chat for a spell!<p>
+    	    	<h3><a href="https://www.hipchat.com/gDDIQrdQa">HipChat</a></h3>
+    	    	<p>Some of the Usergrid team hangs around in this HipChat Room: <a href="https://www.hipchat.com/gDDIQrdQa" target="_blank">https://www.hipchat.com/gDDIQrdQa</a>. Come by and chat for a spell!<p>
 		</div>
       	<div class="col-md-3 done">
         	<h3>IRC</h3>
-        	<p>Fire up your favorite IRC client and check us out on the <a href="http://webchat.freenode.net/?channels=%23usergrid&uio=d4" target="_blank">#usergrid</a> channel.  Get questions answered or just talk Usergrid.<p>
+        	<p>Another (less used) option is the Usergrid IRC chat channel <a href="http://webchat.freenode.net/?channels=%23usergrid&uio=d4" target="_blank">#usergrid</a>.<p>
       </div>
 	</div>
 </section>
@@ -357,7 +358,7 @@
 			</a>
 			<div class="col-md-3">
 				<h3>&nbsp;</h3>
-    	    	<p><i>Want to be added to this list? <a href="mailto:timanglade@apache.org">Contact us!</a></i><p>
+    	    	<p><i>Want to be added to this list? <a href="mailto:snoopdave@apache.org">Contact us!</a></i><p>
 			</div>
 		</div>
 	</div>
@@ -511,7 +512,7 @@
                 <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="docs" 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>
@@ -551,7 +552,7 @@
                 <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>
+                <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> + <a href="https://twitter.com/snoopdave">@snoopdave</a> .</p>
             </div>
         </div>
     </div>

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2a55601f/content/docs/.gitkeep
----------------------------------------------------------------------
diff --git a/content/docs/.gitkeep b/content/docs/.gitkeep
new file mode 100644
index 0000000..e69de29

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2a55601f/content/docs/README.html
----------------------------------------------------------------------
diff --git a/content/docs/README.html b/content/docs/README.html
new file mode 100644
index 0000000..7abe7ff
--- /dev/null
+++ b/content/docs/README.html
@@ -0,0 +1,370 @@
+
+
+<!DOCTYPE html>
+<!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]-->
+<!--[if gt IE 8]><!--> <html class="no-js" lang="en" > <!--<![endif]-->
+<head>
+  <meta charset="utf-8">
+  
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  
+  <title>Apache Usergrid Documentation &mdash; Apache Usergrid 1.0 documentation</title>
+  
+
+  
+  
+
+  
+
+  
+  
+    
+
+  
+
+  
+  
+    <link rel="stylesheet" href="_static/css/theme.css" type="text/css" />
+  
+
+  
+
+  
+    <link rel="top" title="Apache Usergrid 1.0 documentation" href="index.html"/> 
+
+  
+  <script src="_static/js/modernizr.min.js"></script>
+
+</head>
+
+<body class="wy-body-for-nav" role="document">
+
+  <div class="wy-grid-for-nav">
+
+    
+    <nav data-toggle="wy-nav-shift" class="wy-nav-side">
+      <div class="wy-side-nav-search">
+        
+
+        
+          <a href="index.html" class="icon icon-home"> Apache Usergrid
+        
+
+        
+        </a>
+
+        
+          
+          
+            <div class="version">
+              1.0
+            </div>
+          
+        
+
+        
+<div role="search">
+  <form id="rtd-search-form" class="wy-form" action="search.html" method="get">
+    <input type="text" name="q" placeholder="Search docs" />
+    <input type="hidden" name="check_keywords" value="yes" />
+    <input type="hidden" name="area" value="default" />
+  </form>
+</div>
+
+        
+      </div>
+
+      <div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="main navigation">
+        
+          
+          
+              <p class="caption"><span class="caption-text">Introduction</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="introduction/usergrid-features.html">Usergrid Features</a></li>
+<li class="toctree-l1"><a class="reference internal" href="introduction/data-model.html">Usergrid Data model</a></li>
+<li class="toctree-l1"><a class="reference internal" href="introduction/async-vs-sync.html">Async vs. sync calls</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Getting Started</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="getting-started/creating-a-new-application.html">Creating a new application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="getting-started/creating-account.html">Creating an Usergrid Account</a></li>
+<li class="toctree-l1"><a class="reference internal" href="getting-started/using-a-sandbox-app.html">Using a Sandbox Application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="getting-started/using-the-api.html">Using the API</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Data Storage</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="data-storage/data-store-dbms.html">The Usergrid Data Store</a></li>
+<li class="toctree-l1"><a class="reference internal" href="data-storage/optimizing-access.html">Data Store Best Practices</a></li>
+<li class="toctree-l1"><a class="reference internal" href="data-storage/collections.html">Collections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="data-storage/entities.html">Entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Data Queries</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="data-queries/querying-your-data.html">Querying your data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="data-queries/query-parameters.html">Query parameters &amp; clauses</a></li>
+<li class="toctree-l1"><a class="reference internal" href="data-queries/operators-and-types.html">Query operators &amp; data types</a></li>
+<li class="toctree-l1"><a class="reference internal" href="data-queries/advanced-query-usage.html">Advanced query usage</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Entity Connections</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="entity-connections/connecting-entities.html">Connecting entities</a></li>
+<li class="toctree-l1"><a class="reference internal" href="entity-connections/retrieving-entities.html">Retrieving connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="entity-connections/disconnecting-entities.html">Disconnecting entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Security &amp; Authentication</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="security-and-auth/app-security.html">Security &amp; token authentication</a></li>
+<li class="toctree-l1"><a class="reference internal" href="security-and-auth/using-permissions.html">Using permissions</a></li>
+<li class="toctree-l1"><a class="reference internal" href="security-and-auth/authenticating-users-and-application-clients.html">Authenticating users &amp; app clients</a></li>
+<li class="toctree-l1"><a class="reference internal" href="security-and-auth/user-authentication-types.html">Authentication levels</a></li>
+<li class="toctree-l1"><a class="reference internal" href="security-and-auth/changing-token-time-live-ttl.html">Changing token expiration (time-to-live)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="security-and-auth/authenticating-api-requests.html">Authenticating API requests</a></li>
+<li class="toctree-l1"><a class="reference internal" href="security-and-auth/revoking-tokens-logout.html">Revoking tokens (logout)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="security-and-auth/facebook-sign.html">Facebook sign in</a></li>
+<li class="toctree-l1"><a class="reference internal" href="security-and-auth/securing-your-app.html">Security best practices</a></li>
+</ul>
+<p class="caption"><span class="caption-text">User Management &amp; Social Graph</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="user-management/user-management.html">User management &amp; social graph</a></li>
+<li class="toctree-l1"><a class="reference internal" href="user-management/working-user-data.html">Working with User Data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="user-management/group.html">Working with group data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="user-management/activity.html">Activity</a></li>
+<li class="toctree-l1"><a class="reference internal" href="user-management/user-connections.html">Social Graph Connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="user-management/user-connections.html#creating-other-connections">Creating other connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="user-management/messagee-example.html">App Example - Messagee</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Geo-location</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="geolocation/geolocation.html">Geolocating your Entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Assets &amp; Files</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="asset-and-files/uploading-assets.html">Uploading assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="asset-and-files/retrieving-assets.html">Retrieving assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="asset-and-files/folders.html">Folders</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Counters &amp; Events</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="counters-and-events/events-and-counters.html">Counters &amp; events</a></li>
+<li class="toctree-l1"><a class="reference internal" href="counters-and-events/creating-and-incrementing-counters.html">Creating &amp; incrementing counters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="counters-and-events/creating-and-incrementing-counters.html#decrementing-resetting-counters">Decrementing/resetting counters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="counters-and-events/creating-and-incrementing-counters.html#using-counters-hierarchically">Using counters hierarchically</a></li>
+<li class="toctree-l1"><a class="reference internal" href="counters-and-events/retrieving-counters.html">Retrieving counters</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Organizations &amp; Applications</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="orgs-and-apps/managing.html">Organization &amp; application management</a></li>
+<li class="toctree-l1"><a class="reference internal" href="orgs-and-apps/organization.html">Organization</a></li>
+<li class="toctree-l1"><a class="reference internal" href="orgs-and-apps/application.html">Application</a></li>
+</ul>
+<p class="caption"><span class="caption-text">API Reference</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="rest-endpoints/api-docs.html">Methods</a></li>
+<li class="toctree-l1"><a class="reference internal" href="rest-endpoints/api-docs.html#models">Models</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Client SDKs</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="sdks/tbd.html">COMING SOON...</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Installing the Stack</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="installation/ug1-deploy-to-tomcat.html">Usegrid 1: Deploying to Tomcat</a></li>
+<li class="toctree-l1"><a class="reference internal" href="installation/ug1-launcher-quick-start.html">Usegrid 1: Launcher Quick-start</a></li>
+<li class="toctree-l1"><a class="reference internal" href="installation/ug2-deploy-to-tomcat.html">Usergrid 2: Deploy to Tomcat</a></li>
+</ul>
+<p class="caption"><span class="caption-text">More about Usergrid</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="reference/presos-and-videos.html">Presentations &amp; Videos</a></li>
+<li class="toctree-l1"><a class="reference internal" href="reference/contribute-code.html">How to Contribute Code &amp; Docs</a></li>
+</ul>
+
+          
+        
+      </div>
+      &nbsp;
+    </nav>
+
+    <section data-toggle="wy-nav-shift" class="wy-nav-content-wrap">
+
+      
+      <nav class="wy-nav-top" role="navigation" aria-label="top navigation">
+        <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
+        <a href="index.html">Apache Usergrid</a>
+      </nav>
+
+
+      
+      <div class="wy-nav-content">
+        <div class="rst-content">
+          <div role="navigation" aria-label="breadcrumbs navigation">
+  <ul class="wy-breadcrumbs">
+    <li><a href="index.html">Docs</a> &raquo;</li>
+      
+    <li>Apache Usergrid Documentation</li>
+      <li class="wy-breadcrumbs-aside">
+        
+          
+            <a href="_sources/README.txt" rel="nofollow"> View page source</a>
+          
+        
+      </li>
+  </ul>
+  <hr/>
+</div>
+          <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
+           <div itemprop="articleBody">
+            
+  <div class="section" id="apache-usergrid-documentation">
+<h1>Apache Usergrid Documentation<a class="headerlink" href="#apache-usergrid-documentation" title="Permalink to this headline">¶</a></h1>
+<p>Usergrid documentation is written in
+<a class="reference external" href="https://help.github.com/articles/markdown-basics/">Markdown</a> (*.md)
+and RST (.rst) formats and we use the Python based
+<a class="reference external" href="http://sphinx-doc.org/">Sphinx-Docs</a> documentation system to
+transform our Markdown and RST files to HTML format.</p>
+<div class="section" id="prerequisites">
+<h2>Prerequisites<a class="headerlink" href="#prerequisites" title="Permalink to this headline">¶</a></h2>
+<p>Sphinx requires Python and pip. Once you have Python, you can install
+sphinx and pip like so:</p>
+<div class="highlight-python"><div class="highlight"><pre>$ sudo easy_install sphinx
+$ sudo easy_install pip
+</pre></div>
+</div>
+</div>
+<div class="section" id="how-to-change-update-the-usergrid-documentation">
+<h2>How to change/update the Usergrid documentation<a class="headerlink" href="#how-to-change-update-the-usergrid-documentation" title="Permalink to this headline">¶</a></h2>
+</div>
+<div class="section" id="how-to-build-the-usergrid-documentation-using-sphinx">
+<h2>How to build the Usergrid documentation using Sphinx<a class="headerlink" href="#how-to-build-the-usergrid-documentation-using-sphinx" title="Permalink to this headline">¶</a></h2>
+<p>Sphinx runs via a Makefile in this, the docs directory. So, cd to this
+directory and make html:</p>
+<div class="highlight-python"><div class="highlight"><pre>cd $usergrid/docs
+make clean html
+</pre></div>
+</div>
+</div>
+<div class="section" id="how-to-update-the-usergrid-docs">
+<h2>How to update the Usergrid docs<a class="headerlink" href="#how-to-update-the-usergrid-docs" title="Permalink to this headline">¶</a></h2>
+<p>Find the Markdown (.md) or reST (.rst) files that you need to change,
+edit them and then run <code class="docutils literal"><span class="pre">make</span> <span class="pre">clean</span> <span class="pre">html</span></code> to generate the HTML into the
+<code class="docutils literal"><span class="pre">target/html</span></code> directory, where you can preview your changes.</p>
+<div class="section" id="note-the-difference-between-rst-and-markdown-files">
+<h3>Note the difference between RST and Markdown files<a class="headerlink" href="#note-the-difference-between-rst-and-markdown-files" title="Permalink to this headline">¶</a></h3>
+<p>Note that Sphinx&#8217;s native format is
+<a class="reference external" href="http://docutils.sourceforge.net/rst.html">reStructuredText</a> (RST)
+and not Markdown. This causes some issues. For example, using Sphinx
+directives in Markdown files sometimes works and sometimes does not. RST
+is a different format than Markdown and it has a different set of
+directives, some very useful for organizing a large set of documentation
+files.</p>
+</div>
+<div class="section" id="updating-the-table-of-contents">
+<h3>Updating the Table of Contents<a class="headerlink" href="#updating-the-table-of-contents" title="Permalink to this headline">¶</a></h3>
+<p>The Table of Contents for the documentation is in index.rst, which ties
+everything together with a series of RST <strong>toctree</strong> directives. All
+other files should be written in Markdown, unless they need some special
+RST directives that will not work in Markdown.</p>
+</div>
+<div class="section" id="dealing-with-other-tables">
+<h3>Dealing with other tables<a class="headerlink" href="#dealing-with-other-tables" title="Permalink to this headline">¶</a></h3>
+<p>A note about tables. Markdown and reST do not have very good table
+support. Simple tables are easy to do and you can find examples (e.g.
+connecting-entities.md) but for tables with multiple lines in each cell,
+you&#8217;ll probably want to use a raw HTML table, and there are plenty of
+examples of that around too.</p>
+</div>
+</div>
+<div class="section" id="how-to-publish-the-usergrid-docs-to-usergrid-website">
+<h2>How to publish the Usergrid docs to Usergrid website<a class="headerlink" href="#how-to-publish-the-usergrid-docs-to-usergrid-website" title="Permalink to this headline">¶</a></h2>
+<p>To update the Usergrid website you must copy the udpated docs files from
+<code class="docutils literal"><span class="pre">target/html</span></code> directory to the website directory at the root of the
+Usergrid project, i.e. <code class="docutils literal"><span class="pre">${usergrid-project-dir}/website/docs</span></code>.</p>
+<p>You can do this by running the script <code class="docutils literal"><span class="pre">update-website.sh</span></code>.</p>
+<p>Once you&#8217;ve done that then you should follow the instructions in the
+website/README.md file, which explains how to update the website.</p>
+</div>
+<div class="section" id="updating-the-rest-api-reference">
+<h2>Updating the REST API reference<a class="headerlink" href="#updating-the-rest-api-reference" title="Permalink to this headline">¶</a></h2>
+<p>The REST API documentation in <code class="docutils literal"><span class="pre">rest-endpoints/api-docs.md</span></code> is
+generated from a Swagger file in the directory <code class="docutils literal"><span class="pre">src/main/resources</span></code>,
+so DO NOT edit that file directly.</p>
+<p>If you need to update the REST API docs, you should edit the
+usergrid-swagger.yaml file and then re-generate the file.</p>
+<p>If you need to change the formatting of the REST API docs, then you will
+need to edit the Mustache templates in <code class="docutils literal"><span class="pre">src/main/resource</span></code> and you may
+need to edit the Groovy script that does the generation:
+<code class="docutils literal"><span class="pre">src/main/groovy/usergrid.ApiDocGenerator</span></code>.</p>
+<p>You will need: * Groovy 2.x *
+<a class="reference external" href="https://github.com/spullara/mustache.java">Mustache.java</a></p>
+<p><strong>NOTE</strong>: Mustache.hava is not in Maven Central so unfortunately, you
+will have to Git Clone Mustache.java before you can run the generation
+script.</p>
+<p>This is the command to run the generation:</p>
+<div class="highlight-python"><div class="highlight"><pre>groovy src/main/groovy/usergrid.ApiDocGenerator.groovy
+</pre></div>
+</div>
+<p>The script will update the file <code class="docutils literal"><span class="pre">rest-endpoints/api-docs.md</span></code> and when
+you are happy with your update you should commit and push that file with
+Git.</p>
+</div>
+</div>
+
+
+           </div>
+          </div>
+          <footer>
+  
+
+  <hr/>
+
+  <div role="contentinfo">
+    <p>
+        &copy; Copyright 2013-2015, Apache Usergrid.
+
+    </p>
+  </div>
+  Built with <a href="http://sphinx-doc.org/">Sphinx</a> using a <a href="https://github.com/snide/sphinx_rtd_theme">theme</a> provided by <a href="https://readthedocs.org">Read the Docs</a>.
+
+</footer>
+
+        </div>
+      </div>
+
+    </section>
+
+  </div>
+  
+
+
+  
+
+    <script type="text/javascript">
+        var DOCUMENTATION_OPTIONS = {
+            URL_ROOT:'./',
+            VERSION:'1.0',
+            COLLAPSE_INDEX:false,
+            FILE_SUFFIX:'.html',
+            HAS_SOURCE:  true
+        };
+    </script>
+      <script type="text/javascript" src="_static/jquery.js"></script>
+      <script type="text/javascript" src="_static/underscore.js"></script>
+      <script type="text/javascript" src="_static/doctools.js"></script>
+
+  
+
+  
+  
+    <script type="text/javascript" src="_static/js/theme.js"></script>
+  
+
+  
+  
+  <script type="text/javascript">
+      jQuery(function () {
+          SphinxRtdTheme.StickyNav.enable();
+      });
+  </script>
+   
+
+</body>
+</html>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2a55601f/content/docs/_images/cassandra.png
----------------------------------------------------------------------
diff --git a/content/docs/_images/cassandra.png b/content/docs/_images/cassandra.png
new file mode 100644
index 0000000..ac72781
Binary files /dev/null and b/content/docs/_images/cassandra.png differ

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2a55601f/content/docs/_images/iOS10seeusermsg.jpg
----------------------------------------------------------------------
diff --git a/content/docs/_images/iOS10seeusermsg.jpg b/content/docs/_images/iOS10seeusermsg.jpg
new file mode 100644
index 0000000..dfaee31
Binary files /dev/null and b/content/docs/_images/iOS10seeusermsg.jpg differ

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2a55601f/content/docs/_images/iOS1chooseapp.jpg
----------------------------------------------------------------------
diff --git a/content/docs/_images/iOS1chooseapp.jpg b/content/docs/_images/iOS1chooseapp.jpg
new file mode 100644
index 0000000..e81153f
Binary files /dev/null and b/content/docs/_images/iOS1chooseapp.jpg differ

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2a55601f/content/docs/_images/iOS2register.jpg
----------------------------------------------------------------------
diff --git a/content/docs/_images/iOS2register.jpg b/content/docs/_images/iOS2register.jpg
new file mode 100644
index 0000000..7666320
Binary files /dev/null and b/content/docs/_images/iOS2register.jpg differ

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2a55601f/content/docs/_images/iOS5emptyfeed.jpg
----------------------------------------------------------------------
diff --git a/content/docs/_images/iOS5emptyfeed.jpg b/content/docs/_images/iOS5emptyfeed.jpg
new file mode 100644
index 0000000..6b03c67
Binary files /dev/null and b/content/docs/_images/iOS5emptyfeed.jpg differ

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2a55601f/content/docs/_images/iOS6newmsg.jpg
----------------------------------------------------------------------
diff --git a/content/docs/_images/iOS6newmsg.jpg b/content/docs/_images/iOS6newmsg.jpg
new file mode 100644
index 0000000..0fe6164
Binary files /dev/null and b/content/docs/_images/iOS6newmsg.jpg differ

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2a55601f/content/docs/_images/iOS7feed1msg.jpg
----------------------------------------------------------------------
diff --git a/content/docs/_images/iOS7feed1msg.jpg b/content/docs/_images/iOS7feed1msg.jpg
new file mode 100644
index 0000000..f64d378
Binary files /dev/null and b/content/docs/_images/iOS7feed1msg.jpg differ

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2a55601f/content/docs/_images/login.png
----------------------------------------------------------------------
diff --git a/content/docs/_images/login.png b/content/docs/_images/login.png
new file mode 100644
index 0000000..565cf49
Binary files /dev/null and b/content/docs/_images/login.png differ

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2a55601f/content/docs/_images/portal1.png
----------------------------------------------------------------------
diff --git a/content/docs/_images/portal1.png b/content/docs/_images/portal1.png
new file mode 100644
index 0000000..0298f12
Binary files /dev/null and b/content/docs/_images/portal1.png differ

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2a55601f/content/docs/_images/portal2.png
----------------------------------------------------------------------
diff --git a/content/docs/_images/portal2.png b/content/docs/_images/portal2.png
new file mode 100644
index 0000000..71b787f
Binary files /dev/null and b/content/docs/_images/portal2.png differ

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2a55601f/content/docs/_images/portal3.png
----------------------------------------------------------------------
diff --git a/content/docs/_images/portal3.png b/content/docs/_images/portal3.png
new file mode 100644
index 0000000..89136a9
Binary files /dev/null and b/content/docs/_images/portal3.png differ

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2a55601f/content/docs/_images/portal4.png
----------------------------------------------------------------------
diff --git a/content/docs/_images/portal4.png b/content/docs/_images/portal4.png
new file mode 100644
index 0000000..be644e5
Binary files /dev/null and b/content/docs/_images/portal4.png differ

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2a55601f/content/docs/_images/portal5.png
----------------------------------------------------------------------
diff --git a/content/docs/_images/portal5.png b/content/docs/_images/portal5.png
new file mode 100644
index 0000000..f8781c5
Binary files /dev/null and b/content/docs/_images/portal5.png differ

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2a55601f/content/docs/_images/rdbms.png
----------------------------------------------------------------------
diff --git a/content/docs/_images/rdbms.png b/content/docs/_images/rdbms.png
new file mode 100644
index 0000000..ce9f2a7
Binary files /dev/null and b/content/docs/_images/rdbms.png differ

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2a55601f/content/docs/_images/reviews.png
----------------------------------------------------------------------
diff --git a/content/docs/_images/reviews.png b/content/docs/_images/reviews.png
new file mode 100644
index 0000000..3acb39d
Binary files /dev/null and b/content/docs/_images/reviews.png differ

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2a55601f/content/docs/_images/reviews2.png
----------------------------------------------------------------------
diff --git a/content/docs/_images/reviews2.png b/content/docs/_images/reviews2.png
new file mode 100644
index 0000000..85872f2
Binary files /dev/null and b/content/docs/_images/reviews2.png differ

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2a55601f/content/docs/_images/securitymodel0.png
----------------------------------------------------------------------
diff --git a/content/docs/_images/securitymodel0.png b/content/docs/_images/securitymodel0.png
new file mode 100644
index 0000000..9f3ee82
Binary files /dev/null and b/content/docs/_images/securitymodel0.png differ

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2a55601f/content/docs/_sources/README.txt
----------------------------------------------------------------------
diff --git a/content/docs/_sources/README.txt b/content/docs/_sources/README.txt
new file mode 100644
index 0000000..58ccf3b
--- /dev/null
+++ b/content/docs/_sources/README.txt
@@ -0,0 +1,69 @@
+# Apache Usergrid Documentation
+
+Usergrid documentation is written in [Markdown](https://help.github.com/articles/markdown-basics/) (*.md) and RST (.rst) formats and we use the Python based [Sphinx-Docs](http://sphinx-doc.org/) documentation system to transform our Markdown and RST files to HTML format.
+
+## Prerequisites
+
+Sphinx requires Python and pip. Once you have Python, you can install sphinx and pip like so:
+
+	$ sudo easy_install sphinx
+	$ sudo easy_install pip
+
+## How to change/update the Usergrid documentation 
+
+
+
+## How to build the Usergrid documentation using Sphinx
+
+Sphinx runs via a Makefile in this, the docs directory. So, cd to this directory and make html:
+
+	cd $usergrid/docs
+	make clean html
+
+## How to update the Usergrid docs 
+
+Find the Markdown (.md) or reST (.rst) files that you need to change, edit them and then run ``make clean html`` to generate the HTML into the ``target/html`` directory, where you can preview your changes. 
+
+### Note the difference between RST and Markdown files
+
+Note that Sphinx's native format is [reStructuredText](http://docutils.sourceforge.net/rst.html) (RST) and not Markdown. This causes some issues. For example, using Sphinx directives in Markdown files sometimes works and sometimes does not. RST is a different format than Markdown and it has a different set of directives, some very useful for organizing a large set of documentation files.
+
+### Updating the Table of Contents
+
+The Table of Contents for the documentation is in index.rst, which ties everything together
+with a series of RST __toctree__ directives. All other files should be written in Markdown,
+unless they need some special RST directives that will not work in Markdown.
+
+### Dealing with other tables
+
+A note about tables. Markdown and reST do not have very good table support. Simple tables are easy to do and you can find examples (e.g. connecting-entities.md) but for tables with multiple lines in each cell, you'll probably want to use a raw HTML table, and there are plenty of examples of that around too.
+
+## How to publish the Usergrid docs to Usergrid website
+
+To update the Usergrid website you must copy the udpated docs files from ``target/html`` directory to the website directory at the root of the Usergrid project, i.e. ``${usergrid-project-dir}/website/docs``.
+
+You can do this by running the script ``update-website.sh``.
+
+Once you've done that then you should follow the instructions in the website/README.md file, which explains how to update the website.
+
+## Updating the REST API reference
+
+The REST API documentation in ``rest-endpoints/api-docs.md`` is generated from a Swagger file in the 
+directory ``src/main/resources``, so DO NOT edit that file directly.
+
+If you need to update the REST API docs, you should edit the usergrid-swagger.yaml file and then
+ re-generate the file. 
+
+If you need to change the formatting of the REST API docs, then you will need to edit the Mustache templates in ``src/main/resource`` and you may need to edit the Groovy script that does the generation: ``src/main/groovy/usergrid.ApiDocGenerator``.
+ 
+You will need:
+* Groovy 2.x
+* [Mustache.java](https://github.com/spullara/mustache.java) 
+
+__NOTE__: Mustache.hava is not in Maven Central so unfortunately, you will have to Git Clone Mustache.java before you can run the generation script.
+
+This is the command to run the generation:
+
+	groovy src/main/groovy/usergrid.ApiDocGenerator.groovy
+	
+The script will update the file ``rest-endpoints/api-docs.md`` and when you are happy with your update you should commit and push that file with Git.

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2a55601f/content/docs/_sources/asset-and-files/assets.txt
----------------------------------------------------------------------
diff --git a/content/docs/_sources/asset-and-files/assets.txt b/content/docs/_sources/asset-and-files/assets.txt
new file mode 100644
index 0000000..ea7291c
--- /dev/null
+++ b/content/docs/_sources/asset-and-files/assets.txt
@@ -0,0 +1,20 @@
+# Assets
+
+Asset entities are used primarily in Apache Usergrid to manage binary data
+objects such as images, video, and audio content. However, an asset does
+not have to be used for a binary object. For example, assets can be used
+to model a file system.
+
+
+  Property       Type     Description
+  -------------- -------- ---------------------------------------------------------------------------------
+  uuid           UUID     Asset’s unique entity ID
+  type           string   "asset"
+  name           string   Asset name (mandatory)
+  created        long     [UNIX timestamp](http://en.wikipedia.org/wiki/Unix_time) of entity creation
+  modified       long     [UNIX timestamp](http://en.wikipedia.org/wiki/Unix_time) of entity modification
+  owner          UUID     UUID of the asset’s owner (mandatory)
+  path           string   Relative path to the asset (mandatory)
+  content-type   string   Content type of the asset (for example, “image/jpeg”)
+
+ 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2a55601f/content/docs/_sources/asset-and-files/file-storage-configuration.txt
----------------------------------------------------------------------
diff --git a/content/docs/_sources/asset-and-files/file-storage-configuration.txt b/content/docs/_sources/asset-and-files/file-storage-configuration.txt
new file mode 100644
index 0000000..c56265a
--- /dev/null
+++ b/content/docs/_sources/asset-and-files/file-storage-configuration.txt
@@ -0,0 +1,39 @@
+# File storage configuration
+
+Usergrid can store your assets either on your hard drive or in the Amazon S3 cloud.
+
+Local storage configuration
+---
+
+By default assets are stored in the temporary folder /tmp/usergrid
+This can be changed by editing this file /stack/rest/src/main/resources/usergrid-rest-context.xml and replacing {usergrid.temp.files} by the wanted destination
+```xml
+<bean id="binaryStore" class="org.apache.usergrid.services.assets.data.LocalFileBinaryStore">
+  <property name="reposLocation" value="${usergrid.temp.files}"/>
+</bean>
+```
+
+AwS S3 configuration
+---
+
+To use your AWS S3 storage you need to change the binaryStore classpath and add several constructor arguments in /stack/rest/src/main/resources/usergrid-rest-context.xml
+
+Some examples :
+```xml
+<bean id="binaryStore" class="org.apache.usergrid.services.assets.data.AwsSdkS3BinaryStore">
+  <constructor-arg name="accessId" value="x" />
+  <constructor-arg name="secretKey" value="xx" />
+  <constructor-arg name="bucketName" value="x" />
+  <constructor-arg name="regionName" value="eu-central-1" />
+</bean>
+```
+the regionName field is not mandatory, this code is also valid
+```xml
+<bean id="binaryStore" class="org.apache.usergrid.services.assets.data.AwsSdkS3BinaryStore">
+  <constructor-arg name="accessId" value="x" />
+  <constructor-arg name="secretKey" value="xx" />
+  <constructor-arg name="bucketName" value="x" />
+</bean>
+```
+
+The filesize is limited to 50GB but you need to keep in mind that the file has to be stored on the hard drive before being sended to Amazon.

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2a55601f/content/docs/_sources/asset-and-files/folders.txt
----------------------------------------------------------------------
diff --git a/content/docs/_sources/asset-and-files/folders.txt b/content/docs/_sources/asset-and-files/folders.txt
new file mode 100644
index 0000000..7c425be
--- /dev/null
+++ b/content/docs/_sources/asset-and-files/folders.txt
@@ -0,0 +1,85 @@
+# Folders
+
+## Linking a folder to an asset
+In order to access the asset for the image in the folder, you need to link the folder to the asset. You can do that by issuing a POST request in the following format:
+
+    POST /{org-uuid}/{app-uuid}/folders/{folder-uuid}/assets/{assets_id}
+    
+where ``{folder-uuid}`` is the UUID of the folder, and ``{assets-uuid}`` is the UUID of the assets entity.
+
+Here’s how you could link the folder and the asset you created for the my-image.jpg image:
+
+    POST https://api.usergrid.com/my-org/my-app/folders/6640a601-2ac6-11e2-92c3-02e81ae640dc/assets/9501cda1-2d21-11e2-b4c6-02e81ac5a17b 
+    
+In the response, you should see the assets entity for the image added to the folder:
+
+    {
+      "action": "post",
+      "application": "3400ba10-cd0c-11e1-bcf7-12313d1c4491",
+      "params": {},
+      "path": "/folders/6640a601-2ac6-11e2-92c3-02e81ae640dc/assets",
+      "uri": "https://api.usergrid.com/my-org/my-app/folders/6640a601-2ac6-11e2-92c3-02e81ae640dc/assets",
+      "entities": [
+        {
+          "uuid": "9501cda1-2d21-11e2-b4c6-02e81ac5a17b",
+          "type": "asset",
+          "name": "my-image.jpg",
+          "created": 1352763303163,
+          "modified": 1352763303163,
+          "metadata": {
+            "path": "/folders/6640a601-2ac6-11e2-92c3-02e81ae640dc/assets/9501cda1-2d21-11e2-b4c6-02e81ac5a17b"
+          },
+          "owner": "5c0c1789-d503-11e1-b36a-12313b01d5c1",
+          "path": "/myassets/asset1"
+        }
+      ],
+      "timestamp": 1352830448045,
+      "duration": 54,
+      "organization": "my-org”,
+      "applicationName": "my-app"
+    }
+    
+## Retrieve list of folder assets
+You can also request a list of the linked contents of the folder like this:
+
+    GET https://api.usergrid.com/my-org/my-app/folders/6640a601-2ac6-11e2-92c3-02e81ae640dc/assets
+    
+The response should look something like this:
+
+    {
+      "action": "get",
+      "application": "3400ba10-cd0c-11e1-bcf7-12313d1c4491",
+      "params": {
+        "_": [
+          "1352830364891"
+        ]
+      },
+      "path": "/folders/6640a601-2ac6-11e2-92c3-02e81ae640dc/assets",
+      "uri": "https://api.usergrid.com/my-org/my-app/folders/6640a601-2ac6-11e2-92c3-02e81ae640dc/assets",
+      "entities": [
+        {
+          "uuid": "7bf47435-2ac8-11e2-b4c6-02e81ac5a17b",
+          "type": "asset",
+          "name": "my-image.jpg",
+          "created": 1352505133598,
+          "modified": 1352507245108,
+          "checksum": "8e0cd3866ee20746c99e9a9825f38ad8",
+          "content-length": 11853,
+          "content-type": "image/jpeg",
+          "etag": "\"8e0cd3866ee20746c99e9a9825f38ad8\"",
+          "metadata": {
+            "connecting": {
+              "assets": "/folders/6640a601-2ac6-11e2-92c3-02e81ae640dc/assets/7bf47435-2ac8-11e2-b4c6-02e81ac5a17b/connecting/assets"
+            },
+            "connection": "assets",
+            "path": "/folders/6640a601-2ac6-11e2-92c3-02e81ae640dc/assets/7bf47435-2ac8-11e2-b4c6-02e81ac5a17b"
+          },
+          "owner": "5c0c1789-d503-11e1-b36a-12313b01d5c1",
+          "path": "my-image"
+        }
+      ],
+      "timestamp": 1352830363797,
+      "duration": 57,
+      "organization": "my-org",
+      "applicationName": "my-app"
+    }

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2a55601f/content/docs/_sources/asset-and-files/legacy-asset-support.txt
----------------------------------------------------------------------
diff --git a/content/docs/_sources/asset-and-files/legacy-asset-support.txt b/content/docs/_sources/asset-and-files/legacy-asset-support.txt
new file mode 100644
index 0000000..e69de29

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2a55601f/content/docs/_sources/asset-and-files/retrieving-assets.txt
----------------------------------------------------------------------
diff --git a/content/docs/_sources/asset-and-files/retrieving-assets.txt b/content/docs/_sources/asset-and-files/retrieving-assets.txt
new file mode 100644
index 0000000..9313ae8
--- /dev/null
+++ b/content/docs/_sources/asset-and-files/retrieving-assets.txt
@@ -0,0 +1,27 @@
+# Retrieving assets
+
+## Retrieving asset data
+
+To retrieve the asset from an entity, send a ``GET`` request with the ``Accept`` header set to the content type of the asset. The content type can be retrieved from the ``file-metadata.content-type`` property of the entity the asset is attached to.
+
+### Request syntax
+
+    curl -X GET -H 'Accept: <content_type>' 'https://api.usergrid.com/<org>/<app>/<collection>/<entity>
+
+Parameters
+
+Parameter	     Description
+---------        -----------
+content_type	 The content type of the attached asset. For example, text/plain, image/jpeg.
+org	Organization UUID or organization name
+app	Application  UUID or application name
+collection	     Name or UUID of the collection of the entity the asset is attached to.
+entity	         Name or UUID of the entity the asset is attached to.
+
+### Example request
+The following request will retrieve the data for a jpeg file attached to an entity named 'cloud' in the 'pictures' collection:
+
+    curl -X GET -H 'Accept: image/jpeg' 'https://api.usergrid.com/your-org/your-app/pictures/cloud
+    
+## Retrieving an asset entity
+To retrieve the entity that an asset is attached to, perform a ``GET`` request as you normally would to retrieve an entity. For more information, see [Retrieving Data Entities](../data-storage/entities.html#retrieving-data-entities).
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2a55601f/content/docs/_sources/asset-and-files/uploading-assets.txt
----------------------------------------------------------------------
diff --git a/content/docs/_sources/asset-and-files/uploading-assets.txt b/content/docs/_sources/asset-and-files/uploading-assets.txt
new file mode 100644
index 0000000..c5b836f
--- /dev/null
+++ b/content/docs/_sources/asset-and-files/uploading-assets.txt
@@ -0,0 +1,86 @@
+# Uploading assets
+
+With Usergrid, you can store and retrieve files and assets that hold data objects such as images, video, and audio content.
+
+Usergrid manages these objects as Asset entities. Optionally, you can use Folder entities to organize related assets.
+
+## Uploading assets
+Assets can be any file type and can be attached to any entity. When an asset is uploaded, Usergrid will automatically detect the file metadata for the asset and save it in the associated entity as a ``file-metadata`` property. Only 1 asset can be attached to an entity.
+
+To attach an asset to an entity, do the following:
+
+### Request syntax
+
+    curl -X POST -F name='<filename>' -F file=@<file_location> 'https://api.usergrid.com/<org>/<app>/<collection>/<entity>
+    
+Parameters
+
+Parameter	        Description
+---------           -----------
+filename	        A filename to associate with the asset.
+file_location	    The location of the asset to be uploaded.
+org	Organization    UUID or organization name
+app	Application     UUID or application name
+collection	        Name or UUID of the collection of the entity you want to attach the asset to.
+entity	            Name or UUID of an existing entity you want to attach the asset to.
+
+### Example request
+
+    curl -X POST -i -F name='clouds' -F file=@happy_clouds.jpg 'https://api.usergrid.com/your-org/your-app/pictures/'
+    
+### Example response
+
+Notice the ``file-metadata`` property in the response.
+
+    {
+        "action" : "post",
+        "application" : "f34f4222-a166-11e2-a7f7-02e81adcf3d0",
+        "params" : { },
+        "path" : "/users",
+        "uri" : "https://api.usergrid.com/amuramoto/sandbox/pictures",
+        "entities" : [ {
+        "uuid" : "410b213a-b379-11e3-a0e5-9953085ea376",
+        "type" : "user",
+        "name" : "test",
+        "created" : 1395681911491,
+        "modified" : 1399069838919,
+        "name" : "clouds",    
+        "file" : "fobnszewobnioerabnoiawegbrn\n",
+        "file-metadata" : {
+          "content-type" : "image/jpeg",
+          "etag" : "\"2e1db7299b0a667ed80e674a0ef9d653\"",
+          "last-modified" : 1399070010115,
+          "content-length" : 28,
+          "checksum" : "2e1db7299b0a667ed80e674a0ef9d653"
+        },
+        "metadata" : {
+          "connecting" : {        
+            "likes" : "/users/410b213a-b379-11e3-a0e5-9953085ea376/connecting/likes"
+          },
+          "path" : "/users/410b213a-b379-11e3-a0e5-9953085ea376",
+          "sets" : {
+            "rolenames" : "/users/410b213a-b379-11e3-a0e5-9953085ea376/roles",
+            "permissions" : "/users/410b213a-b379-11e3-a0e5-9953085ea376/permissions"
+          },
+          "connections" : {
+            "follows" : "/users/410b213a-b379-11e3-a0e5-9953085ea376/follows"
+          },
+          "collections" : {
+            "activities" : "/users/410b213a-b379-11e3-a0e5-9953085ea376/activities",
+            "devices" : "/users/410b213a-b379-11e3-a0e5-9953085ea376/devices",
+            "feed" : "/users/410b213a-b379-11e3-a0e5-9953085ea376/feed",
+            "groups" : "/users/410b213a-b379-11e3-a0e5-9953085ea376/groups",
+            "roles" : "/users/410b213a-b379-11e3-a0e5-9953085ea376/roles",
+            "following" : "/users/410b213a-b379-11e3-a0e5-9953085ea376/following",
+            "followers" : "/users/410b213a-b379-11e3-a0e5-9953085ea376/followers"
+          }
+        }
+        } ],
+        "timestamp" : 1399070009986,
+        "duration" : 441,
+        "organization" : "your-org",
+        "applicationName" : "your-app"
+    }
+
+## Updating assets
+To update the data for an asset, perform the same request outlined above in 'Uploading assets' as a ``PUT`` request rather than a ``POST``.

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2a55601f/content/docs/_sources/counters-and-events/creating-and-incrementing-counters.txt
----------------------------------------------------------------------
diff --git a/content/docs/_sources/counters-and-events/creating-and-incrementing-counters.txt b/content/docs/_sources/counters-and-events/creating-and-incrementing-counters.txt
new file mode 100644
index 0000000..3bf7f57
--- /dev/null
+++ b/content/docs/_sources/counters-and-events/creating-and-incrementing-counters.txt
@@ -0,0 +1,74 @@
+## Creating & incrementing counters
+To create a new counter or increment an existing counter, include the counter property in the body of a POST to the /events endpoint. More than one counter can be incremented in the same request.
+
+__Note__: It may take up to 30 seconds after an event has been posted for the counter to be incremented.
+
+### Request syntax
+
+    curl -X POST https://api.usergrid.com/<org>/<app>/events -d '{"timestamp":<timestamp>, "counters" : {<counter_name>:<increment_value>}}'
+    
+Parameters
+
+Parameter	    Description
+---------       -----------
+org	            Organization UUID or organization name
+app	            Application UUID or application name
+timestamp	    A required UNIX timestamp that specifies the time the counter is being incremented. 
+counter_name    The name of the counter to create or the existing counter to increment.
+increment_value	The value to increment the counter by. 
+
+Regarding the ``increment_value``, a negative number can be specified to decrement the value. A value of '0' can be specified to reset the value of the counter.
+
+For the ``timestamp``, specifying a value of 0 will automatically assign the current time.
+
+### Example request
+The following request will increment the 'button_clicks' counter by one, with a timestamp of the current time.
+
+    curl -X POST https://api.usergrid.com/your-org/your-app/events -d '{"timestamp":0, "counters" : {"button_clicks":1}}'
+    
+### Example response
+
+    {
+      "action" : "post",
+      "application" : "f34f4222-a166-11e2-a7f7-02e81adcf3d0",
+      "params" : { },
+      "path" : "/events",
+      "uri" : "https://api.usergrid.com/your-org/your-app/events",
+      "entities" : [ {
+        "uuid" : "b11217fc-9d3a-1427-b24e-699740088e05",
+        "type" : "event",
+        "created" : 1401224590293,
+        "modified" : 1401224590293,
+        "timestamp" : 1401224590293,
+        "counters" : {
+          "button_clicks" : 1
+        },
+        "message" : null,
+        "metadata" : {
+          "path" : "/events/b11217fc-9d3a-1427-b24e-699740088e05"
+        }
+      } ],
+      "timestamp" : 1401224590291,
+      "duration" : 30,
+      "organization" : "your-org",
+      "applicationName" : "your-app"
+    }
+		
+## Decrementing/resetting counters
+To decrement a counter, specify a negative number for the counter value in any of the above examples.
+
+To reset a counter, specify a value of 0 for the counter value in any of the above examples.
+
+Note that the Usergrid JavaScript SDK also provides dedicated methods for decrementing and resetting counters.
+
+## Using counters hierarchically
+
+You can organize counters into hierarchies by giving them dot-separated names, e.g. ``button_clicks.homepage``. Incrementing a counter lower in a hierarchy increments all of the counters upward in the hierarchy chain. 
+
+For example, you want to log errors that your app generates, so you create hierarchical counters for each module and function within that module. In this example, you create the following set of counters:
+
+    errors
+    errors.module
+    errors.module.function
+
+Incrementing ``errors.module.function`` by 1 increments all three counters by 1. A hierarchy can be a useful way of easily tracking actions in your app at both a cumulative and granular level.
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2a55601f/content/docs/_sources/counters-and-events/events-and-counters.txt
----------------------------------------------------------------------
diff --git a/content/docs/_sources/counters-and-events/events-and-counters.txt b/content/docs/_sources/counters-and-events/events-and-counters.txt
new file mode 100644
index 0000000..cbb0b93
--- /dev/null
+++ b/content/docs/_sources/counters-and-events/events-and-counters.txt
@@ -0,0 +1,8 @@
+# Counters & events
+Counters can be used to track statistics on many aspects of an application by keeping a running count of the number of times an action occurs in your app. Posting an event increments the counter. Counters can also be retrieved by time period, allowing you to generate reports on specific actions in your app.
+
+With Usergrid, you can define your own counters. Some of the things that you might track with a user-defined counter are:
+
+* How many times people click on the help button in your application.
+* How many times your game is played each day.
+* How many times your banner ads are clicked each day.

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2a55601f/content/docs/_sources/counters-and-events/retrieving-counters.txt
----------------------------------------------------------------------
diff --git a/content/docs/_sources/counters-and-events/retrieving-counters.txt b/content/docs/_sources/counters-and-events/retrieving-counters.txt
new file mode 100644
index 0000000..5210952
--- /dev/null
+++ b/content/docs/_sources/counters-and-events/retrieving-counters.txt
@@ -0,0 +1,109 @@
+# Retrieving counters
+To retrieve a counter, do the following:
+
+## Request syntax
+
+    curl -X GET https://api.usergrid.com/counters?counter=<counter_name>
+    
+Parameters
+
+Parameter       Description
+---------       -----------
+counter_name	The name of the counter to be retrieved. 
+
+More than one counter can be retrieved with a single request by appending additional counter parameters to the request URI.
+
+## Example request
+
+    curl -X GET https://api.usergrid.com/my-org/my-app/counters?counter=button_clicks
+    
+## Example response
+
+    {
+      "action" : "get",
+      "application" : "f34f4222-a166-11e2-a7f7-02e81adcf3d0",
+      "params" : {
+        "counter" : [ "button_clicks" ]
+      },
+      "uri" : "https://api.usergrid.com/your-org/your-app",
+      "entities" : [ ],
+      "timestamp" : 1401310084096,
+      "duration" : 21,
+      "organization" : "your-org",
+      "applicationName" : "your-app",
+      "count" : 0,
+      "counters" : [ {
+        "name" : "button_clicks",
+        "values" : [ {
+          "timestamp" : 1,
+          "value" : 9
+        } ]
+      } ]
+    }
+		
+## Retrieving counters by time interval
+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.
+
+For example, let’s say you’re incrementing a counter every time someone launches your application. You might be interested in which days of the week the application sees the most usage. Using the API, you can examine the counter over a set of weeks, with the data split into daily intervals. Using this information, you can see which are your peak days of usage. You can also view usage across a single day, so you can see if your application is used more in the mornings or the evenings.
+
+## Request syntax
+
+    curl -X GET https://api.usergrid.com/counters?start_time=<timestamp>&end_time=<timestamp>&resolution=<resolution>&counter=<counter_name>
+    
+Parameters
+
+Parameter	 Description
+---------    -----------
+start_time   The beginning of the time period to search
+end_time     The end of the time period to search
+resolution   The interval at which counters are displayed. 
+counter_name The name of the counter to be retrieved.
+
+The following resolutions are supported:
+
+* all
+* minute
+* five_minutes
+* half_hour
+* hour
+* six_day
+* day
+* week
+* month
+
+For example, if the interval is day, and the start time and end time values span 4 days, you will get aggregate counts for each of the 4 days.
+
+## Example request
+
+For example, to retrieve a time range of values, with a granularity of "day", for a counter called "button_clicks", the GET request would look like this:
+
+    curl -X GET https://api.usergrid.com/my-org/my-app/counters?start_time=1315119600000&end_time=1315724400000&resolution=day&counter=button_clicks
+    
+## Example response
+
+    {
+     action: "get",
+        uri: "http://api.usergrid.com/438a1ca1-cf9b-11e0-bcc1-12313f0204bb/counters",
+        timestamp: 1315354369272,
+        duration: 28,
+        counters: [
+            {
+                name: "button_clicks",
+                values: [
+                    {
+                        value: 2
+                        timestamp: 1315180800000
+                    },
+                    {
+                        value: 1
+                        timestamp: 1315267200000
+                    },
+                    {
+                        value: 1
+                        timestamp: 1315353600000
+                    }
+                ]
+            }
+        ]
+    }
+		
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2a55601f/content/docs/_sources/data-queries/advanced-query-usage.txt
----------------------------------------------------------------------
diff --git a/content/docs/_sources/data-queries/advanced-query-usage.txt b/content/docs/_sources/data-queries/advanced-query-usage.txt
new file mode 100644
index 0000000..4b78215
--- /dev/null
+++ b/content/docs/_sources/data-queries/advanced-query-usage.txt
@@ -0,0 +1,23 @@
+# Advanced query usage
+
+<div class="admonition note"> <p class="first admonition-title">Note</p> <p class="last">

+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></div>
+
+## Attaching a query to all API calls
+
+
+<div class="admonition note"> <p class="first admonition-title">Note</p> <p class="last">

+<p>JavaScript SDK only.</p>
+In some cases, it may be convenient to attach a query or other URI parameter to every call you make to Usergrid, such as a custom identifier or token. To do this with the Usergrid JavaScript SDK, add a qs property to your Usergrid.Client object when you initialize the SDK. For more on initializing the SDK, see our install guide.
+</p></div>
+
+For example, the following would append ?custom_id=1234 to every call sent from the Usergrid JavaScript SDK to Usergrid:
+
+    var options = {
+        orgName:'yourOrg',
+        appName:'yourApp',
+        qs:'custom_id=1234'
+    }
+    var dataClient = new Usergrid.Client(options);
+

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2a55601f/content/docs/_sources/data-queries/operators-and-types.txt
----------------------------------------------------------------------
diff --git a/content/docs/_sources/data-queries/operators-and-types.txt b/content/docs/_sources/data-queries/operators-and-types.txt
new file mode 100644
index 0000000..c67ccd1
--- /dev/null
+++ b/content/docs/_sources/data-queries/operators-and-types.txt
@@ -0,0 +1,120 @@
+# Query operators & data types
+
+The following operators and data types are supported by the SQL-like query language in Usergrid.
+
+## Operators
+
+<table class="usergrid-table">
+    <tr>
+        <td>Operator</td>
+        <td>Purpose</td>
+        <td>Example</td>
+    </tr>
+    <tr>
+        <td>'<' or 'lt'</td>
+        <td>Less than</td>
+        <td>select * where quantity > '1000'</td>
+    </tr>
+    <tr>
+        <td>'<=' or 'lte'</td>
+        <td>Less than or equal to</td>
+        <td>Example</td>
+    </tr>
+    <tr>
+        <td>'=' or 'eq'</td>
+        <td>Equals</td>
+        <td>select * where price = '20.00'</td>
+    </tr>
+    <tr>
+        <td>'>=' or 'gte'</td>
+        <td>Greater than or equal to </td>
+        <td>select * where quantity >= '1000'</td>
+    </tr>
+    <tr>
+        <td>'>' or 'gt'</td>
+        <td>Greater than</td>
+        <td>select * where quantity > '1000'</td>
+    </tr>
+    <tr>
+        <td>not <some_expression></td>
+        <td>Subtraction of results</td>
+        <td>select * where quantity < '4000' and not quantity = '2000'</td>
+    </tr>
+    <tr>
+        <td>and</td>
+        <td>Union of results</td>
+        <td>select * where quantity > '1000' and quantity < '4000'</td>
+    </tr>
+    <tr>
+        <td>or</td>
+        <td>Intersection of results</td>
+        <td>select * where quantity = '1000' or quantity = '4000'</td>
+    </tr>
+    <tr>
+        <td>contains</td>
+        <td>Narrow by contained text</td>
+        <td>select * where title contains 'tale'</td>
+    </tr>
+</table>
+
+
+## Data types
+
+As you develop queries, remember that entity properties each conform to a particular data type. For example, in the default entity User, the name property is stored as a string, the created date as a long, and metadata is stored as a JSON object. Your queries must be data type-aware to ensure that query results are as you expect them to be.
+
+For example, if you create an entity with a price property with a value of 100.00, querying for 100 will return no results, since the API expected a decimal-delimited float value in your query.
+
+For a list of property data types for each default entities, see Default Data Entity Types.
+
+<table class="usergrid-table">
+    <tr>
+        <td>string</td>
+        <td><pre>'value', unicode '\uFFFF', octal '\0707'</pre></td>
+    </tr>
+    <tr>
+        <td>long</td>
+        <td><pre>1357412326021</pre> <br> Timestamps are typically stored as long values.</td>
+    </tr>
+    <tr>
+        <td>float</td>
+        <td><pre>10.1, -10.1, 10e10, 10e-10, 10E10, 10E-10</pre> <br>
+        Your query must be specific about the value you're looking for, down to the value 
+        (if any) after the decimal point.</td>
+    </tr>
+    <tr>
+        <td>boolean</td>
+        <td><pre>true | false</pre></td>
+    </tr>
+    <tr>
+        <td>UUID</td>
+        <td><pre>ee912c4b-5769-11e2-924d-02e81ac5a17b</pre></td>
+    </tr>
+    <tr>
+        <td>Array</td>
+        <td><pre>["boat", "car", "bike"]</pre></td>
+    </tr>
+    <tr>
+        <td>object</td>
+        <td><p>For a JSON object like this one:</p>
+            <pre>
+                {
+                 "items": [
+                  {
+                   "name": "rocks"
+                  },
+                  {
+                   "name": "boats"
+                  }
+                 ]
+                }
+            </pre>
+            <p>you can use dot notation to reach property values in the object:</p>
+            <pre>
+                 /mycollection/thing?ql="select * where items.name = 'rocks'"
+            </pre>
+            <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>
+            <p>Please note that object properties are not indexed. This means queries 
+            using dot-notation will be much slower than queries on indexed entity properties.</p></td>
+    </tr>
+</table>


Mime
View raw message