aboutsummaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorAmitai Schlair <schmonz-web-ikiwiki@schmonz.com>2014-01-03 12:45:23 +0100
committerAmitai Schlair <schmonz-web-ikiwiki@schmonz.com>2014-01-03 12:46:12 +0100
commit6cb95579dfaf01e4713b44057b762fd71d522cdf (patch)
tree0aacfa06b8398eb64ea499d4dfe93468febdffb0 /doc
parentcd81b9f8b8cd3fe1c72792ae132c042065bfc523 (diff)
downloadikiwiki-6cb95579dfaf01e4713b44057b762fd71d522cdf.tar
ikiwiki-6cb95579dfaf01e4713b44057b762fd71d522cdf.tar.gz
Revert spam.
This reverts commit cd81b9f8b8cd3fe1c72792ae132c042065bfc523.
Diffstat (limited to 'doc')
-rw-r--r--doc/shortcuts.mdwn5
-rw-r--r--doc/spam_fighting.mdwn6
2 files changed, 7 insertions, 4 deletions
diff --git a/doc/shortcuts.mdwn b/doc/shortcuts.mdwn
index cce3508c5..b4f6d8ef4 100644
--- 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 73c7efcfc..6e04dcf8f 100644
--- 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 | ?
"""]]