deploy: 8330fc9953032f21eb4c7d5f0627c1e6aba2459c

2 files changed, 13 insertions, 9 deletions

diff --git a/develop/setup/forward_proxy.html b/develop/setup/forward_proxy.html
index b3019a645f..034bd7b78f 100644
--- a/develop/setup/forward_proxy.html
+++ b/develop/setup/forward_proxy.html
@@ -217,8 +217,8 @@ will apply blacklisting of IP addresses.</p>
 it is most likely due to the proxy's certificates. To test this, the validation
 in Synapse can be deactivated.</p>
 <p><strong>NOTE</strong>: This has an impact on security and is for testing purposes only!</p>
-<p>To deactivate the certificate validation, the following setting must be made in
-<a href="../usage/configuration/homeserver_sample_config.html">homserver.yaml</a>.</p>
+<p>To deactivate the certificate validation, the following setting must be added to
+your <a href="../usage/configuration/homeserver_sample_config.html">homserver.yaml</a>.</p>
 <pre><code class="language-yaml">use_insecure_ssl_client_just_for_testing_do_not_use: true
 </code></pre>
 
diff --git a/develop/setup/installation.html b/develop/setup/installation.html
index afddc631fe..a6d8ad7e28 100644
--- a/develop/setup/installation.html
+++ b/develop/setup/installation.html
@@ -420,11 +420,11 @@ over HTTPS.</p>
 <p>Alternatively, you can configure Synapse to expose an HTTPS port. To do
 so, you will need to edit <code>homeserver.yaml</code>, as follows:</p>
 <ul>
-<li>First, under the <code>listeners</code> section, uncomment the configuration for the
-TLS-enabled listener. (Remove the hash sign (<code>#</code>) at the start of
-each line). The relevant lines are like this:</li>
+<li>First, under the <code>listeners</code> option, add the configuration for the
+TLS-enabled listener like so:</li>
 </ul>
-<pre><code class="language-yaml">  - port: 8448
+<pre><code class="language-yaml">listeners:
+  - port: 8448
     type: http
     tls: true
     resources:
@@ -432,9 +432,13 @@ each line). The relevant lines are like this:</li>
 </code></pre>
 <ul>
 <li>
-<p>You will also need to uncomment the <code>tls_certificate_path</code> and
-<code>tls_private_key_path</code> lines under the <code>TLS</code> section. You will need to manage
-provisioning of these certificates yourself.</p>
+<p>You will also need to add the options <code>tls_certificate_path</code> and
+<code>tls_private_key_path</code>. to your configuration file. You will need to manage provisioning of 
+these certificates yourself.</p>
+</li>
+<li>
+<p>You can find more information about these options as well as how to configure synapse in the 
+<a href="../usage/configuration/config_documentation.html">configuration manual</a>.</p>
 <p>If you are using your own certificate, be sure to use a <code>.pem</code> file that
 includes the full certificate chain including any intermediate certificates
 (for instance, if using certbot, use <code>fullchain.pem</code> as your certificate, not