Merge branch 'current' into next

Gemfile

@@ -19,7 +19,7 @@ group :jekyll_plugins do
 end
 
 gem 'sinatra', '2.0.7'
-gem 'nokogiri', '1.10.6'
+gem 'nokogiri', '1.10.7'
 
 # Windows and JRuby does not include zoneinfo files, so bundle the tzinfo-data gem
 # and associated library

Gemfile.lock

@@ -71,9 +71,9 @@ GEM
     mini_portile2 (2.4.0)
     multi_json (1.14.1)
     mustermann (1.0.3)
-    nokogiri (1.10.6)
+    nokogiri (1.10.7)
       mini_portile2 (~> 2.4.0)
-    nokogiri (1.10.6-x64-mingw32)
+    nokogiri (1.10.7-x64-mingw32)
       mini_portile2 (~> 2.4.0)
     pathutil (0.16.2)
       forwardable-extended (~> 2.6)
@@ -123,7 +123,7 @@ DEPENDENCIES
   jekyll-redirect-from (= 0.15.0)
   jekyll-sitemap (= 1.4.0)
   jekyll-time-to-read (= 0.1.2)
-  nokogiri (= 1.10.6)
+  nokogiri (= 1.10.7)
   rake (= 13.0.1)
   sass-globbing (= 1.1.5)
   sinatra (= 2.0.7)

source/_addons/homematic.markdown

@@ -1,9 +1,9 @@
 ---
 title: "HomeMatic"
-description: "HomeMatic hardware support to turn you Home-Assistant into a CCU."
+description: "HomeMatic hardware support to turn Home Assistant into a CCU."
 ---
 
-You can't import an existing configuration, you'll need re-learn it into Home Assistant. There is an experimental WebUI alias Regahss support since 9.0 - before it was required to use a 3party tool.
+You can't import an existing configuration, you'll need re-learn it into Home Assistant. There is an experimental WebUI alias Regahss support since 9.0. Before it was required to use a third-party tool.
 
 Follow devices will be supported and tested:
 
@@ -71,11 +71,11 @@ wired:
       required: true
       type: string
     key:
-      description: Encrypted key.
+      description: The encrypted key.
       required: true
       type: string
     ip:
-      description: IP address of LAN gateway.
+      description: The IP address of LAN gateway.
       required: true
       type: string
 hmip_enable:
@@ -126,7 +126,7 @@ dtoverlay=pi3-miniuart-bt
 
 ## HmIP-RFUSB
 
-HassOS > 1.11 support HmIP-RFUSB default and don't need any configuration. If you run a Linux, you need to follow the installation guide from documentation to set up the UART USB interface on your computer.
+HassOS > 1.11 support HmIP-RFUSB by default and don't need any configuration. If you run a Linux installation, you need to follow the installation guide from the documentation to set up the UART USB interface on your computer.
 
 ## Web UI
 

source/_docs/configuration/devices.markdown

@@ -6,7 +6,7 @@ redirect_from: /getting-started/devices/
 
 Home Assistant will be able to automatically discover many devices and services available on your network if you have [the discovery component](/integrations/discovery/) enabled (the default setting).
 
-See the [components overview page](/integrations/) to find installation instructions for your devices and services. If you can't find support for your favorite device or service, [consider adding support](/developers/add_new_platform/).
+See the [integrations overview page](/integrations/) to find installation instructions for your devices and services. If you can't find support for your favorite device or service, [consider adding support](/developers/add_new_platform/).
 
 Classification for the available integrations:
 

source/_integrations/cloudflare.markdown

@@ -50,3 +50,5 @@ records:
 {% endconfiguration %}
 
 This platform uses the API from [ipify.org](https://www.ipify.org/) to set the public IP address.
+
+For SSH usage (according to [this](https://blog.cloudflare.com/cloudflare-now-supporting-more-ports/) source), you need to connect directly to your server (bypassing Cloudflare). To do that create a `CNAME` DNS record, e.g., `ssh.example.com`, with proxy status as "DNS only" (to do that click on orange icon, it will change color to gray) and then connect to `ssh.example.com` using your server SSH port.

source/_integrations/emulated_hue.markdown

@@ -55,9 +55,8 @@ emulated_hue:
 ```yaml
 # Amazon Echo example configuration.yaml entry
 emulated_hue:
-  host_ip: YOUR.HASSIO.IP.ADDRESS
   listen_port: 80
-  # Alexa stopped working on different ports. Search for "Philipps Hue Bridge V1 (round)" in the Alexa App to discover devices.
+  # Amazon Echo/Alexa stopped working on different ports. Search for "Philips Hue Bridge V1 (round)" in the Alexa App to discover devices.
 ```
 
 {% configuration %}
@@ -71,7 +70,7 @@ host_ip:
   required: false
   type: string
 listen_port:
-  description: "The port the Hue bridge API web server will run on. This can be any free port on your system. However, all new Alexa devices require listen_port: 80." 
+  description: "The port the Hue bridge API web server will run on. This can be any free port on your system. However, all new Alexa devices require listen_port: 80. See `setcap` note below if this is set below `1024` when Home Assistant is ran as a non-root user."
   required: false
   type: integer
   default: 8300
@@ -151,11 +150,14 @@ You can verify that the `emulated_hue` integration has been loaded and is respon
 
 For Google Home, verify that the URLs above are using port 80, rather than port 8300 (i.e. `http://<HA IP Address>:80/description.xml`).
 
+For Amazon Alexa/Echo, verify that the URLs above are using port 80, rather than port 8300 (i.e. `http://<HA IP Address>:80/description.xml`). Since 2019-08 Amazon Echo firmware, Alexa no longer works with port 8300.
+
 An additional step is required to run Home Assistant as a non-root user and use port 80 when using the AiO script.  Execute the following command to allow `emulated_hue` to use port 80 as a non-root user.
 
 ```bash
 sudo setcap 'cap_net_bind_service=+ep' /srv/homeassistant/homeassistant_venv/bin/python3
 ```
+
 Please note that your path may be different depending on your installation method. For example, if you followed the [Virtualenv instructions](/docs/installation/virtualenv/), your path will be `/srv/homeassistant/bin/python3`.
 
 ### License

source/_integrations/evohome.markdown

@@ -86,11 +86,11 @@ In Home Assistant, all this is done via `HVAC_MODE` and `PRESET_MODE` (but also
 
 The actual operating mode of evohome entities can be tracked via their state attributes, which includes a JSON data structure for the current state called `status`.
 
-For the Controller, see `systemModeStatus`:
+For the Controller, see `system_mode_status`:
 
 {% raw %}
 ```text
-{% if state_attr('climate.my_home', 'status').systemModeStatus.mode == "Away" %}
+{% if state_attr('climate.my_home', 'status').system_mode_status.mode == "Away" %}
   The system is in Away mode
 {% else %}
   The system is not in Away mode
@@ -102,7 +102,7 @@ For the Zones, it is `setpointStatus`:
 
 {% raw %}
 ```text
-{{ state_attr('climate.kitchen', 'status').setpointStatus.setpointMode }}
+{{ state_attr('climate.kitchen', 'status').setpoint_status.setpoint_mode }}
 ```
 {% endraw %}
 
@@ -110,7 +110,7 @@ The Zones will expose the current/upcoming scheduled `setpoints`:
 
 {% raw %}
 ```text
-{{ state_attr('climate.kitchen', 'status').setpoints.next.temperature }}
+{{ state_attr('climate.kitchen', 'status').setpoints.next_sp_temp }}
 ```
 {% endraw %}
 
@@ -118,8 +118,8 @@ All evohome entities may have faults, and these can be turned into sensors, or:
 
 {% raw %}
 ```text
-{% if state_attr('climate.bedroom', 'status').activeFaults %}
+{% if state_attr('climate.bedroom', 'status').active_faults %}
-  {% if state_attr('climate.bedroom', 'status').activeFaults[0].faultType == 'TempZoneActuatorLowBattery' %}
+  {% if state_attr('climate.bedroom', 'status').active_faults[0].fault_type == 'TempZoneActuatorLowBattery' %}
     There is a low battery
   {% endif %}
     There is a Fault!

source/_integrations/venstar.markdown

@@ -25,9 +25,10 @@ Currently supported functionality:
 - Turning on away preset
 - Turning on hold mode preset
 
-The following values are supported for the hold_mode state attribute:
+The following values are supported for the preset_mode state attribute:
-- `off`: *Enables* the scheduling functionality.
+- `none`: *Enables* the scheduling functionality.
 - `temperature`: *Disables* the schedule and holds the set temperature indefinitely.
+- `away`: Places the thermostat in away mode
 
 Note - Please ensure that you update your thermostat to the latest firmware. Initially tested on firmware 5.10 and currently VH6.79.