diff --git a/atom.xml b/atom.xml index a3559b0dfc..b01a9ed548 100644 --- a/atom.xml +++ b/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Home Assistant]]> - 2016-09-12T05:48:21+00:00 + 2016-09-12T07:05:51+00:00 https://home-assistant.io/ diff --git a/blog/categories/community/atom.xml b/blog/categories/community/atom.xml index a61b400eb3..4741e6a82f 100644 --- a/blog/categories/community/atom.xml +++ b/blog/categories/community/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: Community | Home Assistant]]> - 2016-09-12T05:48:21+00:00 + 2016-09-12T07:05:51+00:00 https://home-assistant.io/ diff --git a/blog/categories/device-tracking/atom.xml b/blog/categories/device-tracking/atom.xml index 15e8b7a599..2fc12be717 100644 --- a/blog/categories/device-tracking/atom.xml +++ b/blog/categories/device-tracking/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: Device-Tracking | Home Assistant]]> - 2016-09-12T05:48:21+00:00 + 2016-09-12T07:05:51+00:00 https://home-assistant.io/ diff --git a/blog/categories/esp8266/atom.xml b/blog/categories/esp8266/atom.xml index 3a16bc225e..6f4c20c928 100644 --- a/blog/categories/esp8266/atom.xml +++ b/blog/categories/esp8266/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: ESP8266 | Home Assistant]]> - 2016-09-12T05:48:21+00:00 + 2016-09-12T07:05:51+00:00 https://home-assistant.io/ diff --git a/blog/categories/how-to/atom.xml b/blog/categories/how-to/atom.xml index fe1c443808..f80126a2b7 100644 --- a/blog/categories/how-to/atom.xml +++ b/blog/categories/how-to/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: How-To | Home Assistant]]> - 2016-09-12T05:48:21+00:00 + 2016-09-12T07:05:51+00:00 https://home-assistant.io/ diff --git a/blog/categories/ibeacons/atom.xml b/blog/categories/ibeacons/atom.xml index 58c272fbe2..48be4c7b0a 100644 --- a/blog/categories/ibeacons/atom.xml +++ b/blog/categories/ibeacons/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: iBeacons | Home Assistant]]> - 2016-09-12T05:48:21+00:00 + 2016-09-12T07:05:51+00:00 https://home-assistant.io/ diff --git a/blog/categories/internet-of-things/atom.xml b/blog/categories/internet-of-things/atom.xml index f2d4fe2e52..0d51a1334f 100644 --- a/blog/categories/internet-of-things/atom.xml +++ b/blog/categories/internet-of-things/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: Internet-of-Things | Home Assistant]]> - 2016-09-12T05:48:21+00:00 + 2016-09-12T07:05:51+00:00 https://home-assistant.io/ diff --git a/blog/categories/iot-data/atom.xml b/blog/categories/iot-data/atom.xml index c2890fa5e0..1cc0357129 100644 --- a/blog/categories/iot-data/atom.xml +++ b/blog/categories/iot-data/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: IoT-Data | Home Assistant]]> - 2016-09-12T05:48:21+00:00 + 2016-09-12T07:05:51+00:00 https://home-assistant.io/ diff --git a/blog/categories/micropython/atom.xml b/blog/categories/micropython/atom.xml index 55fe688f43..2912d57c5c 100644 --- a/blog/categories/micropython/atom.xml +++ b/blog/categories/micropython/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: Micropython | Home Assistant]]> - 2016-09-12T05:48:21+00:00 + 2016-09-12T07:05:51+00:00 https://home-assistant.io/ diff --git a/blog/categories/mqtt/atom.xml b/blog/categories/mqtt/atom.xml index 942889d799..7bd8346fce 100644 --- a/blog/categories/mqtt/atom.xml +++ b/blog/categories/mqtt/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: MQTT | Home Assistant]]> - 2016-09-12T05:48:21+00:00 + 2016-09-12T07:05:51+00:00 https://home-assistant.io/ diff --git a/blog/categories/organisation/atom.xml b/blog/categories/organisation/atom.xml index faad9d229d..f679ec136b 100644 --- a/blog/categories/organisation/atom.xml +++ b/blog/categories/organisation/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: Organisation | Home Assistant]]> - 2016-09-12T05:48:21+00:00 + 2016-09-12T07:05:51+00:00 https://home-assistant.io/ diff --git a/blog/categories/owntracks/atom.xml b/blog/categories/owntracks/atom.xml index 8f7171f39e..c64123a512 100644 --- a/blog/categories/owntracks/atom.xml +++ b/blog/categories/owntracks/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: OwnTracks | Home Assistant]]> - 2016-09-12T05:48:21+00:00 + 2016-09-12T07:05:51+00:00 https://home-assistant.io/ diff --git a/blog/categories/presence-detection/atom.xml b/blog/categories/presence-detection/atom.xml index 958d57c58e..0aae9f8484 100644 --- a/blog/categories/presence-detection/atom.xml +++ b/blog/categories/presence-detection/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: Presence-Detection | Home Assistant]]> - 2016-09-12T05:48:21+00:00 + 2016-09-12T07:05:51+00:00 https://home-assistant.io/ diff --git a/blog/categories/public-service-announcement/atom.xml b/blog/categories/public-service-announcement/atom.xml index 237d394782..baba031e3d 100644 --- a/blog/categories/public-service-announcement/atom.xml +++ b/blog/categories/public-service-announcement/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: Public-Service-Announcement | Home Assistant]]> - 2016-09-12T05:48:21+00:00 + 2016-09-12T07:05:51+00:00 https://home-assistant.io/ diff --git a/blog/categories/release-notes/atom.xml b/blog/categories/release-notes/atom.xml index e6b883e430..7efbf3c275 100644 --- a/blog/categories/release-notes/atom.xml +++ b/blog/categories/release-notes/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: Release-Notes | Home Assistant]]> - 2016-09-12T05:48:21+00:00 + 2016-09-12T07:05:51+00:00 https://home-assistant.io/ diff --git a/blog/categories/survey/atom.xml b/blog/categories/survey/atom.xml index 3183468eeb..65a7a7f453 100644 --- a/blog/categories/survey/atom.xml +++ b/blog/categories/survey/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: Survey | Home Assistant]]> - 2016-09-12T05:48:21+00:00 + 2016-09-12T07:05:51+00:00 https://home-assistant.io/ diff --git a/blog/categories/talks/atom.xml b/blog/categories/talks/atom.xml index 5a9b5a78c8..1733cd50b9 100644 --- a/blog/categories/talks/atom.xml +++ b/blog/categories/talks/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: Talks | Home Assistant]]> - 2016-09-12T05:48:21+00:00 + 2016-09-12T07:05:51+00:00 https://home-assistant.io/ diff --git a/blog/categories/technology/atom.xml b/blog/categories/technology/atom.xml index 338acf2125..7cd7713011 100644 --- a/blog/categories/technology/atom.xml +++ b/blog/categories/technology/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: Technology | Home Assistant]]> - 2016-09-12T05:48:21+00:00 + 2016-09-12T07:05:51+00:00 https://home-assistant.io/ diff --git a/blog/categories/user-stories/atom.xml b/blog/categories/user-stories/atom.xml index 376c83669c..b4a3aec498 100644 --- a/blog/categories/user-stories/atom.xml +++ b/blog/categories/user-stories/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: User-Stories | Home Assistant]]> - 2016-09-12T05:48:21+00:00 + 2016-09-12T07:05:51+00:00 https://home-assistant.io/ diff --git a/blog/categories/video/atom.xml b/blog/categories/video/atom.xml index d195c829f7..5825307b05 100644 --- a/blog/categories/video/atom.xml +++ b/blog/categories/video/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: Video | Home Assistant]]> - 2016-09-12T05:48:21+00:00 + 2016-09-12T07:05:51+00:00 https://home-assistant.io/ diff --git a/blog/categories/website/atom.xml b/blog/categories/website/atom.xml index f3112658f6..7ff71cb24a 100644 --- a/blog/categories/website/atom.xml +++ b/blog/categories/website/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: Website | Home Assistant]]> - 2016-09-12T05:48:21+00:00 + 2016-09-12T07:05:51+00:00 https://home-assistant.io/ diff --git a/getting-started/scripts-conditions/index.html b/getting-started/scripts-conditions/index.html index f865b9ef89..0c62ba764c 100644 --- a/getting-started/scripts-conditions/index.html +++ b/getting-started/scripts-conditions/index.html @@ -95,14 +95,15 @@

Test multiple conditions in 1 condition statement. Passes if all embedded conditions are valid.

-
condition: and
-conditions:
-  - condition: state
-    entity_id: 'device_tracker.paulus'
-    state: 'home'
-  - condition: numeric_state
-    entity_id: 'sensor.temperature'
-    below: '20'
+
condition:
+  condition: and
+  conditions:
+    - condition: state
+      entity_id: 'device_tracker.paulus'
+      state: 'home'
+    - condition: numeric_state
+      entity_id: 'sensor.temperature'
+      below: '20'
 

 

 
@@ -110,14 +111,15 @@
 
 
Test multiple conditions in 1 condition statement. Passes if any embedded conditions is valid.

 
-
condition: or
-conditions:
-  - condition: state
-    entity_id: 'device_tracker.paulus'
-    state: 'home'
-  - condition: numeric_state
-    entity_id: 'sensor.temperature'
-    below: '20'
+
condition:
+  condition: or
+  conditions:
+    - condition: state
+      entity_id: 'device_tracker.paulus'
+      state: 'home'
+    - condition: numeric_state
+      entity_id: 'sensor.temperature'
+      below: '20'
 

 

 
@@ -126,19 +128,20 @@
 
Test multiple AND and OR conditions in 1 condition statement. Passes if any embedded conditions is valid.
 This allows you to mix several AND and OR conditions together.

 
-
condition: and
-conditions:
-  - condition: state
-    entity_id: 'device_tracker.paulus'
-    state: 'home'
-  - condition: or
-    conditions:
+
condition:
+  condition: and
+  conditions:
     - condition: state
-      entity_id: sensor.weather_precip
-      state: 'rain'
-    - condition: numeric_state
-      entity_id: 'sensor.temperature'
-      below: '20'
+      entity_id: 'device_tracker.paulus'
+      state: 'home'
+    - condition: or
+      conditions:
+      - condition: state
+        entity_id: sensor.weather_precip
+        state: 'rain'
+      - condition: numeric_state
+        entity_id: 'sensor.temperature'
+        below: '20'
 

 

 
diff --git a/sitemap.xml b/sitemap.xml
index cd327269c1..8997058795 100644
--- a/sitemap.xml
+++ b/sitemap.xml
@@ -2008,62 +2008,62 @@
 
 
 https://home-assistant.io/demo/frontend.html
-2016-09-12T05:47:31+00:00
+2016-09-12T07:05:00+00:00
 
 
 https://home-assistant.io/demo/index.html
-2016-09-12T05:47:31+00:00
+2016-09-12T07:05:00+00:00
 
 
 https://home-assistant.io/demo/panels/ha-panel-dev-event.html
-2016-09-12T05:47:31+00:00
+2016-09-12T07:05:00+00:00
 
 
 https://home-assistant.io/demo/panels/ha-panel-dev-info.html
-2016-09-12T05:47:31+00:00
+2016-09-12T07:05:00+00:00
 
 
 https://home-assistant.io/demo/panels/ha-panel-dev-service.html
-2016-09-12T05:47:31+00:00
+2016-09-12T07:05:00+00:00
 
 
 https://home-assistant.io/demo/panels/ha-panel-dev-state.html
-2016-09-12T05:47:31+00:00
+2016-09-12T07:05:00+00:00
 
 
 https://home-assistant.io/demo/panels/ha-panel-dev-template.html
-2016-09-12T05:47:31+00:00
+2016-09-12T07:05:00+00:00
 
 
 https://home-assistant.io/demo/panels/ha-panel-history.html
-2016-09-12T05:47:31+00:00
+2016-09-12T07:05:00+00:00
 
 
 https://home-assistant.io/demo/panels/ha-panel-iframe.html
-2016-09-12T05:47:31+00:00
+2016-09-12T07:05:00+00:00
 
 
 https://home-assistant.io/demo/panels/ha-panel-logbook.html
-2016-09-12T05:47:31+00:00
+2016-09-12T07:05:00+00:00
 
 
 https://home-assistant.io/demo/panels/ha-panel-map.html
-2016-09-12T05:47:31+00:00
+2016-09-12T07:05:00+00:00
 
 
 https://home-assistant.io/googlef4f3693c209fe788.html
-2016-09-12T05:47:31+00:00
+2016-09-12T07:05:00+00:00
 
 
 https://home-assistant.io/static/fonts/roboto/DESCRIPTION.en_us.html
-2016-09-12T05:47:31+00:00
+2016-09-12T07:05:00+00:00
 
 
 https://home-assistant.io/static/fonts/robotomono/DESCRIPTION.en_us.html
-2016-09-12T05:47:31+00:00
+2016-09-12T07:05:00+00:00
 
 
 https://home-assistant.io/static/mdi-demo.html
-2016-09-12T05:47:32+00:00
+2016-09-12T07:05:00+00:00