Merge branch 'master' into update-codeblocks

docs/auth/gitlab/provider.md

@@ -18,7 +18,11 @@ Settings for local development:
 
 - Name: Backstage (or your custom app name)
 - Redirect URI: `http://localhost:7007/api/auth/gitlab/handler/frame`
-- Scopes: `read_api` and `read_user`
+- Scopes: `read_user` for sign-in. If you also need ID tokens (e.g. if you are
+  using the Kubernetes plugin and have clusters with `authProvider: oidc` and
+  [`oidcTokenProvider:
+gitlab`](https://backstage.io/docs/features/kubernetes/configuration/#clustersoidctokenprovider-optional)),
+  add the `openid` scope.
 
 ## Configuration
 

docs/auth/service-to-service-auth.md

@@ -5,7 +5,7 @@ title: Service to Service Auth
 description: This section describes how to use service to service authentication, both internally within Backstage plugins and towards external services.
 ---
 
-This article describes the steps needed to introduce _backend-to-backend auth_.
+This article describes the steps needed to introduce _service-to-service auth_ (formerly _backend-to-backend_ auth).
 This allows plugin backends to determine whether a given request originates from
 a legitimate Backstage plugin (or other external caller), by requiring a special
 type of service-to-service token which is signed with a shared secret.
@@ -60,7 +60,7 @@ backend:
 
 **NOTE**: For ease of development, we auto-generate a key for you if you haven't
 configured a secret in dev mode. You _must set your own secret_ in order for
-backend-to-backend auth to work in production; the `ServiceTokenManager` will
+service-to-service auth to work in production; the `ServiceTokenManager` will
 throw an exception in production if it has no keys to work with, which will lead
 to the backend failing to start up.