test

_config.yml

@@ -3,7 +3,7 @@
 #      Main Configs       #
 # ----------------------- #
 
-url: https://www.home-assistant.io
+url: https://home-assistant.io
 title: Home Assistant
 subtitle: Open-source home automation platform running on Python 3
 author: Home Assistant
@@ -139,14 +139,14 @@ social:
 
 # Home Assistant release details
 current_major_version: 0
-current_minor_version: 69
-current_patch_version: 0
-date_released: 2018-05-11
+current_minor_version: 65
+current_patch_version: 5
+date_released: 2018-03-14
 
 # Either # or the anchor link to latest release notes in the blog post.
 # Must be prefixed with a # and have double quotes around it.
 # Major release:
-patch_version_notes: "#"
+patch_version_notes: "#release-0655---march-14"
 # Minor release (Example #release-0431---april-25):
 
 # Date we moved to Discourse for comments

credits_generator/README.md

@@ -1,12 +1,11 @@
 credits_generator
 =================
 
-This tool can be used to update the [Credits page for Home Assistant](https://home-assistant.io/developers/credits/).
+This tool can be used to update the [Home Assistant's Credits page](https://home-assistant.io/developers/credits/).
 
 Setup
 -----
 
-Fetch the dependencies with `npm`.
 ```bash
 $ cd credits_generator
 $ npm install
@@ -14,11 +13,8 @@ $ npm install
 
 Usage
 -----
-Go to https://github.com/settings/tokens/new and generate a new GitHub personal access token.
-Give the token any name and select the `public_repo` and `read:user` scopes.
 
-
-Set the environment variable `GITHUB_TOKEN` to the new token.
+Set your personal GitHub access token as environmental variable.
 
 ```bash
 $ export GITHUB_TOKEN=<Your GitHub access token>
@@ -27,6 +23,7 @@ $ export GITHUB_TOKEN=<Your GitHub access token>
 Run the script.
 
 ```bash
+$ cd credits_generator
 $ node update_credits.js
 ```
 

credits_generator/update_credits.js

@@ -58,12 +58,7 @@ github.repos.getForOrg({
           cb(err);
           return;
         }
-	if (userInfo.name) {
-	  userInfo.name = userInfo.name.replace(/^@/, '')
-	  .replace(/</g, '&lt;')
-	  .replace(/>/g, '&gt;')
-	  .replace(/[\\`*_{}[\]()#+-.!~|]/g, '\\$&');
-	}
+        if(userInfo.login == 'RubenKelevra') userInfo.name = 'RubenKelevra'; // ugh, because his name is `@RubenKelevra`
         usersMap[login].info.name = userInfo.name || userInfo.login;
         usersMap[login].info.username = userInfo.login;
         cb();

plugins/configuration.rb

@@ -2,7 +2,7 @@ module Jekyll
   class ConfigurationBlock < Liquid::Block
     TYPE_LINKS = {
       'action'       => '/docs/scripts/',
-      'device_class' => '/components/%{component}/#device-class',
+      'device_class' => '/components/%{component}/#device_class',
       'template'     => '/docs/configuration/templating/',
     }
 

plugins/environment_variables.rb

@@ -1,17 +0,0 @@
-module Jekyll
-  class EnvironmentVariablesGenerator < Generator
-    def generate(site)
-      # https://www.netlify.com/docs/continuous-deployment/#build-environment-variables
-      repo_url = ENV['REPOSITORY_URL'] || 'https://github.com/home-assistant/home-assistant.github.io'
-
-      # Rewrite urls if repo url is the ssh format.
-      if repo_url.start_with? 'git@github.com:'
-        repo_url = repo_url.sub 'git@github.com:', 'https://github.com/'
-      end
-
-      # These values will be available as {{ site.NLY_REPOSITORY_URL }}
-      site.config['NLY_REPOSITORY_URL'] = repo_url
-      site.config['NLY_HEAD'] = ENV['HEAD'] || 'current'
-    end
-  end
-end

plugins/filters.rb

@@ -24,7 +24,7 @@ module Jekyll
     # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 
     def site_url
-      'https://www.home-assistant.io'
+      'https://home-assistant.io'
     end
 
     # Prepend a url with the full site url

sass/custom/_paulus.scss

@@ -4,10 +4,6 @@ $primary-color: #049cdb;
 
 .site-header {
   position: relative;
-
-  .site-title {
-    font-weight: normal;
-  }
 }
 
 .search-container {
@@ -381,26 +377,18 @@ p.note {
 }
 
 .copyright {
-  text-align: left;
+  text-align: center;
 
-  .company {
-    .title {
-      font-size: 1.5em;
-    }
-
-    img {
-      vertical-align: middle;
-    }
-
-    i {
-      font-size: 2em;
-      padding: 0 5px;
-    }
+  i {
+    font-size: 3em;
+    margin-right: 8px;
+    position: relative;
+    top: -5px;
   }
-
-  ul {
-    margin: 0;
-    list-style: none;
+  .credit {
+    text-align: left;
+    display: inline-block;
+    font-size: .8em;
   }
 }
 

source/_addons/configurator.markdown

@@ -65,7 +65,7 @@ Screenshot of the HASS Configurator.
 
 ### {% linkable_title Embedding into Home-Assistant %}
 
-Using the Home Assistant component [panel_iframe](/components/panel_iframe/) it is possible to embed the configurator directly into Home Assistant, allowing you to modify your configuration from within the Home Assistant frontend.
+Using the Home Assistant component [panel_iframe](https://home-assistant.io/components/panel_iframe/) it is possible to embed the configurator directly into Home Assistant, allowing you to modify your configuration from within the Home Assistant frontend.
 
 An example configuration would look like this:
 

source/_addons/duckdns.markdown

@@ -10,14 +10,12 @@ footer: true
 featured: true
 ---
 
-[Duck DNS](https://www.duckdns.org/) is a free service which will point a DNS (sub domains of duckdns.org) to an IP of your choice. This add-on includes support for Let's Encrypt and will automatically create and renew your certificates.
+[Duck DNS](https://duckdns.org/) is a free service which will point a DNS (sub domains of duckdns.org) to an IP of your choice. This add-on includes support for Let's Encrypt and will automatically create and renew your certificates.
 
 ```json
 {
   "lets_encrypt": {
-    "accept_terms": true,
-    "certfile": "fullchain.pem",
-    "keyfile": "privkey.pem"
+    "accept_terms": true
   },
   "token": "sdfj-2131023-dslfjsd-12321",
   "domains": ["my-domain.duckdns.org"]
@@ -26,10 +24,10 @@ featured: true
 
 Configuration variables:
 
-- **lets_encrypt.accept_terms** (*Optional*): If you accept the [Let's Encrypt Subscriber Agreement][le], it will generate and update Let's Encrypt certificates for your DuckDNS domain.
 - **token** (*Required*): Your Duck DNS API key.
 - **domains** (*Required*): A list of domains to update DNS.
-- **seconds** (*Required*): Seconds between updates to Duck DNS.
+- **seconds** (*Optional*): Seconds between updates to Duck DNS.
+- **lets_encrypt.accept_terms** (*Optional*): If you accept the [Let's Encrypt Subscriber Agreement][le], it will generate & update Let's Enrypt certificates for your DuckDNS domain.
 
 [le]: https://letsencrypt.org/repository/
 
@@ -51,5 +49,3 @@ If you use a port other than `8123` or an SSL proxy, change the port number acco
 You'll need to forward the port you listed in your configuration (8123 in the example above) on your router to your Home Assistant system. You can find guides on how to do this on [Port Forward](https://portforward.com/) - noting that you'll only need to forward the TCP port.
 
 Ensure that you allocate the Home Assistant system a fixed IP on your network before you configure port forwarding. You can do this either on the computer itself (see the [install guide](/hassio/installation/) or via a static lease on your router.
-
-Restart Home Assistant for the configured changes to take effect. When you access the Home Assistant frontend you will now need to use `https`, even when accessing local instances, for example at `https://192.168.0.1:8123`. 

source/_addons/google_assistant.markdown

@@ -11,7 +11,7 @@ featured: true
 ---
 
 <p class='note'>
-  If you want to integrate your Google Home, or mobile phone running Google Assistant, with Home Assistant, then you want the [Google Assistant component](/components/google_assistant/).
+  If you want to integrate your Google Home, or mobile phone running Google Assistant, with Home Assistant, then you want the [Google Assistant component](https://home-assistant.io/components/google_assistant/).
 </p>
 
 [Google Assistant][GoogleAssistant] is an AI-powered voice assistant that runs on the Raspberry Pi and x86 platforms and interact via the [DialogFlow][comp] integration with Home-Assistant. You can also use [Google Actions][GoogleActions] to extend its functionality.
@@ -66,7 +66,7 @@ Configuration example that uses the USB microphone and the built-in headset audi
 
 Configuration variables:
 
-- **mic**: This is the hardware address of your microphone. Look at the add-on output
+- **mic**: This is the hardware address of your microphone. Look at the add-on output 
 - **speaker**: This is the hardware address of your speakers. Look at the add-on output
 
 ### {% linkable_title Home Assistant configuration %}

source/_addons/lets_encrypt.markdown

@@ -2,7 +2,7 @@
 layout: page
 title: "Let's Encrypt"
 description: "Automatically manage your SSL certificate using Let's Encrypt."
-date: 2018-04-18 10:55
+date: 2017-04-30 13:28
 sidebar: true
 comments: false
 sharing: true
@@ -41,24 +41,4 @@ http:
 
 If you use another port such as `8123` or an SSL proxy, change the port number.
 
-## {% linkable_title Enabling auto-renewals %}
-
-Out of the box, the add-on will not automatically renew your certificate. In fact, it only starts, tries to get/renew your certificte, and then stops. It's up to you to manually start it again whenever your certificate comes close to expiry.
-
-However, you can automate this process using Home Assistant.
-
-Use this in your `automations.yaml` to attempt certificate renewal each day at midnight:
-
-```yaml
-- id: letsencrypt-renewal
-  alias: "Let's Encrypt Renewal"
-  trigger:
-  - platform: time
-    at: '00:00:00'
-  action:
-  - service: hassio.addon_restart
-    data:
-      addon: core_letsencrypt
-```
-
 [DuckDNS add-on]: /addons/duckdns/

source/_addons/mariadb.markdown

@@ -9,7 +9,7 @@ sharing: true
 footer: true
 ---
 
-Set up a [mariadb](https://mariadb.org/) SQL server. It supports multiple databases, users, and permission settings. If you want to only connect from inside Home Assistant use `core-mariadb` as the host address.
+Set up a [mariadb](https://mariadb.org/) SQL server. It supports multiple databases, users, and permission settings. If you want to only connect from inside home assistant use `core-mariadb` as the host address.
 
 ```json
 {

source/_addons/mosquitto.markdown

@@ -43,7 +43,7 @@ Configuration variables:
 
 ### {% linkable_title Home Assistant configuration %}
 
-To use the Mosquitto as [broker](/docs/mqtt/broker/#run-your-own), add the following entry to the `configuration.yaml` file.
+To use the Mosquitto as [broker](/docs/mqtt/broker/#run-your-own) add the following entry to the `configuration.yaml` file.
 
 ```yaml
 # Example configuration.yaml entry
@@ -59,20 +59,3 @@ mqtt:
   username: YOUR_USERNAME
   password: YOUR_PASSWORD
 ```
-
-### {% linkable_title Listening simultaneously on SSL/TLS (8883) and insecure (1883) ports %}
-
-1. Configure SSL/TLS as normal.
-2. Set `customize` flag to `true` in your configuration.
-3. Create a file in `/share/mosquitto` named `insecure.conf` with the following contents:
-
-```text
-listener 1883
-protocol mqtt
-```
-
-4. Restart MQTT
-
-<p class='note warning'>
-It's recommened that you only open your firewall to the SSL/TLS port (8883) and only use the insecure port (1883) for local devices.
-</p>

source/_addons/nginx_proxy.markdown

@@ -11,14 +11,13 @@ footer: true
 
 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.
 
-In the `http` section of the `configuration.yaml` file remove `ssl_certificate` and `ssl_key` and don't enter the port in the `base_url` to avoid an HTTP 502 error.
+In the `http` section of the `configuration.yaml` file remove `ssl_certificate` and `ssl_key` and don't enter the port in the `base_url` to avoid a HTTP 502 error.
 
 ```json
 {
   "domain": "home.example.com",
   "certfile": "fullchain.pem",
   "keyfile": "privkey.pem",
-  "hsts": "max-age=31536000; includeSubDomains",
   "customize": {
     "active": false,
     "default": "nginx_proxy_default*.conf",
@@ -32,7 +31,6 @@ Configuration variables:
 - **domain** (*Required*): Domain they will proxy run with it.
 - **certfile** (*Required*): Certificate file to use in the /ssl dir.
 - **keyfile** (*Required*): Private key file to use in the /ssl dir.
-- **hsts** (*Optional*): Value for the [`Strict-Transport-Security`](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Strict-Transport-Security) HTTP header to send. If empty or `null`, the header is not sent.
 - **customize** (*Optional*): If true, additional NGINX configuration files for the default server and additional servers are read from files in the /share dir specified by the `default` and `servers` variables.
 
 <p class='note'>

source/_addons/samba.markdown

@@ -35,7 +35,7 @@ Configuration variables:
 - **name** (*Optional*): Set netbios name of Hass.io device. Default is `hassio`.
 - **workgroup** (*Optional*): Set network workgroup name. Default is `WORKGROUP`.
 - **guest** (*Optional*): Allow login without a username or password. Default is `true`.
-- **map** (*Optional*): Control which folders will be exposed. `config` shares the Home Assistant configuration folder. `addons` shares the local custom repository. `share` shares a folder that can be accessed by add-ons and Home Assistant. `backup` shares access to snapshot files. `ssl` shares certificate storage. Be careful with the `ssl` option! Defaults are all set to `true`, except for `ssl`.
+- **map** (*Optional*): Control which folders will be exposed. `config` shares the Home Assistant configuration folder. `addons` shares the local custom repositiory. `share` shares a folder that can be accessed by add-ons and Home Assistant. `backup` shares access to snapshot files. `ssl` shares certificate storage. Be careful with the `ssl` option! Defaults are all set to `true`, except for `ssl`.
 - **username** (*Optional*): Username for logging in if guest login is not used.
 - **password** (*Optional*): Password for `username`. An empty password is not supported.
 - **interface** (*Optional*): Interface that will start the share. Normally this is `eth0` for ethernet wired connection and `wlan0` for wireless connection.

source/_addons/snips.markdown

@@ -2,39 +2,51 @@
 layout: page
 title: "Snips.ai"
 description: "Enhance your Hass.io installation with a local voice assistant."
-date: 2018-05-02 13:28
+date: 2017-04-30 13:28
 sidebar: true
 comments: false
 sharing: true
 footer: true
 ---
 
-[Snips.ai](https://snips.ai/) is an AI-powered voice assistant that runs on the Raspberry Pi 3 and x86 platforms. It runs on-device and is Private by Design.
+[Snips.ai] is an AI-powered voice assistant that runs on the Raspberry Pi 3 and x86 platforms. It runs on-device and is Private by Design.
 
-The Snips add-on depends on the Mosquitto add on to bridge to Home Assistant, so make sure that is installed.
+To get started, follow [their tutorial] to create an assistant and download the training data.
 
-HomeAssistant comes with certain Intents builtin to handle common tasks. A complete list of Intents can be found in this wiki [Hass Snips Bundle](https://github.com/tschmidty69/hass-snips-bundle-intents/wiki).
+Now install and activate the [Samba] add-on so you can upload your training data. Connect to the "share" Samba share and copy your training data over. Name the file `assistant.zip`.
 
-The Snips addon by default comes with an assistant that allows you to turn on lights or switches, open covers, or add and list items to a shopping list if that component is enabled.
+Now it's time to start Snips for the first time. When the Snips add-on starts, it will output your audio devices:
 
-If using a USB microphone and speakers plugged into the Raspberry Pi output, Snips will work without any change to the configuration. Trying saying things like:
-
-```
-Turn on kitchen light
-Open garage door
-What is on my shopping list
+```text
+**** List of PLAYBACK Hardware Devices ****
+card 0: ALSA [bcm2835 ALSA], device 0: bcm2835 ALSA [bcm2835 ALSA]
+  Subdevices: 8/8
+  Subdevice #0: subdevice #0
+  Subdevice #1: subdevice #1
+  Subdevice #2: subdevice #2
+  Subdevice #3: subdevice #3
+  Subdevice #4: subdevice #4
+  Subdevice #5: subdevice #5
+  Subdevice #6: subdevice #6
+  Subdevice #7: subdevice #7
+card 0: ALSA [bcm2835 ALSA], device 1: bcm2835 ALSA [bcm2835 IEC958/HDMI]
+  Subdevices: 1/1
+  Subdevice #0: subdevice #0
 ```
 
-To get started creating your own configuration, follow [their tutorial](https://snips.gitbook.io/documentation/console) to create an assistant and download the training data. You can also add the HomeAssistant Skill to your assistant to enable the built-in intents, and add or create your own intents to do more complex tasks.
+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.
 
-Now install and activate the [Samba](/addons/samba/) add-on so you can upload your training data. Connect to the "share" Samba share and copy your assistant over. Name the file `assistant.zip` or whatever you have configured in the configuration options.
+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 `mic` (microphone to use) and `speaker` (speaker to use). The format for these options is `<card #>,<device #>`. Change the configuration options and click save.
 
-Now it's time to start Snips for the first time. You can configure the microphone and sound card using the Add-on interface. Now start the add-on.
+Now start the add-on.
 
-### {% linkable_title Add-On configuration %}
+### Add-On configuration
 
 ```json
 {
+  "mic": "1,0",
+  "speaker": "1,0",
+  "assistant": "assistant.zip",
   "mqtt_bridge": {
     "active": true,
     "host": "172.17.0.1",
@@ -42,76 +54,23 @@ Now it's time to start Snips for the first time. You can configure the microphon
     "user": "",
     "password": ""
   },
-  "assistant": "assistant.zip",
-  "language": "en",
-  "custom_tts": false,
-  "tts_platform": "amazon_polly"
 }
 ```
 
 Configuration variables:
 
-- **mqtt_bridge**: Snips uses MQTT to communicate and defaults to their own broker. Use this config option to bridge their broker to your the Mosquitto add-on.
-- **assistant**: The name of your custom assistant in `/share`. If no assistant is found then a default assistant will be used.
-- **language**: Language. This is used to select the default custom assistant, Currently `en`, `de` and `fr` are supported.
-- **custom_tts**: Whether to use a TTS provider from Home Assistant for a variety of voices.
-- **tts_platform**: Which TTS platform to use.
+- **mqtt_bridge** (*Optional*): Snips uses MQTT to communicate and defaults to their own broker. Use this config option to bridge their broker to your own.
+- **mic**: This is the hardware address of your microphone. Look at the Snips 
 
 ### {% linkable_title Home Assistant configuration %}
 
-A simple configuration just requires this. Consult [Snips.ai component](/components/snips/) for more options.
+Use the Home Assistant [Snips.ai component][comp] to integrate the add-on into Home Assistant.
 
 ```yaml
 snips:
 ```
 
-### {% linkable_title Home Assistant configuration %}
-
-There is an active [discord](https://discordapp.com/invite/3939Kqx) channel for further support.
-
-### {% linkable_title Examples %}
-
-So now you can turn lights on and off, let's check the weather. Log on to the [console](https://console.snips.ai/). If this is your first time, create a new assistant and add the Home Assistant skill, along with the Weather skill by snips. Download your assistant manually and copy it to the `/share` folder on your HassIO installation using the Samba addon.
-
-Next create a weather sensor, e.g., one for (Dark Sky)[/components/sensor.darksky/] and put the `api_key` in your `secrets.yaml` file.
-
-```yaml
-- platform: darksky
-  name: "Dark Sky Weather"
-  api_key: !secret dark_sky_key
-  update_interval:
-    minutes: 10
-  monitored_conditions:
-    - summary
-    - hourly_summary
-    - temperature
-    - temperature_max
-    - temperature_min
-```
-Next add this to your `configuration.yaml` file to reference a new `intent_script` component. This is a good practice to [split your configuration files](/docs/configuration/splitting_configuration/) up.
-
-```yaml
-intent_script: !include intent_script.yaml
-```
-
-Finally, create this `intent_script.yaml` file in your configuration directory.
-
-{% raw %}
-```yaml
-searchWeatherForecast:
-  speech:
-    type: plain
-    text: >
-      The weather is currently
-      {{ states('sensor.dark_sky_weather_temperature') | round(0) }}
-      degrees outside and {{ states('sensor.dark_sky_weather_summary') }}.
-      The high today will be
-      {{ states('sensor.dark_sky_weather_daily_high_temperature') | round(0)}}
-      and {{ states('sensor.dark_sky_weather_hourly_summary') }}
-```
-{% endraw %}
-
-Now just restart HassIO and ask it what the weather is like.
-
-[their tutorial]: https://github.com/snipsco/snips-platform-documentation/wiki/2.-Create-an-assistant-using-an-existing-bundle
-
+[Snips.ai]: https://snips.ai/
+[their tutorial]: https://github.com/snipsco/snips-platform-documentation/wiki/2.-Running-your-first-end-to-end-assistant
+[Samba]: /addons/samba/
+[comp]: /components/snips/

source/_addons/tellstick.markdown

@@ -19,9 +19,9 @@ After any changes have been made to the configuration, you need to restart the a
 
 Configuration variables:
 
-- **id** (*Required*): A number and must be unique for each device.
-- **name** (*Required*): A name for easy identification of the device.
-- **protocol** (*Required*): This is the protocol the device uses. More on the different protocols later down.
+- **id** (*Required*): A number and must be unique for each device. 
+- **name** (*Required*): A name for easy identification of the device. 
+- **protocol** (*Required*): This is the protocol the device uses. More on the different protocols later down. 
 - **model** (*Optional*): 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.
 - **house** (*Optional*): Depending on protocol the values here can vary a lot to identify or group per house or type.
 - **unit** (*Optional*): Unit identifier, in most cases a value between 1 to 16 and often used in combination with the house.
@@ -37,10 +37,10 @@ You will need to add internal communication details to `configuration.yaml` to e
 tellstick:
     host: core-tellstick
     port: [50800, 50801]
-
+    
 ```
 
-To add [lights](/components/light.tellstick/), [sensors](/components/sensor.tellstick/) and [switches](/components/switch.tellstick/) you follow the guidelines for each type individually that is [described for Home Assistant](/components/tellstick/)
+To add [lights](https://home-assistant.io/components/light.tellstick/), [sensors](https://home-assistant.io/components/sensor.tellstick/) and [switches](https://home-assistant.io/components/switch.tellstick/) you follow the guidelines for each type individually that is [described for Home Assistant](https://home-assistant.io/components/tellstick/)
 
 The add-on will also enable you to interact with the `tdtool` via a Home Assistant services call, see example below for self-learning device.
 

source/_components/abode.markdown

@@ -24,7 +24,7 @@ There is currently support for the following device types within Home Assistant:
 - [Camera](/components/camera.abode/): Reports on `Camera` devices and will download and show the latest captured still image.
 - [Cover](/components/cover.abode/): Reports on `Secure Barriers` and can be used to open and close the cover.
 - [Lock](/components/cover.abode/): Reports on `Door Locks` and can be used to lock and unlock the door.
-- [Light](/components/light.abode/): Reports on `Dimmer` lights and can be used to dim or turn the light on and off.
+- [Light](/components/light.abode/): Reports on `Dimmer` lights and can be used to dim, change color, or turn the light on and off.
 - [Switch](/components/switch.abode/): Reports on `Power Switch` devices and can be used to turn the power switch on and off. Also reports on `Automations` set up in the Abode system and allows you to activate or deactivate them.
 - [Sensor](/components/sensor.abode/): Reports on `Temperature`, `Humidity`, and `Light` sensors.
 

source/_components/alarm_control_panel.abode.markdown

@@ -1,7 +1,7 @@
 ---
 layout: page
 title: "Abode Alarm Control Panel"
-description: "Instructions on how to setup the Abode Alarm control panel within Home Assistant."
+description: "Instructions how to setup the Abode Alarm control panel within Home Assistant."
 date: 2017-08-26 0:28
 sidebar: true
 comments: false

source/_components/alarm_control_panel.alarmdecoder.markdown

@@ -1,7 +1,7 @@
 ---
 layout: page
 title: "AlarmDecoder Alarm Control Panel"
-description: "Instructions on how to setup the AlarmDecoder Alarm control panel within Home Assistant."
+description: "Instructions how to setup the AlarmDecoder Alarm control panel within Home Assistant."
 date: 2017-04-02 13:28
 sidebar: true
 comments: false
@@ -27,9 +27,7 @@ The Alarm Decoder component gives you access to several services for you to cont
 - `alarm_disarm`: Disarms the alarm from any state. Also clears a `check_zone` flag after an alarm was triggered.
 - `alarmdecoder_alarm_toggle_chime`: Toggles the alarm's chime state.
 
-<p class='note'>
-`alarm_arm_custom_bypass` and `alarm_trigger`, while available in the services list in Home Assistant, are not currently implemented in the Alarm Decoder platform. 
-</p>
+**Note**: `alarm_arm_custom_bypass` and `alarm_trigger`, while available in the services list in Home Assistant, are not currently implemented in the Alarm Decoder component.
 
 ### {% linkable_title Attributes %}
 

source/_components/alarm_control_panel.alarmdotcom.markdown

@@ -1,7 +1,7 @@
 ---
 layout: page
 title: "Alarm.com Alarm Control Panel"
-description: "Instructions on how to integrate Alarm.com into Home Assistant."
+description: "Instructions how to integrate Alarm.com into Home Assistant."
 date: 2016-01-14 22:00
 sidebar: true
 comments: false

source/_components/alarm_control_panel.arlo.markdown

@@ -1,7 +1,7 @@
 ---
 layout: page
 title: "Arlo Control Panel"
-description: "Instructions on how to setup the Netgear Arlo Base Stations as a control panel within Home Assistant."
+description: "Instructions how to setup the Netgear Arlo Base Stations as a control panel within Home Assistant."
 date: 2017-10-05 17:45
 sidebar: true
 comments: false
@@ -27,11 +27,11 @@ alarm_control_panel:
 
 {% configuration %}
 home_mode_name:
-  description: "Arlo base station does not have a built-in home mode. You can map one of your custom modes to Home Assistant's home mode by setting the name of the custom mode in this configuration variable. The name of the custom mode should match exactly as you set it up in the Arlo app."
+  description: "Arlo base station does not have a built-in home mode. You can map one of your custom modes to home assistant's home mode by setting the name of the custom mode in this configuration variable. The name of the custom mode should match exactly as you set it up in the Arlo app."
   required: false
   type: string
 away_mode_name:
-  description: "Arlo base station does not have a built-in away mode. You can map one of your custom modes to Home Assistant's away mode by setting the name of the custom mode in this configuration variable. The name of the custom mode should match eactly as you set it up in the Arlo app."
+  description: "Arlo base station does not have a built-in away mode. You can map one of your custom modes to home assistant's away mode by setting the name of the custom mode in this configuration variable. The name of the custom mode should match eactly as you set it up in the Arlo app."
   required: false
   type: string
   default: "`Armed` mode in Arlo"
@@ -74,3 +74,4 @@ Setting Arlo to a custom mode (mapped to `home_mode_name` in `configuration.yaml
 You can also completely disarm the Arlo base station by calling the `alarm_control_panel.alarm_disarm` service, and trigger the alarm by calling the `alarm_control_panel.alarm_trigger` service.
 
 More examples and configuration options can be found on the [Manual Alarm Control page](/components/alarm_control_panel.manual/#examples).
+

source/_components/alarm_control_panel.concord232.markdown

@@ -1,7 +1,7 @@
 ---
 layout: page
 title: "Concord232 Alarm Control Panel"
-description: "Instructions on how to integrate Interlogix/GE Concord4 with RS-232 Automation Control Module into Home Assistant."
+description: "Instructions how to integrate Interlogix/GE Concord4 with RS-232 Automation Control Module into Home Assistant."
 date: 2016-10-11 10:00
 sidebar: true
 comments: false
@@ -16,7 +16,7 @@ The `concord232` platform provides integration with GE, Interlogix (and other br
 
 To use this platform, you will need to have the external concord232 client and server installed. The server must be running on the device which is connected to the automation module's serial port. The client must be installed on the machine running Home Assistant. These may often be the same machine, but do not have to be. For additional details in setting up and testing the client and server, see <https://github.com/JasonCarter80/concord232>
 
-To enable this platform in Home Assistant, add the following lines to your `configuration.yaml`:
+To enable this platform in home assistant, add the following lines to your `configuration.yaml`:
 
 ```yaml
 # Example configuration.yaml entry

source/_components/alarm_control_panel.egardia.markdown

@@ -1,7 +1,7 @@
 ---
 layout: page
 title: "Egardia / Woonveilig Alarm Control Panel"
-description: "Instructions on how to integrate Egardia / Woonveilig into Home Assistant."
+description: "Instructions how to integrate Egardia / Woonveilig into Home Assistant."
 date: 2016-07-02 22:00
 sidebar: true
 comments: false

source/_components/alarm_control_panel.envisalink.markdown

@@ -1,7 +1,7 @@
 ---
 layout: page
 title: "Envisalink Alarm"
-description: "Instructions on how to setup the Envisalink Alarm control panel within Home Assistant."
+description: "Instructions how to setup the Envisalink Alarm control panel within Home Assistant."
 date: 2016-07-01 08:00
 sidebar: true
 comments: false

source/_components/alarm_control_panel.ialarm.markdown

@@ -1,7 +1,7 @@
 ---
 layout: page
 title: "Antifurto365 iAlarm Control Panel"
-description: "Instructions on how to integrate iAlarms alarms into Home Assistant."
+description: "Instructions how to integrate iAlarms alarms into Home Assistant."
 date: 2017-11-30 20:00
 sidebar: true
 comments: false

source/_components/alarm_control_panel.ifttt.markdown

@@ -1,93 +0,0 @@
----
-layout: page
-title: "IFTTT Alarm Control Panel"
-description: "Instructions on how to integrate IFTTT-controlled security systems into Home Assistant."
-date: 2018-03-10 21:00
-sidebar: true
-comments: false
-sharing: true
-footer: true
-logo: ifttt.png
-ha_category: Alarm
-ha_release: 0.66
----
-
-The `ifttt` platform allows you to integrate security systems that have no open API but can be controlled through [IFTTT](https://ifttt.com/discover).
-
-This platform depends on the [IFTTT](/components/ifttt/) Home Assistant component. See the component's documentation to set it up.
-
-<p class='note'>
-It is important to note that this platform fully relies on IFTTT to receive updates when the security system's state changes. Therefore, this platform shows an assumed state.
-</p>
-
-To enable this, setup the required IFTTT applets as listed below and add the following lines to your `configuration.yaml` file:
-
-```yaml
-# Example configuration.yaml entry
-ifttt:
-  key: YOUR_WEBHOOK_KEY
-  
-alarm_control_panel:
-  - platform: ifttt
-    name: YOUR_ALARM_NAME
-    code: YOUR_ALARM_CODE
-    event_arm_away: YOUR_ARM_AWAY_EVENT
-    event_arm_home: YOUR_ARM_HOME_EVENT
-    event_arm_night: YOUR_ARM_NIGHT_EVENT
-    event_disarm: YOUR_DISARM_EVENT
-```
-
-<p class='note warning'>
-It is strongly discouraged to use this platform when you don't use encryption; otherwise, your API password will be send unprotected through the IFTTT Webhooks. It is adviced to [setup encryption using Let's Encrypt](https://home-assistant.io/blog/2017/09/27/effortless-encryption-with-lets-encrypt-and-duckdns/).
-</p>
-
-{% linkable_title Required IFTTT applets %}
-
-This platform supports the services `alarm_disarm`, `alarm_arm_away`, `alarm_arm_home` and `alarm_arm_night`. For each of these services, an IFTTT webhook will be triggered. 
-
-For this system to operate correctly, the following IFTTT applets have to be setup. Obviously, if your alarm device does not support some states, no applets have to be provided for those.
-* **IF** Webhook event `YOUR_DISARM_EVENT` is called, **THEN** disarm the alarm system.
-* **IF** Webhook event `YOUR_ARM_HOME_EVENT` is called, **THEN** set the alarm system to armed home.
-* **IF** Webhook event `YOUR_ARM_NIGHT_EVENT` is called, **THEN** set the alarm system to armed away.
-* **IF** Webhook event `YOUR_DISARM_EVENT` is called, **THEN** set the alarm system to armed night.
-* **IF** the alarm system was disarmed, **THEN** perform a Webhook `POST` web request to url `https://HASS_URL/api/services/alarm_control_panel/ifttt_push_alarm_state?api_password=API_PASSWORD` with content type `application/json` and body `{"entity_id": "alarm_control_panel.DEVICE_NAME", "state": "disarmed"}`.
-* **IF** the alarm system state changed to armed home, **THEN** perform a Webhook `POST` web request to url `https://HASS_URL/api/services/alarm_control_panel/ifttt_push_alarm_state?api_password=API_PASSWORD` with content type `application/json` and body `{"entity_id": "alarm_control_panel.DEVICE_NAME", "state": "armed_home"}`.
-* **IF** the alarm system state changed to armed away, **THEN** perform a Webhook `POST` web request to url `https://HASS_URL/api/services/alarm_control_panel/ifttt_push_alarm_state?api_password=API_PASSWORD` with content type `application/json` and body `{"entity_id": "alarm_control_panel.DEVICE_NAME", "state": "armed_away"}`.
-* **IF** the alarm system state changed to armed night, **THEN** perform a Webhook `POST` web request to url `https://HASS_URL/api/services/alarm_control_panel/ifttt_push_alarm_state?api_password=API_PASSWORD` with content type `application/json` and body `{"entity_id": "alarm_control_panel.DEVICE_NAME", "state": "armed_night"}`.
-
-
-{% configuration %}
-  name:
-    description: The name of your Home Assistant alarm control panel.
-    required: false
-    type: string
-  code:
-    description: The code for the alarm control panel.
-    required: false
-    type: string
-  event_arm_away:
-    description: IFTTT webhook event to call when the state is set to armed away.
-    required: false
-    type: string
-    default: alarm_arm_away
-  event_arm_home:
-    description: IFTTT webhook event to call when the state is set to armed home.
-    required: false
-    type: string
-    default: alarm_arm_home
-  event_arm_night:
-    description: IFTTT webhook event to call when the state is set to armed night.
-    required: false
-    type: string
-    default: alarm_arm_night
-  event_disarm:
-    description: IFTTT webhook event to call when the state is set to disarmed.
-    required: false
-    type: string
-    default: alarm_disarm
-  optimistic:
-    description: Specify if the state will be updated by a ifttt_push_alarm_state call (false) or can be set immediately (true).
-    required: false
-    type: boolean
-    default: false
-{% endconfiguration %}

source/_components/alarm_control_panel.manual.markdown

@@ -1,7 +1,7 @@
 ---
 layout: page
 title: "Manual Alarm Control Panel"
-description: "Instructions on how to integrate manual alarms into Home Assistant."
+description: "Instructions how to integrate manual alarms into Home Assistant."
 date: 2015-10-13 19:10
 sidebar: true
 comments: false

source/_components/alarm_control_panel.manual_mqtt.markdown

@@ -1,7 +1,7 @@
 ---
 layout: page
 title: "Manual Alarm Control Panel with MQTT Support"
-description: "Instructions on how to integrate manual alarms into Home Assistant with MQTT support."
+description: "Instructions how to integrate manual alarms into Home Assistant with MQTT support."
 date: 2017-07-02 9:10
 sidebar: true
 comments: false

source/_components/alarm_control_panel.markdown

@@ -1,7 +1,7 @@
 ---
 layout: page
 title: "Alarm Control Panels"
-description: "Instructions on how to integrate Alarm Control Panels into Home Assistant."
+description: "Instructions how to integrate Alarm Control Panels into Home Assistant."
 date: 2015-10-13 19:10
 sidebar: true
 comments: false

source/_components/alarm_control_panel.mqtt.markdown

@@ -1,7 +1,7 @@
 ---
 layout: page
 title: "MQTT Alarm Control Panel"
-description: "Instructions on how to integrate MQTT capable Alarm Panels into Home Assistant."
+description: "Instructions how to integrate MQTT capable Alarm Panels into Home Assistant."
 date: 2015-09-14 19:10
 sidebar: true
 comments: false

source/_components/alarm_control_panel.nx584.markdown

@@ -1,7 +1,7 @@
 ---
 layout: page
 title: "NX584 Alarm Control Panel"
-description: "Instructions on how to integrate NX584 into Home Assistant."
+description: "Instructions how to integrate NX584 into Home Assistant."
 date: 2016-02-07 10:00
 sidebar: true
 comments: false

source/_components/alarm_control_panel.satel_integra.markdown

@@ -1,7 +1,7 @@
 ---
 layout: page
 title: "Satel Integra Alarm Control Panel"
-description: "Instructions on how to setup the Satel Integra control panel within Home Assistant."
+description: "Instructions how to setup the Satel Integra control panel within Home Assistant."
 date: 2017-09-07 13:28
 sidebar: true
 comments: false

source/_components/alarm_control_panel.simplisafe.markdown

@@ -1,7 +1,7 @@
 ---
 layout: page
 title: "SimpliSafe Alarm Control Panel"
-description: "Instructions on how to integrate SimpliSafe into Home Assistant."
+description: "Instructions how to integrate SimpliSafe into Home Assistant."
 date: 2016-07-02 22:00
 sidebar: true
 comments: false

source/_components/alarm_control_panel.spc.markdown

@@ -1,7 +1,7 @@
 ---
 layout: page
 title: "Vanderbilt SPC Alarm"
-description: "Instructions on how to setup the Vanderbilt SPC Alarm control panel within Home Assistant."
+description: "Instructions how to setup the Vanderbilt SPC Alarm control panel within Home Assistant."
 date: 2017-05-18 22:01
 sidebar: true
 comments: false

source/_components/alarm_control_panel.totalconnect.markdown

@@ -1,7 +1,7 @@
 ---
 layout: page
 title: "Honeywell TotalConnect Alarm Control Panel"
-description: "Instructions on how to integrate TotalConnect alarms into Home Assistant."
+description: "Instructions how to integrate TotalConnect alarms into Home Assistant."
 date: 2017-04-02 22:00
 sidebar: true
 comments: false

source/_components/alarm_control_panel.verisure.markdown

@@ -1,7 +1,7 @@
 ---
 layout: page
 title: "Verisure Alarm"
-description: "Instructions on how to setup the Verisure Alarm control panel within Home Assistant."
+description: "Instructions how to setup the Verisure Alarm control panel within Home Assistant."
 date: 2016-02-15 22:00
 sidebar: true
 comments: false

source/_components/alarm_control_panel.wink.markdown

@@ -1,7 +1,7 @@
 ---
 layout: page
 title: "Wink Alarm"
-description: "Instructions on how to setup the Wink alarms within Home Assistant."
+description: "Instructions how to setup the Wink alarms within Home Assistant."
 date: 2017-01-14 12:00
 sidebar: true
 comments: false

source/_components/alert.markdown

@@ -1,7 +1,7 @@
 ---
 layout: page
 title: "Alert"
-description: "Instructions on how to setup automatic alerts within Home Assistant."
+description: "Instructions how to setup automatic alerts within Home Assistant."
 date: 2017-01-15 20:00
 sidebar: true
 comments: false

source/_components/alexa.markdown

@@ -1,7 +1,7 @@
 ---
 layout: page
 title: "Alexa / Amazon Echo"
-description: "Instructions on how to connect Alexa/Amazon Echo to Home Assistant."
+description: "Instructions how to connect Alexa/Amazon Echo to Home Assistant."
 date: 2015-12-13 13:02
 sidebar: true
 comments: false
@@ -46,7 +46,7 @@ Additionally, note that at the time of this writing, your Alexa skill endpoint *
   OR
   2. Change your Home Assistant serving port to 443 this is done in the [`http`](/components/http/) section with the `server_port` entry in your `configuration.yaml` file
 
-[blog-lets-encrypt]: /blog/2015/12/13/setup-encryption-using-lets-encrypt/
+[blog-lets-encrypt]: https://home-assistant.io/blog/2015/12/13/setup-encryption-using-lets-encrypt/
 
 To get started with Alexa skills:
 
@@ -167,7 +167,7 @@ intent_script:
       text: OK
 ```
 
-Here we are using [templates] to take the name we gave to Alexa e.g., `downstairs on` and replace the space with an underscore so it becomes `downstairs_on` as Home Assistant expects.
+Here we are using [templates] to take the name we gave to Alexa e.g. `downstairs on` and replace the space with an underscore so it becomes `downstairs_on` as Home Assistant expects.
 
 Now say `Alexa ask Home Assistant to activate <some scene>` and Alexa will activate that scene for you.
 

source/_components/amcrest.markdown

@@ -1,7 +1,7 @@
 ---
 layout: page
 title: "Amcrest IP Camera"
-description: "Instructions on how to integrate Amcrest IP cameras within Home Assistant."
+description: "Instructions how to integrate Amcrest IP cameras within Home Assistant."
 date: 2017-06-24 10:00
 sidebar: true
 comments: false
@@ -13,28 +13,23 @@ ha_iot_class: "Local Polling"
 ha_release: 0.49
 ---
 
-The `amcrest` camera platform allows you to integrate your [Amcrest](https://amcrest.com/) IP camera in Home Assistant.
-
-## {% linkable_title Configuration %}
+The `amcrest` platform allows you to integrate your [Amcrest](https://amcrest.com/) IP camera in Home Assistant.
 
 To enable your camera in your installation, add the following to your `configuration.yaml` file:
 
 ```yaml
 # Example configuration.yaml entry
 amcrest:
-  - host: IP_ADDRESS_CAMERA_1
-    username: YOUR_USERNAME
-    password: YOUR_PASSWORD
+  - host: IP_ADDRESS
+    username: USERNAME
+    password: PASSWORD
     sensors:
       - motion_detector
       - sdcard
-    switches:
-      - motion_detection
-      - motion_recording
 
- - host: IP_ADDRESS_CAMERA_2
-   username: YOUR_USERNAME
-   password: YOUR_PASSWORD
+ - host: IP_ADDRESS
+   username: USERNAME
+   password: PASSWORD
    resolution: low
    stream_source: snapshot
    sensors:
@@ -50,21 +45,18 @@ Configuration variables:
 - **port** (*Optional*): The port that the camera is running on. The default is 80.
 - **resolution** (*Optional*): This parameter allows you to specify the camera resolution. For a high resolution (1080/720p), specify the option `high`. For VGA resolution (640x480p), specify the option `low`. If omitted, it defaults to *high*.
 - **stream_source** (*Optional*): The data source for the live stream. `mjpeg` will use the camera's native MJPEG stream, whereas `snapshot` will use the camera's snapshot API to create a stream from still images. You can also set the `rtsp` option to generate the streaming via RTSP protocol. If omitted, it defaults to *snapshot*.
-- **ffmpeg_arguments**: (*Optional*): Extra options to pass to ffmpeg, e.g., image quality or video filter options.
+- **ffmpeg_arguments**: (*Optional*): Extra options to pass to ffmpeg, e.g. image quality or video filter options.
 - **authentication**: (*Optional*): Defines which authentication method to use only when **stream_source** is **mjpeg**. Currently, *aiohttp* only support *basic*. It defaults to *basic*.
 - **scan_interval** (*Optional*): Defines the update interval of the sensor in seconds. The default is 10 seconds.
 - **sensors** array (*Optional*): Conditions to display in the frontend. By default, *none* of the conditions are enabled. The following conditions can be monitored.
   - **motion_detector**: Return True/False when a motion is detected
   - **sdcard**: Return the SD card usage by reporting the total and used space
   - **ptz_preset**: Return the number of PTZ preset positions configured for the given camera
-- **switches** array (*Optional*): Switches to display in the frontend. By default, *none* of the switches are shown. The following switches can be monitored.
-  - **motion_detection**: Enable/disable motion detection setting 
-  - **motion_recording**: Enable/disable recording on motion detection setting
 
 **Note:** Amcrest cameras with newer firmware no longer have the ability to stream `high` definition video with MJPEG encoding. You may need to use `low` resolution stream or the `snapshot` stream source instead.  If the quality seems too poor, lower the `Frame Rate (FPS)` and max out the `Bit Rate` settings in your camera's configuration manager. If you defined the *stream_source* to **mjpeg**, make sure your camera supports *Basic* HTTP authentication. Newer Amcrest firmware may not work, then **rtsp** is recommended instead.
 
 **Note:** If you set the `stream_source` option to `rtsp`, make sure to follow the steps mentioned at
-[FFMPEG](/components/ffmpeg/) documentation to install the `ffmpeg`.
+[FFMPEG](https://home-assistant.io/components/ffmpeg/) documentation to install the `ffmpeg`.
 
 Finish its configuration by visiting the [Amcrest sensor page](/components/sensor.amcrest/) or [Amcrest camera page](/components/camera.amcrest/).
 

source/_components/android_ip_webcam.markdown

@@ -48,9 +48,6 @@ Sensors:
 - light
 - motion
 - pressure
-- proximity
-- sound
-- video_connections
 
 Settings (Switches):
 
@@ -79,9 +76,6 @@ android_ip_webcam:
       - light
       - motion
       - pressure
-      - proximity
-      - sound
-      - video_connections
     switches:
       - exposure_lock
       - ffc

source/_components/api.markdown

@@ -1,7 +1,7 @@
 ---
 layout: page
 title: "API"
-description: "Instructions on how to setup the RESTful API within Home Assistant."
+description: "Instructions how to setup the RESTful API within Home Assistant."
 date: 2018-01-21 08:00
 sidebar: true
 comments: false

source/_components/apple_tv.markdown

@@ -1,7 +1,7 @@
 ---
 layout: page
 title: "Apple TV"
-description: "Instructions on how to integrate Apple TV devices into Home Assistant."
+description: "Instructions how to integrate Apple TV devices into Home Assistant."
 date: 2017-06-26 20:47
 sidebar: true
 comments: false
@@ -13,7 +13,7 @@ ha_iot_class: "Local Push"
 ha_release: 0.49
 ---
 
-The `apple_tv` platform allows you to control an Apple TV (3rd and 4th generation). See the [remote platform](/components/remote.apple_tv/) if you want to send remote control buttons, e.g., arrow keys.
+The `apple_tv` platform allows you to control an Apple TV (3rd and 4th generation). See the [remote platform](/components/remote.apple_tv/) if you want to send remote control buttons, e.g. arrow keys.
 
 <p class='note'>
 Currently, you must have Home Sharing enabled for this to work. Support for pairing Home Assistant with your device will be supported in a later release.
@@ -92,7 +92,7 @@ then device authentication is required. Press the icon in the upper left corner
 
 <img src='/images/screenshots/developer-tools.png' />
 
-Select `apple_tv` as domain, `apple_tv_authenticate` as service and enter `{"entity_id": "XXX"}` into "Service Data", but replace XXX with the entity id of your device (e.g., `media_player.apple_tv`). Press the button and hopefully you are presented with an input dialog asking for a pin code:
+Select `apple_tv` as domain, `apple_tv_authenticate` as service and enter `{"entity_id": "XXX"}` into "Service Data", but replace XXX with the entity id of your device (e.g. `media_player.apple_tv`). Press the button and hopefully you are presented with an input dialog asking for a pin code:
 
 <img src='/images/components/apple_tv/auth_start.jpg' />
 
@@ -143,3 +143,4 @@ To play media on an Apple TV with device authentication enabled (e.g., ATV4 with
 ### {% linkable_title Service `apple_tv_scan` %}
 
 Scans the local network for Apple TVs. All found devices are presented as a persistent notification.
+

source/_components/arduino.markdown

@@ -1,7 +1,7 @@
 ---
 layout: page
 title: "Arduino"
-description: "Instructions on how to setup an Arduino boards within Home Assistant."
+description: "Instructions how to setup an Arduino boards within Home Assistant."
 date: 2015-06-27 10:28
 sidebar: true
 comments: false
@@ -43,7 +43,7 @@ The exact number can be determined with the command shown below.
 $ ls /dev/ttyACM*
 ```
 
-If that's not working, check your `dmesg` or `journalctl -f` output. Keep in mind that Arduino clones are often using a different name for the port (e.g., `/dev/ttyUSB*`).
+If that's not working, check your `dmesg` or `journalctl -f` output. Keep in mind that Arduino clones are often using a different name for the port (e.g. `/dev/ttyUSB*`).
 
 <p class='note warning'>
 A word of caution: The Arduino boards are not storing states. This means that with every initialization the pins are set to off/low.

source/_components/arlo.markdown

@@ -15,27 +15,19 @@ ha_iot_class: "Cloud Polling"
 
 The `arlo` implementation allows you to integrate your [Arlo](https://arlo.netgear.com/) devices in Home Assistant.
 
-## {% linkable_title Configuration %}
-
 To enable device linked in your [Arlo](https://arlo.netgear.com/) account, add the following to your `configuration.yaml` file:
 
 ```yaml
 # Example configuration.yaml entry
 arlo:
-  username: YOUR_USERNAME
-  password: YOUR_PASSWORD
+  username: you@example.com
+  password: secret
 ```
 
-{% configuration %}
-username:
-  description: The username for accessing your Arlo account.
-  required: true
-  type: string
-password:
-  description: The password for accessing your Arlo account.
-  required: true
-  type: string
-{% endconfiguration %}
+Configuration variables:
+
+- **username** (*Required*): The username for accessing your Arlo account.
+- **password** (*Required*): The password for accessing your Arlo account.
 
 It is recommended to create a dedicated user on Arlo website to be used within Home Assistant and then share your Arlo cameras.
 

source/_components/asterisk_mbox.markdown

@@ -1,32 +1,31 @@
 ---
 layout: page
 title: "Asterisk Voicemail"
-description: "Instructions on how to integrate your existing Asterisk voicemail within Home Assistant."
+description: "Instructions how to integrate your existing Asterisk voicemail within Home Assistant."
 date: 2017-06-30 18:30
 sidebar: true
 comments: false
 sharing: true
 footer: true
-logo: asterisk.png
 ha_category: Other
 ha_version: 0.51
 ha_iot_class: "Local Push"
 ---
 
-The `asterisk_mbox `Asterisk Voicemail integration for Home Assistant allows you to view, listen to, and delete voicemails from an Asterisk voicemail mailbox. The component includes a panel on the frontend that provides caller-id and speech-to-text transcription (using Google's API) of messages in addition to playback and message deletion. There is also an included sensor that indicates of the number of available messages. There is no requirement that the Asterisk PBX and Home Assistant are running on the same machine.
+The Asterisk Voicemail integration for Home Assistant allows you to view, listen to, and delete voicemails from an Asterisk voicemail mailbox.  The component includes a panel on the frontend that provides caller-id and speech-to-text transcription (using Google's API) of messages in addition to playback and message deletion. There is also an included sensor that indicates of the number of available messages. There is no requirement that the Asterisk PBX and Home Assistant are running on the same machine.
 
 To enable the component, a configuration is required in both Home Assistant as well as on the Asterisk server.
 
-First follow the [Asterisk PBX configuration guide](/docs/asterisk_mbox/) to setup the necessary server on the Asterisk PBX server (this is needed even if Asterisk and Home Assistant are running on the same server)
+First follow the [Asterisk PBX configuration guide](/docs/asterisk_mbox) to setup the necessary server on the Asterisk PBX server (this is needed even if Asterisk and Home Assistant are running on the same server)
 
 Once that is complete, add the following entry `configuration.yaml` file:
 
 ```yaml
 # Example configuration.yaml entry
 asterisk_mbox:
-  password: ASTERISK_PBX_PASSWORD
-  host: ASTERISK_PBX_SERVER_IP_ADDRESS
-  port: ASTERISK_PBX_SERVER_PORT
+    password: ASTERISK_PBX_PASSWORD
+    host: ASTERISK_PBX_SERVER_IP_ADDRESS
+    port: ASTERISK_PBX_SERVER_PORT
 ```
 
 This will add a new 'Mailbox' side-panel, as well as a sensor to indicate # of messages available.

source/_components/august.markdown

@@ -15,12 +15,6 @@ ha_iot_class: "Cloud Polling"
 
 The `august` component allows you to integrate your [August](http://august.com) devices in Home Assistant. Currently this component supports August Lock and Doorbell.
 
-<p class='note'>
-August Lock 2nd Gen will need either August Connect or Doorbell to connect to Home Assistant.
-</p>
-
-## {% linkable_title Configuration %}
-
 You will need your August login information (username (either phone# or email), and password) to use this module.
 
 To set it up, add the following to your `configuration.yaml` file:
@@ -30,27 +24,27 @@ To set it up, add the following to your `configuration.yaml` file:
 august:
   login_method: phone
   username: "+16041234567"
-  password: YOUR_PASSWORD
+  password: secret
 ```
 
 {% configuration %}
-login_method:
-  description: Method to login to your August account, either "email" or "phone". A verification code will be sent to your email or phone during setup.
-  required: true
-  type: string
-username:
-  description: The username for accessing your August account. This depends on your login_method, if login_method is email, this will be your email of the account. Otherwise, this will be your phone number.
-  required: true
-  type: string
-password:
-  description: The password for accessing your August account.
-  required: true
-  type: string
-timeout:
-  description: Timeout to wait for connections.
-  required: false
-  type: int
-  default: 10
+  login_method:
+    description: Method to login to your August account, either "email" or "phone". A verification code will be sent to your email or phone during setup.
+    required: true
+    type: string
+  username:
+    description: The username for accessing your August account. This depends on your login_method, if login_method is email, this will be your email of the account. Otherwise, this will be your phone number.
+    required: true
+    type: string
+  password:
+    description: The password for accessing your August account.
+    required: true
+    type: string
+  timeout:
+    description: Timeout to wait for connections.
+    required: false
+    type: int
+    default: 10
 {% endconfiguration %}
 
 Once Home Assistant is started, a configurator will pop up asking you to enter verification code that is sent to your phone number or email.

source/_components/automation.markdown

@@ -1,7 +1,7 @@
 ---
 layout: page
 title: "Automation"
-description: "Instructions on how to setup automation within Home Assistant."
+description: "Instructions how to setup automation within Home Assistant."
 date: 2015-01-20 22:36
 sidebar: true
 comments: false
@@ -19,7 +19,7 @@ Starting with 0.28 your automation rules can be controlled with the frontend.
   <img src='{{site_root}}/images/screenshots/automation-switches.png' />
 </p>
 
-This allows one to reload the automation without restarting Home Assistant itself. If you don't want to see the automation rule in your frontend use `hide_entity: True` to hide it. You can also use `initial_state: 'off'` so that the automation is not automatically turned on after a Home Assistant reboot.
+This allows one to reload the automation without restarting Home Assistant itself. If you don't want to see the automation rule in your frontend use `hide_entity: True` to hide it. You can also use `initial_state: 'off'` so that the automation is not automatically turned on after a Home assistant reboot.
 
 ```yaml
 automation:

source/_components/bbb_gpio.markdown

@@ -1,7 +1,7 @@
 ---
 layout: page
 title: "BeagleBone Black GPIO"
-description: "Instructions on how to integrate the GPIO capability of a BeagleBone Black into Home Assistant."
+description: "Instructions how to integrate the GPIO capability of a BeagleBone Black into Home Assistant."
 date: 2017-01-14 10:00
 sidebar: true
 comments: false

source/_components/binary_sensor.abode.markdown

@@ -1,7 +1,7 @@
 ---
 layout: page
 title: "Abode Binary Sensor"
-description: "Instructions on how to integrate Abode binary sensors into Home Assistant."
+description: "Instructions how to integrate Abode binary sensors into Home Assistant."
 date: 2017-08-26 0:28
 sidebar: true
 comments: false

source/_components/binary_sensor.alarmdecoder.markdown

@@ -1,7 +1,7 @@
 ---
 layout: page
 title: "AlarmDecoder Binary Sensor"
-description: "Instructions on how to integrate AlarmDecoder binary sensors into Home Assistant."
+description: "Instructions how to integrate AlarmDecoder binary sensors into Home Assistant."
 date: 2017-04-02 13:28
 sidebar: true
 comments: false

source/_components/binary_sensor.android_ip_webcam.markdown

@@ -1,7 +1,7 @@
 ---
 layout: page
 title: "Android IP Webcam Binary Sensor"
-description: "Instructions on how to integrate binary motion sensors for Android IP webcam within Home Assistant."
+description: "Instructions how to integrate binary motion sensors for Android IP webcam within Home Assistant."
 date: 2017-03-10 00:00
 sidebar: true
 comments: false

source/_components/binary_sensor.arest.markdown

@@ -1,7 +1,7 @@
 ---
 layout: page
 title: "aREST Binary Sensor"
-description: "Instructions on how to integrate aREST binary sensors within Home Assistant."
+description: "Instructions how to integrate aREST binary sensors within Home Assistant."
 date: 2015-11-20 18:15
 sidebar: true
 comments: false
@@ -28,7 +28,7 @@ binary_sensor:
 
 Configuration variables:
 
-- **resource** (*Required*): IP address and schema of the device that is exposing an aREST API, e.g., http://192.168.1.10.
+- **resource** (*Required*): IP address and schema of the device that is exposing an aREST API, e.g. http://192.168.1.10.
 - **pin** (*Required*): Number of the pin to monitor.
 - **name** (*Optional*): Let you overwrite the name of the device. By default *name* from the device is used.
 

source/_components/binary_sensor.axis.markdown

@@ -1,7 +1,7 @@
 ---
 layout: page
 title: "Axis Binary Sensor"
-description: "Instructions on how to integrate Axis binary sensors into Home Assistant."
+description: "Instructions how to integrate Axis binary sensors into Home Assistant."
 date: 2017-04-01 19:00
 sidebar: true
 comments: false

source/_components/binary_sensor.bayesian.markdown

@@ -1,7 +1,7 @@
 ---
 layout: page
 title: "Bayesian Binary Sensor"
-description: "Instructions on how to integrate threshold Bayesian sensors into Home Assistant."
+description: "Instructions how to integrate threshold Bayesian sensors into Home Assistant."
 date: 2017-08-27 20:05
 sidebar: true
 comments: false

source/_components/binary_sensor.bbb_gpio.markdown

@@ -1,7 +1,7 @@
 ---
 layout: page
 title: "BeagleBone Black GPIO Binary Sensor"
-description: "Instructions on how to integrate the GPIO sensor capability of a BeagleBone Black into Home Assistant."
+description: "Instructions how to integrate the GPIO sensor capability of a BeagleBone Black into Home Assistant."
 date: 2017-01-14 10:00
 sidebar: true
 comments: false

source/_components/binary_sensor.bmw_connected_drive.markdown

@@ -1,20 +0,0 @@
----
-layout: page
-title: "BMW Connected Drive Binary Sensor"
-description: "Instructions on how to setup your BMW Connected Drive account with Home Assistant."
-date: 2018-02-22 23:00
-sidebar: true
-comments: false
-sharing: true
-footer: true
-logo: bmw.png
-ha_category: Binary Sensor
-ha_release: 0.66
----
-
-
-The `bmw_connected_drive` platform allows you to import data on your BMW into Home Assistant.
-
-The binary sensors will be automatically configured if `bmw_connected_drive` component is configured.
-
-For more configuration information see the [`bmw_connected_drive` component](/components/bmw_connected_drive/) documentation.

source/_components/binary_sensor.command_line.markdown

@@ -1,7 +1,7 @@
 ---
 layout: page
 title: "Command line Binary Sensor"
-description: "Instructions on how to integrate Command binary sensors within Home Assistant."
+description: "Instructions how to integrate Command binary sensors within Home Assistant."
 date: 2016-01-13 12:15
 sidebar: true
 comments: false

source/_components/binary_sensor.concord232.markdown

@@ -1,7 +1,7 @@
 ---
 layout: page
 title: "Concord232 Binary Sensor"
-description: "Instructions on how to integrate Interlogix/GE Concord4 binary sensors into Home Assistant."
+description: "Instructions how to integrate Interlogix/GE Concord4 binary sensors into Home Assistant."
 date: 2016-10-11 10:00
 sidebar: true
 comments: false

source/_components/binary_sensor.ecobee.markdown

@@ -1,7 +1,7 @@
 ---
 layout: page
 title: "Ecobee Binary Sensor"
-description: "Instructions on how to setup the Ecobee sensors within Home Assistant."
+description: "Instructions how to setup the Ecobee sensors within Home Assistant."
 date: 2015-11-30 18:00
 sidebar: true
 comments: false

source/_components/binary_sensor.egardia.markdown

@@ -1,7 +1,7 @@
 ---
 layout: page
 title: "Egardia Binary Sensor"
-description: "Instructions on how to integrate Egardia / Woonveilig binary sensors into Home Assistant."
+description: "Instructions how to integrate Egardia / Woonveilig binary sensors into Home Assistant."
 date: 2018-03-02 09:00
 sidebar: true
 comments: false

source/_components/binary_sensor.eight_sleep.markdown

@@ -1,7 +1,7 @@
 ---
 layout: page
 title: "Eight Sleep Binary Sensor"
-description: "Instructions on how to integrate binary motion sensors for Eight Sleep within Home Assistant."
+description: "Instructions how to integrate binary motion sensors for Eight Sleep within Home Assistant."
 date: 2017-04-24 00:00
 sidebar: true
 comments: false

source/_components/binary_sensor.envisalink.markdown

@@ -1,7 +1,7 @@
 ---
 layout: page
 title: "Envisalink Binary Sensor"
-description: "Instructions on how to integrate Envisalink binary sensors into Home Assistant."
+description: "Instructions how to integrate Envisalink binary sensors into Home Assistant."
 date: 2016-07-01 08:00
 sidebar: true
 comments: false

source/_components/binary_sensor.ffmpeg_motion.markdown

@@ -42,7 +42,7 @@ Configuration variables:
 - **reset** (*Optional*): The time to reset the state after no new motion is detected. Defaults to 20 seconds.
 - **repeat** (*Optional*): How many events need to be detected in *repeat_time* in order to trigger a motion. Defaults to 0 repeats (deactivated).
 - **repeat_time** (*Optional*): The span of time *repeat* events need to occur in before triggering a motion. Defaults to 0 seconds (deactivated).
-- **extra_arguments** (*Optional*): Extra options to pass to `ffmpeg`, e.g., video denoise filtering.
+- **extra_arguments** (*Optional*): Extra options to pass to `ffmpeg`, e.g. video denoise filtering.
 
 To experiment with values (changes/100 is the scene value in `ffmpeg`):
 

source/_components/binary_sensor.ffmpeg_noise.markdown

@@ -39,7 +39,7 @@ Configuration variables:
 - **duration** (*Optional*): Default 1 second. How long the noise needs to be over the peak to trigger the state.
 - **reset** (*Optional*): Default 20 seconds. The time to reset the state after no new noise is over the peak.
 - **extra_arguments** (*Optional*): Extra options to pass to `ffmpeg`, like audio frequency filtering.
-- **output** (*Optional*): Allows you to send the audio output of this sensor to an Icecast server or other FFmpeg-supported output, e.g., to stream with Sonos after a state is triggered.
+- **output** (*Optional*): Allows you to send the audio output of this sensor to an Icecast server or other FFmpeg-supported output, e.g. to stream with Sonos after a state is triggered.
 
 To experiment with values:
 

source/_components/binary_sensor.flic.markdown

@@ -1,7 +1,7 @@
 ---
 layout: page
 title: Flic Smart Button
-description: "Instructions on how to integrate flic buttons within Home Assistant."
+description: "Instructions how to integrate flic buttons within Home Assistant."
 date: 2016-12-02 22:03
 sidebar: true
 comments: false

source/_components/binary_sensor.hikvision.markdown

@@ -15,22 +15,22 @@ ha_iot_class: "Local Push"
 
 The Hikvision Binary Sensor is a platform that parses the event stream of a [Hikvision IP Camera or NVR](http://www.hikvision.com/) and presents the camera/nvr events to Home Assistant as binary sensors with either an "off" or "on" state.
 
-The platform will automatically add all sensors to Home Assistant that are configured within the camera/nvr interface to "Notify the surveillance center" as a trigger. If you would like to hide a sensor type you can do so by either unchecking "Notify the surveillance center" in the camera configuration or by using the "ignored" customize option detailed below.
+The platform will automatically add all sensors to Home Assistant that are configured within the camera/nvr interface to "Notify the surveillance center" as a trigger.  If you would like to hide a sensor type you can do so by either unchecking "Notify the surveillance center" in the camera configuration or by using the "ignored" customize option detailed below.
 
 <p class='note'>
-In order for the sensors to work the hikvision user must have the 'Remote: Notify Surveillance Center/Trigger Alarm Output' permission which can be enabled from the user management section of the web interface. Also the 'WEB Authentication' needs to be set to 'digest/basic' in the security/authentication section. 
+In order for the sensors to work the hikvision user must have the 'Remote: Notify Surveillance Center / Trigger Alarm Output' permission which can be enabled from the user managment section of the web interace. Also the 'WEB Authentication' needs to be set to 'digest/basic' in the security / authentication section. 
 </p>
 
 For example, if you configure a camera with the name "Front Porch" that has motion detection and line crossing events enabled to notify the surveillance center the following binary sensors will be added to Home Assistant:
 
-```text
+```
 binary_sensor.front_porch_motion
 binary_sensor.front_port_line_crossing
 ```
 
-When used with a NVR device the sensors will be appended with the channel number they represent. For example, if you configure an NVR with the name "Home" that supports 2 cameras with motion detection and line crossing events enabled to notify the surveillance center the following binary sensors will be added to Home Assistant:
+When used with a NVR device the sensors will be appended with the channel number they represent.  For example, if you configure an NVR with the name "Home" that supports 2 cameras with motion detection and line crossing events enabled to notify the surveillance center the following binary sensors will be added to Home Assistant:
 
-```text
+```
 binary_sensor.home_motion_1
 binary_sensor.home_motion_2
 binary_sensor.home_line_crossing_1
@@ -38,37 +38,35 @@ binary_sensor.home_line_crossing_2
 ```
 
 This platform should work with all Hikvision cameras and nvrs, and has been confirmed to work with the following models:
-
 - DS-2CD3132-I
 - DS-2CD2232-I5
 - DS-2CD2032-I
 - DS-2CD2042WD-I
 - DS-2CD2142FWD-I
 
-To enable this sensor, the following lines are required in your `configuration.yaml` file:
+To enable this sensor, the following lines are required in your `configuration.yaml`:
 
 ```yaml
 binary_sensor:
-  - platform: hikvision
-    host: IP_ADDRESS
-    username: user
-    password: pass
+  platform: hikvision
+  host: IP_ADDRESS
+  username: user
+  password: pass
 ```
 
 Configuration options for a Hikvision Sensor:
 
-- **host** (*Required*): The IP address of the camera you would like to connect to.
-- **username** (*Required*): The username to authenticate with.
-- **password** (*Required*): The password to authenticate with.
 - **name** (*Optional*): The name you'd like to give the camera in Home Assistant, defaults to name defined in the camera.
+- **host** (*Required*): The IP address of the camera you would like to connect to.
 - **port** (*Optional*): The port to connect to the camera on, defaults to 80.
 - **ssl** (*Optional*): True if you want to connect with https. Be sure to set the port also.
+- **username** (*Required*): The username to authenticate with.
+- **password** (*Required*): The password to authenticate with.
 - **customize** (*Optional*): This attribute contains sensor-specific override values. Only sensor name needs defined:
   - **ignored** (*Optional*): Ignore this sensor completely. It won't be shown in the Web Interface and no events are generated for it.
   - **delay** (*Optional*): Specify the delay to wait after a sensor event ends before notifying Home Assistant. This is useful to catch multiple quick trips in one window without the state toggling on and off.  The default delay is 5 seconds.
 
 Supported sensor/event types are:
-
 - Motion
 - Line Crossing
 - Field Detection
@@ -86,36 +84,37 @@ Supported sensor/event types are:
 - Face Detection
 - Scene Change Detection
 
+
 Example of a configuration in your `configuration.yaml` that utilizes the customize options for a camera:
 
 ```yaml
 binary_sensor:
-  - platform: hikvision
-    host: 192.168.X.X
-    port: 80
-    ssl: False
-    username: user
-    password: pass
-    customize:
-      motion:
-        delay: 30
-      line_crossing:
-        ignored: True
+  platform: hikvision
+  host: 192.168.X.X
+  port: 80
+  ssl: False
+  username: user
+  password: pass
+  customize:
+    motion:
+      delay: 30
+    line_crossing:
+      ignored: True
 ```
 
 Example of a configuration in your `configuration.yaml` that utilizes the customize options for a nvr:
 
 ```yaml
 binary_sensor:
-  - platform: hikvision
-    host: 192.168.X.X
-    port: 80
-    ssl: False
-    username: user
-    password: pass
-    customize:
-      motion_1:
-        delay: 30
-      field_detection_2:
-        ignored: True
+  platform: hikvision
+  host: 192.168.X.X
+  port: 80
+  ssl: False
+  username: user
+  password: pass
+  customize:
+    motion_1:
+      delay: 30
+    field_detection_2:
+      ignored: True
 ```

source/_components/binary_sensor.hive.markdown

@@ -14,12 +14,11 @@ ha_iot_class: "Cloud Polling"
 ---
 
 
-The `hive` binary sensor component integrates your Hive sensors into Home Assistant.
+The 'hive' binary sensor component integrates your Hive sensors into Home Assistant.
 
-The platform supports the following Hive products:
-
-- Hive Window or Door Sensor
-- Hive Motion Sensor
+The Hive sensor component supports the following Hive products:
+- **Hive Window or Door Sensor**
+- **Hive Motion Sensor**
 
 
 <p class='note'>

source/_components/binary_sensor.homematic.markdown

@@ -1,7 +1,7 @@
 ---
 layout: page
 title: "Homematic Binary Sensor"
-description: "Instructions on how to integrate binary Homematic sensors within Home Assistant."
+description: "Instructions how to integrate binary Homematic sensors within Home Assistant."
 date: 2016-06-28 08:30
 sidebar: true
 comments: false

source/_components/binary_sensor.http.markdown

@@ -1,7 +1,7 @@
 ---
 layout: page
 title: "HTTP Binary Sensor"
-description: "Instructions on how to integrate HTTP binary sensors within Home Assistant."
+description: "Instructions how to integrate HTTP binary sensors within Home Assistant."
 date: 2016-02-05 12:15
 sidebar: true
 comments: false

source/_components/binary_sensor.ihc.markdown

@@ -1,7 +1,7 @@
 ---
 layout: page
 title: "IHC Binary Sensor"
-description: "Instructions on how to integrate IHC Binary Sensors within Home Assistant."
+description: "Instructions how to integrate IHC Binary Sensors within Home Assistant."
 date: 2017-11-27 13:35
 sidebar: true
 comments: false

source/_components/binary_sensor.insteon_plm.markdown

@@ -1,7 +1,7 @@
 ---
 layout: page
 title: "Insteon PLM Binary Sensor"
-description: "Instructions on how to setup the Insteon PLM binary sensors locally within Home Assistant."
+description: "Instructions how to setup the Insteon PLM binary sensors locally within Home Assistant."
 date: 2017-02-19 17:00
 sidebar: true
 comments: false

source/_components/binary_sensor.isy994.markdown

@@ -1,7 +1,7 @@
 ---
 layout: page
 title: "ISY994 Binary Sensor"
-description: "Instructions on how to integrate ISY994 binary sensors into Home Assistant."
+description: "Instructions how to integrate ISY994 binary sensors into Home Assistant."
 date: 2016-09-03 23:00
 sidebar: true
 comments: false

source/_components/binary_sensor.knx.markdown

@@ -1,7 +1,7 @@
 ---
 layout: page
 title: "KNX Binary Sensor"
-description: "Instructions on how to setup the KNX binary sensors within Home Assistant."
+description: "Instructions how to setup the KNX binary sensors within Home Assistant."
 date: 2016-07-13 07:00
 sidebar: true
 comments: false
@@ -32,7 +32,7 @@ Configuration variables:
 
 - **name** (*Optional*): A name for this device used within Home Assistant.
 - **address**: KNX group address of the binary sensor.
-- **device_class** (Optional): HASS device class e.g., "motion".
+- **device_class** (Optional): HASS device class e.g. "motion".
 - **significant_bit** (Optional): Specify which significant bit of the KNX value should be used. Default is 1.
 - **reset_after** (Optional): Reset back to OFF state after specified milliseconds.
 

source/_components/binary_sensor.markdown

@@ -11,8 +11,6 @@ footer: true
 
 Binary sensors gather information about the state of devices which have a "digital" return value (either 1 or 0). These can be switches, contacts, pins, etc. These sensors only have two states: **0/off/low/closed/false** and **1/on/high/open/true**.  Knowing that there are only two states allows Home Assistant to represent these sensors in a better way in the frontend according to their functionality.
 
-### {% linkable_title Device Class %}
-
 The way these sensors are displayed in the frontend can be modified in the [customize section](/getting-started/customizing-devices/). The following device classes are supported for binary sensors:
 
 - **None**: Generic on/off. This is the default and doesn't need to be set.
@@ -40,9 +38,4 @@ The way these sensors are displayed in the frontend can be modified in the [cust
 - **vibration**: `On` means vibration detected, `Off` means no vibration (clear)
 - **window**: `On` means open, `Off` means closed
 
-For analog sensors please check the [component overview](/components/#sensor).
-
-<p class='img'>
-<img src='/images/screenshots/binary_sensor_classes_icons.png' />
-Example of various device classes icons in `On` and `Off` state.
-</p>
+For analog sensors please check the [component overview](https://home-assistant.io/components/#sensor).

source/_components/binary_sensor.modbus.markdown

@@ -15,12 +15,10 @@ ha_iot_class: "Local Push"
 
 The `modbus` binary sensor allows you to gather data from [Modbus](http://www.modbus.org/) coils.
 
-## {% linkable_title Configuration %}
-
 To use your Modbus binary sensors in your installation, add the following to your `configuration.yaml` file:
 
 ```yaml
-# Example configuration.yaml entry
+# Example configuration.yml entry
 binary_sensor:
   - platform: modbus
     coils:
@@ -41,7 +39,7 @@ Configuration variables:
   
 It's possible to change the default 30 seconds scan interval for the sensor updates as shown in the [Platform options](/docs/configuration/platform_options/#scan-interval) documentation.
 
-## {% linkable_title Full example %}
+### {% linkable_title Full example %}
 
 Example a sensor with a 10 seconds scan interval:
 

source/_components/binary_sensor.mqtt.markdown

@@ -1,7 +1,7 @@
 ---
 layout: page
 title: "MQTT Binary Sensor"
-description: "Instructions on how to integrate MQTT binary sensors within Home Assistant."
+description: "Instructions how to integrate MQTT binary sensors within Home Assistant."
 date: 2015-05-30 23:21
 sidebar: true
 comments: false
@@ -17,8 +17,6 @@ The `mqtt` binary sensor platform uses an MQTT message payload to set the binary
 
 The binary sensor state will be updated only after a new message is published on `state_topic` matching `payload_on` or `payload_off`. If these messages are published with the `retain` flag set, the binary sensor will receive an instant state update after subscription and Home Assistant will display the correct state on startup. Otherwise, the initial state displayed in Home Assistant will be `unknown`.
 
-## {% linkable_title Configuration %}
-
 The `mqtt` binary sensor platform optionally supports an `availability_topic` to receive online and offline messages (birth and LWT messages) from the MQTT device. During normal operation, if the MQTT cover device goes offline (i.e., publishes `payload_not_available` to `availability_topic`), Home Assistant will display the binary sensor as `unavailable`. If these messages are published with the `retain` flag set, the binary sensor will receive an instant update after subscription and Home Assistant will display the correct availability state of the binary sensor when Home Assistant starts up. If the `retain` flag is not set, Home Assistant will display the binary sensor as `unavailable` when Home Assistant starts up. If no `availability_topic` is defined, Home Assistant will consider the MQTT device to be available.
 
 To use an MQTT binary sensor in your installation, add the following to your `configuration.yaml` file:
@@ -44,12 +42,12 @@ payload_on:
   description: The payload that represents the on state.
   required: false
   type: string
-  default: "ON"
+  default: ON
 payload_off:
   description: The payload that represents the off state.
   required: false
   type: string
-  default: "OFF"
+  default: OFF
 availability_topic:
   description: "The MQTT topic subscribed to receive birth and LWT messages from the MQTT device. If `availability_topic` is not defined, the binary sensor availability state will always be `available`. If `availability_topic` is defined, the binary sensor availability state will be `unavailable` by default."
   required: false
@@ -133,7 +131,7 @@ The configuration will look like the example below:
 
 {% raw %}
 ```yaml
-# Example configuration.yaml entry
+# Example configuration.yml entry
 binary_sensor:
   - platform: mqtt
     name: Bathroom

source/_components/binary_sensor.mysensors.markdown

@@ -1,7 +1,7 @@
 ---
 layout: page
 title: "MySensors Binary Sensor"
-description: "Instructions on how to integrate MySensors binary sensors into Home Assistant."
+description: "Instructions how to integrate MySensors binary sensors into Home Assistant."
 date: 2016-04-13 14:20 +0100
 sidebar: true
 comments: false

source/_components/binary_sensor.mystrom.markdown

@@ -1,7 +1,7 @@
 ---
 layout: page
 title: "myStrom Binary Sensor"
-description: "Instructions on how to integrate myStrom buttons into Home Assistant."
+description: "Instructions how to integrate myStrom buttons into Home Assistant."
 date: 2017-04-14 08:15
 sidebar: true
 comments: false

source/_components/binary_sensor.nest.markdown

@@ -1,7 +1,7 @@
 ---
 layout: page
 title: "Nest Binary Sensor"
-description: "Instructions on how to integrate Nest binary sensors within Home Assistant."
+description: "Instructions how to integrate Nest binary sensors within Home Assistant."
 date: 2016-01-26 08:00
 sidebar: true
 comments: false

source/_components/binary_sensor.netatmo.markdown

@@ -1,7 +1,7 @@
 ---
 layout: page
 title: "Netatmo Binary Sensor"
-description: "Instructions on how to integrate Netatmo binary sensor into Home Assistant."
+description: "Instructions how to integrate Netatmo binary sensor into Home Assistant."
 date: 2016-09-19 15:10
 sidebar: true
 comments: false

source/_components/binary_sensor.octoprint.markdown

@@ -1,7 +1,7 @@
 ---
 layout: page
 title: "OctoPrint Binary Sensor"
-description: "Instructions on how to integrate OctoPrint binary sensors within Home Assistant."
+description: "Instructions how to integrate OctoPrint binary sensors within Home Assistant."
 date: 2016-05-05 08:00
 sidebar: true
 comments: false

source/_components/binary_sensor.pilight.markdown

@@ -1,7 +1,7 @@
 ---
 layout: page
 title: "Pilight Binary Sensor"
-description: "Instructions on how to integrate Pilight binary sensors within Home Assistant."
+description: "Instructions how to integrate Pilight binary sensors within Home Assistant."
 date: 2017-03-24 20:41
 sidebar: true
 comments: false
@@ -15,12 +15,10 @@ ha_iot_class: "Local Polling"
 
 The `pilight` binary sensor platform implement the [pilight hub](/components/pilight/) binary sensor functionality. Two type of Pilight binary sensor configuration available. A normal sensor which send the on and off state cyclical and a trigger sensor which send only a trigger when an event happened (for example lots of cheap PIR motion detector).
 
-
-
 To enable a Pilight binary sensor in your installation, add the following to your `configuration.yaml` file:
 
 ```yaml
-# Example configuration.yaml entry
+# Example configuration.yml entry
 binary_sensor:
   - platform: pilight
     variable: 'state'

source/_components/binary_sensor.ping.markdown

@@ -1,7 +1,7 @@
 ---
 layout: page
 title: "Ping (ICMP) Binary sensor"
-description: "Instructions on how to integrate Ping (ICMP)-based binary sensors into Home Assistant."
+description: "Instructions how to integrate Ping (ICMP)-based binary sensors into Home Assistant."
 date: 2017-04-11 08:00
 sidebar: true
 comments: false

source/_components/binary_sensor.qwikswitch.markdown

@@ -1,18 +0,0 @@
----
-layout: page
-title: "QwikSwitch Binary Sensor"
-description: "Instructions on how to integrate Qwikswitch dimmers and relays as sensors into Home Assistant."
-date: 2016-05-04 00:00
-sidebar: true
-comments: false
-sharing: true
-footer: true
-logo: qwikswitch.png
-ha_category: Sensor
-ha_iot_class: "Local Push"
-ha_release: "0.68"
----
-
-The `qwikswitch` binary_sensor platform allows you to use your [QwikSwitch](http://www.qwikswitch.co.za/) sensors within Home Assistant.
-
-The platform is configured through the [QwikSwitch component](/components/qwikswitch/).

source/_components/binary_sensor.random.markdown

@@ -1,7 +1,7 @@
 ---
 layout: page
 title: "Random Binary Sensor"
-description: "Instructions on how to integrate random state sensors into Home Assistant."
+description: "Instructions how to integrate random state sensors into Home Assistant."
 date: 2017-10-27 08:00
 sidebar: true
 comments: false
@@ -16,8 +16,6 @@ ha_release: 0.57
 
 The `random` binary sensor platform is creating random states (`True`, 1, `on` or `False`, 0, `off`). This can be useful if you want to test automation rules. It generates a new state every time it is polled.
 
-## {% linkable_title Configuration %}
-
 To enable the random binary sensor, add the following lines to your `configuration.yaml`:
 
 ```yaml

source/_components/binary_sensor.raspihats.markdown

@@ -1,7 +1,7 @@
 ---
 layout: page
 title: "Raspihats Binary Sensor"
-description: "Instructions on how to integrate Raspihats add-on boards for Raspberry Pi into Home Assistant as a binary_sensor."
+description: "Instructions how to integrate Raspihats add-on boards for Raspberry Pi into Home Assistant as a binary_sensor."
 date: 2017-05-01 04:09
 sidebar: true
 comments: false

source/_components/binary_sensor.rest.markdown

@@ -1,7 +1,7 @@
 ---
 layout: page
 title: "RESTful Binary Sensor"
-description: "Instructions on how to integrate REST binary sensors into Home Assistant."
+description: "Instructions how to integrate REST binary sensors into Home Assistant."
 date: 2015-12-17 19:10
 sidebar: true
 comments: false

source/_components/binary_sensor.rfxtrx.markdown

@@ -1,7 +1,7 @@
 ---
 layout: page
 title: "RFXtrx Binary Sensor"
-description: "Instructions on how to integrate RFXtrx binary sensors into Home Assistant."
+description: "Instructions how to integrate RFXtrx binary sensors into Home Assistant."
 date: 2017-03-26 12:45
 sidebar: true
 comments: false

source/_components/binary_sensor.rpi_gpio.markdown

@@ -1,7 +1,7 @@
 ---
 layout: page
 title: "Raspberry Pi GPIO Binary Sensor"
-description: "Instructions on how to integrate the GPIO sensor capability of a Raspberry Pi into Home Assistant."
+description: "Instructions how to integrate the GPIO sensor capability of a Raspberry Pi into Home Assistant."
 date: 2015-08-30 19:00
 sidebar: true
 comments: false

source/_components/binary_sensor.rpi_pfio.markdown

@@ -1,7 +1,7 @@
 ---
 layout: page
 title: "PiFace Digital I/O Binary Sensor"
-description: "Instructions on how to integrate the PiFace Digital I/O module into Home Assistant as a binary sensor."
+description: "Instructions how to integrate the PiFace Digital I/O module into Home Assistant as a binary sensor."
 date: 2016-05-08 15:00
 sidebar: true
 comments: false

source/_components/binary_sensor.satel_integra.markdown

@@ -1,7 +1,7 @@
 ---
 layout: page
 title: "Satel Integra Binary Sensor"
-description: "Instructions on how to integrate Satel Integra binary sensors into Home Assistant."
+description: "Instructions how to integrate Satel Integra binary sensors into Home Assistant."
 date: 2017-09-07 13:28
 sidebar: true
 comments: false

source/_components/binary_sensor.spc.markdown

@@ -1,7 +1,7 @@
 ---
 layout: page
 title: "SPC Binary Sensor"
-description: "Instructions on how to integrate Vanderbilt SPC binary sensors into Home Assistant."
+description: "Instructions how to integrate Vanderbilt SPC binary sensors into Home Assistant."
 date: 2017-05-18 22:05
 sidebar: true
 comments: false

source/_components/binary_sensor.tapsaff.markdown

@@ -1,7 +1,7 @@
 ---
 layout: page
 title: "Taps Aff"
-description: "Instructions on how to use the Taps Aff binary sensor in Home Assistant."
+description: "Instructions how to use the Taps Aff binary sensor in Home Assistant."
 date: 2017-05-28 18:00
 sidebar: true
 comments: false

source/_components/binary_sensor.tellduslive.markdown

@@ -1,7 +1,7 @@
 ---
 layout: page
 title: "Telldus Binary Sensor"
-description: "Instructions on how to integrate Telldus Live binary sensors into Home Assistant."
+description: "Instructions how to integrate Telldus Live binary sensors into Home Assistant."
 date: 2017-10-24 10:09
 sidebar: true
 comments: false

source/_components/binary_sensor.template.markdown

@@ -1,7 +1,7 @@
 ---
 layout: page
 title: "Template Binary Sensor"
-description: "Instructions on how to integrate Template Binary Sensors into Home Assistant."
+description: "Instructions how to integrate Template Binary Sensors into Home Assistant."
 date: 2016-02-25 15:00
 sidebar: true
 comments: false

source/_components/binary_sensor.threshold.markdown

@@ -1,7 +1,7 @@
 ---
 layout: page
 title: "Threshold Binary Sensor"
-description: "Instructions on how to integrate threshold binary sensors into Home Assistant."
+description: "Instructions how to integrate threshold binary sensors into Home Assistant."
 date: 2016-11-26 12:10
 sidebar: true
 comments: false

source/_components/binary_sensor.trend.markdown

@@ -1,7 +1,7 @@
 ---
 layout: page
 title: "Trend Binary Sensor"
-description: "Instructions on how to integrate Trend binary sensors into Home Assistant."
+description: "Instructions how to integrate Trend binary sensors into Home Assistant."
 date: 2016-09-05 10:00
 sidebar: true
 comments: false

source/_components/binary_sensor.vera.markdown

@@ -1,7 +1,7 @@
 ---
 layout: page
 title: "Vera Binary Sensor"
-description: "Instructions on how to integrate Vera binary sensors into Home Assistant."
+description: "Instructions how to integrate Vera binary sensors into Home Assistant."
 date: 2016-03-26 23:00
 sidebar: true
 comments: false