summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--synapse/types/handlers/__init__.py4
-rw-r--r--synapse/types/rest/client/__init__.py3
2 files changed, 3 insertions, 4 deletions
diff --git a/synapse/types/handlers/__init__.py b/synapse/types/handlers/__init__.py
index 0c2ab13c93..f98b3cad0c 100644
--- a/synapse/types/handlers/__init__.py
+++ b/synapse/types/handlers/__init__.py
@@ -129,8 +129,8 @@ class SlidingSyncConfig(SlidingSyncBody):
         IDs), so this handles those edge cases.
         """
 
-        # `conn_id` can be null, in which case we default to the empty string
-        # (if conn ID is empty then the client can't have multiple sync loops)
+        # If this is missing, only one sliding sync connection is allowed per
+        # given conn_id.
         conn_id = self.conn_id or ""
 
         if self.requester.device_id:
diff --git a/synapse/types/rest/client/__init__.py b/synapse/types/rest/client/__init__.py
index 5be8cf5389..c7d806de77 100644
--- a/synapse/types/rest/client/__init__.py
+++ b/synapse/types/rest/client/__init__.py
@@ -121,8 +121,7 @@ class SlidingSyncBody(RequestBodyModel):
 
     Attributes:
         conn_id: An optional string to identify this connection to the server. If this
-            is missing, only 1 sliding sync connection can be made to the server at
-            any one time.
+            is missing, only one sliding sync connection is allowed per given conn_id.
         lists: Sliding window API. A map of list key to list information
             (:class:`SlidingSyncList`). Max lists: 100. The list keys should be
             arbitrary strings which the client is using to refer to the list. Keep this