You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sn...@apache.org on 2015/08/05 14:51:39 UTC
incubator-usergrid git commit: Replacing more API BaaS references.
Repository: incubator-usergrid
Updated Branches:
refs/heads/ug2-doc-update d00ebf968 -> 8ef6e7cc7
Replacing more API BaaS references.
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/8ef6e7cc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/8ef6e7cc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/8ef6e7cc
Branch: refs/heads/ug2-doc-update
Commit: 8ef6e7cc795cc2cd66d922c43c7c07b2e8bee67d
Parents: d00ebf9
Author: Dave Johnson <sn...@apache.org>
Authored: Wed Aug 5 08:51:27 2015 -0400
Committer: Dave Johnson <sn...@apache.org>
Committed: Wed Aug 5 08:51:27 2015 -0400
----------------------------------------------------------------------
docs/asset-and-files/uploading-assets.md | 6 +++---
docs/security-and-auth/changing-token-time-live-ttl.md | 2 +-
docs/user-management/user-connections.md | 2 +-
docs/user-management/user-management.md | 6 +++---
docs/user-management/working-user-data.md | 2 +-
5 files changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/8ef6e7cc/docs/asset-and-files/uploading-assets.md
----------------------------------------------------------------------
diff --git a/docs/asset-and-files/uploading-assets.md b/docs/asset-and-files/uploading-assets.md
index e50e909..c5b836f 100644
--- a/docs/asset-and-files/uploading-assets.md
+++ b/docs/asset-and-files/uploading-assets.md
@@ -1,11 +1,11 @@
# Uploading assets
-Using Apigee's API BaaS, you can store and retrieve files and assets that hold data objects such as images, video, and audio content.
+With Usergrid, you can store and retrieve files and assets that hold data objects such as images, video, and audio content.
-API BaaS manages these objects as Asset entities. Optionally, you can use Folder entities to organize related assets.
+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, API BaaS 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.
+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:
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/8ef6e7cc/docs/security-and-auth/changing-token-time-live-ttl.md
----------------------------------------------------------------------
diff --git a/docs/security-and-auth/changing-token-time-live-ttl.md b/docs/security-and-auth/changing-token-time-live-ttl.md
index 1dcdd4e..2148d36 100644
--- a/docs/security-and-auth/changing-token-time-live-ttl.md
+++ b/docs/security-and-auth/changing-token-time-live-ttl.md
@@ -1,6 +1,6 @@
# Changing token expiration (time-to-live)
-An access token has a “time-to-live” (ttl), which is the maximum time that the access token will be valid for use within the application. With the API Baas, you can change the default ttl for all application user tokens, set the ttl for an individual token at the time of creation, or revoke one or more tokens. This gives you a high degree of control over access to your API Baas account and data store.
+An access token has a “time-to-live” (ttl), which is the maximum time that the access token will be valid for use within the application. With the Usergrid, you can change the default ttl for all application user tokens, set the ttl for an individual token at the time of creation, or revoke one or more tokens. This gives you a high degree of control over access to your Usergrid account and data store.
## Default ttl
By default, all tokens have a system-defined time-to-live of 7 days (604800 seconds). Note that Token ttl is specified in milliseconds, but when a token is created, the API response will return the ttl in seconds.
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/8ef6e7cc/docs/user-management/user-connections.md
----------------------------------------------------------------------
diff --git a/docs/user-management/user-connections.md b/docs/user-management/user-connections.md
index aef082d..a386d2a 100644
--- a/docs/user-management/user-connections.md
+++ b/docs/user-management/user-connections.md
@@ -3,7 +3,7 @@
One of the most useful features of Usergrid is the ability to create connections between entities, which allow you to model arbitrary relationships between entities. This feature is particularly powerful when applied to user entities by allowing you to model complex social graphs between users as well as groups of users.
## Following/followers
-To make the social graph possibilities of entity connections even easier to achieve, API BaaS also has special support for a default following/followers relationship, which offers these additional features:
+To make the social graph possibilities of entity connections even easier to achieve, Usergrid also has special support for a default following/followers relationship, which offers these additional features:
Reciprocal connection: If a following connection is made between a user and another user, a reciprocal followers relationship will be created automatically. In contrast, all of other entity connections are one-way, meaning any reciprocal relationship must be created manually.
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/8ef6e7cc/docs/user-management/user-management.md
----------------------------------------------------------------------
diff --git a/docs/user-management/user-management.md b/docs/user-management/user-management.md
index 9c8881b..7f9e1d6 100644
--- a/docs/user-management/user-management.md
+++ b/docs/user-management/user-management.md
@@ -2,7 +2,7 @@
Whether you're developing apps for mobile or the Web, it's almost certain that you will need to be able to handle user management, as well as offer the types of social features users have come to expect from a rich app experience. Usergrid makes all of this easy with default entity types and functionality available right out of the box. From user registration and profiles to login and authentication to activity feeds and social graph, you can create a social experience quickly and easily with just a few types of API calls.
## User management
-The default user entity in API BaaS is designed to model app users, meaning registering users and managing their profiles is as simple as sending and updating JSON via the API. Used in conjunction with our available social graph, as well as our OAuth 2.0 authentication and token authorization features, you have all the tools you need to manage your user base.
+The default user entity in Usergrid is designed to model app users, meaning registering users and managing their profiles is as simple as sending and updating JSON via the API. Used in conjunction with our available social graph, as well as our OAuth 2.0 authentication and token authorization features, you have all the tools you need to manage your user base.
Learn more about:
@@ -11,7 +11,7 @@ Learn more about:
* [Permissions and roles](../security-and-auth/using-permissions.html)
## Group management
-One of the most basic social features of any app is the ability to create groups of users to limit shared access to user or other app data. The default group entity in API BaaS was designed for this exact purpose. Associate a user with as many groups or sub-groups as you need, then apply permissions or roles to define shared access to API BaaS data.
+One of the most basic social features of any app is the ability to create groups of users to limit shared access to user or other app data. The default group entity in Usergrid was designed for this exact purpose. Associate a user with as many groups or sub-groups as you need, then apply permissions or roles to define shared access to Usergrid data.
Learn more about:
@@ -19,7 +19,7 @@ Learn more about:
* [Permissions and roles](../security-and-auth/using-permissions.html)
## Social connections
-To create a rich social graph, your app needs to be able to create connections between users. API BaaS makes this process lightweight by allowing you to create social connections and generic entity connections between users to model relationships by working with simple URI paths.
+To create a rich social graph, your app needs to be able to create connections between users. Usergrid makes this process lightweight by allowing you to create social connections and generic entity connections between users to model relationships by working with simple URI paths.
For example, you could create a 'likes' relationship between two users with a POST:
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/8ef6e7cc/docs/user-management/working-user-data.md
----------------------------------------------------------------------
diff --git a/docs/user-management/working-user-data.md b/docs/user-management/working-user-data.md
index 56dad3a..a7603fd 100644
--- a/docs/user-management/working-user-data.md
+++ b/docs/user-management/working-user-data.md
@@ -227,7 +227,7 @@ Usergrid provides a standard password reset flow that can be implemented to allo
Note that you can also implement your own password reset flow using application-level authentication and the /password endpoint. For more, see [Changing a user password](#changing-a-user-password).
-To use the API BaaS password reset flow, do the following:
+To use the Usergrid password reset flow, do the following:
### STEP 1: Get the password reset request form.