Merge branch 'current' into next

Gemfile

@@ -18,7 +18,7 @@ group :jekyll_plugins do
   gem 'jekyll-commonmark', '1.3.1'
 end
 
-gem 'sinatra', '2.0.8.1'
+gem 'sinatra', '2.1.0'
 gem 'nokogiri', '1.10.10'
 
 # Windows and JRuby does not include zoneinfo files, so bundle the tzinfo-data gem

Gemfile.lock

@@ -81,7 +81,7 @@ GEM
       forwardable-extended (~> 2.6)
     public_suffix (4.0.6)
     rack (2.2.3)
-    rack-protection (2.0.8.1)
+    rack-protection (2.1.0)
       rack
     rake (13.0.1)
     rb-fsevent (0.10.4)
@@ -100,10 +100,10 @@ GEM
       ffi (~> 1.9)
     sassc (2.4.0-x64-mingw32)
       ffi (~> 1.9)
-    sinatra (2.0.8.1)
+    sinatra (2.1.0)
       mustermann (~> 1.0)
-      rack (~> 2.0)
+      rack (~> 2.2)
-      rack-protection (= 2.0.8.1)
+      rack-protection (= 2.1.0)
       tilt (~> 2.0)
     stringex (2.8.5)
     terminal-table (1.8.0)
@@ -130,7 +130,7 @@ DEPENDENCIES
   nokogiri (= 1.10.10)
   rake (= 13.0.1)
   sass-globbing (= 1.1.5)
-  sinatra (= 2.0.8.1)
+  sinatra (= 2.1.0)
   stringex (= 2.8.5)
   tzinfo (~> 2.0)
   tzinfo-data

source/_integrations/camera.markdown

@@ -14,7 +14,7 @@ The camera integration allows you to use IP cameras with Home Assistant.
 
 If your camera supports it, and the [`stream`](/integrations/stream) integration is setup, you will be able to stream your cameras in the frontend and on supported media players.
 
-This option will keep the stream alive, and preload the feed on Home Assistant startup. This will result in reduced latency when opening the stream in the frontend, as well as when using the `play_stream` service or Google Assistant integration. It does, however, utilize more resources on your machine, so it is recommended to check CPU usage if you plan to use this feature.
+The `Preload stream` option will start the camera feed on Home Assistant startup and continue to keep the stream alive. This will result in reduced latency when opening the stream in the frontend, as well as when using the `play_stream` service or Google Assistant integration. It does, however, utilize more resources on your machine, so it is recommended to check CPU usage if you plan to use this feature.
 
 <p class='img'>
   <img src='/images/integrations/camera/preload-stream.png' alt='Screenshot showing Preload Stream option in Home Assistant front end.'>

source/_integrations/logi_circle.markdown

@@ -32,7 +32,7 @@ The `logi_circle` implementation allows you to integrate your [Logi Circle](http
  * At the time you submit your request to Logitech, you need to demonstrate that you have exclusive control of the fully qualified domain name in your redirect URI. An active Home Assistant instance at the redirect URI will suffice. If you don't want to expose your Home Assistant instance publicly, you may also place a static page at the redirect URI with a short message that you will manage redirection of the authorization token to your local Home Assistant instance. Free static hosts that issue subdomains for hosting (e.g., Netlify) are permitted.
  * As the redirect URI must be public facing, no local/reserved TLDs are permitted (eg. .local, .localhost, .example, etc. are not allowed).
 
-Please note that the turn-around time for API access takes a few business days after which you will be contacted by Logitech using the email address you provided in the form.
+Please note that the turn-around time for API access takes up to a month after which you will be contacted by Logitech using the email address you provided in the form.
 
 ## Configuration
 

source/_integrations/spotify.markdown

@@ -30,11 +30,15 @@ To create the required Spotify application:
 - Visit the [My Applications](https://developer.spotify.com/my-applications/#!/applications) page.
 - Select **Create An App**. Enter any name and description.
 - Once your application is created, view it and copy your **Client ID** and **Client Secret**, which are used in the Home Assistant configuration file.
-- Add a **Redirect URI** in one of the following forms:
+- On the Spotify page, enter the **Edit Settings** dialog of your newly created application and add a **Redirect URI**:
   - If you are not using SSL: `http://<your_home_assistant_url_or_local_ip>:<port>/auth/external/callback`
   - If you are using SSL: `https://<your_home_assistant_url_or_local_ip>:<port>/auth/external/callback`
 - Click **Save** after adding the URI.
 
+<div class='note'>
+  Your Home Assitant instance does not need to be exposed to the internet. It works just fine with local IP addresses.
+</div>  
+
 ## Configuration
 
 To add Spotify to your installation, add the following to your `configuration.yaml` file:
@@ -61,18 +65,18 @@ client_secret:
 
 After you have set up the above:
 
-- Go to the integrations page in the Home Assistant frontend
+- Go to the **Configurations** page in the Home Assistant frontend.
-- Go to **Integrations**
+- Go to **Integrations**.
 - Add a new **Spotify** integration.
 - Follow the steps shown to authenticate Home Assistant with your Spotify account.
 
 <div class='note'>
   
-  If you receive an `INVALID_CLIENT: Invalid redirect URI` error while trying to authenticate with your Spotify account, make sure to check the Redirect URI in the address bar after adding the new integration. Compare this value with the Redirect URL defined in the Spotify Developer Portal.
+  If you receive an `INVALID_CLIENT: Invalid redirect URI` error while trying to authenticate with your Spotify account, make sure to check the Redirect URI in the address bar after adding the new integration. Compare this value with the Redirect URI defined in the Spotify Developer Portal.
 
 </div>
 
-## URI Links For Playlists
+## URI Links for Playlists
 
 You can send playlists to Spotify using the `"media_content_type": "playlist"`, which are part of the
 [media_player.play_media](/integrations/media_player/#service-media_playerplay_media) service.

source/_integrations/webostv.markdown

@@ -184,7 +184,7 @@ Available services: `button`, `command`
 | Service data attribute | Optional | Description                                                                                                                                                                                                                                                                            |
 | ---------------------- | -------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
 | `entity_id`            | no       | Target a specific webostv media player.                                                                                                                                                                                                                                                |
-| `button`               | no       | Name of the button. Known possible values are `LEFT`, `RIGHT`, `DOWN`, `UP`, `HOME`, `BACK`, `ENTER`, `DASH`, `INFO`, `ASTERISK`, `CC`, `EXIT`, `MUTE`, `RED`, `GREEN`, `BLUE`, `VOLUMEUP`, `VOLUMEDOWN`, `CHANNELUP`, `CHANNELDOWN`, `0`, `1`, `2`, `3`, `4`, `5`, `6`, `7`, `8`, `9` |
+| `button`               | no       | Name of the button. Known possible values are `LEFT`, `RIGHT`, `DOWN`, `UP`, `HOME`, `MENU`, `BACK`, `ENTER`, `DASH`, `INFO`, `ASTERISK`, `CC`, `EXIT`, `MUTE`, `RED`, `GREEN`, `BLUE`, `VOLUMEUP`, `VOLUMEDOWN`, `CHANNELUP`, `CHANNELDOWN`, `0`, `1`, `2`, `3`, `4`, `5`, `6`, `7`, `8`, `9` |
 
 ### Service `webostv.command`