From 316f89e87f462608a5e63ba567ad549330f1456a Mon Sep 17 00:00:00 2001
From: Patrick Cloke <clokep@users.noreply.github.com>
Date: Mon, 24 May 2021 08:57:14 -0400
Subject: Enable experimental spaces by default. (#10011)

The previous spaces_enabled flag now defaults to true and
is exposed in the sample config.
---
 docs/sample_config.yaml | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

(limited to 'docs')

diff --git a/docs/sample_config.yaml b/docs/sample_config.yaml
index 2952f2ba32..f0f9f06a6e 100644
--- a/docs/sample_config.yaml
+++ b/docs/sample_config.yaml
@@ -2943,3 +2943,18 @@ redis:
   # Optional password if configured on the Redis instance
   #
   #password: <secret_password>
+
+
+# Enable experimental features in Synapse.
+#
+# Experimental features might break or be removed without a deprecation
+# period.
+#
+experimental_features:
+  # Support for Spaces (MSC1772), it enables the following:
+  #
+  # * The Spaces Summary API (MSC2946).
+  # * Restricting room membership based on space membership (MSC3083).
+  #
+  # Uncomment to disable support for Spaces.
+  #spaces_enabled: false
-- 
cgit 1.5.1