diff options
| author | Dirk Dougherty <ddougherty@google.com> | 2014-05-14 14:47:28 -0700 |
|---|---|---|
| committer | Dirk Dougherty <ddougherty@google.com> | 2014-05-14 14:50:13 -0700 |
| commit | 9a6672beb1c53559180596ce6b49f9da0c8a0ed7 (patch) | |
| tree | b4693ae211a34491a7e98247ff9c115ae7933110 /docs/html/google/play/billing | |
| parent | f8c940733ed0aaa95a66cb80181f08e39e4592fa (diff) | |
| parent | 93ccd1a2eb16cf4fdd678e3d5b61f73d1bd0de88 (diff) | |
| download | frameworks_base-9a6672beb1c53559180596ce6b49f9da0c8a0ed7.zip frameworks_base-9a6672beb1c53559180596ce6b49f9da0c8a0ed7.tar.gz frameworks_base-9a6672beb1c53559180596ce6b49f9da0c8a0ed7.tar.bz2 | |
resolved conflices for merge of 93ccd1a2 to master
Change-Id: Ic77367cb9c90027e036a461697295fd604b50014
Diffstat (limited to 'docs/html/google/play/billing')
4 files changed, 11 insertions, 5 deletions
diff --git a/docs/html/google/play/billing/billing_subscriptions.jd b/docs/html/google/play/billing/billing_subscriptions.jd index aa25092..d0e6dc5 100644 --- a/docs/html/google/play/billing/billing_subscriptions.jd +++ b/docs/html/google/play/billing/billing_subscriptions.jd @@ -1,6 +1,10 @@ -page.title=Subscriptions +page.title=Google Play In-App Subscriptions parent.title=In-app Billing parent.link=index.html +page.metaDescription=Subscriptions let you sell content or features in your app with automated, recurring billing. +page.image=/images/play_dev.jpg +page.tags="inapp, iap, billing" +meta.tags="monetization, inappbilling, subscriptions" @jd:body <div id="qv-wrapper"> diff --git a/docs/html/google/play/billing/billing_testing.jd b/docs/html/google/play/billing/billing_testing.jd index 9d1964a..df6c657 100644 --- a/docs/html/google/play/billing/billing_testing.jd +++ b/docs/html/google/play/billing/billing_testing.jd @@ -367,6 +367,6 @@ do a factory reset, making sure you log on with your primary account first.</p> publish your application on Google Play. You can follow the normal steps for <a href="{@docRoot}tools/publishing/preparing.html">preparing</a>, <a href="{@docRoot}tools/publishing/app-signing.html">signing</a>, and <a -href="{@docRoot}distribute/googleplay/publish/preparing.html">publishing on Google Play</a>. +href="{@docRoot}distribute/tools/launch-checklist.html">publishing on Google Play</a>. </p> diff --git a/docs/html/google/play/billing/index.jd b/docs/html/google/play/billing/index.jd index 481a79c..dce20cb 100644 --- a/docs/html/google/play/billing/index.jd +++ b/docs/html/google/play/billing/index.jd @@ -1,4 +1,8 @@ page.title=Google Play In-app Billing +page.metaDescription=In-app Billing lets you sell digital content as one-time purchases or subscriptions. +page.image=/images/play_dev.jpg +meta.tags="monetizing, inappbilling, subscriptions" +page.tags="inapp, iap, subscriptions" @jd:body <p>In-app Billing is a Google Play service that lets you sell digital content from inside @@ -40,8 +44,6 @@ products and subscriptions from inside an app.</p> <p>To get started, read the documents below or take the <a href="{@docRoot}training/in-app-billing/index.html">Selling In-app Products</a> training class.</p> -</div> -</div> <dl> <dt><strong><a href="{@docRoot}google/play/billing/billing_overview.html">Overview</a></strong></dt> diff --git a/docs/html/google/play/billing/v2/billing_subscriptions.jd b/docs/html/google/play/billing/v2/billing_subscriptions.jd index 9c86e20..f8051a9 100644 --- a/docs/html/google/play/billing/v2/billing_subscriptions.jd +++ b/docs/html/google/play/billing/v2/billing_subscriptions.jd @@ -382,7 +382,7 @@ intent.setData(Uri.parse("market://details?id=com.example.app")); startActivity(intent);</pre> <p>For more information, see - <a href="{@docRoot}distribute/googleplay/promote/linking.html">Linking to Your Products</a>.</p> + <a href="{@docRoot}distribute/tools/promote/linking.html">Linking to Your Products</a>.</p> <h2 id="purchase-state-changes">Recurring Billing, Cancellation, and Changes In Purchase State</h2> |