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/12 19:46:33 UTC
incubator-usergrid git commit: Substitute Usergrid for API BaaS
Repository: incubator-usergrid
Updated Branches:
refs/heads/two-dot-o-dev e5979feb1 -> c5567415b
Substitute Usergrid for API BaaS
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/c5567415
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/c5567415
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/c5567415
Branch: refs/heads/two-dot-o-dev
Commit: c5567415b7625d6e76ed9422d7b2d1e148665dd0
Parents: e5979fe
Author: Dave Johnson <sn...@apache.org>
Authored: Wed Aug 12 13:45:51 2015 -0400
Committer: Dave Johnson <sn...@apache.org>
Committed: Wed Aug 12 13:45:51 2015 -0400
----------------------------------------------------------------------
docs/push-notifications/adding-push-support.md | 2 +-
.../creating-and-managing-notifications.md | 2 +-
docs/push-notifications/creating-notifiers.md | 8 +++---
docs/push-notifications/getting-started.md | 16 +++++------
.../managing-users-and-devices.md | 30 ++++++++++----------
docs/push-notifications/overview.md | 4 +--
docs/push-notifications/registering.md | 4 +--
docs/push-notifications/troubleshooting.md | 4 +--
docs/push-notifications/tutorial.md | 10 +++----
9 files changed, 40 insertions(+), 40 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/c5567415/docs/push-notifications/adding-push-support.md
----------------------------------------------------------------------
diff --git a/docs/push-notifications/adding-push-support.md b/docs/push-notifications/adding-push-support.md
index 2ec758a..956ac86 100644
--- a/docs/push-notifications/adding-push-support.md
+++ b/docs/push-notifications/adding-push-support.md
@@ -108,7 +108,7 @@ You'll find samples in SDKs that are specific to three mobile platforms: iOS, An
To download the sample app and view the tutorial, see Tutorial: Push notifications sample app.
-When you create notifiers to run the samples, creating them in the default "sandbox" app in your Apigee organization will make it easier to try out the feature. The sandbox app doesn't require authentication.
+When you create notifiers to run the samples, creating them in the default "sandbox" app in your Usergrid organization will make it easier to try out the feature. The sandbox app doesn't require authentication.
## Troubleshooting
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/c5567415/docs/push-notifications/creating-and-managing-notifications.md
----------------------------------------------------------------------
diff --git a/docs/push-notifications/creating-and-managing-notifications.md b/docs/push-notifications/creating-and-managing-notifications.md
index 8a98fba..72a2021 100644
--- a/docs/push-notifications/creating-and-managing-notifications.md
+++ b/docs/push-notifications/creating-and-managing-notifications.md
@@ -1,5 +1,5 @@
# Creating and managing notifications
-This topic provides information on setting up and sending push notifications with the Apigee API backend as a service (BaaS). For high-level information, prerequisites, and tutorials, see [Push notifications overview](overview.html).
+This topic provides information on setting up and sending push notifications with the Usergrid API backend as a service (BaaS). For high-level information, prerequisites, and tutorials, see [Push notifications overview](overview.html).
<div class="admonition note"> <p class="first admonition-title">Note</p> <p class="last">
Although not shown in many of the API examples below, you need to provide a valid access token with each API call. See [Authenticating users and application clients](../security-and-auth/authenticating-users-and-application-clients.html) for details.
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/c5567415/docs/push-notifications/creating-notifiers.md
----------------------------------------------------------------------
diff --git a/docs/push-notifications/creating-notifiers.md b/docs/push-notifications/creating-notifiers.md
index e5ae7a4..9e07176 100644
--- a/docs/push-notifications/creating-notifiers.md
+++ b/docs/push-notifications/creating-notifiers.md
@@ -1,7 +1,7 @@
# Creating notifiers
-When you request that a push notification be sent to your app on devices, an API BaaS notifier carries the request to the notification service (Google GCM or Apple APNs).
+When you request that a push notification be sent to your app on devices, an Usergrid notifier carries the request to the notification service (Google GCM or Apple APNs).
-A notifier is represented by an entity in your API BaaS application (see the [API Docs](../rest-endpoints/api-docs.html) for reference information). It carries the credentials that authorize your request. Once a notification service has verified that your notifier contains valid credentials, it will forward your push notification to your app on devices.
+A notifier is represented by an entity in your Usergrid application (see the [API Docs](../rest-endpoints/api-docs.html) for reference information). It carries the credentials that authorize your request. Once a notification service has verified that your notifier contains valid credentials, it will forward your push notification to your app on devices.
You can create a notifier in two ways: using the admin portal and programmatically.
@@ -41,10 +41,10 @@ __Fields for Android__
<td>Enter the API key that was generated when you registered your app with GCM. To retrieve your API key, go to the [Google API developer web site](https://code.google.com/apis/console/), then select __APIs & Auth > Credentials__.</td></tr>
</table>
-6. Click __Create Notifier__. The API BaaS will create a notifier entity in the /notifiers collection. The notifier will also appear in the list of notifiers in the notifications console.
+6. Click __Create Notifier__. The Usergrid will create a notifier entity in the /notifiers collection. The notifier will also appear in the list of notifiers in the notifications console.
## Creating notifiers programmatically
-You can create an App BaaS notifier programmatically by sending requests to the API BaaS API.
+You can create an App BaaS notifier programmatically by sending requests to the Usergrid API.
### For Apple
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/c5567415/docs/push-notifications/getting-started.md
----------------------------------------------------------------------
diff --git a/docs/push-notifications/getting-started.md b/docs/push-notifications/getting-started.md
index 04c9659..6f1b80f 100644
--- a/docs/push-notifications/getting-started.md
+++ b/docs/push-notifications/getting-started.md
@@ -1,7 +1,7 @@
# Getting started with push notifications
## What are push notifications?
-Apigee API BaaS provides a RESTful framework for sending push notifications to your apps, giving you full control over which app users you target, as well as when you send notifications. You can send messages to devices, users, or groups that have specific characteristics and locations. (To receive push notifications, users must be using devices that can connect to the API BaaS). Here are just a couple reasons for enabling push notification support in your app with API BaaS:
+Usergrid provides a RESTful framework for sending push notifications to your apps, giving you full control over which app users you target, as well as when you send notifications. You can send messages to devices, users, or groups that have specific characteristics and locations. (To receive push notifications, users must be using devices that can connect to the Usergrid). Here are just a couple reasons for enabling push notification support in your app with Usergrid:
* __Reach your app's users__ with messages they care about. This could be a flash sale happening near them right now (use [geolocation](../geolocation/geolocation.html)!) or a lunch special at a favorite restaurant. You could even let a user know it's her turn in a game she's playing with a friend.
* __Keep your app footprint low__ while communicating in a high-value way with your app's users. Compare pushing data with CPU- and memory-heavy pull processes. In those, an app actively listens on an endpoint, regularly pulling data (such as news feeds, new emails, or stock market updates) to the device.
@@ -61,14 +61,14 @@ For a walkthrough of these steps using a push sample app, see Tutorial: Push not
1. __Register__ your app with push notification services. Your notification messages will be forwarded to devices by Apple and/or Google. So you'll need to register with Apple APNs and/or Google's GCM. For more information, see Registering with a notification service.
-2. __Create a notifier__ to send notification messages from the API BaaS to notification services.
-The API BaaS will use your notifier to send your messages to a notification service. For details, see Creating notifiers. To create a notifier, you'll need information generated by registering with a push notification service. You'll need a separate notifier for each app/platform combination.
+2. __Create a notifier__ to send notification messages from the Usergrid to notification services.
+The Usergrid will use your notifier to send your messages to a notification service. For details, see Creating notifiers. To create a notifier, you'll need information generated by registering with a push notification service. You'll need a separate notifier for each app/platform combination.
3. __Register devices at run time__.
At run time, your code will register to receive notifications. To do this, your code uses information from the notification service and your notifier. For more, see Managing users and devices.
4. __Send and manage push notifications__.
-You use API BaaS API notification endpoints to target devices, users, or groups with your messages. To learn more, see Creating and managing notifications.
+You use Usergrid API notification endpoints to target devices, users, or groups with your messages. To learn more, see Creating and managing notifications.
## How it works
@@ -80,9 +80,9 @@ The diagram below illustrates what things should look like once you've gotten se
__A.__ At configuration time, you [create an App ID](registering.html), then [create a notifier](creating-notifiers.html) with a .p12 certificate you generate on your Mac. The .p12 certificate correlates the notifier (which you will use to send notification messages) with the App ID (so that APNs will forward your notifications to devices).
-__B.__ A run time, your app's code [registers with Apple for notifications](managing-users-and-devices.html) by invoking the ``registerForRemoteNotificationTypes`` method to receive a token it can send to API BaaS.
+__B.__ A run time, your app's code [registers with Apple for notifications](managing-users-and-devices.html) by invoking the ``registerForRemoteNotificationTypes`` method to receive a token it can send to Usergrid.
-__C.__ At run time, your app's code [registers with the API BaaS for notifications](managing-users-and-devices.html) by sending the name of the notifier you created. This ensure's that there's a device entity in your API BaaS application. That way, you can address the device with notification messages.
+__C.__ At run time, your app's code [registers with the Usergrid for notifications](managing-users-and-devices.html) by sending the name of the notifier you created. This ensure's that there's a device entity in your Usergrid application. That way, you can address the device with notification messages.
.. image:: pushmiddleios0.png
@@ -92,9 +92,9 @@ __Note__: For information on troubleshooting push notifications on iOS devices,
The diagram below illustrates what things should look like once you've gotten set up to send notifications that are received by your app.
-__A.__ At configuration time, you [create a Google API project](registering.html)), then [create an API BaaS notifier](creating-notifiers.html) with an API key from the project. The API key correlates the notifier (which you will use to send notification messages from the API BaaS) with the API project (which will forward your notifications to devices).
+__A.__ At configuration time, you [create a Google API project](registering.html)), then [create an Usergrid notifier](creating-notifiers.html) with an API key from the project. The API key correlates the notifier (which you will use to send notification messages from the Usergrid) with the API project (which will forward your notifications to devices).
-__B.__ At run time, your app's code [registers with the API BaaS](managing-users-and-devices.html)) for notifications by sending the name of the notifier you created. This ensure's that there's a device entity in your API BaaS application. That way, you can address the device with notification messages.
+__B.__ At run time, your app's code [registers with the Usergrid](managing-users-and-devices.html)) for notifications by sending the name of the notifier you created. This ensure's that there's a device entity in your Usergrid application. That way, you can address the device with notification messages.
__C.__ A run time, your app's code [registers with Google for notifications](managing-users-and-devices.html)) by sending the number of your API project as a "sender ID". The project is the actual notification "sender" that will forward notifications to your app. In other words, the app is telling Google that it wants to receive notifications from that sender.
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/c5567415/docs/push-notifications/managing-users-and-devices.md
----------------------------------------------------------------------
diff --git a/docs/push-notifications/managing-users-and-devices.md b/docs/push-notifications/managing-users-and-devices.md
index 0e68a54..4f04f9a 100644
--- a/docs/push-notifications/managing-users-and-devices.md
+++ b/docs/push-notifications/managing-users-and-devices.md
@@ -1,7 +1,7 @@
# Managing users and devices
-Before your app can receive notifications on a user's device, the app's code will need to register the device with both the API BaaS and the appropriate push notification service (Apple APNs or Google GCM).
+Before your app can receive notifications on a user's device, the app's code will need to register the device with both the Usergrid and the appropriate push notification service (Apple APNs or Google GCM).
-By registering with the API BaaS, your app adds the device on which it is installed to your data store. The device is represented as a Device entity. This makes it possible for you to target that device when sending notifications. (For more on the Device entity, see the [API Docs](../rest-endpoints/api-docs.html).) Any devices, users, and groups that have been registered in this way may be targeted with push notifications.
+By registering with the Usergrid, your app adds the device on which it is installed to your data store. The device is represented as a Device entity. This makes it possible for you to target that device when sending notifications. (For more on the Device entity, see the [API Docs](../rest-endpoints/api-docs.html).) Any devices, users, and groups that have been registered in this way may be targeted with push notifications.
By registering with the notification service, you make the device known to the service. This way, the service can forward your notifications to the device.
@@ -10,16 +10,16 @@ For an overview of how to set up push notifications, including troubleshooting t
</p></div>
## Registering devices
-The following samples illustrate how to register a device with a notification service and with the API BaaS. At a high level, your code will send a registration request to the notification service, then use information in the service's response to send a separate request to the API BaaS. The two requests correlate the notification service, API BaaS, and your mobile app.
+The following samples illustrate how to register a device with a notification service and with the Usergrid. At a high level, your code will send a registration request to the notification service, then use information in the service's response to send a separate request to the Usergrid. The two requests correlate the notification service, Usergrid, and your mobile app.
-You can also create device entities separately by using the /devices endpoint. For more information on using the ``/devices`` endpoint in the API BaaS, see the [API Docs](../rest-endpoints/api-docs.html).
+You can also create device entities separately by using the /devices endpoint. For more information on using the ``/devices`` endpoint in the Usergrid, see the [API Docs](../rest-endpoints/api-docs.html).
-Registering a device with a notification service is a standard coding activity for implementing push notifications. This is not specific to the API BaaS.
+Registering a device with a notification service is a standard coding activity for implementing push notifications. This is not specific to the Usergrid.
### Registering for iOS
-The following code illustrates how you can use the iOS SDK to register a device with both the Apigee server and with the APNs, the Apple push notification service. This example assumes that your code has already property initialized the SDK. For more information, see [Installing the Apigee SDK for iOS](../sdks/tbd.html).
+The following code illustrates how you can use the iOS SDK to register a device with both the Usergrid server and with the APNs, the Apple push notification service. This example assumes that your code has already property initialized the SDK. For more information, see [Installing the Apigee SDK for iOS](../sdks/tbd.html).
// Register with Apple to receive notifications.
@@ -47,7 +47,7 @@ The following code illustrates how you can use the iOS SDK to register a device
// Use this method to register with Apigee.
- (void)application:(UIApplication *)application didRegisterForRemoteNotificationsWithDeviceToken:(NSData *)newDeviceToken
{
- // Register device token with the API BaaS (will create the Device entity if it doesn't exist)
+ // Register device token with the Usergrid (will create the Device entity if it doesn't exist)
// Sends the name of the notifier you created with Apigee, along with the token your code
// received from Apple.
ApigeeClientResponse *response = [dataClient setDevicePushToken: newDeviceToken
@@ -135,9 +135,9 @@ The following code illustrates how to register a client device with GCM, registe
} else {
// Use an instance of the Client class (SDK for Android)
- // to register this device with the API BaaS. Pass as arguments
+ // to register this device with the Usergrid. Pass as arguments
// the device unique identifier, the unique name of the notifier you
- // created in the API BaaS, the GCM API key, and a callback that will
+ // created in the Usergrid, the GCM API key, and a callback that will
// receive an instance of a Device class representing the registered
// device on the system.
dataClient.registerDeviceForPushAsync(dataClient.getUniqueDeviceID(), notifierName, regId, null,
@@ -197,7 +197,7 @@ The following code illustrates how you can use the JavaScript functions included
var appleOptions = {
alert:true, badge:true, sound:true
};
- // Register the device with the API BaaS, passing options for configuration
+ // Register the device with the Usergrid, passing options for configuration
// along with a callback from which you can retrieve the device token
// sent by Apigee.
pushNotification.registerDevice(appleOptions, function(status) {
@@ -232,18 +232,18 @@ Information about installing the plugin is available in its Readme file. For mor
## Connecting devices to users
-You can associate user entities with device entities in the API BaaS. Doing so allows you to target your push notifications at users with specific characteristics. The following describes how to connect a user to a specific device in the API BaaS.
+You can associate user entities with device entities in the Usergrid. Doing so allows you to target your push notifications at users with specific characteristics. The following describes how to connect a user to a specific device in the Usergrid.
-For more information on creating a device in your API BaaS data store, see "Registering Devices" above.
+For more information on creating a device in your Usergrid data store, see "Registering Devices" above.
-For more information on creating a user in your API BaaS data store, see [User](../rest-endpoints/api-docs.html#user).
+For more information on creating a user in your Usergrid data store, see [User](../rest-endpoints/api-docs.html#user).
The following code examples all use the same basic endpoint pattern for connecting devices with users:
POST /users/{userUUID or name}/devices/{deviceUUID}
### Connecting with curl
-The following call connects user "joex" with device 7a0a1cba-9a18-3bee-8ae3-4f511f12a386 (the device UUID). After this connection, you can send a push notification to joex rather than the device. Further, if joex has specific properties set--such as {"favoritecolor": "blue"}--you can send a push notification to all users whose favorite color is blue (assuming they're connected to devices in the API BaaS).
+The following call connects user "joex" with device 7a0a1cba-9a18-3bee-8ae3-4f511f12a386 (the device UUID). After this connection, you can send a push notification to joex rather than the device. Further, if joex has specific properties set--such as {"favoritecolor": "blue"}--you can send a push notification to all users whose favorite color is blue (assuming they're connected to devices in the Usergrid).
curl -X POST "https://api.usergrid.com/my-org/sandbox/users/joex/devices/7a0a1cba-9a18-3bee-8ae3-4f511f12a386"
@@ -253,7 +253,7 @@ The following sample code, taken from AppDelegate.m in the native iOS push sampl
ApigeeClientResponse *response = [dataClient setDevicePushToken: newDeviceToken forNotifier: notifier];
- // You could use this if you log in as an API BaaS user to associate the Device to your User
+ // You could use this if you log in as an Usergrid user to associate the Device to your User
if (response.transactionState == kUGClientResponseSuccess) {
response = [self connectEntities: @"users" connectorID: @"me" type: @"devices" connecteeID: deviceId];
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/c5567415/docs/push-notifications/overview.md
----------------------------------------------------------------------
diff --git a/docs/push-notifications/overview.md b/docs/push-notifications/overview.md
index 4731b60..32fb451 100644
--- a/docs/push-notifications/overview.md
+++ b/docs/push-notifications/overview.md
@@ -10,7 +10,7 @@
<td>
## Reach your users with push
-With the new push notifications feature in the Apigee API BaaS, you can send announcements to your app's users.
+With the new push notifications feature in the Usergrid, you can send announcements to your app's users.
* __Reach your app's users__ with messages they care about.
* __Keep your app footprint low__ while communicating in a high-value way with your app's users.
@@ -38,7 +38,7 @@ Depending on your supported app platforms, you'll need just a few things.
## Build push support
#### [Setting up push notifications support](getting-started.html)
-Connect Apple or Google with Apigee and your app.
+Connect Apple or Google with Usergrid and your app.
#### [Register your app](registering.html)
Register with Apple or Google.
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/c5567415/docs/push-notifications/registering.md
----------------------------------------------------------------------
diff --git a/docs/push-notifications/registering.md b/docs/push-notifications/registering.md
index e7d76e5..8930583 100644
--- a/docs/push-notifications/registering.md
+++ b/docs/push-notifications/registering.md
@@ -1,5 +1,5 @@
# Registering with a notification service
-To send push notifications, you will need to first register your app with the push notification service (Apple APNs or Google GCM) that corresponds to your app's platform. Once you've registered, the service will provide you with a certificate or key that you will need when you create an API BaaS notifier. (See [Creating notifiers](creating-notifiers.html) for more information.)
+To send push notifications, you will need to first register your app with the push notification service (Apple APNs or Google GCM) that corresponds to your app's platform. Once you've registered, the service will provide you with a certificate or key that you will need when you create an Usergrid notifier. (See [Creating notifiers](creating-notifiers.html) for more information.)
Push notification services are gateways controlled by platform services (such as Apple and Google). These gateways ensure that push notifications are delivered securely and originate from trusted apps.
@@ -14,7 +14,7 @@ Before you can send push notifications to your app on iOS devices, you'll need t
* Generate an SSL signing certificate you can use to generate a .p12 certificate.
* Create an Apple App ID through which you can associate push notifications support with your app.
-* Generate a .p12 certificate you can use to create an API BaaS notifier. The certificate will be sent to APNs with push notification requests.
+* Generate a .p12 certificate you can use to create an Usergrid notifier. The certificate will be sent to APNs with push notification requests.
For more information see "How the pieces connect" in [Setting up push notification support](getting-started.html).
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/c5567415/docs/push-notifications/troubleshooting.md
----------------------------------------------------------------------
diff --git a/docs/push-notifications/troubleshooting.md b/docs/push-notifications/troubleshooting.md
index f4519f2..15cab02 100644
--- a/docs/push-notifications/troubleshooting.md
+++ b/docs/push-notifications/troubleshooting.md
@@ -33,7 +33,7 @@ The sender ID is a number you send to GCM from app code when registering with GC
* The API key used to create your notifier is the same as the API key in your Google API project.
-* The notifier name used in your app code is the same as for the notifier you created in the API BaaS.
+* The notifier name used in your app code is the same as for the notifier you created in the Usergrid.
It can be possible to make a fix (such as by correcting the sender ID in your app code) and still see this error. If you're still seeing the error, consider create a new API project and notifier, then use their new values in your code:
@@ -79,7 +79,7 @@ The sender ID is a number you send to GCM from app code when registering with GC
* The API key used to create your notifier is the same as the API key in your Google API project.
-* The notifier name used in your app code is the same as for the notifier you created in the API BaaS.
+* The notifier name used in your app code is the same as for the notifier you created in the Usergrid.
It can be possible to make a fix (such as by correcting the sender ID in your app code) and still see this error. If you're still seeing the error, consider create a new API project and notifier, then use their new values in your code:
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/c5567415/docs/push-notifications/tutorial.md
----------------------------------------------------------------------
diff --git a/docs/push-notifications/tutorial.md b/docs/push-notifications/tutorial.md
index f92347c..8ebecfe 100644
--- a/docs/push-notifications/tutorial.md
+++ b/docs/push-notifications/tutorial.md
@@ -1,5 +1,5 @@
# Tutorial: Push notifications sample app
-In this tutorial, you'll use a sample app (iOS, Android, or PhoneGap) to send yourself a push notification with the API BaaS push notification API. You'll register with a push notification services (Apple APNs or Google GCM) to create the required security certificate or key, create the required API BaaS notifier to send a message, then modify, compile and run the sample app to see push notifications in action.
+In this tutorial, you'll use a sample app (iOS, Android, or PhoneGap) to send yourself a push notification with the Usergrid push notification API. You'll register with a push notification services (Apple APNs or Google GCM) to create the required security certificate or key, create the required Usergrid notifier to send a message, then modify, compile and run the sample app to see push notifications in action.
<div class="admonition note"> <p class="first admonition-title">Note</p> <p class="last">
For an overview of how to set up push notifications, including troubleshooting tips, see [Adding push notifications support](adding-push-support.html).
@@ -22,7 +22,7 @@ To begin this tutorial, download the sample app for the platform of your choice.
__A note to PhoneGap developers__: PhoneGap requires a plugin to enable push notifications. The plugin is included in the sample apps in the JavaScript SDK. For new PhoneGap applications, [download the PhoneGap push plugin](https://github.com/phonegap-build/PushPlugin).
## Step 2: Register with a notification service and generate a certificate/key
-To send push notifications you must register your app with the push notification service that corresponds to your app's platform. Once registered, the service will provide you with a certificate or key that you will provide when creating an API BaaS notifier.
+To send push notifications you must register your app with the push notification service that corresponds to your app's platform. Once registered, the service will provide you with a certificate or key that you will provide when creating an Usergrid notifier.
For a full walkthrough of how to register an app with a notification service and generate the necessary certificate/key, see [Registering with a notification service](registration.html).
@@ -161,7 +161,7 @@ To configure and run the native Android push notification sample app, do the fol
* __APP__: The app in your organization where you created the notifier. (For the sample, make sure it's "sandbox".)
-* __USER__ and __PASSWORD__: Optional. If you created your notifier in an app other than "sandbox" (which doesn't require authentication), enter the username and password of one of your API BaaS admin users.
+* __USER__ and __PASSWORD__: Optional. If you created your notifier in an app other than "sandbox" (which doesn't require authentication), enter the username and password of one of your Usergrid admin users.
4. In AndroidManifest.xml, be sure the proper Android permissions are included, such as READ_PHONE_STATE and VIBRATE.
@@ -238,8 +238,8 @@ When using PhoneGap to develop push notification apps, you use a PhoneGap plugin
* ``/receipts`` - To see the receipt generated from the successful push.
-## Step 6: Send additional push notifications using other API BaaS tools
-Send a push notification from the API BaaS Notifications console
+## Step 6: Send additional push notifications using other Usergrid tools
+Send a push notification from the Usergrid Notifications console
On the Send Notification screen. Select your notifier, select All Devices, enter a message, select Now, and click to send it.
.. image:: sendnotification.png