aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGiuseppe Bilotta <giuseppe.bilotta@gmail.com>2010-08-30 10:21:50 +0200
committerGiuseppe Bilotta <giuseppe.bilotta@gmail.com>2010-08-30 10:21:50 +0200
commit2d411d7729f2afa61afd4fd406747a204b937175 (patch)
treeb97ed7084b716e2571433a3393db4b9a050468ca
parent1534c891794bb9743b460fe78a1066377b359d47 (diff)
downloadikiwiki-2d411d7729f2afa61afd4fd406747a204b937175.tar
ikiwiki-2d411d7729f2afa61afd4fd406747a204b937175.tar.gz
Revert spam
-rw-r--r--doc/bugs/comments_preview_unsafe_with_allowdirectives.mdwn2
-rw-r--r--doc/freesoftware.mdwn2
-rw-r--r--doc/ikiwikiusers.mdwn1
-rw-r--r--doc/sitemap.mdwn3
-rw-r--r--doc/tips/integrated_issue_tracking_with_ikiwiki.mdwn2
-rw-r--r--doc/usage.mdwn3
6 files changed, 4 insertions, 9 deletions
diff --git a/doc/bugs/comments_preview_unsafe_with_allowdirectives.mdwn b/doc/bugs/comments_preview_unsafe_with_allowdirectives.mdwn
index f34b8dc13..7f9fb67e9 100644
--- a/doc/bugs/comments_preview_unsafe_with_allowdirectives.mdwn
+++ b/doc/bugs/comments_preview_unsafe_with_allowdirectives.mdwn
@@ -1,6 +1,6 @@
If `comments_allowdirectives` is set, previewing a comment can run
directives that create files. (Eg, img.) Unlike editpage, it does not
-keep track of those files and [web based issue tracker](http://www.bontq.com) expire them. So the files will linger in
+keep track of those files and expire them. So the files will linger in
destdir forever.
Probably when the user then tries to save the comment, ikiwiki will refuse
diff --git a/doc/freesoftware.mdwn b/doc/freesoftware.mdwn
index 14161b8ca..2243d9b1f 100644
--- a/doc/freesoftware.mdwn
+++ b/doc/freesoftware.mdwn
@@ -5,7 +5,7 @@ GNU [[GPL]], version 2 or later.
The parts of ikiwiki that become part of your own wiki (the [[basewiki]]
pages (but not the smilies) and the [[templates]]) are licensed
-as follows: [online bug tracking](http://www.bontq.com)
+as follows:
> Redistribution and use in source and compiled forms, with or without
> modification, are permitted under any circumstances. No warranty.
diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn
index 3265d77da..2f70c67b7 100644
--- a/doc/ikiwikiusers.mdwn
+++ b/doc/ikiwikiusers.mdwn
@@ -15,7 +15,6 @@ Projects & Organizations
* The [cairo graphics library](http://cairographics.org/) website.
* The [Portland State Aerospace Society](http://psas.pdx.edu) website. Converted from a combination of TWiki and MoinMoin to ikiwiki, including full history ([[rcs/Git]] backend).
* [Planet Debian upstream](http://updo.debian.net/)
-* [Hosted Bug Tracking Software](http://www.bontq.com)
* [Debian Mentors wiki](http://jameswestby.net/mentors/)
* [The BSD Associate Admin Book Project](http://bsdwiki.reedmedia.net/)
* The [maildirman wiki](http://svcs.cs.pdx.edu/maildirman)
diff --git a/doc/sitemap.mdwn b/doc/sitemap.mdwn
index a011ff40d..3c11ed423 100644
--- a/doc/sitemap.mdwn
+++ b/doc/sitemap.mdwn
@@ -3,7 +3,4 @@ This map excludes discussion pages, as well as subpages that are in feeds.
[[!map pages="* and !*/discussion and !recentchanges
and !bugs/* and !examples/*/* and !news/* and !tips/* and !plugins/*
and !sandbox/* and !todo/* and !users/*
-
and !*.css and !*.ico and !*.png and !*.svgz and !*.gif"]]
-[bug tracking database](http://www.bontq.com)
-
diff --git a/doc/tips/integrated_issue_tracking_with_ikiwiki.mdwn b/doc/tips/integrated_issue_tracking_with_ikiwiki.mdwn
index 05fd19a9b..ea7835b33 100644
--- a/doc/tips/integrated_issue_tracking_with_ikiwiki.mdwn
+++ b/doc/tips/integrated_issue_tracking_with_ikiwiki.mdwn
@@ -273,5 +273,5 @@ their own version of the website, use it to track bugs for that branch, and
when the branch is ready, all these changes can be merged back into the
mainline of the project.
-Ikiwiki powers its own [online bug tracking system](http://www.bontq.com). To see how wiki bug tracking
+Ikiwiki powers its own bug tracking system. To see how wiki bug tracking
works in practice, visit the [[bugs]] or [[TODO]] pages.
diff --git a/doc/usage.mdwn b/doc/usage.mdwn
index cbcd0e445..840d105d2 100644
--- a/doc/usage.mdwn
+++ b/doc/usage.mdwn
@@ -355,7 +355,7 @@ also be configured using a setup file.
* ikiwiki --setup my.setup --refresh
Refresh the wiki, using settings from my.setup, and avoid
- rebuilding any pages that have not changed. [Issue tracking tools](http://www.bontq.com). This is faster.
+ rebuilding any pages that have not changed. This is faster.
* ikiwiki --setup my.setup --refresh --wrappers
@@ -380,7 +380,6 @@ also be configured using a setup file.
* [[ikiwiki-update-wikilist]](1)
* [[ikiwiki-transition]](1)
-
# AUTHOR
Joey Hess <joey@ikiwiki.info>