summary refs log tree commit diff
diff options
context:
space:
mode:
authorMatthew Hodgson <matthew@matrix.org>2019-04-21 07:24:50 +0100
committerMatthew Hodgson <matthew@matrix.org>2019-04-21 09:04:24 +0100
commitf6a81341f0ea91fb43f38c600c031ed416ea275a (patch)
treed3b8fc087c822af58a71401ff8c9d8aef7b1b020
parentalso add auth_public_rooms option to require auth for CS API /publicRooms (diff)
downloadsynapse-github/dinsic_2019-04-05_hotfix.tar.xz
-rw-r--r--docs/sample_config.yaml2
-rw-r--r--synapse/config/server.py4
2 files changed, 3 insertions, 3 deletions
diff --git a/docs/sample_config.yaml b/docs/sample_config.yaml
index 4cfc2468f0..bb450ba60a 100644
--- a/docs/sample_config.yaml
+++ b/docs/sample_config.yaml
@@ -75,7 +75,7 @@ pid_file: DATADIR/homeserver.pid
 
 # whether to require users to authenticate in order to query /publicRooms
 # endpoints via CS API. this is a workaround in advance of
-# https://github.com/matrix-org/matrix-doc/issues/612 beinig solved
+# https://github.com/matrix-org/matrix-doc/issues/612 being solved
 #auth_public_rooms: false
 
 # The GC threshold parameters to pass to `gc.set_threshold`, if defined
diff --git a/synapse/config/server.py b/synapse/config/server.py
index ea84245907..696e39b37f 100644
--- a/synapse/config/server.py
+++ b/synapse/config/server.py
@@ -77,7 +77,7 @@ class ServerConfig(Config):
 
         # whether to require users to authenticate in order to query /publicRooms
         # endpoints via CS API. this is a workaround in advance of
-        # https://github.com/matrix-org/matrix-doc/issues/612 beinig solved
+        # https://github.com/matrix-org/matrix-doc/issues/612 being solved
         self.auth_public_rooms = config.get("auth_public_rooms", False)
 
         # whether to enable search. If disabled, new entries will not be inserted
@@ -333,7 +333,7 @@ class ServerConfig(Config):
 
         # whether to require users to authenticate in order to query /publicRooms
         # endpoints via CS API. this is a workaround in advance of
-        # https://github.com/matrix-org/matrix-doc/issues/612 beinig solved
+        # https://github.com/matrix-org/matrix-doc/issues/612 being solved
         #auth_public_rooms: false
 
         # The GC threshold parameters to pass to `gc.set_threshold`, if defined