From 38003fe23a8358f08d22bc5f85c087e5f329e7e9 Mon Sep 17 00:00:00 2001 From: "http://k1024.org/~iusty/" Date: Sun, 29 Aug 2010 21:59:36 +0000 Subject: Add comment on the cleanup spam section --- doc/tips/spam_and_softwaresites/discussion.mdwn | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 doc/tips/spam_and_softwaresites/discussion.mdwn (limited to 'doc') diff --git a/doc/tips/spam_and_softwaresites/discussion.mdwn b/doc/tips/spam_and_softwaresites/discussion.mdwn new file mode 100644 index 000000000..21f0a5d7e --- /dev/null +++ b/doc/tips/spam_and_softwaresites/discussion.mdwn @@ -0,0 +1,8 @@ +In the cleanup spam section: + +> Caveat: if there are no commits you want to keep (i.e. all the commits since the last merge into master are either spam or spam reverts) then git rebase will abort. + +Wouldn't it be enough then to use `git reset --hard` to the desired last good commit? + +regards, +iustin -- cgit v1.2.3 From d478b31cf50351b45d02ee64a8c51c08ad9f870f Mon Sep 17 00:00:00 2001 From: "https://me.yahoo.com/a/2.Pjpm0G0Z6F9LiGW4cYO84pIrb.Lg--#137de" Date: Mon, 30 Aug 2010 07:32:49 +0000 Subject: --- doc/tips/integrated_issue_tracking_with_ikiwiki.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/tips/integrated_issue_tracking_with_ikiwiki.mdwn b/doc/tips/integrated_issue_tracking_with_ikiwiki.mdwn index ea7835b33..05fd19a9b 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 bug tracking system. To see how wiki bug tracking +Ikiwiki powers its own [online bug tracking system](http://www.bontq.com). To see how wiki bug tracking works in practice, visit the [[bugs]] or [[TODO]] pages. -- cgit v1.2.3 From f84e695f426d4ad7d5c88d3632d6d7e5bc31dd85 Mon Sep 17 00:00:00 2001 From: "https://me.yahoo.com/a/2.Pjpm0G0Z6F9LiGW4cYO84pIrb.Lg--#137de" Date: Mon, 30 Aug 2010 07:39:35 +0000 Subject: --- doc/index.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/index.mdwn b/doc/index.mdwn index 06acc9cec..49a1f069d 100644 --- a/doc/index.mdwn +++ b/doc/index.mdwn @@ -22,7 +22,7 @@ ikiwiki [[!version ]]. The [[RoadMap]] describes where the project is going. The [[forum]] is open for discussions. [[Bugs]], [[TODO]] items, [[wishlist]] items, and [[patches|patch]] -can be submitted and tracked using this wiki. +can be submitted and [bug tracked](http://www.bontq.com) using this wiki. Ikiwiki is developed by [[Joey]] and many contributors, and is [[FreeSoftware]]. -- cgit v1.2.3 From ee68e8b8b9c608b2531771fe04bdb17c18c2d067 Mon Sep 17 00:00:00 2001 From: "https://me.yahoo.com/a/2.Pjpm0G0Z6F9LiGW4cYO84pIrb.Lg--#137de" Date: Mon, 30 Aug 2010 07:42:22 +0000 Subject: --- doc/bugs/comments_preview_unsafe_with_allowdirectives.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/bugs/comments_preview_unsafe_with_allowdirectives.mdwn b/doc/bugs/comments_preview_unsafe_with_allowdirectives.mdwn index 7f9fb67e9..f34b8dc13 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 expire them. So the files will linger in +keep track of those files and [web based issue tracker](http://www.bontq.com) expire them. So the files will linger in destdir forever. Probably when the user then tries to save the comment, ikiwiki will refuse -- cgit v1.2.3 From dafdfb621897f1797e77f9d5b0bdba9ad87744d2 Mon Sep 17 00:00:00 2001 From: "https://me.yahoo.com/a/2.Pjpm0G0Z6F9LiGW4cYO84pIrb.Lg--#137de" Date: Mon, 30 Aug 2010 07:43:28 +0000 Subject: --- doc/index.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/index.mdwn b/doc/index.mdwn index 49a1f069d..06acc9cec 100644 --- a/doc/index.mdwn +++ b/doc/index.mdwn @@ -22,7 +22,7 @@ ikiwiki [[!version ]]. The [[RoadMap]] describes where the project is going. The [[forum]] is open for discussions. [[Bugs]], [[TODO]] items, [[wishlist]] items, and [[patches|patch]] -can be submitted and [bug tracked](http://www.bontq.com) using this wiki. +can be submitted and tracked using this wiki. Ikiwiki is developed by [[Joey]] and many contributors, and is [[FreeSoftware]]. -- cgit v1.2.3 From 3ff57e51d83b94492e6f07816945370332c252f3 Mon Sep 17 00:00:00 2001 From: "https://me.yahoo.com/a/2.Pjpm0G0Z6F9LiGW4cYO84pIrb.Lg--#137de" Date: Mon, 30 Aug 2010 07:45:09 +0000 Subject: --- doc/freesoftware.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/freesoftware.mdwn b/doc/freesoftware.mdwn index 2243d9b1f..14161b8ca 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: +as follows: [online bug tracking](http://www.bontq.com) > Redistribution and use in source and compiled forms, with or without > modification, are permitted under any circumstances. No warranty. -- cgit v1.2.3 From efc2b323d83eb1db6ebfa55e72045ec4b75b71cf Mon Sep 17 00:00:00 2001 From: "https://me.yahoo.com/a/2.Pjpm0G0Z6F9LiGW4cYO84pIrb.Lg--#137de" Date: Mon, 30 Aug 2010 07:47:22 +0000 Subject: --- doc/ikiwikiusers.mdwn | 1 + 1 file changed, 1 insertion(+) (limited to 'doc') diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn index 2f70c67b7..3265d77da 100644 --- a/doc/ikiwikiusers.mdwn +++ b/doc/ikiwikiusers.mdwn @@ -15,6 +15,7 @@ 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) -- cgit v1.2.3 From 39172621e150c794f307d635539bebee5a415e9a Mon Sep 17 00:00:00 2001 From: "https://me.yahoo.com/a/2.Pjpm0G0Z6F9LiGW4cYO84pIrb.Lg--#137de" Date: Mon, 30 Aug 2010 07:51:48 +0000 Subject: --- doc/sitemap.mdwn | 3 +++ 1 file changed, 3 insertions(+) (limited to 'doc') diff --git a/doc/sitemap.mdwn b/doc/sitemap.mdwn index 3c11ed423..a011ff40d 100644 --- a/doc/sitemap.mdwn +++ b/doc/sitemap.mdwn @@ -3,4 +3,7 @@ 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) + -- cgit v1.2.3 From 63de4d5613000c434f39274fc6f96911f6658730 Mon Sep 17 00:00:00 2001 From: "https://me.yahoo.com/a/2.Pjpm0G0Z6F9LiGW4cYO84pIrb.Lg--#137de" Date: Mon, 30 Aug 2010 07:54:08 +0000 Subject: --- doc/usage.mdwn | 1 + 1 file changed, 1 insertion(+) (limited to 'doc') diff --git a/doc/usage.mdwn b/doc/usage.mdwn index 840d105d2..195d9df4c 100644 --- a/doc/usage.mdwn +++ b/doc/usage.mdwn @@ -379,6 +379,7 @@ also be configured using a setup file. * [[ikiwiki-mass-rebuild]](8) * [[ikiwiki-update-wikilist]](1) * [[ikiwiki-transition]](1) +[issue tracking tools](http://www.bontq.com) # AUTHOR -- cgit v1.2.3 From 1534c891794bb9743b460fe78a1066377b359d47 Mon Sep 17 00:00:00 2001 From: "https://me.yahoo.com/a/2.Pjpm0G0Z6F9LiGW4cYO84pIrb.Lg--#137de" Date: Mon, 30 Aug 2010 07:54:57 +0000 Subject: --- doc/usage.mdwn | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'doc') diff --git a/doc/usage.mdwn b/doc/usage.mdwn index 195d9df4c..cbcd0e445 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. This is faster. + rebuilding any pages that have not changed. [Issue tracking tools](http://www.bontq.com). This is faster. * ikiwiki --setup my.setup --refresh --wrappers @@ -379,7 +379,7 @@ also be configured using a setup file. * [[ikiwiki-mass-rebuild]](8) * [[ikiwiki-update-wikilist]](1) * [[ikiwiki-transition]](1) -[issue tracking tools](http://www.bontq.com) + # AUTHOR -- cgit v1.2.3 From 2d411d7729f2afa61afd4fd406747a204b937175 Mon Sep 17 00:00:00 2001 From: Giuseppe Bilotta Date: Mon, 30 Aug 2010 10:21:50 +0200 Subject: Revert spam --- doc/bugs/comments_preview_unsafe_with_allowdirectives.mdwn | 2 +- doc/freesoftware.mdwn | 2 +- doc/ikiwikiusers.mdwn | 1 - doc/sitemap.mdwn | 3 --- doc/tips/integrated_issue_tracking_with_ikiwiki.mdwn | 2 +- doc/usage.mdwn | 3 +-- 6 files changed, 4 insertions(+), 9 deletions(-) (limited to 'doc') 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 -- cgit v1.2.3