diff options
| author | Travis Ralston <travpc@gmail.com> | 2018-07-25 16:09:45 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-25 16:09:45 -0600 |
| commit | a4fe9d2d3664d7f3760ec23ca512d711376010aa (patch) | |
| tree | b47d9fd97b8421412d922b4b2bb9d38725f3636e | |
| parent | Merge pull request #3603 from matrix-org/erikj/handle_outliers (diff) | |
| parent | Create 3609.misc (diff) | |
| download | synapse-a4fe9d2d3664d7f3760ec23ca512d711376010aa.tar.xz | |
Merge pull request #3609 from matrix-org/travis/doc-typo-2
Fix a minor documentation typo in on_make_leave
| -rw-r--r-- | changelog.d/3609.misc | 1 | ||||
| -rw-r--r-- | synapse/handlers/federation.py | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/changelog.d/3609.misc b/changelog.d/3609.misc new file mode 100644 index 0000000000..5b9566d076 --- /dev/null +++ b/changelog.d/3609.misc @@ -0,0 +1 @@ +Fix a documentation typo in on_make_leave_request diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py index 145c1a21d4..49068c06d9 100644 --- a/synapse/handlers/federation.py +++ b/synapse/handlers/federation.py @@ -1279,7 +1279,7 @@ class FederationHandler(BaseHandler): @log_function def on_make_leave_request(self, room_id, user_id): """ We've received a /make_leave/ request, so we create a partial - join event for the room and return that. We do *not* persist or + leave event for the room and return that. We do *not* persist or process it until the other server has signed it and sent it back. """ builder = self.event_builder_factory.new({ |