From ab9e173179fc7a9e890f7df81088a095ffa3ec21 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Wed, 18 Nov 2015 08:42:49 +0100
Subject: [PATCH] Update docstrings

---
 homeassistant/components/camera/__init__.py | 15 ++++++++-------
 homeassistant/components/camera/generic.py  |  2 +-
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/homeassistant/components/camera/__init__.py b/homeassistant/components/camera/__init__.py
index ff5198b7ab1..ae5fe28beac 100644
--- a/homeassistant/components/camera/__init__.py
+++ b/homeassistant/components/camera/__init__.py
@@ -58,7 +58,7 @@ MJPEG_START_HEADER = 'Content-type: {0}\r\n\r\n'
 
 # pylint: disable=too-many-branches
 def setup(hass, config):
-    """ Track states and offer events for sensors. """
+    """ Track states and offer events for cameras. """
 
     component = EntityComponent(
         logging.getLogger(__name__), DOMAIN, hass, SCAN_INTERVAL,
@@ -101,7 +101,8 @@ def setup(hass, config):
 
     # pylint: disable=unused-argument
     def _proxy_camera_mjpeg_stream(handler, path_match, data):
-        """ Proxies the camera image as an mjpeg stream via the HA server.
+        """
+        Proxies the camera image as an mjpeg stream via the HA server.
         This function takes still images from the IP camera and turns them
         into an MJPEG stream.  This means that HA can return a live video
         stream even with only a still image URL available.
@@ -163,7 +164,7 @@ def setup(hass, config):
 
 
 class Camera(Entity):
-    """ The base class for camera components """
+    """ The base class for camera components. """
 
     def __init__(self):
         self.is_streaming = False
@@ -171,23 +172,23 @@ class Camera(Entity):
     @property
     # pylint: disable=no-self-use
     def is_recording(self):
-        """ Returns true if the device is recording """
+        """ Returns true if the device is recording. """
         return False
 
     @property
     # pylint: disable=no-self-use
     def brand(self):
-        """ Should return a string of the camera brand """
+        """ Should return a string of the camera brand. """
         return None
 
     @property
     # pylint: disable=no-self-use
     def model(self):
-        """ Returns string of camera model """
+        """ Returns string of camera model. """
         return None
 
     def camera_image(self):
-        """ Return bytes of camera image """
+        """ Return bytes of camera image. """
         raise NotImplementedError()
 
     @property
diff --git a/homeassistant/components/camera/generic.py b/homeassistant/components/camera/generic.py
index b8be51292bf..7e9542908d5 100644
--- a/homeassistant/components/camera/generic.py
+++ b/homeassistant/components/camera/generic.py
@@ -40,7 +40,7 @@ class GenericCamera(Camera):
         self._still_image_url = device_info['still_image_url']
 
     def camera_image(self):
-        """ Return a still image reponse from the camera. """
+        """ Return a still image response from the camera. """
         if self._username and self._password:
             try:
                 response = requests.get(