Merge branch 'backstage:master' into master

docs/auth/okta/provider.md

@@ -41,6 +41,8 @@ auth:
         clientId: ${AUTH_OKTA_CLIENT_ID}
         clientSecret: ${AUTH_OKTA_CLIENT_SECRET}
         audience: ${AUTH_OKTA_DOMAIN}
+        authServerId: ${AUTH_OKTA_AUTH_SERVER_ID} # Optional
+        idp: ${AUTH_OKTA_IDP} # Optional
 ```
 
 The values referenced are found on the Application page on your Okta site.
@@ -48,8 +50,10 @@ The values referenced are found on the Application page on your Okta site.
 - `clientId`: The client ID that you generated on Okta, e.g.
   `3abe134ejxzF21HU74c1`
 - `clientSecret`: The client secret shown for the Application.
-- `audience`: The Okta domain shown for your Application, e.g.
+- `audience`: The Okta domain shown for the Application, e.g.
   `https://company.okta.com`
+- `authServerId`: The authorization server ID for the Application
+- `idp`: The identity provider for the application, e.g. `0oaulob4BFVa4zQvt0g3`
 
 ## Adding the provider to the Backstage frontend
 

docs/features/kubernetes/configuration.md

@@ -57,10 +57,17 @@ This is an array used to determine where to retrieve cluster configuration from.
 
 Valid cluster locator methods are:
 
+- [`localKubectlProxy`](#localKubectlProxy)
 - [`config`](#config)
 - [`gke`](#gke)
 - [custom `KubernetesClustersSupplier`](#custom-kubernetesclusterssupplier)
 
+#### `localKubectlProxy`
+
+This cluster locator method will assume a locally running [`kubectl proxy`](https://kubernetes.io/docs/tasks/extend-kubernetes/http-proxy-access-api/#using-kubectl-to-start-a-proxy-server) process using the default port (8001).
+
+NOTE: This cluster locator method is for local development only and should not be used in production.
+
 #### `config`
 
 This cluster locator method will read cluster information from your app-config

docs/features/software-catalog/well-known-annotations.md

@@ -242,13 +242,14 @@ that entity if the periskop plugin is installed.
 # Example:
 metadata:
   annotations:
-    sentry.io/project-slug: pump-station
+    sentry.io/project-slug: backstage/pump-station
 ```
 
 The value of this annotation is the so-called slug (or alternatively, the ID) of
-a [Sentry](https://sentry.io) project within your organization. The organization
-slug is currently not configurable on a per-entity basis, but is assumed to be
-the same for all entities in the catalog.
+a [Sentry](https://sentry.io) project within your organization. The value can
+be the format of `[organization]/[project-slug]` or just `[project-slug]`. When
+the organization slug is omitted the `app-config.yaml` will be used as a
+fallback (`sentry.organization`).
 
 Specifying this annotation may enable Sentry related features in Backstage for
 that entity.

docs/integrations/github/github-apps.md

@@ -79,7 +79,7 @@ privateKey: |
 ### Including in Integrations Config
 
 Once the credentials are stored in a YAML file generated by `create-github-app`,
-or manually by following the [GitHub Enterprise](#gitHub-enterprise)
+or manually by following the [GitHub Enterprise](#github-enterprise)
 instructions, they can be included in the `app-config.yaml` under the
 `integrations` section.
 

docs/overview/versioning-policy.md

@@ -49,7 +49,7 @@ functionality, breaking changes, and bug fixes, according the
 [versioning policy](#release-versioning-policy).
 
 Patch versions will only be released to address critical bug fixes. They are not
-bound to the regular cadence and are instead releases whenever needed.
+bound to the regular cadence and are instead released whenever needed.
 
 ## Next Release Line