aboutsummaryrefslogtreecommitdiffstats
path: root/doc/hidden_configs.bb
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2014-12-20 15:42:44 -0800
committerfriendica <info@friendica.com>2014-12-20 15:42:44 -0800
commit148f0eb4aed6fdbec62f50d87e6db0c8df35fe28 (patch)
tree16cbf075a0f3be7eb100ad9c44c70ebd9d44f3f5 /doc/hidden_configs.bb
parentce032531dc63e2be232477bca11bac3aa3dfe314 (diff)
parent9684d682aef5a3fb869498522a6740bb4d721839 (diff)
downloadvolse-hubzilla-148f0eb4aed6fdbec62f50d87e6db0c8df35fe28.tar.gz
volse-hubzilla-148f0eb4aed6fdbec62f50d87e6db0c8df35fe28.tar.bz2
volse-hubzilla-148f0eb4aed6fdbec62f50d87e6db0c8df35fe28.zip
Merge https://github.com/friendica/red into pending_merge
Diffstat (limited to 'doc/hidden_configs.bb')
-rw-r--r--doc/hidden_configs.bb2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/hidden_configs.bb b/doc/hidden_configs.bb
index afbac5e0d..727428176 100644
--- a/doc/hidden_configs.bb
+++ b/doc/hidden_configs.bb
@@ -25,7 +25,7 @@ This document assumes you're an administrator.
1 - check 3 octets
2 - check 2 octets
3 - check for any difference at all
- [b]system > protect_tag_hijacking[/b]
+ [b]system > prevent_tag_hijacking[/b]
Prevent foreign networks hijacking hashtags in your posts and directing them at its own resources.
[b]system > blocked[/b]
An array of xchans blocked by this channel. Technically, this is a