summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorAndrew Morgan <1342360+anoadragon453@users.noreply.github.com>2020-08-25 15:03:24 +0100
committerGitHub <noreply@github.com>2020-08-25 15:03:24 +0100
commit74bf8d4d0659a87152804dc56df9284be87512bb (patch)
treedc3bcf29935838f49890e4d96a47c26304bc60d6 /synapse
parentFix missing double-backtick in RST document (diff)
downloadsynapse-74bf8d4d0659a87152804dc56df9284be87512bb.tar.xz
Wording fixes to 'name' user admin api filter (#8163)
Some fixes to wording I noticed after merging #7377.
Diffstat (limited to 'synapse')
-rw-r--r--synapse/storage/databases/main/__init__.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/storage/databases/main/__init__.py b/synapse/storage/databases/main/__init__.py
index 0ed726fee0..0934ae276c 100644
--- a/synapse/storage/databases/main/__init__.py
+++ b/synapse/storage/databases/main/__init__.py
@@ -507,7 +507,7 @@ class DataStore(
         Args:
             start (int): start number to begin the query from
             limit (int): number of rows to retrieve
-            user_id (string): search for user_id
+            user_id (string): search for user_id. ignored if name is not None
             name (string): search for local part of user_id or display name
             guests (bool): whether to in include guest users
             deactivated (bool): whether to include deactivated users