diff --git a/source/_integrations/xbox.markdown b/source/_integrations/xbox.markdown
index d86a78049f2..6654bdfdb76 100644
--- a/source/_integrations/xbox.markdown
+++ b/source/_integrations/xbox.markdown
@@ -36,13 +36,13 @@ Because it uses the Home Assistant Cloud account linking service you **must** ha
The Xbox media player platform will create media player entities for each console linked to your Microsoft account. These entities will display the active app and playback controls as well as a media browser implementation, allowing you to launch any installed application.
-### Service `play_media`
+### Action `play_media`
Launches an application on the Xbox console using the application's product ID. Also supports "Home" and "TV" to navigate to the dashboard or Live TV respectively.
You can find Product IDs using the **{% my developer_events title="Developer Tools -> Events" %}** tab and listening to the `call_service` event. In a new browser tab, navigate to the media browser for your console and click on an App/Game to see the product ID in the event.
-| Service data attribute | Description |
+| Data attribute | Description |
| ---------------------- | --------------------------------------|
| `entity_id` | `entity_id` of the Xbox media player |
| `media_content_id` | "Home"/"TV"/{product_id} |
@@ -66,9 +66,9 @@ media_content_id: "9WZDNCRFJ3TJ" # Netflix
The Xbox remote platform will create Remote entities for each console linked to your Microsoft Account. These entities will allow you to turn on/off and send controller or text input to your console.
-### Service `send_command`
+### Action `send_command`
-| Service data attribute | Optional | Description |
+| Data attribute | Optional | Description |
| ---------------------- | -------- | ---------------------------------------------------------------------- |
| `entity_id` | no | `entity_id` of the Xbox remote. |
| `command` | no | List of the controller commands or text input to be sent.
Commands: A, B, X, Y, Up, Down, Left, Right |
diff --git a/source/_integrations/xiaomi_aqara.markdown b/source/_integrations/xiaomi_aqara.markdown
index f21ca6dbd27..b8211a00d8f 100644
--- a/source/_integrations/xiaomi_aqara.markdown
+++ b/source/_integrations/xiaomi_aqara.markdown
@@ -66,7 +66,7 @@ Please note, there are two versions of the hub: v1 and v2. v1 can be used with H
Follow the setup process using your phone and Mi-Home app. From here you will be able to retrieve the key (password) from within the app following [this tutorial](https://www.domoticz.com/wiki/Xiaomi_Gateway_(Aqara)#Adding_the_Xiaomi_Gateway_to_Domoticz).
-To enable {{ page.title }} in your installation, go to **Settings** -> **Devices & Services**. Xiaomi Aqara gateways should be discovered automatically and should show up in the overview. Hit configure and go through the steps to specify the optional settings. If your aqara gateway does not show up automatically, click the + icon in the lower right. Then search for "xiaomi_aqara" and enter the setup. Multiple gateways can be configured by simply repeating the setup multiple times.
+To enable {{ page.title }} in your installation, go to **Settings** > **Devices & services**. Xiaomi Aqara gateways should be discovered automatically and should show up in the overview. Hit configure and go through the steps to specify the optional settings. If your Aqara gateway does not show up automatically, click the + icon in the lower right. Then, search for "xiaomi_aqara" and enter the setup. Multiple gateways can be configured by simply repeating the setup multiple times.
{% configuration %}
interface:
@@ -84,15 +84,15 @@ name:
type: string
{% endconfiguration %}
-### Services
+### Actions
-The gateway provides the following services:
+The gateway provides the following actions:
-#### Service `xiaomi_aqara.play_ringtone`
+#### Action `xiaomi_aqara.play_ringtone`
Play a specific ringtone. The version of the gateway firmware must be `1.4.1_145` at least. Take a look at the examples below.
-| Service data attribute | Optional | Description |
+| Data attribute | Optional | Description |
|---------------------------|----------|-------------------------------------------------------|
| `gw_mac` | no | MAC address of the Xiaomi Aqara Gateway |
| `ringtone_id` | no | One of the allowed ringtone ids |
@@ -128,27 +128,27 @@ Allowed values of the `ringtone_id` are:
- 29 - Thinker
- Custom ringtones (uploaded by the Mi Home app) starting from 10001
-#### Service `xiaomi_aqara.stop_ringtone`
+#### Action `xiaomi_aqara.stop_ringtone`
Stops a playing ringtone immediately.
-| Service data attribute | Optional | Description |
+| Data attribute | Optional | Description |
|---------------------------|----------|-------------------------------------------------------|
| `gw_mac` | no | MAC address of the Xiaomi Aqara Gateway |
-#### Service `xiaomi_aqara.add_device`
+#### Action `xiaomi_aqara.add_device`
Enables the join permission of the Xiaomi Aqara Gateway for 30 seconds. A new device can be added afterwards by pressing the pairing button once.
-| Service data attribute | Optional | Description |
+| Data attribute | Optional | Description |
|---------------------------|----------|-------------------------------------------------------|
| `gw_mac` | no | MAC address of the Xiaomi Aqara Gateway |
-#### Service `xiaomi_aqara.remove_device`
+#### Action `xiaomi_aqara.remove_device`
Removes a specific device. The removal is required if a device shall be paired with another gateway.
-| Service data attribute | Optional | Description |
+| Data attribute | Optional | Description |
|---------------------------|----------|-------------------------------------------------------|
| `gw_mac` | no | MAC address of the Xiaomi Aqara Gateway |
| `device_id` | no | Hardware address of the device to remove |
diff --git a/source/_integrations/xiaomi_miio.markdown b/source/_integrations/xiaomi_miio.markdown
index 5cee1d7167d..0e9084bcba8 100644
--- a/source/_integrations/xiaomi_miio.markdown
+++ b/source/_integrations/xiaomi_miio.markdown
@@ -1192,57 +1192,57 @@ Clean mode and Motor speed can only be set when the device is turned on.
| Child Lock | Turn on/off the Child Lock |
| Ionizer | Turn on/off the Ionizer |
-### Platform Services
+### Actions
-### Service `humidifier.set_humidity`
+### Action `humidifier.set_humidity`
Set the target humidity.
-| Service data attribute | Optional | Description |
+| Data attribute | Optional | Description |
| ---------------------- | -------- | ----------------------------------------------------- |
| `entity_id` | no | Only act on a specific Xiaomi miIO humidifier entity. |
| `humidity` | no | Target humidity |
-### Service `humidifier.set_mode`
+### Action `humidifier.set_mode`
Set the humidifier operation mode.
-| Service data attribute | Optional | Description |
+| Data attribute | Optional | Description |
| ---------------------- | -------- | ----------------------------------------------------- |
| `entity_id` | no | Only act on a specific Xiaomi miIO humidifier entity. |
| `mode` | no | The Xiaomi miIO operation mode |
-### Service `fan.set_percentage`
+### Action `fan.set_percentage`
Set the fan speed percentage.
-| Service data attribute | Optional | Description |
+| Data attribute | Optional | Description |
| ---------------------- | -------- | ---------------------------------------------- |
| `entity_id` | no | Only act on a specific Xiaomi miIO fan entity. |
| `percentage` | no | Fan speed. Percentage speed setting |
-### Service `fan.set_preset_mode`
+### Action `fan.set_preset_mode`
Set the fan operation mode.
-| Service data attribute | Optional | Description |
+| Data attribute | Optional | Description |
| ---------------------- | -------- | ---------------------------------------------- |
| `entity_id` | no | Only act on a specific Xiaomi miIO fan entity. |
| `preset_mode` | no | The Xiaomi miIO operation mode |
-### Service `xiaomi_miio.fan_reset_filter` (Air Purifier 2 only)
+### Action `xiaomi_miio.fan_reset_filter` (Air Purifier 2 only)
Reset the filter lifetime and usage.
-| Service data attribute | Optional | Description |
+| Data attribute | Optional | Description |
| ---------------------- | -------- | ---------------------------------------------- |
| `entity_id` | no | Only act on a specific Xiaomi miIO fan entity. |
-### Service `xiaomi_miio.fan_set_extra_features` (Air Purifier only)
+### Action `xiaomi_miio.fan_set_extra_features` (Air Purifier only)
Set the extra features.
-| Service data attribute | Optional | Description |
+| Data attribute | Optional | Description |
| ---------------------- | -------- | ---------------------------------------------- |
| `entity_id` | no | Only act on a specific Xiaomi miIO fan entity. |
| `features` | no | Integer, known values are 0 and 1. |
@@ -1424,9 +1424,9 @@ Note there are at least 4 versions of the Xiaomi IR Remote (ChuangmiIr) which ca
For now, pronto hex codes only work on the first version (`chuangmi.ir.v2`).
-### Platform Services
+### Actions
-The Xiaomi IR Remote Platform registers four services.
+The Xiaomi IR Remote Platform registers four actions.
### `remote.send_command`
@@ -1454,7 +1454,7 @@ Used to turn remote's blue LED off.
The `xiaomi_miio` vacuum platform allows you to control the state of your [Xiaomi Mi Robot Vacuum](https://www.mi.com/roomrobot/).
-Currently supported services are:
+Currently supported actions are:
- `start`
- `pause`
@@ -1469,9 +1469,9 @@ Currently supported services are:
- `xiaomi_goto`
- `remote_control_*` (of your robot)
-### Platform Services
+### Actions
-In addition to all of the services provided by the `vacuum` {% term integration %} (`start`, `pause`, `stop`, `return_to_base`, `locate`, `set_fan_speed` and `send_command`), the `xiaomi_miio` platform introduces specific services to access the remote control mode of the robot. These are:
+In addition to all of the actions provided by the `vacuum` {% term integration %} (`start`, `pause`, `stop`, `return_to_base`, `locate`, `set_fan_speed` and `send_command`), the `xiaomi_miio` platform introduces specific actions to access the remote control mode of the robot. These are:
- `xiaomi_miio.vacuum_clean_zone`
- `xiaomi_miio.vacuum_clean_segment`
@@ -1481,11 +1481,11 @@ In addition to all of the services provided by the `vacuum` {% term integration
- `xiaomi_miio.vacuum_remote_control_move`
- `xiaomi_miio.vacuum_remote_control_move_step`
-### Service `xiaomi_miio.vacuum_clean_zone`
+### Action `xiaomi_miio.vacuum_clean_zone`
Start the cleaning operation in the areas selected for the number of repeats indicated.
-| Service data attribute | Optional | Description |
+| Data attribute | Optional | Description |
| ---------------------- | -------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
| `entity_id` | no | Only act on a specific robot |
| `zone` | no | List of zones. Each zone is an array of four integer values. These values represent two sets of x- and y-axis coordinates that describe the beginning and ending points of a square or rectangle cleaning zone. For example, `[[23510,25311,25110,26361]]` creates a box that starts in one corner at the 23510, 25311 (x- and y-axis) coordinates and then is expanded diagonally to the 25110, 26361 coordinates to create a rectangular cleaning zone. |
@@ -1563,11 +1563,11 @@ automation:
- 26496
```
-### Service `xiaomi_miio.vacuum_clean_segment`
+### Action `xiaomi_miio.vacuum_clean_segment`
Clean the specified segment/room. A room is identified by a number. Instructions on how to find the valid room numbers and determine what rooms they map to, read the section [Retrieving room numbers](#retrieving-room-numbers).
-| Service data attribute | Optional | Description |
+| Data attribute | Optional | Description |
| ---------------------- | -------- | ----------------------------------------------------- |
| `entity_id` | no | Only act on a specific robot |
| `segments` | no | List of segment numbers or one single segment number. |
@@ -1624,50 +1624,50 @@ automation:
segments: [1, 1]
```
-### Service `xiaomi_miio.vacuum_goto`
+### Action `xiaomi_miio.vacuum_goto`
Go the specified coordinates.
-| Service data attribute | Optional | Description |
+| Data attribute | Optional | Description |
| ---------------------- | -------- | ----------------------------------------------------------------------- |
| `entity_id` | no | Only act on a specific robot |
| `x_coord` | no | X-coordinate, integer value. The dock is located at x-coordinate 25500. |
| `y_coord` | no | Y-coordinate, integer value. The dock is located at y-coordinate 25500. |
-Note: If your vacuum is in motion and does not respond to the `xiaomi_miio.vacuum_goto` command, call the `vacuum.pause` or `vacuum.stop` service first.
+Note: If your vacuum is in motion and does not respond to the `xiaomi_miio.vacuum_goto` command, call the `vacuum.pause` or `vacuum.stop` action first.
-### Service `xiaomi_miio.vacuum_remote_control_start`
+### Action `xiaomi_miio.vacuum_remote_control_start`
Start the remote control mode of the robot. You can then move it with `remote_control_move`; when done, call `remote_control_stop`.
-| Service data attribute | Optional | Description |
+| Data attribute | Optional | Description |
| ---------------------- | -------- | ---------------------------- |
| `entity_id` | no | Only act on a specific robot |
-### Service `xiaomi_miio.vacuum_remote_control_stop`
+### Action `xiaomi_miio.vacuum_remote_control_stop`
Exit the remote control mode of the robot.
-| Service data attribute | Optional | Description |
+| Data attribute | Optional | Description |
| ---------------------- | -------- | ---------------------------- |
| `entity_id` | no | Only act on a specific robot |
-### Service `xiaomi_miio.vacuum_remote_control_move`
+### Action `xiaomi_miio.vacuum_remote_control_move`
Remote control the robot. Please ensure you first set it in remote control mode with `remote_control_start`.
-| Service data attribute | Optional | Description |
+| Data attribute | Optional | Description |
| ---------------------- | -------- | --------------------------------------------------------- |
| `entity_id` | no | Only act on a specific robot |
| `velocity` | no | Speed: between -0.29 and 0.29 |
| `rotation` | no | Rotation: between -179 degrees and 179 degrees |
| `duration` | no | The number of milliseconds that the robot should move for |
-### Service `xiaomi_miio.vacuum_remote_control_move_step`
+### Action `xiaomi_miio.vacuum_remote_control_move_step`
Enter remote control mode, make one move, stop, and exit remote control mode.
-| Service data attribute | Optional | Description |
+| Data attribute | Optional | Description |
| ---------------------- | -------- | --------------------------------------------------------- |
| `entity_id` | no | Only act on a specific robot |
| `velocity` | no | Speed: between -0.29 and 0.29 |
@@ -1817,7 +1817,7 @@ miiocli roborockvacuum --ip --token get_r
```
It will return the full mapping of room numbers to user-defined names as a list of (number,name) tuples.
-Alternatively, one can just test the clean_segment service with a number and see which room it cleans.
+Alternatively, one can just test the `clean_segment` action with a number and see which room it cleans.
It seems to be the case that Numbers 1..15 are used to number the initial segmentation done by the vacuum cleaner itself. Numbers 16 and upwards numbers rooms from the users manual editing.
@@ -1909,71 +1909,71 @@ Supported models: `philips.light.moonlight`
- brand_sleep
- brand
-### Platform Services
+### Actions
-### Service `xiaomi_miio.light_set_scene`
+### Action `xiaomi_miio.light_set_scene`
Set one of the 4 available fixed scenes.
-| Service data attribute | Optional | Description |
+| Data attribute | Optional | Description |
| ---------------------- | -------- | ------------------------------------------------ |
| `entity_id` | no | Only act on a specific Xiaomi miIO light entity. |
| `scene` | no | Scene, between 1 and 4. |
-### Service `xiaomi_miio.light_set_delayed_turn_off`
+### Action `xiaomi_miio.light_set_delayed_turn_off`
Delayed turn off.
-| Service data attribute | Optional | Description |
+| Data attribute | Optional | Description |
| ---------------------- | -------- | ------------------------------------------------ |
| `entity_id` | no | Only act on a specific Xiaomi miIO light entity. |
| `time_period` | no | Time period for the delayed turn off. |
-### Service `xiaomi_miio.light_reminder_on` (Eyecare Smart Lamp 2 only)
+### Action `xiaomi_miio.light_reminder_on` (Eyecare Smart Lamp 2 only)
Enable the eye fatigue reminder/notification.
-| Service data attribute | Optional | Description |
+| Data attribute | Optional | Description |
| ---------------------- | -------- | ------------------------------------------------ |
| `entity_id` | no | Only act on a specific Xiaomi miIO light entity. |
-### Service `xiaomi_miio.light_reminder_off` (Eyecare Smart Lamp 2 only)
+### Action `xiaomi_miio.light_reminder_off` (Eyecare Smart Lamp 2 only)
Disable the eye fatigue reminder/notification.
-| Service data attribute | Optional | Description |
+| Data attribute | Optional | Description |
| ---------------------- | -------- | ------------------------------------------------ |
| `entity_id` | no | Only act on a specific Xiaomi miIO light entity. |
-### Service `xiaomi_miio.light_night_light_mode_on` (Eyecare Smart Lamp 2 only)
+### Action `xiaomi_miio.light_night_light_mode_on` (Eyecare Smart Lamp 2 only)
Turn the smart night light mode on.
-| Service data attribute | Optional | Description |
+| Data attribute | Optional | Description |
| ---------------------- | -------- | ------------------------------------------------ |
| `entity_id` | no | Only act on a specific Xiaomi miIO light entity. |
-### Service `xiaomi_miio.light_night_light_mode_off` (Eyecare Smart Lamp 2 only)
+### Action `xiaomi_miio.light_night_light_mode_off` (Eyecare Smart Lamp 2 only)
Turn the smart night light mode off.
-| Service data attribute | Optional | Description |
+| Data attribute | Optional | Description |
| ---------------------- | -------- | ------------------------------------------------ |
| `entity_id` | no | Only act on a specific Xiaomi miIO light entity. |
-### Service `xiaomi_miio.light_eyecare_mode_on` (Eyecare Smart Lamp 2 only)
+### Action `xiaomi_miio.light_eyecare_mode_on` (Eyecare Smart Lamp 2 only)
Turn the eyecare mode on.
-| Service data attribute | Optional | Description |
+| Data attribute | Optional | Description |
| ---------------------- | -------- | ------------------------------------------------ |
| `entity_id` | no | Only act on a specific Xiaomi miIO light entity. |
-### Service `xiaomi_miio.light_eyecare_mode_off` (Eyecare Smart Lamp 2 only)
+### Action `xiaomi_miio.light_eyecare_mode_off` (Eyecare Smart Lamp 2 only)
Turn the eyecare mode off.
-| Service data attribute | Optional | Description |
+| Data attribute | Optional | Description |
| ---------------------- | -------- | ------------------------------------------------ |
| `entity_id` | no | Only act on a specific Xiaomi miIO light entity. |
@@ -2023,38 +2023,38 @@ Supported models: `lumi.acpartner.v3` (the socket of the `acpartner.v1` and `v2`
- Attributes
- Load power
-### Platform Services
+### Actions
-### Service `xiaomi_miio.switch_set_wifi_led_on` (Power Strip only)
+### Action `xiaomi_miio.switch_set_wifi_led_on` (Power Strip only)
Turn the wifi LED on.
-| Service data attribute | Optional | Description |
+| Data attribute | Optional | Description |
| ---------------------- | -------- | ------------------------------------------------- |
| `entity_id` | no | Only act on a specific Xiaomi miIO switch entity. |
-### Service `xiaomi_miio.switch_set_wifi_led_off` (Power Strip only)
+### Action `xiaomi_miio.switch_set_wifi_led_off` (Power Strip only)
Turn the wifi LED off.
-| Service data attribute | Optional | Description |
+| Data attribute | Optional | Description |
| ---------------------- | -------- | ------------------------------------------------- |
| `entity_id` | no | Only act on a specific Xiaomi miIO switch entity. |
-### Service `xiaomi_miio.switch_set_power_price` (Power Strip)
+### Action `xiaomi_miio.switch_set_power_price` (Power Strip)
Set the power price.
-| Service data attribute | Optional | Description |
+| Data attribute | Optional | Description |
| ---------------------- | -------- | ------------------------------------------------- |
| `entity_id` | no | Only act on a specific Xiaomi miIO switch entity. |
| `price` | no | Power price, between 0 and 999. |
-### Service `xiaomi_miio.switch_set_power_mode` (Power Strip V1 only)
+### Action `xiaomi_miio.switch_set_power_mode` (Power Strip V1 only)
Set the power mode.
-| Service data attribute | Optional | Description |
+| Data attribute | Optional | Description |
| ---------------------- | -------- | ------------------------------------------------- |
| `entity_id` | no | Only act on a specific Xiaomi miIO switch entity. |
| `mode` | no | Power mode, valid values are 'normal' and 'green' |
diff --git a/source/_integrations/xmpp.markdown b/source/_integrations/xmpp.markdown
index f9ab77cef63..555f5dde5db 100644
--- a/source/_integrations/xmpp.markdown
+++ b/source/_integrations/xmpp.markdown
@@ -38,7 +38,7 @@ notify:
{% configuration %}
name:
- description: "Setting the optional parameter `name` allows multiple notifiers to be created. The default value is `notify`. The notifier will bind to the service `notify.NOTIFIER_NAME`."
+ description: "Setting the optional parameter `name` allows multiple notifiers to be created. The default value is `notify`. The notifier will bind to the `notify.NOTIFIER_NAME` action."
required: false
type: string
default: notify