Merge branch 'current' into rc

Gemfile

@@ -12,7 +12,7 @@ group :development do
   gem 'sassc', '2.1.0'
   gem 'sass-embedded', '1.80.6'
   gem 'rubocop', '1.68.0'
-  gem 'ruby-lsp', '0.21.2'
+  gem 'ruby-lsp', '0.21.3'
   gem 'rackup', '2.2.0'
 end
 

Gemfile.lock

@@ -86,7 +86,7 @@ GEM
     nokogiri (1.16.7-x86_64-linux)
       racc (~> 1.4)
     parallel (1.26.3)
-    parser (3.3.5.1)
+    parser (3.3.6.0)
       ast (~> 2.4.1)
       racc
     pathutil (0.16.2)
@@ -124,7 +124,7 @@ GEM
       unicode-display_width (>= 2.4.0, < 3.0)
     rubocop-ast (1.34.0)
       parser (>= 3.3.1.0)
-    ruby-lsp (0.21.2)
+    ruby-lsp (0.21.3)
       language_server-protocol (~> 3.17.0)
       prism (>= 1.2, < 2.0)
       rbs (>= 3, < 4)
@@ -149,7 +149,7 @@ GEM
       rack-protection (= 4.0.0)
       rack-session (>= 2.0.0, < 3)
       tilt (~> 2.0)
-    sorbet-runtime (0.5.11633)
+    sorbet-runtime (0.5.11637)
     stringex (2.8.6)
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)
@@ -176,7 +176,7 @@ DEPENDENCIES
   rackup (= 2.2.0)
   rake (= 13.2.1)
   rubocop (= 1.68.0)
-  ruby-lsp (= 0.21.2)
+  ruby-lsp (= 0.21.3)
   sass-embedded (= 1.80.6)
   sass-globbing (= 1.1.5)
   sassc (= 2.1.0)

source/_docs/authentication.markdown

@@ -7,7 +7,7 @@ The authentication system secures access to Home Assistant.
 
 ## Login screen
 
-You are greeted with a log in screen, asking you for user name and password.
+You are greeted with a log in screen, asking you for username and password.
 
 <img src='/images/docs/authentication/login-outside-local-network.png' alt='Screenshot of the login screen, when logging in from within the local network' style='border: 0;box-shadow: none;'>
 
@@ -55,9 +55,9 @@ As an extra level of security, you can turn on [multi-factor authentication](/do
 
 If you have administrator rights, you can [add a person to Home Assistant](/integrations/person/#adding-a-person-to-home-assistant) and create them a user account.
 
-## Changing display or user name
+## Changing display or username
 
-To learn how to change a display or user name, refer to [setting up basic information](/docs/configuration/basic/).
+To learn how to change a display or username, refer to [setting up basic information](/docs/configuration/basic/).
 
 ## Other authentication techniques
 

source/_docs/authentication/providers.markdown

@@ -123,11 +123,16 @@ homeassistant:
           - group: system-users
 ```
 
-First note, for `trusted_users` configuration you need to use `user id`, which you can find through {% my users title="Settings -> People" %} -> View User Detail. The `trusted_users` configuration will not validate the existence of the user, so please make sure you have put in the correct user id by yourself.
+First note, for `trusted_users` configuration you need to use `user id`.
 
-Second note, a trusted user with an IPv6 address must put the IPv6 address in quotes as shown.
+1. To find the user ID, in your browser, make sure the URL of your Home Assistant ends in `config/users/`.
+   - For example: `homeassistant:8123/config/users`.
+2. Select the user from the list, and copy the ID.
+   - For example: `acbbff56461748718f3650fb914b88c9`.
+3. The `trusted_users` configuration will not validate the existence of the user, so please make sure you have put in the correct user id.
+4. A trusted user with an IPv6 address must put the IPv6 address in quotes as shown.
 
-In above example, if user try to access Home Assistant from 192.168.0.1, they will have only one user available to choose. They will have two users available if access from 192.168.0.38 (from 192.168.0.0/24 network). If they access from 192.168.10.0/24 network, they can choose from all available users (non-system and active users).
+In the above example, if user try to access Home Assistant from 192.168.0.1, they will have only one user available to choose. They will have two users available if access from 192.168.0.38 (from 192.168.0.0/24 network). If they access from 192.168.10.0/24 network, they can choose from all available users (non-system and active users).
 
 Specially, you can use `group: GROUP_ID` to assign all users in certain `user group` to be available to choose. Group and users can be mix and match.
 

source/_docs/automation/templating.markdown

@@ -102,6 +102,7 @@ These are the properties available for a [Sentence trigger](/docs/automation/tri
 | `trigger.sentence` | Text of the sentence that was matched
 | `trigger.slots`    | Object with matched slot values
 | `trigger.details` | Object with matched slot details by name, such as [wildcards](/docs/automation/trigger/#sentence-wildcards). Each detail contains: <ul><li>`name` - name of the slot</li><li>`text` - matched text</li><li>`value` - output value (see [lists](https://developers.home-assistant.io/docs/voice/intent-recognition/template-sentence-syntax/#lists))</li></ul>
+| `trigger.device_id` | The device ID that captured the command, if any.
 
 ### State
 

source/_docs/configuration/basic.markdown

@@ -39,7 +39,7 @@ To change the general settings that were defined during onboarding, follow these
 
 ## Changing a person's display name
 
-The display name is the name that is shown in Home Assistant. It can differ from the user name, which is the name used to log in.
+The display name is the name that is shown in Home Assistant. It can differ from the username, which is the name used to log in.
 
 ### Prerequisites
 
@@ -50,18 +50,19 @@ The display name is the name that is shown in Home Assistant. It can differ from
 1. To edit the display name of a person using Home Assistant, go to {% my people title="**Settings** > **People**" %} and select the person for which you want to change the display name.
 2. Change the display name and select **Update** to save the change.
 
-## Changing a user name
+## Changing a username
 
-The user name is the name that is used to log in. It can differ from the display name.
+The username is the name that is used to log in. It can differ from the display name.
 
 ### Prerequisites
 
-- You need owner rights to change a user name.
+- You need owner rights to change a username.
 
 ### To change a username
 
 1. To edit the username of a person using Home Assistant, go to {% my people title="**Settings** > **People**" %} and select the person for which you want to change the display name.
 2. Change the username and select **Update** to save the change.
+   - It must be lowercase and contain no spaces.
    - The log in is case-sensitive.
 
 ## Changing authentication settings

source/_integrations/knocki.markdown

@@ -16,12 +16,30 @@ ha_platforms:
 ha_integration_type: hub
 ---
 
-The **Knocki** {% term integration %} can receive events for the triggers set up from your [Knocki devices](https://knocki.com/).
+The **Knocki** {% term integration %} allows you to trigger your favorite automations simply by tapping custom patterns (such as triple taps) on ordinary surfaces.
 
 ## Prerequisites
 
-To use the Knocki integration, you need a Knocki account.
+- You must have a [Knocki device](http://knocki.com).
 
-Once you set a trigger in the app, it will show up in Home Assistant to use.
+- Completed the setup process in the **Knocki** mobile app, as described in steps 1-7 below.
+
+1. Open the Knocki Mobile App. It’s a free download on [iOS](https://apps.apple.com/us/app/knocki/id1238395440) and [Android](https://play.google.com/store/apps/details?id=com.knocki.mobileapp).
+2. Using the app, log-in or create a new Knocki account.
+3. From the app’s home screen, select a Knocki or [add a Knocki](https://support.knocki.com/hc/en-us/articles/12769368448659-How-Do-Add-a-Knocki-to-My-Account).
+4. On the app’s device screen, select a gesture or [add a gesture](https://support.knocki.com/hc/en-us/articles/360013333634-Creating-a-Gesture).
+5. Next, select the [add a task](https://support.knocki.com/hc/en-us/articles/12920956118291-How-do-I-Add-Tasks-to-a-Knocki) option.
+6. Scroll down the task menu and select Home Assistant.
+7. Follow the in-app instructions to add the Home Assistant task.
 
 {% include integrations/config_flow.md %}
+
+## Automation example
+
+1. Go to {% my automations title="**Settings** > **Automations & scenes**" %} and in the lower right corner, select  **Create Automation**.
+2. Select **Create new automation**.
+3. Select **Add Trigger**, select **Entity** as the trigger type.
+   - Search for the name of the task (as you named it in the Knocki app). Select the entity with that name appended to it.
+   - Select **State** as the type of entity change.
+4. Select **Add action** and choose whatever action(s) you’d like the automation to trigger.
+5. Finally, test the action by tapping the associated gesture pattern.

source/_integrations/person.markdown

@@ -44,7 +44,8 @@ If you have administrator rights, you can add other persons to Home Assistant an
    - They cannot have their own dashboard, for example.
    - But they can still be used for device tracking and show up on a map and be used in automations.
 5. If they are able to log in, fill in the user information.
-   - Check if the user name is correct. A suggestion is made based on the person name. But they do not have to be identical.
+   - Check if the username is correct. A suggestion is made based on the person name. But they do not have to be identical.
+     - The username must be lowercase and contain no spaces.
      - The username is required to log in.
      - The person name is the name displayed in the UI.
    - Enter a password and store it in a safe location.

source/voice_control/builtin_sentences.markdown

@@ -131,7 +131,7 @@ Home Assistant comes with [built-in sentences](https://github.com/home-assistant
 - *how much time is left on kitchen timer?*
 - *how much time is left on 5 minute timer?*
 
-"p class='img'""lite-youtube videoid=v3mNdTsX4J0 videotitle=Voice timers with countdown text and loading bar""/lite-youtube"Timers running on an S3-Box-3B, with countdown text and a loading bar!"/p"
+<p class='img'><lite-youtube videoid="v3mNdTsX4J0" videotitle="Voice timers with countdown text and loading bar"></lite-youtube>Timers running on an S3-Box-3B, with countdown text and a loading bar!</p>
 
 To learn how to set this up, refer to the [ESP32-S3-Box-3B tutorial](/voice_control/s3_box_voice_assistant/).