X-Git-Url: https://git.squeep.com/?a=blobdiff_plain;f=CONFIGURATION.md;h=3f0ecafb5c514eaa268a8a4c40831568b80b0e91;hb=b06e61bc4ea0a0b4c8e8ff9e4469b6def7e13932;hp=95eb2cab59cf8104eab034d00678a8f7c80beb60;hpb=01b2dc19cc94ee0e81b7595cc06d92e31253c271;p=akkoma

diff --git a/CONFIGURATION.md b/CONFIGURATION.md
index 95eb2cab5..3f0ecafb5 100644
--- a/CONFIGURATION.md
+++ b/CONFIGURATION.md
@@ -1,14 +1,35 @@
 # Configuring Pleroma
 
 In the `config/` directory, you will find the following relevant files:
+
 * `config.exs`: default base configuration
 * `dev.exs`: default additional configuration for `MIX_ENV=dev`
 * `prod.exs`: default additional configuration for `MIX_ENV=prod`
 
-Additionally, you can overload options in the following files:
+
+Do not modify files in the list above.
+Instead, overload the settings by editing the following files:
+
 * `dev.secret.exs`: custom additional configuration for `MIX_ENV=dev`
 * `prod.secret.exs`: custom additional configuration for `MIX_ENV=prod`
 
+## Block functionality
+
+    config :pleroma, :activitypub,
+      accept_blocks: true,
+      unfollow_blocked: true,
+      outgoing_blocks: true
+
+    config :pleroma, :user, deny_follow_blocked: true
+
+* `accept_blocks`: whether to accept incoming block activities from
+   other instances
+* `unfollow_blocked`: whether blocks result in people getting
+   unfollowed
+* `outgoing_blocks`: whether to federate blocks to other instances
+* `deny_follow_blocked`: whether to disallow following an account that
+   has blocked the user in question
+
 ## Message Rewrite Filters (MRFs)
 
 Modify incoming and outgoing posts.
@@ -16,14 +37,17 @@ Modify incoming and outgoing posts.
     config :pleroma, :instance,
       rewrite_policy: Pleroma.Web.ActivityPub.MRF.NoOpPolicy
 
-`rewrite_policy` specifies which MRF policies to apply. It can either be a single policy or a list of policies.
+`rewrite_policy` specifies which MRF policies to apply.
+It can either be a single policy or a list of policies.
 Currently, MRFs availible by default are:
+
 * `Pleroma.Web.ActivityPub.MRF.NoOpPolicy`
 * `Pleroma.Web.ActivityPub.MRF.DropPolicy`
 * `Pleroma.Web.ActivityPub.MRF.SimplePolicy`
 * `Pleroma.Web.ActivityPub.MRF.RejectNonPublic`
 
-Some policies, such as SimplePolicy and RejectNonPublic, can be additionally configured in their respective sections.
+Some policies, such as SimplePolicy and RejectNonPublic,
+can be additionally configured in their respective sections.
 
 ### NoOpPolicy
 
@@ -31,22 +55,28 @@ Does not modify posts (this is the default `rewrite_policy`)
 
 ### DropPolicy
 
-Drops all posts. It generally does not make sense to use this in production.
+Drops all posts.
+It generally does not make sense to use this in production.
 
 ### SimplePolicy
 
-Versatile policy for applying effects to posts from certain instances.
+Restricts the visibility of posts from certain instances.
 
     config :pleroma, :mrf_simple,
       media_removal: [],
       media_nsfw: [],
       federated_timeline_removal: [],
-      reject: []
-
-* `media_removal`: posts from these instances will have attachments removed
-* `media_nsfw`: posts from these instances will have attachments marked as nsfw
-* `federated_timeline_removal`: posts from these instances will be marked as unlisted
+      reject: [],
+      accept: []
+
+* `media_removal`: posts from these instances will have attachments 
+   removed
+* `media_nsfw`: posts from these instances will have attachments marked
+   as nsfw
+* `federated_timeline_removal`: posts from these instances will be 
+   marked as unlisted
 * `reject`: posts from these instances will be dropped
+* `accept`: if not empty, only posts from these instances will be accepted
 
 ### RejectNonPublic
 
@@ -56,5 +86,6 @@ Drops posts with non-public visibility settings.
       allow_followersonly: false,
       allow_direct: false,
 
-* `allow_followersonly`: whether to allow follower-only posts through the filter
+* `allow_followersonly`: whether to allow follower-only posts through
+   the filter
 * `allow_direct`: whether to allow direct messages through the filter