summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorLuke Barnard <lukeb@openmarket.com>2017-11-01 09:35:15 +0000
committerLuke Barnard <lukeb@openmarket.com>2017-11-01 09:35:15 +0000
commit207fabbc6abcd47d8d48bd1235e944177fa6521a (patch)
treebb5ece945626b2c1a03044849881ead64b45b69e /synapse
parentFlake8 (diff)
downloadsynapse-207fabbc6abcd47d8d48bd1235e944177fa6521a.tar.xz
Update docs for updating room group association
Diffstat (limited to '')
-rw-r--r--synapse/federation/transport/client.py2
-rw-r--r--synapse/groups/groups_server.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/synapse/federation/transport/client.py b/synapse/federation/transport/client.py
index d513c01b7e..ed41dfc7ee 100644
--- a/synapse/federation/transport/client.py
+++ b/synapse/federation/transport/client.py
@@ -533,7 +533,7 @@ class TransportLayerClient(object):
 
     def update_room_group_association(self, destination, group_id, requester_user_id,
                                       room_id, content):
-        """Add a room to a group
+        """Add or update an association between room and group
         """
         path = PREFIX + "/groups/%s/room/%s" % (group_id, room_id,)
 
diff --git a/synapse/groups/groups_server.py b/synapse/groups/groups_server.py
index 69831eacbd..e21ac8e49e 100644
--- a/synapse/groups/groups_server.py
+++ b/synapse/groups/groups_server.py
@@ -533,7 +533,7 @@ class GroupsServerHandler(object):
     @defer.inlineCallbacks
     def update_room_group_association(self, group_id, requester_user_id, room_id,
                                       content):
-        """Add room to group
+        """Add or update an association between room and group
         """
         RoomID.from_string(room_id)  # Ensure valid room id