Merge branch 'current' into next

.devcontainer/devcontainer.json

@@ -5,7 +5,7 @@
     "context": "..",
     "args": {
       "VARIANT": "2.7",
-      "NODE_VERSION": "14"
+      "NODE_VERSION": "18"
     }
   },
   "appPort": [4000],

.nvmrc

@@ -1 +1 @@
-16
+18

source/_data/glossary.yml

@@ -218,6 +218,13 @@
     or RGB color control.
   link: /integrations/light
 
+- term: Matter
+  definition: >-
+    Matter is an open-source standard that defines how to control smart home devices on a Wi-Fi or Thread network. The aim of the standard is to improve security and to make devices interoperable across vendors, replacing proprietary protocols for smart home ecosystems. Unlike other standards, Matter allows joining the same device to multiple controllers. For example, you can add a light to Google Home, Apple Home, and Home Assistant at the same time. A bridge device can be used to connect devices running on other smart home technologies such as Zigbee or Z-Wave.
+  excerpt: >
+    Matter is an open-source standard that defines how to control smart home devices on a Wi-Fi or Thread network.
+  link: /integrations/matter
+
 - term: Notification
   definition: >-
     You can use notifications to send messages, pictures, and more, to devices.
@@ -315,6 +322,14 @@
     dynamic actions.
   link: /docs/automation/templating/
 
+- term: Thread
+  definition: >-
+    Thread is a low-power mesh networking standard that is specifically designed for smart home applications. It is a protocol that defines how devices communicate. *Mesh* topology means that the devices can communicate with each other directly, without going through a central controller first. Thread uses the same radio frequency (RF) technology as Zigbee, but provides IP connectivity similar to Wi-Fi. Unlike Zigbee, Thread does not specify how to control devices. How Thread-enabled devices are controlled is specified in a higher level protocol such as HomeKit or Matter. 
+
+  link: /integrations/thread/
+  excerpt: >
+    Thread is a low-power mesh networking standard that is specifically designed for smart home applications. It is a protocol that defines how devices communicate.
+
 - term: Trigger
   definition: >-
     A trigger is a set of values or conditions of a platform that are defined

source/_integrations/androidtv.markdown

@@ -38,7 +38,7 @@ For Fire TV devices, the instructions are as follows:
   - From the main (Launcher) screen, select Settings.
   - Select My Fire TV > About > Network.
 
-If Develper Options is missing from Settings then select My Fire TV and press the button seven times on About.
+If Developer Options is missing from Settings then select My Fire TV and press the button seven times on About.
 
 {% include integrations/config_flow.md %}
 

source/_integrations/harmony.markdown

@@ -21,7 +21,7 @@ ha_platforms:
 ha_integration_type: integration
 ---
 
-The `harmony` remote platform allows you to control the state of your [Harmony Hub Device](https://support.myharmony.com/hub).
+The `harmony` integration allows you to control the state of your [Harmony Hub Device](https://support.myharmony.com/hub).
 
 Supported units:
 

source/_integrations/shell_command.markdown

@@ -15,6 +15,8 @@ ha_integration_type: integration
 This integration can expose regular shell commands as services. Services can be called from a [script] or in [automation].
 Shell commands aren't allowed for a camel-case naming, please use lowercase naming only and separate the names with underscores.
 
+Note that the shell command process will be terminated after 60 seconds, full stop. There is no option to alter this behavior, this is by design because Home Assistant is not intended to manage long-running external processes.
+
 [script]: /integrations/script/
 [automation]: /getting-started/automation/
 

source/_integrations/thread.markdown

@@ -16,12 +16,28 @@ ha_zeroconf: true
 
 The Thread integration helps you track the different Thread networks in your home and helps you manage their credentials. It is currently a work in progress.
 
-Thread is a low-power mesh networking standard which allows users to connect their devices within a home network. It uses the same RF technology as Zigbee, but provides IP connectivity similar to Wi-Fi. Unlike Zigbee, Thread does not allow to control devices directly: It is just a communication protocol. A higher level protocol such as Matter or HomeKit is required to control Thread enabled devices. Thread allows devices to communicate with each other without the need for a central gateway or router. This makes it ideal for home automation, where a large number of devices may need to be connected.
+Thread-based consumer devices use one of the two Home Automation standards: Matter or HomeKit. To add a thread-based device to Home Assistant, use the respective Home Assistant integration:
 
-To connect a Thread network to Home Assistant, Thread Border Routers (TBRs) are used. TBRs are devices that bridge the Thread network to a local Wi-Fi or Ethernet network. To add a TBR to Home Assistant, you can use our [Home Assistant Yellow](/yellow/) hub or the [Home Assistant SkyConnect](/skyconnect/) Zigbee/Thread stick.
+| Logo                                                                        | Home Assistant integration        |
+| :-------------------------------------------------------------------------: | :--------------------------------:|
+| <img src="https://brands.home-assistant.io/_/matter/icon.png"  width="50">  | [Matter](/integrations/Matter/)   |
+| <img src="https://brands.home-assistant.io/_/homekit/icon.png"  width="50"> | [HomeKit](/integrations/homekit/) |
 
-Home Assistant communicates with TBRs over the local network. This means that TBRs do not have to be physically attached to Home Assistant to be used. You might already have a TBR as part of other products in your home, like a Google Nest Hub Gen 2 or Apple HomePod Mini. Each vendor forms their own network when you start using their products, so you can end up having a Home Assistant, an Apple, and a Google Thread network in your home. These are all separate networks using different credentials, which prevents devices to roam between TBRs.
 
-It is possible to align credentials for TBRs from different vendors and have them form a single network together. This allows you to freely move devices between rooms without losing connectivity. To do this, you need to make sure that all TBRs use the same credentials. Sadly, this works differently for each TBR vendor.
+## Thread &#8212; A communication protocol
+
+Thread is a low-power mesh networking standard that allows users to connect their devices within a home network. Thread allows devices to communicate with each other without the need for a central controller. This makes it ideal for home automation, where a large number of devices may need to be connected. Thread uses the same RF technology as Zigbee but provides IP connectivity similar to Wi-Fi. Unlike Zigbee, Thread does not allow to control devices directly: It is just a communication protocol. A higher-level protocol, such as Matter or HomeKit, is required to control Thread-enabled devices. To see which home automation standard is supported by your device, check the icon on the packaging.
+
+## TBRs connect Thread network to Home Assistant
+
+To connect a Thread network to Home Assistant, Thread border routers (TBRs) are used. TBRs are devices that bridge the Thread network to a local Wi-Fi or Ethernet network. To add a TBR to Home Assistant, you can use our [Home Assistant Yellow](/yellow/) hub or the [Home Assistant SkyConnect](/skyconnect/) Zigbee/Thread stick.
+
+Home Assistant communicates with TBRs over the local network. This means that TBRs do not have to be physically attached to Home Assistant to be used. You might already have a TBR as part of other products in your home, like a Google Nest Hub Gen 2 or Apple HomePod Mini. 
+
+### Vendor specific Thread networks
+
+Each vendor forms their own network when you start using their products, so you can end up having a Home Assistant, an Apple, and a Google Thread network in your home. These are all separate networks using different credentials, which prevents devices from roaming between TBRs.
+
+It is possible to align credentials for TBRs from different vendors and have them form a single network together. This allows you to freely move devices between rooms without losing connectivity. To do this, you need to make sure that all TBRs use the same credentials. Currently, this works differently for each TBR vendor.
 
 Home Assistant will sync the Thread credentials with Google when starting to commission a Matter device via the Home Assistant Companion app. For other vendors, if the vendor allows you to see the operational dataset in TLV format, you can import it to Home Assistant from the Thread panel.