jeena/home-assistant.github.io
1
0
Fork 0
Code Issues Pull requests Projects Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/master' into next

Browse source 
Conflicts:
	source/getting-started/automation.markdown
This commit is contained in:
Paulus Schoutsen 2016-05-01 23:34:04 -07:00
commit de586c5433
120 changed files with 305 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

4
source/getting-started/autostart-systemd.markdown
View file

@ -35,10 +35,10 @@ WantedBy=multi-user.target
EOF'
```
There is also another [sample service file](https://raw.githubusercontent.com/balloob/home-assistant/master/script/home-assistant%40.service) available. To use this one, just download it.
There is also another [sample service file](https://raw.githubusercontent.com/home-assistant/home-assistant/master/script/home-assistant%40.service) available. To use this one, just download it.
```bash
$ sudo wget https://raw.githubusercontent.com/balloob/home-assistant/master/script/home-assistant%40.service -O /lib/systemd/system/home-assistant@[your user].service
$ sudo wget https://raw.githubusercontent.com/home-assistant/home-assistant/master/script/home-assistant%40.service -O /lib/systemd/system/home-assistant@[your user].service
```
You need to reload `systemd` to make the daemon aware of the new configuration. Enable and launch Home Assistant after that.

2
source/getting-started/autostart-upstart.markdown
View file

@ -17,7 +17,7 @@ $ ps -p 1 -o comm=
If the preceding command returns the string `init`, you are likely using Upstart.
Upstart will launch init scripts that are located in the directory `/etc/init.d/`. A sample init script for systems using Upstart is <a href="https://raw.githubusercontent.com/balloob/home-assistant/dev/script/hass-daemon">maintained by this project</a>.
Upstart will launch init scripts that are located in the directory `/etc/init.d/`. A sample init script for systems using Upstart is <a href="https://raw.githubusercontent.com/home-assistant/home-assistant/dev/script/hass-daemon">maintained by this project</a>.
To install this script, download it, tweak it to you liking, and install it by following the directions in the header. This script will setup Home Assistant to run when the system boots. To start/stop Home Assistant manually, issue the following commands:

5
source/getting-started/customizing-devices.markdown
View file

@ -19,6 +19,9 @@ You may have to create the `www` directory yourself as it is not made automatica
You can also use `icon` and refer to any icon from [MaterialDesignIcons.com](http://MaterialDesignIcons.com).
For switches with an assumed state two buttons are shown (turn off, turn on) instead of a switch. By setting `assumed_state` to `false` you will get the default switch icon.
```yaml
# Example configuration.yaml entry
homeassistant:
@ -37,6 +40,8 @@ homeassistant:
switch.wemo_switch_2:
friendly_name: Kitchen kettle
icon: mdi:kettle
switch.rfxtrx_switch:
assumed_state: false
```
### [Next step: Setting up presence detection &raquo;](/getting-started/presence-detection/)

2
source/getting-started/installation-docker.markdown
View file

@ -28,7 +28,7 @@ If you run into any issues, please see [the troubleshooting page](/getting-start
In addition to this site, check out these sources for additional help:
- [Forum](https://community.home-assistant.io) for Home Assistant discussions and questions.
- [Gitter Chat Room](https://gitter.im/balloob/home-assistant) for real-time chat about Home Assistant.
- [Gitter Chat Room](https://gitter.im/home-assistant/home-assistant) for real-time chat about Home Assistant.
- [GitHub Page](https://github.com/home-assistant/home-assistant/issues) for issue reporting.
### [Next step: Configuring Home Assistant &raquo;](/getting-started/configuration/)

2
source/getting-started/installation-raspberry-pi.markdown
View file

@ -38,7 +38,7 @@ If you run into any issues, please see [the troubleshooting page](/getting-start
In addition to this site, check out these sources for additional help:
- [Forum](https://community.home-assistant.io) for Home Assistant discussions and questions.
- [Gitter Chat Room](https://gitter.im/balloob/home-assistant) for real-time chat about Home Assistant.
- [Gitter Chat Room](https://gitter.im/home-assistant/home-assistant) for real-time chat about Home Assistant.
- [GitHub Page](https://github.com/home-assistant/home-assistant/issues) for issue reporting.
### {% linkable_title What's next %}