summary refs log tree commit diff
diff options
context:
space:
mode:
authorDavid Robertson <davidr@element.io>2021-11-17 14:19:56 +0000
committerDavid Robertson <davidr@element.io>2021-11-17 14:19:56 +0000
commitb76337fdf825282b7c75ebc38e9a64f0b00f7cf0 (patch)
tree86505c4e2f1e831fdfe764571c457e56754fc9df
parentRename `get_access_token_for_user_id` method to `create_access_token_for_user... (diff)
parentMerge remote-tracking branch 'origin/release-v1.47' (diff)
downloadsynapse-b76337fdf825282b7c75ebc38e9a64f0b00f7cf0.tar.xz
Merge branch 'master' into develop
-rw-r--r--CHANGES.md6
-rw-r--r--debian/changelog6
-rw-r--r--docs/password_auth_providers.md2
-rw-r--r--docs/turn-howto.md2
-rw-r--r--synapse/__init__.py2
5 files changed, 15 insertions, 3 deletions
diff --git a/CHANGES.md b/CHANGES.md
index 3b05b6c4a0..9f70f74839 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,9 @@
+Synapse 1.47.0 (2021-11-17)
+===========================
+
+No significant changes since 1.47.0rc3.
+
+
 Synapse 1.47.0rc3 (2021-11-16)
 ==============================
 
diff --git a/debian/changelog b/debian/changelog
index 2acd0de3f5..ba75d0b251 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+matrix-synapse-py3 (1.47.0) stable; urgency=medium
+
+  * New synapse release 1.47.0.
+
+ -- Synapse Packaging team <packages@matrix.org>  Wed, 17 Nov 2021 13:09:43 +0000
+
 matrix-synapse-py3 (1.47.0~rc3) stable; urgency=medium
 
   * New synapse release 1.47.0~rc3.
diff --git a/docs/password_auth_providers.md b/docs/password_auth_providers.md
index d7beacfff3..dc0dfffa21 100644
--- a/docs/password_auth_providers.md
+++ b/docs/password_auth_providers.md
@@ -1,7 +1,7 @@
 <h2 style="color:red">
 This page of the Synapse documentation is now deprecated. For up to date
 documentation on setting up or writing a password auth provider module, please see
-<a href="modules.md">this page</a>.
+<a href="modules/index.md">this page</a>.
 </h2>
 
 # Password auth provider modules
diff --git a/docs/turn-howto.md b/docs/turn-howto.md
index 06b2ef2c9a..e6812de69e 100644
--- a/docs/turn-howto.md
+++ b/docs/turn-howto.md
@@ -220,7 +220,7 @@ Here are a few things to try:
    anyone who has successfully set this up.
 
  * Check that you have opened your firewall to allow TCP and UDP traffic to the
-   TURN ports (normally 3478 and 5479).
+   TURN ports (normally 3478 and 5349).
 
  * Check that you have opened your firewall to allow UDP traffic to the UDP
    relay ports (49152-65535 by default).
diff --git a/synapse/__init__.py b/synapse/__init__.py
index 3b5878b912..aa964afb5e 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -47,7 +47,7 @@ try:
 except ImportError:
     pass
 
-__version__ = "1.47.0rc3"
+__version__ = "1.47.0"
 
 if bool(os.environ.get("SYNAPSE_TEST_PATCH_LOG_CONTEXTS", False)):
     # We import here so that we don't have to install a bunch of deps when