From 7363a3c664b5ca62864ed6b4fad4644f9d88e44a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 8 May 2016 00:11:27 +0200 Subject: [PATCH] Minor changes --- source/_components/camera.generic.markdown | 12 +++--------- source/_components/camera.mjpeg.markdown | 6 ++++-- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/source/_components/camera.generic.markdown b/source/_components/camera.generic.markdown index 8fa5522c654..c1f1361f6ae 100644 --- a/source/_components/camera.generic.markdown +++ b/source/_components/camera.generic.markdown @@ -12,17 +12,11 @@ ha_release: pre 0.7 --- -This component allows you to integrate any IP camera into Home Assistant. It supports fetching images from a url with optional HTTP authentication. +The `generic` camera platform allows you to integrate any IP camera into Home Assistant. It supports fetching images from a url with optional HTTP authentication. -Home Assistant will serve the images via its server, making it possible to view your IP camera's while outside of your network. +Home Assistant will serve the images via its server, making it possible to view your IP camera's while outside of your network. The endpoint is `/api/camera_proxy/camera.[name]?time=[timestamp]`. -As part of the basic support the following features will be provided: - -- MJPEG video streaming -- Saving a snapshot -- Recording(JPEG frame capture) - -To enable this sensor in your installation, add the following to your `configuration.yaml` file: +To enable this camery in your installation, add the following to your `configuration.yaml` file: ```yaml # Example configuration.yaml entry diff --git a/source/_components/camera.mjpeg.markdown b/source/_components/camera.mjpeg.markdown index 5cc0c6f3bff..96c64018b11 100644 --- a/source/_components/camera.mjpeg.markdown +++ b/source/_components/camera.mjpeg.markdown @@ -11,9 +11,11 @@ ha_category: Camera --- -The `mjpeg` component allows you to integrate IP cameras which are capable to stream their video with MJPEG into Home Assistant. +The `mjpeg` camera platform allows you to integrate IP cameras which are capable to stream their video with MJPEG into Home Assistant. -To enable this sensor in your installation, add the following to your `configuration.yaml` file: +Home Assistant will serve the images via its server, making it possible to view your IP camera's while outside of your network. The endpoint is `/api/camera_proxy/camera.[name]?time=[timestamp]`. + +To enable this camera in your installation, add the following to your `configuration.yaml` file: ```yaml # Example configuration.yaml entry