Fix indentation and remove use_trigger_values (fixes #2306) (#2313)

source/_components/ifttt.manything.markdown

@@ -20,36 +20,32 @@ After setting up IFTTT, Maker Channel and ManyThing Channel, you can use the fol
 ```yaml
 # Example configuration.yaml entry
 automation:
-- alias: 'ManyThing Recording ON'
+  - alias: 'ManyThing Recording ON'
     # This calls an IFTTT recipe to turn on recording of the ManyThing Camera
     # if we leave the house during the day.
     trigger:
       - platform: state
         entity_id: group.all_devices
        state: 'not_home'
-
     condition:
       - platform: state
         entity_id: sun.sun
        state: 'above_horizon'
-
     action:
       service: ifttt.trigger
       data: {"event":"manything_on"}
 
-- alias: 'ManyThing Recording OFF'
+  - alias: 'ManyThing Recording OFF'
     # This calls an IFTTT recipe to turn off recording of the ManyThing Camera
     # when we are home unless it's nighttime.
     trigger:
       - platform: state
         entity_id: group.all_devices
         state: 'home'
-   - platform: state
+    condition:
+      - condition: state
         entity_id: sun.sun
         state: 'above_horizon'
-
-  condition: use_trigger_values
-
     action:
       service: ifttt.trigger
       data: {"event":"manything_off"}
@@ -73,4 +69,3 @@ domain | `ifttt`
 service | `trigger`
 Service Data | `{"event": "manything_on"}`
 
-

source/_cookbook/automation_for_rainy_days.markdown

@@ -16,21 +16,18 @@ Turn on a light in the living room when it starts raining, someone is home, and
 
 ```yaml
 automation:
-  alias: 'Rainy Day'
+  - alias: 'Rainy Day'
-
     trigger:
       - platform: state
         entity_id: sensor.precip_intensity
         state: 'rain'
+    condition:
       - platform: state
         entity_id: group.all_devices
         state: 'home'
       - platform: time
         after: '14:00'
         before: '23:00'
-
-  condition: use_trigger_values
-
     action:
       service: light.turn_on
       entity_id: light.couch_lamp
@@ -39,17 +36,15 @@ automation:
 And then of course turn off the lamp when it stops raining but only if it's within an hour before sunset.
 
 ```yaml
-automation 2:
+  - alias: 'Rain is over'
-  alias: 'Rain is over'
     trigger:
       - platform: state
         entity_id: sensor.precip_intensity
         state: 'None'
-       - platform: sun
+    condition:
-         event: 'sunset'
+      - condition: sun
+        after: 'sunset'
         offset: '-01:00:00'
-
-  condition: use_trigger_values
     action:
       service: light.turn_off
       entity_id: light.couch_lamp

source/_docs/automation/examples.markdown

@@ -17,7 +17,7 @@ Just some sample automation rules to get you started.
 automation:
 # Turns on lights 1 hour before sunset if people are home
 # and if people get home between 16:00-23:00
-- alias: 'Rule 1 Light on in the evening'
+  - alias: 'Rule 1 Light on in the evening'
     trigger:
       # Prefix the first line of each trigger configuration
       # with a '-' to enter multiple
@@ -41,7 +41,7 @@ automation:
       entity_id: group.living_room
 
 # Turn off lights when everybody leaves the house
-- alias: 'Rule 2 - Away Mode'
+  - alias: 'Rule 2 - Away Mode'
     trigger:
       platform: state
       entity_id: group.all_devices
@@ -51,7 +51,7 @@ automation:
       entity_id: group.all_lights
 
 # Notify when Paulus leaves the house in the evening
-- alias: 'Leave Home notification'
+  - alias: 'Leave Home notification'
     trigger:
       platform: zone
       event: leave