Merge branch 'master' into next

This commit is contained in:
Paulus Schoutsen 2016-05-21 09:52:05 -07:00
commit 0f14803a22
33 changed files with 294 additions and 123 deletions

View file

@ -49,7 +49,7 @@ Turns one or multiple lights off.
| Service data attribute | Optional | Description |
| ---------------------- | -------- | ----------- |
| `entity_id` | no | String or list of strings that point at `entity_id`s of lights. Else targets all.
| `transition` | no | Integer that represents the time the light should take to transition to the new state.
| `transition` | yes | Integer that represents the time the light should take to transition to the new state.
### {% linkable_title Service `light.toggle` %}
@ -60,4 +60,4 @@ Toggles the state of one or multiple lights using [groups]({{site_root}}/compone
| Service data attribute | Optional | Description |
| ---------------------- | -------- | ----------- |
| `entity_id` | no | String or list of strings that point at `entity_id`s of lights. Else targets all.
| `transition` | no | Integer that represents the time the light should take to transition to the new state.
| `transition` | yes | Integer that represents the time the light should take to transition to the new state.