From 02742fd0584a1b07f69541ed2c49a4c83ca016ee Mon Sep 17 00:00:00 2001
From: jmcparland <jmcparland@tcmlabs.com>
Date: Mon, 8 Nov 2021 05:34:39 -0500
Subject: [PATCH 1/3] Wrong DTLS port in "Troubleshooting" (#11268)

Port 5349, not 5479.
---
 docs/turn-howto.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/turn-howto.md b/docs/turn-howto.md
index 6433446c2..5d282099e 100644
--- a/docs/turn-howto.md
+++ b/docs/turn-howto.md
@@ -204,7 +204,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).

From 4ad5ee9996bd24e839532757b15d95d90015f4a0 Mon Sep 17 00:00:00 2001
From: reivilibre <oliverw@matrix.org>
Date: Fri, 12 Nov 2021 12:58:39 +0000
Subject: [PATCH 2/3] Correct target of link to the modules page from the
 Password Auth Providers page (#11309)

---
 docs/password_auth_providers.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/password_auth_providers.md b/docs/password_auth_providers.md
index d7beacfff..dc0dfffa2 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

From 9f9d82aa846332189e818f51d49daf2335780014 Mon Sep 17 00:00:00 2001
From: David Robertson <davidr@element.io>
Date: Wed, 17 Nov 2021 13:10:12 +0000
Subject: [PATCH 3/3] 1.47.0

---
 CHANGES.md          | 6 ++++++
 debian/changelog    | 6 ++++++
 synapse/__init__.py | 2 +-
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/CHANGES.md b/CHANGES.md
index d71ab4a9d..a435d9c59 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 2acd0de3f..ba75d0b25 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/synapse/__init__.py b/synapse/__init__.py
index 3b5878b91..aa964afb5 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