summaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authorScott Main <smain@google.com>2013-02-04 09:07:25 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2013-02-04 09:07:25 -0800
commit7936bee1364ed96a1e96f4fa8af07f1ab26b6791 (patch)
treef49c95a12d0b494eb99d5721b0547b9404a24e63 /docs
parent86f962159a0cc3c5b56d7fcf8d4187eefd5f4442 (diff)
parent0031d177b6137a004930c207f57ac5ac9386c72b (diff)
downloadframeworks_base-7936bee1364ed96a1e96f4fa8af07f1ab26b6791.zip
frameworks_base-7936bee1364ed96a1e96f4fa8af07f1ab26b6791.tar.gz
frameworks_base-7936bee1364ed96a1e96f4fa8af07f1ab26b6791.tar.bz2
am 0031d177: am e63e6d07: am 3424794d: am e63dfe5a: docs: fix broken links
# Via Android Git Automerger (3) and Scott Main (1) * commit '0031d177b6137a004930c207f57ac5ac9386c72b': docs: fix broken links
Diffstat (limited to 'docs')
-rw-r--r--docs/html/develop/index.jd2
-rw-r--r--docs/html/distribute/googleplay/promote/linking.jd2
-rw-r--r--docs/html/distribute/googleplay/publish/preparing.jd2
-rw-r--r--docs/html/guide/topics/ui/notifiers/notifications.jd2
-rw-r--r--docs/html/license.jd2
5 files changed, 5 insertions, 5 deletions
diff --git a/docs/html/develop/index.jd b/docs/html/develop/index.jd
index 57fa498..beb5ac5 100644
--- a/docs/html/develop/index.jd
+++ b/docs/html/develop/index.jd
@@ -70,7 +70,7 @@ src="//lh4.ggpht.com/-6K1kfNOdek8/T72bXvtTSQI/AAAAAAAABmw/kYzmJt0_328/s1600/goog
<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}google/play/billing/billing_subscriptions.html#trials">Read
+href="{@docRoot}google/play/billing/v2/billing_subscriptions.html#trials">Read
more</a></p>
</div>
</li>
diff --git a/docs/html/distribute/googleplay/promote/linking.jd b/docs/html/distribute/googleplay/promote/linking.jd
index 46607f5..4fdc5db 100644
--- a/docs/html/distribute/googleplay/promote/linking.jd
+++ b/docs/html/distribute/googleplay/promote/linking.jd
@@ -51,7 +51,7 @@ file</a>. The package name is also visible in the Developer Console. </p>
<p>Here's an example:</p>
-<p style="margin-left:1em;"><code><a href="http://play.google.com/store/apps/details?id=com.google.android.apps">http://play.google.com/store/apps/details?id=com.google.android.apps</a></code></p>
+<p style="margin-left:1em;"><code><a href="http://play.google.com/store/apps/details?id=com.google.android.apps.maps">http://play.google.com/store/apps/details?id=com.google.android.apps.maps</a></code></p>
<p>For details on how to send the link in an Android app, see <a href="#android-app">Linking from an Android App</a>.</p>
diff --git a/docs/html/distribute/googleplay/publish/preparing.jd b/docs/html/distribute/googleplay/publish/preparing.jd
index 097f163..e93b211 100644
--- a/docs/html/distribute/googleplay/publish/preparing.jd
+++ b/docs/html/distribute/googleplay/publish/preparing.jd
@@ -439,7 +439,7 @@ in the Developer Console Preview only.</p>
<ul style="margin-top:-.5em;">
<li><strong><a href="http://support.google.com/googleplay/android-developer/bin/answer.py?hl=en&answer=1078870">Graphic Assets for your Application
</a></strong> &mdash; Details about the graphic assets you need to upload before publishing.</li>
-<li><strong><a href="http://android-developers.blogspot.com/b/post-preview?token=hbE_njsBAAA.dLFzPbe-VFYCS6R3xP16HQ.Z4XO2iUmCqyYpoFPQ4OhiQ&postId=687446965502713273&type=POST">Google Play Featured Image Guidelines
+<li><strong><a href="http://android-developers.blogspot.com/2011/10/android-market-featured-image.html">Google Play Featured Image Guidelines
</a></strong> &mdash; Blog post that highlights key design considerations for your app's featured image.</li>
</ul>
</td>
diff --git a/docs/html/guide/topics/ui/notifiers/notifications.jd b/docs/html/guide/topics/ui/notifiers/notifications.jd
index e70987b..4a4b1d5 100644
--- a/docs/html/guide/topics/ui/notifiers/notifications.jd
+++ b/docs/html/guide/topics/ui/notifiers/notifications.jd
@@ -569,7 +569,7 @@ numMessages = 0;
For this element, set
<code><a href="{@docRoot}guide/topics/manifest/meta-data-element.html#nm">android:name</a>="android.support.PARENT_ACTIVITY"</code>.
Set
-<code><a href="{@docRoot}/guide/topics/manifest/meta-data-element.html#val">android:value</a>="&lt;parent_activity_name&gt;"</code>
+<code><a href="{@docRoot}guide/topics/manifest/meta-data-element.html#val">android:value</a>="&lt;parent_activity_name&gt;"</code>
where <code>&lt;parent_activity_name&gt;</code> is the value of
<code><a href="{@docRoot}guide/topics/manifest/meta-data-element.html#nm">android:name</a></code>
for the parent
diff --git a/docs/html/license.jd b/docs/html/license.jd
index a9af038..20e68fa 100644
--- a/docs/html/license.jd
+++ b/docs/html/license.jd
@@ -67,7 +67,7 @@ included in that license.</li>
style="margin:0;padding:0 2px;vertical-align:baseline" /> stylized typeface logo) are not included
in the license.
Please see <a
-href="http://www.android.com/developers/branding.html">Android Branding Guidelines</a> for
+href="{@docRoot}distribute/googleplay/promote/brand.html">Brand Guidelines</a> for
information about this usage. </li>
<li>In some cases, a page may include content, such as an image, that is not