summaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authorScott Main <smain@google.com>2011-02-22 15:36:31 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-02-22 15:36:31 -0800
commit0ea4f0d79126e953a87604162c1b9a9e91ffbb1f (patch)
treeaf6bcbd40197ebebb5547dda426e7012e5b908e6 /docs
parent9d5f35d9e0e406bd9e109879db890e361e137929 (diff)
parent5c3582d97a4155e039c0e1312d37bbaba4b97d2a (diff)
downloadframeworks_base-0ea4f0d79126e953a87604162c1b9a9e91ffbb1f.zip
frameworks_base-0ea4f0d79126e953a87604162c1b9a9e91ffbb1f.tar.gz
frameworks_base-0ea4f0d79126e953a87604162c1b9a9e91ffbb1f.tar.bz2
Merge "docs: update highlights doc to remove preview" into honeycomb
Diffstat (limited to 'docs')
-rw-r--r--docs/html/sdk/android-3.0-highlights.jd7
1 files changed, 5 insertions, 2 deletions
diff --git a/docs/html/sdk/android-3.0-highlights.jd b/docs/html/sdk/android-3.0-highlights.jd
index 591f088..ebeb378 100644
--- a/docs/html/sdk/android-3.0-highlights.jd
+++ b/docs/html/sdk/android-3.0-highlights.jd
@@ -46,7 +46,9 @@ page.title=Android 3.0 Platform Highlights
<p>Welcome to Android 3.0!</p>
<p>The Android 3.0 platform introduces many new and exciting features for users and developers.
-This document provides a glimpse of some of the new features and technologies, as delivered in the Android 3.0 Preview SDK. For more information about the SDK or how to download it, please see the <a href="{@docRoot}sdk/preview/index.html">Preview SDK</a> document.</p>
+This document provides a glimpse of some of the new features and technologies, as delivered in
+Android 3.0. For a more detailed look at new developer APIs, see the <a
+href="{@docRoot}sdk/android-3.0.html">Android 3.0 Platform</a> document.</p>
<ul>
<li><a href="#UserFeatures">New User Features</a></li>
@@ -259,7 +261,8 @@ allowscriptaccess="always" allowfullscreen="true" width="278" height="180"></emb
</object>
</div>
-<p>For more information about the new developer APIs, see the Android 3.0 Platform notes in the SDK Preview documentation, available by download through the Android SDK Manager.</p>
+<p>For more information about the new developer APIs, see the <a
+href="{@docRoot}sdk/android-3.0.html">Android 3.0 Platform</a> document.</p>
<p>For a video overview of platform features, see the Android 3.0 Sneak Peek. </p>