reconcile tools-docs into main branch
diff --git a/core/build_id.mk b/core/build_id.mk
index d6ddd72..060c9b5 100644
--- a/core/build_id.mk
+++ b/core/build_id.mk
@@ -1,4 +1,3 @@
-
#
# Copyright (C) 2008 The Android Open Source Project
#
@@ -14,9 +13,20 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
+
+#
+# Defines branch-specific values.
+#
+
# BUILD_ID is usually used to specify the branch name
# (like "MAIN") or a branch name and a release candidate
-# (like "CRB01"). It must be a single word, and is
+# (like "TC1-RC5"). It must be a single word, and is
# capitalized by convention.
+#
+BUILD_ID := Donut
-export BUILD_ID=DRC65
+# DISPLAY_BUILD_NUMBER should only be set for development branches,
+# If set, the BUILD_NUMBER (cl) is appended to the BUILD_ID for
+# a more descriptive BUILD_ID_DISPLAY, otherwise BUILD_ID_DISPLAY
+# is the same as BUILD_ID
+DISPLAY_BUILD_NUMBER := true
diff --git a/tools/droiddoc/templates-sdk/sdkpage.cs b/tools/droiddoc/templates-sdk/sdkpage.cs
index 328d894..fdc1df5 100644
--- a/tools/droiddoc/templates-sdk/sdkpage.cs
+++ b/tools/droiddoc/templates-sdk/sdkpage.cs
@@ -110,18 +110,16 @@
Android 1.6 and we are pleased to announce the availability of an early look
SDK to give you a head-start on developing applications for it. </p>
- <p>The Android <?cs var:sdk.preview.version ?> platform includes a variety of
-improvements and new features for users and developers. Additionally, the SDK
-itself introduces several new capabilities that enable you to develop
-applications more efficiently. See the <a href="features.html">Android <?cs
-var:sdk.preview.version ?> Platform Highlights</a> document for a list of
-highlights.</p>
-<?cs /if ?>
+ <p>The Android 1.6 platform includes a variety of improvements and new
+ features for users and developers. Additionally, the SDK itself introduces
+ several new capabilities that enable you to develop applications more
+ efficiently. See the <a href="features.html">Android 1.6 Highlights</a>
+ document for a list of highlights.</p>
+ <?cs /if ?>
<p>Before downloading, please read the <a href="requirements.html">
-System Requirements</a> document. As you start the download, you will also need
-to review and agree to the Terms and Conditions that govern the use of the
-Android SDK. </p>
+System Requirements</a> document. As you start the download, you will also need to review and agree to
+the Terms and Conditions that govern the use of the Android SDK. </p>
<table class="download">
<tr>
@@ -172,17 +170,14 @@
<?cs if:android.whichdoc != "online" && sdk.preview ?>
<p>Welcome developers! The next release of the Android platform will be
-Android <?cs var:sdk.preview.version ?> and we are pleased to announce the
-availability of an early look SDK to give you a head-start on developing
-applications for it. </p>
+ Android 1.6 and we are pleased to announce the availability of an early look SDK
+ to give you a head-start on developing applications for it. </p>
- <p>The Android <?cs var:sdk.preview.version ?> platform includes a variety of
-improvements and new features for users and developers. Additionally, the SDK
-itself introduces several new capabilities that enable you to develop
-applications more efficiently. See the <a
-href="http://developer.android.com/sdk/preview/features.html">Android
-<?cs var:sdk.preview.version ?> Highlights</a> document for a list of
-highlights.</p>
+ <p>The Android 1.6 platform includes a variety of improvements and new features
+ for users and developers. Additionally, the SDK itself introduces several new
+ capabilities that enable you to develop applications more efficiently.
+ See the <a href="http://developer.android.com/sdk/preview/features.html">
+ Android 1.6 Highlights</a> document for a list of highlights.</p>
<?cs /if ?>
<?cs call:tag_list(root.descr) ?>