diff --git a/atom.xml b/atom.xml
index c8f2f7b942..c02e3b20bb 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-10-09T13:58:12+00:00</updated>
+  <updated>2017-10-09T17:19:57+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/announcements/atom.xml b/blog/categories/announcements/atom.xml
index 99aea8f3d9..21091e1bcd 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-10-09T13:58:12+00:00</updated>
+  <updated>2017-10-09T17:19:57+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 636019a12a..1f09bdd5c3 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-10-09T13:58:12+00:00</updated>
+  <updated>2017-10-09T17:19:57+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 4e88e2f4c5..41e1594d4e 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-10-09T13:58:12+00:00</updated>
+  <updated>2017-10-09T17:19:57+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 6e0fe5594c..7192ec39b9 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-10-09T13:58:12+00:00</updated>
+  <updated>2017-10-09T17:19:57+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 8fdba66d2d..23f2304b5e 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-10-09T13:58:12+00:00</updated>
+  <updated>2017-10-09T17:19:57+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 1820388c8a..4cea829a27 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-10-09T13:58:12+00:00</updated>
+  <updated>2017-10-09T17:19:57+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 ab1b0ba511..3e7ca94558 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-10-09T13:58:12+00:00</updated>
+  <updated>2017-10-09T17:19:57+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 37577fc1d5..8374af90fc 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-10-09T13:58:12+00:00</updated>
+  <updated>2017-10-09T17:19:57+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 a81a8e4d93..73d4459e36 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-10-09T13:58:12+00:00</updated>
+  <updated>2017-10-09T17:19:57+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 e0df5e8c4b..16de41b8d0 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-10-09T13:58:12+00:00</updated>
+  <updated>2017-10-09T17:19:57+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 fe62008ab8..818b98e407 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-10-09T13:58:12+00:00</updated>
+  <updated>2017-10-09T17:19:57+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 99ccd8f600..926dce00ea 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-10-09T13:58:12+00:00</updated>
+  <updated>2017-10-09T17:19:57+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 224cf637d1..0b31238520 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-10-09T13:58:12+00:00</updated>
+  <updated>2017-10-09T17:19:57+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 9b90f65acc..6e995df962 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-10-09T13:58:12+00:00</updated>
+  <updated>2017-10-09T17:19:57+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 e920e768dd..c7f35e0cd2 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-10-09T13:58:12+00:00</updated>
+  <updated>2017-10-09T17:19:57+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 66edb7abe6..d4703d28c2 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-10-09T13:58:12+00:00</updated>
+  <updated>2017-10-09T17:19:57+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 9b817ba31e..21731cace4 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-10-09T13:58:12+00:00</updated>
+  <updated>2017-10-09T17:19:57+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/survey/atom.xml b/blog/categories/survey/atom.xml
index f3b9eeabb3..a41cd6c8ea 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-10-09T13:58:12+00:00</updated>
+  <updated>2017-10-09T17:19:57+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 0dc7477361..886b384c22 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-10-09T13:58:12+00:00</updated>
+  <updated>2017-10-09T17:19:57+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 143de46b64..b7559bc213 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-10-09T13:58:12+00:00</updated>
+  <updated>2017-10-09T17:19:57+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 32056e6ed3..a03f2689fd 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-10-09T13:58:12+00:00</updated>
+  <updated>2017-10-09T17:19:57+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 2fc526ff43..5c3a10a70a 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-10-09T13:58:12+00:00</updated>
+  <updated>2017-10-09T17:19:57+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 5716f8d726..fa637b27c3 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-10-09T13:58:12+00:00</updated>
+  <updated>2017-10-09T17:19:57+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/docs/asterisk_mbox/index.html b/docs/asterisk_mbox/index.html
index be094cd254..de9bc8ffb0 100644
--- a/docs/asterisk_mbox/index.html
+++ b/docs/asterisk_mbox/index.html
@@ -173,7 +173,8 @@ This assumes that your Asterisk PBX server is using <code class="highlighter-rou
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b>
+        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
         <b><a  href='/docs/installation/'>Installation </a></b>
diff --git a/docs/automation/action/index.html b/docs/automation/action/index.html
index 30c61ee858..599312eed0 100644
--- a/docs/automation/action/index.html
+++ b/docs/automation/action/index.html
@@ -138,7 +138,8 @@
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b>
+        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
         <b><a  href='/docs/installation/'>Installation </a></b>
diff --git a/docs/automation/condition/index.html b/docs/automation/condition/index.html
index 6f74fa1597..e8168459d0 100644
--- a/docs/automation/condition/index.html
+++ b/docs/automation/condition/index.html
@@ -104,7 +104,8 @@
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b>
+        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
         <b><a  href='/docs/installation/'>Installation </a></b>
diff --git a/docs/automation/editor/index.html b/docs/automation/editor/index.html
index 8bceda0f16..c856a95d87 100644
--- a/docs/automation/editor/index.html
+++ b/docs/automation/editor/index.html
@@ -140,7 +140,8 @@ Any comments in the YAML file will be lost when you update an automation via the
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b>
+        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
         <b><a  href='/docs/installation/'>Installation </a></b>
diff --git a/docs/automation/examples/index.html b/docs/automation/examples/index.html
index 82c845e5e3..06ee46fe7f 100644
--- a/docs/automation/examples/index.html
+++ b/docs/automation/examples/index.html
@@ -138,7 +138,8 @@
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b>
+        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
         <b><a  href='/docs/installation/'>Installation </a></b>
diff --git a/docs/automation/index.html b/docs/automation/index.html
index b0463ebf9b..fcacbb6785 100644
--- a/docs/automation/index.html
+++ b/docs/automation/index.html
@@ -138,7 +138,8 @@ As of version 0.42 you have to set an initial state in your automations in order
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b>
+        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
         <b><a  href='/docs/installation/'>Installation </a></b>
diff --git a/docs/automation/templating/index.html b/docs/automation/templating/index.html
index f036bfffa7..5764899849 100644
--- a/docs/automation/templating/index.html
+++ b/docs/automation/templating/index.html
@@ -342,7 +342,8 @@
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b>
+        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
         <b><a  href='/docs/installation/'>Installation </a></b>
diff --git a/docs/automation/trigger/index.html b/docs/automation/trigger/index.html
index ea7e6501cc..4584caf722 100644
--- a/docs/automation/trigger/index.html
+++ b/docs/automation/trigger/index.html
@@ -249,7 +249,8 @@ With template triggers you can also evaluate attribute changes by using is_state
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b>
+        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
         <b><a  href='/docs/installation/'>Installation </a></b>
diff --git a/docs/automation/troubleshooting/index.html b/docs/automation/troubleshooting/index.html
index a401ec7c07..c1d8c57c4e 100644
--- a/docs/automation/troubleshooting/index.html
+++ b/docs/automation/troubleshooting/index.html
@@ -93,7 +93,8 @@ INFO [homeassistant.components.automation] Initialized rule Rain is over
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b>
+        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
         <b><a  href='/docs/installation/'>Installation </a></b>
diff --git a/docs/autostart/index.html b/docs/autostart/index.html
index f4b34ee0ff..ce84a2b18d 100644
--- a/docs/autostart/index.html
+++ b/docs/autostart/index.html
@@ -92,7 +92,8 @@
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b>
+        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
         <b><a  href='/docs/installation/'>Installation </a></b>
diff --git a/docs/autostart/init.d/index.html b/docs/autostart/init.d/index.html
index 228f05be51..612f03c993 100644
--- a/docs/autostart/init.d/index.html
+++ b/docs/autostart/init.d/index.html
@@ -193,7 +193,8 @@ esac
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b>
+        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
         <b><a  href='/docs/installation/'>Installation </a></b>
diff --git a/docs/autostart/macos/index.html b/docs/autostart/macos/index.html
index 1ae69ba98f..29abac5666 100644
--- a/docs/autostart/macos/index.html
+++ b/docs/autostart/macos/index.html
@@ -98,7 +98,8 @@ Home Assistant has been uninstalled.
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b>
+        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
         <b><a  href='/docs/installation/'>Installation </a></b>
diff --git a/docs/autostart/synology/index.html b/docs/autostart/synology/index.html
index daeb057e34..d295b3d2aa 100644
--- a/docs/autostart/synology/index.html
+++ b/docs/autostart/synology/index.html
@@ -113,7 +113,8 @@ stop on runlevel <span class="o">[</span>06]
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b>
+        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
         <b><a  href='/docs/installation/'>Installation </a></b>
diff --git a/docs/autostart/systemd/index.html b/docs/autostart/systemd/index.html
index 5f701afcfb..b704bde24a 100644
--- a/docs/autostart/systemd/index.html
+++ b/docs/autostart/systemd/index.html
@@ -179,7 +179,8 @@ WantedBy=multi-user.target
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b>
+        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
         <b><a  href='/docs/installation/'>Installation </a></b>
diff --git a/docs/autostart/upstart/index.html b/docs/autostart/upstart/index.html
index e01bad4b38..5ef6f8558e 100644
--- a/docs/autostart/upstart/index.html
+++ b/docs/autostart/upstart/index.html
@@ -202,7 +202,8 @@ esac
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b>
+        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
         <b><a  href='/docs/installation/'>Installation </a></b>
diff --git a/docs/backend/database/index.html b/docs/backend/database/index.html
index 4eac7a127b..5940863596 100644
--- a/docs/backend/database/index.html
+++ b/docs/backend/database/index.html
@@ -178,7 +178,8 @@ group.all_switches              8018
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b>
+        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
         <b><a  href='/docs/installation/'>Installation </a></b>
diff --git a/docs/backend/index.html b/docs/backend/index.html
index 1f1f640443..6dbbf50393 100644
--- a/docs/backend/index.html
+++ b/docs/backend/index.html
@@ -87,7 +87,8 @@
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b>
+        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
         <b><a  href='/docs/installation/'>Installation </a></b>
diff --git a/docs/backend/updater/index.html b/docs/backend/updater/index.html
index 636ec79239..377f062346 100644
--- a/docs/backend/updater/index.html
+++ b/docs/backend/updater/index.html
@@ -249,7 +249,8 @@
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b>
+        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
         <b><a  href='/docs/installation/'>Installation </a></b>
diff --git a/docs/configuration/basic/index.html b/docs/configuration/basic/index.html
index d9380469e6..ccba48c98c 100644
--- a/docs/configuration/basic/index.html
+++ b/docs/configuration/basic/index.html
@@ -117,7 +117,8 @@ If you decide to expose your Home Assistant instance to the internet and forget
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b>
+        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
         <b><a  href='/docs/installation/'>Installation </a></b>
diff --git a/docs/configuration/customizing-devices/index.html b/docs/configuration/customizing-devices/index.html
index 344f01e0ff..8586d1b05d 100644
--- a/docs/configuration/customizing-devices/index.html
+++ b/docs/configuration/customizing-devices/index.html
@@ -190,7 +190,8 @@ New customize information will be applied the next time the state of the entity
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b>
+        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
         <b><a  href='/docs/installation/'>Installation </a></b>
diff --git a/docs/configuration/devices/index.html b/docs/configuration/devices/index.html
index 0376e88f03..eae5b34cbe 100644
--- a/docs/configuration/devices/index.html
+++ b/docs/configuration/devices/index.html
@@ -130,7 +130,8 @@ Each group consists of a name and a list of entity IDs. Entity IDs can be retrie
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b>
+        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
         <b><a  href='/docs/installation/'>Installation </a></b>
diff --git a/docs/configuration/events/index.html b/docs/configuration/events/index.html
index 46de612629..10ebb1e02b 100644
--- a/docs/configuration/events/index.html
+++ b/docs/configuration/events/index.html
@@ -230,7 +230,8 @@
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b>
+        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
         <b><a  href='/docs/installation/'>Installation </a></b>
diff --git a/docs/configuration/group_visibility/index.html b/docs/configuration/group_visibility/index.html
index 80f0d56bf0..1350237bef 100644
--- a/docs/configuration/group_visibility/index.html
+++ b/docs/configuration/group_visibility/index.html
@@ -235,7 +235,8 @@ If you are using docker to run Home Assistant then the occasion.py script will b
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b>
+        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
         <b><a  href='/docs/installation/'>Installation </a></b>
diff --git a/docs/configuration/index.html b/docs/configuration/index.html
index b90b72c059..128d453af7 100644
--- a/docs/configuration/index.html
+++ b/docs/configuration/index.html
@@ -117,7 +117,8 @@
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b>
+        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
         <b><a  href='/docs/installation/'>Installation </a></b>
diff --git a/docs/configuration/packages/index.html b/docs/configuration/packages/index.html
index 37ae92fe01..bec440c898 100644
--- a/docs/configuration/packages/index.html
+++ b/docs/configuration/packages/index.html
@@ -149,7 +149,8 @@ See the documentation about <a href="/docs/configuration/splitting_configuration
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b>
+        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
         <b><a  href='/docs/installation/'>Installation </a></b>
diff --git a/docs/configuration/platform_options/index.html b/docs/configuration/platform_options/index.html
index 80250e52b7..394e658914 100644
--- a/docs/configuration/platform_options/index.html
+++ b/docs/configuration/platform_options/index.html
@@ -101,7 +101,8 @@
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b>
+        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
         <b><a  href='/docs/installation/'>Installation </a></b>
diff --git a/docs/configuration/remote/index.html b/docs/configuration/remote/index.html
index 8378c4f1ed..c39c9ac872 100644
--- a/docs/configuration/remote/index.html
+++ b/docs/configuration/remote/index.html
@@ -90,7 +90,8 @@
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b>
+        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
         <b><a  href='/docs/installation/'>Installation </a></b>
diff --git a/docs/configuration/secrets/index.html b/docs/configuration/secrets/index.html
index 734130eab7..6275ed34d8 100644
--- a/docs/configuration/secrets/index.html
+++ b/docs/configuration/secrets/index.html
@@ -157,7 +157,8 @@ Please enter password <span class="k">for </span>encrypted keyring:
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b>
+        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
         <b><a  href='/docs/installation/'>Installation </a></b>
diff --git a/docs/configuration/securing/index.html b/docs/configuration/securing/index.html
index 935e76d3cf..213c83cf21 100644
--- a/docs/configuration/securing/index.html
+++ b/docs/configuration/securing/index.html
@@ -100,7 +100,8 @@
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b>
+        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
         <b><a  href='/docs/installation/'>Installation </a></b>
diff --git a/docs/configuration/splitting_configuration/index.html b/docs/configuration/splitting_configuration/index.html
index ee5eb8009d..381e3b6e68 100644
--- a/docs/configuration/splitting_configuration/index.html
+++ b/docs/configuration/splitting_configuration/index.html
@@ -449,7 +449,8 @@ the -id: line must be removed from each of the split files.</p>
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b>
+        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
         <b><a  href='/docs/installation/'>Installation </a></b>
diff --git a/docs/configuration/state_object/index.html b/docs/configuration/state_object/index.html
index 497ff24772..8caf5fe0e9 100644
--- a/docs/configuration/state_object/index.html
+++ b/docs/configuration/state_object/index.html
@@ -166,7 +166,8 @@
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b>
+        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
         <b><a  href='/docs/installation/'>Installation </a></b>
diff --git a/docs/configuration/templating/index.html b/docs/configuration/templating/index.html
index a6d1dd40ef..a2c4eebf73 100644
--- a/docs/configuration/templating/index.html
+++ b/docs/configuration/templating/index.html
@@ -304,7 +304,8 @@ Closest to an entity: {{ closest(states.zone.school, 'group.children') }}
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b>
+        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
         <b><a  href='/docs/installation/'>Installation </a></b>
diff --git a/docs/configuration/troubleshooting/index.html b/docs/configuration/troubleshooting/index.html
index 3b5471dee3..49a1ba4a32 100644
--- a/docs/configuration/troubleshooting/index.html
+++ b/docs/configuration/troubleshooting/index.html
@@ -138,7 +138,8 @@ Whenever you report an issue, be aware that we are volunteers who do not have ac
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b>
+        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
         <b><a  href='/docs/installation/'>Installation </a></b>
diff --git a/docs/configuration/yaml/index.html b/docs/configuration/yaml/index.html
index 1cd84075de..b6e2432807 100644
--- a/docs/configuration/yaml/index.html
+++ b/docs/configuration/yaml/index.html
@@ -139,7 +139,8 @@ The other properties (like name) are specified using mappings. Note that the sec
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b>
+        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
         <b><a  href='/docs/installation/'>Installation </a></b>
diff --git a/docs/ecosystem/apache/index.html b/docs/ecosystem/apache/index.html
index c1822a7b46..c23f17f683 100644
--- a/docs/ecosystem/apache/index.html
+++ b/docs/ecosystem/apache/index.html
@@ -167,7 +167,8 @@ In case you are getting occasional HTTP 504 error messages (“Gateway Timeout
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b>
+        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
         <b><a  href='/docs/installation/'>Installation </a></b>
diff --git a/docs/ecosystem/appdaemon/api/index.html b/docs/ecosystem/appdaemon/api/index.html
index 4fbeef2fa0..b301f6bb79 100644
--- a/docs/ecosystem/appdaemon/api/index.html
+++ b/docs/ecosystem/appdaemon/api/index.html
@@ -1443,7 +1443,8 @@
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b>
+        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
         <b><a  href='/docs/installation/'>Installation </a></b>
diff --git a/docs/ecosystem/appdaemon/configuration/index.html b/docs/ecosystem/appdaemon/configuration/index.html
index 7430c5343b..7513da24a6 100644
--- a/docs/ecosystem/appdaemon/configuration/index.html
+++ b/docs/ecosystem/appdaemon/configuration/index.html
@@ -142,7 +142,8 @@ timezone = &lt;timezone&gt;
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b>
+        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
         <b><a  href='/docs/installation/'>Installation </a></b>
diff --git a/docs/ecosystem/appdaemon/example_apps/index.html b/docs/ecosystem/appdaemon/example_apps/index.html
index 1733b18344..9c193d24b0 100644
--- a/docs/ecosystem/appdaemon/example_apps/index.html
+++ b/docs/ecosystem/appdaemon/example_apps/index.html
@@ -85,7 +85,8 @@
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b>
+        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
         <b><a  href='/docs/installation/'>Installation </a></b>
diff --git a/docs/ecosystem/appdaemon/index.html b/docs/ecosystem/appdaemon/index.html
index f216a3b822..882004730a 100644
--- a/docs/ecosystem/appdaemon/index.html
+++ b/docs/ecosystem/appdaemon/index.html
@@ -165,7 +165,8 @@
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b>
+        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
         <b><a  href='/docs/installation/'>Installation </a></b>
diff --git a/docs/ecosystem/appdaemon/installation/index.html b/docs/ecosystem/appdaemon/installation/index.html
index af4fa8e367..b4f058a561 100644
--- a/docs/ecosystem/appdaemon/installation/index.html
+++ b/docs/ecosystem/appdaemon/installation/index.html
@@ -86,7 +86,8 @@
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b>
+        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
         <b><a  href='/docs/installation/'>Installation </a></b>
diff --git a/docs/ecosystem/appdaemon/operation/index.html b/docs/ecosystem/appdaemon/operation/index.html
index 98855b282b..4e03a2aa72 100644
--- a/docs/ecosystem/appdaemon/operation/index.html
+++ b/docs/ecosystem/appdaemon/operation/index.html
@@ -85,7 +85,8 @@
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b>
+        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
         <b><a  href='/docs/installation/'>Installation </a></b>
diff --git a/docs/ecosystem/appdaemon/reboot/index.html b/docs/ecosystem/appdaemon/reboot/index.html
index 283b906ca1..37ab0601f5 100644
--- a/docs/ecosystem/appdaemon/reboot/index.html
+++ b/docs/ecosystem/appdaemon/reboot/index.html
@@ -85,7 +85,8 @@
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b>
+        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
         <b><a  href='/docs/installation/'>Installation </a></b>
diff --git a/docs/ecosystem/appdaemon/running/index.html b/docs/ecosystem/appdaemon/running/index.html
index c3ed14bbe2..6ba9bf10a7 100644
--- a/docs/ecosystem/appdaemon/running/index.html
+++ b/docs/ecosystem/appdaemon/running/index.html
@@ -147,7 +147,8 @@ optional arguments:
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b>
+        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
         <b><a  href='/docs/installation/'>Installation </a></b>
diff --git a/docs/ecosystem/appdaemon/tutorial/index.html b/docs/ecosystem/appdaemon/tutorial/index.html
index c67143354c..07feb3e1f8 100644
--- a/docs/ecosystem/appdaemon/tutorial/index.html
+++ b/docs/ecosystem/appdaemon/tutorial/index.html
@@ -178,7 +178,8 @@
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b>
+        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
         <b><a  href='/docs/installation/'>Installation </a></b>
diff --git a/docs/ecosystem/appdaemon/updating/index.html b/docs/ecosystem/appdaemon/updating/index.html
index 59a8a6e148..e20d19ac10 100644
--- a/docs/ecosystem/appdaemon/updating/index.html
+++ b/docs/ecosystem/appdaemon/updating/index.html
@@ -89,7 +89,8 @@
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b>
+        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
         <b><a  href='/docs/installation/'>Installation </a></b>
diff --git a/docs/ecosystem/appdaemon/windows/index.html b/docs/ecosystem/appdaemon/windows/index.html
index 12a106aae0..ca2e264d08 100644
--- a/docs/ecosystem/appdaemon/windows/index.html
+++ b/docs/ecosystem/appdaemon/windows/index.html
@@ -92,7 +92,8 @@
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b>
+        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
         <b><a  href='/docs/installation/'>Installation </a></b>
diff --git a/docs/ecosystem/backup/backup_dropbox/index.html b/docs/ecosystem/backup/backup_dropbox/index.html
index c974b3183d..1ee75c63b6 100644
--- a/docs/ecosystem/backup/backup_dropbox/index.html
+++ b/docs/ecosystem/backup/backup_dropbox/index.html
@@ -113,7 +113,8 @@ Add it to your crontab, edit the <strong>path/to</strong> part.</p>
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b>
+        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
         <b><a  href='/docs/installation/'>Installation </a></b>
diff --git a/docs/ecosystem/backup/backup_github/index.html b/docs/ecosystem/backup/backup_github/index.html
index a4174e8a54..226d2f5e73 100644
--- a/docs/ecosystem/backup/backup_github/index.html
+++ b/docs/ecosystem/backup/backup_github/index.html
@@ -233,7 +233,8 @@ no changes added to commit <span class="o">(</span>use <span class="s2">"git add
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b>
+        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
         <b><a  href='/docs/installation/'>Installation </a></b>
diff --git a/docs/ecosystem/backup/backup_usb/index.html b/docs/ecosystem/backup/backup_usb/index.html
index 46cc85b236..525b1f372d 100644
--- a/docs/ecosystem/backup/backup_usb/index.html
+++ b/docs/ecosystem/backup/backup_usb/index.html
@@ -164,7 +164,8 @@ Change below path to where you placed the <code class="highlighter-rouge">usb_ba
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b>
+        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
         <b><a  href='/docs/installation/'>Installation </a></b>
diff --git a/docs/ecosystem/caddy/index.html b/docs/ecosystem/caddy/index.html
index ccab3c7c95..cb308dc2c4 100644
--- a/docs/ecosystem/caddy/index.html
+++ b/docs/ecosystem/caddy/index.html
@@ -93,7 +93,8 @@
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b>
+        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
         <b><a  href='/docs/installation/'>Installation </a></b>
diff --git a/docs/ecosystem/certificates/index.html b/docs/ecosystem/certificates/index.html
index 2c8cce5e7b..ef953bf87e 100644
--- a/docs/ecosystem/certificates/index.html
+++ b/docs/ecosystem/certificates/index.html
@@ -86,7 +86,8 @@
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b>
+        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
         <b><a  href='/docs/installation/'>Installation </a></b>
diff --git a/docs/ecosystem/certificates/lets_encrypt/index.html b/docs/ecosystem/certificates/lets_encrypt/index.html
index 8270b8ae9b..a1006c235e 100644
--- a/docs/ecosystem/certificates/lets_encrypt/index.html
+++ b/docs/ecosystem/certificates/lets_encrypt/index.html
@@ -471,7 +471,8 @@ In cases where, for whatever reason, apt-get installing is not appropriate for y
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b>
+        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
         <b><a  href='/docs/installation/'>Installation </a></b>
diff --git a/docs/ecosystem/certificates/tls_domain_certificate/index.html b/docs/ecosystem/certificates/tls_domain_certificate/index.html
index eb483a9357..d4e06b18e3 100644
--- a/docs/ecosystem/certificates/tls_domain_certificate/index.html
+++ b/docs/ecosystem/certificates/tls_domain_certificate/index.html
@@ -135,7 +135,8 @@ Press Enter to Continue
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b>
+        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
         <b><a  href='/docs/installation/'>Installation </a></b>
diff --git a/docs/ecosystem/certificates/tls_self_signed_certificate/index.html b/docs/ecosystem/certificates/tls_self_signed_certificate/index.html
index 03258970b6..8a10474b99 100644
--- a/docs/ecosystem/certificates/tls_self_signed_certificate/index.html
+++ b/docs/ecosystem/certificates/tls_self_signed_certificate/index.html
@@ -110,7 +110,8 @@ The solution is to use a self-signed certificate. As you most likely don’t hav
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b>
+        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
         <b><a  href='/docs/installation/'>Installation </a></b>
diff --git a/docs/ecosystem/hadashboard/index.html b/docs/ecosystem/hadashboard/index.html
index 83269eb7bc..773ff8841e 100644
--- a/docs/ecosystem/hadashboard/index.html
+++ b/docs/ecosystem/hadashboard/index.html
@@ -106,7 +106,8 @@
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b>
+        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
         <b><a  href='/docs/installation/'>Installation </a></b>
diff --git a/docs/ecosystem/hass-configurator/index.html b/docs/ecosystem/hass-configurator/index.html
index ca87d0540f..3cdf60bffb 100644
--- a/docs/ecosystem/hass-configurator/index.html
+++ b/docs/ecosystem/hass-configurator/index.html
@@ -185,7 +185,8 @@ To resume the screen session, log in to your machine and execute <code class="hi
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b>
+        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
         <b><a  href='/docs/installation/'>Installation </a></b>
diff --git a/docs/ecosystem/index.html b/docs/ecosystem/index.html
index 5d25bb3d6a..b48ced5452 100644
--- a/docs/ecosystem/index.html
+++ b/docs/ecosystem/index.html
@@ -85,7 +85,8 @@
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b>
+        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
         <b><a  href='/docs/installation/'>Installation </a></b>
diff --git a/docs/ecosystem/ios/devices_file/index.html b/docs/ecosystem/ios/devices_file/index.html
index 57fdc0a648..065324bfda 100644
--- a/docs/ecosystem/ios/devices_file/index.html
+++ b/docs/ecosystem/ios/devices_file/index.html
@@ -85,7 +85,8 @@
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b>
+        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
         <b><a  href='/docs/installation/'>Installation </a></b>
diff --git a/docs/ecosystem/ios/index.html b/docs/ecosystem/ios/index.html
index 3dedd1e93b..8a482b3c0d 100644
--- a/docs/ecosystem/ios/index.html
+++ b/docs/ecosystem/ios/index.html
@@ -120,7 +120,8 @@
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b>
+        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
         <b><a  href='/docs/installation/'>Installation </a></b>
diff --git a/docs/ecosystem/ios/integration/index.html b/docs/ecosystem/ios/integration/index.html
index c5f4003b39..631812cc62 100644
--- a/docs/ecosystem/ios/integration/index.html
+++ b/docs/ecosystem/ios/integration/index.html
@@ -93,7 +93,8 @@
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b>
+        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
         <b><a  href='/docs/installation/'>Installation </a></b>
diff --git a/docs/ecosystem/ios/location/index.html b/docs/ecosystem/ios/location/index.html
index f356b41aa5..3a22307bff 100644
--- a/docs/ecosystem/ios/location/index.html
+++ b/docs/ecosystem/ios/location/index.html
@@ -113,7 +113,8 @@
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b>
+        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
         <b><a  href='/docs/installation/'>Installation </a></b>
diff --git a/docs/ecosystem/ios/notifications/actions/index.html b/docs/ecosystem/ios/notifications/actions/index.html
index e6890a2710..0ed4947cfc 100644
--- a/docs/ecosystem/ios/notifications/actions/index.html
+++ b/docs/ecosystem/ios/notifications/actions/index.html
@@ -206,7 +206,8 @@
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b>
+        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
         <b><a  href='/docs/installation/'>Installation </a></b>
diff --git a/docs/ecosystem/ios/notifications/architecture/index.html b/docs/ecosystem/ios/notifications/architecture/index.html
index 4491014e48..368f3f82bf 100644
--- a/docs/ecosystem/ios/notifications/architecture/index.html
+++ b/docs/ecosystem/ios/notifications/architecture/index.html
@@ -88,7 +88,8 @@
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b>
+        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
         <b><a  href='/docs/installation/'>Installation </a></b>
diff --git a/docs/ecosystem/ios/notifications/attachments/index.html b/docs/ecosystem/ios/notifications/attachments/index.html
index 8eef0c0a3a..48f9d754b0 100644
--- a/docs/ecosystem/ios/notifications/attachments/index.html
+++ b/docs/ecosystem/ios/notifications/attachments/index.html
@@ -134,7 +134,8 @@ To expand a notification on 3D Touch devices simply force touch any notification
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b>
+        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
         <b><a  href='/docs/installation/'>Installation </a></b>
diff --git a/docs/ecosystem/ios/notifications/basic/index.html b/docs/ecosystem/ios/notifications/basic/index.html
index cf933789dc..a79f18493c 100644
--- a/docs/ecosystem/ios/notifications/basic/index.html
+++ b/docs/ecosystem/ios/notifications/basic/index.html
@@ -152,7 +152,8 @@
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b>
+        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
         <b><a  href='/docs/installation/'>Installation </a></b>
diff --git a/docs/ecosystem/ios/notifications/content_extensions/index.html b/docs/ecosystem/ios/notifications/content_extensions/index.html
index 743b017aab..2fe8b5abb2 100644
--- a/docs/ecosystem/ios/notifications/content_extensions/index.html
+++ b/docs/ecosystem/ios/notifications/content_extensions/index.html
@@ -159,7 +159,8 @@ The notification content is a real time MJPEG stream of a camera (assuming the c
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b>
+        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
         <b><a  href='/docs/installation/'>Installation </a></b>
diff --git a/docs/ecosystem/ios/notifications/index.html b/docs/ecosystem/ios/notifications/index.html
index a8dd2de2e4..f09c03dc2e 100644
--- a/docs/ecosystem/ios/notifications/index.html
+++ b/docs/ecosystem/ios/notifications/index.html
@@ -93,7 +93,8 @@ Your device ID can be found in the <code class="highlighter-rouge">ios.conf</cod
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b>
+        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
         <b><a  href='/docs/installation/'>Installation </a></b>
diff --git a/docs/ecosystem/ios/notifications/privacy_security_rate_limits/index.html b/docs/ecosystem/ios/notifications/privacy_security_rate_limits/index.html
index 71fe5eb45d..f3feaa6a20 100644
--- a/docs/ecosystem/ios/notifications/privacy_security_rate_limits/index.html
+++ b/docs/ecosystem/ios/notifications/privacy_security_rate_limits/index.html
@@ -90,7 +90,8 @@
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b>
+        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
         <b><a  href='/docs/installation/'>Installation </a></b>
diff --git a/docs/ecosystem/ios/notifications/requesting_location_updates/index.html b/docs/ecosystem/ios/notifications/requesting_location_updates/index.html
index a1dd6f76ef..1e381ddc3a 100644
--- a/docs/ecosystem/ios/notifications/requesting_location_updates/index.html
+++ b/docs/ecosystem/ios/notifications/requesting_location_updates/index.html
@@ -99,7 +99,8 @@
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b>
+        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
         <b><a  href='/docs/installation/'>Installation </a></b>
diff --git a/docs/ecosystem/ios/notifications/sounds/index.html b/docs/ecosystem/ios/notifications/sounds/index.html
index 934ca81711..c5cfe3316a 100644
--- a/docs/ecosystem/ios/notifications/sounds/index.html
+++ b/docs/ecosystem/ios/notifications/sounds/index.html
@@ -254,7 +254,8 @@ US-EN-Morgan-Freeman-Wife-Is-Arriving.wav
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b>
+        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
         <b><a  href='/docs/installation/'>Installation </a></b>
diff --git a/docs/ecosystem/nginx/index.html b/docs/ecosystem/nginx/index.html
index 2211029c08..d0ad43bd18 100644
--- a/docs/ecosystem/nginx/index.html
+++ b/docs/ecosystem/nginx/index.html
@@ -180,7 +180,8 @@ server {
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b>
+        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
         <b><a  href='/docs/installation/'>Installation </a></b>
diff --git a/docs/ecosystem/nginx_subdomain/index.html b/docs/ecosystem/nginx_subdomain/index.html
index a47ee6eded..17bd28ff86 100644
--- a/docs/ecosystem/nginx_subdomain/index.html
+++ b/docs/ecosystem/nginx_subdomain/index.html
@@ -177,7 +177,8 @@
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b>
+        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
         <b><a  href='/docs/installation/'>Installation </a></b>
diff --git a/docs/ecosystem/notebooks/api/index.html b/docs/ecosystem/notebooks/api/index.html
index e4153dc55e..0222ebd116 100644
--- a/docs/ecosystem/notebooks/api/index.html
+++ b/docs/ecosystem/notebooks/api/index.html
@@ -85,7 +85,8 @@
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b>
+        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
         <b><a  href='/docs/installation/'>Installation </a></b>
diff --git a/docs/ecosystem/notebooks/database/index.html b/docs/ecosystem/notebooks/database/index.html
index ec4cbb3380..821bfa6447 100644
--- a/docs/ecosystem/notebooks/database/index.html
+++ b/docs/ecosystem/notebooks/database/index.html
@@ -85,7 +85,8 @@
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b>
+        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
         <b><a  href='/docs/installation/'>Installation </a></b>
diff --git a/docs/ecosystem/notebooks/graph/index.html b/docs/ecosystem/notebooks/graph/index.html
index 76a5bd1713..ee84fd4e74 100644
--- a/docs/ecosystem/notebooks/graph/index.html
+++ b/docs/ecosystem/notebooks/graph/index.html
@@ -85,7 +85,8 @@
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b>
+        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
         <b><a  href='/docs/installation/'>Installation </a></b>
diff --git a/docs/ecosystem/notebooks/index.html b/docs/ecosystem/notebooks/index.html
index 2f5ca55d2b..c2837ba712 100644
--- a/docs/ecosystem/notebooks/index.html
+++ b/docs/ecosystem/notebooks/index.html
@@ -90,7 +90,8 @@
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b>
+        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
         <b><a  href='/docs/installation/'>Installation </a></b>
diff --git a/docs/ecosystem/notebooks/installation/index.html b/docs/ecosystem/notebooks/installation/index.html
index bfc582f079..b778c12488 100644
--- a/docs/ecosystem/notebooks/installation/index.html
+++ b/docs/ecosystem/notebooks/installation/index.html
@@ -110,7 +110,8 @@ Certain notebooks hosted in the <a href="https://github.com/home-assistant/home-
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b>
+        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
         <b><a  href='/docs/installation/'>Installation </a></b>
diff --git a/docs/ecosystem/notebooks/stats/index.html b/docs/ecosystem/notebooks/stats/index.html
index 5df01e6dae..6fb0fb01e7 100644
--- a/docs/ecosystem/notebooks/stats/index.html
+++ b/docs/ecosystem/notebooks/stats/index.html
@@ -85,7 +85,8 @@
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b>
+        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
         <b><a  href='/docs/installation/'>Installation </a></b>
diff --git a/docs/ecosystem/scenegen/index.html b/docs/ecosystem/scenegen/index.html
index 19e1b9da54..f730cb0ca3 100644
--- a/docs/ecosystem/scenegen/index.html
+++ b/docs/ecosystem/scenegen/index.html
@@ -200,7 +200,8 @@ light.bedside:
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b>
+        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
         <b><a  href='/docs/installation/'>Installation </a></b>
diff --git a/docs/ecosystem/synology/index.html b/docs/ecosystem/synology/index.html
index bfd9bb1f86..df6a7cbf0f 100644
--- a/docs/ecosystem/synology/index.html
+++ b/docs/ecosystem/synology/index.html
@@ -95,7 +95,8 @@
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b>
+        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
         <b><a  href='/docs/installation/'>Installation </a></b>
diff --git a/docs/ecosystem/tor/index.html b/docs/ecosystem/tor/index.html
index a58eb5c6fc..9b9df0e987 100644
--- a/docs/ecosystem/tor/index.html
+++ b/docs/ecosystem/tor/index.html
@@ -147,7 +147,8 @@ HiddenServiceAuthorizeClient stealth haremote1
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b>
+        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
         <b><a  href='/docs/installation/'>Installation </a></b>
diff --git a/docs/frontend/browsers/index.html b/docs/frontend/browsers/index.html
index ccb040b7ac..772686252e 100644
--- a/docs/frontend/browsers/index.html
+++ b/docs/frontend/browsers/index.html
@@ -297,7 +297,8 @@
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b>
+        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
         <b><a  href='/docs/installation/'>Installation </a></b>
diff --git a/docs/frontend/index.html b/docs/frontend/index.html
index 87c29e0f4f..79d0b71dec 100644
--- a/docs/frontend/index.html
+++ b/docs/frontend/index.html
@@ -90,7 +90,8 @@
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b>
+        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
         <b><a  href='/docs/installation/'>Installation </a></b>
diff --git a/docs/frontend/mobile/index.html b/docs/frontend/mobile/index.html
index 9c89828118..8c8fb3e94f 100644
--- a/docs/frontend/mobile/index.html
+++ b/docs/frontend/mobile/index.html
@@ -105,7 +105,8 @@
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b>
+        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
         <b><a  href='/docs/installation/'>Installation </a></b>
diff --git a/docs/frontend/webserver/index.html b/docs/frontend/webserver/index.html
index 4b918946d9..4feec3427b 100644
--- a/docs/frontend/webserver/index.html
+++ b/docs/frontend/webserver/index.html
@@ -108,7 +108,8 @@ Nmap <span class="k">done</span>: 1 IP address <span class="o">(</span>1 host up
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b>
+        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
         <b><a  href='/docs/installation/'>Installation </a></b>
diff --git a/docs/glossary/index.html b/docs/glossary/index.html
new file mode 100644
index 0000000000..91f5dce08b
--- /dev/null
+++ b/docs/glossary/index.html
@@ -0,0 +1,355 @@
+<!doctype html>
+  <!--[if lt IE 7]>      <html class="no-js lt-ie9 lt-ie8 lt-ie7"> <![endif]-->
+  <!--[if IE 7]>         <html class="no-js lt-ie9 lt-ie8"> <![endif]-->
+  <!--[if IE 8]>         <html class="no-js lt-ie9"> <![endif]-->
+  <!--[if gt IE 8]><!--> <html> <!--<![endif]-->
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <title>Glossary - Home Assistant</title>
+    <meta name="author" content="Home Assistant">
+    <meta name="description" content="Home Assistant's Glossary.">
+    <meta name="viewport" content="width=device-width">
+    <link rel="canonical" href="https://home-assistant.io/docs/glossary/">
+    <meta property="fb:app_id" content="338291289691179">
+    <meta property="og:title" content="Glossary">
+    <meta property="og:site_name" content="Home Assistant">
+    <meta property="og:url" content="https://home-assistant.io/docs/glossary/">
+    <meta property="og:type" content="article">
+    <meta property="og:description" content="Home Assistant's Glossary.">
+    <meta property="og:image" content="https://home-assistant.io/images/default-social.png">
+    <meta name="twitter:card" content="summary_large_image">
+    <meta name="twitter:site" content="@home_assistant">
+    <meta name="twitter:title" content="Glossary">
+    <meta name="twitter:description" content="Home Assistant's Glossary.">
+    <meta name="twitter:image" content="https://home-assistant.io/images/default-social.png">
+    <link href="/stylesheets/screen.css" media="screen, projection" rel="stylesheet">
+    <link href="/atom.xml" rel="alternate" title="Home Assistant" type="application/atom+xml">
+    <link rel='shortcut icon' href='/images/favicon.ico' />
+    <link rel='icon' type='image/png' href='/images/favicon-192x192.png' sizes='192x192' />
+  </head>
+  <body >
+    <header class='site-header'>
+      <div class="grid-wrapper">
+  <div class="grid">
+    <div class="grid__item three-tenths lap-two-sixths palm-one-whole ha-title">
+  <a href="/" class="site-title">
+    <img width='40' src='/demo/favicon-192x192.png'>
+    <span>Home Assistant</span>
+  </a>
+</div>
+<div class="grid__item seven-tenths lap-four-sixths palm-one-whole">
+  <nav>
+    <input type="checkbox" id="toggle">
+<label for="toggle" class="toggle" data-open="Main Menu" data-close="Close Menu"></label>
+<ul class="menu pull-right">
+  <li><a href="/getting-started/">Getting started</a></li>
+  <li><a href="/components/">Components</a></li>
+  <li><a href="/docs/">Docs</a></li>
+  <li><a href="/cookbook/">Examples</a></li>
+  <li><a href="/developers/">Developers</a></li>
+  <li><a href="/blog/">Blog</a></li>
+  <li><a href="/help/">Need help?</a></li>
+  <li><a href='#' class='show-search'><i class="icon-search"></i></a></li>
+</ul>
+  </nav>
+  <div class='search-container' style='display: none'>
+    <div class='search'>
+      <i class="icon-search"></i>
+      <input id='search' placeholder='Search the docs…'>
+      <a href='#' class='close'><i class="icon-remove-sign"></i></a>
+    </div>
+  </div>
+</div>
+  </div>
+</div>
+    </header>
+    <div class="grid-wrapper">
+      <div class="grid grid-center">
+        <div class="grid__item two-thirds lap-one-whole palm-one-whole">
+          <article class="page">
+    <div class='edit-github'><a href='https://github.com/home-assistant/home-assistant.github.io/tree/current/source/_docs/glossary.markdown'>Edit this page on GitHub</a></div>
+  <header>
+    <h1 class="title indent">
+      Glossary
+    </h1>
+  </header>
+  <hr class="divider">
+<ul>
+  <li>
+      <b>Component</b>: <p>The components provide the core logic for the functionality in Home Assistant. Like <code class="highlighter-rouge">notify</code> provides sending notifications.</p>
+  </li>
+  <li>
+      <b>Device</b>: <p>Usually this is a physical unit which can do or observe something.</p>
+  </li>
+  <li>
+      <b>Discovery</b>: <p>The automatic setup of zeroconf/mDNS and uPnP devices after they are discovered.</p>
+  </li>
+  <li>
+      <b>Entity</b>: <p>An entity is the representation of a single device, unit or web service.</p>
+  </li>
+  <li>
+      <b>Event</b>: <p>When somethings happen.</p>
+  </li>
+  <li>
+      <b>Platform</b>: <p>A platform makes the connection to a specific software or hardware platform. The <code class="highlighter-rouge">pushbullet</code> platform works with the service from pushbullet.com.</p>
+  </li>
+  <li>
+      <b>Service</b>: <p><a href="/docs/scripts/service-calls/">Services</a> are called to perform actions.</p>
+  </li>
+  <li>
+      <b>hass</b>: <p>Often used abbreviation for Home Assistant.</p>
+  </li>
+</ul>
+</article>
+        </div>
+        <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
+          <div class="grid">
+    <section class="aside-module grid__item one-whole lap-one-half">
+  <div class='section'>
+    <h1 class="title delta">Topics</h1>
+    <ul class='divided sidebar-menu'>
+      <li>
+        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a class='active' href='/docs/glossary/'>Glossary </a></b>
+      </li>
+      <li>
+        <b><a  href='/docs/installation/'>Installation </a></b>
+        <ul>
+          <li><a  href='/hassio/'>Hass.io </a></li>
+          <li><a  href='/docs/installation/virtualenv/'>Python Virtual Env </a></li>
+          <li><a  href='/docs/installation/hassbian/'>Hassbian </a></li>
+          <li><a  href='/docs/installation/raspberry-pi-all-in-one/'>Raspberry Pi All-in-One </a></li>
+          <li><a  href='/docs/installation/updating/'>Updating </a></li>
+          <li><a  href='/docs/installation/troubleshooting/'>Troubleshooting </a></li>
+        </ul>
+      </li>
+      <li>
+        <b><a  href='/docs/configuration/'>Configuration </a></b>
+        <ul>
+          <li><a  href='/docs/configuration/yaml/'>YAML </a></li>
+          <li><a  href='/docs/configuration/basic/'>Basic information </a></li>
+          <li><a  href='/docs/configuration/devices/'>Setting up devices </a></li>
+          <li><a  href='/docs/configuration/customizing-devices/'>Customizing entities </a></li>
+          <li><a  href='/docs/configuration/troubleshooting/'>Troubleshooting </a></li>
+          <li><a  href='/docs/configuration/securing/'>Security Check Points </a></li>
+        </ul>
+      </li>
+      <li>
+        <b>Advanced Configuration</b>
+        <ul>
+          <li><a  href='/docs/configuration/remote/'>Remote access </a></li>
+          <li><a  href='/docs/configuration/packages/'>Packages </a></li>
+          <li><a  href='/docs/configuration/splitting_configuration/'>Splitting up the configuration </a></li>
+          <li><a  href='/docs/configuration/secrets/'>Storing Secrets </a></li>
+          <li><a  href='/docs/configuration/templating/'>Templating </a></li>
+          <li><a  href='/docs/configuration/group_visibility/'>Group Visibility </a></li>
+          <li><a  href='/docs/configuration/platform_options/'>Entity component platform options </a></li>
+        </ul>
+      </li>
+      <li>
+        <b>Core objects</b>
+        <ul>
+          <li><a  href='/docs/configuration/events/'>Events </a></li>
+          <li><a  href='/docs/configuration/state_object/'>State Objects </a></li>
+        </ul>
+      </li>
+      <li>
+        <b><a  href='/docs/automation/'>Automation </a></b>
+        <ul>
+          <li><a  href='/docs/automation/examples/'>Examples </a></li>
+          <li><a  href='/docs/automation/editor/'>Editor </a></li>
+          <li><a  href='/docs/automation/trigger/'>Triggers </a></li>
+          <li><a  href='/docs/automation/condition/'>Conditions </a></li>
+          <li><a  href='/docs/automation/action/'>Actions </a></li>
+          <li><a  href='/docs/automation/templating/'>Templates </a></li>
+        </ul>
+      </li>
+      <li>
+        <b><a  href='/docs/frontend/'>Frontend </a></b>
+        <ul>
+          <li><a  href='/docs/frontend/mobile/'>Android/iOS Homescreen </a></li>
+          <li><a  href='/docs/frontend/webserver/'>Web server fingerprint </a></li>
+          <li><a  href='/docs/frontend/browsers/'>Browser Compatibility List </a></li>
+        </ul>
+      </li>
+      <li>
+        <b><a  href='/docs/backend/'>Backend </a></b>
+        <ul>
+          <li><a  href='/docs/backend/database/'>Database </a></li>
+          <li><a  href='/docs/backend/updater/'>Updater </a></li>
+          <li><a  href='/developers/api/'>API </a></li>
+        </ul>
+      </li>
+      <li>
+        <b><a  href='/docs/scripts/'>Scripts </a></b>
+        <ul>
+          <li><a  href='/docs/scripts/service-calls/'>Service Calls </a></li>
+          <li><a  href='/docs/scripts/conditions/'>Conditions </a></li>
+          <li><a  href='/docs/scripts/editor/'>Editor </a></li>
+        </ul>
+      </li>
+      <li>
+        <b><a  href='/docs/tools/'>Tools and Helpers </a></b>
+        <ul>
+          <li><a  href='/docs/tools/dev-tools/'>Developer Tools </a></li>
+          <li><a  href='/docs/tools/hass/'>hass </a></li>
+          <li><a  href='/docs/tools/scripts/'>Scripts </a></li>
+        </ul>
+      </li>
+      <li>
+        <b><a  href='/docs/z-wave/'>Z-Wave </a></b>
+        <ul>
+          <li><a  href='/docs/z-wave/controllers/'>Controllers </a></li>
+          <li><a  href='/docs/z-wave/settings/'>Modifying Settings </a></li>
+          <li><a  href='/docs/z-wave/device-specific/'>Device Specific </a></li>
+        </ul>
+      </li>
+      <li>
+        <b><a  href='/docs/mqtt/'>MQTT </a></b>
+        <ul>
+          <li><a  href='/docs/mqtt/broker/'>Broker </a></li>
+          <li><a  href='/docs/mqtt/certificate/'>Certificate </a></li>
+          <li><a  href='/docs/mqtt/discovery/'>Discovery </a></li>
+          <li><a  href='/docs/mqtt/service/'>Publish service </a></li>
+          <li><a  href='/docs/mqtt/birth_will/'>Birth and last will messages </a></li>
+          <li><a  href='/docs/mqtt/testing/'>Testing your setup </a></li>
+          <li><a  href='/docs/mqtt/logging/'>Logging </a></li>
+          <li><a  href='/docs/mqtt/processing_json/'>Processing JSON </a></li>
+        </ul>
+      </li>
+      <li>
+        <b><a  href='/docs/ecosystem/ios/'>iOS </a></b>
+        <ul>
+          <li><a  href='/docs/ecosystem/ios/notifications/basic/'>Basic notifications </a></li>
+          <ul>
+            <li><a  href='/docs/ecosystem/ios/notifications/sounds/'>Sounds </a></li>
+            <li><a  href='/docs/ecosystem/ios/notifications/architecture/'>Architecture </a></li>
+            <li><a  href='/docs/ecosystem/ios/notifications/privacy_security_rate_limits/'>Privacy, rate limiting and security </a></li>
+          </ul>
+          <li>Advanced notifications</li>
+          <ul>
+            <li><a  href='/docs/ecosystem/ios/notifications/attachments/'>Attachments </a></li>
+            <li><a  href='/docs/ecosystem/ios/notifications/content_extensions/'>Dynamic content </a></li>
+            <li><a  href='/docs/ecosystem/ios/notifications/actions/'>Actionable notifications </a></li>
+            <li><a  href='/docs/ecosystem/ios/notifications/requesting_location_updates/'>Requesting location updates </a></li>
+          </ul>
+          <li><a  href='/docs/ecosystem/ios/location/'>Location Tracking </a></li>
+          <li><a  href='/docs/ecosystem/ios/integration/'>Integration with other apps </a></li>
+        </ul>
+      </li>
+      <li>
+        <a  href='/docs/ecosystem/'>Ecosystem </a>
+        <ul>
+          <li>
+            <a  href='/docs/autostart/'>Autostart </a>
+            <ul>
+              <li><a  href='/docs/autostart/systemd/'>systemd (Linux) </a></li>
+              <li><a  href='/docs/autostart/upstart/'>Upstart (Linux) </a></li>
+              <li><a  href='/docs/autostart/init.d/'>init.d (Linux) </a></li>
+              <li><a  href='/docs/autostart/macos/'>macOS </a></li>
+              <li><a  href='/docs/autostart/synology/'>Synology NAS </a></li>
+            </ul>
+          </li>
+          <li>
+            <a  href='/docs/ecosystem/appdaemon/'>AppDaemon </a>
+          </li>
+          <li>
+            <a  href='/docs/ecosystem/hadashboard/'>HADashboard </a>
+          </li>
+          <li>
+            <a  href='/docs/ecosystem/notebooks/'>Notebooks </a>
+            <ul>
+              <li><a  href='/docs/ecosystem/notebooks/'>Introduction </a></li>
+              <li><a  href='/docs/ecosystem/notebooks/installation/'>Installation </a></li>
+              <li><a  href='/docs/ecosystem/notebooks/graph/'>Graph </a></li>
+              <li><a  href='/docs/ecosystem/notebooks/api/'>Home Assistant API </a></li>
+              <li><a  href='/docs/ecosystem/notebooks/database/'>Database </a></li>
+              <li><a  href='/docs/ecosystem/notebooks/stats/'>Statistics </a></li>
+            </ul>
+          </li>
+          <li>
+            Remote access
+            <ul>
+              <li><a  href='/docs/ecosystem/apache/'>Apache </a></li>
+              <li><a  href='/docs/ecosystem/caddy/'>Caddy Server </a></li>
+              <li><a  href='/docs/ecosystem/nginx/'>NGINX </a></li>
+              <li><a  href='/docs/ecosystem/nginx_subdomain/'>NGINX with subdomain</a></li>
+              <li><a  href='/docs/ecosystem/tor/'>Tor Onion Service </a></li>
+            </ul>
+          </li>
+          <li>
+            <a  href='/docs/ecosystem/certificates/'>Certificates </a>
+            <ul>
+              <li><a  href='/docs/ecosystem/certificates/tls_self_signed_certificate/'>Self-signed certificate </a></li>
+              <li><a  href='/docs/ecosystem/certificates/tls_domain_certificate/'>Certificate domain owners </a></li>
+              <li><a  href='/docs/ecosystem/certificates/lets_encrypt/'>Let's Encrypt (detailed) </a></li>
+            </ul>
+          </li>
+          <li>
+            Backup
+            <ul>
+              <li><a  href='/docs/ecosystem/backup/backup_github/'>Backup to GitHub </a></li>
+              <li><a  href='/docs/ecosystem/backup/backup_dropbox/'>Backup to Dropbox </a></li>
+              <li><a  href='/docs/ecosystem/backup/backup_usb/'>Backup to USB device </a></li>
+            </ul>
+          </li>
+          <li><a  href='/docs/ecosystem/scenegen/'>scenegen </a></li>
+          <li><a  href='/docs/ecosystem/synology/'>Synology </a></li>
+          <li><a  href='/docs/ecosystem/hass-configurator/'>HASS Configurator </a></li>
+        </ul>
+    </ul>
+  </div>
+</section>
+</div>
+        </aside>
+      </div>
+    </div>
+    <footer>
+      <div class="grid-wrapper">
+  <div class="grid">
+    <div class="grid__item">
+      <div class="copyright">
+  <a rel="me" href='https://twitter.com/home_assistant'><i class="icon-twitter"></i></a>
+  <a rel="me" href='https://facebook.com/homeassistantio'><i class="icon-facebook"></i></a>
+  <a rel="me" href='https://plus.google.com/110560654828510104551'><i class="icon-google-plus"></i></a>
+  <a rel="me" href='https://github.com/home-assistant/home-assistant'><i class="icon-github"></i></a>
+  <div class="credit">
+    Contact us at <a href='mailto:hello@home-assistant.io'>hello@home-assistant.io</a> (no support!).<br>
+    Website powered by <a href='http://jekyllrb.com/'>Jekyll</a> and the <a href='https://github.com/coogie/oscailte'>Oscalite theme</a>.<br />
+    Hosted by <a href='https://pages.github.com/'>GitHub</a> and served by <a href='https://cloudflare.com'>CloudFlare</a>.
+  </div>
+  <a rel="license" href="http://creativecommons.org/licenses/by-nc-sa/4.0/"><img alt="Creative Commons License" style="border-width:0" src="https://i.creativecommons.org/l/by-nc-sa/4.0/88x31.png" /></a><br /><span xmlns:dct="http://purl.org/dc/terms/" property="dct:title">home-assistant.io</span> is licensed under a <a rel="license" href="http://creativecommons.org/licenses/by-nc-sa/4.0/">Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International License</a>.
+</div>
+    </div>
+  </div>
+</div>
+    </footer>
+    <script>
+  var _gaq=[['_setAccount','UA-57927901-1'],['_trackPageview']];
+  (function(d,t){var g=d.createElement(t),s=d.getElementsByTagName(t)[0];
+  g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
+  s.parentNode.insertBefore(g,s)}(document,'script'));
+</script>
+<link rel="stylesheet" href="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.css" />
+<script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
+<script type="text/javascript">
+docsearch({
+  apiKey: 'ae96d94b201c5444c8a443093edf3efb',
+  indexName: 'home-assistant',
+  inputSelector: '#search',
+  debug: false // Set debug to true if you want to inspect the dropdown
+});
+document.querySelector('.search .close').addEventListener('click', function(ev) {
+  ev.preventDefault();
+  document.querySelector('.search-container').style.display = 'none';
+});
+document.querySelector('.show-search').addEventListener('click', function(ev) {
+  ev.preventDefault();
+  document.querySelector('.search-container').style.display = 'block';
+  document.getElementById('toggle').checked = false;
+  document.querySelector('.search-container input').focus();
+});
+</script>
+  </body>
+</html>
diff --git a/docs/index.html b/docs/index.html
index eddeb67de6..7d70907d73 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -125,7 +125,8 @@
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b>
+        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
         <b><a  href='/docs/installation/'>Installation </a></b>
diff --git a/docs/installation/archlinux/index.html b/docs/installation/archlinux/index.html
index f40b3e2aaf..b71d9c7ed3 100644
--- a/docs/installation/archlinux/index.html
+++ b/docs/installation/archlinux/index.html
@@ -98,7 +98,8 @@
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b>
+        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
         <b><a  href='/docs/installation/'>Installation </a></b>
diff --git a/docs/installation/armbian/index.html b/docs/installation/armbian/index.html
index 4c71ad91bf..cd36276a40 100644
--- a/docs/installation/armbian/index.html
+++ b/docs/installation/armbian/index.html
@@ -106,7 +106,8 @@
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b>
+        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
         <b><a  href='/docs/installation/'>Installation </a></b>
diff --git a/docs/installation/centos/index.html b/docs/installation/centos/index.html
index 7f5430ab63..085a312106 100644
--- a/docs/installation/centos/index.html
+++ b/docs/installation/centos/index.html
@@ -122,7 +122,8 @@ WantedBy=multi-user.target
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b>
+        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
         <b><a  href='/docs/installation/'>Installation </a></b>
diff --git a/docs/installation/docker/index.html b/docs/installation/docker/index.html
index eb19563cc3..2032d9f417 100644
--- a/docs/installation/docker/index.html
+++ b/docs/installation/docker/index.html
@@ -138,7 +138,8 @@ netsh interface portproxy add v4tov4 listenaddress=0.0.0.0 listenport=8123 conne
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b>
+        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
         <b><a  href='/docs/installation/'>Installation </a></b>
diff --git a/docs/installation/fedora/index.html b/docs/installation/fedora/index.html
index f76054af9c..2da69d77e9 100644
--- a/docs/installation/fedora/index.html
+++ b/docs/installation/fedora/index.html
@@ -109,7 +109,8 @@
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b>
+        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
         <b><a  href='/docs/installation/'>Installation </a></b>
diff --git a/docs/installation/freenas/index.html b/docs/installation/freenas/index.html
index f51cdb7972..04d4f8d51f 100644
--- a/docs/installation/freenas/index.html
+++ b/docs/installation/freenas/index.html
@@ -113,7 +113,8 @@ USB Z-wave sticks may give <code class="highlighter-rouge">dmesg</code> warnings
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b>
+        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
         <b><a  href='/docs/installation/'>Installation </a></b>
diff --git a/docs/installation/hassbian/common-tasks/index.html b/docs/installation/hassbian/common-tasks/index.html
index db94930426..8e6de5663b 100644
--- a/docs/installation/hassbian/common-tasks/index.html
+++ b/docs/installation/hassbian/common-tasks/index.html
@@ -174,7 +174,8 @@ Log in as the <code class="highlighter-rouge">pi</code> account and execute the
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b>
+        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
         <b><a  href='/docs/installation/'>Installation </a></b>
diff --git a/docs/installation/hassbian/customization/index.html b/docs/installation/hassbian/customization/index.html
index c9589ddb24..593f7a9ff7 100644
--- a/docs/installation/hassbian/customization/index.html
+++ b/docs/installation/hassbian/customization/index.html
@@ -107,7 +107,8 @@ The tool is available by running <code class="highlighter-rouge">hassbian-config
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b>
+        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
         <b><a  href='/docs/installation/'>Installation </a></b>
diff --git a/docs/installation/hassbian/index.html b/docs/installation/hassbian/index.html
index 20e3bb34bf..3b2491d7a9 100644
--- a/docs/installation/hassbian/index.html
+++ b/docs/installation/hassbian/index.html
@@ -91,7 +91,8 @@
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b>
+        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
         <b><a  href='/docs/installation/'>Installation </a></b>
diff --git a/docs/installation/hassbian/installation/index.html b/docs/installation/hassbian/installation/index.html
index 8d74c1b69c..0a29e2679e 100644
--- a/docs/installation/hassbian/installation/index.html
+++ b/docs/installation/hassbian/installation/index.html
@@ -121,7 +121,8 @@
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b>
+        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
         <b><a  href='/docs/installation/'>Installation </a></b>
diff --git a/docs/installation/hassbian/integrations/index.html b/docs/installation/hassbian/integrations/index.html
index 1a7e185e82..5f8daefa4b 100644
--- a/docs/installation/hassbian/integrations/index.html
+++ b/docs/installation/hassbian/integrations/index.html
@@ -115,7 +115,8 @@ To enable One Wire support add the following line to the end of <code class="hig
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b>
+        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
         <b><a  href='/docs/installation/'>Installation </a></b>
diff --git a/docs/installation/hassbian/upgrading/index.html b/docs/installation/hassbian/upgrading/index.html
index 4e7b57e363..42b055f8d8 100644
--- a/docs/installation/hassbian/upgrading/index.html
+++ b/docs/installation/hassbian/upgrading/index.html
@@ -103,7 +103,8 @@ You can also use <code class="highlighter-rouge">hassbian-config</code> to autom
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b>
+        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
         <b><a  href='/docs/installation/'>Installation </a></b>
diff --git a/docs/installation/index.html b/docs/installation/index.html
index 266f531214..4405a84ddf 100644
--- a/docs/installation/index.html
+++ b/docs/installation/index.html
@@ -167,7 +167,8 @@
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b>
+        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
         <b><a class='active' href='/docs/installation/'>Installation </a></b>
diff --git a/docs/installation/macos/index.html b/docs/installation/macos/index.html
index 3fdaba3023..e9b1998d38 100644
--- a/docs/installation/macos/index.html
+++ b/docs/installation/macos/index.html
@@ -91,7 +91,8 @@
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b>
+        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
         <b><a  href='/docs/installation/'>Installation </a></b>
diff --git a/docs/installation/python/index.html b/docs/installation/python/index.html
index 820a94a6ce..635eed4e8e 100644
--- a/docs/installation/python/index.html
+++ b/docs/installation/python/index.html
@@ -101,7 +101,8 @@
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b>
+        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
         <b><a  href='/docs/installation/'>Installation </a></b>
diff --git a/docs/installation/raspberry-pi-all-in-one/index.html b/docs/installation/raspberry-pi-all-in-one/index.html
index 937e48893e..2eda75ead7 100644
--- a/docs/installation/raspberry-pi-all-in-one/index.html
+++ b/docs/installation/raspberry-pi-all-in-one/index.html
@@ -184,7 +184,8 @@ Don’t check the USB box regardless of using a USB based device.
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b>
+        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
         <b><a  href='/docs/installation/'>Installation </a></b>
diff --git a/docs/installation/raspberry-pi/index.html b/docs/installation/raspberry-pi/index.html
index 9b5f79dc03..158efb9460 100644
--- a/docs/installation/raspberry-pi/index.html
+++ b/docs/installation/raspberry-pi/index.html
@@ -130,7 +130,8 @@ Since this account is only for running Home Assistant the extra arguments of <co
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b>
+        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
         <b><a  href='/docs/installation/'>Installation </a></b>
diff --git a/docs/installation/synology/index.html b/docs/installation/synology/index.html
index 3e8ef46f0e..26f0bd1e5b 100644
--- a/docs/installation/synology/index.html
+++ b/docs/installation/synology/index.html
@@ -285,7 +285,8 @@ That’s it… you’re all set to go</p>
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b>
+        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
         <b><a  href='/docs/installation/'>Installation </a></b>
diff --git a/docs/installation/troubleshooting/index.html b/docs/installation/troubleshooting/index.html
index 250ea8e38c..a1a6d8e894 100644
--- a/docs/installation/troubleshooting/index.html
+++ b/docs/installation/troubleshooting/index.html
@@ -126,7 +126,8 @@ chrome -&gt; settings -&gt; site settings -&gt; storage -&gt; search for your UR
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b>
+        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
         <b><a  href='/docs/installation/'>Installation </a></b>
diff --git a/docs/installation/updating/index.html b/docs/installation/updating/index.html
index 27b4f07bb5..48f967a810 100644
--- a/docs/installation/updating/index.html
+++ b/docs/installation/updating/index.html
@@ -109,7 +109,8 @@ To avoid permission errors, the upgrade must be run as the same user as the inst
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b>
+        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
         <b><a  href='/docs/installation/'>Installation </a></b>
diff --git a/docs/installation/vagrant/index.html b/docs/installation/vagrant/index.html
index e857bd6bc0..49fffe3d23 100644
--- a/docs/installation/vagrant/index.html
+++ b/docs/installation/vagrant/index.html
@@ -142,7 +142,8 @@ This command will only restart the Home Assistant process inside the Vagrant VM,
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b>
+        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
         <b><a  href='/docs/installation/'>Installation </a></b>
diff --git a/docs/installation/virtualenv/index.html b/docs/installation/virtualenv/index.html
index 980325369b..e8dce1176c 100644
--- a/docs/installation/virtualenv/index.html
+++ b/docs/installation/virtualenv/index.html
@@ -143,7 +143,8 @@
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b>
+        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
         <b><a  href='/docs/installation/'>Installation </a></b>
diff --git a/docs/installation/windows/index.html b/docs/installation/windows/index.html
index d9342de5ae..6210198121 100644
--- a/docs/installation/windows/index.html
+++ b/docs/installation/windows/index.html
@@ -95,7 +95,8 @@ The Microsoft Windows platform is not a primary target to install home Assistant
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b>
+        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
         <b><a  href='/docs/installation/'>Installation </a></b>
diff --git a/docs/mqtt/birth_will/index.html b/docs/mqtt/birth_will/index.html
index 2efd0cd7ba..50037a59da 100644
--- a/docs/mqtt/birth_will/index.html
+++ b/docs/mqtt/birth_will/index.html
@@ -115,7 +115,8 @@
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b>
+        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
         <b><a  href='/docs/installation/'>Installation </a></b>
diff --git a/docs/mqtt/broker/index.html b/docs/mqtt/broker/index.html
index 5be45eb2c0..8e26c9107a 100644
--- a/docs/mqtt/broker/index.html
+++ b/docs/mqtt/broker/index.html
@@ -205,7 +205,8 @@ Home Assistant will automatically load the correct certificate if you connect to
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b>
+        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
         <b><a  href='/docs/installation/'>Installation </a></b>
diff --git a/docs/mqtt/certificate/index.html b/docs/mqtt/certificate/index.html
index d878fbc97e..5a351f8a99 100644
--- a/docs/mqtt/certificate/index.html
+++ b/docs/mqtt/certificate/index.html
@@ -97,7 +97,8 @@
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b>
+        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
         <b><a  href='/docs/installation/'>Installation </a></b>
diff --git a/docs/mqtt/discovery/index.html b/docs/mqtt/discovery/index.html
index 77bbbb8c1f..ecf060c9c9 100644
--- a/docs/mqtt/discovery/index.html
+++ b/docs/mqtt/discovery/index.html
@@ -154,7 +154,8 @@
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b>
+        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
         <b><a  href='/docs/installation/'>Installation </a></b>
diff --git a/docs/mqtt/index.html b/docs/mqtt/index.html
index 2d284741b7..6b7d1e6ab8 100644
--- a/docs/mqtt/index.html
+++ b/docs/mqtt/index.html
@@ -102,7 +102,8 @@
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b>
+        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
         <b><a  href='/docs/installation/'>Installation </a></b>
diff --git a/docs/mqtt/logging/index.html b/docs/mqtt/logging/index.html
index 7f4d761334..4c5d6655cc 100644
--- a/docs/mqtt/logging/index.html
+++ b/docs/mqtt/logging/index.html
@@ -92,7 +92,8 @@
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b>
+        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
         <b><a  href='/docs/installation/'>Installation </a></b>
diff --git a/docs/mqtt/processing_json/index.html b/docs/mqtt/processing_json/index.html
index bbcd31b6f8..5d3a84c031 100644
--- a/docs/mqtt/processing_json/index.html
+++ b/docs/mqtt/processing_json/index.html
@@ -120,7 +120,8 @@
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b>
+        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
         <b><a  href='/docs/installation/'>Installation </a></b>
diff --git a/docs/mqtt/service/index.html b/docs/mqtt/service/index.html
index 9be0423c91..4d462da02c 100644
--- a/docs/mqtt/service/index.html
+++ b/docs/mqtt/service/index.html
@@ -97,7 +97,8 @@
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b>
+        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
         <b><a  href='/docs/installation/'>Installation </a></b>
diff --git a/docs/mqtt/testing/index.html b/docs/mqtt/testing/index.html
index 4b3f49e2eb..8d2f7dd9ca 100644
--- a/docs/mqtt/testing/index.html
+++ b/docs/mqtt/testing/index.html
@@ -116,7 +116,8 @@
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b>
+        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
         <b><a  href='/docs/installation/'>Installation </a></b>
diff --git a/docs/scripts/conditions/index.html b/docs/scripts/conditions/index.html
index ce3f35bf38..556bcaaa72 100644
--- a/docs/scripts/conditions/index.html
+++ b/docs/scripts/conditions/index.html
@@ -213,7 +213,8 @@ Time condition windows can span across the midnight threshold. In the example ab
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b>
+        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
         <b><a  href='/docs/installation/'>Installation </a></b>
diff --git a/docs/scripts/editor/index.html b/docs/scripts/editor/index.html
index 99ad7aee41..ec29a804c0 100644
--- a/docs/scripts/editor/index.html
+++ b/docs/scripts/editor/index.html
@@ -95,7 +95,8 @@
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b>
+        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
         <b><a  href='/docs/installation/'>Installation </a></b>
diff --git a/docs/scripts/index.html b/docs/scripts/index.html
index 6cf85821a7..3fa9e5ded1 100644
--- a/docs/scripts/index.html
+++ b/docs/scripts/index.html
@@ -156,7 +156,8 @@
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b>
+        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
         <b><a  href='/docs/installation/'>Installation </a></b>
diff --git a/docs/scripts/service-calls/index.html b/docs/scripts/service-calls/index.html
index df305ceb26..a3136d7a24 100644
--- a/docs/scripts/service-calls/index.html
+++ b/docs/scripts/service-calls/index.html
@@ -136,7 +136,8 @@ Service Data: <code class="highlighter-rouge"><span class="p">{</span><span clas
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b>
+        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
         <b><a  href='/docs/installation/'>Installation </a></b>
diff --git a/docs/tools/dev-tools/index.html b/docs/tools/dev-tools/index.html
index 7a1d5ecab2..a4ea4dcd0d 100644
--- a/docs/tools/dev-tools/index.html
+++ b/docs/tools/dev-tools/index.html
@@ -125,7 +125,8 @@ Screenshot of Home Assistant’s Developer Tools.
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b>
+        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
         <b><a  href='/docs/installation/'>Installation </a></b>
diff --git a/docs/tools/hass/index.html b/docs/tools/hass/index.html
index 94649d84db..3db27ebb52 100644
--- a/docs/tools/hass/index.html
+++ b/docs/tools/hass/index.html
@@ -116,7 +116,8 @@ optional arguments:
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b>
+        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
         <b><a  href='/docs/installation/'>Installation </a></b>
diff --git a/docs/tools/index.html b/docs/tools/index.html
index 0b4ac1dd28..c3a8d4f3cd 100644
--- a/docs/tools/index.html
+++ b/docs/tools/index.html
@@ -85,7 +85,8 @@
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b>
+        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
         <b><a  href='/docs/installation/'>Installation </a></b>
diff --git a/docs/tools/scripts/index.html b/docs/tools/scripts/index.html
index a42ba22f8b..35bb4cb8ba 100644
--- a/docs/tools/scripts/index.html
+++ b/docs/tools/scripts/index.html
@@ -112,7 +112,8 @@
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b>
+        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
         <b><a  href='/docs/installation/'>Installation </a></b>
diff --git a/docs/z-wave/controllers/index.html b/docs/z-wave/controllers/index.html
index 75196c258f..556d09d8f4 100644
--- a/docs/z-wave/controllers/index.html
+++ b/docs/z-wave/controllers/index.html
@@ -137,7 +137,8 @@ Upon first run, the <code class="highlighter-rouge">zwave</code> component will
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b>
+        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
         <b><a  href='/docs/installation/'>Installation </a></b>
diff --git a/docs/z-wave/device-specific/index.html b/docs/z-wave/device-specific/index.html
index e2d43f9508..d20e0388f3 100644
--- a/docs/z-wave/device-specific/index.html
+++ b/docs/z-wave/device-specific/index.html
@@ -243,7 +243,8 @@ Make sure you copy the newly saved <code class="highlighter-rouge">zwcfg_[home_i
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b>
+        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
         <b><a  href='/docs/installation/'>Installation </a></b>
diff --git a/docs/z-wave/index.html b/docs/z-wave/index.html
index 2bc70733a4..9b7ae36b6b 100644
--- a/docs/z-wave/index.html
+++ b/docs/z-wave/index.html
@@ -348,7 +348,8 @@ Some Z-Wave controllers, like Aeotec ZW090 Z-Stick Gen5, have ability to add dev
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b>
+        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
         <b><a  href='/docs/installation/'>Installation </a></b>
diff --git a/docs/z-wave/settings/index.html b/docs/z-wave/settings/index.html
index d09146aac8..42071a3476 100644
--- a/docs/z-wave/settings/index.html
+++ b/docs/z-wave/settings/index.html
@@ -96,7 +96,8 @@
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        <b><a  href='/faq/'>FAQ </a></b>
+        <b><a  href='/faq/'>FAQ </a></b> | 
+        <b><a  href='/docs/glossary/'>Glossary </a></b>
       </li>
       <li>
         <b><a  href='/docs/installation/'>Installation </a></b>
diff --git a/sitemap.xml b/sitemap.xml
index 3273569c0e..f400d19ee5 100644
--- a/sitemap.xml
+++ b/sitemap.xml
@@ -3438,7 +3438,7 @@
 </url>
 <url>
 <loc>https://home-assistant.io/components/switch.hook/</loc>
-<lastmod>2017-10-09T13:58:12+00:00</lastmod>
+<lastmod>2017-10-09T17:19:57+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/cookbook/automation_for_rainy_days/</loc>
@@ -4069,100 +4069,104 @@
 <lastmod>2017-08-22T22:20:00+00:00</lastmod>
 </url>
 <url>
+<loc>https://home-assistant.io/docs/glossary/</loc>
+<lastmod>2017-10-08T08:30:00+00:00</lastmod>
+</url>
+<url>
 <loc>https://home-assistant.io/docs/autostart/init.d/</loc>
-<lastmod>2017-10-09T13:58:12+00:00</lastmod>
+<lastmod>2017-10-09T17:19:57+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/docs/ecosystem/appdaemon/</loc>
-<lastmod>2017-10-09T13:58:12+00:00</lastmod>
+<lastmod>2017-10-09T17:19:57+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/docs/ecosystem/appdaemon/api/</loc>
-<lastmod>2017-10-09T13:58:12+00:00</lastmod>
+<lastmod>2017-10-09T17:19:57+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/docs/ecosystem/appdaemon/configuration/</loc>
-<lastmod>2017-10-09T13:58:12+00:00</lastmod>
+<lastmod>2017-10-09T17:19:57+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/docs/ecosystem/appdaemon/example_apps/</loc>
-<lastmod>2017-10-09T13:58:12+00:00</lastmod>
+<lastmod>2017-10-09T17:19:57+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/docs/ecosystem/appdaemon/installation/</loc>
-<lastmod>2017-10-09T13:58:12+00:00</lastmod>
+<lastmod>2017-10-09T17:19:57+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/docs/ecosystem/appdaemon/operation/</loc>
-<lastmod>2017-10-09T13:58:12+00:00</lastmod>
+<lastmod>2017-10-09T17:19:57+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/docs/ecosystem/appdaemon/reboot/</loc>
-<lastmod>2017-10-09T13:58:12+00:00</lastmod>
+<lastmod>2017-10-09T17:19:57+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/docs/ecosystem/appdaemon/running/</loc>
-<lastmod>2017-10-09T13:58:12+00:00</lastmod>
+<lastmod>2017-10-09T17:19:57+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/docs/ecosystem/appdaemon/tutorial/</loc>
-<lastmod>2017-10-09T13:58:12+00:00</lastmod>
+<lastmod>2017-10-09T17:19:57+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/docs/ecosystem/appdaemon/updating/</loc>
-<lastmod>2017-10-09T13:58:12+00:00</lastmod>
+<lastmod>2017-10-09T17:19:57+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/docs/ecosystem/appdaemon/windows/</loc>
-<lastmod>2017-10-09T13:58:12+00:00</lastmod>
+<lastmod>2017-10-09T17:19:57+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/docs/ecosystem/certificates/</loc>
-<lastmod>2017-10-09T13:58:12+00:00</lastmod>
+<lastmod>2017-10-09T17:19:57+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/docs/ecosystem/hadashboard/</loc>
-<lastmod>2017-10-09T13:58:12+00:00</lastmod>
+<lastmod>2017-10-09T17:19:57+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/docs/ecosystem/hass-configurator/</loc>
-<lastmod>2017-10-09T13:58:12+00:00</lastmod>
+<lastmod>2017-10-09T17:19:57+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/docs/ecosystem/ios/</loc>
-<lastmod>2017-10-09T13:58:12+00:00</lastmod>
+<lastmod>2017-10-09T17:19:57+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/docs/ecosystem/nginx/</loc>
-<lastmod>2017-10-09T13:58:12+00:00</lastmod>
+<lastmod>2017-10-09T17:19:57+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/docs/ecosystem/notebooks/</loc>
-<lastmod>2017-10-09T13:58:12+00:00</lastmod>
+<lastmod>2017-10-09T17:19:57+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/docs/ecosystem/scenegen/</loc>
-<lastmod>2017-10-09T13:58:12+00:00</lastmod>
+<lastmod>2017-10-09T17:19:57+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/docs/ecosystem/synology/</loc>
-<lastmod>2017-10-09T13:58:12+00:00</lastmod>
+<lastmod>2017-10-09T17:19:57+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/docs/tools/</loc>
-<lastmod>2017-10-09T13:58:12+00:00</lastmod>
+<lastmod>2017-10-09T17:19:57+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/docs/tools/dev-tools/</loc>
-<lastmod>2017-10-09T13:58:12+00:00</lastmod>
+<lastmod>2017-10-09T17:19:57+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/docs/tools/hass/</loc>
-<lastmod>2017-10-09T13:58:12+00:00</lastmod>
+<lastmod>2017-10-09T17:19:57+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/docs/tools/scripts/</loc>
-<lastmod>2017-10-09T13:58:12+00:00</lastmod>
+<lastmod>2017-10-09T17:19:57+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/faq/after-upgrading/</loc>
@@ -5212,62 +5216,62 @@
 </url>
 <url>
 <loc>https://home-assistant.io/demo/frontend.html</loc>
-<lastmod>2017-10-09T13:57:30+00:00</lastmod>
+<lastmod>2017-10-09T17:19:15+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/index.html</loc>
-<lastmod>2017-10-09T13:57:30+00:00</lastmod>
+<lastmod>2017-10-09T17:19:15+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-dev-event.html</loc>
-<lastmod>2017-10-09T13:57:30+00:00</lastmod>
+<lastmod>2017-10-09T17:19:15+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-dev-info.html</loc>
-<lastmod>2017-10-09T13:57:30+00:00</lastmod>
+<lastmod>2017-10-09T17:19:15+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-dev-service.html</loc>
-<lastmod>2017-10-09T13:57:30+00:00</lastmod>
+<lastmod>2017-10-09T17:19:15+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-dev-state.html</loc>
-<lastmod>2017-10-09T13:57:30+00:00</lastmod>
+<lastmod>2017-10-09T17:19:15+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-dev-template.html</loc>
-<lastmod>2017-10-09T13:57:30+00:00</lastmod>
+<lastmod>2017-10-09T17:19:15+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-history.html</loc>
-<lastmod>2017-10-09T13:57:30+00:00</lastmod>
+<lastmod>2017-10-09T17:19:15+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-iframe.html</loc>
-<lastmod>2017-10-09T13:57:30+00:00</lastmod>
+<lastmod>2017-10-09T17:19:15+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-logbook.html</loc>
-<lastmod>2017-10-09T13:57:30+00:00</lastmod>
+<lastmod>2017-10-09T17:19:15+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-map.html</loc>
-<lastmod>2017-10-09T13:57:30+00:00</lastmod>
+<lastmod>2017-10-09T17:19:15+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/googlef4f3693c209fe788.html</loc>
-<lastmod>2017-10-09T13:57:30+00:00</lastmod>
+<lastmod>2017-10-09T17:19:15+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/static/fonts/roboto/DESCRIPTION.en_us.html</loc>
-<lastmod>2017-10-09T13:57:30+00:00</lastmod>
+<lastmod>2017-10-09T17:19:15+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/static/fonts/robotomono/DESCRIPTION.en_us.html</loc>
-<lastmod>2017-10-09T13:57:30+00:00</lastmod>
+<lastmod>2017-10-09T17:19:15+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/static/mdi-demo.html</loc>
-<lastmod>2017-10-09T13:57:30+00:00</lastmod>
+<lastmod>2017-10-09T17:19:15+00:00</lastmod>
 </url>
 </urlset>