From f7a8c0f78796ebbeb57381b145c0648d7bc6b84a Mon Sep 17 00:00:00 2001 From: Scott Main Date: Wed, 2 Feb 2011 17:43:24 -0800 Subject: [PATCH] cherrypick Change-Id: Icf0c7772901f742c36ba417e07cc5e299f72849a fix broken links, update the dev guide intro, and update sitemap file Change-Id: I203f272654596ecf9eaf8ba7d8be85347f5f4dbe --- docs/html/guide/appendix/faq/commontasks.jd | 4 +- docs/html/guide/index.jd | 40 +- .../guide/market/billing/billing_reference.jd | 2 +- docs/html/guide/tutorials/views/index.jd | 2 +- docs/html/sitemap.txt | 8928 +++++++++-------- 5 files changed, 4507 insertions(+), 4469 deletions(-) diff --git a/docs/html/guide/appendix/faq/commontasks.jd b/docs/html/guide/appendix/faq/commontasks.jd index cf9cbd38600b1..47473796de276 100644 --- a/docs/html/guide/appendix/faq/commontasks.jd +++ b/docs/html/guide/appendix/faq/commontasks.jd @@ -60,9 +60,9 @@ applications included in the SDK, in the <sdk>/samples/ folder in the SDK.

Finally, a great way to started with Android development in Eclipse is to -follow both the Hello, +follow both the Hello, World and Notepad code +href="{@docRoot}resources/tutorials/notepad/index.html">Notepad code tutorials. In particular, the start of the Hello Android tutorial is an excellent introduction to creating a new Android application in Eclipse.

diff --git a/docs/html/guide/index.jd b/docs/html/guide/index.jd index 5f0c6a5acc8b2..38f71c04545da 100644 --- a/docs/html/guide/index.jd +++ b/docs/html/guide/index.jd @@ -2,9 +2,9 @@ page.title=The Developer's Guide @jd:body

-Welcome to the Android Dev Guide! The Dev Guide is -a practical introduction to developing applications for Android. -It explores the concepts behind Android, the framework for +Welcome to the Android Dev Guide! The Dev Guide provides +a practical introduction to developing applications for Android and documentation about major +platform features. It explores the concepts behind Android, the framework for constructing an application, and the tools for developing, testing, and publishing software for the platform.

@@ -13,12 +13,12 @@ testing, and publishing software for the platform. The Dev Guide holds most of the documentation for the Android platform, except for reference material on the framework API. For API specifications, go to the -Reference tab above. +Reference.

As you can see in the panel on the left, the Dev Guide is -divided into a handful of sections. They are: +divided into several sections:

@@ -34,6 +34,10 @@ Fundamentals. Then explore other topics — from designing a user interface and setting up resources to storing data and using permissions — as needed. +
Android Market Topics
+
Documentation for topics that concern publishing and monetizing applications on Android +Market, such as how to enforce licensing policies and implement in-app billing.
+
Developing
Directions for using Android's development and debugging tools, and for testing the results.
@@ -47,9 +51,9 @@ and how to publish it when it's ready. applications that perform efficiently and work well for the user. -
Tutorials and Samples
-
Step-by-step tutorials and sample code demonstrating how -an Android application is constructed.
+
Web Applications
+
Documentation about how to create web applications that work seamlessly on Android-powered +devices and create Android applications that embed web-based content.
Appendix
Reference information and specifications, as well as FAQs, @@ -58,26 +62,26 @@ a glossary of terms, and other information.

The first step in programming for Android is downloading the SDK -(software development kit). For instructions and information about -the kit, go to the SDK tab above. +(software development kit). For instructions and information, visit the SDK tab.

-After you have the SDK, begin by looking over the Dev Guide. -If you want to start by getting a quick look at the code, the short -Hello World -tutorial walks you through a standard "Hello, World" application as -it would be written for the Android platform. The +After you have the SDK, begin by looking through the Dev Guide. +If you want to start by getting a quick look at some code, the +Hello World +tutorial walks you through a standard "Hello, World" application to introduce some basics of an +Android application. The Application -Fundamentals documentation is a good place to start for an -understanding of the application framework. +Fundamentals document is a good place to start learning the basics about the application +framework.

For additional help, consider joining one or more of the Android discussion groups. Go to the -Community pages +Developer Forums page for more information.

diff --git a/docs/html/guide/market/billing/billing_reference.jd b/docs/html/guide/market/billing/billing_reference.jd index 357e58b35d17a..c91ca8959f5b4 100755 --- a/docs/html/guide/market/billing/billing_reference.jd +++ b/docs/html/guide/market/billing/billing_reference.jd @@ -40,7 +40,7 @@ page.title=In-app Billing Reference

Android Market Server Response Codes for In-app Billing

diff --git a/docs/html/guide/tutorials/views/index.jd b/docs/html/guide/tutorials/views/index.jd index 2248c68c16ad8..4e76ab9793677 100644 --- a/docs/html/guide/tutorials/views/index.jd +++ b/docs/html/guide/tutorials/views/index.jd @@ -12,7 +12,7 @@ these kinds of boring bits so you can focus on developing the code that makes yo Of course, we'll discuss some of the given code so that it all makes sense.

Note that a certain amount of knowledge is assumed for these tutorials. If you haven't -completed the Hello, World tutorial, +completed the Hello, World tutorial, please do so—it will teach you many things you should know about basic Android development and Eclipse features. More specifically, you should know: