aboutsummaryrefslogtreecommitdiffstats
path: root/doc/hidden_configs.bb
diff options
context:
space:
mode:
authorStefan Parviainen <saparvia@caterva.eu>2014-12-21 09:50:47 +0100
committerStefan Parviainen <saparvia@caterva.eu>2014-12-21 09:50:47 +0100
commit4e5118650225fe0e194ac8164c47916575e898b3 (patch)
tree22e1676a173167b6f340fa8826a184d9efe9479b /doc/hidden_configs.bb
parentd1f53511921afce820d73eb2d2924e2a4aa8ba14 (diff)
parent148f0eb4aed6fdbec62f50d87e6db0c8df35fe28 (diff)
downloadvolse-hubzilla-4e5118650225fe0e194ac8164c47916575e898b3.tar.gz
volse-hubzilla-4e5118650225fe0e194ac8164c47916575e898b3.tar.bz2
volse-hubzilla-4e5118650225fe0e194ac8164c47916575e898b3.zip
Merge remote-tracking branch 'upstream/master' into autocomplete
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