am 2e5fea59: am ca69a634: fix broken links, update the dev guide intro, and update sitemap file

* commit '2e5fea59c29762227ba31b144bedf91f1384c968':
  fix broken links, update the dev guide intro, and update sitemap file

docs/html/guide/appendix/faq/commontasks.jd

@@ -60,9 +60,9 @@ applications included in the SDK, in the <code>&lt;sdk&gt;/samples/</code>
 folder in the SDK.</p>
 
 <p>Finally, a great way to started with Android development in Eclipse is to
-follow both the <a href="{@docRoot}guide/tutorials/hello-world.html">Hello,
+follow both the <a href="{@docRoot}resources/tutorials/hello-world.html">Hello,
 World</a> and <a
-href="{@docRoot}guide/tutorials/notepad/index.html">Notepad</a> code
+href="{@docRoot}resources/tutorials/notepad/index.html">Notepad</a> code
 tutorials. In particular, the start of the Hello Android tutorial is an
 excellent introduction to creating a new Android application in Eclipse.</p>
 

docs/html/guide/index.jd

@@ -2,9 +2,9 @@ page.title=The Developer's Guide
 @jd:body
 
 <p>
-Welcome to the <i>Android Dev Guide</i>! The Dev Guide is 
+Welcome to the <i>Android Dev Guide</i>! The Dev Guide provides 
-a practical introduction to developing applications for Android.  
+a practical introduction to developing applications for Android and documentation about major
-It explores the concepts behind Android, the framework for 
+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.
 </p>
@@ -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 
-<a href="{@docRoot}reference/packages.html">Reference</a> tab above.
+<a href="{@docRoot}reference/packages.html">Reference</a>.
 </p>  
 
 <p>
 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:
 <p>
 
 <dl>
@@ -34,6 +34,10 @@ Fundamentals</a>.  Then explore other topics &mdash; from
 designing a user interface and setting up resources to storing 
 data and using permissions &mdash; as needed.</dd>
 
+<dt><b>Android Market Topics</b></dt>
+<dd>Documentation for topics that concern publishing and monetizing applications on Android
+Market, such as how to enforce licensing policies and implement in-app billing.</dd>
+
 <dt><b>Developing</b></dt>
 <dd>Directions for using Android's development and debugging tools, 
 and for testing the results.</dd>
@@ -47,9 +51,9 @@ and how to publish it when it's ready.</dd>
 applications that perform efficiently and work well for the
 user.</dd>
 
-<dt><b>Tutorials and Samples</b></dt> 
+<dt><b>Web Applications</b></dt> 
-<dd>Step-by-step tutorials and sample code demonstrating how 
+<dd>Documentation about how to create web applications that work seamlessly on Android-powered
-an Android application is constructed.</dd>
+devices and create Android applications that embed web-based content.</dd>
 
 <dt><b>Appendix</b></dt>
 <dd>Reference information and specifications, as well as FAQs, 
@@ -58,26 +62,26 @@ a glossary of terms, and other information.</dd>
 
 <p>
 The first step in programming for Android is downloading the SDK
-(software development kit).  For instructions and information about
+(software development kit).  For instructions and information, visit the <a
-the kit, go to the <a href="{@docRoot}sdk/index.html">SDK</a> tab above.
+href="{@docRoot}sdk/index.html">SDK</a> tab.
 </p>
 
 <p>
-After you have the SDK, begin by looking over the Dev Guide.
+After you have the SDK, begin by looking through the Dev Guide.
-If you want to start by getting a quick look at the code, the short 
+If you want to start by getting a quick look at some code, the 
-<a href="{@docRoot}guide/tutorials/hello-world.html">Hello World</a>
+<a href="{@docRoot}resources/tutorials/hello-world.html">Hello World</a>
-tutorial walks you through a standard "Hello, World" application as 
+tutorial walks you through a standard "Hello, World" application to introduce some basics of an
-it would be written for the Android platform.  The 
+Android application. The 
 <a href="{@docRoot}guide/topics/fundamentals.html">Application
-Fundamentals</a> document is a good place to start for an 
+Fundamentals</a> document is a good place to start learning the basics about the application
-understanding of the application framework.
+framework.
 </p>
 
 
 <p>
 For additional help, consider joining one or more of the Android 
 discussion groups.  Go to the 
-<a href="{@docRoot}resources/community-groups.html">Community</a> pages 
+<a href="{@docRoot}resources/community-groups.html">Developer Forums</a> page
 for more information.
 </p>
 

docs/html/guide/market/billing/billing_reference.jd

@@ -40,7 +40,7 @@ page.title=In-app Billing Reference
 <ul>
   <li><a href="#billing-codes">Android Market Server Response Codes for In-app Billing</a></li>
   <li><a href="#billing-interface">In-app Billing Interface Parameters</a></li>
-  <li><a href="billing-intents">In-app Billing Broadcast Intents</a></li>
+  <li><a href="#billing-intents">In-app Billing Broadcast Intents</a></li>
 </ul>
 
 <h2 id="billing-codes">Android Market Server Response Codes for In-app Billing</h2>

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.</p>
 
 <p>Note that a certain amount of knowledge is assumed for these tutorials. If you haven't
-completed the <a href="{@docRoot}guide/tutorials/hello-world.html">Hello, World</a> tutorial, 
+completed the <a href="{@docRoot}resources/tutorials/hello-world.html">Hello, World</a> tutorial, 
 please do so&mdash;it will teach you many things you should know about basic 
 Android development and Eclipse features. More specifically, you should know:</p>
 <ul>