Merge branch 'current' into next

source/_docs/configuration/events.markdown

@@ -73,7 +73,7 @@ Event `platform_discovered` is fired when a new platform has been discovered by
 Field | Description
 ----- | -----------
 `service` | The service that is discovered. Example: `zwave`.
-`discovered` | Information that is discovered. Can be a dict, tuple etc. Example: `(192.168.1.10, 8889)`.
+`discovered` | Dictionary containing discovery information. Example: `{ "host": "192.168.1.10", "port": 8889}`.
 
 
 ### {% linkable_title Event `component_loaded` %}

source/_docs/configuration/templating.markdown

@@ -85,10 +85,15 @@ Home Assistant adds extensions to allow templates to access all of the current s
 
 [strp-format]: https://docs.python.org/3.4/library/datetime.html#strftime-and-strptime-behavior
 
-<p class='note warning'>
+<p class='note'>
 If your template uses an `entity_id` that begins with a number (example: `states.device_tracker.2008_gmc`) you must use a bracket syntax to avoid errors caused by rendering the `entity_id` improperly. In the example given, the correct syntax for the device tracker would be: `states.device_tracker['2008_gmc']`
 </p>
 
+## {% linkable_title Home Assistant template extensions %}
+
+In templates, besides the normal [state object methods and properties](/topics/state_object/), there are also some extra things available:
+
+- `states.sensor.temperature.state_with_unit` will print the state of the entity and, if available, the unit.
 
 ## {% linkable_title Examples %}
 

source/_docs/ecosystem/certificates/lets_encrypt.markdown

@@ -33,7 +33,7 @@ Steps we will take:
  - 2 - Set up port forwarding without TLS/SSL and test connection
  - 3 - Set up a DuckDNS account
  - 4 - Obtain a TLS/SSL certificate from Let's Encrypt
- - 5 - Check the incoming conection
+ - 5 - Check the incoming connection
  - 6 - Clean up port forwards
  - 7 - Set up a sensor to monitor the expiry date of the certificate
  - 8 - Set up an automatic renewal of the TLS/SSL certificate
@@ -290,7 +290,7 @@ $ sudo chmod 755 /etc/letsencrypt/archive/
 
 Did all of that go without a hitch? Wahoo! Your Let's Encrypt certificate is now ready to be used with Home Assistant. Move to step 5 to put it all together
 
-### {% linkable_title 5 - Check the incoming conection %}
+### {% linkable_title 5 - Check the incoming connection %}
 
 <p class='note'>
 Following on from Step 4 your SSH will still be in the certbot folder. If you edit your configuration files over SSH you will need to change to your `homeassistant` folder:

source/_docs/installation/freenas.markdown

@@ -31,6 +31,11 @@ Install Home Assistant itself.
 
 Create an `/etc/rc.local` file to enable Home Assistant to start when the jail starts. The command in `/etc/rc.local` can also be run in a terminal session but Home Assistant will exit when that session is closed.  
 
+
+```bash
+# cd / && mkdir /home && /home/.homeassistant/
+```
+
 ```bash
 # /usr/local/bin/hass --open-ui --config /home/.homeassistant/ &
 ```

source/_docs/scripts/editor.markdown

@@ -25,4 +25,4 @@ The script editor reads and writes to the file `scripts.yaml` in your [configura
 script: !include scripts.yaml
 ```
 
-The conten that was under `script:` should now be moved to `scripts.yaml` to be editable.
+The content that was under `script:` should now be moved to `scripts.yaml` to be editable.

source/_docs/z-wave.markdown

@@ -18,7 +18,7 @@ There is currently support for climate, covers, lights, locks, sensors, switches
 
 As of version 0.45, Home Assistant automatically installs python-openzwave from PyPI as needed.
 
-There is one dependency you will need to have installed ahead of time:
+There is one dependency you will need to have installed ahead of time (included in `systemd-devel` on Fedora/RHEL systems):
 
 ```bash
 $ sudo apt-get install libudev-dev
@@ -101,6 +101,10 @@ An easy script to generate a random key:
 cat /dev/urandom | tr -dc '0-9A-F' | fold -w 32 | head -n 1 | sed -e 's/\(..\)/0x\1, /g'
 ```
 
+### {% linkable_title Battery Powered Devices %}
+
+Battery powered devices need to be awake before you can use the Z-Wave control panel to update their settings. How to wake your device is device specific, and some devices will stay awake for only a couple of seconds. Please refer to the manual of your device for more details.
+
 ### {% linkable_title Events %}
 
 #### {% linkable_title zwave.network_complete %}