aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Willingham <beardyunixer@beardyunixer.com>2014-12-15 19:32:55 +0000
committerThomas Willingham <beardyunixer@beardyunixer.com>2014-12-15 19:32:55 +0000
commit3b343f8f6c7936aba93ed4a0b09a19086f18ae0d (patch)
tree10ffd650981ae247edb6602dbf1fb75008fe4bd7
parentc6d0695edff770863ea08e521e5a9961af3b2ef6 (diff)
parent723004a13ad6dac06d0d9d626c2ccc24103ab4f9 (diff)
downloadvolse-hubzilla-3b343f8f6c7936aba93ed4a0b09a19086f18ae0d.tar.gz
volse-hubzilla-3b343f8f6c7936aba93ed4a0b09a19086f18ae0d.tar.bz2
volse-hubzilla-3b343f8f6c7936aba93ed4a0b09a19086f18ae0d.zip
Merge branch 'master' of https://github.com/friendica/red
-rw-r--r--doc/hidden_configs.bb5
1 files changed, 4 insertions, 1 deletions
diff --git a/doc/hidden_configs.bb b/doc/hidden_configs.bb
index da5134123..41259d303 100644
--- a/doc/hidden_configs.bb
+++ b/doc/hidden_configs.bb
@@ -101,7 +101,10 @@ This document assumes you're an administrator.
[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)
+ Don't allow members to register channels with this comma separated
+ list of names (no spaces)
+ [b]system > auto_follow[/b]
+ Make the first channel of an account auto-follow channels listed here.
#include doc/macros/main_footer.bb;