aboutsummaryrefslogtreecommitdiff
path: root/docs/configuration
diff options
context:
space:
mode:
authorIvan Tashkinov <ivantashkinov@gmail.com>2019-12-10 08:55:14 +0300
committerIvan Tashkinov <ivantashkinov@gmail.com>2019-12-10 08:55:14 +0300
commit835ac2157c53e8c85bd3759efe061dbfbdfc367e (patch)
tree266959488004bd33200c4ae4d664e665b77b2668 /docs/configuration
parent1770602747ae95d95d12c5601f99ced8699e8947 (diff)
parent99623b4eca8ad4af0b8e7adc9dd4765ba2922c8b (diff)
downloadpleroma-835ac2157c53e8c85bd3759efe061dbfbdfc367e.tar.gz
Merge remote-tracking branch 'remotes/upstream/develop' into 1427-oauth-admin-scopes
# Conflicts: # CHANGELOG.md
Diffstat (limited to 'docs/configuration')
-rw-r--r--docs/configuration/cheatsheet.md1
1 files changed, 1 insertions, 0 deletions
diff --git a/docs/configuration/cheatsheet.md b/docs/configuration/cheatsheet.md
index dc2f55229..ef2711e3c 100644
--- a/docs/configuration/cheatsheet.md
+++ b/docs/configuration/cheatsheet.md
@@ -12,6 +12,7 @@ You shouldn't edit the base config directly to avoid breakages and merge conflic
* `notify_email`: Email used for notifications.
* `description`: The instance’s description, can be seen in nodeinfo and ``/api/v1/instance``.
* `limit`: Posts character limit (CW/Subject included in the counter).
+* `chat_limit`: Character limit of the instance chat messages.
* `remote_limit`: Hard character limit beyond which remote posts will be dropped.
* `upload_limit`: File size limit of uploads (except for avatar, background, banner).
* `avatar_upload_limit`: File size limit of user’s profile avatars.