diff --git a/atom.xml b/atom.xml
index afcb06efaf..11bab7ea38 100644
--- a/atom.xml
+++ b/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Home Assistant]]></title>
   <link href="https://home-assistant.io/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2017-06-11T08:10:25+00:00</updated>
+  <updated>2017-06-11T10:36:55+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
@@ -61,7 +61,7 @@
 
 <ul>
   <li>The USPS sensor entity names have changed as there are now two. One for packages and one for mail. Config will now also use <code class="highlighter-rouge">scan_interval</code> instead of <code class="highlighter-rouge">update_interval</code>  (<a href="https://github.com/happyleavesaoc">@happyleavesaoc</a> - <a href="https://github.com/home-assistant/home-assistant/pull/7655">#7655</a>) (<a href="https://home-assistant.io/components/sensor.usps/">sensor.usps docs</a>) (breaking change)</li>
-  <li>Automation state trigger: From/to checks will now ignore state changes that are just attribute changess (<a href="https://github.com/amelchio">@amelchio</a> - <a href="https://github.com/home-assistant/home-assistant/pull/7651">#7651</a>) (<a href="https://home-assistant.io/components/automation.state/">automation.state docs</a>) (breaking change)</li>
+  <li>Automation state trigger: From/to checks will now ignore state changes that are just attribute changess (<a href="https://github.com/amelchio">@amelchio</a> - <a href="https://github.com/home-assistant/home-assistant/pull/7651">#7651</a>) (<a href="https://home-assistant.io/docs/automation/trigger/#state-trigger">automation.state docs</a>) (breaking change)</li>
   <li>Redesign monitored variables for hp_ilo sensor. <code class="highlighter-rouge">monitored_variables</code> is now a list of <code class="highlighter-rouge">name</code> and <code class="highlighter-rouge">sensor_type</code> values (<a href="https://github.com/Juggels">@Juggels</a> - <a href="https://github.com/home-assistant/home-assistant/pull/7534">#7534</a>) (<a href="https://home-assistant.io/components/sensor.hp_ilo/">sensor.hp_ilo docs</a>) (breaking change)</li>
 </ul>
 
@@ -77,7 +77,7 @@
 </div>
 
 <ul>
-  <li>Automation - time: The <code class="highlighter-rouge">after</code> keyword for time triggers (not conditions) has been deprecated in favor of the <code class="highlighter-rouge">at</code> keyword. This resembles better what it does (old one still works, gives a warning) (<a href="https://github.com/armills">@armills</a> - <a href="https://github.com/home-assistant/home-assistant/pull/7846">#7846</a>) (<a href="https://home-assistant.io/components/automation.time/">automation.time docs</a>) (breaking change)</li>
+  <li>Automation - time: The <code class="highlighter-rouge">after</code> keyword for time triggers (not conditions) has been deprecated in favor of the <code class="highlighter-rouge">at</code> keyword. This resembles better what it does (old one still works, gives a warning) (<a href="https://github.com/armills">@armills</a> - <a href="https://github.com/home-assistant/home-assistant/pull/7846">#7846</a>) (<a href="https://home-assistant.io/docs/automation/trigger/#time-trigger">automation.time docs</a>) (breaking change)</li>
   <li>Automation - numeric_state: <code class="highlighter-rouge">above</code> and <code class="highlighter-rouge">below</code> will no longer trigger if it is equal. (<a href="https://github.com/armills">@armills</a> - <a href="https://github.com/home-assistant/home-assistant/pull/7857">#7857</a>) (breaking change)</li>
   <li>Broadlink switches: Entity ids will change for switches that don’t have a default name set. In this case the object_id is now used. (<a href="https://github.com/abmantis">@abmantis</a> - <a href="https://github.com/home-assistant/home-assistant/pull/7845">#7845</a>) (<a href="https://home-assistant.io/components/switch.broadlink/">switch.broadlink docs</a>) (breaking change)</li>
   <li>Disallow ambiguous color descriptors in the light.turn_on schema. This means that you can no longer specify both <code class="highlighter-rouge">xy_color</code> and <code class="highlighter-rouge">rgb_color</code>. (<a href="https://github.com/amelchio">@amelchio</a> - <a href="https://github.com/home-assistant/home-assistant/pull/7765">#7765</a>) (breaking change)</li>
@@ -105,11 +105,11 @@
   <li>Change line endings to LN (<a href="https://github.com/fabaff">@fabaff</a> - <a href="https://github.com/home-assistant/home-assistant/pull/7660">#7660</a>) (<a href="https://home-assistant.io/components/calendar.demo/">calendar.demo docs</a>) (<a href="https://home-assistant.io/components/calendar.google/">calendar.google docs</a>) (<a href="https://home-assistant.io/components/camera.synology/">camera.synology docs</a>) (<a href="https://home-assistant.io/components/climate.tado/">climate.tado docs</a>) (<a href="https://home-assistant.io/components/remote.harmony/">remote.harmony docs</a>) (<a href="https://home-assistant.io/components/sensor.synologydsm/">sensor.synologydsm docs</a>)</li>
   <li>Point pylutron to pypi (<a href="https://github.com/thecynic">@thecynic</a> - <a href="https://github.com/home-assistant/home-assistant/pull/7664">#7664</a>) (<a href="https://home-assistant.io/components/lutron/">lutron docs</a>)</li>
   <li>Upgrade Openhome library (<a href="https://github.com/bazwilliams">@bazwilliams</a> - <a href="https://github.com/home-assistant/home-assistant/pull/7671">#7671</a>) (<a href="https://home-assistant.io/components/media_player.openhome/">media_player.openhome docs</a>)</li>
-  <li>Ignore attribute changes in automation trigger from/to (<a href="https://github.com/amelchio">@amelchio</a> - <a href="https://github.com/home-assistant/home-assistant/pull/7651">#7651</a>) (<a href="https://home-assistant.io/components/automation.state/">automation.state docs</a>) (breaking change)</li>
+  <li>Ignore attribute changes in automation trigger from/to (<a href="https://github.com/amelchio">@amelchio</a> - <a href="https://github.com/home-assistant/home-assistant/pull/7651">#7651</a>) (<a href="https://home-assistant.io/docs/automation/trigger/#state-trigger">automation.state docs</a>) (breaking change)</li>
   <li>Switch pymodbus to pypi (<a href="https://github.com/andrey-git">@andrey-git</a> - <a href="https://github.com/home-assistant/home-assistant/pull/7677">#7677</a>) (<a href="https://home-assistant.io/components/modbus/">modbus docs</a>)</li>
   <li>zoneminder: fix incorrect use of logging.exception. (<a href="https://github.com/tobygray">@tobygray</a> - <a href="https://github.com/home-assistant/home-assistant/pull/7675">#7675</a>) (<a href="https://home-assistant.io/components/zoneminder/">zoneminder docs</a>)</li>
   <li>Zwave: Apply refresh_node workaround on 1st instance only (<a href="https://github.com/andrey-git">@andrey-git</a> - <a href="https://github.com/home-assistant/home-assistant/pull/7579">#7579</a>) (<a href="https://home-assistant.io/components/zwave/">zwave docs</a>)</li>
-  <li>Guard against new and removed state change events (<a href="https://github.com/balloob">@balloob</a> - <a href="https://github.com/home-assistant/home-assistant/pull/7687">#7687</a>) (<a href="https://home-assistant.io/components/automation.state/">automation.state docs</a>)</li>
+  <li>Guard against new and removed state change events (<a href="https://github.com/balloob">@balloob</a> - <a href="https://github.com/home-assistant/home-assistant/pull/7687">#7687</a>) (<a href="https://home-assistant.io/docs/automation/trigger/#state-trigger">automation.state docs</a>)</li>
   <li>ZWave: Add reset service to meters (<a href="https://github.com/turbokongen">@turbokongen</a> - <a href="https://github.com/home-assistant/home-assistant/pull/7676">#7676</a>) (<a href="https://home-assistant.io/components/zwave/">zwave docs</a>)</li>
   <li>Remove defunct INSTALL_OPENZWAVE from Dockerfile (<a href="https://github.com/armills">@armills</a> - <a href="https://github.com/home-assistant/home-assistant/pull/7697">#7697</a>)</li>
   <li>Fix telegram chats (<a href="https://github.com/azogue">@azogue</a> - <a href="https://github.com/home-assistant/home-assistant/pull/7689">#7689</a>) (<a href="https://home-assistant.io/components/notify.telegram/">notify.telegram docs</a>)</li>
@@ -173,7 +173,7 @@
   <li>Allow ‘base_url’ (fixes #7784) (<a href="https://github.com/fabaff">@fabaff</a> - <a href="https://github.com/home-assistant/home-assistant/pull/7796">#7796</a>) (<a href="https://home-assistant.io/components/upnp/">upnp docs</a>)</li>
   <li>Expose the node name on the zwave node entity (<a href="https://github.com/armills">@armills</a> - <a href="https://github.com/home-assistant/home-assistant/pull/7787">#7787</a>) (<a href="https://home-assistant.io/components/zwave/">zwave docs</a>)</li>
   <li>Bumped pyhomematic version (<a href="https://github.com/danielperna84">@danielperna84</a> - <a href="https://github.com/home-assistant/home-assistant/pull/7861">#7861</a>) (<a href="https://home-assistant.io/components/homematic/">homematic docs</a>)</li>
-  <li>Rename time trigger ‘after’ to ‘at’ (<a href="https://github.com/armills">@armills</a> - <a href="https://github.com/home-assistant/home-assistant/pull/7846">#7846</a>) (<a href="https://home-assistant.io/components/automation.time/">automation.time docs</a>) (breaking change)</li>
+  <li>Rename time trigger ‘after’ to ‘at’ (<a href="https://github.com/armills">@armills</a> - <a href="https://github.com/home-assistant/home-assistant/pull/7846">#7846</a>) (<a href="https://home-assistant.io/docs/automation/trigger/#time-trigger">automation.time docs</a>) (breaking change)</li>
   <li>Use expected behvaior for above/below (<a href="https://github.com/armills">@armills</a> - <a href="https://github.com/home-assistant/home-assistant/pull/7857">#7857</a>) (breaking change)</li>
   <li>log time delay of domain setup in info level (<a href="https://github.com/azogue">@azogue</a> - <a href="https://github.com/home-assistant/home-assistant/pull/7808">#7808</a>)</li>
   <li>Optimize history_stats efficiency and database usage (<a href="https://github.com/bokub">@bokub</a> - <a href="https://github.com/home-assistant/home-assistant/pull/7858">#7858</a>) (<a href="https://home-assistant.io/components/sensor.history_stats/">sensor.history_stats docs</a>)</li>
diff --git a/blog/2017/06/04/release-46/index.html b/blog/2017/06/04/release-46/index.html
index 872137a5b4..0ea429e50a 100644
--- a/blog/2017/06/04/release-46/index.html
+++ b/blog/2017/06/04/release-46/index.html
@@ -100,7 +100,7 @@
 <h2><a class="title-link" name="breaking-changes" href="#breaking-changes"></a> Breaking changes</h2>
 <ul>
   <li>The USPS sensor entity names have changed as there are now two. One for packages and one for mail. Config will now also use <code class="highlighter-rouge">scan_interval</code> instead of <code class="highlighter-rouge">update_interval</code>  (<a href="https://github.com/happyleavesaoc">@happyleavesaoc</a> - <a href="https://github.com/home-assistant/home-assistant/pull/7655">#7655</a>) (<a href="https://home-assistant.io/components/sensor.usps/">sensor.usps docs</a>) (breaking change)</li>
-  <li>Automation state trigger: From/to checks will now ignore state changes that are just attribute changess (<a href="https://github.com/amelchio">@amelchio</a> - <a href="https://github.com/home-assistant/home-assistant/pull/7651">#7651</a>) (<a href="https://home-assistant.io/components/automation.state/">automation.state docs</a>) (breaking change)</li>
+  <li>Automation state trigger: From/to checks will now ignore state changes that are just attribute changess (<a href="https://github.com/amelchio">@amelchio</a> - <a href="https://github.com/home-assistant/home-assistant/pull/7651">#7651</a>) (<a href="https://home-assistant.io/docs/automation/trigger/#state-trigger">automation.state docs</a>) (breaking change)</li>
   <li>Redesign monitored variables for hp_ilo sensor. <code class="highlighter-rouge">monitored_variables</code> is now a list of <code class="highlighter-rouge">name</code> and <code class="highlighter-rouge">sensor_type</code> values (<a href="https://github.com/Juggels">@Juggels</a> - <a href="https://github.com/home-assistant/home-assistant/pull/7534">#7534</a>) (<a href="https://home-assistant.io/components/sensor.hp_ilo/">sensor.hp_ilo docs</a>) (breaking change)</li>
 </ul>
 <div class="language-yaml highlighter-rouge"><pre class="highlight"><code><span class="s">sensor</span><span class="pi">:</span>
@@ -114,7 +114,7 @@
 </code></pre>
 </div>
 <ul>
-  <li>Automation - time: The <code class="highlighter-rouge">after</code> keyword for time triggers (not conditions) has been deprecated in favor of the <code class="highlighter-rouge">at</code> keyword. This resembles better what it does (old one still works, gives a warning) (<a href="https://github.com/armills">@armills</a> - <a href="https://github.com/home-assistant/home-assistant/pull/7846">#7846</a>) (<a href="https://home-assistant.io/components/automation.time/">automation.time docs</a>) (breaking change)</li>
+  <li>Automation - time: The <code class="highlighter-rouge">after</code> keyword for time triggers (not conditions) has been deprecated in favor of the <code class="highlighter-rouge">at</code> keyword. This resembles better what it does (old one still works, gives a warning) (<a href="https://github.com/armills">@armills</a> - <a href="https://github.com/home-assistant/home-assistant/pull/7846">#7846</a>) (<a href="https://home-assistant.io/docs/automation/trigger/#time-trigger">automation.time docs</a>) (breaking change)</li>
   <li>Automation - numeric_state: <code class="highlighter-rouge">above</code> and <code class="highlighter-rouge">below</code> will no longer trigger if it is equal. (<a href="https://github.com/armills">@armills</a> - <a href="https://github.com/home-assistant/home-assistant/pull/7857">#7857</a>) (breaking change)</li>
   <li>Broadlink switches: Entity ids will change for switches that don’t have a default name set. In this case the object_id is now used. (<a href="https://github.com/abmantis">@abmantis</a> - <a href="https://github.com/home-assistant/home-assistant/pull/7845">#7845</a>) (<a href="https://home-assistant.io/components/switch.broadlink/">switch.broadlink docs</a>) (breaking change)</li>
   <li>Disallow ambiguous color descriptors in the light.turn_on schema. This means that you can no longer specify both <code class="highlighter-rouge">xy_color</code> and <code class="highlighter-rouge">rgb_color</code>. (<a href="https://github.com/amelchio">@amelchio</a> - <a href="https://github.com/home-assistant/home-assistant/pull/7765">#7765</a>) (breaking change)</li>
@@ -138,11 +138,11 @@
   <li>Change line endings to LN (<a href="https://github.com/fabaff">@fabaff</a> - <a href="https://github.com/home-assistant/home-assistant/pull/7660">#7660</a>) (<a href="https://home-assistant.io/components/calendar.demo/">calendar.demo docs</a>) (<a href="https://home-assistant.io/components/calendar.google/">calendar.google docs</a>) (<a href="https://home-assistant.io/components/camera.synology/">camera.synology docs</a>) (<a href="https://home-assistant.io/components/climate.tado/">climate.tado docs</a>) (<a href="https://home-assistant.io/components/remote.harmony/">remote.harmony docs</a>) (<a href="https://home-assistant.io/components/sensor.synologydsm/">sensor.synologydsm docs</a>)</li>
   <li>Point pylutron to pypi (<a href="https://github.com/thecynic">@thecynic</a> - <a href="https://github.com/home-assistant/home-assistant/pull/7664">#7664</a>) (<a href="https://home-assistant.io/components/lutron/">lutron docs</a>)</li>
   <li>Upgrade Openhome library (<a href="https://github.com/bazwilliams">@bazwilliams</a> - <a href="https://github.com/home-assistant/home-assistant/pull/7671">#7671</a>) (<a href="https://home-assistant.io/components/media_player.openhome/">media_player.openhome docs</a>)</li>
-  <li>Ignore attribute changes in automation trigger from/to (<a href="https://github.com/amelchio">@amelchio</a> - <a href="https://github.com/home-assistant/home-assistant/pull/7651">#7651</a>) (<a href="https://home-assistant.io/components/automation.state/">automation.state docs</a>) (breaking change)</li>
+  <li>Ignore attribute changes in automation trigger from/to (<a href="https://github.com/amelchio">@amelchio</a> - <a href="https://github.com/home-assistant/home-assistant/pull/7651">#7651</a>) (<a href="https://home-assistant.io/docs/automation/trigger/#state-trigger">automation.state docs</a>) (breaking change)</li>
   <li>Switch pymodbus to pypi (<a href="https://github.com/andrey-git">@andrey-git</a> - <a href="https://github.com/home-assistant/home-assistant/pull/7677">#7677</a>) (<a href="https://home-assistant.io/components/modbus/">modbus docs</a>)</li>
   <li>zoneminder: fix incorrect use of logging.exception. (<a href="https://github.com/tobygray">@tobygray</a> - <a href="https://github.com/home-assistant/home-assistant/pull/7675">#7675</a>) (<a href="https://home-assistant.io/components/zoneminder/">zoneminder docs</a>)</li>
   <li>Zwave: Apply refresh_node workaround on 1st instance only (<a href="https://github.com/andrey-git">@andrey-git</a> - <a href="https://github.com/home-assistant/home-assistant/pull/7579">#7579</a>) (<a href="https://home-assistant.io/components/zwave/">zwave docs</a>)</li>
-  <li>Guard against new and removed state change events (<a href="https://github.com/balloob">@balloob</a> - <a href="https://github.com/home-assistant/home-assistant/pull/7687">#7687</a>) (<a href="https://home-assistant.io/components/automation.state/">automation.state docs</a>)</li>
+  <li>Guard against new and removed state change events (<a href="https://github.com/balloob">@balloob</a> - <a href="https://github.com/home-assistant/home-assistant/pull/7687">#7687</a>) (<a href="https://home-assistant.io/docs/automation/trigger/#state-trigger">automation.state docs</a>)</li>
   <li>ZWave: Add reset service to meters (<a href="https://github.com/turbokongen">@turbokongen</a> - <a href="https://github.com/home-assistant/home-assistant/pull/7676">#7676</a>) (<a href="https://home-assistant.io/components/zwave/">zwave docs</a>)</li>
   <li>Remove defunct INSTALL_OPENZWAVE from Dockerfile (<a href="https://github.com/armills">@armills</a> - <a href="https://github.com/home-assistant/home-assistant/pull/7697">#7697</a>)</li>
   <li>Fix telegram chats (<a href="https://github.com/azogue">@azogue</a> - <a href="https://github.com/home-assistant/home-assistant/pull/7689">#7689</a>) (<a href="https://home-assistant.io/components/notify.telegram/">notify.telegram docs</a>)</li>
@@ -206,7 +206,7 @@
   <li>Allow ‘base_url’ (fixes #7784) (<a href="https://github.com/fabaff">@fabaff</a> - <a href="https://github.com/home-assistant/home-assistant/pull/7796">#7796</a>) (<a href="https://home-assistant.io/components/upnp/">upnp docs</a>)</li>
   <li>Expose the node name on the zwave node entity (<a href="https://github.com/armills">@armills</a> - <a href="https://github.com/home-assistant/home-assistant/pull/7787">#7787</a>) (<a href="https://home-assistant.io/components/zwave/">zwave docs</a>)</li>
   <li>Bumped pyhomematic version (<a href="https://github.com/danielperna84">@danielperna84</a> - <a href="https://github.com/home-assistant/home-assistant/pull/7861">#7861</a>) (<a href="https://home-assistant.io/components/homematic/">homematic docs</a>)</li>
-  <li>Rename time trigger ‘after’ to ‘at’ (<a href="https://github.com/armills">@armills</a> - <a href="https://github.com/home-assistant/home-assistant/pull/7846">#7846</a>) (<a href="https://home-assistant.io/components/automation.time/">automation.time docs</a>) (breaking change)</li>
+  <li>Rename time trigger ‘after’ to ‘at’ (<a href="https://github.com/armills">@armills</a> - <a href="https://github.com/home-assistant/home-assistant/pull/7846">#7846</a>) (<a href="https://home-assistant.io/docs/automation/trigger/#time-trigger">automation.time docs</a>) (breaking change)</li>
   <li>Use expected behvaior for above/below (<a href="https://github.com/armills">@armills</a> - <a href="https://github.com/home-assistant/home-assistant/pull/7857">#7857</a>) (breaking change)</li>
   <li>log time delay of domain setup in info level (<a href="https://github.com/azogue">@azogue</a> - <a href="https://github.com/home-assistant/home-assistant/pull/7808">#7808</a>)</li>
   <li>Optimize history_stats efficiency and database usage (<a href="https://github.com/bokub">@bokub</a> - <a href="https://github.com/home-assistant/home-assistant/pull/7858">#7858</a>) (<a href="https://home-assistant.io/components/sensor.history_stats/">sensor.history_stats docs</a>)</li>
diff --git a/blog/categories/announcements/atom.xml b/blog/categories/announcements/atom.xml
index 855e44f76d..02cc09c8c3 100644
--- a/blog/categories/announcements/atom.xml
+++ b/blog/categories/announcements/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Announcements | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/announcements/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2017-06-11T08:10:25+00:00</updated>
+  <updated>2017-06-11T10:36:55+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/community/atom.xml b/blog/categories/community/atom.xml
index 5717c3185e..3fb3c3bf3b 100644
--- a/blog/categories/community/atom.xml
+++ b/blog/categories/community/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Community | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/community/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2017-06-11T08:10:25+00:00</updated>
+  <updated>2017-06-11T10:36:55+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/device-tracking/atom.xml b/blog/categories/device-tracking/atom.xml
index 0cde53b3fd..3ad11a14bd 100644
--- a/blog/categories/device-tracking/atom.xml
+++ b/blog/categories/device-tracking/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Device-Tracking | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/device-tracking/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2017-06-11T08:10:25+00:00</updated>
+  <updated>2017-06-11T10:36:55+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/esp8266/atom.xml b/blog/categories/esp8266/atom.xml
index 98399368d4..1241c8c2ed 100644
--- a/blog/categories/esp8266/atom.xml
+++ b/blog/categories/esp8266/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: ESP8266 | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/esp8266/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2017-06-11T08:10:25+00:00</updated>
+  <updated>2017-06-11T10:36:55+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/how-to/atom.xml b/blog/categories/how-to/atom.xml
index 2c2e8811eb..4ff25f0714 100644
--- a/blog/categories/how-to/atom.xml
+++ b/blog/categories/how-to/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: How-To | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/how-to/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2017-06-11T08:10:25+00:00</updated>
+  <updated>2017-06-11T10:36:55+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/ibeacons/atom.xml b/blog/categories/ibeacons/atom.xml
index 1f0b32c68d..5a8d173442 100644
--- a/blog/categories/ibeacons/atom.xml
+++ b/blog/categories/ibeacons/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: iBeacons | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/ibeacons/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2017-06-11T08:10:25+00:00</updated>
+  <updated>2017-06-11T10:36:55+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/internet-of-things/atom.xml b/blog/categories/internet-of-things/atom.xml
index d022ddda6d..12d9caf959 100644
--- a/blog/categories/internet-of-things/atom.xml
+++ b/blog/categories/internet-of-things/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Internet-of-Things | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/internet-of-things/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2017-06-11T08:10:25+00:00</updated>
+  <updated>2017-06-11T10:36:55+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/iot-data/atom.xml b/blog/categories/iot-data/atom.xml
index 4b5ef18b46..a4feb85e2d 100644
--- a/blog/categories/iot-data/atom.xml
+++ b/blog/categories/iot-data/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: IoT-Data | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/iot-data/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2017-06-11T08:10:25+00:00</updated>
+  <updated>2017-06-11T10:36:55+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/media/atom.xml b/blog/categories/media/atom.xml
index b6cb760f66..af18d502b1 100644
--- a/blog/categories/media/atom.xml
+++ b/blog/categories/media/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Media | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/media/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2017-06-11T08:10:25+00:00</updated>
+  <updated>2017-06-11T10:36:55+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/merchandise/atom.xml b/blog/categories/merchandise/atom.xml
index 1e7719c1ea..a136e7c18b 100644
--- a/blog/categories/merchandise/atom.xml
+++ b/blog/categories/merchandise/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Merchandise | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/merchandise/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2017-06-11T08:10:25+00:00</updated>
+  <updated>2017-06-11T10:36:55+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/micropython/atom.xml b/blog/categories/micropython/atom.xml
index c67f2e42c8..6dd0553584 100644
--- a/blog/categories/micropython/atom.xml
+++ b/blog/categories/micropython/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Micropython | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/micropython/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2017-06-11T08:10:25+00:00</updated>
+  <updated>2017-06-11T10:36:55+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/mqtt/atom.xml b/blog/categories/mqtt/atom.xml
index d19eea1bb2..13ae29bbe5 100644
--- a/blog/categories/mqtt/atom.xml
+++ b/blog/categories/mqtt/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: MQTT | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/mqtt/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2017-06-11T08:10:25+00:00</updated>
+  <updated>2017-06-11T10:36:55+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/organisation/atom.xml b/blog/categories/organisation/atom.xml
index ad7cd3c6b6..764e034d53 100644
--- a/blog/categories/organisation/atom.xml
+++ b/blog/categories/organisation/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Organisation | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/organisation/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2017-06-11T08:10:25+00:00</updated>
+  <updated>2017-06-11T10:36:55+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/owntracks/atom.xml b/blog/categories/owntracks/atom.xml
index 4e8656184e..312bedd326 100644
--- a/blog/categories/owntracks/atom.xml
+++ b/blog/categories/owntracks/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: OwnTracks | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/owntracks/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2017-06-11T08:10:25+00:00</updated>
+  <updated>2017-06-11T10:36:55+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/presence-detection/atom.xml b/blog/categories/presence-detection/atom.xml
index aaae7707c8..e45d4618f9 100644
--- a/blog/categories/presence-detection/atom.xml
+++ b/blog/categories/presence-detection/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Presence-Detection | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/presence-detection/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2017-06-11T08:10:25+00:00</updated>
+  <updated>2017-06-11T10:36:55+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/public-service-announcement/atom.xml b/blog/categories/public-service-announcement/atom.xml
index b27f7dd3b7..3d6afb524f 100644
--- a/blog/categories/public-service-announcement/atom.xml
+++ b/blog/categories/public-service-announcement/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Public-Service-Announcement | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/public-service-announcement/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2017-06-11T08:10:25+00:00</updated>
+  <updated>2017-06-11T10:36:55+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/release-notes/atom.xml b/blog/categories/release-notes/atom.xml
index b9dce86b91..ff34c86f09 100644
--- a/blog/categories/release-notes/atom.xml
+++ b/blog/categories/release-notes/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Release-Notes | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/release-notes/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2017-06-11T08:10:25+00:00</updated>
+  <updated>2017-06-11T10:36:55+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
@@ -317,8 +317,8 @@ Experiencing issues introduced by this release? Please report them in our [issue
 [alarm_control_panel.concord232 docs]: https://home-assistant.io/components/alarm_control_panel.concord232/
 [apcupsd docs]: https://home-assistant.io/components/apcupsd/
 [arlo docs]: https://home-assistant.io/components/arlo/
-[automation.state docs]: https://home-assistant.io/components/automation.state/
-[automation.time docs]: https://home-assistant.io/components/automation.time/
+[automation.state docs]: https://home-assistant.io/docs/automation/trigger/#state-trigger
+[automation.time docs]: https://home-assistant.io/docs/automation/trigger/#time-trigger
 [calendar.demo docs]: https://home-assistant.io/components/calendar.demo/
 [calendar.google docs]: https://home-assistant.io/components/calendar.google/
 [camera.amcrest docs]: https://home-assistant.io/components/camera.amcrest/
diff --git a/blog/categories/survey/atom.xml b/blog/categories/survey/atom.xml
index 23f77c59a2..1a161918ef 100644
--- a/blog/categories/survey/atom.xml
+++ b/blog/categories/survey/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Survey | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/survey/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2017-06-11T08:10:25+00:00</updated>
+  <updated>2017-06-11T10:36:55+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/talks/atom.xml b/blog/categories/talks/atom.xml
index 5fa1056666..74faad5d1c 100644
--- a/blog/categories/talks/atom.xml
+++ b/blog/categories/talks/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Talks | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/talks/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2017-06-11T08:10:25+00:00</updated>
+  <updated>2017-06-11T10:36:55+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/technology/atom.xml b/blog/categories/technology/atom.xml
index f7a88c0a8a..c6d558f0c2 100644
--- a/blog/categories/technology/atom.xml
+++ b/blog/categories/technology/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Technology | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/technology/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2017-06-11T08:10:25+00:00</updated>
+  <updated>2017-06-11T10:36:55+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/user-stories/atom.xml b/blog/categories/user-stories/atom.xml
index c6fd9b3d4a..f271c884d2 100644
--- a/blog/categories/user-stories/atom.xml
+++ b/blog/categories/user-stories/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: User-Stories | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/user-stories/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2017-06-11T08:10:25+00:00</updated>
+  <updated>2017-06-11T10:36:55+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/video/atom.xml b/blog/categories/video/atom.xml
index cd74237776..a0546f69d5 100644
--- a/blog/categories/video/atom.xml
+++ b/blog/categories/video/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Video | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/video/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2017-06-11T08:10:25+00:00</updated>
+  <updated>2017-06-11T10:36:55+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/website/atom.xml b/blog/categories/website/atom.xml
index e606089a66..f3fb9082ad 100644
--- a/blog/categories/website/atom.xml
+++ b/blog/categories/website/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Website | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/website/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2017-06-11T08:10:25+00:00</updated>
+  <updated>2017-06-11T10:36:55+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/index.html b/blog/index.html
index 0d1d7af40f..9e68255828 100644
--- a/blog/index.html
+++ b/blog/index.html
@@ -130,7 +130,7 @@
 <h2><a class="title-link" name="breaking-changes" href="#breaking-changes"></a> Breaking changes</h2>
 <ul>
   <li>The USPS sensor entity names have changed as there are now two. One for packages and one for mail. Config will now also use <code class="highlighter-rouge">scan_interval</code> instead of <code class="highlighter-rouge">update_interval</code>  (<a href="https://github.com/happyleavesaoc">@happyleavesaoc</a> - <a href="https://github.com/home-assistant/home-assistant/pull/7655">#7655</a>) (<a href="https://home-assistant.io/components/sensor.usps/">sensor.usps docs</a>) (breaking change)</li>
-  <li>Automation state trigger: From/to checks will now ignore state changes that are just attribute changess (<a href="https://github.com/amelchio">@amelchio</a> - <a href="https://github.com/home-assistant/home-assistant/pull/7651">#7651</a>) (<a href="https://home-assistant.io/components/automation.state/">automation.state docs</a>) (breaking change)</li>
+  <li>Automation state trigger: From/to checks will now ignore state changes that are just attribute changess (<a href="https://github.com/amelchio">@amelchio</a> - <a href="https://github.com/home-assistant/home-assistant/pull/7651">#7651</a>) (<a href="https://home-assistant.io/docs/automation/trigger/#state-trigger">automation.state docs</a>) (breaking change)</li>
   <li>Redesign monitored variables for hp_ilo sensor. <code class="highlighter-rouge">monitored_variables</code> is now a list of <code class="highlighter-rouge">name</code> and <code class="highlighter-rouge">sensor_type</code> values (<a href="https://github.com/Juggels">@Juggels</a> - <a href="https://github.com/home-assistant/home-assistant/pull/7534">#7534</a>) (<a href="https://home-assistant.io/components/sensor.hp_ilo/">sensor.hp_ilo docs</a>) (breaking change)</li>
 </ul>
 <div class="language-yaml highlighter-rouge"><pre class="highlight"><code><span class="s">sensor</span><span class="pi">:</span>
@@ -144,7 +144,7 @@
 </code></pre>
 </div>
 <ul>
-  <li>Automation - time: The <code class="highlighter-rouge">after</code> keyword for time triggers (not conditions) has been deprecated in favor of the <code class="highlighter-rouge">at</code> keyword. This resembles better what it does (old one still works, gives a warning) (<a href="https://github.com/armills">@armills</a> - <a href="https://github.com/home-assistant/home-assistant/pull/7846">#7846</a>) (<a href="https://home-assistant.io/components/automation.time/">automation.time docs</a>) (breaking change)</li>
+  <li>Automation - time: The <code class="highlighter-rouge">after</code> keyword for time triggers (not conditions) has been deprecated in favor of the <code class="highlighter-rouge">at</code> keyword. This resembles better what it does (old one still works, gives a warning) (<a href="https://github.com/armills">@armills</a> - <a href="https://github.com/home-assistant/home-assistant/pull/7846">#7846</a>) (<a href="https://home-assistant.io/docs/automation/trigger/#time-trigger">automation.time docs</a>) (breaking change)</li>
   <li>Automation - numeric_state: <code class="highlighter-rouge">above</code> and <code class="highlighter-rouge">below</code> will no longer trigger if it is equal. (<a href="https://github.com/armills">@armills</a> - <a href="https://github.com/home-assistant/home-assistant/pull/7857">#7857</a>) (breaking change)</li>
   <li>Broadlink switches: Entity ids will change for switches that don’t have a default name set. In this case the object_id is now used. (<a href="https://github.com/abmantis">@abmantis</a> - <a href="https://github.com/home-assistant/home-assistant/pull/7845">#7845</a>) (<a href="https://home-assistant.io/components/switch.broadlink/">switch.broadlink docs</a>) (breaking change)</li>
   <li>Disallow ambiguous color descriptors in the light.turn_on schema. This means that you can no longer specify both <code class="highlighter-rouge">xy_color</code> and <code class="highlighter-rouge">rgb_color</code>. (<a href="https://github.com/amelchio">@amelchio</a> - <a href="https://github.com/home-assistant/home-assistant/pull/7765">#7765</a>) (breaking change)</li>
diff --git a/docs/configuration/securing/index.html b/docs/configuration/securing/index.html
index bc01de2522..2d5a2dd262 100644
--- a/docs/configuration/securing/index.html
+++ b/docs/configuration/securing/index.html
@@ -78,7 +78,7 @@
 </ul>
 <p>If you want to allow remote access, consider these additional points:</p>
 <ul>
-  <li>Protect your communication with <a href="/ecosystem/certificates/lets_encrypt/">TLS/SSL</a></li>
+  <li>Protect your communication with <a href="/docs/ecosystem/certificates/lets_encrypt/">TLS/SSL</a></li>
   <li>Protect your communication with <a href="/cookbook/tor_configuration/">Tor</a></li>
   <li>Protect your communication with a <a href="/cookbook/tls_self_signed_certificate/">self-signed certificate</a></li>
   <li>Use a <a href="/cookbook/apache_configuration/">proxy</a></li>
diff --git a/sitemap.xml b/sitemap.xml
index 84f66c438e..6c4698ee82 100644
--- a/sitemap.xml
+++ b/sitemap.xml
@@ -3505,62 +3505,62 @@
 </url>
 <url>
 <loc>https://home-assistant.io/demo/frontend.html</loc>
-<lastmod>2017-06-11T08:09:26+00:00</lastmod>
+<lastmod>2017-06-11T10:35:19+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/index.html</loc>
-<lastmod>2017-06-11T08:09:26+00:00</lastmod>
+<lastmod>2017-06-11T10:35:19+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-dev-event.html</loc>
-<lastmod>2017-06-11T08:09:26+00:00</lastmod>
+<lastmod>2017-06-11T10:35:19+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-dev-info.html</loc>
-<lastmod>2017-06-11T08:09:26+00:00</lastmod>
+<lastmod>2017-06-11T10:35:19+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-dev-service.html</loc>
-<lastmod>2017-06-11T08:09:26+00:00</lastmod>
+<lastmod>2017-06-11T10:35:19+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-dev-state.html</loc>
-<lastmod>2017-06-11T08:09:26+00:00</lastmod>
+<lastmod>2017-06-11T10:35:19+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-dev-template.html</loc>
-<lastmod>2017-06-11T08:09:26+00:00</lastmod>
+<lastmod>2017-06-11T10:35:19+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-history.html</loc>
-<lastmod>2017-06-11T08:09:26+00:00</lastmod>
+<lastmod>2017-06-11T10:35:19+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-iframe.html</loc>
-<lastmod>2017-06-11T08:09:26+00:00</lastmod>
+<lastmod>2017-06-11T10:35:19+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-logbook.html</loc>
-<lastmod>2017-06-11T08:09:26+00:00</lastmod>
+<lastmod>2017-06-11T10:35:19+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-map.html</loc>
-<lastmod>2017-06-11T08:09:26+00:00</lastmod>
+<lastmod>2017-06-11T10:35:19+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/googlef4f3693c209fe788.html</loc>
-<lastmod>2017-06-11T08:09:26+00:00</lastmod>
+<lastmod>2017-06-11T10:35:19+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/static/fonts/roboto/DESCRIPTION.en_us.html</loc>
-<lastmod>2017-06-11T08:09:26+00:00</lastmod>
+<lastmod>2017-06-11T10:35:19+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/static/fonts/robotomono/DESCRIPTION.en_us.html</loc>
-<lastmod>2017-06-11T08:09:26+00:00</lastmod>
+<lastmod>2017-06-11T10:35:19+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/static/mdi-demo.html</loc>
-<lastmod>2017-06-11T08:09:26+00:00</lastmod>
+<lastmod>2017-06-11T10:35:19+00:00</lastmod>
 </url>
 </urlset>