summary refs log tree commit diff
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2020-03-20 17:01:22 +0000
committerAndrew Morgan <andrew@amorgan.xyz>2020-03-20 17:01:22 +0000
commit27ecf7436633040c21c01aa4ab029d23e18a6729 (patch)
tree2da17273954a39dc35de875eccbaf82b331ebb46
parentFix GET request on /_synapse/admin/v2/users endpoint (#6563) (diff)
parentMerge pull request #6665 from matrix-org/babolivier/retention_doc_typo (diff)
downloadsynapse-27ecf7436633040c21c01aa4ab029d23e18a6729.tar.xz
Merge pull request #6665 from matrix-org/babolivier/retention_doc_typo
* commit 'e16521faa':
  Changelog
  Fix typo in message retention policies doc
-rw-r--r--changelog.d/6665.doc1
-rw-r--r--docs/message_retention_policies.md2
2 files changed, 2 insertions, 1 deletions
diff --git a/changelog.d/6665.doc b/changelog.d/6665.doc
new file mode 100644

index 0000000000..bc9a022db2 --- /dev/null +++ b/changelog.d/6665.doc
@@ -0,0 +1 @@ +Add complete documentation of the message retention policies support. diff --git a/docs/message_retention_policies.md b/docs/message_retention_policies.md
index c4888c81be..4300809dfe 100644 --- a/docs/message_retention_policies.md +++ b/docs/message_retention_policies.md
@@ -101,7 +101,7 @@ file. An example of such configuration could be: interval: 2d ``` -In this example, we define two jobs: +In this example, we define three jobs: * one that runs twice a day (every 12 hours) and purges events in rooms which policy's `max_lifetime` is lower or equal to 3 days.