Merge remote-tracking branch 'origin/current' into rc

source/_components/light.group.markdown

@@ -46,3 +46,18 @@ Example of the light group "Kitchen Lights".
 </p>
 
 The supported features of all lights will be added together. For example, if you have one RGB light in a group of otherwise brightness-only lights, the light group will be shown with a color picker.
+
+## {% linkable_title Script Example %}
+
+Here's an example of a script using the above light group.
+
+```yaml
+script:
+  turn_on_kitchen_lights:
+    alias: Kitchen lights on
+    sequence:
+      service: light.turn_on
+      data:
+        entity_id: light.kitchen_lights
+        brightness: 100
+```

source/_components/sensor.nederlandse_spoorwegen.markdown

@@ -24,16 +24,16 @@ Add the data to your `configuration.yaml` file as shown in the example:
 # Example configuration.yaml entry
 sensor:
 - platform: nederlandse_spoorwegen
-    email: you@example.com
-    password: !secret ns_password
-    routes:
-      - name: Rotterdam-Amsterdam
-        from: Rtd
-        to: Asd
-      - name: Groningen-Zwolle-Maastricht
-        from: Gn
-        to: Mt
-        via: Zl
+  email: you@example.com
+  password: !secret ns_password
+  routes:
+    - name: Rotterdam-Amsterdam
+      from: Rtd
+      to: Asd
+    - name: Groningen-Zwolle-Maastricht
+      from: Gn
+      to: Mt
+      via: Zl
 ```
 
 Configuration variables:

source/_components/xiaomi_aqara.markdown

@@ -165,12 +165,6 @@ Stops a playing ringtone immediately.
 
 #### {% linkable_title Service `xiaomi_aqara.add_device` %}
 
-| Service data attribute    | Optional | Description                                           |
-|---------------------------|----------|-------------------------------------------------------|
-| `gw_mac`                  |       no | MAC address of the Xiaomi Aqara Gateway               |
-
-#### {% linkable_title Service `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                                           |