Merge branch 'current' into patch-94

.github/workflows/test.yml

@@ -8,7 +8,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out files from GitHub
-        uses: actions/[email protected].4
+        uses: actions/[email protected].6
       - name: Setting up Node.js
         uses: actions/[email protected]
         with:
@@ -25,7 +25,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out files from GitHub
-        uses: actions/[email protected].4
+        uses: actions/[email protected].6
       - name: Setting up Node.js
         uses: actions/[email protected]
         with:

CODEOWNERS

@@ -841,7 +841,7 @@ source/_integrations/ukraine_alarm.markdown @PaulAnnekov
 source/_integrations/unifi.markdown @Kane610
 source/_integrations/unifi_direct.markdown @tofuSCHNITZEL
 source/_integrations/unifiled.markdown @florisvdk
-source/_integrations/unifiprotect.markdown @AngellusMortis @bdraco
+source/_integrations/unifiprotect.markdown @bdraco
 source/_integrations/upb.markdown @gwww
 source/_integrations/upc_connect.markdown @pvizeli @fabaff
 source/_integrations/upcloud.markdown @scop

Gemfile

@@ -10,7 +10,7 @@ group :development do
   gem 'stringex', '2.8.6'
   # > 2.1.0 causes slowdowns https://github.com/sass/sassc-ruby/issues/189
   gem 'sassc', '2.1.0'
-  gem 'rubocop', '1.63.4'
+  gem 'rubocop', '1.63.5'
   gem 'ruby-lsp', '0.16.6'
   gem 'rackup', '2.1.0'
 end
@@ -19,11 +19,11 @@ group :jekyll_plugins do
   gem 'jekyll-paginate', '1.1.0'
   gem 'jekyll-sitemap', '1.4.0'
   gem 'jekyll-commonmark', '1.4.0'
-  gem 'jekyll-toc', '0.18.0'
+  gem 'jekyll-toc', '0.19.0'
 end
 
 gem 'sinatra', '4.0.0'
-gem 'nokogiri', '1.16.4'
+gem 'nokogiri', '1.16.5'
 
 # Windows and JRuby does not include zoneinfo files, so bundle the tzinfo-data gem
 # and associated library

Gemfile.lock

@@ -30,7 +30,7 @@ GEM
     google-protobuf (4.26.1-x86_64-linux)
       rake (>= 13)
     http_parser.rb (0.8.0)
-    i18n (1.14.4)
+    i18n (1.14.5)
       concurrent-ruby (~> 1.0)
     jekyll (4.3.3)
       addressable (~> 2.4)
@@ -55,7 +55,7 @@ GEM
       sass-embedded (~> 1.54)
     jekyll-sitemap (1.4.0)
       jekyll (>= 3.7, < 5.0)
-    jekyll-toc (0.18.0)
+    jekyll-toc (0.19.0)
       jekyll (>= 3.9)
       nokogiri (~> 1.12)
     jekyll-watch (2.2.1)
@@ -74,7 +74,7 @@ GEM
     multi_json (1.15.0)
     mustermann (3.0.0)
       ruby2_keywords (~> 0.0.1)
-    nokogiri (1.16.4-x86_64-linux)
+    nokogiri (1.16.5-x86_64-linux)
       racc (~> 1.4)
     parallel (1.24.0)
     parser (3.3.1.0)
@@ -84,8 +84,8 @@ GEM
       forwardable-extended (~> 2.6)
     prism (0.27.0)
     public_suffix (5.0.5)
-    racc (1.7.3)
-    rack (3.0.10)
+    racc (1.8.0)
+    rack (3.0.11)
     rack-protection (4.0.0)
       base64 (>= 0.1.0)
       rack (>= 3.0.0, < 4)
@@ -97,12 +97,13 @@ GEM
     rainbow (3.1.1)
     rake (13.2.1)
     rb-fsevent (0.11.2)
-    rb-inotify (0.10.1)
+    rb-inotify (0.11.1)
       ffi (~> 1.0)
-    regexp_parser (2.9.0)
-    rexml (3.2.6)
+    regexp_parser (2.9.2)
+    rexml (3.2.8)
+      strscan (>= 3.0.9)
     rouge (4.2.1)
-    rubocop (1.63.4)
+    rubocop (1.63.5)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
@@ -123,7 +124,7 @@ GEM
     ruby2_keywords (0.0.5)
     safe_yaml (1.0.5)
     sass (3.4.25)
-    sass-embedded (1.76.0-x86_64-linux-gnu)
+    sass-embedded (1.77.2-x86_64-linux-gnu)
       google-protobuf (>= 3.25, < 5.0)
     sass-globbing (1.1.5)
       sass (>= 3.1)
@@ -135,8 +136,9 @@ GEM
       rack-protection (= 4.0.0)
       rack-session (>= 2.0.0, < 3)
       tilt (~> 2.0)
-    sorbet-runtime (0.5.11368)
+    sorbet-runtime (0.5.11385)
     stringex (2.8.6)
+    strscan (3.1.0)
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)
     tilt (2.3.0)
@@ -156,11 +158,11 @@ DEPENDENCIES
   jekyll-commonmark (= 1.4.0)
   jekyll-paginate (= 1.1.0)
   jekyll-sitemap (= 1.4.0)
-  jekyll-toc (= 0.18.0)
-  nokogiri (= 1.16.4)
+  jekyll-toc (= 0.19.0)
+  nokogiri (= 1.16.5)
   rackup (= 2.1.0)
   rake (= 13.2.1)
-  rubocop (= 1.63.4)
+  rubocop (= 1.63.5)
   ruby-lsp (= 0.16.6)
   sass-globbing (= 1.1.5)
   sassc (= 2.1.0)

_config.yml

@@ -110,8 +110,8 @@ social:
 # Home Assistant release details
 current_major_version: 2024
 current_minor_version: 5
-current_patch_version: 0
-date_released: 2024-05-01
+current_patch_version: 4
+date_released: 2024-05-17
 
 # 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.json

@@ -18,7 +18,7 @@
     "textlint": "^14.0.4",
     "textlint-filter-rule-comments": "^1.2.2",
     "textlint-rule-common-misspellings": "^1.0.1",
-    "textlint-rule-terminology": "^4.0.1"
+    "textlint-rule-terminology": "^5.0.0"
   },
   "resolutions": {
     "minimist": ">=1.2.5"

plugins/terminology_tooltip.rb

@@ -34,7 +34,7 @@ def render(context)
 
         if glossary.key?("link")
           rendered_link = Liquid::Template.parse(glossary["link"]).render(context).strip
-          link = "<br><a class='terminology-link' href='#{rendered_link}' target='_blank'>[Learn more]</a>"
+          link = "<small><a class='terminology-link' href='#{rendered_link}' target='_blank'>[Learn more]</a></small>"
         end
 
         tooltip = "<span class='terminology-tooltip'>#{definition}#{link || ""}</span>"

sass/custom/_terminology_tooltip.scss

@@ -66,4 +66,7 @@
       }
     }
   }
+  code {
+    border-bottom: 2px dotted $primary-color;
+  }
 }

source/_dashboards/tile.markdown

@@ -6,7 +6,7 @@ description: "The tile card gives you a quick overview of your entity. The card
 related:
   - docs: /dashboards/actions/
     title: Card actions
-  - docs:  /dashboards/features
+  - docs:  /dashboards/features/
     title: Card features
   - docs: /dashboards/cards/
     title: Dashboard cards
@@ -137,3 +137,15 @@ features:
 
 You want to colorize the tile card? Choose one of the following colors: `primary`, `accent`, `disabled`, `red`, `pink`, `purple`, `deep-purple`, `indigo`, `blue`, `light-blue`, `cyan`, `teal`, `green`, `light-green`, `lime`, `yellow`, `amber`, `orange`, `deep-orange`, `brown`, `grey`, `blue-grey`, `black` and `white`.
 
+## Reordering features
+
+Some features of the tile card, such as the presets or the HVAC modes of a
+thermostat, can show many buttons. While you can limit the buttons you’d
+like to see, they may not be in the desired order.
+
+For your thermostat, that means you can reorder the HVAC modes or presets.
+
+<p class='img'>
+    <img src="/images/blog/2024-05/tile-card-reorder-features.gif" alt=" Screen recording showing how you can now reorder the HVAC modes on the thermostat shown in a tile card."/>
+    You can now reorder the features of the tile card.
+</p>

source/_data/glossary.yml

@@ -140,6 +140,13 @@
   link: /docs/scripts/conditions/
   aliases:
     - conditions
+- term: Configuration file
+  aliases:
+    - configuration.yaml
+    - "`configuration.yaml`"
+  definition: >-
+    The configuration.yaml file is the main configuration file for Home Assistant. It lists the integrations to be loaded and their specific configurations. In some cases, the configuration needs to be edited manually directly in the configuration.yaml file. Most integrations can be configured in the UI.
+  link: /docs/configuration/
 - term: Cover
   definition: >-
     Covers are devices such as blinds, garage doors, etc that can be opened and

source/_docs/authentication/multi-factor-auth.markdown

@@ -24,7 +24,7 @@ Home Assistant generates a secret key which is synchronized with an app on your
 
 #### Setting up TOTP
 
-Enable TOTP in your `configuration.yaml` like this:
+Enable TOTP in your {% term "`configuration.yaml`" %} like this:
 
 ```yaml
 homeassistant:
@@ -64,7 +64,7 @@ The Notify MFA module uses the [notify integration](/integrations/notify/) to se
 
 #### Setting up MFA notify
 
-Add Notify MFA to your `configuration.yaml` file like this:
+Add Notify MFA to your {% term "`configuration.yaml`" %} file like this:
 
 ```yaml
 homeassistant:

source/_docs/authentication/providers.markdown

@@ -1,6 +1,9 @@
 ---
 title: "Authentication providers"
 description: "Guide on configuring different authentication providers."
+related:
+  - docs: /docs/configuration/
+    title: configuration.yaml file
 ---
 
 <div class='note warning'>
@@ -13,13 +16,13 @@ When you log in, an _auth provider_ checks your credentials to make sure you are
 
 <div class='note warning'>
 
-Home Assistant automatically configures the standard auth providers so you don't need to specify `auth_providers` in your `configuration.yaml` file unless you are configuring more than one. Specifying `auth_providers` will disable all auth providers that are not listed, so you could reduce your security or create difficulties logging in if it is not configured correctly.
+Home Assistant automatically configures the standard auth providers so you don't need to specify `auth_providers` in your {% term "`configuration.yaml`" %} file unless you are configuring more than one. Specifying `auth_providers` will disable all auth providers that are not listed, so you could reduce your security or create difficulties logging in if it is not configured correctly.
 
 If you decide to use `trusted_networks` as your `auth_provider` there won't be a way to authenticate for a device outside of your listed trusted network. To overcome this ensure you add the default `auth_provider` with `type: homeassistant` back in manually. This will then present you with the default auth login screen when trusted network authentication fails as expected from outside your LAN.
 
 </div>
 
-Authentication providers are configured in your `configuration.yaml` under the `homeassistant:` block. 
+Authentication providers are configured in your {% term "`configuration.yaml`" %} file under the `homeassistant:` block. 
 If you are moving configuration to packages, this particular configuration must stay within 'configuration.yaml'. See Issue 16441 in the warning block at the bottom of this page.
 
 
@@ -44,15 +47,15 @@ User details are stored in the `[your config]/.storage`  directory. All password
 
 Users can be managed in Home Assistant by the owner. Go to the configuration panel and click on _{% my users %}_.
 
-This is the entry in `configuration.yaml` for Home Assistant auth:
+This is the entry in {% term "`configuration.yaml`" %} for Home Assistant auth:
 
 ```yaml
 homeassistant:
   auth_providers:
     - type: homeassistant
 ```
 
-If you don't specify any `auth_providers` section in the `configuration.yaml` file then this provider will be set up automatically.
+If you don't specify any `auth_providers` section in the {% term "`configuration.yaml`" %} file then this provider will be set up automatically.
 
 ### Trusted networks
 
@@ -72,7 +75,7 @@ You cannot trust a network that you are using in any [trusted_proxies](/integrat
 
 </div>
 
-Here is an example in `configuration.yaml` to set up Trusted Networks:
+Here is an example in {% term "`configuration.yaml`" %} to set up Trusted Networks:
 
 ```yaml
 homeassistant:

source/_docs/automation/editor.markdown

@@ -39,4 +39,4 @@ Automations created or edited via the user interface are activated immediately a
 
 ## Troubleshooting missing automations
 
-When you're creating automations using the GUI and they don't appear in the UI, make sure that you add back `automation: !include automations.yaml` from the default configuration to your `configuration.yaml`.
+When you're creating automations using the GUI and they don't appear in the UI, make sure that you add back `automation: !include automations.yaml` from the default configuration to your {% term "`configuration.yaml`" %}.

source/_docs/automation/using_blueprints.markdown

@@ -91,4 +91,4 @@ Learn more about blueprints by [reading our tutorial on creating a blueprint](/d
 
 ## Troubleshooting missing automations
 
-When you're creating automations using blueprints and they don't appear in the UI, make sure that you add back `automation: !include automations.yaml` from the default configuration to your `configuration.yaml`.
+When you're creating automations using blueprints and they don't appear in the UI, make sure that you add back `automation: !include automations.yaml` from the default configuration to your {% term "`configuration.yaml`" %}.

source/_docs/automation/yaml.markdown

@@ -7,7 +7,7 @@ Automations are created in Home Assistant via the UI, but are stored in a YAML f
 
 The UI will write your automations to `automations.yaml`. This file is managed by the UI and should not be edited manually.
 
-It is also possible to write your automations directly inside `configuration.yaml` or other YAML files. You can do this by adding a labeled `automation` block to your `configuration.yaml`:
+It is also possible to write your automations directly inside {% term "`configuration.yaml`" %} or other YAML files. You can do this by adding a labeled `automation` block to your `configuration.yaml`:
 
 ```yaml
 # The configuration required for the UI to work
@@ -128,7 +128,7 @@ Mode | Description
 
 ## YAML example
 
-Example of a YAML based automation that you can add to `configuration.yaml`.
+Example of a YAML based automation that you can add to {% term "`configuration.yaml`" %}.
 
 {% raw %}