Merge branch 'master' into 1.0.x

[quix0rs-gnu-social.git] / CONFIGURE

diff --git a/CONFIGURE b/CONFIGURE
index 285ccd11b350bfb26c2f926c9473ba8912237383..c5fac78730c88358833c5b9ccb9a1b0efe3e795c 100644 (file)
--- a/CONFIGURE
+++ b/CONFIGURE
@@ -859,3 +859,12 @@ performance
 high: if you need high performance, or if you're seeing bad
       performance, set this to true. It will turn off some high-intensity code from
       the site.
+
+oldschool
+---------
+
+enabled: enable certain old-style user settings options, like stream-only mode,
+        conversation trees, and nicknames in streams. Off by default, and
+        may not be well supported in future versions.
+
+