diff --git a/docs/html/guide/topics/media/camera.jd b/docs/html/guide/topics/media/camera.jd
index b962f9686e898..4e928b3132642 100644
--- a/docs/html/guide/topics/media/camera.jd
+++ b/docs/html/guide/topics/media/camera.jd
@@ -1037,7 +1037,7 @@ private static Uri getOutputMediaFileUri(int type){
 }
 
 /** Create a File for saving an image or video */
-private static Uri getOutputMediaFile(int type){
+private static File getOutputMediaFile(int type){
     // To be safe, you should check that the SDCard is mounted
     // using Environment.getExternalStorageState() before doing this.
 
diff --git a/docs/html/guide/topics/sensors/index.jd b/docs/html/guide/topics/sensors/index.jd
index e00a5b14eb6c4..75a1716c1931f 100644
--- a/docs/html/guide/topics/sensors/index.jd
+++ b/docs/html/guide/topics/sensors/index.jd
@@ -81,7 +81,7 @@ following documents:</p>
       Sensors</a></strong></dt>
     <dd>Learn how to use the sensors that provide orientation and compass data, such as the
       orientation sensor and the geomagnetic field sensor.</dd>
-  <dt><strong><a href="{@docRoot}guide/topics/sensors/environment.html">Environment
+  <dt><strong><a href="{@docRoot}guide/topics/sensors/sensors_environment.html">Environment
         Sensors</a></strong></dt>
     <dd>Learn how to use the sensors that provide environmental data, such as the light,
       humidity, pressure, temperature, and proximity sensors.</dd>