aboutsummaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorMark Felder <feld@FreeBSD.org>2020-10-28 08:48:26 -0500
committerMark Felder <feld@FreeBSD.org>2020-10-28 08:48:26 -0500
commitd2b140a525b6ba04542f13678a2243147010f713 (patch)
tree3849f7dbb2a5906ebe1d25f7af9b2d79cbe7e5a1 /docs
parentd28f72a55af9442719ff01fe7052802c285f6ea8 (diff)
parent1204aaa2e35983f7361d61ee7906ccf3d09d84e4 (diff)
downloadpleroma-d2b140a525b6ba04542f13678a2243147010f713.tar.gz
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into issue/2261
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 0b13d7e88..f4b4b6c3c 100644
--- a/docs/configuration/cheatsheet.md
+++ b/docs/configuration/cheatsheet.md
@@ -45,6 +45,7 @@ To add configuration to your config file, you can copy it from the base config.
older software for theses nicknames.
* `max_pinned_statuses`: The maximum number of pinned statuses. `0` will disable the feature.
* `autofollowed_nicknames`: Set to nicknames of (local) users that every new user should automatically follow.
+* `autofollowing_nicknames`: Set to nicknames of (local) users that automatically follows every newly registered user.
* `attachment_links`: Set to true to enable automatically adding attachment link text to statuses.
* `max_report_comment_size`: The maximum size of the report comment (Default: `1000`).
* `safe_dm_mentions`: If set to true, only mentions at the beginning of a post will be used to address people in direct messages. This is to prevent accidental mentioning of people when talking about them (e.g. "@friend hey i really don't like @enemy"). Default: `false`.