From: Dessalines <dessalines@users.noreply.github.com>
Date: Fri, 16 Oct 2020 20:46:40 +0000 (-0400)
Subject: Adding some comments to defaults.hjson (#1207)
X-Git-Url: http://these/git/readmes/README.ja.md?a=commitdiff_plain;h=37f616bad2b21481fc9cabcc1d83ada84fd6e7eb;p=lemmy.git

Adding some comments to defaults.hjson (#1207)

* Adding some comments to defaults.hjson

* Link to docs for allow/blocklist.
---

diff --git a/config/config.hjson b/config/config.hjson
index 96eff45d..286b1c03 100644
--- a/config/config.hjson
+++ b/config/config.hjson
@@ -1,4 +1,3 @@
 {
   hostname: "localhost:8536"
-  federation_enabled: true
-}
\ No newline at end of file
+}
diff --git a/config/defaults.hjson b/config/defaults.hjson
index 62fa98a6..0368500b 100644
--- a/config/defaults.hjson
+++ b/config/defaults.hjson
@@ -58,8 +58,11 @@
   }
   # settings related to activitypub federation
   federation: {
-    # whether to enable activitypub federation. this feature is in alpha, do not enable in production.
+    # whether to enable activitypub federation. 
     enabled: false
+    # Allows and blocks are described here:
+    # https://dev.lemmy.ml/docs/administration_federation.html#instance-allowlist-and-blocklist
+    #
     # comma separated list of instances with which federation is allowed
     allowed_instances: ""
     # comma separated list of instances which are blocked from federating