diff --git a/atom.xml b/atom.xml
index c3cfca9ff5..3d9c4c9a3e 100644
--- a/atom.xml
+++ b/atom.xml
@@ -4,7 +4,7 @@
- 2018-02-09T19:42:20+00:00
+ 2018-02-09T20:26:08+00:00
https://home-assistant.io/
diff --git a/blog/categories/announcements/atom.xml b/blog/categories/announcements/atom.xml
index 00b2dca96b..d77f01b35a 100644
--- a/blog/categories/announcements/atom.xml
+++ b/blog/categories/announcements/atom.xml
@@ -4,7 +4,7 @@
- 2018-02-09T19:42:20+00:00
+ 2018-02-09T20:26:08+00:00
https://home-assistant.io/
diff --git a/blog/categories/community/atom.xml b/blog/categories/community/atom.xml
index 1d86cf5669..939eac08bf 100644
--- a/blog/categories/community/atom.xml
+++ b/blog/categories/community/atom.xml
@@ -4,7 +4,7 @@
- 2018-02-09T19:42:20+00:00
+ 2018-02-09T20:26:08+00:00
https://home-assistant.io/
diff --git a/blog/categories/device-tracking/atom.xml b/blog/categories/device-tracking/atom.xml
index c48b8119bf..b565999766 100644
--- a/blog/categories/device-tracking/atom.xml
+++ b/blog/categories/device-tracking/atom.xml
@@ -4,7 +4,7 @@
- 2018-02-09T19:42:20+00:00
+ 2018-02-09T20:26:08+00:00
https://home-assistant.io/
diff --git a/blog/categories/esp8266/atom.xml b/blog/categories/esp8266/atom.xml
index 564ad8a807..a1efaa2240 100644
--- a/blog/categories/esp8266/atom.xml
+++ b/blog/categories/esp8266/atom.xml
@@ -4,7 +4,7 @@
- 2018-02-09T19:42:20+00:00
+ 2018-02-09T20:26:08+00:00
https://home-assistant.io/
diff --git a/blog/categories/how-to/atom.xml b/blog/categories/how-to/atom.xml
index 9f1cbd03b4..e6b64d4725 100644
--- a/blog/categories/how-to/atom.xml
+++ b/blog/categories/how-to/atom.xml
@@ -4,7 +4,7 @@
- 2018-02-09T19:42:20+00:00
+ 2018-02-09T20:26:08+00:00
https://home-assistant.io/
diff --git a/blog/categories/ibeacons/atom.xml b/blog/categories/ibeacons/atom.xml
index 1955223068..2d14c18016 100644
--- a/blog/categories/ibeacons/atom.xml
+++ b/blog/categories/ibeacons/atom.xml
@@ -4,7 +4,7 @@
- 2018-02-09T19:42:20+00:00
+ 2018-02-09T20:26:08+00:00
https://home-assistant.io/
diff --git a/blog/categories/internet-of-things/atom.xml b/blog/categories/internet-of-things/atom.xml
index 000eef1f05..eb43710c14 100644
--- a/blog/categories/internet-of-things/atom.xml
+++ b/blog/categories/internet-of-things/atom.xml
@@ -4,7 +4,7 @@
- 2018-02-09T19:42:20+00:00
+ 2018-02-09T20:26:08+00:00
https://home-assistant.io/
diff --git a/blog/categories/iot-data/atom.xml b/blog/categories/iot-data/atom.xml
index 728770c3b3..811d7620b5 100644
--- a/blog/categories/iot-data/atom.xml
+++ b/blog/categories/iot-data/atom.xml
@@ -4,7 +4,7 @@
- 2018-02-09T19:42:20+00:00
+ 2018-02-09T20:26:08+00:00
https://home-assistant.io/
diff --git a/blog/categories/media/atom.xml b/blog/categories/media/atom.xml
index 726fc519eb..63a9d44875 100644
--- a/blog/categories/media/atom.xml
+++ b/blog/categories/media/atom.xml
@@ -4,7 +4,7 @@
- 2018-02-09T19:42:20+00:00
+ 2018-02-09T20:26:08+00:00
https://home-assistant.io/
diff --git a/blog/categories/merchandise/atom.xml b/blog/categories/merchandise/atom.xml
index ff9ee74e4b..e3b1346a1d 100644
--- a/blog/categories/merchandise/atom.xml
+++ b/blog/categories/merchandise/atom.xml
@@ -4,7 +4,7 @@
- 2018-02-09T19:42:20+00:00
+ 2018-02-09T20:26:08+00:00
https://home-assistant.io/
diff --git a/blog/categories/micropython/atom.xml b/blog/categories/micropython/atom.xml
index aa48ef110e..50b7087d0f 100644
--- a/blog/categories/micropython/atom.xml
+++ b/blog/categories/micropython/atom.xml
@@ -4,7 +4,7 @@
- 2018-02-09T19:42:20+00:00
+ 2018-02-09T20:26:08+00:00
https://home-assistant.io/
diff --git a/blog/categories/mqtt/atom.xml b/blog/categories/mqtt/atom.xml
index f3b2eec285..7523b07700 100644
--- a/blog/categories/mqtt/atom.xml
+++ b/blog/categories/mqtt/atom.xml
@@ -4,7 +4,7 @@
- 2018-02-09T19:42:20+00:00
+ 2018-02-09T20:26:08+00:00
https://home-assistant.io/
diff --git a/blog/categories/organization/atom.xml b/blog/categories/organization/atom.xml
index 794f8b65f2..f15bfd12b8 100644
--- a/blog/categories/organization/atom.xml
+++ b/blog/categories/organization/atom.xml
@@ -4,7 +4,7 @@
- 2018-02-09T19:42:20+00:00
+ 2018-02-09T20:26:08+00:00
https://home-assistant.io/
diff --git a/blog/categories/owntracks/atom.xml b/blog/categories/owntracks/atom.xml
index 81ab6778ea..23efe058ea 100644
--- a/blog/categories/owntracks/atom.xml
+++ b/blog/categories/owntracks/atom.xml
@@ -4,7 +4,7 @@
- 2018-02-09T19:42:20+00:00
+ 2018-02-09T20:26:08+00:00
https://home-assistant.io/
diff --git a/blog/categories/presence-detection/atom.xml b/blog/categories/presence-detection/atom.xml
index 22725bc540..b7bfe5d4a5 100644
--- a/blog/categories/presence-detection/atom.xml
+++ b/blog/categories/presence-detection/atom.xml
@@ -4,7 +4,7 @@
- 2018-02-09T19:42:20+00:00
+ 2018-02-09T20:26:08+00:00
https://home-assistant.io/
diff --git a/blog/categories/public-service-announcement/atom.xml b/blog/categories/public-service-announcement/atom.xml
index 98abf65746..ba25ab22e5 100644
--- a/blog/categories/public-service-announcement/atom.xml
+++ b/blog/categories/public-service-announcement/atom.xml
@@ -4,7 +4,7 @@
- 2018-02-09T19:42:20+00:00
+ 2018-02-09T20:26:08+00:00
https://home-assistant.io/
diff --git a/blog/categories/release-notes/atom.xml b/blog/categories/release-notes/atom.xml
index 955541bba9..989f817952 100644
--- a/blog/categories/release-notes/atom.xml
+++ b/blog/categories/release-notes/atom.xml
@@ -4,7 +4,7 @@
- 2018-02-09T19:42:20+00:00
+ 2018-02-09T20:26:08+00:00
https://home-assistant.io/
diff --git a/blog/categories/survey/atom.xml b/blog/categories/survey/atom.xml
index 65dc6dff89..916990f32a 100644
--- a/blog/categories/survey/atom.xml
+++ b/blog/categories/survey/atom.xml
@@ -4,7 +4,7 @@
- 2018-02-09T19:42:20+00:00
+ 2018-02-09T20:26:08+00:00
https://home-assistant.io/
diff --git a/blog/categories/talks/atom.xml b/blog/categories/talks/atom.xml
index c08ef34655..94b7f3f421 100644
--- a/blog/categories/talks/atom.xml
+++ b/blog/categories/talks/atom.xml
@@ -4,7 +4,7 @@
- 2018-02-09T19:42:20+00:00
+ 2018-02-09T20:26:08+00:00
https://home-assistant.io/
diff --git a/blog/categories/technology/atom.xml b/blog/categories/technology/atom.xml
index 23c359dc31..711fd0702d 100644
--- a/blog/categories/technology/atom.xml
+++ b/blog/categories/technology/atom.xml
@@ -4,7 +4,7 @@
- 2018-02-09T19:42:20+00:00
+ 2018-02-09T20:26:08+00:00
https://home-assistant.io/
diff --git a/blog/categories/user-stories/atom.xml b/blog/categories/user-stories/atom.xml
index 6bbf982aaa..9cd8c4b545 100644
--- a/blog/categories/user-stories/atom.xml
+++ b/blog/categories/user-stories/atom.xml
@@ -4,7 +4,7 @@
- 2018-02-09T19:42:20+00:00
+ 2018-02-09T20:26:08+00:00
https://home-assistant.io/
diff --git a/blog/categories/video/atom.xml b/blog/categories/video/atom.xml
index b82c967e6b..160f0e0fa4 100644
--- a/blog/categories/video/atom.xml
+++ b/blog/categories/video/atom.xml
@@ -4,7 +4,7 @@
- 2018-02-09T19:42:20+00:00
+ 2018-02-09T20:26:08+00:00
https://home-assistant.io/
diff --git a/blog/categories/website/atom.xml b/blog/categories/website/atom.xml
index 6ba00b6b8f..072d85f10f 100644
--- a/blog/categories/website/atom.xml
+++ b/blog/categories/website/atom.xml
@@ -4,7 +4,7 @@
- 2018-02-09T19:42:20+00:00
+ 2018-02-09T20:26:08+00:00
https://home-assistant.io/
diff --git a/components/camera.generic/index.html b/components/camera.generic/index.html
index b93cd8f521..ad66bd3c7f 100644
--- a/components/camera.generic/index.html
+++ b/components/camera.generic/index.html
@@ -117,6 +117,14 @@
still_image_url : https://127.0.0.1:8123/local/your_image.png
+ Sharing a camera feed from one Home Assistant instance to another
+If you are running more than one Home Assistant instance (let’s call them the ‘host’ and ‘receiver’ instances) you may wish to display the camera feed from the host instance on the receiver instance. You can use the REST API to access the camera feed on the host (IP address 127.0.0.5) and display it on the receiver instance by configuring the receiver with the the following:
+camera :
+ - platform : generic
+ name : Host instance camera feed
+ still_image_url : https://127.0.0.5:8123/api/camera_proxy/camera.live_view
+
+