Merge branch 'current' into next

source/_data/glossary.yml

@@ -57,6 +57,19 @@
   aliases:
     - automations
 
+- term: Backup
+  definition: >-
+    Home Assistant has built-in functionality to create files containing a copy of
+    your configuration. This can be used to restore your Home Assistant as well
+    as migrate to a new system. The backup feature is available on some installation
+    types.
+  link: /integrations/backup/
+  excerpt: >-
+    Home Assistant has built-in functionality to create files containing a copy of
+    your configurations. This is available on certain installation types.
+  aliases:
+    - backups
+
 - term: Binary sensor
   definition: >-
     A binary sensor returns information about things that only have two states -

source/_docs/z-wave/controllers.markdown

@@ -20,6 +20,9 @@ Users should upgrade the firmware on all 700 series controllers to version 7.17.
 
 </div>
 
+- 800 series controllers
+  - Zooz 800 Series Z-Wave Long Range S2 Stick (ZST39 LR)
+
 - 700 series controllers
   - Aeotec Z-Stick 7 USB stick (ZWA010) (the EU version is not recommended due to RF performance issues)
   - Silicon Labs UZB-7 USB Stick (Silabs SLUSB7000A / SLUSB001A)
@@ -39,7 +42,7 @@ Users should upgrade the firmware on all 700 series controllers to version 7.17.
   - Z-Wave.Me RaZberry 7 Pro (ZMEERAZBERRY7_PRO or ZMEURAZBERRY7_PRO, 700 series)
   - Z-Wave.Me Razberry 2 (500 series)
 
-If you are just starting out, we recommend that you purchase a 700 series controller or a Raspberry Pi module.
+If you are just starting out, we recommend that you purchase a 700 series controller or a Raspberry Pi module. The 700 series controllers are the more recent version (when compared to the 500 series). The 700 series controllers support SmartStart, which allows you to add a device by scanning a QR code.
 
 <div class='note'>
   If you're using Home Assistant OS, Supervised, or Container, it's recommended to use a USB stick, not a module. Passing a module through Docker is more complicated than passing a USB stick through.
@@ -134,4 +137,4 @@ This procedure has been tested with the following modules:
 1. Carefully [close the case](https://yellow.home-assistant.io/guides/add-ssd-existing-installation/#reassembling-top-part) and power up Home Assistant Yellow.
 1. Follow the procedure on [setting up a Z-Wave JS server](/integrations/zwave_js/#setting-up-a-z-wave-js-server).
    1. In step 2, follow the manual setup steps to install the Z-Wave integration.
-   1. in Step 4, you will be prompted to choose a **Device path**. Choose **ttyAMA0**.
+   1. in Step 4, you will be prompted to choose a **Device path**. Choose **ttyAMA0**.

source/_integrations/sensor.rest.markdown

@@ -291,7 +291,7 @@ sensor:
 
 ```yaml
 rest:
-  - resource: http://date.jsontest.com/
+  - resource: "http://date.jsontest.com/"
     sensor:
       - name: "Time"
         value_template: "{{ value_json.time }}"
@@ -331,7 +331,7 @@ This sample fetches a weather report from [OpenWeatherMap](https://openweatherma
 
 ```yaml
 rest:
-  - resource: https://api.openweathermap.org/data/2.5/weather?zip=80302,us&APPID=VERYSECRETAPIKEY
+  - resource: "https://api.openweathermap.org/data/2.5/weather?zip=80302,us&APPID=VERYSECRETAPIKEY"
     sensor:
       - name: "Report"
         value_template: "{{ value_json['weather'][0]['description'].title() }}"
@@ -385,7 +385,7 @@ This configuration shows how to extract multiple values from a dictionary. This
 
 ```yaml
 rest:
-    resource: http://<address_to_rest_service>
+    resource: "http://<address_to_rest_service>"
     sensor:
       - name: "Bedroom1 Temperature"
         value_template: "{{ value_json['bedroom1']['temperature'] }}"
@@ -414,11 +414,11 @@ The example below shows how to extract multiple values from a dictionary from th
 ```yaml
 rest:
   # Steam Controller
-  - resource: http://192.168.1.105/status.xml
+  - resource: "http://192.168.1.105/status.xml"
     scan_interval: 15
   
     sensor:
-      - name: Steam Temp
+      - name: "Steam Temp"
         value_template: "{{ json_value['response']['temp0'] | regex_findall_index('([0-9]+)XF') }}"
         unit_of_measurement: "°F"
 

source/_integrations/zwave_js.markdown

@@ -73,12 +73,12 @@ Use this My button:
 {% my config_flow_start badge domain="zwave_js" %}, or follow these steps:
 
 * Browse to your Home Assistant instance.
-* In the sidebar click on _**{% my config icon %}**_.
-* From the configuration menu select: _**{% my integrations %}**_.
-* In the bottom right, click on the
-  _**{% my config_flow_start icon domain="zwave_js" %}**_ button.
-* From the list, search and select _**"Z-Wave"**_.
-* Follow the instructions on screen to complete the set up.
+* In the sidebar, select **{% my config icon %}**.
+* From the configuration menu, select: **{% my integrations %}**.
+* On the bottom right, select the
+  **{% my config_flow_start icon domain="zwave_js" %}** button.
+* From the list, search and select **Z-Wave**.
+* Follow the instructions on screen to complete the setup.
 
 {% enddetails %}
 
@@ -102,7 +102,7 @@ While your Z-Wave mesh is permanently stored on your dongle, the additional meta
 1. In the Z-Wave integration, select **Configure**.
 1. Select **Add device**.
    * The Z-Wave controller is now in inclusion mode.
-1. If your device supports SmartStart, select **Scan QR code** and scan the QR code on your device.
+1. If your device supports SmartStart (700 series controller), select **Scan QR code** and scan the QR code on your device.
 1. If your device does not support SmartStart, set the device in inclusion mode. Refer to the device manual to see how this is done.
    * If your device is included using S2 security, you may be prompted to enter a PIN number provided with your device. Often, this PIN is provided with the documentation _and_ is also printed on the device itself. For more information on secure inclusion, refer to [this section](/integrations/zwave_js/#should-i-use-secure-inclusion).
 1. The UI should confirm that the device was added. After a short while (seconds to minutes), the entities should also be created.