15 files changed, 24 insertions, 33 deletions
diff --git a/core/java/android/widget/Gallery.java b/core/java/android/widget/Gallery.java
index e4e7239..323fcf0 100644
--- a/core/java/android/widget/Gallery.java
+++ b/core/java/android/widget/Gallery.java
@@ -49,9 +49,6 @@ import com.android.internal.R;
  * <p>
  * Views given to the Gallery should use {@link Gallery.LayoutParams} as their
  * layout parameters type.
- *
- * <p>See the <a href="{@docRoot}resources/tutorials/views/hello-gallery.html">Gallery
- * tutorial</a>.</p>
  * 
  * @attr ref android.R.styleable#Gallery_animationDuration
  * @attr ref android.R.styleable#Gallery_spacing
diff --git a/core/java/android/widget/TabHost.java b/core/java/android/widget/TabHost.java
index 9b292be..8bb9348 100644
--- a/core/java/android/widget/TabHost.java
+++ b/core/java/android/widget/TabHost.java
@@ -45,8 +45,6 @@ import java.util.List;
  * page. The individual elements are typically controlled using this container object, rather than
  * setting values on the child elements themselves.
  *
- * <p>See the <a href="{@docRoot}resources/tutorials/views/hello-tabwidget.html">Tab Layout
- * tutorial</a>.</p>
  */
 public class TabHost extends FrameLayout implements ViewTreeObserver.OnTouchModeChangeListener {
 
diff --git a/core/java/android/widget/TabWidget.java b/core/java/android/widget/TabWidget.java
index 8901037..6bced1c 100644
--- a/core/java/android/widget/TabWidget.java
+++ b/core/java/android/widget/TabWidget.java
@@ -42,9 +42,6 @@ import android.view.accessibility.AccessibilityNodeInfo;
  * handler, and manage callbacks. You might call this object to iterate the list
  * of tabs, or to tweak the layout of the tab list, but most methods should be
  * called on the containing TabHost object.
- *
- * <p>See the <a href="{@docRoot}resources/tutorials/views/hello-tabwidget.html">Tab Layout
- * tutorial</a>.</p>
  * 
  * @attr ref android.R.styleable#TabWidget_divider
  * @attr ref android.R.styleable#TabWidget_tabStripEnabled
diff --git a/core/java/android/widget/TableLayout.java b/core/java/android/widget/TableLayout.java
index 6331b6d..78e9453 100644
--- a/core/java/android/widget/TableLayout.java
+++ b/core/java/android/widget/TableLayout.java
@@ -70,8 +70,6 @@ import java.util.regex.Pattern;
  * actually use any View subclass as a direct child of TableLayout. The View
  * will be displayed as a single row that spans all the table columns.</p>
  *
- * <p>See the <a href="{@docRoot}resources/tutorials/views/hello-tablelayout.html">Table
- * Layout tutorial</a>.</p>
  */
 public class TableLayout extends LinearLayout {
     private int[] mMaxWidths;
diff --git a/docs/html/about/versions/android-4.1.jd b/docs/html/about/versions/android-4.1.jd
index 675dc99..3677860 100644
--- a/docs/html/about/versions/android-4.1.jd
+++ b/docs/html/about/versions/android-4.1.jd
@@ -663,7 +663,7 @@ android.app.Notification#PRIORITY_DEFAULT}, and there's two levels higher and tw
 
 <p>High priority notifications are things that users generally want to respond to quickly,
 such as a new instant message, text message, or impending event reminder. Low priority
-notifications are things like </p>
+notifications are things like expired calendar events or app promotions.</p>
 
 <h3 id="SystemUI">Controls for system UI</h3>
 
diff --git a/docs/html/about/versions/jelly-bean.jd b/docs/html/about/versions/jelly-bean.jd
index cec1857..db56fa4 100644
--- a/docs/html/about/versions/jelly-bean.jd
+++ b/docs/html/about/versions/jelly-bean.jd
@@ -141,7 +141,7 @@ like those shown in the examples above to display rich content and actions.</p>
 <li>BigPictureStyle &mdash; a notification that showcases visual content such as a bitmap.</li>
 </ul>
 
-<p>In addition to the templated styles, you can create you own notification styles <strong>using any remote View</strong>.</p>
+<p>In addition to the templated styles, you can create your own notification styles <strong>using any remote View</strong>.</p>
 
 <p>Apps can add up to three <strong>actions</strong> to a notification, which are displayed below the notification content. The actions let the users respond directly to the information in the notification in alternative ways. such as by email or by phone call, without visiting the app.</p>
 
@@ -243,17 +243,17 @@ style="font-weight:500;">App Widgets</span> can resize automatically to fit the
 
 <p>In Android 4.1, Android Beam makes it easier to share images, videos, or other payloads by <strong>leveraging Bluetooth for the data transfer</strong>. When the user triggers a transfer, Android Beam hands over from NFC to Bluetooth, making it really easy to manage the transfer of a file from one device to another.</p>
 
-<h3>Wi-fi Network Service Discovery</h3>
+<h3>Wi-Fi Network Service Discovery</h3>
 
 <p>Android 4.1 introduces support for multicast <strong>DNS-based service discovery</strong>, which lets applications find and connect to services offered by peer devices over Wi-Fi networks &mdash; including mobile devices, printers, cameras, media players, and others. Developers can take advantage of Wi-Fi network service discovery to build cross-platform or multiplayer games and application experiences.</p>
 
 <p>Using the service discovery API, apps can create and register any kind of service, for any other NSD-enabled device to discover. The service is advertised by multicast across the network using a human-readable string identifier, which lets user more easily identify the type of service.  </p>
 
-<p>Consumer devices can use the API to scan and discover services available from devices connected to the local Wi-Fi network. After discovery, apps can use the API to resolve the service to an IP adress and port through which it can establish a socket connection.</p>
+<p>Consumer devices can use the API to scan and discover services available from devices connected to the local Wi-Fi network. After discovery, apps can use the API to resolve the service to an IP address and port through which it can establish a socket connection.</p>
 
 <p>You can take advantage of this API to build new features into your apps. For example, you could let users connect to a webcam, a printer, or an app on another mobile device that supports Wi-Fi peer-to-peer connections.  </p>
 
-<h3>Wifi-Direct Service Discovery</h3>
+<h3>Wi-Fi Direct Service Discovery</h3>
 
 <p>Ice Cream Sandwich introduced support for Wi-Fi Direct, a technology that lets apps <strong>discover and pair directly</strong>, over a high-bandwidth peer-to-peer connection. Wi-Fi Direct is an ideal way to share media, photos, files and other types of data and sessions, even where there is no cell network or Wi-Fi available.</p>
 
diff --git a/docs/html/distribute/googleplay/promote/brand.jd b/docs/html/distribute/googleplay/promote/brand.jd
index 8aafc48..8d04903 100644
--- a/docs/html/distribute/googleplay/promote/brand.jd
+++ b/docs/html/distribute/googleplay/promote/brand.jd
@@ -93,19 +93,19 @@ any way you want, provided that you follow the guidelines described below.</p>
 <div style="clear:both">
   <div style="float:right;width:50%;padding:1.5em;">
     <p>
-      <img alt="Google Play logo" src="{@docRoot}images/brand/google_play_logo_450.png">
+      <img alt="Google Play logo" src="http://www.android.com/images/brand/google_play_logo_450.png">
     </p>
     <p>
     <img alt="Get it on Google Play badge, large" src=
-            "/images/brand/get_it_on_play_logo_large.png"><br>
-            Download: <a href="{@docRoot}images/brand/get_it_on_play_logo_small.png">Small</a> | <a href=
-            "/images/brand/get_it_on_play_logo_large.png">Large</a>
+            "http://www.android.com/images/brand/get_it_on_play_logo_large.png"><br>
+            Download: <a href="http://www.android.com/images/brand/get_it_on_play_logo_small.png">Small</a> | <a href=
+            "http://www.android.com/images/brand/get_it_on_play_logo_large.png">Large</a>
           </p>
           <p>
             <img alt="Android App on Google Play badge, large" src=
-            "/images/brand/android_app_on_play_logo_large.png"><br>
-            Download: <a href="{@docRoot}images/brand/android_app_on_play_logo_small.png">Small</a> |
-            <a href="{@docRoot}images/brand/android_app_on_play_large.png">Large</a>
+            "http://www.android.com/images/brand/android_app_on_play_logo_large.png"><br>
+            Download: <a href="http://www.android.com/images/brand/android_app_on_play_logo_small.png">Small</a> |
+            <a href="http://www.android.com/images/brand/android_app_on_play_large.png">Large</a>
           </p>
   </div> 
         
@@ -140,20 +140,20 @@ any way you want, provided that you follow the guidelines described below.</p>
      <ul>
             <li>When used online, the badge logo should be used to direct users to:
               <ul>
-                <li>The Google Play landing page: <br /><span style="margin-left:1em;"><a href=
-                "http://play.google.com/">play.google.com</a></span>
+                <li>The Google Play landing page: <br />
+                  <span style="margin-left:1em;">http://play.google.com</span>
                 </li>
-                <li>The Google Play Apps landing page: <br /><a href="http://play.google.com/store/apps">
-                 <span style="margin-left:1em;"> play.google.com/store/apps</a></span>
+                <li>The Google Play Apps landing page: <br />
+                 <span style="margin-left:1em;">http://play.google.com/store/apps</span>
                 </li>
                 <li>A list of products that include your company name, for example, <br />
                 <span style="margin-left:1em;">http://play.google.com/store/search?q=<em>yourCompanyName</em></span>
                 </li>
                 <li>A list of products published by you, for example,<br />
-                <span style="margin-left:1em;">play.google.com/store/search?q=<em>publisherName</em>M/span>
+                <span style="margin-left:1em;">http://play.google.com/store/search?q=<em>publisherName</em>M/span>
                 </li>
                 <li>A specific app product details page within Google Play, for example,<br />
-                <span style="margin-left:1em;">play.google.com/store/apps/details?id=<em>packageName</em></span>
+                <span style="margin-left:1em;">http://play.google.com/store/apps/details?id=<em>packageName</em></span>
                 </li>
               </ul>
             </li>
diff --git a/docs/html/guide/topics/providers/content-provider-creating.jd b/docs/html/guide/topics/providers/content-provider-creating.jd
index bad5390..ebd7c25 100644
--- a/docs/html/guide/topics/providers/content-provider-creating.jd
+++ b/docs/html/guide/topics/providers/content-provider-creating.jd
@@ -401,7 +401,7 @@ page.title=Creating a Content Provider
 </p>
 <p>
     The method {@link android.content.UriMatcher#addURI(String, String, int) addURI()} maps an
-    authority and path to an integer value. The method android.content.UriMatcher#match(Uri)
+    authority and path to an integer value. The method {@link android.content.UriMatcher#match(Uri)
     match()} returns the integer value for a URI. A <code>switch</code> statement
     chooses between querying the entire table, and querying for a single record:
 </p>
diff --git a/docs/html/images/brand/android_app_on_play_logo_large.png b/docs/html/images/brand/android_app_on_play_logo_large.png
deleted file mode 100644
index a46bf35..0000000
--- a/docs/html/images/brand/android_app_on_play_logo_large.png
+++ /dev/null
diff --git a/docs/html/images/brand/android_app_on_play_logo_small.png b/docs/html/images/brand/android_app_on_play_logo_small.png
deleted file mode 100644
index 2d8ef52..0000000
--- a/docs/html/images/brand/android_app_on_play_logo_small.png
+++ /dev/null
diff --git a/docs/html/images/brand/get_it_on_play_logo_large.png b/docs/html/images/brand/get_it_on_play_logo_large.png
deleted file mode 100644
index 8b48767..0000000
--- a/docs/html/images/brand/get_it_on_play_logo_large.png
+++ /dev/null
diff --git a/docs/html/images/brand/get_it_on_play_logo_small.png b/docs/html/images/brand/get_it_on_play_logo_small.png
deleted file mode 100644
index 1fcbec8..0000000
--- a/docs/html/images/brand/get_it_on_play_logo_small.png
+++ /dev/null
diff --git a/docs/html/training/basics/activity-lifecycle/recreating.jd b/docs/html/training/basics/activity-lifecycle/recreating.jd
index 005a95b..3bbf0bb 100644
--- a/docs/html/training/basics/activity-lifecycle/recreating.jd
+++ b/docs/html/training/basics/activity-lifecycle/recreating.jd
@@ -32,7 +32,7 @@ href="{@docRoot}guide/topics/resources/runtime-changes.html">Handling Runtime Ch
 
 <p>There are a few scenarios in which your activity is destroyed due to normal app behavior, such as
 when the user presses the <em>Back</em> button or your activity signals its own destruction by
-calling {@link android.app.Activity#finish()}. The system may also destory your activity if it's
+calling {@link android.app.Activity#finish()}. The system may also destroy your activity if it's
 currently stopped and hasn't been used in a long time or the foreground activity requires more
 resources so the system must shut down background processes to recover memory.</p>
 
diff --git a/docs/html/training/basics/firstapp/building-ui.jd b/docs/html/training/basics/firstapp/building-ui.jd
index 30b6529..f0ec79e 100644
--- a/docs/html/training/basics/firstapp/building-ui.jd
+++ b/docs/html/training/basics/firstapp/building-ui.jd
@@ -183,7 +183,7 @@ resource type&mdash;for example, the string resource uses the same name.)</p>
 <p>The plus-symbol (<code>+</code>) is needed only when you're defining a resource ID for the
 first time. It tells the SDK tools that the resource ID needs to be created. Thus, when the app is
 compiled, the SDK tools use the ID value, <code>edit_message</code>, to create a new identifier in
-your project's {@code gen/R.java} file that is now assiciated with the {@link
+your project's {@code gen/R.java} file that is now associated with the {@link
 android.widget.EditText} element. Once the resource ID is created, other references to the ID do not
 need the plus symbol. This is the only attribute that may need the plus-symbol. See the sidebox for
 more information about resource objects.</p></dd>
@@ -289,7 +289,7 @@ android:layout_weight}</a> attribute.</p>
 
 <p>The weight value allows you to specify the amount of remaining space each view should consume,
 relative to the amount consumed by sibling views, just like the ingredients in a drink recipe: "2
-parts vodka, 1 part coffee liquer" means two-thirds of the drink is vodka. For example, if you give
+parts vodka, 1 part coffee liqueur" means two-thirds of the drink is vodka. For example, if you give
 one view a weight of 2 and another one a weight of 1, the sum is 3, so the first view gets 2/3 of
 the remaining space and the second view gets the rest. If you give a third view a weight of 1,
 then the first view now gets 1/2 the remaining space, while the remaining two each get 1/4.</p>
diff --git a/docs/html/training/improving-layouts/loading-ondemand.jd b/docs/html/training/improving-layouts/loading-ondemand.jd
index 0fa2855..9abd8fa 100644
--- a/docs/html/training/improving-layouts/loading-ondemand.jd
+++ b/docs/html/training/improving-layouts/loading-ondemand.jd
@@ -24,7 +24,8 @@ next.link=smooth-scrolling.html
 <!-- other docs (NOT javadocs) -->
 <h2>You should also read</h2>
 <ul>
-  <li><a href="{@docRoot}resources/articles/layout-tricks-stubs.html">Using ViewStubs</a></li>
+  <li><a href="http://android-developers.blogspot.com/2009/03/android-layout-tricks-3-optimize-with.html"
+         >Optimize with stubs (blog post)</a></li>
 </ul>
 
 </div>