aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon McVittie <smcv@debian.org>2015-01-10 11:23:05 +0000
committerSimon McVittie <smcv@debian.org>2015-01-10 11:23:05 +0000
commit67b0e22d3065ab01cd0635dabdbbad7bc739ed45 (patch)
tree8098d5b1d5eebcdfd037a97ade8758bf2b0b3b57
parent8b659301274ab0127b9a8e76b70c788cafe929ac (diff)
downloadikiwiki-67b0e22d3065ab01cd0635dabdbbad7bc739ed45.tar
ikiwiki-67b0e22d3065ab01cd0635dabdbbad7bc739ed45.tar.gz
despam
-rw-r--r--doc/blog.mdwn2
-rw-r--r--doc/bugs.mdwn3
-rw-r--r--doc/bugs/done.mdwn2
-rw-r--r--doc/plugins/attachment.mdwn6
-rw-r--r--doc/spam_fighting.mdwn7
5 files changed, 9 insertions, 11 deletions
diff --git a/doc/blog.mdwn b/doc/blog.mdwn
index 9de244c16..c4a379fdb 100644
--- a/doc/blog.mdwn
+++ b/doc/blog.mdwn
@@ -1,4 +1,4 @@
Ikiwiki allows turning any page into a weblog, by using the
[[ikiwiki/directive/inline]] [[ikiwiki/directive]]. For example:
-[.](http://www.mommyliciousmaternity.com/)
+
\[[!inline pages="blog/* and !*/Discussion" show="10" rootpage="blog"]]
diff --git a/doc/bugs.mdwn b/doc/bugs.mdwn
index b28ed5743..f16a4f8e1 100644
--- a/doc/bugs.mdwn
+++ b/doc/bugs.mdwn
@@ -1,7 +1,8 @@
If you've found a bug in ikiwiki, post about it here. [[TODO]] items go
elsewhere. Link items to [[bugs/done]] when done.
-Also see the [Debian bugs](http://bugs.debian.org/ikiwiki)[.](http://www.mommyliciousmaternity.com/collections/plus-size-maternity-dresses)
+Also see the [Debian bugs](http://bugs.debian.org/ikiwiki).
+
There are [[!pagecount pages="bugs/* and !bugs/done and !bugs/discussion and
!link(patch) and !link(bugs/done) and !bugs/*/*"
feedpages="created_after(bugs/no_commit_mails_for_new_pages)"]] "open" bugs:
diff --git a/doc/bugs/done.mdwn b/doc/bugs/done.mdwn
index 41fa9401a..0a666ab11 100644
--- a/doc/bugs/done.mdwn
+++ b/doc/bugs/done.mdwn
@@ -1,3 +1,3 @@
-recently fixed [[bugs]][.](http://www.mommyliciousmaternity.com/collections/plus-size-maternity-dresses)
+recently fixed [[bugs]]
[[!inline pages="link(bugs/done) and !bugs and !*/Discussion" sort=mtime show=10]]
diff --git a/doc/plugins/attachment.mdwn b/doc/plugins/attachment.mdwn
index 7cf7da6b4..4fcd714f8 100644
--- a/doc/plugins/attachment.mdwn
+++ b/doc/plugins/attachment.mdwn
@@ -1,7 +1,8 @@
[[!template id=plugin name=attachment core=0 author="[[Joey]]"]]
[[!tag type/web]]
-This plugin allows files to be uploaded to the wiki over the web
+This plugin allows files to be uploaded to the wiki over the web.
+
For each page `foo`, files in the subdirectory `foo/` are treated as
attachments of that page. Attachments can be uploaded and managed as
part of the interface for editing a page.
@@ -22,6 +23,5 @@ Bear in mind that if you let anyone upload a particular kind of file
If you enable this plugin, be sure to lock it down, via the
`allowed_attachments` setup file option. This is a special
[[enhanced_PageSpec|ikiwiki/pagespec/attachment]] using tests provided by
-the [[filecheck]][.](http://www.mommyliciousmaternity.com/collections/plus-size-maternity-dresses)
- plugin. That plugin will be automatically enabled when
+the [[filecheck]] plugin. That plugin will be automatically enabled when
this plugin is enabled.
diff --git a/doc/spam_fighting.mdwn b/doc/spam_fighting.mdwn
index 619f3543e..f95694076 100644
--- a/doc/spam_fighting.mdwn
+++ b/doc/spam_fighting.mdwn
@@ -32,9 +32,6 @@ c2924ce | 2014/01/02 | domtheo9110 | 182.253.51.174
cd81b9f | 2014/01/03 | domtheo9110 | ?
e3376ce | 2014/08/19 | Nng_L (OpenID) | 58.186.127.104
104c606 | 2014/08/19 | tlevine (OpenID) | 82.153.13.48
-4c7f247 | 2015/01/08 | lis (OpenID) | 122.173.219.54
-246678f | 2015/01/08 | lis (OpenID) | 122.173.219.54
-504a6b8 | 2015/01/08 | lis (OpenID) | 122.173.219.54
-b500d89 | 2015/01/08 | lis (OpenID) | 122.173.219.54
-3ae8a75 | 2015/01/08 | lis (OpenID) | 122.173.219.54
+4c7f247 and 4 more | 2015/01/08 | lis (OpenID) | 122.173.219.54
+eb526e9 and 5 more | 2015/01/10 | loveneet (OpenID) | 122.173.133.14
"""]]