Merge "doc change: fix missing code ending tag" into honeycomb
diff --git a/docs/html/guide/developing/building/building-cmdline.jd b/docs/html/guide/developing/building/building-cmdline.jd
index 81c1178..5f193bc 100644
--- a/docs/html/guide/developing/building/building-cmdline.jd
+++ b/docs/html/guide/developing/building/building-cmdline.jd
@@ -72,7 +72,7 @@
<p>This creates your debug <code>.apk</code> file inside the project <code>bin/</code> directory, named
<code><your_project_name>-debug.apk</code>. The file is already signed with
the debug key and has been aligned with
- <a href="{@docRoot}/guide/developing/tools/zipalign.html"><code>zipalign</code></a>.
+ <a href="{@docRoot}guide/developing/tools/zipalign.html"><code>zipalign</code></a>.
</p>
</li>
</ol>
diff --git a/docs/html/guide/topics/manifest/uses-library-element.jd b/docs/html/guide/topics/manifest/uses-library-element.jd
index a1e3563..d94ad9f 100644
--- a/docs/html/guide/topics/manifest/uses-library-element.jd
+++ b/docs/html/guide/topics/manifest/uses-library-element.jd
@@ -46,7 +46,7 @@
<dd>
Android Market filters applications based on the libraries installed on the
user's device. For more information about filtering, see the topic
- <a href="{@docRoot}/guide/appendix/market-filters.html">Market Filters</a>.
+ <a href="{@docRoot}guide/appendix/market-filters.html">Market Filters</a>.
</dd>
</dl>
<p>
diff --git a/docs/html/resources/community-more.jd b/docs/html/resources/community-more.jd
index 9f16fea..df72926 100644
--- a/docs/html/resources/community-more.jd
+++ b/docs/html/resources/community-more.jd
@@ -24,7 +24,11 @@
</tr>
</table>
-<p>If you haven't used IRC before, check <a href="http://en.wikipedia.org/wiki/List_of_IRC_clients">http://en.wikipedia.org/wiki/List_of_IRC_clients »</a> for a helpful list of IRC clients. Alternatively, you could also use this <a href="http://java.freenode.net/index.php?channel=android-dev">web interface »</a>, which does not require any installation, to join discussions on the Android IRC channels. </p>
+<p>If you haven't used IRC before, check <a
+href="http://en.wikipedia.org/wiki/List_of_IRC_clients">http://en.wikipedia.org/wiki/
+List_of_IRC_clients »</a> for a helpful list of IRC clients. Alternatively, you could also use
+this <a href="http://webchat.freenode.net/?channels=android-dev">web interface »</a>, which
+does not require any installation, to join discussions on the Android IRC channels. </p>
<p>Here are some tips for using IRC:</h4>
diff --git a/media/java/android/media/MediaPlayer.java b/media/java/android/media/MediaPlayer.java
index f61ac0f..98ddbe7 100644
--- a/media/java/android/media/MediaPlayer.java
+++ b/media/java/android/media/MediaPlayer.java
@@ -1055,7 +1055,14 @@
/**
* Releases resources associated with this MediaPlayer object.
* It is considered good practice to call this method when you're
- * done using the MediaPlayer.
+ * done using the MediaPlayer. For instance, whenever the Activity
+ * of an application is paused, this method should be invoked to
+ * release the MediaPlayer object. In addition to unnecessary resources
+ * (such as memory and instances of codecs) being hold, failure to
+ * call this method immediately if a MediaPlayer object is no longer
+ * needed may also lead to continuous battery consumption for mobile
+ * devices, and playback failure if no multiple instances of the
+ * same codec is supported on a device.
*/
public void release() {
stayAwake(false);