Remove legacy format exception for ESPHome entity naming (#38559)

source/_integrations/esphome.markdown

@@ -58,14 +58,10 @@ ESPHome devices can perform actions to any [Home Assistant action](https://espho
 
 ## Entity naming and IDs
 
-ESPHome uses different naming and entity ID rules based on the configuration of the ESPHome device. It is recommended to set a `friendly_name` in the ESPHome {% term "`configuration.yaml`" %} to take advantage of the newer naming structure, which is consistent with Home Assistant naming standards and makes it much easier to tell similar devices apart. The legacy naming rules apply when the `friendly_name` is not set in the {% term "`configuration.yaml`" %}.
-
-### Friendly naming
-
-- Entity name is a combination of the friendly name and component name
+- Entity name is a combination of the friendly name (or name if unset) and component name
 - Entity ID is derived from the entity name with the device name prepended
 
-Example:
+Example with `friendly_name` set:
 
 ```yaml
 esphome:
@@ -78,13 +74,7 @@ sensor:
 
 The entity will be named `Living room desk Temperature` and will default to having an entity ID of `sensor.livingroomdesk_temperature`.
 
-### Legacy naming
-
-- Entity name is the component name
-- Device name is not prepended to the entity name
-- Entity ID is derived solely from the entity name
-
-Example:
+Example without `friendly_name` set:
 
 ```yaml
 esphome:
@@ -94,7 +84,7 @@ sensor:
    name: "Temperature"
 ```
 
-The entity will be named `Temperature` and will default to having an entity_id of `sensor.temperature`.
+The entity will be named `livingroomdesk Temperature` and will default to having an entity ID of `sensor.livingroomdesk_temperature`.
 
 ## Obtaining logs from the device
 

source/_integrations/lamarzocco.markdown

@@ -7,6 +7,7 @@ ha_category:
   - Calendar
   - Number
   - Select
+  - Sensor
   - Switch
   - Update
 ha_iot_class: Cloud Push
@@ -19,6 +20,7 @@ ha_platforms:
   - diagnostics
   - number
   - select
+  - sensor
   - switch
   - update
 ha_bluetooth: true
@@ -75,6 +77,9 @@ Use Bluetooth:
 |-------------|-------------| ---------------------- |--------------------- | ------- |
 | **Coffee target temperature** | Temperature the coffee boiler is set to | `all` | {% icon "material-symbols:cloud-outline" title="La Marzocco Cloud" %} <iconify-icon inline title="Bluetooth" icon="material-symbols:bluetooth"></iconify-icon> | - |
 | **Smart standby time** | Time until the machine will automatically stand by (if enabled) | `all` | {% icon "material-symbols:cloud-outline" title="La Marzocco Cloud" %} | - |
+| **Preinfusion time** | Duration of preinfusion | `Linea Micra`, `Linea Mini`, `Linea Mini R` | {% icon "material-symbols:cloud-outline" title="La Marzocco Cloud" %} | only available when machine is in mode `Preinfusion` |
+| **Prebrew time on** | Duration which prebrew will be on | `Linea Micra`, `Linea Mini`, `Linea Mini R` | {% icon "material-symbols:cloud-outline" title="La Marzocco Cloud" %} | only available when machine is in mode `Prebrew` |
+| **Prebrew time off** | Duration which prebrew will wait | `Linea Micra`, `Linea Mini`, `Linea Mini R` | {% icon "material-symbols:cloud-outline" title="La Marzocco Cloud" %} | only available when machine is in mode `Prebrew` |
 
 ## Switches
 
@@ -91,6 +96,15 @@ Use Bluetooth:
 | **Water tank empty** | Indicates whether the water tank needs a refill. | `all` | {% icon "material-symbols:cloud-outline" title="La Marzocco Cloud" %} | - |
 | **Brewing active** | Is on if you are in the process of making coffee. | `all` | {% icon "material-symbols:cloud-outline" title="La Marzocco Cloud" %} | - |
 | **Backflush enabled** | Is on if you started the backflushing process. | `all` | {% icon "material-symbols:cloud-outline" title="La Marzocco Cloud" %}| - |
+| **WebSocket connected** | Track your connection to the cloud WebSocket for real time updates. | `all` | {% icon "material-symbols:cloud-outline" title="La Marzocco Cloud" %}| Disabled by default. |
+
+## Sensors
+
+| Sensor name | Description | Available for machines |  Retrievable from | Remarks |
+|------------------- |-------------| ---------------------- | ----------------- | ------- |
+| **Coffee boiler ready time** | Indicates when the coffee boiler will be ready for brewing. | `all` | {% icon "material-symbols:cloud-outline" title="La Marzocco Cloud" %} | - |
+| **Steam boiler ready time** | Indicates when the steam boiler will be ready for brewing. | `all` | {% icon "material-symbols:cloud-outline" title="La Marzocco Cloud" %} | - |
+
 
 ## Updates