From 63946a6af38642a9b22c5026df5034d9191a8dfe Mon Sep 17 00:00:00 2001
From: squidboi <squidboi@waifu.club>
Date: Sat, 16 Jun 2018 16:33:52 -0700
Subject: [PATCH] added info about block configuration to CONFIGURATION.md

---
 CONFIGURATION.md | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/CONFIGURATION.md b/CONFIGURATION.md
index 4174dd114..ab0c02211 100644
--- a/CONFIGURATION.md
+++ b/CONFIGURATION.md
@@ -13,6 +13,23 @@ 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.