Merge branch 'current' into next

source/_components/binary_sensor.mqtt.markdown

@@ -46,13 +46,13 @@ An extended configuration for the same sensor could look like this if you want/n
 ```yaml
 # Example configuration.yml entry
 binary_sensor:
-  platform: mqtt
-  state_topic: "home-assistant/window/contact"
-  name: "Windows contact"
-  qos: 0
-  payload_on: "1"
-  payload_off: "0"
-  sensor_class: opening
-  value_template: '{% raw %}{{ value.x }}{% endraw %}'
+  - platform: mqtt
+    state_topic: "home-assistant/window/contact"
+    name: "Windows contact"
+    qos: 0
+    payload_on: "1"
+    payload_off: "0"
+    sensor_class: opening
+    value_template: '{% raw %}{{ value.x }}{% endraw %}'
 ```
 

source/_components/mysensors.markdown

@@ -176,6 +176,6 @@ void receive(const MyMessage &message) {
 Sending a heartbeat from the MySensors device to Home Assistant activates the SmartSleep functionality in Home Assistant. This means that messages are buffered and only sent to the device upon receiving a heartbeat from the device. State changes are stored so that only the last requested state change is sent to the device. Other types of messages are queued in a FIFO queue. SmartSleep is useful for battery powered actuators that are waiting for commands.  See the MySensors library API for information on how to send heartbeats and sleep device.  
 
 
-Visit the [library api] of MySensors for more information.
+Visit the [library api][MySensors library api] of MySensors for more information.
 
 [MySensors library api]: http://www.mysensors.org/download

source/_components/notify.html5.markdown

@@ -37,7 +37,7 @@ Configuration variables:
 - Go to [https://console.cloud.google.com/apis/credentials/domainverification](https://console.cloud.google.com/apis/credentials/domainverification) and verify your domain.
 - After that, go to [https://console.firebase.google.com](https://console.firebase.google.com) and select import Google project, select the project you created.
 - Then, click the cogwheel on top left and select "Project settings".
-- Select Cloud messaging tab if under server key is button Regenerate key, click that.
+- Select 'Cloud Messaging' tab, listed beneath Project Credentials will be your 152 character 'Server Key' and 12 digit ID 'Sender ID'.
 
 
 ### {% linkable_title Requirements %}

source/_components/notify.pushbullet.markdown

@@ -26,7 +26,7 @@ notify:
 
 Configuration variables:
 
-- **api_key** (*Required*): Enter the API key for Pushbullet. Go to https://www.pushbullet.com/ to retrieve your API key.
+- **api_key** (*Required*): Enter the API key for Pushbullet. Go to [https://www.pushbullet.com/#settings/account](https://www.pushbullet.com/#settings/account) to retrieve your API key/access token.
 - **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`.
 
 ### {% linkable_title Usage %}

source/_components/recorder.markdown

@@ -16,7 +16,7 @@ The `recorder` component is storing details in a database which then are handled
 
 Home Assistant uses [SQLAlchemy](http://www.sqlalchemy.org/) as Object Relational Mapper (ORM). This means that you can now use **any** SQL backend for the recorder that is supported by SQLAlchemy, like [MySQL](https://www.mysql.com/), [MariaDB](https://mariadb.org/), or [PostgreSQL](https://www.postgresql.org/).
 
-The default database engine is [SQLite](https://www.sqlite.org/) which doesn't require any configuration. The database is stored in your Home Assistant configuration directory (`.homeassistant`) and called `home-assistant.db`.
+The default database engine is [SQLite](https://www.sqlite.org/) which doesn't require any configuration. The database is stored in your Home Assistant configuration directory (`.homeassistant`) and called `home-assistant_v2.db`.
 
 To setup the `recorder` component in your installation, add the following to your `configuration.yaml` file:
 

source/_components/script.markdown

@@ -25,9 +25,15 @@ script:
       # This is Home Assistant Script Syntax
       - service: notify.notify
         data_template:
-          message: Current temperature is {% raw %}{{ states.sensor.temperature.state }}{% endraw %}
+          message: Current temperature is {% raw %}{{ states.sensor.temperature.state }}{% endraw %}
+```
+<p class='note'>
+Script names (e.g. `message_temperature` in the example above) are not allowed to contain dash (minus) characters, i.e. `-`.
+The preferred way to separate words for better readability is to use underscore (`_`) characters. 
+</p>
 
-  # Turns on the bedroom lights and then the living room lights 1 minute later
+```yaml
+  # Turns on the bedroom lights and then the living room lights 1 minute later
   wakeup:
     alias: Wake Up
     sequence:

source/_components/sensor.sma.markdown

@@ -14,7 +14,7 @@ ha_release: 0.36
 ---
 
 
-The `sma` sensor will poll a [SMA][http://www.sma-america.com/] solar inverter and present the values as sensors (or attributes of sensors) in Home Assistant.
+The `sma` sensor will poll a [SMA](http://www.sma-solar.com/) [(US)](http://www.sma-america.com/) solar inverter and present the values as sensors (or attributes of sensors) in Home Assistant.
 
 To enable this sensor, add the following lines to your `configuration.yaml` file:
 
@@ -60,7 +60,8 @@ Example:
    custom:
       yesterday_consumption: 
          key: 6400_00543A01
-         unit: W
+         unit: kWh
+         factor: 1000
 ```
 
 Over time more sensors will be added as standard sensors to the [pysma library](https://github.com/kellerza/pysma/blob/master/pysma/__init__.py#L18). Feel free to submit additional sensors on that repository.

source/_components/switch.tplink.markdown

@@ -33,7 +33,7 @@ switch:
 
 Configuration variables:
 
-- **host** (*Required*): The IP address of your myStrom switch, eg. `http://192.168.1.32`.
+- **host** (*Required*): The IP address of your TP-Link switch, eg. `http://192.168.1.32`.
 - **name** (*Optional*): The name to use when displaying this switch.
 
 

source/_components/switch.wake_on_lan.markdown

@@ -51,6 +51,7 @@ from Home Assistant running on another Linux computer (the **server**).
 6. On the **target**, we need to let the hass user execute the program needed to suspend/shut down the target computer. I'm using `pm-suspend`, use `poweroff` to turn off the computer. First, get the full path: `which pm-suspend`. On my system, this is `/usr/sbin/pm-suspend`.
 7. On the **target**, using an account with sudo access (typically your main account), `sudo visudo`. Add this line last in the file: `hass ALL=NOPASSWD:/usr/sbin/pm-suspend`, where you replace `hass` with the name of your user on the target, if different, and `/usr/sbin/pm-suspend` with the command of your choice, if different.
 8. On the **server**, add the following to your configuration, replacing TARGET with the target's name:
+
 ```yaml
 switch:
   - platform: wake_on_lan