aboutsummaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorrinpatch <rinpatch@sdf.org>2019-12-06 15:36:30 +0000
committerrinpatch <rinpatch@sdf.org>2019-12-06 15:36:30 +0000
commit6cb31edd76fd42a0e33bc365d982cd02e3578d6c (patch)
tree5de31560895d42820fd17341ef47509dc6212e30 /docs
parenta280be34e36223aefd3d5e26fcddb9faad77310b (diff)
parent24599c519f95f27e1fb8120104f13856d2fa3742 (diff)
downloadpleroma-6cb31edd76fd42a0e33bc365d982cd02e3578d6c.tar.gz
Merge branch 'feature/1455-chat-character-limit' into 'develop'
Feature/1455 chat character limit Closes #1455 See merge request pleroma/pleroma!2034
Diffstat (limited to 'docs')
-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.