Merge branch 'current' into next

source/_docs/configuration/customizing-devices.markdown

@@ -49,7 +49,7 @@ homeassistant:
       icon: mdi:description
     "scene.month_*_colors":
       hidden: true
-      emulated_hue: false
+      emulated_hue_hidden: false
       homebridge_hidden: true
 ```
 

source/_docs/ecosystem/tor.markdown

@@ -10,20 +10,14 @@ footer: true
 redirect_from: /cookbook/tor_configuration/
 ---
 
-This is an example about how you can configure Tor to provide secure remote access to your Home Assistant instance as an Onion site, through [Tor's Hidden Service](https://www.torproject.org/docs/hidden-services.html.en) feature. With this enabled, you do not need to open your firewall ports or setup HTTPS to enable secure remote access.
+This article guides your through the configuration of Tor to provide a secure access to your Home Assistant instance as an Onion site, through [Tor's Hidden Service](https://www.torproject.org/docs/hidden-services.html.en) feature, from remote. With this enabled, you do not need to open your firewall ports or setup HTTPS to enable secure remote access.
 
 This is useful if you want to have:
 
- * Access your Home Assistant instance remotely without opening a firewall port or setting up a VPN
- * Don't want to or know how to get an SSL/TLS certificate and HTTPS configuration setup
- * Want to block attackers from even being able to access/scan your port and server at all
- * Want to block anyone from knowing your home IP address and seeing your traffic to your Home Assistant
-
-## {% linkable_title Background and Contact %}
-
-This configuration is part of an effort to apply strong cryptography technologies (like Onion Routing and End-to-End Encryption) to technology we increasingly depend on in our day to day lives. Just like when WhatsApp enabled end-to-end encryption messaging for everyone, every home automation and IoT platform should do the same, because A) the technology is all there, freely licensed and open-source and B) up to this point, all the commercial manufacturers have been doing a horrific job with security.
-
-You can learn more about how Tor can be used to secure home automation and IoT platforms through this short set of slides on the [Internet of Onion Things](https://github.com/n8fr8/talks/blob/master/onion_things/Internet%20of%20Onion%20Things.pdf)
+ * Access your Home Assistant instance remotely without opening a firewall port or setting up a VPN.
+ * Don't want to or know how to get an SSL/TLS certificate and HTTPS configuration setup.
+ * Want to block attackers from even being able to access/scan your port and server at all.
+ * Want to block anyone from knowing your home IP address and seeing your traffic to your Home Assistant.
 
 ## {% linkable_title Hidden Services and Onion Sites %}
 
@@ -61,7 +55,7 @@ The "stealth" entry above ensures traffic to and from your Home Assistant instan
 Then, restart Tor:
 
 ```bash
-$ sudo /etc/init.d/tor restart
+$ sudo systemctl restart tor
 ```
 
 Then read the new generated authentication cookie from the Tor-generated hostname file:
@@ -106,5 +100,3 @@ You could also use Tor as a means to connect your Home Assistant instance to a r
 
 As mentioned, with Orbot on Android, you can enable a "full device" VPN mode, that allows any app you have to tunnel through Tor, even if it is not Tor or proxy aware. This means you should be able to enter your "dot onion" Onion site address into any app you want to access to your Home Assistant instance, and it should work.
 
-This configuration was provided by @n8fr8 ([github](https://github.com/n8fr8), [twitter](https://twitter.com/n8fr8)) of the [Guardian Project](https://guardianproject.info) and [Tor Project](https://torproject.org). You can send questions, feedback and ideas to [support@guardianproject.info](mailto:support@guardianproject.info).
-

source/_docs/z-wave/installation.markdown

@@ -153,6 +153,23 @@ On macOS you can find the USB stick with:
 $ ls /dev/cu.usbmodem*
 ```
 
+### {% linkable_title Hass.io %}
+
+To enable Z-Wave, plug your Z-Wave USB stick into your Raspberry Pi 3 and add the following to your `configuration.yaml`:
+
+```yaml
+zwave:
+  usb_path: /dev/ttyACM0
+```
+
+For some devices the `/dev/ttyAMA0` device is not detected by udev and is therefore not mapped by Docker. To explicitly set this device for mapping to Home-Assistant, execute the following command using the ssh add-on:
+
+```bash
+$ curl -d '{"devices": ["ttyAMA0"]}' http://hassio/homeassistant/options
+```
+
+After that, you need to change `usb_path` to `/dev/ttyAMA0`.
+
 ### {% linkable_title Network Key %}
 
 Security Z-Wave devices require a network key before being added to the network using the Add Secure Node button in the Z-Wave Network Management card. You must set the *network_key* configuration variable to use a network key before adding these devices.
@@ -167,3 +184,30 @@ Ensure you keep a backup of this key. If you have to rebuild your system and don
 ## {% linkable_title First Run %}
 
 Upon first run, the `zwave` component will take time to initialize entities and entities may appear with incomplete names. Running a network heal may speed up this process.
+
+## {% linkable_title Troubleshooting %}
+
+### {% linkable_title Component could not be set up %}
+
+Sometimes the device may not be accessible and you'll get an error message upon startup about not being able to set up Z-Wave. Run the following command for your device path:
+
+```bash
+ls -l /dev/ttyAMA0
+```
+
+You should then see something like this:
+
+```
+crw-rw---- 1 root dialout 204, 64 Apr  1 12:34 /dev/ttyAMA0
+```
+
+The important pieces are the first piece `crw-rw----` and the group `dialout`. If those are different then, for your device path, run:
+
+```bash
+sudo chgrp dialout /dev/ttyAMA0
+sudo chmod g+rw /dev/ttyAMA0
+```
+
+### {% linkable_title Device path changes %}
+
+If your device path changes when you restart, see [this guide](http://hintshop.ludvig.co.nz/show/persistent-names-usb-serial-devices/) on fixing it.