Merge branch 'eread/update-oidc-topic-for-conventions' into 'master'

Update OIDC topic for current conventions See merge request gitlab-org/gitlab!66348

Merge branch 'eread/update-oidc-topic-for-conventions' into 'master'
Update OIDC topic for current conventions See merge request gitlab-org/gitlab!66348
0d066422 · Kati Paizee · 0599a0c1 · c5735309 · 0d066422 · 0d066422
Commit 0d066422 authored Jul 19, 2021 by Kati Paizee
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 142 additions and 149 deletions

doc/.vale/gitlab/spelling-exceptions.txt doc/.vale/gitlab/spelling-exceptions.txt +1 -0

doc/administration/auth/oidc.md doc/administration/auth/oidc.md +141 -149

No files found.
--- a/doc/.vale/gitlab/spelling-exceptions.txt
+++ b/doc/.vale/gitlab/spelling-exceptions.txt
@@ -290,6 +290,7 @@ kanbans
 kaniko
 Karma
 Kerberos
+Keycloak
 keyset
 keyspace
 keytab

--- a/doc/administration/auth/oidc.md
+++ b/doc/administration/auth/oidc.md