diff --git a/source/_components/camera.generic.markdown b/source/_components/camera.generic.markdown
index 9b9984c3ffa..071d8fab8f7 100644
--- a/source/_components/camera.generic.markdown
+++ b/source/_components/camera.generic.markdown
@@ -31,7 +31,7 @@ camera:
 
 Configuration variables:
 
-- **still_image_url** *Required*: The URL your camera serves the image on, eg. http://192.168.1.21:2112/
-- **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.
+- **still_image_url** (*Required*): The URL your camera serves the image on, eg. http://192.168.1.21:2112/
+- **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.
diff --git a/source/_components/camera.mjpeg.markdown b/source/_components/camera.mjpeg.markdown
index 9f84a34851b..61202b15612 100644
--- a/source/_components/camera.mjpeg.markdown
+++ b/source/_components/camera.mjpeg.markdown
@@ -31,10 +31,10 @@ camera:
 
 Configuration variables:
 
-- **mjpeg_url** *Required*: The URL your camera serves the video on, eg. http://192.168.1.21:2112/
-- **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.
+- **mjpeg_url** (*Required*): The URL your camera serves the video on, eg. http://192.168.1.21:2112/
+- **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.
 
 <p class='note'>
 There is a <a href="https://github.com/shazow/urllib3/issues/800" target="_blank">known issue in urllib3</a> that you will get error messages in your logs like <code>[StartBoundaryNotFoundDefect(), MultipartInvariantViolationDefect()], unparsed data: ''</code> but the component still works fine. You can ignore the messages. 
diff --git a/source/_components/camera.rpi_camera.markdown b/source/_components/camera.rpi_camera.markdown
index e2b6b4f2634..c81a93d2c72 100644
--- a/source/_components/camera.rpi_camera.markdown
+++ b/source/_components/camera.rpi_camera.markdown
@@ -14,7 +14,9 @@ ha_release: 0.17
 ---
 
 
-The `rpi` platform allows you to integrate the Raspberry Pi camera into Home Assistant. This component uses the application "raspistill" to store the image from camera.
+The `rpi` platform allows you to integrate the Raspberry Pi camera into Home Assistant. This component uses the application [`raspistill`](https://www.raspberrypi.org/documentation/usage/camera/raspicam/raspistill.md) to store the image from camera.
+
+To enable this camery in your installation, add the following to your `configuration.yaml` file:
 
 ```yaml
 # Example configuration.yaml entry
@@ -33,14 +35,14 @@ camera:
 
 Configuration variables:
 
- - **name** (optional): name of the camera
- - **image_width** (optional): set the image width (default: 640)
- - **image_height** (optional): set the image height (default: 480)
- - **image_quality** (optional): set the image quality (from 0 to 100, default: 7)
- - **image_rotation** (optional): Set image rotation (0-359, default: 0)
- - **horizontal_flip** (optional): Set horizontal flip (0 to disable, 1 to enable, default: 0)
- - **vertical_flip** (optional): Set vertical flip (0 to disable, 1 to enable, default: 0)
- - **timelapse** (optional): Takes a picture every <t>ms (default: 1000)
- - **file_path** (optional): Save the picture in a custom file path (default: camera components folder)
+ - **name** (*Optional*): Name of the camera
+ - **image_width** (*Optional*): Set the image width (default: 640)
+ - **image_height** (*Optional*): Set the image height (default: 480)
+ - **image_quality** (*Optional*): Set the image quality (from 0 to 100, default: 7)
+ - **image_rotation** (*Optional*): Set image rotation (0-359, default: 0)
+ - **horizontal_flip** (*Optional*): Set horizontal flip (0 to disable, 1 to enable, default: 0)
+ - **vertical_flip** (*Optional*): Set vertical flip (0 to disable, 1 to enable, default: 0)
+ - **timelapse** (*Optional*): Takes a picture every ms (default: 1000)
+ - **file_path** (*Optional*): Save the picture in a custom file path (default: camera components folder)
  
 The given **file_path** must be an existing file because the camera platform setup make a writeable check on it.