Merge branch 'current' into next

CODEOWNERS

@@ -14,6 +14,7 @@ source/_integrations/acmeda.markdown @atmurray
 source/_integrations/adax.markdown @danielhiversen
 source/_integrations/adguard.markdown @frenck
 source/_integrations/advantage_air.markdown @Bre77
+source/_integrations/aemet.markdown @Noltari
 source/_integrations/agent_dvr.markdown @ispysoftware
 source/_integrations/air_quality.markdown @home-assistant/core
 source/_integrations/airly.markdown @bieniu
@@ -22,6 +23,7 @@ source/_integrations/airthings.markdown @danielhiversen
 source/_integrations/airtouch4.markdown @LonePurpleWolf
 source/_integrations/airvisual.markdown @bachya
 source/_integrations/airzone.markdown @Noltari
+source/_integrations/aladdin_connect.markdown @mkmer
 source/_integrations/alarm_control_panel.markdown @home-assistant/core
 source/_integrations/alert.markdown @home-assistant/core
 source/_integrations/alexa.markdown @home-assistant/cloud @ochlocracy
@@ -37,6 +39,7 @@ source/_integrations/androidtv.markdown @JeffLIrion @ollo69
 source/_integrations/apache_kafka.markdown @bachya
 source/_integrations/api.markdown @home-assistant/core
 source/_integrations/apple_tv.markdown @postlund
+source/_integrations/application_credentials.markdown @home-assistant/core
 source/_integrations/apprise.markdown @caronc
 source/_integrations/aprs.markdown @PhilRW
 source/_integrations/arcam_fmj.markdown @elupus
@@ -59,6 +62,7 @@ source/_integrations/azure_devops.markdown @timmo001
 source/_integrations/azure_event_hub.markdown @eavanvalkenburg
 source/_integrations/azure_service_bus.markdown @hfurubotten
 source/_integrations/backup.markdown @home-assistant/core
+source/_integrations/baf.markdown @bdraco @jfroy
 source/_integrations/balboa.markdown @garbled1
 source/_integrations/beewi_smartclim.markdown @alemuro
 source/_integrations/binary_sensor.markdown @home-assistant/core
@@ -68,7 +72,7 @@ source/_integrations/blink.markdown @fronzbot
 source/_integrations/blueprint.markdown @home-assistant/core
 source/_integrations/bluesound.markdown @thrawnarn
 source/_integrations/bmw_connected_drive.markdown @gerard33 @rikroe
-source/_integrations/bond.markdown @bdraco @prystupa @joshs85
+source/_integrations/bond.markdown @bdraco @prystupa @joshs85 @marciogranzotto
 source/_integrations/bosch_shc.markdown @tschamm
 source/_integrations/braviatv.markdown @bieniu @Drafteed
 source/_integrations/broadlink.markdown @danielhiversen @felipediel @L-I-Am
@@ -201,6 +205,7 @@ source/_integrations/geniushub.markdown @zxdavb
 source/_integrations/geo_json_events.markdown @exxamalte
 source/_integrations/geo_location.markdown @home-assistant/core
 source/_integrations/geo_rss_events.markdown @exxamalte
+source/_integrations/geocaching.markdown @Sholofly @reinder83
 source/_integrations/geonetnz_quakes.markdown @exxamalte
 source/_integrations/geonetnz_volcano.markdown @exxamalte
 source/_integrations/gios.markdown @bieniu
@@ -244,7 +249,7 @@ source/_integrations/huawei_lte.markdown @scop @fphammerle
 source/_integrations/hue.markdown @balloob @marcelveldt
 source/_integrations/huisbaasje.markdown @dennisschroer
 source/_integrations/humidifier.markdown @home-assistant/core @Shulyaka
-source/_integrations/hunterdouglas_powerview.markdown @bdraco
+source/_integrations/hunterdouglas_powerview.markdown @bdraco @trullock
 source/_integrations/hvv_departures.markdown @vigonotion
 source/_integrations/hydrawise.markdown @ptcryan
 source/_integrations/hyperion.markdown @dermotduffy
@@ -296,6 +301,7 @@ source/_integrations/kraken.markdown @eifinger
 source/_integrations/kulersky.markdown @emlove
 source/_integrations/lametric.markdown @robbiet480 @frenck
 source/_integrations/launch_library.markdown @ludeeus @DurgNomis-drol
+source/_integrations/laundrify.markdown @xLarry
 source/_integrations/lcn.markdown @alengwenus
 source/_integrations/lg_netcast.markdown @Drafteed
 source/_integrations/life360.markdown @pnbruckner
@@ -443,7 +449,7 @@ source/_integrations/radio_browser.markdown @frenck
 source/_integrations/radiotherm.markdown @vinnyfuria
 source/_integrations/rainbird.markdown @konikvranik
 source/_integrations/raincloud.markdown @vanstinator
-source/_integrations/rainforest_eagle.markdown @gtdiehl @jcalbert
+source/_integrations/rainforest_eagle.markdown @gtdiehl @jcalbert @hastarin
 source/_integrations/rainmachine.markdown @bachya
 source/_integrations/random.markdown @fabaff
 source/_integrations/rdw.markdown @frenck
@@ -490,7 +496,6 @@ source/_integrations/seven_segments.markdown @fabaff
 source/_integrations/sharkiq.markdown @JeffResc @funkybunch @AritroSaha10
 source/_integrations/shell_command.markdown @home-assistant/core
 source/_integrations/shelly.markdown @balloob @bieniu @thecode @chemelli74
-source/_integrations/shiftr.markdown @fabaff
 source/_integrations/shodan.markdown @fabaff
 source/_integrations/sia.markdown @eavanvalkenburg
 source/_integrations/sighthound.markdown @robmarkcole
@@ -500,7 +505,7 @@ source/_integrations/sinch.markdown @bendikrb
 source/_integrations/siren.markdown @home-assistant/core @raman325
 source/_integrations/sisyphus.markdown @jkeljo
 source/_integrations/sky_hub.markdown @rogerselwyn
-source/_integrations/slack.markdown @bachya
+source/_integrations/slack.markdown @bachya @tkdrob
 source/_integrations/sleepiq.markdown @mfugate1 @kbickar
 source/_integrations/slide.markdown @ualex73
 source/_integrations/slimproto.markdown @marcelveldt
@@ -586,6 +591,7 @@ source/_integrations/tts.markdown @pvizeli
 source/_integrations/tuya.markdown @Tuya @zlinoliver @frenck
 source/_integrations/twentemilieu.markdown @frenck
 source/_integrations/twinkly.markdown @dr1rrb @Robbie1221
+source/_integrations/ukraine_alarm.markdown @PaulAnnekov
 source/_integrations/unifi.markdown @Kane610
 source/_integrations/unifiled.markdown @florisvdk
 source/_integrations/unifiprotect.markdown @briis @AngellusMortis @bdraco
@@ -604,7 +610,6 @@ source/_integrations/vallox.markdown @andre-richter @slovdahl @viiru-
 source/_integrations/velbus.markdown @Cereal2nd @brefra
 source/_integrations/velux.markdown @Julius2342
 source/_integrations/venstar.markdown @garbled1
-source/_integrations/vera.markdown @pavoni
 source/_integrations/verisure.markdown @frenck
 source/_integrations/versasense.markdown @flamm3blemuff1n
 source/_integrations/version.markdown @ludeeus
@@ -614,7 +619,6 @@ source/_integrations/vilfo.markdown @ManneW
 source/_integrations/vivotek.markdown @HarlemSquirrel
 source/_integrations/vizio.markdown @raman325
 source/_integrations/vlc_telnet.markdown @rodripf @MartinHjelmare
-source/_integrations/volkszaehler.markdown @fabaff
 source/_integrations/volumio.markdown @OnFreund
 source/_integrations/volvooncall.markdown @molobrakos @decompil3d
 source/_integrations/vulcan.markdown @Antoni-Czaplicki
@@ -654,6 +658,7 @@ source/_integrations/yandex_transport.markdown @rishatik92 @devbis
 source/_integrations/yeelight.markdown @zewelor @shenxn @starkillerOG @alexyao2015
 source/_integrations/yeelightsunflower.markdown @lindsaymarkward
 source/_integrations/yi.markdown @bachya
+source/_integrations/yolink.markdown @matrixd2
 source/_integrations/youless.markdown @gjong
 source/_integrations/zengge.markdown @emontnemery
 source/_integrations/zeroconf.markdown @bdraco

_config.yml

@@ -106,9 +106,9 @@ social:
 
 # Home Assistant release details
 current_major_version: 2022
-current_minor_version: 5
-current_patch_version: 5
-date_released: 2022-05-18
+current_minor_version: 6
+current_patch_version: 0
+date_released: 2022-06-01
 
 # Either # or the anchor link to latest release notes in the blog post.
 # Must be prefixed with a # and have double quotes around it.

package-lock.json

@@ -16,7 +16,7 @@
         "remark-stringify": "^10.0.2",
         "textlint": "^12.1.1",
         "textlint-rule-common-misspellings": "^1.0.1",
-        "textlint-rule-terminology": "^3.0.0"
+        "textlint-rule-terminology": "^3.0.1"
       }
     },
     "node_modules/@azu/format-text": {
@@ -5251,9 +5251,9 @@
       }
     },
     "node_modules/textlint-rule-terminology": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/textlint-rule-terminology/-/textlint-rule-terminology-3.0.0.tgz",
-      "integrity": "sha512-ySHbdLcA9Mdbbbc/Wkts3f8CVvY2Nsy3r21NH4bK785jhdpZozG771WDR7d7L5nNnFBeH7MmS0IcscfMpxMyvQ==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/textlint-rule-terminology/-/textlint-rule-terminology-3.0.1.tgz",
+      "integrity": "sha512-jk2SGGep+XBckhIm9u6CG7NeMZiosJRPfoh7ISlCZizj/JGNk/zheDYGVXwKbFu20SxsguyUIpTF1z/d1Q+NeQ==",
       "dev": true,
       "dependencies": {
         "lodash": "^4.17.15",
@@ -9831,9 +9831,9 @@
       }
     },
     "textlint-rule-terminology": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/textlint-rule-terminology/-/textlint-rule-terminology-3.0.0.tgz",
-      "integrity": "sha512-ySHbdLcA9Mdbbbc/Wkts3f8CVvY2Nsy3r21NH4bK785jhdpZozG771WDR7d7L5nNnFBeH7MmS0IcscfMpxMyvQ==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/textlint-rule-terminology/-/textlint-rule-terminology-3.0.1.tgz",
+      "integrity": "sha512-jk2SGGep+XBckhIm9u6CG7NeMZiosJRPfoh7ISlCZizj/JGNk/zheDYGVXwKbFu20SxsguyUIpTF1z/d1Q+NeQ==",
       "dev": true,
       "requires": {
         "lodash": "^4.17.15",

package.json

@@ -12,7 +12,7 @@
     "remark-stringify": "^10.0.2",
     "textlint": "^12.1.1",
     "textlint-rule-common-misspellings": "^1.0.1",
-    "textlint-rule-terminology": "^3.0.0"
+    "textlint-rule-terminology": "^3.0.1"
   },
   "resolutions": {
     "minimist": ">=1.2.5"

source/_docs/configuration/splitting_configuration.markdown

@@ -76,7 +76,9 @@ device_tracker: !include device_tracker.yaml
 
 Nesting `!include`s (having an `!include` within a file that is itself `!include`d) will also work.
 
-You can, as well, have multiple top-level `!include`s for a given integration, if you give a different label to each one:
+Some integrations support multiple top-level `!include`s, this includes integrations defining an IoT domain, e.g. `light`, `switch`, `sensor` as well as the `automation`, `script` and `template` integrations, if you give a different label to each one. Configuration for other integrations can instead be split up by using packages. To learn more about packages, see the [Packages](/docs/configuration/packages) page.
+
+Example of multiple top-level keys for the `light` platform.
 
 ```yaml
 light:

source/_integrations/aemet.markdown

@@ -12,6 +12,8 @@ ha_platforms:
   - sensor
   - weather
 ha_integration_type: integration
+ha_codeowners:
+  - '@Noltari'
 ---
 
 The AEMET weather platform uses [AEMET OpenData](https://opendata.aemet.es/) as a source for current meteorological data for your location. AEMET stands for "Agencia Estatal de Meteorología", which is the Spanish Meteorological Agency.

source/_integrations/aladdin_connect.markdown

@@ -9,6 +9,9 @@ ha_domain: aladdin_connect
 ha_platforms:
   - cover
 ha_integration_type: integration
+ha_codeowners:
+  - '@mkmer'
+ha_config_flow: true
 ---
 
 The `aladdin_connect` cover platform lets you control Genie Aladdin Connect garage doors through Home Assistant.

source/_integrations/bond.markdown

@@ -15,6 +15,7 @@ ha_codeowners:
   - '@bdraco'
   - '@prystupa'
   - '@joshs85'
+  - '@marciogranzotto'
 ha_config_flow: true
 ha_quality_scale: platinum
 ha_zeroconf: true

source/_integrations/counter.markdown

@@ -3,12 +3,13 @@ title: Counter
 description: Instructions on how to integrate counters into Home Assistant.
 ha_category:
   - Automation
+  - Helper
 ha_release: 0.53
 ha_quality_scale: internal
 ha_codeowners:
   - '@fabaff'
 ha_domain: counter
-ha_integration_type: integration
+ha_integration_type: helper
 ---
 
 The `counter` integration allows one to count occurrences fired by automations.

source/_integrations/esphome.markdown

@@ -22,6 +22,7 @@ ha_platforms:
   - fan
   - light
   - lock
+  - media_player
   - number
   - select
   - sensor

source/_integrations/generic.markdown

@@ -9,6 +9,7 @@ ha_iot_class: Local Push
 ha_domain: generic
 ha_platforms:
   - camera
+  - diagnostics
 ha_codeowners:
   - '@davet2001'
 ha_config_flow: true

source/_integrations/geocaching.markdown

@@ -12,6 +12,7 @@ ha_codeowners:
 ha_domain: geocaching
 ha_platforms:
   - sensor
+ha_integration_type: integration
 ---
 
 Geocaching is a real-world, outdoor adventure that is happening all the time, all around the world. To play, participants use the Geocaching app and/or a GPS device to navigate to cleverly hidden containers called geocaches.

source/_integrations/hunterdouglas_powerview.markdown

@@ -11,6 +11,7 @@ ha_iot_class: Local Polling
 ha_config_flow: true
 ha_codeowners:
   - '@bdraco'
+  - '@trullock'
 ha_homekit: true
 ha_platforms:
   - cover

source/_integrations/ialarm_xr.markdown

@@ -11,6 +11,7 @@ ha_codeowners:
   - '@bigmoby'
 ha_platforms:
   - alarm_control_panel
+ha_integration_type: integration
 ---
 
 The iAlarmXR integration provides connectivity with the [Antifurto365](https://www.antifurtocasa365.it/) iAlarmXR alarm systems.

source/_integrations/intellifire.markdown

@@ -12,6 +12,7 @@ ha_config_flow: true
 ha_platforms:
   - binary_sensor
   - sensor
+  - switch
 ha_dhcp: true
 ha_integration_type: integration
 ---

source/_integrations/juicenet.markdown

@@ -4,9 +4,9 @@ description: Instructions on how to setup WiFi-equipped JuiceNet/JuiceBox chargi
 ha_category:
   - Car
   - Energy
+  - Number
   - Sensor
   - Switch
-  - Number
 ha_iot_class: Cloud Polling
 ha_release: 0.47
 ha_codeowners:
@@ -14,9 +14,9 @@ ha_codeowners:
 ha_domain: juicenet
 ha_config_flow: true
 ha_platforms:
+  - number
   - sensor
   - switch
-  - number
 ha_integration_type: integration
 ---
 

source/_integrations/laundrify.markdown

@@ -1,6 +1,6 @@
 ---
-title: "laundrify"
-description: "Instructions on how to integrate laundrify within Home Assistant."
+title: laundrify
+description: Instructions on how to integrate laundrify within Home Assistant.
 ha_category:
   - Binary Sensor
 ha_release: 2022.6
@@ -11,6 +11,7 @@ ha_platforms:
 ha_codeowners:
   - '@xLarry'
 ha_config_flow: true
+ha_integration_type: integration
 ---
 
 Monitor the status of your washing machine or dryer within Home Assistant using a [laundrify](https://laundrify.de/) WiFi power plug.

source/_integrations/moehlenhoff_alpha2.markdown

@@ -10,7 +10,9 @@ ha_codeowners:
   - '@j-a-n'
 ha_domain: moehlenhoff_alpha2
 ha_platforms:
+  - binary_sensor
   - climate
+  - sensor
 ha_integration_type: integration
 ---
 

source/_integrations/rainforest_eagle.markdown

@@ -9,6 +9,7 @@ ha_iot_class: Local Polling
 ha_codeowners:
   - '@gtdiehl'
   - '@jcalbert'
+  - '@hastarin'
 ha_domain: rainforest_eagle
 ha_platforms:
   - diagnostics

source/_integrations/ring.markdown

@@ -20,6 +20,7 @@ ha_platforms:
   - camera
   - light
   - sensor
+  - siren
   - switch
 ha_integration_type: integration
 ---

source/_integrations/sabnzbd.markdown

@@ -13,9 +13,6 @@ ha_domain: sabnzbd
 ha_platforms:
   - sensor
 ha_integration_type: integration
-ha_codeowners:
-  - '@shaiu'
-ha_config_flow: true
 ---
 
 The `sabnzbd` integration will allow you to monitor and control your downloads with [SABnzbd](https://sabnzbd.org) from within Home Assistant and setup automations based on the information.

source/_integrations/shiftr.markdown

@@ -5,8 +5,6 @@ ha_category:
   - History
 ha_iot_class: Cloud Push
 ha_release: 0.48
-ha_codeowners:
-  - '@fabaff'
 ha_domain: shiftr
 ha_integration_type: integration
 ---

source/_integrations/steam_online.markdown

@@ -12,9 +12,6 @@ ha_platforms:
 ha_codeowners:
   - '@tkdrob'
 ha_integration_type: integration
-ha_codeowners:
-  - '@tkdrob'
-ha_config_flow: true
 ---
 
 The Steam integration will allow you to track the online status of public [Steam](https://steamcommunity.com) accounts.

source/_integrations/timer.markdown

@@ -3,10 +3,11 @@ title: Timer
 description: Instructions on how to integrate timers into Home Assistant.
 ha_category:
   - Automation
+  - Helper
 ha_release: 0.57
 ha_quality_scale: internal
 ha_domain: timer
-ha_integration_type: integration
+ha_integration_type: helper
 ---
 
 The `timer` integration aims to simplify automations based on (dynamic) durations.

source/_integrations/totalconnect.markdown

@@ -13,6 +13,7 @@ ha_domain: totalconnect
 ha_platforms:
   - alarm_control_panel
   - binary_sensor
+  - diagnostics
 ha_integration_type: integration
 ---
 

source/_integrations/unifiprotect.markdown

@@ -29,6 +29,7 @@ ha_platforms:
   - binary_sensor
   - button
   - camera
+  - diagnostics
   - light
   - lock
   - media_player

source/_integrations/vera.markdown

@@ -15,8 +15,6 @@ ha_release: pre 0.7
 ha_iot_class: Local Polling
 ha_config_flow: true
 ha_domain: vera
-ha_codeowners:
-  - '@pavoni'
 ha_platforms:
   - binary_sensor
   - climate

source/_integrations/verisure.markdown

@@ -97,5 +97,3 @@ automation:
 | code | Lock was unlocked by exterior code |
 | auto | Lock was locked/unlocked automatically by Verisure rule |
 | remote | Lock was locked/unlocked automatically by Verisure App |
-
-

source/_integrations/volkszaehler.markdown

@@ -6,8 +6,6 @@ ha_category:
 ha_iot_class: Local Polling
 ha_release: 0.78
 ha_domain: volkszaehler
-ha_codeowners:
-  - '@fabaff'
 ha_platforms:
   - sensor
 ha_integration_type: integration

source/_integrations/vulcan.markdown

@@ -9,7 +9,7 @@ ha_domain: vulcan
 ha_codeowners:
   - '@Antoni-Czaplicki'
 ha_config_flow: true
-ha_quality_scale: platinum
+ha_quality_scale: silver
 ha_platforms:
   - calendar
 ha_integration_type: integration

source/_integrations/ws66i.markdown

@@ -12,6 +12,7 @@ ha_codeowners:
 ha_domain: ws66i
 ha_platforms:
   - media_player
+ha_integration_type: integration
 ---
 
 The Soundavo WS66i 6-Zone Amplifier integration allows you to control the [Soundavo Whole-Home Audio Amplifier](https://www.soundavo.com/products/ws-66i) via the local network. This amplifier is an upgrade of the amplifier sold by [Monoprice](https://www.monoprice.com/product?p_id=10761) that adds 2 built-in wireless streamers and an Ethernet port for control over LAN.

source/_integrations/yolink.markdown

@@ -10,7 +10,7 @@ ha_release: 2022.6
 ha_iot_class: Cloud Push
 ha_config_flow: true
 ha_codeowners:
-  - '@YoSmart-Inc'
+  - '@matrixd2'
 ha_domain: yolink
 ha_platforms:
   - binary_sensor

source/_posts/2022-05-29-matter-in-home-assistant-workshop-announcement.markdown

@@ -30,7 +30,7 @@ The workshop will be free but you will need a couple of things if you want to be
 
 - Home Assistant OS 8.0 or newer (Matter relies on an add-on and Bluetooth)
 - [Home Assistant Community Store](https://hacs.xyz/) installed
-- Espressif ESP32-C3-DevKitM-1 ($9 @ [Mouser](https://www.mouser.com/ProductDetail/356-ESP32-C3DEVKITM1), €17 @ [Conrad](https://www.conrad.de/de/p/espressif-entwicklungsboard-esp32-c3-devkitm-1-2490158.html))
+- Espressif ESP32-C3-DevKitM-1 ($9 @ [Mouser](https://www.mouser.com/ProductDetail/356-ESP32-C3DEVKITM1), €17 @ [Conrad](https://www.conrad.de/de/p/espressif-entwicklungsboard-esp32-c3-devkitm-1-2490158.html)) or M5Stamp C3 ($6 @ [M5Stack](https://twitter.com/home_assistant/status/1531712479016890369))
 - Bluetooth. If you use a Raspberry Pi to run Home Assistant you’re set. If you have a Home Assistant Blue or another device without Bluetooth, get a Bluetooth USB adapter that is supported by Home Assistant OS ([like this one](https://www.amazon.com/gp/product/B09DMP6T22/ref=as_li_tl?ie=UTF8&camp=1789&creative=9325&creativeASIN=B09DMP6T22&linkCode=as2&tag=homeassista0e-20&linkId=c5046239bf04d5b21835299dfb393f0e)).
 
 Even if you can’t follow along, it will still be an informative session!