Merge branch 'current' into next

source/_components/binary_sensor.flic.markdown

@@ -31,12 +31,14 @@ Configuration variables:
 - **port** (*Optional*): The port of the flic service. (default: `5551`)
 - **discovery** (*Optional*): If `true`, the component is configured to constantly scan for new buttons. (default: `true`)
 - **ignored_click_types**: List of click types whose occurrence should not trigger and `flic_click` event.
-
+- **timeout** (*Optional*): Maximum time in seconds an event can be queued locally on a button before discarding the event. (default: `3`)
 
 #### {% linkable_title Discovery %}
 
 If discovery is enabled, you can add a new button by pressing it for at least 7s. The button will be paired with the flic service and added to Home Assistant. Otherwise, you have to manually pair it with the flic service. The Home Assistant platform will not scan for new buttons and will only connect to buttons already paired.
 
+#### {% linkable_title Timeout %}
+ +When the flic button is triggered while disconnected from flic service, it will queue all events and try to connect and transmit them as soon as possible. The timeout variable can be used to stop events from triggering if too much time passed between the action and the notification in Home Assistant.
 
 #### {% linkable_title Events %}
 
@@ -62,7 +64,8 @@ Event data:
 - **button_name**: The name of the button, that triggered the event.
 - **button_address**: The bluetooth address of the button, that triggered the event.
 - **click_type**: The type of click. Possible values are `single`, `double` and `hold`.
-
+- **queued_time**: The amount of time this event was queued on the button, in seconds.
 
 ##### {% linkable_title Ignoring Click Types %}
+
 For some purposes it might make sense to exclude a specific click type from triggering click events. For example when ignoring double clicks, pressing the button twice fast results in two `single` instead of a `double` click event. This is very useful for applications where you want to click fast.

source/_components/frontend.markdown

@@ -0,0 +1,24 @@
+---
+layout: page
+title: "Frontend"
+description: "Offers a web framework to serve files."
+date: 2015-12-06 21:35
+sidebar: true
+comments: false
+sharing: true
+footer: true
+logo: home-assistant.png
+ha_category: "Other"
+---
+
+The `http` component serves all files and data required for the Home Assistant frontend. You only need to add this to your configuration file if you want to change any of the default settings.
+
+<p class='note warning'>
+It's HIGHLY recommended that you set the `api_password`, especially if you are planning to expose your installation to the internet.
+</p>
+
+```yaml
+# Example configuration.yaml entry
+frontend:
+```
+

source/_components/sensor.systemmonitor.markdown

@@ -58,3 +58,33 @@ The table contains types and their argument to use in your `configuration.yaml`
 | last_boot           |                          |
 | since_last_boot     |                          |
 
+## {% linkable_title Linux specific %}
+
+To retrieve all available network interfaces on a Linux System, execute the `ifconfig` command.
+
+```bash
+$ ifconfig -a | sed 's/[ \t].*//;/^$/d'
+```
+
+## {% linkable_title Windows specific %}
+
+When running this platform on Microsoft Windows, Typically, the default interface would be called `Local Area Connection`, so your configuration might look like:
+
+```yaml
+sensor:
+  - platform: systemmonitor
+    resources:
+      - type: network_in
+        arg: 'Local Area Connection'
+```
+
+If you need to use some other interface, open a commandline prompt and type `ipconfig` to list all interface names. For example a wireless connection output from `ifconfig` might look like:
+
+```bash
+Wireless LAN adapter Wireless Network Connection:
+
+   Media State . . . . . . . . . . . : Media disconnected
+   Connection-specific DNS Suffix  . :
+```
+
+Where the name is `Wireless Network Connection`

source/_components/tts.markdown

@@ -55,6 +55,7 @@ service: tts.google_say
 data:
   message: 'May the Force be with you.'
 ```
+Say to the `media_player.floor` device entitie:
 
 ```yaml
 service: tts.google_say
@@ -63,6 +64,16 @@ data:
   message: 'May the Force be with you.'
 ```
 
+Say to the `media_player.floor` device entitie in french:
+
+```yaml
+service: tts.google_say
+entity_id: media_player.floor
+data:
+  message: 'Que la force soit avec toi.'
+  language: 'fr'
+```
+
 With a template:
 
 ```yaml