diff --git a/Gemfile b/Gemfile index bda3f75098c..e08d61455ce 100644 --- a/Gemfile +++ b/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 diff --git a/Gemfile.lock b/Gemfile.lock index 3111dee22e0..b3f27a004e3 100644 --- a/Gemfile.lock +++ b/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-protection (= 2.0.8.1) + rack (~> 2.2) + 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 diff --git a/source/_integrations/camera.markdown b/source/_integrations/camera.markdown index 4e9ecdc6317..ab1382f388c 100644 --- a/source/_integrations/camera.markdown +++ b/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.
diff --git a/source/_integrations/logi_circle.markdown b/source/_integrations/logi_circle.markdown
index 66cced5bff2..f5778bcb0a6 100644
--- a/source/_integrations/logi_circle.markdown
+++ b/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
diff --git a/source/_integrations/spotify.markdown b/source/_integrations/spotify.markdown
index 824b8625ebd..5f6e0ba50e7 100644
--- a/source/_integrations/spotify.markdown
+++ b/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://