Merge branch 'current' into next

source/_docs/configuration/customizing-devices.markdown

@@ -67,6 +67,7 @@ homeassistant:
 | `assumed_state` | For switches with an assumed state two buttons are shown (turn off, turn on) instead of a switch. By setting `assumed_state` to `false` you will get the default switch icon.
 | `device_class` | Sets the class of the device, changing the device state and icon that is displayed on the UI (see below).
 | `initial_state` | Sets the initial state for automations. `on` or `off`.
+| `unit_of_measurement` | Defines the units of measurement, if any.
 
 ### {% linkable_title Device Class %}
 

source/_docs/installation/hassbian/common-tasks.markdown

@@ -7,13 +7,13 @@ sidebar: true
 comments: false
 sharing: true
 footer: true
-redirect_from: /getting-started/hassbian-common-tasks/
+redirect_from: /docs/hassbian/common-tasks/
 ---
 
 ### {% linkable_title Login to the Raspberry Pi %}
 To login to your Raspberry Pi running HASSbian you're going to be using a ssh client. Depending on your platform there are several alternatives for doing this. Linux and Max OS generally have a ssh client installed. Windows users are recommended to download and install the ssh client [Putty][ssh-putty].
 
-Connect to the Raspberry Pi over ssh. Default user name is `pi` and password is `raspberry`.  
+Connect to the Raspberry Pi over ssh. Default user name is `pi` and password is `raspberry`.
 Linux and Mac OS users execute the following command in a terminal.
 
 ```bash

source/_docs/installation/hassbian/customization.markdown

@@ -7,7 +7,7 @@ sidebar: true
 comments: false
 sharing: true
 footer: true
-redirect_from: /getting-started/hassbian-customization/
+redirect_from: /docs/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.

source/_docs/installation/hassbian/installation.markdown

@@ -7,7 +7,7 @@ sidebar: true
 comments: false
 sharing: true
 footer: true
-redirect_from: /getting-started/installation-raspberry-pi-image/
+redirect_from: /docs/hassbian/installation/
 ---
 
 The easiest way to install Home Assistant on your Raspberry Pi is by using HASSbian: a Raspberry Pi image with Home Assistant built-in. The image will install the latest version of Home Assistant on initial boot (~10 minutes).

source/_docs/installation/hassbian/integrations.markdown

@@ -7,7 +7,7 @@ sidebar: true
 comments: false
 sharing: true
 footer: true
-redirect_from: /getting-started/hassbian-installation/
+redirect_from: /docs/hassbian/integrations/
 ---
 
 Some components that are specific for the Raspberry Pi can require some further configuration outside of Home Assistant. All commands below are assumed to be executed with the `pi` account. For full documentation of these components refer to the [components](/components) page.

source/_docs/installation/hassbian/upgrading.markdown

@@ -7,7 +7,7 @@ sidebar: true
 comments: false
 sharing: true
 footer: true
-redirect_from: /getting-started/hassbian-upgrading/
+redirect_from: /docs/hassbian/upgrading/
 ---
 
 HASSbian is based on Raspbian and uses the same repositories. Any changes to Raspbian will be reflected in HASSbian. To update and upgrade system packages and installed software (excluding Home Assistant) do the following.