Merge branch 'current' into rc

Gemfile.lock

@@ -142,7 +142,7 @@ GEM
       rack-protection (= 4.0.0)
       rack-session (>= 2.0.0, < 3)
       tilt (~> 2.0)
-    sorbet-runtime (0.5.11511)
+    sorbet-runtime (0.5.11514)
     stringex (2.8.6)
     strscan (3.1.0)
     terminal-table (3.0.2)

source/getting-started/configuration.markdown

@@ -18,9 +18,21 @@ related:
 
 The onboarding process takes you through the initial setup for Home Assistant, such as getting the system up and running, naming your home and selecting your location. This section points you to further documentation helping you with the next steps.
 
+## Adding other persons to Home Assistant
+
+You can add other people to Home Assistant. They can have their own login, use Home Assistant on their devices and create their own dashboards. To add other people, refer to [Adding a person to Home Assistant](/integrations/person/#adding-a-person-to-home-assistant).
+
+## Apps for Android and iOS
+
+You can use Home Assistant on your phone, smartwatch, and even in your car.
+
+- To learn how to install Home Assistant on Android or iOS, refer to the [documentation for the Companion Apps](https://companion.home-assistant.io/).
+- Want to use your voice to control Home Assistant?
+  - Refer to the documentation on using [Assist on Android](/voice_control/android/).
+
 ## Changing the basic settings
 
-To change basic settings such as location, unit system and language, refer to [Changing basic settings](/docs/configuration/basic/).
+To change basic settings such as location, unit system, and language, refer to [Changing basic settings](/docs/configuration/basic/).
 
 ## Creating a backup
 
@@ -43,6 +55,3 @@ If you need more space to store data, you can configure a [network storage](/com
 
 If you want to get started with a voice assistant, refer to the documentation on [Assist](/voice_control/).
 
-## Apps for Android and iOS
-
-If you are looking for information on Home Assistant for Android or iOS, refer to the [documentation for the Companion Apps](https://companion.home-assistant.io/).

source/getting-started/presence-detection.markdown

@@ -58,7 +58,9 @@ There are different ways of setting up zone presence detection. One way is to ru
 
 ## Adding presence detection for other persons in your home
 
-1. For each person you want to have presence detection, add a device tracker.
+1. For each person you want to have presence detection, add a device tracker (for example, their phone).
+   - You can also use a smartwatch for presence detection. To do this, install the [Home Assistant Companion app](https://companion.home-assistant.io/docs/getting_started/) on the device. Make sure to allow location tracking.
+   - To use it for zone presence detection outside your home, the smartwatch requires a mobile plan.
 2. Go to {% my people title="**Settings** > **People**" %} and select the person.
 3. Scroll down and under **Select the devices that belong to this person**, select the device.
 

source/voice_control/thirteen-usd-voice-remote.markdown

@@ -45,7 +45,7 @@ Before you can use this device with Home Assistant, you need to install a bit of
    - Select the **Connect** button below. If your browser does not support web serial, you will see a warning instead of a button.
 
       <script type="module" src="https://unpkg.com/esp-web-tools@10/dist/web/install-button.js?module"></script>
-      <esp-web-install-button manifest="https://firmware.esphome.io/voice-assistant/m5stack-atom-echo/manifest.json"></esp-web-install-button>
+      <esp-web-install-button manifest="https://firmware.esphome.io/wake-word-voice-assistant/m5stack-atom-echo/manifest.json"></esp-web-install-button>
    - **For advanced users**: The configuration file is available on [GitHub](https://github.com/esphome/firmware/blob/main/voice-assistant/m5stack-atom-echo.yaml).
 
 {% include voice_assistant/install_esp_firmware.md %}

source/yellow/index.html

@@ -154,11 +154,6 @@ frontpage_image: /images/frontpage/yellow-frontpage.jpg
       <span>Zigbee & Thread</span>
       <span>Comes with Zigbee out of the box. Thread to power your Matter network is coming soon.</span>
     </div>
-    <div class="item">
-      <span>Ready</span>
-      <span>Zero Setup</span>
-      <span>Comes with Home Assistant.</span>
-    </div>
   </div>
 </div>