Doc change: cleanup filtering sidebars and api level table. Changes links pointing to billing and other play docs that have moved.

Change-Id: I5528e82a6f97eb25f2ec2db5dfe1e178d9580f3c
diff --git a/docs/html/google/gcm/c2dm.jd b/docs/html/google/gcm/c2dm.jd
index e80a41f..381460e 100644
--- a/docs/html/google/gcm/c2dm.jd
+++ b/docs/html/google/gcm/c2dm.jd
@@ -75,7 +75,7 @@
 <dt><strong>Canonical registration ID</strong></dt>
 <dd>There may be situations where the server ends up with 2 registration IDs for the same device. If the GCM response contains a registration ID, simply replace the registration ID you have with the one provided. With this feature your application doesn't need to send the device ID to your server anymore. For more information, see <a href="adv.html#canonical">Advanced Topics</a>.</dd>
 </dl>
-<p>GCM also provides helper libraries (<a href="{@docRoot}guide/google/gcm/client-javadoc/index.html">client</a> and <a href="{@docRoot}guide/google/gcm/server-javadoc/index.html">server</a>) to make writing your code easier.</p>
+<p>GCM also provides helper libraries (<a href="{@docRoot}google/gcm/client-javadoc/index.html">client</a> and <a href="{@docRoot}google/gcm/server-javadoc/index.html">server</a>) to make writing your code easier.</p>
 
 <h3 id="interop">Relationship between C2DM and GCM</h3>
 
diff --git a/docs/html/google/gcm/demo.jd b/docs/html/google/gcm/demo.jd
index 7e35fd6..6dfae2d 100644
--- a/docs/html/google/gcm/demo.jd
+++ b/docs/html/google/gcm/demo.jd
@@ -40,8 +40,8 @@
 </ul>
 <p>Here is the API reference documentation for the helper libraries on which the demo is based:</p>
 <ul>
-  <li><a href="{@docRoot}guide/google/gcm/client-javadoc/index.html">Client Reference</a></li>
-  <li><a href="{@docRoot}guide/google/gcm/server-javadoc/index.html">Server Reference</a></li>
+  <li><a href="{@docRoot}google/gcm/client-javadoc/index.html">Client Reference</a></li>
+  <li><a href="{@docRoot}google/gcm/server-javadoc/index.html">Server Reference</a></li>
 </ul>
 
 <p>The sections below describe how to download the demo code and helper libraries from the SDK Manager. The demo code and helper libraries are also available at the <a href="http://code.google.com/p/gcm">open source site</a>.
diff --git a/docs/html/google/gcm/gs.jd b/docs/html/google/gcm/gs.jd
index fc5c4a2..df13373 100644
--- a/docs/html/google/gcm/gs.jd
+++ b/docs/html/google/gcm/gs.jd
@@ -25,7 +25,7 @@
 </div>
 </div>
 
-<p>This document describes how to write an Android application and the  server-side logic, using the helper libraries (<a href="{@docRoot}guide/google/gcm/client-javadoc/index.html">client</a> and <a href="{@docRoot}guide/google/gcm/server-javadoc/index.html">server</a>) provided by GCM.</p>
+<p>This document describes how to write an Android application and the  server-side logic, using the helper libraries (<a href="{@docRoot}google/gcm/client-javadoc/index.html">client</a> and <a href="{@docRoot}google/gcm/server-javadoc/index.html">server</a>) provided by GCM.</p>
 
 
 <h2 id="create-proj">Creating a Google API project</h2>
@@ -85,7 +85,7 @@
 <p class="note"><strong>Note:</strong> If you need to rotate the key, click  <strong>Generate new key</strong>. A new key  will be created while the old one will still be active for up to 24 hours. If you want to get rid of the old key immediately (for example, if you feel it was compromised), click <strong>Delete key</strong>.</p>
 
 <h2 id="libs">Install the Helper Libraries</h2>
-<p>To perform the steps described in the following sections, you must first install the helper libraries (reference: <a href="{@docRoot}guide/google/gcm/client-javadoc/index.html">client</a> and <a href="{@docRoot}guide/google/gcm/server-javadoc/index.html">server</a>). From the SDK Manager, install <strong>Extras &gt; Google Cloud Messaging for Android Library</strong>. This creates a <code>gcm</code> directory under <code><em>YOUR_SDK_ROOT</em>/extras/google/</code> containing these subdirectories: <code>gcm-client</code>, <code>gcm-server</code>, <code>samples/gcm-demo-client</code>, <code>samples/gcm-demo-server</code>, and <code>samples/gcm-demo-appengine</code>.</p>
+<p>To perform the steps described in the following sections, you must first install the helper libraries (reference: <a href="{@docRoot}google/gcm/client-javadoc/index.html">client</a> and <a href="{@docRoot}google/gcm/server-javadoc/index.html">server</a>). From the SDK Manager, install <strong>Extras &gt; Google Cloud Messaging for Android Library</strong>. This creates a <code>gcm</code> directory under <code><em>YOUR_SDK_ROOT</em>/extras/google/</code> containing these subdirectories: <code>gcm-client</code>, <code>gcm-server</code>, <code>samples/gcm-demo-client</code>, <code>samples/gcm-demo-server</code>, and <code>samples/gcm-demo-appengine</code>.</p>
 
 <p class="note"><strong>Note:</strong> If you don't see <strong>Extras &gt; Google Cloud Messaging for Android Library</strong> in the SDK Manager, make sure you are running version 20 or higher. Be sure to restart the SDK Manager after updating it.</p>
 
diff --git a/docs/html/google/gcm/index.jd b/docs/html/google/gcm/index.jd
index 8079eba..5038125 100644
--- a/docs/html/google/gcm/index.jd
+++ b/docs/html/google/gcm/index.jd
@@ -10,19 +10,19 @@
 <p>To learn more about GCM, you can join the <a href="https://groups.google.com/forum/?fromgroups#!forum/android-gcm">android-gcm group</a> and read the following documents:</p>
 
 <dl>
-  <dt><strong><a href="{@docRoot}guide/google/gcm/gs.html">Getting Started</a></strong></dt>
+  <dt><strong><a href="{@docRoot}google/gcm/gs.html">Getting Started</a></strong></dt>
     <dd>Read this document to learn the basic steps involved in developing Android applications based on GCM.</dd>
-  <dt><strong><a href="{@docRoot}guide/google/gcm/gcm.html">Architectural Overview</a></strong></dt>
+  <dt><strong><a href="{@docRoot}google/gcm/gcm.html">Architectural Overview</a></strong></dt>
     <dd>Read this document for a description of the underlying concepts and architecture in GCM.</dd>
-  <dt><strong><a href="{@docRoot}guide/google/gcm/demo.html">Demo App Tutorial</a></strong></dt>
+  <dt><strong><a href="{@docRoot}google/gcm/demo.html">Demo App Tutorial</a></strong></dt>
     <dd>Read this document to walk through setting up and running the GCM demo app.</dd>
-  <dt><strong><a href="{@docRoot}guide/google/gcm/adv.html">Advanced Topics</a></strong></dt>
+  <dt><strong><a href="{@docRoot}google/gcm/adv.html">Advanced Topics</a></strong></dt>
     <dd>Read this document to get a more in-depth understanding of key GCM features.</dd>
-  <dt><a href="{@docRoot}guide/google/gcm/c2dm.html"><strong>Migration</strong></a></dt>
+  <dt><a href="{@docRoot}google/gcm/c2dm.html"><strong>Migration</strong></a></dt>
     <dd>Read this document if you are a C2DM developer moving to GCM.</dd>
 </dl>
 
-<p>GCM also provides helper libraries for <a href="{@docRoot}guide/google/gcm/client-javadoc/index.html"><strong>client</strong></a> and <a href="{@docRoot}guide/google/gcm/server-javadoc/index.html"><strong>server</strong></a> development.</p>
+<p>GCM also provides helper libraries for <a href="{@docRoot}google/gcm/client-javadoc/index.html"><strong>client</strong></a> and <a href="{@docRoot}google/gcm/server-javadoc/index.html"><strong>server</strong></a> development.</p>
 
 
 
diff --git a/docs/html/google/index.jd b/docs/html/google/index.jd
index 57a3524..97e4ea4 100644
--- a/docs/html/google/index.jd
+++ b/docs/html/google/index.jd
@@ -65,7 +65,7 @@
   <div class="cell-icon">
   <img src="{@docRoot}images/google/gcm-cloud.png">
   </div>
-    <h4><a href="{@docRoot}guide/google/gcm/index.html">Google Cloud Messaging</a></h4>
+    <h4><a href="{@docRoot}google/gcm/index.html">Google Cloud Messaging</a></h4>
     <p>Keep your users connected by delivering events with
     lightweight messages immediately from your web server. There are no quotas or charges
     to use Google Cloud Messaging.</p>
@@ -82,7 +82,7 @@
   <div class="cell-icon">
     <img src="{@docRoot}images/google/iab-99c.png" />
   </div>
-    <h4><a href="{@docRoot}guide/google/play/billing/index.html">In-App Billing</a></h4>
+    <h4><a href="{@docRoot}google/play/billing/index.html">In-App Billing</a></h4>
     <p>Build an app with a steady revenue stream that keeps users engaged
     by offering new content or virtual goods directly in your app. All transactions are handled
     by Google Play Store for a simple user experience.
diff --git a/docs/html/google/play-services/dist.jd b/docs/html/google/play-services/dist.jd
index 85a64f9..e179bff 100644
--- a/docs/html/google/play-services/dist.jd
+++ b/docs/html/google/play-services/dist.jd
@@ -21,7 +21,7 @@
     <p>
       Make sure your app gets to the right users by filtering on a wide range of characteristics
       such as platform versions and hardware features.
-    </p><p><a href="{@docRoot}guide/google/play/filters.html">Learn more &raquo;</a></p>
+    </p><p><a href="{@docRoot}google/play/filters.html">Learn more &raquo;</a></p>
   </div>
 
   <div class="layout-content-col span-6">
@@ -31,7 +31,7 @@
     <p>
       Distribute different APKs based on a variety of properties such as platform version, screen
       size, and GLES texture compression support.
-    </p><p><a href="{@docRoot}guide/google/play/publishing/multiple-apks.html">Learn more &raquo;</a></p>
+    </p><p><a href="{@docRoot}google/play/publishing/multiple-apks.html">Learn more &raquo;</a></p>
   </div>
 
 <div class="layout-content-row">
@@ -43,7 +43,7 @@
       Tap into Google's content delivery services by serving up to 4GB of assets for free. Provide
       users with high-fidelity graphics, media files, or other large assets that are required by
       your app.
-    </p><a href="{@docRoot}guide/google/play/expansion-files.html">Learn more &raquo;</a>
+    </p><a href="{@docRoot}google/play/expansion-files.html">Learn more &raquo;</a>
   </div>
 
    <div class="layout-content-col span-6">
@@ -51,6 +51,6 @@
       Application Licensing
     </h4>
     <p>Protect your revenue streams and integrate policies for usage into your app.
-    </p><a href="{@docRoot}guide/google/play/licensing/index.html">Learn more &raquo;</a>
+    </p><a href="{@docRoot}google/play/licensing/index.html">Learn more &raquo;</a>
   </div>
 </div>
\ No newline at end of file
diff --git a/docs/html/google/play/billing/billing_about.html b/docs/html/google/play/billing/billing_about.html
index 9f41fa62..38616e6 100644
--- a/docs/html/google/play/billing/billing_about.html
+++ b/docs/html/google/play/billing/billing_about.html
@@ -1,12 +1,12 @@
 <html>
 <head>
 <meta http-equiv="refresh"
-content="0;url=http://developer.android.com/guide/google/play/billing/index.html">
+content="0;url=http://developer.android.com/google/play/billing/index.html">
 <title>Redirecting...</title>
 </head>
 <body>
 <p>You should be redirected. Please <a
-href="http://developer.android.com/guide/google/play/billing/index.html">click
+href="http://developer.android.com/google/play/billing/index.html">click
 here</a>.</p>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/html/google/play/billing/billing_admin.jd b/docs/html/google/play/billing/billing_admin.jd
index cb288a5..2413ae5 100755
--- a/docs/html/google/play/billing/billing_admin.jd
+++ b/docs/html/google/play/billing/billing_admin.jd
@@ -15,20 +15,20 @@
   </ol>
   <h2>Downloads</h2>
   <ol>
-    <li><a href="{@docRoot}guide/google/play/billing/billing_integrate.html#billing-download">Sample
+    <li><a href="{@docRoot}google/play/billing/billing_integrate.html#billing-download">Sample
     Application</a></li>
   </ol>
   <h2>See also</h2>
   <ol>
-    <li><a href="{@docRoot}guide/google/play/billing/billing_overview.html">Overview of In-app
+    <li><a href="{@docRoot}google/play/billing/billing_overview.html">Overview of In-app
     Billing</a></li>
-    <li><a href="{@docRoot}guide/google/play/billing/billing_integrate.html">Implementing In-app
+    <li><a href="{@docRoot}google/play/billing/billing_integrate.html">Implementing In-app
     Billing</a></li>
-    <li><a href="{@docRoot}guide/google/play/billing/billing_best_practices.html">Security and
+    <li><a href="{@docRoot}google/play/billing/billing_best_practices.html">Security and
     Design</a></li>
-    <li><a href="{@docRoot}guide/google/play/billing/billing_testing.html">Testing In-app
+    <li><a href="{@docRoot}google/play/billing/billing_testing.html">Testing In-app
     Billing</a></li>
-    <li><a href="{@docRoot}guide/google/play/billing/billing_reference.html">In-app Billing
+    <li><a href="{@docRoot}google/play/billing/billing_reference.html">In-app Billing
     Reference</a></li>
   </ol>
 </div>
@@ -83,12 +83,12 @@
 permission. If an application's manifest does not include this permission, you will be able to edit
 existing items in the product list but you will not be able to add new items to the list. For more
 information about this permission, see
-<a href="{@docRoot}guide/google/play/billing/billing_integrate.html#billing-permission">Updating Your
+<a href="{@docRoot}google/play/billing/billing_integrate.html#billing-permission">Updating Your
 Application's Manifest</a>.</p>
 
 <p>In addition, an application package can have only one product list. If you create a product
 list for an application, and you use the <a
-href="{@docRoot}guide/google/play/publishing/multiple-apks.html">multiple APK feature</a> to distribute
+href="{@docRoot}google/play/publishing/multiple-apks.html">multiple APK feature</a> to distribute
 more than one APK for that application, the product list applies to all APK versions that are
 associated with the application listing. You cannot create individual product lists for each APK if
 you are using the multiple APK feature.</p>
@@ -143,7 +143,7 @@
     <strong>Published</strong> and the item's application must be published on Google Play.</p>
     <p class="note"><strong>Note:</strong> This is not true for test accounts. An item is visible to
     a test account if the application is not published and the item is published. See <a
-    href="{@docRoot}guide/google/play/billing/billing_testing.html#billing-testing-real">Testing In-app
+    href="{@docRoot}google/play/billing/billing_testing.html#billing-testing-real">Testing In-app
     Billing</a> for more information.</p>
   </li>
   <li><strong>Language</strong>
@@ -435,7 +435,7 @@
 refund through your Google Wallet merchant account. When you do this, Google Play receives a
 refund notification from Google Wallet, and Google Play sends a refund message to your
 application. For more information, see <a
-href="{@docRoot}guide/google/play/billing/billing_overview.html#billing-action-notify">Handling
+href="{@docRoot}google/play/billing/billing_overview.html#billing-action-notify">Handling
 IN_APP_NOTIFY messages</a> and <a
 href="http://www.google.com/support/androidmarket/bin/answer.py?answer=1153485">In-app Billing
 Pricing</a>.</p>
diff --git a/docs/html/google/play/billing/billing_best_practices.jd b/docs/html/google/play/billing/billing_best_practices.jd
index 850c661..dbf1057 100755
--- a/docs/html/google/play/billing/billing_best_practices.jd
+++ b/docs/html/google/play/billing/billing_best_practices.jd
@@ -11,20 +11,20 @@
   </ol>
   <h2>Downloads</h2>
   <ol>
-    <li><a href="{@docRoot}guide/google/play/billing/billing_integrate.html#billing-download">Sample
+    <li><a href="{@docRoot}google/play/billing/billing_integrate.html#billing-download">Sample
     Application</a></li>
   </ol>
   <h2>See also</h2>
   <ol>
-    <li><a href="{@docRoot}guide/google/play/billing/billing_overview.html">Overview of In-app
+    <li><a href="{@docRoot}google/play/billing/billing_overview.html">Overview of In-app
     Billing</a></li>
-    <li><a href="{@docRoot}guide/google/play/billing/billing_integrate.html">Implementing In-app
+    <li><a href="{@docRoot}google/play/billing/billing_integrate.html">Implementing In-app
     Billing</a></li>
-    <li><a href="{@docRoot}guide/google/play/billing/billing_testing.html">Testing In-app
+    <li><a href="{@docRoot}google/play/billing/billing_testing.html">Testing In-app
     Billing</a></li>
-    <li><a href="{@docRoot}guide/google/play/billing/billing_admin.html">Administering In-app
+    <li><a href="{@docRoot}google/play/billing/billing_admin.html">Administering In-app
     Billing</a></li>
-    <li><a href="{@docRoot}guide/google/play/billing/billing_reference.html">In-app Billing
+    <li><a href="{@docRoot}google/play/billing/billing_reference.html">In-app Billing
     Reference</a></li>
   </ol>
 </div>
diff --git a/docs/html/google/play/billing/billing_integrate.jd b/docs/html/google/play/billing/billing_integrate.jd
index 2d1582e..2ca7c83 100755
--- a/docs/html/google/play/billing/billing_integrate.jd
+++ b/docs/html/google/play/billing/billing_integrate.jd
@@ -21,15 +21,15 @@
   </ol>
   <h2>See also</h2>
   <ol>
-    <li><a href="{@docRoot}guide/google/play/billing/billing_overview.html">Overview of In-app
+    <li><a href="{@docRoot}google/play/billing/billing_overview.html">Overview of In-app
     Billing</a></li>
-    <li><a href="{@docRoot}guide/google/play/billing/billing_best_practices.html">Security and
+    <li><a href="{@docRoot}google/play/billing/billing_best_practices.html">Security and
     Design</a></li>
-    <li><a href="{@docRoot}guide/google/play/billing/billing_testing.html">Testing In-app
+    <li><a href="{@docRoot}google/play/billing/billing_testing.html">Testing In-app
     Billing</a></li>
-    <li><a href="{@docRoot}guide/google/play/billing/billing_admin.html">Administering In-app
+    <li><a href="{@docRoot}google/play/billing/billing_admin.html">Administering In-app
     Billing</a></li>
-    <li><a href="{@docRoot}guide/google/play/billing/billing_reference.html">In-app Billing
+    <li><a href="{@docRoot}google/play/billing/billing_reference.html">In-app Billing
     Reference</a></li>
   </ol>
 </div>
@@ -41,8 +41,8 @@
 billing sample application as an example.</p>
 
 <p>Before you implement in-app billing in your own application, be sure that you read <a
-href="{@docRoot}guide/google/play/billing/billing_overview.html">Overview of In-app Billing</a> and <a
-href="{@docRoot}guide/google/play/billing/billing_best_practices.html">Security and Design</a>. These
+href="{@docRoot}google/play/billing/billing_overview.html">Overview of In-app Billing</a> and <a
+href="{@docRoot}google/play/billing/billing_best_practices.html">Security and Design</a>. These
 documents provide background information that will make it easier for you to implement in-app
 billing.</p>
 
@@ -238,7 +238,7 @@
     your product list so that <code>sword_001</code> has a purchase type of "Managed per user
     account" and <code>potion_001</code> has a purchase type of "Unmanaged" so you can see how these
     two purchase types behave. To learn how to set up a product list, see <a
-    href="{@docRoot}guide/google/play/billing/billing_admin.html#billing-list-setup">Creating a Product
+    href="{@docRoot}google/play/billing/billing_admin.html#billing-list-setup">Creating a Product
     List</a>.</p>
     <p class="note"><strong>Note:</strong> You must publish the items in your product
     list (<code>sword_001</code> and <code>potion_001</code>) even though you are not publishing the
@@ -258,7 +258,7 @@
     <p>You cannot purchase items from yourself (Google Wallet prohibits this), so you need to
     create at least one test account that you can use to purchase items in the sample application.
     To learn how to set up a test account, see <a
-    href="{@docRoot}guide/google/play/billing/billing_testing.html#billing-testing-setup">Setting up Test
+    href="{@docRoot}google/play/billing/billing_testing.html#billing-testing-setup">Setting up Test
     Accounts</a>.</p>
   </li>
   <li><strong>Verify that your device is running a supported version of the Google Play
@@ -279,7 +279,7 @@
  </li>
  <li><strong>Make one of your test accounts the primary account on your device.</strong>
     <p>The primary account on your device must be one of the <a
-    href="{@docRoot}guide/google/play/billing/billing_admin.html#billing-testing-setup">test accounts</a>
+    href="{@docRoot}google/play/billing/billing_admin.html#billing-testing-setup">test accounts</a>
     that you registered on the Google Play publisher site. If the primary account on your device is not a
     test account, you must do a factory reset of the device and then sign in with one of your test
     accounts. To perform a factory reset, do the following:</p>
@@ -466,7 +466,7 @@
 code. However, this is not the complete purchase response; the complete response is delivered with
 an asynchronous broadcast intent. For more information about the various Bundle keys that are
 supported by the <code>MarketBillingService</code>, see <a
-href="{@docRoot}guide/google/play/billing/billing_reference.html#billing-interface">In-app Billing
+href="{@docRoot}google/play/billing/billing_reference.html#billing-interface">In-app Billing
 Service Interface</a>.</p>
 
 <p>You can use the <code>sendBillingRequest()</code> method to send five types of billing requests.
@@ -482,7 +482,7 @@
   <li><code>CONFIRM_NOTIFICATIONS</code>&mdash;acknowledges that you received the transaction
   information for a purchase or refund.</li>
   <li><code>RESTORE_TRANSACTIONS</code>&mdash;retrieves a user's transaction history for <a
-  href="{@docRoot}guide/google/play/billing/billing_admin.html#billing-purchase-type">managed
+  href="{@docRoot}google/play/billing/billing_admin.html#billing-purchase-type">managed
   purchases</a>.</li>
 </ul>
 
@@ -529,7 +529,7 @@
 <code>API_VERSION</code>, and <code>PACKAGE_NAME</code>. If you are offering subscriptions in
 your app, set the API_VERSION key to a value of "2", to confirm that In-app Billing v2 is
 available. For an examnple, see
-<a href="{@docRoot}guide/google/play/billing/billing_subscriptions.html#version">Subscriptions</a>.</p>
+<a href="{@docRoot}google/play/billing/billing_subscriptions.html#version">Subscriptions</a>.</p>
 
 <p>The <code>CHECK_BILLING_SUPPORTED</code> request returns a synchronous {@link
 android.os.Bundle} response, which contains only a single key: <code>RESPONSE_CODE</code>. The
@@ -577,7 +577,7 @@
 <p>You must specify four keys in the request {@link android.os.Bundle}. The following code sample
 shows how to set these keys and make a purchase request for a single in-app item. In the sample,
 <code>mProductId</code> is the Google Play product ID of an in-app item (which is listed in the
-application's <a href="{@docRoot}guide/google/play/billing/billing_admin.html#billing-list-setup">product
+application's <a href="{@docRoot}google/play/billing/billing_admin.html#billing-list-setup">product
 list</a>), and <code>mService</code> is an instance of the <code>MarketBillingService</code>
 interface.</p>
 
@@ -672,7 +672,7 @@
 
 <p class="note"><strong>Note:</strong> The Google Play application also sends
 an <code>IN_APP_NOTIFY</code> for refunds. For more information, see <a
-href="{@docRoot}guide/google/play/billing/billing_overview.html#billing-action-notify">Handling
+href="{@docRoot}google/play/billing/billing_overview.html#billing-action-notify">Handling
 IN_APP_NOTIFY messages</a>.</p>
 
 <p>Because the purchase process is not instantaneous and can take several seconds (or more), you
@@ -855,7 +855,7 @@
 messages, see the <code>BillingReceiver.java</code> and <code>BillingService.java</code> files in
 the sample application. You can use these samples as a basis for your own implementation. However,
 if you use any of the code from the sample application, be sure you follow the guidelines in <a
-href="{@docRoot}guide/google/play/billing/billing_best_practices.html">Security and Design</a>.</p>
+href="{@docRoot}google/play/billing/billing_best_practices.html">Security and Design</a>.</p>
 
 <h2 id="billing-broadcast-receiver">Creating a BroadcastReceiver</h2>
 
@@ -868,19 +868,19 @@
   <p>This broadcast intent contains a Google Play response code, and is sent after you make an
   in-app billing request. For more information about the response codes that are sent with this
   response, see <a
-  href="{@docRoot}guide/google/play/billing/billing_reference.html#billing-codes">Google Play Response
+  href="{@docRoot}google/play/billing/billing_reference.html#billing-codes">Google Play Response
   Codes for In-app Billing</a>.</p>
   </li>
   <li>com.android.vending.billing.IN_APP_NOTIFY
   <p>This response indicates that a purchase has changed state, which means a purchase succeeded,
   was canceled, or was refunded. For more information about notification messages, see <a
-  href="{@docRoot}guide/google/play/billing/billing_reference.html#billing-intents">In-app Billing
+  href="{@docRoot}google/play/billing/billing_reference.html#billing-intents">In-app Billing
   Broadcast Intents</a></p>
   </li>
   <li>com.android.vending.billing.PURCHASE_STATE_CHANGED
   <p>This broadcast intent contains detailed information about one or more transactions. For more
   information about purchase state messages, see <a
-  href="{@docRoot}guide/google/play/billing/billing_reference.html#billing-intents">In-app Billing
+  href="{@docRoot}google/play/billing/billing_reference.html#billing-intents">In-app Billing
   Broadcast Intents</a></p>
   </li>
 </ul>
@@ -989,7 +989,7 @@
 sample application shows you how to do this. You can use this sample as a basis for your own {@link
 android.content.BroadcastReceiver}. However, if you use any of the code from the sample application,
 be sure you follow the guidelines that are discussed in <a
-href="{@docRoot}guide/google/play/billing/billing_best_practices.html">Security and Design </a>.</p>
+href="{@docRoot}google/play/billing/billing_best_practices.html">Security and Design </a>.</p>
 
 <h2 id="billing-signatures">Verifying Signatures and Nonces</h2>
 
@@ -1028,7 +1028,7 @@
 <code>PURCHASE_STATE_CHANGED</code> broadcast intent. The <code>Security.java</code> file in the
 sample application shows you how to do this. If you use this file as a basis for your own security
 implementation, be sure to follow the guidelines in <a
-href="{@docRoot}guide/google/play/billing/billing_best_practices.html">Security and Design</a> and
+href="{@docRoot}google/play/billing/billing_best_practices.html">Security and Design</a> and
 obfuscate your code.</p>
 
 <p>You will need to use your Google Play public key to perform the signature verification. The
@@ -1075,7 +1075,7 @@
 database has been simplified for clarity and does not exhibit the security best practices that we
 recommend. If you have a remote server, we recommend that you store purchase information on your
 server instead of in a local database on a device. For more information about security best
-practices, see <a href="{@docRoot}guide/google/play/billing/billing_best_practices.html">Security and
+practices, see <a href="{@docRoot}google/play/billing/billing_best_practices.html">Security and
 Design</a>.</p>
 
 <p class="note"><strong>Note</strong>: If you store any purchase information on a device, be sure to
diff --git a/docs/html/google/play/billing/billing_overview.jd b/docs/html/google/play/billing/billing_overview.jd
index 82f6cf4..4b2a643 100755
--- a/docs/html/google/play/billing/billing_overview.jd
+++ b/docs/html/google/play/billing/billing_overview.jd
@@ -21,19 +21,19 @@
   </ol>
   <h2>Downloads</h2>
   <ol>
-    <li><a href="{@docRoot}guide/google/play/billing/billing_integrate.html#billing-download">Sample
+    <li><a href="{@docRoot}google/play/billing/billing_integrate.html#billing-download">Sample
     Application</a></li>
   </ol>
   <h2>See also</h2>
   <ol>
-    <li><a href="{@docRoot}guide/google/play/billing/billing_integrate.html">Implementing In-app
+    <li><a href="{@docRoot}google/play/billing/billing_integrate.html">Implementing In-app
     Billing</a></li>
-    <li><a href="{@docRoot}guide/google/play/billing/billing_best_practices.html">Security and
+    <li><a href="{@docRoot}google/play/billing/billing_best_practices.html">Security and
     Design</a></li>
-    <li><a href="{@docRoot}guide/google/play/billing/billing_testing.html">Testing In-app Billing</a></li>
-    <li><a href="{@docRoot}guide/google/play/billing/billing_admin.html">Administering In-app
+    <li><a href="{@docRoot}google/play/billing/billing_testing.html">Testing In-app Billing</a></li>
+    <li><a href="{@docRoot}google/play/billing/billing_admin.html">Administering In-app
     Billing</a></li>
-    <li><a href="{@docRoot}guide/google/play/billing/billing_reference.html">In-app Billing
+    <li><a href="{@docRoot}google/play/billing/billing_reference.html">In-app Billing
     Reference</a></li>
   </ol>
 </div>
@@ -156,7 +156,7 @@
 interface. This interface is defined in an <a
 href="{@docRoot}guide/components/aidl.html">Android Interface Definition Language</a> file
 (<code>IMarketBillingService.aidl</code>). You can <a
-href="{@docRoot}guide/google/play/billing/billing_integrate.html#billing-download">download</a> this AIDL
+href="{@docRoot}google/play/billing/billing_integrate.html#billing-download">download</a> this AIDL
 file with the in-app billing sample application.</p>
 
 <p>The <code>sendBillingRequest()</code> method has a single {@link android.os.Bundle} parameter.
@@ -164,7 +164,7 @@
 the request, such as the type of billing request you are making, the item that is being purchased and
 its type, and the application that is making the request. For more information about the Bundle keys
 that are sent with a request, see <a
-href="{@docRoot}guide/google/play/billing/billing_reference.html#billing-interface">In-app Billing
+href="{@docRoot}google/play/billing/billing_reference.html#billing-interface">In-app Billing
 Service Interface</a>.
 
 <p>One of the most important keys that every request Bundle must have is the
@@ -198,9 +198,9 @@
   </li>
   <li><code>RESTORE_TRANSACTIONS</code>
     <p>This request retrieves a user's transaction status for <a
-    href="{@docRoot}guide/google/play/billing/billing_admin.html#billing-purchase-type">managed
+    href="{@docRoot}google/play/billing/billing_admin.html#billing-purchase-type">managed
     purchases</a> and <a
-    href="{@docRoot}guide/google/play/billing/billing_admin.html#billing-purchase-type">subscriptions</a>.
+    href="{@docRoot}google/play/billing/billing_admin.html#billing-purchase-type">subscriptions</a>.
     You should send this request only when you need to retrieve a user's transaction
     status, which is usually only when your application is reinstalled or installed for the first
     time on a device.</p>
@@ -240,7 +240,7 @@
     request. This response is <em>not</em> used to report any purchase state changes (such as refund
     or purchase information). For more information about the response codes that are sent with this
     response, see <a
-    href="{@docRoot}guide/google/play/billing/billing_reference.html#billing-codes">Server Response Codes
+    href="{@docRoot}google/play/billing/billing_reference.html#billing-codes">Server Response Codes
     for In-app Billing</a>.</p>
   </li>
   <li><code>com.android.vending.billing.IN_APP_NOTIFY</code>
@@ -276,7 +276,7 @@
 </pre>
 
 <p>For more information about the fields in this JSON string, see <a
-href="{@docRoot}guide/google/play/billing/billing_reference.html#billing-intents">In-app Billing
+href="{@docRoot}google/play/billing/billing_reference.html#billing-intents">In-app Billing
 Broadcast Intents</a>.</p>
 
 <h3 id="billing-message-sequence">Messaging sequence</h3>
@@ -435,7 +435,7 @@
 application-initiated <code>REQUEST_PURCHASE</code> message, so that ultimately your application
 receives a <code>PURCHASE_STATE_CHANGED</code> broadcast intent message that includes information
 about the item that has been purchased. This applies only to items that have their <a
-href="{@docRoot}guide/google/play/billing/billing_admin.html#billing-purchase-type">purchase type</a> set
+href="{@docRoot}google/play/billing/billing_admin.html#billing-purchase-type">purchase type</a> set
 to "managed per user account."</p>
 
 <p>In the second case, your application can receive an <code>IN_APP_NOTIFY</code> broadcast intent
@@ -478,7 +478,7 @@
 the signature of the JSON string.</p>
 
 <p>For more information about best practices for security and design, see <a
-href="{@docRoot}guide/google/play/billing/billing_best_practices.html">Security and Design</a>.</p>
+href="{@docRoot}google/play/billing/billing_best_practices.html">Security and Design</a>.</p>
 
 <h2 id="billing-limitations">In-app Billing Requirements and Limitations</h2>
 
diff --git a/docs/html/google/play/billing/billing_reference.jd b/docs/html/google/play/billing/billing_reference.jd
index c5541fa..e78c99f 100755
--- a/docs/html/google/play/billing/billing_reference.jd
+++ b/docs/html/google/play/billing/billing_reference.jd
@@ -15,20 +15,20 @@
   </ol>
   <h2>Downloads</h2>
   <ol>
-    <li><a href="{@docRoot}guide/google/play/billing/billing_integrate.html#billing-download">Sample
+    <li><a href="{@docRoot}google/play/billing/billing_integrate.html#billing-download">Sample
     Application</a></li>
   </ol>
   <h2>See also</h2>
   <ol>
-    <li><a href="{@docRoot}guide/google/play/billing/billing_overview.html">Overview of In-app
+    <li><a href="{@docRoot}google/play/billing/billing_overview.html">Overview of In-app
     Billing</a></li>
-    <li><a href="{@docRoot}guide/google/play/billing/billing_integrate.html">Implementing In-app
+    <li><a href="{@docRoot}google/play/billing/billing_integrate.html">Implementing In-app
     Billing</a></li>
-    <li><a href="{@docRoot}guide/google/play/billing/billing_best_practices.html">Security and
+    <li><a href="{@docRoot}google/play/billing/billing_best_practices.html">Security and
     Design</a></li>
-    <li><a href="{@docRoot}guide/google/play/billing/billing_testing.html">Testing In-app
+    <li><a href="{@docRoot}google/play/billing/billing_testing.html">Testing In-app
     Billing</a></li>
-    <li><a href="{@docRoot}guide/google/play/billing/billing_admin.html">Administering In-app
+    <li><a href="{@docRoot}google/play/billing/billing_admin.html">Administering In-app
     Billing</a></li>
   </ol>
 </div>
@@ -114,7 +114,7 @@
 <p>The following section describes the interface for Google Play's in-app billing service. The
 interface is defined in the <code>IMarketBillingService.aidl</code> file, which is included with the
 in-app billing <a
-href="{@docRoot}guide/google/play/billing/billing_integrate.html#billing-download">sample
+href="{@docRoot}google/play/billing/billing_integrate.html#billing-download">sample
 application</a>.</p>
 <p>The interface consists of a single request method <code>sendBillingRequest()</code>. This method
 takes a single {@link android.os.Bundle} parameter. The Bundle parameter includes several key-value
@@ -233,7 +233,7 @@
   </li>
   <li><code>RESTORE_TRANSACTIONS</code>
     <p>This request retrieves a user's transaction status for managed purchases (see <a
-    href="{@docRoot}guide/google/play/billing/billing_admin.html#billing-purchase-type">Choosing a
+    href="{@docRoot}google/play/billing/billing_admin.html#billing-purchase-type">Choosing a
     Purchase Type</a> for more information). You should send this message only when you need to
     retrieve a user's transaction status, which is usually only when your application is reinstalled
     or installed for the first time on a device.</p>
@@ -304,7 +304,7 @@
 Play application. These broadcast intents inform your application about in-app billing actions
 that have occurred. Your application must implement a {@link android.content.BroadcastReceiver} to
 receive these broadcast intents, such as the <code>BillingReceiver</code> that's shown in the in-app
-billing <a href="{@docRoot}guide/google/play/billing/billing_integrate.html#billing-download">sample
+billing <a href="{@docRoot}google/play/billing/billing_integrate.html#billing-download">sample
 application</a>.</p>
 
 <h4>com.android.vending.billing.RESPONSE_CODE</h4>
@@ -442,7 +442,7 @@
 API is designed to be used from your backend servers as a way of securely
 managing subscriptions, as well as extending and integrating subscriptions with
 other services. See <a
-href="{@docRoot}guide/google/play/billing/billing_subscriptions.html#play-dev-api">
+href="{@docRoot}google/play/billing/billing_subscriptions.html#play-dev-api">
 Google Play Android Developer API</a> for more information.</p>
 
 <h2 id="billing-versions">In-app Billing API Versions</h2>
@@ -457,7 +457,7 @@
 passed in the <code>sendBillingRequest()</code>, which is defined in the defined
 in the <code>IMarketBillingService.aidl</code> file, which is included with the
 in-app billing <a
-href="{@docRoot}guide/google/play/billing/billing_integrate.html#billing-download">
+href="{@docRoot}google/play/billing/billing_integrate.html#billing-download">
 sample application</a>. For more information, see <a
 href="#billing-interface">In-app Billing Service Interface</a>.</p>
 <h3 id="version_2">In-app Billing version 2</h3>
diff --git a/docs/html/google/play/billing/billing_subscriptions.jd b/docs/html/google/play/billing/billing_subscriptions.jd
index 68eda196..5980d83 100755
--- a/docs/html/google/play/billing/billing_subscriptions.jd
+++ b/docs/html/google/play/billing/billing_subscriptions.jd
@@ -48,19 +48,19 @@
 </ol>
   <h2>Downloads</h2>
   <ol>
-    <li><a href="{@docRoot}guide/google/play/billing/billing_integrate.html#billing-download">Sample Application</a></li>
+    <li><a href="{@docRoot}google/play/billing/billing_integrate.html#billing-download">Sample Application</a></li>
   </ol>
   <h2>See also</h2>
   <ol>
-    <li><a href="{@docRoot}guide/google/play/billing/billing_overview.html">Overview of In-app
+    <li><a href="{@docRoot}google/play/billing/billing_overview.html">Overview of In-app
     Billing</a></li>
-    <li><a href="{@docRoot}guide/google/play/billing/billing_best_practices.html">Security and
+    <li><a href="{@docRoot}google/play/billing/billing_best_practices.html">Security and
     Design</a></li>
-    <li><a href="{@docRoot}guide/google/play/billing/billing_testing.html">Testing In-app
+    <li><a href="{@docRoot}google/play/billing/billing_testing.html">Testing In-app
     Billing</a></li>
-    <li><a href="{@docRoot}guide/google/play/billing/billing_admin.html">Administering In-app
+    <li><a href="{@docRoot}google/play/billing/billing_admin.html">Administering In-app
     Billing</a></li>
-    <li><a href="{@docRoot}guide/google/play/billing/billing_reference.html">In-app Billing
+    <li><a href="{@docRoot}google/play/billing/billing_reference.html">In-app Billing
     Reference</a></li>
   </ol>
 </div>
@@ -78,7 +78,7 @@
 interactions as for other in-app products.subscriptions. Because the
 implementation of subscriptions follows the same path as for other in-app
 products, details are provided outside of this document, starting with the <a
-href="{@docRoot}guide/google/play/billing/billing_overview.html">In-app Billing
+href="{@docRoot}google/play/billing/billing_overview.html">In-app Billing
 Overview</a>. </p>
 
 <p>This document is focused on highlighting implementation details that are
@@ -395,7 +395,7 @@
 
 <p>The full implementation details for In-app Billing are provided outside of
 this document, starting with the <a
-href="{@docRoot}guide/google/play/billing/billing_overview.html">In-app Billing
+href="{@docRoot}google/play/billing/billing_overview.html">In-app Billing
 Overview</a>. This document is focused on highlighting implementation details
 that are specific to subscriptions, along with some strategies for the
 associated billing and business models.</p>
@@ -407,7 +407,7 @@
 subscriptions, an updated version of the In-app Billing sample app is available.
 You can download the sample app from the Android SDK repository using the
 Android SDK Manager. For details, see <a
-href="{@docRoot}guide/google/play/billing/billing_integrate.html#billing-download">
+href="{@docRoot}google/play/billing/billing_integrate.html#billing-download">
 Downloading the Sample Application</a>.</p>
 
 <h3 id="model">Application model</h3>
@@ -426,7 +426,7 @@
 errors, and status messages, and an observer for sending callbacks to your
 application as needed. All of these components and their interactions are
 described in full in the <a
-href="{@docRoot}guide/google/play/billing/billing_overview.html">In-app Billing
+href="{@docRoot}google/play/billing/billing_overview.html">In-app Billing
 Overview</a> and related documents.</p>
 
 <p>To initiate different types of billing communication with Google Play, your
@@ -470,7 +470,7 @@
 pass it to your backend servers, which can then use it to query the billing
 status or cancel the subscription remotely. If your app will store the token
 locally, please read the <a
-href="{@docRoot}guide/google/play/billing/billing_best_practices.html">Security and
+href="{@docRoot}google/play/billing/billing_best_practices.html">Security and
 Design</a> document for best practices for maintaining the security of your
 data.</p>
 
@@ -565,7 +565,7 @@
 
 <p>The REQUEST_PURCHASE includes a Bundle containing the item details, as
 described in the <a
-href="{@docRoot}guide/google/play/billing/billing_overview.html">In-app Billing
+href="{@docRoot}google/play/billing/billing_overview.html">In-app Billing
 Overview</a>. For a subscription, the Bundle must also specify:</p>
 
 <ul>
@@ -581,7 +581,7 @@
 <code>RESPONSE_CODE</code>, <code>PURCHASE_INTENT</code>, and
 <code>REQUEST_ID</code>. Your app uses the <code>PURCHASE_INTENT</code> to
 launch the checkout UI and the message flow proceeds exactly as described in <a
-href="{@docRoot}guide/google/play/billing/billing_overview.html#billing-message-
+href="{@docRoot}google/play/billing/billing_overview.html#billing-message-
 sequence">Messaging sequence</a>.</p>
 
 <p>Here’s how the sample app initiates a purchase for a subscription, where
@@ -638,7 +638,7 @@
 
 <p>The process for restoring subscriptions transactions is the same as described
 in <a
-href="{@docRoot}guide/google/play/billing/billing_overview.html#billing-message-
+href="{@docRoot}google/play/billing/billing_overview.html#billing-message-
 sequence">Messaging sequence</a>. Your app sends a
 <code>RESTORE_TRANSACTIONS</code> request to Google Play. Google Play sends two
 broadcast intents as asynchronous responses &mdash; a <code>RESPONSE_CODE</code>
@@ -654,7 +654,7 @@
 <p>Your app can store the restored purchase state and other transaction details
 in the way that best meets your needs. Your app can use it later to check the
 subscription validity, although please read the <a
-href="{@docRoot}guide/google/play/billing/billing_best_practices.html">Security and
+href="{@docRoot}google/play/billing/billing_best_practices.html">Security and
 Design</a> document for best practices for maintaining the security of your
 data.</p>
 
@@ -788,7 +788,7 @@
 
 <p>For subscriptions, you make the same types of modifications to your app as
 are described in <a
-href="{@docRoot}guide/google/play/billing/billing_integrate.html#billing-implement">
+href="{@docRoot}google/play/billing/billing_integrate.html#billing-implement">
 Modifying your Application Code</a>.</p>
 
 <p>Note that, in your UI that lets users view and select subscriptions for
@@ -816,7 +816,7 @@
 <li>Additional currency pricing (can be auto-filled)</li>
 </ul>
 
-<p>For details, please see <a href="{@docRoot}guide/google/play/billing/billing_admin.html">Administering
+<p>For details, please see <a href="{@docRoot}google/play/billing/billing_admin.html">Administering
 In-app Billing</a>.</p>
 
 
diff --git a/docs/html/google/play/billing/billing_testing.jd b/docs/html/google/play/billing/billing_testing.jd
index e2d4a01..edf7e70 100755
--- a/docs/html/google/play/billing/billing_testing.jd
+++ b/docs/html/google/play/billing/billing_testing.jd
@@ -13,20 +13,20 @@
   </ol>
   <h2>Downloads</h2>
   <ol>
-    <li><a href="{@docRoot}guide/google/play/billing/billing_integrate.html#billing-download">Sample
+    <li><a href="{@docRoot}google/play/billing/billing_integrate.html#billing-download">Sample
     Application</a></li>
   </ol>
   <h2>See also</h2>
   <ol>
-    <li><a href="{@docRoot}guide/google/play/billing/billing_overview.html">Overview of In-app
+    <li><a href="{@docRoot}google/play/billing/billing_overview.html">Overview of In-app
     Billing</a></li>
-    <li><a href="{@docRoot}guide/google/play/billing/billing_integrate.html">Implementing In-app
+    <li><a href="{@docRoot}google/play/billing/billing_integrate.html">Implementing In-app
     Billing</a></li>
-    <li><a href="{@docRoot}guide/google/play/billing/billing_best_practices.html">Security and
+    <li><a href="{@docRoot}google/play/billing/billing_best_practices.html">Security and
     Design</a></li>
-    <li><a href="{@docRoot}guide/google/play/billing/billing_admin.html">Administering In-app
+    <li><a href="{@docRoot}google/play/billing/billing_admin.html">Administering In-app
     Billing</a></li>
-    <li><a href="{@docRoot}guide/google/play/billing/billing_reference.html">In-app Billing
+    <li><a href="{@docRoot}google/play/billing/billing_reference.html">In-app Billing
     Reference</a></li>
   </ol>
 </div>
@@ -94,7 +94,7 @@
     request through your Google Wallet account, a refund message is sent to your application by
     Google Play. This occurs only when Google Play gets notification from Google Wallet that
     a refund has been made. For more information about refunds, see <a
-    href="{@docRoot}guide/google/play/billing/billing_overview.html#billing-action-notify">Handling
+    href="{@docRoot}google/play/billing/billing_overview.html#billing-action-notify">Handling
     IN_APP_NOTIFY messages</a> and <a
     href="http://www.google.com/support/androidmarket/bin/answer.py?answer=1153485">In-app Billing
     Pricing</a>.</p>
@@ -108,7 +108,7 @@
 <p>In some cases, the reserved items may return signed static responses, which lets you test
 signature verification in your application. To test signature verification with the special reserved
 product IDs, you may need to set up <a
-href="{@docRoot}guide/google/play/billing/billing_admin.html#billing-testing-setup">test accounts</a> or
+href="{@docRoot}google/play/billing/billing_admin.html#billing-testing-setup">test accounts</a> or
 upload your application as a unpublished draft application. Table 1 shows you the conditions under
 which static responses are signed.</p>
 
@@ -218,7 +218,7 @@
 register at least one test account on the Google Play publisher site. You cannot use your
 developer account to test the complete in-app purchase process because Google Wallet does not let
 you buy items from yourself. If you have not set up test accounts before, see <a
-href="{@docRoot}guide/google/play/billing/billing_admin.html#billing-testing-setup">Setting up test
+href="{@docRoot}google/play/billing/billing_admin.html#billing-testing-setup">Setting up test
 accounts</a>.</p>
 
 <p>Also, a test account can purchase an item in your product list only if the item is published. The
@@ -243,7 +243,7 @@
   </li>
   <li><strong>Add items to the application's product list.</strong>
     <p>Make sure that you publish the items (the application can remain unpublished). See <a
-    href="{@docRoot}guide/google/play/billing/billing_admin.html#billing-catalog">Creating a product
+    href="{@docRoot}google/play/billing/billing_admin.html#billing-catalog">Creating a product
     list</a> to learn how to do this.</p>
   </li>
   <li><strong>Install your application on an Android-powered device.</strong>
@@ -256,7 +256,7 @@
  <li><strong>Make one of your test accounts the primary account on your device.</strong>
     <p>To perform end-to-end testing of in-app billing, the primary account on your device must be
     one of the <a
-    href="{@docRoot}guide/google/play/billing/billing_admin.html#billing-testing-setup">test accounts</a>
+    href="{@docRoot}google/play/billing/billing_admin.html#billing-testing-setup">test accounts</a>
     that you registered on the Google Play site. If the primary account on your device is not a
     test account, you must do a factory reset of the device and then sign in with one of your test
     accounts. To perform a factory reset, do the following:</p>
diff --git a/docs/html/google/play/billing/index.jd b/docs/html/google/play/billing/index.jd
index 134140d..80ba2d4 100755
--- a/docs/html/google/play/billing/index.jd
+++ b/docs/html/google/play/billing/index.jd
@@ -6,25 +6,25 @@
 
   <h2>Topics</h2>
   <ol>
-    <li><a href="{@docRoot}guide/google/play/billing/billing_overview.html">Overview of In-app
+    <li><a href="{@docRoot}google/play/billing/billing_overview.html">Overview of In-app
     Billing</a></li>
-    <li><a href="{@docRoot}guide/google/play/billing/billing_integrate.html">Implementing In-app
+    <li><a href="{@docRoot}google/play/billing/billing_integrate.html">Implementing In-app
     Billing</a></li>
-    <li><a href="{@docRoot}guide/google/play/billing/billing_subscriptions.html">Subscriptions</a></li>
-    <li><a href="{@docRoot}guide/google/play/billing/billing_best_practices.html">Security and
-    Design</a></li>    <li><a href="{@docRoot}guide/google/play/billing/billing_testing.html">Testing In-app
+    <li><a href="{@docRoot}google/play/billing/billing_subscriptions.html">Subscriptions</a></li>
+    <li><a href="{@docRoot}google/play/billing/billing_best_practices.html">Security and
+    Design</a></li>    <li><a href="{@docRoot}google/play/billing/billing_testing.html">Testing In-app
     Billing</a></li>
-    <li><a href="{@docRoot}guide/google/play/billing/billing_admin.html">Administering In-app
+    <li><a href="{@docRoot}google/play/billing/billing_admin.html">Administering In-app
     Billing</a></li>
   </ol>
   <h2>Reference</h2>
   <ol>
-    <li><a href="{@docRoot}guide/google/play/billing/billing_reference.html">In-app Billing
+    <li><a href="{@docRoot}google/play/billing/billing_reference.html">In-app Billing
     Reference</a></li>
   </ol>
   <h2>Downloads</h2>
   <ol>
-    <li><a href="{@docRoot}guide/google/play/billing/billing_integrate.html#billing-download">Sample
+    <li><a href="{@docRoot}google/play/billing/billing_integrate.html#billing-download">Sample
     Application</a></li>
   </ol>  
 </div>
@@ -43,7 +43,7 @@
 <div class="sidebox-wrapper">
 <div class="sidebox">
   <p><strong>Free trials for subscriptions</strong> <span class="new" style="font-size:.78em;">New!</span></p>
-  <p>You can now offer users a configurable <a href="{@docRoot}guide/google/play/billing/billing_subscriptions.html#trials">free trial period</a> for your in-app subscriptions. You can set up trials with a simple change in the Developer Console&mdash;no change to your app code is needed. 
+  <p>You can now offer users a configurable <a href="{@docRoot}google/play/billing/billing_subscriptions.html#trials">free trial period</a> for your in-app subscriptions. You can set up trials with a simple change in the Developer Console&mdash;no change to your app code is needed. 
 </div>
 </div>
 
@@ -71,7 +71,7 @@
 <p class="caution"><strong>Important</strong>: Although the sample application is a working example
 of how you can implement in-app billing, we <em>strongly recommend</em> that you modify and
 obfuscate the sample code before you use it in a production application. For more information, see
-<a href="{@docRoot}guide/google/play/billing/billing_best_practices.html">Security and Design</a>.</p>
+<a href="{@docRoot}google/play/billing/billing_best_practices.html">Security and Design</a>.</p>
 
 <img src="{@docRoot}images/billing_checkout_flow.png" height="382" id="figure1" />
 <p class="img-caption">
@@ -84,29 +84,29 @@
 applications, read the following documents:</p>
 
 <dl>
-  <dt><strong><a href="{@docRoot}guide/google/play/billing/billing_overview.html">Overview of In-app
+  <dt><strong><a href="{@docRoot}google/play/billing/billing_overview.html">Overview of In-app
   Billing</a></strong></dt>
     <dd>Learn how the service works and what a typical in-app billing implementation looks
     like.</dd>
-  <dt><strong><a href="{@docRoot}guide/google/play/billing/billing_integrate.html">Implementing
+  <dt><strong><a href="{@docRoot}google/play/billing/billing_integrate.html">Implementing
   In-app Billing</a></strong></dt>
     <dd>Use this step-by-step guide to start incorporating in-app billing into your
     application. The instructions apply to both one-time and subscription purchases.</dd>
     
-    <dt><strong><a href="{@docRoot}guide/google/play/billing/billing_subscriptions.html">Subscriptions</a></strong></dt>
+    <dt><strong><a href="{@docRoot}google/play/billing/billing_subscriptions.html">Subscriptions</a></strong></dt>
     <dd>Learn how subscriptions work and how to implement support for them in your app.</dd>
-  <dt><strong><a href="{@docRoot}guide/google/play/billing/billing_best_practices.html">Security
+  <dt><strong><a href="{@docRoot}google/play/billing/billing_best_practices.html">Security
   and Design</a></strong></dt>
     <dd>Review these best practices to help ensure that your in-app billing implementation is
     secure and well designed.</dd>
-  <dt><strong><a href="{@docRoot}guide/google/play/billing/billing_testing.html">Testing In-app
+  <dt><strong><a href="{@docRoot}google/play/billing/billing_testing.html">Testing In-app
   Billing</a></strong></dt>
     <dd>Understand how the in-app billing test tools work and learn how to test your in-app billing
     implementation.</dd>
-  <dt><strong><a href="{@docRoot}guide/google/play/billing/billing_admin.html">Administering
+  <dt><strong><a href="{@docRoot}google/play/billing/billing_admin.html">Administering
   In-app Billing</a></strong></dt>
     <dd>Learn how to set up your product list, register test accounts, and handle refunds.</dd>
-  <dt><strong><a href="{@docRoot}guide/google/play/billing/billing_reference.html">In-app Billing
+  <dt><strong><a href="{@docRoot}google/play/billing/billing_reference.html">In-app Billing
   Reference</a></strong></dt>
     <dd>Get detailed information about Google Play response codes and the in-app billing
     interface.</dd>
diff --git a/docs/html/google/play/dist.jd b/docs/html/google/play/dist.jd
index 7e60315..20523f6 100644
--- a/docs/html/google/play/dist.jd
+++ b/docs/html/google/play/dist.jd
@@ -17,7 +17,7 @@
     <p>
       Make sure your app gets to the right users by filtering on a wide range of characteristics
       such as platform versions and hardware features.
-    </p><p><a href="{@docRoot}guide/google/play/filters.html">Learn more &raquo;</a></p>
+    </p><p><a href="{@docRoot}google/play/filters.html">Learn more &raquo;</a></p>
   </div>
 
   <div class="layout-content-col span-6">
@@ -27,7 +27,7 @@
     <p>
       Distribute different APKs based on a variety of properties such as platform version, screen
       size, and GLES texture compression support.
-    </p><p><a href="{@docRoot}guide/google/play/publishing/multiple-apks.html">Learn more &raquo;</a></p>
+    </p><p><a href="{@docRoot}google/play/publishing/multiple-apks.html">Learn more &raquo;</a></p>
   </div>
 
 <div class="layout-content-row">
@@ -39,7 +39,7 @@
       Tap into Google's content delivery services by serving up to 4GB of assets for free. Provide
       users with high-fidelity graphics, media files, or other large assets that are required by
       your app.
-    </p><a href="{@docRoot}guide/google/play/expansion-files.html">Learn more &raquo;</a>
+    </p><a href="{@docRoot}google/play/expansion-files.html">Learn more &raquo;</a>
   </div>
 
    <div class="layout-content-col span-6">
@@ -47,6 +47,6 @@
       Application Licensing
     </h4>
     <p>Protect your revenue streams and integrate policies for usage into your app.
-    </p><a href="{@docRoot}guide/google/play/licensing/index.html">Learn more &raquo;</a>
+    </p><a href="{@docRoot}google/play/licensing/index.html">Learn more &raquo;</a>
   </div>
 </div>
\ No newline at end of file
diff --git a/docs/html/google/play/expansion-files.jd b/docs/html/google/play/expansion-files.jd
index 9cd1bb1..271c192 100644
--- a/docs/html/google/play/expansion-files.jd
+++ b/docs/html/google/play/expansion-files.jd
@@ -52,8 +52,8 @@
 
 <h2>See also</h2>
 <ol>
-  <li><a href="{@docRoot}guide/google/play/licensing/index.html">Application Licensing</a></li>
-  <li><a href="{@docRoot}guide/google/play/publishing/multiple-apks.html">Multiple
+  <li><a href="{@docRoot}google/play/licensing/index.html">Application Licensing</a></li>
+  <li><a href="{@docRoot}google/play/publishing/multiple-apks.html">Multiple
 APK Support</a></li>
 </ol>
 </div>
@@ -216,7 +216,7 @@
       <li>If yes, your app is ready to go.</li>
       <li>If no, your app must download the expansion files over HTTP from Google Play. Your app
 must send a request to the Google Play client using the Google Play's <a
-href="{@docRoot}guide/google/play/licensing/index.html">Application Licensing</a> service, which
+href="{@docRoot}google/play/licensing/index.html">Application Licensing</a> service, which
 responds with the name, file size, and URL for each expansion file. With this information, you then
 download the files and save them to the proper <a href="#StorageLocation">storage location</a>.</li>
     </ol>
@@ -243,7 +243,7 @@
 Space is precious and you should keep your total application size as small as possible. If your app
 uses more than 50MB in order to provide multiple versions of your graphic assets for multiple screen
 densities, consider instead publishing <a
-href="{@docRoot}guide/google/play/publishing/multiple-apks.html">multiple APKs</a> in which each APK
+href="{@docRoot}google/play/publishing/multiple-apks.html">multiple APKs</a> in which each APK
 contains only the assets required for the screens that it targets.</li>
   <li>Determine which application resources to separate from your APK and package them in a
 file to use as the main expansion file.
@@ -260,7 +260,7 @@
   </li>
   <li>Add logic to your application's main activity that checks whether the expansion files
 are on the device upon start-up. If the files are not on the device, use Google Play's <a
-href="{@docRoot}guide/google/play/licensing/index.html">Application Licensing</a> service to request URLs
+href="{@docRoot}google/play/licensing/index.html">Application Licensing</a> service to request URLs
 for the expansion files, then download and save them.
     <p>To greatly reduce the amount of code you must write and ensure a good user experience
 during the download, we recommend you use the <a href="#AboutLibraries">Downloader
@@ -293,16 +293,16 @@
 provides for each file is unique for every download and each one expires shortly after it is given
 to your application.</li>
   <li>If you update your application with a new APK or upload <a
-href="{@docRoot}guide/google/play/publishing/multiple-apks.html">multiple APKs</a> for the same
+href="{@docRoot}google/play/publishing/multiple-apks.html">multiple APKs</a> for the same
 application, you can select expansion files that you've uploaded for a previous APK. <strong>The
 expansion file's name does not change</strong>&mdash;it retains the version received by the APK to
 which the file was originally associated.</li>
   <li>If you use expansion files in combination with <a
-href="{@docRoot}guide/google/play/publishing/multiple-apks.html">multiple APKs</a> in order to
+href="{@docRoot}google/play/publishing/multiple-apks.html">multiple APKs</a> in order to
 provide different expansion files for different devices, you still must upload separate APKs
 for each device in order to provide a unique  <a
 href="{@docRoot}guide/topics/manifest/manifest-element.html#vcode">{@code versionCode}</a>
-value and declare different <a href="{@docRoot}guide/google/play/filters.html">filters</a> for
+value and declare different <a href="{@docRoot}google/play/filters.html">filters</a> for
 each APK.</li>
   <li>You cannot issue an update to your application by changing the expansion files
 alone&mdash;<strong>you must upload a new APK</strong> to update your app. If your changes only
@@ -334,7 +334,7 @@
 application launches for the first time. However, in some cases your app must download the
 expansion files itself by requesting them from a URL provided to you in a response
 from Google Play's <a
-href="{@docRoot}guide/google/play/licensing/index.html">Application Licensing</a> service.</p>
+href="{@docRoot}google/play/licensing/index.html">Application Licensing</a> service.</p>
 
 <p>The basic logic you need to download your expansion files is the following:</p>
 
@@ -347,7 +347,7 @@
       <li>If the expansion files are <em>not</em> there:
         <ol>
           <li>Perform a request using Google Play's <a
-href="{@docRoot}guide/google/play/licensing/index.html">Application Licensing</a> to get your
+href="{@docRoot}google/play/licensing/index.html">Application Licensing</a> to get your
 app's expansion file names, sizes, and URLs.</li>
           <li>Use the URLs provided by Google Play to download the expansion files and save
 the expansion files. You <strong>must</strong> save the files to the <a
@@ -366,7 +366,7 @@
 
 
 <p>If your application is free (not a paid app), then you probably haven't used the <a
-href="{@docRoot}guide/google/play/licensing/index.html">Application Licensing</a> service. It's primarily
+href="{@docRoot}google/play/licensing/index.html">Application Licensing</a> service. It's primarily
 designed for you to enforce
 licensing policies for your application and ensure that the user has the right to
 use your app (he or she rightfully paid for it on Google Play). In order to facilitate the
@@ -410,7 +410,7 @@
 the library into your application.</p>
 
 <p>If you'd rather develop your own solution to download the expansion files using the Google
-Play URLs, you must follow the <a href="{@docRoot}guide/google/play/licensing/index.html">Application
+Play URLs, you must follow the <a href="{@docRoot}google/play/licensing/index.html">Application
 Licensing</a> documentation to perform a license request, then retrieve the expansion file names,
 sizes, and URLs from the response extras. You should use the <a href="#ExpansionPolicy">{@code
 APKExpansionPolicy}</a> class (included in the License Verification Library) as your licensing
@@ -572,11 +572,11 @@
   <dt>{@code getPublicKey()}</dt>
     <dd>This must return a string that is the Base64-encoded RSA public key for your publisher
 account, available from the profile page on the Developer Console (see <a
-href="{@docRoot}guide/google/play/licensing/setting-up.html">Setting Up for Licensing</a>).</dd>
+href="{@docRoot}google/play/licensing/setting-up.html">Setting Up for Licensing</a>).</dd>
   <dt>{@code getSALT()}</dt>
     <dd>This must return an array of random bytes that the licensing {@code Policy} uses to
 create an <a
-href="{@docRoot}guide/google/play/licensing/adding-licensing.html#impl-Obfuscator">{@code
+href="{@docRoot}google/play/licensing/adding-licensing.html#impl-Obfuscator">{@code
 Obfuscator}</a>. The salt ensures that your obfuscated {@link android.content.SharedPreferences}
 file in which your licensing data is saved will be unique and non-discoverable.</dd>
   <dt>{@code getAlarmReceiverClassName()}</dt>
@@ -925,7 +925,7 @@
 <p>For more information about how to use the {@code APKExpansionPolicy} when you're <em>not</em>
 using the <a
 href="#AboutLibraries">Downloader Library</a>, see the documentation for <a
-href="{@docRoot}guide/google/play/licensing/adding-licensing.html">Adding Licensing to Your App</a>,
+href="{@docRoot}google/play/licensing/adding-licensing.html">Adding Licensing to Your App</a>,
 which explains how to implement a license policy such as this one.</p>
 
 
diff --git a/docs/html/google/play/filters.jd b/docs/html/google/play/filters.jd
index 3db9cb6..eeb2215 100644
--- a/docs/html/google/play/filters.jd
+++ b/docs/html/google/play/filters.jd
@@ -6,19 +6,18 @@
 
 <h2>Quickview</h2>
 <ul>
-<li>Google Play applies filters that control which Android-powered devices can access your
-application when the user is visiting the store.</li>
-<li>Filtering is determined by comparing device configurations that you declare in you app's
-manifest file to the configurations defined by the device, as well as other factors.</li> </ul>
+<li>Google Play applies filters to control which Android devices can download
+your application from the store.</li>
+<li>Filtering ensures that your apps are available only to users whose devices meet your app's compatibility requirements.
+<li>Filtering is determined by the configuration requirements that you declare in you app's
+manifest file, as well as other factors.</li>
+</ul>
 
 <h2>In this document</h2>
 
 <ol>
   <li><a href="#how-filters-work">How Filters Work on Google Play</a></li>
   <li><a href="#manifest-filters">Filtering based on Manifest Elements</a>
-    <ol>
-      <li><a href="#advanced-filters">Advanced manifest filters</a></li>
-    </ol>
   </li>
   <li><a href="#other-filters">Other Filters</a></li>
   <li><a href="#MultiApks">Publishing Multiple APKs with Different Filters</a></li>
@@ -44,53 +43,44 @@
 href="{@docRoot}guide/topics/manifest/uses-sdk-element.html">&lt;uses-sdk&gt;</code></a></li>
 </ol>
 
-<div id="qv-extra">
-  <img id="rule" src="{@docRoot}assets/images/grad-rule-qv.png">
-  <div id="qv-sub-rule">
-    <img src="{@docRoot}assets/images/icon_play.png" style="float:left;margin:0;padding:0 5px;">
-    <h2 style="color:#669999;padding-top:1em;">Interested in publishing your app on Google Play?</h2>
-    <p><a id="publish-link"
-href="http://play.google.com/apps/publish">Go to Google Play</a> to create a publisher
-account and upload your app.</p></div>
-</div>
-
 </div>
 </div>
 
+<p>When a user searches or browses for apps to download on Google Play, the
+results are filtered based on which applications are compatible with the device.
+For example, if an app requires a camera, Google Play would not show the app to devices
+that do not have a camera. This <em>filtering</em> helps developers manage the
+distribution of their apps and helps ensure the best possible experience for
+users.</p>
 
-<p>When a user searches or browses on Google Play on an Android device, the results are filtered
-based on which applications are compatible with that device. For example, if an application
-requires a camera (as specified in the application manifest file), then Google Play will not show
-the app on any device that does not have a camera.</p>
+<p>Filtering in Google Play is based on several types of app metadata and
+configuration settings, including manifest declarations, required
+libraries,architecture dependencies, and distribution controls set in the Google
+Play Developer Console, such as geographic targeting, pricing, and more.</p>
 
-<p>Declarations in the manifest file that are compared to the device's configuration is not the
-only part of how applications are filtered. Filtering might also occur due to the user's country and
-carrier, the presence or absence of a SIM card, and other factors. </p>
-
-<p>Changes to the Google Play filters are independent of changes to the Android platform itself.
-This document is updated periodically to reflect any changes that affect the way Google Play
-filters applications.</p>
+<p>Google Play filtering is based in part on manifest declarations and other
+aspects of the Android framework, but actual filtering behaviors are distinct
+from the framework and are not bound to specific API levels. This document
+specifies the current filtering rules used by Google Play.</p>
 
 
 <h2 id="how-filters-work">How Filters Work on Google Play</h2>
 
 <p>Google Play uses the filter restrictions described below to determine
 whether to show your application to a user who is browsing or searching for
-applications from the Google Play app. When determining whether to display your app,
-Google Play checks the device's hardware and software configuration, as well as it's
-carrier, location, and other characteristics. It then compares those against the
-restrictions and dependencies expressed by the application's
-manifest file and publishing details. If the application is
-compatible with the device according to the filter rules, Google Play displays the
-application to the user. Otherwise, Google Play hides your application from search
-results and category browsing, even if a user specifically requests
-the app by clicking a deep link that points directly to the app's ID within Google Play..</p>
+applications from the Google Play app.</p>
 
-<p class="note"><strong>Note:</strong> When users browse the <a
-href="http://play.google.com/apps">Google Play web site</a>, they can see all published
-applications. The Google Play web site compares the application requirements to each of the
-user's registered devices for compatibility, though, and only allows them to install the application
-if it's compatible with their device.</p>
+<p>When determining whether to display your app, Google Play checks the device's
+hardware and software requirement, as well as it's carrier, location, and other
+characteristics. It then compares those against the restrictions and
+dependencies expressed by the application's manifest file and publishing
+details. </p>
+
+<p>If the application is compatible with the device according to the filter
+rules, Google Play displays the application to the user. Otherwise, Google Play
+hides your application from search results and category browsing, even if a user
+specifically requests the app by clicking a deep link that points directly to
+the app's ID within Google Play.</p>
 
 <p>You can use any combination of the available filters for your app. For example, you can set a
 <code>minSdkVersion</code> requirement of <code>"4"</code> and set <code>smallScreens="false"</code>
@@ -103,8 +93,15 @@
 update that makes the app invisible to the user, the user will not see that an update is
 available.</p>
 
+<h4>Filtering on the Google Play web site</h4>
 
-<h2 id="manifest-filters">Filtering based on Manifest Elements</h2>
+<p>When users browse the <a href="http://play.google.com/apps">Google Play web
+site</a>, they can see all published applications. The Google Play web site
+compares the application requirements to each of the user's registered devices
+for compatibility, though, and only allows them to install the application if
+it's compatible with their device.</p>
+
+<h2 id="manifest-filters">Filtering based on the App Manifest</h2>
 
 <p>Most filters are triggered by elements within an application's
 manifest file, <a
@@ -451,4 +448,4 @@
 version codes for each APK to ensure proper update paths for each configuration.</p>
 
 <p>If you need more information about how to publish multiple APKs on Google Play, read <a
-href="{@docRoot}guide/google/play/publishing/multiple-apks.html">Multiple APK Support</a>.</p>
+href="{@docRoot}google/play/publishing/multiple-apks.html">Multiple APK Support</a>.</p>
diff --git a/docs/html/google/play/licensing/adding-licensing.jd b/docs/html/google/play/licensing/adding-licensing.jd
index 4a45de3..15d1e92 100644
--- a/docs/html/google/play/licensing/adding-licensing.jd
+++ b/docs/html/google/play/licensing/adding-licensing.jd
@@ -72,11 +72,11 @@
 <p>The sections below describe these tasks. When you are done with the
 integration, you should be able to compile your application successfully and you
 can begin testing, as described in <a
-href="{@docRoot}guide/google/play/licensing/setting-up.html#test-env">Setting Up the Test
+href="{@docRoot}google/play/licensing/setting-up.html#test-env">Setting Up the Test
 Environment</a>.</p>
 
 <p>For an overview of the full set of source files included in the LVL, see <a
-href="{@docRoot}guide/google/play/licensing/licensing-reference.html#lvl-summary">Summary of LVL Classes
+href="{@docRoot}google/play/licensing/licensing-reference.html#lvl-summary">Summary of LVL Classes
 and Interfaces</a>.</p>
 
 
@@ -224,7 +224,7 @@
 cached response is valid, rather than making a request to the licensing server.
 Setting the response validity according to the server-provided <code>VT</code>
 extra is highly recommended. See <a
-href="{@docRoot}guide/google/play/licensing/licensing-reference.html#extras">Server Response Extras</a>
+href="{@docRoot}google/play/licensing/licensing-reference.html#extras">Server Response Extras</a>
 for more information.</li>
 <li>Uses an exponential backoff period, if retrying any requests the result in
 errors. Note that the Google Play client automatically retries failed
@@ -247,7 +247,7 @@
 recommended. See the ServerManagedPolicy implementation for an example of how to
 extract and use the extras. For a list of server settings and information about
 how to use them, see  <a
-href="{@docRoot}guide/google/play/licensing/licensing-reference.html#extras">Server Response
+href="{@docRoot}google/play/licensing/licensing-reference.html#extras">Server Response
 Extras</a>.</p>
 
 <h3 id="ServerManagedPolicy">ServerManagedPolicy</h3>
@@ -261,7 +261,7 @@
 </p>
 
 <p style="margin-top:.5em;">See <a
-href="{@docRoot}guide/google/play/licensing/licensing-reference.html#extras">Server Response Extras</a>
+href="{@docRoot}google/play/licensing/licensing-reference.html#extras">Server Response Extras</a>
 for
 a list of settings and <code>ServerManagedPolicy.java</code> for information
 about how a {@code Policy} can use the extras.</p>
@@ -294,7 +294,7 @@
 license response in its <code>processServerResponse()</code> method and checks
 them in its <code>allowAccess()</code> method. For a list of the server-provided
 settings used by ServerManagedPolicy, see <a
-href="{@docRoot}guide/google/play/licensing/licensing-reference.html#extras">Server Response
+href="{@docRoot}google/play/licensing/licensing-reference.html#extras">Server Response
 Extras</a>.</p>
 
 <p>For convenience, best performance, and the benefit of using license settings
@@ -697,9 +697,9 @@
 <p>Additionally, you should implement the <code>applicationError()</code>
 method, which the LVL calls to let your application handle errors that are not
 retryable. For a list of such errors, see <a
-href="{@docRoot}guide/google/play/licensing/licensing-reference.html#server-response-codes">Server
+href="{@docRoot}google/play/licensing/licensing-reference.html#server-response-codes">Server
 Response Codes</a> in the <a
-href="{@docRoot}guide/google/play/licensing/licensing-reference.html">Licensing Reference</a>. You can implement
+href="{@docRoot}google/play/licensing/licensing-reference.html">Licensing Reference</a>. You can implement
 the method in any way needed. In most cases, the
 method should log the error code and call <code>dontAllow()</code>.</p>
 
diff --git a/docs/html/google/play/licensing/index.jd b/docs/html/google/play/licensing/index.jd
index d393738..a13be10 100644
--- a/docs/html/google/play/licensing/index.jd
+++ b/docs/html/google/play/licensing/index.jd
@@ -31,25 +31,25 @@
 to initiate the download of an APK expansion file. In which case, the request that your application
 sends to the licensing service is not to check whether the user paid for the app, but to request the
 URL of the expansion files. For information about downloading expansion files for your application,
-read the guide to <a href="{@docRoot}guide/google/play/expansion-files.html">APK Expansion Files</a>.</p>
+read the guide to <a href="{@docRoot}google/play/expansion-files.html">APK Expansion Files</a>.</p>
 
 
 <p>To learn more about Google Play's application licensing service and start integrating it into
 your applications, read the following documents:</p>
 
 <dl>
-  <dt><strong><a href="{@docRoot}guide/google/play/licensing/overview.html">Licensing
+  <dt><strong><a href="{@docRoot}google/play/licensing/overview.html">Licensing
 Overview</a></strong></dt>
     <dd>Describes how the service works and what a typical licensing implementation looks
 like.</dd>
-  <dt><strong><a href="{@docRoot}guide/google/play/licensing/setting-up.html">Setting Up for
+  <dt><strong><a href="{@docRoot}google/play/licensing/setting-up.html">Setting Up for
 Licensing</a></strong></dt>
     <dd>Explains how to set up your Google Play account, development environment, and
 testing environment in order to add licensing to your app.</dd>
-  <dt><strong><a href="{@docRoot}guide/google/play/licensing/adding-licensing.html">Adding
+  <dt><strong><a href="{@docRoot}google/play/licensing/adding-licensing.html">Adding
 Licensing to Your App</a></strong></dt>
     <dd>Provides a step-by-step guide to add licensing verification to your application.</dd>
-  <dt><strong><a href="{@docRoot}guide/google/play/licensing/licensing-reference.html">Licensing
+  <dt><strong><a href="{@docRoot}google/play/licensing/licensing-reference.html">Licensing
 Reference</a></strong></dt>
     <dd>Provides detailed information about the licensing library's classes and the service response
 codes.</dd>
diff --git a/docs/html/google/play/licensing/licensing-reference.jd b/docs/html/google/play/licensing/licensing-reference.jd
index d3d5224..79c818c 100644
--- a/docs/html/google/play/licensing/licensing-reference.jd
+++ b/docs/html/google/play/licensing/licensing-reference.jd
@@ -230,7 +230,7 @@
 </table>
 
 <p class="note"><strong>Note:</strong> As documented in <a
-href="{@docRoot}guide/google/play/licensing/setting-up.html#test-env">
+href="{@docRoot}google/play/licensing/setting-up.html#test-env">
 Setting Up The Testing Environment</a>, the response code can be manually
 overridden for the application developer and any registered test users via the
 Google Play publisher site.
@@ -251,13 +251,13 @@
 period and provide other information, The licensing server includes several pieces of
 information in the license responses. Specifically, the service provides recommended values for the
 application's license validity period, retry grace period, maximum allowable retry count, and other
-settings. If your application uses <a href="{@docRoot}guide/google/play/expansion-files.html">APK
+settings. If your application uses <a href="{@docRoot}google/play/expansion-files.html">APK
 expansion files</a>, the response also includes the file names, sizes, and URLs. The server appends
 the settings as key-value pairs in the license response "extras" field. </p>
 
 <p>Any {@code Policy} implementation can extract the extras settings from the license
 response and use them as needed. The LVL default {@code Policy} implementation, <a
-href="{@docRoot}guide/google/play/licensing/adding-licensing.html#ServerManagedPolicy">{@code
+href="{@docRoot}google/play/licensing/adding-licensing.html#ServerManagedPolicy">{@code
 ServerManagedPolicy}</a>, serves as a working
 implementation and an illustration of how to obtain, store, and use the
 settings. </p>
diff --git a/docs/html/google/play/licensing/overview.jd b/docs/html/google/play/licensing/overview.jd
index 467a3a2..1123748 100644
--- a/docs/html/google/play/licensing/overview.jd
+++ b/docs/html/google/play/licensing/overview.jd
@@ -206,7 +206,7 @@
 functions when run on a device that does not offer Google Play.</li>
 <li>You can implement licensing controls for a free app, but only if you're using the service to 
 provide <a
-href="{@docRoot}guide/google/play/expansion-files.html">APK expansion files</a>.</li>
+href="{@docRoot}google/play/expansion-files.html">APK expansion files</a>.</li>
 </ul>
 
 
@@ -237,7 +237,7 @@
 higher version of the platform.</p>
 
 <p>To begin adding application licensing to your application, continue to <a
-href="{@docRoot}guide/google/play/licensing/setting-up.html">Setting Up for Licensing</a>.</p>
+href="{@docRoot}google/play/licensing/setting-up.html">Setting Up for Licensing</a>.</p>
 
 
 
diff --git a/docs/html/google/play/licensing/setting-up.jd b/docs/html/google/play/licensing/setting-up.jd
index 80a4419..77e9d09 100644
--- a/docs/html/google/play/licensing/setting-up.jd
+++ b/docs/html/google/play/licensing/setting-up.jd
@@ -102,7 +102,7 @@
 </ol>
 
 <p>The sections below describe these tasks. When you are done with setup,
-you can begin <a href="{@docRoot}guide/google/play/licensing/adding-licensing.html">Adding
+you can begin <a href="{@docRoot}google/play/licensing/adding-licensing.html">Adding
 Licensing to Your App</a>.</p>
 
 <p>To get started, you need to set up a proper runtime environment on which
@@ -358,7 +358,7 @@
 
 <p>If you add the LVL sources directly to your application, you can skip the
 next section and start working with the library, as described in <a
-href="{@docRoot}guide/google/play/licensing/adding-licensing.html">Adding
+href="{@docRoot}google/play/licensing/adding-licensing.html">Adding
 Licensing to Your App</a>.</p>
 
 
@@ -483,9 +483,9 @@
 <p>In general, you should make sure to test your application's licensing
 implementation with every response code available in the Test Response menu.
 For a description of the codes, see <a
-href="{@docRoot}guide/google/play/licensing/licensing-reference.html#server-response-codes">Server
+href="{@docRoot}google/play/licensing/licensing-reference.html#server-response-codes">Server
 Response Codes</a> in the <a
-href="{@docRoot}guide/google/play/licensing/licensing-reference.html">Licensing Reference</a>.</p>
+href="{@docRoot}google/play/licensing/licensing-reference.html">Licensing Reference</a>.</p>
 
 <img src="{@docRoot}images/licensing_test_response.png" alt=""/>
 <p class="img-caption"><strong>Figure 4.</strong> The Licensing
@@ -506,7 +506,7 @@
 have set up. For more information about test accounts, see the next section.</p>
 
 <p>See <a
-href="{@docRoot}guide/google/play/licensing/licensing-reference.html#server-response-codes">Server
+href="{@docRoot}google/play/licensing/licensing-reference.html#server-response-codes">Server
 Response Codes</a> for a list of
 test responses available and their meanings. </p>
 
@@ -695,7 +695,7 @@
 emulator.</p>
 
 <p>Once you've completed the setup procedures, continue to <a
-href="{@docRoot}guide/google/play/licensing/adding-licensing.html">Adding Licensing to Your App</a>.</p>
+href="{@docRoot}google/play/licensing/adding-licensing.html">Adding Licensing to Your App</a>.</p>
 
 
 
diff --git a/docs/html/google/play/publishing/multiple-apks.jd b/docs/html/google/play/publishing/multiple-apks.jd
index 0619dfc..fc9e0f9 100644
--- a/docs/html/google/play/publishing/multiple-apks.jd
+++ b/docs/html/google/play/publishing/multiple-apks.jd
@@ -44,8 +44,8 @@
 
   <h2>See also</h2>
 <ol>
-  <li><a href="{@docRoot}guide/google/play/expansion-files.html">APK Expansion Files</a></li>
-  <li><a href="{@docRoot}guide/google/play/filters.html">Filters on Google Play</a></li>
+  <li><a href="{@docRoot}google/play/expansion-files.html">APK Expansion Files</a></li>
+  <li><a href="{@docRoot}google/play/filters.html">Filters on Google Play</a></li>
   <li><a href="{@docRoot}guide/practices/screens_support.html">Supporting Multiple Screens</a></li>
   <li><a href="{@docRoot}tools/extras/support-library.html">Support Library</a></li>
   <li><a href="{@docRoot}guide/topics/manifest/uses-sdk-element.html#ApiLevels">Android API Levels</a></li>
@@ -194,7 +194,7 @@
 <h3 id="SupportedFilters">Supported filters</h3>
 
 <p>Which devices receive each APK is determined by <a
-href="{@docRoot}guide/google/play/filters.html">Google Play filters</a> that are specified by
+href="{@docRoot}google/play/filters.html">Google Play filters</a> that are specified by
 elements in the manifest file of each APK. However, Google Play allows you to publish multiple
 APKs only when each APK uses filters to support a variation of the following
 device characteristics:</p>
@@ -293,7 +293,7 @@
 </ul>
 
 <p>Other manifest elements that enable <a
-href="{@docRoot}guide/google/play/filters.html">Google Play filters</a>&mdash;but are not
+href="{@docRoot}google/play/filters.html">Google Play filters</a>&mdash;but are not
 listed above&mdash;are still applied for each APK as usual. However, Google Play does not allow
 you to publish separate APKs based on variations of those device characteristics. Thus, you cannot
 publish multiple APKs if the above listed filters are the same for each APK (but the APKs differ