aboutsummaryrefslogtreecommitdiff
path: root/docs/configuration/cheatsheet.md
diff options
context:
space:
mode:
authorrinpatch <rinpatch@sdf.org>2020-09-14 15:19:09 +0000
committerrinpatch <rinpatch@sdf.org>2020-09-14 15:19:09 +0000
commit39d769f25057dbaf89dc23d39941780bc65c2b06 (patch)
tree3f97dd0896244b88d337921a374a6df60fd76831 /docs/configuration/cheatsheet.md
parent6e70415e4a1d814d2b772d94658d9f7b66d1fe89 (diff)
parent0b5e72ecf033ff78c67eb4e5a68277e5d83f5611 (diff)
downloadpleroma-39d769f25057dbaf89dc23d39941780bc65c2b06.tar.gz
Merge branch 'remove/managed-config-option' into 'develop'
Remove `:managed_config` option. Closes #2086 See merge request pleroma/pleroma!2983
Diffstat (limited to 'docs/configuration/cheatsheet.md')
-rw-r--r--docs/configuration/cheatsheet.md1
1 files changed, 0 insertions, 1 deletions
diff --git a/docs/configuration/cheatsheet.md b/docs/configuration/cheatsheet.md
index 0c5d17ce3..054b8fe43 100644
--- a/docs/configuration/cheatsheet.md
+++ b/docs/configuration/cheatsheet.md
@@ -40,7 +40,6 @@ To add configuration to your config file, you can copy it from the base config.
* `allow_relay`: Enable Pleroma’s Relay, which makes it possible to follow a whole instance.
* `public`: Makes the client API in authenticated mode-only except for user-profiles. Useful for disabling the Local Timeline and The Whole Known Network. Note that there is a dependent setting restricting or allowing unauthenticated access to specific resources, see `restrict_unauthenticated` for more details.
* `quarantined_instances`: List of ActivityPub instances where private (DMs, followers-only) activities will not be send.
-* `managed_config`: Whenether the config for pleroma-fe is configured in [:frontend_configurations](#frontend_configurations) or in ``static/config.json``.
* `allowed_post_formats`: MIME-type list of formats allowed to be posted (transformed into HTML).
* `extended_nickname_format`: Set to `true` to use extended local nicknames format (allows underscores/dashes). This will break federation with
older software for theses nicknames.