diff --git a/atom.xml b/atom.xml
index b0b5e3d80f..33757dd7ee 100644
--- a/atom.xml
+++ b/atom.xml
@@ -4,7 +4,7 @@
- 2016-05-20T15:37:24+00:00
+ 2016-05-20T18:04:19+00:00
https://home-assistant.io/
diff --git a/blog/categories/community/atom.xml b/blog/categories/community/atom.xml
index 732221a5f5..10d5c1c4d2 100644
--- a/blog/categories/community/atom.xml
+++ b/blog/categories/community/atom.xml
@@ -4,7 +4,7 @@
- 2016-05-20T15:37:24+00:00
+ 2016-05-20T18:04:19+00:00
https://home-assistant.io/
diff --git a/blog/categories/esp8266/atom.xml b/blog/categories/esp8266/atom.xml
index 423f62e4aa..4f13abdf8c 100644
--- a/blog/categories/esp8266/atom.xml
+++ b/blog/categories/esp8266/atom.xml
@@ -4,7 +4,7 @@
- 2016-05-20T15:37:24+00:00
+ 2016-05-20T18:04:19+00:00
https://home-assistant.io/
diff --git a/blog/categories/how-to/atom.xml b/blog/categories/how-to/atom.xml
index ee0adcde96..e54c6c1db0 100644
--- a/blog/categories/how-to/atom.xml
+++ b/blog/categories/how-to/atom.xml
@@ -4,7 +4,7 @@
- 2016-05-20T15:37:24+00:00
+ 2016-05-20T18:04:19+00:00
https://home-assistant.io/
diff --git a/blog/categories/ibeacons/atom.xml b/blog/categories/ibeacons/atom.xml
index 468e43c50c..439dfeb969 100644
--- a/blog/categories/ibeacons/atom.xml
+++ b/blog/categories/ibeacons/atom.xml
@@ -4,7 +4,7 @@
- 2016-05-20T15:37:24+00:00
+ 2016-05-20T18:04:19+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 56e25c8e1a..97f8a15477 100644
--- a/blog/categories/internet-of-things/atom.xml
+++ b/blog/categories/internet-of-things/atom.xml
@@ -4,7 +4,7 @@
- 2016-05-20T15:37:24+00:00
+ 2016-05-20T18:04:19+00:00
https://home-assistant.io/
diff --git a/blog/categories/mqtt/atom.xml b/blog/categories/mqtt/atom.xml
index e03da87fff..b30ebaa1b3 100644
--- a/blog/categories/mqtt/atom.xml
+++ b/blog/categories/mqtt/atom.xml
@@ -4,7 +4,7 @@
- 2016-05-20T15:37:24+00:00
+ 2016-05-20T18:04:19+00:00
https://home-assistant.io/
diff --git a/blog/categories/organisation/atom.xml b/blog/categories/organisation/atom.xml
index 578a26af81..5d7c54bf5b 100644
--- a/blog/categories/organisation/atom.xml
+++ b/blog/categories/organisation/atom.xml
@@ -4,7 +4,7 @@
- 2016-05-20T15:37:24+00:00
+ 2016-05-20T18:04:19+00:00
https://home-assistant.io/
diff --git a/blog/categories/owntracks/atom.xml b/blog/categories/owntracks/atom.xml
index 456b630417..f54e44f642 100644
--- a/blog/categories/owntracks/atom.xml
+++ b/blog/categories/owntracks/atom.xml
@@ -4,7 +4,7 @@
- 2016-05-20T15:37:24+00:00
+ 2016-05-20T18:04:19+00:00
https://home-assistant.io/
diff --git a/blog/categories/presence-detection/atom.xml b/blog/categories/presence-detection/atom.xml
index 0acdc9fe99..c6b06b7f74 100644
--- a/blog/categories/presence-detection/atom.xml
+++ b/blog/categories/presence-detection/atom.xml
@@ -4,7 +4,7 @@
- 2016-05-20T15:37:24+00:00
+ 2016-05-20T18:04:19+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 e94abe69e8..83fe12fb13 100644
--- a/blog/categories/public-service-announcement/atom.xml
+++ b/blog/categories/public-service-announcement/atom.xml
@@ -4,7 +4,7 @@
- 2016-05-20T15:37:24+00:00
+ 2016-05-20T18:04:19+00:00
https://home-assistant.io/
diff --git a/blog/categories/release-notes/atom.xml b/blog/categories/release-notes/atom.xml
index 6badc67504..bd22279daf 100644
--- a/blog/categories/release-notes/atom.xml
+++ b/blog/categories/release-notes/atom.xml
@@ -4,7 +4,7 @@
- 2016-05-20T15:37:24+00:00
+ 2016-05-20T18:04:19+00:00
https://home-assistant.io/
diff --git a/blog/categories/survey/atom.xml b/blog/categories/survey/atom.xml
index 80eb971926..a0c6fde2c4 100644
--- a/blog/categories/survey/atom.xml
+++ b/blog/categories/survey/atom.xml
@@ -4,7 +4,7 @@
- 2016-05-20T15:37:24+00:00
+ 2016-05-20T18:04:19+00:00
https://home-assistant.io/
diff --git a/blog/categories/talks/atom.xml b/blog/categories/talks/atom.xml
index 45c3b1edf8..e1e58ab3f0 100644
--- a/blog/categories/talks/atom.xml
+++ b/blog/categories/talks/atom.xml
@@ -4,7 +4,7 @@
- 2016-05-20T15:37:24+00:00
+ 2016-05-20T18:04:19+00:00
https://home-assistant.io/
diff --git a/blog/categories/technology/atom.xml b/blog/categories/technology/atom.xml
index 014fda1990..e2d92e2c67 100644
--- a/blog/categories/technology/atom.xml
+++ b/blog/categories/technology/atom.xml
@@ -4,7 +4,7 @@
- 2016-05-20T15:37:24+00:00
+ 2016-05-20T18:04:19+00:00
https://home-assistant.io/
diff --git a/blog/categories/user-stories/atom.xml b/blog/categories/user-stories/atom.xml
index 4d2632c3f2..3b285fbba2 100644
--- a/blog/categories/user-stories/atom.xml
+++ b/blog/categories/user-stories/atom.xml
@@ -4,7 +4,7 @@
- 2016-05-20T15:37:24+00:00
+ 2016-05-20T18:04:19+00:00
https://home-assistant.io/
diff --git a/blog/categories/video/atom.xml b/blog/categories/video/atom.xml
index 4499852c7d..c9b1aced30 100644
--- a/blog/categories/video/atom.xml
+++ b/blog/categories/video/atom.xml
@@ -4,7 +4,7 @@
- 2016-05-20T15:37:24+00:00
+ 2016-05-20T18:04:19+00:00
https://home-assistant.io/
diff --git a/blog/categories/website/atom.xml b/blog/categories/website/atom.xml
index 89614ef245..482f0dcccf 100644
--- a/blog/categories/website/atom.xml
+++ b/blog/categories/website/atom.xml
@@ -4,7 +4,7 @@
- 2016-05-20T15:37:24+00:00
+ 2016-05-20T18:04:19+00:00
https://home-assistant.io/
diff --git a/getting-started/automation-condition/index.html b/getting-started/automation-condition/index.html
index ce237e5ba0..17e801158f 100644
--- a/getting-started/automation-condition/index.html
+++ b/getting-started/automation-condition/index.html
@@ -102,6 +102,28 @@
The available conditions for an automation are the same as for the script syntax. So see that page for a full list of available conditions.
+Example of using condition:
+
+
+
- alias: 'Enciende Despacho'
+ trigger:
+ platform: state
+ entity_id: sensor.mini_despacho
+ to: 'ON'
+ condition:
+ condition: or
+ conditions:
+ - condition: template
+ value_template: ''
+ - condition: template
+ value_template: ''
+ action:
+ - service: scene.turn_on
+ entity_id: scene.DespiertaDespacho
+
+
+
+
diff --git a/sitemap.xml b/sitemap.xml
index 11b1340e50..56717ac317 100644
--- a/sitemap.xml
+++ b/sitemap.xml
@@ -1613,26 +1613,26 @@
https://home-assistant.io/demo/frontend.html
- 2016-05-20T15:36:22+00:00
+ 2016-05-20T18:03:39+00:00
https://home-assistant.io/demo/index.html
- 2016-05-20T15:36:22+00:00
+ 2016-05-20T18:03:39+00:00
https://home-assistant.io/googlef4f3693c209fe788.html
- 2016-05-20T15:36:22+00:00
+ 2016-05-20T18:03:39+00:00
https://home-assistant.io/static/fonts/roboto/DESCRIPTION.en_us.html
- 2016-05-20T15:36:22+00:00
+ 2016-05-20T18:03:39+00:00
https://home-assistant.io/static/fonts/robotomono/DESCRIPTION.en_us.html
- 2016-05-20T15:36:22+00:00
+ 2016-05-20T18:03:39+00:00
https://home-assistant.io/static/mdi-demo.html
- 2016-05-20T15:36:22+00:00
+ 2016-05-20T18:03:39+00:00