Merge branch 'current' into next

source/_includes/common-tasks/flashing_n2_otg.md

@@ -14,30 +14,37 @@ To flash your eMMC using Petitboot and OTG-USB, you will need the following item
 
 #### Enabling SPI boot mode
 
-Remove the case of your ODROID-N2+
+To enable the SPI boot mode:
+
+1. Power off the ODROID-N2+ by unplugging the power cable.
+1. Remove the case.
 
    ![Photo of the removed case](/images/hassio/screenshots/case-removed.jpg)
 
-Next, locate the toggle for boot mode and switch it from MMC to SPI.
+1. Locate the toggle for boot mode and switch it from MMC to SPI.
 
    ![Photo of the SPI toggle switch](/images/hassio/screenshots/toggle_spi.jpg)
    
-Connect a USB keyboard and HDMI connected monitor to your ODROID-N2+, and then connect power.
+1. Connect the ODROID-N2+ directly to your computer via the USB-OTG port located on the front of the board.
+1. Connect a USB keyboard and a monitor (using HDMI) to your ODROID-N2+.
+1. Plug in the power cable to power on the ODROID-N2+.
 
 #### Enabling USB drive mode
 
-The ODROID-N2+ will now boot into a terminal. Select `Exit to shell` from the menu.
+After The ODROID-N2+ is set to SPI boot mode and powered on, it boots into a terminal. To enable the USB drive mode:
+
+1. Select `Exit to shell` from the menu.
 
    ![Exit to shell](/images/hassio/screenshots/exit-shell.png)
 
-Use the following command at the console to confirm the storage device node:
+1. Use the following command at the console to confirm the storage device node:
 
    ```bash
    ls /dev/mmc*
    ```
 
-Set the storage device on the ODROID-N2+ as a mass storage device using `ums` (USB Mass storage mode)
+1. 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.
+This will configure the ODROID-N2+ and OTG to act as a memory card reader:
 
    ```bash
    ums /dev/mmcblk0

source/_integrations/cover.template.markdown

@@ -70,7 +70,7 @@ cover:
         required: false
         type: template
       availability_template:
-        description: Defines a template to get the `available` state of the component. If the template returns `true`, the device is `available`. If the template returns any other value, the device will be `unavailable`. If `availability_template` is not configured, the component will always be `available`.
+        description: Defines a template to get the `available` state of the entity. If the template either fails to render or returns either of `True`, `"1"`, `"true"`, `"yes"`, `"on"`, `"enable"` or a non-zero number, the entity is `available`. If the template returns any other value, the device will be `unavailable`. If not configured, the entity will always be `available`. Note that the string comparison not case sensitive; `"TrUe"` and `"yEs"` are allowed.
         required: false
         type: template
         default: true

source/_integrations/edimax.markdown

@@ -50,17 +50,15 @@ Starting with [version 2 of the firmware](https://www.edimax.com/edimax/download
 {% raw %}
 
 ```yaml
-  - platform: template
+template:
-    sensors:
+  - sensor:
-      edimax_current_power:
+    - name: Edimax Current power consumption
-        friendly_name: Edimax Current power consumption
       unit_of_measurement: "W"
-        value_template: "{{ state_attr('switch.edimax_smart_plug',  'current_power_w') | replace('None', 0) }}"
+      state: "{{ state_attr('switch.edimax_smart_plug', 'current_power_w') | default(0, true) }}"
       
-      edimax_total_power:
+    - name: Edimax Accumulated daily power consumption
-        friendly_name: Edimax Accumulated daily power consumption
       unit_of_measurement: "kWh"
-        value_template: "{{ state_attr('switch.edimax_smart_plug',  'today_energy_kwh') | replace('None', 0) }}"
+      state: "{{ state_attr('switch.edimax_smart_plug', 'current_power_w') | default(0, true) }}"
 ```
 
 {% endraw %}

source/_integrations/fan.template.markdown

@@ -94,7 +94,7 @@ fan:
         required: false
         type: template
       availability_template:
-        description: Defines a template to get the `available` state of the component. If the template returns `true`, the device is `available`. If the template returns any other value, the device will be `unavailable`. If `availability_template` is not configured, the component will always be `available`.
+        description: Defines a template to get the `available` state of the entity. If the template either fails to render or returns either of `True`, `"1"`, `"true"`, `"yes"`, `"on"`, `"enable"` or a non-zero number, the entity is `available`. If the template returns any other value, the device will be `unavailable`. If not configured, the entity will always be `available`. Note that the string comparison not case sensitive; `"TrUe"` and `"yEs"` are allowed.
         required: false
         type: template
         default: true

source/_integrations/light.template.markdown

@@ -145,7 +145,7 @@ light:
         required: false
         type: template
       availability_template:
-        description: Defines a template to get the `available` state of the component. If the template returns `true`, the device is `available`. If the template returns any other value, the device will be `unavailable`. If `availability_template` is not configured, the component will always be `available`.
+        description: Defines a template to get the `available` state of the entity. If the template either fails to render or returns either of `True`, `"1"`, `"true"`, `"yes"`, `"on"`, `"enable"` or a non-zero number, the entity is `available`. If the template returns any other value, the device will be `unavailable`. If not configured, the entity will always be `available`. Note that the string comparison not case sensitive; `"TrUe"` and `"yEs"` are allowed.
         required: false
         type: template
         default: true

source/_integrations/lock.template.markdown

@@ -56,7 +56,7 @@ lock:
     required: true
     type: template
   availability_template:
-    description: Defines a template to get the `available` state of the component. If the template returns `true`, the device is `available`. If the template returns any other value, the device will be `unavailable`. If `availability_template` is not configured, the component will always be `available`.
+    description: Defines a template to get the `available` state of the entity. If the template either fails to render or returns either of `True`, `"1"`, `"true"`, `"yes"`, `"on"`, `"enable"` or a non-zero number, the entity is `available`. If the template returns any other value, the device will be `unavailable`. If not configured, the entity will always be `available`. Note that the string comparison not case sensitive; `"TrUe"` and `"yEs"` are allowed.
     required: false
     type: template
     default: true

source/_integrations/switch.template.markdown

@@ -60,7 +60,7 @@ switch:
         type: template
         default: optimistic
       availability_template:
-        description: Defines a template to get the `available` state of the component. If the template returns `true`, the device is `available`. If the template returns any other value, the device will be `unavailable`. If `availability_template` is not configured, the component will always be `available`.
+        description: Defines a template to get the `available` state of the entity. If the template either fails to render or returns either of `True`, `"1"`, `"true"`, `"yes"`, `"on"`, `"enable"` or a non-zero number, the entity is `available`. If the template returns any other value, the device will be `unavailable`. If not configured, the entity will always be `available`. Note that the string comparison not case sensitive; `"TrUe"` and `"yEs"` are allowed.
         required: false
         type: template
         default: true

source/_integrations/template.markdown

@@ -236,7 +236,7 @@ select:
       required: false
       type: template
     availability:
-      description: Defines a template to get the `available` state of the entity. If the template returns `true`, the device is `available`. If the template returns any other value, the device will be `unavailable`. If not configured, the component will always be `available`.
+      description: Defines a template to get the `available` state of the entity. If the template either fails to render or returns either of `True`, `"1"`, `"true"`, `"yes"`, `"on"`, `"enable"` or a non-zero number, the entity is `available`. If the template returns any other value, the device will be `unavailable`. If not configured, the entity will always be `available`. Note that the string comparison not case sensitive; `"TrUe"` and `"yEs"` are allowed.
       required: false
       type: template
       default: true
@@ -599,7 +599,7 @@ sensors:
           required: true
           type: template
         availability_template:
-          description: Defines a template to get the `available` state of the component. If the template returns `true`, the device is `available`. If the template returns any other value, the device will be `unavailable`. If `availability_template` is not configured, the component will always be `available`.
+          description: Defines a template to get the `available` state of the entity. If the template either fails to render or returns either of `True`, `"1"`, `"true"`, `"yes"`, `"on"`, `"enable"` or a non-zero number, the entity is `available`. If the template returns any other value, the device will be `unavailable`. If not configured, the entity will always be `available`. Note that the string comparison not case sensitive; `"TrUe"` and `"yEs"` are allowed.
           required: false
           type: template
           default: true

source/_integrations/vacuum.template.markdown

@@ -65,7 +65,7 @@ vacuum:
             required: true
             type: template          
       availability_template:
-        description: Defines a template to get the `available` state of the component. If the template returns `true`, the device is `available`. If the template returns any other value, the device will be `unavailable`. If `availability_template` is not configured, the component will always be `available`.
+        description: Defines a template to get the `available` state of the entity. If the template either fails to render or returns either of `True`, `"1"`, `"true"`, `"yes"`, `"on"`, `"enable"` or a non-zero number, the entity is `available`. If the template returns any other value, the device will be `unavailable`. If not configured, the entity will always be `available`. Note that the string comparison not case sensitive; `"TrUe"` and `"yEs"` are allowed.
         required: false
         type: template
         default: true