Merge branch 'current' into next

_config.yml

@@ -140,11 +140,11 @@ social:
 # Home Assistant release details
 current_major_version: 0
 current_minor_version: 56
-current_patch_version: 0
-date_released: 2017-10-21
+current_patch_version: 1
+date_released: 2017-10-22
 
 # Either # or the anchor link to latest release notes in the blog post.
 # Must be prefixed with a # and have double quotes around it.
 # Major release:
-#patch_version_notes: "#release-0551---october-15"
+patch_version_notes: "#release-0561---october-22"
 # Minor release (Example #release-0431---april-25):

source/_components/camera.skybell.markdown

@@ -13,7 +13,7 @@ ha_release: 0.56
 ha_iot_class: "Cloud Polling"
 ---
 
-To get your [Skybell.com](https://skybell.com/) cameras working within Home Assistant, please follow the instructions for the general [Skybell component](/components/skybell).
+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).
 
 Once you have enabled the [Skybell component](/components/skybell), add the following to your `configuration.yaml` file:
 

source/_components/google_assistant.markdown

@@ -30,7 +30,9 @@ google_assistant:
     - group
 ```
 
-*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.
+*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:
+
+`cat /dev/urandom|fold -w 120|head -n 1|base64 -w 0|tr -dc '0-9A-Za-z'|cut -c -80`
 
 *Configuration Variables:*
 * *expose_by_default* (Optional): Expose devices in all supported domains by default.

source/_components/namecheapdns.markdown

@@ -24,7 +24,7 @@ To use the component in your installation, add the following to your `configurat
 ```yaml
 # Example configuration.yaml entry
 namecheapdns:
-  host: @
+  host: '@'
   domain: example.com
   access_token: 0123_Dynamic_DNS_Password
 ```

source/_components/nest.markdown

@@ -34,6 +34,8 @@ The Nest component is the main component to integrate all [Nest](https://nest.co
 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.
 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.
 
+Connecting to the Nest Developer API requires outbound port 8553 on your firewall. The configuration will fail if this is not accessible.
+
 ### {% linkable_title Configuration %}
 
 ```yaml

source/_components/notify.clicksend_tts.markdown

@@ -34,9 +34,9 @@ Configuration variables:
 * **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.
 * **username** (Required): Your username.
 * **api_key** (Required): Your API Key.
-* **recipient** (Required): Your phone no. This is where you want to send your notification SMS messages. eg: `09171234567`
-* **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'.
-* **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'.
+* **recipient** (Required): Your phone number. This is where you want to send your notification SMS messages (e.g., `09171234567`)
+* **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`.
+* **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`.
 
 To use notifications, please see the [getting started with automation page](https://home-assistant.io/getting-started/automation/).
 

source/_components/sensor.travisci.markdown

@@ -21,7 +21,7 @@ To enable this platform, please add the following to your `configuration.yaml` f
 # Example configuration.yaml entry
 sensor:
   - platform: travisci
-    github_token: 123456789
+    api_key: 123456789
 ```
 
 Configuration variables:

source/_components/toon.markdown

@@ -15,7 +15,7 @@ ha_iot_class: "Cloud Polling"
 
 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.
 
-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.
+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.
 
 To use your Toon thermostat in your installation, add the following to your `configuration.yaml` file:
 

source/_components/xiaomi_aqara.markdown

@@ -58,6 +58,7 @@ To enable {{ page.title }} in your installation, add the following to your `conf
 ```yaml
 # You can leave mac empty if you only have one gateway.
 xiaomi_aqara:
+  discovery_retry: 5
   gateways:
     - mac:
       key: xxxxxxxxxxxxxxxx

source/_cookbook/dim_and_brighten_lights.markdown

@@ -40,7 +40,7 @@ automation:
           entity_id: zwave.YOUR_REMOTE
     action:
       - service: script.turn_off
-        data_template:
+        data:
           entity_id: script.light_bright
       - service: script.turn_off
         data:
@@ -69,7 +69,7 @@ automation:
           entity_id: zwave.YOUR_REMOTE
     action:
       - service: script.turn_off
-        data_template:
+        data:
           entity_id: script.light_dim
       - service: script.turn_off
         data:

source/_docs/autostart/synology.markdown

@@ -38,13 +38,13 @@ exec /bin/sh /volume1/homeassistant/hass-daemon start
 Register the autostart
 
 ```bash
-$ ln -s homeassistant-conf /etc/init/homeassistant-conf
+$ ln -s homeassistant.conf /etc/init/homeassistant.conf
 ```
 
 Make the relevant files executable:
 
 ```bash
-$ chmod -r 777 /etc/init/homeassistant-conf
+$ chmod -r 777 /etc/init/homeassistant.conf
 ```
 
 That's it - reboot your NAS and Home Assistant should automatically start

source/_docs/backend/database.markdown

@@ -10,8 +10,8 @@ footer: true
 redirect_from: /details/database/
 ---
 
-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.
-First load your database with `sqlite3`.
+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.
+First load your database with `sqlite3`:
 
 ```bash
 $ sqlite3 home-assistant_v2.db 
@@ -20,7 +20,7 @@ Enter ".help" for usage hints.
 sqlite> 
 ```
 
-It helps to set some options to make the output better readable.
+It helps to set some options to make the output more readable:
 
 ```bash
 sqlite> .header on
@@ -38,7 +38,7 @@ seq  name             file
 
 ### {% linkable_title Schema %}
 
-Get all available tables from your current Home Assistant database.
+Get all available tables from your current Home Assistant database:
 
 ```bash
 sqlite> SELECT sql FROM sqlite_master;
@@ -81,7 +81,7 @@ CREATE INDEX states__state_changes ON states (last_changed, last_updated, entity
 CREATE TABLE sqlite_stat1(tbl,idx,stat) 
 ```
 
-To only show the details about the `states` table as we are using that one in the next examples.
+To only show the details about the `states` table (since we are using that one in the next examples):
 
 ```bash
 sqlite> SELECT sql FROM sqlite_master WHERE type = 'table' AND tbl_name = 'states';
@@ -89,7 +89,7 @@ sqlite> SELECT sql FROM sqlite_master WHERE type = 'table' AND tbl_name = 'state
 
 ### {% linkable_title Query %}
 
-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.
+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:
 
 ```bash
 sqlite> .width 30, 10,
@@ -110,7 +110,7 @@ group.all_switches              8018
 
 ### {% linkable_title Delete %}
 
-If you don't want to keep certain entities, you can delete them permanently.
+If you don't want to keep certain entities, you can delete them permanently:
 
 ```bash
 sqlite> DELETE FROM states WHERE entity_id="sensor.cpu";
@@ -123,4 +123,3 @@ sqlite> VACUUM;
 ```
 
 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/).
-

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

@@ -57,7 +57,7 @@ You can also pass the following properties under `action_data` to modify the map
 The notification thumbnail will be a still image from the camera.
 The notification content is a real time MJPEG stream of a camera (assuming the camera supports it).
 
-You can use the attachment parameters `content-type` and `hide-thumbnail` with camera.
+You can use the attachment parameters `content-type` and `hide-thumbnail` with camera to control the thumbnail.
 
 You can view an example [here](https://www.youtube.com/watch?v=LmYwpxPKW0g).
 
@@ -66,6 +66,8 @@ service: notify.ios_<your_device_id_here>
 data:
   message: Motion detected in the Living Room
   data:
+    attachment:
+      content-type: jpeg
     push:
       category: camera
     entity_id: camera.demo_camera

source/_docs/installation/archlinux.markdown

@@ -1,7 +1,7 @@
 ---
 layout: page
-title: "Installation on ArchLinux"
-description: "Installation of Home Assistant on your ArchLinux computer."
+title: "Installation on Arch Linux"
+description: "Installation of Home Assistant on your Arch Linux computer."
 date: 2017-03-01 07:00
 sidebar: true
 comments: false
@@ -9,7 +9,7 @@ sharing: true
 footer: true
 ---
 
-[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.
+[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.
 
 Install the needed Python packages.
 

source/_docs/scripts.markdown

@@ -90,6 +90,28 @@ wait_template: {% raw %}"{{ states.climate.kitchen.attributes.valve < 10 }}"{% e
 timeout: 00:01:00
 ```
 
+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).
+
+{% raw %}
+```yaml
+wait_template: "{{ is_state(trigger.entity_id, 'on') }}"
+```
+{% endraw %}
+
+It is also possible to use dummy variables, e.g., in scripts, when using `wait_template`.
+
+{% raw %}
+```yaml
+# Service call, e.g. from an automation.
+service: script.do_something
+data_template:
+  dummy: "{{ input_boolean.switch }}"
+
+# Inside the script
+wait_template: "{{ is_state(dummy, 'off') }}"
+```
+{% endraw %}
+
 ### {% linkable_title Fire an Event %}
 
 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

@@ -32,3 +32,8 @@ There are 2 basic things you'll need to use Z-Wave, a Z-Wave [controller](/docs/
 
 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).
 
+## {% linkable_title Getting started %}
+
+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).
+
+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

@@ -10,13 +10,17 @@ footer: true
 redirect_from: /getting-started/z-wave-panel/
 ---
 
+<p class='note'>
+  If you don't see the **Configuration** menu on the menubar, where you'll find the Z-Wave menu, [see here](/components/config/).
+</p>
+
 ## {% linkable_title Z-Wave Network Management %}
 
 Here is where you [include and exclude](/docs/z-wave/adding/) Z-Wave devices from your network.
 
 * **Add Node** puts the controller into inclusion mode, so you can include (add) a device to your Z-Wave network
 * **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))
-* **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
+* **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
 * **Cancel Command** cancels any of the above
 
 * **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.

source/_posts/2017-10-21-release-56.markdown

@@ -1,7 +1,7 @@
 ---
 layout: post
-title: "0.56: Skybell, Google Actions, Travis CI and Toon"
-description: "Support for Tibber and the Things Network a long with new Owntracks and DuckDNS features"
+title: "0.56: Skybell, Google Assistant, Travis CI and Toon"
+description: "Support for Skybell, Toon, Travis CI and Google Assistant"
 date: 2017-10-21 10:00:00
 date_formatted: "October 21, 2017"
 author: Fabian Affolter
@@ -19,7 +19,7 @@ We reached another milestone aka number: 10000. GitHub is assigning numbers to p
 If you haven't noticed, there is now a [glossary](https://home-assistant.io/docs/glossary/) that collects some Home Assistant relevant terms. Talking about the documentation: [@DubhAd](https://github.com/DubhAd) rewrote large parts of the [Z-Wave section](https://home-assistant.io/docs/z-wave/). More structure to get started and to find details during the setup and the configuration.
 
 ## {% linkable_title Google Assistant / Google Home integration %}
-This release includes a new component to integrate Home Assistant with Google Assistant by [Phil Kates][@philk]. We integrate via the Smart Home API, this means that you will be able to control your devices in Home Assistant via any device that has Google Assistant. Learn more in [the documentation][googleactions docs].
+This release includes a new component to integrate Home Assistant with Google Assistant by [Phil Kates][@philk]. We integrate via the Smart Home API, this means that you will be able to control your devices in Home Assistant via any device that has Google Assistant. Learn more in [the documentation][google_assistant docs].
 
 ## {% linkable_title Hacktoberfest %}
 [Hacktoberfest](https://home-assistant.io/blog/2017/09/29/hacktoberfest/) is still on and so far we have received a lot improvements. We can't make any promises to review everything by the end of October, but we are trying to make sure that you will get your t-shirt.
@@ -40,7 +40,7 @@ Why not observe your [Travis CI](https://travis-ci.org) jobs with Home Assistant
 - Abode Temp, Humidity, and Light Sensor ([@MisterWil] - [#9709]) ([abode docs]) ([sensor.abode docs]) (new-platform)
 - Introducing support to Travis-CI ([@tchellomello] - [#9701]) ([sensor.travisci docs]) (new-platform)
 - Skybell ([@MisterWil] - [#9681]) ([skybell docs]) ([binary_sensor.skybell docs]) ([camera.skybell docs]) ([light.skybell docs]) ([sensor.skybell docs]) ([switch.skybell docs]) (new-platform)
-- Xiaomi Smart WiFi Socket and Smart Power Strip integration ([@syssi] - [#9138]) ([switch.xiaomi_plug docs]) (new-platform)
+- Xiaomi Smart WiFi Socket and Smart Power Strip integration ([@syssi] - [#9138]) ([switch.xiaomi_miio docs]) (new-platform)
 - Add notification platform for Rocket.Chat ([@webworxshop] - [#9553]) ([notify.rocketchat docs]) (new-platform)
 - Tesla bug fixes. ([@zabuldon] - [#9774]) ([tesla docs]) ([binary_sensor.tesla docs]) ([climate.tesla docs]) ([lock.tesla docs]) ([sensor.tesla docs]) ([switch.tesla docs]) (new-platform)
 - Split map panel out into its own component ([@cgarwood] - [#9814]) ([map docs]) (breaking change) (new-platform)
@@ -48,11 +48,16 @@ Why not observe your [Travis CI](https://travis-ci.org) jobs with Home Assistant
 - Add namecheap DNS component ([@Munsio] - [#9821]) ([namecheapdns docs]) (new-platform)
 - Uptime sensor ([@fronzbot] - [#9856]) ([sensor.uptime docs]) (new-platform)
 - Cloud connection via aiohttp ([@balloob] - [#9860]) (new-platform)
-- Google Actions for Assistant ([@philk] - [#9632]) ([googleactions docs]) ([http docs]) (new-platform)
+- Google Actions for Assistant ([@philk] - [#9632]) ([google_assistant docs]) ([http docs]) (new-platform)
 - A new platform for controlling Monoprice 6-Zone amplifier ([@etsinko] - [#9662]) ([media_player.monoprice docs]) (new-platform)
 - Add serial sensor ([@fabaff] - [#9861]) ([sensor.serial docs]) (new-platform)
 - Add Toon support ([@Boltgolt] - [#9483]) ([toon docs]) ([climate.toon docs]) ([sensor.toon docs]) ([switch.toon docs]) (new-platform)
 
+## {% linkable_title 0.56.1 - October 22 %}
+
+- Fix device update / entity_id with names ([@pvizeli] - [#10029])
+- fix temperature/humidity sensors valid values ([@bieniu] - [#10024]) ([sensor.xiaomi_aqara docs])
+
 ## {% linkable_title If you need help... %}
 
 ...don't hesitate to use our very active [forums](https://community.home-assistant.io/) or join us for a little [chat](https://discord.gg/c5DvZ4e). The release notes have comments enabled but it's preferred if you use the former communication channels. Thanks.
@@ -107,7 +112,7 @@ Experiencing issues introduced by this release? Please report them in our [issue
 - Match test requirements by full package name. ([@andrey-git] - [#9764])
 - yeelight: implement min_mireds and max_mireds, fixes #9509 ([@rytilahti] - [#9763]) ([light.yeelight docs])
 - Bump raincloudy version 0.0.3 ([@tchellomello] - [#9767]) ([raincloud docs]) ([sensor.raincloud docs])
-- Xiaomi Smart WiFi Socket and Smart Power Strip integration ([@syssi] - [#9138]) ([switch.xiaomi_plug docs]) (new-platform)
+- Xiaomi Smart WiFi Socket and Smart Power Strip integration ([@syssi] - [#9138]) ([switch.xiaomi_miio docs]) (new-platform)
 - fix for LocationParseError in netgear platform ([@etsinko] - [#9683]) ([device_tracker docs]) ([device_tracker.netgear docs])
 - Expose time module in Python Scripts ([@balloob] - [#9736]) ([python_script docs])
 - Add notification platform for Rocket.Chat. ([@webworxshop] - [#9553]) ([notify.rocketchat docs]) (new-platform)
@@ -183,7 +188,7 @@ Experiencing issues introduced by this release? Please report them in our [issue
 - Update xiaomi_aqara.py ([@danielhiversen] - [#9920]) ([sensor.xiaomi_aqara docs])
 - Fix the resource naming in the UI ([@cgtobi] - [#9927]) ([sensor.glances docs])
 - Add transmission sensor: number of active torrents ([@mclem] - [#9914]) ([sensor.transmission docs])
-- Google Actions for Assistant ([@philk] - [#9632]) ([googleactions docs]) ([http docs]) (new-platform)
+- Google Actions for Assistant ([@philk] - [#9632]) ([google_assistant docs]) ([http docs]) (new-platform)
 - Allow flexible relayer url ([@balloob] - [#9939]) ([cloud.iot docs])
 - update async_timeout from v1.4.0 tp v2.0.0 ([@TopdRob] - [#9938])
 - Bump py-synology to 0.1.5 ([@arsaboo] - [#9932]) ([camera.synology docs])
@@ -440,7 +445,7 @@ Experiencing issues introduced by this release? Please report them in our [issue
 [device_tracker.upc_connect docs]: https://home-assistant.io/components/device_tracker.upc_connect/
 [enocean docs]: https://home-assistant.io/components/enocean/
 [ffmpeg docs]: https://home-assistant.io/components/ffmpeg/
-[googleactions docs]: https://home-assistant.io/components/googleactions/
+[google_assistant docs]: https://home-assistant.io/components/google_assistant/
 [hassio docs]: https://home-assistant.io/components/hassio/
 [homematic docs]: https://home-assistant.io/components/homematic/
 [http docs]: https://home-assistant.io/components/http/
@@ -515,7 +520,7 @@ Experiencing issues introduced by this release? Please report them in our [issue
 [switch.toon docs]: https://home-assistant.io/components/switch.toon/
 [switch.tplink docs]: https://home-assistant.io/components/switch.tplink/
 [switch.wink docs]: https://home-assistant.io/components/switch.wink/
-[switch.xiaomi_plug docs]: https://home-assistant.io/components/switch.xiaomi_plug/
+[switch.xiaomi_miio docs]: https://home-assistant.io/components/switch.xiaomi_miio/
 [telegram_bot docs]: https://home-assistant.io/components/telegram_bot/
 [tesla docs]: https://home-assistant.io/components/tesla/
 [toon docs]: https://home-assistant.io/components/toon/
@@ -528,4 +533,6 @@ Experiencing issues introduced by this release? Please report them in our [issue
 [wink docs]: https://home-assistant.io/components/wink/
 [xiaomi_aqara docs]: https://home-assistant.io/components/xiaomi_aqara/
 [zha docs]: https://home-assistant.io/components/zha/
-
+[#10024]: https://github.com/home-assistant/home-assistant/pull/10024
+[#10029]: https://github.com/home-assistant/home-assistant/pull/10029
+[@bieniu]: https://github.com/bieniu

source/developers/documentation/index.markdown

@@ -7,7 +7,7 @@ sidebar: true
 comments: false
 sharing: true
 footer: true
-redirect: /developers/website/
+redirect_from: /developers/website/
 ---
 
 The website you are reading now is the home of Home Assistant: [https://home-assistant.io](https://home-assistant.io). This is the place where we provide documentation and additional details about Home Assistant for end users and developers.

source/developers/releasing.markdown

@@ -9,37 +9,45 @@ sharing: true
 footer: true
 ---
 
-This page describes the steps for publishing a new Home Assistant release. Those steps requires that you don't use forks but work with the repositories themself. 
+This page describes the steps for publishing a new Home Assistant release. Those steps requires that you don't use forks but work with the repositories themself. The [hass-release](https://github.com/home-assistant/hass-release) script is a helper to do a release. 
 
-### {% linkable_title GitHub (3 days before release) %}
-
-1. Merge `master` into `dev` to make the PR mergeable.
-2. Cut a release branch from `dev`. Example name `release-0-49`.
-3. Create a pull request from the release branch to `master` with the upcoming release number as the title. PR message contains intro, highlighting major changes, and an overview of all changes tagging each author. Use [hass-release](https://github.com/home-assistant/hass-release) to collect the details.
-4. Update `homeassistant/const.py` with the correct version number (remove the `dev` tag) and push that commit to release branch.
-5. From now until the release branch has been merged, we tag bugfixes with the milestone for the release (create if doesn't exist).
-4. Update `homeassistant/const.py` with the upcoming version number (including the `dev` tag) and push that commit to the `dev` branch.
-
-### {% linkable_title Website (3 days before release) %}
-
-1. Merge `current` into `next`
-2. Cut release branch of `next`. For example `release-0-49`.
-3. Open a PR from release branch to `current` with the upcoming release number as the title.
+### {% linkable_title Release preparation (3 days before release) %}
 
 ### {% linkable_title GitHub %}
 
-1. Merge pull request (DO NOT SQUASH!).
-2. Go to [releases](https://github.com/home-assistant/home-assistant/releases) and tag a new release on the `master` branch. "Tag version" and "Release title" are the version number (`O.x` for major version, `0.x.y` for minor and bug fix releases). Release description is the text from PR. Press "Publish release" to finish the process.
-3. Merge `master` into `dev`.
+1. Merge `master` into `dev` to make the PR mergeable.
+2. Cut a release branch from `dev`. Example name `release-0-57`.
+3. Create a pull request from the release branch to `master` with the upcoming release number as the title.
+4. Update `homeassistant/const.py` with the correct version number (remove the `dev` tag) and push that commit to release branch.
+
+### {% linkable_title Website %}
+
+1. Merge `current` into `next`
+2. Cut release branch of `next`. For example `release-0-57`.
+3. Open a PR from release branch to `current` with the upcoming release number as the title.
+
+## {% linkable_title Release day %}
+
+From creating the release branch till it has been merged, we tag bugfixes with the milestone for the release (create if doesn't exist).
+
+### {% linkable_title GitHub %}
+
+1. Cherry-pick the milestoned PRs that need to get into the release `python3 -m hassrelease milestone_cherry_pick 0.57`
+2. Run `python3 -m hassrelease release_notes 0.56` for the release notes.
+3. Once the release notes has been generated, issue `python3 -m hassrelease milestone_close 0.56`
+4. Merge pull request (DO NOT SQUASH!). Use `Merge pull request`.
+5. Go to [releases](https://github.com/home-assistant/home-assistant/releases), click `Draft a new release` and tag a new release on the `master` branch. "Tag version" and "Release title" are the version number (`O.x` for major version, `0.x.y` for minor and bug fix releases). Release description is the text from PR. Press "Publish release" to finish the process.
+6. Merge `master` into `dev`.
+7. Update `homeassistant/const.py` with the upcoming version number (including the `dev` tag) and push that commit to the `dev` branch.
 
 ### {% linkable_title Website %}
 
 1. Create a blog post in the release branch and base it on the text of the PR in the main repository. Add images, additional text, links, etc. if it adds value. Tag each platform/component in a message to documentation.
 2. Create missing documentation as stubs.
-3. Update `_config.yml` with link to the new release blog post and version number (at the bottom of the file).
-4. Merge `current` into release branch (`$ git checkout release-0-40 && git merge current`) to make the PR mergeable.
-5. Merge pull request (blog post, updated frontpage, and all new documentation) to `current`. DO NOT SQUASH!
-6. Run `credits_generator`.
+3. Run `credits_generator`.
+4. Update `_config.yml` with a link to the new release blog post and version number (at the bottom of the file).
+5. Merge `current` into release branch (`$ git checkout release-0-40 && git merge current`) to make the PR mergeable.
+6. Merge pull request (blog post, updated frontpage, and all new documentation) to `current`. DO NOT SQUASH!
 7. Merge `current` into `next`.
 
 ### {% linkable_title Docker Hub %}

source/hassio/zwave.markdown

@@ -16,19 +16,22 @@ zwave:
   usb_path: /dev/ttyACM0
 ```
 
-If you need GPIO on raspberry-pi3 for you Z-Wave module add the following line into `config.txt`:
+If you need GPIO on Raspberry Pi 3 for your Z-Wave module, add the following line into `config.txt`:
+
 ```
 dtoverlay=pi3-miniuart-bt
 ```
 
-For some exceptional devices, the `/dev/ttyAMA0` will not be detected by udev and are therefor not mapped with docker.
-So you need explicit set this device for mapping to Home-Assistant. Execute this command on ssh add-on:
+For some devices the `/dev/ttyAMA0` device is not detected by udev and is therefore not mapped by Docker. To explicitly set this device for mapping to Home-Assistant, execute the following command using the ssh add-on:
+
 ```bash
 $ curl -d '{"devices": ["ttyAMA0"]}' http://hassio/homeassistant/options
 ```
-After that, you need change `usb_path` to `/dev/ttyAMA0`.
+
+After that, you need to change `usb_path` to `/dev/ttyAMA0`.
 
 ### HUSBZB-1:
+
 ```yaml
 zwave:
   usb_path: /dev/ttyUSB0