Merge branch 'current' into next

_config.yml

@@ -101,8 +101,8 @@ social:
 # Home Assistant release details
 current_major_version: 0
 current_minor_version: 115
-current_patch_version: 5
-date_released: 2020-09-29
+current_patch_version: 6
+date_released: 2020-09-30
 
 # Either # or the anchor link to latest release notes in the blog post.
 # Must be prefixed with a # and have double quotes around it.

source/_docs/asterisk_mbox.markdown

@@ -92,7 +92,7 @@ Before beginning make sure that you have the following:
    Type=simple
    User=asterisk
    Group=asterisk
-   ExecStart=/usr/local/bin/asterisk_mbox_server --cfg /etc/asterisk/asterisk_mbox.ini
+   ExecStart=/usr/local/bin/asterisk-mbox-server --cfg /etc/asterisk/asterisk_mbox.ini
    Restart=on-failure
 
    [Install]

source/_docs/automation/trigger.markdown

@@ -83,7 +83,7 @@ automation:
 
 <div class='note'>
 Listing above and below together means the numeric_state has to be between the two values.
-In the example above, the trigger would fire if a numeric_state goes to 17.1-24.9 (from strict below 17, or strict above 25).
+In the example above, the trigger would fire if a numeric_state goes to 17.1-24.9 (from strict above 17 and strict below 25).
 </div>
 
 The `for:` can also be specified as `HH:MM:SS` like this:

source/_integrations/calendar.google.markdown

@@ -31,8 +31,8 @@ Generate a Client ID and Client Secret on
 1. You then need to select a `Support email`. To do this, simply click the drop down box and select your email address.
 1. Scroll to the bottom and click `save`. (You don't have to fill out anything else)
 1. You will then be automatically taken to the OAuth consent screen, you don't need to do anything here. Instead, click Credentials in the menu on the left hand side of the screen, then click `+ Create credentials` (at the top of the screen), then select `OAuth client ID`.
-1. Set the Application type to 'Other' (if not present, choose 'TV and Limited Input') and give this credential set a name (like "Home Assistant Credentials") then click 'Create'.
-1. You will then be presented with a pop-up saying 'OAuth client created' showing `Your Clident ID` and `Your Client Secret`. Make a note of these (for example, copy and paste them into a text editor) as you will need to put these in your `configuration.yaml` file shortly. Once you have noted these strings, click `OK`. If you need to find these credentials again at any point then simply nagivate to `APIs & Services` > `Credentials` and you will see `Home Assistant Credentials` (or whatever you named them in the previous step) under `OAuth 2.0 Clident IDs`. To view both the `Client ID` and `Client secret`, click on the pencil icon, this will take you to the settings page for these credentials and the information will be on the right hand side of the page.
+1. Set the Application type to `TV and Limited Input` and give this credential set a name (like "Home Assistant Credentials") then click 'Create'.
+1. You will then be presented with a pop-up saying 'OAuth client created' showing `Your Client ID` and `Your Client Secret`. Make a note of these (for example, copy and paste them into a text editor) as you will need to put these in your `configuration.yaml` file shortly. Once you have noted these strings, click `OK`. If you need to find these credentials again at any point then simply nagivate to `APIs & Services` > `Credentials` and you will see `Home Assistant Credentials` (or whatever you named them in the previous step) under `OAuth 2.0 Clident IDs`. To view both the `Client ID` and `Client secret`, click on the pencil icon, this will take you to the settings page for these credentials and the information will be on the right hand side of the page.
 1. We need to double check that the "Google Calendar API" has been automatically enabled. To do this, select `Library` from the menu, then search for "Google Calendar API". If it is enabled you will see `API Enabled` with a green tick next to it. If it is not enabled, then enable it.
 
 

source/_integrations/ios.markdown

@@ -11,4 +11,4 @@ ha_codeowners:
 ha_domain: ios
 ---
 
-The `ios` integration is the Home Assistant part for using the iOS companion app. For further details please check the [iOS section](/docs/ecosystem/ios/) in the documentation for further details.
+The `ios` integration is the Home Assistant part for using the iOS companion app. For further details please check the [iOS section](/docs/ecosystem/ios/) in the documentation.

source/_posts/2020-09-17-release-115.markdown

@@ -109,6 +109,7 @@ navigating you around this release.
 - [Release 0.115.3 - September 25](#release-01153---september-25)
 - [Release 0.115.4 - September 28](#release-01154---september-28)
 - [Release 0.115.5 - September 29](#release-01155---september-29)
+- [Release 0.115.6 - September 30](#release-01156---september-30)
 - [All changes](#all-changes)
 
 ## Media Browser
@@ -1869,6 +1870,14 @@ discovery. Users currently using that should set up all devices through UI.
 [@frenck]: https://github.com/frenck
 [tts docs]: /integrations/tts/
 
+## Release 0.115.6 - September 30
+
+- Use custom app to play camera stream using Google Assistant ([@bramkragten] - [#40750]) ([google_assistant docs])
+
+[#40750]: https://github.com/home-assistant/core/pull/40750
+[@bramkragten]: https://github.com/bramkragten
+[google_assistant docs]: /integrations/google_assistant/
+
 ## All changes
 
 <details>

source/_redirects

@@ -2,7 +2,7 @@
 #
 
 # General use redirects
-/join-chat https://discord.gg/c5DvZ4e
+/join-chat https://discord.gg/BzQNTqK
 /suggest-community-highlight https://docs.google.com/forms/d/e/1FAIpQLSd9VWPeVM0xg0swWL6kT3wkQUKt8vWsTL5WtPO95LAy-0cYZw/viewform
 
 # Older development pages