Merge branch 'current' into next

This commit is contained in:
Paulus Schoutsen 2017-05-24 16:31:52 -07:00
commit be219c8d59
24 changed files with 307 additions and 86 deletions

View file

@ -21,7 +21,7 @@ automation:
platform: sun
event: sunset
action:
service: homeassistant.turn_on
service: light.turn_on
entity_id:
- light.kitchen
- light.living_room

View file

@ -21,7 +21,7 @@ Choose a meaningful name for your automation rules.
<img src='{{site_root}}/images/docs/automation-editor/new-automation.png' />
</p>
If the value of the is greater than 10 then the automation rule should apply.
If the value of the sensor is greater than 10 then the automation rule should apply.
<p class='img'>
<img src='{{site_root}}/images/docs/automation-editor/new-trigger.png' />