aboutsummaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorMark Felder <feld@FreeBSD.org>2019-07-09 10:18:30 -0500
committerMark Felder <feld@FreeBSD.org>2019-07-09 10:18:30 -0500
commit31a59d6f23d66f0f4221d2f036e727f22da17615 (patch)
tree230fcd3e5a02433c8f14dd40e0217cfcad54b02c /docs
parent98f13eac9e38c6ec44a7146cfc58114b0148f462 (diff)
parent376a55c97fcf178abec3091db830215642bf23c1 (diff)
downloadpleroma-31a59d6f23d66f0f4221d2f036e727f22da17615.tar.gz
Merge branch 'develop' into proxy-error
Diffstat (limited to 'docs')
-rw-r--r--docs/config.md1
1 files changed, 1 insertions, 0 deletions
diff --git a/docs/config.md b/docs/config.md
index 8afccb228..822c34c51 100644
--- a/docs/config.md
+++ b/docs/config.md
@@ -87,6 +87,7 @@ config :pleroma, Pleroma.Emails.Mailer,
* `invites_enabled`: Enable user invitations for admins (depends on `registrations_open: false`).
* `account_activation_required`: Require users to confirm their emails before signing in.
* `federating`: Enable federation with other instances
+* `federation_incoming_replies_max_depth`: Max. depth of reply-to activities fetching on incoming federation, to prevent out-of-memory situations while fetching very long threads. If set to `nil`, threads of any depth will be fetched. Lower this value if you experience out-of-memory crashes.
* `federation_reachability_timeout_days`: Timeout (in days) of each external federation target being unreachable prior to pausing federating to it.
* `allow_relay`: Enable Pleroma’s Relay, which makes it possible to follow a whole instance
* `rewrite_policy`: Message Rewrite Policy, either one or a list. Here are the ones available by default: