summaryrefslogtreecommitdiff
path: root/docs/configuration
diff options
context:
space:
mode:
authorIlja <ilja@ilja.space>2022-07-14 07:07:19 +0200
committerIlja <ilja@ilja.space>2022-07-14 07:07:19 +0200
commit44d14e8a9c0f9472560b6e389af7f28de6006a2f (patch)
treed34e79d791215de89373cc5913f83474c50df181 /docs/configuration
parentf88ed1df75efcbfff930c642eeff5891cadceb1f (diff)
parent3fb9171694936e10114ba69a728256f5de792ecb (diff)
downloadpleroma-44d14e8a9c0f9472560b6e389af7f28de6006a2f.tar.gz
pleroma-44d14e8a9c0f9472560b6e389af7f28de6006a2f.zip
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into fine_grained_moderation_privileges
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 9cf7ce499..4f398a14b 100644
--- a/docs/configuration/cheatsheet.md
+++ b/docs/configuration/cheatsheet.md
@@ -18,6 +18,7 @@ To add configuration to your config file, you can copy it from the base config.
* `email`: Email used to reach an Administrator/Moderator of the instance.
* `notify_email`: Email used for notifications.
* `description`: The instance’s description, can be seen in nodeinfo and ``/api/v1/instance``.
+* `short_description`: Shorter version of instance description, can be seen on ``/api/v1/instance``.
* `limit`: Posts character limit (CW/Subject included in the counter).
* `description_limit`: The character limit for image descriptions.
* `remote_limit`: Hard character limit beyond which remote posts will be dropped.