Merge branch 'master' into next

2016-03-26 00:09:44 -07:00 · 2016-03-26 00:09:44 -07:00 · 27c1f41d7b
commit 27c1f41d7b
parent 286ecd799c aacf326cc0
60 changed files with 1849 additions and 136 deletions
--- a/source/_components/alexa.markdown
+++ b/source/_components/alexa.markdown
@ -80,7 +80,7 @@ Out of the box, the component will do nothing. You have to teach it about all in

 You can use [templates] for the values of `speech/text`, `card/title` and `card/content`.

-[templates]: /getting-started/templating/
+[templates]: /topics/templating/

 Configuring the Alexa component for the above intents would look like this:

--- a/source/_components/automation.markdown
+++ b/source/_components/automation.markdown
@ -209,7 +209,7 @@ automation:

 Conditions are an optional part of an automation rule and be used to prevent an action from happening when triggered. Conditions look very familiar to triggers but are very different. A trigger will look at events happening at the system while a condition only looks at how the system looks right now. A trigger can observe that a switch is being turned on. A condition can only see if a switch is on or off.

-An automation rule can have mulitiple triggers. By default the action will only fire if all conditions pass. An optional key `condition_type: 'or'` can be set on the automation rule to fire action if any condition matches.  In the example below, the automation would trigger if the time is before 05:00 _OR_ after 20:00.
+An automation rule can have mulitiple conditions. By default the action will only fire if all conditions pass. An optional key `condition_type: 'or'` can be set on the automation rule to fire action if any condition matches.  In the example below, the automation would trigger if the time is before 05:00 _OR_ after 20:00.

 ```yaml
 automation:
@ -363,4 +363,4 @@ The Logbook component will show a line entry when an automation is triggered.  Y

 ![Logbook example](/images/components/automation/logbook.png)

-[template]: /getting-started/templating/
+[template]: /topics/templating/
--- a/source/_components/binary_sensor.command_line.markdown
+++ b/source/_components/binary_sensor.command_line.markdown
@ -33,7 +33,7 @@ Configuration variables:
 - **name** (*Optional*): Let you overwrite the the name of the device. By default *name* from the device is used.
 - **payload_on** (*Optional*): The payload that represents enabled state. Default is "ON".
 - **payload_off** (*Optional*): The payload that represents disabled state. Default is "OFF".
- **value_template** (*Optional*): Defines a [template](/getting-started/templating/) to extract a value from the payload.
+- **value_template** (*Optional*): Defines a [template](/topics/templating/) to extract a value from the payload.

 ## {% linkable_title Examples %}

--- a/source/_components/binary_sensor.mqtt.markdown
+++ b/source/_components/binary_sensor.mqtt.markdown
@ -25,6 +25,7 @@ binary_sensor:
  qos: 0
  payload_on: "ON"
  payload_off: "OFF"
+  sensor_class: opening
  value_template: '{% raw %}{{ value.x }}{% endraw %}'
 ```

@ -35,7 +36,8 @@ Configuration variables:
 - **qos** (*Optional*): The maximum QoS level of the state topic. Default is 0.
 - **payload_on** (*Optional*): The payload that represents on state. Default is "ON".
 - **payload_off** (*Optional*): The payload that represents  state. Default is "OFF".
- **value_template** (*Optional*): Defines a [template](/getting-started/templating/) to extract a value from the payload.
+- **sensor_class** (*Optional*): The [type/class](/components/binary_sensor/) of the sensor to set the icon in the frontend.
+- **value_template** (*Optional*): Defines a [template](/topics/templating/) to extract a value from the payload.

 For a quick check you can use the commandline tools shipped with `mosquitto` to send MQTT messages. Set the state of your sensor manually:

--- a/source/_components/binary_sensor.rest.markdown
+++ b/source/_components/binary_sensor.rest.markdown
@ -42,7 +42,7 @@ Configuration variables:

 - **resource** (*Required*): The resource or endpoint that contains the value.
 - **method** (*Optional*): The method of the request. Default is GET.
- **value_template** (*Optional*): Defines a [template](/getting-started/templating/) to extract the value.
+- **value_template** (*Optional*): Defines a [template](/topics/templating/) to extract the value.
 - **payload** (*Optional*): The payload to send with a POST request. Usualy formed as a dictionary.
 - **name** (*Optional*): Name of the REST binary sensor.

--- a/source/_components/binary_sensor.tcp.markdown
+++ b/source/_components/binary_sensor.tcp.markdown
@ -37,7 +37,7 @@ Configuration options for the a TCP Sensor:
 - **payload** (*Required*): What to send to the host in order to get the response we're interested in.
 - **value_on** (*Required*): The value returned when the device is "on".
 - **timeout** (*Optional*): How long in seconds to wait for a response from the service before giving up and disconnecting. Defaults to 10.
- **value_template** (*Optional*): Defines a [template](/getting-started/templating/) to extract the value. By default it's assumed that the entire response is the value.
+- **value_template** (*Optional*): Defines a [template](/topics/templating/) to extract the value. By default it's assumed that the entire response is the value.
 - **unit** (*Optional*): The unit of measurement to use for the value.
 - **buffer_size** (*Optional*): The size of the receive buffer in bytes. Set this to a larger value if you expect to receive a response larger than the default. Defaults to 1024.

--- a/source/_components/binary_sensor.template.markdown
+++ b/source/_components/binary_sensor.template.markdown
@ -29,7 +29,7 @@ Configuration variables:
 - **sensors** array (*Required*): List of your sensors.
  - **friendly_name** (*Optional*): Name to use in the Frontend.
  - **sensor_class** (*Optional*): Defines the class of the sensor (motion, heat, moisture, etc)
-  - **value_template** (*Optional*): Defines a [template](/getting-started/templating/) to extract a value from the payload.
+  - **value_template** (*Optional*): Defines a [template](/topics/templating/) to extract a value from the payload.


 ## {% linkable_title Examples %}
--- a/source/_components/browser.markdown
+++ b/source/_components/browser.markdown
@ -12,7 +12,7 @@ ha_category: Other
 ---


-The browser component provides a service to open urls in the default browser on the host machine.
+The `browser` component provides a service to open URLs in the default browser on the host machine.

 To load this component, add the following lines to your `configuration.yaml`:

@ -21,8 +21,19 @@ To load this component, add the following lines to your `configuration.yaml`:
 browser:
 ```

-#### Service `browser/browse_url`
+#### {% linkable_title Service `browser/browse_url` %} 

 | Service data attribute | Optional | Description |
 | ---------------------- | -------- | ----------- |
 | `url`                  |       no | The url to open
+
+
+### {% linkable_title Usage %}
+
+To use this service, choose **Call Service** from the **Developer Tools**. Choose the service *browser/browse_url* from the list of **Available services:** and enter the URL into the **Service Data** field and hit **CALL SERVICE**.
+
+```json
+{"url": "http://www.google.com"}
+```
+
+This will open the given URL on the host machine.
--- a/source/_components/camera.foscam.markdown
+++ b/source/_components/camera.foscam.markdown
@ -20,7 +20,7 @@ To enable your Foscam IP camera in your installation, add the following to your
 # Example configuration.yaml entry
 camera:
  platform: foscam
-  ip: 192.168.0.123
+  ip: IP_ADDRESS
  name: Door Camera
  port: 88
  username: USERNAME
@ -29,12 +29,15 @@ camera:

 Configuration variables:

- **ip** *Required*: The IP address your camera.
- **port** *Optional*: The port that the camera is running on. The default is 88. 
- **name** *Optional*: This parameter allows you to override the name of your camera.
- **username** *Required*: The username for accessing your camera.
- **password** *Required*: The password for accessing your camera.
-  - **Note**: There seems to be some issues within Foscam with lengthy passwords and passwords containing certain symbols. Be sure to check your camera's documentation.
+- **ip** (*Required*): The IP address your camera.
+- **port** (*Optional*): The port that the camera is running on. The default is 88. 
+- **name** (*Optional*): This parameter allows you to override the name of your camera.
+- **username** (*Required*): The username for accessing your camera.
+- **password** (*Required*): The password for accessing your camera.
+
+<p class='note'>
+There seems to be some issues within Foscam with lengthy passwords and passwords containing certain symbols. Be sure to check your camera's documentation.
+</p>
 
 ### {% linkable_title Control Foscam PTZ (Pan/Tilt/Zoom) - Home/Away %}
 Foscam Webcams which support CGI Commands can be controlled by Home Assistant ([Source](http://www.ipcamcontrol.net/files/Foscam%20IPCamera%20CGI%20User%20Guide-V1.0.4.pdf)). For an example of how this can be done, see the [Foscam IP Camera Pan, Tilt, Zoom Control](/cookbook/foscam_away_mode_PTZ/) Cookbook entry.
--- a/source/_components/device_tracker.nmap_scanner.markdown
+++ b/source/_components/device_tracker.nmap_scanner.markdown
@ -27,6 +27,9 @@ device_tracker:
  home_interval: 10
 ```

-`home_interval` is an optional value set in minutes.  This will be the number of minutes nmap will not scan this device, assuming it is home, in order to preserve the device battery.
+Configuration variables:
+
+- **hosts** (*Required*): Thenetwork range to scan in CIDR notation, eg. 192.168.1.1/24
+- **home_interval** (*Optional*): The number of minutes nmap will not scan this device, assuming it is home, in order to preserve the device battery.

 See the [device tracker component page](/components/device_tracker/) for instructions how to configure the people to be tracked.
--- a/source/_components/device_tracker.snmp.markdown
+++ b/source/_components/device_tracker.snmp.markdown
@ -23,6 +23,8 @@ OID examples:
 - Mikrotik: 1.3.6.1.2.1.4.22.1.2 (confirmed, RouterOS 6.x on RB2011)
 - Aruba: 1.3.6.1.4.1.14823.2.3.3.1.2.4.1.2 (untested)
 - BiPAC 7800DXL: 1.3.6.1.2.1.17.7.1.2.2.1.1 (confirmed on firmware 2.32e)
+- OpenWrt: 1.3.6.1.2.1.4.22.1.2 (tested on Chaos Calmer 15.05 firmware, need to install snmpd package)
+- pfSense: 1.3.6.1.2.1.4.22.1.2 (tested on 2.2.4-RELEASE, need to enable SNMP service)

 To use the snmp platform in your installation, add the following to your `configuration.yaml` file:

--- a/source/_components/discovery.markdown
+++ b/source/_components/discovery.markdown
@ -37,5 +37,9 @@ If running home-assistant in a docker container use switch `--net=host` to put i
 If you are developing a new platform, please read [how to make your platform discoverable]({{site_root}}/developers/add_new_platform/#discovery).

 <p class='note warning'>
-There is currently a <a href='https://bitbucket.org/al45tair/netifaces/issues/17/dll-fails-to-load-windows-81-64bit'>known issue</a> with running this playform on a 64-bit version of Python.
+There is currently a <a href='https://bitbucket.org/al45tair/netifaces/issues/17/dll-fails-to-load-windows-81-64bit'>known issue</a> with running this platform on a 64-bit version of Python.
+</p>
+
+<p class='note'>
+If you are on Windows and you're using Python 3.5, download the Netifaces dependency <a href='http://www.lfd.uci.edu/~gohlke/pythonlibs/#netifaces'>here</a>.
 </p>
--- a/source/_components/group.markdown
+++ b/source/_components/group.markdown
@ -15,10 +15,11 @@ Groups allow the user to combine multiple entities into one. A group can be prom

 Check the **Set State** page from the **Developer Tools** and browse the **Current entities:** listing for all available entities.

+By default, every group appears in the HOME tab. If you name a group `default_view` it will REPLACE the contents of the HOME tab so you can customize it as you wish.
+
 ```yaml
 # Example configuration.yaml entry
 group:
-  # If you name an entry default_view it will REPLACE the contents of the "Home" tab
  default_view:
    view: yes
    entities:
@ -42,24 +43,32 @@ group:

 Configuration variables:

+- **view** (*Optional*): If yes then the entry will be shown as a view (tab).
 - **name** (*Optional*): Name of the group.
- **icon** (*Optional*): An optional icon to show in the Frontend.
- **view** (*Optional*): If yes then the entry will be shown as a view.
- **entities** array or comma delimited string (*Required*): List of entites to group.
+- **icon** (*Optional*): If the group is a view, this icon will show at the top in the frontend instead of the name. If it's not a view, then the icon shows when this group is used in another group.
+- **entities** (*Required*): array or comma delimited string, list of entities to group.

 <p class='img'>
 <img src='/images/blog/2016-01-release-12/views.png'>
 Example of groups shown as views in the frontend.
 </p>

-If all entities are switches or lights they can be controlled as one with a switch at the top of the card. Grouped states should share the same type of states (ON/OFF or HOME/NOT_HOME).
+If all entities in a group are switches or lights then Home Assistant adds a switch at the top of the card that turns them all on/off at once.
+
+You can create views (tabs) that contain other groups.  
+Notice in the example below that in order to refer to the group "Living Room", you use `group.living_room` (lowercase and spaces replaced with underscores).

 ```yaml
-# Example configuration.yaml entry
-group:
-  living_room:
-    - light.bowl
-    - light.ceiling
-    - light.tv_back_light
-  children: device_tracker.child_1, device_tracker.child_2
-```
+# Example configuration.yaml entry that shows two groups, referred to in a view group (tab)
+  Living Room:
+    entities:
+      - light.light_family_1
+      - binary_sensor.motion_living
+  Bedroom: light.light_bedroom, switch.sleeping
+  Rooms:                                                                                                                                                       
+    view: yes                                                                                                                                                  
+    name: Rooms
+    entities:                                                                                                                                                  
+      - group.living_room                                                                                                                                      
+      - group.bedroom                                                                                                                                          
+``` 
--- a/source/_components/light.hue.markdown
+++ b/source/_components/light.hue.markdown
@ -22,6 +22,13 @@ If you want to enable the light component directly, add the following lines to y
 light:
  platform: hue
  host: DEVICE_IP_ADDRESS
-  # Optional, make this unique if specifying multiple Hue hubs
+  allow_unreachable: true
  filename: my_hue_hub_token.conf
 ```
+
+Configuration variables:
+
+- **host** (*Required*): IP address aof the device, eg. 192.168.1.10.
+- **allow_unreachable** (*Optional*):  This will allow unreachable bulbs to report their state correctly. By default *name* from the device is used.
+- **filename** (*Optional*): Make this unique if specifying multiple Hue hubs.
+
--- a/source/_components/light.mqtt.markdown
+++ b/source/_components/light.mqtt.markdown
@ -66,9 +66,9 @@ Configuration variables:
 - **brightness_command_topic** (*Optional*): The MQTT topic to publish commands to change the light's brightness.
 - **rgb_state_topic** (*Optional*): The MQTT topic subscribed to receive RGB state updates.
 - **rgb_command_topic** (*Optional*): The MQTT topic to publish commands to change the light's RGB state.
- **state_value_template** (*Optional*): Defines a [template](/getting-started/templating/) to extract the state value.
- **brightness_value_template** (*Optional*): Defines a [template](/getting-started/templating/) to extract the brightness value.
- **rgb_value_template** (*Optional*): Defines a [template](/getting-started/templating/) to extract the RGB value.
+- **state_value_template** (*Optional*): Defines a [template](/topics/templating/) to extract the state value.
+- **brightness_value_template** (*Optional*): Defines a [template](/topics/templating/) to extract the brightness value.
+- **rgb_value_template** (*Optional*): Defines a [template](/topics/templating/) to extract the RGB value.
 - **brightness_scale** (*Optional*): Defines the maximum brightness value (i.e. 100%) of the MQTT device (defaults to 255).
 - **qos** (*Optional*): The maximum QoS level of the state topic. Default is 0 and will also be used to publishing messages.
 - **payload_on** (*Optional*): The payload that represents enabled state. Default is "ON".
--- a/source/_components/lock.mqtt.markdown
+++ b/source/_components/lock.mqtt.markdown
@ -46,7 +46,7 @@ Configuration variables:
 - **optimistic** (*Optional*): Flag that defines if lock works in optimistic mode. Default is true if no state topic defined, else false.
 - **qos** (*Optional*): The maximum QoS level of the state topic. Default is 0 and will also be used to publishing messages.
 - **retain** (*Optional*): If the published message should have the retain flag on or not.
- **value_template** (*Optional*): Defines a [template](/getting-started/templating/) to extract a value from the payload.
+- **value_template** (*Optional*): Defines a [template](/topics/templating/) to extract a value from the payload.

 <p class='note warning'>
 Make sure that your topic match exact. `some-topic/` and `some-topic` are different topics.
--- a/source/_components/mqtt.markdown
+++ b/source/_components/mqtt.markdown
@ -125,18 +125,21 @@ Home Assistant will automatically load the correct certificate if you connect to

 ## {% linkable_title Building on top of MQTT %}

+ - [MQTT Alarm control panel](/components/alarm_control_panel.mqtt/)
+ - [MQTT Binary sensor](/components/binary_sensor.mqtt/)
 - [MQTT Sensor](/components/sensor.mqtt/)
 - [MQTT Switch](/components/switch.mqtt/)
 - [MQTT Light](/components/light.mqtt/)
+ - [MQTT Lock](/components/lock.mqtt/)
 - [MQTT Device Tracker](/components/device_tracker.mqtt/)
 - [OwnTracks Device Tracker](/components/device_tracker.owntracks/)
 - [MQTT automation rule](/components/automation/#mqtt-based-automation)
- - [MQTT alarm](/components/alarm_control_panel.mqtt/)
+
 - Integrating it into own component. See the [MQTT example component](/cookbook/python_component_mqtt_basic/) how to do this.

 ### {% linkable_title Publish service %}

-The MQTT component will register the service `publish` which allows publishing messages to MQTT topics. There are two ways of specifiying your payload. You can either use `payload` to hard-code a payload or use `payload_template` to specify a [template](/getting-started/templating/) that will be rendered to generate the payload.
+The MQTT component will register the service `publish` which allows publishing messages to MQTT topics. There are two ways of specifiying your payload. You can either use `payload` to hard-code a payload or use `payload_template` to specify a [template](/topics/templating/) that will be rendered to generate the payload.

 ```json
 {
--- a/source/_components/notify.google_voice.markdown
+++ b/source/_components/notify.google_voice.markdown
@ -28,7 +28,7 @@ notify:
 Configuration variables:

 - **username** (*Required*): Enter your the Google email address you have signed up for Google Voice with. Go to https://www.google.com/voice to setup your Google Voice account.
- **password** (*Required*): Enter the password associated with the above email. Go to https://www.pushbullet.com/ to retrieve your API key.
+- **password** (*Required*): Enter the password associated with the above email.
 - **name** (*Optional*): Setting the optional parameter `name` allows multiple notifiers to be created. The default value is `notify`. The notifier will bind to the service `notify.NOTIFIER_NAME`.

 ### Usage
--- a/source/_components/notify.markdown
+++ b/source/_components/notify.markdown
@ -37,7 +37,7 @@ Once loaded, the `notify` platform will expose a service that can be called to s

 The notification component supports specifying [templates] for both the `message` and the `title`. This will allow you to use the current state of Home Assistant in your notifications.

-[templates]: /getting-started/templating/
+[templates]: /topics/templating/

 ### {% linkable_title Test if it works %}

--- a/source/_components/rollershutter.mqtt.markdown
+++ b/source/_components/rollershutter.mqtt.markdown
@ -42,4 +42,4 @@ Configuration variables:
 - **payload_up** (*Optional*): The payload to open the rollershutter. Default is "OPEN".
 - **payload_down** (*Optional*): The payload to close the rollershutter. Default is "CLOSE".
 - **payload_stop** (*Optional*): The payload to stop the rollershutter. Default is "STOP".
- **value_template** (*Optional*): Defines a [template](/getting-started/templating/) to extract a value from the payload.
+- **value_template** (*Optional*): Defines a [template](/topics/templating/) to extract a value from the payload.
--- a/source/_components/scene.hunterdouglas_powerview.markdown
+++ b/source/_components/scene.hunterdouglas_powerview.markdown
@ -8,7 +8,7 @@ comments: false
 sharing: true
 footer: true
 logo: hunter-douglas-powerview.png
-ha_category: Organization
+ha_category: Rollershutter
 ---

 Implements the [Hunter Douglas PowerView](http://www.hunterdouglas.com/operating-systems/powerview-motorization/support) platform scene control. It queries the PowerView Hub and Home Assistant displays them as scenes.
@ -24,4 +24,4 @@ scene:

 Configuration variables:

- **address** (*Required*): IP address of the PowerView Hub, eg. http://192.168.1.10.
+- **address** (*Required*): IP address of the PowerView Hub, eg. 192.168.1.10.
--- a/source/_components/scene.home_assistant.markdown
+++ b/source/_components/scene.home_assistant.markdown
--- a/source/_components/sensor.arest.markdown
+++ b/source/_components/sensor.arest.markdown
@ -45,11 +45,11 @@ Configuration variables:
 - **monitored_variables** array (*Optional*): List of exposed variables.
  - **name** (*Required*): The name of the variable you wish to monitor.
  - **unit** (*Optional*): Defines the units of measurement of the sensor, if any.
-  - **value_template** (*Optional*): Defines a [template](/getting-started/templating/) to extract a value from the payload.
+  - **value_template** (*Optional*): Defines a [template](/topics/templating/) to extract a value from the payload.
 - **pins** array (*Optional*): List of pins to monitor. Analog pins need a leading **A** for the pin number.
  - **name** (*Optional*): The name of the variable you wish to monitor.
  - **unit_of_measurement** (*Optional*): Defines the unit of measurement of the sensor, if any.
-  - **value_template** (*Optional*): Defines a [template](/getting-started/templating/) to extract a value from the payload.
+  - **value_template** (*Optional*): Defines a [template](/topics/templating/) to extract a value from the payload.

 The variables in the `monitored_variables` array must be available in the response of the device. As a starting point you could use the one of the example sketches (eg.  [Ethernet](https://raw.githubusercontent.com/marcoschwartz/aREST/master/examples/Ethernet/Ethernet.ino) for an Arduino with Ethernet shield). In those sketches are two variables (`temperature` and `humidity`) available which will act as endpoints. 

--- a/source/_components/sensor.command_line.markdown
+++ b/source/_components/sensor.command_line.markdown
@ -31,7 +31,7 @@ Configuration variables:
 - **command** (*Required*): The action to take to get the value.
 - **name** (*Optional*): Name of the command sensor.
 - **unit_of_measurement** (*Optional*): Defines the unit of measurement of the sensor, if any.
- **value_template** (*Optional*): Defines a [template](/getting-started/templating/) to extract a value from the payload.
+- **value_template** (*Optional*): Defines a [template](/topics/templating/) to extract a value from the payload.

 ## {% linkable_title Examples %}

--- a/source/_components/sensor.mqtt.markdown
+++ b/source/_components/sensor.mqtt.markdown
@ -33,7 +33,7 @@ Configuration variables:
 - **name** (*Optional*): The name of the sensor. Default is 'MQTT Sensor'. 
 - **qos** (*Optional*): The maximum QoS level of the state topic. Default is 0.
 - **unit_of_measurement** (*Optional*): Defines the units of measurement of the sensor, if any.
- **value_template** (*Optional*): Defines a [template](/getting-started/templating/) to extract a value from the payload.
+- **value_template** (*Optional*): Defines a [template](/topics/templating/) to extract a value from the payload.

 ## {% linkable_title Examples %}

--- a/source/_components/sensor.rest.markdown
+++ b/source/_components/sensor.rest.markdown
@ -44,7 +44,7 @@ Configuration variables:

 - **resource** (*Required*): The resource or endpoint that contains the value.
 - **method** (*Optional*): The method of the request. Default is GET.
- **value_template** (*Optional*): Defines a [template](/getting-started/templating/) to extract the value.
+- **value_template** (*Optional*): Defines a [template](/topics/templating/) to extract the value.
 - **payload** (*Optional*): The payload to send with a POST request. Usualy formed as a dictionary.
 - **name** (*Optional*): Name of the REST sensor.
 - **unit_of_measurement** (*Optional*): Defines the unit of measurement of the sensor, if any.
--- a/source/_components/sensor.speedtest.markdown
+++ b/source/_components/sensor.speedtest.markdown
@ -72,4 +72,4 @@ Configuration variables:
 - **hour** (*Optional*): Specify the hour(s) of the day to schedule the speedtest. Use a list for multiple entries. Default is None.
 - **day** (*Optional*): Specify the day(s) of the month to schedule the speedtest. Use a list for multiple entries. Default is None.

-This component uses [speetest-cli](https://github.com/sivel/speedtest-cli) to gather network performance data from Speedtest.net.  Please be aware of the potential [inconsistencies](https://github.com/sivel/speedtest-cli#inconsistency) that this component may display.
+This component uses [speedtest-cli](https://github.com/sivel/speedtest-cli) to gather network performance data from Speedtest.net.  Please be aware of the potential [inconsistencies](https://github.com/sivel/speedtest-cli#inconsistency) that this component may display.
--- a/source/_components/sensor.tcp.markdown
+++ b/source/_components/sensor.tcp.markdown
@ -34,7 +34,7 @@ Configuration options for the a TCP Sensor:
 - **port** (*Required*): The port to connect to the host on.
 - **payload** (*Required*): What to send to the host in order to get the response we're interested in.
 - **timeout** (*Optional*): How long in seconds to wait for a response from the service before giving up and disconnecting. Defaults to `10`
- **value_template** (*Optional*): Defines a [template](/getting-started/templating/) to extract the value. By default it's assumed that the entire response is the value.
+- **value_template** (*Optional*): Defines a [template](/topics/templating/) to extract the value. By default it's assumed that the entire response is the value.
 - **unit** (*Optional*): The unit of measurement to use for the value.
 - **buffer_size** (*Optional*): The size of the receive buffer in bytes. Set this to a larger value if you expect to receive a response larger than the default. Defaults to `1024`.

--- a/source/_components/sensor.template.markdown
+++ b/source/_components/sensor.template.markdown
@ -32,7 +32,7 @@ Configuration variables:
 - **sensors** array (*Required*): List of your sensors.
  - **friendly_name** (*Optional*): Name to use in the Frontend.
  - **unit_of_measurement** (*Optional*): Defines the units of measurement of the sensor, if any.
-  - **value_template** (*Optional*): Defines a [template](/getting-started/templating/) to extract a value from the payload.
+  - **value_template** (*Optional*): Defines a [template](/topics/templating/) to extract a value from the payload.


 ## {% linkable_title Examples %}
--- a/source/_components/switch.mqtt.markdown
+++ b/source/_components/switch.mqtt.markdown
@ -46,7 +46,7 @@ Configuration variables:
 - **optimistic** (*Optional*): Flag that defines if switch works in optimistic mode. Default is true if no state topic defined, else false.
 - **qos** (*Optional*): The maximum QoS level of the state topic. Default is 0 and will also be used to publishing messages.
 - **retain** (*Optional*): If the published message should have the retain flag on or not.
- **value_template** (*Optional*): Defines a [template](/getting-started/templating/) to extract a value from the payload.
+- **value_template** (*Optional*): Defines a [template](/topics/templating/) to extract a value from the payload.

 <p class='note warning'>
 Make sure that your topic match exact. `some-topic/` and `some-topic` are different topics.
--- a/source/_components/switch.template.markdown
+++ b/source/_components/switch.template.markdown
@ -38,7 +38,7 @@ Configuration variables:

 - **switches** array (*Required*): List of your switches.
  - **friendly_name** (*Optional*): Name to use in the Frontend.
-  - **value_template** (*Required*): Defines a [template](/getting-started/templating/) to set the state of the switch.
+  - **value_template** (*Required*): Defines a [template](/topics/templating/) to set the state of the switch.
  - **turn_on** (*Required*): Defines an [action](/getting-started/automation/) to run when the switch is turned on.
  - **turn_off** (*Required*): Defines an [action](/getting-started/automation/) to run when the switch is turned off.

--- a/source/_components/tellstick.markdown
+++ b/source/_components/tellstick.markdown
@ -12,7 +12,7 @@ ha_category: Hub
 ---


-The `tellstick` component integrates [TellStick](http://www.telldus.se/products/tellstick) devices into Home Assistant. This integration allows users to add switches, lights, and sensors which are communicating with 433 Mhz. There are couple of vendors (Capidi Elro, Intertechno, Nexa, Proove, Sartano, and Viking) how are selling products which works with TellStick. For more details, please check the TellStick [compatibility list](http://telldus.se/products/compability).
+The `tellstick` component integrates [TellStick](http://www.telldus.se/products/tellstick) devices into Home Assistant. This integration allows users to add switches, lights, and sensors which are communicating with 433 Mhz. There are a number of vendors (Capidi Elro, Intertechno, Nexa, Proove, Sartano, and Viking) who are selling products that work with TellStick. For more details, please check the TellStick [compatibility list](http://telldus.se/products/compability).

 To get started, add the devices to your `configuration.yaml` file.

--- a/source/_components/zwave.markdown
+++ b/source/_components/zwave.markdown
@ -22,7 +22,13 @@ To allow Home Assistant to talk to your Z-Wave USB stick you will have to compil
 Make sure you have the correct dependencies installed before running the script:

 ```bash
-$ apt-get install cython3 libudev-dev python3-sphinx python3-setuptools
+$ sudo apt-get install cython3 libudev-dev python3-sphinx python3-setuptools
+```
+
+Make sure you have at least version 0.23 of cython. 
+
+```bash
+$ sudo pip3 install --upgrade cython
 ```

 Then get the OpenZWave files and switch to the `python3` branch:
@ -37,7 +43,7 @@ $ sudo PYTHON_EXEC=`which python3` make install
 <p class='note'>
 Instead of `make install`, you can alternatively build your own python-openzwave package which can be easily uninstalled:

-`$ sudo PYTHON_EXEC=`which python3` checkinstall --pkgname python-openzwave --pkgversion 1.0 --provides python-openzwave`
+```$ sudo PYTHON_EXEC=`which python3` checkinstall --pkgname python-openzwave --pkgversion 1.0 --provides python-openzwave```

 </p>