Merge remote-tracking branch 'origin/current' into next

source/_docs/configuration/events.markdown

@@ -17,7 +17,6 @@ Home Assistant contains a few built-in events that are used to coordinate betwee
 ### {% linkable_title Event `homeassistant_start` %}
 Event `homeassistant_start` is fired when all components from the configuration have been intitialized. This is the event that will start the timer firing off `time_changed` events.
 
-
 ### {% linkable_title Event `homeassistant_stop` %}
 Event `homeassistant_stop` is fired when Home Assistant is shutting down. It should be used to close any open connection or release any resources.
 

source/_docs/installation/freenas.markdown

@@ -2,7 +2,7 @@
 layout: page
 title: "Installation on FreeNAS 9.10"
 description: "Installation of Home Assistant on your FreeNAS."
-date: 2017-04-06 17:00
+date: 2017-06-20 11:00
 sidebar: true
 comments: false
 sharing: true
@@ -29,10 +29,20 @@ Install Home Assistant itself.
 # pip3 install homeassistant
 ```
 
-Finally start Home Assistant.
+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
-# hass --open-ui
+# /usr/local/bin/hass --open-ui --config /home/.homeassistant/ &
 ```
 
-Some suggestions on using a tmux to keep it running can be found in the FreeNAS forums [HERE](https://forums.freenas.org/index.php?threads/how-to-home-assistant-in-a-jail-tested-on-9-10.50371/)
+Make `/etc/rc.local` executable so it runs on startup
+
+```bash
+# chmod 755 /etc/rc.local
+```
+
+Finally restart the jail from the Freenas GUI.
+
+<p class='note'>
+USB Z-wave sticks may give `dmesg` warnings similar to "data interface 1, has no CM over data, has no break".  This doesn't impact the function of the Z-wave stick in Hass. Just make sure the proper `/dev/cu*` is used in the Home Assistant `configuration.yaml` file.  
+</p>

source/_docs/mqtt/broker.markdown

@@ -31,9 +31,13 @@ Home Assistant contains an embedded MQTT broker. If no broker configuration is g
 mqtt:
 ```
 
-<p class='note'>
-This broker does not currently work with OwnTracks because of a protocol version issue.
-</p>
+### {% linkable_title Owntracks%}
+
+To use Owntracks with the internal broker a small configuration change must be made in order for the app to use MQTT protocol 3.1.1 (Protocol Level 4).
+
+In the Owntracks preferences (Android: v1.2.3+, iOS: v9.5.1+) open **Configuration Management**; Find the value named `mqttProtocolLevel` and set the value to `4`. The application will now use MQTT 3.1.1 to connect, which is compatible with the embedded broker.
+
+### {% linkable_title Settings %}
 
 If you want to customize the settings of the embedded broker, use `embedded:` and the values shown in the [HBMQTT Broker configuration](http://hbmqtt.readthedocs.org/en/latest/references/broker.html#broker-configuration). This will replace the default configuration.
 

source/_docs/tools/scripts.markdown

@@ -37,7 +37,7 @@ $ hass --script keyring
 
 ### {% linkable_title Benchmark %}
 
-For testing the performance of Home Assistant the Benchmark scipt runs until you exit using Control+C.
+For testing the performance of Home Assistant the Benchmark script runs until you exit using Control+C.
 
 Firing and handling of a million events.
 

source/_docs/z-wave.markdown

@@ -154,7 +154,7 @@ Example:
      platform: event
      event_type: zwave.node_event
      event_data:
-       object_id: aeon_labs_minimote_1
+       entity_id: zwave.aeon_labs_minimote_1
        basic_level: 255
 ```
 
@@ -172,7 +172,7 @@ automation:
       platform: event
       event_type: zwave.scene_activated
       event_data:
-        object_id: zwaveme_zme_wallcs_secure_wall_controller_8
+        entity_id: zwave.zwaveme_zme_wallcs_secure_wall_controller_8
         scene_id: 11
 ```