diff --git a/atom.xml b/atom.xml index 14922a3800..5f4389d34e 100644 --- a/atom.xml +++ b/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Home Assistant]]> - 2017-03-26T10:23:27+00:00 + 2017-03-26T10:51:06+00:00 https://home-assistant.io/ diff --git a/blog/categories/community/atom.xml b/blog/categories/community/atom.xml index 683aa53d1c..32e0d7ba23 100644 --- a/blog/categories/community/atom.xml +++ b/blog/categories/community/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: Community | Home Assistant]]> - 2017-03-26T10:23:27+00:00 + 2017-03-26T10:51:06+00:00 https://home-assistant.io/ diff --git a/blog/categories/device-tracking/atom.xml b/blog/categories/device-tracking/atom.xml index d5a6a40c2e..d7da8f06ea 100644 --- a/blog/categories/device-tracking/atom.xml +++ b/blog/categories/device-tracking/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: Device-Tracking | Home Assistant]]> - 2017-03-26T10:23:27+00:00 + 2017-03-26T10:51:06+00:00 https://home-assistant.io/ diff --git a/blog/categories/esp8266/atom.xml b/blog/categories/esp8266/atom.xml index 02a075fe76..f601f4d20a 100644 --- a/blog/categories/esp8266/atom.xml +++ b/blog/categories/esp8266/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: ESP8266 | Home Assistant]]> - 2017-03-26T10:23:27+00:00 + 2017-03-26T10:51:06+00:00 https://home-assistant.io/ diff --git a/blog/categories/how-to/atom.xml b/blog/categories/how-to/atom.xml index 37720d774a..cb27b585a6 100644 --- a/blog/categories/how-to/atom.xml +++ b/blog/categories/how-to/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: How-To | Home Assistant]]> - 2017-03-26T10:23:27+00:00 + 2017-03-26T10:51:06+00:00 https://home-assistant.io/ diff --git a/blog/categories/ibeacons/atom.xml b/blog/categories/ibeacons/atom.xml index b143531f53..fb97c5e931 100644 --- a/blog/categories/ibeacons/atom.xml +++ b/blog/categories/ibeacons/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: iBeacons | Home Assistant]]> - 2017-03-26T10:23:27+00:00 + 2017-03-26T10:51:06+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 870fde5560..6c2db49be2 100644 --- a/blog/categories/internet-of-things/atom.xml +++ b/blog/categories/internet-of-things/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: Internet-of-Things | Home Assistant]]> - 2017-03-26T10:23:27+00:00 + 2017-03-26T10:51:06+00:00 https://home-assistant.io/ diff --git a/blog/categories/iot-data/atom.xml b/blog/categories/iot-data/atom.xml index 0cbbea5ea5..8638b6836c 100644 --- a/blog/categories/iot-data/atom.xml +++ b/blog/categories/iot-data/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: IoT-Data | Home Assistant]]> - 2017-03-26T10:23:27+00:00 + 2017-03-26T10:51:06+00:00 https://home-assistant.io/ diff --git a/blog/categories/merchandise/atom.xml b/blog/categories/merchandise/atom.xml index cacae61b15..65b8f9a64a 100644 --- a/blog/categories/merchandise/atom.xml +++ b/blog/categories/merchandise/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: Merchandise | Home Assistant]]> - 2017-03-26T10:23:27+00:00 + 2017-03-26T10:51:06+00:00 https://home-assistant.io/ diff --git a/blog/categories/micropython/atom.xml b/blog/categories/micropython/atom.xml index c4ca329ee4..028b7553ec 100644 --- a/blog/categories/micropython/atom.xml +++ b/blog/categories/micropython/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: Micropython | Home Assistant]]> - 2017-03-26T10:23:27+00:00 + 2017-03-26T10:51:06+00:00 https://home-assistant.io/ diff --git a/blog/categories/mqtt/atom.xml b/blog/categories/mqtt/atom.xml index 8262f1f22b..559877d856 100644 --- a/blog/categories/mqtt/atom.xml +++ b/blog/categories/mqtt/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: MQTT | Home Assistant]]> - 2017-03-26T10:23:27+00:00 + 2017-03-26T10:51:06+00:00 https://home-assistant.io/ diff --git a/blog/categories/organisation/atom.xml b/blog/categories/organisation/atom.xml index 542febb646..a9ff061191 100644 --- a/blog/categories/organisation/atom.xml +++ b/blog/categories/organisation/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: Organisation | Home Assistant]]> - 2017-03-26T10:23:27+00:00 + 2017-03-26T10:51:06+00:00 https://home-assistant.io/ diff --git a/blog/categories/owntracks/atom.xml b/blog/categories/owntracks/atom.xml index c25aa13e60..2cfe9c72e4 100644 --- a/blog/categories/owntracks/atom.xml +++ b/blog/categories/owntracks/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: OwnTracks | Home Assistant]]> - 2017-03-26T10:23:27+00:00 + 2017-03-26T10:51:06+00:00 https://home-assistant.io/ diff --git a/blog/categories/presence-detection/atom.xml b/blog/categories/presence-detection/atom.xml index 4b4911edfa..e71aafe535 100644 --- a/blog/categories/presence-detection/atom.xml +++ b/blog/categories/presence-detection/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: Presence-Detection | Home Assistant]]> - 2017-03-26T10:23:27+00:00 + 2017-03-26T10:51:06+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 5ba269193e..4e28e2a185 100644 --- a/blog/categories/public-service-announcement/atom.xml +++ b/blog/categories/public-service-announcement/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: Public-Service-Announcement | Home Assistant]]> - 2017-03-26T10:23:27+00:00 + 2017-03-26T10:51:06+00:00 https://home-assistant.io/ diff --git a/blog/categories/release-notes/atom.xml b/blog/categories/release-notes/atom.xml index 056eef5e9e..02dbc13d7a 100644 --- a/blog/categories/release-notes/atom.xml +++ b/blog/categories/release-notes/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: Release-Notes | Home Assistant]]> - 2017-03-26T10:23:27+00:00 + 2017-03-26T10:51:06+00:00 https://home-assistant.io/ diff --git a/blog/categories/survey/atom.xml b/blog/categories/survey/atom.xml index c44244e311..efe353cf13 100644 --- a/blog/categories/survey/atom.xml +++ b/blog/categories/survey/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: Survey | Home Assistant]]> - 2017-03-26T10:23:27+00:00 + 2017-03-26T10:51:06+00:00 https://home-assistant.io/ diff --git a/blog/categories/talks/atom.xml b/blog/categories/talks/atom.xml index 1843a5b489..34d0f7fb69 100644 --- a/blog/categories/talks/atom.xml +++ b/blog/categories/talks/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: Talks | Home Assistant]]> - 2017-03-26T10:23:27+00:00 + 2017-03-26T10:51:06+00:00 https://home-assistant.io/ diff --git a/blog/categories/technology/atom.xml b/blog/categories/technology/atom.xml index 5acfdfd5d6..50b5a5ffeb 100644 --- a/blog/categories/technology/atom.xml +++ b/blog/categories/technology/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: Technology | Home Assistant]]> - 2017-03-26T10:23:27+00:00 + 2017-03-26T10:51:06+00:00 https://home-assistant.io/ diff --git a/blog/categories/user-stories/atom.xml b/blog/categories/user-stories/atom.xml index c47b4ceb90..422ce6b961 100644 --- a/blog/categories/user-stories/atom.xml +++ b/blog/categories/user-stories/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: User-Stories | Home Assistant]]> - 2017-03-26T10:23:27+00:00 + 2017-03-26T10:51:06+00:00 https://home-assistant.io/ diff --git a/blog/categories/video/atom.xml b/blog/categories/video/atom.xml index e31c76b714..1b4d2f79a0 100644 --- a/blog/categories/video/atom.xml +++ b/blog/categories/video/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: Video | Home Assistant]]> - 2017-03-26T10:23:27+00:00 + 2017-03-26T10:51:06+00:00 https://home-assistant.io/ diff --git a/blog/categories/website/atom.xml b/blog/categories/website/atom.xml index b3d63e79a9..bf28bb5994 100644 --- a/blog/categories/website/atom.xml +++ b/blog/categories/website/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: Website | Home Assistant]]> - 2017-03-26T10:23:27+00:00 + 2017-03-26T10:51:06+00:00 https://home-assistant.io/ diff --git a/components/android_ip_webcam/index.html b/components/android_ip_webcam/index.html index c04c3a2c1a..2c71388e74 100644 --- a/components/android_ip_webcam/index.html +++ b/components/android_ip_webcam/index.html @@ -66,9 +66,9 @@
-

The Android IP webcam component turns an Android phone into a network camera with multiple viewing options.

+

The android_ip_webcam component turns an Android phone into a network camera with multiple viewing options.

It’s setup as a mjpeg camera and all settings as switches inside of Home Assistant. You can also expose the sensors. If you have multiple phones, you can use all options inside a list.

-

To set it up, download the IP Webcam app and add the following information to your configuration.yaml file:

+

To set it up, download the IP Webcam app, and add the following information to your configuration.yaml file:

# Example configuration.yaml entry
 android_ip_webcam:
   - host: 192.168.1.10
@@ -107,25 +107,8 @@
   
  • overlay
    • 
   
  • torch
    • 
   
  • whitebalance_lock
    • 
-  
  • video_recording
-«««< HEAD
-=======
    • 
+  
  • video_recording
    • 
 
-
    
-  
    
-    
    
-      
    
-        
    
-          
    
-            
    
-              
    current
    
-            
    
-          
    
-        
    
-      
    
-    
    
-  
    
-