deploy: 7dc14730d9

develop/dev/git.html

@@ -283,15 +283,15 @@ when a PR is landed, or as part of our release process.</p>
 that our active branches are ordered thus, from more-stable to less-stable:</p>
 <ul>
 <li><code>master</code> (tracks our last release).</li>
-<li><code>release-vX.Y.Z</code> (the branch where we prepare the next release)<sup
+<li><code>release-vX.Y</code> (the branch where we prepare the next release)<sup
    id="a3"><a href="#f3">3</a></sup>.</li>
 <li>PR branches which are targeting the release.</li>
 <li><code>develop</code> (our &quot;mainline&quot; branch containing our bleeding-edge).</li>
 <li>regular PR branches.</li>
 </ul>
 <p>The corollary is: if you have a bugfix that needs to land in both
-<code>release-vX.Y.Z</code> <em>and</em> <code>develop</code>, then you should base your PR on
-<code>release-vX.Y.Z</code>, get it merged there, and then merge from <code>release-vX.Y.Z</code> to
+<code>release-vX.Y</code> <em>and</em> <code>develop</code>, then you should base your PR on
+<code>release-vX.Y</code>, get it merged there, and then merge from <code>release-vX.Y</code> to
 <code>develop</code>. (If a fix lands in <code>develop</code> and we later need it in a
 release-branch, we can of course cherry-pick it, but landing it in the release
 branch first helps reduce the chance of annoying conflicts.)</p>
@@ -302,7 +302,7 @@ most intuitive name. <a href="#a1">^</a></p>
 <p><b id="f2">[2]</b>: Well, anyone with commit access.<a href="#a2">^</a></p>
 <p><b id="f3">[3]</b>: Very, very occasionally (I think this has happened once in
 the history of Synapse), we've had two releases in flight at once. Obviously,
-<code>release-v1.2.3</code> is more-stable than <code>release-v1.3.0</code>. <a href="#a3">^</a></p>
+<code>release-v1.2</code> is more-stable than <code>release-v1.3</code>. <a href="#a3">^</a></p>
 
                     </main>
 

develop/print.html

@@ -11280,15 +11280,15 @@ when a PR is landed, or as part of our release process.</p>
 that our active branches are ordered thus, from more-stable to less-stable:</p>
 <ul>
 <li><code>master</code> (tracks our last release).</li>
-<li><code>release-vX.Y.Z</code> (the branch where we prepare the next release)<sup
+<li><code>release-vX.Y</code> (the branch where we prepare the next release)<sup
    id="a3"><a href="dev/git.html#f3">3</a></sup>.</li>
 <li>PR branches which are targeting the release.</li>
 <li><code>develop</code> (our &quot;mainline&quot; branch containing our bleeding-edge).</li>
 <li>regular PR branches.</li>
 </ul>
 <p>The corollary is: if you have a bugfix that needs to land in both
-<code>release-vX.Y.Z</code> <em>and</em> <code>develop</code>, then you should base your PR on
-<code>release-vX.Y.Z</code>, get it merged there, and then merge from <code>release-vX.Y.Z</code> to
+<code>release-vX.Y</code> <em>and</em> <code>develop</code>, then you should base your PR on
+<code>release-vX.Y</code>, get it merged there, and then merge from <code>release-vX.Y</code> to
 <code>develop</code>. (If a fix lands in <code>develop</code> and we later need it in a
 release-branch, we can of course cherry-pick it, but landing it in the release
 branch first helps reduce the chance of annoying conflicts.)</p>
@@ -11299,7 +11299,7 @@ most intuitive name. <a href="dev/git.html#a1">^</a></p>
 <p><b id="f2">[2]</b>: Well, anyone with commit access.<a href="dev/git.html#a2">^</a></p>
 <p><b id="f3">[3]</b>: Very, very occasionally (I think this has happened once in
 the history of Synapse), we've had two releases in flight at once. Obviously,
-<code>release-v1.2.3</code> is more-stable than <code>release-v1.3.0</code>. <a href="dev/git.html#a3">^</a></p>
+<code>release-v1.2</code> is more-stable than <code>release-v1.3</code>. <a href="dev/git.html#a3">^</a></p>
 <div id="chapter_begin" style="break-before: page; page-break-before: always;"></div><h1 id="opentracing"><a class="header" href="#opentracing">OpenTracing</a></h1>
 <h2 id="background"><a class="header" href="#background">Background</a></h2>
 <p>OpenTracing is a semi-standard being adopted by a number of distributed

develop/searchindex.js

@@ -1 +1 @@
-Object.assign(window.search, {"doc_urls":["welcome_and_overview.html#introduction","setup/installation.html#installation-instructions","setup/installation.html#choosing-your-server-name","setup/installation.html#installing-synapse","setup/installation.html#installing-from-source","setup/installation.html#prebuilt-packages","setup/installation.html#setting-up-synapse","setup/installation.html#using-postgresql","setup/installation.html#tls-certificates","setup/installation.html#client-well-known-uri","setup/installation.html#email","setup/installation.html#registering-a-user","setup/installation.html#setting-up-a-turn-server","setup/installation.html#url-previews","setup/installation.html#troubleshooting-installation","postgres.html#using-postgres","postgres.html#install-postgres-client-libraries","postgres.html#set-up-database","postgres.html#synapse-config","postgres.html#tuning-postgres","postgres.html#porting-from-sqlite","postgres.html#overview","postgres.html#using-the-port-script","postgres.html#troubleshooting","postgres.html#alternative-auth-methods","postgres.html#fixing-incorrect-collate-or-ctype","postgres.html#fixing-inconsistent-sequences-error","reverse_proxy.html#using-a-reverse-proxy-with-synapse","reverse_proxy.html#reverse-proxy-configuration-examples","reverse_proxy.html#nginx","reverse_proxy.html#caddy-1","reverse_proxy.html#caddy-2","reverse_proxy.html#apache","reverse_proxy.html#haproxy","reverse_proxy.html#relayd","reverse_proxy.html#homeserver-configuration","reverse_proxy.html#health-check-endpoint","reverse_proxy.html#synapse-administration-endpoints","turn-howto.html#overview","turn-howto.html#requirements","turn-howto.html#coturn-setup","turn-howto.html#initial-installation","turn-howto.html#configuration","turn-howto.html#synapse-setup","turn-howto.html#troubleshooting","delegate.html#delegation","delegate.html#well-known-delegation","delegate.html#srv-dns-record-delegation","delegate.html#delegation-faq","delegate.html#when-do-i-need-delegation","delegate.html#do-you-still-recommend-against-using-a-reverse-proxy-on-the-federation-port","delegate.html#do-i-still-need-to-give-my-tls-certificates-to-synapse-if-i-am-using-a-reverse-proxy","delegate.html#do-i-need-the-same-certificate-for-the-client-and-federation-port","upgrading/index.html#upgrading-synapse","upgrading/index.html#rolling-back-to-older-versions","upgrading/index.html#replace-130-accordingly","upgrading/index.html#replace-130-and-stretch-accordingly","upgrading/index.html#upgrading-to-v1340","upgrading/index.html#room_invite_state_types-configuration-setting","upgrading/index.html#upgrading-to-v1330","upgrading/index.html#account-validity-html-templates-can-now-display-a-users-expiration-date","upgrading/index.html#upgrading-to-v1320","upgrading/index.html#regression-causing-connected-prometheus-instances-to-become-overwhelmed","upgrading/index.html#dropping-support-for-old-python-postgres-and-sqlite-versions","upgrading/index.html#removal-of-old-list-accounts-admin-api","upgrading/index.html#application-services-must-use-type-mloginapplication_service-when-registering-users","upgrading/index.html#upgrading-to-v1290","upgrading/index.html#requirement-for-x-forwarded-proto-header","upgrading/index.html#upgrading-to-v1270","upgrading/index.html#changes-to-callback-uri-for-oauth2--openid-connect-and-saml2","upgrading/index.html#changes-to-html-templates","upgrading/index.html#upgrading-to-v1260","upgrading/index.html#rolling-back-to-v1250-after-a-failed-upgrade","upgrading/index.html#upgrading-to-v1250","upgrading/index.html#last-release-supporting-python-35","upgrading/index.html#blacklisting-ip-ranges","upgrading/index.html#upgrading-to-v1240","upgrading/index.html#custom-openid-connect-mapping-provider-breaking-change","upgrading/index.html#removal-historical-synapse-admin-api","upgrading/index.html#upgrading-to-v1230","upgrading/index.html#structured-logging-configuration-breaking-changes","upgrading/index.html#upgrading-to-v1220","upgrading/index.html#thirdpartyeventrules-breaking-changes","upgrading/index.html#upgrading-to-v1210","upgrading/index.html#forwarding-_synapseclient-through-your-reverse-proxy","upgrading/index.html#new-html-templates","upgrading/index.html#updated-single-sign-on-html-templates","upgrading/index.html#upgrading-to-v1180","upgrading/index.html#docker--py3-suffix-will-be-removed-in-future-versions","upgrading/index.html#redis-replication-is-now-recommended-in-lieu-of-tcp-replication","upgrading/index.html#upgrading-to-v1140","upgrading/index.html#upgrading-to-v1130","upgrading/index.html#incorrect-database-migration-in-old-synapse-versions","upgrading/index.html#new-single-sign-on-html-templates","upgrading/index.html#synapse-sso-plugins-method-deprecation","upgrading/index.html#rolling-back-to-v1124-after-a-failed-upgrade","upgrading/index.html#upgrading-to-v1120","upgrading/index.html#upgrading-to-v1100","upgrading/index.html#upgrading-to-v180","upgrading/index.html#upgrading-to-v170","uLine truncated
+Object.assign(window.search, {"doc_urls":["welcome_and_overview.html#introduction","setup/installation.html#installation-instructions","setup/installation.html#choosing-your-server-name","setup/installation.html#installing-synapse","setup/installation.html#installing-from-source","setup/installation.html#prebuilt-packages","setup/installation.html#setting-up-synapse","setup/installation.html#using-postgresql","setup/installation.html#tls-certificates","setup/installation.html#client-well-known-uri","setup/installation.html#email","setup/installation.html#registering-a-user","setup/installation.html#setting-up-a-turn-server","setup/installation.html#url-previews","setup/installation.html#troubleshooting-installation","postgres.html#using-postgres","postgres.html#install-postgres-client-libraries","postgres.html#set-up-database","postgres.html#synapse-config","postgres.html#tuning-postgres","postgres.html#porting-from-sqlite","postgres.html#overview","postgres.html#using-the-port-script","postgres.html#troubleshooting","postgres.html#alternative-auth-methods","postgres.html#fixing-incorrect-collate-or-ctype","postgres.html#fixing-inconsistent-sequences-error","reverse_proxy.html#using-a-reverse-proxy-with-synapse","reverse_proxy.html#reverse-proxy-configuration-examples","reverse_proxy.html#nginx","reverse_proxy.html#caddy-1","reverse_proxy.html#caddy-2","reverse_proxy.html#apache","reverse_proxy.html#haproxy","reverse_proxy.html#relayd","reverse_proxy.html#homeserver-configuration","reverse_proxy.html#health-check-endpoint","reverse_proxy.html#synapse-administration-endpoints","turn-howto.html#overview","turn-howto.html#requirements","turn-howto.html#coturn-setup","turn-howto.html#initial-installation","turn-howto.html#configuration","turn-howto.html#synapse-setup","turn-howto.html#troubleshooting","delegate.html#delegation","delegate.html#well-known-delegation","delegate.html#srv-dns-record-delegation","delegate.html#delegation-faq","delegate.html#when-do-i-need-delegation","delegate.html#do-you-still-recommend-against-using-a-reverse-proxy-on-the-federation-port","delegate.html#do-i-still-need-to-give-my-tls-certificates-to-synapse-if-i-am-using-a-reverse-proxy","delegate.html#do-i-need-the-same-certificate-for-the-client-and-federation-port","upgrading/index.html#upgrading-synapse","upgrading/index.html#rolling-back-to-older-versions","upgrading/index.html#replace-130-accordingly","upgrading/index.html#replace-130-and-stretch-accordingly","upgrading/index.html#upgrading-to-v1340","upgrading/index.html#room_invite_state_types-configuration-setting","upgrading/index.html#upgrading-to-v1330","upgrading/index.html#account-validity-html-templates-can-now-display-a-users-expiration-date","upgrading/index.html#upgrading-to-v1320","upgrading/index.html#regression-causing-connected-prometheus-instances-to-become-overwhelmed","upgrading/index.html#dropping-support-for-old-python-postgres-and-sqlite-versions","upgrading/index.html#removal-of-old-list-accounts-admin-api","upgrading/index.html#application-services-must-use-type-mloginapplication_service-when-registering-users","upgrading/index.html#upgrading-to-v1290","upgrading/index.html#requirement-for-x-forwarded-proto-header","upgrading/index.html#upgrading-to-v1270","upgrading/index.html#changes-to-callback-uri-for-oauth2--openid-connect-and-saml2","upgrading/index.html#changes-to-html-templates","upgrading/index.html#upgrading-to-v1260","upgrading/index.html#rolling-back-to-v1250-after-a-failed-upgrade","upgrading/index.html#upgrading-to-v1250","upgrading/index.html#last-release-supporting-python-35","upgrading/index.html#blacklisting-ip-ranges","upgrading/index.html#upgrading-to-v1240","upgrading/index.html#custom-openid-connect-mapping-provider-breaking-change","upgrading/index.html#removal-historical-synapse-admin-api","upgrading/index.html#upgrading-to-v1230","upgrading/index.html#structured-logging-configuration-breaking-changes","upgrading/index.html#upgrading-to-v1220","upgrading/index.html#thirdpartyeventrules-breaking-changes","upgrading/index.html#upgrading-to-v1210","upgrading/index.html#forwarding-_synapseclient-through-your-reverse-proxy","upgrading/index.html#new-html-templates","upgrading/index.html#updated-single-sign-on-html-templates","upgrading/index.html#upgrading-to-v1180","upgrading/index.html#docker--py3-suffix-will-be-removed-in-future-versions","upgrading/index.html#redis-replication-is-now-recommended-in-lieu-of-tcp-replication","upgrading/index.html#upgrading-to-v1140","upgrading/index.html#upgrading-to-v1130","upgrading/index.html#incorrect-database-migration-in-old-synapse-versions","upgrading/index.html#new-single-sign-on-html-templates","upgrading/index.html#synapse-sso-plugins-method-deprecation","upgrading/index.html#rolling-back-to-v1124-after-a-failed-upgrade","upgrading/index.html#upgrading-to-v1120","upgrading/index.html#upgrading-to-v1100","upgrading/index.html#upgrading-to-v180","upgrading/index.html#upgrading-to-v170","uLine truncated

develop/searchindex.json

@@ -1 +1 @@
-{"doc_urls":["welcome_and_overview.html#introduction","setup/installation.html#installation-instructions","setup/installation.html#choosing-your-server-name","setup/installation.html#installing-synapse","setup/installation.html#installing-from-source","setup/installation.html#prebuilt-packages","setup/installation.html#setting-up-synapse","setup/installation.html#using-postgresql","setup/installation.html#tls-certificates","setup/installation.html#client-well-known-uri","setup/installation.html#email","setup/installation.html#registering-a-user","setup/installation.html#setting-up-a-turn-server","setup/installation.html#url-previews","setup/installation.html#troubleshooting-installation","postgres.html#using-postgres","postgres.html#install-postgres-client-libraries","postgres.html#set-up-database","postgres.html#synapse-config","postgres.html#tuning-postgres","postgres.html#porting-from-sqlite","postgres.html#overview","postgres.html#using-the-port-script","postgres.html#troubleshooting","postgres.html#alternative-auth-methods","postgres.html#fixing-incorrect-collate-or-ctype","postgres.html#fixing-inconsistent-sequences-error","reverse_proxy.html#using-a-reverse-proxy-with-synapse","reverse_proxy.html#reverse-proxy-configuration-examples","reverse_proxy.html#nginx","reverse_proxy.html#caddy-1","reverse_proxy.html#caddy-2","reverse_proxy.html#apache","reverse_proxy.html#haproxy","reverse_proxy.html#relayd","reverse_proxy.html#homeserver-configuration","reverse_proxy.html#health-check-endpoint","reverse_proxy.html#synapse-administration-endpoints","turn-howto.html#overview","turn-howto.html#requirements","turn-howto.html#coturn-setup","turn-howto.html#initial-installation","turn-howto.html#configuration","turn-howto.html#synapse-setup","turn-howto.html#troubleshooting","delegate.html#delegation","delegate.html#well-known-delegation","delegate.html#srv-dns-record-delegation","delegate.html#delegation-faq","delegate.html#when-do-i-need-delegation","delegate.html#do-you-still-recommend-against-using-a-reverse-proxy-on-the-federation-port","delegate.html#do-i-still-need-to-give-my-tls-certificates-to-synapse-if-i-am-using-a-reverse-proxy","delegate.html#do-i-need-the-same-certificate-for-the-client-and-federation-port","upgrading/index.html#upgrading-synapse","upgrading/index.html#rolling-back-to-older-versions","upgrading/index.html#replace-130-accordingly","upgrading/index.html#replace-130-and-stretch-accordingly","upgrading/index.html#upgrading-to-v1340","upgrading/index.html#room_invite_state_types-configuration-setting","upgrading/index.html#upgrading-to-v1330","upgrading/index.html#account-validity-html-templates-can-now-display-a-users-expiration-date","upgrading/index.html#upgrading-to-v1320","upgrading/index.html#regression-causing-connected-prometheus-instances-to-become-overwhelmed","upgrading/index.html#dropping-support-for-old-python-postgres-and-sqlite-versions","upgrading/index.html#removal-of-old-list-accounts-admin-api","upgrading/index.html#application-services-must-use-type-mloginapplication_service-when-registering-users","upgrading/index.html#upgrading-to-v1290","upgrading/index.html#requirement-for-x-forwarded-proto-header","upgrading/index.html#upgrading-to-v1270","upgrading/index.html#changes-to-callback-uri-for-oauth2--openid-connect-and-saml2","upgrading/index.html#changes-to-html-templates","upgrading/index.html#upgrading-to-v1260","upgrading/index.html#rolling-back-to-v1250-after-a-failed-upgrade","upgrading/index.html#upgrading-to-v1250","upgrading/index.html#last-release-supporting-python-35","upgrading/index.html#blacklisting-ip-ranges","upgrading/index.html#upgrading-to-v1240","upgrading/index.html#custom-openid-connect-mapping-provider-breaking-change","upgrading/index.html#removal-historical-synapse-admin-api","upgrading/index.html#upgrading-to-v1230","upgrading/index.html#structured-logging-configuration-breaking-changes","upgrading/index.html#upgrading-to-v1220","upgrading/index.html#thirdpartyeventrules-breaking-changes","upgrading/index.html#upgrading-to-v1210","upgrading/index.html#forwarding-_synapseclient-through-your-reverse-proxy","upgrading/index.html#new-html-templates","upgrading/index.html#updated-single-sign-on-html-templates","upgrading/index.html#upgrading-to-v1180","upgrading/index.html#docker--py3-suffix-will-be-removed-in-future-versions","upgrading/index.html#redis-replication-is-now-recommended-in-lieu-of-tcp-replication","upgrading/index.html#upgrading-to-v1140","upgrading/index.html#upgrading-to-v1130","upgrading/index.html#incorrect-database-migration-in-old-synapse-versions","upgrading/index.html#new-single-sign-on-html-templates","upgrading/index.html#synapse-sso-plugins-method-deprecation","upgrading/index.html#rolling-back-to-v1124-after-a-failed-upgrade","upgrading/index.html#upgrading-to-v1120","upgrading/index.html#upgrading-to-v1100","upgrading/index.html#upgrading-to-v180","upgrading/index.html#upgrading-to-v170","upgrading/index.html#upgradingLine truncated
+{"doc_urls":["welcome_and_overview.html#introduction","setup/installation.html#installation-instructions","setup/installation.html#choosing-your-server-name","setup/installation.html#installing-synapse","setup/installation.html#installing-from-source","setup/installation.html#prebuilt-packages","setup/installation.html#setting-up-synapse","setup/installation.html#using-postgresql","setup/installation.html#tls-certificates","setup/installation.html#client-well-known-uri","setup/installation.html#email","setup/installation.html#registering-a-user","setup/installation.html#setting-up-a-turn-server","setup/installation.html#url-previews","setup/installation.html#troubleshooting-installation","postgres.html#using-postgres","postgres.html#install-postgres-client-libraries","postgres.html#set-up-database","postgres.html#synapse-config","postgres.html#tuning-postgres","postgres.html#porting-from-sqlite","postgres.html#overview","postgres.html#using-the-port-script","postgres.html#troubleshooting","postgres.html#alternative-auth-methods","postgres.html#fixing-incorrect-collate-or-ctype","postgres.html#fixing-inconsistent-sequences-error","reverse_proxy.html#using-a-reverse-proxy-with-synapse","reverse_proxy.html#reverse-proxy-configuration-examples","reverse_proxy.html#nginx","reverse_proxy.html#caddy-1","reverse_proxy.html#caddy-2","reverse_proxy.html#apache","reverse_proxy.html#haproxy","reverse_proxy.html#relayd","reverse_proxy.html#homeserver-configuration","reverse_proxy.html#health-check-endpoint","reverse_proxy.html#synapse-administration-endpoints","turn-howto.html#overview","turn-howto.html#requirements","turn-howto.html#coturn-setup","turn-howto.html#initial-installation","turn-howto.html#configuration","turn-howto.html#synapse-setup","turn-howto.html#troubleshooting","delegate.html#delegation","delegate.html#well-known-delegation","delegate.html#srv-dns-record-delegation","delegate.html#delegation-faq","delegate.html#when-do-i-need-delegation","delegate.html#do-you-still-recommend-against-using-a-reverse-proxy-on-the-federation-port","delegate.html#do-i-still-need-to-give-my-tls-certificates-to-synapse-if-i-am-using-a-reverse-proxy","delegate.html#do-i-need-the-same-certificate-for-the-client-and-federation-port","upgrading/index.html#upgrading-synapse","upgrading/index.html#rolling-back-to-older-versions","upgrading/index.html#replace-130-accordingly","upgrading/index.html#replace-130-and-stretch-accordingly","upgrading/index.html#upgrading-to-v1340","upgrading/index.html#room_invite_state_types-configuration-setting","upgrading/index.html#upgrading-to-v1330","upgrading/index.html#account-validity-html-templates-can-now-display-a-users-expiration-date","upgrading/index.html#upgrading-to-v1320","upgrading/index.html#regression-causing-connected-prometheus-instances-to-become-overwhelmed","upgrading/index.html#dropping-support-for-old-python-postgres-and-sqlite-versions","upgrading/index.html#removal-of-old-list-accounts-admin-api","upgrading/index.html#application-services-must-use-type-mloginapplication_service-when-registering-users","upgrading/index.html#upgrading-to-v1290","upgrading/index.html#requirement-for-x-forwarded-proto-header","upgrading/index.html#upgrading-to-v1270","upgrading/index.html#changes-to-callback-uri-for-oauth2--openid-connect-and-saml2","upgrading/index.html#changes-to-html-templates","upgrading/index.html#upgrading-to-v1260","upgrading/index.html#rolling-back-to-v1250-after-a-failed-upgrade","upgrading/index.html#upgrading-to-v1250","upgrading/index.html#last-release-supporting-python-35","upgrading/index.html#blacklisting-ip-ranges","upgrading/index.html#upgrading-to-v1240","upgrading/index.html#custom-openid-connect-mapping-provider-breaking-change","upgrading/index.html#removal-historical-synapse-admin-api","upgrading/index.html#upgrading-to-v1230","upgrading/index.html#structured-logging-configuration-breaking-changes","upgrading/index.html#upgrading-to-v1220","upgrading/index.html#thirdpartyeventrules-breaking-changes","upgrading/index.html#upgrading-to-v1210","upgrading/index.html#forwarding-_synapseclient-through-your-reverse-proxy","upgrading/index.html#new-html-templates","upgrading/index.html#updated-single-sign-on-html-templates","upgrading/index.html#upgrading-to-v1180","upgrading/index.html#docker--py3-suffix-will-be-removed-in-future-versions","upgrading/index.html#redis-replication-is-now-recommended-in-lieu-of-tcp-replication","upgrading/index.html#upgrading-to-v1140","upgrading/index.html#upgrading-to-v1130","upgrading/index.html#incorrect-database-migration-in-old-synapse-versions","upgrading/index.html#new-single-sign-on-html-templates","upgrading/index.html#synapse-sso-plugins-method-deprecation","upgrading/index.html#rolling-back-to-v1124-after-a-failed-upgrade","upgrading/index.html#upgrading-to-v1120","upgrading/index.html#upgrading-to-v1100","upgrading/index.html#upgrading-to-v180","upgrading/index.html#upgrading-to-v170","upgrading/index.html#upgradingLine truncated