summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Main <smain@google.com>2011-02-23 10:54:31 -0800
committerScott Main <smain@google.com>2011-02-23 10:54:31 -0800
commit2788e4f96a3f210192145a340a1d072c70c7bc4f (patch)
tree416999fc48d7ebbcf334c1f2c9d0b3d01d9af88d
parentc6c6fe939c83e644b7626f6d3f3be25883af1583 (diff)
downloadframeworks_base-2788e4f96a3f210192145a340a1d072c70c7bc4f.zip
frameworks_base-2788e4f96a3f210192145a340a1d072c70c7bc4f.tar.gz
frameworks_base-2788e4f96a3f210192145a340a1d072c70c7bc4f.tar.bz2
docs: fix some typos
Change-Id: I2dc9855f8fe87234d4337351e8bac6c382fb74d2
-rw-r--r--core/java/android/animation/package.html2
-rw-r--r--docs/html/sdk/android-3.0.jd4
2 files changed, 3 insertions, 3 deletions
diff --git a/core/java/android/animation/package.html b/core/java/android/animation/package.html
index ff43260..92eeb20 100644
--- a/core/java/android/animation/package.html
+++ b/core/java/android/animation/package.html
@@ -15,7 +15,7 @@ behaviors.</p>
<p>
For a guide on how to use the property animation system, see the
-<a href="{@docRoot}guide/topics/media/index.html">Animation</a> developer guide.
+<a href="{@docRoot}guide/topics/graphics/animation.html">Animation</a> developer guide.
</p>
</body>
</html>
diff --git a/docs/html/sdk/android-3.0.jd b/docs/html/sdk/android-3.0.jd
index 998c7c3..6c087bb 100644
--- a/docs/html/sdk/android-3.0.jd
+++ b/docs/html/sdk/android-3.0.jd
@@ -868,8 +868,8 @@ dimensions.</p>
<h3>JSON utilities</h3>
<p>New classes, {@link android.util.JsonReader} and {@link android.util.JsonWriter}, help you
-read and write JSON streams. The new APIs compliment the {@link org.json} classes which manipulate a
-document in memory.</p>
+read and write JSON streams. The new APIs complement the {@link org.json} classes, which manipulate
+a document in memory.</p>
<p>You can create an instance of {@link android.util.JsonReader} by calling
its constructor method and passing the {@link java.io.InputStreamReader} that feeds the JSON string.