Merge branch 'home-assistant:current' into feature/tile-card-icon-hol…

…d-and-icon-double-tap

Gemfile.lock

@@ -29,10 +29,10 @@ GEM
     ffi (1.17.0-arm64-darwin)
     ffi (1.17.0-x86_64-linux-gnu)
     forwardable-extended (2.6.0)
-    google-protobuf (4.28.0-arm64-darwin)
+    google-protobuf (4.28.1-arm64-darwin)
       bigdecimal
       rake (>= 13)
-    google-protobuf (4.28.0-x86_64-linux)
+    google-protobuf (4.28.1-x86_64-linux)
       bigdecimal
       rake (>= 13)
     http_parser.rb (0.8.0)

sass/homeassistant/base/_navigation.scss

@@ -184,14 +184,14 @@ header .grid {
     @include box-sizing(border-box);
     @include transition(all 0.5s linear);
     content: "☰";
-    display: inline-block;
+    display: flex;
+    justify-content: center;
+    align-items: center;
     width: 32px;
     height: 32px;
-    padding: 4px 9px;
     background: $primary-color;
     text-align: center;
     font-family: $sans-serif;
-    font-size: 16px;
     color: $white;
     white-space: nowrap;
     border-radius: 24px;
@@ -203,6 +203,7 @@ header .grid {
 
   #toggle:checked + .toggle::after {
     content: attr(data-close);
+    padding-bottom: 2px;
   }
 
   /* submenus */

source/_includes/integrations/restart_ha_after_config_inclusion.md

@@ -1 +1 @@
-After changing the {% term "`configuration.yaml`" %} file, [restart Home Assistant](/docs/configuration/#reloading-the-configuration-to-apply-changes) to apply the changes. {% if page.ha_platforms %} {% if page.ha_quality_scale != "internal" or page.ha_domain contains 'generic' %}. The integration is now shown on the integrations page under **{% my integrations title="Settings > Devices & services" %}**. Its entities are listed on the integration card itself and on the {% my entities title="**Entities**" %} tab. {% endif %}{% endif %}
+After changing the {% term "`configuration.yaml`" %} file, [restart Home Assistant](/docs/configuration/#reloading-the-configuration-to-apply-changes) to apply the changes. {% if page.ha_platforms %} {% if page.ha_quality_scale != "internal" or page.ha_domain contains 'generic' %} The integration is now shown on the integrations page under **{% my integrations title="Settings > Devices & services" %}**. Its entities are listed on the integration card itself and on the {% my entities title="**Entities**" %} tab. {% endif %}{% endif %}

source/_integrations/air_quality.markdown

@@ -27,3 +27,7 @@ The platforms cover the following levels (if they are available):
 - The NO2 (nitrogen dioxide) level.
 
 {% include integrations/building_block_integration.md %}
+
+## The state of an air quality entity
+
+The state of an air quality entity represents the concentration of particles in the air that are 2.5 microns or fewer in diameter. The state is a number. The number is followed by the unit of measurement (micrograms per cubic meter: "µg/m³"). For example, *PM2.5: 4 µg/m³*. In this example, the state is 4.

source/_integrations/alarm_control_panel.markdown

@@ -9,24 +9,43 @@ ha_domain: alarm_control_panel
 ha_codeowners:
   - '@home-assistant/core'
 ha_integration_type: entity
+related:
+  - docs: /integrations/manual/
+    title: Manual alarm
+  - docs: /integrations/alarm_control_panel.template/
+    title: Template alarm
 ---
 
 Home Assistant can give you an interface which is similar to a classic alarm system.
 Please see [manual alarm](/integrations/manual) or [template alarm](/integrations/alarm_control_panel.template) for alarm configuration.
 
-
 {% include integrations/building_block_integration.md %}
 
-### Actions
+## The state of an alarm panel entity
+
+An alarm panel entity can have the following states. Not all integrations implement all the different states.
+
+- **Disarmed**: The alarm is disarmed (off).
+- **Armed home**: The alarm is armed in home mode.
+- **Armed away**: The alarm is armed in away mode.
+- **Armed night**: The alarm is armed in night mode.
+- **Armed vacation**: The alarm is armed in vacation mode.
+- **Armed custom bypass**: The alarm is armed in bypass mode.
+- **Pending**: The alarm is pending (towards triggered).
+- **Arming**: The alarm is in the process of being armed.
+- **Disarming**: The alarm is in the process of being disarmed.
+- **Triggered**: The alarm has been triggered.
+
+## Actions
 
 Depending on features supported by a specific integration alarm may expose the following actions:
 
-| Action | Data | Description |
-| ------- | ---- | ----------- |
-| `alarm_arm_home` | `entity_id` <br> `code` (optional) | Arm the alarm in the home mode.
-| `alarm_arm_away` | `entity_id` <br> `code` (optional) | Arm the alarm in the away mode.
-| `alarm_arm_night` | `entity_id` <br> `code` (optional) | Arm the alarm in the night mode.
-| `alarm_arm_vacation` | `entity_id` <br> `code` (optional) | Arm the alarm in the vacation mode.
-| `alarm_disarm` | `entity_id` <br> `code` (optional) | Disarm the alarm.
-| `alarm_trigger` | `entity_id` <br> `code` (optional) | Trigger the alarm manually.
-| `alarm_arm_custom_bypass` | `entity_id` <br> `code` (optional) | Send arm custom bypass command.
+| Action                    | Data                               | Description                         |
+| ------------------------- | ---------------------------------- | ----------------------------------- |
+| `alarm_arm_home`          | `entity_id` <br> `code` (optional) | Arm the alarm in the home mode.     |
+| `alarm_arm_away`          | `entity_id` <br> `code` (optional) | Arm the alarm in the away mode.     |
+| `alarm_arm_night`         | `entity_id` <br> `code` (optional) | Arm the alarm in the night mode.    |
+| `alarm_arm_vacation`      | `entity_id` <br> `code` (optional) | Arm the alarm in the vacation mode. |
+| `alarm_disarm`            | `entity_id` <br> `code` (optional) | Disarm the alarm.                   |
+| `alarm_trigger`           | `entity_id` <br> `code` (optional) | Trigger the alarm manually.         |
+| `alarm_arm_custom_bypass` | `entity_id` <br> `code` (optional) | Send arm custom bypass command.     |

source/_integrations/calendar.markdown

@@ -21,7 +21,6 @@ integrations page to find integrations offering calendar entities. For example,
 
 {% include integrations/building_block_integration.md %}
 
-
 ## Viewing and managing calendars
 
 Each calendar is represented as its own {% term entity %} in Home Assistant and can be
@@ -34,6 +33,13 @@ the **Add event** button in the lower right corner of the calendar dashboard.
 
 Also see [Actions](#actions) below.
 
+## The state of a calendar entity
+
+The state shows whether or not there is an active event:
+
+- On: The calendar has an active event.
+- Off: The calendar does not have an active event.
+
 ## Automation
 
 Calendar [Triggers](/docs/automation/trigger) enable {% term automation %} based on an
@@ -148,16 +154,16 @@ directly using {% term actions %}. The actions provided by some calendar {% term
 
 Add a new calendar event. A calendar `target` is selected with a [Target Selector](/docs/blueprint/selectors/#target-selector) and the `data` payload supports the following fields:
 
-| Data attribute | Optional | Description | Example |
-| ---------------------- | -------- | ----------- | --------|
-| `summary` | no | Acts as the title of the event. | Bowling
-| `description` | yes | The description of the event. | Birthday bowling
-| `start_date_time` | yes | The date and time the event should start. | 2019-03-10 20:00:00
-| `end_date_time` | yes | The date and time the event should end (exclusive). | 2019-03-10 23:00:00
-| `start_date` | yes | The date the whole day event should start. | 2019-03-10
-| `end_date` | yes | The date the whole day event should end (exclusive). | 2019-03-11
-| `in` | yes | Days or weeks that you want to create the event in. | "days": 2
-| `location` | yes | The location of the event. | Bowling center
+| Data attribute    | Optional | Description                                          | Example             |
+| ----------------- | -------- | ---------------------------------------------------- | ------------------- |
+| `summary`         | no       | Acts as the title of the event.                      | Bowling             |
+| `description`     | yes      | The description of the event.                        | Birthday bowling    |
+| `start_date_time` | yes      | The date and time the event should start.            | 2019-03-10 20:00:00 |
+| `end_date_time`   | yes      | The date and time the event should end (exclusive).  | 2019-03-10 23:00:00 |
+| `start_date`      | yes      | The date the whole day event should start.           | 2019-03-10          |
+| `end_date`        | yes      | The date the whole day event should end (exclusive). | 2019-03-11          |
+| `in`              | yes      | Days or weeks that you want to create the event in.  | "days": 2           |
+| `location`        | yes      | The location of the event.                           | Bowling center      |
 
 
 {% note %}
@@ -196,11 +202,11 @@ data:
 This action populates [Response Data](/docs/scripts/perform-actions#use-templates-to-handle-response-data)
 with calendar events within a date range. It can return events from multiple calendars.
 
-| Data attribute | Optional | Description | Example |
-| ---------------------- | -------- | ----------- | --------|
-| `start_date_time` | yes | Return active events after this time (exclusive). When not set, defaults to now. | 2019-03-10 20:00:00
-| `end_date_time` | yes | Return active events before this time (exclusive). Cannot be used with `duration`. You must specify either `end_date_time` or `duration`.| 2019-03-10 23:00:00
-| `duration` | yes | Return active events from `start_date_time` until the specified duration. Cannot be used with `end_date_time`. You must specify either `duration` or `end_date_time`. | `days: 2`
+| Data attribute    | Optional | Description                                                                                                                                                           | Example             |
+| ----------------- | -------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------- |
+| `start_date_time` | yes      | Return active events after this time (exclusive). When not set, defaults to now.                                                                                      | 2019-03-10 20:00:00 |
+| `end_date_time`   | yes      | Return active events before this time (exclusive). Cannot be used with `duration`. You must specify either `end_date_time` or `duration`.                             | 2019-03-10 23:00:00 |
+| `duration`        | yes      | Return active events from `start_date_time` until the specified duration. Cannot be used with `end_date_time`. You must specify either `duration` or `end_date_time`. | `days: 2`           |
 
 {% note %}
 Use only one of `end_date_time` or `duration`.
@@ -221,13 +227,13 @@ response_variable: agenda
 The response data contains a field for every calendar entity (e.g. `calendar.school` and `calendar.work` in this case).
 Every calendar entity has a field `events` containing a list of events with these fields:
 
-| Response data | Description | Example |
-| ---------------------- | ----------- | -------- |
-| `summary` | The title of the event. | Bowling
-| `description` | The description of the event. | Birthday bowling
-| `start` | The date or date time the event starts. | 2019-03-10 20:00:00
-| `end` | The date or date time the event ends (exclusive). | 2019-03-10 23:00:00
-| `location` | The location of the event. | Bowling center
+| Response data | Description                                       | Example             |
+| ------------- | ------------------------------------------------- | ------------------- |
+| `summary`     | The title of the event.                           | Bowling             |
+| `description` | The description of the event.                     | Birthday bowling    |
+| `start`       | The date or date time the event starts.           | 2019-03-10 20:00:00 |
+| `end`         | The date or date time the event ends (exclusive). | 2019-03-10 23:00:00 |
+| `location`    | The location of the event.                        | Bowling center      |
 
 This example uses a template with response data in another action: