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

source/_docs/configuration/customizing-devices.markdown

@@ -78,7 +78,7 @@ Device class is currently supported by the following platforms:
 
 ### {% linkable_title Reloading customize %}
 
-Home Assistant offers a service to reload the core configuration while Home Assistant is running called `homeassistant/reload_core_config`. This allows you to change your customize section and see it being applied without having to restart Home Assistant. To call this service, go to the <img src='/images/screenshots/developer-tool-services-icon.png' alt='service developer tool icon' class="no-shadow" height="38" /> service developer tools, select the service `homeassistant/reload_core_config` and click "Call Service".
+Home Assistant offers a service to reload the core configuration while Home Assistant is running called `homeassistant.reload_core_config`. This allows you to change your customize section and see it being applied without having to restart Home Assistant. To call this service, go to the <img src='/images/screenshots/developer-tool-services-icon.png' alt='service developer tool icon' class="no-shadow" height="38" /> service developer tools, select the service `homeassistant.reload_core_config` and click "CALL SERVICE".
 
 <p class='note warning'>
 New customize information will be applied the next time the state of the entity gets updated.

source/_docs/configuration/templating.markdown

@@ -83,10 +83,10 @@ Home Assistant adds extensions to allow templates to access all of the current s
 - Filter `timestamp_local`  will convert an UNIX timestamp to local time/data.
 - Filter `timestamp_utc` will convert an UNIX timestamp to UTC time/data.
 - Filter `timestamp_custom(format_string, local_boolean)` will convert an UNIX timestamp to a custom format, the use of a local timestamp is default, supporting [Python format options](https://docs.python.org/3/library/time.html#time.strftime).
-- Filter `max` will obtain the larget item in a sequence.
+- Filter `max` will obtain the largest item in a sequence.
 - Filter `min` will obtain the smallest item in a sequence.
 
-[strp-format]: https://docs.python.org/3.4/library/datetime.html#strftime-and-strptime-behavior
+[strp-format]: https://docs.python.org/3.6/library/datetime.html#strftime-and-strptime-behavior
 
 <p class='note'>
 If your template uses an `entity_id` that begins with a number (example: `states.device_tracker.2008_gmc`) you must use a bracket syntax to avoid errors caused by rendering the `entity_id` improperly. In the example given, the correct syntax for the device tracker would be: `states.device_tracker['2008_gmc']`

source/_docs/installation/docker.markdown

@@ -80,7 +80,7 @@ If you want to use a USB Bluetooth adapter or Z-Wave USB Stick with Home Assista
 
 ### {% linkable_title QNAP NAS %}
 
-As QNAP within QTS now supports Docker (with a neat UI), you can simply install Home Assistant using docker without the need for command-line. For details about the package (including compatability-information, if your NAS is supported), see https://www.qnap.com/solution/container_station/en/index.php
+As QNAP within QTS now supports Docker (with a neat UI), you can simply install Home Assistant using docker without the need for command-line. For details about the package (including compatibility-information, if your NAS is supported), see https://www.qnap.com/solution/container_station/en/index.php
 
 The steps would be:
 

source/_docs/installation/virtualenv.markdown

@@ -17,7 +17,7 @@ It's recommended when installing Python packages that you use a [virtual environ
 _(If you're on a Debian based system, you will need to install Python virtual environment support using `apt-get install python3-pip python3-venv`.)_
 
 <p class='Note'>
-It is recommended to use the [advanced guide](/docs/installation/raspberry-pi/) which allows for the installation to run as a `homeassistant` user.  The steps below may be shorter but some users find difficulty when applying updates and may run into issues.
+It is recommended to use the [advanced guide](/docs/installation/raspberry-pi/) which allows for the installation to run as a `homeassistant` user. The steps below may be shorter but some users find difficulty when applying updates and may run into issues.
 </p>
 
 ### {% linkable_title Install %}
@@ -74,3 +74,12 @@ It is recommended to use the [advanced guide](/docs/installation/raspberry-pi/)
 <p class='info'>
 Looking for more advanced guides? Check our [Rasbian guide](/docs/installation/raspberry-pi/) or the [other installation guides](/docs/installation/).
 </p>
+
+### {% linkable_title After upgrading Python %}
+
+If you've upgraded Python (for example, you were running 3.5.2 and now you've installed 3.5.4) then you'll need to build a new virtual environment. Simply rename your existing virtual environment directory:
+
+```bash
+$ mv homeassistant homeassistant.old
+```
+Then follow the [Install](/docs/installation/virtualenv/#install) steps again, being sure to use the newly installed version of Python.