Skip to content

Commit b886491

Browse files
committed
Merge branch 'current' into next
2 parents 0afea9e + d42ebe6 commit b886491

21 files changed

+113
-58
lines changed

_config.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -140,11 +140,11 @@ social:
140140
# Home Assistant release details
141141
current_major_version: 0
142142
current_minor_version: 56
143-
current_patch_version: 0
144-
date_released: 2017-10-21
143+
current_patch_version: 1
144+
date_released: 2017-10-22
145145

146146
# Either # or the anchor link to latest release notes in the blog post.
147147
# Must be prefixed with a # and have double quotes around it.
148148
# Major release:
149-
#patch_version_notes: "#release-0551---october-15"
149+
patch_version_notes: "#release-0561---october-22"
150150
# Minor release (Example #release-0431---april-25):

source/_components/camera.skybell.markdown

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ ha_release: 0.56
1313
ha_iot_class: "Cloud Polling"
1414
---
1515

16-
To get your [Skybell.com](https://skybell.com/) cameras working within Home Assistant, please follow the instructions for the general [Skybell component](/components/skybell).
16+
To get your [Skybell.com](https://www.skybell.com/) cameras working within Home Assistant, please follow the instructions for the general [Skybell component](/components/skybell).
1717

1818
Once you have enabled the [Skybell component](/components/skybell), add the following to your `configuration.yaml` file:
1919

source/_components/google_assistant.markdown

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,9 @@ google_assistant:
3030
- group
3131
```
3232
33-
*Note:* It's very important that you use very long strings for `client_id` and `access_token`. Those are essentially the credentials to your Home Assistant instance.
33+
*Note:* It's very important that you use very long strings for `client_id` and `access_token`. Those are essentially the credentials to your Home Assistant instance. You can generate them with the following command:
34+
35+
`cat /dev/urandom|fold -w 120|head -n 1|base64 -w 0|tr -dc '0-9A-Za-z'|cut -c -80`
3436

3537
*Configuration Variables:*
3638
* *expose_by_default* (Optional): Expose devices in all supported domains by default.

source/_components/namecheapdns.markdown

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ To use the component in your installation, add the following to your `configurat
2424
```yaml
2525
# Example configuration.yaml entry
2626
namecheapdns:
27-
host: @
27+
host: '@'
2828
domain: example.com
2929
access_token: 0123_Dynamic_DNS_Password
3030
```

source/_components/nest.markdown

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@ The Nest component is the main component to integrate all [Nest](https://nest.co
3434
9. Once the new product page opens the "Product ID" and "Product Secret" are located on the right side. These will be used as `client_id` and `client_secret` below.
3535
10. Once Home Assistant is started, a configurator will pop up asking you to log into your Nest account and copy a PIN code into Home Assistant.
3636

37+
Connecting to the Nest Developer API requires outbound port 8553 on your firewall. The configuration will fail if this is not accessible.
38+
3739
### {% linkable_title Configuration %}
3840

3941
```yaml

source/_components/notify.clicksend_tts.markdown

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@ Configuration variables:
3434
* **name** (Optional): Setting the optional parameter name allows multiple notifiers to be created. The default value is `ClickSend`. The notifier will bind to the service notify.NOTIFIER_NAME.
3535
* **username** (Required): Your username.
3636
* **api_key** (Required): Your API Key.
37-
* **recipient** (Required): Your phone no. This is where you want to send your notification SMS messages. eg: `09171234567`
38-
* **language** (Optional): The language you want to use to convert the message to audio. Accepted values are found in the [ClickSend Documentation](http://docs.clicksend.apiary.io/#reference/voice/voice-languages). Default value is 'en-us'.
39-
* **voice** (Optional): The voice that needs to be used to play the message to the recipient. Allowed values are 'female' or 'male'. Default value is 'female'.
37+
* **recipient** (Required): Your phone number. This is where you want to send your notification SMS messages (e.g., `09171234567`)
38+
* **language** (Optional): The language you want to use to convert the message to audio. Accepted values are found in the [ClickSend Documentation](http://docs.clicksend.apiary.io/#reference/voice/voice-languages). Default value is `en-us`.
39+
* **voice** (Optional): The voice that needs to be used to play the message to the recipient. Allowed values are `female` or `male`. Default value is `female`.
4040

4141
To use notifications, please see the [getting started with automation page](https://home-assistant.io/getting-started/automation/).
4242

source/_components/sensor.travisci.markdown

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ To enable this platform, please add the following to your `configuration.yaml` f
2121
# Example configuration.yaml entry
2222
sensor:
2323
- platform: travisci
24-
github_token: 123456789
24+
api_key: 123456789
2525
```
2626
2727
Configuration variables:

source/_components/toon.markdown

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ ha_iot_class: "Cloud Polling"
1515

1616
The `toon` component platform can be used to control your Toon thermostat. This component adds a climate device for your Toon thermostat and sensors for power and gas consumption. The component also auto-detects any smart plugs, solar panels and smoke detectors connected to Toon and adds sensors and switches for them.
1717

18-
For the `toon` component to work, you'll need an active Toon subscription with Eneco. The component uses your Mijn Eneco credentials to control your thermostat through the [toonopafstand](https://toonopafstand.eneco.nl) website.
18+
For the `toon` component to work, you'll need an active Toon subscription with Eneco. The component uses your Mijn Eneco credentials to control your thermostat through the [toonopafstand](https://toonopafstand.eneco.nl) domain.
1919

2020
To use your Toon thermostat in your installation, add the following to your `configuration.yaml` file:
2121

source/_components/xiaomi_aqara.markdown

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ To enable {{ page.title }} in your installation, add the following to your `conf
5858
```yaml
5959
# You can leave mac empty if you only have one gateway.
6060
xiaomi_aqara:
61+
discovery_retry: 5
6162
gateways:
6263
- mac:
6364
key: xxxxxxxxxxxxxxxx

source/_cookbook/dim_and_brighten_lights.markdown

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ automation:
4040
entity_id: zwave.YOUR_REMOTE
4141
action:
4242
- service: script.turn_off
43-
data_template:
43+
data:
4444
entity_id: script.light_bright
4545
- service: script.turn_off
4646
data:
@@ -69,7 +69,7 @@ automation:
6969
entity_id: zwave.YOUR_REMOTE
7070
action:
7171
- service: script.turn_off
72-
data_template:
72+
data:
7373
entity_id: script.light_dim
7474
- service: script.turn_off
7575
data:

source/_docs/autostart/synology.markdown

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,13 @@ exec /bin/sh /volume1/homeassistant/hass-daemon start
3838
Register the autostart
3939

4040
```bash
41-
$ ln -s homeassistant-conf /etc/init/homeassistant-conf
41+
$ ln -s homeassistant.conf /etc/init/homeassistant.conf
4242
```
4343

4444
Make the relevant files executable:
4545

4646
```bash
47-
$ chmod -r 777 /etc/init/homeassistant-conf
47+
$ chmod -r 777 /etc/init/homeassistant.conf
4848
```
4949

5050
That's it - reboot your NAS and Home Assistant should automatically start

source/_docs/backend/database.markdown

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ footer: true
1010
redirect_from: /details/database/
1111
---
1212

13-
The default database that is used for Home Assistant is [SQLite](https://www.sqlite.org/) and is stored in your [configuration directory](/getting-started/configuration/), eg. `<path to config dir>/.homeassistant/home-assistant_v2.db`. You will need an installation of `sqlite3`, the command-line for SQLite database, or [DB Browser for SQLite](http://sqlitebrowser.org/) which provide an editor for executing SQL commands.
14-
First load your database with `sqlite3`.
13+
The default database that is used for Home Assistant is [SQLite](https://www.sqlite.org/) and is stored in your [configuration directory](/getting-started/configuration/) (e.g., `<path to config dir>/.homeassistant/home-assistant_v2.db`). You will need an installation of `sqlite3`, the command-line for SQLite database, or [DB Browser for SQLite](http://sqlitebrowser.org/), which provides an editor for executing SQL commands.
14+
First load your database with `sqlite3`:
1515

1616
```bash
1717
$ sqlite3 home-assistant_v2.db
@@ -20,7 +20,7 @@ Enter ".help" for usage hints.
2020
sqlite>
2121
```
2222

23-
It helps to set some options to make the output better readable.
23+
It helps to set some options to make the output more readable:
2424

2525
```bash
2626
sqlite> .header on
@@ -38,7 +38,7 @@ seq name file
3838

3939
### {% linkable_title Schema %}
4040

41-
Get all available tables from your current Home Assistant database.
41+
Get all available tables from your current Home Assistant database:
4242

4343
```bash
4444
sqlite> SELECT sql FROM sqlite_master;
@@ -81,15 +81,15 @@ CREATE INDEX states__state_changes ON states (last_changed, last_updated, entity
8181
CREATE TABLE sqlite_stat1(tbl,idx,stat)
8282
```
8383

84-
To only show the details about the `states` table as we are using that one in the next examples.
84+
To only show the details about the `states` table (since we are using that one in the next examples):
8585

8686
```bash
8787
sqlite> SELECT sql FROM sqlite_master WHERE type = 'table' AND tbl_name = 'states';
8888
```
8989

9090
### {% linkable_title Query %}
9191

92-
The identification of the available columns in the table is done and we are now able to create a query. Let's list of your Top 10 entities.
92+
The identification of the available columns in the table is done and we are now able to create a query. Let's list your Top 10 entities:
9393

9494
```bash
9595
sqlite> .width 30, 10,
@@ -110,7 +110,7 @@ group.all_switches 8018
110110

111111
### {% linkable_title Delete %}
112112

113-
If you don't want to keep certain entities, you can delete them permanently.
113+
If you don't want to keep certain entities, you can delete them permanently:
114114

115115
```bash
116116
sqlite> DELETE FROM states WHERE entity_id="sensor.cpu";
@@ -123,4 +123,3 @@ sqlite> VACUUM;
123123
```
124124

125125
For a more interactive way to work with the database or the create statistics, checkout our [Jupyter notebooks](http://nbviewer.jupyter.org/github/home-assistant/home-assistant-notebooks/tree/master/).
126-

source/_docs/ecosystem/ios/notifications/content_extensions.markdown

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ You can also pass the following properties under `action_data` to modify the map
5757
The notification thumbnail will be a still image from the camera.
5858
The notification content is a real time MJPEG stream of a camera (assuming the camera supports it).
5959

60-
You can use the attachment parameters `content-type` and `hide-thumbnail` with camera.
60+
You can use the attachment parameters `content-type` and `hide-thumbnail` with camera to control the thumbnail.
6161

6262
You can view an example [here](https://www.youtube.com/watch?v=LmYwpxPKW0g).
6363

@@ -66,6 +66,8 @@ service: notify.ios_<your_device_id_here>
6666
data:
6767
message: Motion detected in the Living Room
6868
data:
69+
attachment:
70+
content-type: jpeg
6971
push:
7072
category: camera
7173
entity_id: camera.demo_camera

source/_docs/installation/archlinux.markdown

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
---
22
layout: page
3-
title: "Installation on ArchLinux"
4-
description: "Installation of Home Assistant on your ArchLinux computer."
3+
title: "Installation on Arch Linux"
4+
description: "Installation of Home Assistant on your Arch Linux computer."
55
date: 2017-03-01 07:00
66
sidebar: true
77
comments: false
88
sharing: true
99
footer: true
1010
---
1111

12-
[ArchLinux](https://www.archlinux.org/) is a lightweight and flexible Linux distribution. There are official packages optimized for the i686 and x86-64 architectures available.
12+
[Arch Linux](https://www.archlinux.org/) is a lightweight and flexible Linux distribution. There are official packages optimized for the i686 and x86-64 architectures available.
1313

1414
Install the needed Python packages.
1515

source/_docs/scripts.markdown

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,28 @@ wait_template: {% raw %}"{{ states.climate.kitchen.attributes.valve < 10 }}"{% e
9090
timeout: 00:01:00
9191
```
9292

93+
When using `wait_template` within an automation `trigger.entity_id` is supported for `state`, `numeric_state` and `template` triggers, see also [Available-Trigger-Data](/docs/automation/templating/#available-trigger-data).
94+
95+
{% raw %}
96+
```yaml
97+
wait_template: "{{ is_state(trigger.entity_id, 'on') }}"
98+
```
99+
{% endraw %}
100+
101+
It is also possible to use dummy variables, e.g., in scripts, when using `wait_template`.
102+
103+
{% raw %}
104+
```yaml
105+
# Service call, e.g. from an automation.
106+
service: script.do_something
107+
data_template:
108+
dummy: "{{ input_boolean.switch }}"
109+
110+
# Inside the script
111+
wait_template: "{{ is_state(dummy, 'off') }}"
112+
```
113+
{% endraw %}
114+
93115
### {% linkable_title Fire an Event %}
94116

95117
This action allows you to fire an event. Events can be used for many things. It could trigger an automation or indicate to another component that something is happening. For instance, in the below example it is used to create an entry in the logbook.

source/_docs/z-wave.markdown

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,3 +32,8 @@ There are 2 basic things you'll need to use Z-Wave, a Z-Wave [controller](/docs/
3232

3333
There are 12 different regions for Z-Wave devices, which relates to the frequency the devices use. There is overlap between the regions, but you should ensure that you buy devices for your region. Wikipedia has a list of the [frequencies used](https://en.wikipedia.org/wiki/Z-Wave#Radio_frequencies).
3434

35+
## {% linkable_title Getting started %}
36+
37+
You'll now need to connect your [controller](/docs/z-wave/controllers/), [configure](/docs/z-wave/installation) the Z-Wave component, then [add some devices](/docs/z-wave/adding) using the [control panel](/docs/z-wave/control-panel). [This explains](/docs/z-wave/devices/) about devices, and how [entities are named](/docs/z-wave/entities).
38+
39+
You can get more information on the [available services](/docs/z-wave/services/) and [events](/docs/z-wave/events/), what the [query stages](/docs/z-wave/query-stage) of battery powered devices are, as well as details on configuring [specific devices](/docs/z-wave/device-specific/).

source/_docs/z-wave/control-panel.markdown

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,17 @@ footer: true
1010
redirect_from: /getting-started/z-wave-panel/
1111
---
1212

13+
<p class='note'>
14+
If you don't see the **Configuration** menu on the menubar, where you'll find the Z-Wave menu, [see here](/components/config/).
15+
</p>
16+
1317
## {% linkable_title Z-Wave Network Management %}
1418

1519
Here is where you [include and exclude](/docs/z-wave/adding/) Z-Wave devices from your network.
1620

1721
* **Add Node** puts the controller into inclusion mode, so you can include (add) a device to your Z-Wave network
1822
* **Add Node Secure** puts the controller into secure inclusion mode (this requires that you've created a [security key](/docs/z-wave/adding#sdding-security-devices))
19-
* **Remove Node** puts the controller into exclusion mdoe, so you can exclude (remove) a device. Note that you can exclude a non-secure device that's been added to another network
23+
* **Remove Node** puts the controller into exclusion mode, so you can exclude (remove) a device. Note that you can exclude a non-secure device that's been added to another network
2024
* **Cancel Command** cancels any of the above
2125

2226
* **Heal Network** tells the controller to "heal" the Z-Wave network. Basically asks the nodes to tell the controller all of their neighbors so the controller can refigure out optimal routing.

0 commit comments

Comments
 (0)