9 files changed, 25 insertions, 25 deletions
diff --git a/docs/html/tools/help/jobb.jd b/docs/html/tools/help/jobb.jd
index d390ac9..97f0942 100644
--- a/docs/html/tools/help/jobb.jd
+++ b/docs/html/tools/help/jobb.jd
@@ -8,7 +8,7 @@ page.title=JOBB
   Level 9) or higher. OBB files are used to provide additional file assets for Android applications
   (such as graphics, sounds and video), separate from an application's APK file. For more
   information on using expansion files, see
-  <a href="{@docRoot}guide/google/play/expansion-files.html">APK Expansion Files</a>.</p>
+  <a href="{@docRoot}google/play/expansion-files.html">APK Expansion Files</a>.</p>
 
 
 <h2 id="usage">Usage</h2>
diff --git a/docs/html/tools/help/proguard.jd b/docs/html/tools/help/proguard.jd
index 1da94ba..be0b8dc 100644
--- a/docs/html/tools/help/proguard.jd
+++ b/docs/html/tools/help/proguard.jd
@@ -39,7 +39,7 @@ parent.link=index.html
   sized <code>.apk</code> file that is more difficult to reverse engineer. Because ProGuard makes your
   application harder to reverse engineer, it is important that you use it
   when your application utilizes features that are sensitive to security like when you are
-  <a href="{@docRoot}guide/google/play/licensing/index.html">Licensing Your Applications</a>.</p>
+  <a href="{@docRoot}google/play/licensing/index.html">Licensing Your Applications</a>.</p>
 
   <p>ProGuard is integrated into the Android build system, so you do not have to invoke it
   manually. ProGuard runs only when you build your application in release mode, so you do not 
diff --git a/docs/html/tools/publishing/preparing.jd b/docs/html/tools/publishing/preparing.jd
index 3ebf3f7..b1585f0 100644
--- a/docs/html/tools/publishing/preparing.jd
+++ b/docs/html/tools/publishing/preparing.jd
@@ -246,7 +246,7 @@ application on Google Play. For example, the <code>android:minSdkVersion</code>
 <code>android:targetSdkVersion</code> attributes, which are located in the <a
 href="{@docRoot}guide/topics/manifest/uses-sdk-element.html"> &lt;uses-sdk&gt;</a> element. For more
 information about these and other Google Play settings, see <a
-href="{@docRoot}guide/google/play/filters.html">Filters on Google Play</a>.</p>
+href="{@docRoot}google/play/filters.html">Filters on Google Play</a>.</p>
 
 <h4>Address compatibility issues</h4>
 
@@ -291,7 +291,7 @@ current user has purchased it. Using Google Play Licensing is optional even if y
 releasing your app through Google Play.</p>
 
 <p>For more information about Google Play Licensing Service and how to use it in your
-application, see <a href="{@docRoot}guide/google/play/licensing/index.html">Application Licensing</a>.</p>
+application, see <a href="{@docRoot}google/play/licensing/index.html">Application Licensing</a>.</p>
 
 <h2 id="publishing-build">Building Your Application for Release</h2>
 
@@ -333,7 +333,7 @@ information about the signing process and signing guidelines.</p>
 
 <p>If your application relies on a remote server, make sure the server is secure and that it is
 configured for production use. This is particularly important if you are implementing <a
-href="{@docRoot}guide/google/play/billing/index.html">in-app billing</a> in your application and you are
+href="{@docRoot}google/play/billing/index.html">in-app billing</a> in your application and you are
 performing the signature verification step on a remote server.</p>
 
 <p>Also, if your application fetches content from a remote server or a real-time service (such as a
diff --git a/docs/html/tools/publishing/publishing_overview.jd b/docs/html/tools/publishing/publishing_overview.jd
index 572766c..ea01e20 100755
--- a/docs/html/tools/publishing/publishing_overview.jd
+++ b/docs/html/tools/publishing/publishing_overview.jd
@@ -127,8 +127,8 @@ your Android applications to users around the world. When you release your appli
 Google Play you have access to a suite of developer tools that let you analyze your sales,
 identify market trends, and control who your applications are being distributed to. You also have
 access to several revenue-enhancing features such as <a
-href="{@docRoot}guide/google/play/billing/index.html">in-app billing</a> and <a
-href="{@docRoot}guide/google/play/licensing/index.html">application licensing</a>. The rich array of tools
+href="{@docRoot}google/play/billing/index.html">in-app billing</a> and <a
+href="{@docRoot}google/play/licensing/index.html">application licensing</a>. The rich array of tools
 and features, coupled with numerous end-user community features, makes Google Play the premier
 marketplace for selling and buying Android applications.</p>
 
@@ -207,9 +207,9 @@ the user has configured their Settings to allow the installation of apps from
 website, it can be inefficient. For example, if you want to monetize your
 application you will have to process and track all financial transactions
 yourself and you will not be able to use Google Play's <a
-href="{@docRoot}guide/google/play/billing/index.html">In-app Billing service</a>
+href="{@docRoot}google/play/billing/index.html">In-app Billing service</a>
 to sell in-app products. In addition, you will not be able to use the <a
-href="{@docRoot}guide/google/play/licensing/index.html">Licensing service</a> to
+href="{@docRoot}google/play/licensing/index.html">Licensing service</a> to
 help prevent unauthorized installation and use of your application.</p>
 
 
diff --git a/docs/html/tools/sdk/tools-notes.jd b/docs/html/tools/sdk/tools-notes.jd
index 50fc24a..a5dfa5a 100644
--- a/docs/html/tools/sdk/tools-notes.jd
+++ b/docs/html/tools/sdk/tools-notes.jd
@@ -92,7 +92,7 @@ href="http://tools.android.com/knownissues">http://tools.android.com/knownissues
           </ul>
         </li>
         <li>Added {@code jobb} tool for creating and encrypting
-          <a href="{@docRoot}guide/google/play/expansion-files.html">APK Expansion Files</a>.
+          <a href="{@docRoot}google/play/expansion-files.html">APK Expansion Files</a>.
           (<a href="{@docRoot}tools/help/jobb.html">more info</a>)
         <li>Improved the Android JUnit test runner to allow a test to be run on all connected
           devices simultaneously.</li>
diff --git a/docs/html/tools/workflow/publishing/preparing.jd b/docs/html/tools/workflow/publishing/preparing.jd
index 4633d7e..9925037 100644
--- a/docs/html/tools/workflow/publishing/preparing.jd
+++ b/docs/html/tools/workflow/publishing/preparing.jd
@@ -291,7 +291,7 @@ current user has purchased it. Using Google Play Licensing is optional even if y
 releasing your app through Google Play.</p>
 
 <p>For more information about Google Play Licensing Service and how to use it in your
-application, see <a href="{@docRoot}guide/google/play/licensing/index.html">Application Licensing</a>.</p>
+application, see <a href="{@docRoot}google/play/licensing/index.html">Application Licensing</a>.</p>
 
 <h2 id="publishing-build">Building Your Application for Release</h2>
 
@@ -333,7 +333,7 @@ information about the signing process and signing guidelines.</p>
 
 <p>If your application relies on a remote server, make sure the server is secure and that it is
 configured for production use. This is particularly important if you are implementing <a
-href="{@docRoot}guide/google/play/billing/index.html">in-app billing</a> in your application and you are
+href="{@docRoot}google/play/billing/index.html">in-app billing</a> in your application and you are
 performing the signature verification step on a remote server.</p>
 
 <p>Also, if your application fetches content from a remote server or a real-time service (such as a
diff --git a/docs/html/tools/workflow/publishing/publishing.jd b/docs/html/tools/workflow/publishing/publishing.jd
index a54b030..400f56f 100644
--- a/docs/html/tools/workflow/publishing/publishing.jd
+++ b/docs/html/tools/workflow/publishing/publishing.jd
@@ -73,8 +73,8 @@ your Android applications to users around the world. When you release your appli
 Google Play you have access to a suite of developer tools that let you analyze your sales,
 identify market trends, and control who your applications are being distributed to. You also have
 access to several revenue-enhancing features, such as <a
-href="{@docRoot}guide/google/play/billing/index.html">in-app billing</a> and
-<a href="{@docRoot}guide/google/play/licensing/index.html">application licensing</a>.</p>
+href="{@docRoot}google/play/billing/index.html">in-app billing</a> and
+<a href="{@docRoot}google/play/licensing/index.html">application licensing</a>.</p>
 
 <p>Before you can publish applications on Google Play, you need to <a
 href="http://play.google.com/apps/publish">register</a> as a Google Play developer. During the
@@ -150,7 +150,7 @@ href="https://support.google.com/androidmarket/developer/bin/answer.py?hl=en&ans
 href="http://support.google.com/androidmarket/developer/bin/answer.py?hl=en&answer=188189&topic=
 2364761&ctx=topic">content rating</a>. In addition, if you want to sell items within your app using
 the in-app billing feature, you can use the Developer Console to <a
-href="http://grendel.sea.corp.google.com:48014/guide/google/play/billing/billing_admin.html#billing-list
+href="http://grendel.sea.corp.google.com:48014/google/play/billing/billing_admin.html#billing-list
 - setup">create a product list</a> and control which items are available for purchase in your
 app.</p>
 
@@ -194,7 +194,7 @@ filter in your manifest, only those devices that have a camera will see your app
 Play. Filters must be configured in your application's manifest file when you are <a
 href="{@docRoot}tools/publishing/preparing.html">preparing your app for release</a> (that is, before
 you upload your app to Google Play). For more information, see <a
-href="{@docRoot}guide/google/play/filters.html">Filters on Google Play</a>.</p>
+href="{@docRoot}google/play/filters.html">Filters on Google Play</a>.</p>
 
 <p>You can also use the multiple APK feature to distribute different {@code .apk} files under the same
 application listing and the same package name; however, you should use this option only as a last
@@ -211,7 +211,7 @@ each APK to the appropriate devices based on configuration support you've declar
 file of each APK. To use this feature, you need to build your separate {@code .apk} files when you are <a
 href="{@docRoot}tools/publishing/preparing.html">preparing your app for release</a> (that is, before
 you upload your app to Google Play). For more information, see <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>
 
 <h2 id="marketupgrade">Publishing Updates on Google Play</h2>
 
@@ -254,11 +254,11 @@ higher.</p>
 
 <p>For complete information about Google Play Licensing Service and how to
 use it in your application, read <a
-href="{@docRoot}guide/google/play/licensing/index.html">Application Licensing</a>.</p>
+href="{@docRoot}google/play/licensing/index.html">Application Licensing</a>.</p>
 
 <h2 id="marketinappbilling">Using Google Play In-app Billing</h2>
 
-<p><a href="{@docRoot}guide/google/play/billing/billing_overview.html">Google Play In-app Billing</a>
+<p><a href="{@docRoot}google/play/billing/billing_overview.html">Google Play In-app Billing</a>
 is a Google Play service that lets you sell digital content in your applications. You can use
 the service to sell a wide range of content, including downloadable  content such as media files or
 photos, and virtual content such as game levels or potions.</p>
@@ -275,12 +275,12 @@ Checkout Merchant account. Also, because the service uses no dedicated framework
 in-app billing to any application that uses a minimum API level of 4 or higher.</p>
 
 <p>To help you integrate in-app billing into your application, the Android SDK provides a <a
-href="{@docRoot}guide/google/play/billing/billing_integrate.html#billing-download">sample application</a>
+href="{@docRoot}google/play/billing/billing_integrate.html#billing-download">sample application</a>
 that demonstrates a simple implementation of in-app billing. The sample application contains
 examples of billing-related classes you can use to implement in-app billing in your application. It
 also contains examples of the database, user interface, and business logic you might use to
 implement in-app billing. For more information about the in-app billing feature, see the
-<a href="{@docRoot}guide/google/play/billing/index.html">In-app Billing documentation</a>.</p>
+<a href="{@docRoot}google/play/billing/index.html">In-app Billing documentation</a>.</p>
 
 <h2 id="marketintent">Linking to Your Apps on Google Play</h2>
 
diff --git a/docs/html/tools/workflow/publishing/publishing_overview.jd b/docs/html/tools/workflow/publishing/publishing_overview.jd
index ca0dca8..a1973c9 100755
--- a/docs/html/tools/workflow/publishing/publishing_overview.jd
+++ b/docs/html/tools/workflow/publishing/publishing_overview.jd
@@ -129,8 +129,8 @@ your Android applications to users around the world. When you release your appli
 Google Play you have access to a suite of developer tools that let you analyze your sales,
 identify market trends, and control who your applications are being distributed to. You also have
 access to several revenue-enhancing features that are not available anywhere else, such as <a
-href="{@docRoot}guide/google/play/billing/index.html">in-app billing</a> and <a
-href="{@docRoot}guide/google/play/licensing.html">application licensing</a>. This rich array of tools
+href="{@docRoot}google/play/billing/index.html">in-app billing</a> and <a
+href="{@docRoot}google/play/licensing.html">application licensing</a>. This rich array of tools
 and features, coupled with numerous end-user community features, makes Google Play the premier
 marketplace for selling and buying Android applications.</p>
 
diff --git a/docs/html/tools/workflow/publishing_overview.jd b/docs/html/tools/workflow/publishing_overview.jd
index ca0dca8..a1973c9 100755
--- a/docs/html/tools/workflow/publishing_overview.jd
+++ b/docs/html/tools/workflow/publishing_overview.jd
@@ -129,8 +129,8 @@ your Android applications to users around the world. When you release your appli
 Google Play you have access to a suite of developer tools that let you analyze your sales,
 identify market trends, and control who your applications are being distributed to. You also have
 access to several revenue-enhancing features that are not available anywhere else, such as <a
-href="{@docRoot}guide/google/play/billing/index.html">in-app billing</a> and <a
-href="{@docRoot}guide/google/play/licensing.html">application licensing</a>. This rich array of tools
+href="{@docRoot}google/play/billing/index.html">in-app billing</a> and <a
+href="{@docRoot}google/play/licensing.html">application licensing</a>. This rich array of tools
 and features, coupled with numerous end-user community features, makes Google Play the premier
 marketplace for selling and buying Android applications.</p>