Revert spam.

This reverts commit cd81b9f8b8cd3fe1c72792ae132c042065bfc523.

diff --git a/doc/shortcuts.mdwn b/doc/shortcuts.mdwn
index cce3508c55046041cef4f650c5ad44a3822456f6..b4f6d8ef47b4fb0ec1a067743c8732c6eb6f7d24 100644 (file)
--- a/doc/shortcuts.mdwn
+++ b/doc/shortcuts.mdwn
@@ -78,5 +78,6 @@ with an existing directive.  These directives also accept a `desc`
 parameter that will override the one provided at definition time.
 
 If you come up with a shortcut that you think others might find useful,
-consider contributing it to the [Glutera](http://www.grosir-kosmetik.com/62-glutera.html), so that future versions of
-ikiwiki will [Cotton sliver](http://www.mitracatur.com/product/cotton-sliver) and [Absorbent cotton](http://www.mitracatur.com/product/absorbent-cotton) include your shortcut in the standard underlay.
+consider contributing it to the [shortcuts page on the ikiwiki
+wiki](http://ikiwiki.info/shortcuts/), so that future versions of
+ikiwiki will include your shortcut in the standard underlay.

diff --git a/doc/spam_fighting.mdwn b/doc/spam_fighting.mdwn
index 73c7efcfceff00ea2753231ebd9078b793be4fac..6e04dcf8f40ee4a060cefbce7ab7ce4f591ae580 100644 (file)
--- a/doc/spam_fighting.mdwn
+++ b/doc/spam_fighting.mdwn
@@ -10,8 +10,9 @@ to the setup branch in git to be able to update the ban list, get in touch
 with joey with a ssh public key. Once your key is added, you will be able
 to edit the ikiwiki.setup file on the setup branch, and push changes.
 You will also be able to access the recent web server logs to find IP
-addresses from recent web edits, by running: `ssh b-ikiwiki@ikiwiki.info
-logdump | grep 'GET .*\?updated HTTP\/' > access.log`.
+addresses from recent web edits, by running:
+
+    ssh b-ikiwiki@ikiwiki.info logdump | grep 'GET .*\?updated HTTP\/' > access.log
 
 ## Spam commits
 
@@ -28,4 +29,5 @@ d759052 | 2013/09/08 | spain1001 | 80.187.106.2
 cba01c2 | 2013/09/15 | spain1001 | 80.187.106.136
 702a3e5 | 2014/01/02 | Toni      | 124.105.173.121
 c2924ce | 2014/01/02 | domtheo9110 | 182.253.51.174
+cd81b9f | 2014/01/03 | domtheo9110 | ?
 """]]