From bf6393f5a8057d57dee034d3dd546955cd12b434 Mon Sep 17 00:00:00 2001
From: erikjohnston <erikjohnston@users.noreply.github.com>
Date: Tue, 6 Jun 2023 09:50:03 +0000
Subject: deploy: ec71214243eac58a4a6d272c15441a6405f6ae9c

---
 latest/usage/configuration/config_documentation.html  | 5 +++++
 latest/usage/configuration/logging_sample_config.html | 4 +---
 2 files changed, 6 insertions(+), 3 deletions(-)

(limited to 'latest/usage/configuration')

diff --git a/latest/usage/configuration/config_documentation.html b/latest/usage/configuration/config_documentation.html
index 250c4fec81..26a051c6c3 100644
--- a/latest/usage/configuration/config_documentation.html
+++ b/latest/usage/configuration/config_documentation.html
@@ -3552,6 +3552,10 @@ This setting has the following sub-options:</p>
 localhost and 6379</p>
 </li>
 <li>
+<p><code>path</code>: The full path to a local Unix socket file. <strong>If this is used, <code>host</code> and
+<code>port</code> are ignored.</strong> Defaults to `/tmp/redis.sock'</p>
+</li>
+<li>
 <p><code>password</code>: Optional password if configured on the Redis instance.</p>
 </li>
 <li>
@@ -3573,6 +3577,7 @@ localhost and 6379</p>
 <p><code>ca_path</code>: Optional path to the folder containing the CA certificate file</p>
 <p><em>Added in Synapse 1.78.0.</em></p>
 <p><em>Changed in Synapse 1.84.0: Added use_tls, certificate_file, private_key_file, ca_file and ca_path attributes</em></p>
+<p><em>Changed in Synapse 1.85.0: Added path option to use a local Unix socket</em></p>
 </li>
 </ul>
 <p>Example configuration:</p>
diff --git a/latest/usage/configuration/logging_sample_config.html b/latest/usage/configuration/logging_sample_config.html
index 34c640f73d..69f10b9a34 100644
--- a/latest/usage/configuration/logging_sample_config.html
+++ b/latest/usage/configuration/logging_sample_config.html
@@ -225,9 +225,7 @@ root:
     # Write logs to the `buffer` handler, which will buffer them together in memory,
     # then write them to a file.
     #
-    # Replace &quot;buffer&quot; with &quot;console&quot; to log to stderr instead. (Note that you'll
-    # also need to update the configuration for the `twisted` logger above, in
-    # this case.)
+    # Replace &quot;buffer&quot; with &quot;console&quot; to log to stderr instead.
     #
     handlers: [buffer]
 
-- 
cgit 1.5.1