diff options
| author | Erik Johnston <erik@matrix.org> | 2018-03-22 10:19:53 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2018-03-22 10:19:53 +0000 |
| commit | eb9fc021e302aa7a5c39902e056cc525328431f8 (patch) | |
| tree | 9162c92d399494be5213ec24c6e547c42f40469a /docs | |
| parent | Merge pull request #3015 from matrix-org/erikj/simplejson_replication (diff) | |
| parent | Update CHANGES.rst (diff) | |
| download | synapse-eb9fc021e302aa7a5c39902e056cc525328431f8.tar.xz | |
Merge branch 'release-v0.27.0' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/admin_api/purge_history_api.rst | 6 | ||||
| -rw-r--r-- | docs/workers.rst | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/docs/admin_api/purge_history_api.rst b/docs/admin_api/purge_history_api.rst index ea2922da5c..2da833c827 100644 --- a/docs/admin_api/purge_history_api.rst +++ b/docs/admin_api/purge_history_api.rst @@ -16,9 +16,11 @@ including an ``access_token`` of a server admin. By default, events sent by local users are not deleted, as they may represent the only copies of this content in existence. (Events sent by remote users are -deleted, and room state data before the cutoff is always removed). +deleted.) -To delete local events as well, set ``delete_local_events`` in the body: +Room state data (such as joins, leaves, topic) is always preserved. + +To delete local message events as well, set ``delete_local_events`` in the body: .. code:: json diff --git a/docs/workers.rst b/docs/workers.rst index dee04bbf3e..80f8d2181a 100644 --- a/docs/workers.rst +++ b/docs/workers.rst @@ -230,7 +230,7 @@ file. For example:: ``synapse.app.event_creator`` ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Handles non-state event creation. It can handle REST endpoints matching: +Handles non-state event creation. It can handle REST endpoints matching:: ^/_matrix/client/(api/v1|r0|unstable)/rooms/.*/send |