Merge commit 'e452973fd' into dinsic

* commit 'e452973fd':
  fix broken link in sample config (#7712)

3 files changed, 3 insertions, 2 deletions

diff --git a/changelog.d/7712.misc b/changelog.d/7712.misc
new file mode 100644

index 0000000000..4f0987303e
--- /dev/null
+++ b/changelog.d/7712.misc
@@ -0,0 +1 @@
+Fix broken link in sample config.
diff --git a/docs/sample_config.yaml b/docs/sample_config.yaml

index e698166283..6baa7c9645 100644
--- a/docs/sample_config.yaml
+++ b/docs/sample_config.yaml
@@ -1714,7 +1714,7 @@ saml2_config:
 # use an OpenID Connect Provider for authentication, instead of its internal
 # password database.
 #
-# See https://github.com/matrix-org/synapse/blob/master/openid.md.
+# See https://github.com/matrix-org/synapse/blob/master/docs/openid.md.
 #
 oidc_config:
   # Uncomment the following to enable authorization against an OpenID Connect
diff --git a/synapse/config/oidc_config.py b/synapse/config/oidc_config.py

index e24dd637bc..e0939bce84 100644
--- a/synapse/config/oidc_config.py
+++ b/synapse/config/oidc_config.py
@@ -89,7 +89,7 @@ class OIDCConfig(Config):
         # use an OpenID Connect Provider for authentication, instead of its internal
         # password database.
         #
-        # See https://github.com/matrix-org/synapse/blob/master/openid.md.
+        # See https://github.com/matrix-org/synapse/blob/master/docs/openid.md.
         #
         oidc_config:
           # Uncomment the following to enable authorization against an OpenID Connect