home-assistant · fabaff · Sep 30, 2016 · Sep 30, 2016
diff --git a/source/_components/camera.ffmpeg.markdown b/source/_components/camera.ffmpeg.markdown
@@ -22,8 +22,6 @@ To enable your FFmpeg feed in your installation, add the following to your `conf
 camera:
   - platform: ffmpeg
     input: FFMPEG_SUPPORTED_INPUT
-    name: FFmpeg
-    extra_arguments: -q:v 2
 ```
 
 Configuration variables:

diff --git a/source/_components/camera.foscam.markdown b/source/_components/camera.foscam.markdown
@@ -21,8 +21,6 @@ To enable your Foscam IP camera in your installation, add the following to your
 camera:
   platform: foscam
   ip: IP_ADDRESS
-  name: Door Camera
-  port: 88
   username: USERNAME
   password: PASSWORD
 ```
@@ -31,9 +29,9 @@ Configuration variables:
 
 - **ip** (*Required*): The IP address your camera.
 - **port** (*Optional*): The port that the camera is running on. The default is 88. 
-- **name** (*Optional*): This parameter allows you to override the name of your camera.
 - **username** (*Required*): The username for accessing your camera.
 - **password** (*Required*): The password for accessing your camera.
+- **name** (*Optional*): This parameter allows you to override the name of your camera.
 
 <p class='note'>
 There seems to be some issues within Foscam with lengthy passwords and passwords containing certain symbols. Be sure to check your camera's documentation.

diff --git a/source/_components/camera.generic.markdown b/source/_components/camera.generic.markdown
@@ -23,18 +23,13 @@ To enable this camera in your installation, add the following to your `configura
 ```yaml
 # Example configuration.yaml entry
 camera:
-  platform: generic
-  still_image_url: http://194.218.96.92/jpg/image.jpg
-  name: my sample camera
-  username: USERNAME
-  password: PASSWORD
-  authentication: basic
-  limit_refetch_to_url_change: true
+  - platform: generic
+    still_image_url: http://194.218.96.92/jpg/image.jpg
 ```
 
 Configuration variables:
 
-- **still_image_url** (*Required*): The URL your camera serves the image on, eg. http://192.168.1.21:2112/. Can be a [template].
+- **still_image_url** (*Required*): The URL your camera serves the image on, eg. http://192.168.1.21:2112/. Can be a [template](/topics/templating/).
 - **name** (*Optional*): This parameter allows you to override the name of your camera.
 - **username** (*Optional*): The username for accessing your camera.
 - **password** (*Optional*): The password for accessing your camera.
@@ -48,4 +43,3 @@ Configuration variables:
   </a>
 </p>
 
-[template]: /topics/templating/
diff --git a/source/_components/camera.local_file.markdown b/source/_components/camera.local_file.markdown
@@ -22,15 +22,14 @@ To enable this camera in your installation, add the following to your `configura
 ```yaml
 # Example configuration.yaml entry
 camera:
-  platform: local_file
-  name: Local File
-  file_path: /tmp/image.jpg
+  - platform: local_file
+    file_path: /tmp/image.jpg
 ```
 
 Configuration variables:
 
- - **name** (*Optional*): Name of the camera
  - **file_path** (*Required*): File to serve as the camera.
+ - **name** (*Optional*): Name of the camera
 
 <p class='note'>
 The given `file_path` must be an existing file because the camera platform setup make a readable check on it.

diff --git a/source/_components/camera.markdown b/source/_components/camera.markdown
@@ -10,5 +10,5 @@ footer: true
 ---
 
 
-The camera component allows you to use IP cameras with Home Assistant.
+The camera component allows you to use IP cameras with Home Assistant. With a little additional work you could use [USB cameras](/blog/2016/06/23/usb-webcams-and-home-assistant/) as well.
 
diff --git a/source/_components/camera.mjpeg.markdown b/source/_components/camera.mjpeg.markdown
@@ -22,12 +22,8 @@ To enable this camera in your installation, add the following to your `configura
 ```yaml
 # Example configuration.yaml entry
 camera:
-  platform: mjpeg
-  mjpeg_url: http://192.168.1.92/mjpeg
-  name: my sample camera
-  username: USERNAME
-  password: PASSWORD
-  authentication: basic
+  - platform: mjpeg
+    mjpeg_url: http://192.168.1.92/mjpeg
 ```
 
 Configuration variables:

diff --git a/source/_components/camera.netatmo.markdown b/source/_components/camera.netatmo.markdown
@@ -21,10 +21,6 @@ To enable the Netatmo camera, you first have to set up [netatmo](/components/net
 # Example configuration.yaml entry
 camera:
   platform: netatmo
-  home: home_name
-  cameras:
-    - camera_name1
-    - camera_name2
 ```
 
 Configuration variables:
@@ -33,5 +29,14 @@ Configuration variables:
 - **cameras** array (*Optional*): Cameras to use. Multiple enties allowed.
     - **camera_name**: Name of the camera to display.
 
-If **home** and **cameras** is not provided, all cameras will be displayed.
+If **home** and **cameras** are not provided, all cameras will be displayed. For more control over your cameras check the configuration sample below.
 
+```yaml
+# Example configuration.yaml entry
+camera:
+  platform: netatmo
+  home: home_name
+  cameras:
+    - camera_name1
+    - camera_name2
+```
diff --git a/source/_components/camera.rpi_camera.markdown b/source/_components/camera.rpi_camera.markdown
@@ -21,16 +21,7 @@ To enable this camera in your installation, add the following to your `configura
 ```yaml
 # Example configuration.yaml entry
 camera:
-  platform: rpi_camera
-  name: Raspberry Pi Camera
-  image_width: 640
-  image_height: 480
-  image_quality: 7
-  image_rotation: 0
-  timelapse: 1000
-  horizontal_flip: 0
-  vertical_flip: 0
-  file_path: /tmp/image.jpg
+  - platform: rpi_camera
 ```
 
 Configuration variables:

diff --git a/source/_components/camera.uvc.markdown b/source/_components/camera.uvc.markdown
@@ -20,10 +20,9 @@ To enable a UVC camera in your installation, add the following to your `configur
 ```yaml
 # Example configuration.yaml entry
 camera:
-  platform: uvc
-  nvr: IP_ADDRESS
-  port: PORT
-  key: APIKEY
+  - platform: uvc
+    nvr: IP_ADDRESS
+    key: API_KEY
 ```
 
 Configuration variables:
Original file line number	Diff line number	Diff line change
Expand Up		@@ -10,5 +10,5 @@ footer: true
		---


		The camera component allows you to use IP cameras with Home Assistant.
		The camera component allows you to use IP cameras with Home Assistant. With a little additional work you could use [USB cameras](/blog/2016/06/23/usb-webcams-and-home-assistant/) as well.