Merge commit 'e452973fd' into dinsic

* commit 'e452973fd': fix broken link in sample config (#7712)
matrix-org · Aug 3, 2020 · 100a7ea · 100a7ea
2 parents c6011c3 + e452973
commit 100a7ea
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/changelog.d/7712.misc 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
@@ -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
@@ -89,7 +89,7 @@ def generate_config_section(self, config_dir_path, server_name, **kwargs):
         # 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