aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLouise Crow <louise.crow@gmail.com>2014-09-22 16:41:24 +0100
committerLouise Crow <louise.crow@gmail.com>2014-10-09 15:52:59 +0100
commitb3db714729316238f314d995355d93439cee448f (patch)
tree22cadfa0e8c1c3288ca646b8e85ae81bde47bb2e
parentd8b1e0da0ad21967c31ae99436bb01f317958417 (diff)
Use 'admin interface' instead of 'admin tool'
-rw-r--r--docs/running/admin_manual.md4
1 files changed, 4 insertions, 0 deletions
diff --git a/docs/running/admin_manual.md b/docs/running/admin_manual.md
index 2420c0a2f..03380aa22 100644
--- a/docs/running/admin_manual.md
+++ b/docs/running/admin_manual.md
@@ -346,7 +346,11 @@ The message will now be associated with the correct request and will appear on t
### Banning a user
+<<<<<<< HEAD
You may wish to completely ban a user from the website (such as a spammer or troll for example). You need to log into the admin interface at `/admin`. On the top row of links, locate and click on ‘Users’.
+=======
+You may wish to completely ban a user from the website (such as a spammer or troll for example). You need to log into the admin interface at `admin`. On the top row of links, locate and click on ‘Users’.
+>>>>>>> 5ad8992... Use 'admin interface' instead of 'admin tool'
Find the user you wish to ban on the list and click on their name. Once on the user page, select ‘edit’.