aboutsummaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorrinpatch <rinpatch@sdf.org>2019-06-22 02:00:18 +0300
committerrinpatch <rinpatch@sdf.org>2019-06-22 02:00:18 +0300
commit452d5d32317ef204c465ea56c341c86ab59bd171 (patch)
treea9b612cf4ed8a422c421ef0c7613e9ef971b72ab /docs
parent743bd648832eb1fd6033c3484059c08f88af40f3 (diff)
parent55742d978d15bba75bcae9c6f2d91afbb77d0dc5 (diff)
downloadpleroma-452d5d32317ef204c465ea56c341c86ab59bd171.tar.gz
Merge branch 'develop' into release-docs
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 ed8e465c6..b75193545 100644
--- a/docs/config.md
+++ b/docs/config.md
@@ -90,6 +90,7 @@ config :pleroma, Pleroma.Emails.Mailer,
* `Pleroma.Web.ActivityPub.MRF.SubchainPolicy`: Selectively runs other MRF policies when messages match (see ``:mrf_subchain`` section)
* `Pleroma.Web.ActivityPub.MRF.RejectNonPublic`: Drops posts with non-public visibility settings (See ``:mrf_rejectnonpublic`` section)
* `Pleroma.Web.ActivityPub.MRF.EnsureRePrepended`: Rewrites posts to ensure that replies to posts with subjects do not have an identical subject and instead begin with re:.
+ * `Pleroma.Web.ActivityPub.MRF.AntiLinkSpamPolicy`: Rejects posts from likely spambots by rejecting posts from new users that contain links.
* `public`: Makes the client API in authentificated mode-only except for user-profiles. Useful for disabling the Local Timeline and The Whole Known Network.
* `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 this config or in ``static/config.json``