cherrypick Change-Id: I0b44b8b11599ac94fd0ecac84dcb71725d69cd63
Doc change: Update min glibc version for linux.
Change-Id: I97a79004362e97732fa7d3be07c7396180f5fa99
diff --git a/docs/html/sdk/android-2.3.jd b/docs/html/sdk/android-2.3.jd
index 5438adc..5b4f17b 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
@@ -747,7 +747,7 @@
<li>{@link android.content.pm.PackageManager#FEATURE_SIP android.software.sip}
— The application uses the SIP API on the device.</li>
<li>{@link android.content.pm.PackageManager#FEATURE_SIP_VOIP
-android.software.sip.voip} — The application uses a SIP-based VOIP
+android.software.sip.voip} — The application uses a SIP-based VoIP
service on the device.</li>
<li>{@link
android.content.pm.PackageManager#FEATURE_TOUCHSCREEN_MULTITOUCH_JAZZHAND