Merge branch 'current' into next

.github/workflows/test.yml

@@ -8,7 +8,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out files from GitHub
-        uses: actions/checkout@v2.3.5
+        uses: actions/checkout@v2.4.0
       - name: Setting up Node.js
         uses: actions/setup-node@v2.4.1
         with:
@@ -25,7 +25,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out files from GitHub
-        uses: actions/checkout@v2.3.5
+        uses: actions/checkout@v2.4.0
       - name: Setting up Node.js
         uses: actions/setup-node@v2.4.1
         with:

Gemfile.lock

@@ -29,7 +29,7 @@ GEM
     ffi (1.15.4-x64-mingw32)
     forwardable-extended (2.6.0)
     http_parser.rb (0.6.0)
-    i18n (1.8.10)
+    i18n (1.8.11)
       concurrent-ruby (~> 1.0)
     jekyll (4.2.1)
       addressable (~> 2.4)

source/_faq/usb_boot.markdown

@@ -3,7 +3,10 @@ title: "Is USB Boot for the Raspberry Pi 4 supported?"
 ha_category: Home Assistant
 ---
 
-Due to the complexity of USB and the USB mass storage device class, booting from a USB device is brittle. When booting from a USB drive this process has to be done multiple times (firmware/boot loader and the operating system), and there is a high chance that this process doesn't complete during one of these stages. In general, the Linux USB stack is solid, so it is recommended to boot Home Assistant OS from an SD card and use a USB attached flash drive as data partition only. The data move can be accomplished through the `datactl` command on the host or through the UI. For more information, see [Using external Data Disk](/common-tasks/os/#using-external-data-disk)
+Home Assistant offers a data disk feature that offloads all data to an attached USB hard drive. The SD card is still in use but is only used to serve the Home Assistant OS. [Learn more about the data disk feature.](/common-tasks/os/#using-external-data-disk)
 
+**Booting from USB**
 
-That said, booting Home Assistant OS completely from a USB drive (SSD or any other USB mass storage device) works with *some* USB devices. USB Devices that are known to work with Raspberry Pi OS (check the Raspberry Pi Forum) are more likely to work with Home Assistant OS. However, because Home Assistant OS has also U-Boot in the boot chain, there are devices which are known to work with Raspberry Pi OS but do *not* work with Home Assistant OS.
+Due to the complexity of USB and the USB mass storage device class, booting from a USB device is delicate. When booting from a USB drive this process has to be done multiple times (firmware/boot loader and the operating system), and there is a high chance that it doesn't complete during one of these stages.
+
+That said, booting Home Assistant OS completely from a USB drive (SSD or any other USB mass storage device) works with *some* USB devices. USB Devices that are known to work with Raspberry Pi OS (check the Raspberry Pi Forum) are more likely to work with Home Assistant OS. However, because Home Assistant OS also has U-Boot in the boot chain, there are devices which are known to work with Raspberry Pi OS but do *not* work with Home Assistant OS. Finding the right combination of hardware can require expirimentation.

source/_includes/common-tasks/flashing_n2_otg.md

@@ -37,13 +37,21 @@ After The ODROID-N2+ is set to SPI boot mode and powered on, it boots into a ter
 
    ![Exit to shell](/images/hassio/screenshots/exit-shell.png)
 
-1. Use the following command at the console to confirm the storage device node:
+<div class='note'>
+
+When using the command line, it may return the following message:
+`can't access tty; job control turned off.`
+You can safely ignore this message and proceed with the installation
+
+</div>
+
+2. Use the following command at the console to confirm the storage device node:
 
    ```bash
    ls /dev/mmc*
    ```
 
-1. Set the storage device on the ODROID-N2+ as a mass storage device using the `ums` command (USB Mass storage mode).
+3. Set the storage device on the ODROID-N2+ as a mass storage device using the `ums` command (USB Mass storage mode).
 This will configure the ODROID-N2+ and OTG to act as a memory card reader:
 
    ```bash

source/_integrations/sensor.mqtt.markdown

@@ -128,10 +128,6 @@ json_attributes_topic:
   description: The MQTT topic subscribed to receive a JSON dictionary payload and then set as sensor attributes. Implies `force_update` of the current sensor state when a message is received on this topic.
   required: false
   type: string
-last_reset_topic:
-  description: "The MQTT topic subscribed to receive timestamps for when an accumulating sensor such as an energy meter was reset. If the sensor never resets, set `last_reset_topic` to same as `state_topic` and set the `last_reset_value_template` to a constant valid timstamp, for example UNIX epoch 0: `1970-01-01T00:00:00+00:00`."
-  required: false
-  type: string
 last_reset_value_template:
   description: "Defines a [template](/docs/configuration/templating/#processing-incoming-data) to extract the last_reset. Available variables: `entity_id`. The `entity_id` can be used to reference the entity's attributes."
   required: false