diff --git a/docs/html/guide/index.jd b/docs/html/guide/index.jd index 38f71c04545da..8378472ec62fa 100644 --- a/docs/html/guide/index.jd +++ b/docs/html/guide/index.jd @@ -34,9 +34,9 @@ Fundamentals. Then explore other topics — from designing a user interface and setting up resources to storing data and using permissions — as needed. -
Android Market Topics
-
Documentation for topics that concern publishing and monetizing applications on Android -Market, such as how to enforce licensing policies and implement in-app billing.
+
Google Play Topics
+
Documentation for topics that concern publishing and monetizing applications on Google Play, +such as how to enforce licensing policies and implement in-app billing.
Developing
Directions for using Android's development and debugging tools, diff --git a/docs/html/guide/market/billing/billing_integrate.jd b/docs/html/guide/market/billing/billing_integrate.jd index 57f685b22577b..b49dc25d89937 100755 --- a/docs/html/guide/market/billing/billing_integrate.jd +++ b/docs/html/guide/market/billing/billing_integrate.jd @@ -91,8 +91,8 @@ application source files.

IMarketBillingService.aidl -Android Interface Definition Library (AIDL) file that defines the IPC interface to Android -Market's in-app billing service (MarketBillingService). +Android Interface Definition Library (AIDL) file that defines the IPC interface to Google +Play's in-app billing service (MarketBillingService). diff --git a/docs/html/guide/market/expansion-files.jd b/docs/html/guide/market/expansion-files.jd index 26e63ecd6b6a7..01acb33fc5910 100644 --- a/docs/html/guide/market/expansion-files.jd +++ b/docs/html/guide/market/expansion-files.jd @@ -408,8 +408,8 @@ user experience with minimal effort on your behalf, we recommend you use the Dow download your expansion files. The information in the following sections explain how to integrate the library into your application.

-

If you'd rather develop your own solution to download the expansion files using the Android -Market URLs, you must follow the Application +

If you'd rather develop your own solution to download the expansion files using the Google +Play URLs, you must follow the Application Licensing documentation to perform a license request, then retrieve the expansion file names, sizes, and URLs from the response extras. You should use the {@code APKExpansionPolicy} class (included in the License Verification Library) as your licensing diff --git a/docs/html/guide/market/licensing/index.jd b/docs/html/guide/market/licensing/index.jd index b9a71540e7d7f..1f15303e4e8e8 100644 --- a/docs/html/guide/market/licensing/index.jd +++ b/docs/html/guide/market/licensing/index.jd @@ -9,8 +9,8 @@ disallow further use as appropriate.

Using the service, you can apply a flexible licensing policy on an application-by-application basis—each application can enforce licensing in the way most appropriate for it. If necessary, -an application can apply custom constraints based on the licensing status obtained from Android -Market. For example, an application can check the licensing status and then apply custom constraints +an application can apply custom constraints based on the licensing status obtained from Google Play. +For example, an application can check the licensing status and then apply custom constraints that allow the user to run it unlicensed for a specific validity period. An application can also restrict use of the application to a specific device, in addition to any other constraints.

diff --git a/docs/html/sdk/oem-usb.jd b/docs/html/sdk/oem-usb.jd index addcc5ecba2d0..818a0af2fbc88 100644 --- a/docs/html/sdk/oem-usb.jd +++ b/docs/html/sdk/oem-usb.jd @@ -34,7 +34,7 @@ To start developing with your device, read Using Hardware Devices.

Note: If your device is one of the Android Developer Phones -(purchased from the Android Market publisher site), a Nexus One, or a Nexus S, then you need +(ADP), a Nexus One, or a Nexus S, then you need the Google USB Driver, instead of an OEM driver. The Galaxy Nexus driver, however, is distributed by Samsung