Merge branch 'current' into next

balloob · balloob · commit c88b3a1b8d2b · 2017-01-15T08:54:16.000-08:00
diff --git a/source/_components/binary_sensor.flic.markdown b/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.
diff --git a/source/_components/frontend.markdown b/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:
+```
+
diff --git a/source/_components/sensor.systemmonitor.markdown b/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`
diff --git a/source/_components/tts.markdown b/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
diff --git a/source/getting-started/autostart-systemd.markdown b/source/getting-started/autostart-systemd.markdown
@@ -63,7 +63,7 @@ After=docker.service
 [Service]
 Restart=always
 RestartSec=3
-ExecStart=/usr/bin/docker run --name="home-assistant-%i" -v /home/%i/.homeassistant/:/config -v /etc/localtime:/etc/localtime:ro --net=host homeassistant/home-assistant 
+ExecStart=/usr/bin/docker run --name="home-assistant-%i" -v /home/%i/.homeassistant/:/config -v /etc/localtime:/etc/localtime:ro --net=host homeassistant/home-assistant
 ExecStop=/usr/bin/docker stop -t 2 home-assistant-%i
 ExecStopPost=/usr/bin/docker rm -f home-assistant-%i
 
diff --git a/source/getting-started/z-wave.markdown b/source/getting-started/z-wave.markdown
@@ -81,6 +81,7 @@ Configuration variables:
   - **ignored** (*Optional*): Ignore this entitiy completely. It won't be shown in the Web Interface and no events are generated for it.
   - **refresh_value** (*Optional*): Enable refreshing of the node value. Only light component uses this. Defaults to 2 second delay.
   - **delay** (*Optional*): Specify the delay to wait for refresh of node value if you want other than 2 seconds.
+- **debug** (*Optional*): Print verbose z-wave info to log. Defaults to False.
 
 To find the path of your Z-Wave USB stick or module, run:
 
@@ -226,16 +227,17 @@ The `zwave` component exposes multiple services to help maintain the network.
 | ------- | ----------- |
 | add_node | Put the Z-Wave controller in inclusion mode. Allows one to add a new device to the Z-Wave network.|
 | add_node_secure | Put the Z-Wave controller in secure inclusion mode. Allows one to add a new device with secure communications to the Z-Wave network. |
-| change_association | Add or remove an association in the Z-Wave network
 | cancel_command | Cancels a running Z-Wave command. If you have started a add_node or remove_node command, and decides you are not going to do it, then this must be used to stop the inclusion/exclusion command. |
+| change_association | Add or remove an association in the Z-Wave network |
 | heal_network | Tells the controller to "heal" the Z-Wave network. Basically asks the nodes to tell the controller all of their neighbors so the controller can refigure out optimal routing. |
+| print_config_parameter | Prints Z-wave node's config parameter value to the log.
 | remove_node | Put the Z-Wave controller in exclusion mode. Allows one to remove a device from the Z-Wave network.|
+| rename_node | Sets a node's name. Requires an `entity_id` and `name` field. |
 | set_config_parameter | Let's the user set a config parameter to a node.
 | soft_reset | Tells the controller to do a "soft reset". This is not supposed to lose any data, but different controllers can behave differently to a "soft reset" command.|
 | start_network | Starts the Z-Wave network.|
 | stop_network | Stops the Z-Wave network.|
 | test_network | Tells the controller to send no-op commands to each node and measure the time for a response. In theory, this can also bring back nodes which have been marked "presumed dead".|
-| rename_node | Sets a node's name. Requires an `entity_id` and `name` field. |
 
 The `soft_reset` and `heal_network` commands can be used as part of an automation script to help keep a Z-Wave network running reliably as shown in the example below.  By default, Home Assistant will run a `heal_network` at midnight.  This is a configuration option for the `zwave` component, the option defaults to `true` but can be disabled by setting `auto_heal` to false.  Using the `soft_reset` function with some Z-Wave controllers can cause the Z-Wave network to hang. If you're having issues with your Z-Wave network try disabling this automation.
 
