Merge "Doc change: cleanup filtering sidebars and api level table. Changes links pointing to billing and other play docs that have moved." into jb-mr1-dev

Author: ddougherty

docs/html/about/versions/android-3.1.jd

@@ -825,7 +825,7 @@ devices.</li>
 href="{@docRoot}guide/topics/manifest/uses-feature-element.html">{@code
 &lt;uses-feature&gt;}</a> manifest elements. For more information about
 declaring features in an application manifest, read <a
-href="{@docRoot}guide/google/play/filters.html">Google Play
+href="{@docRoot}google/play/filters.html">Google Play
 Filters</a>.</p>
 
 

docs/html/about/versions/android-4.2.jd

@@ -343,7 +343,7 @@ unique installations</a>. By creating a new {@link java.util.UUID} when your app
 first time, you’re certain to obtain a unique ID for tracking each user, regardless of how many
 users install your app on a single device. Alternatively, you can save a local token fetched from
 your server or use the registrations ID provided by <a
-href="{@docRoot}guide/google/gcm/index.html">Google Cloud Messaging</a>.</p>
+href="{@docRoot}google/gcm/index.html">Google Cloud Messaging</a>.</p>
 
 <p>Beware that if your app requests one of the hardware device identifiers (such as the WiFi MAC
 address, the {@link android.os.Build#SERIAL} number, or the {@link

docs/html/about/versions/jelly-bean.jd

@@ -962,7 +962,7 @@ style="font-weight:500;">App Widgets</span> can resize automatically to fit the
 
 <p>GCM handles all the details of <strong>queuing messages and delivering them</strong> efficiently to the targeted Android devices. It supports message <strong>multicasting</strong> and can reach up to 1000 connected devices simultaneously with a single request. It also supports message <strong>payloads</strong>, which means that in addition to sending tickle messages to an app on the device, developers can send up to 4K of data. </p>
 
-<p>Google Cloud Messaging is completely <strong>free for all developers</strong> and sign-up is easy. See the <a href="{@docRoot}guide/google/gcm/index.html">Google Cloud Messaging</a> page for registration, downloads, and documentation.</p>
+<p>Google Cloud Messaging is completely <strong>free for all developers</strong> and sign-up is easy. See the <a href="{@docRoot}google/gcm/index.html">Google Cloud Messaging</a> page for registration, downloads, and documentation.</p>
 
 <h3>App Encryption</h3>
 

docs/html/develop/index.jd

@@ -70,7 +70,7 @@ src="http://1.bp.blogspot.com/-6K1kfNOdek8/T72bXvtTSQI/AAAAAAAABmw/kYzmJt0_328/s
                    <h2>In-app Subscriptions with Trials</h2>
                    <p>You can now set up a <strong>free trial period</strong> for any Google Play in-app subscription, making it easy for users try your subscriber content before automatically converting to a full subscription. Free trials give you a new way to bring users into your products and engage them effectively. </p>
                    <p><a class="button"
-href="{@docRoot}guide/google/play/billing/billing_subscriptions.html#trials">Read
+href="{@docRoot}google/play/billing/billing_subscriptions.html#trials">Read
 more</a></p>
                    </div>                
                 </li>
@@ -368,4 +368,4 @@ function togglePlaylist(listLink) {
 
 showDevelopersLivePlaylist();
 showVideosPlaylists();
-</script>
+</script>

docs/html/distribute/googleplay/about/distribution.jd

@@ -62,7 +62,7 @@ others.</p>
 
 <p>When you upload your app, Google Play reads the dependencies and sets up any
 necessary distribution rules. For technical information about declaring
-dependencies, read <a href="{@docRoot}guide/google/play/filters.html">Filters on 
+dependencies, read <a href="{@docRoot}google/play/filters.html">Filters on 
 Google Play</a>. </p>
 
 <p>For pinpoint control over distribution, Google Play lets you see all of the

docs/html/distribute/googleplay/about/monetizing.jd

@@ -112,7 +112,7 @@ gameplay levels, and upgrades as in-app products. The only restriction is that
 free apps must remain free (to download) for the life of the app.</p>
 
 <p>For details about in-app products or subscriptions,
-see <a href="/guide/google/play/billing/index.html">Google Play In-app Billing</a>.</p>
+see <a href="{@docRoot}google/play/billing/index.html">Google Play In-app Billing</a>.</p>
 
 <h2 id="buyer-currency" style="margin-top:1.5em;">Flexible pricing in the currencies of your customers</h2>
 

docs/html/distribute/googleplay/publish/console.jd

@@ -141,10 +141,10 @@ time, just by saving changes in the Develoer Console.</p>
 <div class="sidebox">
 <h2>In-app Billing</h2>
 <p>For details on how to implement In-app Billing, see the
-<a href="{@docRoot}guide/google/play/billing/index.html">In-app Billing</span></a>
+<a href="{@docRoot}google/play/billing/index.html">In-app Billing</span></a>
 developer documentation.</p></div></div>
 
-<p><a href="{@docRoot}guide/google/play/billing/index.html">In-app Billing</a> is a Google Play service that lets you monetize your apps in more ways by selling in-app products and subscriptions. In-app products are one-time purchases, while  subscriptions are recurring charges on an monthly or annual basis.</p>
+<p><a href="{@docRoot}google/play/billing/index.html">In-app Billing</a> is a Google Play service that lets you monetize your apps in more ways by selling in-app products and subscriptions. In-app products are one-time purchases, while  subscriptions are recurring charges on an monthly or annual basis.</p>
 
 <p>From the Developer Console you can create product lists for in-app
 products and subscriptions, set prices, and publish.</p>

docs/html/distribute/googleplay/publish/preparing.jd

@@ -188,7 +188,7 @@ launch target date.</p>
 Google Play. Currently, the maximum size for an APK published on Google Play is
 <strong>50 MB</strong>. If your app exceeds that size, or if you want to offer a
 secondary download, you can use <a
-href="{@docRoot}guide/google/play/expansion-files.html">APK Expansion Files</a>,
+href="{@docRoot}google/play/expansion-files.html">APK Expansion Files</a>,
 which Google Play will host for free on its server infrastructure and
 automatically handle the download to devices.</p>
 
@@ -207,7 +207,7 @@ creating your release-ready APK.</p>
 <tr>
 <td><p>Related resources:</p>
 <ul style="margin-top:-.5em;">
-<li><strong><a href="{@docRoot}guide/google/play/expansion-files.html">APK Expansion Files</a></strong> &mdash; Developer documentation describing APK Expansion Files and how to support them in your app.</li>
+<li><strong><a href="{@docRoot}google/play/expansion-files.html">APK Expansion Files</a></strong> &mdash; Developer documentation describing APK Expansion Files and how to support them in your app.</li>
 </ul>
 </td>
 </tr>
@@ -276,15 +276,15 @@ you need set up a Checkout Merchant Account before you can publish.</p>
 <tr>
 <td><p>Related resources:</p>
 <ul style="margin-top:-.5em;">
-<li><strong><a href="{@docRoot}guide/google/play/billing/index.html">In-app Billing</a></strong> &mdash; Developer introduction to Google Play In-app Billing.</li>
+<li><strong><a href="{@docRoot}google/play/billing/index.html">In-app Billing</a></strong> &mdash; Developer introduction to Google Play In-app Billing.</li>
 </ul>
 </td>
 </tr>
 </table>
 
 <h2 id="inapp-billing">9. Consider using In-app Billing</h2>
 
-<p>Google Play <a href="{@docRoot}guide/google/play/billing/index.html">In-app
+<p>Google Play <a href="{@docRoot}google/play/billing/index.html">In-app
 Billing</a> 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.
@@ -302,7 +302,7 @@ before creating your release-ready APK.</p>
 <tr>
 <td><p>Related resources:</p>
 <ul style="margin-top:-.5em;">
-<li><strong><a href="{@docRoot}guide/google/play/billing/index.html">In-app Billing</a></strong> &mdash; Developer documentation describing In-app Billing and how to support it in your app.</li>
+<li><strong><a href="{@docRoot}google/play/billing/index.html">In-app Billing</a></strong> &mdash; Developer documentation describing In-app Billing and how to support it in your app.</li>
 </ul>
 </td>
 </tr>

docs/html/distribute/googleplay/quality/tablet.jd

@@ -478,7 +478,7 @@ and tablets), with a single Google Play listing:
   </ul>
 </li>
 <li>If necessary, you can alternatively choose to deliver your app using <a 
-href="{@docRoot}guide/google/play/publishing/multiple-apks.html">Multiple APK Support</a>, 
+href="{@docRoot}google/play/publishing/multiple-apks.html">Multiple APK Support</a>, 
 although in most cases using a single APK to reach all devices is strongly recommended.</li>
 
 <li>Highlight your app’s tablet capabilities in the product details page:

docs/html/distribute/open.jd

@@ -74,9 +74,9 @@ users have 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>