diff --git a/_config.yml b/_config.yml
index 1bd28a1cfef..911082b60aa 100644
--- a/_config.yml
+++ b/_config.yml
@@ -101,8 +101,8 @@ social:
# Home Assistant release details
current_major_version: 0
current_minor_version: 112
-current_patch_version: 4
-date_released: 2020-07-08
+current_patch_version: 5
+date_released: 2020-07-13
# Either # or the anchor link to latest release notes in the blog post.
# Must be prefixed with a # and have double quotes around it.
diff --git a/source/_cookbook/configuration_yaml_by_klaasnicolaas.markdown b/source/_cookbook/configuration_yaml_by_klaasnicolaas.markdown
index 8b2d621cbda..51517847973 100644
--- a/source/_cookbook/configuration_yaml_by_klaasnicolaas.markdown
+++ b/source/_cookbook/configuration_yaml_by_klaasnicolaas.markdown
@@ -2,5 +2,5 @@
title: "Configuration.yaml by klaasnicolaas"
description: ""
ha_category: Example configuration.yaml
-ha_external_link: https://github.com/klaasnicolaas/Smarthome-homeassistant-config
+ha_external_link: https://github.com/klaasnicolaas/Student-homeassistant-config
---
diff --git a/source/_docs/authentication.markdown b/source/_docs/authentication.markdown
index 81ae30d9e97..11007d29d9e 100644
--- a/source/_docs/authentication.markdown
+++ b/source/_docs/authentication.markdown
@@ -24,15 +24,13 @@ For the moment, other user accounts will have the same access as the owner accou
### Your Account Profile
-Once you're logged in, you can see the details of your account at the _Profile_ page by clicking on the circular badge next to the Home Assistant title in the sidebar.
+Once you're logged in, you can see the details of your account at the _Profile_ page by clicking on the circular at the very bottom of the sidebar.
You can:
-* Change the language you prefer Home Assistant to use.
-* Change your password.
-* Select the [theme](/integrations/frontend/#defining-themes) for the interface of Home Assistant.
+* Change your password.
* Enable or disable [multi-factor authentication](/docs/authentication/multi-factor-auth/).
* Delete _Refresh Tokens_. These are created when you log in from a device. Delete them if you want to force the device to log out.
* Create [Long Lived Access Tokens](https://developers.home-assistant.io/docs/en/auth_api.html#long-lived-access-token) so scripts can securely interact with Home Assistant.
diff --git a/source/_docs/authentication/providers.markdown b/source/_docs/authentication/providers.markdown
index 0e825b19cda..b5c87c35541 100644
--- a/source/_docs/authentication/providers.markdown
+++ b/source/_docs/authentication/providers.markdown
@@ -22,6 +22,8 @@ However, this feature is deprecated and will be removed in a future release so y
Home Assistant automatically configures the standard auth providers so you don't need to specify `auth_providers` in your `configuration.yaml` file unless you are configuring more than one. Specifying `auth_providers` will disable all auth providers that are not listed, so you could reduce your security or create difficulties logging in if it is not configured correctly.
+This means that if you decide to use `trusted_networks` as your `auth_provider` there won't be a way to authenticate for a device outside of your listed trusted network. To overcome this ensure you add the default `auth_provider``type: homeassistant` back in manually. This will then present you with the default auth login screen when trusted network authentication fails as expected from outside your LAN.
+
Authentication providers are configured in your `configuration.yaml` under the `homeassistant:` block. You can supply more than one, for example:
diff --git a/source/_docs/tools/dev-tools.markdown b/source/_docs/tools/dev-tools.markdown
index d4460c61676..0272cf0c820 100644
--- a/source/_docs/tools/dev-tools.markdown
+++ b/source/_docs/tools/dev-tools.markdown
@@ -84,9 +84,3 @@ It has two sections, code goes on the left hand side, and the output is shown on
It is a good practice to test the template code in the template editor prior to putting it in automations and scripts.
For more information about jinja2, visit [jinja2 documentation](http://jinja.pocoo.org/docs/dev/templates/), and also read templating document [here](/topics/templating/)
-
-## MQTT
-
-This section is only visible if the MQTT integration is configured. To configure MQTT, add `mqtt:` to the `configuration.yaml` file. For more information, refer to the [MQTT](/integrations/mqtt/) integration.
-
-Even though MQTT in general provides deeper functionality, the developer tools section of MQTT is limited to publishing messages to a given topic. It supports templates for the payload. To publish a message, simply specify the topic name and the payload and click “PUBLISH” button.
diff --git a/source/_integrations/calendar.google.markdown b/source/_integrations/calendar.google.markdown
index 68e8f3ac39b..0f2eccd32a7 100644
--- a/source/_integrations/calendar.google.markdown
+++ b/source/_integrations/calendar.google.markdown
@@ -39,6 +39,12 @@ Generate a Client ID and Client Secret on
If you will later be adding more scopes than just the "Google Calendar API" to the OAuth for this application, you will need to delete your token file under your Home Assistant Profile. You will lose your refresh token due to the re-authenticating to add more API access. It's recommended to use different authorizations for different pieces of Google.
+## Troubleshooting
+
+If you are trying to switch to a new Google account then you would run into the following error message. Make sure to delete the existing **.google.token** file from your `config` folder and restart Home Assistant to try again.
+
+'oauth2client.client.HttpAccessTokenRefreshError: deleted_client: The OAuth client was deleted'
+
## Configuration
To integrate Google Calendar in Home Assistant,
diff --git a/source/_integrations/demo.markdown b/source/_integrations/demo.markdown
index 86c86f09cd9..714074607ce 100644
--- a/source/_integrations/demo.markdown
+++ b/source/_integrations/demo.markdown
@@ -22,6 +22,7 @@ Available demo platforms:
- [Cover](/integrations/cover/) (`cover`)
- [Fan](/integrations/fan/) (`fan`)
- [Geolocation](/integrations/geo_location/) (`geo_location`)
+- [Humidifier](/integrations/humidifier/) (`humidifier`)
- [Image Processing](/integrations/image_processing/) (`image_processing`)
- [Light](/integrations/light/) (`light`)
- [Lock](/integrations/lock/) (`lock`)
diff --git a/source/_integrations/plum_lightpad.markdown b/source/_integrations/plum_lightpad.markdown
index ae8ece3a7fe..8a211f47ebf 100644
--- a/source/_integrations/plum_lightpad.markdown
+++ b/source/_integrations/plum_lightpad.markdown
@@ -4,10 +4,12 @@ description: Instructions on setting up Plum Lightpads within Home Assistant.
ha_category:
- Switch
ha_iot_class: Local Push
+ha_config_flow: true
ha_release: 0.85
ha_domain: plum_lightpad
ha_codeowners:
- '@ColinHarrington'
+ - '@prystupa'
---
Configurable/Dimmable Wi-Fi Lightswitch
@@ -20,7 +22,14 @@ Configurable/Dimmable Wi-Fi Lightswitch
## Configuration
-To enable Plum Lightpad support, add the following lines to your `configuration.yaml` file:
+To use Plum Lightpad devices in your installation, add your Plum account from the integrations page.
+
+Menu: **Configuration** -> **Integrations**.
+
+Click on the `+` sign to add an integration and click on **Plum Lightpad** (use typeahead if necessary).
+After completing the configuration flow, the Plum Lightpad integration will be available.
+
+Alternatively, add the following lines to your `configuration.yaml` file:
```yaml
# Example configuration.yaml entry
diff --git a/source/_lovelace/humidifier.markdown b/source/_lovelace/humidifier.markdown
new file mode 100644
index 00000000000..ce853fbfc8f
--- /dev/null
+++ b/source/_lovelace/humidifier.markdown
@@ -0,0 +1,40 @@
+---
+title: "Humidifier Card"
+sidebar_label: Humidifier
+description: "The Humidifier card gives control of your humidifier entity, allowing you to change the target humidity and mode of the entity."
+---
+
+The Humidifier card lets you control and monitor humidifiers, dehumidifiers, and hygrostat devices.
+
+
+
+ Screenshot of the humidifier card.
+