diff --git a/addons/cec_scan/index.html b/addons/cec_scan/index.html
index 39d88661bc..192bf08dce 100644
--- a/addons/cec_scan/index.html
+++ b/addons/cec_scan/index.html
@@ -75,7 +75,7 @@
     </h1>
   </header>
   <hr class="divider">
-  <p>Help you to discover the HDMI CEC address. Start the add-on and look into log to see all connected device on HDMI.</p>
+  <p>Help you to discover the HDMI CEC address. Start the add-on and look into the log to see all connected device on HDMI.</p>
 </article>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
diff --git a/addons/check_config/index.html b/addons/check_config/index.html
index 129bbf302c..601d60bb05 100644
--- a/addons/check_config/index.html
+++ b/addons/check_config/index.html
@@ -75,7 +75,7 @@
     </h1>
   </header>
   <hr class="divider">
-  <p>You can use this addon to check whether your configuration files are valid against the new version of Home Assistant before you actually update your Home Assistant installation. This will help you avoid errors due to breaking changes, resulting in an smooth update.</p>
+  <p>You can use this addon to check whether your configuration files are valid against the new version of Home Assistant before you actually update your Home Assistant installation. This addon will help you avoid errors due to breaking changes, resulting in a smooth update.</p>
 <div class="language-json highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="w">
   </span><span class="nt">"version"</span><span class="p">:</span><span class="w"> </span><span class="s2">"latest"</span><span class="w">
 </span><span class="p">}</span><span class="w">
diff --git a/addons/configurator/index.html b/addons/configurator/index.html
index 2eca0a7204..e232c9aaee 100644
--- a/addons/configurator/index.html
+++ b/addons/configurator/index.html
@@ -75,7 +75,7 @@
     </h1>
   </header>
   <hr class="divider">
-  <p>As long as a fully featured configuration GUI for Home Assistant is still under development, you can use this add-on to add a browser based file-editor to your Hass.IO installation. By default it will listen on port <code class="highlighter-rouge">3218</code> of the host Hass.IO is running on.</p>
+  <p>As long as a fully featured configuration GUI for Home Assistant is still under development, you can use this add-on to add a browser-based file-editor to your Hass.IO installation. By default it will listen on port <code class="highlighter-rouge">3218</code> of the host Hass.IO is running on.</p>
 <p>More information and a standalone version for regular Home Assistant installations can be found in the <a href="https://github.com/danielperna84/hass-configurator">GitHub repository</a>.</p>
 <p class="img">
 <img src="/images/hassio/screenshots/addon-hass-configurator.png" />
@@ -86,8 +86,8 @@ Screenshot of the HASS Configurator.
   <li>Web-Based editor to modify your files with syntax highlighting.</li>
   <li>Upload and download files.</li>
   <li>Stage and commit changes in Git repositories, create and switch between branches, push to remotes.</li>
-  <li>Lists of available triggers, events, entities, conditions and services. Selected element gets inserted into the editor at the last cursor position.</li>
-  <li>Restart Home Assistant directly with the click of a button. Reloading groups, automations etc. can be done as well. An API-password is required.</li>
+  <li>Lists of available triggers, events, entities, conditions, and services. The selected element gets inserted into the editor at the last cursor position.</li>
+  <li>Restart Home Assistant directly with the click of a button. Reloading groups, automations, etc. can be done as well. An API-password is required.</li>
   <li>SSL support.</li>
   <li>Optional authentication and IP filtering for added security.</li>
   <li>Direct links to Home Assistant documentation and icons.</li>
@@ -113,14 +113,14 @@ Screenshot of the HASS Configurator.
   <li><strong>username</strong> (<em>Optional</em>): Set a username to access your configuration is protected.</li>
   <li><strong>password</strong> (<em>Required</em>): Set a password for access.</li>
   <li><strong>ssl</strong> (<em>Optional</em>): Enable or Disable SSL for the editor.</li>
-  <li><strong>allowed_networks</strong> (<em>Optional</em>): Limit access to the configurator by adding allowed IP addresses / networks to the list.</li>
+  <li><strong>allowed_networks</strong> (<em>Optional</em>): Limit access to the configurator by adding allowed IP addresses/networks to the list.</li>
   <li><strong>banned_ips</strong> (<em>Optional</em>): List of statically banned IP addresses.</li>
   <li><strong>banlimit</strong> (<em>Optional</em>): Ban access from IPs after <code class="highlighter-rouge">banlimit</code> failed login attempts. The default value <code class="highlighter-rouge">0</code> disables this feature. Restart the add-on to clear the list of banned IP addresses.</li>
   <li><strong>ignore_pattern</strong> (<em>Optional</em>): Files and folders to ignore in the UI.</li>
-  <li><strong>dirsfirst</strong> (<em>Optional</em>): List directories before files in the filebrowser.</li>
+  <li><strong>dirsfirst</strong> (<em>Optional</em>): List directories before files in the file browser.</li>
 </ul>
 <h3><a class="title-link" name="embedding-into-home-assistant" href="#embedding-into-home-assistant"></a> Embedding into Home-Assistant</h3>
-<p>Using the Home Assistant component <a href="https://home-assistant.io/components/panel_iframe/">panel_iframe</a> it is possible to embed the configurator directly into Home Assistant, allowing you to modify your configuration within the Home Assistant frontend.</p>
+<p>Using the Home Assistant component <a href="https://home-assistant.io/components/panel_iframe/">panel_iframe</a> it is possible to embed the configurator directly into Home Assistant, allowing you to modify your configuration from within the Home Assistant frontend.</p>
 <p>An example configuration would look like this:</p>
 <div class="language-yaml highlighter-rouge"><pre class="highlight"><code><span class="s">panel_iframe</span><span class="pi">:</span>
   <span class="s">configurator</span><span class="pi">:</span>
@@ -130,7 +130,7 @@ Screenshot of the HASS Configurator.
 </code></pre>
 </div>
 <p class="note warning">
-Be careful when setting up port forwarding to the configurator while embedding into Home Assistant. If you don’t restrict access by requiring authentication and / or blocking based on client IP addresses, your configuration will be exposed to the internet!
+Be careful when setting up port forwarding to the configurator while embedding into Home Assistant. If you don’t restrict access by requiring authentication and/or blocking based on client IP addresses, your configuration will be exposed to the internet!
 </p>
 </article>
         </div>
diff --git a/addons/dnsmasq/index.html b/addons/dnsmasq/index.html
index be3e2ec297..8e42b11659 100644
--- a/addons/dnsmasq/index.html
+++ b/addons/dnsmasq/index.html
@@ -93,10 +93,10 @@
 </div>
 <p>Configuration variables:</p>
 <ul>
-  <li><strong>defaults</strong> (<em>Required</em>): A list of dns server to forward default requests.</li>
+  <li><strong>defaults</strong> (<em>Required</em>): A list of DNS servers to forward default requests to.</li>
   <li><strong>forwards</strong> (<em>Optional</em>): A list of domains that will forward to a specific server.</li>
-  <li><strong>hosts</strong> (<em>Optional</em>): A list of hosts to resolve it static.</li>
-  <li><strong>interface</strong> (<em>Optional</em>): If a interface is set, it listen only on this interface. Need to set for resinos. Normally is <code class="highlighter-rouge">eth0</code> for ethernet wired connection and <code class="highlighter-rouge">wlan0</code> for wireless connection.</li>
+  <li><strong>hosts</strong> (<em>Optional</em>): A list of hosts to resolve statically.</li>
+  <li><strong>interface</strong> (<em>Optional</em>): If an interface is set, it listens only on this interface. Needs to be set for ResinOS. Normally is <code class="highlighter-rouge">eth0</code> for ethernet wired connection and <code class="highlighter-rouge">wlan0</code> for wireless connection.</li>
 </ul>
 </article>
         </div>
diff --git a/addons/google_assistant/index.html b/addons/google_assistant/index.html
index e7d4a0bd16..bd747db970 100644
--- a/addons/google_assistant/index.html
+++ b/addons/google_assistant/index.html
@@ -76,7 +76,7 @@
   </header>
   <hr class="divider">
   <p class="note">
-  If you are wanting to integrate your Google Home, or mobile phone running Google Assistant, with Home Assistant then you want the <a href="https://home-assistant.io/components/google_assistant/">Google Assistant component</a>.
+  If you want to integrate your Google Home, or mobile phone running Google Assistant, with Home Assistant, then you want the <a href="https://home-assistant.io/components/google_assistant/">Google Assistant component</a>.
 </p>
 <p><a href="https://assistant.google.com/">Google Assistant</a> is an AI-powered voice assistant that runs on the Raspberry Pi and x86 platforms and interact via the <a href="/components/dialogflow/">DialogFlow</a> integration with Home-Assistant. You can also use <a href="https://actions.google.com/">Google Actions</a> to extend its functionality.</p>
 <p>To enable access to the Google Assistant API, do the following:</p>
@@ -109,8 +109,8 @@ card 1: Microphone [Yeti Stereo Microphone], device 0: USB Audio [USB Audio]
 <p>You need to use this information to point the add-on at the right speakers and microphone. The information describes different cards and devices. On a Raspberry Pi 3, card 0 - device 0 is the built-in headset port, card 0 - device 1 is the HDMI port. In the example above, the USB microphone showed up as card 1 - device 0.</p>
 <p>Find the microphone and speakers that you want to use and note down their device and card number. We will need that to configure the add-on options <code class="highlighter-rouge">mic</code> (microphone to use) and <code class="highlighter-rouge">speaker</code> (speaker to use). The format for these options is <code class="highlighter-rouge">&lt;card #&gt;,&lt;device #&gt;</code>. Change the configuration options and click save.</p>
 <p>The next step is to authenticate your Google account with Google Assistant. Start the add-on and click on the “OPEN WEB UI” button to start authentication.</p>
-<h3>Add-On configuration</h3>
-<p>Configuration example that uses the USB microphone and use the built-in headset audio output on the Raspberry Pi. Note that card and device numbers can differ on your device.</p>
+<h3>Add-on configuration</h3>
+<p>Configuration example that uses the USB microphone and the built-in headset audio output on the Raspberry Pi. Note that card and device numbers can differ on your device.</p>
 <div class="language-json highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="w">
   </span><span class="nt">"mic"</span><span class="p">:</span><span class="w"> </span><span class="s2">"1,0"</span><span class="p">,</span><span class="w">
   </span><span class="nt">"speaker"</span><span class="p">:</span><span class="w"> </span><span class="s2">"0,0"</span><span class="p">,</span><span class="w">
diff --git a/addons/homematic/index.html b/addons/homematic/index.html
index 7e95638c26..dbbffbd32b 100644
--- a/addons/homematic/index.html
+++ b/addons/homematic/index.html
@@ -75,8 +75,8 @@
     </h1>
   </header>
   <hr class="divider">
-  <p>Set up a <a href="https://github.com/eq-3/occu">HomeMatic</a> hardware layer. At the moment we don’t support hmIP but that is in progress. For learning and handling devices use our internal homematic panel and services (in progress) or use <a href="https://github.com/hobbyquaker/homematic-manager">Homematic-Manager</a> &gt; 2.0.</p>
-<p>The logic layer will be Home-Assistant. There is no ReGa or other logic layer installed. You can’t import exists configuration, you need new learn it into Home-Assistant.</p>
+  <p>Set up a <a href="https://github.com/eq-3/occu">HomeMatic</a> hardware layer. At the moment we don’t support hmIP, but that is in progress. For learning and handling devices use our internal HomeMatic panel and services (in progress) or use <a href="https://github.com/hobbyquaker/homematic-manager">Homematic-Manager</a> &gt; 2.0.</p>
+<p>The logic layer will be Home-Assistant. There is no ReGa or other logic layer installed. You can’t import an existing configuration, you’ll need re-learn it into Home-Assistant.</p>
 <p>Follow devices will be supported and tested:</p>
 <ul>
   <li><a href="https://www.elv.ch/homematic-funkmodul-fuer-raspberry-pi-bausatz.html">HM-MOD-RPI-PCB</a></li>
@@ -107,14 +107,14 @@
 </ul>
 <p>For RF devices</p>
 <ul>
-  <li><strong>type</strong> (<em>Require</em>): Device type for RFD service. Look into handbook of your device.</li>
-  <li><strong>device</strong> (<em>Require</em>): Device on host.</li>
+  <li><strong>type</strong> (<em>Require</em>): Device type for RFD service. Look into the manual of your device.</li>
+  <li><strong>device</strong> (<em>Require</em>): Device on the host.</li>
 </ul>
 <p>For RF devices</p>
 <ul>
-  <li><strong>serial</strong> (<em>Require</em>): Serial number of device.</li>
+  <li><strong>serial</strong> (<em>Require</em>): Serial number of the device.</li>
   <li><strong>key</strong> (<em>Require</em>): Encrypted key.</li>
-  <li><strong>ip</strong> (<em>Require</em>): IP address of lan gateway.</li>
+  <li><strong>ip</strong> (<em>Require</em>): IP address of LAN gateway.</li>
 </ul>
 <h2><a class="title-link" name="home-assistant-configuration" href="#home-assistant-configuration"></a> Home Assistant configuration</h2>
 <p>Use the following configuration in Home Assistant to use it:</p>
@@ -126,7 +126,7 @@
 </code></pre>
 </div>
 <h2><a class="title-link" name="raspberry-pi3" href="#raspberry-pi3"></a> Raspberry Pi3</h2>
-<p>With HM-MOD-PRI-PCB you need add follow into your <code class="highlighter-rouge">config.txt</code> on boot partition:</p>
+<p>With HM-MOD-PRI-PCB you need to add follow into your <code class="highlighter-rouge">config.txt</code> on boot partition:</p>
 <div class="highlighter-rouge"><pre class="highlight"><code>dtoverlay=pi3-miniuart-bt
 </code></pre>
 </div>
diff --git a/addons/index.html b/addons/index.html
index 8a85e977dc..c385ca5149 100644
--- a/addons/index.html
+++ b/addons/index.html
@@ -103,7 +103,7 @@
   </li>
   <li>
     <a href='/addons/samba/'>Samba</a><br>
-    Manage your Home Assistant and custom addons over Samba.
+    Manage your Home Assistant and custom add-ons over Samba.
   </li>
 </ul>
 <h3><a class='title-link' name='other-add-ons' href='#other-add-ons'></a> Other add-ons </h3>
diff --git a/addons/lets_encrypt/index.html b/addons/lets_encrypt/index.html
index 18a400b3f2..628f49f297 100644
--- a/addons/lets_encrypt/index.html
+++ b/addons/lets_encrypt/index.html
@@ -78,7 +78,7 @@
   <p class="note">
 You should not use this if you are also using the <a href="/addons/duckdns/">DuckDNS add-on</a>. The DuckDNS add-on has integrated Let’s Encrypt support.
 </p>
-<p>Setup and manage a <a href="https://letsencrypt.org/">Let’s Encrypt</a> certificate. This will create a certificate on the first run and will auto-renew if the certificate is within 30 days of expiration.</p>
+<p>Setup and manage a <a href="https://letsencrypt.org/">Let’s Encrypt</a> certificate. This addon will create a certificate on the first run and will auto-renew if the certificate is within 30 days of expiration.</p>
 <div class="language-json highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="w">
   </span><span class="nt">"email"</span><span class="p">:</span><span class="w"> </span><span class="s2">"example@example.com"</span><span class="p">,</span><span class="w">
   </span><span class="nt">"domains"</span><span class="p">:</span><span class="w"> </span><span class="p">[</span><span class="s2">"example.com"</span><span class="p">,</span><span class="w"> </span><span class="s2">"mqtt.example.com"</span><span class="p">,</span><span class="w"> </span><span class="s2">"hass.example.com"</span><span class="p">]</span><span class="w">
@@ -98,7 +98,7 @@ You should not use this if you are also using the <a href="/addons/duckdns/">Duc
   <span class="s">ssl_key</span><span class="pi">:</span> <span class="s">/ssl/privkey.pem</span>
 </code></pre>
 </div>
-<p>If you use another port such as <code class="highlighter-rouge">8123</code> or a SSL proxy, change the port number.</p>
+<p>If you use another port such as <code class="highlighter-rouge">8123</code> or an SSL proxy, change the port number.</p>
 </article>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
diff --git a/addons/mariadb/index.html b/addons/mariadb/index.html
index c4841952f3..2f670b90ac 100644
--- a/addons/mariadb/index.html
+++ b/addons/mariadb/index.html
@@ -75,7 +75,7 @@
     </h1>
   </header>
   <hr class="divider">
-  <p>Set up a <a href="https://mariadb.org/">mariadb</a> SQL server. It supports multiple databases, users and permission settings. If you want to only connect from inside home assistant use <code class="highlighter-rouge">core-mariadb</code> as the host address.</p>
+  <p>Set up a <a href="https://mariadb.org/">mariadb</a> SQL server. It supports multiple databases, users, and permission settings. If you want to only connect from inside home assistant use <code class="highlighter-rouge">core-mariadb</code> as the host address.</p>
 <div class="language-json highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="w">
   </span><span class="nt">"databases"</span><span class="p">:</span><span class="w"> </span><span class="p">[</span><span class="s2">"homeassistant"</span><span class="p">],</span><span class="w">
   </span><span class="nt">"logins"</span><span class="p">:</span><span class="w"> </span><span class="p">[</span><span class="w">
diff --git a/addons/mosquitto/index.html b/addons/mosquitto/index.html
index f66e0c02f6..1396955dfe 100644
--- a/addons/mosquitto/index.html
+++ b/addons/mosquitto/index.html
@@ -97,10 +97,10 @@ Make sure you use logins and disable anonymous access if you want to secure the
 </p>
 <p>Configuration variables:</p>
 <ul>
-  <li><strong>plain</strong> (<em>Optional</em>): Listen to broker on port 1883 without SSL/TLS. Defaults to <code class="highlighter-rouge">true</code>.</li>
-  <li><strong>ssl</strong> (<em>Optional</em>): Listen to broker on port 8883 with SSL/TLS. This requires certificates. Defaults to <code class="highlighter-rouge">false</code>.</li>
-  <li><strong>anonymous</strong> (<em>Optional</em>): Allow anonymous connection. If <em>logins</em> is set, anonymous user can only read data. Defaults to <code class="highlighter-rouge">true</code>.</li>
-  <li><strong>logins</strong> (<em>Optional</em>): A list of user that will be created with <em>username</em> and <em>password</em>.</li>
+  <li><strong>plain</strong> (<em>Optional</em>): Listen on port 1883 without SSL/TLS. Defaults to <code class="highlighter-rouge">true</code>.</li>
+  <li><strong>ssl</strong> (<em>Optional</em>): Listen on port 8883 with SSL/TLS. This requires certificates. Defaults to <code class="highlighter-rouge">false</code>.</li>
+  <li><strong>anonymous</strong> (<em>Optional</em>): Allow anonymous connections. If <em>logins</em> is set, the anonymous user can only read data. Defaults to <code class="highlighter-rouge">true</code>.</li>
+  <li><strong>logins</strong> (<em>Optional</em>): A list of users that will be created with <em>username</em> and <em>password</em>.</li>
   <li><strong>customize</strong> (<em>Optional</em>): If you enable it, it reads additional configuration files (<code class="highlighter-rouge">*.conf</code>) from <code class="highlighter-rouge">/share/mosquitto</code>.</li>
 </ul>
 <h3><a class="title-link" name="home-assistant-configuration" href="#home-assistant-configuration"></a> Home Assistant configuration</h3>
diff --git a/addons/nginx_proxy/index.html b/addons/nginx_proxy/index.html
index 3d7cddd672..bb089c2cbc 100644
--- a/addons/nginx_proxy/index.html
+++ b/addons/nginx_proxy/index.html
@@ -75,7 +75,7 @@
     </h1>
   </header>
   <hr class="divider">
-  <p>Setup a SSL proxy with NGINX and redirect port 80 to 443. Make sure you have generated a certificate before you start this add-on.</p>
+  <p>Setup an SSL proxy with NGINX and redirect port 80 to 443. Make sure you have generated a certificate before you start this add-on.</p>
 <p>In the <code class="highlighter-rouge">http</code> section of the <code class="highlighter-rouge">configuration.yaml</code> file remove <code class="highlighter-rouge">ssl_certificate</code> and <code class="highlighter-rouge">ssl_key</code> and don’t enter the port in the <code class="highlighter-rouge">base_url</code> to avoid a HTTP 502 error.</p>
 <div class="language-json highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="w">
   </span><span class="nt">"domain"</span><span class="p">:</span><span class="w"> </span><span class="s2">"home.example.com"</span><span class="w">
@@ -87,7 +87,7 @@
   <li><strong>domain</strong> (<em>Required</em>): Domain they will proxy run with it.</li>
 </ul>
 <p class="note">
-It is possible to deactive port 80 if you need this for things like <code class="highlighter-rouge">emulate_hue</code>. Remove the host port from Network option of this add-on.
+It is possible to deactivate port 80 if you need this for things like <code class="highlighter-rouge">emulate_hue</code>. Remove the host port from Network option of this add-on.
 </p>
 </article>
         </div>
diff --git a/addons/rpc_shutdown/index.html b/addons/rpc_shutdown/index.html
index ef33bfb934..2af687853f 100644
--- a/addons/rpc_shutdown/index.html
+++ b/addons/rpc_shutdown/index.html
@@ -75,7 +75,7 @@
     </h1>
   </header>
   <hr class="divider">
-  <p>Allow to shutdown a Windows computer with a service call from Home Assistant.</p>
+  <p>Allows you to shut down a Windows computer with a service call from Home Assistant.</p>
 <div class="language-json highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="w">
   </span><span class="nt">"computers"</span><span class="p">:</span><span class="w"> </span><span class="p">[</span><span class="w">
     </span><span class="p">{</span><span class="w">
@@ -88,10 +88,10 @@
 </span></code></pre>
 </div>
 <ul>
-  <li><strong>computers</strong> (<em>Required</em>): A list of computer object to shutdown from Home-Assistant.</li>
-  <li><strong>computers/alias</strong> (<em>Required</em>): Set a alias for this record and that is the name for the input.</li>
-  <li><strong>computers/address</strong> (<em>Required</em>): IP address or netbios name of the computer for shutdown.</li>
-  <li><strong>computers/credentials</strong> (<em>Required</em>): Credentials for logging into computer. Use a <code class="highlighter-rouge">%</code> as delimiter of username and password.</li>
+  <li><strong>computers</strong> (<em>Required</em>): A list of computer objects to shutdown from Home-Assistant.</li>
+  <li><strong>computers/alias</strong> (<em>Required</em>): Set an alias for this record which becomes the name for the input.</li>
+  <li><strong>computers/address</strong> (<em>Required</em>): IP address or NetBIOS name of the computer for the shutdown.</li>
+  <li><strong>computers/credentials</strong> (<em>Required</em>): Credentials for logging into computer. Use a <code class="highlighter-rouge">%</code> as the delimiter of username and password.</li>
 </ul>
 <h2><a class="title-link" name="home-assistant" href="#home-assistant"></a> Home Assistant</h2>
 <p>Use the following inside Home Assistant service call to use it:</p>
diff --git a/addons/samba/index.html b/addons/samba/index.html
index 3d6723d07f..85126b975a 100644
--- a/addons/samba/index.html
+++ b/addons/samba/index.html
@@ -8,7 +8,7 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
     <title>Samba - Home Assistant</title>
     <meta name="author" content="Home Assistant">
-    <meta name="description" content="Manage your Home Assistant and custom addons over Samba.">
+    <meta name="description" content="Manage your Home Assistant and custom add-ons over Samba.">
     <meta name="viewport" content="width=device-width">
     <link rel="canonical" href="https://home-assistant.io/addons/samba/">
     <meta property="fb:app_id" content="338291289691179">
@@ -16,12 +16,12 @@
     <meta property="og:site_name" content="Home Assistant">
     <meta property="og:url" content="https://home-assistant.io/addons/samba/">
     <meta property="og:type" content="article">
-    <meta property="og:description" content="Manage your Home Assistant and custom addons over Samba.">
+    <meta property="og:description" content="Manage your Home Assistant and custom add-ons over Samba.">
     <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="Samba">
-    <meta name="twitter:description" content="Manage your Home Assistant and custom addons over Samba.">
+    <meta name="twitter:description" content="Manage your Home Assistant and custom add-ons over Samba.">
     <meta name="twitter:image" content="https://home-assistant.io/images/default-social.png">
     <link href="/stylesheets/screen.css" media="screen, projection, print" rel="stylesheet">
     <link href="/atom.xml" rel="alternate" title="Home Assistant" type="application/atom+xml">
@@ -75,7 +75,7 @@
     </h1>
   </header>
   <hr class="divider">
-  <p>This allows you to set up a <a href="https://samba.org/">Samba</a> server to access hass.io folders using Windows network shares.</p>
+  <p>This addon allows you to set up a <a href="https://samba.org/">Samba</a> server to access hass.io folders using Windows network shares.</p>
 <div class="language-json highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="w">
   </span><span class="nt">"name"</span><span class="p">:</span><span class="w"> </span><span class="s2">"hassio"</span><span class="p">,</span><span class="w">
   </span><span class="nt">"workgroup"</span><span class="p">:</span><span class="w"> </span><span class="s2">"WORKGROUP"</span><span class="p">,</span><span class="w">
@@ -95,10 +95,10 @@
 </div>
 <p>Configuration variables:</p>
 <ul>
-  <li><strong>name</strong> (<em>Optional</em>): default <code class="highlighter-rouge">hassio</code>. Set netbios name of hassio device.</li>
+  <li><strong>name</strong> (<em>Optional</em>): default <code class="highlighter-rouge">hassio</code>. Set NetBIOS name of hassio device.</li>
   <li><strong>workgroup</strong> (<em>Optional</em>): default <code class="highlighter-rouge">WORKGROUP</code>. Set network workgroup.</li>
   <li><strong>guest</strong> (<em>Optional</em>): Allow login without a username or password. Defaults to <code class="highlighter-rouge">true</code>.</li>
-  <li><strong>map</strong> (<em>Optional</em>): Control which folder will be expose. <code class="highlighter-rouge">config</code> is for Home Assistant configuration folder. <code class="highlighter-rouge">addons</code> for local custom repositiory. <code class="highlighter-rouge">share</code> is a folder that can access from add-ons and Home Assistant too. <code class="highlighter-rouge">backup</code> for access to snapshot files. <code class="highlighter-rouge">ssl</code> for certificate storage, be careful with this option! Defaults all to <code class="highlighter-rouge">true</code>, except for <code class="highlighter-rouge">ssl</code>.</li>
+  <li><strong>map</strong> (<em>Optional</em>): Control which folder will be exposed. <code class="highlighter-rouge">config</code> is for Home Assistant configuration folder. <code class="highlighter-rouge">addons</code> for a local custom repository. <code class="highlighter-rouge">share</code> is a folder that can access from add-ons and Home Assistant too. <code class="highlighter-rouge">backup</code> for access to snapshot files. <code class="highlighter-rouge">ssl</code> for certificate storage, be careful with this option! Defaults all to <code class="highlighter-rouge">true</code>, except for <code class="highlighter-rouge">ssl</code>.</li>
   <li><strong>username</strong> (<em>Optional</em>): The username for logging in if guest login is not used.</li>
   <li><strong>password</strong> (<em>Optional</em>): Password for <code class="highlighter-rouge">username</code>. An empty password is not supported.</li>
   <li><strong>interface</strong> (<em>Optional</em>): Interface on that will start the share. Normally is <code class="highlighter-rouge">eth0</code> for ethernet wired connection and <code class="highlighter-rouge">wlan0</code> for wireless connection.</li>
diff --git a/addons/ssh/index.html b/addons/ssh/index.html
index 354581dd7f..d6794f7f91 100644
--- a/addons/ssh/index.html
+++ b/addons/ssh/index.html
@@ -76,14 +76,14 @@
   </header>
   <hr class="divider">
   <p>Setting up an <a href="https://openssh.org/">SSH</a> server allows access to your Hass.io folders with any SSH client. It also includes a command-line tool to access the <a href="https://github.com/home-assistant/hassio/blob/dev/API.md">Hass.io API</a>. Try it out:</p>
-<div class="language-bash highlighter-rouge"><pre class="highlight"><code><span class="gp">$ </span>hassio <span class="nb">help</span>
+<div class="language-bash highlighter-rouge"><pre class="highlight"><code>hassio <span class="nb">help</span>
 </code></pre>
 </div>
 <p class="note">
 This add-on will not enable you to install packages or do anything as root. This is not allowed with Hass.io.
 </p>
-<p>To use this add-on, you must have a private/public key to log in. To generate them, follow the <a href="https://www.digitalocean.com/community/tutorials/how-to-create-ssh-keys-with-putty-to-connect-to-a-vps">instructions for Windows</a> and <a href="https://help.github.com/articles/generating-a-new-ssh-key-and-adding-it-to-the-ssh-agent/">these for other platforms</a>. It is possible to set a password for login since version 2.0 but for high security use private/public keys. You can not run both variant at same time.</p>
-<p>In order to start this add-on for the first time, you either need to include an ssh key (enclosed in quotation marks, on a single line without line breaks) or set a password in the options section.</p>
+<p>To use this add-on, you must have a private/public key to log in. To generate them, follow the <a href="https://www.digitalocean.com/community/tutorials/how-to-create-ssh-keys-with-putty-to-connect-to-a-vps">instructions for Windows</a> and <a href="https://help.github.com/articles/generating-a-new-ssh-key-and-adding-it-to-the-ssh-agent/">these for other platforms</a>. It is possible to set a password for login since version 2.0 but for high security use private/public keys. You can not run both variants at the same time.</p>
+<p>To start this add-on for the first time, you either need to include an ssh key (enclosed in quotation marks, on a single line without line breaks) or set a password in the options section.</p>
 <div class="language-json highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="w">
   </span><span class="nt">"authorized_keys"</span><span class="p">:</span><span class="w"> </span><span class="p">[</span><span class="w">
     </span><span class="s2">"ssh-rsa AKDJD3839...== my-key"</span><span class="w">
@@ -96,7 +96,7 @@ This add-on will not enable you to install packages or do anything as root. This
 <p>After logging in, you will find yourself in this add-ons container. The Home Assistant configuration directory is mounted on the path <code class="highlighter-rouge">/config</code>.</p>
 <p>Configuration variables:</p>
 <ul>
-  <li><strong>authorized_keys</strong> (<em>Optional</em>): Your public keys for authorized keyfile. Every element will be a line inside that file.</li>
+  <li><strong>authorized_keys</strong> (<em>Optional</em>): Your public keys for the authorized key file. Every element will be a line inside that file.</li>
   <li><strong>password</strong> (<em>Optional</em>): Set a password for login. We do not recommend this variant.</li>
 </ul>
 <div class="videoWrapper">
diff --git a/addons/tellstick/index.html b/addons/tellstick/index.html
index 81e2999a11..e5481609a0 100644
--- a/addons/tellstick/index.html
+++ b/addons/tellstick/index.html
@@ -78,16 +78,16 @@
   <p>Setting up the <a href="http://telldus.com">Tellstick</a> service and tools contained in the <a href="http://developer.telldus.com/">telldus-core</a> package and adding configuration to enable Tellstick and Tellstick Duo to work on your Hass.io.</p>
 <p>To use this add-on, you first install it from the list of Built-in add-ons in Hass.io.
 After installation you are presented with a default and example configuration, to alter this you must follow both the JSON format and also be aligned with the <a href="https://developer.telldus.com/wiki/TellStick_conf">valid parameters for Tellstick configuration file (tellstick.conf)</a>.</p>
-<p>After any changes has been made to the configuration you need to restart the add-on for the changes to take effect.</p>
+<p>After any changes have been made to the configuration, you need to restart the add-on for the changes to take effect.</p>
 <p>Configuration variables:</p>
 <ul>
-  <li><strong>id</strong> (<em>Required</em>): This is a number and must be unique for each device.</li>
+  <li><strong>id</strong> (<em>Required</em>): A number and must be unique for each device.</li>
   <li><strong>name</strong> (<em>Required</em>): A name for easy identification of the device.</li>
   <li><strong>protocol</strong> (<em>Required</em>): This is the protocol the device uses. More on the different protocols later down.</li>
-  <li><strong>model</strong> (<em>Optional</em>): The parameter model is only used by some protocols where there exists different types of devices using the same protocol. This can be dimmers versus non-dimmers, codeswitch versus selflearning etc.</li>
+  <li><strong>model</strong> (<em>Optional</em>): The model parameter is only used by some protocols where there exists different types of devices using the same protocol. This can be dimmers versus non-dimmers, codeswitch versus self-learning, etc.</li>
   <li><strong>house</strong> (<em>Optional</em>): Depending on protocol the values here can vary a lot to identify or group per house or type.</li>
-  <li><strong>unit</strong> (<em>Optional</em>): Unit identifier, in most cases a value between 1 to 16 and often used in combination with house.</li>
-  <li><strong>fade</strong> (<em>Optional</em>): Fade is either <code class="highlighter-rouge">true</code> or <code class="highlighter-rouge">false</code> and tells a dimmer if is should fade smooth or instant between values (only for IKEA protocol as it seems).</li>
+  <li><strong>unit</strong> (<em>Optional</em>): Unit identifier, in most cases a value between 1 to 16 and often used in combination with the house.</li>
+  <li><strong>fade</strong> (<em>Optional</em>): Fade is either <code class="highlighter-rouge">true</code> or <code class="highlighter-rouge">false</code> and tells a dimmer if it should fade smooth or instant between values (only for IKEA protocol as it seems).</li>
   <li><strong>code</strong> (<em>Optional</em>): A number series based on ones and zeroes often used for dip-switch based devices.</li>
 </ul>
 <p>You will need to add internal communication details to <code class="highlighter-rouge">configuration.yaml</code> to enable the integration from Hass.io and the add-on.</p>
@@ -100,7 +100,7 @@ After installation you are presented with a default and example configuration, t
 </code></pre>
 </div>
 <p>To add <a href="https://home-assistant.io/components/light.tellstick/">lights</a>, <a href="https://home-assistant.io/components/sensor.tellstick/">sensors</a> and <a href="https://home-assistant.io/components/switch.tellstick/">switches</a> you follow the guidelines for each type individually that is <a href="https://home-assistant.io/components/tellstick/">described for Home Assistant</a></p>
-<p>The add-on will also enable you to interact with tdtool via a Home Assistant services call, see example below for selflearning device.</p>
+<p>The add-on will also enable you to interact with the <code class="highlighter-rouge">tdtool</code> via a Home Assistant services call, see example below for self-learning device.</p>
 <h2><a class="title-link" name="examples" href="#examples"></a> Examples</h2>
 <p>Example for adding more devices in the add-on configuration (note the comma separator between devices):</p>
 <div class="language-json highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="w">
@@ -130,7 +130,7 @@ After installation you are presented with a default and example configuration, t
 <p>Go to Home Assistant <a href="http://hassio.local:8123/dev-service">service call</a> in Developer tools and select.</p>
 <ul>
   <li>Service: <code class="highlighter-rouge">hassio.addon_stdin</code></li>
-  <li>Enter service Data:<br />
+  <li>Enter service Data:
 <code class="highlighter-rouge"><span class="p">{</span><span class="nt">"addon"</span><span class="p">:</span><span class="s2">"core_tellstick"</span><span class="p">,</span><span class="nt">"input"</span><span class="p">:{</span><span class="nt">"function"</span><span class="p">:</span><span class="s2">"learn"</span><span class="p">,</span><span class="nt">"device"</span><span class="p">:</span><span class="s2">"1"</span><span class="p">}}</span></code></li>
 </ul>
 <p>Replace <code class="highlighter-rouge">1</code> with the corresponding ID of the device in your TellStick configuration.</p>
@@ -154,7 +154,7 @@ After installation you are presented with a default and example configuration, t
   <li>
     <p><code class="highlighter-rouge">"function":"bell","device":"x"</code>: Sends bell command to devices supporting this. ’x’ could either be an integer of the device-id, or the name of the device.</p>
   </li>
-  <li><code class="highlighter-rouge">"function":"learn","device":"x"</code>: Sends a special learn command to devices supporting this. This is normaly devices of ’selflearning’ type. ’x’ could either be an integer of the device-id, or the name of the device.</li>
+  <li><code class="highlighter-rouge">"function":"learn","device":"x"</code>: Sends a special learn command to devices supporting this. This is normally devices of ’selflearning’ type. ’x’ could either be an integer of the device-id, or the name of the device.</li>
 </ul>
 </article>
         </div>
diff --git a/atom.xml b/atom.xml
index ee32a2992f..cac0cc16f7 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>2018-01-21T16:34:50+00:00</updated>
+  <updated>2018-01-21T17:08:34+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/announcement/atom.xml b/blog/categories/announcement/atom.xml
index b7f14fef68..09a94fb04c 100644
--- a/blog/categories/announcement/atom.xml
+++ b/blog/categories/announcement/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Announcement | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/announcement/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2018-01-21T16:34:50+00:00</updated>
+  <updated>2018-01-21T17:08:34+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 ba1e71b357..fe17e368f4 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>2018-01-21T16:34:50+00:00</updated>
+  <updated>2018-01-21T17:08:34+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 445cfefd4f..130b5b77e5 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>2018-01-21T16:34:50+00:00</updated>
+  <updated>2018-01-21T17:08:34+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 d4b9b408e1..9290f7abab 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>2018-01-21T16:34:50+00:00</updated>
+  <updated>2018-01-21T17:08:34+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 514de0468c..cad8fbba15 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>2018-01-21T16:34:50+00:00</updated>
+  <updated>2018-01-21T17:08:34+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 a85b66cc28..5e99e45b84 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>2018-01-21T16:34:50+00:00</updated>
+  <updated>2018-01-21T17:08:34+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 f5d80bdb1e..b8ce712885 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>2018-01-21T16:34:50+00:00</updated>
+  <updated>2018-01-21T17:08:34+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 10e51c67cc..6ab240ab13 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>2018-01-21T16:34:50+00:00</updated>
+  <updated>2018-01-21T17:08:34+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 3cf16e576d..cc2dab8aca 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>2018-01-21T16:34:50+00:00</updated>
+  <updated>2018-01-21T17:08:34+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 9413500d64..2d8e577f1f 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>2018-01-21T16:34:50+00:00</updated>
+  <updated>2018-01-21T17:08:34+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 524a4e1783..3292001db1 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>2018-01-21T16:34:50+00:00</updated>
+  <updated>2018-01-21T17:08:34+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 509ca55e2b..7bb3dcb211 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>2018-01-21T16:34:50+00:00</updated>
+  <updated>2018-01-21T17:08:34+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 5a4831b5ed..2b0d694334 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>2018-01-21T16:34:50+00:00</updated>
+  <updated>2018-01-21T17:08:34+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 a91a0df87d..0de479ee2d 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>2018-01-21T16:34:50+00:00</updated>
+  <updated>2018-01-21T17:08:34+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 15cf5fd273..417a75c75c 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>2018-01-21T16:34:50+00:00</updated>
+  <updated>2018-01-21T17:08:34+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 d2f1ff65de..8fc2da3ad1 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>2018-01-21T16:34:50+00:00</updated>
+  <updated>2018-01-21T17:08:34+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 ff0c3f64c3..d5ea04111c 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>2018-01-21T16:34:50+00:00</updated>
+  <updated>2018-01-21T17:08:34+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/public/atom.xml b/blog/categories/public/atom.xml
index efa5613e03..f95b3f76b6 100644
--- a/blog/categories/public/atom.xml
+++ b/blog/categories/public/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Public | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/public/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2018-01-21T16:34:50+00:00</updated>
+  <updated>2018-01-21T17:08:34+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 f2286a504f..a2cc151c76 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>2018-01-21T16:34:50+00:00</updated>
+  <updated>2018-01-21T17:08:34+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/service/atom.xml b/blog/categories/service/atom.xml
index 1bb19c60d9..b3b7c73979 100644
--- a/blog/categories/service/atom.xml
+++ b/blog/categories/service/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Service | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/service/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2018-01-21T16:34:50+00:00</updated>
+  <updated>2018-01-21T17:08:34+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 e590ad6260..f5389e76f5 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>2018-01-21T16:34:50+00:00</updated>
+  <updated>2018-01-21T17:08:34+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 b4d1ad918d..b0c1a8c68c 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>2018-01-21T16:34:50+00:00</updated>
+  <updated>2018-01-21T17:08:34+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 2b005e2cdd..18b5f4b841 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>2018-01-21T16:34:50+00:00</updated>
+  <updated>2018-01-21T17:08:34+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 d39a72a0ac..6539366d94 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>2018-01-21T16:34:50+00:00</updated>
+  <updated>2018-01-21T17:08:34+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 beb3104329..acab325c46 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>2018-01-21T16:34:50+00:00</updated>
+  <updated>2018-01-21T17:08:34+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 dc08e4ed32..3f5de4c868 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>2018-01-21T16:34:50+00:00</updated>
+  <updated>2018-01-21T17:08:34+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/docs/installation/raspberry-pi/index.html b/docs/installation/raspberry-pi/index.html
index 10f0a43fb3..b1be26b792 100644
--- a/docs/installation/raspberry-pi/index.html
+++ b/docs/installation/raspberry-pi/index.html
@@ -124,6 +124,7 @@ Since this account is only for running Home Assistant the extra arguments of <co
 <p class="note">
 When you run the <code class="highlighter-rouge">hass</code> command for the first time, it will download, install and cache the necessary libraries/dependencies. This procedure may take anywhere between 5 to 10 minutes. During that time, you may get “site cannot be reached” error when accessing the web interface. This will only happen for the first time, and subsequent restarts will be much faster.
 </p>
+<p>If you want setup <code class="highlighter-rouge">hass</code> as a daemon and autostart it on boot please refer to [Autostart Home Assistant](/docs/autostart/].</p>
 </article>
         </div>
         <aside id="sidebar" class="grid__item one-third lap-one-whole palm-one-whole">
diff --git a/sitemap.xml b/sitemap.xml
index c0e16a9599..1e72fd003d 100644
--- a/sitemap.xml
+++ b/sitemap.xml
@@ -3910,7 +3910,7 @@
 </url>
 <url>
 <loc>https://home-assistant.io/components/switch.hook/</loc>
-<lastmod>2018-01-21T16:34:50+00:00</lastmod>
+<lastmod>2018-01-21T17:08:34+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/cookbook/automation_for_rainy_days/</loc>
@@ -4594,99 +4594,99 @@
 </url>
 <url>
 <loc>https://home-assistant.io/docs/autostart/init.d/</loc>
-<lastmod>2018-01-21T16:34:50+00:00</lastmod>
+<lastmod>2018-01-21T17:08:34+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/docs/ecosystem/appdaemon/</loc>
-<lastmod>2018-01-21T16:34:50+00:00</lastmod>
+<lastmod>2018-01-21T17:08:34+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/docs/ecosystem/appdaemon/api/</loc>
-<lastmod>2018-01-21T16:34:50+00:00</lastmod>
+<lastmod>2018-01-21T17:08:34+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/docs/ecosystem/appdaemon/configuration/</loc>
-<lastmod>2018-01-21T16:34:50+00:00</lastmod>
+<lastmod>2018-01-21T17:08:34+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/docs/ecosystem/appdaemon/example_apps/</loc>
-<lastmod>2018-01-21T16:34:50+00:00</lastmod>
+<lastmod>2018-01-21T17:08:34+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/docs/ecosystem/appdaemon/installation/</loc>
-<lastmod>2018-01-21T16:34:50+00:00</lastmod>
+<lastmod>2018-01-21T17:08:34+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/docs/ecosystem/appdaemon/operation/</loc>
-<lastmod>2018-01-21T16:34:50+00:00</lastmod>
+<lastmod>2018-01-21T17:08:34+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/docs/ecosystem/appdaemon/reboot/</loc>
-<lastmod>2018-01-21T16:34:50+00:00</lastmod>
+<lastmod>2018-01-21T17:08:34+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/docs/ecosystem/appdaemon/running/</loc>
-<lastmod>2018-01-21T16:34:50+00:00</lastmod>
+<lastmod>2018-01-21T17:08:34+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/docs/ecosystem/appdaemon/tutorial/</loc>
-<lastmod>2018-01-21T16:34:50+00:00</lastmod>
+<lastmod>2018-01-21T17:08:34+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/docs/ecosystem/appdaemon/updating/</loc>
-<lastmod>2018-01-21T16:34:50+00:00</lastmod>
+<lastmod>2018-01-21T17:08:34+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/docs/ecosystem/appdaemon/windows/</loc>
-<lastmod>2018-01-21T16:34:50+00:00</lastmod>
+<lastmod>2018-01-21T17:08:34+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/docs/ecosystem/certificates/</loc>
-<lastmod>2018-01-21T16:34:50+00:00</lastmod>
+<lastmod>2018-01-21T17:08:34+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/docs/ecosystem/hadashboard/</loc>
-<lastmod>2018-01-21T16:34:50+00:00</lastmod>
+<lastmod>2018-01-21T17:08:34+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/docs/ecosystem/hass-configurator/</loc>
-<lastmod>2018-01-21T16:34:50+00:00</lastmod>
+<lastmod>2018-01-21T17:08:34+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/docs/ecosystem/ios/</loc>
-<lastmod>2018-01-21T16:34:50+00:00</lastmod>
+<lastmod>2018-01-21T17:08:34+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/docs/ecosystem/nginx/</loc>
-<lastmod>2018-01-21T16:34:50+00:00</lastmod>
+<lastmod>2018-01-21T17:08:34+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/docs/ecosystem/notebooks/</loc>
-<lastmod>2018-01-21T16:34:50+00:00</lastmod>
+<lastmod>2018-01-21T17:08:34+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/docs/ecosystem/scenegen/</loc>
-<lastmod>2018-01-21T16:34:50+00:00</lastmod>
+<lastmod>2018-01-21T17:08:34+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/docs/ecosystem/synology/</loc>
-<lastmod>2018-01-21T16:34:50+00:00</lastmod>
+<lastmod>2018-01-21T17:08:34+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/docs/tools/</loc>
-<lastmod>2018-01-21T16:34:50+00:00</lastmod>
+<lastmod>2018-01-21T17:08:34+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/docs/tools/dev-tools/</loc>
-<lastmod>2018-01-21T16:34:50+00:00</lastmod>
+<lastmod>2018-01-21T17:08:34+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/docs/tools/hass/</loc>
-<lastmod>2018-01-21T16:34:50+00:00</lastmod>
+<lastmod>2018-01-21T17:08:34+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/docs/tools/scripts/</loc>
-<lastmod>2018-01-21T16:34:50+00:00</lastmod>
+<lastmod>2018-01-21T17:08:34+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/faq/after-upgrading/</loc>
@@ -5839,62 +5839,62 @@
 </url>
 <url>
 <loc>https://home-assistant.io/demo/frontend.html</loc>
-<lastmod>2018-01-21T16:34:02+00:00</lastmod>
+<lastmod>2018-01-21T17:07:39+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/index.html</loc>
-<lastmod>2018-01-21T16:34:02+00:00</lastmod>
+<lastmod>2018-01-21T17:07:39+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-dev-event.html</loc>
-<lastmod>2018-01-21T16:34:02+00:00</lastmod>
+<lastmod>2018-01-21T17:07:39+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-dev-info.html</loc>
-<lastmod>2018-01-21T16:34:02+00:00</lastmod>
+<lastmod>2018-01-21T17:07:39+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-dev-service.html</loc>
-<lastmod>2018-01-21T16:34:02+00:00</lastmod>
+<lastmod>2018-01-21T17:07:39+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-dev-state.html</loc>
-<lastmod>2018-01-21T16:34:02+00:00</lastmod>
+<lastmod>2018-01-21T17:07:39+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-dev-template.html</loc>
-<lastmod>2018-01-21T16:34:02+00:00</lastmod>
+<lastmod>2018-01-21T17:07:39+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-history.html</loc>
-<lastmod>2018-01-21T16:34:02+00:00</lastmod>
+<lastmod>2018-01-21T17:07:39+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-iframe.html</loc>
-<lastmod>2018-01-21T16:34:02+00:00</lastmod>
+<lastmod>2018-01-21T17:07:39+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-logbook.html</loc>
-<lastmod>2018-01-21T16:34:02+00:00</lastmod>
+<lastmod>2018-01-21T17:07:39+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-map.html</loc>
-<lastmod>2018-01-21T16:34:02+00:00</lastmod>
+<lastmod>2018-01-21T17:07:39+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/googlef4f3693c209fe788.html</loc>
-<lastmod>2018-01-21T16:34:02+00:00</lastmod>
+<lastmod>2018-01-21T17:07:39+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/static/fonts/roboto/DESCRIPTION.en_us.html</loc>
-<lastmod>2018-01-21T16:34:03+00:00</lastmod>
+<lastmod>2018-01-21T17:07:40+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/static/fonts/robotomono/DESCRIPTION.en_us.html</loc>
-<lastmod>2018-01-21T16:34:03+00:00</lastmod>
+<lastmod>2018-01-21T17:07:40+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/static/mdi-demo.html</loc>
-<lastmod>2018-01-21T16:34:03+00:00</lastmod>
+<lastmod>2018-01-21T17:07:40+00:00</lastmod>
 </url>
 </urlset>