diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 9e39a3de6c3..c4cf8a1c1c4 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,3 +1,10 @@
+
## Proposed change
+
+## What is Works with Home Assistant
+
+When you want to add something to your smart home the choices can be daunting; we want stable, supported devices that are built on standards that last. We understood how hard it could be to navigate all this and [set up Works with Home Assistant in 2022](/blog/2022/07/12/partner-program/), clearly indicating to users which brands provided the best smart home experiences and will continue to do so into the future. While also encouraging brands to step up their openness, compatibility, and long-term support.
+
+
diff --git a/source/dashboards/badges.markdown b/source/dashboards/badges.markdown
index 09294582a3f..4ee0e273412 100644
--- a/source/dashboards/badges.markdown
+++ b/source/dashboards/badges.markdown
@@ -30,6 +30,11 @@ Badges are widgets that sit at the top of a panel, above all the cards.
8. If you want this badge to be visible only to specific users or under a certain condition, open the **Visibility** tab to [define those conditions](/dashboards/cards/#showing-or-hiding-a-card-conditionally).
9. Select **Save**.
+
+
+ Adding a badge to a dashboard.
+
+
## Entity badge
The Entity badge allows you to display the state of an entity on a badge. This badge supports [actions](/dashboards/actions/).
@@ -146,10 +151,6 @@ icon:
required: false
description: Overwrites icon or entity picture. You can use any icon from [Material Design Icons](https://pictogrammers.com/library/mdi/). Prefix the icon name with `mdi:`, ie `mdi:home`.
type: string
-image:
- required: false
- description: The URL of an image.
- type: string
conditions:
required: false
description: List of conditions to check. See [available conditions](#conditions-options).*
@@ -162,9 +163,11 @@ state_filter:
*only one filter will be applied: `conditions` or `state_filter` if `conditions` is not present
+You may also add any additional configuration options to an entity which are supported by the chosen badge type (`Entity` badge type if no type is chosen).
+
## Conditions options
-You can specify multiple `conditions`, in which case the entity will be displayed if it matches any condition.
+You can specify multiple `conditions`, in which case the entity will be displayed if it matches all conditions.
### State
diff --git a/source/dashboards/cards.markdown b/source/dashboards/cards.markdown
index ef5c991d038..f4b13e092ae 100644
--- a/source/dashboards/cards.markdown
+++ b/source/dashboards/cards.markdown
@@ -30,7 +30,7 @@ There are several different card types, each with their own configuration option
- **Specific to a device type or service**: [alarm](/dashboards/alarm-panel/), [light](/dashboards/light/), [humidifier](/dashboards/humidifier/), [thermostat](/dashboards/thermostat/), [plant status](/dashboards/plant-status/), [media control](/dashboards/media-control/), [weather forecast](/dashboards/weather-forecast/), [to-do list](/dashboards/todo-list/), [map](/dashboards/map/), [logbook](/dashboards/logbook/), [calendar](/dashboards/calendar/)
- **Grouping other cards**: [vertical stack](/dashboards/vertical-stack/), [horizontal stack](/dashboards/horizontal-stack/), [grid](/dashboards/grid/)
- **Logic function**: [conditional](/dashboards/conditional/), [entity filter](/dashboards/entity-filter/)
-- **Display generic data**: [sensor](/dashboards/sensor/), [history graph](/dashboards/history-graph/), [statistic](/dashboards/statistic/), [statistics graph](/dashboards/statistics-graph/), [energy](/dashboards/energy/), [gauge](/dashboards/gauge/), [webpage](/dashboards/webpage/)
+- **Display generic data**: [sensor](/dashboards/sensor/), [history graph](/dashboards/history-graph/), [statistic](/dashboards/statistic/), [statistics graph](/dashboards/statistics-graph/), [energy](/dashboards/energy/), [gauge](/dashboards/gauge/), [webpage](/dashboards/iframe/)
- **Control devices and entities**: [button](/dashboards/button/), [entity](/dashboards/entity/)
- **Display data and control entities**: [area](/dashboards/area/), [picture elements](/dashboards/picture-elements/), [picture glance](/dashboards/picture-glance/)
diff --git a/source/getting-started/concepts-terminology.markdown b/source/getting-started/concepts-terminology.markdown
index c9e9fa14cda..965c545a48a 100644
--- a/source/getting-started/concepts-terminology.markdown
+++ b/source/getting-started/concepts-terminology.markdown
@@ -13,7 +13,7 @@ Integrations are pieces of software that allow Home Assistant to connect to othe
Some integration cards show an icon:
- The cloud icon

indicates that this integration depends on the cloud.
-- The YAML icon

indicates that this integration was not setup via the UI. You have either set it up in YAML or it is a dependency set up by an other integration. If you want to configure it, you will need to do so in your configuration.yaml file.
+The file icon

indicates that this integration was not set up via the UI. You have either set it up in your {% term "`configuration.yaml`" %} file, or it is a dependency set up by another integration. If you want to configure it, you will need to do so in your {% term "`configuration.yaml`" %} file.
- The custom icon

indicates that this is not an official Home Assistant integration but that it was custom made. It could be imported from another source, for example downloaded from HACS.
For a full list of compatible {% term integrations %}, refer to the [integrations](/integrations) documentation.
diff --git a/source/getting-started/configuration.markdown b/source/getting-started/configuration.markdown
index 7ee91082b73..f2637504869 100644
--- a/source/getting-started/configuration.markdown
+++ b/source/getting-started/configuration.markdown
@@ -38,10 +38,11 @@ To change basic settings such as location, unit system, and language, refer to [
You can back up your Home Assistant, add-on data, and configuration. Backups are used to restore a system or parts of it if a rollback is needed, or to migrate your Home Assistant to new hardware. It is good practice to create a backup before updating.
-To learn how to create a backup of your Home Assistant installation, refer to the following topics:
+To learn how to create a backup of your Home Assistant installation, select the link below that matches your installation type.
- {% term "Home Assistant Operating System" %}: [Creating a backup from OS](/common-tasks/os/#backups)
- {% term "Home Assistant Supervised" %}: [Creating a backup from Supervised](/common-tasks/supervised/#backups)
+- {% term "Home Assistant Core" %} or {% term "Home Assistant Container" %}: [Creating a backup from Core or Container](/integrations/backup/)
## Editing the configuration.yaml and configuring file access
diff --git a/source/getting-started/integration.markdown b/source/getting-started/integration.markdown
index 4252a203488..b6ec8dd93ec 100644
--- a/source/getting-started/integration.markdown
+++ b/source/getting-started/integration.markdown
@@ -48,7 +48,11 @@ This tutorial assumes that you have [installed Home Assistant](/installation/) a

- This opens the integration details page.
- - On the details page, we see that this integration has one {% term service %} and one {% term entity %}.
+ - We see that this integration has one {% term service %} and one {% term entity %}.
+ - **Documentation** opens the documentation page of this integration.
+ - **Known issues** opens the GitHub issue tracker, filtered for issues related to this integration.
+ - This allows you to see if other users reported issues related to that integration.
+ - **Enable debug logging** lets you [activate the debug logs for that integration](/docs/configuration/troubleshooting/#debug-logs-and-diagnostics).

diff --git a/source/green/index.html b/source/green/index.html
index f5be07b3259..64c08c14d2c 100644
--- a/source/green/index.html
+++ b/source/green/index.html
@@ -2544,6 +2544,24 @@ dark_header: true
+