Merge branch 'current' into next

source/_integrations/google_assistant.markdown

@@ -109,11 +109,23 @@ If you want to support active reporting of state to Google's server (configurati
 
 ### Enable Local Fulfillment
 
+Google Assistant devices can send their commands locally to Home Assistant allowing them to respond faster.
+
+Your Home Assistant instance needs to be connected to the same network as the Google Assistant device that you’re talking to so that it can be discovered via mDNS discovery (UDP broadcasts).
+
+Your Google Assistant devices will still communicate via the internet to:
+- Sync entities.
+- Get credentials to establish a local connection.
+- Send commands that involve a [secure device](#secure-device).
+- Send commands if local fulfillment fails.
+
 <div class='note'>
 
-The [`ssl_certificate` option](/integrations/http/#ssl_certificate) in the `http` integration must not have a value or this feature won't work.
+The [HTTP integration](/integrations/http) must **not** be configured to use an SSL certificate with the [`ssl_certificate` option](/integrations/http/#ssl_certificate).
-
+  
-This is because Google requires a valid certificate and the way it connects to Home Assistant for local fulfillment makes that impossible. Consider using a reverse proxy such as the {% my supervisor_addon addon="core_nginx_proxy" title="NGINX SSL" %} add-on instead of directing external traffic directly to Home Assistant.
+This is because the Google Assistant device will connect directly to the IP of your Home Assistant instance and will fail if it encounters an invalid SSL certificate.
+  
+For secure remote access, use a reverse proxy such as the {% my supervisor_addon addon="core_nginx_proxy" title="NGINX SSL" %} add-on instead of directing external traffic straight to Home Assistant.
 
 </div>
 
@@ -121,18 +133,18 @@ This is because Google requires a valid certificate and the way it connects to H
 2. Click `Develop` on the top of the page, then click `Actions` located in the hamburger menu on the top left.
 3. Upload [this Javascript file](/assets/integrations/google_assistant/app.js) for both Node and Chrome by clicking the `Upload Javascript files` button.
 4. Add device scan configuration:
-   1. Click `+ New scan config`
+   1. Click `+ New scan config` if no configuration exists
    2. Select `MDNS`
-   3. Set mDNS service name to `_home-assistant._tcp.local`
+   3. Set `MDNS service name` to `_home-assistant._tcp.local`
-   4. Click `Add field`, then under `Select a field` select `name`
+   4. Click `Add field`, then under `Select a field` choose `Name`
-   5. Enter a new `value` field set to `.*\._home-assistant\._tcp\.local`
+   5. Enter a new `Value` field set to `.*\._home-assistant\._tcp\.local`
 5. Check the box `Support local query` under `Add capabilities`.
 6. `Save` your changes.
-7. Either wait for 30 minutes, or restart your connected Google device.
+7. Either wait for 30 minutes, or restart all your Google Assistant devices.
 8. Restart Home Assistant Core.
 9. With a Google Assistant device, try saying "OK Google, sync my devices." This can be helpful to avoid issues, especially if you are enabling local fulfillment sometime after adding cloud Google Assistant support.
 
-You can debug the setup by following [these instructions](https://developers.google.com/assistant/smarthome/develop/local#debugging_from_chrome)
+You can debug the setup by following [these instructions](https://developers.google.com/assistant/smarthome/develop/local#debugging_from_chrome).
 
 ### YAML Configuration
 

source/_integrations/gtfs.markdown

@@ -16,7 +16,7 @@ You need to find a valid GTFS data set, which you can usually find just by searc
 
 Here are some examples:
 
-- [Bay Area Rapid Transit (BART)](https://www.bart.gov/schedules/developers/gtfs) - The light rail system for the San Francisco Bay Area.
+- [Bay Area Rapid Transit (BART)](https://www.bart.gov/schedules/developers/gtfs) - The rapid transit system for the San Francisco Bay Area.
 - [Metropolitan Transit Authority of New York City (MTA)](http://web.mta.info/developers/) - Provides separate data feeds for subway, bus, LIRR and Metro-North of the greater New York City metropolitan region.
 - [Official Timetable Switzerland](https://opentransportdata.swiss/en/dataset/timetable-2019-gtfs) - The official timetable data for Switzerland in 2019.
 

source/_integrations/homekit.markdown

@@ -587,6 +587,10 @@ Pairing works fine when the filter is set to only include `demo.demo`, but fails
 
 ### Issues during normal use
 
+#### Bridge spontaneously unpairs
+
+Multiple users have reported that iOS 12 and earlier devices will spontaneously remove pairings. Ensure all iOS devices that have administrator access to the Home are running iOS 13 or later. If you cannot update the device to iOS 13, disable `Home` in the device iCloud settings.
+
 #### My entity doesn't show up
 
 Check if the domain of your entity is [supported](#supported-components). If it is, check your [filter](#configure-filter) settings. Make sure the spelling is correct, especially if you use `include_entities`.