Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/usergrid into USERGRID-1246
# By Dave Johnson # Via Dave Johnson * 'master' of https://git-wip-us.apache.org/repos/asf/usergrid: Docs are for "2.x" and not "1.0" Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/c97ffa7e Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/c97ffa7e Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/c97ffa7e Branch: refs/heads/USERGRID-1246-MASTER Commit: c97ffa7e1485cf1f192177eba76f82fa90ffe53c Parents: b252ac5 279c020 Author: George Reyes <g...@apache.org> Authored: Mon May 2 10:51:07 2016 -0700 Committer: George Reyes <g...@apache.org> Committed: Mon May 2 10:51:07 2016 -0700 ---------------------------------------------------------------------- content/docs/README.html | 8 ++++---- .../file-storage-configuration.html | 8 ++++---- content/docs/assets-and-files/folders.html | 8 ++++---- .../assets-and-files/legacy-asset-support.html | 8 ++++---- .../docs/assets-and-files/retrieving-assets.html | 8 ++++---- .../docs/assets-and-files/uploading-assets.html | 8 ++++---- .../creating-and-incrementing-counters.html | 8 ++++---- .../counters-and-events/events-and-counters.html | 8 ++++---- .../counters-and-events/retrieving-counters.html | 8 ++++---- .../docs/data-queries/advanced-query-usage.html | 8 ++++---- content/docs/data-queries/operators-and-types.html | 8 ++++---- content/docs/data-queries/query-parameters.html | 8 ++++---- content/docs/data-queries/querying-your-data.html | 8 ++++---- content/docs/data-storage/collections.html | 8 ++++---- content/docs/data-storage/data-store-dbms.html | 8 ++++---- content/docs/data-storage/entities.html | 8 ++++---- content/docs/data-storage/optimizing-access.html | 8 ++++---- .../entity-connections/connecting-entities.html | 8 ++++---- .../entity-connections/disconnecting-entities.html | 8 ++++---- .../entity-connections/retrieving-entities.html | 8 ++++---- content/docs/genindex.html | 8 ++++---- content/docs/geolocation/geolocation.html | 8 ++++---- content/docs/index.html | 8 ++++---- content/docs/installation/deployment-guide.html | 8 ++++---- .../docs/installation/ug1-deploy-to-tomcat.html | 8 ++++---- .../installation/ug1-launcher-quick-start.html | 8 ++++---- .../docs/installation/ug2-deploy-to-tomcat.html | 8 ++++---- content/docs/introduction/async-vs-sync.html | 8 ++++---- content/docs/introduction/data-model.html | 8 ++++---- content/docs/introduction/overview.html | 8 ++++---- content/docs/introduction/usergrid-features.html | 8 ++++---- content/docs/jersey2skeleton/README.html | 8 ++++---- content/docs/objects.inv | Bin 686 -> 686 bytes content/docs/orgs-and-apps/admin-user.html | 8 ++++---- content/docs/orgs-and-apps/application.html | 8 ++++---- content/docs/orgs-and-apps/managing.html | 8 ++++---- content/docs/orgs-and-apps/organization.html | 8 ++++---- .../push-notifications/adding-push-support.html | 8 ++++---- .../creating-and-managing-notifications.html | 8 ++++---- .../push-notifications/creating-notifiers.html | 8 ++++---- .../docs/push-notifications/getting-started.html | 8 ++++---- .../managing-users-and-devices.html | 8 ++++---- content/docs/push-notifications/overview.html | 8 ++++---- content/docs/push-notifications/registering.html | 8 ++++---- content/docs/push-notifications/tbd.html | 8 ++++---- .../docs/push-notifications/troubleshooting.html | 8 ++++---- content/docs/push-notifications/tutorial.html | 8 ++++---- content/docs/push-notifications/users-devices.html | 8 ++++---- content/docs/reference/contribute-code.html | 8 ++++---- content/docs/reference/presos-and-videos.html | 8 ++++---- content/docs/rest-endpoints/api-docs.html | 8 ++++---- content/docs/sdks/ios-new.html | 8 ++++---- content/docs/sdks/sdk-outline.html | 8 ++++---- content/docs/sdks/tbd.html | 8 ++++---- content/docs/search.html | 8 ++++---- content/docs/security-and-auth/app-security.html | 8 ++++---- .../authenticating-api-requests.html | 8 ++++---- ...thenticating-users-and-application-clients.html | 8 ++++---- .../changing-token-time-live-ttl.html | 8 ++++---- content/docs/security-and-auth/facebook-sign.html | 8 ++++---- .../security-and-auth/revoking-tokens-logout.html | 8 ++++---- .../docs/security-and-auth/securing-your-app.html | 8 ++++---- .../user-authentication-types.html | 8 ++++---- .../docs/security-and-auth/using-permissions.html | 8 ++++---- content/docs/security-and-auth/using-roles.html | 8 ++++---- content/docs/user-management/activity.html | 8 ++++---- content/docs/user-management/group.html | 8 ++++---- content/docs/user-management/groups.html | 8 ++++---- content/docs/user-management/messagee-example.html | 8 ++++---- content/docs/user-management/user-connections.html | 8 ++++---- content/docs/user-management/user-management.html | 8 ++++---- .../docs/user-management/working-user-data.html | 8 ++++---- .../using-usergrid/creating-a-new-application.html | 8 ++++---- content/docs/using-usergrid/creating-account.html | 8 ++++---- .../docs/using-usergrid/using-a-sandbox-app.html | 8 ++++---- content/docs/using-usergrid/using-the-api.html | 8 ++++---- docs/conf.py | 4 ++-- 77 files changed, 302 insertions(+), 302 deletions(-) ----------------------------------------------------------------------
