Merge "Fix document." into ics-mr1

3 files changed, 7 insertions, 7 deletions

diff --git a/docs/html/guide/topics/media/camera.jd b/docs/html/guide/topics/media/camera.jd
index a76c3c7..7d72491 100644
--- a/docs/html/guide/topics/media/camera.jd
+++ b/docs/html/guide/topics/media/camera.jd
@@ -442,7 +442,7 @@ use or does not exist will cause your application to be shut down by the system.
 the first, back-facing camera on a device with more than one camera.</p>
 
 <h3 id="check-camera-features">Checking camera features</h3>
-<p>Once you obtain access to a camera, you can get further information about its capabilties using
+<p>Once you obtain access to a camera, you can get further information about its capabilities using
 the {@link android.hardware.Camera#getParameters() Camera.getParameters()} method and checking the
 returned {@link android.hardware.Camera.Parameters} object for supported capabilities. When using
 API Level 9 or higher, use the {@link android.hardware.Camera#getCameraInfo(int,
@@ -677,8 +677,8 @@ button {@link android.view.View.OnClickListener}.</p>
 <pre>
 // Add a listener to the Capture button
 Button captureButton = (Button) findViewById(id.button_capture);
-    captureButton.setOnClickListener(
-        new View.OnClickListener() {
+captureButton.setOnClickListener(
+    new View.OnClickListener() {
         &#64;Override
         public void onClick(View v) {
             // get an image from the camera
diff --git a/docs/html/training/camera/cameradirect.jd b/docs/html/training/camera/cameradirect.jd
index 03ad119..4b6f0d2 100644
--- a/docs/html/training/camera/cameradirect.jd
+++ b/docs/html/training/camera/cameradirect.jd
@@ -35,7 +35,7 @@ previous.link=videobasics.html
 the framework APIs.</p>
 
 <p>Directly controlling a device camera requires a lot more code than requesting pictures or videos
-from existing camera applications. However, if you want to build a specialized camera application or
+from existing camera applications. However, if you want to build a specialized camera application
 or something fully integrated in your app UI, this lesson shows you how.</p>
 
 
@@ -95,7 +95,7 @@ camera sensor is picking up.</p>
 <p>To get started with displaying a preview, you need preview class. The
 preview requires an implementation of the {@code
 android.view.SurfaceHolder.Callback} interface, which is used to pass image
-data from the camera hardware the application.</p>
+data from the camera hardware to the application.</p>
 
 <pre>
 class Preview extends ViewGroup implements SurfaceHolder.Callback {
@@ -214,7 +214,7 @@ takePicture()}.</p>
 
 <h2 id="TaskRestartPreview">Restart the Preview</h2>
 
-<p>After a picture is taken, you must to restart the preview before the user
+<p>After a picture is taken, you must restart the preview before the user
 can take another picture. In this example, the restart is done by overloading
 the shutter button.</p>
 
diff --git a/docs/html/training/camera/videobasics.jd b/docs/html/training/camera/videobasics.jd
index f8ce03c..5fe1a3a 100644
--- a/docs/html/training/camera/videobasics.jd
+++ b/docs/html/training/camera/videobasics.jd
@@ -107,7 +107,7 @@ public static boolean isIntentAvailable(Context context, String action) {
 <p>The Android Camera application returns the video in the {@link android.content.Intent} delivered
 to {@link android.app.Activity#onActivityResult onActivityResult()} as a {@link
 android.net.Uri} pointing to the video location in storage. The following code
-retrieves this image and displays it in a {@link android.widget.VideoView}.</p>
+retrieves this video and displays it in a {@link android.widget.VideoView}.</p>
 
 <pre>
 private void handleCameraVideo(Intent intent) {