commit e9123960764d7b2e94fb0d68aae21fccc472abcd
author Scott Main <smain@google.com> Mon Dec 06 16:19:32 2010 -0800
committer Scott Main <smain@google.com> Tue Dec 14 16:42:48 2010 -0800
tree 567e4a2b060be45fa571347017231f3da3057d0c
parent 93d204ed98019322e434b714c7c0a619d69f24f5

cherrypick Change-Id: I00fd449b1daf5b75d6a051af46bfa6e45d131708
docs: misc doc fixes

Change-Id: Ib5f8aaf8feb42c825bc0149ec3775999856f5f57

docs/html/sdk/android-2.3.jd

diff --git a/docs/html/sdk/android-2.3.jd b/docs/html/sdk/android-2.3.jd
index 9ef7847..f996fa2 100644
--- a/docs/html/sdk/android-2.3.jd
+++ b/docs/html/sdk/android-2.3.jd
@@ -124,7 +124,7 @@
 API since the previous version.</p>
 
 
-<h3 id="sip">SIP-based VOIP</h3>
+<h3 id="sip">SIP-based VoIP</h3>
 
 <p>The platform now includes a SIP protocol stack and framework API that lets
 developers build internet telephony applications. Using the API, applications can offer
@@ -719,7 +719,7 @@
 <li><code>android.permission.USE_SIP</code> &mdash; Allows an application to use
 the {@link android.net.sip SIP API} to make or receive internet calls.
 <li><code>android.permission.NFC</code> &mdash; Allows an application to use the
-{@link android.nfc NFC API} to make or receive internet calls.</li>
+{@link android.nfc NFC API} to read NFC tags.</li>
 </ul>
 
 <h3 id="feature_constants">New Feature Constants</h3>
@@ -748,13 +748,13 @@
 <li>{@link android.content.pm.PackageManager#FEATURE_SIP android.software.sip}
 &mdash; The application uses the SIP API on the device.</li>
 <li>{@link android.content.pm.PackageManager#FEATURE_SIP_VOIP
-android.software.sip.voip} &mdash; The application uses a SIP-based VOIP
+android.software.sip.voip} &mdash; The application uses a SIP-based VoIP
 service on the device.</li>
 <li>{@link
 android.content.pm.PackageManager#FEATURE_TOUCHSCREEN_MULTITOUCH_JAZZHAND
 android.hardware.touchscreen.multitouch.jazzhand} &mdash; The application uses
 advanced multipoint multitouch capabilities on the device screen, for tracking
-up to five points fully independently.</li>
+five or more points fully independently.</li>
 </ul>
 
 <p>For full information about how to declare features and use them for