Despam, again. Someone ban adrianna please?

diff --git a/doc/features.mdwn b/doc/features.mdwn
index c119dae974c15e20c05d4d79df35e736e3c03cc5..3925d78ef41089dd3cc5dc1c93f957adff6bc340 100644 (file)
--- a/doc/features.mdwn
+++ b/doc/features.mdwn
@@ -125,7 +125,7 @@ yours when you commit.
 In the rare cases where automatic merging fails due to the same part of a
 page being concurrently edited, regular commit conflict markers are
 shown in the file to resolve the conflict, so if you're already familiar
-with that there's no new commit [order essays](http://custom-paper-writing.com/order) marker syntax to learn.
+with that there's no new commit marker syntax to learn.
 
 ### [[RecentChanges]], editing pages in a web browser
 
@@ -158,7 +158,7 @@ since page edit controls can be changed via plugins.
 
 ### [[PageHistory]]
 
-Well, sorta. Rather than implementing YA history browser [essay writing companies](http://essaywritingservices.org/custom-essay-writing.php), it can link to
+Well, sorta. Rather than implementing YA history browser, it can link to
 [[ViewVC]] or the like to browse the history of a wiki page.
 
 ### Full text search

diff --git a/doc/security.mdwn b/doc/security.mdwn
index a06f3a37fe6bc8866e1d2df97f1ed9dce20358ad..21aef316bcbddb8773aa335c79bd9ce1c036e4e3 100644 (file)
--- a/doc/security.mdwn
+++ b/doc/security.mdwn
@@ -376,7 +376,7 @@ parties.
 Cross Site Request Forging could be used to constuct a link that would
 change a logged-in user's password or other preferences if they clicked on
 the link. It could also be used to construct a link that would cause a wiki
-page [order essay](http://custom-paper-writing.com/order) to be modified by a logged-in user. ([[!cve CVE-2008-0165]])
+page to be modified by a logged-in user. ([[!cve CVE-2008-0165]])
 
 These holes were discovered on 10 April 2008 and fixed the same day with
 the release of ikiwiki 2.42. A fix was also backported to Debian etch, as
@@ -415,7 +415,7 @@ can cause it to crash. This can potentially be used for a denial of service
 attack.
 
 intrigeri discovered this problem on 12 Nov 2008 and a patch put in place
-later that day, in version 2.70. The fix was backported [write my essay](http://custom-essay-writing-service.org/faq.php) to testing as version
+later that day, in version 2.70. The fix was backported to testing as version
 2.53.3, and to stable as version 1.33.7.
 
 ## Insufficient blacklisting in teximg plugin

diff --git a/doc/setup.mdwn b/doc/setup.mdwn
index 4ad64d73b06639f9f984699b7afb8a2ea58422a4..2d4da553615cc52c71c053e81dd23b8deeafa3a7 100644 (file)
--- a/doc/setup.mdwn
+++ b/doc/setup.mdwn
@@ -105,7 +105,7 @@ After making changes to this file, you need to tell ikiwiki to use it:
 ## Customizing file locations
 
 As a wiki compiler, ikiwiki builds a wiki from files in a source directory,
-and outputs the files to a destination directory [write my essay](http://custom-essay-writing-service.org/faq.php). The source directory is
+and outputs the files to a destination directory. The source directory is
 a working copy checked out from the version control system repository.
 
 When you used `auto.setup`, ikiwiki put the source directory, destination
@@ -118,7 +118,7 @@ First, move the destination directory and repository around.
        % mv public_html/foo /srv/web/foo.com
        % mv foo.git /srv/git/foo.git
 
-If you moved the repository to a new location [buy reports](http://essaywritingservices.org/book-report.php), checkouts pointing at the
+If you moved the repository to a new location, checkouts pointing at the
 old location won't work, and the easiest way to deal with this is to delete
 them and re-checkout from the new repository location.
    

diff --git a/doc/shortcuts.mdwn b/doc/shortcuts.mdwn
index f33dfb6b65bb6f8dd337e48a8a1fc45fdbdc2b94..54dd0fdb1eadfac386b31b2dd2f014349a54184a 100644 (file)
--- a/doc/shortcuts.mdwn
+++ b/doc/shortcuts.mdwn
@@ -49,7 +49,7 @@ This page controls what shortcut links the wiki supports.
 * [[!shortcut name=emacswiki url="http://www.emacswiki.org/cgi-bin/wiki/%s"]]
 * [[!shortcut name=haskellwiki url="http://haskell.org/haskellwiki/%s"]]
 * [[!shortcut name=dict url="http://www.dict.org/bin/Dict?Form=Dict1&Strategy=*&Database=*&Query=%s"]]
-* [[!shortcut name=imdb url="http://imdb.com/find?q=%s"]]  
+* [[!shortcut name=imdb url="http://imdb.com/find?q=%s"]]
 * [[!shortcut name=gpg url="http://pgpkeys.mit.edu:11371/pks/lookup?op=vindex&exact=on&search=0x%s"]]
 * [[!shortcut name=perldoc url="http://perldoc.perl.org/search.html?q=%s"]]
 * [[!shortcut name=whois url="http://reports.internic.net/cgi/whois?whois_nic=%s&type=domain"]]
@@ -65,13 +65,13 @@ This page controls what shortcut links the wiki supports.
 To add a new shortcut, use the `shortcut`
 [[ikiwiki/directive]]. In the url, "%s" is replaced with the
 text passed to the named shortcut, after [[!wikipedia url_encoding]]
-it, and '%S' is replaced with the raw, non-encoded text [custom writing company](http://essaywritingservices.org/custom-essay-writing.php). The optional
+it, and '%S' is replaced with the raw, non-encoded text. The optional
 `desc` parameter controls the description of the link.
 
 Remember that the `name` you give the shortcut will become a new
 [[ikiwiki/directive]].  Avoid using a `name` that conflicts
 with an existing directive.  These directives also accept a `desc`
-parameter that will override [certified resume writer](http://cvresumewriters.com/onlineresume.php) the one provided at definition time.
+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 [shortcuts page on the ikiwiki