Merge branch 'master' into next

This commit is contained in:
Paulus Schoutsen 2016-01-12 23:15:23 -08:00
commit 40d33437d7
45 changed files with 68 additions and 21 deletions

View file

@ -138,6 +138,7 @@ We went over the basics of creating a home automation rule. From here no longer
- Learn about [scripts](/components/script/) to help you trigger multiple actions and delays
- Learn about [scenes](/components/scene/) to help you set many entities at once to your liking
- Setup a [notification platform](/components/#notifications) to sent yourself messages
- For more advanced automation using Python, write your own [custom component](/developers/creating_components/).
<p class='note warning'>
Whenever you write the value <code>on</code> or <code>off</code>, surround it with quotes to avoid

View file

@ -57,8 +57,8 @@ Home Assistant requires the Raspberry Pi to run [Raspbian Jessie](https://www.ra
Execute the following code in a console:
```bash
$ pip3 install homeassistant
$ hass --open-ui
$ sudo pip3 install homeassistant
$ hass
```
Running these commands will: