Merge branch 'current' into rc

Gemfile.lock

@@ -83,7 +83,7 @@ GEM
     rack-protection (2.2.2)
       rack
     rake (13.0.6)
-    rb-fsevent (0.11.1)
+    rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
     rexml (3.2.5)

source/_docs/automation/trigger.markdown

@@ -346,6 +346,11 @@ automation:
       from: "not_home"
       # Optional
       to: "home"
+      # If given, will trigger when the condition has been true for X time; you can also use days and milliseconds.
+      for:
+        hours: 0
+        minutes: 1
+        seconds: 0
 ```
 
 It's possible to give a list of `from` states or `to` states:

source/_docs/configuration/events.markdown

@@ -87,7 +87,7 @@ If you want to trigger automation on a Home Assistant stop event, we recommend u
 
 | Field       | Description                                         |
 | ----------- | --------------------------------------------------- |
-| `name`      | Name of the entity. Example: `Litchen light`.       |
+| `name`      | Name of the entity. Example: `Kitchen light`.       |
 | `message`   | Message. Example: `was turned on`                   |
 | `domain`    | Optional, domain of the entry. Example: `light`     |
 | `entity_id` | Optional, identifier of the entity that was logged. |

source/_integrations/amazon_polly.markdown

@@ -42,7 +42,7 @@ aws_secret_access_key:
   required: true
   type: string
 profile_name:
-  description: A credentials profile name.
+  description: A credentials profile name. If provided, you must **not** provide an `aws_access_key_id` nor an `aws_secrete_access_key`. 
   required: false
   type: string
 region_name:
@@ -51,12 +51,12 @@ region_name:
   type: [string, list]
   default: us-east-1
 text_type:
-  description: "Specify wherever to use text (default) or ssml markup by default."
+  description: "Whether to interpret messages as `text` or as [`ssml`](https://docs.aws.amazon.com/polly/latest/dg/ssml.html) by default."
   required: false
   type: string
   default: text
 voice:
-  description: Voice name to be used.
+  description: The [Voice Name/ID](https://docs.aws.amazon.com/polly/latest/dg/voicelist.html) to be used for generated speech by default. 
   required: false
   type: string
 output_format:

source/_integrations/denonavr.markdown

@@ -62,6 +62,7 @@ Known supported devices:
 - Denon AVR-S720W
 - Denon AVR-S750H
 - Denon AVR-S760H
+- Denon AVR-S940H
 - Denon AVR-S950H
 - Denon AVR-S960H
 - Denon DN-500AV

source/_integrations/ipma.markdown

@@ -18,3 +18,5 @@ ha_integration_type: integration
 The `ipma` weather platform uses the [Instituto Português do Mar e Atmosfera](https://www.ipma.pt/) as a source for current and forecast meteorological data.
 
 {% include integrations/config_flow.md %}
+
+IPMA provides both *hourly* (72h) and *daily* (10 days) forecasts, but you must choose which one will be exposed by the weather entity during initial setup of the integration.

source/_integrations/mjpeg.markdown

@@ -56,3 +56,8 @@ use is automatically detected when using a username and password.
 - OctoPrint (OctoPi):
   - MJPEG URL: `http://IP/webcam/?action=stream`
   - Still Image URL: `http://IP/webcam/?action=snapshot`
+
+- Legacy Foscam / wanscam
+  - MJPEG URL: `http://IP:PORT/videostream.cgi` (add ?resultion=32 for 640x480 or ?resultion=32 for 320x240)
+  - Still Image URL: `http://IP:PORT/snapshot.cgi`
+

source/_integrations/modbus.markdown

@@ -79,7 +79,7 @@ timeout:
   default: 5
   type: integer
 type:
-  description: Type of communication. Possible values are `tcp` Modbus messages with Modbus TCP frame on TCP/IP, `udp` Modbus messages with Modbus TCP frame on UDP, `rtuovertcp` Modbus messages with a wrapper TCP/IP simulating a serial line, 'serial' Modbus serial (RS485).
+  description: Type of communication. Possible values are `tcp` Modbus messages with Modbus TCP frame on TCP/IP, `udp` Modbus messages with Modbus TCP frame on UDP, `rtuovertcp` Modbus messages with a wrapper TCP/IP simulating a serial line, `serial` Modbus serial (RS485).
   required: true
   type: string
 {% endconfiguration %}

source/_integrations/oncue.markdown

@@ -21,6 +21,7 @@ The Oncue by Kohler integration will allow you to monitor the state of your [Onc
 
 ## Tested Devices
 
+- 20RESA
 - [24RCL](https://kohlerpower.com/en/residential/generators/product/24rcl)
 - [38RCLB](https://kohlerpower.com/en/residential/generators/product/38rclb)
 - [48RCLB](https://kohlerpower.com/en/residential/generators/product/48rclb)

source/_integrations/overkiz.markdown

@@ -52,16 +52,14 @@ The Overkiz (by Somfy) integration platform is used by many different vendors, l
 - Hitachi Hi Kumo
 - Nexity Eugénie
 - Rexel Energeasy Connect
+- Somfy Connectivity Kit
 - Somfy Connexoon IO
 - Somfy Connexoon RTS
 - Somfy TaHoma
-- Somfy TaHoma Switch [(instructions)](#tahoma-switch)
+- Somfy TaHoma Beecon
-- Somfy Connection Kit
+- Somfy TaHoma Switch
 - Thermor Cozytouch
 
-### TaHoma Switch
-
-Multiple users reported that the TaHoma Switch will work with this integration **after** you create a scene in the TaHoma app and wait for a few hours.
 
 ## Supported devices
 
@@ -83,8 +81,10 @@ During peak hours, it could happen that the Overkiz platform is unable to execut
 
 ### Internet connectivity required
 
-This integration communicates via the cloud-based Overkiz API, since Overkiz doesn't expose a local API on their hubs. If you are only using Somfy IO compatible devices, you could purchase a Velux KLF200 hub and use [the Velux integration](/integrations/velux/) which has a local API.
+This integration communicates via the cloud-based Overkiz API. The Somfy TaHoma v2 and the Somfy TaHoma Switch offer the [Somfy TaHoma Developer Mode (local API)](https://developer.somfy.com/developer-mode), which is not supported in Home Assistant yet.
+
+Another option if you are only using Somfy IO compatible devices is to purchase a Velux KLF200 hub and use [the Velux integration](/integrations/velux/) which has a local API.
 
 #### Local API via HomeKit Controller
 
-If your hub (e.g. Somfy TaHoma or Somfy Connection Kit) supports HomeKit natively, your setup code will be added as a sensor in Home Assistant. Look up your hub in Home Assistant and retrieve the value from the 'HomeKit Setup Code' sensor. You can now configure the [HomeKit Controller](/integrations/homekit_controller/) integration in Home Assistant and benefit from local support.
+If your hub (e.g. Somfy TaHoma) supports HomeKit natively, your setup code will be added as a sensor in Home Assistant. Look up your hub in Home Assistant and retrieve the value from the 'HomeKit Setup Code' sensor. You can now configure the [HomeKit Controller](/integrations/homekit_controller/) integration in Home Assistant and benefit from local support. Only a [limited amount of devices is supported](https://service.somfy.com/downloads/nl_v5/tahoma-homekitcompatibilitylist_eng.pdf).

source/_integrations/simplisafe.markdown

@@ -45,6 +45,10 @@ SimpliSafe offers several [monitoring plans](https://support.simplisafe.com/hc/e
 
 ## Getting an Authorization Code
 
+<div class='note warning'>
+You must have multi-factor authentication (MFA) enabled on your SimpliSafe account for the below instructions to work. Without MFA enabled, you will never receive the correct authorization code!
+</div>
+
 SimpliSafe authenticates users via its web app. Due to technical limitations, there is a manual step when adding the integration. For in-depth guidance, refer to step 6 of [the `simplisafe-python` documentation on authentication](https://simplisafe-python.readthedocs.io/en/latest/usage.html#authentication).
 
 ## Services

source/_integrations/template.markdown

@@ -411,7 +411,7 @@ template:
 
 {% endraw %}
 
-### State based sensor modyfying another sensor's output
+### State based sensor modifying another sensor's output
 
 If you don't like the wording of a sensor output, then the Template Sensor can help too. Let's rename the output of the [Sun component](/integrations/sun/) as a simple example:
 

source/_integrations/yolink.markdown

@@ -37,16 +37,17 @@ If you want to use separate credentials, please contact <service@yosmart.com> to
 
 The integration is tested and verified for the following devices from YoLink:
 
-* YS6602/4 (outlet | plug)
+* YS6602/4 YS6704 (outlet | plug)
 * YS7103/4/5 (siren)
 * YS7704 (door sensor)
+* YS7707 (Contact Sensor)
 * YS7804/5 (motion sensor)
 * YS7903/4 (leak sensor)
-* YS8003 (temperature/humidity sensor)
+* YS8003/4/5/6 (temperature/humidity sensor)
 * YS7201 (vibration sensor)
-* YS7607 (lock)
+* YS7606/7 (lock)
-* YS4909 (valve controller)
+* YS4909 YS5001 (valve controller)
-* YS5705 (switch)
+* YS5705/6 (switch)
-* YS7A01 (CO & Smoke Sensor)
+* YS7A01/2 (CO & Smoke Sensor)
-* YS4002 (Thermostat)
+* YS4002/3 (Thermostat)
-* YS4906/YS7706 (Garage Door Sensor/ Garage Door Controller)
+* YS4906/8 YS7706 (Garage Door Sensor/ Garage Door Controller)

source/getting-started/automation.markdown

@@ -5,14 +5,14 @@ description: "A quick intro on getting your first automation going."
 
 Once your devices are set up, it's time to put the cherry on the pie: automation. In this guide we're going to create a simple automation rule to **turn on the lights when the sun sets**. Of course, this assumes that you have set up an integration that provides a light at this point.
 
-In the user interface, click Configuration in the sidebar, then click Automation. You will now see the automation screen from which you can manage all the automations in Home Assistant.
+In the user interface, click Settings in the sidebar, then click Automations & Scenes. You will now see the automation screen from which you can manage all the automations in Home Assistant.
 
 <p class='img'>
 <img src='/images/getting-started/automation-editor.png'>
 The automation editor.
 </p>
 
-Click the blue button at the bottom right to create a new automation. You are presented with a blank automation screen.
+Click the blue button at the bottom right to create a new automation. A dialog will appear. Choose "Start with an empty automation". You are presented with a blank automation screen.
 
 <p class='img'>
 <img src='/images/getting-started/new-automation.png'>