Merge branch 'current' into next

2025-07-22 16:56:50 +00:00 · 2019-07-31 16:26:37 -07:00 · 2019-07-31 16:26:37 -07:00 · 9c0308b489
commit 9c0308b489
parent 50c1fbb7dc f9004d324d
114 changed files with 429 additions and 247 deletions
--- a/.gitignore
+++ b/.gitignore
@ -16,3 +16,4 @@ source/.jekyll-metadata
 !.vscode/extensions.json
 !.vscode/tasks.json
 *.suo
+tags*
--- a/_config.yml
+++ b/_config.yml
@ -99,8 +99,8 @@ social:
 # Home Assistant release details
 current_major_version: 0
 current_minor_version: 96
-current_patch_version: 1
-date_released: 2019-07-18
+current_patch_version: 5
+date_released: 2019-07-25

 # Either # or the anchor link to latest release notes in the blog post.
 # Must be prefixed with a # and have double quotes around it.
--- a/plugins/configuration.rb
+++ b/plugins/configuration.rb
@ -37,7 +37,7 @@ module Jekyll
      type.strip!
      if TYPE_LINKS.include? type.downcase
        url = TYPE_LINKS[type.downcase] % {component: component}
-        "[%s](%s)" % [type, url]
+        "<a href=\"%s\">%s</a>" % [url, type]
      else
        type
      end
--- a/source/_components/alexa.smart_home.markdown
+++ b/source/_components/alexa.smart_home.markdown
@ -97,7 +97,7 @@ Next you need create a Lambda function.
 - Under `Configuration` tab, expand `Designer`, then click `Alexa Smart Home` in the left part of the panel to add a Alexa Smart Home trigger to your Lambda function.
 - Scroll down little bit, you need input the `Skill ID` from the skill you created in previous step. (tips: you may need switch back to Alexa Developer Console to copy the `Skill ID`.
 - Click your Lambda Function icon in the middle of the diagram, scroll down you will see a `Function code` window.
- Clear the example code, copy the Python script from: <https://gist.github.com/awarecan/630510a9742f5f8901b5ab284c25e912>
+- Clear the example code, copy the Python script from: <https://gist.github.com/matt2005/744b5ef548cc13d88d0569eea65f5e5b> (modified code to support Alexa's proactive mode, see details below)
 - Scroll down a little bit, you will find `Environment variables`, you need add 4 environment variables:
  * BASE_URL *(required)*: your Home Assistant instance's Internet accessible URL with port if need
  * NOT_VERIFY_SSL *(optional)*: you can set it to *True* to ignore the SSL issue, if you don't have a valid SSL certificate or you are using self-signed certificate.
@ -168,7 +168,7 @@ Alexa can link your Amazon account to your Home Assistant account. Therefore Hom
  * `Access Token URI`: https://[YOUR HOME ASSISTANT URL:PORT]/auth/token
  * `Client ID`:
    - https://pitangui.amazon.com/ if you are in US
-    - https://layla.amazon.com/ if you are in EU (not verified yet)
+    - https://layla.amazon.com/ if you are in EU
    - https://alexa.amazon.co.jp/ if you are in JP and AU (not verified yet)
    
    The trailing slash is important here.
@ -216,12 +216,11 @@ alexa:
        display_categories: LIGHT
 ```

-The `endpoint`, `client_id` and `client_secret` are optional, and are only required if you want to enable Alexa's proactive mode. Please note the following if you want to enable proactive mode:
+The `endpoint`, `client_id` and `client_secret` are optional, and are only required if you want to enable Alexa's proactive mode (i.e. "Send Alexa Events" enabled). Please note the following if you want to enable proactive mode:

 - There are different endpoint URLs, depending on the region of your skill. Please check the available endpoints at <https://developer.amazon.com/docs/smarthome/send-events-to-the-alexa-event-gateway.html#endpoints>
 - The `client_id` and `client_secret` are not the ones used by the skill that have been set up using "Login with Amazon" (in the [Alexa Developer Console][amazon-dev-console]: Build > Account Linking), but rather from the "Alexa Skill Messaging" (in the Alexa Developer Console: Build > Permissions > Alexa Skill Messaging). To get them, you need to enable the "Send Alexa Events" permission.
- If the "Send Alexa Events" permission was not enabled previously, you need to unlink and relink the skill using the Alexa App, or else Home Assistant will show the following error: "Token invalid and no refresh token available."
-
+- If the "Send Alexa Events" permission was not enabled previously, you need to unlink and relink the skill using the Alexa App, or else Home Assistant will show the following error: "Token invalid and no refresh token available. Also, you need to restart your Home Assistant after each disabling/enabling the skill in Alexa."

 ### Alexa web-based app

--- a/source/_components/androidtv.markdown
+++ b/source/_components/androidtv.markdown
@ -232,6 +232,6 @@ Available key commands include:
 - `BACK`
 - `MENU`

-The full list of key commands can be found [here](https://github.com/JeffLIrion/python-androidtv/blob/e1c07176efc9216cdcff8245c920224c0234ea56/androidtv/constants.py#L115-L155).
+The full list of key commands can be found [here](https://github.com/JeffLIrion/python-androidtv/blob/bf1058a2f746535921b3f5247801469c4567e51a/androidtv/constants.py#L143-L186).

 You can also use the command `GET_PROPERTIES` to retrieve the properties used by Home Assistant to update the device's state.  These will be stored in the media player's `'adb_response'` attribute and logged at the INFO level, this information can be used to help improve state detection in the backend [androidtv](https://github.com/JeffLIrion/python-androidtv) package.
--- a/source/_components/aquostv.markdown
+++ b/source/_components/aquostv.markdown
@ -75,4 +75,4 @@ Currently known supported models:
 - LC-60EQ10U
 - LC-60SQ15U

-If your model is not on the list then give it a test, if everything works correctly then add it to the list on [GitHub](https://github.com/home-assistant/home-assistant.github.io/tree/current/source/_components/media_player.aquostv.markdown).
+If your model is not on the list then give it a test, if everything works correctly then add it to the list on [GitHub](https://github.com/home-assistant/home-assistant.io/blob/current/source/_components/aquostv.markdown).
--- a/source/_components/binary_sensor.rfxtrx.markdown
+++ b/source/_components/binary_sensor.rfxtrx.markdown
@ -90,7 +90,7 @@ automatic_add:

 <div class='note warning'>

-This integration and the [rfxtrx switch](/components/switch/rfxtrx/) can steal each other's devices when setting the `automatic_add` configuration parameter to `true`.
+This integration and the [rfxtrx switch](/components/switch.rfxtrx/) can steal each other's devices when setting the `automatic_add` configuration parameter to `true`.
 Set `automatic_add` only when you have some devices to add to your installation, otherwise leave it to `false`.

 </div>
--- a/source/_components/binary_sensor.template.markdown
+++ b/source/_components/binary_sensor.template.markdown
@ -85,7 +85,7 @@ Template Binary Sensor may get an `unknown` state during startup. This results
 in error messages in your log file until that platform has completed loading.
 If you use `is_state()` function in your template, you can avoid this situation.
 For example, you would replace
-{% raw %}`{{ is_state('switch.source', 'on') }}`{% endraw %}
+{% raw %}`{{ states.switch.source.state == 'on' }}`{% endraw %}
 with this equivalent that returns `true`/`false` and never gives an unknown
 result:
 {% raw %}`{{ is_state('switch.source', 'on') }}`{% endraw %}
--- a/source/_components/blink.markdown
+++ b/source/_components/blink.markdown
@ -220,7 +220,7 @@ Again, this example assumes your camera's name (in the blink app) is `My Camera`
      to: 'on'
  action:
      service: blink.save_video
-      data:
+      data_template:
          name: "My Camera"
          filename: "/tmp/videos/blink_video_{{ now().strftime('%Y%m%d_%H%M%S') }}.mp4"
      
--- a/source/_components/cast.markdown
+++ b/source/_components/cast.markdown
@ -11,7 +11,7 @@ redirect_from: /components/media_player.cast/
 ---

 Google Cast devices like Android TVs and Chromecasts will be automatically
-discovered if you enable [the discovery integration(/components/discovery/). If
+discovered if you enable [the discovery integration](/components/discovery/). If
 you don't have the discovery integration enabled, you can enable the Cast
 integration by going to the Integrations page inside the config panel.

--- a/source/_components/command_line.markdown
+++ b/source/_components/command_line.markdown
@ -47,12 +47,12 @@ payload_on:
  description: The payload that represents enabled state.
  required: false
  type: string
-  default: ON
+  default: 'ON'
 payload_off:
  description: The payload that represents disabled state.
  required: false
  type: string
-  default: OFF
+  default: 'OFF'
 value_template:
  description: Defines a [template](/docs/configuration/templating/#processing-incoming-data) to extract a value from the payload.
  required: false
--- a/source/_components/config.markdown
+++ b/source/_components/config.markdown
@ -3,7 +3,7 @@ title: "Config"
 description: "Instructions on how to setup the configuration panel for Home Assistant."
 logo: home-assistant.png
 ha_category:
-  - Front end
+  - Front End
 ha_release: 0.39
 ha_qa_scale: internal
 ---
--- a/source/_components/cover.mqtt.markdown
+++ b/source/_components/cover.mqtt.markdown
@ -13,9 +13,9 @@ The `mqtt` cover platform allows you to control an MQTT cover (such as blinds, a
 ## Configuration

 The device state (`open` or `closed`) will be updated only after a new message is published on `state_topic` matching `state_open` or `state_closed`. If these messages are published with the `retain` flag set, the cover will receive an instant state update after subscription and Home Assistant will display the correct state on startup. Otherwise, the initial state displayed in Home Assistant will be `unknown`.
-`state_topic` can only manage `state_open` and `state_closed`. No percentage positons etc.
+`state_topic` can only manage `state_open` and `state_closed`. No percentage positions etc.

-For this purpose is `position_topic` which can set state of the cover and positon.
+For this purpose is `position_topic` which can set state of the cover and position.
 Default setting are 0 means the device is `closed` and all other intermediate positions means the device is `open`.
 `position_topic` is managed by `position_open` and `position_closed`
 You can set it up in opossite way as well.
--- a/source/_components/cups.markdown
+++ b/source/_components/cups.markdown
@ -15,7 +15,7 @@ The `cups` sensor platform is using the open source printing system [CUPS](https

 ## Setup

-You will need to install the `python3-dev` or `python3-devel` pacakge and the development files for CUPS (`libcups2-dev` or`cups-devel`) on your system manually (e.g., `sudo apt-get install python3-dev libcups2-dev` or `sudo dnf -y install python3-devel cups-devel`) along with a compiler (`gcc`). This integration doesn't work out-of-the-box in a container-based setup.
+You will need to install the `python3-dev` or `python3-devel` package and the development files for CUPS (`libcups2-dev` or`cups-devel`) on your system manually (e.g., `sudo apt-get install python3-dev libcups2-dev` or `sudo dnf -y install python3-devel cups-devel`) along with a compiler (`gcc`). This integration doesn't work out-of-the-box in a container-based setup.

 To set up the sensor the "Queue Name" of the printer is needed. The fastest way to get it, is to visit the CUPS web interface at "http://[IP ADDRESS PRINT SERVER]:631" and go to "Printers".

--- a/source/_components/daikin.markdown
+++ b/source/_components/daikin.markdown
@ -57,9 +57,10 @@ The `daikin` climate platform integrates Daikin air conditioning systems into Ho

 - [**set_hvac_mode**](/components/climate/#service-climateset_hvac_mode) (off, heat, cool, auto, or fan only)
 - [**target temperature**](https://www.home-assistant.io/components/climate#service-climateset_temperature)
+- [**turn on/off**](https://www.home-assistant.io/components/climate#service-climateturn_on)
 - [**fan mode**](https://www.home-assistant.io/components/climate#service-climateset_fan_mode) (speed)
 - [**swing mode**](https://www.home-assistant.io/components/climate#service-climateset_swing_mode)
- [**set_preset_mode**](https://www.home-assistant.io/components/climate#service-climateset_away_mode) (away, home)
+- [**set_preset_mode**](https://www.home-assistant.io/components/climate#service-climateset_preset_mode) (away, none)

 Current inside temperature is displayed.

@ -69,6 +70,18 @@ Some models do not support setting of **fan speed** or **swing mode**.
  
 </div>

+<div class='note'>
+
+Preset mode **away** translates to Daikin's "Holiday Mode":<br/>
+<br>
+_"Holiday mode" is used when you want to turn off your units when you leave you home for a longer time._<br>
+<br>
+_When "Holiday mode" is enabled, the following action take place:_
+ - _All connected units are turned OFF._
+ - _All schedule timers are disabled._
+
+</div>
+
 ## Sensor

 The `daikin` sensor platform integrates Daikin air conditioning systems into Home Assistant, enabling displaying the following parameters:
--- a/source/_components/danfoss_air.markdown
+++ b/source/_components/danfoss_air.markdown
@ -52,7 +52,7 @@ The following sensors are supported.
 - **Supply temperature:** Air temperature of the air supplied to the house.
 - **Extract temperature:** Air temperature of the air extracted from the house.
 - **Exhaust temperature:** Exhausted air temperature.
- **Remaining filter lifetime:** Reamining filter lifetime measured in percent.
+- **Remaining filter lifetime:** Remaining filter lifetime measured in percent.

 ## Switch

--- a/source/_components/discord.markdown
+++ b/source/_components/discord.markdown
@ -13,7 +13,7 @@ The [Discord service](https://discordapp.com/) is a platform for the notify comp

 In order to get a token you need to go to the [Discord My Apps page](https://discordapp.com/developers/applications/me) and create a new application. Once the application is ready, create a [bot](https://discordapp.com/developers/docs/topics/oauth2#bots) user (**Create a Bot User**).

-Retreive the **Client ID** from the information section and the (hidden) **Token** of your bot for later.
+Retrieve the **Client ID** from the information section and the (hidden) **Token** of your bot for later.

 When setting up the application you can use this [icon](/images/favicon-192x192-full.png).

@ -66,21 +66,15 @@ Right click channel name and copy the channel ID (**Copy ID**).

 This channel ID has to be used as the target when calling the notification service. Multiple channel IDs can be specified, across multiple servers.

-#### Example service payload
+#### Example service call

-```json
-{
-  "message": "A message from Home Assistant",
-  "target": [
-    "1234567890",
-    "0987654321"
-  ],
-  "data": {
-    "images": [
-      "/tmp/garage_cam.jpg"
-    ]
-  }
-}
+```yaml
+- service: notify.discord
+  data:
+    message: "A message from Home Assistant"
+    target: ["1234567890", "0987654321"]
+    data:
+      images: "/tmp/garage_cam"
 ```

 ### Notes
--- a/source/_components/ebusd.markdown
+++ b/source/_components/ebusd.markdown
@ -107,7 +107,7 @@ monitored_conditions:
    Zone1OperativeMode:
      description: Heating circuit operative mode (on/off/day/night).
    ContinuosHeating:
-      description: Continuos heating.
+      description: Continuous heating.
    PowerEnergyConsumptionLastMonth:
      description: Power energy consumption from last month.
    PowerEnergyConsumptionThisMonth:
--- a/source/_components/ecoal_boiler.markdown
+++ b/source/_components/ecoal_boiler.markdown
@ -2,7 +2,7 @@
 title: "eCoal water boiler controller"
 description: "Instructions on how to integrate eSterownik.pl eCoal.pl controller into Home Assistant."
 ha_category:
-  - Water heater
+  - Water Heater
 ha_release: 0.87
 ha_iot_class: Local Polling
 redirect_from:
--- a/source/_components/econet.markdown
+++ b/source/_components/econet.markdown
@ -3,7 +3,7 @@ title: "EcoNet water heater"
 description: "Instructions on how to integrate Rheem EcoNet water heaters into Home Assistant."
 logo: econet.png
 ha_category:
-  - Water heater
+  - Water Heater
 ha_release: 0.61
 ha_iot_class: Cloud Polling
 redirect_from:
--- a/source/_components/elkm1.markdown
+++ b/source/_components/elkm1.markdown
@ -82,12 +82,12 @@ area:
      required: false
      default: true
    include:
-      description: List to include in the form of either `<value>` or `<value>-<value>` where `<value>` is a postive integer or a X10 housecode. See configuration below for examples of ranges.
+      description: List to include in the form of either `<value>` or `<value>-<value>` where `<value>` is a positive integer or an X10 housecode. See configuration below for examples of ranges.
      type: list
      required: false
      default: All included.
    exclude:
-      description: List to exclude in the form of either `<value>` or `<value>-<value>` where `<value>` is a number or a X10 housecode. See configuration below for examples of ranges.
+      description: List to exclude in the form of either `<value>` or `<value>-<value>` where `<value>` is a number or an X10 housecode. See configuration below for examples of ranges.
      type: list
      required: false
      default: None excluded.
@ -103,12 +103,12 @@ counter:
      required: false
      default: true
    include:
-      description: List to include in the form of either `<value>` or `<value>-<value>` where `<value>` is a postive integer or a X10 housecode. See configuration below for examples of ranges.
+      description: List to include in the form of either `<value>` or `<value>-<value>` where `<value>` is a positive integer or an X10 housecode. See configuration below for examples of ranges.
      type: list
      required: false
      default: All included.
    exclude:
-      description: List to exclude in the form of either `<value>` or `<value>-<value>` where `<value>` is a number or a X10 housecode. See configuration below for examples of ranges.
+      description: List to exclude in the form of either `<value>` or `<value>-<value>` where `<value>` is a number or an X10 housecode. See configuration below for examples of ranges.
      type: list
      required: false
      default: None excluded.
@ -124,12 +124,12 @@ keypad:
      required: false
      default: true
    include:
-      description: List to include in the form of either `<value>` or `<value>-<value>` where `<value>` is a postive integer or a X10 housecode. See configuration below for examples of ranges.
+      description: List to include in the form of either `<value>` or `<value>-<value>` where `<value>` is a positive integer or an X10 housecode. See configuration below for examples of ranges.
      type: list
      required: false
      default: All included.
    exclude:
-      description: List to exclude in the form of either `<value>` or `<value>-<value>` where `<value>` is a number or a X10 housecode. See configuration below for examples of ranges.
+      description: List to exclude in the form of either `<value>` or `<value>-<value>` where `<value>` is a number or an X10 housecode. See configuration below for examples of ranges.
      type: list
      required: false
      default: None excluded.
@ -145,12 +145,12 @@ output:
      required: false
      default: true
    include:
-      description: List to include in the form of either `<value>` or `<value>-<value>` where `<value>` is a postive integer or a X10 housecode. See configuration below for examples of ranges.
+      description: List to include in the form of either `<value>` or `<value>-<value>` where `<value>` is a positive integer or an X10 housecode. See configuration below for examples of ranges.
      type: list
      required: false
      default: All included.
    exclude:
-      description: List to exclude in the form of either `<value>` or `<value>-<value>` where `<value>` is a number or a X10 housecode. See configuration below for examples of ranges.
+      description: List to exclude in the form of either `<value>` or `<value>-<value>` where `<value>` is a number or an X10 housecode. See configuration below for examples of ranges.
      type: list
      required: false
      default: None excluded.
@ -166,12 +166,12 @@ setting:
      required: false
      default: true
    include:
-      description: List to include in the form of either `<value>` or `<value>-<value>` where `<value>` is a postive integer or a X10 housecode. See configuration below for examples of ranges.
+      description: List to include in the form of either `<value>` or `<value>-<value>` where `<value>` is a positive integer or an X10 housecode. See configuration below for examples of ranges.
      type: list
      required: false
      default: All included.
    exclude:
-      description: List to exclude in the form of either `<value>` or `<value>-<value>` where `<value>` is a number or a X10 housecode. See configuration below for examples of ranges.
+      description: List to exclude in the form of either `<value>` or `<value>-<value>` where `<value>` is a number or an X10 housecode. See configuration below for examples of ranges.
      type: list
      required: false
      default: None excluded.
@ -187,12 +187,12 @@ task:
      required: false
      default: true
    include:
-      description: List to include in the form of either `<value>` or `<value>-<value>` where `<value>` is a postive integer or a X10 housecode. See configuration below for examples of ranges.
+      description: List to include in the form of either `<value>` or `<value>-<value>` where `<value>` is a positive integer or an X10 housecode. See configuration below for examples of ranges.
      type: list
      required: false
      default: All included.
    exclude:
-      description: List to exclude in the form of either `<value>` or `<value>-<value>` where `<value>` is a number or a X10 housecode. See configuration below for examples of ranges.
+      description: List to exclude in the form of either `<value>` or `<value>-<value>` where `<value>` is a number or an X10 housecode. See configuration below for examples of ranges.
      type: list
      required: false
      default: None excluded.
@ -208,12 +208,12 @@ thermostat:
      required: false
      default: true
    include:
-      description: List to include in the form of either `<value>` or `<value>-<value>` where `<value>` is a postive integer or a X10 housecode. See configuration below for examples of ranges.
+      description: List to include in the form of either `<value>` or `<value>-<value>` where `<value>` is a positive integer or an X10 housecode. See configuration below for examples of ranges.
      type: list
      required: false
      default: All included.
    exclude:
-      description: List to exclude in the form of either `<value>` or `<value>-<value>` where `<value>` is a number or a X10 housecode. See configuration below for examples of ranges.
+      description: List to exclude in the form of either `<value>` or `<value>-<value>` where `<value>` is a number or an X10 housecode. See configuration below for examples of ranges.
      type: list
      required: false
      default: None excluded.
@ -229,12 +229,12 @@ plc:
      required: false
      default: true
    include:
-      description: List to include in the form of either `<value>` or `<value>-<value>` where `<value>` is a postive integer or a X10 housecode. See configuration below for examples of ranges.
+      description: List to include in the form of either `<value>` or `<value>-<value>` where `<value>` is a positive integer or an X10 housecode. See configuration below for examples of ranges.
      type: list
      required: false
      default: All included.
    exclude:
-      description: List to exclude in the form of either `<value>` or `<value>-<value>` where `<value>` is a number or a X10 housecode. See configuration below for examples of ranges.
+      description: List to exclude in the form of either `<value>` or `<value>-<value>` where `<value>` is a number or an X10 housecode. See configuration below for examples of ranges.
      type: list
      required: false
      default: None excluded.
@ -250,12 +250,12 @@ zone:
      required: false
      default: true
    include:
-      description: List to include in the form of either `<value>` or `<value>-<value>` where `<value>` is a postive integer or a X10 housecode. See configuration below for examples of ranges.
+      description: List to include in the form of either `<value>` or `<value>-<value>` where `<value>` is a positive integer or an X10 housecode. See configuration below for examples of ranges.
      type: list
      required: false
      default: All included.
    exclude:
-      description: List to exclude in the form of either `<value>` or `<value>-<value>` where `<value>` is a number or a X10 housecode. See configuration below for examples of ranges.
+      description: List to exclude in the form of either `<value>` or `<value>-<value>` where `<value>` is a number or an X10 housecode. See configuration below for examples of ranges.
      type: list
      required: false
      default: None excluded.
--- a/source/_components/entur_public_transport.markdown
+++ b/source/_components/entur_public_transport.markdown
@ -129,4 +129,4 @@ The stop id is the content after `id=` parameter in the url. Copy paste this int

 **Q:** Where do I find a line id to add to the whitelisting?

-**A:** The sensor will show the line id, and is the recommended way to find it, while we wait for 'Nasjonalt Stoppestedregister' to become public. It is also possible to see the line ids by using the developer tool in the browser while looking at the trafic in [Entur's travel planer](https://en-tur.no).
+**A:** The sensor will show the line id, and is the recommended way to find it, while we wait for 'Nasjonalt Stoppestedregister' to become public. It is also possible to see the line ids by using the developer tool in the browser while looking at the traffic in [Entur's travel planer](https://en-tur.no).
--- a/source/_components/environment_canada.markdown
+++ b/source/_components/environment_canada.markdown
@ -18,6 +18,13 @@ The following device types and data are supported:
 - [Sensor](#sensor) - Current conditions and alerts
 - [Camera](#camera) - Radar imagery

+<p class='note'>
+
+  On Raspbian or Hassbian, you may need to manually install additional prerequisites with the following command:
+  `sudo apt-get install libatlas-base-dev libopenjp2-7`
+
+</p>
+
 ## Location Selection

 Each platform automatically determines which weather station's data to use. However, as station coordinates provided by Environment Canada are somewhat imprecise, in some cases you may need to override the automatic selection to use the desired station.
--- a/source/_components/freebox.markdown
+++ b/source/_components/freebox.markdown
@ -60,7 +60,7 @@ authorize it by pressing the right arrow on the facade of the Freebox when
 prompted to do so.

 To make the WiFi switch working you will have to add "Modification des réglages de la Freebox
-" permission to Home Assitant application in "Paramètres de la Freebox" > "Gestion des accès" > "Applications".
+" permission to Home Assistant application in "Paramètres de la Freebox" > "Gestion des accès" > "Applications".

 ### Supported routers

--- a/source/_components/geniushub.markdown
+++ b/source/_components/geniushub.markdown
@ -4,9 +4,9 @@ description: "Instructions on how to integrate Genius Hub with Home Assistant."
 logo: geniushub.png
 ha_category:
  - Climate
-  - Water heater
+  - Water Heater
  - Sensor
-  - Binary sensor
+  - Binary Sensor
 ha_release: 0.92
 ha_iot_class: Local Polling
 ---
--- a/source/_components/google_assistant.markdown
+++ b/source/_components/google_assistant.markdown
@ -248,7 +248,7 @@ The request_sync service may fail with a 404 if the project_id of the Homegraph
  4. Generate a new API key.
  5. Again, create a new project in the [Actions on Google console](https://console.actions.google.com/). Described above. But at the step 'Build under the Actions SDK box' choose your newly created project. By this, they share the same `project_id`.

-Syncing may also fail after a period of time, likely around 30 days, due to the fact that your Actions on Google app is techincally in testing mode and has never been published. Eventually, it seems that the test expires. Control of devices will continue to work but syncing may not. If you say "Ok Google, sync my devices" and get the response "Unable to sync Home Assistant", this can usually be resolved by going back to your test app in the [Actions on Google console](https://console.actions.google.com/) and clicking `Simulator` under `TEST`. Regenerate the draft version Test App and try asking Google to sync your devices again.
+Syncing may also fail after a period of time, likely around 30 days, due to the fact that your Actions on Google app is technically in testing mode and has never been published. Eventually, it seems that the test expires. Control of devices will continue to work but syncing may not. If you say "Ok Google, sync my devices" and get the response "Unable to sync Home Assistant", this can usually be resolved by going back to your test app in the [Actions on Google console](https://console.actions.google.com/) and clicking `Simulator` under `TEST`. Regenerate the draft version Test App and try asking Google to sync your devices again.

 ### Troubleshooting with NGINX

--- a/source/_components/gtt.markdown
+++ b/source/_components/gtt.markdown
@ -28,7 +28,7 @@ stop:
  required: true
  type: string
 bus_name:
-  description: The name of the choosen bus.
+  description: The name of the chosen bus.
  required: false
  type: string
 {% endconfiguration %}
--- a/source/_components/heos.markdown
+++ b/source/_components/heos.markdown
@ -41,7 +41,7 @@ A connection to a single device enables control for all devices on the network.

 ### Service `heos.sign_in`

-Use the sign-in service to sign the connected controller into a HEOS account so that it can retreive and play HEOS favorites and playlists. An error message is logged if sign-in is unsuccessful. Example service data payload:
+Use the sign-in service to sign the connected controller into a HEOS account so that it can retrieve and play HEOS favorites and playlists. An error message is logged if sign-in is unsuccessful. Example service data payload:

 ```json
 {
@ -142,7 +142,7 @@ You can play a URL through a HEOS media player using the `media_player.play_medi

 ### Debugging

-The HEOS integration will log additional information about commands, events, and other messages when the log level is set to `debug`. Add the the relevent line below to the `configuration.yaml` to enable debug logging:
+The HEOS integration will log additional information about commands, events, and other messages when the log level is set to `debug`. Add the the relevant line below to the `configuration.yaml` to enable debug logging:

 ```yaml
 logger:
@ -157,4 +157,4 @@ logger:
 If the HEOS controller is not signed in to a HEOS account, HEOS favorites will not be populated in the media player source selection and the service `media_player.play_media` for `favorite` and `playlist` will fail. Additionally, the following warning will be logged at startup:
 > IP_ADDRESS is not logged in to a HEOS account and will be unable to retrieve HEOS favorites: Use the 'heos.sign_in' service to sign-in to a HEOS account

-To resolve this issue, use the `heos.sign_out` service to sign the controller into an account as documented above. This only needs to be performed once, as the controller will remain signed in while the account credentails are valid.
+To resolve this issue, use the `heos.sign_out` service to sign the controller into an account as documented above. This only needs to be performed once, as the controller will remain signed in while the account credentials are valid.
--- a/source/_components/hlk_sw16.markdown
+++ b/source/_components/hlk_sw16.markdown
@ -76,7 +76,7 @@ deviceid:
      type: map
      keys:
        relayid:
-          description: The array that contains the HLK-SW16 relays, each must be a number between 0 and 9 or letter between a and f which each corresponds to a labled relay switch on the HLK-SW16.
+          description: The array that contains the HLK-SW16 relays, each must be a number between 0 and 9 or letter between a and f which each corresponds to a labeled relay switch on the HLK-SW16.
          required: false
          type: map
          keys:
--- a/source/_components/homekit_controller.markdown
+++ b/source/_components/homekit_controller.markdown
@ -24,7 +24,7 @@ redirect_from:
  - /components/sensor.homekit_controller/
 ---

-[HomeKit](https://developer.apple.com/homekit/) controller integration for Home Assistant allows you to connect HomeKit accessories to Home Assistant. This integration should not be confused with the [HomeKit](/components/homekit/) component, which allows you to control Home Assistant devices via HomeKit.
+[HomeKit](https://developer.apple.com/homekit/) controller integration for Home Assistant allows you to connect HomeKit accessories to Home Assistant. This integration should not be confused with the [HomeKit](/components/homekit/) integration, which allows you to control Home Assistant devices via HomeKit.

 There is currently support for the following device types within Home Assistant:

@ -39,4 +39,4 @@ There is currently support for the following device types within Home Assistant:

 The integration will be automatically configured if the [`discovery`](/components/discovery/) integration is enabled.

-For each detected HomeKit accessory, a configuration prompt will appear in the web front end. Use this to provide the HomeKit PIN. Note that HomeKit accessories can only be paired to one device at once. If your device is currently paired with Siri, you will need to reset it in order to pair it with Home Assistant. Once Home Assistant is configured to work with the device, you can export it back to Siri with the [`HomeKit`](/components/homekit/) component.
+For each detected HomeKit accessory, a configuration prompt will appear in the web front end. Use this to provide the HomeKit PIN. Note that HomeKit accessories can only be paired to one device at once. If your device is currently paired with Siri, you will need to reset it in order to pair it with Home Assistant. Once Home Assistant is configured to work with the device, you can export it back to Siri with the [`HomeKit`](/components/homekit/) integration.
--- a/source/_components/incomfort.markdown
+++ b/source/_components/incomfort.markdown
@ -3,10 +3,10 @@ title: "Intergas InComfort"
 description: "Instructions on how to integrate an Intergas Lan2RF gateway with Home Assistant."
 logo: incomfort.png
 ha_category:
-  - Water heater
+  - Water Heater
  - Climate
  - Sensor
-  - Binary sensor
+  - Binary Sensor
 ha_release: 0.93
 ha_iot_class: Local Polling
 ---
--- a/source/_components/input_datetime.markdown
+++ b/source/_components/input_datetime.markdown
@ -53,6 +53,10 @@ input_datetime:
        required: false
        type: boolean
        default: false
+      icon:
+        description: Icon to display in the frontend.
+        required: false
+        type: icon
      initial:
        description: Set the initial value of this input, depending on `has_time` and `has_date`.
        required: false
@ -71,6 +75,7 @@ automations and templates.
 | `has_date` | `true` if this entity has a date.
 | `year`<br>`month`<br>`day` | The year, month and day of the date.<br>(only available if `has_| `hour`<br>`minute`<br>`second` | The hour, minute and second of the time.<br>(only available if `has_time: true`)
 | `timestamp` | A timestamp representing the time held in the input.<br>If `has_
+
 ### Restore State

 This integration will automatically restore the state it had prior to Home
--- a/source/_components/kodi.markdown
+++ b/source/_components/kodi.markdown
@ -299,8 +299,6 @@ script:
          method: VideoLibrary.Scan
 ```

-For a more complex usage of the `kodi_call_method` service, with event triggering of Kodi API results, you can have a look at this [example](/cookbook/automation_kodi_dynamic_input_select/)
-
 ## Notifications

 The `kodi` notifications platform allows you to send messages to your [Kodi](https://kodi.tv/) multimedia system from Home Assistant.
--- a/source/_components/lcn.markdown
+++ b/source/_components/lcn.markdown
@ -509,7 +509,7 @@ Example:
 ```yaml
 service: output_abs
 data:
-  addres: myhome.0.7
+  address: myhome.0.7
  output: output1
  brightness: 100
  transition: 0
--- a/source/_components/life360.markdown
+++ b/source/_components/life360.markdown
@ -3,6 +3,7 @@ title: "Life360"
 description: "Instructions how to use Life360 to track devices in Home Assistant."
 logo: life360.png
 ha_release: 0.95
+ha_config_flow: true
 ha_category:
  - Presence Detection
 ha_iot_class: Cloud Polling
--- a/source/_components/logbook.markdown
+++ b/source/_components/logbook.markdown
@ -11,7 +11,7 @@ ha_release: 0.7

 The logbook integration provides a different perspective on the history of your
 house by showing all the changes that happened to your house in reverse
-chronological order. [See the demo for a live example](/demo/). It depends on
+chronological order. It depends on
 the `recorder` integration for storing the data. This means that if the
 [`recorder`](/components/recorder/) integration is set up to use e.g., MySQL or
 PostgreSQL as data store, the `logbook` integration does not use the default
--- a/source/_components/manual.markdown
+++ b/source/_components/manual.markdown
@ -214,59 +214,57 @@ Sending a Notification when the Alarm is Armed (Away/Home), Disarmed and in Pend
 {% raw %}
 ```yaml
 - alias: 'Send notification when alarm is Disarmed'
-  initial_state: 'on'
  trigger:
    - platform: state
      entity_id: alarm_control_panel.home_alarm
      to: 'disarmed'
  action:
    - service: notify.notify
-      data:
-        message: "ALARM! The alarm is Disarmed at {{ states('sensor.date__time') }}"
+      data_template:
+        message: "ALARM! The alarm is Disarmed at {{ states('sensor.date_time') }}"
 ```
 {% endraw %}

 {% raw %}
 ```yaml
 - alias: 'Send notification when alarm is in pending status'
-  initial_state: 'on'
  trigger:
    - platform: state
      entity_id: alarm_control_panel.home_alarm
      to: 'pending'
  action:
    - service: notify.notify
-      data:
-        message: "ALARM! The alarm is in pending status at {{ states('sensor.date__time') }}"
+      data_template:
+        message: "ALARM! The alarm is in pending status at {{ states('sensor.date_time') }}"
 ```
 {% endraw %}

 {% raw %}
 ```yaml
 - alias: 'Send notification when alarm is Armed in Away mode'
-  initial_state: 'on'
  trigger:
    - platform: state
      entity_id: alarm_control_panel.home_alarm
      to: 'armed_away'
  action:
    - service: notify.notify
-      data:
-        message: "ALARM! The alarm is armed in Away mode {{ states('sensor.date__time') }}"
+      data_template:
+        message: "ALARM! The alarm is armed in Away mode {{ states('sensor.date_time') }}"
 ```
 {% endraw %}

 {% raw %}
 ```yaml
 - alias: 'Send notification when alarm is Armed in Home mode'
-  initial_state: 'on'
  trigger:
    - platform: state
      entity_id: alarm_control_panel.home_alarm
      to: 'armed_home'
  action:
    - service: notify.notify
-      data:
-        message: "ALARM! The alarm is armed in Home mode {{ states('sensor.date__time') }}"
+      data_template:
+        # Using multi-line notation allows for easier quoting
+        message: >
+          ALARM! The alarm is armed in Home mode {{ states('sensor.date_time') }}
 ```
 {% endraw %}
--- a/source/_components/mhz19.markdown
+++ b/source/_components/mhz19.markdown
@ -60,4 +60,4 @@ Then (after a reboot): you can setup the sensor using:

 ## Calibration

-The MH-Z19B version of the sensor has Automatic Baseline Calibration enabled by default, which will calibrate the 400PPM level to the lowest measured PPM in the last 24h cycle. Currently the integration does not allow turning this functionaly off.
+The MH-Z19B version of the sensor has Automatic Baseline Calibration enabled by default, which will calibrate the 400PPM level to the lowest measured PPM in the last 24h cycle. Currently the integration does not allow turning this functionality off.
--- a/source/_components/mystrom.markdown
+++ b/source/_components/mystrom.markdown
@ -18,9 +18,12 @@ The `mystrom` light platform allows you to control your [myStrom](https://mystro

 There is currently support for the following device types within Home Assistant:

- [Binary Sensor](#binary-sensor)
 - [Light](#light)
+- [Binary Sensor](#binary-sensor)
+  - [Setup of myStrom Buttons](#setup-of-mystrom-buttons)
 - [Switch](#switch)
+  - [Setup](#setup)
+  - [Get the current power consumption](#get-the-current-power-consumption)

 ## Light

@ -159,7 +162,7 @@ The `mystrom` switch platform allows you to control the state of your [myStrom](
 Make sure that you have enabled the REST API under **Advanced** in the web frontend of the switch.

 <p class='img'>
-  <img src='{{site_root}}/images/components/mystrom/mystrom-advanced.png' />
+  <img src='{{site_root}}/images/components/mystrom/switch-advanced.png' />
 </p>

 To use your myStrom switch in your installation, add the following to your `configuration.yaml` file:
--- a/source/_components/netatmo.markdown
+++ b/source/_components/netatmo.markdown
@ -60,7 +60,7 @@ password:
  required: true
  type: string
 discovery:
-  description: Whether to discover Netatmo devices. Set it to False, if you want to choose which Netatmo device you want to add.
+  description: Whether to discover Netatmo devices automatically. Set it to False, if you want to choose which Netatmo device you want to add. Do not use discovery and manual configuration at the same time.
  required: false
  type: boolean
  default: true
--- a/source/_components/netgear_lte.markdown
+++ b/source/_components/netgear_lte.markdown
@ -171,6 +171,7 @@ This service can set modem configuration options (otherwise available in the mod

 The following automation example processes incoming SMS messages with the [Conversation](/components/conversation/) integration and then deletes the message from the inbox.

+{% raw %}
 ```yaml
 automation:
  - alias: SMS conversation
@ -186,3 +187,4 @@ automation:
          host: '{{ trigger.event.data.host }}'
          sms_id: '{{ trigger.event.data.sms_id }}'
 ```
+{% endraw %}
--- a/source/_components/nilu.markdown
+++ b/source/_components/nilu.markdown
@ -59,7 +59,7 @@ Under the attributes from a NILU station, there will be a `nilu pollution index`

 ### Low

-Low or no health risk linked to measured air pollution. Outdoor activites are recommended.
+Low or no health risk linked to measured air pollution. Outdoor activities are recommended.

 ### Moderate

--- a/source/_components/nissan_leaf.markdown
+++ b/source/_components/nissan_leaf.markdown
@ -44,7 +44,7 @@ region:
  required: true
  type: string
 nissan_connect:
-  description: If your car has the updated head unit (NissanConnect rather than Carwings) then the location can be aquired and exposed via a device tracker. If you have Carwings then this should be set to false. The easiest way to identify NissanConnect is if the T&C buttons are orange and blue, for CarWings they're both blue, or just look for anything saying "CarWings" in Settings area of the infotainment system.
+  description: If your car has the updated head unit (NissanConnect rather than Carwings) then the location can be acquired and exposed via a device tracker. If you have Carwings then this should be set to false. The easiest way to identify NissanConnect is if the T&C buttons are orange and blue, for CarWings they're both blue, or just look for anything saying "CarWings" in Settings area of the infotainment system.
  required: false
  type: boolean
  default: true
--- a/source/_components/notify.markdown
+++ b/source/_components/notify.markdown
@ -10,7 +10,7 @@ ha_release: 0.7

 The `notify` integration makes it possible to send notifications to a wide variety of platforms. Please check the sidebar for a full list of platforms that are supported.

-If you want to send notifications to the Home Assistant Web Interface you may use the [Persistent Notification Component](/components/persistent_notification/).
+If you want to send notifications to the Home Assistant web interface, you may use the [Persistent Notification integration](/components/persistent_notification/).

 ## Service

@ -19,11 +19,11 @@ Once loaded, the `notify` platform will expose a service that can be called to s
 | Service data attribute | Optional | Description |
 | ---------------------- | -------- | ----------- |
 | `message`              |       no | Body of the notification.
-| `title`                |      yes | Title of the notification. Default is `Home Assistant`.
-| `target`               |      yes | Some platforms will allow specifying a recipient that will receive the notification. See your platform page if it is supported.
+| `title`                |      yes | Title of the notification.
+| `target`               |      yes | Some platforms allow specifying a recipient that will receive the notification. See your platform page if it is supported.
 | `data`                 |      yes | On platforms who have extended functionality. See your platform page if it is supported.

-The notification integration supports specifying [templates](/topics/templating/) with `data_template`. This will allow you to use the current state of Home Assistant in your notifications.
+The notify integration supports specifying [templates](/topics/templating/) with `data_template`. This will allow you to use the current state of Home Assistant in your notifications.

 In an [action](/getting-started/automation-action/) of your [automation setup](/getting-started/automation/) it could look like this with a customized subject.

@ -37,7 +37,7 @@ action:

 ### Test if it works

-A simple way to test if you have set up your notify platform correctly, is to use <img src='/images/screenshots/developer-tool-services-icon.png' alt='service developer tool icon' class="no-shadow" height="38" /> **Services** from the **Developer Tools**. Choose your service from the dropdown menu **Service**, enter something like the sample below into the **Service Data** field, and hit **CALL SERVICE**.
+A simple way to test if you have set up your notify platform correctly, is to open **Developer Tools** from the sidebar and then select the  **Services** tab. Choose your service from the **Service** dropdown menu, enter the sample below into the **Service Data** field, and press the **CALL SERVICE** button.

 ```json
 {
--- a/source/_components/openhome.markdown
+++ b/source/_components/openhome.markdown
@ -11,7 +11,7 @@ redirect_from:
 ---


-The `openhome` platform allows you to connect an [Openhome Compliant Renderer](https://www.openhome.org) to Home Assistant such as a [Linn Products Ltd](https://www.linn.co.uk) HiFi streamer. It will allow you to control media playback, volume, source and see the current playing item. Openhome devices should be discovered by using the [the discovery component](/components/discovery/), their device names are taken from the name of the room configured on the device.
+The `openhome` platform allows you to connect an [Openhome Compliant Renderer](http://openhome.org/) to Home Assistant such as a [Linn Products Ltd](https://www.linn.co.uk) HiFi streamer. It will allow you to control media playback, volume, source and see the current playing item. Openhome devices should be discovered by using the [the discovery component](/components/discovery/), their device names are taken from the name of the room configured on the device.

 ```yaml
 # Example configuration.yaml entry
--- a/source/_components/openwrt.markdown
+++ b/source/_components/openwrt.markdown
@ -34,7 +34,7 @@ There are _multiple_ ways of integrating an OpenWRT router for presence detectio

 ### Event-based device tracker

-This can be achieved by running a simple shell script on the OpenWRT router which calls the appropriate Home Assistant service. An OpenWRT package which does this is listed above. As this method directly calls the [service API](/developers/rest_api.markdown#post-apiservicesltdomainltservice), no special configuration is necessary on the Home Assistant side, except for ensuring the device_tracker API is running, which is achieved by adding the following to your `configuration.yaml` file:
+This can be achieved by running a simple shell script on the OpenWRT router which calls the appropriate Home Assistant service. An OpenWRT package which does this is listed above. As this method directly calls the [service API](https://developers.home-assistant.io/docs/en/external_api_rest.html#post-api-services-lt-domain-lt-service), no special configuration is necessary on the Home Assistant side, except for ensuring the device_tracker API is running, which is achieved by adding the following to your `configuration.yaml` file:

 ```yaml
 device_tracker:
--- a/source/_components/orangepi_gpio.markdown
+++ b/source/_components/orangepi_gpio.markdown
@ -64,7 +64,7 @@ As this platform supports different types of GPIO pinouts for difference Orange
 | `neocore2` | Supports the NanoPi Neocore 2 |

 ## Additional steps
-This integration uses the `SYSFS` filesystem to get control of the GPIOs. Therefore an operatings system with `CONFIG_GPIO_SYSFS` is required. As far as I know, most out-of-the-box distributions still enable this by default.
+This integration uses the `SYSFS` filesystem to get control of the GPIOs. Therefore an operating system with `CONFIG_GPIO_SYSFS` is required. As far as I know, most out-of-the-box distributions still enable this by default.

 As of Linux 4.8 sysfs-gpio is marked as obsolete. However as of today, the alternative GPIO character device is not widely used. Therefore we will use this until the new character device is more widely supported.

--- a/source/_components/panasonic_bluray.markdown
+++ b/source/_components/panasonic_bluray.markdown
@ -21,7 +21,7 @@ Currently known supported models:
 - DMP-BDT500
 - DMP-BBT01

-If your model is not on the list, then give it a try, if everything works correctly then add it to the list on [GitHub](https://github.com/home-assistant/home-assistant.github.io/blob/current/source/_components/media_player.panasonic_bluray.markdown).
+If your model is not on the list, then give it a try, if everything works correctly then add it to the list on [GitHub](https://github.com/home-assistant/home-assistant.io/blob/current/source/_components/panasonic_bluray.markdown).

 Example configuration:

--- a/source/_components/panasonic_viera.markdown
+++ b/source/_components/panasonic_viera.markdown
@ -29,7 +29,7 @@ Currently known supported models:
 - TX-42AS650
 - TX55ASW654

-If your model is not on the list then give it a test, if everything works correctly then add it to the list on [GitHub](https://github.com/home-assistant/home-assistant.github.io/blob/next/source/_components/media_player.panasonic_viera.markdown).
+If your model is not on the list then give it a test, if everything works correctly then add it to the list on [GitHub](https://github.com/home-assistant/home-assistant.io/blob/current/source/_components/panasonic_viera.markdown).

 Some Panasonic Viera TVs allow Home Assistant to turn them on, if you specify the MAC address with `mac:`.

--- a/source/_components/panel_custom.markdown
+++ b/source/_components/panel_custom.markdown
@ -3,7 +3,7 @@ title: "Panel Custom"
 description: "Instructions on how to add customized panels to the frontend of Home Assistant."
 logo: home-assistant.png
 ha_category:
-  - Front end
+  - Front End
 ha_release: 0.26
 ha_qa_scale: internal
 ---
--- a/source/_components/panel_iframe.markdown
+++ b/source/_components/panel_iframe.markdown
@ -3,7 +3,7 @@ title: "Panel iFrame"
 description: "Instructions on how to add iFrames in the frontend of Home Assistant."
 logo: home-assistant.png
 ha_category:
-  - Front end
+  - Front End
 ha_release: 0.25
 ha_qa_scale: internal
 ---
--- a/source/_components/persistent_notification.markdown
+++ b/source/_components/persistent_notification.markdown
@ -8,7 +8,7 @@ ha_release: 0.23
 ha_qa_scale: internal
 ---

-The `persistent_notification` can be used to show a message on the frontend that has to be dismissed by the user.
+The `persistent_notification` integration can be used to show a notfication on the frontend that has to be dismissed by the user.

 <p class='img'>
  <img src='/images/screenshots/persistent-notification.png' />
@ -16,7 +16,7 @@ The `persistent_notification` can be used to show a message on the frontend that

 ### Service

-The service `persistent_notification/create` takes in `message`, `title`, and `notification_id`.
+The service `persistent_notification.create` takes in `message`, `title`, and `notification_id`.

 | Service data attribute | Optional | Description |
 | ---------------------- | -------- | ----------- |
@ -36,7 +36,7 @@ action:
    title: "Custom subject"
 ```

-The service `persistent_notification/dismiss` requires a `notification_id`.
+The service `persistent_notification.dismiss` requires a `notification_id`.

 | Service data attribute | Optional | Description |
 | ---------------------- | -------- | ----------- |
@ -97,7 +97,7 @@ The message attribute supports the [Markdown formatting syntax](https://daringfi

 ### Create a persistent notification

-Choose <img src='/images/screenshots/developer-tool-services-icon.png' alt='service developer tool icon' class="no-shadow" height="38" /> **Services** from the **Developer Tools** to call the `persistent_notification` service. Select `persistent_notification/create` from the list of **Available services:** and enter something like the sample below into the **Service Data** field and hit **CALL SERVICE**.
+Choose the **Services** tab from the **Developer Tools** sidebar item, then select the `persistent_notification.create` service from the "Service" dropdown. Enter something like the sample below into the **Service Data** field and press the **CALL SERVICE** button.

 ```json
 {
--- a/source/_components/point.markdown
+++ b/source/_components/point.markdown
@ -86,7 +86,7 @@ Each Point exposes the following binary sensors:

 <div class="note">

-The binary sensors **button_press**, **sound** and **tamper** are switched `On` for a breif moment and are then switched back to `Off`.
+The binary sensors **button_press**, **sound** and **tamper** are switched `On` for a brief moment and are then switched back to `Off`.

 </div>

--- a/source/_components/ps4.markdown
+++ b/source/_components/ps4.markdown
@ -5,14 +5,13 @@ logo: ps4.png
 ha_category:
  - Media Player
 ha_release: 0.89
+ha_config_flow: true
 ha_iot_class: Local Polling
 ---

 The `ps4` integration allows you to control a
 [Sony PlayStation 4 console](https://www.playstation.com/en-us/explore/ps4/).

- This integration supports controlling a single PlayStation 4 for your instance. Additional consoles may be supported in a future release.
-
 ## Requirements

 - Android or iOS device
@ -26,7 +25,7 @@ The `ps4` integration allows you to control a
  Read the section "Granting Port Access" below before continuing.
 </div>

-2. Navigate to `Configuration -> Integrations` and select `Configure` for `PlayStation 4`.
+2. Navigate to `Configuration -> Integrations` and press the plus button in the bottom right corner. Select `PlayStation 4` from the list of integrations.

 3. Follow instructions displayed to generate user credentials. You will know this step is completed when a form with fields appears.

@ -71,7 +70,7 @@ sudo setcap 'cap_net_bind_service=+ep' /usr/bin/python3.5

 To find your system Python path:

- Add the [System Health](/components/system_health/) integration to your `configuration.yaml`. In a web browser access your frontend and navigate to the about/logs page "http://<yourhomeassistanturl>/dev-info). In the System Health box locate the item **python_version** and note the value that is displayed. Then in terminal run:
+- Add the [System Health](/components/system_health/) integration to your `configuration.yaml`. In a web browser access your frontend and navigate to the about/logs page "http://<yourhomeassistanturl>/developer-tools/info). In the System Health box locate the item **python_version** and note the value that is displayed. Then in terminal run:

  ```bash
  whereis python<version>
@ -116,11 +115,11 @@ Some titles will have different SKUs in the PlayStation Store database depending

 |  Available Regions                                                          | Unavailable Regions        |
 | --------------------------------------------------------------------------- | -------------------------- |
-| Argentina, Australia, Austria, Bahrain, Belgium, Brazil, Bulgaria,          | China, Japan, Phillipines, |
+| Argentina, Australia, Austria, Bahrain, Belgium, Brazil, Bulgaria,          | China, Japan, Philippines, |
 | Canada, Chile, Columbia, Costa Rica, Croatia, Cyprus, Czech Republic,       | Serbia, Ukraine, Vietnam   |
 | Denmark, Ecuador, El Salvador, Finland, France, Germany, Greece, Guatemala, |                            |
 | Honduras, Hong Kong, Hungary, Iceland, India, Indonesia, Ireland, Israel,   |                            |
-| Italy, Korea, Kuwait, Lebanon, Luxembourg, Malta, Maylasia, Mexico,         |                            |
+| Italy, Korea, Kuwait, Lebanon, Luxembourg, Malta, Malaysia, Mexico,         |                            |
 | Middle East, Nederland, New Zealand, Nicaragua, Norway, Oman, Panama,       |                            |
 | Peru, Poland, Portugal, Qatar, Romania, Russia, Saudi Arabia, Singapore,    |                            |
 | Slovakia, Slovenia, South Africa, Spain, Sweden, Switzerland, Taiwan,       |                            |
--- a/source/_components/ptvsd.markdown
+++ b/source/_components/ptvsd.markdown
@ -40,7 +40,7 @@ wait:

 ### Security

-Ensure if this is a public-facing server, that the port is secured. Anyone who is able to access the debugger port can *execute arbitary code* on the home assistant server, which is very unsafe.
+Ensure if this is a public-facing server, that the port is secured. Anyone who is able to access the debugger port can *execute arbitrary code* on the home assistant server, which is very unsafe.

 If the home assistant server is behind your firewall with only the http(s) port exposed, then this is safe from outside connections.

--- a/source/_components/recorder.markdown
+++ b/source/_components/recorder.markdown
@ -8,7 +8,7 @@ ha_release: pre 0.7
 ha_qa_scale: internal
 ---

-The `recorder` integration is responsible for storing details in a database, which then are handled by the [`history` component](/components/history/).
+The `recorder` integration is responsible for storing details in a database, which then are handled by the [`history` integration](/components/history/).

 Home Assistant uses [SQLAlchemy](http://www.sqlalchemy.org/), which is an Object Relational Mapper (ORM). This means that you can use **any** SQL backend for the recorder that is supported by SQLAlchemy, like [MySQL](https://www.mysql.com/), [MariaDB](https://mariadb.org/), [PostgreSQL](https://www.postgresql.org/), or [MS SQL Server](https://www.microsoft.com/en-us/sql-server/).

@ -23,7 +23,7 @@ recorder:

 {% configuration %}
 recorder:
-  description: Enables the recorder component. Only allowed once.
+  description: Enables the recorder integration. Only allowed once.
  required: true
  type: map
  keys:
@ -115,7 +115,7 @@ recorder:
     - sensor.date
 ```

-If you only want to hide events from your history, take a look at the [`history` component](/components/history/). The same goes for the [logbook](/components/logbook/). But if you have privacy concerns about certain events or want them in neither the history or logbook, you should use the `exclude`/`include` options of the `recorder` component. That way they aren't even in your database, you can reduce storage and keep the database small by excluding certain often-logged events (like `sensor.last_boot`).
+If you only want to hide events from your history, take a look at the [`history` integration](/components/history/). The same goes for the [logbook](/components/logbook/). But if you have privacy concerns about certain events or want them in neither the history or logbook, you should use the `exclude`/`include` options of the `recorder` integration. That way they aren't even in your database, you can reduce storage and keep the database small by excluding certain often-logged events (like `sensor.last_boot`).

 ### Service `purge`

--- a/source/_components/rest_command.markdown
+++ b/source/_components/rest_command.markdown
@ -24,7 +24,7 @@ rest_command:

 {% configuration %}
 service_name:
-  description: The name used to expose the service. E.g., in the above example, it would be 'rest_command.service_name'.
+  description: The name used to expose the service. E.g., in the above example, it would be 'rest_command.example_request'.
  required: true
  type: map
  keys:
--- a/source/_components/rss_feed_template.markdown
+++ b/source/_components/rss_feed_template.markdown
@ -3,7 +3,7 @@ title: "RSS feed template"
 description: "Use this integration to generate RSS feeds showing your latest data."
 logo: home-assistant.png
 ha_category:
-  - Front end
+  - Front End
 ha_release: 0.44
 ha_qa_scale: internal
 ---
--- a/source/_components/scrape.markdown
+++ b/source/_components/scrape.markdown
@ -165,7 +165,7 @@ sensor:

 ### BOM Weather

-The Australian Bureau of Meterology website returns an error if the User Agent header is not sent.
+The Australian Bureau of Meteorology website returns an error if the User Agent header is not sent.

 {% raw %}
 ```yaml
--- a/source/_components/sensibo.markdown
+++ b/source/_components/sensibo.markdown
@ -61,12 +61,12 @@ switch:
        friendly_name: "AC"
        value_template: "{{ is_state('climate.ac', 'cool') or is_state('climate.ac', 'heat') or is_state('climate.ac', 'dry') or is_state('climate.ac', 'fan_only') }}"
        turn_on:
-          service: climate.set_havc_mode
+          service: climate.set_hvac_mode
          data:
            entity_id: climate.ac
            hvac_mode: cool
        turn_off:
-          service: climate.set_havc_mode
+          service: climate.set_hvac_mode
          data:
            entity_id: climate.ac
            hvac_mode: off
--- a/source/_components/sensor.rfxtrx.markdown
+++ b/source/_components/sensor.rfxtrx.markdown
@ -54,17 +54,28 @@ sensor:

 Only these data_type are valid:

- *Temperature*
+- *Temperature*, *Temperature2*
 - *Humidity*
+- *Humidity status*
 - *Barometer*
 - *Wind direction*
+- *Wind average speed*
+- *Wind gust*
 - *Rain rate*
- *Energy usage*
- *Total usage*
+- *Rain total*
 - *Sound*
 - *Sensor Status*
 - *Counter value*
 - *UV*
+- *Forecast*
+- *Forecast numeric*
+- *Chill*
+- *Energy usage*
+- *Total usage*
+- *Voltage*
+- *Current*
+- *Battery numeric*
+- *Rssi numeric*

 Example configuration:

--- a/source/_components/smartthings.markdown
+++ b/source/_components/smartthings.markdown
@ -345,7 +345,7 @@ If you have completed the checklist above and are still unable to setup the plat

 ### Debugging

-The SmartThings integration will log additional information about push updates received, events fired, and other messages when the log level is set to `debug`. Add the the relevent line below to the `configuration.yaml`:
+The SmartThings integration will log additional information about push updates received, events fired, and other messages when the log level is set to `debug`. Add the the relevant line below to the `configuration.yaml`:

 ```yaml
 logger:
--- a/source/_components/switcher_kis.markdown
+++ b/source/_components/switcher_kis.markdown
@ -26,7 +26,7 @@ To retrieve your device's details, please follow the instructions [here](https:/

 <div class='note warning'>

-  Please note, on the original script repository, users recently reported difficulties controling the device after upgrading the firmware to the new 3.0 version.As this integration is based on that script, please do not upgrade to version 3.0 until this issue is resolved. You can follow the issue [here](https://github.com/NightRang3r/Switcher-V2-Python/issues/3).
+  Please note, on the original script repository, users recently reported difficulties controlling the device after upgrading the firmware to the new 3.0 version.As this integration is based on that script, please do not upgrade to version 3.0 until this issue is resolved. You can follow the issue [here](https://github.com/NightRang3r/Switcher-V2-Python/issues/3).

 </div>
 ```yaml
--- a/source/_components/telegram.markdown
+++ b/source/_components/telegram.markdown
@ -20,9 +20,7 @@ The requirements are:
 - You need to configure a [Telegram bot in Home Assistant](/components/telegram_bot) and define there your API key and the allowed chat ids to interact with.
 - The `chat_id` of an allowed user.

-To retrieve your `chat_id`, contact any of the Telegram bots created for this purpose (@myidbot, @get_id_bot)
-
-The quickest way to retrieve your `chat_id` is visiting [https://api.telegram.org/botYOUR_API_TOKEN/getUpdates](https://api.telegram.org/botYOUR_API_TOKEN/getUpdates) or to use `$ curl -X GET https://api.telegram.org/botYOUR_API_TOKEN/getUpdates`. Replace `YOUR_API_TOKEN` with your actual token.
+The quickest way to retrieve your `chat_id` is visiting [https://api.telegram.org/botYOUR_API_TOKEN/getUpdates](https://api.telegram.org/botYOUR_API_TOKEN/getUpdates) or to use `$ curl -X GET https://api.telegram.org/botYOUR_API_TOKEN/getUpdates` **after** you have sent the bot a message. Replace `YOUR_API_TOKEN` with your actual token.

 The result set will include your chat ID as `id` in the `chat` section:

--- a/source/_components/tellstick.markdown
+++ b/source/_components/tellstick.markdown
@ -17,13 +17,16 @@ redirect_from:
  - /components/switch.tellstick/
 ---

-The `tellstick` integration integrates [TellStick](https://telldus.com/produkt/z-wave-gateway-tellstick-znet-lite-ver-2/) devices into Home Assistant. This integration allows users to add switches, lights, and sensors which are communicating with 433 MHz. There are a number of vendors (Capidi Elro, Intertechno, Nexa, Proove, Sartano, and Viking) who are selling products that work with TellStick. For more details, please check the TellStick [protocol list](http://developer.telldus.com/wiki/TellStick_conf).
+The `tellstick` integration integrates [TellStick][tellstick-gateway] devices into Home Assistant. This integration allows users to add switches, lights, and sensors which are communicating with 433 MHz. There are a number of vendors (Capidi Elro, Intertechno, Nexa, Proove, Sartano, and Viking) who are selling products that work with TellStick. For more details, please check the TellStick [protocol list](http://developer.telldus.com/wiki/TellStick_conf).

 There is currently support for the following device types within Home Assistant:

+- [Configuration](#configuration)
 - [Cover](#cover)
 - [Light](#light)
 - [Sensor](#sensor)
+- [Examples](#examples)
+  - [Full configuration](#full-configuration)
 - [Switch](#switch)

 ## Configuration
@ -62,7 +65,7 @@ port:

 ## Cover

-This `tellstick` cover platform allows you to control your [TellStick](http://www.telldus.se/products/tellstick) covers.
+This `tellstick` cover platform allows you to control your [TellStick][tellstick-gateway] covers.

 To use your TellStick device, you first have to set up your [Tellstick hub](#configuration) and then add the following to your `configuration.yaml` file:

@ -74,7 +77,7 @@ cover:

 ## Light

-This `tellstick` light platform allows you to control your [TellStick](http://www.telldus.se/products/tellstick) dimmers.
+This `tellstick` light platform allows you to control your [TellStick][tellstick-gateway] dimmers.

 To use your TellStick device, you first have to set up your [Tellstick hub](#configuration) and then add the following to your `configuration.yaml` file:

@ -86,7 +89,7 @@ light:

 ## Sensor

-The `tellstick` sensor platform allows you to get current meteorological data from a [TellStick](http://www.telldus.se/products/tellstick) device.
+The `tellstick` sensor platform allows you to get current meteorological data from a [TellStick][tellstick-gateway] device.

 To use your TellStick device, you first have to set up your [Tellstick hub](#configuration) and then add the following to your `configuration.yaml` file:

@ -148,7 +151,7 @@ sensor:

 ## Switch

-This `tellstick` switch platform allows you to control [TellStick](http://www.telldus.se/products/tellstick) devices.
+This `tellstick` switch platform allows you to control [TellStick][tellstick-gateway] devices.

 To use your TellStick device, you first have to set up your [Tellstick hub](#configuration) and then add the following to your `configuration.yaml` file:

@ -157,3 +160,5 @@ To use your TellStick device, you first have to set up your [Tellstick hub](#con
 switch:
  - platform: tellstick
 ```
+
+[tellstick-gateway]: https://telldus.com/produkt/z-wave-gateway-tellstick-znet-lite-ver-2/
--- a/source/_components/tensorflow.markdown
+++ b/source/_components/tensorflow.markdown
@ -36,7 +36,7 @@ This integration requires files to be downloaded, compiled on your computer, and
        |- __init__.py
 ```

- Copy required object_detection dependancies to the `object_detection` folder inside of the `tensorflow` folder:
+- Copy required object_detection dependencies to the `object_detection` folder inside of the `tensorflow` folder:

  - `research/object_detection/data`
  - `research/object_detection/utils`
--- a/source/_components/traccar.markdown
+++ b/source/_components/traccar.markdown
@ -63,7 +63,7 @@ max_accuracy:
  type: integer
  default: 0
 skip_accuracy_filter_on:
-  description: Skip filter positon by "max_accuracy filter" if any of specified attributes are pressent on the traccar message.
+  description: Skip filter position by "max_accuracy filter" if any of specified attributes are pressent on the traccar message.
  required: false
  type: list
 monitored_conditions:
--- a/source/_components/utility_meter.markdown
+++ b/source/_components/utility_meter.markdown
@ -101,7 +101,7 @@ This service must be called by the user for the tariff switching logic to occur

 The following configuration shows an example where 2 utility_meters (`daily_energy` and `monthly_energy`) track daily and monthly energy consumptions.

-Both track the same sensor (`sensor.energy`) which continously monitors the energy consumed.
+Both track the same sensor (`sensor.energy`) which continuously monitors the energy consumed.

 4 different sensors will be created, 2 per utility meter and corresponding to each tariff.
 Sensor `sensor.daily_energy_peak`, `sensor.daily_energy_offpeak`, `sensor.monthly_energy_peak` and `sensor.monthly_energy_offpeak` will automatically be created to track the consumption in each tariff for the given cycle.
--- a/source/_components/weather.markdown
+++ b/source/_components/weather.markdown
@ -1,12 +1,16 @@
 ---
 title: "Weather"
 description: "Instructions on how to setup your Weather platforms with Home Assistant."
+logo: home-assistant.png
+ha_category:
+  - Weather
+ha_qa_scale: internal
 ha_release: 0.32
 ---

-The `weather` platforms are gathering meteorological information from web services and display the conditions and other details about the weather at the given location.
+The `weather` platforms are gathering meteorological information from web services and display the conditions and other details about the weather at the given location. Read the integration documentation for your particular weather provider to learn how to set it up.

-Home Assistant currently supports free web services and such which require a registration. Please check the sidebar for a full list of supported `weather` platforms.
+Home Assistant currently supports free web services and such which require a registration.

 ## Condition mapping

--- a/source/_components/weblink.markdown
+++ b/source/_components/weblink.markdown
@ -3,7 +3,7 @@ title: "Weblink"
 description: "Instructions on how to setup Links within Home Assistant."
 logo: home-assistant.png
 ha_category:
-  - Front end
+  - Front End
 ha_release: 0.13
 ha_qa_scale: internal
 ---
--- a/source/_components/wink.markdown
+++ b/source/_components/wink.markdown
@ -14,7 +14,7 @@ ha_category:
  - Scene
  - Sensor
  - Switch
-  - Water heater
+  - Water Heater
 featured: true
 ha_iot_class: Cloud Polling
 ha_release: pre 0.7
--- a/source/_components/wwlln.markdown
+++ b/source/_components/wwlln.markdown
@ -27,8 +27,9 @@ many strikes are caught as possible.

 ## Configuration

-To retrieve data from the WWLLN, add the following to your `configuration.yaml`
-file:
+To retrieve data from the WWLLN, edit your `configuration.yaml` file manually or use the "Integrations" feature in the GUI, you find it under Configurations - Integrations.
+
+To manually add the component, add the following to your `configuration.yaml`:

 ```yaml
 wwlln:
@ -51,6 +52,7 @@ window:
 description: The amount of time before now for which strikes should be considered "active" and shown in the UI. Note that a window of less than 1 hour may cause Home Assistant to miss events.
 required: false
 type: time
+default: 10 minutes
 {% endconfiguration %}

 ## State Attributes
@ -59,7 +61,7 @@ The following state attributes are available for each entity in addition to
 the standard ones:

 | Attribute        | Description                                                                   |
-|--------------------|-------------|
+| ---------------- | ----------------------------------------------------------------------------- |
 | latitude         | Latitude of the lightning strike.                                             |
 | longitude        | Longitude of the lightning strike.                                            |
 | source           | `wwlln` to be used in conjunction with the `geo_location` automation trigger. |
--- a/source/_components/yi.markdown
+++ b/source/_components/yi.markdown
@ -33,6 +33,12 @@ Currently, version 0.1.4-beta2 of the custom firmware is the highest supported w

 </div>

+<div class='note warning'>
+
+If you use a version higher than 0.1.4-beta2, you can simply solve the FTP issue by creating a symlink to `/tmp` in the `/home/yi-hack-v4` directory (the directory name can be different depending on the version which you use). For example, access the Yi camera via SSH and type command: `ln -s /tmp tmp`.
+
+</div>
+
 <div class='note warning'>
 Hassbian users: don't forget to install ffmpeg support on your platform, otherwise, you'll not see video.
 </div>
--- a/source/_docs/automation/trigger.markdown
+++ b/source/_docs/automation/trigger.markdown
@ -193,7 +193,7 @@ automation:
    platform: sun
    # Possible values: sunset, sunrise
    event: sunset
-    # Optional time offset. This example will trigger 45 minutes before sunrise.
+    # Optional time offset. This example will trigger 45 minutes before sunset.
    offset: '-00:45:00'
 ```

--- a/source/_docs/configuration/basic.markdown
+++ b/source/_docs/configuration/basic.markdown
@ -4,7 +4,9 @@ description: "Setting up the basic info of Home Assistant."
 redirect_from: /getting-started/basic/
 ---

-By default, Home Assistant will try to detect your location from IP address geolocation. Home Assistant will automatically select a temperature unit and time zone based on this location. You can overwrite this by adding the following information to your `configuration.yaml`:
+As part of the default onboarding proccess, Home Assistant can detect your location from IP address geolocation. Home Assistant will automatically select a temperature unit and time zone based on this location. You may adjust this during onboarding, or afterwards at Configuration -> General. 
+
+If you prefer YAML, you can add the following information to your `configuration.yaml`:

 ```yaml
 homeassistant:
--- a/source/_docs/configuration/customizing-devices.markdown
+++ b/source/_docs/configuration/customizing-devices.markdown
@ -19,7 +19,7 @@ By default, all of your devices will be visible and have a default icon determin

 ### Customization using the UI

-Under the *Configuration* menu you'll find the *Customization* menu. When you select an entity to customize, you'll see all the existing attributes listed and you can customize those, or select an additional supported attribute ([see below](/docs/configuration/customizing-devices/#possible-values)).
+Under the *Configuration* menu you'll find the *Customization* menu. If this menu item is not visible, enable advanced mode on your [profile page](/docs/authentication/#your-account-profile) first. When you select an entity to customize, you'll see all the existing attributes listed and you can customize those, or select an additional supported attribute ([see below](/docs/configuration/customizing-devices/#possible-values)).

 #### Possible values

--- a/source/_docs/configuration/templating.markdown
+++ b/source/_docs/configuration/templating.markdown
@ -74,7 +74,7 @@ The next two statements result in the same value if the state exists. The second
 {% raw %}
 ```text
 {{ states('device_tracker.paulus') }}
-{{ states('device_tracker.paulus') }}
+{{ states.device_tracker.paulus }}
 ```
 {% endraw %}

--- a/source/_docs/ecosystem/hass-configurator.markdown
+++ b/source/_docs/ecosystem/hass-configurator.markdown
@ -108,7 +108,7 @@ Since the configurator script on its own is no service, you will have to take so
 `nohup sudo ./configurator.py &`
 2. If your system is using systemd (that's usually what you'll find on a Raspberry Pi), there's a [template file](https://github.com/danielperna84/hass-configurator/blob/master/hass-configurator.systemd) you can use and then apply the same process to integrate it as mentioned in the [Home Assistant documentation](/docs/autostart/systemd/). If you use this method you have to set the `BASEPATH` variable according to your environment.
 3. If you have [supervisor](http://supervisord.org/) running on your system, [hass-poc-configurator.supervisor](https://github.com/danielperna84/hass-configurator/blob/master/hass-configurator.supervisor) would be an example configuration you could use to control the configurator.
-4. A tool called [tmux](https://tmux.github.io/), which should be pre-installed with [HASSbian](/docs/hassbian/).
+4. A tool called [tmux](https://tmux.github.io/), which should be pre-installed with [HASSbian](/docs/installation/hassbian/).
 5. A tool called [screen](http://ss64.com/bash/screen.html) (alternative to tmux). If it's not already installed on your system, you can do `sudo apt-get install screen` or `sudo yum install screen` to get it. When it's installed, start a screen session by executing `screen`. Then navigate to your Home Assistant directory and start the configurator like described above. Put the screen session into the background by pressing `CTRL+A` and then `CTRL+D`. It is now safe to disconnect from your SSH session.
 To resume the screen session, log in to your machine and execute `screen -r`.

--- a/source/_docs/installation/archlinux.markdown
+++ b/source/_docs/installation/archlinux.markdown
@ -8,18 +8,9 @@ description: "Installation of Home Assistant on your Arch Linux computer."
 Install the needed Python packages.

 ```bash
-$ sudo pacman -S python
-$ sudo pacman -S python-pip
+sudo pacman -S python
+sudo pacman -S python-pip
 ```

-and Home Assistant itself.
-
-```bash
-$ pip3 install --user homeassistant
-```
-
-Home Assistant is part of the [AUR](https://aur.archlinux.org/packages/home-assistant/). This means that it can be installed with `pacaur`. This package is often broken or outdated:
-
-```bash
-$ pacaur -S home-assistant
-```
+From here on, we recommend you to follow the
+[virtualenv](https://www.home-assistant.io/docs/installation/virtualenv/) guide.
--- a/source/_docs/installation/docker.markdown
+++ b/source/_docs/installation/docker.markdown
@ -4,6 +4,8 @@ description: "Instructions to install Home Assistant on a Docker."
 redirect_from: /getting-started/installation-docker/
 ---

+## Platform Installation
+
 Installation with Docker is straightforward. Adjust the following command so that `/PATH_TO_YOUR_CONFIG` points at the folder where you want to store your configuration and run it:

 ### Linux
@ -176,14 +178,14 @@ device_tracker:
  - platform: bluetooth_tracker
 ```

-### Restart
+## Restart

 If you change the configuration you have to restart the server. To do that you have 2 options.

 1. You can go to the <img src='/images/screenshots/developer-tool-services-icon.png' alt='service developer tool icon' class="no-shadow" height="38" /> service developer tools, select the service `homeassistant/restart` and click "Call Service".
 2. Or you can restart it from a terminal by running `docker restart home-assistant`

-### Docker Compose
+## Docker Compose

 As the docker command becomes more complex, switching to `docker-compose` can be preferable and support automatically restarting on failure or system restart. Create a `docker-compose.yml` file:

@ -212,7 +214,7 @@ To restart Home Assistant when you have changed configuration:
 $ docker-compose restart
 ```

-### Exposing Devices
+## Exposing Devices

 In order to use Z-Wave, Zigbee or other integrations that require access to devices, you need to map the appropriate device into the container. Ensure the user that is running the container has the correct privileges to access the `/dev/tty*` file, then add the device mapping to your docker command:

--- a/source/_docs/installation/freenas.markdown
+++ b/source/_docs/installation/freenas.markdown
@ -42,8 +42,8 @@ Install Home Assistant itself:
 ```bash
 # su homeassistant
 % cd /usr/local/share/homeassistant
-% source ./bin/activate.csh
 % virtualenv -p python3.7 .
+% source ./bin/activate.csh
 % pip3 install homeassistant
 % deactivate
 % exit
--- a/source/_docs/installation/virtualenv.markdown
+++ b/source/_docs/installation/virtualenv.markdown
@ -98,9 +98,11 @@ $ pip3 install --upgrade git+git://github.com/home-assistant/home-assistant.git@
 - It's recommended to run Home Assistant as a dedicated user.
 - If you want Home Assistant to automatically start at boot, check the [autostart docs](/docs/autostart/)

-<p class='info'>
+<div class='info'>
+ 
 Looking for more advanced guides? Check our [Raspbian guide](/docs/installation/raspberry-pi/) or the [other installation guides](/docs/installation/).
-</p>
+
+</div>

 ### After upgrading Python

--- a/source/_docs/mqtt/testing.markdown
+++ b/source/_docs/mqtt/testing.markdown
@ -16,7 +16,7 @@ If you are using the embedded MQTT broker, the command looks a little different
 $ mosquitto_pub -V mqttv311 -u homeassistant -P <broker password> -t "hello" -m world
 ```

-Another way to send MQTT messages by hand is to use the "Developer Tools" in the Frontend. Choose "Call Service" and then `mqtt/mqtt_send` under "Available Services". Enter something similar to the example below into the "Service Data" field.
+Another way to send MQTT messages by hand is to use the "Developer Tools" in the Frontend. Choose "Call Service" and then `mqtt.publish` under "Available Services". Enter something similar to the example below into the "Service Data" field.

 ```json
 {
--- a/source/_docs/tools/dev-tools.markdown
+++ b/source/_docs/tools/dev-tools.markdown
@ -95,6 +95,3 @@ Even though MQTT in general provides deeper functionality, the developer tools s
 Info

 The Information tab simply provides information about the current installed version, additional links and credits. The tab also contains a section that shows `syslog` information, and the contents of `home-assistant.log` with an option to clear and refresh the logs.
-
-The Information tab also allows makes it possible to try out the Lovelace User Interface (UI) by clicking "Try out the new Lovelace UI" or set Lovelace as the default UI, so that when the "Overview" link in the Sidebar is selected, the Lovelace UI will load by default.
-
--- a/source/_docs/z-wave/controllers.markdown
+++ b/source/_docs/z-wave/controllers.markdown
@ -7,6 +7,12 @@ description: "Extended instructions how to setup Z-Wave."

 You need to have a compatible Z-Wave stick or module installed. This needs to be a *static controller*, which most Z-Wave sticks and modules will be. If yours is a *bridge* device then it won't work with [OpenZWave](http://openzwave.com/), which is what provides Home Assistant's Z-Wave capabilities. The following devices have been confirmed to work:

+<p class='note'>
+
+There have [been reports](https://www.raspberrypi.org/forums/viewtopic.php?f=28&t=245031#p1502030) of the Aeotec stick not working on the Raspberry Pi 4.
+
+</p>
+
 * Aeotec Z-Stick Series 5
 * Everspring USB stick - Gen 5
 * Sigma Designs UZB stick
--- a/source/_docs/z-wave/installation.markdown
+++ b/source/_docs/z-wave/installation.markdown
@ -160,11 +160,10 @@ On the Raspberry Pi you will need to enable the serial interface in the `raspi-c

 #### Linux (except Hassbian)

-On Debian Linux platforms there two dependencies you will need to have installed ahead of time (included in `systemd-devel` on Fedora/RHEL systems):
+On Debian Linux platforms there are dependencies you will need to have installed ahead of time (included in `systemd-devel` on Fedora/RHEL systems):

 ```bash
 $ sudo apt-get install libudev-dev
-$ sudo apt-get install libopenzwave1.5-dev
 ```

 You may also have to install the Python development libraries for your version of Python. For example `libpython3.6-dev`, and possibly `python3.6-dev` if you're using Python 3.6.
--- a/source/_includes/site/head.html
+++ b/source/_includes/site/head.html
@ -26,7 +26,7 @@
    {% if page.author_twitter %}<meta name="twitter:creator" content="@{{ page.author_twitter }}">{% endif %}
    <meta name="twitter:title" content="{% if post.title %}{{ post.title }}{% elsif page.title %}{{ page.title }}{% else %}{{ site.title }}{% endif %}">
    <meta name="twitter:description" content="{{ page.description | default: site.description | strip_html | truncate: 200 }}">
-    <meta name="twitter:image" content="{{ social_image }}">
+    <meta name="twitter:image" content="{{ page.og_image | default: "/images/default-social.png" | prepend: site.url }}">

    <link href="/stylesheets/prism.css" rel="stylesheet">
    <link href="/stylesheets/screen.css" media="screen, projection, print" rel="stylesheet">
--- a/source/_lovelace/history-graph.markdown
+++ b/source/_lovelace/history-graph.markdown
@ -27,7 +27,7 @@ entities:
  type: list
 hours_to_show:
  required: false
-  description: Hours to show. Minimum is 10 hours, maximum of 80 hours.
+  description: Hours to show. Minimum is 1 hour, maximum of 80 hours.
  type: integer
  default: 24
 refresh_interval:
--- a/source/_posts/2016-02-13-speedtest-bloomsky-splunk-and-garage-doors.markdown
+++ b/source/_posts/2016-02-13-speedtest-bloomsky-splunk-and-garage-doors.markdown
@ -22,7 +22,7 @@ Not only did we gain a lot of test coverage, we also attracted a lot of new deve

 - Core: Add service to restart Home Assistant ([@rmkraus])
 - Core: Allow device to report as unavailable ([@MartinHjelmare])
- - Core: Allow overriding polling interval in platforms and [via config][polling-config] ([@balloob])
+ - Core: Allow overriding polling interval in platforms and via config ([@balloob])
 - Frontend: support for a [default view] have been added to replace the show all view ([@balloob])
 - Component: Added [apcupsd] component ([@flyte])
 - Component: Added component to log values to [Splunk] ([@miniconfig])
@ -82,7 +82,6 @@ Not only did we gain a lot of test coverage, we also attracted a lot of new deve
 [@Danielhiversen]: https://github.com/Danielhiversen/
 [@roqeer]: https://github.com/roqeer/
 [@jaharkes]: https://github.com/jaharkes/
-[polling-config]: /cookbook/customize_polling_interval/
 [default view]: /components/group/
 [apcupsd]: /components/apcupsd/
 [Splunk]: /components/splunk/
--- a/source/_posts/2016-03-12-z-wave-pep257-templated-service-calls.markdown
+++ b/source/_posts/2016-03-12-z-wave-pep257-templated-service-calls.markdown
@ -49,7 +49,7 @@ automation:
 `media_content_type` and `media_content_id`, to match the corresponding media
 player state attributes. This change affects automations, scripts and scenes.

-[services]: /topics/service_calls/#use-templates-to-decide-which-service-to-call
+[services]: /docs/scripts/service-calls/#use-templates-to-decide-which-service-to-call
 [Hunter Douglas Powerview]: /components/scene.hunterdouglas_powerview/
 [MQTT]: /components/lock.mqtt/
 [OwnTracks]: /components/device_tracker.owntracks/
--- a/source/_posts/2016-06-18-pandora-bt-home-hub-5-and-local-file-camera.markdown
+++ b/source/_posts/2016-06-18-pandora-bt-home-hub-5-and-local-file-camera.markdown
@ -88,5 +88,5 @@ netatmo:
 [Swagger.yaml format]: https://github.com/home-assistant/home-assistant/blob/dev/docs/swagger.yaml
 [All-in-One installer]: /getting-started/installation-raspberry-pi-all-in-one/
 [standalone Raspberry Pi installation guide]: /getting-started/installation-raspberry-pi/
-[Voltage sensor]: /components/sensor.bloomsky/
+[Voltage sensor]: /components/bloomsky/#sensor
 [SNMP]: /components/sensor.snmp/
--- a/source/_posts/2016-10-22-flash-briefing-updater-hacktoberfest.markdown
+++ b/source/_posts/2016-10-22-flash-briefing-updater-hacktoberfest.markdown
@ -183,7 +183,7 @@ This is super annoying, I know, especially since we had said in [0.12][zero-one-
 - Notify: [Matrix] support added ([@mweinelt])
 - Device tracker - nmap: Allow specifying multiple inputs for [nmap] ([@hcooper])
 - Device Tracker - snmp: SNMPv3 now supported ([@T3m3z])
- Notify: [Telstra] SMS now supported ([@nvella])
+- Notify: Telstra SMS now supported ([@nvella])
 - Camera: [Verisure] now supported ([@turbokongen])
 - Support added for [Neato] Connected Robot ([@jabesq])
 - Media player: More options for [Yamaha] AVR ([@ehagan])
@ -268,19 +268,18 @@ Thanks for reading all of the above, especially since this week was a pretty lon
 [Concord232]: /components/alarm_control_panel.concord232/
 [HTTP]: /components/http/
 [HaveIBeenPwned]: /components/sensor.haveibeenpwned/
-[Matrix]: //components/notify.matrix/
+[Matrix]: /components/matrix/#notifications
 [Neato]: /components/switch.neato/
 [Pilight]: /components/sensor.pilight/
 [Proximity]: /components/proximity/
 [PyPi]: https://pypi.python.org/pypi
 [Synology]: /components/camera.synology/
-[Telstra]: /components/notify.telstra/
 [UUID]: https://en.wikipedia.org/wiki/Universally_unique_identifier
 [Verisure]: /components/camera.verisure/
 [WUnderground]: /components/sensor.wunderground/
 [Yamaha]: /components/media_player.yamaha/
 [Zoneminder]: /components/zoneminder/
-[emoncms]: //components/emoncms_history/
+[emoncms]: /components/emoncms_history/
 [filtering]: /components/logbook/
 [flash-briefing-docs]: /components/alexa/
 [hacktoberfest-blog]: /blog/2016/10/02/hacktoberfest/
--- a/source/_posts/2017-04-24-hardware-contest-2017.markdown
+++ b/source/_posts/2017-04-24-hardware-contest-2017.markdown
@ -11,10 +11,10 @@ og_image: /images/default-social.png

 We have four submissions for our [Hardware Contest 2017][hardware].

- [Part of IoT-course](https://community.home-assistant.io/t/entry-for-hardware-contest-part-of-iot-course/14827)
- [Automating a nursing home!](https://community.home-assistant.io/t/entry-automating-a-nursing-home/14872)
- [Dedicated hardware for coding, testing, building, and contributing to Home Assistant](https://community.home-assistant.io/t/entry-dedicated-hardware-for-coding-testing-building-and-contributing-to-home-assistant/15515)
- [HassIO - Home Assistant hub for dummies](https://community.home-assistant.io/t/entry-hassio-home-assistant-hub-for-dummies/16037)
+- Part of IoT-course
+- Automating a nursing home!
+- Dedicated hardware for coding, testing, building, and contributing to Home Assistant
+- HassIO - Home Assistant hub for dummies

 The voting is now open. To keep things simple are we using the voting feature of the [forum]. Vote for your choices.

@ -22,6 +22,6 @@ End of the voting period: April, 30 2017 - 23.59 UTC

 [hardware]: /blog/2017/04/01/thomas-krenn-award/
 [award]: https://www.thomas-krenn.com/de/tkmag/allgemein/zammad-home-assistant-und-freifunk-das-sind-die-gewinner-des-thomas-krenn-awards-2017/
-[forum]: https://community.home-assistant.io/c/contest-2017
+[forum]: https://community.home-assistant.io/t/hardware-contest-2017/42546
 [twitter]: https://twitter.com/home_assistant

--- a/source/_posts/2017-05-01-home-assistant-on-raspberry-pi-zero-in-30-minutes.markdown
+++ b/source/_posts/2017-05-01-home-assistant-on-raspberry-pi-zero-in-30-minutes.markdown
@ -71,5 +71,5 @@ Wait about 15-20 minutes and voilà you have your Home Assistant on your Raspber

 To try it out, go to [http://hassbian:8123](http://hassbian:8123) or [http://hassbian.local:8123](http://hassbian.local:8123) if you're using Mac.

-For further details about HASSbian, take a look at the [documentation](/docs/hassbian/).
+For further details about HASSbian, take a look at the [documentation](/docs/installation/hassbian/).

--- a/source/_posts/2017-05-06-zigbee-opencv-dlib.markdown
+++ b/source/_posts/2017-05-06-zigbee-opencv-dlib.markdown
@ -459,7 +459,7 @@ influxdb:
 [notify.html5 docs]: /components/notify.html5/
 [notify.joaoapps_join docs]: /components/notify.joaoapps_join/
 [notify.mailgun docs]: /components/notify.mailgun/
-[notify.matrix docs]: /components/notify.matrix/
+[notify.matrix docs]: /components/matrix/#notifications
 [notify.smtp docs]: /components/notify.smtp/
 [notify.telegram docs]: /components/notify.telegram/
 [notify.webostv docs]: /components/notify.webostv/
--- a/source/_posts/2017-05-20-automation-editor-zwave-panel-ocr.markdown
+++ b/source/_posts/2017-05-20-automation-editor-zwave-panel-ocr.markdown
@ -421,7 +421,7 @@ Experiencing issues introduced by this release? Please report them in our [issue
 [vera docs]: /components/vera/
 [websocket_api docs]: /components/websocket_api/
 [zwave docs]: /components/zwave/
-[zwave.api docs]: /components/zwave.api/
+[zwave.api docs]: /components/zwave/
 [forum]: https://community.home-assistant.io/
 [issue]: https://github.com/home-assistant/home-assistant/issues
 [#7673]: https://github.com/home-assistant/home-assistant/pull/7673
@ -433,5 +433,5 @@ Experiencing issues introduced by this release? Please report them in our [issue
 [device_tracker.ubus docs]: /components/device_tracker.ubus/
 [hassio docs]: /components/hassio/
 [media_player.volumio docs]: /components/media_player.volumio/
-[telegram_bot.__init__ docs]: /components/telegram_bot.__init__/
+[telegram_bot.__init__ docs]: /components/telegram_bot/
 [discord]: https://discord.gg/c5DvZ4e
--- a/source/_posts/2017-06-04-release-46.markdown
+++ b/source/_posts/2017-06-04-release-46.markdown
@ -372,7 +372,7 @@ Experiencing issues introduced by this release? Please report them in our [issue
 [switch.broadlink docs]: /components/switch.broadlink/
 [switch.rachio docs]: /components/switch.rachio/
 [switch.rflink docs]: /components/switch.rflink/
-[telegram_bot.__init__ docs]: /components/telegram_bot.__init__/
+[telegram_bot.__init__ docs]: /components/telegram_bot/
 [telegram_bot.polling docs]: /components/telegram_bot.polling/
 [telegram_bot.webhooks docs]: /components/telegram_bot.webhooks/
 [tellduslive docs]: /components/tellduslive/
--- a/source/_posts/2017-06-17-release-47.markdown
+++ b/source/_posts/2017-06-17-release-47.markdown
@ -549,7 +549,7 @@ automation:
 [switch.raspihats docs]: /components/switch.raspihats/
 [switch.rest docs]: /components/switch.rest/
 [switch.template docs]: /components/switch.template/
-[telegram_bot.__init__ docs]: /components/telegram_bot.__init__/
+[telegram_bot.__init__ docs]: /components/telegram_bot/
 [telegram_bot.polling docs]: /components/telegram_bot.polling/
 [telegram_bot.webhooks docs]: /components/telegram_bot.webhooks/
 [updater docs]: /components/updater/
--- a/source/_posts/2017-10-28-demo.markdown
+++ b/source/_posts/2017-10-28-demo.markdown
@ -44,7 +44,7 @@ switch:
 </p>

 ## `random` platforms
-Till now the frontend is static. Nothing is changing over time. Starting with 0.57 we ship a [`random` binary sensor](https://github.com/home-assistant/home-assistant.github.io/blob/next/source/_components/binary_sensor.random.markdown) platform in addition to the already available [`random` sensor](/components/sensor.random/).
+Till now the frontend is static. Nothing is changing over time. Starting with 0.57 we ship a [`random` binary sensor](/components/random/#binary-sensor) platform in addition to the already available [`random` sensor](/components/sensor.random/).

 By adding those platform to your `configuration.yaml` file, your demo will become more interactive.

--- a/source/_posts/2018-02-26-release-64.markdown
+++ b/source/_posts/2018-02-26-release-64.markdown
@ -549,7 +549,7 @@ Experiencing issues introduced by this release? Please report them in our [issue
 [scene docs]: /components/scene/
 [sensor.airvisual docs]: /components/sensor.airvisual/
 [sensor.alpha_vantage docs]: /components/sensor.alpha_vantage/
-[sensor.bloomsky docs]: /components/sensor.bloomsky/
+[sensor.bloomsky docs]: /components/bloomsky/#sensor
 [sensor.bmw_connected_drive docs]: /components/sensor.bmw_connected_drive/
 [sensor.buienradar docs]: /components/sensor.buienradar/
 [sensor.deconz docs]: /components/sensor.deconz/
--- a/Show More
+++ b/Show More