Merge branch 'master' into debian-jessie-backports

[git.ikiwiki.info.git] / doc / tips / spam_and_softwaresites.mdwn

diff --git a/doc/tips/spam_and_softwaresites.mdwn b/doc/tips/spam_and_softwaresites.mdwn
index 507858c0cca3f5a9b3bfd70f7a1f662896ec4048..f640b2faad7f8f658adb0cb660461bdf44aab066 100644 (file)
--- a/doc/tips/spam_and_softwaresites.mdwn
+++ b/doc/tips/spam_and_softwaresites.mdwn
@@ -1,3 +1,5 @@
+[[!meta date="2010-03-01 13:14:48 +0000"]]
+
 Any wiki with a form of web-editing enabled will have to deal with
 spam. (See the [[plugins/blogspam]] plugin for one defensive tool you
 can deploy).
@@ -34,7 +36,7 @@ branch. If there is, see 'erase spam from the commit history', below, first.
 
 Once you are confident it's clean:
 
-    # ensure you are on the doc branch
+    # ensure you are on the master branch
     $ git branch
       doc
     * master