Merge https://github.com/friendica/red into pending_merge

1 files changed, 2 insertions, 0 deletions

diff --git a/doc/hidden_configs.bb b/doc/hidden_configs.bb
index 7b7a688c4..da5134123 100644
--- a/doc/hidden_configs.bb
+++ b/doc/hidden_configs.bb
@@ -100,6 +100,8 @@ This document assumes you're an administrator.
         the main logs as well.
     [b]system > hide_in_statistics[/b]
         Tell the red statistics servers to completely hide this hub in hub lists.
+    [b]system > reserved_channels[/b]
+        Don't allow members to register channels with this comma separated list of names (no spaces)
 	
 #include doc/macros/main_footer.bb;