From: Joey Hess <joey@kitenet.net>
Date: Sun, 11 Aug 2013 12:58:54 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info
X-Git-Tag: 3.20130904~39
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/63078f2e4f145f8e14e281ed1eb265a67b87b9ea?hp=854588d33d9cbfa13503bdc988961f17197669e1

Merge branch 'master' of ssh://git.ikiwiki.info
---

diff --git a/doc/git.mdwn b/doc/git.mdwn
index b86132ed2..71f7eb54b 100644
--- a/doc/git.mdwn
+++ b/doc/git.mdwn
@@ -13,7 +13,7 @@ rejected.
 The gitweb is [here](http://source.ikiwiki.branchable.com/?p=source.git;a=summary).
 
 Commits to this git repository are fed into [KGB](http://kgb.alioth.debian.org/)
-for transmission to the #ikiwiki irc channel.
+for transmission to the #ikiwiki irc channel. See also: [[spam_fighting]]
 
 ## personal git repositories
 
diff --git a/doc/spam_fighting.mdwn b/doc/spam_fighting.mdwn
new file mode 100644
index 000000000..c6a7b8b2a
--- /dev/null
+++ b/doc/spam_fighting.mdwn
@@ -0,0 +1,10 @@
+ikiwiki.info is occasionally attacked by persistent spammers who keep
+making changes. Anyone can revert spam changes, and several people do.
+
+If you find a spammer, and revert their spam, please post a link to the
+spam commit here. After review, these can be used to ban spammers by login,
+or for the really persistent ones, by IP (or even IP range).
+
+If you're a trusted member of the ikiwiki community and would like access
+to the setup branch in git to be able to update the ban list, get in touch
+with joey with a ssh public key.