deploy: 2481b7dfa41c1c890346136f04344a4e1660ef32

1 files changed, 12 insertions, 36 deletions

diff --git a/develop/print.html b/develop/print.html
index 11ff8fad55..3bd2cbcae0 100644
--- a/develop/print.html
+++ b/develop/print.html
@@ -1785,6 +1785,18 @@ dpkg -i matrix-synapse-py3_1.3.0+stretch1_amd64.deb
 You will need Python 3.8 to run Synapse v1.88.0 (due out July 18th, 2023).</p>
 <p>If you use current versions of the Matrix.org-distributed Debian
 packages or Docker images, no action is required.</p>
+<h2 id="removal-of-worker_replication_-settings"><a class="header" href="#removal-of-worker_replication_-settings">Removal of <code>worker_replication_*</code> settings</a></h2>
+<p>As mentioned previously in <a href="upgrade.html#upgrading-to-v1840">Upgrading to v1.84.0</a>, the following deprecated settings
+are being removed in this release of Synapse:</p>
+<ul>
+<li><a href="https://matrix-org.github.io/synapse/v1.86/usage/configuration/config_documentation.html#worker_replication_host"><code>worker_replication_host</code></a></li>
+<li><a href="https://matrix-org.github.io/synapse/v1.86/usage/configuration/config_documentation.html#worker_replication_http_port"><code>worker_replication_http_port</code></a></li>
+<li><a href="https://matrix-org.github.io/synapse/v1.86/usage/configuration/config_documentation.html#worker_replication_http_tls"><code>worker_replication_http_tls</code></a></li>
+</ul>
+<p>Please ensure that you have migrated to using <code>main</code> on your shared configuration's <code>instance_map</code>
+(or create one if necessary). This is required if you have <em><strong>any</strong></em> workers at all;
+administrators of single-process (monolith) installations don't need to do anything.</p>
+<p>For an illustrative example, please see <a href="upgrade.html#upgrading-to-v1840">Upgrading to v1.84.0</a> below.</p>
 <h1 id="upgrading-to-v1860"><a class="header" href="#upgrading-to-v1860">Upgrading to v1.86.0</a></h1>
 <h2 id="minimum-supported-rust-version"><a class="header" href="#minimum-supported-rust-version">Minimum supported Rust version</a></h2>
 <p>The minimum supported Rust version has been increased from v1.58.1 to v1.60.0.
@@ -7176,39 +7188,6 @@ giving each worker a unique <code>worker_name</code>.</p>
 <pre><code class="language-yaml">worker_name: generic_worker1
 </code></pre>
 <hr />
-<h3 id="worker_replication_host"><a class="header" href="#worker_replication_host"><code>worker_replication_host</code></a></h3>
-<p><em>Deprecated as of version 1.84.0. Place <code>host</code> under <code>main</code> entry on the <a href="usage/configuration/config_documentation.html#instance_map"><code>instance_map</code></a> in your shared yaml configuration instead.</em></p>
-<p>The HTTP replication endpoint that it should talk to on the main Synapse process.
-The main Synapse process defines this with a <code>replication</code> resource in
-<a href="usage/configuration/config_documentation.html#listeners"><code>listeners</code> option</a>.</p>
-<p>Example configuration:</p>
-<pre><code class="language-yaml">worker_replication_host: 127.0.0.1
-</code></pre>
-<hr />
-<h3 id="worker_replication_http_port"><a class="header" href="#worker_replication_http_port"><code>worker_replication_http_port</code></a></h3>
-<p><em>Deprecated as of version 1.84.0. Place <code>port</code> under <code>main</code> entry on the <a href="usage/configuration/config_documentation.html#instance_map"><code>instance_map</code></a> in your shared yaml configuration instead.</em></p>
-<p>The HTTP replication port that it should talk to on the main Synapse process.
-The main Synapse process defines this with a <code>replication</code> resource in
-<a href="usage/configuration/config_documentation.html#listeners"><code>listeners</code> option</a>.</p>
-<p>Example configuration:</p>
-<pre><code class="language-yaml">worker_replication_http_port: 9093
-</code></pre>
-<hr />
-<h3 id="worker_replication_http_tls"><a class="header" href="#worker_replication_http_tls"><code>worker_replication_http_tls</code></a></h3>
-<p><em>Deprecated as of version 1.84.0. Place <code>tls</code> under <code>main</code> entry on the <a href="usage/configuration/config_documentation.html#instance_map"><code>instance_map</code></a> in your shared yaml configuration instead.</em></p>
-<p>Whether TLS should be used for talking to the HTTP replication port on the main
-Synapse process.
-The main Synapse process defines this with the <code>tls</code> option on its <a href="usage/configuration/config_documentation.html#listeners">listener</a> that
-has the <code>replication</code> resource enabled.</p>
-<p><strong>Please note:</strong> by default, it is not safe to expose replication ports to the
-public Internet, even with TLS enabled.
-See <a href="usage/configuration/config_documentation.html#worker_replication_secret"><code>worker_replication_secret</code></a>.</p>
-<p>Defaults to <code>false</code>.</p>
-<p><em>Added in Synapse 1.72.0.</em></p>
-<p>Example configuration:</p>
-<pre><code class="language-yaml">worker_replication_http_tls: true
-</code></pre>
-<hr />
 <h3 id="worker_listeners"><a class="header" href="#worker_listeners"><code>worker_listeners</code></a></h3>
 <p>A worker can handle HTTP requests. To do so, a <code>worker_listeners</code> option
 must be declared, in the same way as the <a href="usage/configuration/config_documentation.html#listeners"><code>listeners</code> option</a>
@@ -10911,9 +10890,6 @@ The currently available worker applications are listed <a href="workers.html#ava
 with an <code>http</code> listener.</li>
 <li><strong>Synapse 1.72 and older:</strong> if handling the <code>^/_matrix/client/v3/keys/upload</code> endpoint, the HTTP URI for
 the main process (<code>worker_main_http_uri</code>). This config option is no longer required and is ignored when running Synapse 1.73 and newer.</li>
-<li><strong>Synapse 1.83 and older:</strong> The HTTP replication endpoint that the worker should talk to on the main synapse process
-(<a href="usage/configuration/config_documentation.html#worker_replication_host"><code>worker_replication_host</code></a> and
-<a href="usage/configuration/config_documentation.html#worker_replication_http_port"><code>worker_replication_http_port</code></a>). If using Synapse 1.84 and newer, these are not needed if <code>main</code> is defined on the <a href="workers.html#shared-configuration">shared configuration</a> <code>instance_map</code></li>
 </ul>
 <p>For example:</p>
 <pre><code class="language-yaml">worker_app: synapse.app.generic_worker