only_committed_changes could fail in a git repository merged with git merge -s ours.

[git.ikiwiki.info.git] / doc / banned_users.mdwn

diff --git a/doc/banned_users.mdwn b/doc/banned_users.mdwn
index 11e744b109ad927efb8c58fa55e856dd9125035a..c44f8c587fd12af58e0f0e0275e76d7123b2b57b 100644 (file)
--- a/doc/banned_users.mdwn
+++ b/doc/banned_users.mdwn
@@ -1,6 +1,10 @@
-Wiki admins can ban users via their Preferences.
+Banned users can be configured in the setup file via the `banned_users`
+setting. This is a list of user names, or [[PageSpecs|ikiwiki/PageSpec]]
+to ban. Using a PageSpec is useful to block an IP address.

 
 

-The list of banned users is space delimited.
+For example:
+
+       banned_users => ['evilspammer', 'ip(192.168.1.1)'],

 
 If a banned user attempts to use the ikiwiki CGI, they will receive a 403
 Forbidden webpage indicating they are banned.
 
 If a banned user attempts to use the ikiwiki CGI, they will receive a 403
 Forbidden webpage indicating they are banned.