From af0d1543982ec36c22bea896050da617bc52e2d8 Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <paulus@paulusschoutsen.nl>
Date: Sat, 26 Mar 2016 18:28:02 -0700
Subject: [PATCH] Update examples for deprecated service call config

---
 source/_cookbook/foscam_away_mode_PTZ.markdown   | 12 ++++++------
 ...rt_ha_if_wemo_switch_is_not_detected.markdown |  8 ++++----
 ..._for_10_minutes_when_motion_detected.markdown | 16 ++++++++--------
 ...with-moteino-mqtt-and-home-assistant.markdown |  4 ++++
 4 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/source/_cookbook/foscam_away_mode_PTZ.markdown b/source/_cookbook/foscam_away_mode_PTZ.markdown
index 3ac9578ccce..59d20576c58 100644
--- a/source/_cookbook/foscam_away_mode_PTZ.markdown
+++ b/source/_cookbook/foscam_away_mode_PTZ.markdown
@@ -47,18 +47,18 @@ The `script.foscam_off` and `script.foscam_on` can be used to set the motion det
 script:
  foscam_off:
    sequence:
-   - execute_service: switch.turn_off
-     service_data:
+   - service: switch.turn_off
+     data:
        entity_id: switch.foscam_motion
    - service: shell_command.foscam_turn_off
  foscam_on:
    sequence:
-   - execute_service: switch.turn_off
-     service_data:
+   - service: switch.turn_off
+     data:
        entity_id: switch.foscam_motion
    - service: shell_command.foscam_turn_on
-   - execute_service: switch.turn_on
-     service_data:
+   - service: switch.turn_on
+     data:
        entity_id: switch.foscam_motion
 ```
 
diff --git a/source/_cookbook/restart_ha_if_wemo_switch_is_not_detected.markdown b/source/_cookbook/restart_ha_if_wemo_switch_is_not_detected.markdown
index 5c7accebee2..cca4f2f07d1 100644
--- a/source/_cookbook/restart_ha_if_wemo_switch_is_not_detected.markdown
+++ b/source/_cookbook/restart_ha_if_wemo_switch_is_not_detected.markdown
@@ -53,11 +53,11 @@ script:
     sequence:
       - delay:
           minutes: 15
-      - execute_service: notify.pushbullet
-        service_data:
+      - service: notify.pushbullet
+        data:
           message: 'WeMo not found, restarting HA'
-      - execute_service: switch.turn_on
-        service_data:
+      - service: switch.turn_on
+        data:
           entity_id: switch.killhass
   
 automation:
diff --git a/source/_cookbook/turn_on_light_for_10_minutes_when_motion_detected.markdown b/source/_cookbook/turn_on_light_for_10_minutes_when_motion_detected.markdown
index 1cbdbdde6e1..78c668a00da 100644
--- a/source/_cookbook/turn_on_light_for_10_minutes_when_motion_detected.markdown
+++ b/source/_cookbook/turn_on_light_for_10_minutes_when_motion_detected.markdown
@@ -30,15 +30,15 @@ script:
     alias: "Turn on lamp and set timer"
     sequence:
       # Cancel ev. old timers
-      - execute_service: script.turn_off
-        service_data:
+      - service: script.turn_off
+        data:
            entity_id: script.timer_off
-      - execute_service: light.turn_on
-        service_data:
+      - service: light.turn_on
+        data:
           entity_id: light.kitchen
       # Set new timer
-      - execute_service: script.turn_on
-        service_data:
+      - service: script.turn_on
+        data:
           entity_id: script.timer_off
 
   timer_off:
@@ -46,7 +46,7 @@ script:
     sequence:
       - delay:
           minutes: 10
-      - execute_service: light.turn_off
-        service_data:
+      - service: light.turn_off
+        data:
           entity_id: light.kitchen
 ```
diff --git a/source/_posts/2015-08-26-laundry-automation-with-moteino-mqtt-and-home-assistant.markdown b/source/_posts/2015-08-26-laundry-automation-with-moteino-mqtt-and-home-assistant.markdown
index 0fdd5bcfab6..676de505396 100644
--- a/source/_posts/2015-08-26-laundry-automation-with-moteino-mqtt-and-home-assistant.markdown
+++ b/source/_posts/2015-08-26-laundry-automation-with-moteino-mqtt-and-home-assistant.markdown
@@ -55,6 +55,10 @@ Materials used:
 
 Home Assistant Configuration:
 
+<p class='note'>
+The automation and script syntax here is using a deprecated and no longer supported format.
+</p>
+
 ```yaml
 mqtt:
   broker: 192.168.1.100