Merge branch 'current' into next

source/_components/alarm_control_panel.manual_mqtt.markdown

@@ -9,10 +9,10 @@ sharing: true
 footer: true
 logo: home-assistant.png
 ha_category: Alarm
-ha_release: 0.49
+ha_release: 0.50
 ---
 
-This component extends the [manual alarm](/components/alarm_control_panel.manual/) by adding support for MQTT control of the alarm by a remote device.  It can be used to create external keypads which simply change the state of the manual alarm in Home Assistant.
+This platform extends the [manual alarm](/components/alarm_control_panel.manual/) by adding support for MQTT control of the alarm by a remote device. It can be used to create external keypads which simply change the state of the manual alarm in Home Assistant.
 
 It's essentially the opposite of the [MQTT Alarm Panel](/components/alarm_control_panel.mqtt/) which allows Home Assistant to observe an existing, fully-featured alarm where all of the alarm logic is embedded in that physical device.
 
@@ -63,7 +63,7 @@ Refer to the [Manual Alarm Control page](/components/alarm_control_panel.manual/
 
 ## {% linkable_title MQTT Control %}
 
-The state of this alarm can be controlled using [MQTT](/components/mqtt/).  Ensure you've configured that before adding this component.
+The state of this alarm can be controlled using [MQTT](/components/mqtt/). Ensure you've configured that before adding this component.
 
 To change the state of the alarm, publish one of the following messages to the `command_topic`:
 
@@ -71,7 +71,7 @@ To change the state of the alarm, publish one of the following messages to the `
  - `ARM_HOME`
  - `ARM_AWAY`
 
-To receive state updates from HA, subscribe to the `state_topic`.  HA will publish a new message whenever the state changes:
+To receive state updates from HA, subscribe to the `state_topic`. Home Assistant will publish a new message whenever the state changes:
 
  - `disarmed`
  - `armed_home`

source/_components/binary_sensor.pilight.markdown

@@ -1,7 +1,7 @@
 ---
 layout: page
 title: "Pilight Binary Sensor"
-description: "Instructions how to integrate pilight binary sensors within Home Assistant."
+description: "Instructions how to integrate Pilight binary sensors within Home Assistant."
 date: 2017-03-24 20:41
 sidebar: true
 comments: false
@@ -13,8 +13,9 @@ ha_release: 0.44
 ha_iot_class: "Local Polling"
 ---
 
-This component implement the [pilight hub](https://github.com/home-assistant/home-assistant.github.io/source/_components/pilight.markdown)  binary sensor functionality.
-Two type of pilight binary sensor configuration available. A normal sensor which send the on and off state cyclical and a trigger sensor which send only a trigger when an event happend (for example lots of cheap PIR motion detector) (see example configuration below).
+The `pilight` binary sensor platform implement the [pilight hub](/components/pilight/) binary sensor functionality. Two type of Pilight binary sensor configuration available. A normal sensor which send the on and off state cyclical and a trigger sensor which send only a trigger when an event happend (for example lots of cheap PIR motion detector).
+
+To enable a Pilight binary sensor in your installation, add the following to your `configuration.yaml` file:
 
 ```yaml
 # Example configuration.yml entry

source/_components/binary_sensor.velbus.markdown

@@ -10,7 +10,7 @@ footer: true
 logo: velbus.png
 ha_category: Binary Sensor
 ha_iot_class: "Local Push"
-ha_release: 0.49
+ha_release: "0.50"
 ---
 
 The `velbus` binary_sensor allows you to control [Velbus](http://www.velbus.eu) connected wall switches.

source/_components/binary_sensor.xiaomi.markdown

@@ -43,10 +43,13 @@ The requirement is that you have setup the [`xiaomi` component](/components/xiao
     entity_id: sensor.illumination_34ce00xxxx11
     below: 300
   action:
-    service: light.turn_on
-    entity_id: light.gateway_light_34ce00xxxx11
-    data:
-      brightness: 5
+    - service: light.turn_on
+      entity_id: light.gateway_light_34ce00xxxx11
+      data:
+        brightness: 5
+    - service: automation.turn_on
+      data:
+        entity_id: automation.MOTION_OFF
 - alias: If there no motion for 5 minutes turn off the gateway light
   trigger:
     platform: state
@@ -56,8 +59,11 @@ The requirement is that you have setup the [`xiaomi` component](/components/xiao
     for:
       minutes: 5
   action:
-    service: light.turn_off
-    entity_id: light.gateway_light_34ce00xxxx11
+    - service: light.turn_off
+      entity_id: light.gateway_light_34ce00xxxx11
+    - service: automation.turn_off
+      data:
+        entity_id: automation.Motion_off
 ```
   
 #### {% linkable_title Door and/or Window %}

source/_components/config.markdown

@@ -8,7 +8,7 @@ comments: false
 sharing: true
 footer: true
 logo: home-assistant.png
-ha_category: Other
+ha_category: Front end
 ha_release: 0.39
 ---
 

source/_components/conversation.markdown

@@ -12,7 +12,7 @@ ha_category: "Voice"
 ---
 
 
-The conversation component can process sentences into commands for Home Assistant. It currently has built in functionality to recognize `turn <Friendly Name> <on/off>`, but custom phrases can be added through configuration.
+The `conversation` component can process sentences into commands for Home Assistant. It currently has built in functionality to recognize `turn <Friendly Name> <on/off>`, but custom phrases can be added through configuration.
 
 
 To enable the conversation option in your installation, add the following to your `configuration.yaml` file:
@@ -23,6 +23,7 @@ conversation:
 ```
 
 To add custom phrases to be recognized:
+
 ```yaml
 # Example configuration.yaml entry with custom phrasesconversation
 conversation:
@@ -32,11 +33,17 @@ conversation:
             service: input_boolean.toggle
 ```
 
-The action keyword uses [script
-syntax](https://home-assistant.io/docs/scripts/).
-
+The action keyword uses [script syntax](https://home-assistant.io/docs/scripts/).
 
+To use the `conversation` component with the [`shopping list` component](/components/shopping_list/) add an intent.
 
+```yaml
+# Example configuration.yaml entry
+conversation:
+  intents:
+    ShoppingListAddItem:
+      - Add {item} to my shopping list
+```
 
 When this component is active and you are using a supported browser voice commands will be activated in the frontend. Browse to [the demo](/demo/) using Chrome or Chromium to see it in action.
 

source/_components/cover.lutron_caseta.markdown

@@ -10,6 +10,17 @@ footer: true
 logo: lutron.png
 ha_category: Cover
 ha_iot_class: "Local Polling"
+ha_release: 0.45
 ---
 
-To get your Lutron Caseta covers working with Home Assistant, follow the instructions for the general [Lutron Caseta component](/components/lutron_caseta/).
+To get your Lutron Caseta covers (Serena Shades) working with Home Assistant, first follow the instructions for the general [Lutron Caseta component](/components/lutron_caseta/).
+
+You also need to configure Lutron Caseta as a cover platform in your `configuration.yaml` file:
+
+```yaml
+# Example configuration.yaml entry
+cover:
+  - platform: lutron_caseta
+```
+
+Your Lutron Caseta shades will be pulled into Home Assistant with the names they were assigned in the Lutron Caseta app.

source/_components/discovery.markdown

@@ -33,6 +33,7 @@ Home Assistant can discover and automatically configure zeroconf/mDNS and uPnP d
  * Bose Soundtouch speakers
  * Axis Communications security devices
  * IKEA Trådfri (Tradfri)
+ * Harmony Hub
 
 It will be able to add Google Chromecasts and Belkin WeMo switches automatically, for Philips Hue it will require some configuration from the user.
 

source/_components/fan.velbus.markdown

@@ -10,7 +10,7 @@ footer: true
 logo: velbus.png
 ha_category: Fan
 ha_iot_class: "Local Push"
-ha_release: 0.49
+ha_release: "0.50"
 ---
 
 The `velbus` fan allows you to control [Velbus](http://www.velbus.eu) connected fans.

source/_components/frontend.markdown

@@ -36,3 +36,17 @@ The example above defined two themes named `happy` and `sad`. For each theme you
 There are 2 themes-related services:
  - `frontend.reload_themes` - reloads theme configuration from yaml.
  - `frontend.set_theme(name)` - sets backend-preferred theme name. 
+
+Example in automation:
+```yaml
+automation:
+  - alias: 'Set theme at startup'
+    initial_state: 'on'
+    trigger:
+     - platform: homeassistant
+       event: start
+    action:
+      service: frontend.set_theme
+      data:
+        name: pink
+```

source/_components/intent_script.markdown

@@ -9,27 +9,28 @@ sharing: true
 footer: true
 logo: home-assistant.png
 ha_category: Intent
-ha_release: 0.50
+ha_release: "0.50"
 ---
 
 The intent_script component allows users to configure actions and responses to intents. Intents can be fired by any component that supports it. Examples are Alexa (Amazon Echo), API.ai (Google Assistant) and Snips.
 
 ```yaml
-{% raw %}# Example configuration.yaml entry
+# Example configuration.yaml entry
 intent_script:
   GetTemperature:  # Intent type
     speech:
-      text: We have {{ states.sensor.temperature }} degrees
+      text: We have {% raw %}{{ states.sensor.temperature }}{% endraw %} degrees
     action:
       service: notify.notify
       data_template:
         message: Hello from an intent!
-{% endraw %}
 ```
+Configuration variables:
 
 Inside an intent we can define these variables:
-- **speech** (*Optional*): Text or template to return
-- **action** (*Optional*): [Script syntax]
-- **async_action** (*Optional*): Set to True to have Home Assistant not wait for the script to finish before returning the intent response.
 
-[Script syntax]: /docs/scripts/
+- **intent** (*Required*): Name of the intent. Multiple entries are possible.
+  - **speech** (*Optional*): Text or template to return.
+  - **action** (*Optional*): [Script syntax](/docs/scripts/).
+  - **async_action** (*Optional*): Set to True to have Home Assistant not wait for the script to finish before returning the intent response.
+

source/_components/light.tplink.markdown

@@ -8,7 +8,7 @@ comments: false
 sharing: true
 footer: true
 logo: tp-link.png
-ha_category: light
+ha_category: Light
 ha_iot_class: "Local Polling"
 ha_release: "0.50"
 ---

source/_components/light.velbus.markdown

@@ -10,7 +10,7 @@ footer: true
 logo: velbus.png
 ha_category: Light
 ha_iot_class: "Local Push"
-ha_release: 0.49
+ha_release: "0.50"
 ---
 
 The `velbus` light allows you to control [Velbus](http://www.velbus.eu) lights.

source/_components/media_extractor.markdown

@@ -54,7 +54,7 @@ More info about queries [here](https://github.com/rg3/youtube-dl#format-selectio
 
 ### {% linkable_title Use the service %}
 
-Go to the "Developer Tools", then to "Call Service", and choose `media_extractor/play_media` from the list of available services. Fill the "Service Data" field as shown in the example below and hit "CALL SERVICE".
+Go to the "Developer Tools," then to "Call Service," and choose `media_extractor/play_media` from the list of available services. Fill the "Service Data" field as shown in the example below and hit "CALL SERVICE."
 
 This will download the file from the given URL.
 

source/_components/sensor.uk_transport.markdown

@@ -56,19 +56,19 @@ A large amount of information about upcoming departures is available within the
   sensors:
     next_train_status:
       friendly_name: 'Next train status'
-      value_template: '{{states.sensor.next_train_to_wat.attributes.next_trains[0].status}}'
+      value_template: {% raw %}'{{states.sensor.next_train_to_wat.attributes.next_trains[0].status}}'{% endraw %}
     next_trains_origin:
       friendly_name: 'Next train origin'
-      value_template: '{{states.sensor.next_train_to_wat.attributes.next_trains[0].origin_name}}'
+      value_template: {% raw %}'{{states.sensor.next_train_to_wat.attributes.next_trains[0].origin_name}}'{% endraw %}
     next_trains_estimated:
       friendly_name: 'Next train estimated'
-      value_template: '{{states.sensor.next_train_to_wat.attributes.next_trains[0].estimated}}'
+      value_template: {% raw %}'{{states.sensor.next_train_to_wat.attributes.next_trains[0].estimated}}'{% endraw %}
     next_trains_scheduled:
       friendly_name: 'Next train scheduled'
-      value_template: '{{states.sensor.next_train_to_wat.attributes.next_trains[0].scheduled}}'
+      value_template: {% raw %}'{{states.sensor.next_train_to_wat.attributes.next_trains[0].scheduled}}'{% endraw %}
     next_trains_platform:
       friendly_name: 'Next train platform'
-      value_template: '{{states.sensor.next_train_to_wat.attributes.next_trains[0].platform}}'
+      value_template: {% raw %}'{{states.sensor.next_train_to_wat.attributes.next_trains[0].platform}}'{% endraw %}
 
 ```
 
@@ -106,16 +106,16 @@ And the template sensor for viewing the next bus attributes.
   sensors:
     next_bus_route:
       friendly_name: 'Next bus route'
-      value_template: '{{states.sensor.next_bus_to_wantage.attributes.next_buses[0].route}}'
+      value_template: {% raw %}'{{states.sensor.next_bus_to_wantage.attributes.next_buses[0].route}}'{% endraw %}
     next_bus_direction:
       friendly_name: 'Next bus direction'
-      value_template: '{{states.sensor.next_bus_to_wantage.attributes.next_buses[0].direction}}'
+      value_template: {% raw %}'{{states.sensor.next_bus_to_wantage.attributes.next_buses[0].direction}}'{% endraw %}
     next_bus_scheduled:
       friendly_name: 'Next bus scheduled'
-      value_template: '{{states.sensor.next_bus_to_wantage.attributes.next_buses[0].scheduled}}'
+      value_template: {% raw %}'{{states.sensor.next_bus_to_wantage.attributes.next_buses[0].scheduled}}'{% endraw %}
     next_bus_estimated:
       friendly_name: 'Next bus estimated'
-      value_template: '{{states.sensor.next_bus_to_wantage.attributes.next_buses[0].estimated}}'
+      value_template: {% raw %}'{{states.sensor.next_bus_to_wantage.attributes.next_buses[0].estimated}}'{% endraw %}
 
 ```
 

source/_components/shopping_list.markdown

@@ -0,0 +1,20 @@
+---
+layout: page
+title: "Shopping List"
+description: "Instructions on how to integrate a Shopping list into Home Assistant using Intent."
+date: 2017-07-29 13:00
+sidebar: true
+comments: false
+sharing: true
+footer: true
+logo: home-assistant.png
+ha_category: Intent
+ha_release: "0.50"
+---
+
+The `shopping_list` component allows you to keep track of shopping list items. Includes the ability to add items via your voice using the sentence "Add eggs to my shopping list".
+
+```yaml
+# Example configuration.yaml entry
+shopping_list:
+```

source/_components/switch.velbus.markdown

@@ -10,7 +10,7 @@ footer: true
 logo: velbus.png
 ha_category: Switch
 ha_iot_class: "Local Push"
-ha_release: 0.49
+ha_release: "0.50"
 ---
 
 The `velbus` switch allows you to control [Velbus](http://www.velbus.eu) connected switches.

source/_components/velbus.markdown

@@ -10,7 +10,7 @@ footer: true
 logo: velbus.png
 ha_category: Hub
 ha_iot_class: "Local Push"
-ha_release: 0.49
+ha_release: "0.50"
 ---
 
 The `velbus` component supports the Velbus USB and Serial gateways.