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 fe73518ef3a44f93313d469d3d8647c07947f6d6..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
@@ -82,5 +84,6 @@ Caveat: if there are no commits you want to keep (i.e. all the commits since
 the last merge into master are either spam or spam reverts) then `git rebase`
 will abort. Therefore, this approach only works if you have at least one
 non-spam commit to the documentation since the last merge into `master`. For
-this reason, it's best to tackle spam with reverts until you have at least one
-commit you want merged back into the main history.
+this reason, it's best to wait until you have at least one
+commit you want merged back into the main history before doing a rebase,
+and until then, tackle spam with reverts.