Merge branch 'master' of git@github.com:partofthething/home-assistant.io.git into zwave-unfork

# Conflicts:
#	source/_components/binary_sensor.mysensors.markdown

source/_components/binary_sensor.bloomsky.markdown

@@ -11,7 +11,7 @@ logo: bloomsky.png
 ha_category: Binary Sensor
 ---
 
-The `bloomsky` binary sensor platform allows you to get data from your BoomSky device.
+The `bloomsky` binary sensor platform allows you to get data from your BloomSky device.
 
 To get your BloomSky binary sensors working with Home Assistant, follow the instructions for the [BloomSky component](/components/bloomsky/) first.
 

source/_components/binary_sensor.mysensors.markdown

@@ -2,7 +2,7 @@
 layout: page
 title: "MySensors Binary Sensor"
 description: "Instructions how to integrate MySensors binary sensors into Home Assistant."
-date: 2016-02-27 20:13 +0100
+date: 2016-02-28 01:20 +0100
 sidebar: true
 comments: false
 sharing: true
@@ -30,9 +30,9 @@ S_TYPE         | V_TYPE
 ---------------|----------------------------------
 S_SPRINKLER    | V_TRIPPED
 S_WATER_LEAK   | V_TRIPPED
-S_SOUND        | V_TRIPPED, V_LEVEL
+S_SOUND        | V_TRIPPED
-S_VIBRATION    | V_TRIPPED, V_LEVEL
+S_VIBRATION    | V_TRIPPED
-S_MOISTURE     | V_TRIPPED, V_LEVEL
+S_MOISTURE     | V_TRIPPED
 
 For more information, visit the [serial api] of MySensors.
 

source/_components/light.mysensors.markdown

@@ -20,14 +20,12 @@ The following actuator types are supported:
 
 S_TYPE   | V_TYPE
 ---------|--------------
-S_LIGHT  | V_LIGHT
 S_DIMMER | V_DIMMER
 
 ##### MySensors version 1.5 and higher
 
 S_TYPE      | V_TYPE
 ------------|-------------
-S_LIGHT     | V_STATUS
 S_DIMMER    | V_PERCENTAGE
 S_RGB_LIGHT | V_RGB
 

source/_components/sensor.deutsche_bahn.markdown

@@ -0,0 +1,32 @@
+---
+layout: page
+title: "Swiss Public Transport"
+description: "Instructions how to integrate timetable data for travelling in Switzerland within Home Assistant."
+date: 2015-06-02 21:45
+sidebar: true
+comments: false
+sharing: true
+footer: true
+ha_category: Sensor
+ha_iot_class: "Local Polling"
+---
+
+
+The `deutsche_bahn` sensor will give you the departure time of the next train for the given connection. In case of a delay, the delay is also shown. Additional `ATTRIBUTES` are used to inform about eg. the type of the train, price and if it is ontime. The data are coming from the [bahn.de](http://www.bahn.de/p/view/index.shtml) website.
+
+
+To enable this sensor, add the following lines to your `configuration.yaml` file:
+
+```yaml
+# Example configuration.yaml entry
+sensor:
+  platform: deutsche_bahn
+  from: NAME_OF_START_STATION
+  to: NAME_OF_FINAL_STATION
+```
+
+Configuration variables:
+
+- **from** (*Required*): The name of the start station.
+- **to** (*Required*): The name of the end station.
+

source/_components/sensor.mysensors.markdown

@@ -2,7 +2,7 @@
 layout: page
 title: "MySensors Sensor"
 description: "Instructions how to integrate MySensors sensors into Home Assistant."
-date: 2016-02-18 20:13 +0100
+date: 2016-02-28 01:20 +0100
 sidebar: true
 comments: false
 sharing: true
@@ -20,9 +20,6 @@ The following sensor types are supported:
 
 S_TYPE             | V_TYPE
 -------------------|---------------------------------------
-S_DOOR             | V_TRIPPED
-S_MOTION           | V_TRIPPED
-S_SMOKE            | V_TRIPPED
 S_TEMP             | V_TEMP
 S_HUM              | V_HUM
 S_BARO             | V_PRESSURE, V_FORECAST
@@ -46,11 +43,9 @@ S_TYPE         | V_TYPE
 ---------------|----------------------------------
 S_COLOR_SENSOR | V_RGB
 S_MULTIMETER   | V_VOLTAGE, V_CURRENT, V_IMPEDANCE
-S_SPRINKLER    | V_TRIPPED
+S_SOUND        | V_LEVEL
-S_WATER_LEAK   | V_TRIPPED
+S_VIBRATION    | V_LEVEL
-S_SOUND        | V_TRIPPED, V_LEVEL
+S_MOISTURE     | V_LEVEL
-S_VIBRATION    | V_TRIPPED, V_LEVEL
-S_MOISTURE     | V_TRIPPED, V_LEVEL
 S_LIGHT_LEVEL  | V_LEVEL
 S_AIR_QUALITY  | V_LEVEL (replaces V_DUST_LEVEL)
 S_DUST         | V_LEVEL (replaces V_DUST_LEVEL)

source/_components/sensor.neurio_energy.markdown

@@ -13,7 +13,7 @@ ha_iot_class: "Cloud Polling"
 ---
 
 
-Integrate your [Neurio](http://neur.io/) meter information into Home Assistant. To get an API key and secret, login to your Neurio account at https://my.neur.io/#settings/applications/register and register an application. Note the Homepage URL and Callback URL are optional.
+Integrate your [Neurio](http://neur.io/) meter information into Home Assistant. To get an API key and secret, login to your [Neurio account](https://my.neur.io/#settings/applications/register) and register an application. Note the Homepage URL and Callback URL are optional.
 
 To enable this sensor in your installation, add the following to your `configuration.yaml` file:
 

source/_components/sensor.tcp.markdown

@@ -62,7 +62,40 @@ sensor:
     port: 8888
     timeout: 5
     payload: "r WaterPressure\n"
-    value_template: "{{ value.split(';')[0] }}"
+    value_template: "{% raw %}{{ value.split(';')[0] }}{% endraw %}"
     unit: Bar
 ```
 
+### {% linkable_title hddtemp %}
+
+The tool `hddtemp` collects the temperatur of your harddisks. 
+
+```bash
+$ hddtemp
+/dev/sda: SAMSUNG MZMTE256HMHP-000L1: 39°C
+```
+
+With `hddtemp -d` you can run the tool in TCP/IP daemon mode on port 7634 which enables you to get the data across the network.
+
+```bash
+$ telnet localhost 7634
+Trying 127.0.0.1...
+Connected to localhost.
+Escape character is '^]'.
+|/dev/sda|SAMSUNG MZMTE256HMHP-000L1|38|C|Connection closed by foreign host.
+```
+
+The entry for the `configuration.yaml` file for a `hddtemp` sensor could look like the example below.
+
+```yaml
+sensor:
+# Example configuration.yaml entry
+  - platform: tcp
+    name: HDD temperature
+    host: 127.0.0.1
+    port: 7634
+    timeout: 5
+    payload: "\n"
+    value_template: "{% raw %}{{ value.split('|')[3] }}{% endraw %}"
+    unit: "°C"
+```

source/_components/switch.mqtt.markdown

@@ -19,7 +19,7 @@ When a state topic is not available, the switch will work in optimistic mode. In
 
 Optimistic mode can be forced, even if state topic is available. Try to enable it, if experiencing incorrect switch operation.
 
-To enable this s in your installation, add the following to your `configuration.yaml` file:
+To enable this switch in your installation, add the following to your `configuration.yaml` file:
 
 ```yaml
 # Example configuration.yml entry
@@ -28,10 +28,10 @@ switch:
   name: "Bedroom Switch"
   state_topic: "home/bedroom/switch1"
   command_topic: "home/bedroom/switch1/set"
-  qos: 0
   payload_on: "ON"
   payload_off: "OFF"
   optimistic: false
+  qos: 0
   retain: true
   value_template: '{% raw %}{{ value.x }}{% endraw %}'
 ```
@@ -41,13 +41,13 @@ Configuration variables:
 - **name** (*Optional*): The name of the switch. Default is 'MQTT Switch'.
 - **state_topic** (*Optional*): The MQTT topic subscribed to receive state updates.
 - **command_topic** (*Required*): The MQTT topic to publish commands to change the switch state.
-- **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".
 - **payload_off** (*Optional*): The payload that represents disabled state. Default is "OFF".
 - **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.
 
 <p class='note warning'>
-  Make sure that your topics match exact. `some-topic/` and `some-topic` are different topics.
+Make sure that your topic match exact. `some-topic/` and `some-topic` are different topics.
 </p>

source/_components/switch.mysensors.markdown

@@ -2,7 +2,7 @@
 layout: page
 title: "MySensors Switch"
 description: "Instructions how to integrate MySensors switches into Home Assistant."
-date: 2016-02-15 20:49 +0100
+date: 2016-02-28 01:20 +0100
 sidebar: true
 comments: false
 sharing: true
@@ -23,12 +23,14 @@ S_TYPE   | V_TYPE
 S_DOOR   | V_ARMED
 S_MOTION | V_ARMED
 S_SMOKE  | V_ARMED
+S_LIGHT  | V_LIGHT
 S_LOCK   | V_LOCK_STATUS
 
 ##### MySensors version 1.5 and higher
 
 S_TYPE       | V_TYPE
 -------------|------------------
+S_LIGHT      | V_STATUS
 S_BINARY     | V_STATUS, V_LIGHT
 S_SPRINKLER  | V_STATUS
 S_WATER_LEAK | V_ARMED

source/_cookbook/automation_for_rainy_days.markdown

@@ -10,7 +10,7 @@ footer: true
 ha_category: Automation Examples
 ---
 
-This requires a [forecast.io](components/sensor.forecast/) sensor with the condition `weather_precip` that tells if it's raining or not.
+This requires a [forecast.io](/components/sensor.forecast/) sensor with the condition `weather_precip` that tells if it's raining or not.
 
 Turn on a light in the living room when it starts raining, someone is home, and it's afternoon or later.