Merge "docs: Fix a bunch of misc doc issues from external tracker" into ics-mr1

core/java/android/hardware/GeomagneticField.java

@@ -19,7 +19,7 @@ package android.hardware;
 import java.util.GregorianCalendar;
 
 /**
- * This class is used to estimated estimate magnetic field at a given point on
+ * Estimates magnetic field at a given point on
  * Earth, and in particular, to compute the magnetic declination from true
  * north.
  *

docs/html/guide/developing/device.jd

@@ -134,11 +134,11 @@ above.</p>
   </tr>
   <tr>
     <td>ASUS</td>
-    <td><code>0B05</code></td>
+    <td><code>0b05</code></td>
   </tr>
   <tr>
     <td>Dell</td>
-    <td><code>413C</code></td>
+    <td><code>413c</code></td>
   </tr>
   <tr>
     <td>Foxconn</td>
@@ -146,35 +146,35 @@ above.</p>
   </tr>
   <tr>
     <td>Fujitsu</td>
-    <td><code>04C5</code></td>
+    <td><code>04c5</code></td>
   </tr>
   <tr>
     <td>Fujitsu Toshiba</td>
-    <td><code>04C5</code></td>
+    <td><code>04c5</code></td>
   </tr>
   <tr>
     <td>Garmin-Asus</td>
-    <td><code>091E</code></td>
+    <td><code>091e</code></td>
   </tr>
   <tr>
     <td>Google</td>
-    <td><code>18D1</code></td>
+    <td><code>18d1</code></td>
   </tr>
   <tr>
     <td>Hisense</td>
-    <td><code>109B</code></td>
+    <td><code>109b</code></td>
   </tr>
   <tr>
     <td>HTC</td>
-    <td><code>0BB4</code></td>
+    <td><code>0bb4</code></td>
   </tr>
   <tr>
     <td>Huawei</td>
-    <td><code>12D1</code></td>
+    <td><code>12d1</code></td>
   </tr>
   <tr>
     <td>K-Touch</td>
-    <td><code>24E3</code></td>
+    <td><code>24e3</code></td>
   </tr>
   <tr>
     <td>KT Tech</td>
@@ -185,8 +185,8 @@ above.</p>
     <td><code>0482</code></td>
   </tr>
   <tr>
-    <td>Lenevo</td>
+    <td>Lenovo</td>
-    <td><code>17EF</code></td>
+    <td><code>17ef</code></td>
   </tr>
   <tr>
     <td>LG</td>
@@ -194,7 +194,7 @@ above.</p>
   </tr>
   <tr>
     <td>Motorola</td>
-    <td><code>22B8</code></td>
+    <td><code>22b8</code></td>
   </tr>
   <tr>
     <td>NEC</td>
@@ -214,11 +214,11 @@ above.</p>
   </tr>
   <tr>
     <td>Pantech</td>
-    <td><code>10A9</code></td>
+    <td><code>10a9</code></td>
   </tr>
   <tr>
     <td>Pegatron</td>
-    <td><code>1D4D</code></td>
+    <td><code>1d4d</code></td>
   </tr>
   <tr>
     <td>Philips</td>
@@ -226,31 +226,31 @@ above.</p>
   </tr>
   <tr>
     <td>PMC-Sierra</td>
-    <td><code>04DA</code></td>
+    <td><code>04da</code></td>
   </tr>
   <tr>
     <td>Qualcomm</td>
-    <td><code>05C6</code></td>
+    <td><code>05c6</code></td>
   </tr>
   <tr>
     <td>SK Telesys</td>
-    <td><code>1F53</code></td>
+    <td><code>1f53</code></td>
   </tr>
   <tr>
     <td>Samsung</td>
-    <td><code>04E8</code></td>
+    <td><code>04e8</code></td>
   </tr>
   <tr>
     <td>Sharp</td>
-    <td><code>04DD</code></td>
+    <td><code>04dd</code></td>
   </tr>
   <tr>
     <td>Sony</td>
-    <td><code>054C</code></td>
+    <td><code>054c</code></td>
   </tr>
   <tr>
     <td>Sony Ericsson</td>
-    <td><code>0FCE</code></td>
+    <td><code>0fce</code></td>
   </tr>
   <tr>
     <td>Teleepoch</td>
@@ -262,6 +262,6 @@ above.</p>
   </tr>
   <tr>
     <td>ZTE</td>
-    <td><code>19D2</code></td>
+    <td><code>19d2</code></td>
   </tr>
 </table>

docs/html/guide/developing/tools/monkeyrunner_concepts.jd

@@ -236,7 +236,7 @@ Table 1 explains the flags and arguments.
     You can generate an API reference for monkeyrunner by running:
 </p>
 <pre>
-monkeyrunner &lt;format&gt; help.py &lt;outfile&gt;
+monkeyrunner help.py &lt;format&gt; &lt;outfile&gt;
 </pre>
 <p>
 The arguments are:

docs/html/guide/market/expansion-files.jd

@@ -1088,12 +1088,8 @@ android.content.res.AssetFileDescriptor}, such as some {@link android.media.Medi
     <dd>Most applications don't need to use this class. This class defines a {@link
 android.content.ContentProvider} that marshals the data from the ZIP files through a content
 provider {@link android.net.Uri} in order to provide file access for certain Android APIs that
-expect {@link android.net.Uri} access to media files.
+expect {@link android.net.Uri} access to media files. For example, this is useful if you want to
-      <p>The sample application available in the
+play a video with {@link android.widget.VideoView#setVideoURI VideoView.setVideoURI()}.</p></dd>
-Apk Expansion package demonstrates a scenario in which this class is useful
-to specify a video with {@link android.widget.VideoView#setVideoURI
-VideoView.setVideoURI()}. See the sample app's class {@code SampleZipfileProvider} for an
-example of how to extend this class to use in your application.</p></dd>
 </dl>
 
 <h4>Reading from a ZIP file</h4>

docs/html/guide/topics/fundamentals/tasks-and-back-stack.jd

@@ -154,7 +154,7 @@ See the following section about <a href="#ActivityState">Activity state</a>.</p>
 
 <p>Because the activities in the back stack are never rearranged, if your application allows
 users to start a particular activity from more than one activity, a new instance of
-that activity is created and popped onto the stack (rather than bringing any previous instance of
+that activity is created and pushed onto the stack (rather than bringing any previous instance of
 the activity to the top). As such, one activity in your application might be instantiated multiple
 times (even from different tasks), as shown in figure 3. As such, if the user navigates backward
 using the <em>Back</em> button, each instance of the activity is revealed in the order they were
@@ -291,7 +291,7 @@ B should associate with current task. If both activities define how Activity B
 should associate with a task, then Activity A's request (as defined in the intent) is honored
 over Activity B's request (as defined in its manifest).</p>
 
-<p class="note"><strong>Note:</strong> Some the launch modes available in the manifest
+<p class="note"><strong>Note:</strong> Some launch modes available for the manifest file
 are not available as flags for an intent and, likewise, some launch modes available as flags
 for an intent cannot be defined in the manifest.</p>
 

docs/html/guide/topics/manifest/manifest-element.jd

@@ -37,7 +37,7 @@ parent.link=manifest-intro.html
 <dt>description:</dt>
 <dd>The root element of the AndroidManifest.xml file.  It must 
 contain an <code><a href="{@docRoot}guide/topics/manifest/application-element.html">&lt;application&gt;</a></code> element 
-and specify {@code xlmns:android} and {@code package} attributes.</dd>
+and specify {@code xmlns:android} and {@code package} attributes.</dd>
 
 <dt>attributes:</dt>
 <dd>

docs/html/guide/topics/providers/content-provider-basics.jd

@@ -123,7 +123,7 @@ page.title=Content Provider Basics
 
     <!-- Intro paragraphs -->
 <p>
-    A content provider manages access to a central repository of data. The provider and
+    A content provider manages access to a central repository of data. A provider
     is part of an Android application, which often provides its own UI for working with
     the data. However, content providers are primarily intended to be used by other
     applications, which access the provider using a provider client object. Together, providers
@@ -569,7 +569,7 @@ selectionArgs[0] = mUserInput;
 </pre>
 <p>
     A selection clause that uses <code>?</code> as a replaceable parameter and an array of
-    selection arguments array are preferred way to specify a selection, even the provider isn't
+    selection arguments array are preferred way to specify a selection, even if the provider isn't
     based on an SQL database.
 </p>
 <!-- Displaying the results -->

docs/html/guide/topics/resources/providing-resources.jd

@@ -287,9 +287,8 @@ names.</p>
         from the SIM card in the device. For example, <code>mcc310</code> is U.S. on any carrier,
         <code>mcc310-mnc004</code> is U.S. on Verizon, and <code>mcc208-mnc00</code> is France on
         Orange.</p>
-        <p>If the device uses a radio connection (GSM phone), the MCC comes
+        <p>If the device uses a radio connection (GSM phone), the MCC and MNC values come
-        from the SIM, and the MNC comes from the network to which the
+        from the SIM card.</p>
-        device is connected.</p>
         <p>You can also use the MCC alone (for example, to include country-specific legal
 resources in your application). If you need to specify based on the language only, then use the
 <em>language and region</em> qualifier instead (discussed next). If you decide to use the MCC and

docs/html/guide/topics/resources/string-resource.jd

@@ -358,11 +358,14 @@ values, with non-exhaustive examples in parentheses:
 <pre>
 int count = getNumberOfsongsAvailable();
 Resources res = {@link android.content.Context#getResources()};
-String songsFound = res.{@link android.content.res.Resources#getQuantityString(int,int)
+String songsFound = res.<a
-getQuantityString}(R.plurals.numberOfSongsAvailable, count, count);
+href="{@docRoot}reference/android/content/res/Resources.html#getQuantityString(int, int, java.lang.Object...)"
+>getQuantityString</a>(R.plurals.numberOfSongsAvailable, count, count);
 </pre>
-<p>When using the {@link android.content.res.Resources#getQuantityString(int,int)
+
-getQuantityString()} method, you need to pass the {@code count} twice if your string includes
+<p>When using the <a
+href="{@docRoot}reference/android/content/res/Resources.html#getQuantityString(int, int, java.lang.Object...)">{@code
+getQuantityString()}</a> method, you need to pass the {@code count} twice if your string includes
 <a href="#FormattingAndStyling">string formatting</a> with a number. For example, for the string
 {@code %d songs found}, the first {@code count} parameter selects the appropriate plural string and
 the second {@code count} parameter is inserted into the {@code %d} placeholder. If your plural

docs/html/guide/topics/sensors/index.jd

@@ -43,7 +43,7 @@ device's temperature sensor and humidity sensor to calculate and report the dewp
 application might use the geomagnetic field sensor and accelerometer to report a compass
 bearing.</p>
 
-<p>The Android platform supports four broad categories of sensors:</p>
+<p>The Android platform supports three broad categories of sensors:</p>
 
 <ul>
   <li>Motion sensors

docs/html/guide/topics/ui/layout-objects.jd

@@ -163,7 +163,7 @@ refer to the ID using the syntax of a relative resource
         <td>
         <pre>
 &lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-8&quot;?&gt;
-&lt;RelativeLayout xmlns:android=&quot;http://schemas.android.com/apk/res/android
+&lt;RelativeLayout xmlns:android=&quot;http://schemas.android.com/apk/res/android"
                 android:layout_width=&quot;fill_parent&quot; 
                 android:layout_height=&quot;wrap_content&quot;
                 android:background=&quot;@drawable/blue&quot;

docs/html/guide/topics/wireless/wifip2p.jd

@@ -333,7 +333,7 @@ protected void onCreate(Bundle savedInstanceState){
     ...
     mManager = (WifiP2pManager) getSystemService(Context.WIFI_P2P_SERVICE);
     mChannel = mManager.initialize(this, getMainLooper(), null);
-    Receiver = new WiFiDirectBroadcastReceiver(manager, channel, this);
+    mReceiver = new WiFiDirectBroadcastReceiver(manager, channel, this);
     ...
 }
 </pre>
@@ -364,13 +364,13 @@ protected void onCreate(Bundle savedInstanceState){
 &#064;Override
 protected void onResume() {
     super.onResume();
-    registerReceiver(receiver, intentFilter);
+    registerReceiver(mReceiver, mIntentFilter);
 }
 /* unregister the broadcast receiver */
 &#064;Override
 protected void onPause() {
     super.onPause();
-    unregisterReceiver(receiver);
+    unregisterReceiver(mReceiver);
 }
 </pre>
 

docs/html/resources/tutorials/views/hello-webview.jd

@@ -52,7 +52,7 @@ public void onCreate(Bundle savedInstanceState) {
   <li>While you're in the manifest, give some more space for web pages by removing the title
   bar, with the "NoTitleBar" theme:
 <pre>
-&lt;activity android:name=".HelloGoogleMaps" android:label="@string/app_name"
+&lt;activity android:name=".HelloWebView" android:label="@string/app_name"
      <strong>android:theme="@android:style/Theme.NoTitleBar"</strong>&gt;
 </pre>
   </li>

docs/html/sdk/android-4.0-highlights.jd

@@ -343,7 +343,7 @@ capabilities</strong></p>
 
 <p>The Camera app includes many new features that let users capture special moments
 with great photos and videos. After capturing images, they can edit and share
-them easily with friemds. </p>
+them easily with friends. </p>
 
 <p>When taking pictures, <strong>continuous focus</strong>, <strong>zero shutter
 lag exposure</strong>, and decreased shot-to-shot speed help capture clear,

docs/html/training/monitoring-device-state/docking-monitoring.jd

@@ -15,7 +15,7 @@ next.link=connectivity-monitoring.html
 
 <h2>This lesson teaches you to</h2>
 <ol>
-  <li><a href="#CurrentDockState">Request the Audio Focus</a></li>
+  <li><a href="#CurrentDockState">Determine the Current Docking State</a></li>
   <li><a href="#DockType">Determine the Current Dock Type</a></li>
   <li><a href="#MonitorDockState">Monitor for Changes in the Dock State or Type</a></li>
 </ol>