Merge branch 'current' into next

source/_docs/ecosystem/backup/backup_dropbox.markdown

@@ -14,15 +14,18 @@ Backing up and regularly syncing your Home Assistant configuration to [Dropbox](
 
 ### {% linkable_title Requirements %}
 
-You need 2 parts in order to get it working correctly.
+You need two parts in order to get it working correctly.
 
-Become the user you run homeassistant from.
+Become the user that run Home Assistant.
 
-- A seperate python script that syncs a specific folder. Which can be found [here](https://gist.github.com/riemers/31e3350041fd3e47e489cbc811209d6f)
+- A seperate Python script that syncs a specific folder. Which can be found [here](https://gist.github.com/riemers/31e3350041fd3e47e489cbc811209d6f)
 - The excellent [dropbox uploader script](https://github.com/andreafabrizi/Dropbox-Uploader/blob/master/dropbox_uploader.sh) you can grab the .sh file only.
 
 Download those files to a folder of your liking, after that edit both files and change paths accordingly.
-### {% linkable_title Step 1: Linking your dropbox account %}
+
+In the Python script you can specify which files and directories should be excluded. This allows you to skip `secrets.yaml` or the `deps` folder.
+
+### {% linkable_title Step 1: Linking your Dropbox account %}
 
 ```bash
 $ chmod +x dropbox_uploader.sh
@@ -30,16 +33,16 @@ $ ./dropbox_uploader.sh
 ```
 Follow the instructions you see on your screen.
 
-### {% linkable_title Step 2: Running the dropbox uploader %}
+### {% linkable_title Step 2: Running the Dropbox uploader %}
 
-Go to the folder you have placed dropbox.py.
+Go to the folder you have placed `dropbox.py`.
 
 ```bash
 $ python dropbox.py
 ```
 
 The first time can take a lot of time since it will upload all your files!
-Do note, this will **backup your passwords to dropbox too**
+Do note, this will **backup your passwords to Dropbox**.
 
 ### {% linkable_title Automate the backup %}
 
@@ -49,5 +52,3 @@ Add it to your crontab, edit the **path/to** part.
 ```bash
 $ (crontab -l 2>/dev/null; echo "0 3 * * * python /path/to/dropbox.py") | crontab -
 ```
-
-_The python script is very crude, there is room for improvement with regards to not backing up certain files like cache or files that will be installed by HA again after reinstall. But it gets the job done._

source/_docs/hassbian/customization.markdown

@@ -12,12 +12,14 @@ redirect_from: /getting-started/hassbian-customization/
 
 To allow you to customize your installation further, we have included a tool called `hassbian-config`. This tool comes with a set of packages that can easily be installed for easier customization of your Home Assistant installation.
 
-  - Install Samba. Allows anyone on your network to edit your configuration from any computer. This share is unsecured and it's usage is not recommended if you share your network with others.
-  - Install Libcec. Adds local [HDMI CEC support][cec].
-  - Install Mosquitto MQTT server. Installs the latest Mosquitto package and client tools from the Mosquitto projects offical repository. Now includes websocket support.
-  - Install Open Z-Wave. Installs Open Z-Wave and prepares for using a USB or GPIO ZWave controller.
-  - Install Hue. hue: Configures the Python executable to allow usage of low numbered ports for use with Emulated Hue component thats used with Amazon Echo, Google Home and Mycroft.ai.
-  - Install Tellstick. Installs the Tellstick package for controling and using a connected Tellstick.
+ - Install Hue. Configures the Python executable to allow usage of low numbered ports for use with Emulated Hue component thats used with Amazon Echo, Google Home and Mycroft.ai.
+ - Install Mosquitto MQTT server. Installs the latest Mosquitto package and client tools from the Mosquitto projects official repository. Now includes websocket support.
+ - Install Libcec. Adds local [HDMI CEC support][cec].
+ - Install Open Z-Wave-pip. Installs Python Open Z-Wave from a pip package. This is the quickest and recommended way of installing Z-Wave support but does not OZWCP pre-installed.
+ - Install Open Z-Wave. Installs Python Open Z-Wave and OZWCP from git.
+ - Install Samba. Allows anyone on your network to edit your configuration from any computer. This share is unsecured and it's usage is not recommended if you share your network with others.
+ - Install Tellstick. Installs the Tellstick package for controlling and using a connected Tellstick.
+ - Install Tradfri. Installs dependencies for using IKEA Trådfri.
 
 The tool is available by running `hassbian-config`. To view the available packages run `hassbian-config show` and `sudo hassbian-config install PACKAGENAME`.
 For more information about this tool have a look at the [hassbian-scripts repository][hassbian-repo].

source/_docs/z-wave.markdown

@@ -24,8 +24,6 @@ There is one dependency you will need to have installed ahead of time:
 $ sudo apt-get install libudev-dev
 ```
 
-_Note: The Home Assistant docker image, HASSbian, and the All In One installer all have support for Z-Wave already built-in!_
-
 ### {% linkable_title Configuration %}
 
 ```yaml