Merge branch 'develop' into daniel/roomcleanupincremental

Conflicts: synapse/handlers/room.py
2016-02-16 11:34:48 +00:00 · 2016-02-16 11:34:48 +00:00 · feedaa37fa
parent 4bfb32f685 a182e5d721
commit feedaa37fa
1 changed files with 3 additions and 3 deletions
--- a/synapse/handlers/room.py
+++ b/synapse/handlers/room.py
@ -80,13 +80,13 @@ class RoomCreationHandler(BaseHandler):
        """ Creates a new room.

        Args:
-            user_id (str): The ID of the user creating the new room.
+            requester (Requester): The user who requested the room creation.
            config (dict) : A dict of configuration options.
        Returns:
            The new room ID.
        Raises:
-            SynapseError if the room ID was taken, couldn't be stored, or
-            something went horribly wrong.
+            SynapseError if the room ID couldn't be stored, or something went
+            horribly wrong.
        """
        user_id = requester.user.to_string()