diff --git a/atom.xml b/atom.xml index 17fd8e94e3..125b69bf36 100644 --- a/atom.xml +++ b/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Home Assistant]]> - 2016-10-05T22:05:02+00:00 + 2016-10-05T22:10:48+00:00 https://home-assistant.io/ diff --git a/blog/categories/community/atom.xml b/blog/categories/community/atom.xml index 67e9347608..068b8a58ef 100644 --- a/blog/categories/community/atom.xml +++ b/blog/categories/community/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: Community | Home Assistant]]> - 2016-10-05T22:05:02+00:00 + 2016-10-05T22:10:48+00:00 https://home-assistant.io/ diff --git a/blog/categories/device-tracking/atom.xml b/blog/categories/device-tracking/atom.xml index 877cbc9cc4..1ed2442a43 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-10-05T22:05:02+00:00 + 2016-10-05T22:10:48+00:00 https://home-assistant.io/ diff --git a/blog/categories/esp8266/atom.xml b/blog/categories/esp8266/atom.xml index cd19251a8d..1579eb7b60 100644 --- a/blog/categories/esp8266/atom.xml +++ b/blog/categories/esp8266/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: ESP8266 | Home Assistant]]> - 2016-10-05T22:05:02+00:00 + 2016-10-05T22:10:48+00:00 https://home-assistant.io/ diff --git a/blog/categories/how-to/atom.xml b/blog/categories/how-to/atom.xml index cce8145cc5..eea3126e07 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-10-05T22:05:02+00:00 + 2016-10-05T22:10:48+00:00 https://home-assistant.io/ diff --git a/blog/categories/ibeacons/atom.xml b/blog/categories/ibeacons/atom.xml index 27b788c666..c443b1ed60 100644 --- a/blog/categories/ibeacons/atom.xml +++ b/blog/categories/ibeacons/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: iBeacons | Home Assistant]]> - 2016-10-05T22:05:02+00:00 + 2016-10-05T22:10:48+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 ca6dc4575c..010fcbc3b6 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-10-05T22:05:02+00:00 + 2016-10-05T22:10:48+00:00 https://home-assistant.io/ diff --git a/blog/categories/iot-data/atom.xml b/blog/categories/iot-data/atom.xml index 1d3fdba9d3..ad5923312c 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-10-05T22:05:02+00:00 + 2016-10-05T22:10:48+00:00 https://home-assistant.io/ diff --git a/blog/categories/micropython/atom.xml b/blog/categories/micropython/atom.xml index ae31419fd2..1de773da0b 100644 --- a/blog/categories/micropython/atom.xml +++ b/blog/categories/micropython/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: Micropython | Home Assistant]]> - 2016-10-05T22:05:02+00:00 + 2016-10-05T22:10:48+00:00 https://home-assistant.io/ diff --git a/blog/categories/mqtt/atom.xml b/blog/categories/mqtt/atom.xml index 9676743625..48fabf775c 100644 --- a/blog/categories/mqtt/atom.xml +++ b/blog/categories/mqtt/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: MQTT | Home Assistant]]> - 2016-10-05T22:05:02+00:00 + 2016-10-05T22:10:48+00:00 https://home-assistant.io/ diff --git a/blog/categories/organisation/atom.xml b/blog/categories/organisation/atom.xml index ddcedd00ea..b1e364f9d5 100644 --- a/blog/categories/organisation/atom.xml +++ b/blog/categories/organisation/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: Organisation | Home Assistant]]> - 2016-10-05T22:05:02+00:00 + 2016-10-05T22:10:48+00:00 https://home-assistant.io/ diff --git a/blog/categories/owntracks/atom.xml b/blog/categories/owntracks/atom.xml index 7b16b46569..b9c71f9fc6 100644 --- a/blog/categories/owntracks/atom.xml +++ b/blog/categories/owntracks/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: OwnTracks | Home Assistant]]> - 2016-10-05T22:05:02+00:00 + 2016-10-05T22:10:48+00:00 https://home-assistant.io/ diff --git a/blog/categories/presence-detection/atom.xml b/blog/categories/presence-detection/atom.xml index 213c77819d..f17516259e 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-10-05T22:05:02+00:00 + 2016-10-05T22:10:48+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 3749815cf4..8c41cee010 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-10-05T22:05:02+00:00 + 2016-10-05T22:10:48+00:00 https://home-assistant.io/ diff --git a/blog/categories/release-notes/atom.xml b/blog/categories/release-notes/atom.xml index 964c94eef9..d9007fce89 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-10-05T22:05:02+00:00 + 2016-10-05T22:10:48+00:00 https://home-assistant.io/ diff --git a/blog/categories/survey/atom.xml b/blog/categories/survey/atom.xml index 9e972541c1..36724ef763 100644 --- a/blog/categories/survey/atom.xml +++ b/blog/categories/survey/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: Survey | Home Assistant]]> - 2016-10-05T22:05:02+00:00 + 2016-10-05T22:10:48+00:00 https://home-assistant.io/ diff --git a/blog/categories/talks/atom.xml b/blog/categories/talks/atom.xml index 46e325a937..6941561e29 100644 --- a/blog/categories/talks/atom.xml +++ b/blog/categories/talks/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: Talks | Home Assistant]]> - 2016-10-05T22:05:02+00:00 + 2016-10-05T22:10:48+00:00 https://home-assistant.io/ diff --git a/blog/categories/technology/atom.xml b/blog/categories/technology/atom.xml index 1f1234b99b..33cfb5fbb9 100644 --- a/blog/categories/technology/atom.xml +++ b/blog/categories/technology/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: Technology | Home Assistant]]> - 2016-10-05T22:05:02+00:00 + 2016-10-05T22:10:48+00:00 https://home-assistant.io/ diff --git a/blog/categories/user-stories/atom.xml b/blog/categories/user-stories/atom.xml index c515503ed6..8be54a88de 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-10-05T22:05:02+00:00 + 2016-10-05T22:10:48+00:00 https://home-assistant.io/ diff --git a/blog/categories/video/atom.xml b/blog/categories/video/atom.xml index ec5e48676e..db0d78f664 100644 --- a/blog/categories/video/atom.xml +++ b/blog/categories/video/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: Video | Home Assistant]]> - 2016-10-05T22:05:02+00:00 + 2016-10-05T22:10:48+00:00 https://home-assistant.io/ diff --git a/blog/categories/website/atom.xml b/blog/categories/website/atom.xml index a331998dc5..0b0a081b15 100644 --- a/blog/categories/website/atom.xml +++ b/blog/categories/website/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: Website | Home Assistant]]> - 2016-10-05T22:05:02+00:00 + 2016-10-05T22:10:48+00:00 https://home-assistant.io/ diff --git a/getting-started/automation/index.html b/getting-started/automation/index.html index 3bcf107b3d..68139ef5eb 100644 --- a/getting-started/automation/index.html +++ b/getting-started/automation/index.html @@ -112,7 +112,7 @@

The third part is the action which will be performed when a rule is triggered and all conditions are met.For example, it can turn a light on, set the temperature on your thermostat or activate a scene.

-The difference between a condition and a trigger can be confusing as they are very similar. Triggers are looking at the actions while conditions look at the result: turning a light on vs a light being on. +The difference between a condition and a trigger can be confusing as they are very similar. Triggers look at the actions, while conditions look at the results: turning a light on vs a light being on.

Exploring the internal state

diff --git a/sitemap.xml b/sitemap.xml index fa0c3a8d45..428593000c 100644 --- a/sitemap.xml +++ b/sitemap.xml @@ -2113,62 +2113,62 @@ https://home-assistant.io/demo/frontend.html -2016-10-05T22:04:11+00:00 +2016-10-05T22:10:06+00:00 https://home-assistant.io/demo/index.html -2016-10-05T22:04:11+00:00 +2016-10-05T22:10:06+00:00 https://home-assistant.io/demo/panels/ha-panel-dev-event.html -2016-10-05T22:04:11+00:00 +2016-10-05T22:10:06+00:00 https://home-assistant.io/demo/panels/ha-panel-dev-info.html -2016-10-05T22:04:11+00:00 +2016-10-05T22:10:06+00:00 https://home-assistant.io/demo/panels/ha-panel-dev-service.html -2016-10-05T22:04:11+00:00 +2016-10-05T22:10:06+00:00 https://home-assistant.io/demo/panels/ha-panel-dev-state.html -2016-10-05T22:04:11+00:00 +2016-10-05T22:10:06+00:00 https://home-assistant.io/demo/panels/ha-panel-dev-template.html -2016-10-05T22:04:11+00:00 +2016-10-05T22:10:06+00:00 https://home-assistant.io/demo/panels/ha-panel-history.html -2016-10-05T22:04:11+00:00 +2016-10-05T22:10:06+00:00 https://home-assistant.io/demo/panels/ha-panel-iframe.html -2016-10-05T22:04:11+00:00 +2016-10-05T22:10:06+00:00 https://home-assistant.io/demo/panels/ha-panel-logbook.html -2016-10-05T22:04:11+00:00 +2016-10-05T22:10:06+00:00 https://home-assistant.io/demo/panels/ha-panel-map.html -2016-10-05T22:04:11+00:00 +2016-10-05T22:10:06+00:00 https://home-assistant.io/googlef4f3693c209fe788.html -2016-10-05T22:04:11+00:00 +2016-10-05T22:10:06+00:00 https://home-assistant.io/static/fonts/roboto/DESCRIPTION.en_us.html -2016-10-05T22:04:11+00:00 +2016-10-05T22:10:06+00:00 https://home-assistant.io/static/fonts/robotomono/DESCRIPTION.en_us.html -2016-10-05T22:04:11+00:00 +2016-10-05T22:10:06+00:00 https://home-assistant.io/static/mdi-demo.html -2016-10-05T22:04:11+00:00 +2016-10-05T22:10:06+00:00