Merge branch 'current' into next

source/_docs/configuration/templating.markdown

@@ -23,14 +23,14 @@ Templating is a powerful feature in Home Assistant that allows the user control
 
 - Formatting outgoing messages in, for example, the [notify] and [alexa] components.
 - Process incoming data from sources that provide raw data, like [MQTT], [REST sensor], or the [command line sensor].
-- [Advanced Automation templating]auto-template]
+- [Automation Templating].
 
 [notify]: /components/notify/
 [alexa]: /components/alexa/
 [MQTT]: /components/mqtt/
 [REST sensor]: /components/sensor.rest/
 [command line sensor]: /components/sensor.command_line/
-[auto-template]: /getting-started/automation-templating/
+[Automation Templating]: /docs/automation/templating/
 
 ## {% linkable_title Building templates %}
 

source/_docs/ecosystem/apache.markdown

@@ -55,7 +55,7 @@ If you don't want HTTPS, you can change `<VirtualHost *:443>` to `<VirtualHost *
 
 <p class='note'>
 In case you are getting occasional HTTP 504 error messages ("Gateway Timeout") when accessing the Web UI through your proxy, try adding disablereuse=on to both ProxyPass directives:
-
+</p>
 ```text
 <VirtualHost *:443>
   [...]
@@ -65,7 +65,6 @@ In case you are getting occasional HTTP 504 error messages ("Gateway Timeout") w
   [...]
 </VirtualHost>
 ```
-</p>
 
 #### {% linkable_title Multiple Instance %}
 

source/_docs/hassbian/customization.markdown

@@ -14,7 +14,7 @@ To allow you to customize your installation further, we have included a set of H
 
   - 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 Mossquitto MQTT server. Installs the latest Mosquitto package and client tools from the Mosquitto projects offical repository. Now includes websocket support.
+  - 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.
 
 All of these scripts are available in the directory `/home/pi/hassbian-scripts/`. For more information about these scripts have a look at the [hassbian-scripts repository][hassbian-repo].

source/_docs/installation/archlinux.markdown

@@ -24,7 +24,7 @@ and Home Assistant itself.
 $ pip3 install homeassistant
 ```
 
-Home Assistant is part of the [AUR](https://aur.archlinux.org/packages/home-assistant/). This meand that it can be installed directly with `pacman`:
+Home Assistant is part of the [AUR](https://aur.archlinux.org/packages/home-assistant/). This means that it can be installed directly with `pacman`:
 
 ```bash
 $ sudo pacman -S home-assistant