summaryrefslogtreecommitdiff
path: root/docs/configuration
diff options
context:
space:
mode:
authorEgor Kislitsyn <egor@kislitsyn.com>2020-10-29 14:51:23 +0400
committerEgor Kislitsyn <egor@kislitsyn.com>2020-10-29 14:51:23 +0400
commit8542d2efee86131350736a9be96713551e01f6ed (patch)
tree070a7a5693766e2a9e7ad31782f59d224c7dac4e /docs/configuration
parent1bfd8528bbc71c8c34253eb245de7df498064fb4 (diff)
parent0e0a6aef70fc0cac1f9176e4f50a7fe4930242fa (diff)
downloadpleroma-8542d2efee86131350736a9be96713551e01f6ed.tar.gz
pleroma-8542d2efee86131350736a9be96713551e01f6ed.zip
Merge remote-tracking branch 'origin/develop' into feature/local-only-scope
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 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`.