Merge branch 'current' into next

source/_components/android_ip_webcam.markdown

@@ -12,26 +12,16 @@ ha_category: Hub
 ha_release: "0.40"
 ---
 
-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][app] and add the following information to your `configuration.yaml` file:
+To set it up, download [the IP Webcam app][app], and add the following information to your `configuration.yaml` file:
 
 ```yaml
 # Example configuration.yaml entry
 android_ip_webcam:
-<<<<<<< HEAD
-<<<<<<< HEAD
   - host: 192.168.1.10
-=======
-  # This should be the ip of your phone
-=======
-  # This should be the IP Address of the phone
->>>>>>> origin/current
-  - host: 192.168.1.10
-    name: Entrance
->>>>>>> current
 ```
 
 Configuration variables:
@@ -42,7 +32,6 @@ Configuration variables:
 - **username** (*Optional*): The username to access the phone.
 - **password** (*Optional*): The password to access the phone.
 - **scan_interval** (*Optional*): Default is 10 seconds. Defines the update interval of the phone.
-- **auto_discovery** (*Optional*): Default is True. Auto detect which sensors and settings are available for setup.
 - **sensors** array (*Optional*): Conditions to display sensor in the frontend. See list of supported sensors.
 - **switches** array (*Optional*): Conditions to display settings in the frontend. See list of supported settings.
 - **motion_sensor** (*Optional*): Activate motion sensor if auto_discovery is disabled.
@@ -70,8 +59,5 @@ Settings:
 - torch
 - whitebalance_lock
 - video_recording
-<<<<<<< HEAD
-=======
 
 [app]: https://play.google.com/store/apps/details?id=com.pas.webcam
->>>>>>> current

source/_components/binary_sensor.workday.markdown

@@ -45,7 +45,7 @@ automation:
   condition:
     condition: state
     entity_id: 'binary_sensor.workday_sensor'
-    state: 'off'
+    state: 'on'
   action:
     service: switch.turn_on
     entity_id: switch.heater

source/_components/light.lifx.markdown

@@ -15,6 +15,8 @@ ha_release: 0.12
 
 The `lifx` platform allows you to integrate your [LIFX](http://www.lifx.com) into Home Assistant.
 
+_Please note, LIFX is currently not supported on Windows._
+
 ```yaml
 # Example configuration.yaml entry
 light:

source/_components/light.mqtt_json.markdown

@@ -52,8 +52,7 @@ Configuration variables:
 
 - **command_topic** (*Required*): The MQTT topic to publish commands to change the light's state.
 - **brightness** (*Optional*): Flag that defines if the light supports brightness. Default is false.
-- **color_temperature** (*Optional*): Flag that defines if the light supports color temperature. Default is false.
-- **effect** (*Optional*): Flag that defines if the light supports effects. Default is false.
+- **color_temp** (*Optional*): Flag that defines if the light supports color temperature. Default is false.
 - **effect** (*Optional*): Flag that defines if the light supports effects. Default is false.
 - **effect_list** (*Optional*): The list of effects the light supports.
 - **flash_time_long** (*Optional*): The duration, in seconds, of a "long" flash. Default is 10.

source/_components/logbook.markdown

@@ -88,8 +88,8 @@ script:
   add_logbook_entry:
     alias: Add Logbook
     sequence:
-      - event: LOGBOOK_ENTRY
-        event_data:
+      - service: logbook.log
+        data_template:
           name: Kitchen
           message: is being used
           # Optional

source/_components/notify.matrix.markdown

@@ -20,7 +20,8 @@ To enable Matrix notifications in your installation, add the following to your `
 ```yaml
 # Example configuration.yaml entry
 notify:
-  - platform: matrix
+  - name: NOTIFIER_NAME
+    platform: matrix
     homeserver: HOMESERVER
     username: USERNAME
     password: PASSWORD

source/_components/sensor.efergy.markdown

@@ -38,6 +38,7 @@ sensor:
         currency: $
       - type: amount
         period: day
+      - type: current_values
 ```
 
 Configuration variables:
@@ -51,6 +52,7 @@ negative number of minutes your timezone is ahead/behind UTC time.
       - **budget**: Monthly budget.
       - **cost**: The cost for energy consumption (with the tariff that has been set in Efergy) over a given period.
       - **amount**: The amount of energy consumed over a given period.
+      - **current_values**: This returns the current energy usage of each device on your account, as efergy_\<sid of device\>.  If you only have one device in your account, this is effectively the same as instant_readings.
   - **period** (*Optional*): Some variables take a period argument. Valid options are "day", "week", "month", and "year".
   - **currency** (*Optional*): This is used to display the cost/period as the unit when monitoring the cost. It should correspond to the actual currency used in your dashboard.
 

source/_components/zeroconf.markdown

@@ -21,14 +21,24 @@ To integrate this into Home Assistant, add the following section to your `config
 zeroconf:
 ```
 
-The registration will include metadata about the Home Assistant instance, including a base URL that can be used to access Home Assistant, the currently running Home Assistant version, and whether an API password is needed to access the instance.
+The registration will include metadata about the Home Assistant instance, including a base URL that can be used to access Home Assistant, the currently running Home Assistant version, and whether an API password is needed to access the instance. The examples below show two ways to retrieve the details for testing. 
 
 ```bash
 $ avahi-browse -alr
 + eth0 IPv4 Home                              _home-assistant._tcp local
 = eth0 IPv4 Home                              _home-assistant._tcp local
    hostname = [Home._home-assistant._tcp.local]
-   address = [192.168.0.5]
+   address = [192.168.0.70]
    port = [8123]
-   txt = ["version=0.27.0.dev0" "base_url=http://192.168.0.5:8123" "requires_api_password=true"]
+   txt = ["base_url=http://192.168.0.70:8123" "requires_api_password=true" "version=0.41.0"]
+```
+
+```bash
+$ avahi-discover
+Browsing domain 'local' on -1.-1 ...
+Browsing for services of type '_home-assistant._tcp' in domain 'local' on 4.0 ...
+Found service 'Home' of type '_home-assistant._tcp' in domain 'local' on 4.0.
+Service data for service 'Home' of type '_home-assistant._tcp' in domain 'local' on 4.0:
+	Host Home._home-assistant._tcp.local (192.168.0.70), port 8123, TXT data: 
+['requires_api_password=true', 'base_url=http://192.168.0.70:8123', 'version=0.41.0']
 ```