From 018df1df824e440004b276129c2867b552a0ec4d Mon Sep 17 00:00:00 2001 From: "http://marcotmarcot.wordpress.com/" Date: Tue, 24 Aug 2010 10:32:29 +0000 Subject: darcs command --- doc/setup.mdwn | 1 + 1 file changed, 1 insertion(+) (limited to 'doc') diff --git a/doc/setup.mdwn b/doc/setup.mdwn index 266222cc3..83409228c 100644 --- a/doc/setup.mdwn +++ b/doc/setup.mdwn @@ -68,6 +68,7 @@ source. (Remember to replace "foo" with the real directory name.) cvs -d `pwd`/foo get -P ikiwiki bzr clone foo foo.src hg clone foo foo.src + darcs get foo foo.src # TODO monotone, tla Now to edit pages by hand, go into the directory you checked out (ie, -- cgit v1.2.3 From 37f62dde2d9b752ba559b796cf6c1b3bc3dee9bd Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 25 Aug 2010 14:57:45 -0400 Subject: response --- doc/todo/edit_form:_no_fixed_size_for_textarea.mdwn | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'doc') diff --git a/doc/todo/edit_form:_no_fixed_size_for_textarea.mdwn b/doc/todo/edit_form:_no_fixed_size_for_textarea.mdwn index 8721277aa..77e46049f 100644 --- a/doc/todo/edit_form:_no_fixed_size_for_textarea.mdwn +++ b/doc/todo/edit_form:_no_fixed_size_for_textarea.mdwn @@ -42,3 +42,11 @@ browsers emulate it. [[done]] Wouldn't it be possible to just implement an integer-valued setting for this, accessible via the "Setup" wiki page? This would require a wiki regen, but such a setting would not be changed frequently I suppose. Also, Mediawiki has this implemented as a per-user setting (two settings, actually, -- number of rows and columns of the edit area); such a per-user setting would be the best possible implementation, but I'm not sure if ikiwiki already supports per-user settings. Please consider implementing this as the current 20 rows is a great PITA for any non-trivial page. > I don't think it would need a wiki rebuild, as the textarea is generated dynamically by the CGI when you perform a CGI action, and (as far as I know) is not cooked into any static content. -- [[Jon]] + +>> There is no need for a configuration setting for this -- to change +>> the default height from 20 rows to something else, you can just put +>> something like this in your `local.css`: --[[Joey]] + + #editcontent { + height: 50em; + } -- cgit v1.2.3 From 612493567f946f333a73e4f55fae2ab157108fd9 Mon Sep 17 00:00:00 2001 From: "http://marcotmarcot.wordpress.com/" Date: Wed, 25 Aug 2010 20:20:39 +0000 Subject: Marco Sivla --- doc/ikiwikiusers.mdwn | 1 + 1 file changed, 1 insertion(+) (limited to 'doc') diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn index e76d547cc..2f70c67b7 100644 --- a/doc/ikiwikiusers.mdwn +++ b/doc/ikiwikiusers.mdwn @@ -158,6 +158,7 @@ Personal sites and blogs * [Nicolas Schodet](http://ni.fr.eu.org/) * [weakish](http://weakish.github.com) * [Thomas Kane](http://planetkane.org/) +* [Marco Silva](http://marcot.eti.br/) a weblog + wiki using the [darcs](http://darcs.net) backend Please feel free to add your own ikiwiki site! -- cgit v1.2.3 From e5c4b811369f271dc313741538adfe7cbf745be6 Mon Sep 17 00:00:00 2001 From: "http://www.google.com/profiles/hakim.cassimally" Date: Thu, 26 Aug 2010 07:35:47 +0000 Subject: --- doc/sandbox.mdwn | 1 + 1 file changed, 1 insertion(+) (limited to 'doc') diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn index 01308dae4..137075ee7 100644 --- a/doc/sandbox.mdwn +++ b/doc/sandbox.mdwn @@ -49,6 +49,7 @@ Bulleted list * + ---- This **SandBox** is also a [[blog]]! -- cgit v1.2.3 From 6d213a0c739d5b34357b01a616f99197eeba6ad9 Mon Sep 17 00:00:00 2001 From: "http://www.google.com/profiles/hakim.cassimally" Date: Thu, 26 Aug 2010 07:38:02 +0000 Subject: --- doc/sandbox.mdwn | 1 + 1 file changed, 1 insertion(+) (limited to 'doc') diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn index 137075ee7..365cb3321 100644 --- a/doc/sandbox.mdwn +++ b/doc/sandbox.mdwn @@ -53,5 +53,6 @@ Bulleted list ---- This **SandBox** is also a [[blog]]! +[[!inline pages="blog/* and !*/Discussion" show="10" rootpage="blog"]] [[!inline pages="sandbox/* and !*/Discussion" rootpage="sandbox" show="4" archive="yes"]] -- cgit v1.2.3 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 From 7ab84dcfe52a37b93e6faa49895ae963a3b5d0d1 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 30 Aug 2010 13:15:49 -0400 Subject: highlight: Make location of highlight's files configurable in setup file to allow for nonstandard installations. --- IkiWiki/Plugin/highlight.pm | 30 +++++++++++++++++----- debian/changelog | 2 ++ .../Highlight_extension_uses_hard_coded_paths.mdwn | 2 ++ 3 files changed, 27 insertions(+), 7 deletions(-) (limited to 'doc') diff --git a/IkiWiki/Plugin/highlight.pm b/IkiWiki/Plugin/highlight.pm index e517ac5c0..d4ade0a7b 100644 --- a/IkiWiki/Plugin/highlight.pm +++ b/IkiWiki/Plugin/highlight.pm @@ -6,10 +6,6 @@ use strict; use IkiWiki 3.00; use Encode; -# locations of highlight's files -my $filetypes="/etc/highlight/filetypes.conf"; -my $langdefdir="/usr/share/highlight/langDefs"; - sub import { hook(type => "getsetup", id => "highlight", call => \&getsetup); hook(type => "checkconfig", id => "highlight", call => \&checkconfig); @@ -32,9 +28,29 @@ sub getsetup () { safe => 1, rebuild => 1, }, + filetypes_conf => { + type => "string", + example => "/etc/highlight/filetypes.conf", + description => "location of highlight's filetypes.conf", + safe => 0, + rebuild => undef, + }, + langdefdir => { + type => "string", + example => "/usr/share/highlight/langDefs", + description => "location of highlight's langDefs directory", + safe => 0, + rebuild => undef, + }, } sub checkconfig () { + if (! exists $config{filetypes_conf}) { + $config{filetypes_conf}="/etc/highlight/filetypes.conf"; + } + if (! exists $config{langdefdir}) { + $config{langdefdir}="/usr/share/highlight/langDefs"; + } if (exists $config{tohighlight}) { foreach my $file (split ' ', $config{tohighlight}) { my @opts = $file=~s/^\.// ? @@ -80,7 +96,7 @@ my %highlighters; # Parse highlight's config file to get extension => language mappings. sub read_filetypes () { - open (IN, $filetypes) || error("$filetypes: $!"); + open (IN, $config{filetypes_conf}) || error("$config{filetypes_conf}: $!"); while () { chomp; if (/^\$ext\((.*)\)=(.*)$/) { @@ -97,12 +113,12 @@ sub read_filetypes () { sub ext2langfile ($) { my $ext=shift; - my $langfile="$langdefdir/$ext.lang"; + my $langfile="$config{langdefdir}/$ext.lang"; return $langfile if exists $highlighters{$langfile}; read_filetypes() unless $filetypes_read; if (exists $ext2lang{$ext}) { - return "$langdefdir/$ext2lang{$ext}.lang"; + return "$config{langdefdir}/$ext2lang{$ext}.lang"; } # If a language only has one common extension, it will not # be listed in filetypes, so check the langfile. diff --git a/debian/changelog b/debian/changelog index d5587bfce..0d36a7352 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,8 @@ ikiwiki (3.20100816) UNRELEASED; urgency=low * style.css: Use relative, not absolute font sizes. Thanks, Giuseppe Bilotta. * htmlscrubber: Do not scrub url anchors that contain colons. * Danish translation update. Closes: #594673 + * highlight: Make location of highlight's files configurable in setup + file to allow for nonstandard installations. -- Joey Hess Sun, 15 Aug 2010 11:45:48 -0400 diff --git a/doc/bugs/Highlight_extension_uses_hard_coded_paths.mdwn b/doc/bugs/Highlight_extension_uses_hard_coded_paths.mdwn index 1b9cb2e2d..275661fb8 100644 --- a/doc/bugs/Highlight_extension_uses_hard_coded_paths.mdwn +++ b/doc/bugs/Highlight_extension_uses_hard_coded_paths.mdwn @@ -1 +1,3 @@ The [[plugins/highlight]] plugin hard codes some paths up the top of the plugin. This means that you need to edit the ikiwiki source if you have highlight installed in a non-standard location (e.g. if you have done a user-level install of the highlight package). + +> configurable now, [[done]] --[[Joey]] -- cgit v1.2.3 From 1e7a53c70bb8c185f23f578cc6c1073b4285ccb1 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 30 Aug 2010 13:20:25 -0400 Subject: response --- doc/forum/Can__39__t_get_comments_plugin_working.mdwn | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/forum/Can__39__t_get_comments_plugin_working.mdwn b/doc/forum/Can__39__t_get_comments_plugin_working.mdwn index 06b7fdd84..f189d9b64 100644 --- a/doc/forum/Can__39__t_get_comments_plugin_working.mdwn +++ b/doc/forum/Can__39__t_get_comments_plugin_working.mdwn @@ -1,7 +1,16 @@ I feel like I must be missing something. -My blog is based on Ikiwiki, and uses /yyyy/mm/dd/title/ for blog posts. Because I use the plugin that generates index pages for subdirectories, I have to use /????/??/??/* to identify posts and avoid missing the index pages for years, months and days. +My blog is based on Ikiwiki, and uses /yyyy/mm/dd/title/ for blog posts. +Because I use the plugin that generates index pages for subdirectories, I +have to use /????/??/??/* to identify posts and avoid missing the index +pages for years, months and days. I've enabled the comments plugin, but no matter what I do, I can't seem to make the comment form appear on my posts. I've removed the entire site and have rebuilt. I've set the pagespec to /????/??/??/* and ./????/??/??/*, but neither seems to work. I don't see any output, or anything else to indicate that pages aren't working. Are there any other plugins that need to be enabled for this to work? I think I've locked things down such that anonymous users can't edit by enabling signinedit and setting a lock, but this may be blocking the ability to comment (though I don't recall seeing anything in the docs about needing additional plugins.) + +> Just use '????/??/??/*' , and it will work. +> [[Pagespecs|ikiwiki/pagespec]] are automatically matched absolute to the +> top of the site, and adding a leading "/" is not necessary and will +> make the PageSpec not match. (And the relative PageSpec with "./" is +> not right in this case either). --[[Joey]] -- cgit v1.2.3 From c4d4cad3befbbd444d094cbeb0b6ebba3910a025 Mon Sep 17 00:00:00 2001 From: Giuseppe Bilotta Date: Fri, 20 Aug 2010 10:13:14 +0200 Subject: Single dot in pagespec translates to 'current page' --- IkiWiki.pm | 3 +++ doc/ikiwiki/pagespec.mdwn | 4 ++++ 2 files changed, 7 insertions(+) (limited to 'doc') diff --git a/IkiWiki.pm b/IkiWiki.pm index df8abe2c2..6fd112960 100644 --- a/IkiWiki.pm +++ b/IkiWiki.pm @@ -2401,6 +2401,9 @@ package IkiWiki::PageSpec; sub derel ($$) { my $path=shift; my $from=shift; + if ($path eq '.') { + $path = $from; + } if ($path =~ m!^\./!) { $from=~s#/?[^/]+$## if defined $from; diff --git a/doc/ikiwiki/pagespec.mdwn b/doc/ikiwiki/pagespec.mdwn index c66395f84..7fabff9a4 100644 --- a/doc/ikiwiki/pagespec.mdwn +++ b/doc/ikiwiki/pagespec.mdwn @@ -78,3 +78,7 @@ filenames of the pages in the wiki, so a pagespec "foo" used on page "a/b" will not match a page named "a/foo" or "a/b/foo". To match relative to the directory of the page containing the pagespec, you can use "./". For example, "./foo" on page "a/b" matches page "a/foo". + +If you want to use the name of the page the pagespec is used in, you can use +a single dot. For example, `link(.)` matches all the pages linking to the +current page. -- cgit v1.2.3 From 00a54d1bb7826455609645aa1d0ea66cfec3f468 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 30 Aug 2010 13:37:16 -0400 Subject: finish link(.) support --- debian/changelog | 1 + doc/ikiwiki/pagespec.mdwn | 6 +++--- doc/todo/support_link__40__.__41___in_pagespec.mdwn | 8 ++++++++ 3 files changed, 12 insertions(+), 3 deletions(-) (limited to 'doc') diff --git a/debian/changelog b/debian/changelog index 0d36a7352..eba38c4d1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,6 +13,7 @@ ikiwiki (3.20100816) UNRELEASED; urgency=low * Danish translation update. Closes: #594673 * highlight: Make location of highlight's files configurable in setup file to allow for nonstandard installations. + * Allow "link(.)" and similar PageSpecs. Thanks, Giuseppe Bilotta. -- Joey Hess Sun, 15 Aug 2010 11:45:48 -0400 diff --git a/doc/ikiwiki/pagespec.mdwn b/doc/ikiwiki/pagespec.mdwn index 7fabff9a4..6aec561ae 100644 --- a/doc/ikiwiki/pagespec.mdwn +++ b/doc/ikiwiki/pagespec.mdwn @@ -79,6 +79,6 @@ filenames of the pages in the wiki, so a pagespec "foo" used on page relative to the directory of the page containing the pagespec, you can use "./". For example, "./foo" on page "a/b" matches page "a/foo". -If you want to use the name of the page the pagespec is used in, you can use -a single dot. For example, `link(.)` matches all the pages linking to the -current page. +To indicate the name of the page the PageSpec is used in, you can +use a single dot. For example, `link(.)` matches all the pages +linking to the page containing the PageSpec. diff --git a/doc/todo/support_link__40__.__41___in_pagespec.mdwn b/doc/todo/support_link__40__.__41___in_pagespec.mdwn index 79809662a..653db1ff2 100644 --- a/doc/todo/support_link__40__.__41___in_pagespec.mdwn +++ b/doc/todo/support_link__40__.__41___in_pagespec.mdwn @@ -11,3 +11,11 @@ IkiWiki.pm is the best way to do it". > I implemented this suggestion in the simplest possible way, [[!taglink patch]] available [[here|http://git.oblomov.eu/ikiwiki/patch/f4a52de556436fdee00fd92ca9a3b46e876450fa]]. > An alternative approach, very similar, would be to make the empty page parameter mean current page (e.g. `link()` would mean pages linking here). The patch would be very similar. > -- GB + +>> Thanks for this, and also for your recent spam-fighting. +>> Huh, I was right about changing derel, didn't realize it would be +>> so obvious a change. :) Oh well, I managed to complicate it +>> some in optimisation pass.. ;) +>> +>> Note that your git-daemon on git.oblomov.eu seems down. +>> I pulled the patch from gitweb, [[done]] --[[Joey]] -- cgit v1.2.3 From 88594e75994c80ca5f2f311f0375b7ce98ecd3ed Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 30 Aug 2010 13:42:55 -0400 Subject: more info? --- doc/bugs/po:_po_files_instead_of_html_files.mdwn | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'doc') diff --git a/doc/bugs/po:_po_files_instead_of_html_files.mdwn b/doc/bugs/po:_po_files_instead_of_html_files.mdwn index 933e348c4..6e12b51be 100644 --- a/doc/bugs/po:_po_files_instead_of_html_files.mdwn +++ b/doc/bugs/po:_po_files_instead_of_html_files.mdwn @@ -4,3 +4,9 @@ Links: index index.fr templates templates.fr When i click on "templates.fr", i get the po.file instead of html. Sorry for the noise! I set "po_master_language" to fr and all was ok. [[done]]. + +> Any chance you could be a bit more verbose about what the +> misconfiguration was? I don't think the po plugin should behave like that +> in any configuration. Unless, perhaps, it was just not configured to +> support any languages at all, and so the po file was treated as a raw +> file. --[[Joey]] -- cgit v1.2.3 From 99a123fa1680e5f3691f4e4a463ff9bc2196718e Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 30 Aug 2010 13:45:30 -0400 Subject: response --- doc/forum/editing_a_comment.mdwn | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'doc') diff --git a/doc/forum/editing_a_comment.mdwn b/doc/forum/editing_a_comment.mdwn index 8bddab3fb..eb534365e 100644 --- a/doc/forum/editing_a_comment.mdwn +++ b/doc/forum/editing_a_comment.mdwn @@ -1 +1,11 @@ Is it possible to edit a comment? I did not find any button for it. + +> It was a design decision to not allow editing comments via the web +> interface. The thinking being that comments on blogs tend to not allow +> editing, and allowing wiki-style editing by anyone would sort of defeat +> the purpose of comments. +> +> I do think there is room to support more forum-style comments in ikiwiki. +> As long as the comment is not posted by an anonymous user, it would be +> possible to open up editing to the original commenter. One day, perhaps.. +> --[[Joey]] -- cgit v1.2.3 From 408067b893f8e7668050fd9d8ca0ab4165aa5263 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 30 Aug 2010 14:21:50 -0400 Subject: response --- doc/todo/Add_nicer_math_formatting.mdwn | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/todo/Add_nicer_math_formatting.mdwn b/doc/todo/Add_nicer_math_formatting.mdwn index 041eaee11..6e082c102 100644 --- a/doc/todo/Add_nicer_math_formatting.mdwn +++ b/doc/todo/Add_nicer_math_formatting.mdwn @@ -1,5 +1,24 @@ -It would be nice to add nicer math formatting. I currently use the [[plugins/teximg]] plugin, but I wonder if [jsMath](http://www.math.union.edu/~dpvc/jsMath/) wouldn't be a better option. +It would be nice to add nicer math formatting. I currently use the +[[plugins/teximg]] plugin, but I wonder if +[jsMath](http://www.math.union.edu/~dpvc/jsMath/) wouldn't be a better option. [[Will]] +> I've looked at jsmath (which is nicely packaged in Debian), and +> I agree that this is nicer than TeX images. That text-mode browsers +> get to see LaTeX as a fallback is actually a nice feature (better +> than nothing, right? :) That browsers w/o javascript will not be able to +> see the math either is probably ok. +> +> A plugin would probably be a pretty trivial thing to write. +> It just needs to include the javascript files, +> and slap a `
avound the user's code`, then +> call `jsMath.Process(document);` at the end of the page. +> +> My only concern is security: Has jsMath's parser been written +> to be safe when processing untrusted input? Could a user abuse the +> parser to cause it to emit/run arbitrary javascript code? +> I've posted a question about this to its forum: --[[Joey]] +> + [[!tag wishlist]] -- cgit v1.2.3 From 801c59b535e9a1501ac40e8ad2a0423d506c5276 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 30 Aug 2010 14:25:49 -0400 Subject: response --- doc/plugins/contrib/ymlfront/discussion.mdwn | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'doc') diff --git a/doc/plugins/contrib/ymlfront/discussion.mdwn b/doc/plugins/contrib/ymlfront/discussion.mdwn index b1fd65fff..bf9780048 100644 --- a/doc/plugins/contrib/ymlfront/discussion.mdwn +++ b/doc/plugins/contrib/ymlfront/discussion.mdwn @@ -4,3 +4,9 @@ Now that I have implemented a \[[!ymlfront ...]] directive, I would like to remo * it is non-standard Any objections? + +> Well, I don't have much standing since I have been too lame to integrate +> ymlfront into ikiwiki yet. Buy, my opinion is, I liked the old +> format of putting the YAML literally at the front of the file. It +> seemed to allow parsing the file as YAML, using any arbitrary YAML +> processer. And it was nice how it avoided boilerplate. --[[Joey]] -- cgit v1.2.3 From 71fa036270e4c202ee19be60b81993fb6e7cb4cb Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 30 Aug 2010 14:41:59 -0400 Subject: response --- ...ttp_or_https_in_urls_to_allow_serving_both.mdwn | 41 ++++++++++++++++++---- 1 file changed, 34 insertions(+), 7 deletions(-) (limited to 'doc') diff --git a/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn b/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn index 5f17e3ae0..63fd3d11d 100644 --- a/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn +++ b/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn @@ -12,20 +12,47 @@ It would be good if relative paths could be used instead, so the transport metho > "../../", and "../". The only absolute links are to CGIs and the w3c DTD. > --[[Joey]] ->> The problem is within the CGI script. The links within the HTML page are all absolute, including links to the css file. ->> Having a http links within a HTML page retrieved using https upset most browsers (I think). Also if I push cancel on the edit page in https, I end up at at http page. -- Brian May +>> The problem is within the CGI script. The links within the HTML page are all +>> absolute, including links to the css file. Having a http links within a HTML +>> page retrieved using https upset most browsers (I think). Also if I push cancel +>> on the edit page in https, I end up at at http page. -- Brian May >>> Ikiwiki does not hardcode http links anywhere. If you don't want >>> it to use such links, change your configuration to use https >>> consistently. --[[Joey]] -Errr... That is not a solution, that is a work around. ikiwiki does not hard code the absolute paths, but absolute paths are hard coded in the configuration file. If you want to serve your website so that the majority of users can see it as http, including in rss feeds (this allows proxy caches to cache the contents and has reduced load requirements), but editing is done via https for increased security, it is not possible. I have some ideas how this can be implemented (as ikiwiki has the absolute path to the CGI script and the absolute path to the destination, it should be possible to generate a relative path from one to the other), although some minor issues still need to be resolved. -- Brian May - -I noticed the links to the images on are also absolute, that is ; this seems surprising, as the change.tmpl file uses <TMPL_VAR BASEURL> -which seems to do the right thing in page.tmpl, but not for change.tmpl. Where is BASEURL set? -- Brian May +Errr... That is not a solution, that is a work around. ikiwiki does not hard +code the absolute paths, but absolute paths are hard coded in the configuration +file. If you want to serve your website so that the majority of users can see +it as http, including in rss feeds (this allows proxy caches to cache the +contents and has reduced load requirements), but editing is done via https for +increased security, it is not possible. I have some ideas how this can be +implemented (as ikiwiki has the absolute path to the CGI script and the +absolute path to the destination, it should be possible to generate a relative +path from one to the other), although some minor issues still need to be +resolved. -- Brian May + +I noticed the links to the images on are +also absolute, that is ; this seems +surprising, as the change.tmpl file uses <TMPL_VAR BASEURL> which seems +to do the right thing in page.tmpl, but not for change.tmpl. Where is BASEURL +set? -- Brian May > The use of an absolute baseurl in change.tmpl is a special case. --[[Joey]] -So I'm facing this same issue. I have a wiki which needs to be accessed on three different URLs(!) and the hard coding of the URL from the setup file is becoming a problem for me. Is there anything I can do here? --[[Perry]] +So I'm facing this same issue. I have a wiki which needs to be accessed on +three different URLs(!) and the hard coding of the URL from the setup file is +becoming a problem for me. Is there anything I can do here? --[[Perry]] + +> I remain puzzled by the problem that Brian is discussing. I don't see +> why you can't just set the cgiurl and url to a https url, and serve +> the site using both http and https. +> +> Just for example, is an ikiwiki, and it is accessible +> via https or http, and if you use https, links will remain on https (except +> for links using the cgi, which I could fix by changing the cgiurl to https). +> +> I think it's possible ikiwiki used to have some +> absolute urls that have been fixed since Brian filed the bug. --[[Joey]] [[wishlist]] -- cgit v1.2.3 From 67ac2bad74e42cb3dec564fb40a198688b2e358e Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 30 Aug 2010 14:44:10 -0400 Subject: response --- doc/todo/po:_remove_po_files_when_disabling_plugin.mdwn | 2 ++ 1 file changed, 2 insertions(+) (limited to 'doc') diff --git a/doc/todo/po:_remove_po_files_when_disabling_plugin.mdwn b/doc/todo/po:_remove_po_files_when_disabling_plugin.mdwn index 0801f7fcd..5d0318ae1 100644 --- a/doc/todo/po:_remove_po_files_when_disabling_plugin.mdwn +++ b/doc/todo/po:_remove_po_files_when_disabling_plugin.mdwn @@ -9,3 +9,5 @@ files from the source repository when it has been disabled? >> in most cases, it is not, thanks to .gitignore or similar, but we >> can't be sure. So I just can't decide it is needed to call >> `rcs_remove` rather than a good old `unlink`. --[[intrigeri]] + +>>> I guess you could call `rcs_remove` followed by `unlink`. --[[Joey]] -- cgit v1.2.3 From 6989ffdf2fcba60c481d11d09c65e259733122a4 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 30 Aug 2010 14:59:09 -0400 Subject: response --- doc/forum/report_pagination.mdwn | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'doc') diff --git a/doc/forum/report_pagination.mdwn b/doc/forum/report_pagination.mdwn index d609fd502..03a77b16d 100644 --- a/doc/forum/report_pagination.mdwn +++ b/doc/forum/report_pagination.mdwn @@ -9,3 +9,10 @@ Approaches: 3. some other approach I haven't thought of. I'm afraid that whatever approach I take, it will end up being a kludge. + +> Well, it should be perfectly fine, and non-kludgy for a single page to +> generate multiple html files. Just make sure that html files have names +> that won't conflict with the html files generated by some other page. +> +> Of course the caveat is that since such files are not pages, you won't +> be able to use wikilinks to link directly to them, etc. --[[Joey]] -- cgit v1.2.3 From 827710bb59d04d71bc36ef47bd5fdb66fe128b40 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 30 Aug 2010 15:00:31 -0400 Subject: split out bug report and close --- doc/plugins/po.mdwn | 72 ----------------------------------------------------- 1 file changed, 72 deletions(-) (limited to 'doc') diff --git a/doc/plugins/po.mdwn b/doc/plugins/po.mdwn index 91273ba98..da58a9f49 100644 --- a/doc/plugins/po.mdwn +++ b/doc/plugins/po.mdwn @@ -246,75 +246,3 @@ TODO [[!inline pages="todo/po:* and !todo/done and !link(todo/done) and !todo/*/*" feeds=no actions=no archive=yes show=0]] - -broken links to translatable basewiki pages that lack po files --------------------------------------------------------------- - -If a page is not translated yet, the "translated" version of it -displays wikilinks to other, existing (but not yet translated?) -pages as edit links, as if those pages do not exist. - -That's really confusing, especially as clicking such a link -brings up an edit form to create a new, english page. - -This is with po_link_to=current or negotiated. With default, it doesn't -happen.. - -Also, this may only happen if the page being linked to is coming from an -underlay, and the underlays lack translation to a given language. ---[[Joey]] - -> Any simple testcase to reproduce it, please? I've never seen this -> happen yet. --[[intrigeri]] - ->> Sure, go here ->> (Currently 0% translateed) and see the 'WikiLink' link at the bottom, ->> which goes to ->> Compare with eg, the 100% translated Dansk version, where ->> the WikiLink link links to the English WikiLink page. --[[Joey]] - ->>> Seems not related to the page/string translation status: the 0% ->>> translated Spanish version has the correct link, just like the ->>> Dansk version => I'm changing the bug title accordingly. ->>> ->>> I tested forcing the sv html page to be rebuilt by translating a ->>> string in it, it did not fix the bug. I did the same for the ->>> Spanish page, it did not introduce the bug. So this is really ->>> weird. ->>> ->>> The smiley underlay seems to be the only place where the wrong ->>> thing happens: the basewiki underlay has similar examples ->>> that do not exhibit this bug. An underlay linking to another might ->>> be necessary to reproduce it. Going to dig deeper. --[[intrigeri]] - ->>>> After a few hours lost in the Perl debugger, I think I have found ->>>> the root cause of the problem: in l10n wiki's configured ->>>> `underlaydir`, the basewiki is present in every slave language ->>>> that is enabled for this wiki *but* Swedish. With such a ->>>> configuration, the `ikiwiki/wikilink` page indeed does not exist ->>>> in Swedish language: no `ikiwiki/wikilink.sv.po` can be found ->>>> where ikiwiki is looking. Have a look to ->>>> , the basewiki is not ->>>> available in Swedish language on this wiki. So this is not a po ->>>> bug, but a configuration or directories layout issue. This is ->>>> solved by adding the Swedish basewiki to the underlay dir, which ->>>> is I guess not a possibility in the l10n wiki context. I guess ->>>> this could be solved by adding `SRCDIR/basewiki` as an underlay ->>>> to your l10n wiki configuration, possibly using the ->>>> `add_underlays` configuration directive. --[[intrigeri]] - ->>>>> There is no complete Swedish underlay translation yet, so it is not ->>>>> shipped in ikiwiki. I don't think it's a misconfiguration to use ->>>>> a language that doesn't have translated underlays. --[[Joey]] - ->>>>>> Ok. The problem is triggered when using a language that doesn't ->>>>>> have translated underlays, *and* defining ->>>>>> `po_translatable_pages` in a way that renders the base wiki ->>>>>> pages translatable in po's view of things, which in turns makes ->>>>>> the po plugin act as if the translation pages did exist, ->>>>>> although they do not in this case. I still need to have a deep ->>>>>> look at the underlays-related code you added to `po.pm` a while ->>>>>> ago. Stay tuned. --[[intrigeri]] - ->>>>>>> Fixed in my po branch, along with other related small bugs that ->>>>>>> happen in the very same situation only. --[[intrigeri]] -- cgit v1.2.3 From bdafa441babb9bf73b8c25852eed1a115ca5b8e7 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 30 Aug 2010 15:08:07 -0400 Subject: close bug; more rationalle for reordering --- doc/todo/po:_avoid_rebuilding_to_fix_meta_titles.mdwn | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'doc') diff --git a/doc/todo/po:_avoid_rebuilding_to_fix_meta_titles.mdwn b/doc/todo/po:_avoid_rebuilding_to_fix_meta_titles.mdwn index 402f70b79..9bb9c72c4 100644 --- a/doc/todo/po:_avoid_rebuilding_to_fix_meta_titles.mdwn +++ b/doc/todo/po:_avoid_rebuilding_to_fix_meta_titles.mdwn @@ -43,3 +43,18 @@ Re the meta title escaping issue worked around by `change`. >>>>>> did not dare to. I'll try this. --[[intrigeri]] >>>>>>> Done in my po branch, please have a look. --[[intrigeri]] + +>>>>>>>> I've merged it. Didn't look at the po.pm changes closely; +>>>>>>>> assume they're ok. [[done]] --[[Joey]] +>>>>>>>> +>>>>>>>> My thinking about the reordering being safe is that +>>>>>>>> the relative ordering of scan and preprocess in scan mode hooks +>>>>>>>> has not been defined before, so it should be ok to define it. :) +>>>>>>>> +>>>>>>>> And as to possible breakage from things that assumed the old +>>>>>>>> ordering, such a thing would need to have a scan hook and a +>>>>>>>> preprocess in scan mode hook, and the two hooks would need to +>>>>>>>> populate the same data structure with conflicting information, +>>>>>>>> in order for there to be a problem. That seems highly unlikely +>>>>>>>> and would be pretty broken on its own. And no plugin in ikiwiki +>>>>>>>> itself has both types of hooks. --[[Joey]] -- cgit v1.2.3 From 5afd6e0f701d98f1dbb512c11853589c96c9dd0b Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 30 Aug 2010 15:27:26 -0400 Subject: forgot to add this --- ...nslatable_basewiki_pages_that_lack_po_fies.mdwn | 73 ++++++++++++++++++++++ 1 file changed, 73 insertions(+) create mode 100644 doc/bugs/po:broken_links_to_translatable_basewiki_pages_that_lack_po_fies.mdwn (limited to 'doc') diff --git a/doc/bugs/po:broken_links_to_translatable_basewiki_pages_that_lack_po_fies.mdwn b/doc/bugs/po:broken_links_to_translatable_basewiki_pages_that_lack_po_fies.mdwn new file mode 100644 index 000000000..121d33807 --- /dev/null +++ b/doc/bugs/po:broken_links_to_translatable_basewiki_pages_that_lack_po_fies.mdwn @@ -0,0 +1,73 @@ +broken links to translatable basewiki pages that lack po files +-------------------------------------------------------------- + +If a page is not translated yet, the "translated" version of it +displays wikilinks to other, existing (but not yet translated?) +pages as edit links, as if those pages do not exist. + +That's really confusing, especially as clicking such a link +brings up an edit form to create a new, english page. + +This is with po_link_to=current or negotiated. With default, it doesn't +happen.. + +Also, this may only happen if the page being linked to is coming from an +underlay, and the underlays lack translation to a given language. +--[[Joey]] + +> Any simple testcase to reproduce it, please? I've never seen this +> happen yet. --[[intrigeri]] + +>> Sure, go here +>> (Currently 0% translateed) and see the 'WikiLink' link at the bottom, +>> which goes to +>> Compare with eg, the 100% translated Dansk version, where +>> the WikiLink link links to the English WikiLink page. --[[Joey]] + +>>> Seems not related to the page/string translation status: the 0% +>>> translated Spanish version has the correct link, just like the +>>> Dansk version => I'm changing the bug title accordingly. +>>> +>>> I tested forcing the sv html page to be rebuilt by translating a +>>> string in it, it did not fix the bug. I did the same for the +>>> Spanish page, it did not introduce the bug. So this is really +>>> weird. +>>> +>>> The smiley underlay seems to be the only place where the wrong +>>> thing happens: the basewiki underlay has similar examples +>>> that do not exhibit this bug. An underlay linking to another might +>>> be necessary to reproduce it. Going to dig deeper. --[[intrigeri]] + +>>>> After a few hours lost in the Perl debugger, I think I have found +>>>> the root cause of the problem: in l10n wiki's configured +>>>> `underlaydir`, the basewiki is present in every slave language +>>>> that is enabled for this wiki *but* Swedish. With such a +>>>> configuration, the `ikiwiki/wikilink` page indeed does not exist +>>>> in Swedish language: no `ikiwiki/wikilink.sv.po` can be found +>>>> where ikiwiki is looking. Have a look to +>>>> , the basewiki is not +>>>> available in Swedish language on this wiki. So this is not a po +>>>> bug, but a configuration or directories layout issue. This is +>>>> solved by adding the Swedish basewiki to the underlay dir, which +>>>> is I guess not a possibility in the l10n wiki context. I guess +>>>> this could be solved by adding `SRCDIR/basewiki` as an underlay +>>>> to your l10n wiki configuration, possibly using the +>>>> `add_underlays` configuration directive. --[[intrigeri]] + +>>>>> There is no complete Swedish underlay translation yet, so it is not +>>>>> shipped in ikiwiki. I don't think it's a misconfiguration to use +>>>>> a language that doesn't have translated underlays. --[[Joey]] + +>>>>>> Ok. The problem is triggered when using a language that doesn't +>>>>>> have translated underlays, *and* defining +>>>>>> `po_translatable_pages` in a way that renders the base wiki +>>>>>> pages translatable in po's view of things, which in turns makes +>>>>>> the po plugin act as if the translation pages did exist, +>>>>>> although they do not in this case. I still need to have a deep +>>>>>> look at the underlays-related code you added to `po.pm` a while +>>>>>> ago. Stay tuned. --[[intrigeri]] + +>>>>>>> Fixed in my po branch, along with other related small bugs that +>>>>>>> happen in the very same situation only. --[[intrigeri]] + +>>>>>>>> Merged. Not tested yet, but I trust you; [[done]] --[[Joey]] -- cgit v1.2.3 From d085d1ac5db888e95de5a43f818a13570bc4771b Mon Sep 17 00:00:00 2001 From: "http://oblomov.myopenid.com/" Date: Mon, 30 Aug 2010 19:29:31 +0000 Subject: ymlfront vs MMD --- doc/plugins/contrib/ymlfront/discussion.mdwn | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'doc') diff --git a/doc/plugins/contrib/ymlfront/discussion.mdwn b/doc/plugins/contrib/ymlfront/discussion.mdwn index bf9780048..03af5e634 100644 --- a/doc/plugins/contrib/ymlfront/discussion.mdwn +++ b/doc/plugins/contrib/ymlfront/discussion.mdwn @@ -10,3 +10,9 @@ Any objections? > format of putting the YAML literally at the front of the file. It > seemed to allow parsing the file as YAML, using any arbitrary YAML > processer. And it was nice how it avoided boilerplate. --[[Joey]] + +>> The old delimited format also has the advantage of being remarkably similar to the +>> [MultiMarkDown](http://fletcherpenney.net/multimarkdown/users_guide/multimarkdown_syntax_guide/) +>> way of including metadata in documents. The only difference is that MMD doesn't expect the +>> triple-dash separators, but I'm thinking about submitting a patch to MMD to actually support +>> that syntax. --GB -- cgit v1.2.3 From 47cfd14e8436e201facfa906a615fd272dfc156b Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 30 Aug 2010 15:53:37 -0400 Subject: add bug lifted from irc --- .../httpauth_conflicts_with_git_anon_push.mdwn | 25 ++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 doc/bugs/httpauth_conflicts_with_git_anon_push.mdwn (limited to 'doc') diff --git a/doc/bugs/httpauth_conflicts_with_git_anon_push.mdwn b/doc/bugs/httpauth_conflicts_with_git_anon_push.mdwn new file mode 100644 index 000000000..3e496fef4 --- /dev/null +++ b/doc/bugs/httpauth_conflicts_with_git_anon_push.mdwn @@ -0,0 +1,25 @@ +Someone tried to report a bug using IRC while I was on vacation. +--[[Joey]] + +
+julm: [11:58:35] han, it's me the problem; I was generating a post-update hook instead of a pre-receive hook
+julm: [12:03:59] why does the pre-receive hook return: "Status: 302 Found" and a "Location: "? Is it normal?
+julm: [00:08:44] it's Plugin/httpauth.pm which is outputing those Status and Location
+julm: [00:09:12] problem is that it's an anonymous push via git://
+julm: [03:28:53] hacked my way to fix it somehow: http://git.internet.alpes.fr.eu.org/?p=web/ikiwiki.git;a=commitdiff;h=7211df4f7457c3afab53822a97cbd21825c473f4
+
+ +Analysis: + +* IkiWiki::Receive calls `check_canedit`. +* httpauth's canedit hook returns an error handler function + which redirects the browser through the cgiauthurl. + (Similarly, signinedit's hook may call needsignin, which + can display a signin form. +* That doesn't work well when doing a git anon push. :) +* Also, IkiWiki::Receive calls `check_canattach` and + `check_canremove`, which both also call `check_canedit`. + +So, all these calls need to avoid running the error handler +functions returned by canedit hooks, and just return error +messages. -- cgit v1.2.3 From a330b1ee743f093a03ff23b2d4bff42df7def8b9 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 30 Aug 2010 16:05:15 -0400 Subject: Avoid trying to log the user in when receiving anonymous pushes from git and a plugin like httpauth returns a login function. Just use check_canedit in nonfatal mode. --- IkiWiki/Receive.pm | 3 +-- debian/changelog | 2 ++ doc/bugs/httpauth_conflicts_with_git_anon_push.mdwn | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) (limited to 'doc') diff --git a/IkiWiki/Receive.pm b/IkiWiki/Receive.pm index d116049c4..14936f8cd 100644 --- a/IkiWiki/Receive.pm +++ b/IkiWiki/Receive.pm @@ -95,8 +95,7 @@ sub test () { if ($change->{action} eq 'change' || $change->{action} eq 'add') { if (defined $page) { - IkiWiki::check_canedit($page, $cgi, $session); - next; + next if IkiWiki::check_canedit($page, $cgi, $session, 1); } else { if (IkiWiki::Plugin::attachment->can("check_canattach")) { diff --git a/debian/changelog b/debian/changelog index df74e35d1..a1ef33b22 100644 --- a/debian/changelog +++ b/debian/changelog @@ -23,6 +23,8 @@ ikiwiki (3.20100816) UNRELEASED; urgency=low setup. (intrigeri) * t/bazaar.t: Work around bzr 2.2.0's new requirement to configure bzr whoami before committing. + * Avoid trying to log the user in when receiving anonymous pushes + from git and a plugin like httpauth returns a login function. -- Joey Hess Sun, 15 Aug 2010 11:45:48 -0400 diff --git a/doc/bugs/httpauth_conflicts_with_git_anon_push.mdwn b/doc/bugs/httpauth_conflicts_with_git_anon_push.mdwn index 3e496fef4..91507f57a 100644 --- a/doc/bugs/httpauth_conflicts_with_git_anon_push.mdwn +++ b/doc/bugs/httpauth_conflicts_with_git_anon_push.mdwn @@ -22,4 +22,4 @@ Analysis: So, all these calls need to avoid running the error handler functions returned by canedit hooks, and just return error -messages. +messages. [[done]] --[[Joey]] -- cgit v1.2.3 From d09f3e4c2e8e29e96a358b3009e34572ebfc095e Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 30 Aug 2010 17:15:07 -0400 Subject: cleanup sandbox (commit used to test git anon push) --- doc/sandbox.mdwn | 1 - 1 file changed, 1 deletion(-) (limited to 'doc') diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn index 365cb3321..137075ee7 100644 --- a/doc/sandbox.mdwn +++ b/doc/sandbox.mdwn @@ -53,6 +53,5 @@ Bulleted list ---- This **SandBox** is also a [[blog]]! -[[!inline pages="blog/* and !*/Discussion" show="10" rootpage="blog"]] [[!inline pages="sandbox/* and !*/Discussion" rootpage="sandbox" show="4" archive="yes"]] -- cgit v1.2.3 From f44306868c7d9de8133fcde754a727e387b1288a Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 30 Aug 2010 17:18:02 -0400 Subject: remove 2 pages (commit used to test git anon push) --- doc/sandbox/Post.mdwn | 5 ----- doc/sandbox/prova_blog.html | 8 -------- 2 files changed, 13 deletions(-) delete mode 100644 doc/sandbox/Post.mdwn delete mode 100644 doc/sandbox/prova_blog.html (limited to 'doc') diff --git a/doc/sandbox/Post.mdwn b/doc/sandbox/Post.mdwn deleted file mode 100644 index 7ae61669b..000000000 --- a/doc/sandbox/Post.mdwn +++ /dev/null @@ -1,5 +0,0 @@ -Ikiwiki is a **wiki compiler**. It converts wiki pages into HTML pages -suitable for publishing on a website. Ikiwiki stores pages and history in a -[[revision_control_system|rcs]] such as [[Subversion|rcs/svn]] or [[rcs/Git]]. -There are many other [[features]], including support for -[[blogging|blog]], as well as a large array of [[plugins]]. diff --git a/doc/sandbox/prova_blog.html b/doc/sandbox/prova_blog.html deleted file mode 100644 index d69937ea8..000000000 --- a/doc/sandbox/prova_blog.html +++ /dev/null @@ -1,8 +0,0 @@ -Questa è una prova. -Vediamo se funziona - -
-#!/bin/bash
-
-echo "ciao"
-
-- cgit v1.2.3 From 1b1c30a713f4e5273002a633c375821598974c05 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 30 Aug 2010 17:23:13 -0400 Subject: remove note about git-daemon bug Seems to be fixed with git 1.7.1 --- doc/tips/untrusted_git_push.mdwn | 8 -------- 1 file changed, 8 deletions(-) (limited to 'doc') diff --git a/doc/tips/untrusted_git_push.mdwn b/doc/tips/untrusted_git_push.mdwn index 3573a0ddf..b74e0e9d9 100644 --- a/doc/tips/untrusted_git_push.mdwn +++ b/doc/tips/untrusted_git_push.mdwn @@ -112,11 +112,3 @@ abort the push before refs are updated. However, the changeset will still be present in your repository, wasting space. Since nothing refers to it, it will be expired eventually. You can speed up the expiry by running `git prune`. - -When aborting a push, ikiwiki displays an error message about why it didn't -accept it. If using git over ssh, the user will see this error message, -which is probably useful to them. But `git-daemon` is buggy, and hides this -message from the user. This can make it hard for users to figure out why -their push was rejected. (If this happens to you, look at "'git log --stat -origin/master..`" and think about whether your changes would be accepted -over the web interface.) -- cgit v1.2.3 From cd302b6ff40118815881feaf587a8bad71ed5891 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 30 Aug 2010 17:26:14 -0400 Subject: sandbox declutter --- doc/sandbox.mdwn | 3 --- 1 file changed, 3 deletions(-) (limited to 'doc') diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn index 137075ee7..cbef5394e 100644 --- a/doc/sandbox.mdwn +++ b/doc/sandbox.mdwn @@ -46,10 +46,7 @@ Bulleted list * [[different_name_for_a_WikiLink|ikiwiki/WikiLink]] * * [GNU](http://www.gnu.org/) -* - - ---- This **SandBox** is also a [[blog]]! -- cgit v1.2.3 From 1ef1e2d7de2ea5d510d6822186963fe3d47ca5c3 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 30 Aug 2010 17:27:28 -0400 Subject: sandbox declutter --- doc/sandbox.mdwn | 1 - 1 file changed, 1 deletion(-) (limited to 'doc') diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn index cbef5394e..94ddb3224 100644 --- a/doc/sandbox.mdwn +++ b/doc/sandbox.mdwn @@ -15,7 +15,6 @@ Numbered list 1. First item. 1. Sub item. - 2. bar 1. Another. 1. And another.. 1. foo -- cgit v1.2.3 From 2b2d777321267af82c5230df35d5c40b65bd8424 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 30 Aug 2010 17:44:31 -0400 Subject: add sandbox/me.mdwn used to test untrusted git push with httpauth enabled --- doc/sandbox/me.mdwn | 1 + 1 file changed, 1 insertion(+) create mode 100644 doc/sandbox/me.mdwn (limited to 'doc') diff --git a/doc/sandbox/me.mdwn b/doc/sandbox/me.mdwn new file mode 100644 index 000000000..45b983be3 --- /dev/null +++ b/doc/sandbox/me.mdwn @@ -0,0 +1 @@ +hi -- cgit v1.2.3 From e74729a3f0a7e2e9436fe148108ac18728c0d180 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 30 Aug 2010 18:41:39 -0400 Subject: formatting (used to test anon git push again) --- doc/sandbox.mdwn | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn index 94ddb3224..06ce35835 100644 --- a/doc/sandbox.mdwn +++ b/doc/sandbox.mdwn @@ -1,4 +1,5 @@ -This is the [[SandBox]], a page anyone can edit to try out ikiwiki (version [[!version ]]). +This is the [[SandBox]], a page anyone can edit to try out ikiwiki +(version [[!version ]]). > This is a blockquote. > -- cgit v1.2.3 From 89ddd60537abb73af8a739b4e88942cb3fef0d4a Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 30 Aug 2010 18:42:19 -0400 Subject: remove sandbox/me (used to test anon git push again) --- doc/sandbox/me.mdwn | 1 - 1 file changed, 1 deletion(-) delete mode 100644 doc/sandbox/me.mdwn (limited to 'doc') diff --git a/doc/sandbox/me.mdwn b/doc/sandbox/me.mdwn deleted file mode 100644 index 45b983be3..000000000 --- a/doc/sandbox/me.mdwn +++ /dev/null @@ -1 +0,0 @@ -hi -- cgit v1.2.3 From 2eb04d8b4178f920996b0f74c953e956761a8f0b Mon Sep 17 00:00:00 2001 From: "http://kerravonsen.dreamwidth.org/" Date: Tue, 31 Aug 2010 12:36:50 +0000 Subject: keeping triple-dash as default, but making it configurable --- doc/plugins/contrib/ymlfront/discussion.mdwn | 3 +++ 1 file changed, 3 insertions(+) (limited to 'doc') diff --git a/doc/plugins/contrib/ymlfront/discussion.mdwn b/doc/plugins/contrib/ymlfront/discussion.mdwn index 03af5e634..b30c2da37 100644 --- a/doc/plugins/contrib/ymlfront/discussion.mdwn +++ b/doc/plugins/contrib/ymlfront/discussion.mdwn @@ -16,3 +16,6 @@ Any objections? >> way of including metadata in documents. The only difference is that MMD doesn't expect the >> triple-dash separators, but I'm thinking about submitting a patch to MMD to actually support >> that syntax. --GB + +>>> Yes, the idea was to allow the file to be parsed as YAML, you're right. I just found that I tended to have problems when people used "---" for horizontal rules. However, I have also found that trying to keep it solely as an IkiWiki directive doesn't work either, since sometimes the meta-data I need also contained "]]" which broke the parsing of the directive. +>>> So I have decided to go for a compromise, and make the delimiter configurable, rather than hardcoded as "---"; the triple-dash is the default, but it can be configured to be something else instead. I haven't pushed the change yet, but I have written it, and it seems to work. -- [[KathrynAndersen]] -- cgit v1.2.3 From 3e7605d146c73ae283b6a00c1d6d84448805a121 Mon Sep 17 00:00:00 2001 From: Giuseppe Bilotta Date: Tue, 31 Aug 2010 19:39:03 +0200 Subject: more on ymlfront vs MMD --- doc/plugins/contrib/ymlfront/discussion.mdwn | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'doc') diff --git a/doc/plugins/contrib/ymlfront/discussion.mdwn b/doc/plugins/contrib/ymlfront/discussion.mdwn index b30c2da37..0b58982ff 100644 --- a/doc/plugins/contrib/ymlfront/discussion.mdwn +++ b/doc/plugins/contrib/ymlfront/discussion.mdwn @@ -19,3 +19,11 @@ Any objections? >>> Yes, the idea was to allow the file to be parsed as YAML, you're right. I just found that I tended to have problems when people used "---" for horizontal rules. However, I have also found that trying to keep it solely as an IkiWiki directive doesn't work either, since sometimes the meta-data I need also contained "]]" which broke the parsing of the directive. >>> So I have decided to go for a compromise, and make the delimiter configurable, rather than hardcoded as "---"; the triple-dash is the default, but it can be configured to be something else instead. I haven't pushed the change yet, but I have written it, and it seems to work. -- [[KathrynAndersen]] + +>>>> I'm not sure about what kind of problems you're meeting with "---" being used +>>>> for horizontal rules: isn't it sufficient to just check that (1) the triple-dash +>>>> is the first thing in the page and (2) there are only YAML-style assignments +>>>> (and no blank lines) between the two markers? Check #2 would also be enough to +>>>> support MMD-style metadata, which means (a) no start marker and (b) empty line +>>>> to mark the end of the metadata block. Would this be supported by the plugin? +>>>> --GB -- cgit v1.2.3 From 3b81ca0c39e6f03adbaacc0b436db6e7cb958f9f Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 31 Aug 2010 14:30:56 -0400 Subject: add news item for ikiwiki 3.20100831 --- doc/news/version_3.20100610.mdwn | 18 ------------------ doc/news/version_3.20100623.mdwn | 29 ----------------------------- doc/news/version_3.20100831.mdwn | 27 +++++++++++++++++++++++++++ 3 files changed, 27 insertions(+), 47 deletions(-) delete mode 100644 doc/news/version_3.20100610.mdwn delete mode 100644 doc/news/version_3.20100623.mdwn create mode 100644 doc/news/version_3.20100831.mdwn (limited to 'doc') diff --git a/doc/news/version_3.20100610.mdwn b/doc/news/version_3.20100610.mdwn deleted file mode 100644 index ee7c86d72..000000000 --- a/doc/news/version_3.20100610.mdwn +++ /dev/null @@ -1,18 +0,0 @@ -ikiwiki 3.20100610 released with [[!toggle text="these changes"]] -[[!toggleable text=""" - * creation\_day() etc use local time, not gmtime. To match calendars, which - use local time. - * img: Fill in missing height or width when scaling image. - * Remove example blog tag pages; allow autotag creation to create them - when used. - * Fix support for globbing in tagged() pagespecs. - * Fix display of sidebar when previewing page edit. (Thanks, privat) - * relativedate: Fix problem with localised dates not working. - * editpage: Avoid storing accidental state changes when previewing pages. - * page.tmpl: Add a div around the page content, and comments, to aide in - sidebar styling. - * style.css: Improvements to make floating sidebar fit much better on - pages with inlines. - * calendar: Shorten day names, and improve styling of month calendar. - * style.css: Reduced sidebar width back to 20ex from 30; the month calendar - will now fit in the smaller width, and 30 was feeling too large."""]] \ No newline at end of file diff --git a/doc/news/version_3.20100623.mdwn b/doc/news/version_3.20100623.mdwn deleted file mode 100644 index 684217e26..000000000 --- a/doc/news/version_3.20100623.mdwn +++ /dev/null @@ -1,29 +0,0 @@ -ikiwiki 3.20100623 released with [[!toggle text="these changes"]] -[[!toggleable text=""" - * openid: Add openid\_realm and openid\_cgiurl configuration options, - useful in a few edge case setups. - * attachment: Show files from underlay in attachments list. - * img: Support hspace and vspace attributes. - * editpage: Rename "comments" field to avoid CSS conflict with the - comments div. - * edittemplate: Make silent mode not disable display when the template - page does not exist, so it can be easily created. - * edittemplate: Look for template pages under templates/ like everything - else (still looks in old location for backwards compatibility). - * attachment: When inserting links, insert img directives for images, - if that plugin is enabled. - * websetup: Allow enabling plugins listed in disable\_plugins. - * editpage, comments: Fix broken links in sidebar (due to forcebaseurl). - (Thanks, privat) - * calendar: Tune archive\_pagespec to only match pages, not other files. - * Fix issues with combining unicode srcdirs and source files. - (Workaround bug #586045) - * Make --gettime be honored after initial setup. - * git: Fix --gettime to properly support utf8 filenames. - * attachment: Support Windows paths when taking basename of client-supplied - file name. - * theme: New plugin, allows easily themeing a site via the underlay. - * Added actiontabs theme by Svend Sorensen. - * Added blueview theme by Bernd Zeimetz. - * mercurial: Fix buggy getctime code. Closes: #[586279](http://bugs.debian.org/586279) - * link: Enhanced to handle URLs and email addresses. (Bernd Zeimetz)"""]] \ No newline at end of file diff --git a/doc/news/version_3.20100831.mdwn b/doc/news/version_3.20100831.mdwn new file mode 100644 index 000000000..152e3c2f7 --- /dev/null +++ b/doc/news/version_3.20100831.mdwn @@ -0,0 +1,27 @@ +ikiwiki 3.20100831 released with [[!toggle text="these changes"]] +[[!toggleable text=""" + * filecheck: Fall back to using the file command if the freedesktop + magic file cannot identify a file. + * flattr: New plugin. (Thanks to jaywalk for the initial implementation + at a flattr plugin! This one is less configurable, but simpler.) + * smiley: warn instead of error for missing smileys (Giuseppe Bilotta) + * openid: Syntax tweak to the javascript code to make it work with MSIE 7 + (and MSIE 8 in compat mode). Thanks to Iain McLaren for reporting + the bug and providing access to debug it. + * style.css: Use relative, not absolute font sizes. Thanks, Giuseppe Bilotta. + * htmlscrubber: Do not scrub url anchors that contain colons. + * Danish translation update. Closes: #[594673](http://bugs.debian.org/594673) + * highlight: Make location of highlight's files configurable in setup + file to allow for nonstandard installations. + * Allow "link(.)" and similar PageSpecs. Thanks, Giuseppe Bilotta. + * Run the preprocess hooks in scan mode *before* the scan hooks. + This allows the po plugin to register a scan hook that runs + last and rescans pages after all data from the first scan pass is + completed. This avoids the po plugin needing to rebuild some pages. + (intrigeri) + * po: Fix some bugs that affected l10n.ikiwiki.info's unusual + setup. (intrigeri) + * t/bazaar.t: Work around bzr 2.2.0's new requirement to configure + bzr whoami before committing. + * httpauth: Avoid redirecting the user to the cgiauthurl if + they already have a login session."""]] \ No newline at end of file -- cgit v1.2.3 From 040e174b2c5e849cbfa256694813731e444ca4ae Mon Sep 17 00:00:00 2001 From: chrysn Date: Tue, 31 Aug 2010 20:48:49 +0200 Subject: wishlist item: alias directive --- doc/todo/alias_directive.mdwn | 47 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 doc/todo/alias_directive.mdwn (limited to 'doc') diff --git a/doc/todo/alias_directive.mdwn b/doc/todo/alias_directive.mdwn new file mode 100644 index 000000000..4d7817694 --- /dev/null +++ b/doc/todo/alias_directive.mdwn @@ -0,0 +1,47 @@ +An alias directive could work like an inverse redirect, but in a more +maintainable way. Currently, a page might have several redirects leading to it, +without an easy way of enumerating them. Therefore, the following directive is +suggested for addition (possibly by means of a plugin): + +> The `alias` and `aliastext` directives implicitly create +> redirect pages to the page they are used on. If two or more pages claim a +> non-existing page to be an alias, a disambiguation page will automatically +> generated. If an existing page is claimed as an alias, it will be prefixed +> with a note that its topic is also an alias for other pages. +> +> All aliases to a page are automatically listed below the backlink and tag +> lists at the bottom of a page by default. This can be configured globally by +> setting the `alias_list` configuration option to `false`, or set explicitly +> per alias by specifying `list=true` or `list=false`. +> +> Similar to the `taglink` directive, `aliastext` produces the alias name as +> well as registering it. +> +> ## Usage example +> +> `Greece.mdwn`: +> +> > Greece, also known as \[[!aliastext Hellas]] and officially the +> > \[[!aliastext "Hellenic Republic"]], is a … +> > +> > +> > \[[!alias Grece list=false]] +> +> This page by itself will redirect from the "Hellas" and "Hellenic Republic" +> pages as if they both contained just: +> +> > \[[!meta redir="Greece"]] +> +> If, on the other hand, `Hellas Planitia` also claims `[[!alias Hellas]]`, the +> Hellas page will look like this: +> +> > **Hellas** is an alias for the following pages: +> > +> > * \[[Greece]] +> > * \[[Hellas Planitia]] + +The proposed plugin/directive could be extended, eg. by also including +old-style redirects in the alias list, but that might introduce unwanted +coupling with the meta directive. + +[[!tag wishlist]] -- cgit v1.2.3 From 4fbf2f9b6d5de95211b47f4b2f80e3479b3b6811 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawmAN5tpw40_t2tPFDLkP35Fc4zIskJDEtQ" Date: Wed, 1 Sep 2010 00:27:16 +0000 Subject: --- doc/sandbox.mdwn | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'doc') diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn index 06ce35835..7a10c8403 100644 --- a/doc/sandbox.mdwn +++ b/doc/sandbox.mdwn @@ -12,6 +12,13 @@ This is the [[SandBox]], a page anyone can edit to try out ikiwiki > > Back to the first level. +1. Hot Items + 1. Daves Insanity Sauce + 2. Marie Sharps + 1. Blazing Inferno +1. Not so Hot Items + 1. Tabasco + Numbered list 1. First item. -- cgit v1.2.3 From 2a1077f8869ca65b49e09d99a76b595d90b28499 Mon Sep 17 00:00:00 2001 From: "http://kerravonsen.dreamwidth.org/" Date: Wed, 1 Sep 2010 10:09:44 +0000 Subject: YAML is YAML --- doc/plugins/contrib/ymlfront/discussion.mdwn | 2 ++ 1 file changed, 2 insertions(+) (limited to 'doc') diff --git a/doc/plugins/contrib/ymlfront/discussion.mdwn b/doc/plugins/contrib/ymlfront/discussion.mdwn index 0b58982ff..b122294bb 100644 --- a/doc/plugins/contrib/ymlfront/discussion.mdwn +++ b/doc/plugins/contrib/ymlfront/discussion.mdwn @@ -27,3 +27,5 @@ Any objections? >>>> support MMD-style metadata, which means (a) no start marker and (b) empty line >>>> to mark the end of the metadata block. Would this be supported by the plugin? >>>> --GB + +>>>>> Since I allow all legal YAML, the only way to check if it is legal YAML is to use the YAML parser, by which time one is already parsing the YAML, so it seems a bit pointless to check before one does so. -- KA -- cgit v1.2.3 From 704038db298c0f3a8039dcfe8d3a801c26fadf15 Mon Sep 17 00:00:00 2001 From: PaulePanter Date: Thu, 2 Sep 2010 14:09:55 +0000 Subject: Use HTTPS version for [Wikimedia](https://secure.wikimedia.org/) and Google (noted by using DuckDuckGo.com which is directing there) --- doc/shortcuts.mdwn | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'doc') diff --git a/doc/shortcuts.mdwn b/doc/shortcuts.mdwn index 54dd0fdb1..cafe3f573 100644 --- a/doc/shortcuts.mdwn +++ b/doc/shortcuts.mdwn @@ -11,13 +11,13 @@ Some examples of using shortcuts include: This page controls what shortcut links the wiki supports. -* [[!shortcut name=google url="http://www.google.com/search?q=%s"]] +* [[!shortcut name=google url="https://encrypted.google.com/search?q=%s"]] * [[!shortcut name=archive url="http://web.archive.org/*/%S"]] * [[!shortcut name=gmap url="http://maps.google.com/maps?q=%s"]] * [[!shortcut name=gmsg url="http://groups.google.com/groups?selm=%s"]] -* [[!shortcut name=wikipedia url="http://en.wikipedia.org/wiki/%s"]] -* [[!shortcut name=wikitravel url="http://wikitravel.org/en/%s"]] -* [[!shortcut name=wiktionary url="http://en.wiktionary.org/wiki/%s"]] +* [[!shortcut name=wikipedia url="https://secure.wikimedia.org/wikipedia/en/wiki/%s"]] +* [[!shortcut name=wikitravel url="https://wikitravel.org/en/%s"]] +* [[!shortcut name=wiktionary url="https://secure.wikimedia.org/wiktionary/en/wiki/%s"]] * [[!shortcut name=debbug url="http://bugs.debian.org/%S" desc="Debian bug #%s"]] * [[!shortcut name=deblist url="http://lists.debian.org/debian-%s" desc="debian-%s@lists.debian.org"]] * [[!shortcut name=debpkg url="http://packages.debian.org/%s"]] -- cgit v1.2.3 From e3238ee21c8c9c346019f4747ab003801204934e Mon Sep 17 00:00:00 2001 From: PaulePanter Date: Thu, 2 Sep 2010 14:26:49 +0000 Subject: shortcuts: Suggestions for multi-language links --- doc/shortcuts/discussion.mdwn | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 doc/shortcuts/discussion.mdwn (limited to 'doc') diff --git a/doc/shortcuts/discussion.mdwn b/doc/shortcuts/discussion.mdwn new file mode 100644 index 000000000..b48117b67 --- /dev/null +++ b/doc/shortcuts/discussion.mdwn @@ -0,0 +1,11 @@ +# Suggestions for multi-language links + +Sites like Wikipedia have different URLs for each language. The shortcut for Wikipedia `!wikipedia` points to `https://secure.wikimedia.org/wikipedia/en/wiki/%s` which is the English version. + +Do you have a suggestion on how to make that shortcut also be used to point to a different language. + +1. The option to just adapt the shortcut (`s/en/de/`) is quite cumbersome for non English speakers and also has the disadvantage of always updating the shortcut links manually after each modification in the upstream ikiwiki shortcut list to stay in sync. +1. Adding an extra shortcut for every language, e. g. `!wikipediade`, with for example the country TLD in it is an option but would make the shortcut list quite big. +1. Adding a `lang` parameter comes also to my mind, but I do not know how feasible that is. + +Thanks. --[[PaulePanter]] -- cgit v1.2.3 From f67574a82d08b1a21b06befba4e676e5ac55b5cd Mon Sep 17 00:00:00 2001 From: "http://jmtd.livejournal.com/" Date: Thu, 2 Sep 2010 22:20:06 +0000 Subject: discussing Paul's HTTPS edit --- doc/shortcuts/discussion.mdwn | 2 ++ 1 file changed, 2 insertions(+) (limited to 'doc') diff --git a/doc/shortcuts/discussion.mdwn b/doc/shortcuts/discussion.mdwn index b48117b67..6f762173a 100644 --- a/doc/shortcuts/discussion.mdwn +++ b/doc/shortcuts/discussion.mdwn @@ -9,3 +9,5 @@ Do you have a suggestion on how to make that shortcut also be used to point to a 1. Adding a `lang` parameter comes also to my mind, but I do not know how feasible that is. Thanks. --[[PaulePanter]] + +> Does anyone have an opinion on the shortcuts for google/wikipedia pointing at the HTTPS services? Introduced by [this edit by Paul Panter](http://git.ikiwiki.info/?p=ikiwiki;a=blobdiff;f=doc/shortcuts.mdwn;h=cafe3f573ef5cfd4811bee9688afa1675302aca9;hp=54dd0fdb1eadfac386b31b2dd2f014349a54184a;hb=704038db298c0f3a8039dcfe8d3a801c26fadf15;hpb=2a1077f8869ca65b49e09d99a76b595d90b28499). Personally, I think they shuold be separate shortcut keys. Most of my google/WP usage is such that I would prefer it over HTTP (faster, less resource usage at client side). However, I never use the shortcuts feature in ikiwiki anyway... -- [[Jon]] -- cgit v1.2.3 From e0bfb1ef5782530bc5ee0576551b531d7f869fe0 Mon Sep 17 00:00:00 2001 From: "http://jmtd.livejournal.com/" Date: Thu, 2 Sep 2010 22:22:05 +0000 Subject: spelling --- doc/shortcuts/discussion.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/shortcuts/discussion.mdwn b/doc/shortcuts/discussion.mdwn index 6f762173a..aac98457e 100644 --- a/doc/shortcuts/discussion.mdwn +++ b/doc/shortcuts/discussion.mdwn @@ -10,4 +10,4 @@ Do you have a suggestion on how to make that shortcut also be used to point to a Thanks. --[[PaulePanter]] -> Does anyone have an opinion on the shortcuts for google/wikipedia pointing at the HTTPS services? Introduced by [this edit by Paul Panter](http://git.ikiwiki.info/?p=ikiwiki;a=blobdiff;f=doc/shortcuts.mdwn;h=cafe3f573ef5cfd4811bee9688afa1675302aca9;hp=54dd0fdb1eadfac386b31b2dd2f014349a54184a;hb=704038db298c0f3a8039dcfe8d3a801c26fadf15;hpb=2a1077f8869ca65b49e09d99a76b595d90b28499). Personally, I think they shuold be separate shortcut keys. Most of my google/WP usage is such that I would prefer it over HTTP (faster, less resource usage at client side). However, I never use the shortcuts feature in ikiwiki anyway... -- [[Jon]] +> Does anyone have an opinion on the shortcuts for google/wikipedia pointing at the HTTPS services? Introduced by [this edit by Paul Panter](http://git.ikiwiki.info/?p=ikiwiki;a=blobdiff;f=doc/shortcuts.mdwn;h=cafe3f573ef5cfd4811bee9688afa1675302aca9;hp=54dd0fdb1eadfac386b31b2dd2f014349a54184a;hb=704038db298c0f3a8039dcfe8d3a801c26fadf15;hpb=2a1077f8869ca65b49e09d99a76b595d90b28499). Personally, I think they should be separate shortcut keys. Most of my google/WP usage is such that I would prefer it over HTTP (faster, less resource usage at client side). However, I never use the shortcuts feature in ikiwiki anyway... -- [[Jon]] -- cgit v1.2.3 From 23b80f63e718ea029ef8e6317fdb94c9676857e3 Mon Sep 17 00:00:00 2001 From: "http://poisonbit.wordpress.com/" Date: Fri, 3 Sep 2010 15:03:33 +0000 Subject: Manual install as plain user (only curl and build-essential required) on stable --- doc/install/discussion.mdwn | 49 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) (limited to 'doc') diff --git a/doc/install/discussion.mdwn b/doc/install/discussion.mdwn index 02cdb29c9..44152d80b 100644 --- a/doc/install/discussion.mdwn +++ b/doc/install/discussion.mdwn @@ -269,3 +269,52 @@ Any suggestions? Whew! perl Makefile.PL INSTALL_BASE=$HOME PREFIX= make make install + +--- + +03 September 2010, Report on successful manual install in Debian 5 (Lenny) AMD64: + +note: Maybe much more easy using backports, but using this tools you get a plain user cpan :) + +This where my steps: + +As root (#): + + # aptitude install build-essential curl libexpat1-dev + +As plain user ($): + + I use to install user perl modules using local::lib: + + http://github.com/poisonbit/sandbox/blob/master/bin/myperl.sh + + After that and relogin, you can install cpanm :) + + mkdir -p "$HOME/downloads" + cd "$HOME/downloads/" + curl -L http://cpanmin.us | perl - App::cpanminus + source "/home/$USER/.bashrc" + wget http://ftp.de.debian.org/debian/pool/main/i/ikiwiki/ikiwiki_3.20100831.tar.gz + cpanm Text::Markdown + cpanm URI + cpanm HTML::Parser + cpanm HTML::Template + cpanm HTML::Scrubber + cpanm CGI::FormBuilder + cpanm CGI::Session + tar -zxf ikiwiki_3.20100831.tar.gz + cd ikiwiki/ + perl Makefile.PL PREFIX=/home/$USER/.perl5 INSTALL_BASE= + make + make install + make install INSTALL_BASE=/home/$USER/.perl5 + +Using cpan or cpanm with local::lib, you can install any other needed dependency, as plain user in your home (XS modules may need -dev packages) + +After all, here it's: + + ikiwiki --version + ikiwiki version 3.20100831 + +Hope this could be useful for someone some day. +Iñigo -- cgit v1.2.3 From 175ff176f5b5558a7928aea52692f268b65b3dff Mon Sep 17 00:00:00 2001 From: "http://poisonbit.wordpress.com/" Date: Fri, 3 Sep 2010 15:04:52 +0000 Subject: deleting libexpat1-dev, only needed for perlbrew, not for local:lib --- doc/install/discussion.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/install/discussion.mdwn b/doc/install/discussion.mdwn index 44152d80b..c2bb4ba2a 100644 --- a/doc/install/discussion.mdwn +++ b/doc/install/discussion.mdwn @@ -280,7 +280,7 @@ This where my steps: As root (#): - # aptitude install build-essential curl libexpat1-dev + # aptitude install build-essential curl As plain user ($): -- cgit v1.2.3 From eb2f54fb8ffd66df752d63676a843ae6f4ece8e3 Mon Sep 17 00:00:00 2001 From: "http://poisonbit.wordpress.com/" Date: Fri, 3 Sep 2010 15:39:56 +0000 Subject: Modified, retested all with a clean user (last edition was from a bash_history) --- doc/install/discussion.mdwn | 36 ++++++++++++++++++++---------------- 1 file changed, 20 insertions(+), 16 deletions(-) (limited to 'doc') diff --git a/doc/install/discussion.mdwn b/doc/install/discussion.mdwn index c2bb4ba2a..69c2abddc 100644 --- a/doc/install/discussion.mdwn +++ b/doc/install/discussion.mdwn @@ -280,41 +280,45 @@ This where my steps: As root (#): - # aptitude install build-essential curl + # aptitude install build-essential curl perl As plain user ($): - I use to install user perl modules using local::lib: - - http://github.com/poisonbit/sandbox/blob/master/bin/myperl.sh - - After that and relogin, you can install cpanm :) + I use to install user perl modules using local::lib mkdir -p "$HOME/downloads" cd "$HOME/downloads/" + wget http://search.cpan.org/CPAN/authors/id/G/GE/GETTY/local-lib-1.006007.tar.gz + wget http://ftp.de.debian.org/debian/pool/main/i/ikiwiki/ikiwiki_3.20100831.tar.gz + tar -zxf local-lib-1.006007.tar.gz + cd local-lib-1.006007/ + perl Makefile.PL --bootstrap=~/.perl5 + make test && make install + echo 'eval $(perl -I$HOME/.perl5/lib/perl5 -Mlocal::lib)' >>~/.bashrc + . ~/.bashrc curl -L http://cpanmin.us | perl - App::cpanminus source "/home/$USER/.bashrc" - wget http://ftp.de.debian.org/debian/pool/main/i/ikiwiki/ikiwiki_3.20100831.tar.gz - cpanm Text::Markdown - cpanm URI - cpanm HTML::Parser - cpanm HTML::Template - cpanm HTML::Scrubber cpanm CGI::FormBuilder cpanm CGI::Session + cpanm HTML::Parser + cpanm HTML::Template + cpanm -f HTML::Scrubber # tests failed + cpanm Text::Markdown + cpanm URI tar -zxf ikiwiki_3.20100831.tar.gz cd ikiwiki/ - perl Makefile.PL PREFIX=/home/$USER/.perl5 INSTALL_BASE= + perl Makefile.PL INSTALL_BASE= PREFIX=/home/$USER/.perl5 + make tests # All tests successful make - make install make install INSTALL_BASE=/home/$USER/.perl5 + . ~/.bashrc Using cpan or cpanm with local::lib, you can install any other needed dependency, as plain user in your home (XS modules may need -dev packages) After all, here it's: - ikiwiki --version + ikiwiki -version ikiwiki version 3.20100831 -Hope this could be useful for someone some day. +Hope this can be useful for someone. Iñigo -- cgit v1.2.3 From 336d4884baee1c4f45e836a530520695b73b1b20 Mon Sep 17 00:00:00 2001 From: "http://poisonbit.wordpress.com/" Date: Fri, 3 Sep 2010 15:54:47 +0000 Subject: Minor fixes/cleanups on my addition --- doc/install/discussion.mdwn | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'doc') diff --git a/doc/install/discussion.mdwn b/doc/install/discussion.mdwn index 69c2abddc..42c56aa13 100644 --- a/doc/install/discussion.mdwn +++ b/doc/install/discussion.mdwn @@ -294,10 +294,10 @@ As plain user ($): cd local-lib-1.006007/ perl Makefile.PL --bootstrap=~/.perl5 make test && make install - echo 'eval $(perl -I$HOME/.perl5/lib/perl5 -Mlocal::lib)' >>~/.bashrc + echo 'eval $(perl -I$HOME/.perl5/lib/perl5 -Mlocal::lib=$HOME/.perl5)' >>~/.bashrc . ~/.bashrc curl -L http://cpanmin.us | perl - App::cpanminus - source "/home/$USER/.bashrc" + . ~/.bashrc cpanm CGI::FormBuilder cpanm CGI::Session cpanm HTML::Parser @@ -305,15 +305,15 @@ As plain user ($): cpanm -f HTML::Scrubber # tests failed cpanm Text::Markdown cpanm URI + cd .. tar -zxf ikiwiki_3.20100831.tar.gz cd ikiwiki/ perl Makefile.PL INSTALL_BASE= PREFIX=/home/$USER/.perl5 make tests # All tests successful - make make install INSTALL_BASE=/home/$USER/.perl5 . ~/.bashrc -Using cpan or cpanm with local::lib, you can install any other needed dependency, as plain user in your home (XS modules may need -dev packages) +Using cpan or cpanm with local::lib, you can install any other dependency, as plain user (in your home). XS modules may need -dev packages. After all, here it's: -- cgit v1.2.3 From 095b9f1ef5b630a8556247f75ec4e7fbcc7fbb4b Mon Sep 17 00:00:00 2001 From: "http://poisonbit.wordpress.com/" Date: Fri, 3 Sep 2010 15:59:06 +0000 Subject: minor, delete a repited . ~/.bashrc --- doc/install/discussion.mdwn | 1 - 1 file changed, 1 deletion(-) (limited to 'doc') diff --git a/doc/install/discussion.mdwn b/doc/install/discussion.mdwn index 42c56aa13..3cefbd209 100644 --- a/doc/install/discussion.mdwn +++ b/doc/install/discussion.mdwn @@ -297,7 +297,6 @@ As plain user ($): echo 'eval $(perl -I$HOME/.perl5/lib/perl5 -Mlocal::lib=$HOME/.perl5)' >>~/.bashrc . ~/.bashrc curl -L http://cpanmin.us | perl - App::cpanminus - . ~/.bashrc cpanm CGI::FormBuilder cpanm CGI::Session cpanm HTML::Parser -- cgit v1.2.3 From 538bf32181fc0506627535480c75f34a73c058bc Mon Sep 17 00:00:00 2001 From: "http://poisonbit.wordpress.com/" Date: Fri, 3 Sep 2010 16:06:18 +0000 Subject: checking again instructions, HTML::Scrubber does not fail in tests with a clean install. --- doc/install/discussion.mdwn | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'doc') diff --git a/doc/install/discussion.mdwn b/doc/install/discussion.mdwn index 3cefbd209..a6ce1eee3 100644 --- a/doc/install/discussion.mdwn +++ b/doc/install/discussion.mdwn @@ -301,14 +301,14 @@ As plain user ($): cpanm CGI::Session cpanm HTML::Parser cpanm HTML::Template - cpanm -f HTML::Scrubber # tests failed + cpanm HTML::Scrubber cpanm Text::Markdown cpanm URI cd .. tar -zxf ikiwiki_3.20100831.tar.gz cd ikiwiki/ perl Makefile.PL INSTALL_BASE= PREFIX=/home/$USER/.perl5 - make tests # All tests successful + make test # All tests successful. make install INSTALL_BASE=/home/$USER/.perl5 . ~/.bashrc -- cgit v1.2.3 From 89d0d414bfe6f07bce51a31909cfa3bc761aa21c Mon Sep 17 00:00:00 2001 From: "http://poisonbit.wordpress.com/" Date: Fri, 3 Sep 2010 16:12:23 +0000 Subject: problem with /etc files --- doc/install/discussion.mdwn | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/install/discussion.mdwn b/doc/install/discussion.mdwn index a6ce1eee3..c21664c79 100644 --- a/doc/install/discussion.mdwn +++ b/doc/install/discussion.mdwn @@ -319,5 +319,9 @@ After all, here it's: ikiwiki -version ikiwiki version 3.20100831 -Hope this can be useful for someone. +But it seems like this installation looses the /etc files... + + $ find /home/ikiwiki/.perl5/ -iname '*.setup' + $ + Iñigo -- cgit v1.2.3 From bf16d3da43424c4b9cbd5d9c5fecd29ab551cf0a Mon Sep 17 00:00:00 2001 From: "http://poisonbit.wordpress.com/" Date: Fri, 3 Sep 2010 16:17:34 +0000 Subject: Workaround for /etc files --- doc/install/discussion.mdwn | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'doc') diff --git a/doc/install/discussion.mdwn b/doc/install/discussion.mdwn index c21664c79..e37b2a785 100644 --- a/doc/install/discussion.mdwn +++ b/doc/install/discussion.mdwn @@ -280,11 +280,10 @@ This where my steps: As root (#): - # aptitude install build-essential curl perl + aptitude install build-essential curl perl -As plain user ($): - I use to install user perl modules using local::lib +As plain user ($), I use to install user perl modules using local::lib mkdir -p "$HOME/downloads" cd "$HOME/downloads/" @@ -319,9 +318,9 @@ After all, here it's: ikiwiki -version ikiwiki version 3.20100831 -But it seems like this installation looses the /etc files... +It seems like this installation looses the /etc files (we're as plain user), but this can be used as a workaround: + + ikiwiki -setup ~/downloads/ikiwiki/auto.setup - $ find /home/ikiwiki/.perl5/ -iname '*.setup' - $ Iñigo -- cgit v1.2.3 From 40b37861a4a77f2ab2ed069b3e20c770054abce5 Mon Sep 17 00:00:00 2001 From: "http://poisonbit.wordpress.com/" Date: Fri, 3 Sep 2010 16:25:36 +0000 Subject: update issue needing /etc as plain user --- doc/install/discussion.mdwn | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'doc') diff --git a/doc/install/discussion.mdwn b/doc/install/discussion.mdwn index e37b2a785..c06893ec1 100644 --- a/doc/install/discussion.mdwn +++ b/doc/install/discussion.mdwn @@ -322,5 +322,12 @@ It seems like this installation looses the /etc files (we're as plain user), but ikiwiki -setup ~/downloads/ikiwiki/auto.setup +I've not investigated more the /etc files ussage, but does not seems like a good idea to be as plain user... + + /etc/ikiwiki/wikilist does not exist + ** Failed to add you to the system wikilist file. + ** (Probably ikiwiki-update-wikilist is not SUID root.) + ** Your wiki will not be automatically updated when ikiwiki is upgraded. + Iñigo -- cgit v1.2.3 From fe46c31a649872cd2a9afe29e5e0877249760e44 Mon Sep 17 00:00:00 2001 From: Svend Sorensen Date: Fri, 3 Sep 2010 11:17:43 -0700 Subject: Add forum post regarding "bad page name" error --- doc/forum/Forward_slashes_being_escaped_as_252F.mdwn | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 doc/forum/Forward_slashes_being_escaped_as_252F.mdwn (limited to 'doc') diff --git a/doc/forum/Forward_slashes_being_escaped_as_252F.mdwn b/doc/forum/Forward_slashes_being_escaped_as_252F.mdwn new file mode 100644 index 000000000..b9c5aca07 --- /dev/null +++ b/doc/forum/Forward_slashes_being_escaped_as_252F.mdwn @@ -0,0 +1,9 @@ +When I try to edit a page that has a forward slash in the URL, I get "Error: +bad page name". I think the problem is because the forward slash is escaped as +`%252F` instead of `%2F`. + +For example, if I go to `http://ciffer.net/~svend/tech/hosts/` and click Edit, +I am sent to a page with the URL +`http://ciffer.net/~svend/ikiwiki.cgi?page=tech%252Fhosts&do=edit`. + +I am running ikiwiki 3.20100504~bpo50+1 on Debian Lenny. -- cgit v1.2.3 From 3f9244ccf4b7e85acf7816217db67c0b34650854 Mon Sep 17 00:00:00 2001 From: philippe Date: Sat, 4 Sep 2010 07:39:10 +0000 Subject: --- doc/bugs/po:_po_files_instead_of_html_files.mdwn | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'doc') diff --git a/doc/bugs/po:_po_files_instead_of_html_files.mdwn b/doc/bugs/po:_po_files_instead_of_html_files.mdwn index 6e12b51be..d893c71d9 100644 --- a/doc/bugs/po:_po_files_instead_of_html_files.mdwn +++ b/doc/bugs/po:_po_files_instead_of_html_files.mdwn @@ -10,3 +10,13 @@ When i click on "templates.fr", i get the po.file instead of html. > in any configuration. Unless, perhaps, it was just not configured to > support any languages at all, and so the po file was treated as a raw > file. --[[Joey]] + +>> I can reproduce the bug with: + # po plugin + # master language (non-PO files) + po_master_language => { + code => 'en', + name => 'English' + }, + # slave languages (PO files) + po_slave_languages => [qw{fr|Français}], -- cgit v1.2.3 From edb256d2d8c59754e074f71f24644d57442a24e9 Mon Sep 17 00:00:00 2001 From: Changaco Date: Sat, 4 Sep 2010 14:04:51 +0000 Subject: added a patch to make it more like MediaWiki --- doc/plugins/contrib/headinganchors/discussion.mdwn | 32 ++++++++++++++++++++++ 1 file changed, 32 insertions(+) (limited to 'doc') diff --git a/doc/plugins/contrib/headinganchors/discussion.mdwn b/doc/plugins/contrib/headinganchors/discussion.mdwn index 91fe04a6d..151af8d92 100644 --- a/doc/plugins/contrib/headinganchors/discussion.mdwn +++ b/doc/plugins/contrib/headinganchors/discussion.mdwn @@ -1 +1,33 @@ Isn't this functionality a part of what [[plugins/toc]] needs and does? Then probably the [[plugins/toc]] plugin's code could be split into the part that implements the [[plugins/contrib/headinganchors]]'s functionality and the TOC generation itself. That will bring more order into the code and the set of available plugins. --Ivan Z. + +--- + +A patch to make it more like MediaWiki: + +
--- headinganchors.pm
++++ headinganchors.pm
+@@ -5,6 +5,7 @@
+ use warnings;
+ use strict;
+ use IkiWiki 2.00;
++use URI::Escape;
+ 
+ sub import {
+         hook(type => "sanitize", id => "headinganchors", call => \&headinganchors);
+@@ -14,9 +15,11 @@
+         my $str = shift;
+         $str =~ s/^\s+//;
+         $str =~ s/\s+$//;
+-        $str = lc($str);
+-        $str =~ s/[&\?"\'\.,\(\)!]//mig;
+-        $str =~ s/[^a-z]/_/mig;
++        $str =~ s/\s/_/g;
++        $str =~ s/"//g;
++        $str =~ s/^[^a-zA-Z]/z-/; # must start with an alphabetical character
++        $str = uri_escape_utf8($str);
++        $str =~ s/%/./g;
+         return $str;
+ }
+
+ +--Changaco -- cgit v1.2.3 From 306941954e53931626522ef1e7d56693a57dd203 Mon Sep 17 00:00:00 2001 From: "http://marcotmarcot.wordpress.com/" Date: Sun, 5 Sep 2010 14:34:16 +0000 Subject: .darcs --- doc/setup.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/setup.mdwn b/doc/setup.mdwn index 83409228c..ac491baae 100644 --- a/doc/setup.mdwn +++ b/doc/setup.mdwn @@ -68,7 +68,7 @@ source. (Remember to replace "foo" with the real directory name.) cvs -d `pwd`/foo get -P ikiwiki bzr clone foo foo.src hg clone foo foo.src - darcs get foo foo.src + darcs get foo.darcs foo.src # TODO monotone, tla Now to edit pages by hand, go into the directory you checked out (ie, -- cgit v1.2.3 From 38fb7bd42d61d1433f5ccee0dd222ed40668eda7 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawllEHb4oGNaUrl7vyziQGrxAlQFri_BfaE" Date: Sun, 5 Sep 2010 18:31:16 +0000 Subject: --- doc/forum/404_-_not_found.mdwn | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 doc/forum/404_-_not_found.mdwn (limited to 'doc') diff --git a/doc/forum/404_-_not_found.mdwn b/doc/forum/404_-_not_found.mdwn new file mode 100644 index 000000000..ef471192b --- /dev/null +++ b/doc/forum/404_-_not_found.mdwn @@ -0,0 +1,13 @@ +Hi, + +I've followed the tutorial to install ikiwiki. Once installed (on a Ubuntu 10.04 distro running under VirtualBox on a Windows XP, SP3 host), I can access the **http://ubuntu1004/index.lighttpd.html** page without any issues. + +But when I try to access the page **http://ubuntu1004/~geertvc/gwiki** (as is mentioned at the end of the ikiwiki setup), I get the error message "**404 - not found**". + +I've also followed the "dot-cgi" trick, but with the same negative result. The web server I've installed, is lighttpd. + +What did I miss? + +Best rgds, + +--Geert -- cgit v1.2.3 From 0842297678e72819273cd3bfa52420958b36c7e2 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawkIl2-FajX9MSbbfcPYvzbmbsemGJJfXds" Date: Mon, 6 Sep 2010 14:13:49 +0000 Subject: --- doc/bugs/ikiwiki_ignores_PATH_environment.mdwn | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 doc/bugs/ikiwiki_ignores_PATH_environment.mdwn (limited to 'doc') diff --git a/doc/bugs/ikiwiki_ignores_PATH_environment.mdwn b/doc/bugs/ikiwiki_ignores_PATH_environment.mdwn new file mode 100644 index 000000000..63ac4bc31 --- /dev/null +++ b/doc/bugs/ikiwiki_ignores_PATH_environment.mdwn @@ -0,0 +1,9 @@ +At the very top of the main ikiwiki executable script the `PATH` environment is set like this: + + $ENV{PATH}="/usr/local/bin:/usr/bin:/bin:/opt/local/bin"; + +This makes it a little hard to specify which specific binaries should be used, especially if there is more than one of them available (see c.f. where the MacPorts-supplied, up-to-date subversion should be used and not an arcane one from the base distro / OS). Is there a specific reason why ikiwiki wipes out `$PATH` like this or could that line be improved to + + $ENV{PATH}="$ENV{PATH}:/usr/local/bin:/usr/bin:/bin:/opt/local/bin"; + +? The alternative is of course to patch ikiwiki as suggested in the bug, but I wanted to ask here first :) -- cgit v1.2.3 From 7475f90be2c1941d4449791e9e9cd5f3dc3bbb71 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 7 Sep 2010 12:01:20 -0400 Subject: add todo item about hooks not called during untrusted git push --- doc/todo/untrusted_git_push_hooks.mdwn | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 doc/todo/untrusted_git_push_hooks.mdwn (limited to 'doc') diff --git a/doc/todo/untrusted_git_push_hooks.mdwn b/doc/todo/untrusted_git_push_hooks.mdwn new file mode 100644 index 000000000..313078ce5 --- /dev/null +++ b/doc/todo/untrusted_git_push_hooks.mdwn @@ -0,0 +1,12 @@ +Re the canrename, canremove, and canedit hooks: + +Of the three, only canremove is currently checked during an untrusted +git push (a normal git push is assumed to be from a trusted user and +bypasses all checks). + +It would probably make sense to add the canedit hook to the checks done +there. Calling the canrename hook is tricky, because after all, git does +not record explicit file moves. + +The checkcontent hook is another hook not currently called there, that +probably should be. -- cgit v1.2.3 From 8a6f4a7e50c247c061fd74b535d0f292aca6bda7 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 7 Sep 2010 12:08:59 -0400 Subject: needsbuild hook interface changed; the hooks should now return the modified array of things that need built. (Backwards compatability code keeps plugins using the old interface working.) --- IkiWiki/Plugin/aggregate.pm | 2 ++ IkiWiki/Plugin/calendar.pm | 1 + IkiWiki/Plugin/edittemplate.pm | 2 ++ IkiWiki/Plugin/listdirectives.pm | 2 ++ IkiWiki/Plugin/meta.pm | 1 + IkiWiki/Plugin/pinger.pm | 1 + IkiWiki/Plugin/po.pm | 2 ++ IkiWiki/Plugin/skeleton.pm.example | 4 ++++ IkiWiki/Plugin/theme.pm | 1 + IkiWiki/Plugin/version.pm | 1 + IkiWiki/Render.pm | 5 ++++- debian/changelog | 8 ++++++++ doc/plugins/write.mdwn | 4 ++-- 13 files changed, 31 insertions(+), 3 deletions(-) (limited to 'doc') diff --git a/IkiWiki/Plugin/aggregate.pm b/IkiWiki/Plugin/aggregate.pm index 7789c4c2a..fe53d868d 100644 --- a/IkiWiki/Plugin/aggregate.pm +++ b/IkiWiki/Plugin/aggregate.pm @@ -210,6 +210,8 @@ sub needsbuild (@) { markunseen($feed->{sourcepage}); } } + + return $needsbuild; } sub preprocess (@) { diff --git a/IkiWiki/Plugin/calendar.pm b/IkiWiki/Plugin/calendar.pm index bb995d499..c7d2b7c01 100644 --- a/IkiWiki/Plugin/calendar.pm +++ b/IkiWiki/Plugin/calendar.pm @@ -491,6 +491,7 @@ sub needsbuild (@) { } } } + return $needsbuild; } 1 diff --git a/IkiWiki/Plugin/edittemplate.pm b/IkiWiki/Plugin/edittemplate.pm index 226f83bb4..4f07866e4 100644 --- a/IkiWiki/Plugin/edittemplate.pm +++ b/IkiWiki/Plugin/edittemplate.pm @@ -41,6 +41,8 @@ sub needsbuild (@) { } } } + + return $needsbuild; } sub preprocess (@) { diff --git a/IkiWiki/Plugin/listdirectives.pm b/IkiWiki/Plugin/listdirectives.pm index 8a67f7160..835e25388 100644 --- a/IkiWiki/Plugin/listdirectives.pm +++ b/IkiWiki/Plugin/listdirectives.pm @@ -64,6 +64,8 @@ sub needsbuild (@) { } } } + + return $needsbuild; } sub preprocess (@) { diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm index d18585d3d..5941e3f3f 100644 --- a/IkiWiki/Plugin/meta.pm +++ b/IkiWiki/Plugin/meta.pm @@ -37,6 +37,7 @@ sub needsbuild (@) { } } } + return $needsbuild; } sub scrub ($$) { diff --git a/IkiWiki/Plugin/pinger.pm b/IkiWiki/Plugin/pinger.pm index c20ecb5d4..cc9f52d2b 100644 --- a/IkiWiki/Plugin/pinger.pm +++ b/IkiWiki/Plugin/pinger.pm @@ -45,6 +45,7 @@ sub needsbuild (@) { } } } + return $needsbuild; } sub preprocess (@) { diff --git a/IkiWiki/Plugin/po.pm b/IkiWiki/Plugin/po.pm index f3530faf3..7b62092e1 100644 --- a/IkiWiki/Plugin/po.pm +++ b/IkiWiki/Plugin/po.pm @@ -221,6 +221,8 @@ sub needsbuild () { foreach my $master (keys %translations) { map add_depends($_, $master), values %{otherlanguages_pages($master)}; } + + return $needsbuild; } sub scan (@) { diff --git a/IkiWiki/Plugin/skeleton.pm.example b/IkiWiki/Plugin/skeleton.pm.example index 341d67867..7974d5e53 100644 --- a/IkiWiki/Plugin/skeleton.pm.example +++ b/IkiWiki/Plugin/skeleton.pm.example @@ -73,7 +73,11 @@ sub refresh () { } sub needsbuild ($) { + my $needsbuild=shift; + debug("skeleton plugin needsbuild"); + + return $needsbuild; } sub preprocess (@) { diff --git a/IkiWiki/Plugin/theme.pm b/IkiWiki/Plugin/theme.pm index 03b0816ed..ee94547e9 100644 --- a/IkiWiki/Plugin/theme.pm +++ b/IkiWiki/Plugin/theme.pm @@ -60,6 +60,7 @@ sub needsbuild ($) { $wikistate{theme}{currenttheme}=$config{theme}; } + return $needsbuild; } 1 diff --git a/IkiWiki/Plugin/version.pm b/IkiWiki/Plugin/version.pm index c13643478..fc265526c 100644 --- a/IkiWiki/Plugin/version.pm +++ b/IkiWiki/Plugin/version.pm @@ -37,6 +37,7 @@ sub needsbuild (@) { } } } + return $needsbuild; } sub preprocess (@) { diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm index 9921915b4..0dbe9611a 100644 --- a/IkiWiki/Render.pm +++ b/IkiWiki/Render.pm @@ -759,7 +759,10 @@ sub refresh () { my ($new, $internal_new)=find_new_files($files); my ($del, $internal_del)=find_del_files($pages); my ($changed, $internal_changed)=find_changed($files); - run_hooks(needsbuild => sub { shift->($changed) }); + run_hooks(needsbuild => sub { + my $ret=shift->($changed); + $changed=$ret if ref $ret eq 'ARRAY'; + }); my $oldlink_targets=calculate_old_links($changed, $del); foreach my $file (@$changed) { diff --git a/debian/changelog b/debian/changelog index 81bd99a71..430bd302c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +ikiwiki (3.20100832) UNRELEASED; urgency=low + + * needsbuild hook interface changed; the hooks should now return + the modified array of things that need built. (Backwards compatability + code keeps plugins using the old interface working.) + + -- Joey Hess Tue, 07 Sep 2010 12:08:05 -0400 + ikiwiki (3.20100831) unstable; urgency=low * filecheck: Fall back to using the file command if the freedesktop diff --git a/doc/plugins/write.mdwn b/doc/plugins/write.mdwn index 10b4df835..31bb64e68 100644 --- a/doc/plugins/write.mdwn +++ b/doc/plugins/write.mdwn @@ -179,8 +179,8 @@ function is passed no values. This allows a plugin to manipulate the list of files that need to be built when the wiki is refreshed. The function is passed a reference to an -array of files that will be rebuilt, and can modify the array, either -adding or removing files from it. +array of files that will be rebuilt. It should return an array reference +that is a modified version of its input. It can add or remove files from it. ### scan -- cgit v1.2.3 From b3aadbf0bdb67fea1e9944dfa562f1ac020c16ea Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 7 Sep 2010 12:38:40 -0400 Subject: response --- doc/forum/404_-_not_found.mdwn | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) (limited to 'doc') diff --git a/doc/forum/404_-_not_found.mdwn b/doc/forum/404_-_not_found.mdwn index ef471192b..dc3318901 100644 --- a/doc/forum/404_-_not_found.mdwn +++ b/doc/forum/404_-_not_found.mdwn @@ -1,13 +1,22 @@ Hi, -I've followed the tutorial to install ikiwiki. Once installed (on a Ubuntu 10.04 distro running under VirtualBox on a Windows XP, SP3 host), I can access the **http://ubuntu1004/index.lighttpd.html** page without any issues. +I've followed the tutorial to install ikiwiki. Once installed (on a Ubuntu +10.04 distro running under VirtualBox on a Windows XP, SP3 host), I can +access the **http://ubuntu1004/index.lighttpd.html** page without any +issues. -But when I try to access the page **http://ubuntu1004/~geertvc/gwiki** (as is mentioned at the end of the ikiwiki setup), I get the error message "**404 - not found**". +But when I try to access the page **http://ubuntu1004/~geertvc/gwiki** (as +is mentioned at the end of the ikiwiki setup), I get the error message +"**404 - not found**". -I've also followed the "dot-cgi" trick, but with the same negative result. The web server I've installed, is lighttpd. +I've also followed the "dot-cgi" trick, but with the same negative result. +The web server I've installed, is lighttpd. What did I miss? Best rgds, --Geert + +> Perhaps your webserver is not exporting your `public_html` directory +> in `~geertvc`? Check its configuration. --[[Joey]] -- cgit v1.2.3 From 5f101ab1209e36c6e1a415a2e17677224025077c Mon Sep 17 00:00:00 2001 From: intrigeri Date: Tue, 7 Sep 2010 19:18:24 +0200 Subject: Removing tag done as it seems to need some more care. --- doc/bugs/po:_po_files_instead_of_html_files.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/bugs/po:_po_files_instead_of_html_files.mdwn b/doc/bugs/po:_po_files_instead_of_html_files.mdwn index d893c71d9..8238f50df 100644 --- a/doc/bugs/po:_po_files_instead_of_html_files.mdwn +++ b/doc/bugs/po:_po_files_instead_of_html_files.mdwn @@ -3,7 +3,7 @@ At the bottom of this page, there is the "Links" line: Links: index index.fr templates templates.fr When i click on "templates.fr", i get the po.file instead of html. - Sorry for the noise! I set "po_master_language" to fr and all was ok. [[done]]. + Sorry for the noise! I set "po_master_language" to fr and all was ok. > Any chance you could be a bit more verbose about what the > misconfiguration was? I don't think the po plugin should behave like that -- cgit v1.2.3 From 5c6c0813ca8dff8c42ac32ed9702568228f8407b Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 7 Sep 2010 13:47:50 -0400 Subject: Remove PATH overriding code in ikiwiki script that was present to make perl taint checking happy, but taint checking is disabled. --- debian/changelog | 2 ++ doc/bugs/ikiwiki_ignores_PATH_environment.mdwn | 9 +++++++++ ikiwiki.in | 3 --- 3 files changed, 11 insertions(+), 3 deletions(-) (limited to 'doc') diff --git a/debian/changelog b/debian/changelog index 430bd302c..a9892938a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,8 @@ ikiwiki (3.20100832) UNRELEASED; urgency=low * needsbuild hook interface changed; the hooks should now return the modified array of things that need built. (Backwards compatability code keeps plugins using the old interface working.) + * Remove PATH overriding code in ikiwiki script that was present to make + perl taint checking happy, but taint checking is disabled. -- Joey Hess Tue, 07 Sep 2010 12:08:05 -0400 diff --git a/doc/bugs/ikiwiki_ignores_PATH_environment.mdwn b/doc/bugs/ikiwiki_ignores_PATH_environment.mdwn index 63ac4bc31..5097acaef 100644 --- a/doc/bugs/ikiwiki_ignores_PATH_environment.mdwn +++ b/doc/bugs/ikiwiki_ignores_PATH_environment.mdwn @@ -7,3 +7,12 @@ This makes it a little hard to specify which specific binaries should be used, e $ENV{PATH}="$ENV{PATH}:/usr/local/bin:/usr/bin:/bin:/opt/local/bin"; ? The alternative is of course to patch ikiwiki as suggested in the bug, but I wanted to ask here first :) + +> You can use the ENV setting in your setup file to set any environment +> variables you like. Since ikiwiki.cgi is run by the web browser, that +> is the best way to ensure ikiwiki always runs with a given variable set. +> +> As a suid program, the ikiwiki wrappers have to sanitize the environment. +> The ikiwiki script's own sanitization of PATH was done to make perl taint +> checking happy, but as taint checking is disabled anyway, I have removed +> that. [[done]] --[[Joey]] diff --git a/ikiwiki.in b/ikiwiki.in index bcda2469b..339efd37c 100755 --- a/ikiwiki.in +++ b/ikiwiki.in @@ -1,7 +1,4 @@ #!/usr/bin/perl -$ENV{PATH}="/usr/local/bin:/usr/bin:/bin"; -delete @ENV{qw{IFS CDPATH ENV BASH_ENV}}; - package IkiWiki; use warnings; -- cgit v1.2.3 From 3c16ca60794df8196e05cb45a31f8b8f36b4a613 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 7 Sep 2010 15:59:57 -0400 Subject: web server is forcing a redirect --- doc/forum/Forward_slashes_being_escaped_as_252F.mdwn | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'doc') diff --git a/doc/forum/Forward_slashes_being_escaped_as_252F.mdwn b/doc/forum/Forward_slashes_being_escaped_as_252F.mdwn index b9c5aca07..cabb21b5c 100644 --- a/doc/forum/Forward_slashes_being_escaped_as_252F.mdwn +++ b/doc/forum/Forward_slashes_being_escaped_as_252F.mdwn @@ -7,3 +7,16 @@ I am sent to a page with the URL `http://ciffer.net/~svend/ikiwiki.cgi?page=tech%252Fhosts&do=edit`. I am running ikiwiki 3.20100504~bpo50+1 on Debian Lenny. + + +> But on your page, the Edit link is escaped normally and correctly (using %2F). +> Look at the page source! +> +> The problem is that your web server is forcing a hard (302) redirect +> to the doubly-escaped url. In wireshark I see your web server send back: + + HTTP/1.1 302 Found\r\n + Apache/2.2.9 (Debian) PHP/5.2.6-1+lenny9 with Suhosin-Patch + Location: http://ciffer.net/~svend/ikiwiki.cgi?page=tech%252Fhosts&do=edit + +> You'll need to investigate why your web server is doing that... --[[Joey]] -- cgit v1.2.3 From c8cfeb9329d7cef7e26bec7bcafd0f72cf28c413 Mon Sep 17 00:00:00 2001 From: Svend Sorensen Date: Tue, 7 Sep 2010 15:54:04 -0700 Subject: Issue resolved. Thanks Joey! --- doc/forum/Forward_slashes_being_escaped_as_252F.mdwn | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'doc') diff --git a/doc/forum/Forward_slashes_being_escaped_as_252F.mdwn b/doc/forum/Forward_slashes_being_escaped_as_252F.mdwn index cabb21b5c..5df81e561 100644 --- a/doc/forum/Forward_slashes_being_escaped_as_252F.mdwn +++ b/doc/forum/Forward_slashes_being_escaped_as_252F.mdwn @@ -20,3 +20,14 @@ I am running ikiwiki 3.20100504~bpo50+1 on Debian Lenny. Location: http://ciffer.net/~svend/ikiwiki.cgi?page=tech%252Fhosts&do=edit > You'll need to investigate why your web server is doing that... --[[Joey]] + +>> Thanks for pointing me in the right direction. I have the following redirect +>> in my Apache config. + + RewriteEngine on + RewriteCond %{HTTP_HOST} ^www\.ciffer\.net$ + RewriteRule /(.*) http://ciffer.net/$1 [L,R] + +>> and my ikiwiki url setting contained `www.ciffer.net`, which was causing the +>> redirect. Correcting the url fixed the problem. I'm still not sure why +>> Apache was mangling the URL. --[[Svend]] -- cgit v1.2.3 From a27ab08b622c253a8545fa8f514e031275820a7d Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawngqGADV9fidHK5qabIzKN0bx1ZIfvaTqs" Date: Wed, 8 Sep 2010 21:24:52 +0000 Subject: --- doc/rcs/svn/discussion.mdwn | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'doc') diff --git a/doc/rcs/svn/discussion.mdwn b/doc/rcs/svn/discussion.mdwn index 426735182..7d683d050 100644 --- a/doc/rcs/svn/discussion.mdwn +++ b/doc/rcs/svn/discussion.mdwn @@ -11,3 +11,14 @@ can act upon them sequentially, or (2) optionally divorce the `ikiwiki I'm not aware of web servers, at least apache, killing cgi processes when the user stops a page load. If this is happening ikiwiki should be able to avoid it by blocking whatever signal is causing it to terminate. --[[Joey]] + +Just as an experiment, I tried running ikiwiki using a *remote* repository, +i.e. via "svn+ssh". After setting up the repo and relocating the working copy, +unfortunately, it doesn't work; editing a page gives the error: + +Error: no element found at line 3, column 0, byte 28 at /opt/local/lib/perl5/vendor_perl/5.10.1/darwin-multi-2level/XML/Parser.pm line 187 + +I *think* this is because, despite a SetEnv directive in the apache configuration, +the CGI wrapper is expunging SVN_SSH from the environment (based on perusing +the source of Wrapper.pm and looking at "envsave" there at the top). +Is this the case? --Glenn -- cgit v1.2.3 From 3e0223b351872624921dbb177f38281bb51f2eac Mon Sep 17 00:00:00 2001 From: tschwinge Date: Thu, 9 Sep 2010 14:38:54 +0000 Subject: Tags now work as I'd expect them to. --- doc/users/tschwinge.mdwn | 4 ---- 1 file changed, 4 deletions(-) (limited to 'doc') diff --git a/doc/users/tschwinge.mdwn b/doc/users/tschwinge.mdwn index 414612aff..46c29a0d6 100644 --- a/doc/users/tschwinge.mdwn +++ b/doc/users/tschwinge.mdwn @@ -35,10 +35,6 @@ Markdown rendering, for example). -## Tags -- [[bugs/tagged__40____41___matching_wikilinks]] - -Tags should be a separate concept from wikilinks. - ### \[[!map]] behavior The \[[!map]] on, for example, -- cgit v1.2.3 From 62672f88cdae1fcc811d7fe99fbafc678d2a857a Mon Sep 17 00:00:00 2001 From: "http://jmtd.livejournal.com/" Date: Thu, 9 Sep 2010 21:41:07 +0000 Subject: Added a comment --- .../comment_1_3dea2600474f77fb986767da4d507d62._comment | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 doc/forum/404_-_not_found/comment_1_3dea2600474f77fb986767da4d507d62._comment (limited to 'doc') diff --git a/doc/forum/404_-_not_found/comment_1_3dea2600474f77fb986767da4d507d62._comment b/doc/forum/404_-_not_found/comment_1_3dea2600474f77fb986767da4d507d62._comment new file mode 100644 index 000000000..453419cf3 --- /dev/null +++ b/doc/forum/404_-_not_found/comment_1_3dea2600474f77fb986767da4d507d62._comment @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="http://jmtd.livejournal.com/" + ip="188.222.50.68" + subject="comment 1" + date="2010-09-09T21:41:07Z" + content=""" +You probably need to run \"lighttpd-enable-mod userdir\" +"""]] -- cgit v1.2.3 From fb9019a9dab686a931bc5e9549bc08c672f202f4 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 9 Sep 2010 18:24:49 -0400 Subject: response --- doc/rcs/svn/discussion.mdwn | 3 +++ 1 file changed, 3 insertions(+) (limited to 'doc') diff --git a/doc/rcs/svn/discussion.mdwn b/doc/rcs/svn/discussion.mdwn index 7d683d050..887b5c4a2 100644 --- a/doc/rcs/svn/discussion.mdwn +++ b/doc/rcs/svn/discussion.mdwn @@ -22,3 +22,6 @@ I *think* this is because, despite a SetEnv directive in the apache configuratio the CGI wrapper is expunging SVN_SSH from the environment (based on perusing the source of Wrapper.pm and looking at "envsave" there at the top). Is this the case? --Glenn + +> That seems likely. You can edit Wrapper.pm and add `SVN_SSH` to the +> `@envsave` list and rebuild your wrappers to test it. --[[Joey]] -- cgit v1.2.3 From 32a70b7c4859dfeb6f9fa91fb4bc0f4d709b8376 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawngqGADV9fidHK5qabIzKN0bx1ZIfvaTqs" Date: Fri, 10 Sep 2010 13:00:03 +0000 Subject: Move the svn+ssh discussion to the forum. --- doc/forum/using_svn+ssh_with_ikiwiki.mdwn | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 doc/forum/using_svn+ssh_with_ikiwiki.mdwn (limited to 'doc') diff --git a/doc/forum/using_svn+ssh_with_ikiwiki.mdwn b/doc/forum/using_svn+ssh_with_ikiwiki.mdwn new file mode 100644 index 000000000..b80e8e834 --- /dev/null +++ b/doc/forum/using_svn+ssh_with_ikiwiki.mdwn @@ -0,0 +1,9 @@ +Just as an experiment, I tried running ikiwiki using a remote repository, i.e. via "svn+ssh". After setting up the repo and relocating the working copy, unfortunately, it doesn't work; editing a page gives the error: + +Error: no element found at line 3, column 0, byte 28 at /opt/local/lib/perl5/vendor_perl/5.10.1/darwin-multi-2level/XML/Parser.pm line 187 + +I think this is because, despite a SetEnv directive in the apache configuration, the CGI wrapper is expunging SVN_SSH from the environment (based on perusing the source of Wrapper.pm and looking at "envsave" there at the top). Is this the case? --Glenn + +That seems likely. You can edit Wrapper.pm and add SVN_SSH to the @envsave list and rebuild your wrappers to test it. --Joey + +A better way(?) would be to add a plugin to set the SVN_SSH variable at the appropriate moment (or even to add this to the SVN plugin). What kind of hook should this be; it needs to run just *after* the CGI script cleans its environment? -- cgit v1.2.3 From 807a75f6b6d95910deb68359873563b528e17d82 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawngqGADV9fidHK5qabIzKN0bx1ZIfvaTqs" Date: Fri, 10 Sep 2010 13:01:14 +0000 Subject: Move the discussion of svn+ssh to the forum for now. --- doc/rcs/svn/discussion.mdwn | 14 -------------- 1 file changed, 14 deletions(-) (limited to 'doc') diff --git a/doc/rcs/svn/discussion.mdwn b/doc/rcs/svn/discussion.mdwn index 887b5c4a2..426735182 100644 --- a/doc/rcs/svn/discussion.mdwn +++ b/doc/rcs/svn/discussion.mdwn @@ -11,17 +11,3 @@ can act upon them sequentially, or (2) optionally divorce the `ikiwiki I'm not aware of web servers, at least apache, killing cgi processes when the user stops a page load. If this is happening ikiwiki should be able to avoid it by blocking whatever signal is causing it to terminate. --[[Joey]] - -Just as an experiment, I tried running ikiwiki using a *remote* repository, -i.e. via "svn+ssh". After setting up the repo and relocating the working copy, -unfortunately, it doesn't work; editing a page gives the error: - -Error: no element found at line 3, column 0, byte 28 at /opt/local/lib/perl5/vendor_perl/5.10.1/darwin-multi-2level/XML/Parser.pm line 187 - -I *think* this is because, despite a SetEnv directive in the apache configuration, -the CGI wrapper is expunging SVN_SSH from the environment (based on perusing -the source of Wrapper.pm and looking at "envsave" there at the top). -Is this the case? --Glenn - -> That seems likely. You can edit Wrapper.pm and add `SVN_SSH` to the -> `@envsave` list and rebuild your wrappers to test it. --[[Joey]] -- cgit v1.2.3 From 0754b92fde09951912f7846fcf05388632c8edc7 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawngqGADV9fidHK5qabIzKN0bx1ZIfvaTqs" Date: Fri, 10 Sep 2010 13:02:13 +0000 Subject: --- doc/forum/using_svn+ssh_with_ikiwiki.mdwn | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'doc') diff --git a/doc/forum/using_svn+ssh_with_ikiwiki.mdwn b/doc/forum/using_svn+ssh_with_ikiwiki.mdwn index b80e8e834..a5da15b6a 100644 --- a/doc/forum/using_svn+ssh_with_ikiwiki.mdwn +++ b/doc/forum/using_svn+ssh_with_ikiwiki.mdwn @@ -1,9 +1,9 @@ Just as an experiment, I tried running ikiwiki using a remote repository, i.e. via "svn+ssh". After setting up the repo and relocating the working copy, unfortunately, it doesn't work; editing a page gives the error: -Error: no element found at line 3, column 0, byte 28 at /opt/local/lib/perl5/vendor_perl/5.10.1/darwin-multi-2level/XML/Parser.pm line 187 +> Error: no element found at line 3, column 0, byte 28 at /opt/local/lib/perl5/vendor_perl/5.10.1/darwin-multi-2level/XML/Parser.pm line 187 -I think this is because, despite a SetEnv directive in the apache configuration, the CGI wrapper is expunging SVN_SSH from the environment (based on perusing the source of Wrapper.pm and looking at "envsave" there at the top). Is this the case? --Glenn +I think this is because, despite a SetEnv directive in the apache configuration, the CGI wrapper is expunging SVN_SSH from the environment (based on perusing the source of Wrapper.pm and looking at "envsave" there at the top). Is this the case? --[[Glenn|geychaner@mac.com] -That seems likely. You can edit Wrapper.pm and add SVN_SSH to the @envsave list and rebuild your wrappers to test it. --Joey +> That seems likely. You can edit Wrapper.pm and add SVN_SSH to the @envsave list and rebuild your wrappers to test it. --Joey -A better way(?) would be to add a plugin to set the SVN_SSH variable at the appropriate moment (or even to add this to the SVN plugin). What kind of hook should this be; it needs to run just *after* the CGI script cleans its environment? +A better way(?) would be to add a plugin to set the SVN_SSH variable at the appropriate moment (or even to add this to the SVN plugin). What kind of hook should this be; it needs to run just *after* the CGI script cleans its environment? --[[Glenn|geychaner@mac.com] -- cgit v1.2.3 From 5bee98156aaee2ea796703ecd5df2d4a25e9d9b8 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawngqGADV9fidHK5qabIzKN0bx1ZIfvaTqs" Date: Fri, 10 Sep 2010 13:02:36 +0000 Subject: --- doc/forum/using_svn+ssh_with_ikiwiki.mdwn | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'doc') diff --git a/doc/forum/using_svn+ssh_with_ikiwiki.mdwn b/doc/forum/using_svn+ssh_with_ikiwiki.mdwn index a5da15b6a..ce271722c 100644 --- a/doc/forum/using_svn+ssh_with_ikiwiki.mdwn +++ b/doc/forum/using_svn+ssh_with_ikiwiki.mdwn @@ -2,8 +2,8 @@ Just as an experiment, I tried running ikiwiki using a remote repository, i.e. v > Error: no element found at line 3, column 0, byte 28 at /opt/local/lib/perl5/vendor_perl/5.10.1/darwin-multi-2level/XML/Parser.pm line 187 -I think this is because, despite a SetEnv directive in the apache configuration, the CGI wrapper is expunging SVN_SSH from the environment (based on perusing the source of Wrapper.pm and looking at "envsave" there at the top). Is this the case? --[[Glenn|geychaner@mac.com] +I think this is because, despite a SetEnv directive in the apache configuration, the CGI wrapper is expunging SVN_SSH from the environment (based on perusing the source of Wrapper.pm and looking at "envsave" there at the top). Is this the case? --[[Glenn|geychaner@mac.com]] > That seems likely. You can edit Wrapper.pm and add SVN_SSH to the @envsave list and rebuild your wrappers to test it. --Joey -A better way(?) would be to add a plugin to set the SVN_SSH variable at the appropriate moment (or even to add this to the SVN plugin). What kind of hook should this be; it needs to run just *after* the CGI script cleans its environment? --[[Glenn|geychaner@mac.com] +A better way(?) would be to add a plugin to set the SVN_SSH variable at the appropriate moment (or even to add this to the SVN plugin). What kind of hook should this be; it needs to run just *after* the CGI script cleans its environment? --[[Glenn|geychaner@mac.com]] -- cgit v1.2.3 From fbfda5ccfce40d3f0b5a6076ef02f07e9e5b8fd6 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 10 Sep 2010 13:13:00 -0400 Subject: po: Make the po_master_language use a langpair like "en|English", so it can be configured via the web. --- IkiWiki/Plugin/po.pm | 81 ++++++++++++++++++++++++++++++++-------------------- debian/changelog | 2 ++ doc/plugins/po.mdwn | 2 +- 3 files changed, 53 insertions(+), 32 deletions(-) (limited to 'doc') diff --git a/IkiWiki/Plugin/po.pm b/IkiWiki/Plugin/po.pm index 651c98ed7..a233fb5af 100644 --- a/IkiWiki/Plugin/po.pm +++ b/IkiWiki/Plugin/po.pm @@ -25,6 +25,7 @@ use File::Temp; use Memoize; use UNIVERSAL; +my ($master_language_code, $master_language_name); my %translations; my @origneedsbuild; my %origsubs; @@ -95,10 +96,7 @@ sub getsetup () { }, po_master_language => { type => "string", - example => { - 'code' => 'en', - 'name' => 'English' - }, + example => "en|English", description => "master language (non-PO files)", safe => 1, rebuild => 1, @@ -132,24 +130,31 @@ sub getsetup () { } sub checkconfig () { - foreach my $field (qw{po_master_language}) { - if (! exists $config{$field} || ! defined $config{$field}) { - error(sprintf(gettext("Must specify %s when using the %s plugin"), - $field, 'po')); + if (exists $config{po_master_language}) { + if (! ref $config{po_master_language}) { + ($master_language_code, $master_language_name)= + splitlangpair($config{po_master_language}); } + else { + $master_language_code=$config{po_master_language}{code}; + $master_language_name=$config{po_master_language}{name}; + } + } + if (! defined $master_language_code) { + $master_language_code='en'; + } + if (! defined $master_language_name) { + $master_language_name='English'; } if (ref $config{po_slave_languages} eq 'ARRAY') { my %slaves; foreach my $pair (@{$config{po_slave_languages}}) { - my ($code, $name) = ( $pair =~ /^([a-z]{2})\|(.+)$/ ); - if (!defined $code || !defined $name) { - error(sprintf(gettext("%s has invalid syntax: must use CODE|NAME"), - $pair)); + my ($code, $name)=splitlangpair($pair); + if (defined $code) { + push @slavelanguages, $code; + $slaves{$code} = $name; } - $slaves{$code} = $name; - push @slavelanguages, $code; - } $config{po_slave_languages} = \%slaves; } @@ -159,12 +164,12 @@ sub checkconfig () { } keys %{$config{po_slave_languages}}; } - delete $config{po_slave_languages}{$config{po_master_language}{code}};; + delete $config{po_slave_languages}{$master_language_code}; map { islanguagecode($_) or error(sprintf(gettext("%s is not a valid language code"), $_)); - } ($config{po_master_language}{code}, @slavelanguages); + } ($master_language_code, @slavelanguages); if (! exists $config{po_translatable_pages} || ! defined $config{po_translatable_pages}) { @@ -198,11 +203,11 @@ sub checkconfig () { if -d "$config{underlaydirbase}/po/$ll/$underlay"; } - if ($config{po_master_language}{code} ne 'en') { + if ($master_language_code ne 'en') { # Add underlay containing translated source files # for the master language. - add_underlay("locale/$config{po_master_language}{code}/$underlay") - if -d "$config{underlaydirbase}/locale/$config{po_master_language}{code}/$underlay"; + add_underlay("locale/$master_language_code/$underlay") + if -d "$config{underlaydirbase}/locale/$master_language_code/$underlay"; } } } @@ -512,7 +517,7 @@ sub formbuilder_setup (@) { if ($form->field("do") eq "create") { # Warn the user: new pages must be written in master language. my $template=template("pocreatepage.tmpl"); - $template->param(LANG => $config{po_master_language}{name}); + $template->param(LANG => $master_language_name); $form->tmpl_param(message => $template->output); } elsif ($form->field("do") eq "edit") { @@ -601,7 +606,7 @@ sub mybeautify_urlpath ($) { my $res=$origsubs{'beautify_urlpath'}->($url); if (defined $config{po_link_to} && $config{po_link_to} eq "negotiated") { - $res =~ s!/\Qindex.$config{po_master_language}{code}.$config{htmlext}\E$!/!; + $res =~ s!/\Qindex.$master_language_code.$config{htmlext}\E$!/!; $res =~ s!/\Qindex.$config{htmlext}\E$!/!; map { $res =~ s!/\Qindex.$_.$config{htmlext}\E$!/!; @@ -824,7 +829,7 @@ sub lang ($) { if (1 < (my ($masterpage, $lang) = _istranslation($page))) { return $lang; } - return $config{po_master_language}{code}; + return $master_language_code; } sub islanguagecode ($) { @@ -837,7 +842,7 @@ sub otherlanguage_page ($$) { my $page=shift; my $code=shift; - return masterpage($page) if $code eq $config{po_master_language}{code}; + return masterpage($page) if $code eq $master_language_code; return masterpage($page) . '.' . $code; } @@ -851,9 +856,9 @@ sub otherlanguages_codes ($) { return \@ret unless istranslation($page) || istranslatable($page); my $curlang=lang($page); foreach my $lang - ($config{po_master_language}{code}, @slavelanguages) { + ($master_language_code, @slavelanguages) { next if $lang eq $curlang; - if ($lang eq $config{po_master_language}{code} || + if ($lang eq $master_language_code || istranslatedto(masterpage($page), $lang)) { push @ret, $lang; } @@ -1008,8 +1013,8 @@ sub percenttranslated ($) { sub languagename ($) { my $code=shift; - return $config{po_master_language}{name} - if $code eq $config{po_master_language}{code}; + return $master_language_name + if $code eq $master_language_code; return $config{po_slave_languages}{$code} if defined $config{po_slave_languages}{$code}; return; @@ -1022,13 +1027,13 @@ sub otherlanguagesloop ($) { if (istranslation($page)) { push @ret, { url => urlto_with_orig_beautiful_urlpath(masterpage($page), $page), - code => $config{po_master_language}{code}, - language => $config{po_master_language}{name}, + code => $master_language_code, + language => $master_language_name, master => 1, }; } foreach my $lang (@{otherlanguages_codes($page)}) { - next if $lang eq $config{po_master_language}{code}; + next if $lang eq $master_language_code; my $otherpage = otherlanguage_page($page, $lang); push @ret, { url => urlto_with_orig_beautiful_urlpath($otherpage, $page), @@ -1233,6 +1238,20 @@ sub po4a_options($) { return %options; } +sub splitlangpair ($) { + my $pair=shift; + + my ($code, $name) = ( $pair =~ /^([a-z]{2})\|(.+)$/ ); + if (! defined $code || ! defined $name || + ! length $code || ! length $name) { + # not a fatal error to avoid breaking if used with web setup + print STDERR sprintf(gettext("%s has invalid syntax: must use CODE|NAME"), + $pair)."\n"; + } + + return $code, $name; +} + # ,---- # | PageSpecs # `---- diff --git a/debian/changelog b/debian/changelog index ebccf4698..72b220a4f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,8 @@ ikiwiki (3.20100832) UNRELEASED; urgency=low perl taint checking happy, but taint checking is disabled. * teximg: Use Unicode UTF-8 encoding by default. Closes: #596067 Thanks, Paul Menzel. + * po: Make the po_master_language use a langpair like "en|English", + so it can be configured via the web. * po: Allow enabling via web setup. -- Joey Hess Tue, 07 Sep 2010 12:08:05 -0400 diff --git a/doc/plugins/po.mdwn b/doc/plugins/po.mdwn index da58a9f49..2acbc366a 100644 --- a/doc/plugins/po.mdwn +++ b/doc/plugins/po.mdwn @@ -49,7 +49,7 @@ Supported languages `po_master_language` is used to set the "master" language in `ikiwiki.setup`, such as: - po_master_language => { 'code' => 'en', 'name' => 'English' } + po_master_language => 'en|English' `po_slave_languages` is used to set the list of supported "slave" languages, such as: -- cgit v1.2.3 From a3ce17387c2af17a419114ef863afb6f06d4c816 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawngqGADV9fidHK5qabIzKN0bx1ZIfvaTqs" Date: Fri, 10 Sep 2010 20:50:05 +0000 Subject: --- doc/forum/recovering_original_title_with_meta_directive.mdwn | 1 + 1 file changed, 1 insertion(+) create mode 100644 doc/forum/recovering_original_title_with_meta_directive.mdwn (limited to 'doc') diff --git a/doc/forum/recovering_original_title_with_meta_directive.mdwn b/doc/forum/recovering_original_title_with_meta_directive.mdwn new file mode 100644 index 000000000..ad0b02a9e --- /dev/null +++ b/doc/forum/recovering_original_title_with_meta_directive.mdwn @@ -0,0 +1 @@ +When using the \[[!meta title=""]] directive, the documentation states that a template variable is set when the title is overridden. However, how does one recover the original page title? --[[Glenn|geychaner@mac.com]] -- cgit v1.2.3 From c4ebdd6f467f3361b1f444d9462e10acdbcf9322 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 10 Sep 2010 17:17:08 -0400 Subject: Pass array of names of files that have been deleted to needsbuild hook as second parameter, to allow for plugins that needs access to this information earlier than the delete hook. --- IkiWiki/Plugin/inline.pm | 5 +++-- IkiWiki/Render.pm | 2 +- debian/changelog | 3 +++ doc/plugins/write.mdwn | 13 +++++++++---- 4 files changed, 16 insertions(+), 7 deletions(-) (limited to 'doc') diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm index 715a3d652..20c5f3bdd 100644 --- a/IkiWiki/Plugin/inline.pm +++ b/IkiWiki/Plugin/inline.pm @@ -570,9 +570,9 @@ sub genfeed ($$$$$@) { } } + my $file=$pagesources{$p}; + my $type=pagetype($file); if ($itemtemplate->query(name => "enclosure")) { - my $file=$pagesources{$p}; - my $type=pagetype($file); if (defined $type) { $itemtemplate->param(content => $pcontent); } @@ -591,6 +591,7 @@ sub genfeed ($$$$$@) { } } else { + next unless defined $type; $itemtemplate->param(content => $pcontent); } diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm index 0dbe9611a..7ea919abc 100644 --- a/IkiWiki/Render.pm +++ b/IkiWiki/Render.pm @@ -760,7 +760,7 @@ sub refresh () { my ($del, $internal_del)=find_del_files($pages); my ($changed, $internal_changed)=find_changed($files); run_hooks(needsbuild => sub { - my $ret=shift->($changed); + my $ret=shift->($changed, [@$del, @$internal_del]); $changed=$ret if ref $ret eq 'ARRAY'; }); my $oldlink_targets=calculate_old_links($changed, $del); diff --git a/debian/changelog b/debian/changelog index 4b61a12b0..bf294b6d4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,6 +12,9 @@ ikiwiki (3.20100832) UNRELEASED; urgency=low * po: Allow enabling via web setup. * po: Auto-upgrade old format settings to new formats when writing setup file. + * Pass array of names of files that have been deleted to needsbuild hook + as second parameter, to allow for plugins that needs access to this + information earlier than the delete hook. -- Joey Hess Tue, 07 Sep 2010 12:08:05 -0400 diff --git a/doc/plugins/write.mdwn b/doc/plugins/write.mdwn index 31bb64e68..e60314485 100644 --- a/doc/plugins/write.mdwn +++ b/doc/plugins/write.mdwn @@ -177,10 +177,15 @@ function is passed no values. hook(type => "needsbuild", id => "foo", call => \&needsbuild); -This allows a plugin to manipulate the list of files that need to be -built when the wiki is refreshed. The function is passed a reference to an -array of files that will be rebuilt. It should return an array reference -that is a modified version of its input. It can add or remove files from it. +This allows a plugin to observe or even manipulate the list of files that +need to be built when the wiki is refreshed. + +As its first parameter, the function is passed a reference to an array of +files that will be built. It should return an array reference that is a +modified version of its input. It can add or remove files from it. + +The second parameter passed to the function is a reference to an array of +files that have been deleted. ### scan -- cgit v1.2.3 From a68e98d9c26e6133624a3b4a54a6a67ce0d2fd86 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 11 Sep 2010 13:06:45 -0400 Subject: bug report --- doc/bugs/po:_markdown_link_parse_bug.mdwn | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 doc/bugs/po:_markdown_link_parse_bug.mdwn (limited to 'doc') diff --git a/doc/bugs/po:_markdown_link_parse_bug.mdwn b/doc/bugs/po:_markdown_link_parse_bug.mdwn new file mode 100644 index 000000000..93400f4c0 --- /dev/null +++ b/doc/bugs/po:_markdown_link_parse_bug.mdwn @@ -0,0 +1,14 @@ +Apparently this is legal markdown, though unusual syntax for a link: + + \[Branchable](http://www.branchable.com/ "Ikiwiki hosting") + +If that is put on a translatable page, the translations display it not as a +link, but in the escaped form that appears above. + +Probably a po4a bug, but I don't see the bug clearly in the gernerated po +file: + + "This was posted automatically by [Branchable](http://www.branchable.com/ " + "\"Ikiwiki hosting\") when I signed up." + +--[[Joey]] -- cgit v1.2.3 From 0ef8c10fe4a025ad13a8e5e1d3a4569489455ec4 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 11 Sep 2010 13:08:31 -0400 Subject: formatting --- doc/bugs/po:_markdown_link_parse_bug.mdwn | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'doc') diff --git a/doc/bugs/po:_markdown_link_parse_bug.mdwn b/doc/bugs/po:_markdown_link_parse_bug.mdwn index 93400f4c0..10715001c 100644 --- a/doc/bugs/po:_markdown_link_parse_bug.mdwn +++ b/doc/bugs/po:_markdown_link_parse_bug.mdwn @@ -1,9 +1,9 @@ Apparently this is legal markdown, though unusual syntax for a link: - \[Branchable](http://www.branchable.com/ "Ikiwiki hosting") + [Branchable](http://www.branchable.com/ "Ikiwiki hosting") If that is put on a translatable page, the translations display it not as a -link, but in the escaped form that appears above. +link, but as plain text. Probably a po4a bug, but I don't see the bug clearly in the gernerated po file: -- cgit v1.2.3 From 46eb410220f0ad50c07693f746e0f38481aa194b Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawllEHb4oGNaUrl7vyziQGrxAlQFri_BfaE" Date: Sun, 12 Sep 2010 06:45:28 +0000 Subject: Added a comment --- ...ent_2_948e4678be6f82d9b541132405351a2c._comment | 31 ++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 doc/forum/404_-_not_found/comment_2_948e4678be6f82d9b541132405351a2c._comment (limited to 'doc') diff --git a/doc/forum/404_-_not_found/comment_2_948e4678be6f82d9b541132405351a2c._comment b/doc/forum/404_-_not_found/comment_2_948e4678be6f82d9b541132405351a2c._comment new file mode 100644 index 000000000..c3fb72db5 --- /dev/null +++ b/doc/forum/404_-_not_found/comment_2_948e4678be6f82d9b541132405351a2c._comment @@ -0,0 +1,31 @@ +[[!comment format=mdwn + username="https://www.google.com/accounts/o8/id?id=AItOawllEHb4oGNaUrl7vyziQGrxAlQFri_BfaE" + nickname="Geert" + subject="comment 2" + date="2010-09-12T06:45:27Z" + content=""" +After a re-installation of ikiwiki (first removed all old files), I get the following feedback: + + Successfully set up gwiki: + url: http://ubuntu1004/~geertvc/gwiki + srcdir: ~/gwiki + destdir: ~/public_html/gwiki + repository: ~/gwiki.git + To modify settings, edit ~/gwiki.setup and then run: + ikiwiki -setup ~/gwiki.setup + + +In the lighttpd config file (/etc/lighttpd/lighttpd.conf), I've now changed the item \"server.document-root\" from the default \"/var/www\" to (in my case) \"/home/geertvc/public_html/gwiki\". I've taken the destdir location (see above) as document root for lighttpd. + +When doing this, I can see the \"index.html\" page of ikiwiki (by typing the following URL in the address box of the browser: \"ubuntu1004/index.html\"). So, that seems to be the right modification, right? Or isn't it? + +Note: when I take the directory \"/home/geertvc/gwiki\" (= the URL given above), then things do not work. I can't see the content of \"index.html\", I get the error message I mentioned in my initial post (404 - not found). + +But when clicking, for instance, the \"Edit\" button, the link brings me to the following location: + + http://ubuntu1004/~geertvc/gwiki/ikiwiki.cgi?page=index&do=edit + +However, there's not at all a file called \"ikiwiki.cgi\" at that location. The location of the file \"ikiwiki.cgi\" is \"/home/geertvc/public_html/gwiki\", so why is the link \"Edit\" leading me to that (wrong?) location? + +Apparently, something is still wrong with my settings. Hope, with the above information, someone can put me on the right track... +"""]] -- cgit v1.2.3 From bf8991112089b6d6f77856fff02fd0496330469b Mon Sep 17 00:00:00 2001 From: "http://jmtd.livejournal.com/" Date: Sun, 12 Sep 2010 12:26:49 +0000 Subject: Added a comment: Follow instructions --- .../comment_3_4c7b1fa88776815bbc6aa286606214c2._comment | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 doc/forum/404_-_not_found/comment_3_4c7b1fa88776815bbc6aa286606214c2._comment (limited to 'doc') diff --git a/doc/forum/404_-_not_found/comment_3_4c7b1fa88776815bbc6aa286606214c2._comment b/doc/forum/404_-_not_found/comment_3_4c7b1fa88776815bbc6aa286606214c2._comment new file mode 100644 index 000000000..9f606f04e --- /dev/null +++ b/doc/forum/404_-_not_found/comment_3_4c7b1fa88776815bbc6aa286606214c2._comment @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="http://jmtd.livejournal.com/" + ip="78.105.191.131" + subject="Follow instructions" + date="2010-09-12T12:26:49Z" + content=""" +Please re-read my comment. If you enable usersdirs then /~user corresponds to ~/public_html. The change you have made has / corresponding instead, which is why the links don't work. +"""]] -- cgit v1.2.3 From 75bf370d4c9aedaa039a93753ff093447c8f09fc Mon Sep 17 00:00:00 2001 From: blipvert Date: Sun, 12 Sep 2010 15:36:28 +0000 Subject: --- doc/bugs/git.pm_should_prune_remote_branches_when_fetching.mdwn | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 doc/bugs/git.pm_should_prune_remote_branches_when_fetching.mdwn (limited to 'doc') diff --git a/doc/bugs/git.pm_should_prune_remote_branches_when_fetching.mdwn b/doc/bugs/git.pm_should_prune_remote_branches_when_fetching.mdwn new file mode 100644 index 000000000..50047789e --- /dev/null +++ b/doc/bugs/git.pm_should_prune_remote_branches_when_fetching.mdwn @@ -0,0 +1,3 @@ +The _git_ module does not appear ever to prune obsolete remote branches in the _srcdir_ repository, leading to spurious errors when fetching. + +Pruning remote branches is done automatically with the --prune option to "git fetch" or in a separate command "git remote prune". -- cgit v1.2.3 From c2950540725db1dda7c02f567c7c26a0f86c98f3 Mon Sep 17 00:00:00 2001 From: blipvert Date: Sun, 12 Sep 2010 15:38:19 +0000 Subject: added signature --- doc/bugs/git.pm_should_prune_remote_branches_when_fetching.mdwn | 2 ++ 1 file changed, 2 insertions(+) (limited to 'doc') diff --git a/doc/bugs/git.pm_should_prune_remote_branches_when_fetching.mdwn b/doc/bugs/git.pm_should_prune_remote_branches_when_fetching.mdwn index 50047789e..137fc2398 100644 --- a/doc/bugs/git.pm_should_prune_remote_branches_when_fetching.mdwn +++ b/doc/bugs/git.pm_should_prune_remote_branches_when_fetching.mdwn @@ -1,3 +1,5 @@ The _git_ module does not appear ever to prune obsolete remote branches in the _srcdir_ repository, leading to spurious errors when fetching. Pruning remote branches is done automatically with the --prune option to "git fetch" or in a separate command "git remote prune". + +--[[blipvert]] -- cgit v1.2.3 From adfe73de439162ec3dca344573409fb89a8909ce Mon Sep 17 00:00:00 2001 From: blipvert Date: Sun, 12 Sep 2010 17:01:55 +0000 Subject: minor grammatical edit --- doc/bugs/git.pm_should_prune_remote_branches_when_fetching.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/bugs/git.pm_should_prune_remote_branches_when_fetching.mdwn b/doc/bugs/git.pm_should_prune_remote_branches_when_fetching.mdwn index 137fc2398..4f42b082f 100644 --- a/doc/bugs/git.pm_should_prune_remote_branches_when_fetching.mdwn +++ b/doc/bugs/git.pm_should_prune_remote_branches_when_fetching.mdwn @@ -1,5 +1,5 @@ The _git_ module does not appear ever to prune obsolete remote branches in the _srcdir_ repository, leading to spurious errors when fetching. -Pruning remote branches is done automatically with the --prune option to "git fetch" or in a separate command "git remote prune". +Pruning remote branches can be done automatically with the --prune option to "git fetch" or in a separate command "git remote prune". --[[blipvert]] -- cgit v1.2.3 From f4392bc4dd3be5833b8a7b3c1b37515a7e3b3b1f Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 12 Sep 2010 15:56:17 -0400 Subject: response --- doc/bugs/git.pm_should_prune_remote_branches_when_fetching.mdwn | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'doc') diff --git a/doc/bugs/git.pm_should_prune_remote_branches_when_fetching.mdwn b/doc/bugs/git.pm_should_prune_remote_branches_when_fetching.mdwn index 4f42b082f..bf68350e3 100644 --- a/doc/bugs/git.pm_should_prune_remote_branches_when_fetching.mdwn +++ b/doc/bugs/git.pm_should_prune_remote_branches_when_fetching.mdwn @@ -3,3 +3,7 @@ The _git_ module does not appear ever to prune obsolete remote branches in the _ Pruning remote branches can be done automatically with the --prune option to "git fetch" or in a separate command "git remote prune". --[[blipvert]] + +> I'll need more information than that before I add extra processing +> work to the current git commands it uses. I don't see any errors here +> from obsolete remote branches. --[[Joey]] -- cgit v1.2.3 From 827bd1d99027b845cb2fbc9f87200b5316f449c6 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawngqGADV9fidHK5qabIzKN0bx1ZIfvaTqs" Date: Sun, 12 Sep 2010 22:48:49 +0000 Subject: --- doc/bugs/ikiwiki_ignores_PATH_environment.mdwn | 2 ++ 1 file changed, 2 insertions(+) (limited to 'doc') diff --git a/doc/bugs/ikiwiki_ignores_PATH_environment.mdwn b/doc/bugs/ikiwiki_ignores_PATH_environment.mdwn index 5097acaef..992ea0a2a 100644 --- a/doc/bugs/ikiwiki_ignores_PATH_environment.mdwn +++ b/doc/bugs/ikiwiki_ignores_PATH_environment.mdwn @@ -16,3 +16,5 @@ This makes it a little hard to specify which specific binaries should be used, e > The ikiwiki script's own sanitization of PATH was done to make perl taint > checking happy, but as taint checking is disabled anyway, I have removed > that. [[done]] --[[Joey]] + +Question: Do ikiwiki.cgi and the RCS post-commit script sanitize the $PATH separately from bin/ikiwiki? If not, then bin/ikiwiki is probably right to sanitize the $PATH; otherwise you've created a security hole with access to the account that ikiwiki is SUID to. It'd be nice if /opt/local/bin were earlier in the $PATH, but that can be changed (as noted) in the setup file. [[Glenn|geychaner@mac.com]] -- cgit v1.2.3 From f6127eb9fa53d375f6ad3d079c75a279c268e9cd Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawngqGADV9fidHK5qabIzKN0bx1ZIfvaTqs" Date: Sun, 12 Sep 2010 22:50:33 +0000 Subject: Add comment about this issue --- doc/bugs/ikiwiki_ignores_PATH_environment.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/bugs/ikiwiki_ignores_PATH_environment.mdwn b/doc/bugs/ikiwiki_ignores_PATH_environment.mdwn index 992ea0a2a..1cf99d826 100644 --- a/doc/bugs/ikiwiki_ignores_PATH_environment.mdwn +++ b/doc/bugs/ikiwiki_ignores_PATH_environment.mdwn @@ -17,4 +17,4 @@ This makes it a little hard to specify which specific binaries should be used, e > checking happy, but as taint checking is disabled anyway, I have removed > that. [[done]] --[[Joey]] -Question: Do ikiwiki.cgi and the RCS post-commit script sanitize the $PATH separately from bin/ikiwiki? If not, then bin/ikiwiki is probably right to sanitize the $PATH; otherwise you've created a security hole with access to the account that ikiwiki is SUID to. It'd be nice if /opt/local/bin were earlier in the $PATH, but that can be changed (as noted) in the setup file. [[Glenn|geychaner@mac.com]] +Question: Do ikiwiki.cgi and the RCS post-commit script sanitize the $PATH separately from bin/ikiwiki? If not, then bin/ikiwiki is probably right to sanitize the $PATH; otherwise you've created a security hole with access to the account that ikiwiki is SUID to. It'd be nice if /opt/local/bin were earlier in the $PATH, but that can be changed (as noted) in the setup file. [[Glenn|geychaner@mac.com]] (Also the person who started this by filing an issue with MacPorts; I'm experimenting with ikiwiki for collaborative documentation.) -- cgit v1.2.3 From 62c2fdbb257720cdbb79415437a3a312e5277ce6 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawngqGADV9fidHK5qabIzKN0bx1ZIfvaTqs" Date: Sun, 12 Sep 2010 22:53:01 +0000 Subject: Hopefully solve it myself, based on comments found elsewhere. --- doc/forum/using_svn+ssh_with_ikiwiki.mdwn | 2 ++ 1 file changed, 2 insertions(+) (limited to 'doc') diff --git a/doc/forum/using_svn+ssh_with_ikiwiki.mdwn b/doc/forum/using_svn+ssh_with_ikiwiki.mdwn index ce271722c..8d9c27e46 100644 --- a/doc/forum/using_svn+ssh_with_ikiwiki.mdwn +++ b/doc/forum/using_svn+ssh_with_ikiwiki.mdwn @@ -7,3 +7,5 @@ I think this is because, despite a SetEnv directive in the apache configuration, > That seems likely. You can edit Wrapper.pm and add SVN_SSH to the @envsave list and rebuild your wrappers to test it. --Joey A better way(?) would be to add a plugin to set the SVN_SSH variable at the appropriate moment (or even to add this to the SVN plugin). What kind of hook should this be; it needs to run just *after* the CGI script cleans its environment? --[[Glenn|geychaner@mac.com]] + +Actually, this probably doesn't need to be a plugin; setting SVN_SSH in ENV can probably be done through the setup file. (Right?) --[[Glenn|geychaner@mac.com]] -- cgit v1.2.3 From a52ef8d746bacdf3137effe03393c0ef06cc7917 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 12 Sep 2010 18:53:34 -0400 Subject: response --- doc/bugs/ikiwiki_ignores_PATH_environment.mdwn | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'doc') diff --git a/doc/bugs/ikiwiki_ignores_PATH_environment.mdwn b/doc/bugs/ikiwiki_ignores_PATH_environment.mdwn index 1cf99d826..6781d4b4b 100644 --- a/doc/bugs/ikiwiki_ignores_PATH_environment.mdwn +++ b/doc/bugs/ikiwiki_ignores_PATH_environment.mdwn @@ -18,3 +18,7 @@ This makes it a little hard to specify which specific binaries should be used, e > that. [[done]] --[[Joey]] Question: Do ikiwiki.cgi and the RCS post-commit script sanitize the $PATH separately from bin/ikiwiki? If not, then bin/ikiwiki is probably right to sanitize the $PATH; otherwise you've created a security hole with access to the account that ikiwiki is SUID to. It'd be nice if /opt/local/bin were earlier in the $PATH, but that can be changed (as noted) in the setup file. [[Glenn|geychaner@mac.com]] (Also the person who started this by filing an issue with MacPorts; I'm experimenting with ikiwiki for collaborative documentation.) + +> The suid wrappers remove all environment variables except for a few used +> for CGI. PATH is not propigated by them, so when they run ikiwiki it will +> get the system's default path now. --[[Joey]] -- cgit v1.2.3 From d2fbde0e814d873017ccc7d71eb585b9391dff9a Mon Sep 17 00:00:00 2001 From: Javier Rojas Date: Sun, 12 Sep 2010 19:25:38 -0500 Subject: new version of the ikiwiki vim plugin. docs upgraded. new forum post --- doc/forum/ikiwiki_vim_integration.mdwn | 17 +++++++++++++++++ doc/forum/link_autocompletion_in_vim.mdwn | 7 ++++++- doc/plugins/contrib/headinganchors.mdwn | 1 + doc/tips/vim_and_ikiwiki.mdwn | 28 ++++++++++++++++++++++++++++ doc/tips/vim_syntax_highlighting.mdwn | 5 +++++ 5 files changed, 57 insertions(+), 1 deletion(-) create mode 100644 doc/forum/ikiwiki_vim_integration.mdwn create mode 100644 doc/tips/vim_and_ikiwiki.mdwn (limited to 'doc') diff --git a/doc/forum/ikiwiki_vim_integration.mdwn b/doc/forum/ikiwiki_vim_integration.mdwn new file mode 100644 index 000000000..4724807e8 --- /dev/null +++ b/doc/forum/ikiwiki_vim_integration.mdwn @@ -0,0 +1,17 @@ +Hi all. I upgraded the [ikiwiki-nav plugin](http://www.vim.org/scripts/script.php?script_id=2968) +so that now it supports: + + * Jumping to the file corresponding to the wikilink under the cursor. + * Creating the file corresponding to the wikilink under the cursor (including + directories if necessary.) + * Jumping to the previous/next wikilink in the current file. + * Autocomplete link names. + +Download it from [here](http://www.vim.org/scripts/script.php?script_id=2968) + +I've also created a new page unifying all the hints available here to use vim +with ikiwiki files, in [[tips/vim_and_ikiwiki]] + + +--[[jerojasro]] + diff --git a/doc/forum/link_autocompletion_in_vim.mdwn b/doc/forum/link_autocompletion_in_vim.mdwn index 7d3ed8b02..a46c7e4c1 100644 --- a/doc/forum/link_autocompletion_in_vim.mdwn +++ b/doc/forum/link_autocompletion_in_vim.mdwn @@ -1,5 +1,10 @@ +This page is deprecated. See [[tips/vim_and_ikiwiki]] for the most up to date +content. + +------ + I extended the functionality of the [ikiwiki-nav plugin](http://www.vim.org/scripts/script.php?script_id=2968) -(see [[here|tips/follow_wikilinks_from_inside_vim]]) to allow completion of +(see [[here|tips/vim_ikiwiki_ftplugin]]) to allow completion of wikilinks from inside vim, through the omnicompletion mechanism. It still has some bugs, but is usable, and will not destroy your data. It can diff --git a/doc/plugins/contrib/headinganchors.mdwn b/doc/plugins/contrib/headinganchors.mdwn index becbf89a5..5ef054bce 100644 --- a/doc/plugins/contrib/headinganchors.mdwn +++ b/doc/plugins/contrib/headinganchors.mdwn @@ -1,4 +1,5 @@ [[!template id=plugin name=headinganchors author="[[PaulWise]]"]] +[[ikiwiki/directive/cosa]] This is a simple plugin to add ids (which will serve as [[anchor]]s) to all headings, based on their text. It works as a postprocessing filter, allowing it to work on mdwn, wiki, html, diff --git a/doc/tips/vim_and_ikiwiki.mdwn b/doc/tips/vim_and_ikiwiki.mdwn new file mode 100644 index 000000000..eb22e353a --- /dev/null +++ b/doc/tips/vim_and_ikiwiki.mdwn @@ -0,0 +1,28 @@ +# Vim and ikiwiki + +## Syntax highlighting + +[ikiwiki-syntax](http://www.vim.org/scripts/script.php?script_id=3156) is a vim +syntax highlighting file for ikiwiki [[ikiwiki/markdown]] files. It highlights +directives and wikilinks. It only supports prefixed directives, i.e., +\[[!directive foo=bar baz]], not the old format with spaces. + +------ + +The previous syntax definition for ikiwiki links is at [[ikiwiki.vim]]; however, +it seems to not be [[maintained +anymore|forum/navigation_of_wiki_pages_on_local_filesystem_with_vim#syn-maintenance]], +and it has some [[issues|forum/ikiwiki_vim_syntaxfile]]. + +## Page creation and navigation + +The [ikiwiki-nav](http://www.vim.org/scripts/script.php?script_id=2968) package +is a vim plugin that enables you to do the following from inside vim: + + * Jumping to the file corresponding to the wikilink under the cursor. + * Creating the file corresponding to the wikilink under the cursor (including + directories if necessary.) + * Jumping to the previous/next wikilink in the current file. + * Autocomplete link names. + +Download it from [here](http://www.vim.org/scripts/script.php?script_id=2968) diff --git a/doc/tips/vim_syntax_highlighting.mdwn b/doc/tips/vim_syntax_highlighting.mdwn index bf7104aec..8f2fdc1f0 100644 --- a/doc/tips/vim_syntax_highlighting.mdwn +++ b/doc/tips/vim_syntax_highlighting.mdwn @@ -1,3 +1,8 @@ +This page is deprecated. See [[tips/vim_and_ikiwiki]] for the most up to date +content + +-------- + [ikiwiki-syntax](http://www.vim.org/scripts/script.php?script_id=3156) is a vim syntax highlighting file for ikiwiki [[ikiwiki/markdown]] files. It highlights directives and wikilinks. It only supports prefixed directives, i.e., -- cgit v1.2.3 From 4c74a6c0925f16de1583e28fe11833ee0a93fdc9 Mon Sep 17 00:00:00 2001 From: Javier Rojas Date: Sun, 12 Sep 2010 19:27:44 -0500 Subject: reverted typo --- doc/plugins/contrib/headinganchors.mdwn | 1 - 1 file changed, 1 deletion(-) (limited to 'doc') diff --git a/doc/plugins/contrib/headinganchors.mdwn b/doc/plugins/contrib/headinganchors.mdwn index 5ef054bce..becbf89a5 100644 --- a/doc/plugins/contrib/headinganchors.mdwn +++ b/doc/plugins/contrib/headinganchors.mdwn @@ -1,5 +1,4 @@ [[!template id=plugin name=headinganchors author="[[PaulWise]]"]] -[[ikiwiki/directive/cosa]] This is a simple plugin to add ids (which will serve as [[anchor]]s) to all headings, based on their text. It works as a postprocessing filter, allowing it to work on mdwn, wiki, html, -- cgit v1.2.3 From bed67815fb34ed8210e8cf9c53017f902e7439c5 Mon Sep 17 00:00:00 2001 From: blipvert Date: Mon, 13 Sep 2010 01:44:37 +0000 Subject: --- doc/bugs/git.pm_should_prune_remote_branches_when_fetching.mdwn | 2 ++ 1 file changed, 2 insertions(+) (limited to 'doc') diff --git a/doc/bugs/git.pm_should_prune_remote_branches_when_fetching.mdwn b/doc/bugs/git.pm_should_prune_remote_branches_when_fetching.mdwn index bf68350e3..5b7be1187 100644 --- a/doc/bugs/git.pm_should_prune_remote_branches_when_fetching.mdwn +++ b/doc/bugs/git.pm_should_prune_remote_branches_when_fetching.mdwn @@ -7,3 +7,5 @@ Pruning remote branches can be done automatically with the --prune option to "gi > I'll need more information than that before I add extra processing > work to the current git commands it uses. I don't see any errors here > from obsolete remote branches. --[[Joey]] + +Suppose a remote repository contains a branch named "foo", and you fetch from it. Then, someone renames that branch to "foo/bar". The next time you fetch from that repository, you will get an error because the obsolete branch "foo" is blocking the branch "foo/bar" from being created (due to the way git stores refs for branches). Pruning gets around the problem. It doesn't really add much overhead to the fetch, and in fact it can *save* overhead since obsolete branches do consume resource (any commits they point to cannot be garbage collected). -- cgit v1.2.3 From c647e12c92fe635e07734946e815db41ec44ddfd Mon Sep 17 00:00:00 2001 From: blipvert Date: Mon, 13 Sep 2010 01:45:13 +0000 Subject: --- doc/bugs/git.pm_should_prune_remote_branches_when_fetching.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/bugs/git.pm_should_prune_remote_branches_when_fetching.mdwn b/doc/bugs/git.pm_should_prune_remote_branches_when_fetching.mdwn index 5b7be1187..4c1e461e3 100644 --- a/doc/bugs/git.pm_should_prune_remote_branches_when_fetching.mdwn +++ b/doc/bugs/git.pm_should_prune_remote_branches_when_fetching.mdwn @@ -8,4 +8,4 @@ Pruning remote branches can be done automatically with the --prune option to "gi > work to the current git commands it uses. I don't see any errors here > from obsolete remote branches. --[[Joey]] -Suppose a remote repository contains a branch named "foo", and you fetch from it. Then, someone renames that branch to "foo/bar". The next time you fetch from that repository, you will get an error because the obsolete branch "foo" is blocking the branch "foo/bar" from being created (due to the way git stores refs for branches). Pruning gets around the problem. It doesn't really add much overhead to the fetch, and in fact it can *save* overhead since obsolete branches do consume resource (any commits they point to cannot be garbage collected). +Suppose a remote repository contains a branch named "foo", and you fetch from it. Then, someone renames that branch to "foo/bar". The next time you fetch from that repository, you will get an error because the obsolete branch "foo" is blocking the branch "foo/bar" from being created (due to the way git stores refs for branches). Pruning gets around the problem. It doesn't really add much overhead to the fetch, and in fact it can *save* overhead since obsolete branches do consume resource (any commits they point to cannot be garbage collected). --[[blipvert]] -- cgit v1.2.3 From 0586d52f1f8978e53e90df32a21ebd346eabaa1b Mon Sep 17 00:00:00 2001 From: blipvert Date: Mon, 13 Sep 2010 01:46:22 +0000 Subject: fix typo --- doc/bugs/git.pm_should_prune_remote_branches_when_fetching.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/bugs/git.pm_should_prune_remote_branches_when_fetching.mdwn b/doc/bugs/git.pm_should_prune_remote_branches_when_fetching.mdwn index 4c1e461e3..01f3d1a28 100644 --- a/doc/bugs/git.pm_should_prune_remote_branches_when_fetching.mdwn +++ b/doc/bugs/git.pm_should_prune_remote_branches_when_fetching.mdwn @@ -8,4 +8,4 @@ Pruning remote branches can be done automatically with the --prune option to "gi > work to the current git commands it uses. I don't see any errors here > from obsolete remote branches. --[[Joey]] -Suppose a remote repository contains a branch named "foo", and you fetch from it. Then, someone renames that branch to "foo/bar". The next time you fetch from that repository, you will get an error because the obsolete branch "foo" is blocking the branch "foo/bar" from being created (due to the way git stores refs for branches). Pruning gets around the problem. It doesn't really add much overhead to the fetch, and in fact it can *save* overhead since obsolete branches do consume resource (any commits they point to cannot be garbage collected). --[[blipvert]] +Suppose a remote repository contains a branch named "foo", and you fetch from it. Then, someone renames that branch to "foo/bar". The next time you fetch from that repository, you will get an error because the obsolete branch "foo" is blocking the branch "foo/bar" from being created (due to the way git stores refs for branches). Pruning gets around the problem. It doesn't really add much overhead to the fetch, and in fact it can *save* overhead since obsolete branches do consume resources (any commits they point to cannot be garbage collected). --[[blipvert]] -- cgit v1.2.3 From b9dfa39e9f6805f7c37252937224ac3f281cb6ce Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 13 Sep 2010 15:11:46 -0400 Subject: further thought --- doc/todo/po:_rethink_pagespecs.mdwn | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'doc') diff --git a/doc/todo/po:_rethink_pagespecs.mdwn b/doc/todo/po:_rethink_pagespecs.mdwn index 50c10c5db..ada372b0e 100644 --- a/doc/todo/po:_rethink_pagespecs.mdwn +++ b/doc/todo/po:_rethink_pagespecs.mdwn @@ -9,3 +9,27 @@ default when locking pages.) --[[Joey]] > list must be restricted to pages in the master (or current?) > language, and the ones that should not. The only solution I can see > to this surprising behaviour is: documentation. --[[intrigeri]] + +>> Well, a sorting criteria might be that if a PageSpec is used +>> with a specified locaction, as happens whenever a PageSpec is +>> used on a page, then it should match only `currentlang()`. If it +>> is used without a location, as in the setup file, then no such limit. +>> +>> Note that +>> `match_currentlang` currently dies if called w/o a location -- if +>> it instead was always true w/o a location, this would just mean that +>> all pagespecs should have `and currentlang()` added to them. How to +>> implement that? All I can think of doing is wrapping +>> `pagespec_translate`. +>> +>> The only case I've found where it does make sense to match other +>> language pages is on `l10n.ikiwiki.info` when listing pages that +>> need translation. +>> +>> Otherwise, it can be documented, but that's not really enough; +>> a user who makes a site using auto-blog.setup and enables po will +>> get a really scred up blog that lists translations as separate posts +>> and needs significant work to fix. I have thought about making +>> `match_currentlang` a stub in IkiWiki, so I can use it in all +>> the PageSpecs in the example blog, but I can't say I love the idea. +>> --[[Joey]] -- cgit v1.2.3 From ddd987711fdb249245de408f503dad52d225f06a Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 13 Sep 2010 15:13:07 -0400 Subject: mention branch --- doc/todo/po:_rethink_pagespecs.mdwn | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'doc') diff --git a/doc/todo/po:_rethink_pagespecs.mdwn b/doc/todo/po:_rethink_pagespecs.mdwn index ada372b0e..686f3e77d 100644 --- a/doc/todo/po:_rethink_pagespecs.mdwn +++ b/doc/todo/po:_rethink_pagespecs.mdwn @@ -28,8 +28,9 @@ default when locking pages.) --[[Joey]] >> >> Otherwise, it can be documented, but that's not really enough; >> a user who makes a site using auto-blog.setup and enables po will ->> get a really scred up blog that lists translations as separate posts +>> get a really screwed up blog that lists translations as separate posts >> and needs significant work to fix. I have thought about making ->> `match_currentlang` a stub in IkiWiki, so I can use it in all ->> the PageSpecs in the example blog, but I can't say I love the idea. +>> `match_currentlang` a stub in IkiWiki (done in my currentlang branch), +>> so I can use it in all the PageSpecs in the example blog etc, but I +>> can't say I love the idea. >> --[[Joey]] -- cgit v1.2.3 From 8e8b011c1a64cc15b08e0e61f1bb85eede1e3318 Mon Sep 17 00:00:00 2001 From: "http://jmtd.livejournal.com/" Date: Mon, 13 Sep 2010 19:37:50 +0000 Subject: mixing template vars into directive arguments --- ..._39__t_mix_template_vars_inside_directives.mdwn | 33 ++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 doc/bugs/can__39__t_mix_template_vars_inside_directives.mdwn (limited to 'doc') diff --git a/doc/bugs/can__39__t_mix_template_vars_inside_directives.mdwn b/doc/bugs/can__39__t_mix_template_vars_inside_directives.mdwn new file mode 100644 index 000000000..0fa85effb --- /dev/null +++ b/doc/bugs/can__39__t_mix_template_vars_inside_directives.mdwn @@ -0,0 +1,33 @@ +I often find myself wrapping the same boiler plate around [[ikiwiki/directives/img]] img directives, so I tried to encapsulate it using the following [[ikiwiki/directives/template]]: + + +
+ [\[!img + size="" + + + alt="" + + + alt="" + + alt="[pic]" + + + + ]] + +

+ +
+ +The result, even with htmlscrubber disabled, is mangled, something like + +
+ ?size + +
+ +Any suggestions gladly received. -- [[Jon]] -- cgit v1.2.3 From 16aad6825d2cdae2c1e06604f9d5652d376fca18 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawlY5yDefnXSHvWGbJ9kvhnAyQZiAAttENk" Date: Tue, 14 Sep 2010 17:04:14 +0000 Subject: corrected link --- doc/tips/vim_and_ikiwiki.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/tips/vim_and_ikiwiki.mdwn b/doc/tips/vim_and_ikiwiki.mdwn index eb22e353a..e4136aa5d 100644 --- a/doc/tips/vim_and_ikiwiki.mdwn +++ b/doc/tips/vim_and_ikiwiki.mdwn @@ -9,7 +9,7 @@ directives and wikilinks. It only supports prefixed directives, i.e., ------ -The previous syntax definition for ikiwiki links is at [[ikiwiki.vim]]; however, +The previous syntax definition for ikiwiki links is at [[vim_syntax_highlighting/ikiwiki.vim]]; however, it seems to not be [[maintained anymore|forum/navigation_of_wiki_pages_on_local_filesystem_with_vim#syn-maintenance]], and it has some [[issues|forum/ikiwiki_vim_syntaxfile]]. -- cgit v1.2.3 From 382b0b349988d92f8571b38beb8be003e0b334a0 Mon Sep 17 00:00:00 2001 From: "http://k1024.org/~iusty/" Date: Tue, 14 Sep 2010 18:33:15 +0000 Subject: Add new bug about the comments/blogspam plugins --- .../blog_spam_plugin_not_allowing_non-ASCII_chars__63__.mdwn | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 doc/bugs/blog_spam_plugin_not_allowing_non-ASCII_chars__63__.mdwn (limited to 'doc') diff --git a/doc/bugs/blog_spam_plugin_not_allowing_non-ASCII_chars__63__.mdwn b/doc/bugs/blog_spam_plugin_not_allowing_non-ASCII_chars__63__.mdwn new file mode 100644 index 000000000..22242a97f --- /dev/null +++ b/doc/bugs/blog_spam_plugin_not_allowing_non-ASCII_chars__63__.mdwn @@ -0,0 +1,10 @@ +Hi, + +I'm trying to add a comment, and ikiwiki fails with this error message: + + Error: HTTP::Message content must be bytes at /usr/share/perl5/RPC/XML/Client.pm line 308 + +This seems to happen because I had a non-ASCII character in the comment (an ellipse, …). +The interesting part is that the comment preview works fine, just the save fails. Probably +this means that the blogspam plugin is the culprit (hence the error in RPC::XML::Client library). +I'm using version 3.20100815~bpo50+. Thanks! -- cgit v1.2.3 From e0898ae1a8e64a12c4e47b3f922d6cf1fad4f31c Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 14 Sep 2010 15:23:16 -0400 Subject: blogspam: Fix crash when content contained utf-8. I also tried setting RPC::XML::ENCODING but that did not prevent the crash, and it seems that blogspam.net doesn't like getting xml encoded in unicode, since it mis-flagged comments as spammy that way that are normally allowed through. --- IkiWiki/Plugin/blogspam.pm | 12 +++++++----- debian/changelog | 1 + .../blog_spam_plugin_not_allowing_non-ASCII_chars__63__.mdwn | 5 +++++ 3 files changed, 13 insertions(+), 5 deletions(-) (limited to 'doc') diff --git a/IkiWiki/Plugin/blogspam.pm b/IkiWiki/Plugin/blogspam.pm index 8db3780e8..f0b6cb2a2 100644 --- a/IkiWiki/Plugin/blogspam.pm +++ b/IkiWiki/Plugin/blogspam.pm @@ -4,6 +4,7 @@ package IkiWiki::Plugin::blogspam; use warnings; use strict; use IkiWiki 3.00; +use Encode; my $defaulturl='http://test.blogspam.net:8888/'; @@ -68,6 +69,7 @@ sub checkcontent (@) { my $url=$defaulturl; $url = $config{blogspam_server} if exists $config{blogspam_server}; + my $client = RPC::XML::Client->new($url); my @options = split(",", $config{blogspam_options}) @@ -90,12 +92,12 @@ sub checkcontent (@) { my %req=( ip => $session->remote_addr(), - comment => defined $params{diff} ? $params{diff} : $params{content}, - subject => defined $params{subject} ? $params{subject} : "", - name => defined $params{author} ? $params{author} : "", - link => exists $params{url} ? $params{url} : "", + comment => encode_utf8(defined $params{diff} ? $params{diff} : $params{content}), + subject => encode_utf8(defined $params{subject} ? $params{subject} : ""), + name => encode_utf8(defined $params{author} ? $params{author} : ""), + link => encode_utf8(exists $params{url} ? $params{url} : ""), options => join(",", @options), - site => $config{url}, + site => encode_utf8($config{url}), version => "ikiwiki ".$IkiWiki::version, ); my $res = $client->send_request('testComment', \%req); diff --git a/debian/changelog b/debian/changelog index 8b127b574..0eb5810d0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -18,6 +18,7 @@ ikiwiki (3.20100832) UNRELEASED; urgency=low * actiontabs: Improve tab padding. * blueview: Fix display of links to translated pages in the page header. * Set isPermaLink="no" for guids in rss feeds. + * blogspam: Fix crash when content contained utf-8. -- Joey Hess Tue, 07 Sep 2010 12:08:05 -0400 diff --git a/doc/bugs/blog_spam_plugin_not_allowing_non-ASCII_chars__63__.mdwn b/doc/bugs/blog_spam_plugin_not_allowing_non-ASCII_chars__63__.mdwn index 22242a97f..265040d67 100644 --- a/doc/bugs/blog_spam_plugin_not_allowing_non-ASCII_chars__63__.mdwn +++ b/doc/bugs/blog_spam_plugin_not_allowing_non-ASCII_chars__63__.mdwn @@ -8,3 +8,8 @@ This seems to happen because I had a non-ASCII character in the comment (an elli The interesting part is that the comment preview works fine, just the save fails. Probably this means that the blogspam plugin is the culprit (hence the error in RPC::XML::Client library). I'm using version 3.20100815~bpo50+. Thanks! + +> I've filed an upstream bug about this on RPC::XML: +> +> +> Worked around it in blogspam by decoding. --[[Joey]] -- cgit v1.2.3 From 0ff945ddf19010b890458face057505f7b48b572 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 14 Sep 2010 15:37:45 -0400 Subject: external: Disable RPC::XML's "smart" encoding, which sent ints for strings that contained only a number, fixing a longstanding crash of the rst plugin. --- IkiWiki/Plugin/external.pm | 2 ++ debian/changelog | 3 +++ doc/bugs/rst_fails_on_file_containing_only_a_number.mdwn | 3 +++ 3 files changed, 8 insertions(+) (limited to 'doc') diff --git a/IkiWiki/Plugin/external.pm b/IkiWiki/Plugin/external.pm index ec91c79db..a4cc1dd3c 100644 --- a/IkiWiki/Plugin/external.pm +++ b/IkiWiki/Plugin/external.pm @@ -28,7 +28,9 @@ sub import { $plugins{$plugin}={in => $plugin_read, out => $plugin_write, pid => $pid, accum => ""}; + $RPC::XML::ENCODING="utf-8"; + $RPC::XML::FORCE_STRING_ENCODING="true"; rpc_call($plugins{$plugin}, "import"); } diff --git a/debian/changelog b/debian/changelog index 0eb5810d0..46401b58c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -19,6 +19,9 @@ ikiwiki (3.20100832) UNRELEASED; urgency=low * blueview: Fix display of links to translated pages in the page header. * Set isPermaLink="no" for guids in rss feeds. * blogspam: Fix crash when content contained utf-8. + * external: Disable RPC::XML's "smart" encoding, which sent ints + for strings that contained only a number, fixing a longstanding crash + of the rst plugin. -- Joey Hess Tue, 07 Sep 2010 12:08:05 -0400 diff --git a/doc/bugs/rst_fails_on_file_containing_only_a_number.mdwn b/doc/bugs/rst_fails_on_file_containing_only_a_number.mdwn index dab3b7e5b..99e46aac9 100644 --- a/doc/bugs/rst_fails_on_file_containing_only_a_number.mdwn +++ b/doc/bugs/rst_fails_on_file_containing_only_a_number.mdwn @@ -24,3 +24,6 @@ throwing code..): > No, still the same failure. I think it's failing parsing the input data, > (which perl probably transmitted as an int due to perl internals) > not writing out its response. --[[Joey]] + +> On second thought, this was a bug in ikiwiki, it should be transmitting +> that as a string. Fixed in external.pm --[[Joey]] -- cgit v1.2.3 From 57d0ef239b1a153d3c2da50e23c95f43e9b56cc0 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 14 Sep 2010 15:39:30 -0400 Subject: update --- doc/plugins/write/external.mdwn | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'doc') diff --git a/doc/plugins/write/external.mdwn b/doc/plugins/write/external.mdwn index e30bf2ff3..a3fbe8a2c 100644 --- a/doc/plugins/write/external.mdwn +++ b/doc/plugins/write/external.mdwn @@ -1,7 +1,7 @@ External plugins are standalone, executable programs, that can be written in any language. When ikiwiki starts up, it runs the program, and -communicates with it using [XML RPC][xmlrpc]. If you want to [[write]] an external -plugin, read on.. +communicates with it using [XML RPC][xmlrpc]. If you want to [[write]] an +external plugin, read on.. [xmlrpc]: http://www.xmlrpc.com/ @@ -85,8 +85,8 @@ language as part of their XML RPC interface. XML RPC has a limitation that it does not have a way to pass undef/NULL/None. There is an extension to the protocol that supports this, -but it is not yet available in the [[!cpan XML::RPC]] library used by -ikiwiki. +but it is not yet available in all versions of the [[!cpan XML::RPC]] library +used by ikiwiki. Until the extension is available, ikiwiki allows undef to be communicated over XML RPC by passing a sentinal value, a hash with a single key "null" -- cgit v1.2.3 From 8c8d2c2d2cd259f3e72fd0a4022d02e15e66104f Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 14 Sep 2010 15:44:52 -0400 Subject: close --- doc/bugs/blog_spam_plugin_not_allowing_non-ASCII_chars__63__.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/bugs/blog_spam_plugin_not_allowing_non-ASCII_chars__63__.mdwn b/doc/bugs/blog_spam_plugin_not_allowing_non-ASCII_chars__63__.mdwn index 265040d67..59bf93d14 100644 --- a/doc/bugs/blog_spam_plugin_not_allowing_non-ASCII_chars__63__.mdwn +++ b/doc/bugs/blog_spam_plugin_not_allowing_non-ASCII_chars__63__.mdwn @@ -12,4 +12,4 @@ I'm using version 3.20100815~bpo50+. Thanks! > I've filed an upstream bug about this on RPC::XML: > > -> Worked around it in blogspam by decoding. --[[Joey]] +> Worked around it in blogspam by decoding. [[done]] --[[Joey]] -- cgit v1.2.3 From cd794613b6f5140365e51f79023c882e8ea71197 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 14 Sep 2010 15:45:38 -0400 Subject: git: When updating from remote, use git pull --prune, to avoid possible errors from conflicting obsolete remote branches. --- IkiWiki/Plugin/git.pm | 2 +- debian/changelog | 2 ++ doc/bugs/git.pm_should_prune_remote_branches_when_fetching.mdwn | 3 +++ 3 files changed, 6 insertions(+), 1 deletion(-) (limited to 'doc') diff --git a/IkiWiki/Plugin/git.pm b/IkiWiki/Plugin/git.pm index d342a7398..fd57ce1e4 100644 --- a/IkiWiki/Plugin/git.pm +++ b/IkiWiki/Plugin/git.pm @@ -462,7 +462,7 @@ sub rcs_update () { # Update working directory. if (length $config{gitorigin_branch}) { - run_or_cry('git', 'pull', $config{gitorigin_branch}); + run_or_cry('git', 'pull', '--prune', $config{gitorigin_branch}); } } diff --git a/debian/changelog b/debian/changelog index 46401b58c..27e0fb103 100644 --- a/debian/changelog +++ b/debian/changelog @@ -22,6 +22,8 @@ ikiwiki (3.20100832) UNRELEASED; urgency=low * external: Disable RPC::XML's "smart" encoding, which sent ints for strings that contained only a number, fixing a longstanding crash of the rst plugin. + * git: When updating from remote, use git pull --prune, to avoid possible + errors from conflicting obsolete remote branches. -- Joey Hess Tue, 07 Sep 2010 12:08:05 -0400 diff --git a/doc/bugs/git.pm_should_prune_remote_branches_when_fetching.mdwn b/doc/bugs/git.pm_should_prune_remote_branches_when_fetching.mdwn index 01f3d1a28..5dc4250e3 100644 --- a/doc/bugs/git.pm_should_prune_remote_branches_when_fetching.mdwn +++ b/doc/bugs/git.pm_should_prune_remote_branches_when_fetching.mdwn @@ -9,3 +9,6 @@ Pruning remote branches can be done automatically with the --prune option to "gi > from obsolete remote branches. --[[Joey]] Suppose a remote repository contains a branch named "foo", and you fetch from it. Then, someone renames that branch to "foo/bar". The next time you fetch from that repository, you will get an error because the obsolete branch "foo" is blocking the branch "foo/bar" from being created (due to the way git stores refs for branches). Pruning gets around the problem. It doesn't really add much overhead to the fetch, and in fact it can *save* overhead since obsolete branches do consume resources (any commits they point to cannot be garbage collected). --[[blipvert]] + +> Ok, so git pull --prune can be used to do everything in one command. +> [[done]] --[[Joey]] -- cgit v1.2.3 From 953ff0e6de65f084f733e9506788c0c12bc1d187 Mon Sep 17 00:00:00 2001 From: tschwinge Date: Wed, 15 Sep 2010 05:31:41 +0000 Subject: Report. --- ..._in_this_page_--_missing_page_dependencies.mdwn | 26 ++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 doc/bugs/Error:_no_text_was_copied_in_this_page_--_missing_page_dependencies.mdwn (limited to 'doc') diff --git a/doc/bugs/Error:_no_text_was_copied_in_this_page_--_missing_page_dependencies.mdwn b/doc/bugs/Error:_no_text_was_copied_in_this_page_--_missing_page_dependencies.mdwn new file mode 100644 index 000000000..356f9155a --- /dev/null +++ b/doc/bugs/Error:_no_text_was_copied_in_this_page_--_missing_page_dependencies.mdwn @@ -0,0 +1,26 @@ +That one has bitten me for some time; here is the minimal testcase. There is +also an equivalent (I suppose) problem when using another plugin, but I hope +it's enough to track it down for this one. + + $ tar -xj < [bug-dep_order.tar.bz2](http://www.thomas.schwinge.homeip.net/tmp/bug-dep_order.tar.bz2) + $ cd bug-dep_order/ + $ ./render_locally + [...] + $ find "$PWD".rendered/ -print0 | xargs -0 grep 'no text was copied' + $ [no output] + $ touch news/2010-07-31.mdwn + $ ./render_locally + refreshing wiki.. + scanning news/2010-07-31.mdwn + building news/2010-07-31.mdwn + building news.mdwn, which depends on news/2010-07-31 + building index.mdwn, which depends on news/2010-07-31 + done + $ find "$PWD".rendered/ -print0 | xargs -0 grep 'no text was copied' + /home/thomas/tmp/hurd-web/bug-dep_order.rendered/news.html:

[[!paste Error: no text was copied in this page]]

+ /home/thomas/tmp/hurd-web/bug-dep_order.rendered/news.html:

[[!paste Error: no text was copied in this page]]

+ +This error shows up only for *news.html*, but not in *news/2010-07-31* or for +the aggregation in *index.html* or its RSS and atom files. + +--[[tschwinge]] -- cgit v1.2.3 From 3371ef20f6c9bcdd35b52f25427cd5d1c7826534 Mon Sep 17 00:00:00 2001 From: tschwinge Date: Wed, 15 Sep 2010 05:34:11 +0000 Subject: bugs/Error:_no_text_was_copied_in_this_page_--_missing_page_dependencies --- doc/users/tschwinge.mdwn | 1 + 1 file changed, 1 insertion(+) (limited to 'doc') diff --git a/doc/users/tschwinge.mdwn b/doc/users/tschwinge.mdwn index 46c29a0d6..944105349 100644 --- a/doc/users/tschwinge.mdwn +++ b/doc/users/tschwinge.mdwn @@ -138,6 +138,7 @@ discussed in *N-to-M Mapping of Input and Output Files* on ([[plugins/cutpaste]]) in RSS feed (only; not Atom?) under some conditions (refresh only, but not rebuild?). Perhaps missing to read in / parse some files? + [[Reported|bugs/Error:_no_text_was_copied_in_this_page_--_missing_page_dependencies]]. * [[plugins/recentchanges]] -- cgit v1.2.3 From 852cc25f3b5d0f7b026e37a6231334edc92d367f Mon Sep 17 00:00:00 2001 From: intrigeri Date: Wed, 15 Sep 2010 14:39:42 +0200 Subject: reply --- doc/todo/po:_rethink_pagespecs.mdwn | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'doc') diff --git a/doc/todo/po:_rethink_pagespecs.mdwn b/doc/todo/po:_rethink_pagespecs.mdwn index 686f3e77d..98c7ff655 100644 --- a/doc/todo/po:_rethink_pagespecs.mdwn +++ b/doc/todo/po:_rethink_pagespecs.mdwn @@ -14,14 +14,18 @@ default when locking pages.) --[[Joey]] >> with a specified locaction, as happens whenever a PageSpec is >> used on a page, then it should match only `currentlang()`. If it >> is used without a location, as in the setup file, then no such limit. ->> + +>>> Ok. --[[intrigeri]] + >> Note that >> `match_currentlang` currently dies if called w/o a location -- if >> it instead was always true w/o a location, this would just mean that >> all pagespecs should have `and currentlang()` added to them. How to >> implement that? All I can think of doing is wrapping >> `pagespec_translate`. ->> + +>>> Seems doable. --[[intrigeri]] + >> The only case I've found where it does make sense to match other >> language pages is on `l10n.ikiwiki.info` when listing pages that >> need translation. -- cgit v1.2.3 From 884835ce1cd3b1ba24d6f6bb19786d04e6b8ae90 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 15 Sep 2010 16:24:50 -0400 Subject: cutpaste: Fix bug that occured in some cases involving inlines when text was pasted on a page before being cut. --- IkiWiki/Plugin/cutpaste.pm | 31 +++++++++++++++------- debian/changelog | 2 ++ ..._in_this_page_--_missing_page_dependencies.mdwn | 20 ++++++++++++++ 3 files changed, 44 insertions(+), 9 deletions(-) (limited to 'doc') diff --git a/IkiWiki/Plugin/cutpaste.pm b/IkiWiki/Plugin/cutpaste.pm index 4a8817168..0f6ea0b1f 100644 --- a/IkiWiki/Plugin/cutpaste.pm +++ b/IkiWiki/Plugin/cutpaste.pm @@ -5,10 +5,9 @@ use warnings; use strict; use IkiWiki 3.00; -my %savedtext; - sub import { hook(type => "getsetup", id => "cutpaste", call => \&getsetup); + hook(type => "needsbuild", id => "cutpaste", call => \&needsbuild); hook(type => "preprocess", id => "cut", call => \&preprocess_cut, scan => 1); hook(type => "preprocess", id => "copy", call => \&preprocess_copy, scan => 1); hook(type => "preprocess", id => "paste", call => \&preprocess_paste); @@ -23,6 +22,22 @@ sub getsetup () { }, } +sub needsbuild (@) { + my $needsbuild=shift; + foreach my $page (keys %pagestate) { + if (exists $pagestate{$page}{cutpaste}) { + if (exists $pagesources{$page} && + grep { $_ eq $pagesources{$page} } @$needsbuild) { + # remove state, will be re-added if + # the cut/copy directive is still present + # on rebuild. + delete $pagestate{$page}{cutpaste}; + } + } + } + return $needsbuild; +} + sub preprocess_cut (@) { my %params=@_; @@ -32,8 +47,7 @@ sub preprocess_cut (@) { } } - $savedtext{$params{page}} = {} if not exists $savedtext{$params{"page"}}; - $savedtext{$params{page}}->{$params{id}} = $params{text}; + $pagestate{$params{page}}{cutpaste}{$params{id}} = $params{text}; return "" if defined wantarray; } @@ -47,8 +61,7 @@ sub preprocess_copy (@) { } } - $savedtext{$params{page}} = {} if not exists $savedtext{$params{"page"}}; - $savedtext{$params{page}}->{$params{id}} = $params{text}; + $pagestate{$params{page}}{cutpaste}{$params{id}} = $params{text}; return IkiWiki::preprocess($params{page}, $params{destpage}, $params{text}) if defined wantarray; @@ -63,15 +76,15 @@ sub preprocess_paste (@) { } } - if (! exists $savedtext{$params{page}}) { + if (! exists $pagestate{$params{page}}{cutpaste}) { error gettext('no text was copied in this page'); } - if (! exists $savedtext{$params{page}}->{$params{id}}) { + if (! exists $pagestate{$params{page}}{cutpaste}{$params{id}}) { error sprintf(gettext('no text was copied in this page with id %s'), $params{id}); } return IkiWiki::preprocess($params{page}, $params{destpage}, - $savedtext{$params{page}}->{$params{id}}); + $pagestate{$params{page}}{cutpaste}{$params{id}}); } 1; diff --git a/debian/changelog b/debian/changelog index 27e0fb103..d6eebea78 100644 --- a/debian/changelog +++ b/debian/changelog @@ -24,6 +24,8 @@ ikiwiki (3.20100832) UNRELEASED; urgency=low of the rst plugin. * git: When updating from remote, use git pull --prune, to avoid possible errors from conflicting obsolete remote branches. + * cutpaste: Fix bug that occured in some cases involving inlines when + text was pasted on a page before being cut. -- Joey Hess Tue, 07 Sep 2010 12:08:05 -0400 diff --git a/doc/bugs/Error:_no_text_was_copied_in_this_page_--_missing_page_dependencies.mdwn b/doc/bugs/Error:_no_text_was_copied_in_this_page_--_missing_page_dependencies.mdwn index 356f9155a..4535cf35d 100644 --- a/doc/bugs/Error:_no_text_was_copied_in_this_page_--_missing_page_dependencies.mdwn +++ b/doc/bugs/Error:_no_text_was_copied_in_this_page_--_missing_page_dependencies.mdwn @@ -24,3 +24,23 @@ This error shows up only for *news.html*, but not in *news/2010-07-31* or for the aggregation in *index.html* or its RSS and atom files. --[[tschwinge]] + +> So the cutpaste plugin, in order to support pastes +> that come before the corresponding cut in the page, +> relies on the scan hook being called for the page +> before it is preprocessed. +> +> In the case of an inline, this doesn't happen, if +> the page in question has not changed. +> +> Really though it's not just inline, it's potentially anything +> that preprocesses content. None of those things guarantee that +> scan gets re-run on it first. +> +> I think cutpaste is going beyond the intended use of scan hooks, +> which is to gather link information, not do arbitrary data collection. +> Requiring scan be run repeatedly could be a lot more work. +> +> Using `%pagestate` to store the cut content when scanning would be +> one way to fix this bug. It would mean storing potentially big chunks +> of page content in the indexdb. --[[Joey]] -- cgit v1.2.3 From 0780d989a91974604beb711325ee5ddba6bb207c Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 15 Sep 2010 16:40:53 -0400 Subject: add news item for ikiwiki 3.20100915 --- doc/news/version_3.20100704.mdwn | 26 -------------------------- doc/news/version_3.20100915.mdwn | 28 ++++++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 26 deletions(-) delete mode 100644 doc/news/version_3.20100704.mdwn create mode 100644 doc/news/version_3.20100915.mdwn (limited to 'doc') diff --git a/doc/news/version_3.20100704.mdwn b/doc/news/version_3.20100704.mdwn deleted file mode 100644 index 9d2792ce6..000000000 --- a/doc/news/version_3.20100704.mdwn +++ /dev/null @@ -1,26 +0,0 @@ -ikiwiki 3.20100704 released with [[!toggle text="these changes"]] -[[!toggleable text=""" - * Changes to avoid display of ugly google openids, by displaying - a username taken from openid. - * API: Add new optional field nickname to rcs\_recentchanges. - * API: rcs\_commit and rcs\_commit\_staged are now passed named - parameters. - * openid: Store nickname based on username or email provided from - openid provider. - * git: Record the nickname from openid in the git author email. - * comment: Record the username from openid in the comment page. - * Fixed some confusion and bugginess about whether - rcs\_getctime/rcs\_getmtime were passed absolute or relative filenames. - (Make it relative like everything else.) - * hnb: Fixed broken use of mkstemp that had caused dangling temp files, - and prevented actually rendering hnb files. - * Use comment template on comments page of example blog. - * comment.tmpl: Fix up display when inline uses it to display a non-comment - page. (Such as a discussion page.) - * git: Added git\_wrapper\_background\_command option. Can be used to eg, - make the git wrapper push to github in the background after ikiwiki - runs. - * po: Added needstranslation() pagespec. (intrigeri) - * po: Added support for .html source pages. (intrigeri) - * comment: Fix problem moderating comments of certian pages with utf-8 - in their name."""]] \ No newline at end of file diff --git a/doc/news/version_3.20100915.mdwn b/doc/news/version_3.20100915.mdwn new file mode 100644 index 000000000..90c5cc37a --- /dev/null +++ b/doc/news/version_3.20100915.mdwn @@ -0,0 +1,28 @@ +ikiwiki 3.20100915 released with [[!toggle text="these changes"]] +[[!toggleable text=""" + * needsbuild hook interface changed; the hooks should now return + the modified array of things that need built. (Backwards compatibility + code keeps plugins using the old interface working.) + * Remove PATH overriding code in ikiwiki script that was present to make + perl taint checking happy, but taint checking is disabled. + * teximg: Use Unicode UTF-8 encoding by default. Closes: #[596067](http://bugs.debian.org/596067) + Thanks, Paul Menzel. + * po: Make the po\_master\_language use a langpair like "en|English", + so it can be configured via the web. + * po: Allow enabling via web setup. + * po: Auto-upgrade old format settings to new formats when writing + setup file. + * Pass array of names of files that have been deleted to needsbuild hook + as second parameter, to allow for plugins that needs access to this + information earlier than the delete hook. + * actiontabs: Improve tab padding. + * blueview: Fix display of links to translated pages in the page header. + * Set isPermaLink="no" for guids in rss feeds. + * blogspam: Fix crash when content contained utf-8. + * external: Disable RPC::XML's "smart" encoding, which sent ints + for strings that contained only a number, fixing a longstanding crash + of the rst plugin. + * git: When updating from remote, use git pull --prune, to avoid possible + errors from conflicting obsolete remote branches. + * cutpaste: Fix bug that occured in some cases involving inlines when + text was pasted on a page before being cut."""]] \ No newline at end of file -- cgit v1.2.3 From 9585968861d551fc43379053f8556a2fe44de7b8 Mon Sep 17 00:00:00 2001 From: privat Date: Fri, 17 Sep 2010 01:42:46 +0000 Subject: patch proposal: add option to capitalize pagetitles --- doc/todo/capitalize_title.mdwn | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 doc/todo/capitalize_title.mdwn (limited to 'doc') diff --git a/doc/todo/capitalize_title.mdwn b/doc/todo/capitalize_title.mdwn new file mode 100644 index 000000000..3e8366dd3 --- /dev/null +++ b/doc/todo/capitalize_title.mdwn @@ -0,0 +1,31 @@ +Here I propose an option (with a [[patch]]) to capitalize the first letter (ucfirst) of default titles : filenames and urls can be lowercase but title are displayed with a capital first character (filename = "foo.mdwn", pagetitle = "Foo"). Note that \[[!meta title]] are unaffected (no automatic capitalization). Comments please :) --[[JeanPrivat]] +

+diff --git a/IkiWiki.pm b/IkiWiki.pm
+index 6da2819..fd36ec4 100644
+--- a/IkiWiki.pm
++++ b/IkiWiki.pm
+@@ -281,6 +281,13 @@ sub getsetup () {
+                safe => 0,
+                rebuild => 1,
+        },
++       capitalize => {
++               type => "boolean",
++               default => undef,
++               description => "capitalize the first letter of page titles",
++               safe => 1,
++               rebuild => 1,
++       },
+        userdir => {
+                type => "string",
+                default => "",
+@@ -989,6 +996,10 @@ sub pagetitle ($;$) {
+                $page=~s/(__(\d+)__|_)/$1 eq '_' ? ' ' : "&#$2;"/eg;
+        }
+ 
++       if ($config{capitalize}) {
++               $page = ucfirst $page;
++       }
++
+        return $page;
+ }
+
-- cgit v1.2.3 From 3f8ba63a9968b6fc670ea2b49b86ba62571ef15b Mon Sep 17 00:00:00 2001 From: tschwinge Date: Fri, 17 Sep 2010 11:48:29 +0000 Subject: Report. --- doc/bugs/cutpaste.pm:_missing_filter_call.mdwn | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 doc/bugs/cutpaste.pm:_missing_filter_call.mdwn (limited to 'doc') diff --git a/doc/bugs/cutpaste.pm:_missing_filter_call.mdwn b/doc/bugs/cutpaste.pm:_missing_filter_call.mdwn new file mode 100644 index 000000000..30bd52996 --- /dev/null +++ b/doc/bugs/cutpaste.pm:_missing_filter_call.mdwn @@ -0,0 +1,23 @@ +Consider this: + + $ wget http://www.thomas.schwinge.homeip.net/tmp/cutpaste_filter.tar.bz2 + $ wget http://www.thomas.schwinge.homeip.net/tmp/cutpaste_filter.patch + + $ tar -xj < cutpaste_filter.tar.bz2 + $ cd cutpaste_filter/ + $ ./render_locally + $ find "$PWD".rendered/ -type f -print0 | xargs -0 grep -H -E 'FOO|BAR' + [notice one FOO in there] + $ rm -rf .ikiwiki "$PWD".rendered + + $ cp /usr/share/perl5/IkiWiki/Plugin/cutpaste.pm .library/IkiWiki/Plugin/ + $ patch -p0 < ../cutpaste_filter.patch + $ ./render_locally + $ find "$PWD".rendered/ -type f -print0 | xargs -0 grep -H -E 'FOO|BAR' + [correct; notice no more FOO] + +I guess this needs a general audit -- there are other places where `preprocess` +is being doing without `filter`ing first, for example in the same file, `copy` +function. + +--[[tschwinge]] -- cgit v1.2.3 From 65c5e24d364f491ace462beb06e2e3adb721b1e0 Mon Sep 17 00:00:00 2001 From: Javier Rojas Date: Fri, 17 Sep 2010 20:08:49 -0500 Subject: idea about 'dynamic' forms --- doc/forum/field_and_forms.mdwn | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 doc/forum/field_and_forms.mdwn (limited to 'doc') diff --git a/doc/forum/field_and_forms.mdwn b/doc/forum/field_and_forms.mdwn new file mode 100644 index 000000000..97fda1856 --- /dev/null +++ b/doc/forum/field_and_forms.mdwn @@ -0,0 +1,13 @@ +Dear ikiwiki users, and specially [[users/KathrynAndersen]] ([[users/rubykat]]): +have you considered some way of extending ikiwiki to allow some kind of +on-the-fly generation of web forms to create new pages? these web forms should +offer as many fields as one has defined in some [[page +template|plugins/contrib/ftemplate]], and, once POSTed, should create a page +using that template, with those fields already filled with the values the user +provided. + +I see this a a generalization of the `postform` option of the +[[ikiwiki/directive/inline]] directive. That option tells ikiwiki to create a +form with one field already filled (title). + +What are your ideas about this? -- cgit v1.2.3 From 0b59b140071748b6bc0204ac2f367353a74c697e Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 18 Sep 2010 12:24:33 -0400 Subject: remove obsolete docs about DefaultLanguage I think this may have made sense when the master language was rendered to index.html, but with it at index.en.html, DefaultLanguage is not needed. --- doc/plugins/po.mdwn | 4 ---- 1 file changed, 4 deletions(-) (limited to 'doc') diff --git a/doc/plugins/po.mdwn b/doc/plugins/po.mdwn index 2acbc366a..ca1775f6e 100644 --- a/doc/plugins/po.mdwn +++ b/doc/plugins/po.mdwn @@ -120,10 +120,6 @@ Add 'Options MultiViews' to the wiki directory's configuration in Apache. When `usedirs` is enabled, one has to set `DirectoryIndex index` for the wiki context. -Setting `DefaultLanguage LL` (replace `LL` with your default MIME -language code) for the wiki context can help to ensure -`bla/page/index.en.html` is served as `Content-Language: LL`. - For details, see [Apache's documentation](http://httpd.apache.org/docs/2.2/content-negotiation.html). lighttpd -- cgit v1.2.3 From 96a8ea0ebbd93a8cc56222234d4a5815b30a3934 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 18 Sep 2010 12:58:37 -0400 Subject: add --- ...:_apache_config_serves_index.rss_for_index.mdwn | 28 ++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 doc/bugs/po:_apache_config_serves_index.rss_for_index.mdwn (limited to 'doc') diff --git a/doc/bugs/po:_apache_config_serves_index.rss_for_index.mdwn b/doc/bugs/po:_apache_config_serves_index.rss_for_index.mdwn new file mode 100644 index 000000000..e6e1b57a8 --- /dev/null +++ b/doc/bugs/po:_apache_config_serves_index.rss_for_index.mdwn @@ -0,0 +1,28 @@ +The apache config documented in [[plugins/po]] has a subtle bug. It works +until a site gets an index.atom or index.rss file. (Acutally, with po +enabled, they're called index.en.atom or index.en.rss etc, but the result +is the same). + +Then, when wget, curl, or w3m is pointed at http://site/, apache serves +up the rss/atom file rather than the index page. + +Analysis: + +* /etc/mime.types gives mime types to .rss and .atom files +* `mod_negotiation`'s MultiViews allows any file with a mime type to be + served up via content negotiation, if the client requests that type. +* wget etc send "Accept: */*" to accept all content types. Compare + with firefox, which sends "Accept: text/html,application/xhtml+xml,application/xml;q=0.9,*/*" +* So apache has a tie between a html encoded Enlish file, and a rss encoded + English file and the client has no preference. In a tie, apache will serve up the + *smallest* file, which tends to be the rss file. (Apache's docs say it uses that + strange criteria to break ties; see ) + +The only way I have found to work around this problem is to remove +atom and rss from /etc/mime.types. Of course, that has other undesirable +results. + +I wonder if it would be worth making the po plugin generate apache +[type map files](http://httpd.apache.org/docs/2.0/mod/mod_negotiation.html#typemaps). +That should avoid this problem. +--[[Joey]] -- cgit v1.2.3 From 4079c06be22d0eb31bd0bead4b8f53a9831804e9 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 18 Sep 2010 13:03:33 -0400 Subject: format --- doc/bugs/po:_apache_config_serves_index.rss_for_index.mdwn | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'doc') diff --git a/doc/bugs/po:_apache_config_serves_index.rss_for_index.mdwn b/doc/bugs/po:_apache_config_serves_index.rss_for_index.mdwn index e6e1b57a8..bf5973325 100644 --- a/doc/bugs/po:_apache_config_serves_index.rss_for_index.mdwn +++ b/doc/bugs/po:_apache_config_serves_index.rss_for_index.mdwn @@ -11,8 +11,8 @@ Analysis: * /etc/mime.types gives mime types to .rss and .atom files * `mod_negotiation`'s MultiViews allows any file with a mime type to be served up via content negotiation, if the client requests that type. -* wget etc send "Accept: */*" to accept all content types. Compare - with firefox, which sends "Accept: text/html,application/xhtml+xml,application/xml;q=0.9,*/*" +* wget etc send `Accept: */*` to accept all content types. Compare + with firefox, which sends `Accept: text/html,application/xhtml+xml,application/xml;q=0.9,*/*` * So apache has a tie between a html encoded Enlish file, and a rss encoded English file and the client has no preference. In a tie, apache will serve up the *smallest* file, which tends to be the rss file. (Apache's docs say it uses that -- cgit v1.2.3 From b2b599dfb9d042da324480e03d3a55873ac336d6 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 18 Sep 2010 13:36:29 -0400 Subject: response --- doc/bugs/cutpaste.pm:_missing_filter_call.mdwn | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'doc') diff --git a/doc/bugs/cutpaste.pm:_missing_filter_call.mdwn b/doc/bugs/cutpaste.pm:_missing_filter_call.mdwn index 30bd52996..475880f0a 100644 --- a/doc/bugs/cutpaste.pm:_missing_filter_call.mdwn +++ b/doc/bugs/cutpaste.pm:_missing_filter_call.mdwn @@ -21,3 +21,21 @@ is being doing without `filter`ing first, for example in the same file, `copy` function. --[[tschwinge]] + +> So, in English, page text inside a cut directive will not be filtered. +> Because the cut directive takes the text during the scan pass, before +> filtering happens. +> +> Commit 192ce7a238af9021b0fd6dd571f22409af81ebaf and +> [[bugs/po_vs_templates]] has to do with this. +> There I decided that filter hooks should *only* act on the complete +> text of a page. +> +> I also suggested that anything that wants to reliably +> s/FOO/BAR/ should probably use a sanitize hook, not a filter hook. +> I think that would make sense in this example. +> +> I don't see any way to make cut text be filtered while satisfying these +> constraints, without removing cutpaste's ability to have forward pastes +> of text cut laster in the page. (That does seems like an increasingly +> bad idea..) --[[Joey]] -- cgit v1.2.3 From 26c38c8049e3e8794984079b3b6d4c22ba888d3a Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 18 Sep 2010 15:09:14 -0400 Subject: better fix developed on #httpd channel --- doc/bugs/po:_apache_config_serves_index.rss_for_index.mdwn | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'doc') diff --git a/doc/bugs/po:_apache_config_serves_index.rss_for_index.mdwn b/doc/bugs/po:_apache_config_serves_index.rss_for_index.mdwn index bf5973325..7acbfe82d 100644 --- a/doc/bugs/po:_apache_config_serves_index.rss_for_index.mdwn +++ b/doc/bugs/po:_apache_config_serves_index.rss_for_index.mdwn @@ -26,3 +26,11 @@ I wonder if it would be worth making the po plugin generate apache [type map files](http://httpd.apache.org/docs/2.0/mod/mod_negotiation.html#typemaps). That should avoid this problem. --[[Joey]] + +Update: A non-intrusive fix is to add this to apache configuration. +This tunes the "quality" of the rss and atom files, in an apparently currently +undocumented way (though someone on #httpd suggested it should get documented). +Result is that apache will prefer serving index.html. --[[Joey]] + + AddType application/rss+xml;qs=0.8 .rss + AddType application/atom+xml;qs=0.8 .atom -- cgit v1.2.3 From ea487472ed05f633e3cd9479b933656309c0d3c8 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 18 Sep 2010 18:48:46 -0400 Subject: document settings needed to fix bug --- doc/bugs/po:_apache_config_serves_index.rss_for_index.mdwn | 2 +- doc/plugins/po.mdwn | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) (limited to 'doc') diff --git a/doc/bugs/po:_apache_config_serves_index.rss_for_index.mdwn b/doc/bugs/po:_apache_config_serves_index.rss_for_index.mdwn index 7acbfe82d..a2b68c4b1 100644 --- a/doc/bugs/po:_apache_config_serves_index.rss_for_index.mdwn +++ b/doc/bugs/po:_apache_config_serves_index.rss_for_index.mdwn @@ -30,7 +30,7 @@ That should avoid this problem. Update: A non-intrusive fix is to add this to apache configuration. This tunes the "quality" of the rss and atom files, in an apparently currently undocumented way (though someone on #httpd suggested it should get documented). -Result is that apache will prefer serving index.html. --[[Joey]] +Result is that apache will prefer serving index.html. --[[Joey]] [[done]] AddType application/rss+xml;qs=0.8 .rss AddType application/atom+xml;qs=0.8 .atom diff --git a/doc/plugins/po.mdwn b/doc/plugins/po.mdwn index ca1775f6e..f91e44ea3 100644 --- a/doc/plugins/po.mdwn +++ b/doc/plugins/po.mdwn @@ -117,8 +117,13 @@ serve any page in the client's preferred language, if available. Add 'Options MultiViews' to the wiki directory's configuration in Apache. -When `usedirs` is enabled, one has to set `DirectoryIndex index` for -the wiki context. +When `usedirs` is enabled, you should also set `DirectoryIndex index`. + +These settings are also recommended, in order to avoid serving up rss files +as index pages: + + AddType application/rss+xml;qs=0.8 .rss + AddType application/atom+xml;qs=0.8 .atom For details, see [Apache's documentation](http://httpd.apache.org/docs/2.2/content-negotiation.html). -- cgit v1.2.3 From 8c8856601f76c16b2be51b16c095a276f9c9a9b5 Mon Sep 17 00:00:00 2001 From: tschwinge Date: Sun, 19 Sep 2010 06:17:01 +0000 Subject: Back to Joey. --- doc/bugs/cutpaste.pm:_missing_filter_call.mdwn | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'doc') diff --git a/doc/bugs/cutpaste.pm:_missing_filter_call.mdwn b/doc/bugs/cutpaste.pm:_missing_filter_call.mdwn index 475880f0a..f7138cba0 100644 --- a/doc/bugs/cutpaste.pm:_missing_filter_call.mdwn +++ b/doc/bugs/cutpaste.pm:_missing_filter_call.mdwn @@ -39,3 +39,17 @@ function. > constraints, without removing cutpaste's ability to have forward pastes > of text cut laster in the page. (That does seems like an increasingly > bad idea..) --[[Joey]] + +> > OK -- so the FOO/BAR thing was only a very stripped-down example, of +> > course, and the real thing is being observed with the +> > *[[plugins/contrib/getfield]]* plugin. This one needs to run *before* +> > `preprocess`ing, for its `{{$page#field}}` syntax is (a) meant to be usable +> > inside ikiwiki directives, and (b) the field values are meant to still be +> > `preprocess`ed before being embedded. That's why it's using the `filter` +> > hook instead of `sanitize`. + +> > Would adding another kind of hook be a way to fix this? My idea is that +> > *cut* (and others) would then take their data not during `scan`ning, but +> > *after* `filter`ing. + +> > --[[tschwinge]] -- cgit v1.2.3 From 2745dfee60fa890ed0ecb8f53528e8a8a0803066 Mon Sep 17 00:00:00 2001 From: jason Date: Sun, 19 Sep 2010 20:23:13 +0000 Subject: Add link to html5shiv. --- doc/tips/html5.mdwn | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/tips/html5.mdwn b/doc/tips/html5.mdwn index 945efc4bc..8fbbb2ebb 100644 --- a/doc/tips/html5.mdwn +++ b/doc/tips/html5.mdwn @@ -15,7 +15,8 @@ No care is taken to add backwards compatability hacks for browsers that are not html5 aware (like MSIE). If you want to include the javascript with those hacks, you can edit `page.tmpl` to do so. [Dive Into HTML5](http://diveintohtml5.org/) is a good reference for -current compatability issues and workarounds with html5. +current compatability issues and workarounds with html5. And a remotely-loadable +JS shiv for enabling HTML5 elements in IE is available through [html5shiv at Google Code](http://code.google.com/p/html5shiv/). --- -- cgit v1.2.3 From 608d595dfdde90b8eed41de5c096157df0cdd494 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawl_d5VW9AK4YSf-cJKz8vUONCihstBZU9o" Date: Mon, 20 Sep 2010 17:00:21 +0000 Subject: --- doc/setup/discussion.mdwn | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'doc') diff --git a/doc/setup/discussion.mdwn b/doc/setup/discussion.mdwn index 74f7740db..f0eeea8ee 100644 --- a/doc/setup/discussion.mdwn +++ b/doc/setup/discussion.mdwn @@ -258,3 +258,10 @@ precicely breaks without it? -- [[Jon]] > I don't remember what was the specific problem with perl 5.8.8. All I can > find is some taint checking bugs, which are currently worked around by > taint checking being disabled. --[[Joey]] + +--- + +Did anyone tried to install ikiwiki under a vhost setup ? +ikiwiki is installed under a debian lenny system. but without write acces to /etc/ikiwiki (obvious) i am coming not far. +Or do i miss something which is probably hidden deeper in the documentation ? + -- cgit v1.2.3 From 9aec1b02a4df223ad84c96a35f13e51fc2982f2e Mon Sep 17 00:00:00 2001 From: hb7 Date: Wed, 22 Sep 2010 07:55:50 +0000 Subject: --- doc/sandbox/Nur_so..mdwn | 1 + 1 file changed, 1 insertion(+) create mode 100644 doc/sandbox/Nur_so..mdwn (limited to 'doc') diff --git a/doc/sandbox/Nur_so..mdwn b/doc/sandbox/Nur_so..mdwn new file mode 100644 index 000000000..32c9f2397 --- /dev/null +++ b/doc/sandbox/Nur_so..mdwn @@ -0,0 +1 @@ +Das ist ein Test. -- cgit v1.2.3 From 7110b4964762df17142affde90075a0e9a5494f9 Mon Sep 17 00:00:00 2001 From: "http://blipvert.myopenid.com/" Date: Wed, 22 Sep 2010 19:33:19 +0000 Subject: poll vote (Accept only OpenID for logins) --- doc/news/openid.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/news/openid.mdwn b/doc/news/openid.mdwn index 4f1ee7bf7..c070c1e23 100644 --- a/doc/news/openid.mdwn +++ b/doc/news/openid.mdwn @@ -10,4 +10,4 @@ log back in, try out the OpenID signup process if you don't already have an OpenID, and see how OpenID works for you. And let me know your feelings about making such a switch. --[[Joey]] -[[!poll 64 "Accept only OpenID for logins" 21 "Accept only password logins" 36 "Accept both"]] +[[!poll 65 "Accept only OpenID for logins" 21 "Accept only password logins" 36 "Accept both"]] -- cgit v1.2.3 From 0ea5c4a241b9a0dff66c5bd232ead8a1b2d9ac4a Mon Sep 17 00:00:00 2001 From: "http://blipvert.myopenid.com/" Date: Wed, 22 Sep 2010 19:37:40 +0000 Subject: --- doc/news/openid/discussion.mdwn | 3 +++ 1 file changed, 3 insertions(+) (limited to 'doc') diff --git a/doc/news/openid/discussion.mdwn b/doc/news/openid/discussion.mdwn index e611fa77b..1b2072bcc 100644 --- a/doc/news/openid/discussion.mdwn +++ b/doc/news/openid/discussion.mdwn @@ -80,3 +80,6 @@ which fails here? Or is something broken in Ikiwiki's implementation? > [[bugs/OpenID_delegation_fails_on_my_server]] --[[Joey]] Yes. I'd only recently set up my server as a delegate under wordpress, so still thought that perhaps the issue was on my end. But I'd since used my delegate successfully elsewhere, so I filed it as a bug against ikiwiki. + +---- +I just tried logging it with OpenID and it Just Worked. Pretty painless. If you want to turn off password authentication on ikiwiki.info, I say go for it. --[[blipvert.myopenid.com]] -- cgit v1.2.3 From 6902f9850a1f1c6e7eca9fab29ec98d4e7d9df3a Mon Sep 17 00:00:00 2001 From: "http://blipvert.myopenid.com/" Date: Wed, 22 Sep 2010 19:38:32 +0000 Subject: --- doc/news/openid/discussion.mdwn | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/news/openid/discussion.mdwn b/doc/news/openid/discussion.mdwn index 1b2072bcc..fa8acb942 100644 --- a/doc/news/openid/discussion.mdwn +++ b/doc/news/openid/discussion.mdwn @@ -82,4 +82,5 @@ which fails here? Or is something broken in Ikiwiki's implementation? Yes. I'd only recently set up my server as a delegate under wordpress, so still thought that perhaps the issue was on my end. But I'd since used my delegate successfully elsewhere, so I filed it as a bug against ikiwiki. ---- -I just tried logging it with OpenID and it Just Worked. Pretty painless. If you want to turn off password authentication on ikiwiki.info, I say go for it. --[[blipvert.myopenid.com]] +##Pretty Painless +I just tried logging it with OpenID and it Just Worked. Pretty painless. If you want to turn off password authentication on ikiwiki.info, I say go for it. --[[blipvert]] -- cgit v1.2.3 From a31d6ab1b9ca061b565d976f754c11b1bef7a325 Mon Sep 17 00:00:00 2001 From: "http://blipvert.myopenid.com/" Date: Wed, 22 Sep 2010 20:10:26 +0000 Subject: --- doc/news/openid/discussion.mdwn | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/news/openid/discussion.mdwn b/doc/news/openid/discussion.mdwn index fa8acb942..a79a87989 100644 --- a/doc/news/openid/discussion.mdwn +++ b/doc/news/openid/discussion.mdwn @@ -82,5 +82,8 @@ which fails here? Or is something broken in Ikiwiki's implementation? Yes. I'd only recently set up my server as a delegate under wordpress, so still thought that perhaps the issue was on my end. But I'd since used my delegate successfully elsewhere, so I filed it as a bug against ikiwiki. ---- -##Pretty Painless +###Pretty Painless I just tried logging it with OpenID and it Just Worked. Pretty painless. If you want to turn off password authentication on ikiwiki.info, I say go for it. --[[blipvert]] + +###LiveJournal openid +One caveat to the above is that, of course, OpenID is a distributed trust system which means you do have to think about the trust aspect. A case in point is livejournal.com whose OpenID implementation is badly broken in one important respect: If a LiveJournal user deletes his or her journal, and a different user registers a journal with the same name (this is actually quite a common occurrence on LiveJournal), they in effect inherit the previous journal owner's identity. LiveJournal does not even have a mechanism in place for a remote site even to detect that a journal has changed hands. It is an extremely dodgy situation which they seem to have *no* intention of fixing, and the bottom line is that the "identity" represented by a *username*.livejournal.com token should not be trusted as to its long-term uniqueness. Just FYI. --[[blipvert]] -- cgit v1.2.3 From 4a5d68a139e946b64a89625919a5398fd5268a1f Mon Sep 17 00:00:00 2001 From: Javier Rojas Date: Wed, 22 Sep 2010 22:41:18 -0500 Subject: possible bug with img plugin --- doc/bugs/img_plugin_and_class_attr.mdwn | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 doc/bugs/img_plugin_and_class_attr.mdwn (limited to 'doc') diff --git a/doc/bugs/img_plugin_and_class_attr.mdwn b/doc/bugs/img_plugin_and_class_attr.mdwn new file mode 100644 index 000000000..7fd457c31 --- /dev/null +++ b/doc/bugs/img_plugin_and_class_attr.mdwn @@ -0,0 +1,25 @@ +The [[plugins/img]] plugin is not generating the proper `class` +attribute in its HTML output. + +The plugin receives something like the following: + + [[!img 129199047595759991.jpg class="centered"]] + +And is supossed to generate an HTML code like the following: + + + +But is generating the following + + + +This seems to be happening with all images inserted using the plugin (that use +the `class=yaddayadda` argument to the `img` directive.) I remember it didn't +happen before, and I suspect an ikiwiki upgrade is to blame. I tested with a +blog created from scratch, and a single post, and the problem appeared there +too. + +This is happening with version 3.20100815 of ikiwiki. + +[[jerojasro]] + -- cgit v1.2.3 From 7481329bdd11d81c4b3e85a446ab1e4bfcc298c8 Mon Sep 17 00:00:00 2001 From: Javier Rojas Date: Wed, 22 Sep 2010 22:44:07 -0500 Subject: typo --- doc/bugs/img_plugin_and_class_attr.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/bugs/img_plugin_and_class_attr.mdwn b/doc/bugs/img_plugin_and_class_attr.mdwn index 7fd457c31..4dd0df4ec 100644 --- a/doc/bugs/img_plugin_and_class_attr.mdwn +++ b/doc/bugs/img_plugin_and_class_attr.mdwn @@ -3,7 +3,7 @@ attribute in its HTML output. The plugin receives something like the following: - [[!img 129199047595759991.jpg class="centered"]] + \[[!img 129199047595759991.jpg class="centered"]] And is supossed to generate an HTML code like the following: -- cgit v1.2.3 From fc296d49a01377704443280d9ba2c04e6aff3de0 Mon Sep 17 00:00:00 2001 From: "http://hendry.iki.fi/" Date: Thu, 23 Sep 2010 10:15:19 +0000 Subject: b00g --- doc/ikiwiki/directive/table/discussion.mdwn | 1 + 1 file changed, 1 insertion(+) create mode 100644 doc/ikiwiki/directive/table/discussion.mdwn (limited to 'doc') diff --git a/doc/ikiwiki/directive/table/discussion.mdwn b/doc/ikiwiki/directive/table/discussion.mdwn new file mode 100644 index 000000000..87d2e0cd1 --- /dev/null +++ b/doc/ikiwiki/directive/table/discussion.mdwn @@ -0,0 +1 @@ +The problem I have in my tables, is that some fields contain example HTML that needs to be escaped. -- cgit v1.2.3 From abea37a67af78c9c9405d4f089b76199264d193f Mon Sep 17 00:00:00 2001 From: chrysn Date: Thu, 23 Sep 2010 13:09:05 +0200 Subject: connection between alias direcive and autotag --- doc/todo/alias_directive.mdwn | 29 ++++++++++++++++++++-- ...o-create_tag_pages_according_to_a_template.mdwn | 13 ++++++++++ 2 files changed, 40 insertions(+), 2 deletions(-) (limited to 'doc') diff --git a/doc/todo/alias_directive.mdwn b/doc/todo/alias_directive.mdwn index 4d7817694..71a2efc76 100644 --- a/doc/todo/alias_directive.mdwn +++ b/doc/todo/alias_directive.mdwn @@ -27,8 +27,8 @@ suggested for addition (possibly by means of a plugin): > > > > \[[!alias Grece list=false]] > -> This page by itself will redirect from the "Hellas" and "Hellenic Republic" -> pages as if they both contained just: +> This page by itself will redirect from the "Hellas", "Hellenic Republic" and +> "Grece" pages as if they both contained just: > > > \[[!meta redir="Greece"]] > @@ -44,4 +44,29 @@ The proposed plugin/directive could be extended, eg. by also including old-style redirects in the alias list, but that might introduce unwanted coupling with the meta directive. +----------------- + +On second thought, implementing this might have similarities with +[[todo/auto-create tag pages according to a template]] -- the auto-created +pages would, if the way of the alias directive is followed, not create physical +files, though, but be created just when someone edits them. + +If multiple plugins do such a trick, they would have to fight over who comes +first. If, for example, we have a setup where not yet created tag pages are +automatically generated as "\[[!inline pages="link()" +archive="yes"]]" and aliases are enabled, and a non-tag pages grabs a tag as an +alias (as to redirect all taglinks of the tag to itself), there are two +possibilities: + +* The autotag plugin comes first: + * autotag sees the missing tag and creates its "\[[!inline" stuff + * alias sees that there is already content and adds its prefix +* The alias plugin comes first (this is the prefered way): + * alias sees the empty page, sees it is not contested by other alias + directives and creates its "\[[!meta" redirect + * autotag sees there is already content and doesn't do anything + +That issue could be handled with "priority number" on the hook, with plugins +with a lower number being called first. + [[!tag wishlist]] diff --git a/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn b/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn index 7eb404910..92c3b7695 100644 --- a/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn +++ b/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn @@ -248,4 +248,17 @@ I've tested it fairly thouroughly. --[[Joey]] [a358d74bef51dae31332ff27e897fe04834571e6]: http://git.liegesta.at/?p=ikiwiki.git;a=commitdiff;h=a358d74bef51dae31332ff27e897fe04834571e6 (commitdiff for a358d74bef51dae31332ff27e897fe04834571e6) [981400177d68a279f485727be3f013e68f0bf691]: http://git.liegesta.at/?p=ikiwiki.git;a=commitdiff;h=981400177d68a279f485727be3f013e68f0bf691 (commitdiff for 981400177d68a279f485727be3f013e68f0bf691) +------------------- + +Even if this is already marked as done, I'd like to suggest an alternative +solution: + +Instead of creating a file that gets checked in into the RCS, the source files +could be left out and the output files be written as long as there is no +physical source file (think of a virtual underlay). Something similar would be +required to implement [[todo/alias directive]], which couldn't be easily done +by writing to the RCS as the page's contents can change depending on which +other pages claim it as an alias. --[[chrysn]] + + [[!tag done]] -- cgit v1.2.3 From b4471d44184a03180ad19a98673d52752ce73b46 Mon Sep 17 00:00:00 2001 From: "188.118.202.217" <188.118.202.217@web> Date: Thu, 23 Sep 2010 11:17:06 +0000 Subject: poll vote (Accept only OpenID for logins) --- doc/news/openid.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/news/openid.mdwn b/doc/news/openid.mdwn index c070c1e23..67bf10cb6 100644 --- a/doc/news/openid.mdwn +++ b/doc/news/openid.mdwn @@ -10,4 +10,4 @@ log back in, try out the OpenID signup process if you don't already have an OpenID, and see how OpenID works for you. And let me know your feelings about making such a switch. --[[Joey]] -[[!poll 65 "Accept only OpenID for logins" 21 "Accept only password logins" 36 "Accept both"]] +[[!poll 66 "Accept only OpenID for logins" 21 "Accept only password logins" 36 "Accept both"]] -- cgit v1.2.3 From aac1428491c850b74800f59926dcbc3c7bc6dd84 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 23 Sep 2010 16:05:43 -0400 Subject: response --- doc/news/openid/discussion.mdwn | 3 +++ 1 file changed, 3 insertions(+) (limited to 'doc') diff --git a/doc/news/openid/discussion.mdwn b/doc/news/openid/discussion.mdwn index a79a87989..c0447a13f 100644 --- a/doc/news/openid/discussion.mdwn +++ b/doc/news/openid/discussion.mdwn @@ -85,5 +85,8 @@ Yes. I'd only recently set up my server as a delegate under wordpress, so still ###Pretty Painless I just tried logging it with OpenID and it Just Worked. Pretty painless. If you want to turn off password authentication on ikiwiki.info, I say go for it. --[[blipvert]] +> I doubt I will. The new login interface basically makes password login +> and openid cooexist nicely. --[[Joey]] + ###LiveJournal openid One caveat to the above is that, of course, OpenID is a distributed trust system which means you do have to think about the trust aspect. A case in point is livejournal.com whose OpenID implementation is badly broken in one important respect: If a LiveJournal user deletes his or her journal, and a different user registers a journal with the same name (this is actually quite a common occurrence on LiveJournal), they in effect inherit the previous journal owner's identity. LiveJournal does not even have a mechanism in place for a remote site even to detect that a journal has changed hands. It is an extremely dodgy situation which they seem to have *no* intention of fixing, and the bottom line is that the "identity" represented by a *username*.livejournal.com token should not be trusted as to its long-term uniqueness. Just FYI. --[[blipvert]] -- cgit v1.2.3 From 66e3a164223bc36d14c5b304f902f6d5413045c7 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawmlZJCPogIE74m6GSCmkbJoMZiWNOlXcjI" Date: Fri, 24 Sep 2010 19:01:08 +0000 Subject: Added a comment --- .../comment_1_e4720e8e4fe74bd6cba746e8259832e6._comment | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 doc/forum/how_do_I_revert_edits_in_the_web_mode__63__/comment_1_e4720e8e4fe74bd6cba746e8259832e6._comment (limited to 'doc') diff --git a/doc/forum/how_do_I_revert_edits_in_the_web_mode__63__/comment_1_e4720e8e4fe74bd6cba746e8259832e6._comment b/doc/forum/how_do_I_revert_edits_in_the_web_mode__63__/comment_1_e4720e8e4fe74bd6cba746e8259832e6._comment new file mode 100644 index 000000000..597cab2e4 --- /dev/null +++ b/doc/forum/how_do_I_revert_edits_in_the_web_mode__63__/comment_1_e4720e8e4fe74bd6cba746e8259832e6._comment @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="https://www.google.com/accounts/o8/id?id=AItOawmlZJCPogIE74m6GSCmkbJoMZiWNOlXcjI" + nickname="Ian" + subject="comment 1" + date="2010-09-24T19:01:08Z" + content=""" ++1 for a \"revert\" web plugin which at least handles the simple cases. -- Ian Osgood, The TOVA Company +"""]] -- cgit v1.2.3 From c9cceef939d83d0e3bb3793b2995ee5917da082e Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 25 Sep 2010 15:02:32 -0400 Subject: notabug --- doc/bugs/img_plugin_and_class_attr.mdwn | 2 ++ 1 file changed, 2 insertions(+) (limited to 'doc') diff --git a/doc/bugs/img_plugin_and_class_attr.mdwn b/doc/bugs/img_plugin_and_class_attr.mdwn index 4dd0df4ec..7e880b4fc 100644 --- a/doc/bugs/img_plugin_and_class_attr.mdwn +++ b/doc/bugs/img_plugin_and_class_attr.mdwn @@ -23,3 +23,5 @@ This is happening with version 3.20100815 of ikiwiki. [[jerojasro]] +> How is this a bug? It's perfectly legal html for a class attribute to +> put an element into multiple classes. [[notabug|done]] --[[Joey]] -- cgit v1.2.3 From 81d0871dd90166cfd41767b4dc3cfc2cb91c69c2 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 25 Sep 2010 15:04:00 -0400 Subject: forgot to close this, was fixed using %pagestate --- ...r:_no_text_was_copied_in_this_page_--_missing_page_dependencies.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/bugs/Error:_no_text_was_copied_in_this_page_--_missing_page_dependencies.mdwn b/doc/bugs/Error:_no_text_was_copied_in_this_page_--_missing_page_dependencies.mdwn index 4535cf35d..6996a9fbf 100644 --- a/doc/bugs/Error:_no_text_was_copied_in_this_page_--_missing_page_dependencies.mdwn +++ b/doc/bugs/Error:_no_text_was_copied_in_this_page_--_missing_page_dependencies.mdwn @@ -43,4 +43,4 @@ the aggregation in *index.html* or its RSS and atom files. > > Using `%pagestate` to store the cut content when scanning would be > one way to fix this bug. It would mean storing potentially big chunks -> of page content in the indexdb. --[[Joey]] +> of page content in the indexdb. [[done]] --[[Joey]] -- cgit v1.2.3 From 5d201da7188e39787fe08485113300d8e590ba58 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 25 Sep 2010 15:20:41 -0400 Subject: pebak? --- .../can__39__t_mix_template_vars_inside_directives.mdwn | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'doc') diff --git a/doc/bugs/can__39__t_mix_template_vars_inside_directives.mdwn b/doc/bugs/can__39__t_mix_template_vars_inside_directives.mdwn index 0fa85effb..462852ef8 100644 --- a/doc/bugs/can__39__t_mix_template_vars_inside_directives.mdwn +++ b/doc/bugs/can__39__t_mix_template_vars_inside_directives.mdwn @@ -31,3 +31,17 @@ The result, even with htmlscrubber disabled, is mangled, something like
Any suggestions gladly received. -- [[Jon]] + +> Well, you *should* be able to do things like this, and in my testing, I +> *can*. I used your exact example above (removing the backslash escape) +> and invoked it as: +> \[[!template id=test href=himom.png size=100x]] +> +> And got just what you would expect. +> +> I don't know what went wrong for you, but I don't see a bug here. +> My guess, at the moment, is that you didn't specify the required href +> and size parameters when using the template. If I leave those off, +> I of course reproduce what you reported, since the img directive gets +> called with no filename, and so assumes the size parameter is the image +> to display.. [[done]]? --[[Joey]] -- cgit v1.2.3 From 4846b4472ec69e95dd2cc0a792aaf7668367263d Mon Sep 17 00:00:00 2001 From: "98.66.223.132" <98.66.223.132@web> Date: Sun, 26 Sep 2010 04:16:56 +0000 Subject: poll vote (Accept both) --- doc/news/openid.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/news/openid.mdwn b/doc/news/openid.mdwn index 67bf10cb6..32325559e 100644 --- a/doc/news/openid.mdwn +++ b/doc/news/openid.mdwn @@ -10,4 +10,4 @@ log back in, try out the OpenID signup process if you don't already have an OpenID, and see how OpenID works for you. And let me know your feelings about making such a switch. --[[Joey]] -[[!poll 66 "Accept only OpenID for logins" 21 "Accept only password logins" 36 "Accept both"]] +[[!poll 66 "Accept only OpenID for logins" 21 "Accept only password logins" 37 "Accept both"]] -- cgit v1.2.3 From 954b6353b029062418b911114baa9f86b216e44e Mon Sep 17 00:00:00 2001 From: "http://lovesgoodfood.com/jason/" Date: Sun, 26 Sep 2010 04:18:15 +0000 Subject: --- doc/news/openid/discussion.mdwn | 2 ++ 1 file changed, 2 insertions(+) (limited to 'doc') diff --git a/doc/news/openid/discussion.mdwn b/doc/news/openid/discussion.mdwn index c0447a13f..fdd5eecd1 100644 --- a/doc/news/openid/discussion.mdwn +++ b/doc/news/openid/discussion.mdwn @@ -90,3 +90,5 @@ I just tried logging it with OpenID and it Just Worked. Pretty painless. If yo ###LiveJournal openid One caveat to the above is that, of course, OpenID is a distributed trust system which means you do have to think about the trust aspect. A case in point is livejournal.com whose OpenID implementation is badly broken in one important respect: If a LiveJournal user deletes his or her journal, and a different user registers a journal with the same name (this is actually quite a common occurrence on LiveJournal), they in effect inherit the previous journal owner's identity. LiveJournal does not even have a mechanism in place for a remote site even to detect that a journal has changed hands. It is an extremely dodgy situation which they seem to have *no* intention of fixing, and the bottom line is that the "identity" represented by a *username*.livejournal.com token should not be trusted as to its long-term uniqueness. Just FYI. --[[blipvert]] +---- +Submitting bugs in the OpenID components will be difficult if OpenID must be working first... -- cgit v1.2.3 From 896adeafda0b81227ca54f058b18f7c3aadd318c Mon Sep 17 00:00:00 2001 From: "http://lovesgoodfood.com/jason/" Date: Sun, 26 Sep 2010 04:19:29 +0000 Subject: (fixing silly formatting issue) --- doc/news/openid/discussion.mdwn | 2 ++ 1 file changed, 2 insertions(+) (limited to 'doc') diff --git a/doc/news/openid/discussion.mdwn b/doc/news/openid/discussion.mdwn index fdd5eecd1..bc9856ad9 100644 --- a/doc/news/openid/discussion.mdwn +++ b/doc/news/openid/discussion.mdwn @@ -90,5 +90,7 @@ I just tried logging it with OpenID and it Just Worked. Pretty painless. If yo ###LiveJournal openid One caveat to the above is that, of course, OpenID is a distributed trust system which means you do have to think about the trust aspect. A case in point is livejournal.com whose OpenID implementation is badly broken in one important respect: If a LiveJournal user deletes his or her journal, and a different user registers a journal with the same name (this is actually quite a common occurrence on LiveJournal), they in effect inherit the previous journal owner's identity. LiveJournal does not even have a mechanism in place for a remote site even to detect that a journal has changed hands. It is an extremely dodgy situation which they seem to have *no* intention of fixing, and the bottom line is that the "identity" represented by a *username*.livejournal.com token should not be trusted as to its long-term uniqueness. Just FYI. --[[blipvert]] + ---- + Submitting bugs in the OpenID components will be difficult if OpenID must be working first... -- cgit v1.2.3 From fd7062959a6c2d301cfc091795e9989d0df94b23 Mon Sep 17 00:00:00 2001 From: "http://smcv.pseudorandom.co.uk/" Date: Sun, 26 Sep 2010 21:39:07 +0000 Subject: HTML::Tree v4 is not entirely backwards-compatible --- doc/bugs/htmlbalance_fails_with_HTML-Tree_v4.mdwn | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 doc/bugs/htmlbalance_fails_with_HTML-Tree_v4.mdwn (limited to 'doc') diff --git a/doc/bugs/htmlbalance_fails_with_HTML-Tree_v4.mdwn b/doc/bugs/htmlbalance_fails_with_HTML-Tree_v4.mdwn new file mode 100644 index 000000000..c02ec114f --- /dev/null +++ b/doc/bugs/htmlbalance_fails_with_HTML-Tree_v4.mdwn @@ -0,0 +1,13 @@ +[[!template id=gitbranch branch=smcv/ready/htmlbalance author="[[smcv]]"]] + +My one-patch htmlbalance branch fixes incompatibility with HTML::Tree 4.0. +From the git commit: + + The HTML::Tree changelog says: + + [THINGS THAT MAY BREAK YOUR CODE OR TESTS] + ... + * Attribute names are now validated in as_XML and invalid names will + cause an error. + + and indeed the regression tests do get an error. -- cgit v1.2.3 From 82d751cf32d14acfaf09edad70e387c28a946145 Mon Sep 17 00:00:00 2001 From: "http://smcv.pseudorandom.co.uk/" Date: Sun, 26 Sep 2010 21:39:47 +0000 Subject: +patch --- doc/bugs/htmlbalance_fails_with_HTML-Tree_v4.mdwn | 2 ++ 1 file changed, 2 insertions(+) (limited to 'doc') diff --git a/doc/bugs/htmlbalance_fails_with_HTML-Tree_v4.mdwn b/doc/bugs/htmlbalance_fails_with_HTML-Tree_v4.mdwn index c02ec114f..e608e1b3d 100644 --- a/doc/bugs/htmlbalance_fails_with_HTML-Tree_v4.mdwn +++ b/doc/bugs/htmlbalance_fails_with_HTML-Tree_v4.mdwn @@ -11,3 +11,5 @@ From the git commit: cause an error. and indeed the regression tests do get an error. + +[[!tag patch]] -- cgit v1.2.3 From 58c80f8ed1d0dea5e03bc566769522c558353ab8 Mon Sep 17 00:00:00 2001 From: "http://smcv.pseudorandom.co.uk/" Date: Sun, 26 Sep 2010 21:53:00 +0000 Subject: +patch --- ...ttp_or_https_in_urls_to_allow_serving_both.mdwn | 24 ++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'doc') diff --git a/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn b/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn index 63fd3d11d..d59bf15f0 100644 --- a/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn +++ b/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn @@ -56,3 +56,27 @@ becoming a problem for me. Is there anything I can do here? --[[Perry]] > absolute urls that have been fixed since Brian filed the bug. --[[Joey]] [[wishlist]] + +---- + +[[!template id=gitbranch branch=smcv/https author="[[smcv]]"]] +[[!tag patch]] + +For a while I've been using a configuration where each wiki has a HTTP and +a HTTPS mirror, and updating one automatically updates the other, but +that seems unnecessarily complicated. My `https` branch adds `https_url` +and `https_cgiurl` config options which can be used to provide a HTTPS +variant of an existing site; the CGI script automatically detects whether +it was accessed over HTTPS and switches to the other one. + +This required some refactoring, which might be worth merging even if +you don't like my approach: + +* change `IkiWiki::cgiurl` to return the equivalent of `$config{cgiurl}` if + called with no parameters, and change all plugins to indirect through it + (then I only need to change that one function for the HTTPS hack) + +* `IkiWiki::baseurl` already has similar behaviour, so change nearly all + references to the `$config{url}` to call `baseurl` (a couple of references + specifically wanted the top-level public URL for Google or Blogspam rather + than a URL for the user's browser, so I left those alone) -- cgit v1.2.3 From 9d634e97d2f359db65883aadfb941309a53a0bc8 Mon Sep 17 00:00:00 2001 From: "http://smcv.pseudorandom.co.uk/" Date: Sun, 26 Sep 2010 21:53:54 +0000 Subject: sign my change --- ...avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn | 2 ++ 1 file changed, 2 insertions(+) (limited to 'doc') diff --git a/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn b/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn index d59bf15f0..112112284 100644 --- a/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn +++ b/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn @@ -80,3 +80,5 @@ you don't like my approach: references to the `$config{url}` to call `baseurl` (a couple of references specifically wanted the top-level public URL for Google or Blogspam rather than a URL for the user's browser, so I left those alone) + +--[[smcv]] -- cgit v1.2.3 From 759260f7c836f3491d4250e77aea2c14ad9369b5 Mon Sep 17 00:00:00 2001 From: "http://smcv.pseudorandom.co.uk/" Date: Sun, 26 Sep 2010 21:54:32 +0000 Subject: sign --- doc/bugs/htmlbalance_fails_with_HTML-Tree_v4.mdwn | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/bugs/htmlbalance_fails_with_HTML-Tree_v4.mdwn b/doc/bugs/htmlbalance_fails_with_HTML-Tree_v4.mdwn index e608e1b3d..2613224cf 100644 --- a/doc/bugs/htmlbalance_fails_with_HTML-Tree_v4.mdwn +++ b/doc/bugs/htmlbalance_fails_with_HTML-Tree_v4.mdwn @@ -1,4 +1,5 @@ [[!template id=gitbranch branch=smcv/ready/htmlbalance author="[[smcv]]"]] +[[!tag patch]] My one-patch htmlbalance branch fixes incompatibility with HTML::Tree 4.0. From the git commit: @@ -12,4 +13,4 @@ From the git commit: and indeed the regression tests do get an error. -[[!tag patch]] +--[[smcv]] -- cgit v1.2.3 From 43c99f907674de2207a7b411ee1b0c2996ce79d2 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 26 Sep 2010 22:37:18 -0400 Subject: htmlbalance: Fix compatability with HTML::Tree 4.0. (smcv) --- debian/changelog | 1 + doc/bugs/htmlbalance_fails_with_HTML-Tree_v4.mdwn | 2 ++ 2 files changed, 3 insertions(+) (limited to 'doc') diff --git a/debian/changelog b/debian/changelog index 97f9d3c79..a71a08ea2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ ikiwiki (3.20100916) UNRELEASED; urgency=low * meta: Ensure that the url specified by xrds-location is absolute. * attachment: Fix attachment file size display. * Propigate PATH into wrapper. + * htmlbalance: Fix compatability with HTML::Tree 4.0. (smcv) -- Joey Hess Sun, 19 Sep 2010 20:13:06 -0400 diff --git a/doc/bugs/htmlbalance_fails_with_HTML-Tree_v4.mdwn b/doc/bugs/htmlbalance_fails_with_HTML-Tree_v4.mdwn index 2613224cf..92427065d 100644 --- a/doc/bugs/htmlbalance_fails_with_HTML-Tree_v4.mdwn +++ b/doc/bugs/htmlbalance_fails_with_HTML-Tree_v4.mdwn @@ -14,3 +14,5 @@ From the git commit: and indeed the regression tests do get an error. --[[smcv]] + +[[done]] --[[Joey]] -- cgit v1.2.3 From e7b772e65b5cedb6773a6ecc52cde6fb0bacdd79 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 26 Sep 2010 23:01:01 -0400 Subject: review --- ...g_http_or_https_in_urls_to_allow_serving_both.mdwn | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'doc') diff --git a/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn b/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn index 112112284..1547c39eb 100644 --- a/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn +++ b/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn @@ -82,3 +82,22 @@ you don't like my approach: than a URL for the user's browser, so I left those alone) --[[smcv]] + +> The justification for your patch seems to be wanting to use a different +> domain, like secure.foo.com, for https? Can you really not just configure +> both url and cgiurl to use `https://secure.foo.com/...` and rely on +> relative links to keep users of `http://insecure.foo.com/` on http until +> they need to use the cgi? +> +> I'm unconvinced. +> +> `Ikiwiki::baseurl()."foo"` just seems to be asking for trouble, +> ie being accidentially written as `IkiWiki::baseurl("foo")`, +> which will fail when foo is not a page, but some file. +> +> I see multiple places (inline.pm, meta.pm, poll.pm, recentchanges.pm) +> where it will now put the https url into a static page if the build +> happens to be done by the cgi accessed via https, but not otherwise. +> I would rather not have to audit for such problems going forward. +> +> --[[Joey]] -- cgit v1.2.3 From 06fe3dadae90c143eea80129e47d7dd1bc81282c Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 27 Sep 2010 00:56:26 -0400 Subject: add news item for ikiwiki 3.20100926 --- doc/news/version_3.20100722.mdwn | 25 ------------------------- doc/news/version_3.20100926.mdwn | 6 ++++++ 2 files changed, 6 insertions(+), 25 deletions(-) delete mode 100644 doc/news/version_3.20100722.mdwn create mode 100644 doc/news/version_3.20100926.mdwn (limited to 'doc') diff --git a/doc/news/version_3.20100722.mdwn b/doc/news/version_3.20100722.mdwn deleted file mode 100644 index 27ed1fd4d..000000000 --- a/doc/news/version_3.20100722.mdwn +++ /dev/null @@ -1,25 +0,0 @@ -ikiwiki 3.20100722 released with [[!toggle text="these changes"]] -[[!toggleable text=""" - * img: Add a margin around images displayed by this directive. - * comments: Added commentmoderation directive for easy linking to the - comment moderation queue. - * aggregate: Write timestamp next aggregation can happen to - .ikiwiki/aggregatetime, to allow for more sophisticated cron jobs. - * Add --changesetup mode that allows easily changing options in a - setup file. - * openid: Fix handling of utf-8 nicknames. - * Clarified what the filter hook should be passed: Only be the raw, - complete text of a page. Not a snippet, or data read in from an - unrelated file. - * template: Do not pass filled in template through filter hook. - Avoids causing breakage in po plugin. - * color, comments, conditional, cutpaste, more, sidebar, toggle: Also - avoid unnecessary calls to filter hook. - * po: needstranslation() pagespec can have a percent specified. - * Drop Cache-Control must-revalidate (Firefox 3.5.10 does not seem to have - the caching problem that was added to work around). Closes: #[588623](http://bugs.debian.org/588623) - * Made much more robust in cases where multiple source files produce - conflicting files/directories in the destdir. - * Updated French translation from Philippe Batailler. Closes: #[589423](http://bugs.debian.org/589423) - * po: Fix selflink display on tranlsated pages. (intrigeri) - * Avoid showing 'Add a comment' link at the bottom of the comment post form."""]] \ No newline at end of file diff --git a/doc/news/version_3.20100926.mdwn b/doc/news/version_3.20100926.mdwn new file mode 100644 index 000000000..b56e5770b --- /dev/null +++ b/doc/news/version_3.20100926.mdwn @@ -0,0 +1,6 @@ +ikiwiki 3.20100926 released with [[!toggle text="these changes"]] +[[!toggleable text=""" + * meta: Ensure that the url specified by xrds-location is absolute. + * attachment: Fix attachment file size display. + * Propigate PATH into wrapper. + * htmlbalance: Fix compatibility with HTML::Tree 4.0. (smcv)"""]] \ No newline at end of file -- cgit v1.2.3 From e05099d5cf70b3637c57b6584df3bdfddbb5e513 Mon Sep 17 00:00:00 2001 From: "http://smcv.pseudorandom.co.uk/" Date: Mon, 27 Sep 2010 18:48:58 +0000 Subject: yay https --- ...ttp_or_https_in_urls_to_allow_serving_both.mdwn | 37 +++++++++++++++++++--- 1 file changed, 33 insertions(+), 4 deletions(-) (limited to 'doc') diff --git a/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn b/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn index 1547c39eb..cbd8c4da7 100644 --- a/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn +++ b/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn @@ -88,16 +88,45 @@ you don't like my approach: > both url and cgiurl to use `https://secure.foo.com/...` and rely on > relative links to keep users of `http://insecure.foo.com/` on http until > they need to use the cgi? -> + +>> My problem with that is that uses of the CGI aren't all equal (and that +>> the CA model is broken). You could put CGI uses in two classes: +>> +>> - websetup and other "serious" things (for the sites I'm running, which +>> aren't very wiki-like, editing pages is also in this class). +>> I'd like to be able to let privileged users log in over +>> https with httpauth (or possibly even a client certificate), and I don't +>> mind teaching these few people how to do the necessary contortions to +>> enable something like CACert. +>> +>> - Random users making limited use of the CGI: do=goto, do=404, and +>> commenting with an OpenID. I don't think it's realistic to expect +>> users to jump through all the CA hoops to get CACert installed for that, +>> which leaves their browsers being actively obstructive, unless I either +>> pay the CA tax (per subdomain) to get "real" certificates, or use plain +>> http. +>> +>> On a more wiki-like wiki, the second group would include normal page edits. +>> +>> Perhaps I'm doing this backwards, and instead of having the master +>> `url`/`cgiurl` be the HTTP version and providing tweakables to override +>> these with HTTPS, I should be overriding particular uses to plain HTTP... +>> +>> --[[smcv]] + > I'm unconvinced. > > `Ikiwiki::baseurl()."foo"` just seems to be asking for trouble, > ie being accidentially written as `IkiWiki::baseurl("foo")`, > which will fail when foo is not a page, but some file. -> + +>> That's a good point. --s + > I see multiple places (inline.pm, meta.pm, poll.pm, recentchanges.pm) > where it will now put the https url into a static page if the build > happens to be done by the cgi accessed via https, but not otherwise. > I would rather not have to audit for such problems going forward. -> -> --[[Joey]] + +>> Yes, that's a problem with this approach (either way round). Perhaps +>> making it easier to run two mostly-synched copies like I was previously +>> doing is the only solution... --s -- cgit v1.2.3 From 3d3af6983d32b41143d5e64ac90c44d1bc829d07 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 27 Sep 2010 15:36:05 -0400 Subject: response --- ...wiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'doc') diff --git a/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn b/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn index cbd8c4da7..bb0a87183 100644 --- a/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn +++ b/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn @@ -108,11 +108,21 @@ you don't like my approach: >> >> On a more wiki-like wiki, the second group would include normal page edits. >> +>>> I see your use case. It still seems to me that for the more common +>>> case where CA tax has been paid (getting a cert that is valid for +>>> multiple subdomains should be doable?), having anything going through the +>>> cgiurl upgrade to https would be ok. In that case, http is just an +>>> optimisation for low-value, high-aggregate-bandwidth type uses, so a +>>> little extra https on the side is not a big deal. --[[Joey]] +>> >> Perhaps I'm doing this backwards, and instead of having the master >> `url`/`cgiurl` be the HTTP version and providing tweakables to override >> these with HTTPS, I should be overriding particular uses to plain HTTP... >> >> --[[smcv]] +>>> +>>> Maybe, or I wonder if you could just use RewriteEngine for such selective +>>> up/downgrading. Match on `do=(edit|create|prefs)`. --[[Joey]] > I'm unconvinced. > -- cgit v1.2.3 From e22b18aabcb46e3c0eafeb466b51bb3eb18cf1e1 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 27 Sep 2010 15:47:14 -0400 Subject: template_depends: throw nice error message when template cannot be found plovs reported a crash when templates were not installed properly, with a non-useful error about the template object not being defined. I've audited all uses of template_depends(), and template(), and it makes sense for them to throw an error if the template cannot be found. All code with a user-supplied template catches errors already, to handle template parse failures. It did not make sense for template_file to throw errors, as some code uses it to probe if a template file is available. --- IkiWiki.pm | 8 +++++--- IkiWiki/Plugin/edittemplate.pm | 3 --- IkiWiki/Plugin/inline.pm | 5 +---- IkiWiki/Plugin/template.pm | 7 ++----- doc/plugins/write.mdwn | 2 ++ 5 files changed, 10 insertions(+), 15 deletions(-) (limited to 'doc') diff --git a/IkiWiki.pm b/IkiWiki.pm index 6da281999..66ae86809 100644 --- a/IkiWiki.pm +++ b/IkiWiki.pm @@ -1769,12 +1769,14 @@ sub template_depends ($$;@) { my $page=shift; my ($filename, $tpage, $untrusted)=template_file($name); + if (! defined $filename) { + error(sprintf(gettext("template %s not found"), $name)) + } + if (defined $page && defined $tpage) { add_depends($page, $tpage); } - - return unless defined $filename; - + my @opts=( filter => sub { my $text_ref = shift; diff --git a/IkiWiki/Plugin/edittemplate.pm b/IkiWiki/Plugin/edittemplate.pm index 4f07866e4..576c94be4 100644 --- a/IkiWiki/Plugin/edittemplate.pm +++ b/IkiWiki/Plugin/edittemplate.pm @@ -132,9 +132,6 @@ sub filltemplate ($$) { # up a template that doesn't work. return "[[!pagetemplate ".gettext("failed to process template:")." $@]]"; } - if (! defined $template) { - return; - } $template->param(name => $page); diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm index 715a3d652..c00aed299 100644 --- a/IkiWiki/Plugin/inline.pm +++ b/IkiWiki/Plugin/inline.pm @@ -336,10 +336,7 @@ sub preprocess_inline (@) { blind_cache => 1); }; if ($@) { - error gettext("failed to process template:")." $@"; - } - if (! $template) { - error sprintf(gettext("template %s not found"), $params{template}.".tmpl"); + error sprintf(gettext("failed to process template %s"), $params{template}.".tmpl").": $@"; } } my $needcontent=$raw || (!($archive && $quick) && $template->query(name => 'content')); diff --git a/IkiWiki/Plugin/template.pm b/IkiWiki/Plugin/template.pm index db26bfe31..3df06e652 100644 --- a/IkiWiki/Plugin/template.pm +++ b/IkiWiki/Plugin/template.pm @@ -41,12 +41,9 @@ sub preprocess (@) { blind_cache => 1); }; if ($@) { - error gettext("failed to process template:")." $@"; - } - if (! $template) { - error sprintf(gettext("%s not found"), + error sprintf(gettext("failed to process template %s"), htmllink($params{page}, $params{destpage}, - "/templates/$params{id}")) + "/templates/$params{id}"))." $@"; } $params{basename}=IkiWiki::basename($params{page}); diff --git a/doc/plugins/write.mdwn b/doc/plugins/write.mdwn index e60314485..d5bd1dd76 100644 --- a/doc/plugins/write.mdwn +++ b/doc/plugins/write.mdwn @@ -740,6 +740,8 @@ with no ".tmpl" extension. Template pages are normally looked for in the templates/ directory. If the page name starts with "/", a page elsewhere in the wiki can be used. +If the template is not found, or contains a syntax error, an error is thrown. + ### `template_depends($$;@)` Use this instead of `template()` if the content of a template is being -- cgit v1.2.3 From 142c77ff6f0f08cc486aa12f4e52eb32ec9f1c71 Mon Sep 17 00:00:00 2001 From: "http://jmtd.livejournal.com/" Date: Mon, 27 Sep 2010 22:17:29 +0000 Subject: probably PEBKAC (but still haven't figured it out) --- doc/bugs/can__39__t_mix_template_vars_inside_directives.mdwn | 2 ++ 1 file changed, 2 insertions(+) (limited to 'doc') diff --git a/doc/bugs/can__39__t_mix_template_vars_inside_directives.mdwn b/doc/bugs/can__39__t_mix_template_vars_inside_directives.mdwn index 462852ef8..7bb39470f 100644 --- a/doc/bugs/can__39__t_mix_template_vars_inside_directives.mdwn +++ b/doc/bugs/can__39__t_mix_template_vars_inside_directives.mdwn @@ -45,3 +45,5 @@ Any suggestions gladly received. -- [[Jon]] > I of course reproduce what you reported, since the img directive gets > called with no filename, and so assumes the size parameter is the image > to display.. [[done]]? --[[Joey]] + +>> Hmm, eek. Just double-checked, and done a full rebuild. No dice! Version 3.20100831. Feel free to leave this marked done, It probably *is* PEBKAC. I shall look again in day time. -- [[Jon]] -- cgit v1.2.3 From a70f8dad67a2abe09e451ffefb96be3f7ef67176 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 27 Sep 2010 18:47:13 -0400 Subject: test case --- doc/bugs/can__39__t_mix_template_vars_inside_directives.mdwn | 3 +++ 1 file changed, 3 insertions(+) (limited to 'doc') diff --git a/doc/bugs/can__39__t_mix_template_vars_inside_directives.mdwn b/doc/bugs/can__39__t_mix_template_vars_inside_directives.mdwn index 7bb39470f..72bd1cfa2 100644 --- a/doc/bugs/can__39__t_mix_template_vars_inside_directives.mdwn +++ b/doc/bugs/can__39__t_mix_template_vars_inside_directives.mdwn @@ -47,3 +47,6 @@ Any suggestions gladly received. -- [[Jon]] > to display.. [[done]]? --[[Joey]] >> Hmm, eek. Just double-checked, and done a full rebuild. No dice! Version 3.20100831. Feel free to leave this marked done, It probably *is* PEBKAC. I shall look again in day time. -- [[Jon]] + +>>> As always, if you'd like to mail me a larger test case that reproduces a +>>> problem for you, I can take a look at it. --[[Joey]] -- cgit v1.2.3 From 9a0d1862f4ffc6c6958d2133881b3984224a11c7 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawnZyXrBJHCbhjyf69drmoWxbsEex_bQhEk" Date: Tue, 28 Sep 2010 19:01:50 +0000 Subject: initial page --- doc/plugins/contrib/imailhide.mdwn | 60 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) create mode 100644 doc/plugins/contrib/imailhide.mdwn (limited to 'doc') diff --git a/doc/plugins/contrib/imailhide.mdwn b/doc/plugins/contrib/imailhide.mdwn new file mode 100644 index 000000000..7e9a3f995 --- /dev/null +++ b/doc/plugins/contrib/imailhide.mdwn @@ -0,0 +1,60 @@ +[[!template id=plugin name=imailhide author="Peter Vizi"]] +[[!tag mailhide]] + +# Mailhide plugin for Ikiwiki + +This plugin provides the directive mailhide, that uses the [Mailhide +API][1] to protect email addresses from spammers. + +## Dependencies + +The [Captcha::reCAPTCHA::Mailhide][2] perl module is required for this +plugin. + +## Download + +You can get the source code from [github][3]. + +## Installation + +Copy `imailhide.pm` to `/usr/share/perl/5.10.0/IkiWiki/Plugin` or +`~/.ikiwiki/IkiWiki/Plugin`, and enable it in your `.setup` file + + add_plugins => [qw{goodstuff imailhide ....}], + mailhide_public_key => "8s99vSA99fF11mao193LWdpa==", + mailhide_private_key => "6b5e4545326b5e4545326b5e45453223", + mailhide_default_style => "short", + +## Configuration + +### `mailhide_public_key` + +This is your personal public key that you can get at [Google][4]. + +### `mailhide_private_key` + +This is your personal private key that you can get at [Google][4]. + +### `mailhide_default_style` + +As per the recommendation of the [Mailhide API documentation][5], you +can define this as `short` or `long`. The `short` parameter will +result in `john` links, while the `long` parameter +will result in `joh...@example.com`. + +## Parameters + +### `email` + +*Required.* This is the email addres that you want to hide. + +### `style` + +*Optional.* You can set the style parameter individually for each + `mailhide` call. See `mailhide_default_style` for details. + +[1]: http://www.google.com/recaptcha/mailhide/ +[2]: http://search.cpan.org/perldoc?Captcha::reCAPTCHA::Mailhide +[3]: http://github.com/petervizi/imailhide +[4]: http://www.google.com/recaptcha/mailhide/apikey +[5]: http://code.google.com/apis/recaptcha/docs/mailhideapi.html -- cgit v1.2.3 From 219f057e5857c952289fcacd14cf0da91c5262b2 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawnZyXrBJHCbhjyf69drmoWxbsEex_bQhEk" Date: Tue, 28 Sep 2010 19:24:07 +0000 Subject: better tags --- doc/plugins/contrib/imailhide.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/plugins/contrib/imailhide.mdwn b/doc/plugins/contrib/imailhide.mdwn index 7e9a3f995..3aacef57a 100644 --- a/doc/plugins/contrib/imailhide.mdwn +++ b/doc/plugins/contrib/imailhide.mdwn @@ -1,5 +1,5 @@ [[!template id=plugin name=imailhide author="Peter Vizi"]] -[[!tag mailhide]] +[[!tag type/widget type/html]] # Mailhide plugin for Ikiwiki -- cgit v1.2.3 From 11f4a42884c1d4c72a438e715e84da7cc3e2175a Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 28 Sep 2010 16:34:43 -0400 Subject: add reference to peteg's revert code --- doc/forum/how_do_I_revert_edits_in_the_web_mode__63__.mdwn | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'doc') diff --git a/doc/forum/how_do_I_revert_edits_in_the_web_mode__63__.mdwn b/doc/forum/how_do_I_revert_edits_in_the_web_mode__63__.mdwn index 7686a7a08..dc2b7ca4a 100644 --- a/doc/forum/how_do_I_revert_edits_in_the_web_mode__63__.mdwn +++ b/doc/forum/how_do_I_revert_edits_in_the_web_mode__63__.mdwn @@ -33,3 +33,9 @@ Puzzled a bit :-/ >>>> had its own history browser (somewhere down my todo list). --[[schmonz]] >>>> Yup, having a possibility to revert a single file would suffice. + +--- + +There is some work in progress on this by Peter Gammie. --[[Joey]] + +[[!template id=gitbranch branch=peteg/master author="[[peteg]]"]] -- cgit v1.2.3 From 8571f1e38db474e9fe7616937f8cc896e38813a3 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 28 Sep 2010 17:07:01 -0400 Subject: add todo page for web reversion, with code review of patch --- ...ow_do_I_revert_edits_in_the_web_mode__63__.mdwn | 5 +- doc/todo/web_reversion.mdwn | 56 ++++++++++++++++++++++ 2 files changed, 58 insertions(+), 3 deletions(-) create mode 100644 doc/todo/web_reversion.mdwn (limited to 'doc') diff --git a/doc/forum/how_do_I_revert_edits_in_the_web_mode__63__.mdwn b/doc/forum/how_do_I_revert_edits_in_the_web_mode__63__.mdwn index dc2b7ca4a..4998c1a75 100644 --- a/doc/forum/how_do_I_revert_edits_in_the_web_mode__63__.mdwn +++ b/doc/forum/how_do_I_revert_edits_in_the_web_mode__63__.mdwn @@ -36,6 +36,5 @@ Puzzled a bit :-/ --- -There is some work in progress on this by Peter Gammie. --[[Joey]] - -[[!template id=gitbranch branch=peteg/master author="[[peteg]]"]] +Perer Gammie and I are working on reversion over at [[todo/web_reversion]]. +--[[Joey]] diff --git a/doc/todo/web_reversion.mdwn b/doc/todo/web_reversion.mdwn new file mode 100644 index 000000000..50cb13fad --- /dev/null +++ b/doc/todo/web_reversion.mdwn @@ -0,0 +1,56 @@ +Goal: Web interface to allow reverting of changes. + +Interface: + +At least at first, it will be exposed via the recentchanges +page, with revert icons next to each change. We may want a dynamic +per-page interface that goes back more than 100 changes later. + +Limiting assumptions: + +* No support for resolving conflicts in reverts; such a revert would just + fail and not happen. +* No support for reset-to-this-point; initially the interface would only + revert a single commit, and if a bunch needed to go, the user would have + to drive that one at a time. + +Implementation plan: + +* `rcs_revert` hook that takes a revision to revert. +* CGI: `do=revert&rev=foo` +* recentchanges plugin adds above to recentchanges page +* prompt user to confirm (to avoid spiders doing reverts), + check that user is allowed to make the change, commit reversion, + and refresh site. + +Peter Gammie has done an initial implementation of the above. +[[!template id=gitbranch branch=peteg/master author="[[peteg]]"]] + +> Review: --[[Joey]] +> +> The revert commit will not currently say what web user did the revert. +> This could be fixed by doing a --no-commit revert first and then using +> rcs_commit_staged. +> +> So I see one thing I completly forgot about is `check_canedit`. Avoiding users +> using reverting to make changes they would normally not be allowed to do is +> tricky. I guess that a easy first pass would be to only let admins do it. +> That would be enough to get the feature out there.. +> +> I'm thinking about having a `rcs_preprevert`. It would take a rev and look +> at what changes reverting it would entail, and return the same data +> structure that `rcs_recieve` does. This could be done by using `git revert +> --no-commit`, and then examining the changes, and then `git reset` to drop +> them. +> +> Then the code that is currently in IkiWiki/Receive.pm, that calls +> `check_canedit` and `check_canremove` to test the change, can be +> straightforwardly refactored out, and used for checking reverts too. +> +> (The data from `rcs_preprevert` could also be used for a confirmation +> prompt -- it doesn't currently include enough info for diffs, but at +> least could have a list of changed files.) +> +> Note that it's possible for a git repo to have commits that modify wiki +> files in a subdir, and code files elsewhere. `rcs_preprevert` should +> detect changes outside the wiki dir, and fail, like `rcs_receive` does. -- cgit v1.2.3 From 388dd74c96fdcd18141081b8ec0ae68dd128b89d Mon Sep 17 00:00:00 2001 From: "http://smcv.pseudorandom.co.uk/" Date: Wed, 29 Sep 2010 00:28:14 +0000 Subject: alternative approach with untested branch --- ...ttp_or_https_in_urls_to_allow_serving_both.mdwn | 32 +++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn b/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn index bb0a87183..e2d9a5993 100644 --- a/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn +++ b/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn @@ -60,7 +60,6 @@ becoming a problem for me. Is there anything I can do here? --[[Perry]] ---- [[!template id=gitbranch branch=smcv/https author="[[smcv]]"]] -[[!tag patch]] For a while I've been using a configuration where each wiki has a HTTP and a HTTPS mirror, and updating one automatically updates the other, but @@ -140,3 +139,34 @@ you don't like my approach: >> Yes, that's a problem with this approach (either way round). Perhaps >> making it easier to run two mostly-synched copies like I was previously >> doing is the only solution... --s + +---- + +**warning: untested branch ** [[!template id=gitbranch branch=smcv/localurl author="[[smcv]]"]] + +OK, here's an alternative approach, closer in spirit to what was initially +requested. I haven't tested this at all (it's getting rather late in UK time) +and it will probably be rebased later, but I've referenced it here as a proof of +concept. + +The idea is that in the common case, the CGI and the pages will reside on the +same server, so they can use "semi-absolute" URLs (`/ikiwiki.cgi`, `/style.css`, +`/bugs/done`) to refer to each other. My branch adds config options which +could be set as follows for ikiwiki.info or any branchable.com site: + +* local_url: / +* local_cgiurl: /ikiwiki.cgi + +Most redirects, form actions, links etc. can safely use this form rather than +the fully-absolute URL. If not configured, these options default to the +corresponding absolute URL, which is would also be correct for unusual sites +where the CGI and the pages aren't on the same server. + +(In theory you could use things like `//static.example.com/wiki/` and +`//dynamic.example.com/ikiwiki.cgi` to preserve choice of http/https +while switching server, but I don't know how consistently browsers +suppot that.) + +"local" here is short for "locally valid", because these URLs are neither +fully relative nor fully absolute, and there doesn't seem to be a good name +for them... -- cgit v1.2.3 From 589aabeebe50c8ee95cd7c60c2128204264dd634 Mon Sep 17 00:00:00 2001 From: PeteG Date: Wed, 29 Sep 2010 04:22:10 +0000 Subject: --- doc/todo/web_reversion.mdwn | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'doc') diff --git a/doc/todo/web_reversion.mdwn b/doc/todo/web_reversion.mdwn index 50cb13fad..92052eb26 100644 --- a/doc/todo/web_reversion.mdwn +++ b/doc/todo/web_reversion.mdwn @@ -24,14 +24,17 @@ Implementation plan: and refresh site. Peter Gammie has done an initial implementation of the above. -[[!template id=gitbranch branch=peteg/master author="[[peteg]]"]] +[[!template id=gitbranch branch=peteg/revert author="[[peteg]]"]] + +>> It is on a separate branch now. --[[peteg]] > Review: --[[Joey]] > > The revert commit will not currently say what web user did the revert. > This could be fixed by doing a --no-commit revert first and then using > rcs_commit_staged. -> +>> Fixed, I think. --[[peteg]] +> > So I see one thing I completly forgot about is `check_canedit`. Avoiding users > using reverting to make changes they would normally not be allowed to do is > tricky. I guess that a easy first pass would be to only let admins do it. -- cgit v1.2.3 From acecbad0ff4a8c441da520522710dd5357ab31e0 Mon Sep 17 00:00:00 2001 From: Peter Gammie Date: Wed, 29 Sep 2010 15:14:19 +1000 Subject: First cut at the revert plugin. --- IkiWiki.pm | 12 ++++++++ IkiWiki/Plugin/git.pm | 35 +++++++++++++++++++++ IkiWiki/Plugin/recentchanges.pm | 66 ++++++++++++++++++++++++++++++++++++++++ doc/templates.mdwn | 2 +- doc/wikiicons/revert.png | Bin 0 -> 840 bytes templates/revert.tmpl | 13 ++++++++ 6 files changed, 127 insertions(+), 1 deletion(-) create mode 100644 doc/wikiicons/revert.png create mode 100644 templates/revert.tmpl (limited to 'doc') diff --git a/IkiWiki.pm b/IkiWiki.pm index 66ae86809..e2b2ceda3 100644 --- a/IkiWiki.pm +++ b/IkiWiki.pm @@ -1941,6 +1941,18 @@ sub rcs_receive () { $hooks{rcs}{rcs_receive}{call}->(); } +sub rcs_preprevert ($) { + $hooks{rcs}{rcs_preprevert}{call}->(@_); +} + +sub rcs_revert (@) { + $hooks{rcs}{rcs_revert}{call}->(@_); +} + +sub rcs_showpatch ($) { + $hooks{rcs}{rcs_showpatch}{call}->(@_); +} + sub add_depends ($$;$) { my $page=shift; my $pagespec=shift; diff --git a/IkiWiki/Plugin/git.pm b/IkiWiki/Plugin/git.pm index fd57ce1e4..a68bd0b0e 100644 --- a/IkiWiki/Plugin/git.pm +++ b/IkiWiki/Plugin/git.pm @@ -27,6 +27,10 @@ sub import { hook(type => "rcs", id => "rcs_getctime", call => \&rcs_getctime); hook(type => "rcs", id => "rcs_getmtime", call => \&rcs_getmtime); hook(type => "rcs", id => "rcs_receive", call => \&rcs_receive); + hook(type => "rcs", id => "rcs_preprevert", call => \&rcs_preprevert); + hook(type => "rcs", id => "rcs_revert", call => \&rcs_revert); + hook(type => "rcs", id => "rcs_showpatch", call => \&rcs_showpatch); + hook(type => "rcs", id => "rcs_revert", call => \&rcs_revert); } sub checkconfig () { @@ -811,4 +815,35 @@ sub rcs_receive () { return reverse @rets; } +sub rcs_preprevert ($) { + # FIXME implement +} + +sub rcs_revert (@) { + # Try to revert the given patch; returns undef on _success_. + # Same parameters as rcs_commit_staged + 'rev', the patch ID to be + # reverted. + my %params = @_; + my $rev = $params{rev}; + + if(run_or_non('git', 'revert', '--no-commit', $rev)) { + debug "Committing revert for patch '$rev'."; + rcs_commit_staged(message => "This reverts commit $rev", @_); + } else { + # No idea what is actually getting reverted, so all we can do is say we failed. + run_or_die('git', 'reset', '--hard'); + return "Failed to revert patch $rev."; + } +} + +sub rcs_showpatch ($) { + # Show the patch with the given revision id. + my ($rev) = @_; + + # FIXME check + my @r = run_or_die('git', 'show', $rev); + + return join "\n", @r; +} + 1 diff --git a/IkiWiki/Plugin/recentchanges.pm b/IkiWiki/Plugin/recentchanges.pm index 758b98348..2a78566e1 100644 --- a/IkiWiki/Plugin/recentchanges.pm +++ b/IkiWiki/Plugin/recentchanges.pm @@ -60,6 +60,72 @@ sub refresh ($) { } } +sub confirmation_form { + my ($q, $session, $rev) = @_; + + eval q{use CGI::FormBuilder}; + error($@) if $@; + my $f = CGI::FormBuilder->new( + name => "revert", + header => 0, + charset => "utf-8", + method => 'POST', + javascript => 0, + params => $q, + action => $config{cgiurl}, + stylesheet => 1, + template => { template('revert.tmpl') }, + ); + + $f->field(name => "sid", type => "hidden", value => $session->id, + force => 1); + $f->field(name => "do", type => "hidden", value => "revert", force => 1); + $f->field(name => "rev", type => "hidden", value => $rev, force => 1); + + return $f, ["Revert", "Cancel"]; +} + +sub sessioncgi ($$) { + my ($q, $session) = @_; + my $do = $q->param('do'); + my $rev = $q->param('rev'); + + return unless $do eq 'revert' && $rev; + + # FIXME rcs_preprevert ?? + IkiWiki::check_canedit('FIXME', $q, $session); + + my ($form, $buttons) = confirmation_form($q, $session); + IkiWiki::decode_form_utf8($form); + + if($form->submitted eq 'Revert' && $form->validate) { + IkiWiki::checksessionexpiry($q, $session, $q->param('sid')); + + IkiWiki::disable_commit_hook(); + my $r = IkiWiki::rcs_revert( + session => $session, + rev => $rev); + IkiWiki::enable_commit_hook(); + + if($r) { + die "FIXME revert '$rev' failed."; + } else { + IkiWiki::refresh(); + IkiWiki::saveindex(); + # FIXME indicate success. + } + } else { + $form->title(sprintf(gettext("confirm reversion of %s"), $rev)); + my $patch_contents = IkiWiki::rcs_showpatch($rev); + $form->tmpl_param(patch_contents => encode_entities($patch_contents)); + IkiWiki::showform($form, $buttons, $session, $q); + exit 0; + } + + IkiWiki::redirect($q, urlto($config{recentchangespage}, '')); + exit 0; +} + # Enable the recentchanges link. sub pagetemplate (@) { my %params=@_; diff --git a/doc/templates.mdwn b/doc/templates.mdwn index bfb6a439a..4fd2bf501 100644 --- a/doc/templates.mdwn +++ b/doc/templates.mdwn @@ -74,7 +74,7 @@ html out of ikiwiki and in the templates. * `editpage.tmpl`, `editconflict.tmpl`, `editcreationconflict.tmpl`, `editfailedsave.tmpl`, `editpagegone.tmpl`, `pocreatepage.tmpl`, `editcomment.tmpl` `commentmoderation.tmpl`, `renamesummary.tmpl`, - `passwordmail.tmpl`, `openid-selector.tmpl` - Parts of ikiwiki's user + `passwordmail.tmpl`, `openid-selector.tmpl`, `revert.tmpl` - Parts of ikiwiki's user interface; do not normally need to be customised. [[!meta robots="noindex, follow"]] diff --git a/doc/wikiicons/revert.png b/doc/wikiicons/revert.png new file mode 100644 index 000000000..9036046e9 Binary files /dev/null and b/doc/wikiicons/revert.png differ diff --git a/templates/revert.tmpl b/templates/revert.tmpl new file mode 100644 index 000000000..3cf069dca --- /dev/null +++ b/templates/revert.tmpl @@ -0,0 +1,13 @@ +
+
+
+ +
+ + +
+
+ + +
+ -- cgit v1.2.3 From 64c3c0d0deb80c5af69154d0bc06419a2232fb8f Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawnZyXrBJHCbhjyf69drmoWxbsEex_bQhEk" Date: Wed, 29 Sep 2010 10:12:52 +0000 Subject: --- doc/plugins/contrib/imailhide.mdwn | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'doc') diff --git a/doc/plugins/contrib/imailhide.mdwn b/doc/plugins/contrib/imailhide.mdwn index 3aacef57a..3247f57bf 100644 --- a/doc/plugins/contrib/imailhide.mdwn +++ b/doc/plugins/contrib/imailhide.mdwn @@ -1,7 +1,4 @@ -[[!template id=plugin name=imailhide author="Peter Vizi"]] -[[!tag type/widget type/html]] - -# Mailhide plugin for Ikiwiki +# Mailhide Plugin for Ikiwiki This plugin provides the directive mailhide, that uses the [Mailhide API][1] to protect email addresses from spammers. @@ -53,8 +50,13 @@ will result in `joh...@example.com`. *Optional.* You can set the style parameter individually for each `mailhide` call. See `mailhide_default_style` for details. +## Known Issues + +1. [opening new window when displaying email address][6] + [1]: http://www.google.com/recaptcha/mailhide/ [2]: http://search.cpan.org/perldoc?Captcha::reCAPTCHA::Mailhide [3]: http://github.com/petervizi/imailhide [4]: http://www.google.com/recaptcha/mailhide/apikey [5]: http://code.google.com/apis/recaptcha/docs/mailhideapi.html +[6]: http://github.com/petervizi/imailhide/issues#issue/1 -- cgit v1.2.3 From b0483974f5f71bc75f5a4df3e636af246371cbf6 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawnZyXrBJHCbhjyf69drmoWxbsEex_bQhEk" Date: Wed, 29 Sep 2010 10:15:04 +0000 Subject: --- doc/plugins/contrib/imailhide.mdwn | 3 +++ 1 file changed, 3 insertions(+) (limited to 'doc') diff --git a/doc/plugins/contrib/imailhide.mdwn b/doc/plugins/contrib/imailhide.mdwn index 3247f57bf..6009aa012 100644 --- a/doc/plugins/contrib/imailhide.mdwn +++ b/doc/plugins/contrib/imailhide.mdwn @@ -1,3 +1,6 @@ +[[!template id=plugin name=imailhide author="Peter_Vizi"]] +[[!tag type/widget type/html]] + # Mailhide Plugin for Ikiwiki This plugin provides the directive mailhide, that uses the [Mailhide -- cgit v1.2.3 From 0d03e639003f1b9e640d0da4c82cb6f26f1e437b Mon Sep 17 00:00:00 2001 From: "http://jmtd.livejournal.com/" Date: Thu, 30 Sep 2010 08:55:04 +0000 Subject: code and lists --- doc/sandbox/bullet_list_and_code_test.mdwn | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 doc/sandbox/bullet_list_and_code_test.mdwn (limited to 'doc') diff --git a/doc/sandbox/bullet_list_and_code_test.mdwn b/doc/sandbox/bullet_list_and_code_test.mdwn new file mode 100644 index 000000000..a17729c90 --- /dev/null +++ b/doc/sandbox/bullet_list_and_code_test.mdwn @@ -0,0 +1,12 @@ +paragraph. + + code + + * bullet list + * bullet list + + more code + + * bullet list continued + + tailing code -- cgit v1.2.3 From 19c1b202a4f94f4d627f030161bac45055ac22ec Mon Sep 17 00:00:00 2001 From: "http://jmtd.livejournal.com/" Date: Thu, 30 Sep 2010 08:57:56 +0000 Subject: +branchable link, demo of actiontabs --- doc/css_market.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/css_market.mdwn b/doc/css_market.mdwn index 0e5a68740..c167388a7 100644 --- a/doc/css_market.mdwn +++ b/doc/css_market.mdwn @@ -47,7 +47,7 @@ included in the [[theme_plugin|plugins/theme]]. * **[contraste.css][4]**, contributed by [[Blanko]]. Can be seen on [Contraste Demo][5]. Local.css and templates available [here][6]. * **[[css_market/actiontabs.css]]**, contributed by [[svend]]. This style sheet displays - the action list (Edit, RecentChanges, etc.) as tabs. + the action list (Edit, RecentChanges, etc.) as tabs. This is in use at [branchable](http://www.branchable.com/). [[!meta stylesheet="actiontabs"]] * **[wiki.css](http://cyborginstitute.net/includes/wiki.css)** by [[tychoish]]. -- cgit v1.2.3 From 0f2f769229459effdb4dfaff9e7f617670b3d519 Mon Sep 17 00:00:00 2001 From: "http://jmtd.livejournal.com/" Date: Thu, 30 Sep 2010 08:59:12 +0000 Subject: lists and bullets --- ...rkdown:_mixing_code_and_lists_doesn__39__t_work_nicely.mdwn | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 doc/bugs/markdown:_mixing_code_and_lists_doesn__39__t_work_nicely.mdwn (limited to 'doc') diff --git a/doc/bugs/markdown:_mixing_code_and_lists_doesn__39__t_work_nicely.mdwn b/doc/bugs/markdown:_mixing_code_and_lists_doesn__39__t_work_nicely.mdwn new file mode 100644 index 000000000..4accaa1de --- /dev/null +++ b/doc/bugs/markdown:_mixing_code_and_lists_doesn__39__t_work_nicely.mdwn @@ -0,0 +1,10 @@ +Consider: + + * one bullet + * another + + end of bullet list, this should be a code block + + * later on bullets + + tailing code block -- cgit v1.2.3 From 13945890c3292020bc0a9bb54668557115f5ad48 Mon Sep 17 00:00:00 2001 From: "http://jmtd.livejournal.com/" Date: Thu, 30 Sep 2010 09:00:39 +0000 Subject: removed --- ...rkdown:_mixing_code_and_lists_doesn__39__t_work_nicely.mdwn | 10 ---------- 1 file changed, 10 deletions(-) delete mode 100644 doc/bugs/markdown:_mixing_code_and_lists_doesn__39__t_work_nicely.mdwn (limited to 'doc') diff --git a/doc/bugs/markdown:_mixing_code_and_lists_doesn__39__t_work_nicely.mdwn b/doc/bugs/markdown:_mixing_code_and_lists_doesn__39__t_work_nicely.mdwn deleted file mode 100644 index 4accaa1de..000000000 --- a/doc/bugs/markdown:_mixing_code_and_lists_doesn__39__t_work_nicely.mdwn +++ /dev/null @@ -1,10 +0,0 @@ -Consider: - - * one bullet - * another - - end of bullet list, this should be a code block - - * later on bullets - - tailing code block -- cgit v1.2.3 From 278821b6b611c0885977f3b2431b5384a9fd660f Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawna1dYW4AIhTgNOMGflUf8PlpHlugZn5cA" Date: Thu, 30 Sep 2010 12:17:14 +0000 Subject: Created "configurable tidy" todo item. --- doc/todo/configurable_tidy_command_for_htmltidy.mdwn | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 doc/todo/configurable_tidy_command_for_htmltidy.mdwn (limited to 'doc') diff --git a/doc/todo/configurable_tidy_command_for_htmltidy.mdwn b/doc/todo/configurable_tidy_command_for_htmltidy.mdwn new file mode 100644 index 000000000..51991393e --- /dev/null +++ b/doc/todo/configurable_tidy_command_for_htmltidy.mdwn @@ -0,0 +1,6 @@ +[[!tag patch patch]] + +I was trying to get htmltidy to [play nicely with MathML][play]. Unfortunately, I couldn't construct a command line that I was happy with, but along the way I altered htmltidy to allow a configurable command line. This seemed like a generally useful thing, so I've published my [patch][] as a Git branch. + +[play]: http://lists.w3.org/Archives/Public/html-tidy/2006JanMar/0052.html +[patch]: http://www.physics.drexel.edu/~wking/code/git/git.php?p=ikiwiki.git&a=commitdiff&h=408ee89fd7c1dc70510385a7cf263a05862dda97&hb=e65ce4f0937eaf622846c02a9d39fa7aebe4af12 -- cgit v1.2.3 From dfbb57aa8dd3de920773aa5765f18b23ec620ea0 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawna1dYW4AIhTgNOMGflUf8PlpHlugZn5cA" Date: Thu, 30 Sep 2010 13:49:37 +0000 Subject: Point to my updated mdwn_itex plugin. --- doc/todo/latex.mdwn | 2 ++ 1 file changed, 2 insertions(+) (limited to 'doc') diff --git a/doc/todo/latex.mdwn b/doc/todo/latex.mdwn index 4363003c1..76bb69c9e 100644 --- a/doc/todo/latex.mdwn +++ b/doc/todo/latex.mdwn @@ -9,6 +9,8 @@ of the ikiwiki [[/logo]]. > [[users/JasonBlevins]] has also a plugin for including [[LaTeX]] expressions (by means of `itex2MML`) -- [[plugins/mdwn_itex]] (look at his page for the link). --Ivan Z. +>> I've [updated](http://www.physics.drexel.edu/~wking/unfolding-disasters/posts/mdwn_itex/) Jason's plugin for ikiwiki 3.x. --W. Trevor King + ---- ikiwiki could also support LaTeX as a document type, again rendering to HTML. -- cgit v1.2.3 From b9b505210457f5a8f6c19b60295b2a657d23f244 Mon Sep 17 00:00:00 2001 From: "http://jmtd.livejournal.com/" Date: Thu, 30 Sep 2010 21:49:55 +0000 Subject: gah --- doc/bugs/can__39__t_mix_template_vars_inside_directives.mdwn | 3 +++ 1 file changed, 3 insertions(+) (limited to 'doc') diff --git a/doc/bugs/can__39__t_mix_template_vars_inside_directives.mdwn b/doc/bugs/can__39__t_mix_template_vars_inside_directives.mdwn index 72bd1cfa2..5fc50c22b 100644 --- a/doc/bugs/can__39__t_mix_template_vars_inside_directives.mdwn +++ b/doc/bugs/can__39__t_mix_template_vars_inside_directives.mdwn @@ -50,3 +50,6 @@ Any suggestions gladly received. -- [[Jon]] >>> As always, if you'd like to mail me a larger test case that reproduces a >>> problem for you, I can take a look at it. --[[Joey]] + +>>>> Thank you for the offer. I might still take you up on it. I've just proven that this +>>>> does work for a clean repo / bare bones test case. -- [[Jon]] -- cgit v1.2.3 From e46f15f371fdb2a904f65e2772a941c9f24f1611 Mon Sep 17 00:00:00 2001 From: "http://jmtd.livejournal.com/" Date: Thu, 30 Sep 2010 21:57:39 +0000 Subject: done, PEBKAC. Thank you for your time :) --- doc/bugs/can__39__t_mix_template_vars_inside_directives.mdwn | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'doc') diff --git a/doc/bugs/can__39__t_mix_template_vars_inside_directives.mdwn b/doc/bugs/can__39__t_mix_template_vars_inside_directives.mdwn index 5fc50c22b..e91a8923d 100644 --- a/doc/bugs/can__39__t_mix_template_vars_inside_directives.mdwn +++ b/doc/bugs/can__39__t_mix_template_vars_inside_directives.mdwn @@ -51,5 +51,11 @@ Any suggestions gladly received. -- [[Jon]] >>> As always, if you'd like to mail me a larger test case that reproduces a >>> problem for you, I can take a look at it. --[[Joey]] ->>>> Thank you for the offer. I might still take you up on it. I've just proven that this ->>>> does work for a clean repo / bare bones test case. -- [[Jon]] +>>>> Thank you for the offer. I might still take you up on it. I've just proven that this +>>>> does work for a clean repo / bare bones test case. -- [[Jon]] Figured it out. The +>>>> problem was I'd copied a page (old_new) which had two images embedded in it to test. +>>>> I'd stored the images under a subdir "old_new". The new page was called "old_new_test" +>>>> and the images thus could not be found by a pagespec "some-image.jpg". Adjusting the +>>>> href argument to the template (consequently the src argument to img) to +>>>> "old_new/some-image.jpg" fixed it all. [[done]], PEBKAC. Thank you for your time :) +>>>> -- [[Jon]] -- cgit v1.2.3 From 922e149de93844561160c2978d71531f3c08345e Mon Sep 17 00:00:00 2001 From: PeteG Date: Fri, 1 Oct 2010 04:20:03 +0000 Subject: Continuing discussion about reverting via the web interface. --- doc/todo/web_reversion.mdwn | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/todo/web_reversion.mdwn b/doc/todo/web_reversion.mdwn index 92052eb26..34947b710 100644 --- a/doc/todo/web_reversion.mdwn +++ b/doc/todo/web_reversion.mdwn @@ -45,15 +45,23 @@ Peter Gammie has done an initial implementation of the above. > structure that `rcs_recieve` does. This could be done by using `git revert > --no-commit`, and then examining the changes, and then `git reset` to drop > them. +>> We can use the existing `git_commit_info` with the patch ID - no need to touch the working directory. -- [[peteg]] > > Then the code that is currently in IkiWiki/Receive.pm, that calls > `check_canedit` and `check_canremove` to test the change, can be > straightforwardly refactored out, and used for checking reverts too. +>> Wow, that was easy. :-) -- [[peteg]] > > (The data from `rcs_preprevert` could also be used for a confirmation > prompt -- it doesn't currently include enough info for diffs, but at > least could have a list of changed files.) -> +>> I added `rcs_showpatch` which simply yields the output of `git show `. -- [[peteg]] +> > Note that it's possible for a git repo to have commits that modify wiki > files in a subdir, and code files elsewhere. `rcs_preprevert` should > detect changes outside the wiki dir, and fail, like `rcs_receive` does. +>> Taken care of by refactoring `rcs_receive` in `git.pm` +>> I've tested it lightly in my single-user setup. It's a little nasty that the `attachment` plugin +>> gets used to check whether attachments are allowed -- there really should be a hook for that. +>> +>> Please look it over and tell me what else needs fixing... -- [[peteg]] -- cgit v1.2.3 From 3740f787571b0dff26d0b01cc63a22d9816c2896 Mon Sep 17 00:00:00 2001 From: "http://smcv.pseudorandom.co.uk/" Date: Fri, 1 Oct 2010 22:43:52 +0000 Subject: updated branch; fold discussion of rejected version into a toggleable --- ...ttp_or_https_in_urls_to_allow_serving_both.mdwn | 67 ++++++++++++++++------ 1 file changed, 49 insertions(+), 18 deletions(-) (limited to 'doc') diff --git a/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn b/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn index e2d9a5993..f95b7af4b 100644 --- a/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn +++ b/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn @@ -59,6 +59,9 @@ becoming a problem for me. Is there anything I can do here? --[[Perry]] ---- +[[!toggle id="smcv-https" text="Some discussion of a rejected implementation, smcv/https."]] +[[!toggleable id="smcv-https" text=""" + [[!template id=gitbranch branch=smcv/https author="[[smcv]]"]] For a while I've been using a configuration where each wiki has a HTTP and @@ -140,33 +143,61 @@ you don't like my approach: >> making it easier to run two mostly-synched copies like I was previously >> doing is the only solution... --s +"""]] + ---- -**warning: untested branch ** [[!template id=gitbranch branch=smcv/localurl author="[[smcv]]"]] +[[!template id=gitbranch branch=smcv/localurl author="[[smcv]]"]] OK, here's an alternative approach, closer in spirit to what was initially -requested. I haven't tested this at all (it's getting rather late in UK time) -and it will probably be rebased later, but I've referenced it here as a proof of -concept. +requested. I haven't tested this on a full website with the CGI yet. The idea is that in the common case, the CGI and the pages will reside on the same server, so they can use "semi-absolute" URLs (`/ikiwiki.cgi`, `/style.css`, -`/bugs/done`) to refer to each other. My branch adds config options which -could be set as follows for ikiwiki.info or any branchable.com site: - -* local_url: / -* local_cgiurl: /ikiwiki.cgi - -Most redirects, form actions, links etc. can safely use this form rather than -the fully-absolute URL. If not configured, these options default to the -corresponding absolute URL, which is would also be correct for unusual sites -where the CGI and the pages aren't on the same server. - -(In theory you could use things like `//static.example.com/wiki/` and -`//dynamic.example.com/ikiwiki.cgi` to preserve choice of http/https +`/bugs/done`) to refer to each other. Most redirects, form actions, links etc. +can safely use this form rather than the fully-absolute URL. + +The initial version of the branch had config options `local_url` and +`local_cgiurl`, but they're now automatically computed by checking +whether `url` and `cgiurl` are on the same server with the the same URL +scheme. In theory you could use things like `//static.example.com/wiki/` +and `//dynamic.example.com/ikiwiki.cgi` to preserve choice of http/https while switching server, but I don't know how consistently browsers -suppot that.) +suppot that. "local" here is short for "locally valid", because these URLs are neither fully relative nor fully absolute, and there doesn't seem to be a good name for them... + +New API added by this branch: + +* `urlto(x, y, 'local')` uses `$local_url` instead of `$config{url}` + +* `IkiWiki::baseurl` has a new second argument which works like the + third argument of `urlto` + +* `IkiWiki::cgiurl` uses `$local_cgiurl` if passed `local_cgiurl => 1` + +* `IkiWiki::cgiurl` omits the trailing `?` if given no named parameters + except `cgiurl` and/or `local_cgiurl` + +Bugs: + +* I don't think anything except `openid` calls `cgiurl` without also + passing in `local_cgiurl => 1`, so perhaps that should be the default; + `openid` uses `cgiurl` anyway, so there doesn't even necessarily need + to be a way to force absolute URLs? Any other module that really needs + an absolute URL could use `cgiurl(cgiurl => $config{cgiurl}, ...)`, + although that does look a bit strange + +* It occurs to me that `IkiWiki::cgiurl` could probably benefit from being + exported? Perhaps also `IkiWiki::baseurl`? + +* Or, to reduce use of the unexported `baseurl` function, it might make + sense to give `urlto` a special case that references the root of the wiki, + with a trailing slash ready to append stuff: perhaps `urlto('/')`, + with usage like this? + + do_something(baseurl => urlto('/', undef, local)`); + do_something_else(urlto('/').'style.css'); + IkiWiki::redirect(urlto('/', undef, 1)); -- cgit v1.2.3 From 681b968ab9f728b5b548d27b42fc788ff39de14c Mon Sep 17 00:00:00 2001 From: "http://smcv.pseudorandom.co.uk/" Date: Fri, 1 Oct 2010 22:46:50 +0000 Subject: how much indentation does a code block in a bullet point need? we just don't know --- ...d_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'doc') diff --git a/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn b/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn index f95b7af4b..969b17fa2 100644 --- a/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn +++ b/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn @@ -198,6 +198,6 @@ Bugs: with a trailing slash ready to append stuff: perhaps `urlto('/')`, with usage like this? - do_something(baseurl => urlto('/', undef, local)`); - do_something_else(urlto('/').'style.css'); - IkiWiki::redirect(urlto('/', undef, 1)); + do_something(baseurl => urlto('/', undef, local)`); + do_something_else(urlto('/').'style.css'); + IkiWiki::redirect(urlto('/', undef, 1)); -- cgit v1.2.3 From f768b6bf16e043b41d4503f3ab0758d975994b12 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawngqGADV9fidHK5qabIzKN0bx1ZIfvaTqs" Date: Fri, 1 Oct 2010 22:48:29 +0000 Subject: --- doc/forum/Asciidoc_plugin.mdwn | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 doc/forum/Asciidoc_plugin.mdwn (limited to 'doc') diff --git a/doc/forum/Asciidoc_plugin.mdwn b/doc/forum/Asciidoc_plugin.mdwn new file mode 100644 index 000000000..57d6fd91e --- /dev/null +++ b/doc/forum/Asciidoc_plugin.mdwn @@ -0,0 +1,14 @@ +I have completely overhauled the Asciidoc plugin for ikiwiki that was created by [[Karl Mowson|http://www.mowson.org/karl/colophon/]]. The source can be downloaded from my [[Dropbox|http://dl.dropbox.com/u/11256359/asciidoc.pm]]. + +### Features + +* Uses a filter hook to escape WikiLinks and Directives using Asciidoc `+++` passthrough macros, to avoid them being processed by Asciidoc. This behavior is configurable in the wiki setup file. +* Adds a preprocessor directive 'asciidoc' which allows extra Asciidoc command-line options to be passed on a per-page basis. Each parameter name is the option name (the leading `--` will be inserted automatically), and the parameter value is the option value. Currently, only 'conf-file' and 'doctype' are allowed (or even useful). +* Sets the page title from the first line in the Asciidoc file using a meta directive. This behavior is configurable in the wiki setup file. +* Searches for an Asciidoc configuration file named the same as the wiki if none is specified in the setup file. +* Asciidoc configuration files are stored in the wiki. They should be named `._conf` to avoid publishing them. + +### Problems + +* Escaping Directives is not optimal. It prevents markup from being used in Directives, and the passthrough macros have to include extra spaces to avoid having directives that return an empty string collapse to `++++++`. In addition, I had to borrow the regexps from the Ikiwiki source code; it would be nice if this were available as part of the API. +* Handling of Asciidoc errors is suboptimal; they are simply inserted into the returned page. This could be fixed in Perl 5.12 by using the run_forked() in IPC::Cmd. -- cgit v1.2.3 From 28c9f7dbcfa152957e15de3bd3fd91502e94635a Mon Sep 17 00:00:00 2001 From: "http://smcv.pseudorandom.co.uk/" Date: Fri, 1 Oct 2010 22:50:26 +0000 Subject: clarification: too many things called cgiurl --- ..._ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'doc') diff --git a/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn b/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn index 969b17fa2..262d5c22d 100644 --- a/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn +++ b/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn @@ -185,9 +185,10 @@ Bugs: * I don't think anything except `openid` calls `cgiurl` without also passing in `local_cgiurl => 1`, so perhaps that should be the default; - `openid` uses `cgiurl` anyway, so there doesn't even necessarily need - to be a way to force absolute URLs? Any other module that really needs - an absolute URL could use `cgiurl(cgiurl => $config{cgiurl}, ...)`, + `openid` uses the `cgiurl` named parameter anyway, so there doesn't even + necessarily need to be a way to force absolute URLs? Any other module + that really needs an absolute URL could use + `cgiurl(cgiurl => $config{cgiurl}, ...)`, although that does look a bit strange * It occurs to me that `IkiWiki::cgiurl` could probably benefit from being -- cgit v1.2.3 From 0b0ce854d0cfa716ed5af7830884ca04358b230b Mon Sep 17 00:00:00 2001 From: "http://smcv.pseudorandom.co.uk/" Date: Fri, 1 Oct 2010 23:01:36 +0000 Subject: workaround --- doc/bugs/404_plugin_and_lighttpd.mdwn | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'doc') diff --git a/doc/bugs/404_plugin_and_lighttpd.mdwn b/doc/bugs/404_plugin_and_lighttpd.mdwn index e478d98c3..8508d0dcd 100644 --- a/doc/bugs/404_plugin_and_lighttpd.mdwn +++ b/doc/bugs/404_plugin_and_lighttpd.mdwn @@ -1,5 +1,15 @@ Lighttpd apparently sets REDIRECT_STATUS=200 for the server.error-handler-404 page. This breaks the [[plugins/404]] plugin which checks this variable for 404 before processing the URI. It also doesn't seem to set REDIRECT_URL. +> For what it's worth, the first half is . +> One workaround would be to make this script your 404 handler: +> +> #!/bin/sh +> REDIRECT_STATUS=404; export REDIRECT_STATUS +> REDIRECT_URL="$SERVER_NAME$REQUEST_URI"; export REDIRECT_URL +> exec /path/to/your/ikiwiki.cgi "$@" +> +> --[[smcv]] + I was able to fix my server to check the REQUEST_URI for ikiwiki.cgi and to continue processing if it was not found, passing $ENV{SEVER_NAME} . $ENV{REQUEST_URI} as the first parameter to cgi_page_from_404. However, my perl is terrible and I just made it work rather than figuring out exactly what to do to get it to work on both lighttpd and apache. This is with lighttpd 1.4.19 on Debian. -- cgit v1.2.3 From 3fd58fc71bb47636036299a26ce85fa02c4d9b77 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawngqGADV9fidHK5qabIzKN0bx1ZIfvaTqs" Date: Fri, 1 Oct 2010 23:14:28 +0000 Subject: --- doc/forum/Dump_plugin.mdwn | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 doc/forum/Dump_plugin.mdwn (limited to 'doc') diff --git a/doc/forum/Dump_plugin.mdwn b/doc/forum/Dump_plugin.mdwn new file mode 100644 index 000000000..ff3bfea90 --- /dev/null +++ b/doc/forum/Dump_plugin.mdwn @@ -0,0 +1,4 @@ +I have a second plugin that adds a directive 'dump', and dumps all sorts of information (env variables and template variables) about a page into the end of the page. It's cheesy, but it's available in my [[Dropbox|http://dl.dropbox.com/u/11256359/dump.pm]] as well as the Asciidoc plugin. + +### Issues +* It really ought to use some kind of template instead of HTML. In fact, it ought to embed its information in template variables of some kind rather than stuffing it into the end of the page. -- cgit v1.2.3 From 01c893e843c3f5351580adba2741df347232d328 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Sat, 2 Oct 2010 13:56:15 +0100 Subject: fix typo spotted by lintian --- doc/usage.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/usage.mdwn b/doc/usage.mdwn index 840d105d2..2325b6502 100644 --- a/doc/usage.mdwn +++ b/doc/usage.mdwn @@ -350,7 +350,7 @@ also be configured using a setup file. * ikiwiki --setup my.setup - Completly (re)build the wiki using the specified setup file. + Completely (re)build the wiki using the specified setup file. * ikiwiki --setup my.setup --refresh -- cgit v1.2.3 From a7d12113ea97735e66811bb1fb498d87a9c3bbe6 Mon Sep 17 00:00:00 2001 From: "http://smcv.pseudorandom.co.uk/" Date: Sat, 2 Oct 2010 13:52:45 +0000 Subject: tested and seems to work --- ...kiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn b/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn index 262d5c22d..39dd42b87 100644 --- a/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn +++ b/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn @@ -150,7 +150,8 @@ you don't like my approach: [[!template id=gitbranch branch=smcv/localurl author="[[smcv]]"]] OK, here's an alternative approach, closer in spirit to what was initially -requested. I haven't tested this on a full website with the CGI yet. +requested. I included a regression test for `urlto`, `baseurl` and `cgiurl`, +now that they have slightly more complex behaviour. The idea is that in the common case, the CGI and the pages will reside on the same server, so they can use "semi-absolute" URLs (`/ikiwiki.cgi`, `/style.css`, @@ -169,6 +170,12 @@ suppot that. fully relative nor fully absolute, and there doesn't seem to be a good name for them... +I've tested this on a demo website with the CGI enabled, and it seems to +work nicely (there might be bugs in some plugins, I didn't try all of them). +The `$config{url}` and `$config{cgiurl}` are both HTTP, but if I enable +`httpauth`, set `cgiauthurl` to a HTTPS version of the same site and log +in via that, links all end up in the HTTPS version. + New API added by this branch: * `urlto(x, y, 'local')` uses `$local_url` instead of `$config{url}` -- cgit v1.2.3 From 43cdf3f22fdc22e0b93e245f68b330b50d4fb292 Mon Sep 17 00:00:00 2001 From: "http://smcv.pseudorandom.co.uk/" Date: Sat, 2 Oct 2010 13:57:03 +0000 Subject: tag as patch, I think this version is ready for review --- ...void_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn b/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn index 39dd42b87..20d22b9ab 100644 --- a/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn +++ b/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn @@ -147,7 +147,8 @@ you don't like my approach: ---- -[[!template id=gitbranch branch=smcv/localurl author="[[smcv]]"]] +[[!template id=gitbranch branch=smcv/ready/localurl author="[[smcv]]"]] +[[!tag patch]] OK, here's an alternative approach, closer in spirit to what was initially requested. I included a regression test for `urlto`, `baseurl` and `cgiurl`, -- cgit v1.2.3 From d21087205caa025a23bd424618bc78ecc5533902 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 2 Oct 2010 12:03:33 -0400 Subject: close --- doc/todo/configurable_tidy_command_for_htmltidy.mdwn | 2 ++ 1 file changed, 2 insertions(+) (limited to 'doc') diff --git a/doc/todo/configurable_tidy_command_for_htmltidy.mdwn b/doc/todo/configurable_tidy_command_for_htmltidy.mdwn index 51991393e..e317184b5 100644 --- a/doc/todo/configurable_tidy_command_for_htmltidy.mdwn +++ b/doc/todo/configurable_tidy_command_for_htmltidy.mdwn @@ -4,3 +4,5 @@ I was trying to get htmltidy to [play nicely with MathML][play]. Unfortunately, [play]: http://lists.w3.org/Archives/Public/html-tidy/2006JanMar/0052.html [patch]: http://www.physics.drexel.edu/~wking/code/git/git.php?p=ikiwiki.git&a=commitdiff&h=408ee89fd7c1dc70510385a7cf263a05862dda97&hb=e65ce4f0937eaf622846c02a9d39fa7aebe4af12 + +> Thanks, [[done]] --[[Joey]] -- cgit v1.2.3 From 01fd6aa3b74ae77c7252e6944774076e6fe40690 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawngqGADV9fidHK5qabIzKN0bx1ZIfvaTqs" Date: Sun, 3 Oct 2010 00:45:47 +0000 Subject: Added a comment: New dump plugin --- .../comment_1_bfce80b3f5be78ec28692330843d4ae1._comment | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 doc/forum/Dump_plugin/comment_1_bfce80b3f5be78ec28692330843d4ae1._comment (limited to 'doc') diff --git a/doc/forum/Dump_plugin/comment_1_bfce80b3f5be78ec28692330843d4ae1._comment b/doc/forum/Dump_plugin/comment_1_bfce80b3f5be78ec28692330843d4ae1._comment new file mode 100644 index 000000000..855b72bbb --- /dev/null +++ b/doc/forum/Dump_plugin/comment_1_bfce80b3f5be78ec28692330843d4ae1._comment @@ -0,0 +1,14 @@ +[[!comment format=mdwn + username="https://www.google.com/accounts/o8/id?id=AItOawngqGADV9fidHK5qabIzKN0bx1ZIfvaTqs" + nickname="Glenn" + subject="New dump plugin" + date="2010-10-03T00:45:47Z" + content=""" +I took my own advice and rewrote the dump plugin so that it uses a template. A sample template has been added to my [[Dropbox|http://dl.dropbox.com/u/11256359/dump.tmpl]]. + +### Issues: + +* Dumps appear at the end of the page rather than where the directive occurs. +* For some reason I haven't yet figured out, dumps don't appear in page previews. +* I haven't tested inlined content and the dump plugin. +"""]] -- cgit v1.2.3 From ed2071802f3f637e191eaefbf264f4439b2b3e2d Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawm0-WSZnp73Gr2n4a4tmxVPY5kUE50lYH4" Date: Mon, 4 Oct 2010 14:34:35 +0000 Subject: Adding apache2 dependencies to enable CGI --- doc/tips/dot_cgi.mdwn | 2 ++ 1 file changed, 2 insertions(+) (limited to 'doc') diff --git a/doc/tips/dot_cgi.mdwn b/doc/tips/dot_cgi.mdwn index da55c1f1c..42a0aa7bf 100644 --- a/doc/tips/dot_cgi.mdwn +++ b/doc/tips/dot_cgi.mdwn @@ -26,6 +26,8 @@ configuration changes should work anywhere. Or, if you've put it in a `~/public_html`, edit `/etc/apache2/mods-available/userdir.conf`. + You may also want to install some dependencies to enable CGI in apache2 setup as: `libcgi-formbuilder-perl` and `libcgi-session-perl`. + * You may also want to enable the [[plugins/404]] plugin. To make apache use it, the apache config file will need a further modification to make it use ikiwiki's CGI as the apache 404 handler. -- cgit v1.2.3 From d441c6b76df4f840b37292d869146e9e53f92315 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawm0-WSZnp73Gr2n4a4tmxVPY5kUE50lYH4" Date: Mon, 4 Oct 2010 16:20:13 +0000 Subject: Adding blog dependencies --- doc/setup.mdwn | 2 ++ 1 file changed, 2 insertions(+) (limited to 'doc') diff --git a/doc/setup.mdwn b/doc/setup.mdwn index ac491baae..206f4b664 100644 --- a/doc/setup.mdwn +++ b/doc/setup.mdwn @@ -22,6 +22,8 @@ Or, set up a blog with ikiwiki, run this command instead. % ikiwiki -setup /etc/ikiwiki/auto-blog.setup +`librpc-xml-perl` and `python-docutils` dependencies are needed. + Either way, it will ask you a couple of questions. What will the wiki be named? foo -- cgit v1.2.3 From 1e294917fd7d50b32c5e91430619e5c5e52c3ddf Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawm0-WSZnp73Gr2n4a4tmxVPY5kUE50lYH4" Date: Mon, 4 Oct 2010 17:13:25 +0000 Subject: fix a little typo --- doc/setup.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/setup.mdwn b/doc/setup.mdwn index 206f4b664..40581eb72 100644 --- a/doc/setup.mdwn +++ b/doc/setup.mdwn @@ -132,7 +132,7 @@ 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. % rm -rf foo - % git clone /src/git/foo.git + % git clone /srv/git/foo.git Finally, edit the setup file. Modify the settings for `srcdir`, `destdir`, `url`, `cgiurl`, `cgi_wrapper`, `git_wrapper`, etc to reflect where -- cgit v1.2.3 From 3f3aab3793fb471f8a99ed12df1bbad7abdc3455 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 4 Oct 2010 16:22:50 -0400 Subject: document new rcs reversion support functions --- IkiWiki/Plugin/git.pm | 175 ++++++++++++++++++++++---------------------- doc/plugins/write.mdwn | 33 ++++++++- doc/todo/web_reversion.mdwn | 6 ++ 3 files changed, 123 insertions(+), 91 deletions(-) (limited to 'doc') diff --git a/IkiWiki/Plugin/git.pm b/IkiWiki/Plugin/git.pm index a0f9b15a7..33ec00d8a 100644 --- a/IkiWiki/Plugin/git.pm +++ b/IkiWiki/Plugin/git.pm @@ -748,73 +748,72 @@ sub git_find_root { } sub git_parse_changes { - my @changes = @_; - - my $subdir = git_find_root(); - my @rets; - foreach my $ci (@changes) { - foreach my $detail (@{ $ci->{'details'} }) { - my $file = $detail->{'file'}; - - # check that all changed files are in the - # subdir - if (length $subdir && - ! ($file =~ s/^\Q$subdir\E//)) { - error sprintf(gettext("you are not allowed to change %s"), $file); - } - - my ($action, $mode, $path); - if ($detail->{'status'} =~ /^[M]+\d*$/) { - $action="change"; - $mode=$detail->{'mode_to'}; - } - elsif ($detail->{'status'} =~ /^[AM]+\d*$/) { - $action="add"; - $mode=$detail->{'mode_to'}; - } - elsif ($detail->{'status'} =~ /^[DAM]+\d*/) { - $action="remove"; - $mode=$detail->{'mode_from'}; - } - else { - error "unknown status ".$detail->{'status'}; - } - - # test that the file mode is ok - if ($mode !~ /^100[64][64][64]$/) { - error sprintf(gettext("you cannot act on a file with mode %s"), $mode); - } - if ($action eq "change") { - if ($detail->{'mode_from'} ne $detail->{'mode_to'}) { - error gettext("you are not allowed to change file modes"); - } - } - - # extract attachment to temp file - if (($action eq 'add' || $action eq 'change') && - ! pagetype($file)) { - - eval q{use File::Temp}; - die $@ if $@; - my $fh; - ($fh, $path)=File::Temp::tempfile("XXXXXXXXXX", UNLINK => 1); - # Ensure we run this in the right place, see comments in rcs_receive. - my $cmd = ($no_chdir ? '' : "cd $config{srcdir} && ") - . "git show $detail->{sha1_to} > '$path'"; - if (system($cmd) != 0) { - error("failed writing temp file '$path'."); - } - } - - push @rets, { - file => $file, - action => $action, - path => $path, - }; - } - } - - return @rets; + my @changes = @_; + + my $subdir = git_find_root(); + my @rets; + foreach my $ci (@changes) { + foreach my $detail (@{ $ci->{'details'} }) { + my $file = $detail->{'file'}; + + # check that all changed files are in the subdir + if (length $subdir && + ! ($file =~ s/^\Q$subdir\E//)) { + error sprintf(gettext("you are not allowed to change %s"), $file); + } + + my ($action, $mode, $path); + if ($detail->{'status'} =~ /^[M]+\d*$/) { + $action="change"; + $mode=$detail->{'mode_to'}; + } + elsif ($detail->{'status'} =~ /^[AM]+\d*$/) { + $action="add"; + $mode=$detail->{'mode_to'}; + } + elsif ($detail->{'status'} =~ /^[DAM]+\d*/) { + $action="remove"; + $mode=$detail->{'mode_from'}; + } + else { + error "unknown status ".$detail->{'status'}; + } + + # test that the file mode is ok + if ($mode !~ /^100[64][64][64]$/) { + error sprintf(gettext("you cannot act on a file with mode %s"), $mode); + } + if ($action eq "change") { + if ($detail->{'mode_from'} ne $detail->{'mode_to'}) { + error gettext("you are not allowed to change file modes"); + } + } + + # extract attachment to temp file + if (($action eq 'add' || $action eq 'change') && + ! pagetype($file)) { + eval q{use File::Temp}; + die $@ if $@; + my $fh; + ($fh, $path)=File::Temp::tempfile("XXXXXXXXXX", UNLINK => 1); + # Ensure we run this in the right place, + # see comments in rcs_receive. + my $cmd = ($no_chdir ? '' : "cd $config{srcdir} && ") + . "git show $detail->{sha1_to} > '$path'"; + if (system($cmd) != 0) { + error("failed writing temp file '$path'."); + } + } + + push @rets, { + file => $file, + action => $action, + path => $path, + }; + } + } + + return @rets; } sub rcs_receive () { @@ -832,7 +831,7 @@ sub rcs_receive () { # are in the master git repo, not the srcdir repo. # The pre-receive hook already puts us in the right place. $no_chdir=1; - push @rets, git_parse_changes(git_commit_info($oldrev."..".$newrev)); + push @rets, git_parse_changes(git_commit_info($oldrev."..".$newrev)); $no_chdir=0; } @@ -840,31 +839,31 @@ sub rcs_receive () { } sub rcs_preprevert (@) { - # Determine what the effects are of reverting the patch with the - # ID given by 'rev'. Returns the same structure as rcs_receive. - # Note test_changes expects 'cgi' and 'session' parameters. - my %params = @_; - my $rev = $params{rev}; + my %params = @_; + my $rev = $params{rev}; - require IkiWiki::Receive; - IkiWiki::Receive::test_changes(%params, changes => [git_parse_changes(git_commit_info($rev, 1))]); + # Note test_changes expects 'cgi' and 'session' parameters. + require IkiWiki::Receive; + IkiWiki::Receive::test_changes(%params, changes => + [git_parse_changes(git_commit_info($rev, 1))]); } sub rcs_revert (@) { - # Try to revert the given patch; returns undef on _success_. - # Same parameters as rcs_commit_staged + 'rev', the patch ID to be - # reverted. - my %params = @_; - my $rev = $params{rev}; + # Try to revert the given patch; returns undef on _success_. + my %params = @_; + my $rev = $params{rev}; - if(run_or_non('git', 'revert', '--no-commit', $rev)) { - debug "Committing revert for patch '$rev'."; - rcs_commit_staged(message => "This reverts commit $rev", @_); - } else { - # No idea what is actually getting reverted, so all we can do is say we failed. - run_or_die('git', 'reset', '--hard'); - return "Failed to revert patch $rev."; - } + if (run_or_non('git', 'revert', '--no-commit', $rev)) { + debug "Committing revert for patch '$rev'."; + rcs_commit_staged(message => + sprintf(gettext("This reverts commit %s"), $rev), @_); + } + else { + # No idea what is actually getting reverted, so all we can + # do is say we failed. + run_or_die('git', 'reset', '--hard'); + return sprintf(gettext("Failed to revert commit %s"), $rev); + } } sub rcs_showpatch (@) { diff --git a/doc/plugins/write.mdwn b/doc/plugins/write.mdwn index d5bd1dd76..1bd3b0f87 100644 --- a/doc/plugins/write.mdwn +++ b/doc/plugins/write.mdwn @@ -1176,9 +1176,9 @@ sense to implement for all RCSs. It should examine the incoming changes, and do any sanity checks that are appropriate for the RCS to limit changes to safe file adds, -removes, and changes. If something bad is found, it should exit -nonzero, to abort the push. Otherwise, it should return a list of -files that were changed, in the form: +removes, and changes. If something bad is found, it should die, to abort +the push. Otherwise, it should return a list of files that were changed, +in the form: { file => # name of file that was changed @@ -1191,6 +1191,33 @@ files that were changed, in the form: The list will then be checked to make sure that each change is one that is allowed to be made via the web interface. +#### `rcs_preprevert($)` + +This is called by the revert web interface. It is passed a RCS-specific +change ID, and should determine what the effects would be of reverting +that change, and return the same data structure as `rcs_receive`. + +Like `rcs_receive`, it should do whatever sanity checks are appropriate +for the RCS to limit changes to safe changes, and die if a change would +be unsafe to revert. + +#### `rcs_revert(@)` + +This is called by the revert web interface. It is passed a named +parameter rev that is the RCS-specific change ID to revert. + +Addition named parameters: `message`, and `session` (optional). + +It should try to revert the specified rev, which includes committing +the reversion, and returns undef on _success_ and an error message +on failure. + +#### `rcs_showpatch(@)` + +This is passed a named parameter rev that is a RCS-specific +change ID. It should generate a diff-style patch showing the changes +made and return it. + ### PageSpec plugins It's also possible to write plugins that add new functions to diff --git a/doc/todo/web_reversion.mdwn b/doc/todo/web_reversion.mdwn index 34947b710..9e5880558 100644 --- a/doc/todo/web_reversion.mdwn +++ b/doc/todo/web_reversion.mdwn @@ -65,3 +65,9 @@ Peter Gammie has done an initial implementation of the above. >> gets used to check whether attachments are allowed -- there really should be a hook for that. >> >> Please look it over and tell me what else needs fixing... -- [[peteg]] + +>>> I have made my own revert branch and put a few fixes in there. Issues +>>> I noticed but have not gotten to: +>>> +>>> * `rcs_diff` already exists; why add `rcs_showpatch`? +>>> * -- cgit v1.2.3 From a99790e5ec38afe4d591ba27d984b367c098d5d2 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 4 Oct 2010 16:58:55 -0400 Subject: second review pass and I have a revert branch now --- doc/todo/web_reversion.mdwn | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'doc') diff --git a/doc/todo/web_reversion.mdwn b/doc/todo/web_reversion.mdwn index 34947b710..e0c6ebdf1 100644 --- a/doc/todo/web_reversion.mdwn +++ b/doc/todo/web_reversion.mdwn @@ -65,3 +65,20 @@ Peter Gammie has done an initial implementation of the above. >> gets used to check whether attachments are allowed -- there really should be a hook for that. >> >> Please look it over and tell me what else needs fixing... -- [[peteg]] + +>>> I have made my own revert branch and put a few fixes in there +>>> (and fixed all the indention..). Issues I noticed but have not gotten +>>> to: --[[Joey]] +>>> +>>> * `rcs_diff` already exists; why add `rcs_showpatch`? +>>> * Would it be better for `rcs_revert` to not commit, and +>>> `rcs_commit_staged` to then be used? This would work for git, but +>>> maybe other RCSs would be problimatic. It would simplifiy the +>>> interface and allow for future mulitple-revert interfaces. +>>> * I quite don't understand why one caller of `git_parse_changes` +>>> needs it to chdir, and not the other one. It's running +>>> in the same git repo either way, and git doesn't need +>>> `git show` to run in a subdir at all.. +>>> * Probably needs to untaint the revs passed in. +>>> * Seems backwards for `rcs_preprevert` to import and +>>> use `IkiWiki::Receive`. -- cgit v1.2.3 From 380a80adfa8df712876095d684e8a564b8a86aea Mon Sep 17 00:00:00 2001 From: JoeRayhawk Date: Tue, 5 Oct 2010 01:09:42 +0000 Subject: Bug: UTF-16 and UTF-32 are unhandled: New --- doc/bugs/UTF-16_and_UTF-32_are_unhandled.mdwn | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 doc/bugs/UTF-16_and_UTF-32_are_unhandled.mdwn (limited to 'doc') diff --git a/doc/bugs/UTF-16_and_UTF-32_are_unhandled.mdwn b/doc/bugs/UTF-16_and_UTF-32_are_unhandled.mdwn new file mode 100644 index 000000000..21df334a8 --- /dev/null +++ b/doc/bugs/UTF-16_and_UTF-32_are_unhandled.mdwn @@ -0,0 +1,20 @@ +Wide characters should probably be supported, or, at the very least, warned about. + +Test case: + + mkdir -p ikiwiki-utf-test/raw ikiwiki-utf-test/rendered + for page in txt mdwn; do + echo hello > ikiwiki-utf-test/raw/$page.$page + for text in 8 16 16BE 16LE 32 32BE 32LE; do + iconv -t UTF$text ikiwiki-utf-test/raw/$page.$page > ikiwiki-utf-test/raw/$page-utf$text.$page; + done + done + ikiwiki --verbose --plugin txt --plugin mdwn ikiwiki-utf-test/raw/ ikiwiki-utf-test/rendered/ + www-browser ikiwiki-utf-test/rendered/ || x-www-browser ikiwiki-utf-test/rendered/ + # rm -r ikiwiki-utf-test/ # some browsers rather stupidly daemonize themselves, so this operation can't easily be safely automated + +BOMless LE and BE input is probably a lost cause. + +Optimally, UTF-16 (which is ubiquitous in the Windows world) and UTF-32 should be fully supported, probably by converting to mostly-UTF-8 and using `&#xXXXX;` or `&#DDDDD;` XML escapes where necessary. + +Suboptimally, UTF-16 and UTF-32 should be converted to UTF-8 where cleanly possible and a warning printed where impossible. -- cgit v1.2.3 From 3f104d1eb7cc15dec0d3a7a67db85fbe63484281 Mon Sep 17 00:00:00 2001 From: PeteG Date: Tue, 5 Oct 2010 02:30:25 +0000 Subject: --- doc/todo/web_reversion.mdwn | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'doc') diff --git a/doc/todo/web_reversion.mdwn b/doc/todo/web_reversion.mdwn index e0c6ebdf1..900d98591 100644 --- a/doc/todo/web_reversion.mdwn +++ b/doc/todo/web_reversion.mdwn @@ -69,8 +69,11 @@ Peter Gammie has done an initial implementation of the above. >>> I have made my own revert branch and put a few fixes in there >>> (and fixed all the indention..). Issues I noticed but have not gotten >>> to: --[[Joey]] +>>>> Please change the git pointer above, then. I will work on your branch. -- [[peteg]] >>> >>> * `rcs_diff` already exists; why add `rcs_showpatch`? +>>>> If `rcs_diff` is intended for human consumption, by all means we can use that. -- [[peteg]] + >>> * Would it be better for `rcs_revert` to not commit, and >>> `rcs_commit_staged` to then be used? This would work for git, but >>> maybe other RCSs would be problimatic. It would simplifiy the @@ -79,6 +82,9 @@ Peter Gammie has done an initial implementation of the above. >>> needs it to chdir, and not the other one. It's running >>> in the same git repo either way, and git doesn't need >>> `git show` to run in a subdir at all.. +>>>> I was aping (preserving) what was already there. I don't understand what you say about `git show` - it must run under $srcdir, surely? And empirically the CGI process wasn't in the right place. By all means simplify that. -- [[peteg]] + >>> * Probably needs to untaint the revs passed in. >>> * Seems backwards for `rcs_preprevert` to import and >>> use `IkiWiki::Receive`. +>>>> Indeed. This is saying that the checking code in IkiWiki::Receive is in the wrong place. I think it would be better to set up some general hooks and shuffle it into a plugin, for then other plugins that maintain special files in the repo can have a say about validity. -- [[peteg]] -- cgit v1.2.3 From b02081b6f7de340372100227efc4b97d494b170f Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawna1dYW4AIhTgNOMGflUf8PlpHlugZn5cA" Date: Tue, 5 Oct 2010 13:33:36 +0000 Subject: Added link to git repository with support for inlining raw files. --- doc/todo/inline_raw_files.mdwn | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 doc/todo/inline_raw_files.mdwn (limited to 'doc') diff --git a/doc/todo/inline_raw_files.mdwn b/doc/todo/inline_raw_files.mdwn new file mode 100644 index 000000000..0e0f0c298 --- /dev/null +++ b/doc/todo/inline_raw_files.mdwn @@ -0,0 +1,16 @@ +summary +======= + +Extend inlining to handle raw files (files with unrecognized extensions). + +Also raise an error in IkiWiki::pagetype($file) if $file is blank, which avoids trying to do much with missing files, etc. + +I've included this patch (and some other adjustments) in my [branch] of the IkiWiki Git repository. I'm using the new code in my [blog][]. + +[branch]: http://www.physics.drexel.edu./~wking/code/git/git.php?p=ikiwiki.git +[blog]: http://www.physics.drexel.edu/~wking/unfolding-disasters/posts/yacc2dot/ + +usage +===== + + \[[!inline pagenames="somefile.txt" template="raw" feeds="no"]] -- cgit v1.2.3 From 5017568721b598026dcb730157b66614b14a5a01 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawna1dYW4AIhTgNOMGflUf8PlpHlugZn5cA" Date: Tue, 5 Oct 2010 13:59:27 +0000 Subject: Added github git branch for W. Trevor King. --- doc/git.mdwn | 1 + 1 file changed, 1 insertion(+) (limited to 'doc') diff --git a/doc/git.mdwn b/doc/git.mdwn index 88608d4b5..98f09014e 100644 --- a/doc/git.mdwn +++ b/doc/git.mdwn @@ -65,6 +65,7 @@ think about merging them. This is recommended. :-) * [[privat]] `git://github.com/privat/ikiwiki.git` * [[blipvert]] `git://github.com/blipvert/ikiwiki.git` * [[bzed|BerndZeimetz]] `git://git.recluse.de/users/bzed/ikiwiki.git` +* [[wtk|W. Trevor King]]: `git://github.com/wking/ikiwiki.git` ## branches -- cgit v1.2.3 From 267d2ce476756335142424b34fe4341081a67f36 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawna1dYW4AIhTgNOMGflUf8PlpHlugZn5cA" Date: Tue, 5 Oct 2010 14:02:03 +0000 Subject: Use wtk's github branch instead of drexel.edu branch. --- doc/todo/inline_raw_files.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/todo/inline_raw_files.mdwn b/doc/todo/inline_raw_files.mdwn index 0e0f0c298..2968bad40 100644 --- a/doc/todo/inline_raw_files.mdwn +++ b/doc/todo/inline_raw_files.mdwn @@ -7,7 +7,7 @@ Also raise an error in IkiWiki::pagetype($file) if $file is blank, which avoids I've included this patch (and some other adjustments) in my [branch] of the IkiWiki Git repository. I'm using the new code in my [blog][]. -[branch]: http://www.physics.drexel.edu./~wking/code/git/git.php?p=ikiwiki.git +[branch]: http://github.com/wking/ikiwiki [blog]: http://www.physics.drexel.edu/~wking/unfolding-disasters/posts/yacc2dot/ usage -- cgit v1.2.3 From 421de42c2a09d8e933dd25581333afa09c56ff15 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawna1dYW4AIhTgNOMGflUf8PlpHlugZn5cA" Date: Tue, 5 Oct 2010 14:08:23 +0000 Subject: Add gitbranch template to inline_raw_files.mdwn. --- doc/todo/inline_raw_files.mdwn | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'doc') diff --git a/doc/todo/inline_raw_files.mdwn b/doc/todo/inline_raw_files.mdwn index 2968bad40..b5a525ac0 100644 --- a/doc/todo/inline_raw_files.mdwn +++ b/doc/todo/inline_raw_files.mdwn @@ -1,13 +1,14 @@ +[[!template id=gitbranch branch=wtk/master author="[[wtk]]"]] + summary ======= Extend inlining to handle raw files (files with unrecognized extensions). -Also raise an error in IkiWiki::pagetype($file) if $file is blank, which avoids trying to do much with missing files, etc. +Also raise an error in `IkiWiki::pagetype($file)` if `$file` is blank, which avoids trying to do much with missing files, etc. -I've included this patch (and some other adjustments) in my [branch] of the IkiWiki Git repository. I'm using the new code in my [blog][]. +I'm using the new code in my [blog][]. -[branch]: http://github.com/wking/ikiwiki [blog]: http://www.physics.drexel.edu/~wking/unfolding-disasters/posts/yacc2dot/ usage -- cgit v1.2.3 From a3b58406a1d111c4dbbd8469821771e84885eae9 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawna1dYW4AIhTgNOMGflUf8PlpHlugZn5cA" Date: Tue, 5 Oct 2010 14:10:00 +0000 Subject: Fix wikilink from git to wtk page. --- doc/git.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/git.mdwn b/doc/git.mdwn index 98f09014e..5943097e6 100644 --- a/doc/git.mdwn +++ b/doc/git.mdwn @@ -65,7 +65,7 @@ think about merging them. This is recommended. :-) * [[privat]] `git://github.com/privat/ikiwiki.git` * [[blipvert]] `git://github.com/blipvert/ikiwiki.git` * [[bzed|BerndZeimetz]] `git://git.recluse.de/users/bzed/ikiwiki.git` -* [[wtk|W. Trevor King]]: `git://github.com/wking/ikiwiki.git` +* [[wtk]]: `git://github.com/wking/ikiwiki.git` ## branches -- cgit v1.2.3 From 46a98c8a4d72e8be0fd5e683a83745d529b2c3c3 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 5 Oct 2010 11:22:51 -0400 Subject: add pointer to my branch --- doc/todo/web_reversion.mdwn | 1 + 1 file changed, 1 insertion(+) (limited to 'doc') diff --git a/doc/todo/web_reversion.mdwn b/doc/todo/web_reversion.mdwn index 900d98591..33fa79aad 100644 --- a/doc/todo/web_reversion.mdwn +++ b/doc/todo/web_reversion.mdwn @@ -67,6 +67,7 @@ Peter Gammie has done an initial implementation of the above. >> Please look it over and tell me what else needs fixing... -- [[peteg]] >>> I have made my own revert branch and put a few fixes in there +>>> [[!template id=gitbranch branch=origin/revert author="[[joey]]"]] >>> (and fixed all the indention..). Issues I noticed but have not gotten >>> to: --[[Joey]] >>>> Please change the git pointer above, then. I will work on your branch. -- [[peteg]] -- cgit v1.2.3 From 8728a79226896b2909f60753dc17978c065cfc57 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 5 Oct 2010 12:01:36 -0400 Subject: inline already supports raw files though --- doc/todo/inline_raw_files.mdwn | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'doc') diff --git a/doc/todo/inline_raw_files.mdwn b/doc/todo/inline_raw_files.mdwn index b5a525ac0..645ab89b7 100644 --- a/doc/todo/inline_raw_files.mdwn +++ b/doc/todo/inline_raw_files.mdwn @@ -15,3 +15,17 @@ usage ===== \[[!inline pagenames="somefile.txt" template="raw" feeds="no"]] + + +> But inline already supports raw files in two ways: +> +> * setting raw=yes will cause a page to be inlined raw without +> using any template, as if it were part of the page at the location +> of the inline +> * otherwise, the file becomes an enclosure in the rss feed, for use with +> podcasting. +> +> So I don't see the point of your patch. Although since your text +> editor seems to like to make lots of whitespace changes, it's possible +> I missed something in the large quantity of noise introduced by it. +> --[[Joey]] -- cgit v1.2.3 From 4ea3c3c2e5cf17dc734f90bc2c142129e3106f58 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawna1dYW4AIhTgNOMGflUf8PlpHlugZn5cA" Date: Wed, 6 Oct 2010 11:12:13 +0000 Subject: respond to Joey's raw inline comments. --- doc/todo/inline_raw_files.mdwn | 32 +++++++++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/todo/inline_raw_files.mdwn b/doc/todo/inline_raw_files.mdwn index 645ab89b7..100c07288 100644 --- a/doc/todo/inline_raw_files.mdwn +++ b/doc/todo/inline_raw_files.mdwn @@ -28,4 +28,34 @@ usage > So I don't see the point of your patch. Although since your text > editor seems to like to make lots of whitespace changes, it's possible > I missed something in the large quantity of noise introduced by it. -> --[[Joey]] +> --[[Joey]] + +>> As I understand it, setting `raw=yes` causes the page to be inlined +>> as if the page contents had appeared in place of the directive. The +>> content is then processed by whatever `htmlize()` applies to the +>> inlining page. I want the inlined page to be unprocessed, and +>> wrapped in `
...
` (as they are on the blog +>> post I link to above). +>> +>> Enclosures do not include the page contents at all, just a link to +>> them. I'm trying to inline the content so I can comment on it from +>> the inlining page. +>> +>> Apologies for my cluttered version history, I should have branched my +>> earlier changes off to make things clearer. I tried to isolate my +>> whitespace changes (fixes?) in c9ae012d245154c3374d155958fcb0b60fda57ce. +>> 157389355d01224b2d3c3f6e4c1eb42a20ec8a90 should hold all the content +>> changes. +>> +>> A list of other things globbed into my master branch that should have +>> been separate branches: +>> +>> * Make it easy to select a Markdown executable for mdwn.pm. +>> * Included an updated form of +>> [[Javier Rojas' linktoimgonly.pm|forum/link_to_an_image_inside_the_wiki_without_inlining_it]]. +>> * Included an updated form of +>> [Jason Blevins' mdwn_itex.pm](http://jblevins.org/git/ikiwiki/plugins.git/plain/mdwn_itex.pm). +>> * Assorted minor documentation changes. +>> +>> --[[wtk]] + -- cgit v1.2.3 From 3d0108bf0a6f8b0284399cf3a5b150369308c935 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawmVAPKb571nVlx9Em3vWyWOK1k0J6-TUAg" Date: Wed, 6 Oct 2010 12:50:17 +0000 Subject: --- doc/sandbox.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn index 7a10c8403..a3a20fd78 100644 --- a/doc/sandbox.mdwn +++ b/doc/sandbox.mdwn @@ -12,7 +12,7 @@ This is the [[SandBox]], a page anyone can edit to try out ikiwiki > > Back to the first level. -1. Hot Items +1. Hot Items that are hot 1. Daves Insanity Sauce 2. Marie Sharps 1. Blazing Inferno -- cgit v1.2.3 From 237ea79d715fbba5c1be0b73fbe008b3221975fb Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 6 Oct 2010 14:39:10 -0400 Subject: remove rcs_showpatch --- IkiWiki.pm | 4 ---- IkiWiki/Plugin/git.pm | 9 --------- IkiWiki/Plugin/recentchanges.pm | 2 +- doc/plugins/write.mdwn | 6 ------ doc/todo/web_reversion.mdwn | 4 ---- 5 files changed, 1 insertion(+), 24 deletions(-) (limited to 'doc') diff --git a/IkiWiki.pm b/IkiWiki.pm index 466907c9d..269647eb4 100644 --- a/IkiWiki.pm +++ b/IkiWiki.pm @@ -1949,10 +1949,6 @@ sub rcs_revert (@) { $hooks{rcs}{rcs_revert}{call}->(@_); } -sub rcs_showpatch (@) { - $hooks{rcs}{rcs_showpatch}{call}->(@_); -} - sub add_depends ($$;$) { my $page=shift; my $pagespec=shift; diff --git a/IkiWiki/Plugin/git.pm b/IkiWiki/Plugin/git.pm index 5922494bc..3ccaa446a 100644 --- a/IkiWiki/Plugin/git.pm +++ b/IkiWiki/Plugin/git.pm @@ -29,7 +29,6 @@ sub import { hook(type => "rcs", id => "rcs_receive", call => \&rcs_receive); hook(type => "rcs", id => "rcs_preprevert", call => \&rcs_preprevert); hook(type => "rcs", id => "rcs_revert", call => \&rcs_revert); - hook(type => "rcs", id => "rcs_showpatch", call => \&rcs_showpatch); } sub checkconfig () { @@ -865,12 +864,4 @@ sub rcs_revert (@) { } } -sub rcs_showpatch (@) { - # Show the patch with the given revision id. - my %params = @_; - my $rev = $params{rev}; - - return join "\n", run_or_die('git', 'show', $rev); -} - 1 diff --git a/IkiWiki/Plugin/recentchanges.pm b/IkiWiki/Plugin/recentchanges.pm index 7e71d4fc3..948bb1366 100644 --- a/IkiWiki/Plugin/recentchanges.pm +++ b/IkiWiki/Plugin/recentchanges.pm @@ -117,7 +117,7 @@ sub sessioncgi ($$) { } else { $form->title(sprintf(gettext("confirm reversion of %s"), $rev)); - my $patch_contents = IkiWiki::rcs_showpatch(rev => $rev); + my $patch_contents = IkiWiki::rcs_diff($rev); $form->tmpl_param(patch_contents => encode_entities($patch_contents)); $form->field(name => "rev", type => "hidden", value => $rev, force => 1); IkiWiki::showform($form, $buttons, $session, $q); diff --git a/doc/plugins/write.mdwn b/doc/plugins/write.mdwn index 1bd3b0f87..3eade34ee 100644 --- a/doc/plugins/write.mdwn +++ b/doc/plugins/write.mdwn @@ -1212,12 +1212,6 @@ It should try to revert the specified rev, which includes committing the reversion, and returns undef on _success_ and an error message on failure. -#### `rcs_showpatch(@)` - -This is passed a named parameter rev that is a RCS-specific -change ID. It should generate a diff-style patch showing the changes -made and return it. - ### PageSpec plugins It's also possible to write plugins that add new functions to diff --git a/doc/todo/web_reversion.mdwn b/doc/todo/web_reversion.mdwn index 33fa79aad..7cb412f79 100644 --- a/doc/todo/web_reversion.mdwn +++ b/doc/todo/web_reversion.mdwn @@ -55,7 +55,6 @@ Peter Gammie has done an initial implementation of the above. > (The data from `rcs_preprevert` could also be used for a confirmation > prompt -- it doesn't currently include enough info for diffs, but at > least could have a list of changed files.) ->> I added `rcs_showpatch` which simply yields the output of `git show `. -- [[peteg]] > > Note that it's possible for a git repo to have commits that modify wiki > files in a subdir, and code files elsewhere. `rcs_preprevert` should @@ -71,9 +70,6 @@ Peter Gammie has done an initial implementation of the above. >>> (and fixed all the indention..). Issues I noticed but have not gotten >>> to: --[[Joey]] >>>> Please change the git pointer above, then. I will work on your branch. -- [[peteg]] ->>> ->>> * `rcs_diff` already exists; why add `rcs_showpatch`? ->>>> If `rcs_diff` is intended for human consumption, by all means we can use that. -- [[peteg]] >>> * Would it be better for `rcs_revert` to not commit, and >>> `rcs_commit_staged` to then be used? This would work for git, but -- cgit v1.2.3 From c2694e663deb6f49aa511c1b5310fb4cd4187eb0 Mon Sep 17 00:00:00 2001 From: JoshTriplett Date: Wed, 6 Oct 2010 18:49:02 +0000 Subject: --- doc/todo/countdown_directive.mdwn | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 doc/todo/countdown_directive.mdwn (limited to 'doc') diff --git a/doc/todo/countdown_directive.mdwn b/doc/todo/countdown_directive.mdwn new file mode 100644 index 000000000..5a540d927 --- /dev/null +++ b/doc/todo/countdown_directive.mdwn @@ -0,0 +1,3 @@ +I'd love to have a countdown directive, which would take a timestamp to count down to and generate a JavaScript timer in the page. + +Ideally I'd also like to either have parameters providing content to show before and after the time passes, or integration with existing conditional directives to do the same thing. -- cgit v1.2.3 From 017f06dd49fc59c1c0b8c13c7d17722297c97200 Mon Sep 17 00:00:00 2001 From: JoshTriplett Date: Wed, 6 Oct 2010 18:49:30 +0000 Subject: wishlist --- doc/todo/countdown_directive.mdwn | 2 ++ 1 file changed, 2 insertions(+) (limited to 'doc') diff --git a/doc/todo/countdown_directive.mdwn b/doc/todo/countdown_directive.mdwn index 5a540d927..61c36204c 100644 --- a/doc/todo/countdown_directive.mdwn +++ b/doc/todo/countdown_directive.mdwn @@ -1,3 +1,5 @@ I'd love to have a countdown directive, which would take a timestamp to count down to and generate a JavaScript timer in the page. Ideally I'd also like to either have parameters providing content to show before and after the time passes, or integration with existing conditional directives to do the same thing. + +[[!tag wishlist]] -- cgit v1.2.3 From 7988a5aee3be9fe82da1d47d2a72c95eabc7bb6e Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 6 Oct 2010 14:55:08 -0400 Subject: revert html tweaking --- doc/style.css | 3 ++- templates/change.tmpl | 10 +++++----- 2 files changed, 7 insertions(+), 6 deletions(-) (limited to 'doc') diff --git a/doc/style.css b/doc/style.css index fa4b2a38a..aa27d8866 100644 --- a/doc/style.css +++ b/doc/style.css @@ -172,7 +172,8 @@ div.recentchanges { width: 35%; font-size: small; } -.recentchanges .pagelinks { +.recentchanges .pagelinks, +.recentchanges .revert { float: right; margin: 0; width: 60%; diff --git a/templates/change.tmpl b/templates/change.tmpl index 9cf40777b..4525402a7 100644 --- a/templates/change.tmpl +++ b/templates/change.tmpl @@ -10,10 +10,8 @@
Changed pages: -[[diff|wikiicons/diff.png]] - - - +[[diff|wikiicons/diff.png]] +
Changed by: @@ -29,8 +27,10 @@
Date:
-[[revert|wikiicons/revert.png]] + +[[revert|wikiicons/revert.png]] +
-- cgit v1.2.3 From 238e8b95a5b084e7131d3314b78419b9404cba4c Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 6 Oct 2010 15:08:12 -0400 Subject: convert rcs_revert to only stage the reversion --- IkiWiki.pm | 4 ++-- IkiWiki/Plugin/git.pm | 13 ++++--------- IkiWiki/Plugin/recentchanges.pm | 13 +++++++++---- doc/plugins/write.mdwn | 10 ++++------ doc/todo/web_reversion.mdwn | 4 ---- 5 files changed, 19 insertions(+), 25 deletions(-) (limited to 'doc') diff --git a/IkiWiki.pm b/IkiWiki.pm index 269647eb4..faf4af5c7 100644 --- a/IkiWiki.pm +++ b/IkiWiki.pm @@ -1941,11 +1941,11 @@ sub rcs_receive () { $hooks{rcs}{rcs_receive}{call}->(); } -sub rcs_preprevert (@) { +sub rcs_preprevert ($) { $hooks{rcs}{rcs_preprevert}{call}->(@_); } -sub rcs_revert (@) { +sub rcs_revert ($) { $hooks{rcs}{rcs_revert}{call}->(@_); } diff --git a/IkiWiki/Plugin/git.pm b/IkiWiki/Plugin/git.pm index 3ccaa446a..996ab6fba 100644 --- a/IkiWiki/Plugin/git.pm +++ b/IkiWiki/Plugin/git.pm @@ -846,19 +846,14 @@ sub rcs_preprevert (@) { [git_parse_changes(git_commit_info($rev, 1))]); } -sub rcs_revert (@) { - # Try to revert the given patch; returns undef on _success_. - my %params = @_; - my $rev = $params{rev}; +sub rcs_revert ($) { + # Try to revert the given rev; returns undef on _success_. + my $rev = $shift; if (run_or_non('git', 'revert', '--no-commit', $rev)) { - debug "Committing revert for patch '$rev'."; - rcs_commit_staged(message => - sprintf(gettext("This reverts commit %s"), $rev), @_); + return undef; } else { - # No idea what is actually getting reverted, so all we can - # do is say we failed. run_or_die('git', 'reset', '--hard'); return sprintf(gettext("Failed to revert commit %s"), $rev); } diff --git a/IkiWiki/Plugin/recentchanges.pm b/IkiWiki/Plugin/recentchanges.pm index 439241b93..44c981548 100644 --- a/IkiWiki/Plugin/recentchanges.pm +++ b/IkiWiki/Plugin/recentchanges.pm @@ -101,12 +101,17 @@ sub sessioncgi ($$) { if ($form->submitted eq 'Revert' && $form->validate) { IkiWiki::checksessionexpiry($q, $session, $q->param('sid')); IkiWiki::disable_commit_hook(); - my $r = IkiWiki::rcs_revert( - session => $session, - rev => $rev); + my $r = IkiWiki::rcs_revert($rev); + if (! defined $r) { # success + rcs_commit_staged( + message => sprintf(gettext("This reverts commit %s"), $rev), + session => $session, + rev => $rev, + ); + } IkiWiki::enable_commit_hook(); - if ($r) { + if (defined $r) { die "Revert '$rev' failed."; } else { diff --git a/doc/plugins/write.mdwn b/doc/plugins/write.mdwn index 3eade34ee..dbbe83851 100644 --- a/doc/plugins/write.mdwn +++ b/doc/plugins/write.mdwn @@ -1201,16 +1201,14 @@ Like `rcs_receive`, it should do whatever sanity checks are appropriate for the RCS to limit changes to safe changes, and die if a change would be unsafe to revert. -#### `rcs_revert(@)` +#### `rcs_revert($)` This is called by the revert web interface. It is passed a named parameter rev that is the RCS-specific change ID to revert. -Addition named parameters: `message`, and `session` (optional). - -It should try to revert the specified rev, which includes committing -the reversion, and returns undef on _success_ and an error message -on failure. +It should try to revert the specified rev, and leave the reversion staged +so `rcs_commit_staged` will complete it. It should return undef on _success_ +and an error message on failure. ### PageSpec plugins diff --git a/doc/todo/web_reversion.mdwn b/doc/todo/web_reversion.mdwn index 7cb412f79..784b72e05 100644 --- a/doc/todo/web_reversion.mdwn +++ b/doc/todo/web_reversion.mdwn @@ -71,10 +71,6 @@ Peter Gammie has done an initial implementation of the above. >>> to: --[[Joey]] >>>> Please change the git pointer above, then. I will work on your branch. -- [[peteg]] ->>> * Would it be better for `rcs_revert` to not commit, and ->>> `rcs_commit_staged` to then be used? This would work for git, but ->>> maybe other RCSs would be problimatic. It would simplifiy the ->>> interface and allow for future mulitple-revert interfaces. >>> * I quite don't understand why one caller of `git_parse_changes` >>> needs it to chdir, and not the other one. It's running >>> in the same git repo either way, and git doesn't need -- cgit v1.2.3 From 734d352bebc66cf80458277b96ef06467c6f99ed Mon Sep 17 00:00:00 2001 From: "http://jmtd.livejournal.com/" Date: Wed, 6 Oct 2010 20:25:05 +0000 Subject: rationale --- doc/todo/use_templates_for_the_img_plugin.mdwn | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 doc/todo/use_templates_for_the_img_plugin.mdwn (limited to 'doc') diff --git a/doc/todo/use_templates_for_the_img_plugin.mdwn b/doc/todo/use_templates_for_the_img_plugin.mdwn new file mode 100644 index 000000000..c5a1028f4 --- /dev/null +++ b/doc/todo/use_templates_for_the_img_plugin.mdwn @@ -0,0 +1,5 @@ +The patches in http://github.com/jmtd/ikiwiki/tree/img_use_template convert the `img.pm` plugin to use a template (by default, `img.tmpl`, varied using a`template=` parameter) rather than hard-code the generated HTML. + +I originally thought of this to solve the problem outlined in [[bugs/can't mix template vars inside directives]], before I realised I could wrap the `img` call in my pages with a template to achieve the same thing. I therefore sat on it. + +However, I since thought of another use for this, and so started implementing it. -- cgit v1.2.3 From 78f784c91df385050ef61a0c76c906cacdb2d911 Mon Sep 17 00:00:00 2001 From: "http://jmtd.livejournal.com/" Date: Wed, 6 Oct 2010 20:27:08 +0000 Subject: gitbranch template --- doc/todo/use_templates_for_the_img_plugin.mdwn | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'doc') diff --git a/doc/todo/use_templates_for_the_img_plugin.mdwn b/doc/todo/use_templates_for_the_img_plugin.mdwn index c5a1028f4..d6dce8c63 100644 --- a/doc/todo/use_templates_for_the_img_plugin.mdwn +++ b/doc/todo/use_templates_for_the_img_plugin.mdwn @@ -1,5 +1,9 @@ -The patches in http://github.com/jmtd/ikiwiki/tree/img_use_template convert the `img.pm` plugin to use a template (by default, `img.tmpl`, varied using a`template=` parameter) rather than hard-code the generated HTML. +[[!template id=gitbranch branch=jmtd/img_use_template author="[[Jon]]"]] + +Not finished! :-) + +The patches in convert the `img.pm` plugin to use a template (by default, `img.tmpl`, varied using a `template=` parameter) rather than hard-code the generated HTML. I originally thought of this to solve the problem outlined in [[bugs/can't mix template vars inside directives]], before I realised I could wrap the `img` call in my pages with a template to achieve the same thing. I therefore sat on it. -However, I since thought of another use for this, and so started implementing it. +However, I since thought of another use for this, and so started implementing it. (note to self: explain this other use) -- cgit v1.2.3 From c8214300ed6198d3a59cc1e3b3d74b0722c26b91 Mon Sep 17 00:00:00 2001 From: "http://jmtd.livejournal.com/" Date: Thu, 7 Oct 2010 12:37:02 +0000 Subject: other purpose --- doc/todo/use_templates_for_the_img_plugin.mdwn | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'doc') diff --git a/doc/todo/use_templates_for_the_img_plugin.mdwn b/doc/todo/use_templates_for_the_img_plugin.mdwn index d6dce8c63..1cee1b535 100644 --- a/doc/todo/use_templates_for_the_img_plugin.mdwn +++ b/doc/todo/use_templates_for_the_img_plugin.mdwn @@ -7,3 +7,23 @@ The patches in convert th I originally thought of this to solve the problem outlined in [[bugs/can't mix template vars inside directives]], before I realised I could wrap the `img` call in my pages with a template to achieve the same thing. I therefore sat on it. However, I since thought of another use for this, and so started implementing it. (note to self: explain this other use) + +---- + +Ok, I have managed to achieve what I wanted with stock ikiwiki, this branch might not have any more life left in it (but it has proven an interesting experiment to see how much logic could be moved from `img.pm` into a template relatively easily. Although the template is not terribly legible.) + +My ikiwiki page has a picture on the front page. I've changed that picture just once, but I would like to change it again from time to time. I also want to keep a "gallery", or at least a list, of previous pictures, and perhaps include text alongside each picture, but not on the front page. + +I've achieved this as follows + + * each index picture gets a page under "indexpics". + * the "indexpics" page has a raw inline to include them all[1] + * the front page has more-or-less the same inline, with show=1 + * each index picture page has a [[plugins/conditional]]: + * if you are being included, show the resized picture only, and link the picture to the relevant indexpic page + * else, show the picture with the default link to a full-size image, and include explanatory text. + * most of the boilerplate is hidden inside a template + +It is not quite as I envisaged it: the explanatory text would probably make sense on the indexpics "gallery" page, but since that includes the page, the wrong trouser-leg of the conditional is used. But it works quite well. Introducing a new index picture involves creating an appropriate page under indexpics and the rest happens automatically. + +[1] lie #1: the pagespec is a lot more complex as it has to exclude raw image filetypes -- cgit v1.2.3 From 5448a9324e98a8aff32c68bf00ea8093aeb99167 Mon Sep 17 00:00:00 2001 From: "http://hendry.iki.fi/" Date: Fri, 8 Oct 2010 10:05:07 +0000 Subject: --- doc/ikiwiki/directive/aggregate/discussion.mdwn | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 doc/ikiwiki/directive/aggregate/discussion.mdwn (limited to 'doc') diff --git a/doc/ikiwiki/directive/aggregate/discussion.mdwn b/doc/ikiwiki/directive/aggregate/discussion.mdwn new file mode 100644 index 000000000..cf3d2022f --- /dev/null +++ b/doc/ikiwiki/directive/aggregate/discussion.mdwn @@ -0,0 +1,3 @@ +It would be awesome if table could aggregrate remote CSVs too. I want something like: + + !table file="http://cyclehireapp.com/cyclehirelive/cyclehire.csv" -- cgit v1.2.3 From 62cd39a905cf3699bceb33dc6ea243f8ba030d26 Mon Sep 17 00:00:00 2001 From: z3ttacht Date: Fri, 8 Oct 2010 15:30:50 +0000 Subject: --- doc/templates/discussion.mdwn | 3 +++ 1 file changed, 3 insertions(+) (limited to 'doc') diff --git a/doc/templates/discussion.mdwn b/doc/templates/discussion.mdwn index 4ddc48ac3..efeedf448 100644 --- a/doc/templates/discussion.mdwn +++ b/doc/templates/discussion.mdwn @@ -7,6 +7,9 @@ note and popups are templates? But they're not in the templates directory, and i > installed there, typically in `/usr/share/ikiwiki/basewiki/templates/` > --[[Joey]] +> > And how am I able to use e.g. links? It's not listed in `/usr/share/ikiwiki/basewiki/templates`. +> > I intend do (mis)use links for a horizontal navigation. Or may I be better off altering page.tmpl? +> > --z3ttacht Is there a list of the TMPL_VAR-Variables that are defined by ikiwiki? -- cgit v1.2.3 From c0a128131fb8a9985a46b1050f3d029c41176ccf Mon Sep 17 00:00:00 2001 From: "83.61.47.122" <83.61.47.122@web> Date: Fri, 8 Oct 2010 19:45:29 +0000 Subject: poll vote (Accept only OpenID for logins) --- doc/news/openid.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/news/openid.mdwn b/doc/news/openid.mdwn index 32325559e..025a07802 100644 --- a/doc/news/openid.mdwn +++ b/doc/news/openid.mdwn @@ -10,4 +10,4 @@ log back in, try out the OpenID signup process if you don't already have an OpenID, and see how OpenID works for you. And let me know your feelings about making such a switch. --[[Joey]] -[[!poll 66 "Accept only OpenID for logins" 21 "Accept only password logins" 37 "Accept both"]] +[[!poll 67 "Accept only OpenID for logins" 21 "Accept only password logins" 37 "Accept both"]] -- cgit v1.2.3 From 7aba3bd74696dc5c3f51448db29bfba0c58d6529 Mon Sep 17 00:00:00 2001 From: intrigeri Date: Fri, 8 Oct 2010 23:28:08 +0200 Subject: ping --- doc/todo/mirrorlist_with_per-mirror_usedirs_settings.mdwn | 2 ++ 1 file changed, 2 insertions(+) (limited to 'doc') diff --git a/doc/todo/mirrorlist_with_per-mirror_usedirs_settings.mdwn b/doc/todo/mirrorlist_with_per-mirror_usedirs_settings.mdwn index 6ca9962ba..fb33f195c 100644 --- a/doc/todo/mirrorlist_with_per-mirror_usedirs_settings.mdwn +++ b/doc/todo/mirrorlist_with_per-mirror_usedirs_settings.mdwn @@ -21,4 +21,6 @@ and decided this time it was really needed to implement this feature. --[[intrigeri]] +> Ping. --[[intrigeri]] + [[!tag patch]] -- cgit v1.2.3 From 594eb32780466e89390bacc61f8c28b1d4ca9f0b Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 8 Oct 2010 17:46:21 -0400 Subject: update for new hooks --- doc/rcs.mdwn | 2 ++ 1 file changed, 2 insertions(+) (limited to 'doc') diff --git a/doc/rcs.mdwn b/doc/rcs.mdwn index 83c6910d0..06af9807c 100644 --- a/doc/rcs.mdwn +++ b/doc/rcs.mdwn @@ -23,6 +23,8 @@ auto.setup |yes |yes |incomplete|yes |incomplete |yes `rcs_diff` |yes |yes |yes |yes |no |yes |yes |yes `rcs_getctime` |fast |slow |slow |slow |slow |slow |slow |slow `rcs_getmtime` |fast |slow |slow |no |no |no |no |no +`rcs_preprevert` |yes |no |no |no |no |no |no |no +`rcs_revert` |yes |no |no |no |no |no |no |no anonymous push |yes |no |no |no |no |no |no |no conflict handling |yes |yes |yes |buggy |yes |yes |yes |yes openid username |yes |no |no |no |no |no |no |no -- cgit v1.2.3 From 84111d96c461a5d31a615ebf64cae751e6fd9aef Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 8 Oct 2010 17:54:12 -0400 Subject: make revert hooks optional I removed the IkiWiki::rcs_ stubs for the revert hooks. Instead recentchanges tests to see if the hooks are available and calls them directly. --- IkiWiki.pm | 8 -------- IkiWiki/Plugin/recentchanges.pm | 9 ++++++--- doc/plugins/write.mdwn | 5 +++-- templates/change.tmpl | 2 ++ 4 files changed, 11 insertions(+), 13 deletions(-) (limited to 'doc') diff --git a/IkiWiki.pm b/IkiWiki.pm index faf4af5c7..1f6d70ba3 100644 --- a/IkiWiki.pm +++ b/IkiWiki.pm @@ -1941,14 +1941,6 @@ sub rcs_receive () { $hooks{rcs}{rcs_receive}{call}->(); } -sub rcs_preprevert ($) { - $hooks{rcs}{rcs_preprevert}{call}->(@_); -} - -sub rcs_revert ($) { - $hooks{rcs}{rcs_revert}{call}->(@_); -} - sub add_depends ($$;$) { my $page=shift; my $pagespec=shift; diff --git a/IkiWiki/Plugin/recentchanges.pm b/IkiWiki/Plugin/recentchanges.pm index 44c981548..a6d7f9fce 100644 --- a/IkiWiki/Plugin/recentchanges.pm +++ b/IkiWiki/Plugin/recentchanges.pm @@ -93,7 +93,8 @@ sub sessioncgi ($$) { return unless $do eq 'revert' && $rev; - IkiWiki::rcs_preprevert(cgi => $q, session => $session, rev => $rev); + $IkiWiki::hooks{rcs}{rcs_preprevert}{call}->( + cgi => $q, session => $session, rev => $rev); my ($form, $buttons) = confirmation_form($q, $session); IkiWiki::decode_form_utf8($form); @@ -101,7 +102,7 @@ sub sessioncgi ($$) { if ($form->submitted eq 'Revert' && $form->validate) { IkiWiki::checksessionexpiry($q, $session, $q->param('sid')); IkiWiki::disable_commit_hook(); - my $r = IkiWiki::rcs_revert($rev); + my $r = $IkiWiki::hooks{rcs}{rcs_revert}{call}->($rev); if (! defined $r) { # success rcs_commit_staged( message => sprintf(gettext("This reverts commit %s"), $rev), @@ -186,7 +187,9 @@ sub store ($$$) { ]; push @{$change->{pages}}, { link => '...' } if $is_excess; - if (length $config{cgiurl}) { + if (length $config{cgiurl} && + exists $IkiWiki::hooks{rcs}{rcs_preprevert} && + exists $IkiWiki::hooks{rcs}{rcs_revert}) { $change->{reverturl} = IkiWiki::cgiurl( do => "revert", rev => $change->{rev} diff --git a/doc/plugins/write.mdwn b/doc/plugins/write.mdwn index dbbe83851..6b751f0cd 100644 --- a/doc/plugins/write.mdwn +++ b/doc/plugins/write.mdwn @@ -1154,8 +1154,6 @@ context, and the whole diff in scalar context. This is used to get the page creation time for a file from the RCS, by looking it up in the history. -It's ok if this is not implemented, and throws an error. - If the RCS cannot determine a ctime for the file, return 0. #### `rcs_getmtime($)` @@ -1210,6 +1208,9 @@ It should try to revert the specified rev, and leave the reversion staged so `rcs_commit_staged` will complete it. It should return undef on _success_ and an error message on failure. +This hook and `rcs_preprevert` are optional, if not implemented, no revert +web interface will be available. + ### PageSpec plugins It's also possible to write plugins that add new functions to diff --git a/templates/change.tmpl b/templates/change.tmpl index 4525402a7..60a9d94b5 100644 --- a/templates/change.tmpl +++ b/templates/change.tmpl @@ -28,9 +28,11 @@
+ [[revert|wikiicons/revert.png]] +
-- cgit v1.2.3 From f5c270b11dbfb2589df21388a07f55002e076d3c Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 8 Oct 2010 18:43:15 -0400 Subject: update --- doc/todo/web_reversion.mdwn | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'doc') diff --git a/doc/todo/web_reversion.mdwn b/doc/todo/web_reversion.mdwn index 784b72e05..4335b3fbf 100644 --- a/doc/todo/web_reversion.mdwn +++ b/doc/todo/web_reversion.mdwn @@ -62,6 +62,8 @@ Peter Gammie has done an initial implementation of the above. >> Taken care of by refactoring `rcs_receive` in `git.pm` >> I've tested it lightly in my single-user setup. It's a little nasty that the `attachment` plugin >> gets used to check whether attachments are allowed -- there really should be a hook for that. +>>> I agree, but have not figured out a way to make a hook work yet. +>>> --[[Joey]] >> >> Please look it over and tell me what else needs fixing... -- [[peteg]] @@ -76,8 +78,3 @@ Peter Gammie has done an initial implementation of the above. >>> in the same git repo either way, and git doesn't need >>> `git show` to run in a subdir at all.. >>>> I was aping (preserving) what was already there. I don't understand what you say about `git show` - it must run under $srcdir, surely? And empirically the CGI process wasn't in the right place. By all means simplify that. -- [[peteg]] - ->>> * Probably needs to untaint the revs passed in. ->>> * Seems backwards for `rcs_preprevert` to import and ->>> use `IkiWiki::Receive`. ->>>> Indeed. This is saying that the checking code in IkiWiki::Receive is in the wrong place. I think it would be better to set up some general hooks and shuffle it into a plugin, for then other plugins that maintain special files in the repo can have a say about validity. -- [[peteg]] -- cgit v1.2.3 From e7d6dcfed618c57c775478c95b77a15097142e6e Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 8 Oct 2010 18:46:30 -0400 Subject: remove todo item I understand the need to avoid chdir when running git_parse_changes for receive now. At that point, the changes have not been pushed to the srcdir's repo yet. When running the same code for preprevert, chdir to the srcdir is ok, and necessary. --- IkiWiki/Plugin/git.pm | 2 -- doc/todo/web_reversion.mdwn | 9 +-------- 2 files changed, 1 insertion(+), 10 deletions(-) (limited to 'doc') diff --git a/IkiWiki/Plugin/git.pm b/IkiWiki/Plugin/git.pm index 48e71aa9a..47e806209 100644 --- a/IkiWiki/Plugin/git.pm +++ b/IkiWiki/Plugin/git.pm @@ -794,8 +794,6 @@ sub git_parse_changes { die $@ if $@; my $fh; ($fh, $path)=File::Temp::tempfile("XXXXXXXXXX", UNLINK => 1); - # Ensure we run this in the right place, - # see comments in rcs_receive. my $cmd = ($no_chdir ? '' : "cd $config{srcdir} && ") . "git show $detail->{sha1_to} > '$path'"; if (system($cmd) != 0) { diff --git a/doc/todo/web_reversion.mdwn b/doc/todo/web_reversion.mdwn index 4335b3fbf..212fd3a53 100644 --- a/doc/todo/web_reversion.mdwn +++ b/doc/todo/web_reversion.mdwn @@ -69,12 +69,5 @@ Peter Gammie has done an initial implementation of the above. >>> I have made my own revert branch and put a few fixes in there >>> [[!template id=gitbranch branch=origin/revert author="[[joey]]"]] ->>> (and fixed all the indention..). Issues I noticed but have not gotten ->>> to: --[[Joey]] +>>> (and fixed all the indention..). --[[Joey]] >>>> Please change the git pointer above, then. I will work on your branch. -- [[peteg]] - ->>> * I quite don't understand why one caller of `git_parse_changes` ->>> needs it to chdir, and not the other one. It's running ->>> in the same git repo either way, and git doesn't need ->>> `git show` to run in a subdir at all.. ->>>> I was aping (preserving) what was already there. I don't understand what you say about `git show` - it must run under $srcdir, surely? And empirically the CGI process wasn't in the right place. By all means simplify that. -- [[peteg]] -- cgit v1.2.3 From 481d8e69dece3f256015af4a5c1da33bf06c7b99 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 8 Oct 2010 19:12:46 -0400 Subject: better revert icon based on one of the smileys, fixed to have transparent bg --- doc/wikiicons/revert.png | Bin 840 -> 397 bytes 1 file changed, 0 insertions(+), 0 deletions(-) (limited to 'doc') diff --git a/doc/wikiicons/revert.png b/doc/wikiicons/revert.png index 9036046e9..c39e65c33 100644 Binary files a/doc/wikiicons/revert.png and b/doc/wikiicons/revert.png differ -- cgit v1.2.3 From 108d2ac9ae8597ff7e62edd6274fc21d626cdf69 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 8 Oct 2010 19:13:35 -0400 Subject: fix to have transparent background --- doc/smileys/icon-error.png | Bin 159 -> 397 bytes 1 file changed, 0 insertions(+), 0 deletions(-) (limited to 'doc') diff --git a/doc/smileys/icon-error.png b/doc/smileys/icon-error.png index 53b1055f6..c39e65c33 100644 Binary files a/doc/smileys/icon-error.png and b/doc/smileys/icon-error.png differ -- cgit v1.2.3 From 1820f07f04476e8be290aadeee140cd0a5a0dfed Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 8 Oct 2010 19:24:06 -0400 Subject: revert interface done --- debian/changelog | 5 +++++ doc/forum/how_do_I_revert_edits_in_the_web_mode__63__.mdwn | 6 ++++++ doc/todo/web_reversion.mdwn | 2 ++ 3 files changed, 13 insertions(+) (limited to 'doc') diff --git a/debian/changelog b/debian/changelog index 1d12d0558..d1ee4967d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,11 @@ ikiwiki (3.20100927) UNRELEASED; urgency=low * htmltidy: Allow configuring tidy parameters in setup file. (W. Trevor King) * Updated French program translation. Closes: #598918 + * git: Added new rcs_revert and rcs_preprevert hooks. + * recentchanges: Add revert buttons to RecentChanges page, and + implement web-based reversion interface. + * Thanks to Peter Gammie for his assistance with the web-based reversion + feature. -- Joey Hess Wed, 29 Sep 2010 11:58:23 -0400 diff --git a/doc/forum/how_do_I_revert_edits_in_the_web_mode__63__.mdwn b/doc/forum/how_do_I_revert_edits_in_the_web_mode__63__.mdwn index 4998c1a75..d69b3801b 100644 --- a/doc/forum/how_do_I_revert_edits_in_the_web_mode__63__.mdwn +++ b/doc/forum/how_do_I_revert_edits_in_the_web_mode__63__.mdwn @@ -38,3 +38,9 @@ Puzzled a bit :-/ Perer Gammie and I are working on reversion over at [[todo/web_reversion]]. --[[Joey]] + +Update: Web reversion is now supported by ikiwiki. Only changes committed +to your wiki after you upgrade to the version of ikiwiki that supports it +will get revert buttons on the RecentChanges page. If you want to force +adding buttons for older changes, you can delete `recentchanges/*._change` +from your srcdir, and rebuild the wiki. --[[Joey]] diff --git a/doc/todo/web_reversion.mdwn b/doc/todo/web_reversion.mdwn index 212fd3a53..9550fa58b 100644 --- a/doc/todo/web_reversion.mdwn +++ b/doc/todo/web_reversion.mdwn @@ -71,3 +71,5 @@ Peter Gammie has done an initial implementation of the above. >>> [[!template id=gitbranch branch=origin/revert author="[[joey]]"]] >>> (and fixed all the indention..). --[[Joey]] >>>> Please change the git pointer above, then. I will work on your branch. -- [[peteg]] + +[[done]] -- cgit v1.2.3 From 2d99fe0d34be35d9e5d556d530f2d8993007cdf6 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 8 Oct 2010 19:27:28 -0400 Subject: note that recentchanges plugin handles reversions --- doc/plugins/recentchanges.mdwn | 2 ++ 1 file changed, 2 insertions(+) (limited to 'doc') diff --git a/doc/plugins/recentchanges.mdwn b/doc/plugins/recentchanges.mdwn index 823f68502..6fff18e8a 100644 --- a/doc/plugins/recentchanges.mdwn +++ b/doc/plugins/recentchanges.mdwn @@ -6,6 +6,8 @@ generates a page describing each recent change made to the wiki. These pages can be joined together with [[inline]] to generate the [[RecentChanges]] page. +This plugin also currently handles web-based reversion of changes. + Typically only the RecentChanges page will use the pages generated by this plugin, but you can use it elsewhere too if you like. It's used like this: -- cgit v1.2.3 From 59ea972fc91005699b14204c989c2d29997a3009 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 8 Oct 2010 19:32:09 -0400 Subject: cleanup --- doc/todo/web_reversion.mdwn | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'doc') diff --git a/doc/todo/web_reversion.mdwn b/doc/todo/web_reversion.mdwn index 9550fa58b..736d674fe 100644 --- a/doc/todo/web_reversion.mdwn +++ b/doc/todo/web_reversion.mdwn @@ -67,9 +67,7 @@ Peter Gammie has done an initial implementation of the above. >> >> Please look it over and tell me what else needs fixing... -- [[peteg]] ->>> I have made my own revert branch and put a few fixes in there ->>> [[!template id=gitbranch branch=origin/revert author="[[joey]]"]] ->>> (and fixed all the indention..). --[[Joey]] ->>>> Please change the git pointer above, then. I will work on your branch. -- [[peteg]] +>>> I have made my own revert branch and put a few^Wseveral fixes in there. +>>> All merged to master now! --[[Joey]] [[done]] -- cgit v1.2.3 From bc8b61dae8faa0a654f3a5f2278cd1c66a2f44a3 Mon Sep 17 00:00:00 2001 From: "http://smcv.pseudorandom.co.uk/" Date: Sat, 9 Oct 2010 12:48:47 +0000 Subject: pseudo-review --- ...irrorlist_with_per-mirror_usedirs_settings.mdwn | 24 ++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'doc') diff --git a/doc/todo/mirrorlist_with_per-mirror_usedirs_settings.mdwn b/doc/todo/mirrorlist_with_per-mirror_usedirs_settings.mdwn index fb33f195c..484f85cbb 100644 --- a/doc/todo/mirrorlist_with_per-mirror_usedirs_settings.mdwn +++ b/doc/todo/mirrorlist_with_per-mirror_usedirs_settings.mdwn @@ -24,3 +24,27 @@ and decided this time it was really needed to implement this feature. > Ping. --[[intrigeri]] [[!tag patch]] + +>> (I'm not an ikiwiki committer, opinions may vary.) +>> +>> This would be easier to review if there weren't a million merges from +>> master; perhaps either leave a branch as-is, or rebase it, or merge +>> only at "significant" times like after a release? +>> +>> I believe Joey's main objection to complex $config entries is that +>> it's not at all clear what [[plugins/websetup]] would do with them. +>> Would something like this make a reasonable alternative? +>> +>> $config{mirrorlist} = ["nousedirs|file:///home/intrigeri/wiki", +>> "usedirs|http://example.com/wiki", "http://example.net"]; +>> +>> From how I understand tainting, this: +>> +>> $untainted{$_} = possibly_foolish_untaint($tainted->{$_}) +>> +>> probably needs to untaint the key too: +>> +>> my $key = possibly_foolish_untaint($_); +>> $untainted{$key} = possibly_foolish_untaint($tainted->{key}); +>> +>> --[[smcv]] -- cgit v1.2.3 From 2c0d2799b752c81c4fe45d569d1931157ef947ec Mon Sep 17 00:00:00 2001 From: justint Date: Sun, 10 Oct 2010 23:01:19 +0000 Subject: perl Makefile.PL LIB=/Library/Perl/5.10.0 #this worked for me(Mac OS X) --- doc/install.mdwn | 1 + 1 file changed, 1 insertion(+) (limited to 'doc') diff --git a/doc/install.mdwn b/doc/install.mdwn index cc3a4c29f..f38ae2aab 100644 --- a/doc/install.mdwn +++ b/doc/install.mdwn @@ -41,5 +41,6 @@ If you're using a shared hosting provider, of the sort where you don't have root, you can still install ikiwiki. There are tutorials covering this for a few providers: + * [[tips/NearlyFreeSpeech]] * [[tips/DreamHost]] -- cgit v1.2.3 From 2ef899d9f94768d714b81ff5bc157e5f2c521395 Mon Sep 17 00:00:00 2001 From: Anonymous Date: Mon, 11 Oct 2010 11:45:38 +0200 Subject: Bugreport --- ..._of_img_directive_behave_not_as_documented.mdwn | 29 ++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 doc/bugs/class_parameter_of_img_directive_behave_not_as_documented.mdwn (limited to 'doc') diff --git a/doc/bugs/class_parameter_of_img_directive_behave_not_as_documented.mdwn b/doc/bugs/class_parameter_of_img_directive_behave_not_as_documented.mdwn new file mode 100644 index 000000000..10ba15066 --- /dev/null +++ b/doc/bugs/class_parameter_of_img_directive_behave_not_as_documented.mdwn @@ -0,0 +1,29 @@ +On [[ikiwiki/directive/img/]] I read that + +> You can also pass alt, title, class, align, id, hspace, and vspace +> parameters. These are passed through unchanged to the html img tag. + +but when I pass `class="myclass"` to an img directive, I obtain + + img: Add a margin around images displayed by this directive. +> +> Particularly important for floating images, which could before be placed +> uncomfortably close to text. + +which adds to img.pm: + + if (exists $params{class}) { + $params{class}.=" img"; + } + else { + $params{class}="img"; + } + +I would prefer if the `img` class were only added if no class attribute is +passed. + +If you keep the current behaviour, please document it. -- cgit v1.2.3 From 6dd49d0df7ac97b2a74517f18fcb24881c940cad Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 11 Oct 2010 19:23:24 -0400 Subject: bug --- doc/bugs/monotone_backend_does_not_support_srcdir_in_subdir.mdwn | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 doc/bugs/monotone_backend_does_not_support_srcdir_in_subdir.mdwn (limited to 'doc') diff --git a/doc/bugs/monotone_backend_does_not_support_srcdir_in_subdir.mdwn b/doc/bugs/monotone_backend_does_not_support_srcdir_in_subdir.mdwn new file mode 100644 index 000000000..9e1924472 --- /dev/null +++ b/doc/bugs/monotone_backend_does_not_support_srcdir_in_subdir.mdwn @@ -0,0 +1,3 @@ +The [[rcs/monotone]] backend does not currently support putting the ikiwiki srcdir +in a subdirectory of the repository. It must be at the top. Git has +special code to handle this case. --[[Joey]] -- cgit v1.2.3 From 7ba0f7d297e7d3e833756016b635ffa0cc78200e Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 11 Oct 2010 20:30:14 -0400 Subject: monotone: Fix recentchanges page when the srcdir is not at the top of the monotone workspace. Thanks, tommyd. --- IkiWiki/Plugin/monotone.pm | 13 ++++++++++++- debian/changelog | 2 ++ .../monotone_backend_does_not_support_srcdir_in_subdir.mdwn | 2 ++ 3 files changed, 16 insertions(+), 1 deletion(-) (limited to 'doc') diff --git a/IkiWiki/Plugin/monotone.pm b/IkiWiki/Plugin/monotone.pm index 95fbcee76..75bf2f458 100644 --- a/IkiWiki/Plugin/monotone.pm +++ b/IkiWiki/Plugin/monotone.pm @@ -252,9 +252,20 @@ sub get_changed_files ($$) { my @ret; my %seen = (); - + + # we need to strip off the relative path to the source dir + # because monotone outputs all file paths absolute according + # to the workspace root + my $rel_src_dir = $config{'srcdir'}; + $rel_src_dir =~ s/^\Q$config{'mtnrootdir'}\E\/?//; + $rel_src_dir .= "/" if length $rel_src_dir; + while ($changes =~ m/\s*(add_file|patch|delete|rename)\s"(.*?)(? Wed, 29 Sep 2010 11:58:23 -0400 diff --git a/doc/bugs/monotone_backend_does_not_support_srcdir_in_subdir.mdwn b/doc/bugs/monotone_backend_does_not_support_srcdir_in_subdir.mdwn index 9e1924472..35f624f78 100644 --- a/doc/bugs/monotone_backend_does_not_support_srcdir_in_subdir.mdwn +++ b/doc/bugs/monotone_backend_does_not_support_srcdir_in_subdir.mdwn @@ -1,3 +1,5 @@ The [[rcs/monotone]] backend does not currently support putting the ikiwiki srcdir in a subdirectory of the repository. It must be at the top. Git has special code to handle this case. --[[Joey]] + +[[done]] -- cgit v1.2.3 From c752be0acb942036a2dfd69dcfde06c17860db34 Mon Sep 17 00:00:00 2001 From: justint Date: Tue, 12 Oct 2010 05:53:32 +0000 Subject: Mac OS X Snow Leopard Installing IkiWiki Tips --- doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn | 81 ++++++++++++++++++++++++++ 1 file changed, 81 insertions(+) create mode 100644 doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn (limited to 'doc') diff --git a/doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn b/doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn new file mode 100644 index 000000000..2c3428b3f --- /dev/null +++ b/doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn @@ -0,0 +1,81 @@ +These are some notes on installing ikiwiki on Mac OS X Snow Leopard. I have a three year old machine with a lot of stuff on it so it took quite a while, YMMV. + +The best part of installing ikiwiki was learning how to use git. I never used source control before but its pretty slick. + +## installing git: + +curl http://kernel.org/pub/software/scm/git/git-(latest version).tar.gz -O +tar xzvf git-(latest version).tar.gz +cd git-(latest version) +./configure --prefix=/usr/local +NO_MSGFMT=yes make prefix=/usr/local all +sudo make install + +git config --global user.name "firstname lastname" +git config --global user.email "email here" +git config --global color.ui "auto" + +curl http://www.kernel.org/pub/software/scm/git/git-manpages-1.7.3.1.tar.gz | sudo tar -xzC /opt/local/share/man/ + + +## installing ikiwiki: +I had terrible trouble installing ikiwiki. It turned out I had accidentally installed Perl through ports. Uninstalling that made everything install nicely. +I like to install test software in /opt. No particular reason. You could install to defaults. + +perl Makefile.PL PREFIX=/Library/Perl/5.10.0 LIB=/Library/Perl/5.10.0 +perl Makefile.PL LIB=/Library/Perl/5.10.0 +make +make install +sudo install -d /opt/ikiwiki +sudo install -m 0644 wikilist /opt/ikiwiki +sudo install -m 0644 auto.setup /opt/ikiwiki +sudo install -m 0644 auto-blog.setup /opt/ikiwiki + +when you make ikiwiki it gives you a .git folder with the ikiwiki files. Stay out of this folder. You want to learn how to create a clone and make all your changes in the clone. When you push the changes ikiwiki will update. I moved a file in this folder by accident because I named my working file the same and I couldn't get into the setup page. I had apparently messed up my ikiwiki git repository. I did a pull into my clone, deleted the repository and webserver/ cgi folders and ran a new setup. Then I did a git clone and dragged all my old files into the new clone. Did the git dance and did git push. Then the angels sang. + +## using git from inside a git folder: +start with git clone, then learn to do the git dance like this. +git pull +make your changes to your clone +git commit -a -m "message here" +git push + +When you can't get into the setup page or you get strange behavior after a setup update the Utilities > Console app is your friend. + +## installing gitweb + +make GITWEB_PROJECTROOT="/opt/ikiwiki/" GITWEB_CSS="/gitweb/gitweb.css" GITWEB_LOGO="/gitweb/git-logo.png" GITWEB_FAVICON="/gitweb/git-favicon.png" bindir=/opt/local/bin + +cp gitweb.cgi /Library/WebServer/CGI-Executables/gitweb/ +sudo chmod 2755 gitweb.cgi + +## installing xapian: +download xapian and omega +I needed pcre: sudo ports install pcre + +./configure +make +sudo make install + +## installing omega: +I had a build error do to libiconv undefined symbols. sudo port deactivate libiconv took care of it. After install I had trouble with ikiwiki so I did a sudo port install libiconv and ikiwiki came back. +./configure +make +sudo make install + +## installing Search::Xapian from CPAN +for some reason this wouldn't install using CPAN console so I went to CPAN online and downloaded the source. +perl Makefile.PL +make +make test +sudo make install +it installed without issue so I'm baffled why it didn't install from command line. + +## turning on search plugin: +I turned on the plugin from the setup page in ikiwiki but it gave an error when I went to search. Error "blah blah cgi-bin/omega/omega" does not exist or some such. I did a +find / -name "omega" -print +and found the omega program in +/usr/local/lib/xapian-omega/bin/omega. +Then I went into the setup file and replaced the bad path, updated and badda-boom badda-bing. + +Then I fell asleep. -- cgit v1.2.3 From 20b94ad9e1f5a401798b6991aeba964267ce3087 Mon Sep 17 00:00:00 2001 From: justint Date: Tue, 12 Oct 2010 05:55:32 +0000 Subject: --- doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn | 53 ++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) (limited to 'doc') diff --git a/doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn b/doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn index 2c3428b3f..4eb084f38 100644 --- a/doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn +++ b/doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn @@ -2,44 +2,71 @@ These are some notes on installing ikiwiki on Mac OS X Snow Leopard. I have a th The best part of installing ikiwiki was learning how to use git. I never used source control before but its pretty slick. + ## installing git: curl http://kernel.org/pub/software/scm/git/git-(latest version).tar.gz -O + tar xzvf git-(latest version).tar.gz + cd git-(latest version) + ./configure --prefix=/usr/local + NO_MSGFMT=yes make prefix=/usr/local all + sudo make install + git config --global user.name "firstname lastname" + git config --global user.email "email here" + git config --global color.ui "auto" + curl http://www.kernel.org/pub/software/scm/git/git-manpages-1.7.3.1.tar.gz | sudo tar -xzC /opt/local/share/man/ ## installing ikiwiki: I had terrible trouble installing ikiwiki. It turned out I had accidentally installed Perl through ports. Uninstalling that made everything install nicely. + I like to install test software in /opt. No particular reason. You could install to defaults. + perl Makefile.PL PREFIX=/Library/Perl/5.10.0 LIB=/Library/Perl/5.10.0 + perl Makefile.PL LIB=/Library/Perl/5.10.0 + make + make install + sudo install -d /opt/ikiwiki + sudo install -m 0644 wikilist /opt/ikiwiki + sudo install -m 0644 auto.setup /opt/ikiwiki + sudo install -m 0644 auto-blog.setup /opt/ikiwiki + when you make ikiwiki it gives you a .git folder with the ikiwiki files. Stay out of this folder. You want to learn how to create a clone and make all your changes in the clone. When you push the changes ikiwiki will update. I moved a file in this folder by accident because I named my working file the same and I couldn't get into the setup page. I had apparently messed up my ikiwiki git repository. I did a pull into my clone, deleted the repository and webserver/ cgi folders and ran a new setup. Then I did a git clone and dragged all my old files into the new clone. Did the git dance and did git push. Then the angels sang. + ## using git from inside a git folder: + start with git clone, then learn to do the git dance like this. + git pull + make your changes to your clone + git commit -a -m "message here" + git push + When you can't get into the setup page or you get strange behavior after a setup update the Utilities > Console app is your friend. ## installing gitweb @@ -47,35 +74,61 @@ When you can't get into the setup page or you get strange behavior after a setup make GITWEB_PROJECTROOT="/opt/ikiwiki/" GITWEB_CSS="/gitweb/gitweb.css" GITWEB_LOGO="/gitweb/git-logo.png" GITWEB_FAVICON="/gitweb/git-favicon.png" bindir=/opt/local/bin cp gitweb.cgi /Library/WebServer/CGI-Executables/gitweb/ + sudo chmod 2755 gitweb.cgi + ## installing xapian: + download xapian and omega + I needed pcre: sudo ports install pcre ./configure + make + sudo make install + ## installing omega: + I had a build error do to libiconv undefined symbols. sudo port deactivate libiconv took care of it. After install I had trouble with ikiwiki so I did a sudo port install libiconv and ikiwiki came back. + ./configure + make + sudo make install + ## installing Search::Xapian from CPAN + for some reason this wouldn't install using CPAN console so I went to CPAN online and downloaded the source. + perl Makefile.PL + make + make test + sudo make install + it installed without issue so I'm baffled why it didn't install from command line. + + ## turning on search plugin: + I turned on the plugin from the setup page in ikiwiki but it gave an error when I went to search. Error "blah blah cgi-bin/omega/omega" does not exist or some such. I did a + find / -name "omega" -print + and found the omega program in + /usr/local/lib/xapian-omega/bin/omega. + Then I went into the setup file and replaced the bad path, updated and badda-boom badda-bing. + Then I fell asleep. -- cgit v1.2.3 From b7d4c1e473ccec6d6e21b1ed225f5e4de27a62f5 Mon Sep 17 00:00:00 2001 From: justint Date: Tue, 12 Oct 2010 14:46:35 +0000 Subject: setting Discussion PageSpec? --- doc/forum/Discussion_PageSpec__63__.mdwn | 1 + 1 file changed, 1 insertion(+) create mode 100644 doc/forum/Discussion_PageSpec__63__.mdwn (limited to 'doc') diff --git a/doc/forum/Discussion_PageSpec__63__.mdwn b/doc/forum/Discussion_PageSpec__63__.mdwn new file mode 100644 index 000000000..fb592be48 --- /dev/null +++ b/doc/forum/Discussion_PageSpec__63__.mdwn @@ -0,0 +1 @@ +I've looked around but haven't found it. Can you set a Discussion PageSpec so only certain pages allow discussion? -- cgit v1.2.3 From e6d130877bb374abe9721e497f0d4868b6c952d8 Mon Sep 17 00:00:00 2001 From: justint Date: Wed, 13 Oct 2010 03:03:24 +0000 Subject: --- .../Map_Plugin__44___would_like_to_add___63__updated_to_all_links.mdwn | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 doc/forum/Map_Plugin__44___would_like_to_add___63__updated_to_all_links.mdwn (limited to 'doc') diff --git a/doc/forum/Map_Plugin__44___would_like_to_add___63__updated_to_all_links.mdwn b/doc/forum/Map_Plugin__44___would_like_to_add___63__updated_to_all_links.mdwn new file mode 100644 index 000000000..fcffe690f --- /dev/null +++ b/doc/forum/Map_Plugin__44___would_like_to_add___63__updated_to_all_links.mdwn @@ -0,0 +1,3 @@ +Map Plugin, would like to add ?updated to all links created. + +When I edit a page and then click that page in a map in a sidebar Safari always shows me a cached page. -- cgit v1.2.3 From 48c53906bc899364c74a2877ea6e5c5189299e0e Mon Sep 17 00:00:00 2001 From: justint Date: Wed, 13 Oct 2010 05:30:50 +0000 Subject: Added a comment: skip it --- .../comment_1_3fe4c5967e704355f9b594aed46baf67._comment | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 doc/forum/Map_Plugin__44___would_like_to_add___63__updated_to_all_links/comment_1_3fe4c5967e704355f9b594aed46baf67._comment (limited to 'doc') diff --git a/doc/forum/Map_Plugin__44___would_like_to_add___63__updated_to_all_links/comment_1_3fe4c5967e704355f9b594aed46baf67._comment b/doc/forum/Map_Plugin__44___would_like_to_add___63__updated_to_all_links/comment_1_3fe4c5967e704355f9b594aed46baf67._comment new file mode 100644 index 000000000..ce1a78584 --- /dev/null +++ b/doc/forum/Map_Plugin__44___would_like_to_add___63__updated_to_all_links/comment_1_3fe4c5967e704355f9b594aed46baf67._comment @@ -0,0 +1,13 @@ +[[!comment format=mdwn + username="justint" + ip="24.182.207.250" + subject="skip it" + date="2010-10-13T05:30:50Z" + content=""" +skip it, I added + + + + +to my page.tmpl and the problem went away. +"""]] -- cgit v1.2.3 From 71fdabcb494d3f6e62bf755246c480ac7fc17156 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawmbuZI4n1RsTe3Yeaqb5F-yhtR7a8BWEIE" Date: Wed, 13 Oct 2010 09:10:45 +0000 Subject: --- doc/sandbox.mdwn | 1 + 1 file changed, 1 insertion(+) (limited to 'doc') diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn index a3a20fd78..c665e67f0 100644 --- a/doc/sandbox.mdwn +++ b/doc/sandbox.mdwn @@ -53,6 +53,7 @@ Bulleted list * [[different_name_for_a_WikiLink|ikiwiki/WikiLink]] * * [GNU](http://www.gnu.org/) +* Joey's blog ---- -- cgit v1.2.3 From 8555d10f6369d78c44cf4677010b7e1260d9f5c0 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 13 Oct 2010 12:57:16 -0400 Subject: img: If a class is specified, don't also put the img in the img class. --- IkiWiki/Plugin/img.pm | 5 +---- debian/changelog | 2 ++ .../class_parameter_of_img_directive_behave_not_as_documented.mdwn | 2 ++ 3 files changed, 5 insertions(+), 4 deletions(-) (limited to 'doc') diff --git a/IkiWiki/Plugin/img.pm b/IkiWiki/Plugin/img.pm index 2375ead89..bd527c8c8 100644 --- a/IkiWiki/Plugin/img.pm +++ b/IkiWiki/Plugin/img.pm @@ -156,10 +156,7 @@ sub preprocess (@) { $imgurl="$config{url}/$imglink"; } - if (exists $params{class}) { - $params{class}.=" img"; - } - else { + if (! exists $params{class}) { $params{class}="img"; } diff --git a/debian/changelog b/debian/changelog index 12cc90b11..5433ba05f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,6 +14,8 @@ ikiwiki (3.20100927) UNRELEASED; urgency=low * websetup: Fix defaults of checkboxes in advanced mode. * monotone: Fix recentchanges page when the srcdir is not at the top of the monotone workspace. Thanks, tommyd. + * img: If a class is specified, don't also put the img in the img + class. -- Joey Hess Wed, 29 Sep 2010 11:58:23 -0400 diff --git a/doc/bugs/class_parameter_of_img_directive_behave_not_as_documented.mdwn b/doc/bugs/class_parameter_of_img_directive_behave_not_as_documented.mdwn index 10ba15066..e7797765f 100644 --- a/doc/bugs/class_parameter_of_img_directive_behave_not_as_documented.mdwn +++ b/doc/bugs/class_parameter_of_img_directive_behave_not_as_documented.mdwn @@ -27,3 +27,5 @@ I would prefer if the `img` class were only added if no class attribute is passed. If you keep the current behaviour, please document it. + +> [[done]] --[[Joey]] -- cgit v1.2.3 From dcd89979379b7cbaab7ec4af0411796bdcf16f44 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 13 Oct 2010 12:59:59 -0400 Subject: answer --- doc/forum/Discussion_PageSpec__63__.mdwn | 2 ++ 1 file changed, 2 insertions(+) (limited to 'doc') diff --git a/doc/forum/Discussion_PageSpec__63__.mdwn b/doc/forum/Discussion_PageSpec__63__.mdwn index fb592be48..2860d0d17 100644 --- a/doc/forum/Discussion_PageSpec__63__.mdwn +++ b/doc/forum/Discussion_PageSpec__63__.mdwn @@ -1 +1,3 @@ I've looked around but haven't found it. Can you set a Discussion PageSpec so only certain pages allow discussion? + +> Not currently, sorry. --[[Joey]] -- cgit v1.2.3 From a14c2a9cd0f04062e32c218b799076adaf8b934e Mon Sep 17 00:00:00 2001 From: "http://hendry.iki.fi/" Date: Thu, 14 Oct 2010 12:25:48 +0000 Subject: perms --- doc/bugs/More_permission_checking.mdwn | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 doc/bugs/More_permission_checking.mdwn (limited to 'doc') diff --git a/doc/bugs/More_permission_checking.mdwn b/doc/bugs/More_permission_checking.mdwn new file mode 100644 index 000000000..e56cda98b --- /dev/null +++ b/doc/bugs/More_permission_checking.mdwn @@ -0,0 +1,9 @@ +I'm often confused about permissions and I wish ikiwiki could stamp it's foot down and ensure all the permissions are correctly (canonically?) setup. + +I keep ending up having to `sudo chown -R :www-data` and `sudo chmod -R g+w` on srcdir, destdir. I'm never quite sure what is the best practice for the srcdirs' `/srv/git/` is. Currently everything looks like `hendry:www-data` with ug+rw. + +I think I've triggered these problems by (not thinking and) running `ikiwiki --rebuild --setup /home/hendry/.ikiwiki/mywiki.setup` as my user. + +I don't know if there can be some lookup with `/etc/ikiwiki/wikilist`. Though shouldn't everything be under the `www-data` group in reality? + +Also when I use `sudo ikiwiki -setup /etc/ikiwiki/auto.setup`, I think I create a ton of problems for myself since everything is created as the root user, right? And `/etc/ikiwiki/wikilist` doesn't seem to have the latest created wiki added. I have to reluctantly manually do this. -- cgit v1.2.3 From 46118a983f1253defcda3042821a10ce5046103c Mon Sep 17 00:00:00 2001 From: justint Date: Thu, 14 Oct 2010 20:24:43 +0000 Subject: --- doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn | 35 ++++++++++---------------- 1 file changed, 13 insertions(+), 22 deletions(-) (limited to 'doc') diff --git a/doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn b/doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn index 4eb084f38..38df19708 100644 --- a/doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn +++ b/doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn @@ -5,15 +5,17 @@ The best part of installing ikiwiki was learning how to use git. I never used so ## installing git: +cd /opt/ikiwiki/install + curl http://kernel.org/pub/software/scm/git/git-(latest version).tar.gz -O tar xzvf git-(latest version).tar.gz cd git-(latest version) -./configure --prefix=/usr/local +./configure --prefix=/usr/local -NO_MSGFMT=yes make prefix=/usr/local all +make prefix=/usr/local all sudo make install @@ -25,31 +27,20 @@ git config --global user.email "email here" git config --global color.ui "auto" -curl http://www.kernel.org/pub/software/scm/git/git-manpages-1.7.3.1.tar.gz | sudo tar -xzC /opt/local/share/man/ +curl http://www.kernel.org/pub/software/scm/git/git-manpages-1.7.3.1.tar.gz | sudo tar -xzC /usr/local/share/man/ ## installing ikiwiki: I had terrible trouble installing ikiwiki. It turned out I had accidentally installed Perl through ports. Uninstalling that made everything install nicely. +I got an error on msgfmt. Turns out this is a program in gettext. I installed that and it fixed the error. -I like to install test software in /opt. No particular reason. You could install to defaults. - - -perl Makefile.PL PREFIX=/Library/Perl/5.10.0 LIB=/Library/Perl/5.10.0 +git clone git://git.ikiwiki.info/ perl Makefile.PL LIB=/Library/Perl/5.10.0 make -make install - -sudo install -d /opt/ikiwiki - -sudo install -m 0644 wikilist /opt/ikiwiki - -sudo install -m 0644 auto.setup /opt/ikiwiki - -sudo install -m 0644 auto-blog.setup /opt/ikiwiki - +sudo make install when you make ikiwiki it gives you a .git folder with the ikiwiki files. Stay out of this folder. You want to learn how to create a clone and make all your changes in the clone. When you push the changes ikiwiki will update. I moved a file in this folder by accident because I named my working file the same and I couldn't get into the setup page. I had apparently messed up my ikiwiki git repository. I did a pull into my clone, deleted the repository and webserver/ cgi folders and ran a new setup. Then I did a git clone and dragged all my old files into the new clone. Did the git dance and did git push. Then the angels sang. @@ -71,12 +62,13 @@ When you can't get into the setup page or you get strange behavior after a setup ## installing gitweb -make GITWEB_PROJECTROOT="/opt/ikiwiki/" GITWEB_CSS="/gitweb/gitweb.css" GITWEB_LOGO="/gitweb/git-logo.png" GITWEB_FAVICON="/gitweb/git-favicon.png" bindir=/opt/local/bin +cd gitweb -cp gitweb.cgi /Library/WebServer/CGI-Executables/gitweb/ +make GITWEB_PROJECTROOT="/opt/ikiwiki/" GITWEB_CSS="/gitweb/gitweb.css" GITWEB_LOGO="/gitweb/git-logo.png" GITWEB_FAVICON="/gitweb/git-favicon.png" -sudo chmod 2755 gitweb.cgi +cp gitweb.cgi /Library/WebServer/CGI-Executables/ +sudo chmod 2755 /Library/WebServer/CGI-Executables/gitweb.cgi ## installing xapian: @@ -117,7 +109,6 @@ sudo make install it installed without issue so I'm baffled why it didn't install from command line. - ## turning on search plugin: I turned on the plugin from the setup page in ikiwiki but it gave an error when I went to search. Error "blah blah cgi-bin/omega/omega" does not exist or some such. I did a @@ -131,4 +122,4 @@ and found the omega program in Then I went into the setup file and replaced the bad path, updated and badda-boom badda-bing. -Then I fell asleep. + -- cgit v1.2.3 From 52375d9c080fd5db8106f75d5ca00f3c806644de Mon Sep 17 00:00:00 2001 From: justint Date: Thu, 14 Oct 2010 20:42:23 +0000 Subject: --- doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn | 44 ++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) (limited to 'doc') diff --git a/doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn b/doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn index 38df19708..d685af0d0 100644 --- a/doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn +++ b/doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn @@ -109,6 +109,50 @@ sudo make install it installed without issue so I'm baffled why it didn't install from command line. +## setup file + +#!/usr/bin/perl +# Ikiwiki setup automator. +# +# This setup file causes ikiwiki to create a wiki, check it into revision +# control, generate a setup file for the new wiki, and set everything up. +# +# Just run: ikiwiki -setup /etc/ikiwiki/auto.setup +# +# By default, it asks a few questions, and confines itself to the user's home +# directory. You can edit it to change what it asks questions about, or to +# modify the values to use site-specific settings. + +require IkiWiki::Setup::Automator; + +our $wikiname="your wiki"; +our $wikiname_short="yourwiki"; +our $rcs="git"; +our $admin="your name"; +use Net::Domain q{hostfqdn}; +our $domain="your.domain"; + +IkiWiki::Setup::Automator->import( +wikiname => $wikiname, +adminuser => [$admin], +rcs => $rcs, +srcdir => "/opt/ikiwiki/$wikiname_short", +destdir => "/Library/WebServer/Documents/$wikiname_short", +repository => "/opt/ikiwiki/$wikiname_short.".($rcs eq "monotone" ? "mtn" : $rcs), +dumpsetup => "/opt/ikiwiki/$wikiname_short.setup", +url => "http://$domain/$wikiname_short", +cgiurl => "http://$domain/cgi-bin/$wikiname_short/ikiwiki.cgi", +cgi_wrapper => "/Library/WebServer/CGI-Executables/$wikiname_short/ikiwiki.cgi", +adminemail => "your\@email.com", +add_plugins => [qw{goodstuff websetup}], +disable_plugins => [qw{}], +libdir => "/opt/ikiwiki/.ikiwiki", +rss => 1, +atom => 1, +syslog => 1, +) + + ## turning on search plugin: I turned on the plugin from the setup page in ikiwiki but it gave an error when I went to search. Error "blah blah cgi-bin/omega/omega" does not exist or some such. I did a -- cgit v1.2.3 From 29b5c68bbbb35749b5b515266deffe9358ce3b74 Mon Sep 17 00:00:00 2001 From: justint Date: Thu, 14 Oct 2010 21:19:19 +0000 Subject: --- doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn | 96 ++++++++++++++------------ 1 file changed, 51 insertions(+), 45 deletions(-) (limited to 'doc') diff --git a/doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn b/doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn index d685af0d0..05a9bf6d7 100644 --- a/doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn +++ b/doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn @@ -64,11 +64,19 @@ When you can't get into the setup page or you get strange behavior after a setup cd gitweb -make GITWEB_PROJECTROOT="/opt/ikiwiki/" GITWEB_CSS="/gitweb/gitweb.css" GITWEB_LOGO="/gitweb/git-logo.png" GITWEB_FAVICON="/gitweb/git-favicon.png" +make GITWEB_PROJECTROOT="/opt/ikiwiki/" GITWEB_CSS="/gitweb.css" GITWEB_LOGO="/git-logo.png" GITWEB_FAVICON="/git-favicon.png" cp gitweb.cgi /Library/WebServer/CGI-Executables/ +cp /usr/local/share/gitweb/static/git-favicon.png /Library/WebServer/ +cp /usr/local/share/gitweb/static/git-logo.png /Library/WebServer/ +cp /usr/local/share/gitweb/static/gitweb.css /Library/WebServer/ +cp /usr/local/share/gitweb/static/gitweb.js /Library/WebServer/ sudo chmod 2755 /Library/WebServer/CGI-Executables/gitweb.cgi +sudo chmod 2755 /Library/WebServer/git-favicon.png +sudo chmod 2755 /Library/WebServer/git-logo.png +sudo chmod 2755 /Library/WebServer/gitweb.css +sudo chmod 2755 /Library/WebServer/gitweb.js ## installing xapian: @@ -108,50 +116,48 @@ sudo make install it installed without issue so I'm baffled why it didn't install from command line. - -## setup file - -#!/usr/bin/perl -# Ikiwiki setup automator. -# -# This setup file causes ikiwiki to create a wiki, check it into revision -# control, generate a setup file for the new wiki, and set everything up. -# -# Just run: ikiwiki -setup /etc/ikiwiki/auto.setup -# -# By default, it asks a few questions, and confines itself to the user's home -# directory. You can edit it to change what it asks questions about, or to -# modify the values to use site-specific settings. - -require IkiWiki::Setup::Automator; - -our $wikiname="your wiki"; -our $wikiname_short="yourwiki"; -our $rcs="git"; -our $admin="your name"; -use Net::Domain q{hostfqdn}; -our $domain="your.domain"; - -IkiWiki::Setup::Automator->import( -wikiname => $wikiname, -adminuser => [$admin], -rcs => $rcs, -srcdir => "/opt/ikiwiki/$wikiname_short", -destdir => "/Library/WebServer/Documents/$wikiname_short", -repository => "/opt/ikiwiki/$wikiname_short.".($rcs eq "monotone" ? "mtn" : $rcs), -dumpsetup => "/opt/ikiwiki/$wikiname_short.setup", -url => "http://$domain/$wikiname_short", -cgiurl => "http://$domain/cgi-bin/$wikiname_short/ikiwiki.cgi", -cgi_wrapper => "/Library/WebServer/CGI-Executables/$wikiname_short/ikiwiki.cgi", -adminemail => "your\@email.com", -add_plugins => [qw{goodstuff websetup}], -disable_plugins => [qw{}], -libdir => "/opt/ikiwiki/.ikiwiki", -rss => 1, -atom => 1, -syslog => 1, -) - + + ## setup file + _!/usr/bin/perl + _ Ikiwiki setup automator. + + _ This setup file causes ikiwiki to create a wiki, check it into revision + _ control, generate a setup file for the new wiki, and set everything up. + + _ Just run: ikiwiki -setup /etc/ikiwiki/auto.setup + + _By default, it asks a few questions, and confines itself to the user's home + _directory. You can edit it to change what it asks questions about, or to + _modify the values to use site-specific settings. + require IkiWiki::Setup::Automator; + + our $wikiname="your wiki"; + our $wikiname_short="yourwiki"; + our $rcs="git"; + our $admin="your name"; + use Net::Domain q{hostfqdn}; + our $domain="your.domain"; + + IkiWiki::Setup::Automator->import( + wikiname => $wikiname, + adminuser => [$admin], + rcs => $rcs, + srcdir => "/opt/ikiwiki/$wikiname_short", + destdir => "/Library/WebServer/Documents/$wikiname_short", + repository => "/opt/ikiwiki/$wikiname_short.".($rcs eq "monotone" ? "mtn" : $rcs), + dumpsetup => "/opt/ikiwiki/$wikiname_short.setup", + url => "http://$domain/$wikiname_short", + cgiurl => "http://$domain/cgi-bin/$wikiname_short/ikiwiki.cgi", + cgi_wrapper => "/Library/WebServer/CGI-Executables/$wikiname_short/ikiwiki.cgi", + adminemail => "your\@email.com", + add_plugins => [qw{goodstuff websetup}], + disable_plugins => [qw{}], + libdir => "/opt/ikiwiki/.ikiwiki", + rss => 1, + atom => 1, + syslog => 1, + ) + ## turning on search plugin: -- cgit v1.2.3 From 222e1fdc1f62433d290c39e8bb3235167192b062 Mon Sep 17 00:00:00 2001 From: justint Date: Thu, 14 Oct 2010 21:23:08 +0000 Subject: --- doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) (limited to 'doc') diff --git a/doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn b/doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn index 05a9bf6d7..aa89c4f55 100644 --- a/doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn +++ b/doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn @@ -67,16 +67,26 @@ cd gitweb make GITWEB_PROJECTROOT="/opt/ikiwiki/" GITWEB_CSS="/gitweb.css" GITWEB_LOGO="/git-logo.png" GITWEB_FAVICON="/git-favicon.png" cp gitweb.cgi /Library/WebServer/CGI-Executables/ -cp /usr/local/share/gitweb/static/git-favicon.png /Library/WebServer/ -cp /usr/local/share/gitweb/static/git-logo.png /Library/WebServer/ -cp /usr/local/share/gitweb/static/gitweb.css /Library/WebServer/ -cp /usr/local/share/gitweb/static/gitweb.js /Library/WebServer/ + +cp /usr/local/share/gitweb/static/git-favicon.png /Library/WebServer/Documents/ + +cp /usr/local/share/gitweb/static/git-logo.png /Library/WebServer/Documents/ + +cp /usr/local/share/gitweb/static/gitweb.css /Library/WebServer/Documents/ + +cp /usr/local/share/gitweb/static/gitweb.js /Library/WebServer/Documents/ + sudo chmod 2755 /Library/WebServer/CGI-Executables/gitweb.cgi -sudo chmod 2755 /Library/WebServer/git-favicon.png -sudo chmod 2755 /Library/WebServer/git-logo.png -sudo chmod 2755 /Library/WebServer/gitweb.css -sudo chmod 2755 /Library/WebServer/gitweb.js + +sudo chmod 2755 /Library/WebServer/Documents/git-favicon.png + +sudo chmod 2755 /Library/WebServer/Documents/git-logo.png + +sudo chmod 2755 /Library/WebServer/Documents/gitweb.css + +sudo chmod 2755 /Library/WebServer/Documents/gitweb.js + ## installing xapian: -- cgit v1.2.3 From 1c4eeddb784b4e04abb5364d140684359a56aca3 Mon Sep 17 00:00:00 2001 From: justint Date: Thu, 14 Oct 2010 21:45:48 +0000 Subject: --- doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'doc') diff --git a/doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn b/doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn index aa89c4f55..50bb2f520 100644 --- a/doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn +++ b/doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn @@ -171,15 +171,10 @@ it installed without issue so I'm baffled why it didn't install from command lin ## turning on search plugin: -I turned on the plugin from the setup page in ikiwiki but it gave an error when I went to search. Error "blah blah cgi-bin/omega/omega" does not exist or some such. I did a +I turned on the plugin from the setup page in ikiwiki but it gave an error when I went to search. Error "Error: /usr/lib/cgi-bin/omega/omega failed: No such file or directory". +I did a "find / -name "omega" -print" and found the omega program in "/usr/local/lib/xapian-omega/bin/omega". -find / -name "omega" -print - -and found the omega program in - -/usr/local/lib/xapian-omega/bin/omega. - -Then I went into the setup file and replaced the bad path, updated and badda-boom badda-bing. +Then I went into the 2wiki.setup file and replaced the bad path, updated and badda-boom badda-bing. -- cgit v1.2.3 From f57f56fac11f2cbd619b7e2d14944538e9fb34b6 Mon Sep 17 00:00:00 2001 From: "https://launchpad.net/~anarcat" Date: Fri, 15 Oct 2010 05:17:32 +0000 Subject: add my own way :) --- doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'doc') diff --git a/doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn b/doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn index d67a9131b..cbea798f1 100644 --- a/doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn +++ b/doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn @@ -6,6 +6,10 @@ ---- +I wrote a script that will download all the latest revisions of a mediawiki site. In short, it does a good part of the stuff required for the migration: it downloads the goods (ie. the latest version of every page, automatically) and commits the resulting structure. There's still a good few pieces missing for an actual complete conversion to ikiwiki, but it's a pretty good start. It only talks with mediawiki through HTTP, so no special access is necessary. The downside of that is that it will not attempt to download every revision for performance reasons. The code is here: http://anarcat.ath.cx/software/mediawikigitdump.git/ See header of the file for more details and todos. -- [[users/Anarcat]] + +---- + The u32 page is excellent, but I wonder if documenting the procedure here would be worthwhile. Who knows, the remote site might disappear. But also there are some variations on the approach that might be useful: -- cgit v1.2.3 From c8d5b7d2f93464560b2db97b139713eda692320f Mon Sep 17 00:00:00 2001 From: "https://launchpad.net/~anarcat" Date: Fri, 15 Oct 2010 05:19:06 +0000 Subject: --- doc/users/anarcat.wiki | 1 + 1 file changed, 1 insertion(+) create mode 100644 doc/users/anarcat.wiki (limited to 'doc') diff --git a/doc/users/anarcat.wiki b/doc/users/anarcat.wiki new file mode 100644 index 000000000..7ef474ed6 --- /dev/null +++ b/doc/users/anarcat.wiki @@ -0,0 +1 @@ +Hello! I'm anarcat. See [[https://wiki.koumbit.net/TheAnarcat]] to know more about me. -- cgit v1.2.3 From deb4bb6111beb9004544bc32d4aeb79f6d5768f7 Mon Sep 17 00:00:00 2001 From: "https://launchpad.net/~anarcat" Date: Fri, 15 Oct 2010 05:24:40 +0000 Subject: date --- doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn b/doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn index cbea798f1..4a7163eae 100644 --- a/doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn +++ b/doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn @@ -6,7 +6,7 @@ ---- -I wrote a script that will download all the latest revisions of a mediawiki site. In short, it does a good part of the stuff required for the migration: it downloads the goods (ie. the latest version of every page, automatically) and commits the resulting structure. There's still a good few pieces missing for an actual complete conversion to ikiwiki, but it's a pretty good start. It only talks with mediawiki through HTTP, so no special access is necessary. The downside of that is that it will not attempt to download every revision for performance reasons. The code is here: http://anarcat.ath.cx/software/mediawikigitdump.git/ See header of the file for more details and todos. -- [[users/Anarcat]] +I wrote a script that will download all the latest revisions of a mediawiki site. In short, it does a good part of the stuff required for the migration: it downloads the goods (ie. the latest version of every page, automatically) and commits the resulting structure. There's still a good few pieces missing for an actual complete conversion to ikiwiki, but it's a pretty good start. It only talks with mediawiki through HTTP, so no special access is necessary. The downside of that is that it will not attempt to download every revision for performance reasons. The code is here: http://anarcat.ath.cx/software/mediawikigitdump.git/ See header of the file for more details and todos. -- [[users/Anarcat]] 2010-10-15 ---- -- cgit v1.2.3 From dd35d0d28fa2db775b4fd7fef0c587d5abd96e3e Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawlcaGfdn9Kye1Gc8aGb67PDVQW4mKbQD7E" Date: Fri, 15 Oct 2010 14:39:18 +0000 Subject: package systems exist --- doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard/discussion.mdwn | 1 + 1 file changed, 1 insertion(+) create mode 100644 doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard/discussion.mdwn (limited to 'doc') diff --git a/doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard/discussion.mdwn b/doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard/discussion.mdwn new file mode 100644 index 000000000..ae3969879 --- /dev/null +++ b/doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard/discussion.mdwn @@ -0,0 +1 @@ +If you want do a bunch of manual labor, this is good, but most people probably want to get ikiwiki via a package system. My Mac laptop's ikiwiki is installed from pkgsrc. --[[schmonz]] -- cgit v1.2.3 From 332cb13310dfdc40b4620be7942657c30f63b3c8 Mon Sep 17 00:00:00 2001 From: josepht Date: Mon, 18 Oct 2010 15:05:02 +0000 Subject: Fixes --- doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'doc') diff --git a/doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn b/doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn index 50bb2f520..f755813e3 100644 --- a/doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn +++ b/doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn @@ -34,8 +34,12 @@ curl http://www.kernel.org/pub/software/scm/git/git-manpages-1.7.3.1.tar.gz | su I had terrible trouble installing ikiwiki. It turned out I had accidentally installed Perl through ports. Uninstalling that made everything install nicely. I got an error on msgfmt. Turns out this is a program in gettext. I installed that and it fixed the error. +cd .. + git clone git://git.ikiwiki.info/ +cd git.ikiwiki.info/ + perl Makefile.PL LIB=/Library/Perl/5.10.0 make -- cgit v1.2.3 From d2b7fcda9a3b302cfabf528e37dd3366030ebb6b Mon Sep 17 00:00:00 2001 From: josepht Date: Mon, 18 Oct 2010 15:38:16 +0000 Subject: --- doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn b/doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn index f755813e3..8b649156d 100644 --- a/doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn +++ b/doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn @@ -66,7 +66,7 @@ When you can't get into the setup page or you get strange behavior after a setup ## installing gitweb -cd gitweb +cd ../git-1.7.3.1/gitweb make GITWEB_PROJECTROOT="/opt/ikiwiki/" GITWEB_CSS="/gitweb.css" GITWEB_LOGO="/git-logo.png" GITWEB_FAVICON="/git-favicon.png" -- cgit v1.2.3 From 0fe25eb41464095f1511b054f45b885572a13071 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawnzWY2QyG3IWm_oMTbSsdYFbNE3kiwh4ns" Date: Tue, 19 Oct 2010 06:10:17 +0000 Subject: --- doc/examples/blog/posts/hello__33__.mdwn | 1 + 1 file changed, 1 insertion(+) create mode 100644 doc/examples/blog/posts/hello__33__.mdwn (limited to 'doc') diff --git a/doc/examples/blog/posts/hello__33__.mdwn b/doc/examples/blog/posts/hello__33__.mdwn new file mode 100644 index 000000000..2a855be13 --- /dev/null +++ b/doc/examples/blog/posts/hello__33__.mdwn @@ -0,0 +1 @@ +hi! there............ -- cgit v1.2.3 From a40abf3e1acba1eaab8dd0f2e416bfde2d9b6667 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 19 Oct 2010 02:32:04 -0400 Subject: cleanup --- doc/examples/blog/posts/hello__33__.mdwn | 1 - 1 file changed, 1 deletion(-) delete mode 100644 doc/examples/blog/posts/hello__33__.mdwn (limited to 'doc') diff --git a/doc/examples/blog/posts/hello__33__.mdwn b/doc/examples/blog/posts/hello__33__.mdwn deleted file mode 100644 index 2a855be13..000000000 --- a/doc/examples/blog/posts/hello__33__.mdwn +++ /dev/null @@ -1 +0,0 @@ -hi! there............ -- cgit v1.2.3 From 2bb049df4fe55191783e6625dbac719e52e329fd Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 19 Oct 2010 02:45:29 -0400 Subject: add news item for ikiwiki 3.20101019 --- doc/news/version_3.20100804.mdwn | 14 -------------- doc/news/version_3.20101019.mdwn | 20 ++++++++++++++++++++ 2 files changed, 20 insertions(+), 14 deletions(-) delete mode 100644 doc/news/version_3.20100804.mdwn create mode 100644 doc/news/version_3.20101019.mdwn (limited to 'doc') diff --git a/doc/news/version_3.20100804.mdwn b/doc/news/version_3.20100804.mdwn deleted file mode 100644 index be85cb949..000000000 --- a/doc/news/version_3.20100804.mdwn +++ /dev/null @@ -1,14 +0,0 @@ -ikiwiki 3.20100804 released with [[!toggle text="these changes"]] -[[!toggleable text=""" - * template: Fix dependency tracking. Broken in version 3.20100427. - * po: The po\_slave\_languages setting is now a list, so the order of - translated languages can be controlled. (intrigeri) - * git: Fix gitweb historyurl examples so "diff to current" links work. - (Thanks jrayhawk) - * meta: Allow syntax closer to html meta to be used. - * Add new disable hook, allowing plugins to perform cleanup after they - have been disabled. - * Use Digest::SHA built into perl rather than external Digest::SHA1 - to simplify dependencies. Closes: #[591040](http://bugs.debian.org/591040) - * Fixes a bug that prevented matching deleted pages when using the page() - PageSpec."""]] \ No newline at end of file diff --git a/doc/news/version_3.20101019.mdwn b/doc/news/version_3.20101019.mdwn new file mode 100644 index 000000000..86c302e25 --- /dev/null +++ b/doc/news/version_3.20101019.mdwn @@ -0,0 +1,20 @@ +ikiwiki 3.20101019 released with [[!toggle text="these changes"]] +[[!toggleable text=""" + * Fix test suite failure on other side of date line. + * htmltidy: Allow configuring tidy parameters in setup file. + (W. Trevor King) + * Updated French program translation. Closes: #[598918](http://bugs.debian.org/598918) + * git: Added new rcs\_revert and rcs\_preprevert hooks. + * recentchanges: Add revert buttons to RecentChanges page, and + implement web-based reversion interface. + * Thanks to Peter Gammie for his assistance with the web-based reversion + feature. + * actiontabs: More consistent styling of Hn tags. + * websetup: Fix saving of advanced mode changes. + * websetup: Fix defaults of checkboxes in advanced mode. + * monotone: Fix recentchanges page when the srcdir is not at the top + of the monotone workspace. Thanks, tommyd. + * img: If a class is specified, don't also put the img in the img + class. + * auto-blog.setup: Don't enable opendiscussion by default; require users be + logged in to post comments."""]] \ No newline at end of file -- cgit v1.2.3 From a0b55ac3cd4f840f62d0441e3b1fe9b95ec15007 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawlcaGfdn9Kye1Gc8aGb67PDVQW4mKbQD7E" Date: Tue, 19 Oct 2010 15:13:29 +0000 Subject: setting cookies before aggregating --- doc/plugins/aggregate/discussion.mdwn | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'doc') diff --git a/doc/plugins/aggregate/discussion.mdwn b/doc/plugins/aggregate/discussion.mdwn index 1a9844577..77005a6a1 100644 --- a/doc/plugins/aggregate/discussion.mdwn +++ b/doc/plugins/aggregate/discussion.mdwn @@ -89,3 +89,30 @@ New bug: new posts aren't getting displayed (or cached for aggregation). After f >>> mind having a copy to investigate. --[[Joey]] >>>> Didn't think of that, will keep a copy if there's a next time. -- [[schmonz]] + +----- + +In a corporate environment where feeds are generally behind +authentication, I need to prime the aggregator's `LWP::UserAgent` +with some cookies. What I've done is write a custom plugin to populate +`$config{cookies}` with an `HTTP::Cookies` object, plus this diff: + + --- /var/tmp/pkg/lib/perl5/vendor_perl/5.10.0/IkiWiki/Plugin/aggregate.pm 2010-06-24 13:03:33.000000000 -0400 + +++ aggregate.pm 2010-06-24 13:04:09.000000000 -0400 + @@ -488,7 +488,11 @@ + } + $feed->{feedurl}=pop @urls; + } + - my $res=URI::Fetch->fetch($feed->{feedurl}); + + my $res=URI::Fetch->fetch($feed->{feedurl}, + + UserAgent => LWP::UserAgent->new( + + cookie_jar => $config{cookies}, + + ), + + ); + if (! $res) { + $feed->{message}=URI::Fetch->errstr; + $feed->{error}=1; + +It works, but I have to remember to apply the diff whenever I update +ikiwiki. Can you provide a more elegant means of allowing cookies and/or +the user agent to be programmatically manipulated? --[[schmonz]] -- cgit v1.2.3 From 372ed18f2806367964ac500ac4f463ad466ca06f Mon Sep 17 00:00:00 2001 From: JoeRayhawk Date: Wed, 20 Oct 2010 06:57:06 +0000 Subject: forum: PageSpec results from independent checkout: call for help --- doc/forum/PageSpec_results_from_independent_checkout.mdwn | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 doc/forum/PageSpec_results_from_independent_checkout.mdwn (limited to 'doc') diff --git a/doc/forum/PageSpec_results_from_independent_checkout.mdwn b/doc/forum/PageSpec_results_from_independent_checkout.mdwn new file mode 100644 index 000000000..6b2fd6df0 --- /dev/null +++ b/doc/forum/PageSpec_results_from_independent_checkout.mdwn @@ -0,0 +1,5 @@ +I'd like to be able to do PageSpec matches independent of the Ikiwiki checkout, but at best I'm currently restricted to copying over and using whatever is in the indexdb with this approach: + + perl -MIkiWiki -le '$config{wikistatedir}=".ikiwiki"; IkiWiki::loadindex(); print foreach pagespec_match_list("", shift)' "bugs/*" + +I get the impression there's a way to build up enough state to run pagespec matches without doing any rendering, but I don't know how. Any ideas? -- JoeRayhawk -- cgit v1.2.3 From 7e8064e9fa8b3f2c3c0bd0aa5458f00552398e06 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 20 Oct 2010 18:53:50 -0400 Subject: add a hint that creation_month takes a number, not a month name --- IkiWiki.pm | 6 +++--- doc/ikiwiki/pagespec.mdwn | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'doc') diff --git a/IkiWiki.pm b/IkiWiki.pm index 941ee13c4..1fa89586e 100644 --- a/IkiWiki.pm +++ b/IkiWiki.pm @@ -2610,7 +2610,7 @@ sub match_created_after ($$;@) { sub match_creation_day ($$;@) { my $d=shift; if ($d !~ /^\d+$/) { - return IkiWiki::FailReason->new('invalid day'); + return IkiWiki::ErrorReason->new("invalid day $d"); } if ((localtime($IkiWiki::pagectime{shift()}))[3] == shift) { return IkiWiki::SuccessReason->new('creation_day matched'); @@ -2623,7 +2623,7 @@ sub match_creation_day ($$;@) { sub match_creation_month ($$;@) { my $m=shift; if ($m !~ /^\d+$/) { - return IkiWiki::FailReason->new('invalid month'); + return IkiWiki::ErrorReason->new("invalid month $m"); } if ((localtime($IkiWiki::pagectime{shift()}))[4] + 1 == shift) { return IkiWiki::SuccessReason->new('creation_month matched'); @@ -2636,7 +2636,7 @@ sub match_creation_month ($$;@) { sub match_creation_year ($$;@) { my $y=shift; if ($y !~ /^\d+$/) { - return IkiWiki::FailReason->new('invalid year'); + return IkiWiki::ErrorReason->new("invalid year $y"); } if ((localtime($IkiWiki::pagectime{shift()}))[5] + 1900 == $y) { return IkiWiki::SuccessReason->new('creation_year matched'); diff --git a/doc/ikiwiki/pagespec.mdwn b/doc/ikiwiki/pagespec.mdwn index 6aec561ae..fe1af4c15 100644 --- a/doc/ikiwiki/pagespec.mdwn +++ b/doc/ikiwiki/pagespec.mdwn @@ -32,6 +32,7 @@ Some more elaborate limits can be added to what matches using these functions: tags matched by a glob) * "`backlink(page)`" - matches only pages that a given page links to * "`creation_month(month)`" - matches only files created on the given month + number * "`creation_day(mday)`" - or day of the month * "`creation_year(year)`" - or year * "`created_after(page)`" - matches only files created after the given page -- cgit v1.2.3 From a0eb16b68dc11d7e9e13f8f9aebb8cb9d312ef6e Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawmE7z4CSv-ctBarutQCd70R3CcaSPPxjVk" Date: Thu, 21 Oct 2010 05:27:08 +0000 Subject: --- ...r_subdirectories__63_____40__Blogging_and_Wiki_pages__41__.mdwn | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 doc/forum/Different_templates_for_subdirectories__63_____40__Blogging_and_Wiki_pages__41__.mdwn (limited to 'doc') diff --git a/doc/forum/Different_templates_for_subdirectories__63_____40__Blogging_and_Wiki_pages__41__.mdwn b/doc/forum/Different_templates_for_subdirectories__63_____40__Blogging_and_Wiki_pages__41__.mdwn new file mode 100644 index 000000000..8d6700651 --- /dev/null +++ b/doc/forum/Different_templates_for_subdirectories__63_____40__Blogging_and_Wiki_pages__41__.mdwn @@ -0,0 +1,7 @@ +I have been mucking about with ikiwiki for two whole days now. + +I like many things about it. Even though I've been spending most of my time wrestling with css I did manage to write a whole lot of blog posts and love what ikiwiki is doing for the "revise" part of my writing cycle. And I like the idea of integrating the wiki and the blog into one unifying architecture.... + +But... I would like very much to have different page templates for blogging and wiki-ing, some way of specifying that for stuff in the "/posts" directory I'd rather use blogpost.tmpl rather than page.tmpl. I just spent a few minutes looking at the perl for this (I assume Render.pm) and my mind dumped core... + +(generically, some way to specify output formatting on a subdirectory basis would be good) -- cgit v1.2.3 From 1fc550ac8c9a6ca8c666fde3bcbf5743a4b8d3fe Mon Sep 17 00:00:00 2001 From: "https://mukund.startssl.com/" Date: Thu, 21 Oct 2010 08:37:47 +0000 Subject: Fix link --- doc/ikiwikiusers.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn index 2f70c67b7..2836d96e5 100644 --- a/doc/ikiwikiusers.mdwn +++ b/doc/ikiwikiusers.mdwn @@ -154,7 +154,7 @@ Personal sites and blogs * [Ertug Karamatli](http://pages.karamatli.com) * [Jonatan Walck](http://jonatan.walck.i2p/) a weblog + wiki over [I2P](http://i2p2.de/). Also [mirrored](http://jonatan.walck.se/) to the Internet a few times per day. * [Daniel Wayne Armstrong](http://circuidipity.com/) -* [Mukund](https://www.mukund.org/) +* [Mukund](https://mukund.org/) * [Nicolas Schodet](http://ni.fr.eu.org/) * [weakish](http://weakish.github.com) * [Thomas Kane](http://planetkane.org/) -- cgit v1.2.3 From 6a3323e9b6d5813233025a28d88d36cb861ee58c Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawlY5yDefnXSHvWGbJ9kvhnAyQZiAAttENk" Date: Thu, 21 Oct 2010 15:00:50 +0000 Subject: Added a comment --- .../comment_1_15651796492a6f04a19f4a481947c97c._comment | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 doc/forum/Different_templates_for_subdirectories__63_____40__Blogging_and_Wiki_pages__41__/comment_1_15651796492a6f04a19f4a481947c97c._comment (limited to 'doc') diff --git a/doc/forum/Different_templates_for_subdirectories__63_____40__Blogging_and_Wiki_pages__41__/comment_1_15651796492a6f04a19f4a481947c97c._comment b/doc/forum/Different_templates_for_subdirectories__63_____40__Blogging_and_Wiki_pages__41__/comment_1_15651796492a6f04a19f4a481947c97c._comment new file mode 100644 index 000000000..e92f4107d --- /dev/null +++ b/doc/forum/Different_templates_for_subdirectories__63_____40__Blogging_and_Wiki_pages__41__/comment_1_15651796492a6f04a19f4a481947c97c._comment @@ -0,0 +1,16 @@ +[[!comment format=mdwn + username="https://www.google.com/accounts/o8/id?id=AItOawlY5yDefnXSHvWGbJ9kvhnAyQZiAAttENk" + nickname="Javier" + subject="comment 1" + date="2010-10-21T15:00:50Z" + content=""" +You can do what you want with the [[ikiwiki/directive/pagetemplate]] directive, but in a slightly cumbersome way, because you have to say what template you want in every page that differs from the default. + +See also: [[templates]] + +And, a perhaps more proper solution to your problem, although I don't fully understand the way of tackling it, in [[todo/multiple_template_directories]]. + +If you could create a proper page in this wiki, centralizing all the knowledge dispersed in those pages, it would be nice ;) + +--[[jerojasro]] +"""]] -- cgit v1.2.3 From 5a82fad494ddbf8f283454202eb3d2712b1b4b19 Mon Sep 17 00:00:00 2001 From: fd Date: Fri, 22 Oct 2010 14:18:41 +0000 Subject: --- doc/sandbox/hey.mdwn | 1 + 1 file changed, 1 insertion(+) create mode 100644 doc/sandbox/hey.mdwn (limited to 'doc') diff --git a/doc/sandbox/hey.mdwn b/doc/sandbox/hey.mdwn new file mode 100644 index 000000000..a955185ef --- /dev/null +++ b/doc/sandbox/hey.mdwn @@ -0,0 +1 @@ +* Hello -- cgit v1.2.3 From 91a3b74711df8a74e2d600ba3b0bca8f441d1958 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawmZMunnF2szppZKh59QntrdlZDr6BPipiM" Date: Sat, 23 Oct 2010 02:16:00 +0000 Subject: --- doc/plugins/theme.mdwn | 3 +++ 1 file changed, 3 insertions(+) (limited to 'doc') diff --git a/doc/plugins/theme.mdwn b/doc/plugins/theme.mdwn index 7149cc163..2622abc88 100644 --- a/doc/plugins/theme.mdwn +++ b/doc/plugins/theme.mdwn @@ -9,3 +9,6 @@ inside `/usr/share/ikiwiki/themes/`. A theme provides, via the underlay, an enhanced version of the regular [[style.css]]. This leaves [[local.css]] free for you to further customise. Themes can also provide header and background images. + +You can set the theme via the **theme** option in your config file (after +enabling the plugin). Refresh the wiki after changing it to see the changes. -- cgit v1.2.3 From d567c8b209e6643f603d04f8f62f2ca67e9154c6 Mon Sep 17 00:00:00 2001 From: "http://jmtd.livejournal.com/" Date: Sat, 23 Oct 2010 17:35:42 +0000 Subject: expand on using templates outside the wiki source directory --- doc/ikiwiki/directive/template.mdwn | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'doc') diff --git a/doc/ikiwiki/directive/template.mdwn b/doc/ikiwiki/directive/template.mdwn index 6c50fa32e..9e3ae54df 100644 --- a/doc/ikiwiki/directive/template.mdwn +++ b/doc/ikiwiki/directive/template.mdwn @@ -34,11 +34,15 @@ large chunks of marked up text to be embedded into a template: The template is a regular wiki page, located in the `templates/` subdirectory inside the source directory of the wiki. -(Alternatively, templates can be stored in a directory outside the wiki, +Alternatively, templates can be stored in a directory outside the wiki, as files with the extension ".tmpl". -By default, these are searched for in `/usr/share/ikiwiki/templates`; +By default, these are searched for in `/usr/share/ikiwiki/templates`, the `templatedir` setting can be used to make another directory be searched -first.) +first. When referring to templates outside the wiki source directory, the "id" +parameter is not interpreted as a pagespec, and you must include the full filename +of the template page, including the ".tmpl" extension. E.g.: + + \[[!template id=blogpost.tmpl]] The template uses the syntax used by the [[!cpan HTML::Template]] perl module, which allows for some fairly complex things to be done. Consult its -- cgit v1.2.3 From 30a647edf89d9645291ee7ba1f8df328f4d21821 Mon Sep 17 00:00:00 2001 From: "http://jmtd.livejournal.com/" Date: Sat, 23 Oct 2010 17:45:47 +0000 Subject: --- doc/sandbox/revert_me.mdwn | 1 + 1 file changed, 1 insertion(+) create mode 100644 doc/sandbox/revert_me.mdwn (limited to 'doc') diff --git a/doc/sandbox/revert_me.mdwn b/doc/sandbox/revert_me.mdwn new file mode 100644 index 000000000..2b1cd2f94 --- /dev/null +++ b/doc/sandbox/revert_me.mdwn @@ -0,0 +1 @@ +this looks good -- cgit v1.2.3 From 9d85b10be894c85529daac111040b1ff1ee3ecd9 Mon Sep 17 00:00:00 2001 From: "http://jmtd.livejournal.com/" Date: Sat, 23 Oct 2010 17:47:04 +0000 Subject: --- doc/sandbox/revert_me.mdwn | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'doc') diff --git a/doc/sandbox/revert_me.mdwn b/doc/sandbox/revert_me.mdwn index 2b1cd2f94..c3212ce71 100644 --- a/doc/sandbox/revert_me.mdwn +++ b/doc/sandbox/revert_me.mdwn @@ -1 +1,5 @@ this looks good + +alas, + + Error: you are not allowed to change sandbox/revert_me.mdwn -- cgit v1.2.3 From 1c8d7c450b6ec1e6bf9973525bf117035b907e98 Mon Sep 17 00:00:00 2001 From: "http://jmtd.livejournal.com/" Date: Sat, 23 Oct 2010 18:06:17 +0000 Subject: web reversion - hmm --- doc/bugs/web_reversion_on_ikiwiki.info.mdwn | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 doc/bugs/web_reversion_on_ikiwiki.info.mdwn (limited to 'doc') diff --git a/doc/bugs/web_reversion_on_ikiwiki.info.mdwn b/doc/bugs/web_reversion_on_ikiwiki.info.mdwn new file mode 100644 index 000000000..c8563b1b5 --- /dev/null +++ b/doc/bugs/web_reversion_on_ikiwiki.info.mdwn @@ -0,0 +1,5 @@ +I created [[sandbox/revert me]] and then tried the revert button on [[recentchanges]], but I was not allowed to revert it. The specific error was + + Error: you are not allowed to change sandbox/revert_me.mdwn + +I've just tried reading through the revert code, and I haven't figured out what permission I am lacking. Perhaps the error message could be a little clearer on that. The error might have been thrown by git_parse_changes in git.pm or check_canchange in IkiWiki.pm, via IkiWiki::Receive. -- Jon -- cgit v1.2.3 From 6ec52548c22d96f1d9eabdca48694ba167d47631 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 23 Oct 2010 15:23:37 -0400 Subject: test --- doc/sandbox/revert_me.mdwn | 2 ++ 1 file changed, 2 insertions(+) (limited to 'doc') diff --git a/doc/sandbox/revert_me.mdwn b/doc/sandbox/revert_me.mdwn index c3212ce71..ed717d26d 100644 --- a/doc/sandbox/revert_me.mdwn +++ b/doc/sandbox/revert_me.mdwn @@ -3,3 +3,5 @@ this looks good alas, Error: you are not allowed to change sandbox/revert_me.mdwn + +test -- cgit v1.2.3 From 2c0783831e08dc912d8c90879c00c3315bf85d96 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 23 Oct 2010 15:32:46 -0400 Subject: test --- doc/sandbox/revert_me.mdwn | 2 -- 1 file changed, 2 deletions(-) (limited to 'doc') diff --git a/doc/sandbox/revert_me.mdwn b/doc/sandbox/revert_me.mdwn index ed717d26d..c3212ce71 100644 --- a/doc/sandbox/revert_me.mdwn +++ b/doc/sandbox/revert_me.mdwn @@ -3,5 +3,3 @@ this looks good alas, Error: you are not allowed to change sandbox/revert_me.mdwn - -test -- cgit v1.2.3 From f3820ee8acbbb31a4794039a989d3e642f5c6d2a Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawm0mAKbBvoYTeRz4lDv83cTfXsAns5CmDQ" Date: Sat, 23 Oct 2010 20:17:57 +0000 Subject: test web revert (fixed bug) This reverts commit 9d85b10be894c85529daac111040b1ff1ee3ecd9 --- doc/sandbox/revert_me.mdwn | 4 ---- 1 file changed, 4 deletions(-) (limited to 'doc') diff --git a/doc/sandbox/revert_me.mdwn b/doc/sandbox/revert_me.mdwn index c3212ce71..2b1cd2f94 100644 --- a/doc/sandbox/revert_me.mdwn +++ b/doc/sandbox/revert_me.mdwn @@ -1,5 +1 @@ this looks good - -alas, - - Error: you are not allowed to change sandbox/revert_me.mdwn -- cgit v1.2.3 From 45fac6dabf394d2b9bfdfd4026b4823dc6cc6308 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 23 Oct 2010 16:29:12 -0400 Subject: test --- doc/sandbox/revert_me.mdwn | 2 ++ 1 file changed, 2 insertions(+) (limited to 'doc') diff --git a/doc/sandbox/revert_me.mdwn b/doc/sandbox/revert_me.mdwn index 2b1cd2f94..d5fb06504 100644 --- a/doc/sandbox/revert_me.mdwn +++ b/doc/sandbox/revert_me.mdwn @@ -1 +1,3 @@ this looks good + +ok -- cgit v1.2.3 From bb8fc299acf377846caa189cd17426e4abd2ce74 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawm0mAKbBvoYTeRz4lDv83cTfXsAns5CmDQ" Date: Sat, 23 Oct 2010 20:30:02 +0000 Subject: test 2 This reverts commit 45fac6dabf394d2b9bfdfd4026b4823dc6cc6308 --- doc/sandbox/revert_me.mdwn | 2 -- 1 file changed, 2 deletions(-) (limited to 'doc') diff --git a/doc/sandbox/revert_me.mdwn b/doc/sandbox/revert_me.mdwn index d5fb06504..2b1cd2f94 100644 --- a/doc/sandbox/revert_me.mdwn +++ b/doc/sandbox/revert_me.mdwn @@ -1,3 +1 @@ this looks good - -ok -- cgit v1.2.3 From 9d78e484da5c0f8734cbc26bb1a8f89617d6afe8 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 23 Oct 2010 16:33:27 -0400 Subject: fixed --- doc/bugs/web_reversion_on_ikiwiki.info.mdwn | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'doc') diff --git a/doc/bugs/web_reversion_on_ikiwiki.info.mdwn b/doc/bugs/web_reversion_on_ikiwiki.info.mdwn index c8563b1b5..19a073da2 100644 --- a/doc/bugs/web_reversion_on_ikiwiki.info.mdwn +++ b/doc/bugs/web_reversion_on_ikiwiki.info.mdwn @@ -1,5 +1,12 @@ -I created [[sandbox/revert me]] and then tried the revert button on [[recentchanges]], but I was not allowed to revert it. The specific error was +I created [[sandbox/revert me]] and then tried the revert button on +[[recentchanges]], but I was not allowed to revert it. The specific error +was Error: you are not allowed to change sandbox/revert_me.mdwn -I've just tried reading through the revert code, and I haven't figured out what permission I am lacking. Perhaps the error message could be a little clearer on that. The error might have been thrown by git_parse_changes in git.pm or check_canchange in IkiWiki.pm, via IkiWiki::Receive. -- Jon +I've just tried reading through the revert code, and I haven't figured out +what permission I am lacking. Perhaps the error message could be a little +clearer on that. The error might have been thrown by git_parse_changes in +git.pm or check_canchange in IkiWiki.pm, via IkiWiki::Receive. -- Jon + +[[fixed|done]] --[[Joey]] -- cgit v1.2.3 From 3993757cf8f5747dd19cf35e95e1078de1513acf Mon Sep 17 00:00:00 2001 From: "http://jmtd.livejournal.com/" Date: Sat, 23 Oct 2010 20:48:03 +0000 Subject: Thanks Joey --- doc/bugs/web_reversion_on_ikiwiki.info.mdwn | 2 ++ 1 file changed, 2 insertions(+) (limited to 'doc') diff --git a/doc/bugs/web_reversion_on_ikiwiki.info.mdwn b/doc/bugs/web_reversion_on_ikiwiki.info.mdwn index 19a073da2..6f18cfcba 100644 --- a/doc/bugs/web_reversion_on_ikiwiki.info.mdwn +++ b/doc/bugs/web_reversion_on_ikiwiki.info.mdwn @@ -10,3 +10,5 @@ clearer on that. The error might have been thrown by git_parse_changes in git.pm or check_canchange in IkiWiki.pm, via IkiWiki::Receive. -- Jon [[fixed|done]] --[[Joey]] + +: Brilliant, many thanks. -- [[Jon]] -- cgit v1.2.3 From 7163ec70f955a1ea902bc16d6a229b57732473b7 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 23 Oct 2010 17:26:26 -0400 Subject: add news item for ikiwiki 3.20101023 --- doc/news/version_3.20100815.mdwn | 4 ---- doc/news/version_3.20101023.mdwn | 4 ++++ 2 files changed, 4 insertions(+), 4 deletions(-) delete mode 100644 doc/news/version_3.20100815.mdwn create mode 100644 doc/news/version_3.20101023.mdwn (limited to 'doc') diff --git a/doc/news/version_3.20100815.mdwn b/doc/news/version_3.20100815.mdwn deleted file mode 100644 index 1073933a1..000000000 --- a/doc/news/version_3.20100815.mdwn +++ /dev/null @@ -1,4 +0,0 @@ -ikiwiki 3.20100815 released with [[!toggle text="these changes"]] -[[!toggleable text=""" - * Fix po test suite to not assume ikiwiki's underlay is already installed. - Closes: #[593047](http://bugs.debian.org/593047)"""]] \ No newline at end of file diff --git a/doc/news/version_3.20101023.mdwn b/doc/news/version_3.20101023.mdwn new file mode 100644 index 000000000..44bed6be6 --- /dev/null +++ b/doc/news/version_3.20101023.mdwn @@ -0,0 +1,4 @@ +ikiwiki 3.20101023 released with [[!toggle text="these changes"]] +[[!toggleable text=""" + * Fix typo that broke anonymous git push. + * Fix web reversion when the srcdir is in a subdir of the git repo."""]] \ No newline at end of file -- cgit v1.2.3 From 38f0bec34560d2258a2d690676987b12ab184490 Mon Sep 17 00:00:00 2001 From: "72.0.72.144" <72.0.72.144@web> Date: Sun, 24 Oct 2010 13:58:59 +0000 Subject: poll vote (Accept both) --- doc/news/openid.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/news/openid.mdwn b/doc/news/openid.mdwn index 025a07802..05991ff72 100644 --- a/doc/news/openid.mdwn +++ b/doc/news/openid.mdwn @@ -10,4 +10,4 @@ log back in, try out the OpenID signup process if you don't already have an OpenID, and see how OpenID works for you. And let me know your feelings about making such a switch. --[[Joey]] -[[!poll 67 "Accept only OpenID for logins" 21 "Accept only password logins" 37 "Accept both"]] +[[!poll 67 "Accept only OpenID for logins" 21 "Accept only password logins" 38 "Accept both"]] -- cgit v1.2.3 From 577e185b63c6703df1045a7109882e5c3548ab4d Mon Sep 17 00:00:00 2001 From: Anonymous Date: Tue, 26 Oct 2010 17:42:51 +0200 Subject: signal dead link to 'default content for *copyright* and *license*' plugin --- ...fault_content_for___42__copyright__42___and___42__license__42__.mdwn | 2 ++ 1 file changed, 2 insertions(+) (limited to 'doc') diff --git a/doc/plugins/contrib/default_content_for___42__copyright__42___and___42__license__42__.mdwn b/doc/plugins/contrib/default_content_for___42__copyright__42___and___42__license__42__.mdwn index b9ad3cc8e..7b7cd9ccd 100644 --- a/doc/plugins/contrib/default_content_for___42__copyright__42___and___42__license__42__.mdwn +++ b/doc/plugins/contrib/default_content_for___42__copyright__42___and___42__license__42__.mdwn @@ -10,6 +10,8 @@ so I'm now publishing them here. and [`license.pm`](http://www.schwinge.homeip.net/~thomas/tmp/license.pm) +> These links are dead + Usage instructions are found inside the two plugin files. --[[tschwinge]] -- cgit v1.2.3 From 616767191759281cf6c3abdfedaa649a8147761a Mon Sep 17 00:00:00 2001 From: tschwinge Date: Wed, 27 Oct 2010 12:39:34 +0000 Subject: Fix links. DynDNS (which was resolving *.schwinge.homeip.net to my server at home) stopped supporting wildcard CNAMEs *.schwinge.homeip.net, so I now always have to use the canonical name (or pay for getting this back, or go looking for another service provider)... --- ...t_content_for___42__copyright__42___and___42__license__42__.mdwn | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'doc') diff --git a/doc/plugins/contrib/default_content_for___42__copyright__42___and___42__license__42__.mdwn b/doc/plugins/contrib/default_content_for___42__copyright__42___and___42__license__42__.mdwn index 7b7cd9ccd..ce2779db1 100644 --- a/doc/plugins/contrib/default_content_for___42__copyright__42___and___42__license__42__.mdwn +++ b/doc/plugins/contrib/default_content_for___42__copyright__42___and___42__license__42__.mdwn @@ -6,11 +6,9 @@ Someone was just asking for it and I had written these two plugins already some months ago, so I'm now publishing them here. -[`copyright.pm`](http://www.schwinge.homeip.net/~thomas/tmp/copyright.pm) +[`copyright.pm`](http://schwinge.homeip.net/~thomas/tmp/copyright.pm) and -[`license.pm`](http://www.schwinge.homeip.net/~thomas/tmp/license.pm) - -> These links are dead +[`license.pm`](http://schwinge.homeip.net/~thomas/tmp/license.pm) Usage instructions are found inside the two plugin files. -- cgit v1.2.3 From a12dd235ea6afff3540da3f5e66e7abbadaa6944 Mon Sep 17 00:00:00 2001 From: Thomas Schwinge Date: Wed, 27 Oct 2010 14:49:21 +0200 Subject: Fix some more links. DynDNS (which was resolving *.schwinge.homeip.net to my server at home) stopped supporting wildcard CNAMEs *.schwinge.homeip.net, so I now always have to use the canonical name (or pay for getting this back, or go looking for another service provider)... --- ..._no_text_was_copied_in_this_page_--_missing_page_dependencies.mdwn | 2 +- doc/bugs/cutpaste.pm:_missing_filter_call.mdwn | 4 ++-- doc/forum/cutpaste.pm_not_only_file-local.mdwn | 2 +- doc/plugins/contrib/texinfo.mdwn | 2 +- .../__42__forward__42__ing_functionality_for_the_meta_plugin.mdwn | 2 +- doc/todo/passwordauth:_sendmail_interface.mdwn | 2 +- doc/users/tschwinge.mdwn | 4 ++-- 7 files changed, 9 insertions(+), 9 deletions(-) (limited to 'doc') diff --git a/doc/bugs/Error:_no_text_was_copied_in_this_page_--_missing_page_dependencies.mdwn b/doc/bugs/Error:_no_text_was_copied_in_this_page_--_missing_page_dependencies.mdwn index 6996a9fbf..0082eed4d 100644 --- a/doc/bugs/Error:_no_text_was_copied_in_this_page_--_missing_page_dependencies.mdwn +++ b/doc/bugs/Error:_no_text_was_copied_in_this_page_--_missing_page_dependencies.mdwn @@ -2,7 +2,7 @@ That one has bitten me for some time; here is the minimal testcase. There is also an equivalent (I suppose) problem when using another plugin, but I hope it's enough to track it down for this one. - $ tar -xj < [bug-dep_order.tar.bz2](http://www.thomas.schwinge.homeip.net/tmp/bug-dep_order.tar.bz2) + $ tar -xj < [bug-dep_order.tar.bz2](http://schwinge.homeip.net/~thomas/tmp/bug-dep_order.tar.bz2) $ cd bug-dep_order/ $ ./render_locally [...] diff --git a/doc/bugs/cutpaste.pm:_missing_filter_call.mdwn b/doc/bugs/cutpaste.pm:_missing_filter_call.mdwn index f7138cba0..4b22fd06c 100644 --- a/doc/bugs/cutpaste.pm:_missing_filter_call.mdwn +++ b/doc/bugs/cutpaste.pm:_missing_filter_call.mdwn @@ -1,7 +1,7 @@ Consider this: - $ wget http://www.thomas.schwinge.homeip.net/tmp/cutpaste_filter.tar.bz2 - $ wget http://www.thomas.schwinge.homeip.net/tmp/cutpaste_filter.patch + $ wget http://schwinge.homeip.net/~thomas/tmp/cutpaste_filter.tar.bz2 + $ wget http://schwinge.homeip.net/~thomas/tmp/cutpaste_filter.patch $ tar -xj < cutpaste_filter.tar.bz2 $ cd cutpaste_filter/ diff --git a/doc/forum/cutpaste.pm_not_only_file-local.mdwn b/doc/forum/cutpaste.pm_not_only_file-local.mdwn index 3563e3e01..0c5221cc9 100644 --- a/doc/forum/cutpaste.pm_not_only_file-local.mdwn +++ b/doc/forum/cutpaste.pm_not_only_file-local.mdwn @@ -3,7 +3,7 @@ has \[[!cut id=foo text="foo"]], and fileB does \[[!absorb pagenames=fileA]], and can then use \[[!paste id=foo]]. Therefore, I've written an [*absorb* directive / -plugin](http://www.thomas.schwinge.homeip.net/tmp/absorb.pm), which is meant to +plugin](http://schwinge.homeip.net/~thomas/tmp/absorb.pm), which is meant to absorb pages in order to get hold of their *cut* and *copy* directives' contents. This does work as expected. But it also absorbs page fileA's *meta* values, like a *meta title*, etc. How to avoid / solve this? diff --git a/doc/plugins/contrib/texinfo.mdwn b/doc/plugins/contrib/texinfo.mdwn index 595bd27aa..a2769166d 100644 --- a/doc/plugins/contrib/texinfo.mdwn +++ b/doc/plugins/contrib/texinfo.mdwn @@ -8,7 +8,7 @@ This plugin is not neccessarily meant to enable people to write arbitrary wiki pages in the Texinfo format (even though that is possible, of course), but rather to ease collaboration on existing Texinfo documents. -The plugin is available at . +The plugin is available at . It's very basic at the moment, but will be improved over time. diff --git a/doc/todo/__42__forward__42__ing_functionality_for_the_meta_plugin.mdwn b/doc/todo/__42__forward__42__ing_functionality_for_the_meta_plugin.mdwn index 61b19d302..b3804d652 100644 --- a/doc/todo/__42__forward__42__ing_functionality_for_the_meta_plugin.mdwn +++ b/doc/todo/__42__forward__42__ing_functionality_for_the_meta_plugin.mdwn @@ -4,7 +4,7 @@ to the [[`meta`_plugin|plugins/meta]]. > [[done]], with some changes --[[Joey]] Find the most recent version at -. +. I can't use `scrub(...)`, as that will strip out the forwarding HTML command. How to deal with that? diff --git a/doc/todo/passwordauth:_sendmail_interface.mdwn b/doc/todo/passwordauth:_sendmail_interface.mdwn index 29f28ca32..556240964 100644 --- a/doc/todo/passwordauth:_sendmail_interface.mdwn +++ b/doc/todo/passwordauth:_sendmail_interface.mdwn @@ -35,7 +35,7 @@ in the ikiwiki source code, where emailing is done. OK, so I'll have a look at replacing all email handling with *Email::Send*. [[!tag patch]] -** +** Remaining TODOs: diff --git a/doc/users/tschwinge.mdwn b/doc/users/tschwinge.mdwn index 944105349..435208a71 100644 --- a/doc/users/tschwinge.mdwn +++ b/doc/users/tschwinge.mdwn @@ -1,8 +1,8 @@ [[!meta title="Thomas Schwinge"]] # Thomas Schwinge - - + + I have converted the [GNU Hurd](http://www.gnu.org/software/hurd/)'s previous web pages and previous wiki pages to a *[[ikiwiki]]* system; and all that while -- cgit v1.2.3 From 43e399d7d221d060b76e86dce72beb5b04eea132 Mon Sep 17 00:00:00 2001 From: "http://pixel.dreamwidth.org/" Date: Wed, 27 Oct 2010 20:51:34 +0000 Subject: --- doc/forum/Moving_wiki.git_folder__63__.mdwn | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 doc/forum/Moving_wiki.git_folder__63__.mdwn (limited to 'doc') diff --git a/doc/forum/Moving_wiki.git_folder__63__.mdwn b/doc/forum/Moving_wiki.git_folder__63__.mdwn new file mode 100644 index 000000000..f3cc6375d --- /dev/null +++ b/doc/forum/Moving_wiki.git_folder__63__.mdwn @@ -0,0 +1,17 @@ +I folks, I created a simple wiki to keep notes and references for projects, it's worked quite nice so far. I decided to use git as it's what I use daily to manage code, and it's available on all my machines. + +Anyway, I wanted to move all the wiki source stuff into a subfolder so that it stops cluttering up my ~ directory. However, there seems to be a problem with moving wiki.git (I moved wiki, wiki.git and wiki.setup) and I'm not sure where to tell ikiwiki that the git directory has been moved. I changed + + srcdir => '/home/pixel/.notebook/wiki', + git_wrapper => '/home/pixel/.notebook/wiki.git/hooks/post-update', + +and that seems to be fine. However when I go to run ikiwiki --setup things go wrong: + + pixel@tosh: [~ (ruby-1.9.2-p0)] ➔ ikiwiki -setup .notebook/wiki.setup + successfully generated /home/pixel/public_html/wiki/ikiwiki.cgi + successfully generated /home/pixel/.notebook/wiki.git/hooks/post-update + fatal: '/home/pixel/wiki.git' does not appear to be a git repository + fatal: The remote end hung up unexpectedly + 'git pull origin' failed: at /usr/share/perl5/IkiWiki/Plugin/git.pm line 193. + +I've gone through wiki.setup and nothing has jumped out as the place to set this, have I missed something? -- cgit v1.2.3 From 2a224f5a8a81b923ba0da4fcb742fb293122f19b Mon Sep 17 00:00:00 2001 From: "http://pixel.dreamwidth.org/" Date: Wed, 27 Oct 2010 20:52:08 +0000 Subject: edit for typo --- doc/forum/Moving_wiki.git_folder__63__.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/forum/Moving_wiki.git_folder__63__.mdwn b/doc/forum/Moving_wiki.git_folder__63__.mdwn index f3cc6375d..77d1da1ee 100644 --- a/doc/forum/Moving_wiki.git_folder__63__.mdwn +++ b/doc/forum/Moving_wiki.git_folder__63__.mdwn @@ -1,4 +1,4 @@ -I folks, I created a simple wiki to keep notes and references for projects, it's worked quite nice so far. I decided to use git as it's what I use daily to manage code, and it's available on all my machines. +Hi folks, I created a simple wiki to keep notes and references for projects, it's worked quite nice so far. I decided to use git as it's what I use daily to manage code, and it's available on all my machines. Anyway, I wanted to move all the wiki source stuff into a subfolder so that it stops cluttering up my ~ directory. However, there seems to be a problem with moving wiki.git (I moved wiki, wiki.git and wiki.setup) and I'm not sure where to tell ikiwiki that the git directory has been moved. I changed -- cgit v1.2.3 From f840fb5c58ac4b0e5ab41165fbc0afd2d6a9a256 Mon Sep 17 00:00:00 2001 From: "http://users.itk.ppke.hu/~cstamas/openid/" Date: Wed, 27 Oct 2010 22:45:28 +0000 Subject: Added a comment --- .../comment_1_05238461520613f4ed1b0d02ece663bd._comment | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 doc/forum/Moving_wiki.git_folder__63__/comment_1_05238461520613f4ed1b0d02ece663bd._comment (limited to 'doc') diff --git a/doc/forum/Moving_wiki.git_folder__63__/comment_1_05238461520613f4ed1b0d02ece663bd._comment b/doc/forum/Moving_wiki.git_folder__63__/comment_1_05238461520613f4ed1b0d02ece663bd._comment new file mode 100644 index 000000000..d654591c0 --- /dev/null +++ b/doc/forum/Moving_wiki.git_folder__63__/comment_1_05238461520613f4ed1b0d02ece663bd._comment @@ -0,0 +1,11 @@ +[[!comment format=mdwn + username="http://users.itk.ppke.hu/~cstamas/openid/" + ip="212.183.140.47" + subject="comment 1" + date="2010-10-27T22:45:28Z" + content=""" +I think you want to edit + + .git/config + +"""]] -- cgit v1.2.3 From 9ffa87671062eecfcd042a9501032d441def7ce1 Mon Sep 17 00:00:00 2001 From: "http://kerravonsen.dreamwidth.org/" Date: Thu, 28 Oct 2010 00:19:43 +0000 Subject: tweaking docs --- doc/plugins/contrib/ikiwiki/directive/ymlfront.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/plugins/contrib/ikiwiki/directive/ymlfront.mdwn b/doc/plugins/contrib/ikiwiki/directive/ymlfront.mdwn index bb4a58fc6..1a01834f8 100644 --- a/doc/plugins/contrib/ikiwiki/directive/ymlfront.mdwn +++ b/doc/plugins/contrib/ikiwiki/directive/ymlfront.mdwn @@ -14,4 +14,4 @@ There is one argument to this directive. The YAML-format data. This should be enclosed inside triple-quotes to preserve the data correctly. If more than one ymlfront directive is given per page, the result is undefined. -Likewise, it is inadvisable to try to mix the "---" ymlfront format with the directive form of the data. +Likewise, it is inadvisable to try to mix the non-directive ymlfront format with the directive form of the data. -- cgit v1.2.3 From f2f41d680a841813fb3b75e0311793afc956ffd2 Mon Sep 17 00:00:00 2001 From: "http://kerravonsen.dreamwidth.org/" Date: Thu, 28 Oct 2010 00:21:47 +0000 Subject: new version of ymlfront finally documented --- doc/plugins/contrib/ymlfront.mdwn | 65 ++++++++++++++++++++++++++++++--------- 1 file changed, 51 insertions(+), 14 deletions(-) (limited to 'doc') diff --git a/doc/plugins/contrib/ymlfront.mdwn b/doc/plugins/contrib/ymlfront.mdwn index a2c649044..2805be04f 100644 --- a/doc/plugins/contrib/ymlfront.mdwn +++ b/doc/plugins/contrib/ymlfront.mdwn @@ -10,6 +10,9 @@ IkiWiki::Plugin::ymlfront - add YAML-format data to a page # activate the plugin add_plugins => [qw{goodstuff ymlfront ....}], + # configure the plugin + ymlfront_delim => [qw(--YAML-- --YAML--)], + ## DESCRIPTION This plugin provides a way of adding arbitrary meta-data (data fields) to any @@ -25,23 +28,57 @@ This plugin is meant to be used in conjunction with the [[field]] plugin. ## DETAILS -If one is not using the ymlfront directive, the YAML-format data in a page -must be placed at the start of the page and delimited by lines containing -precisely three dashes. The "normal" content of the page then follows. +There are three formats for adding YAML data to a page. These formats +should not be mixed - the result is undefined. -For example: +1. ymlfront directive + + See [[ikiwiki/directive/ymlfront]] for more information. - --- - title: Foo does not work - Urgency: High - Status: Assigned - AssignedTo: Fred Nurk - Version: 1.2.3 - --- - When running on the Sprongle system, the Foo function returns incorrect data. +2. default YAML-compatible delimiter + + By default, the YAML-format data in a page is placed at the start of + the page and delimited by lines containing precisely three dashes. + This is what YAML itself uses to delimit multiple documents. + The "normal" content of the page then follows. + + For example: + + --- + title: Foo does not work + Urgency: High + Status: Assigned + AssignedTo: Fred Nurk + Version: 1.2.3 + --- + When running on the Sprongle system, the Foo function returns incorrect data. + + What will normally be displayed is everything following the second line of dashes. That will be htmlized using the page-type of the page-file. + +3. user-defined delimiter + + Instead of using the default "---" delimiter, the user can define, + in the configuration file, the **ymlfront_delim** value, which is an + array containing two strings. The first string defines the markup for + the start of the YAML data, and the second string defines the markip + for the end of the YAML data. These two strings can be the same, or + they can be different. In this case, the YAML data section is not + required to be at the start of the page, but as with the default, it + is expected that only one data section will be on the page. + + For example: + + --YAML-- + title: Foo does not work + Urgency: High + Status: Assigned + AssignedTo: Fred Nurk + Version: 1.2.3 + --YAML-- + When running on the Sprongle system, the Foo function returns incorrect data. -What will normally be displayed is everything following the second line of dashes. -That will be htmlized using the page-type of the page-file. + What will normally be displayed is everything outside the delimiters, + both before and after. That will be htmlized using the page-type of the page-file. ### Accessing the Data -- cgit v1.2.3 From 073bbe7ae00baa9ca89a61e43e53f072ac1b3b89 Mon Sep 17 00:00:00 2001 From: "http://pixel.dreamwidth.org/" Date: Thu, 28 Oct 2010 02:39:05 +0000 Subject: Added a comment: I'm trying to move the root repository --- .../comment_2_0429a0bc807a7d290ec2d5e6be23cc16._comment | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 doc/forum/Moving_wiki.git_folder__63__/comment_2_0429a0bc807a7d290ec2d5e6be23cc16._comment (limited to 'doc') diff --git a/doc/forum/Moving_wiki.git_folder__63__/comment_2_0429a0bc807a7d290ec2d5e6be23cc16._comment b/doc/forum/Moving_wiki.git_folder__63__/comment_2_0429a0bc807a7d290ec2d5e6be23cc16._comment new file mode 100644 index 000000000..a761bbc76 --- /dev/null +++ b/doc/forum/Moving_wiki.git_folder__63__/comment_2_0429a0bc807a7d290ec2d5e6be23cc16._comment @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="http://pixel.dreamwidth.org/" + ip="65.29.14.21" + subject="I'm trying to move the root repository" + date="2010-10-28T02:39:04Z" + content=""" +This isn't my working repository (on my system it's called notebook, and I created it by: git clone wiki.git notebook presumably I could fix that one by editing config, once the other is working) this is the root repository. When I created my ikiwiki, it created 3 things in my home directory: wiki, wiki.git and wiki.setup. It's the wiki.git folder that is causing trouble. +"""]] -- cgit v1.2.3 From c53ddaf93abd16d2e64b62a465c630dee9a8a157 Mon Sep 17 00:00:00 2001 From: "http://pixel.dreamwidth.org/" Date: Thu, 28 Oct 2010 02:42:26 +0000 Subject: This reverts commit 073bbe7ae00baa9ca89a61e43e53f072ac1b3b89 --- .../comment_2_0429a0bc807a7d290ec2d5e6be23cc16._comment | 8 -------- 1 file changed, 8 deletions(-) delete mode 100644 doc/forum/Moving_wiki.git_folder__63__/comment_2_0429a0bc807a7d290ec2d5e6be23cc16._comment (limited to 'doc') diff --git a/doc/forum/Moving_wiki.git_folder__63__/comment_2_0429a0bc807a7d290ec2d5e6be23cc16._comment b/doc/forum/Moving_wiki.git_folder__63__/comment_2_0429a0bc807a7d290ec2d5e6be23cc16._comment deleted file mode 100644 index a761bbc76..000000000 --- a/doc/forum/Moving_wiki.git_folder__63__/comment_2_0429a0bc807a7d290ec2d5e6be23cc16._comment +++ /dev/null @@ -1,8 +0,0 @@ -[[!comment format=mdwn - username="http://pixel.dreamwidth.org/" - ip="65.29.14.21" - subject="I'm trying to move the root repository" - date="2010-10-28T02:39:04Z" - content=""" -This isn't my working repository (on my system it's called notebook, and I created it by: git clone wiki.git notebook presumably I could fix that one by editing config, once the other is working) this is the root repository. When I created my ikiwiki, it created 3 things in my home directory: wiki, wiki.git and wiki.setup. It's the wiki.git folder that is causing trouble. -"""]] -- cgit v1.2.3 From e8802c885a55c22b5ff754839654d0785ad91991 Mon Sep 17 00:00:00 2001 From: "http://pixel.dreamwidth.org/" Date: Thu, 28 Oct 2010 02:54:15 +0000 Subject: Added a comment --- .../comment_2_72b2b842dfa0cfaf899fe7af12977519._comment | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 doc/forum/Moving_wiki.git_folder__63__/comment_2_72b2b842dfa0cfaf899fe7af12977519._comment (limited to 'doc') diff --git a/doc/forum/Moving_wiki.git_folder__63__/comment_2_72b2b842dfa0cfaf899fe7af12977519._comment b/doc/forum/Moving_wiki.git_folder__63__/comment_2_72b2b842dfa0cfaf899fe7af12977519._comment new file mode 100644 index 000000000..f2e7ece18 --- /dev/null +++ b/doc/forum/Moving_wiki.git_folder__63__/comment_2_72b2b842dfa0cfaf899fe7af12977519._comment @@ -0,0 +1,10 @@ +[[!comment format=mdwn + username="http://pixel.dreamwidth.org/" + ip="65.29.14.21" + subject="comment 2" + date="2010-10-28T02:54:15Z" + content=""" +That did it thanks! + +Should I make some sort of edit in the setup page? I've used git for a while and for whatever reason it never occurred to me that this was from git, not from ikiwiki itself. +"""]] -- cgit v1.2.3 From 34ef3fb40f0a8a5d595ce5cf5f0b6470b7c78198 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawmE7z4CSv-ctBarutQCd70R3CcaSPPxjVk" Date: Thu, 28 Oct 2010 14:20:24 +0000 Subject: I'm curious if there has been any progress on better RSS output --- ...not_use_recommended_encoding_of_entities_for_some_fields.mdwn | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'doc') diff --git a/doc/bugs/rss_feeds_do_not_use_recommended_encoding_of_entities_for_some_fields.mdwn b/doc/bugs/rss_feeds_do_not_use_recommended_encoding_of_entities_for_some_fields.mdwn index 48c168997..85c317669 100644 --- a/doc/bugs/rss_feeds_do_not_use_recommended_encoding_of_entities_for_some_fields.mdwn +++ b/doc/bugs/rss_feeds_do_not_use_recommended_encoding_of_entities_for_some_fields.mdwn @@ -34,3 +34,12 @@ For Atom, at least, I believe adding `type="xhtml"` to the title element will wo > Update: Ok, I've fixed this for titles, as a special case, but the > underlying problem remains for other fields in rss feeds (such as > author), so I'm leaving this bug report open. --[[Joey]] + +>> I'm curious if there has been any progress on better RSS output? +>> I've been prototyping a new blog and getting good RSS out of it +>> seems important as the bulk of my current readers use RSS. +>> I note, in passing that the "more" plugin doesn't quite do what +>> I want either - I'd like to pass a full RSS feed of a post and only +>> have "more" apply to the front page of the blog. Is there a way to do that? +>> -- [[dtaht]] +>> -- cgit v1.2.3 From 99749dfdeac07b975cfba6eef617f3d7362eec73 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawmE7z4CSv-ctBarutQCd70R3CcaSPPxjVk" Date: Thu, 28 Oct 2010 14:28:04 +0000 Subject: more plugin and rss --- doc/bugs/more_and_RSS_generation.mdwn | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 doc/bugs/more_and_RSS_generation.mdwn (limited to 'doc') diff --git a/doc/bugs/more_and_RSS_generation.mdwn b/doc/bugs/more_and_RSS_generation.mdwn new file mode 100644 index 000000000..72d636f18 --- /dev/null +++ b/doc/bugs/more_and_RSS_generation.mdwn @@ -0,0 +1,7 @@ +I'd like the more plugin and RSS to play better together. In the case of the html generation of the main page of a blog, I'd like to get the first paragraph out, but keep RSS as a full feed. + +Maybe there is a different plugin (I also tried toggle)? + +I also note, that at least currently, more seems to break on a few pages, not being parsed at all when aggregated into the front page. + +see also: [[/bugs/rss_feeds_do_not_use_recommended_encoding_of_entities_for_some_fields/]] -- cgit v1.2.3 From 1b770bea3fd5b5dfb4e75237218db204139d9189 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawmE7z4CSv-ctBarutQCd70R3CcaSPPxjVk" Date: Thu, 28 Oct 2010 14:38:32 +0000 Subject: --- doc/bugs/logout_in_ikiwiki.mdwn | 1 + 1 file changed, 1 insertion(+) create mode 100644 doc/bugs/logout_in_ikiwiki.mdwn (limited to 'doc') diff --git a/doc/bugs/logout_in_ikiwiki.mdwn b/doc/bugs/logout_in_ikiwiki.mdwn new file mode 100644 index 000000000..ad89f4c2d --- /dev/null +++ b/doc/bugs/logout_in_ikiwiki.mdwn @@ -0,0 +1 @@ +It looks like there is no way to logout of ikiwiki at present, meaning that if you edit the ikiwiki in, say, a cybercafe, the cookie remains... is there some other security mechanism in place that can check for authorization, or should I hack in a logout routine into ikiwiki.cgi? -- cgit v1.2.3 From 663d2578832dd0808ea98a624b49cec4bf3c0243 Mon Sep 17 00:00:00 2001 From: "http://liw.fi/" Date: Thu, 28 Oct 2010 17:39:29 +0000 Subject: --- doc/bugs/logout_in_ikiwiki.mdwn | 2 ++ 1 file changed, 2 insertions(+) (limited to 'doc') diff --git a/doc/bugs/logout_in_ikiwiki.mdwn b/doc/bugs/logout_in_ikiwiki.mdwn index ad89f4c2d..9f974be15 100644 --- a/doc/bugs/logout_in_ikiwiki.mdwn +++ b/doc/bugs/logout_in_ikiwiki.mdwn @@ -1 +1,3 @@ It looks like there is no way to logout of ikiwiki at present, meaning that if you edit the ikiwiki in, say, a cybercafe, the cookie remains... is there some other security mechanism in place that can check for authorization, or should I hack in a logout routine into ikiwiki.cgi? + +> Click on "Preferences". There is a logout button there. --liw -- cgit v1.2.3 From 47b9f10e6254277918873a980af0cf0631326165 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 28 Oct 2010 15:39:22 -0400 Subject: response --- doc/bugs/logout_in_ikiwiki.mdwn | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'doc') diff --git a/doc/bugs/logout_in_ikiwiki.mdwn b/doc/bugs/logout_in_ikiwiki.mdwn index 9f974be15..5df19c405 100644 --- a/doc/bugs/logout_in_ikiwiki.mdwn +++ b/doc/bugs/logout_in_ikiwiki.mdwn @@ -1,3 +1,7 @@ It looks like there is no way to logout of ikiwiki at present, meaning that if you edit the ikiwiki in, say, a cybercafe, the cookie remains... is there some other security mechanism in place that can check for authorization, or should I hack in a logout routine into ikiwiki.cgi? > Click on "Preferences". There is a logout button there. --liw + +> It would be nice if it were not buried there, but putting it on the +> action bar statically would be confusing. The best approach might be to +> use javascript. --[[Joey]] -- cgit v1.2.3 From f54a91c3021b304fdde183834542418720e4f792 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawmE7z4CSv-ctBarutQCd70R3CcaSPPxjVk" Date: Fri, 29 Oct 2010 00:56:13 +0000 Subject: trying to figure out how to make ikiwiki slightly more interactive --- doc/bugs/logout_in_ikiwiki.mdwn | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'doc') diff --git a/doc/bugs/logout_in_ikiwiki.mdwn b/doc/bugs/logout_in_ikiwiki.mdwn index 5df19c405..a9c407ba2 100644 --- a/doc/bugs/logout_in_ikiwiki.mdwn +++ b/doc/bugs/logout_in_ikiwiki.mdwn @@ -5,3 +5,18 @@ It looks like there is no way to logout of ikiwiki at present, meaning that if y > It would be nice if it were not buried there, but putting it on the > action bar statically would be confusing. The best approach might be to > use javascript. --[[Joey]] + + +>> I agree that javascript seems to be a solution, but my brain falls +>> off the end of the world while looking at ways to manipulate the DOM. +>> (I'd argue also in favor of the openid_provider cookie expiring +>> in less time than it does now, and being session based) + +>> It would be nice to move navigational elements to the upper right corner +>> of the page... + +>> I have two kinds of pages (wiki and blog), and three classes of users +>> anonymous users - display things like login, help, and recentchanges, +>> non-admin users - on a per subdir basis (blog and !blog) display +>> logout, help, recentchanges, edit, comment +>> admin users - logout, help, recentchanges, edit, comment, etc -- cgit v1.2.3 From cfc1b6ac486e11cb11d6c72602bf70b0a440b747 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawmE7z4CSv-ctBarutQCd70R3CcaSPPxjVk" Date: Fri, 29 Oct 2010 00:58:34 +0000 Subject: --- doc/bugs/logout_in_ikiwiki.mdwn | 3 +++ 1 file changed, 3 insertions(+) (limited to 'doc') diff --git a/doc/bugs/logout_in_ikiwiki.mdwn b/doc/bugs/logout_in_ikiwiki.mdwn index a9c407ba2..3ca85fddc 100644 --- a/doc/bugs/logout_in_ikiwiki.mdwn +++ b/doc/bugs/logout_in_ikiwiki.mdwn @@ -16,7 +16,10 @@ It looks like there is no way to logout of ikiwiki at present, meaning that if y >> of the page... >> I have two kinds of pages (wiki and blog), and three classes of users + >> anonymous users - display things like login, help, and recentchanges, + >> non-admin users - on a per subdir basis (blog and !blog) display >> logout, help, recentchanges, edit, comment + >> admin users - logout, help, recentchanges, edit, comment, etc -- cgit v1.2.3 From d16104f55d8b31929d0466ca9abc3ccb4af0a8e8 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 30 Oct 2010 12:41:31 -0400 Subject: response --- doc/bugs/more_and_RSS_generation.mdwn | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'doc') diff --git a/doc/bugs/more_and_RSS_generation.mdwn b/doc/bugs/more_and_RSS_generation.mdwn index 72d636f18..00ab43fa2 100644 --- a/doc/bugs/more_and_RSS_generation.mdwn +++ b/doc/bugs/more_and_RSS_generation.mdwn @@ -2,6 +2,19 @@ I'd like the more plugin and RSS to play better together. In the case of the htm Maybe there is a different plugin (I also tried toggle)? +> I am not a fan of the more directive (thus the rant about it sucking +> embedded in its [[example|ikiwiki/directive/more]]). But I don't think +> that weakening it to not work in rss feeds is a good idea, if someone +> wants to force users to go somewhere to view their full content, +> they should be able to do it, even though it does suck. +> +> The toggle directive will degrade fairly well in an rss feed to +> display the full text. (There is an annoying toggle link that does +> nothing when embedded in an rss feed). --[[Joey]] + I also note, that at least currently, more seems to break on a few pages, not being parsed at all when aggregated into the front page. +> It's just a simple directive, it should work anywhere any directive will, +> and does as far as I can see. Details? --[[Joey]] + see also: [[/bugs/rss_feeds_do_not_use_recommended_encoding_of_entities_for_some_fields/]] -- cgit v1.2.3 From 313a28b8f68b76aee4b94413e4e9d47dca93a34e Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 30 Oct 2010 12:50:26 -0400 Subject: response --- ...o_not_use_recommended_encoding_of_entities_for_some_fields.mdwn | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'doc') diff --git a/doc/bugs/rss_feeds_do_not_use_recommended_encoding_of_entities_for_some_fields.mdwn b/doc/bugs/rss_feeds_do_not_use_recommended_encoding_of_entities_for_some_fields.mdwn index 85c317669..0a435cea3 100644 --- a/doc/bugs/rss_feeds_do_not_use_recommended_encoding_of_entities_for_some_fields.mdwn +++ b/doc/bugs/rss_feeds_do_not_use_recommended_encoding_of_entities_for_some_fields.mdwn @@ -43,3 +43,10 @@ For Atom, at least, I believe adding `type="xhtml"` to the title element will wo >> have "more" apply to the front page of the blog. Is there a way to do that? >> -- [[dtaht]] >> +>>> To be clear, the RSS spec sucks to such an extent that, as far as +>>> I know, there is no sort of title escaping that will work in all +>>> RSS consumers. Titles are currently escaped in the way +>>> that tends to break the fewest according to what I've read. +>>> If you're unlucky enough to +>>> have a "&" or "<" in your **name**, then you may still run into +>>> problems with how that is escaped in rss feeds. --[[Joey]] -- cgit v1.2.3 From cb45d3cf44760411746414ba1218c925ad097149 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 30 Oct 2010 12:59:31 -0400 Subject: re the openid_provider cookie --- doc/bugs/logout_in_ikiwiki.mdwn | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'doc') diff --git a/doc/bugs/logout_in_ikiwiki.mdwn b/doc/bugs/logout_in_ikiwiki.mdwn index 3ca85fddc..d9b6df677 100644 --- a/doc/bugs/logout_in_ikiwiki.mdwn +++ b/doc/bugs/logout_in_ikiwiki.mdwn @@ -12,6 +12,12 @@ It looks like there is no way to logout of ikiwiki at present, meaning that if y >> (I'd argue also in favor of the openid_provider cookie expiring >> in less time than it does now, and being session based) +>>> (The `openid_provider` cookie is purely a convenience cookie to +>>> auto-select the user's openid provider the next time they log +>>> in. As such, it cannot be a session cookie. It does not provide any +>>> personally-identifying information so it should not really matter +>>> when it expires.) --[[Joey]] + >> It would be nice to move navigational elements to the upper right corner >> of the page... -- cgit v1.2.3 From b62581583107f6fc3e9bccf66a87a491c236757f Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawmrVK0l7LGe93rzchPlVg7bukNgTsqTbn8" Date: Sat, 30 Oct 2010 20:26:45 +0000 Subject: --- doc/forum/ikiwiki_+_mathjax.mdwn | 1 + 1 file changed, 1 insertion(+) create mode 100644 doc/forum/ikiwiki_+_mathjax.mdwn (limited to 'doc') diff --git a/doc/forum/ikiwiki_+_mathjax.mdwn b/doc/forum/ikiwiki_+_mathjax.mdwn new file mode 100644 index 000000000..1279a2c80 --- /dev/null +++ b/doc/forum/ikiwiki_+_mathjax.mdwn @@ -0,0 +1 @@ +Is it possible to use [mathjax](http://www.mathjax.org/) in ikiwiki to typeset math formulas? If so, is this compatible with the [wmd](http://ikiwiki.info/plugins/wmd/) plugin? -- cgit v1.2.3 From 85d262e4cab2bfa55194b445d7fd251fa5818bc6 Mon Sep 17 00:00:00 2001 From: "http://edrex.myopenid.com/" Date: Sat, 30 Oct 2010 21:24:17 +0000 Subject: --- doc/todo/auto-create_tag_pages_according_to_a_template.mdwn | 1 + 1 file changed, 1 insertion(+) (limited to 'doc') diff --git a/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn b/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn index 92c3b7695..676e2bc00 100644 --- a/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn +++ b/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn @@ -260,5 +260,6 @@ required to implement [[todo/alias directive]], which couldn't be easily done by writing to the RCS as the page's contents can change depending on which other pages claim it as an alias. --[[chrysn]] +I agree with [[chrysn]]. In fact, is there any good reason that the core tag plugin doesn't do this? The current usability is horrible, to the point that I have gone 2.5 years with Ikiwiki and haven't yet started using tags. -- [[Eric|http://wiki.pdxhub.org/people/eric]] [[!tag done]] -- cgit v1.2.3 From 238259dfa199e217e34cc02462f55df6b2b1fcc5 Mon Sep 17 00:00:00 2001 From: "http://dtaht.myopenid.com/" Date: Sun, 31 Oct 2010 22:23:03 +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 2836d96e5..54fa1d57b 100644 --- a/doc/ikiwikiusers.mdwn +++ b/doc/ikiwikiusers.mdwn @@ -159,6 +159,7 @@ Personal sites and blogs * [weakish](http://weakish.github.com) * [Thomas Kane](http://planetkane.org/) * [Marco Silva](http://marcot.eti.br/) a weblog + wiki using the [darcs](http://darcs.net) backend +* [NeX-6](http://nex-6.taht.net/) ikiwiki blog and wiki running over ipv6 Please feel free to add your own ikiwiki site! -- cgit v1.2.3 From fa71b0e6aa08b0e3b274a0b939bf657f2576e482 Mon Sep 17 00:00:00 2001 From: "http://smcv.pseudorandom.co.uk/" Date: Mon, 1 Nov 2010 18:23:43 +0000 Subject: added to git --- ..._content_for___42__copyright__42___and___42__license__42__.mdwn | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'doc') diff --git a/doc/plugins/contrib/default_content_for___42__copyright__42___and___42__license__42__.mdwn b/doc/plugins/contrib/default_content_for___42__copyright__42___and___42__license__42__.mdwn index ce2779db1..c13114360 100644 --- a/doc/plugins/contrib/default_content_for___42__copyright__42___and___42__license__42__.mdwn +++ b/doc/plugins/contrib/default_content_for___42__copyright__42___and___42__license__42__.mdwn @@ -45,3 +45,10 @@ by ikiwiki are likewise fine. --[[tschwinge]] > and can extend beyond just copyright and license, but has the disadvantage > that it doesn't support setting defaults for a given "subdirectory" > only. --[[smcv]] + +[[!template id=gitbranch name=smcv/contrib/defcopyright author="[[tschwinge]]"]] + +> For `./gitremotes` convenience (taking the Linus approach to backups :-) ) +> I've added this to my git repository as a branch. No review, approval or +> ownership is implied, feel free to replace this with a branch in any other +> repository --[[smcv]] -- cgit v1.2.3 From e68f29eebb3917909b939869e57b985add724598 Mon Sep 17 00:00:00 2001 From: "http://smcv.pseudorandom.co.uk/" Date: Mon, 1 Nov 2010 18:24:46 +0000 Subject: ugh, now with better syntax --- ...fault_content_for___42__copyright__42___and___42__license__42__.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/plugins/contrib/default_content_for___42__copyright__42___and___42__license__42__.mdwn b/doc/plugins/contrib/default_content_for___42__copyright__42___and___42__license__42__.mdwn index c13114360..16c147b68 100644 --- a/doc/plugins/contrib/default_content_for___42__copyright__42___and___42__license__42__.mdwn +++ b/doc/plugins/contrib/default_content_for___42__copyright__42___and___42__license__42__.mdwn @@ -46,7 +46,7 @@ by ikiwiki are likewise fine. --[[tschwinge]] > that it doesn't support setting defaults for a given "subdirectory" > only. --[[smcv]] -[[!template id=gitbranch name=smcv/contrib/defcopyright author="[[tschwinge]]"]] +[[!template id=gitbranch branch=smcv/contrib/defcopyright author="[[tschwinge]]"]] > For `./gitremotes` convenience (taking the Linus approach to backups :-) ) > I've added this to my git repository as a branch. No review, approval or -- cgit v1.2.3 From ca166361973e09b6756acbfe46b4a1bcfa4148d7 Mon Sep 17 00:00:00 2001 From: dark Date: Mon, 1 Nov 2010 20:53:42 +0000 Subject: --- doc/users/dark.mdwn | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 doc/users/dark.mdwn (limited to 'doc') diff --git a/doc/users/dark.mdwn b/doc/users/dark.mdwn new file mode 100644 index 000000000..e1d06d0b0 --- /dev/null +++ b/doc/users/dark.mdwn @@ -0,0 +1,3 @@ +[[!meta title="Richard Braakman"]] + +Lars Wirzenius convinced me to try ikiwiki for blogging :) -- cgit v1.2.3 From 69a22a6f4b4dfc47a7ce39476758742036b70e63 Mon Sep 17 00:00:00 2001 From: dark Date: Mon, 1 Nov 2010 20:55:20 +0000 Subject: proposal plus patch --- doc/todo/selective_more_directive.mdwn | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 doc/todo/selective_more_directive.mdwn (limited to 'doc') diff --git a/doc/todo/selective_more_directive.mdwn b/doc/todo/selective_more_directive.mdwn new file mode 100644 index 000000000..24e6ab568 --- /dev/null +++ b/doc/todo/selective_more_directive.mdwn @@ -0,0 +1,26 @@ +I'm setting up a blog for NaNoWriMo and other story-writing, which means long posts every day. I want to have excerpts on the front page, which link to the full length story posts. I also want a dedicated page for each story which inlines the story in full and in chronological order. I can use the "more" directive to achieve this effect on the front page but then it spoils the story page. My solution was to add a pages= parameter to the more directive to make it more selective. + + --- /usr/share/perl5/IkiWiki/Plugin/more.pm 2010-10-09 00:09:24.000000000 +0000 + +++ .ikiwiki/IkiWiki/Plugin/more.pm 2010-11-01 20:24:59.000000000 +0000 + @@ -26,7 +26,10 @@ + + $params{linktext} = $linktext unless defined $params{linktext}; + + - if ($params{page} ne $params{destpage}) { + + if ($params{page} ne $params{destpage} && + + (! exists $params{pages} || + + pagespec_match($params{destpage}, $params{pages}, + + location => $params{page}))) { + return "\n". + htmllink($params{page}, $params{destpage}, $params{page}, + linktext => $params{linktext}, + +I can now call it as + + \[[!more pages="index" linktext="Chapter 1" text=""" + etc + """]] + +I'm not entirely happy with the design, since I would rather put this information in the inline directive instead of in every story post. Unfortunately I found no way to pass parameters from the inline directive to the inlined page. + +-- [[dark]] -- cgit v1.2.3 From ccd80905f7ea02ef07c2174ab2e8bd5f8ab0afc3 Mon Sep 17 00:00:00 2001 From: "http://cristian.regolo.cc/" Date: Tue, 2 Nov 2010 14:13:12 +0000 Subject: --- doc/setup/byhand.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/setup/byhand.mdwn b/doc/setup/byhand.mdwn index 86cff5af4..75a5648d5 100644 --- a/doc/setup/byhand.mdwn +++ b/doc/setup/byhand.mdwn @@ -104,7 +104,7 @@ is ok, run `ikiwiki --setup ikiwiki.setup`, and you're done! There are lots of other configuration options in ikiwiki.setup that you can uncomment, configure, and enable by re-running `ikiwiki --setup ikiwiki.setup`. Be sure to browse through all the -[[plugins]].. +[[plugins]]. ## Put your wiki in revision control. -- cgit v1.2.3 From a194fbc5bced565fa751008b8ada666c411d097d Mon Sep 17 00:00:00 2001 From: "http://lovesgoodfood.com/jason/" Date: Wed, 3 Nov 2010 21:12:48 +0000 Subject: Add myself. --- doc/ikiwikiusers.mdwn | 1 + 1 file changed, 1 insertion(+) (limited to 'doc') diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn index 54fa1d57b..d8e55bace 100644 --- a/doc/ikiwikiusers.mdwn +++ b/doc/ikiwikiusers.mdwn @@ -160,6 +160,7 @@ Personal sites and blogs * [Thomas Kane](http://planetkane.org/) * [Marco Silva](http://marcot.eti.br/) a weblog + wiki using the [darcs](http://darcs.net) backend * [NeX-6](http://nex-6.taht.net/) ikiwiki blog and wiki running over ipv6 +* [Jason Riedy](http://lovesgoodfood.com/jason/), which may occasionally look funny if I'm playing with my branch... Please feel free to add your own ikiwiki site! -- cgit v1.2.3 From c3624227620f5034fa84b3cb1294a61fc08eeea9 Mon Sep 17 00:00:00 2001 From: civiccents Date: Wed, 3 Nov 2010 21:54:17 +0000 Subject: test --- doc/sandbox/D-Liberative.wiki | 1 + 1 file changed, 1 insertion(+) create mode 100644 doc/sandbox/D-Liberative.wiki (limited to 'doc') diff --git a/doc/sandbox/D-Liberative.wiki b/doc/sandbox/D-Liberative.wiki new file mode 100644 index 000000000..69071521a --- /dev/null +++ b/doc/sandbox/D-Liberative.wiki @@ -0,0 +1 @@ +For now its just a concept... what if we could map deliberative capacity? -- cgit v1.2.3 From 23e3e5f15e61639ccba4a7dfbab11d6fe4b9f047 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawmwYptyV5ptNt8LCbMYsmpcNkk9_DRt-EY" Date: Wed, 3 Nov 2010 23:34:53 +0000 Subject: --- doc/forum/Blog_posting_times_and_ikiwiki_state.mdwn | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 doc/forum/Blog_posting_times_and_ikiwiki_state.mdwn (limited to 'doc') diff --git a/doc/forum/Blog_posting_times_and_ikiwiki_state.mdwn b/doc/forum/Blog_posting_times_and_ikiwiki_state.mdwn new file mode 100644 index 000000000..3e6c23241 --- /dev/null +++ b/doc/forum/Blog_posting_times_and_ikiwiki_state.mdwn @@ -0,0 +1,19 @@ +What I wanted +------------- + +I thought to myself it would be nice to see from the console the dates that my ikiwiki blog posts were published. Especially as I would like to know the order of my todo list without having to view the webpage. + +What I discovered +----------------- + +Looked at the code and saw the functions for grabbing the ctime from git but couldn't reconcile them to the "Posted" date in the RSS feed. Some more reading and I figured out that the Posted time is taken from the UNIX ctime when first uploaded into the repository and this information is stored in the page state via a Perl storable database - indexdb. (I'm sure most know this but to be clear in UNIX ctime is *not* the actual creation time of a file. UNIX has no facility for recording the actual creation time - however on first upload to the wiki it's good enough). + +Wrote a Perl script to query and sort indexdb. Now I can list my todos or blog posts in the order they appear on the web. Handy. + +However the ikiwiki state is specifically excluded via '.gitignore'. I work a lot on trains and not having this file in my cloned wiki means I can't list published posts or my todos in the proper order. I can get an approximation from git logs but, dam it, I want it the same! + +What can I do? +-------------- + +Is it a spectacularly bad idea to include the ikiwiki state file in my cloned repo (I suspect it is). What else could be done? Can I disable pagestate somehow or force ikiwiki to always use git commit times for Posted times? + -- cgit v1.2.3 From c8537b41320e1f38b2369f24431423dfb2f14b15 Mon Sep 17 00:00:00 2001 From: "http://smcv.pseudorandom.co.uk/" Date: Thu, 4 Nov 2010 10:58:53 +0000 Subject: --- doc/forum/Blog_posting_times_and_ikiwiki_state.mdwn | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'doc') diff --git a/doc/forum/Blog_posting_times_and_ikiwiki_state.mdwn b/doc/forum/Blog_posting_times_and_ikiwiki_state.mdwn index 3e6c23241..0c1da5b97 100644 --- a/doc/forum/Blog_posting_times_and_ikiwiki_state.mdwn +++ b/doc/forum/Blog_posting_times_and_ikiwiki_state.mdwn @@ -17,3 +17,12 @@ What can I do? Is it a spectacularly bad idea to include the ikiwiki state file in my cloned repo (I suspect it is). What else could be done? Can I disable pagestate somehow or force ikiwiki to always use git commit times for Posted times? +> Have you tried running ikiwiki with the `--gettime` option on your laptop, +> to force it to retrieve initial commit times from git? You should only +> need to do that once, and it'll be cached in the pagestate thereafter. +> +> Because that functionality is slow on every supported VCS except git, +> ikiwiki tries to avoid using it unless it's really needed. [[rcs]] +> lists it as "fast" for git, though, so depending how fast it really is +> and how large your wiki is, you might be able to get away with running +> ikiwiki with `--gettime` all the time? --[[smcv]] -- cgit v1.2.3 From a2a1d2b2d96ede3f6a25d2d0fb89681ec5e05ff3 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawmwYptyV5ptNt8LCbMYsmpcNkk9_DRt-EY" Date: Thu, 4 Nov 2010 11:52:53 +0000 Subject: Added a comment --- .../comment_1_87304dfa2caea7e526cdb04917524e8c._comment | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 doc/forum/Blog_posting_times_and_ikiwiki_state/comment_1_87304dfa2caea7e526cdb04917524e8c._comment (limited to 'doc') diff --git a/doc/forum/Blog_posting_times_and_ikiwiki_state/comment_1_87304dfa2caea7e526cdb04917524e8c._comment b/doc/forum/Blog_posting_times_and_ikiwiki_state/comment_1_87304dfa2caea7e526cdb04917524e8c._comment new file mode 100644 index 000000000..62bae02b0 --- /dev/null +++ b/doc/forum/Blog_posting_times_and_ikiwiki_state/comment_1_87304dfa2caea7e526cdb04917524e8c._comment @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="https://www.google.com/accounts/o8/id?id=AItOawmwYptyV5ptNt8LCbMYsmpcNkk9_DRt-EY" + nickname="Matt" + subject="comment 1" + date="2010-11-04T11:52:53Z" + content=""" +Perhaps I have a different setup from you but on my laptop I don't have ikiwiki installed - only a clone of the git repo. You mean to run --gettime on the post-update git hook? +"""]] -- cgit v1.2.3 From 415effbb43663ad756d78b3e957ac593d0227a74 Mon Sep 17 00:00:00 2001 From: civiccents Date: Thu, 4 Nov 2010 20:40:10 +0000 Subject: grammer --- doc/sandbox/D-Liberative.wiki | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/sandbox/D-Liberative.wiki b/doc/sandbox/D-Liberative.wiki index 69071521a..b8c94f310 100644 --- a/doc/sandbox/D-Liberative.wiki +++ b/doc/sandbox/D-Liberative.wiki @@ -1 +1 @@ -For now its just a concept... what if we could map deliberative capacity? +For now its just a concept... what if a community could map its deliberative capacity? -- cgit v1.2.3 From 1f32f5e6184b6354f671ae71578f1158c49168b6 Mon Sep 17 00:00:00 2001 From: harishcm Date: Fri, 5 Nov 2010 09:01:58 +0000 Subject: Put link to personal website --- doc/users/harishcm.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/users/harishcm.mdwn b/doc/users/harishcm.mdwn index 164711022..292a3bfad 100644 --- a/doc/users/harishcm.mdwn +++ b/doc/users/harishcm.mdwn @@ -1 +1 @@ -Using ikiwiki for my yet to be published personal website :) +Using ikiwiki for my personal website -- cgit v1.2.3 From 65873fee5e1dda78d6cf561cdd81a5dcd6d2735d Mon Sep 17 00:00:00 2001 From: "http://cristian.regolo.cc/" Date: Fri, 5 Nov 2010 15:49:36 +0000 Subject: add link to tag plugin page --- doc/examples/blog.mdwn | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'doc') diff --git a/doc/examples/blog.mdwn b/doc/examples/blog.mdwn index b25601227..5f8f6c3ce 100644 --- a/doc/examples/blog.mdwn +++ b/doc/examples/blog.mdwn @@ -10,8 +10,8 @@ Some additional configuration you might want to do, if not using * Make sure to configure ikiwiki to generate RSS or Atom feeds. -* Make sure you have the tag plugin enabled, and the `tagbase` set to - "tags". Tag pages will then automatically be created. +* Make sure you have the [[tag|plugins/tag]] plugin enabled, and the + `tagbase` set to "tags". Tag pages will then automatically be created. An example of how to tag a post is: \[[!tag life]] -- cgit v1.2.3 From 87a42450e1ac8e2e01b7ed2785ed43040fd14ed3 Mon Sep 17 00:00:00 2001 From: "http://jugglingbits.wordpress.com/" Date: Sat, 6 Nov 2010 07:51:29 +0000 Subject: --- doc/forum/How_to_list_new_pages__44___inline__63__.mdwn | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 doc/forum/How_to_list_new_pages__44___inline__63__.mdwn (limited to 'doc') diff --git a/doc/forum/How_to_list_new_pages__44___inline__63__.mdwn b/doc/forum/How_to_list_new_pages__44___inline__63__.mdwn new file mode 100644 index 000000000..f28e8b99b --- /dev/null +++ b/doc/forum/How_to_list_new_pages__44___inline__63__.mdwn @@ -0,0 +1,5 @@ +Hi, I'd love to include a "New posts" list into my front page, like at for example. + +It should be different from recent changes in that it shouldn't show modifications of existing pages, and in that it would be inside a page with other content. + +Thanks, Thomas -- cgit v1.2.3 From eaa04125d7080a9c882b629d1e0f6c7992ad462f Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawlOh8Cp-kxb0kaANKSNGrtw5XvdyHGJ3dk" Date: Sat, 6 Nov 2010 09:15:29 +0000 Subject: Added crucial hello-world line --- doc/sandbox.mdwn | 2 ++ 1 file changed, 2 insertions(+) (limited to 'doc') diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn index c665e67f0..df9d688b8 100644 --- a/doc/sandbox.mdwn +++ b/doc/sandbox.mdwn @@ -1,3 +1,5 @@ +Hello, world! + This is the [[SandBox]], a page anyone can edit to try out ikiwiki (version [[!version ]]). -- cgit v1.2.3 From cbcd9077ad5fbef8c0622ea9c78a66c9baece804 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawlOh8Cp-kxb0kaANKSNGrtw5XvdyHGJ3dk" Date: Sat, 6 Nov 2010 09:17:43 +0000 Subject: --- doc/sandbox/Testing_blog_entry.mdwn | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 doc/sandbox/Testing_blog_entry.mdwn (limited to 'doc') diff --git a/doc/sandbox/Testing_blog_entry.mdwn b/doc/sandbox/Testing_blog_entry.mdwn new file mode 100644 index 000000000..aa5fa5b20 --- /dev/null +++ b/doc/sandbox/Testing_blog_entry.mdwn @@ -0,0 +1,7 @@ +# Be cool, this is a test! + +Hello guys, this is *just a test* entry. + +* Did I say +* that I love +* bulleted lists? -- cgit v1.2.3 From 408af2bb9e10d2ed899e17f9814a5514c0254dc8 Mon Sep 17 00:00:00 2001 From: JoeRayhawk Date: Sun, 7 Nov 2010 04:37:14 +0000 Subject: A wish for a noninvasive autoindex. --- doc/plugins/autoindex/discussion.mdwn | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'doc') diff --git a/doc/plugins/autoindex/discussion.mdwn b/doc/plugins/autoindex/discussion.mdwn index 2d6b6f1f0..a48fe9df1 100644 --- a/doc/plugins/autoindex/discussion.mdwn +++ b/doc/plugins/autoindex/discussion.mdwn @@ -61,3 +61,15 @@ If you just don't want to clutter your git repo, below it's a patch does the fol Warning: I guess this patch may work, but I *haven't tested it yet*. -- [[weakish]] + +------ + +`autoindex_commit => 0` would be nice, but uncommited files are definitely not. +
+remote: From /srv/git/test3
+remote:    3047077..1df636c  master     -> origin/master
+remote: error: Untracked working tree file 'test.mdwn' would be overwritten by merge.  Aborting
+remote: 'git pull --prune origin' failed:  at /usr/share/perl5/IkiWiki/Plugin/git.pm line 201.
+
+ +It'd be nice if we were able to notice directories with no associated compilable markup files and compile a simple map directive straight to HTML without any intermediate markup file being involved at all. -- JoeRayhawk -- cgit v1.2.3 From 93e15cc84f47a1340f8bd06d7056ba423fe510bb Mon Sep 17 00:00:00 2001 From: "http://smcv.pseudorandom.co.uk/" Date: Mon, 8 Nov 2010 12:02:36 +0000 Subject: --- doc/plugins/autoindex/discussion.mdwn | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'doc') diff --git a/doc/plugins/autoindex/discussion.mdwn b/doc/plugins/autoindex/discussion.mdwn index a48fe9df1..d8b9be6e0 100644 --- a/doc/plugins/autoindex/discussion.mdwn +++ b/doc/plugins/autoindex/discussion.mdwn @@ -1,6 +1,11 @@ Would it be possible to add an option to only generate the index files for the html output and not place the markdown files in the wiki source? +> Or better still, add a mechanism for ikiwiki to hold transient source +> pages in memory and render them as if they existed, without actually +> writing them out, as [[JoeRayhawk]] suggests below? I think +> add_autofile would be the way to do this. --[[smcv]] + The reason being that I have a lot of directories which need to be autoindexed, but I would prefer if the index files didn't clutter up my git repository. -- cgit v1.2.3 From 0e4e3f7cae25082fc90a93dee41b397b0ae9be09 Mon Sep 17 00:00:00 2001 From: "http://smcv.pseudorandom.co.uk/" Date: Mon, 8 Nov 2010 12:10:20 +0000 Subject: suggested in two places => useful? --- doc/todo/transient_in-memory_pages.mdwn | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 doc/todo/transient_in-memory_pages.mdwn (limited to 'doc') diff --git a/doc/todo/transient_in-memory_pages.mdwn b/doc/todo/transient_in-memory_pages.mdwn new file mode 100644 index 000000000..9808ffdfe --- /dev/null +++ b/doc/todo/transient_in-memory_pages.mdwn @@ -0,0 +1,20 @@ +On [[todo/auto-create_tag_pages_according_to_a_template]], [[chrysn]] +suggests: + +> Instead of creating a file that gets checked in into the RCS, the +> source files could be left out and the output files be written as +> long as there is no physical source file (think of a virtual underlay). +> Something similar would be required to implement alias directive, +> which couldn't be easily done by writing to the RCS as the page's +> contents can change depending on which other pages claim it as an alias. + +`add_autofile` could be adapted to do this, or a similar API could be +added. + +This would also be useful for autoindex, as suggested on +[[plugins/autoindex/discussion]]. I'd also like to use it for +[[plugins/contrib/album]]. + +One refinement I'd suggest is that if the transient page is edited, +its transient contents are evaluated and used as the initial +content for the edit box; after that, it'd become a static page. --[[smcv]] -- cgit v1.2.3 From db3fb406733b98535d426acedd58f1633df79ade Mon Sep 17 00:00:00 2001 From: "http://smcv.pseudorandom.co.uk/" Date: Mon, 8 Nov 2010 12:11:32 +0000 Subject: --- doc/todo/autoindex_should_use_add__95__autofile.mdwn | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 doc/todo/autoindex_should_use_add__95__autofile.mdwn (limited to 'doc') diff --git a/doc/todo/autoindex_should_use_add__95__autofile.mdwn b/doc/todo/autoindex_should_use_add__95__autofile.mdwn new file mode 100644 index 000000000..517567e58 --- /dev/null +++ b/doc/todo/autoindex_should_use_add__95__autofile.mdwn @@ -0,0 +1,2 @@ +`add_autofile` is a generic version of [[plugins/autoindex]]'s code, +so the latter should probably use the former. --[[smcv]] -- cgit v1.2.3 From 2c17255b6641e33374a446ca281a0ad6d46af1dc Mon Sep 17 00:00:00 2001 From: "http://smcv.pseudorandom.co.uk/" Date: Mon, 8 Nov 2010 12:14:26 +0000 Subject: cross-references --- doc/plugins/autoindex/discussion.mdwn | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/plugins/autoindex/discussion.mdwn b/doc/plugins/autoindex/discussion.mdwn index d8b9be6e0..b09481cdc 100644 --- a/doc/plugins/autoindex/discussion.mdwn +++ b/doc/plugins/autoindex/discussion.mdwn @@ -4,7 +4,9 @@ for the html output and not place the markdown files in the wiki source? > Or better still, add a mechanism for ikiwiki to hold transient source > pages in memory and render them as if they existed, without actually > writing them out, as [[JoeRayhawk]] suggests below? I think -> add_autofile would be the way to do this. --[[smcv]] +> add_autofile would be the way to do this. +> I've added this to [[todo]] as [[todo/autoindex should use add__95__autofile]] +> and [[todo/transient in-memory pages]]. --[[smcv]] The reason being that I have a lot of directories which need to be autoindexed, but I would prefer if the index files didn't clutter up my git repository. -- cgit v1.2.3 From 9c42f5786601429a0b921d6591ebf5e4c1eb4da8 Mon Sep 17 00:00:00 2001 From: "http://smcv.pseudorandom.co.uk/" Date: Mon, 8 Nov 2010 12:17:07 +0000 Subject: put the problematic patch in a toggleable to make discussion more visible --- doc/plugins/autoindex/discussion.mdwn | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/plugins/autoindex/discussion.mdwn b/doc/plugins/autoindex/discussion.mdwn index b09481cdc..6b13d2342 100644 --- a/doc/plugins/autoindex/discussion.mdwn +++ b/doc/plugins/autoindex/discussion.mdwn @@ -22,6 +22,8 @@ If you just don't want to clutter your git repo, below it's a patch does the fol * If you set autoindex_commit to 1 (this is the default), auto-generated index files will be put in the repo provided you enabled rcs backend. +[[!toggle id="patch-for-autoindex_commit" text="patch for autoindex_commit"]] +[[!toggleable id="patch-for-autoindex_commit" text=""" 
 --- autoindex.pm.orig	2009-10-01 17:13:51.000000000 +0800
 +++ autoindex.pm	2009-10-01 17:21:09.000000000 +0800
@@ -65,7 +67,7 @@ If you just don't want to clutter your git repo, below it's a patch does the fol
  				gettext("automatic index generation"),
  				undef, undef);
- +"""]] Warning: I guess this patch may work, but I *haven't tested it yet*. -- [[weakish]] -- cgit v1.2.3 From af75602391ac9651e7594c65588da86d591f2c01 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawna2L5uKII-LuYyGFfQ_1VRGHbID0xYPYc" Date: Mon, 8 Nov 2010 13:31:35 +0000 Subject: --- doc/sandbox/Mooooo.mdwn | 1 + 1 file changed, 1 insertion(+) create mode 100644 doc/sandbox/Mooooo.mdwn (limited to 'doc') diff --git a/doc/sandbox/Mooooo.mdwn b/doc/sandbox/Mooooo.mdwn new file mode 100644 index 000000000..6f11d357c --- /dev/null +++ b/doc/sandbox/Mooooo.mdwn @@ -0,0 +1 @@ +Hrm. -- cgit v1.2.3 From 2fdda536ec6bee1eff3b71c214753078cd588f8f Mon Sep 17 00:00:00 2001 From: "143.215.206.35" <143.215.206.35@web> Date: Mon, 8 Nov 2010 20:54:58 +0000 Subject: poll vote (Accept both) --- doc/news/openid.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/news/openid.mdwn b/doc/news/openid.mdwn index 05991ff72..02f7afbc0 100644 --- a/doc/news/openid.mdwn +++ b/doc/news/openid.mdwn @@ -10,4 +10,4 @@ log back in, try out the OpenID signup process if you don't already have an OpenID, and see how OpenID works for you. And let me know your feelings about making such a switch. --[[Joey]] -[[!poll 67 "Accept only OpenID for logins" 21 "Accept only password logins" 38 "Accept both"]] +[[!poll 67 "Accept only OpenID for logins" 21 "Accept only password logins" 39 "Accept both"]] -- cgit v1.2.3 From 9c8f86ee9c59035c9462d2c69c7b89d0c9dbc3c2 Mon Sep 17 00:00:00 2001 From: "134.100.5.65" <134.100.5.65@web> Date: Tue, 9 Nov 2010 20:05:26 +0000 Subject: poll vote (Accept both) --- doc/news/openid.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/news/openid.mdwn b/doc/news/openid.mdwn index 02f7afbc0..5b145fee4 100644 --- a/doc/news/openid.mdwn +++ b/doc/news/openid.mdwn @@ -10,4 +10,4 @@ log back in, try out the OpenID signup process if you don't already have an OpenID, and see how OpenID works for you. And let me know your feelings about making such a switch. --[[Joey]] -[[!poll 67 "Accept only OpenID for logins" 21 "Accept only password logins" 39 "Accept both"]] +[[!poll 67 "Accept only OpenID for logins" 21 "Accept only password logins" 40 "Accept both"]] -- cgit v1.2.3 From 171c429f829aac53cb449e3bb574d2a1669e025e Mon Sep 17 00:00:00 2001 From: "http://kerravonsen.dreamwidth.org/" Date: Wed, 10 Nov 2010 00:53:10 +0000 Subject: make match_glob faster - patch! --- ...mproving_the_efficiency_of_match__95__glob.mdwn | 39 ++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn (limited to 'doc') diff --git a/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn b/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn new file mode 100644 index 000000000..8f70f1dde --- /dev/null +++ b/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn @@ -0,0 +1,39 @@ +I've been profiling my IkiWiki to try to improve speed (with many pages makes speed even more important) and I've written a patch to improve the speed of match_glob. This matcher is a good one to improve the speed of, because it gets called so many times. + +Here's my patch - please consider it! -- [[KathrynAndersen]] + +-------------------------------------------------------------- +
+diff --git a/IkiWiki.pm b/IkiWiki.pm
+index 08a3d78..c187b98 100644
+--- a/IkiWiki.pm
++++ b/IkiWiki.pm
+@@ -2482,6 +2482,8 @@ sub derel ($$) {
+ 	return $path;
+ }
+ 
++my %glob_cache;
++
+ sub match_glob ($$;@) {
+ 	my $page=shift;
+ 	my $glob=shift;
+@@ -2489,8 +2491,15 @@ sub match_glob ($$;@) {
+ 	
+ 	$glob=derel($glob, $params{location});
+ 
+-	my $regexp=IkiWiki::glob2re($glob);
+-	if ($page=~/^$regexp$/i) {
++	# Instead of converting the glob to a regex every time,
++	# cache the compiled regex to save time.
++	if (!exists $glob_cache{$glob}
++	    or !defined $glob_cache{$glob})
++	{
++	    my $re=IkiWiki::glob2re($glob);
++	    $glob_cache{$glob} = qr/^$re$/i;
++	}
++	if ($page =~ $glob_cache{$glob}) {
+ 		if (! IkiWiki::isinternal($page) || $params{internal}) {
+ 			return IkiWiki::SuccessReason->new("$glob matches $page");
+ 		}
+
+-------------------------------------------------------------- -- cgit v1.2.3 From e810fe394b49955971299329136d46548d95ec6b Mon Sep 17 00:00:00 2001 From: "http://smcv.pseudorandom.co.uk/" Date: Wed, 10 Nov 2010 13:26:16 +0000 Subject: possible improvement --- doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'doc') diff --git a/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn b/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn index 8f70f1dde..0a9d8c69c 100644 --- a/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn +++ b/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn @@ -2,6 +2,10 @@ I've been profiling my IkiWiki to try to improve speed (with many pages makes sp Here's my patch - please consider it! -- [[KathrynAndersen]] +> It seems to me as though changing `glob2re` to return qr/$re/, and calling +> `memoize(glob2re)` next to the other memoize calls, would be a less +> verbose way to do this? --[[smcv]] + -------------------------------------------------------------- 
 diff --git a/IkiWiki.pm b/IkiWiki.pm
-- 
cgit v1.2.3


From 08a20a3deaca2cb1f68fba993411b51c19e4c362 Mon Sep 17 00:00:00 2001
From: Joey Hess 
Date: Wed, 10 Nov 2010 11:37:59 -0400
Subject: benchmarks

---
 doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'doc')

diff --git a/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn b/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn
index 0a9d8c69c..b63128702 100644
--- a/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn
+++ b/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn
@@ -6,6 +6,9 @@ Here's my patch - please consider it! -- [[KathrynAndersen]]
 > `memoize(glob2re)` next to the other memoize calls, would be a less
 > verbose way to do this? --[[smcv]]
 
+>> I think so, yeah. Anyway, do you have any benchmark results handy,
+>> Kathryn?  --[[Joey]] 
+
 --------------------------------------------------------------
 
 diff --git a/IkiWiki.pm b/IkiWiki.pm
-- 
cgit v1.2.3


From f35f79a0b831e8b47f62c430c1bba538d4687521 Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 
Date: Wed, 10 Nov 2010 21:08:45 +0000
Subject: response with benchmark

---
 ...mproving_the_efficiency_of_match__95__glob.mdwn | 41 ++++++++++++++++++++++
 1 file changed, 41 insertions(+)

(limited to 'doc')

diff --git a/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn b/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn
index b63128702..ff9784dd1 100644
--- a/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn
+++ b/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn
@@ -9,6 +9,47 @@ Here's my patch - please consider it! -- [[KathrynAndersen]]
 >> I think so, yeah. Anyway, do you have any benchmark results handy,
 >> Kathryn?  --[[Joey]] 
 
+>>> See below.
+>>> Also, would it make more sense for glob2re to return qr/^$re$/i rather than qr/$re/?  Everything that uses glob2re seems to use
+	$foo =~ /^$re$/i
+>>> rather than /$re/ so I think that would make sense.
+>>> -- [[KathrynAndersen]]
+
+--------------------------------------------------------------
+Benchmarks done with Devel::Profile on the same testbed IkiWiki setup.  I'm just showing the start of the profile output, since that's what's relevant.
+
+Before:
+
+time elapsed (wall):   27.4173
+time running program:  22.5909  (82.40%)
+time profiling (est.): 4.8264  (17.60%)
+number of calls:       1314729
+number of exceptions:  65
+
+%Time    Sec.     #calls   sec/call  F  name
+11.05    2.4969    62333   0.000040     IkiWiki::PageSpec::match_glob
+ 4.10    0.9261      679   0.001364     Text::Balanced::_match_tagged
+ 2.72    0.6139    59812   0.000010     IkiWiki::SuccessReason::merge_influences
+

+
+After:
+
+time elapsed (wall):   26.1843
+time running program:  21.5673  (82.37%)
+time profiling (est.): 4.6170  (17.63%)
+number of calls:       1252433
+number of exceptions:  65
+
+%Time    Sec.     #calls   sec/call  F  name
+ 7.66    1.6521    62333   0.000027     IkiWiki::PageSpec::match_glob
+ 4.33    0.9336      679   0.001375     Text::Balanced::_match_tagged
+ 2.81    0.6057    59812   0.000010     IkiWiki::SuccessReason::merge_influences
+

+
+Note that the seconds per call for match_glob in the "after" case has gone down by about a third.
+
+K.A.
+
 --------------------------------------------------------------
 
 diff --git a/IkiWiki.pm b/IkiWiki.pm
-- 
cgit v1.2.3


From 8806a9795116e73ec851dfea89af45a786fbe6da Mon Sep 17 00:00:00 2001
From: dark 
Date: Thu, 11 Nov 2010 21:49:10 +0000
Subject: poll vote (Accept both)

---
 doc/news/openid.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'doc')

diff --git a/doc/news/openid.mdwn b/doc/news/openid.mdwn
index 5b145fee4..87f640321 100644
--- a/doc/news/openid.mdwn
+++ b/doc/news/openid.mdwn
@@ -10,4 +10,4 @@ log back in, try out the OpenID signup process if you don't already have an
 OpenID, and see how OpenID works for you. And let me know your feelings about
 making such a switch. --[[Joey]]
 
-[[!poll 67 "Accept only OpenID for logins" 21 "Accept only password logins" 40 "Accept both"]]
+[[!poll 67 "Accept only OpenID for logins" 21 "Accept only password logins" 41 "Accept both"]]
-- 
cgit v1.2.3


From 0a7db85f06674311b80b490dfc238a1eaed040f8 Mon Sep 17 00:00:00 2001
From: 
 "https://www.google.com/accounts/o8/id?id=AItOawmMInRJfXlDaAMktsWQKahl1C7X4cGrUtE"
 
Date: Thu, 11 Nov 2010 23:01:14 +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..90713d1f2 100644
--- a/doc/index.mdwn
+++ b/doc/index.mdwn
@@ -17,7 +17,7 @@ All wikis are supposed to have a [[SandBox]], so this one does too.
 This site generally runs the latest release of ikiwiki; currently, it runs
 ikiwiki [[!version ]].
 
-## developer resources
+## developer resources sas
 
 The [[RoadMap]] describes where the project is going.
 The [[forum]] is open for discussions.
-- 
cgit v1.2.3


From d5056fb61e8332fea658363e931ec28a35681ffe Mon Sep 17 00:00:00 2001
From: Joey Hess 
Date: Fri, 12 Nov 2010 00:24:33 -0400
Subject: add example of skipping blog posts while scrubbing comments

---
 doc/plugins/htmlscrubber.mdwn | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'doc')

diff --git a/doc/plugins/htmlscrubber.mdwn b/doc/plugins/htmlscrubber.mdwn
index c59b46e14..080575c46 100644
--- a/doc/plugins/htmlscrubber.mdwn
+++ b/doc/plugins/htmlscrubber.mdwn
@@ -32,10 +32,11 @@ other HTML-related functionality, such as whether [[meta]] allows
 potentially unsafe HTML tags.
 
 The `htmlscrubber_skip` configuration setting can be used to skip scrubbing
-of some pages. Set it to a [[ikiwiki/PageSpec]], such as "!*/Discussion",
-and pages matching that can have all the evil CSS, JavsScript, and unsafe
-html elements you like. One safe way to use this is to use [[lockedit]] to
-lock those pages, so only admins can edit them.
+of some pages. Set it to a [[ikiwiki/PageSpec]], such as 
+"posts/* and !comment(*) and !*/Discussion", and pages matching that can have
+all the evil CSS, JavsScript, and unsafe html elements you like. One safe
+way to use this is to use [[lockedit]] to lock those pages, so only admins
+can edit them.
 
 ----
 
-- 
cgit v1.2.3


From 0ea5f43790fe2ce3cc40e9513191e72c67a1ee51 Mon Sep 17 00:00:00 2001
From: Joey Hess 
Date: Fri, 12 Nov 2010 00:24:52 -0400
Subject: security issue

---
 doc/security.mdwn | 13 +++++++++++++
 1 file changed, 13 insertions(+)

(limited to 'doc')

diff --git a/doc/security.mdwn b/doc/security.mdwn
index 34a005239..33b199247 100644
--- a/doc/security.mdwn
+++ b/doc/security.mdwn
@@ -440,3 +440,16 @@ with the release of ikiwiki 3.20100312.
 A fix was also backported to Debian etch, as version 2.53.5. I recommend
 upgrading to one of these versions if your wiki can be edited by third
 parties.
+
+## javascript insertation via insufficient htmlscrubbing of comments
+
+Kevin Riggle noticed that it was not possible to configure
+`htmlscrubber_skip` to scrub comments while leaving unscubbed the text
+of eg, blog posts. Confusingly, setting it to "* and !comment(*)" did not
+scrub comments.
+
+Additionally, it was discovered that comments' html was never scrubbed during
+preview or moderation of comments.
+
+These problems were discovered on 12 November 2010 and fixed the same
+hour with the release of ikiwiki 3.20101112.
-- 
cgit v1.2.3


From 5dbf25127fb776cc52a3a142b805a0c7f3cef242 Mon Sep 17 00:00:00 2001
From: Joey Hess 
Date: Fri, 12 Nov 2010 00:45:00 -0400
Subject: releasing version 3.20101112

---
 debian/changelog  |  4 ++--
 doc/security.mdwn |  2 +-
 ikiwiki.spec      |  2 +-
 po/ikiwiki.pot    | 10 +++++-----
 4 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'doc')

diff --git a/debian/changelog b/debian/changelog
index 2c4c9274a..f8dc04eca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-ikiwiki (3.20101024) UNRELEASED; urgency=low
+ikiwiki (3.20101112) unstable; urgency=HIGH
 
   * txt: Fix display when used inside a format directive.
   * highlight: Ensure that other, more-specific format plugins,
@@ -16,7 +16,7 @@ ikiwiki (3.20101024) UNRELEASED; urgency=low
   * comments: Make comment() pagespec also match comments that are being
     posted.
 
- -- Joey Hess   Mon, 25 Oct 2010 22:30:29 -0400
+ -- Joey Hess   Fri, 12 Nov 2010 00:36:06 -0400
 
 ikiwiki (3.20101023) unstable; urgency=low
 
diff --git a/doc/security.mdwn b/doc/security.mdwn
index 33b199247..2c342b199 100644
--- a/doc/security.mdwn
+++ b/doc/security.mdwn
@@ -449,7 +449,7 @@ of eg, blog posts. Confusingly, setting it to "* and !comment(*)" did not
 scrub comments.
 
 Additionally, it was discovered that comments' html was never scrubbed during
-preview or moderation of comments.
+preview or moderation of comments with such a configuration.
 
 These problems were discovered on 12 November 2010 and fixed the same
 hour with the release of ikiwiki 3.20101112.
diff --git a/ikiwiki.spec b/ikiwiki.spec
index 7653ac671..5ef43903d 100644
--- a/ikiwiki.spec
+++ b/ikiwiki.spec
@@ -1,5 +1,5 @@
 Name:           ikiwiki
-Version: 3.20101023
+Version: 3.20101112
 Release:        1%{?dist}
 Summary:        A wiki compiler
 
diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot
index fa65b6f93..e4274d0f6 100644
--- a/po/ikiwiki.pot
+++ b/po/ikiwiki.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-23 17:21-0400\n"
+"POT-Creation-Date: 2010-11-12 00:37-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME \n"
 "Language-Team: LANGUAGE \n"
@@ -203,7 +203,7 @@ msgstr ""
 msgid "moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:137 ../IkiWiki/Plugin/format.pm:48
+#: ../IkiWiki/Plugin/comments.pm:137 ../IkiWiki/Plugin/format.pm:50
 #, perl-format
 msgid "unsupported page format %s"
 msgstr ""
@@ -268,7 +268,7 @@ msgstr ""
 msgid "comment moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:822
+#: ../IkiWiki/Plugin/comments.pm:828
 #, perl-format
 msgid "%i comment"
 msgid_plural "%i comments"
@@ -278,7 +278,7 @@ msgstr[1] ""
 #. translators: Here "Comment" is a verb;
 #. translators: the user clicks on it to
 #. translators: post a comment.
-#: ../IkiWiki/Plugin/comments.pm:832
+#: ../IkiWiki/Plugin/comments.pm:838
 msgid "Comment"
 msgstr ""
 
@@ -411,7 +411,7 @@ msgid ""
 "warning: highlight perl module not available; falling back to pass through"
 msgstr ""
 
-#: ../IkiWiki/Plugin/htmltidy.pm:62
+#: ../IkiWiki/Plugin/htmltidy.pm:63
 msgid "htmltidy failed to parse this html"
 msgstr ""
 
-- 
cgit v1.2.3


From 65ecc73755348f1ed13b77b2f4bdf9db4e465be4 Mon Sep 17 00:00:00 2001
From: Joey Hess 
Date: Fri, 12 Nov 2010 00:46:29 -0400
Subject: add news item for ikiwiki 3.20101112

---
 doc/news/version_3.20100831.mdwn | 27 ---------------------------
 doc/news/version_3.20101112.mdwn | 17 +++++++++++++++++
 2 files changed, 17 insertions(+), 27 deletions(-)
 delete mode 100644 doc/news/version_3.20100831.mdwn
 create mode 100644 doc/news/version_3.20101112.mdwn

(limited to 'doc')

diff --git a/doc/news/version_3.20100831.mdwn b/doc/news/version_3.20100831.mdwn
deleted file mode 100644
index 152e3c2f7..000000000
--- a/doc/news/version_3.20100831.mdwn
+++ /dev/null
@@ -1,27 +0,0 @@
-ikiwiki 3.20100831 released with [[!toggle text="these changes"]]
-[[!toggleable text="""
-   * filecheck: Fall back to using the file command if the freedesktop
-     magic file cannot identify a file.
-   * flattr: New plugin. (Thanks to jaywalk for the initial implementation
-     at a flattr plugin! This one is less configurable, but simpler.)
-   * smiley: warn instead of error for missing smileys (Giuseppe Bilotta)
-   * openid: Syntax tweak to the javascript code to make it work with MSIE 7
-     (and MSIE 8 in compat mode). Thanks to Iain McLaren for reporting
-     the bug and providing access to debug it.
-   * style.css: Use relative, not absolute font sizes. Thanks, Giuseppe Bilotta.
-   * htmlscrubber: Do not scrub url anchors that contain colons.
-   * Danish translation update. Closes: #[594673](http://bugs.debian.org/594673)
-   * highlight: Make location of highlight's files configurable in setup
-     file to allow for nonstandard installations.
-   * Allow "link(.)" and similar PageSpecs. Thanks, Giuseppe Bilotta.
-   * Run the preprocess hooks in scan mode *before* the scan hooks.
-     This allows the po plugin to register a scan hook that runs
-     last and rescans pages after all data from the first scan pass is
-     completed. This avoids the po plugin needing to rebuild some pages.
-     (intrigeri)
-   * po: Fix some bugs that affected l10n.ikiwiki.info's unusual
-     setup. (intrigeri)
-   * t/bazaar.t: Work around bzr 2.2.0's new requirement to configure
-     bzr whoami before committing.
-   * httpauth: Avoid redirecting the user to the cgiauthurl if
-     they already have a login session."""]]
\ No newline at end of file
diff --git a/doc/news/version_3.20101112.mdwn b/doc/news/version_3.20101112.mdwn
new file mode 100644
index 000000000..ad591445f
--- /dev/null
+++ b/doc/news/version_3.20101112.mdwn
@@ -0,0 +1,17 @@
+ikiwiki 3.20101112 released with [[!toggle text="these changes"]]
+[[!toggleable text="""
+   * txt: Fix display when used inside a format directive.
+   * highlight: Ensure that other, more-specific format plugins,
+     like txt are used in preference to this one in case of ties.
+   * htmltidy, sortnaturally: Add missing checkconfig hook
+     registration. Closes: #[601912](http://bugs.debian.org/601912)
+     (Thanks, Craig Lennox and Tuomas Jormola)
+   * git: Use author date, not committer date. Closes: #[602012](http://bugs.debian.org/602012)
+     (Thanks, Tuomas Jormola)
+   * Fix htmlscrubber\_skip to be matched on the source page, not the page it is
+     inlined into. Should allow setting to "* and !comment(*)" to scrub
+     comments, but leave your blog posts unscrubbed, etc.
+   * comments: Make postcomment() pagespec work when previewing a comment,
+     including during moderation.
+   * comments: Make comment() pagespec also match comments that are being
+     posted."""]]
\ No newline at end of file
-- 
cgit v1.2.3


From ebcc0e6c9068bafaa52938a9f3aae6d6dd3d60aa Mon Sep 17 00:00:00 2001
From: 
 "https://www.google.com/accounts/o8/id?id=AItOawmrVK0l7LGe93rzchPlVg7bukNgTsqTbn8"
 
Date: Fri, 12 Nov 2010 13:35:34 +0000
Subject:

---
 doc/todo/Add_nicer_math_formatting.mdwn | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'doc')

diff --git a/doc/todo/Add_nicer_math_formatting.mdwn b/doc/todo/Add_nicer_math_formatting.mdwn
index 6e082c102..3a5e94a14 100644
--- a/doc/todo/Add_nicer_math_formatting.mdwn
+++ b/doc/todo/Add_nicer_math_formatting.mdwn
@@ -21,4 +21,6 @@ It would be nice to add nicer math formatting.  I currently use the
 > I've posted a question about this to its forum:  --[[Joey]] 
 >  
 
+I think [mathjax](http://www.mathjax.org/) would be the best option. This is the math rendering engine used in mathoverflow.
+
 [[!tag wishlist]]
-- 
cgit v1.2.3


From 5f750e16b8c32d2fd69209f433e7d19efa53a71f Mon Sep 17 00:00:00 2001
From: Joey Hess 
Date: Fri, 12 Nov 2010 10:25:21 -0400
Subject: CVE id

---
 debian/changelog  | 6 +++---
 doc/security.mdwn | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'doc')

diff --git a/debian/changelog b/debian/changelog
index f8dc04eca..582a8e36a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,11 +10,11 @@ ikiwiki (3.20101112) unstable; urgency=HIGH
     (Thanks, Tuomas Jormola)
   * Fix htmlscrubber_skip to be matched on the source page, not the page it is
     inlined into. Should allow setting to "* and !comment(*)" to scrub
-    comments, but leave your blog posts unscrubbed, etc.
+    comments, but leave your blog posts unscrubbed, etc. CVE-2010-1673
   * comments: Make postcomment() pagespec work when previewing a comment,
-    including during moderation.
+    including during moderation. CVE-2010-1673
   * comments: Make comment() pagespec also match comments that are being
-    posted.
+    posted. CVE-2010-1673
 
  -- Joey Hess   Fri, 12 Nov 2010 00:36:06 -0400
 
diff --git a/doc/security.mdwn b/doc/security.mdwn
index 2c342b199..4fa531eb1 100644
--- a/doc/security.mdwn
+++ b/doc/security.mdwn
@@ -452,4 +452,4 @@ Additionally, it was discovered that comments' html was never scrubbed during
 preview or moderation of comments with such a configuration.
 
 These problems were discovered on 12 November 2010 and fixed the same
-hour with the release of ikiwiki 3.20101112.
+hour with the release of ikiwiki 3.20101112. ([[!cve CVE-2010-1673]])
-- 
cgit v1.2.3


From 98d0883c8949e6cde8db019bb282d5fa815ffc1a Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" 
Date: Sun, 14 Nov 2010 16:50:31 +0000
Subject: branches imported into git; benchmark results

---
 ...mproving_the_efficiency_of_match__95__glob.mdwn | 71 ++++++++++++++++++++++
 1 file changed, 71 insertions(+)

(limited to 'doc')

diff --git a/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn b/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn
index ff9784dd1..c4d3a8ecb 100644
--- a/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn
+++ b/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn
@@ -15,6 +15,11 @@ Here's my patch - please consider it! -- [[KathrynAndersen]]
 >>> rather than /$re/ so I think that would make sense.
 >>> -- [[KathrynAndersen]]
 
+>>>> Git branch `smcv/ka-glob-cache` has Kathryn's patch. Git
+>>>> branch `smcv/memoize-glob2re` does as I suggested, which
+>>>> is less verbose than Kathryn's patch but also not as
+>>>> fast; I'm not sure why, tbh. --[[smcv]]
+
 --------------------------------------------------------------
 Benchmarks done with Devel::Profile on the same testbed IkiWiki setup.  I'm just showing the start of the profile output, since that's what's relevant.
 
@@ -51,6 +56,72 @@ Note that the seconds per call for match_glob in the "after" case has gone down
 K.A.
 
 --------------------------------------------------------------
+
+A second set of benchmarks, done by rebuilding the docwiki at commit f942c2db05e4
+like so:
+
+    perl -Iblib/lib -d:Profile ikiwiki.in -setup docwiki.setup --no-verbose
+
+The docwiki appears to use fewer glob matches than Kathryn's wiki.
+
+With master:
+
+    time elapsed (wall):   29.6970
+    time running program:  24.6930  (83.15%)
+    time profiling (est.): 5.0041  (16.85%)
+    number of calls:       1359180
+    number of exceptions:  13
+
+    %Time    Sec.     #calls   sec/call  F  name
+    13.62    3.3629     3406   0.000987     Text::Balanced::_match_tagged
+    10.84    2.6773    79442   0.000034     IkiWiki::PageSpec::match_glob
+     3.08    0.7598    59454   0.000013     :IkiWiki/Plugin/inline.pm:223
+     3.07    0.7593    29830   0.000025     IkiWiki::bestlink
+     2.99    0.7378    10231   0.000072     IkiWiki::PageSpec::match_link
+
+With my `smcv/memoize-glob2re` branch:
+
+    time elapsed (wall):   30.4931
+    time running program:  25.1248  (82.39%)
+    time profiling (est.): 5.3683  (17.61%)
+    number of calls:       1439943
+    number of exceptions:  13
+
+    %Time    Sec.     #calls   sec/call  F  name
+    13.19    3.3146     3406   0.000973     Text::Balanced::_match_tagged
+     8.41    2.1123    79442   0.000027     IkiWiki::PageSpec::match_glob
+     3.97    0.9979    86905   0.000011     Memoize::_memoizer
+     3.05    0.7654    59454   0.000013     :IkiWiki/Plugin/inline.pm:223
+     3.02    0.7576    29830   0.000025     IkiWiki::bestlink
+
+and in a repeated run:
+
+     8.40    2.0905    79442   0.000026     IkiWiki::PageSpec::match_glob
+
+With Kathryn's patch as seen in my `smcv/ka-glob-cache` branch:
+
+    time elapsed (wall):   27.7567
+    time running program:  22.9941  (82.84%)
+    time profiling (est.): 4.7627  (17.16%)
+    number of calls:       1279946
+    number of exceptions:  13
+
+    %Time    Sec.     #calls   sec/call  F  name
+    14.29    3.2867     3406   0.000965     Text::Balanced::_match_tagged
+     7.89    1.8136    79442   0.000023     IkiWiki::PageSpec::match_glob
+     3.30    0.7577    59454   0.000013     :IkiWiki/Plugin/inline.pm:223
+     3.24    0.7461    29830   0.000025     IkiWiki::bestlink
+     3.19    0.7332      143   0.005127  ?  IkiWiki::pagespec_match_list
+
+and in a repeated run:
+
+     7.84    1.8253    79442   0.000023     IkiWiki::PageSpec::match_glob
+
+--[[smcv]]
+
+--------------------------------------------------------------
+
+
 
 diff --git a/IkiWiki.pm b/IkiWiki.pm
 index 08a3d78..c187b98 100644
-- 
cgit v1.2.3


From 9d26a72468fad69d633875b4ffb4aff8abd80023 Mon Sep 17 00:00:00 2001
From: Simon McVittie 
Date: Sun, 14 Nov 2010 18:19:46 +0000
Subject: point to my 'transient' branch

---
 ...o-create_tag_pages_according_to_a_template.mdwn |  2 ++
 .../autoindex_should_use_add__95__autofile.mdwn    |  2 ++
 doc/todo/transient_in-memory_pages.mdwn            | 23 ++++++++++++++++++++++
 3 files changed, 27 insertions(+)

(limited to 'doc')

diff --git a/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn b/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
index 676e2bc00..e065c4a3d 100644
--- a/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
+++ b/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
@@ -262,4 +262,6 @@ other pages claim it as an alias. --[[chrysn]]
 
 I agree with [[chrysn]]. In fact, is there any good reason that the core tag plugin doesn't do this? The current usability is horrible, to the point that I have gone 2.5 years with Ikiwiki and haven't yet started using tags. -- [[Eric|http://wiki.pdxhub.org/people/eric]]
 
+> See [[todo/transient in-memory pages]] for progress on this. --[[smcv]]
+
 [[!tag done]]
diff --git a/doc/todo/autoindex_should_use_add__95__autofile.mdwn b/doc/todo/autoindex_should_use_add__95__autofile.mdwn
index 517567e58..64f81c82e 100644
--- a/doc/todo/autoindex_should_use_add__95__autofile.mdwn
+++ b/doc/todo/autoindex_should_use_add__95__autofile.mdwn
@@ -1,2 +1,4 @@
 `add_autofile` is a generic version of [[plugins/autoindex]]'s code,
 so the latter should probably use the former. --[[smcv]]
+
+> See [[todo/transient in-memory pages]] for progress on this. --[[smcv]]
diff --git a/doc/todo/transient_in-memory_pages.mdwn b/doc/todo/transient_in-memory_pages.mdwn
index 9808ffdfe..5dbbe4f82 100644
--- a/doc/todo/transient_in-memory_pages.mdwn
+++ b/doc/todo/transient_in-memory_pages.mdwn
@@ -18,3 +18,26 @@ This would also be useful for autoindex, as suggested on
 One refinement I'd suggest is that if the transient page is edited,
 its transient contents are evaluated and used as the initial
 content for the edit box; after that, it'd become a static page. --[[smcv]]
+
+--------------------------
+
+[[!template id=gitbranch branch=smcv/transient author="[[smcv]]"]]
+[[!tag patch]]
+
+I had a look at implementing this. It turns out to be harder than I thought
+to have purely in-memory pages (several plugins want to be able to access the
+source file as a file), but I did get this proof-of-concept branch
+to write tag and autoindex pages into an underlay.
+
+This loses the ability to delete the auto-created pages (although they don't
+clutter up git this way, at least), and a lot of the code in autoindex is
+probably now redundant, so this is probably not quite ready for merge, but
+I'd welcome opinions.
+
+Usage: set `tag_underlay` and/or `autoindex_underlay` to an absolute path,
+which you must create beforehand. I suggest *srcdir* + `/.ikiwiki/transient`.
+
+Refinements that could be made if this approach seems reasonable:
+
+* make these options boolean, and have the path always be `.ikiwiki/transient`
+* improve the `remove` plugin so it also deletes from this special underlay
-- 
cgit v1.2.3


From 608cef54d63ba60efd24ae14012dda7ff8d014a9 Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 
Date: Mon, 15 Nov 2010 02:01:21 +0000
Subject: theory about differences in speed of memoize and non-memoize patches

---
 doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'doc')

diff --git a/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn b/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn
index c4d3a8ecb..43571ead7 100644
--- a/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn
+++ b/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn
@@ -20,6 +20,8 @@ Here's my patch - please consider it! -- [[KathrynAndersen]]
 >>>> is less verbose than Kathryn's patch but also not as
 >>>> fast; I'm not sure why, tbh. --[[smcv]]
 
+>>>>> I think it's because my patch focuses on match_glob while the memoize patch focuses on `glob2re`, and `glob2re` is called in `filecheck`, `meta` and `po` as well as in `match_glob` and `match_user`; thus the memoized `glob2re` is dealing with a bigger set of globs to look up, and thus could be just that little bit slower. -- [[KathrynAndersen]]
+
 --------------------------------------------------------------
 Benchmarks done with Devel::Profile on the same testbed IkiWiki setup.  I'm just showing the start of the profile output, since that's what's relevant.
 
-- 
cgit v1.2.3


From ffeee19216182d633d251852ab62fe79c1367796 Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 
Date: Mon, 15 Nov 2010 05:43:56 +0000
Subject: make it more generic?

---
 doc/todo/transient_in-memory_pages.mdwn | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'doc')

diff --git a/doc/todo/transient_in-memory_pages.mdwn b/doc/todo/transient_in-memory_pages.mdwn
index 5dbbe4f82..816e95c38 100644
--- a/doc/todo/transient_in-memory_pages.mdwn
+++ b/doc/todo/transient_in-memory_pages.mdwn
@@ -41,3 +41,8 @@ Refinements that could be made if this approach seems reasonable:
 
 * make these options boolean, and have the path always be `.ikiwiki/transient`
 * improve the `remove` plugin so it also deletes from this special underlay
+
+>> Perhaps it should be something more generic, so that other plugins could use it (such as "album" mentioned above).
+>> The `.ikiwiki/transient` would suit this, but instead of saying "tag_underlay" or "autoindex_underlay" have "use_transient_underlay" or something like that?
+>> Or to make it more flexible, have just one option "transient_underlay" which is set to an absolute path, and if it is set, then one is using a transient-underlay.
+>> --[[KathrynAndersen]]
-- 
cgit v1.2.3


From 263cfa7d1e938e3b41d1b6826427f0d613b2b97c Mon Sep 17 00:00:00 2001
From: "http://jmtd.livejournal.com/" 
Date: Mon, 15 Nov 2010 10:08:30 +0000
Subject: aggregate: too long filenames

---
 doc/bugs/aggregate_generates_long_filenames.mdwn | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 doc/bugs/aggregate_generates_long_filenames.mdwn

(limited to 'doc')

diff --git a/doc/bugs/aggregate_generates_long_filenames.mdwn b/doc/bugs/aggregate_generates_long_filenames.mdwn
new file mode 100644
index 000000000..cb5e6df73
--- /dev/null
+++ b/doc/bugs/aggregate_generates_long_filenames.mdwn
@@ -0,0 +1,10 @@
+the [[pluhins/aggregate]] plugin mashes the `title` of an aggregated post into a filename.  This results in long filenames.  I have hit a filesystem length limitation on several occasions.  Some (ab)uses of RSS, e.g., twitter,
+generate long titles.  Especially once you throw escaping into the mix:
+
+    $ ikiwiki --setup testsetup --aggregate --refresh
+    failed to write ./test/lifestream/Hidden_Features_Of_Perl__44___PHP__44___Javascript__44___C__44___C++__44___C__35____44___Java__44___Ruby___46____46____46__._aggregated.ikiwiki-new: File name too long
+    aggregation failed with code 9216
+    $ echo $?
+    25
+
+-- [[Jon]]
-- 
cgit v1.2.3


From 471ac78068532da53e4dad49d52c5ddccfcbff21 Mon Sep 17 00:00:00 2001
From: "http://jmtd.livejournal.com/" 
Date: Mon, 15 Nov 2010 10:09:41 +0000
Subject: typo

---
 doc/bugs/aggregate_generates_long_filenames.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'doc')

diff --git a/doc/bugs/aggregate_generates_long_filenames.mdwn b/doc/bugs/aggregate_generates_long_filenames.mdwn
index cb5e6df73..3d98ee8b2 100644
--- a/doc/bugs/aggregate_generates_long_filenames.mdwn
+++ b/doc/bugs/aggregate_generates_long_filenames.mdwn
@@ -1,4 +1,4 @@
-the [[pluhins/aggregate]] plugin mashes the `title` of an aggregated post into a filename.  This results in long filenames.  I have hit a filesystem length limitation on several occasions.  Some (ab)uses of RSS, e.g., twitter,
+the [[plugins/aggregate]] plugin mashes the `title` of an aggregated post into a filename.  This results in long filenames.  I have hit a filesystem length limitation on several occasions.  Some (ab)uses of RSS, e.g., twitter,
 generate long titles.  Especially once you throw escaping into the mix:
 
     $ ikiwiki --setup testsetup --aggregate --refresh
-- 
cgit v1.2.3


From 85ee24a9e53aec7d70bb4fb758428e59ea76e853 Mon Sep 17 00:00:00 2001
From: "http://jmtd.livejournal.com/" 
Date: Mon, 15 Nov 2010 10:11:40 +0000
Subject:

---
 doc/bugs/aggregate_generates_long_filenames.mdwn | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'doc')

diff --git a/doc/bugs/aggregate_generates_long_filenames.mdwn b/doc/bugs/aggregate_generates_long_filenames.mdwn
index 3d98ee8b2..40decb392 100644
--- a/doc/bugs/aggregate_generates_long_filenames.mdwn
+++ b/doc/bugs/aggregate_generates_long_filenames.mdwn
@@ -7,4 +7,7 @@ generate long titles.  Especially once you throw escaping into the mix:
     $ echo $?
     25
 
+It would also appear this abrubtly terminates aggregate processing (if not ikiwiki itself).  Only after moving my test repo to `/tmp` to shorten the filename did I see newer RSS feeds (from a totally different source) picked up.
+
+
 -- [[Jon]]
-- 
cgit v1.2.3


From 5ecba3b05d66bb58dc48a9027838e8b0bcbc0db9 Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" 
Date: Mon, 15 Nov 2010 11:14:21 +0000
Subject: more discussion

---
 doc/todo/transient_in-memory_pages.mdwn | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

(limited to 'doc')

diff --git a/doc/todo/transient_in-memory_pages.mdwn b/doc/todo/transient_in-memory_pages.mdwn
index 816e95c38..edf056e4a 100644
--- a/doc/todo/transient_in-memory_pages.mdwn
+++ b/doc/todo/transient_in-memory_pages.mdwn
@@ -46,3 +46,21 @@ Refinements that could be made if this approach seems reasonable:
 >> The `.ikiwiki/transient` would suit this, but instead of saying "tag_underlay" or "autoindex_underlay" have "use_transient_underlay" or something like that?
 >> Or to make it more flexible, have just one option "transient_underlay" which is set to an absolute path, and if it is set, then one is using a transient-underlay.
 >> --[[KathrynAndersen]]
+
+>>> What I had in mind was more like `tag_autocreate_transient => 1` or
+>>> `autoindex_transient => 1`; you might conceivably want tags to be
+>>> checked in but autoindices to be transient, and it's fine for each
+>>> plugin to make its own decision. Going from that to one boolean
+>>> (or just always-transient if people don't think that's too
+>>> astonishing) would be trivial, though.
+>>>
+>>> I don't think relocating the transient underlay really makes sense,
+>>> except for prototyping: you only want one, and `.ikiwiki` is as good
+>>> a place as any (ikiwiki already needs to be able to write there).
+>>>
+>>> For [[plugins/contrib/album]] I think I'd just make the photo viewer
+>>> pages always-transient - you can always make a transient page
+>>> permanent by editing it, after all.
+>>>
+>>> Do you think this approach has enough potential that I should
+>>> continue to hack on it? Any thoughts on the implementation? --[[smcv]]
-- 
cgit v1.2.3


From 53e519931f3a6b7cea0af652d749344757d4e2bc Mon Sep 17 00:00:00 2001
From: "http://jmtd.livejournal.com/" 
Date: Mon, 15 Nov 2010 14:23:01 +0000
Subject: template files being treated as regular pages and the problems that
 can cause

---
 ...c:_mixing_templates_and_creation__95__date.mdwn | 58 ++++++++++++++++++++++
 1 file changed, 58 insertions(+)
 create mode 100644 doc/bugs/argument_isn__39__t_numeric:_mixing_templates_and_creation__95__date.mdwn

(limited to 'doc')

diff --git a/doc/bugs/argument_isn__39__t_numeric:_mixing_templates_and_creation__95__date.mdwn b/doc/bugs/argument_isn__39__t_numeric:_mixing_templates_and_creation__95__date.mdwn
new file mode 100644
index 000000000..70af505c1
--- /dev/null
+++ b/doc/bugs/argument_isn__39__t_numeric:_mixing_templates_and_creation__95__date.mdwn
@@ -0,0 +1,58 @@
+I get the following error when building my wiki
+
+    Argument "\x{3c}\x{54}..." isn't numeric in numeric eq (==) at /usr/share/perl5/IkiWiki.pm line 2547.
+    Argument "\x{3c}\x{54}..." isn't numeric in numeric eq (==) at /usr/share/perl5/IkiWiki.pm line 2547.
+
+that line corresponds to
+
+    sub match_creation_year ($$;@) {
+	if ((localtime($IkiWiki::pagectime{shift()}))[5] + 1900 == shift) { <-- this one
+		return IkiWiki::SuccessReason->new('creation_year matched');
+	}
+
+A git bisect shows that the offending commit introduced this hunk
+
+
+    --- /dev/null
+    +++ b/templates/all_entry.mdwn
+    @@ -0,0 +1,23 @@
+    +## 
+    +
+    +There
+    +
+    +have been
+    +
+    +were
+    +
+    +[[!pagecount pages="
+    +log/* and !tagged(aggregation) and !*/Discussion and !tagged(draft)
+    +and creation_year()
+    +and !*.png and !*.jpg
+    +"]] posts
+    +
+    +so far
+    +
+    +in .
+    +
+    +[[!inline pages="
+    +    log/* and !tagged(aggregation) and !*/Discussion and !tagged(draft)
+    +    and creation_year()
+    +    and !*.png and !*.jpg
+    +    " archive=yes feeds=no]]
+
+The lines which feature creation_year() are most likely the culprits.  That would explain why the error was repeated twice, and would tally with the file in `templates/` being rendered, rather than the inclusionists.
+
+A workaround is to move the template outside of the srcdir into the external templates directory and include the file suffix when using it, e.g.
+
+    \[[!template id=all_entry.tmpl year=2010 current=true]]
+
+An alternative fix is to wrap the entire template inside a test to see whether the page is included or not. E.g.
+
+
+    \[[!if test="included()" then="""
+    ...template...
+    """ else="""
+    Nothing to see here.
+    """]]
+
+In fact, this is probably best practice for in-srcdir templates.  I'd consider this done if the documentation for the directive suggested it. -- [[Jon]]
-- 
cgit v1.2.3


From da9e1ea667f82d5fca9168dbed19be08040570ff Mon Sep 17 00:00:00 2001
From: "http://jmtd.livejournal.com/" 
Date: Mon, 15 Nov 2010 14:28:05 +0000
Subject: guard templates with the if directive where necessary

---
 doc/ikiwiki/directive/template.mdwn | 34 +++++++++++++++++++++-------------
 1 file changed, 21 insertions(+), 13 deletions(-)

(limited to 'doc')

diff --git a/doc/ikiwiki/directive/template.mdwn b/doc/ikiwiki/directive/template.mdwn
index 9e3ae54df..df391f99e 100644
--- a/doc/ikiwiki/directive/template.mdwn
+++ b/doc/ikiwiki/directive/template.mdwn
@@ -60,22 +60,30 @@ few things:
   `text`.
 * To use one block of text if a variable is set and a second if it's not,
   use `textother text`
+* Each template file included in the wiki's source will also generate a regular
+  wiki page.  In many cases you might want to prevent some of your template
+  being interpreted for the regular page.  Use the [[if]] directive with the
+  `included()` test to guard the template code.
 
 Here's a sample template:
 
-        
-        Name: \[[]]

-        Age: 

-        
-        Favorite color: 

-        
-        No favorite color.

-        
-        
-        

-        
-        
-        
+        \[[!if test="included()" then="""
+          
+          Name: \[[]]

+          Age: 

+          
+            Favorite color: 

+          
+            No favorite color.

+          
+          
+            

+            
+          
+          
+        """ else="""
+          This is a template page.
+        """]]
 
 The filled out template will be formatted the same as the rest of the page
 that contains it, so you can include WikiLinks and all other forms of wiki
-- 
cgit v1.2.3


From 9d0ac3170a8f90d2139ef75698e8af21a6435fb4 Mon Sep 17 00:00:00 2001
From: "http://jmtd.livejournal.com/" 
Date: Mon, 15 Nov 2010 14:28:50 +0000
Subject: done with commit da9e1ea667f82d5fca916

---
 ...ent_isn__39__t_numeric:_mixing_templates_and_creation__95__date.mdwn | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'doc')

diff --git a/doc/bugs/argument_isn__39__t_numeric:_mixing_templates_and_creation__95__date.mdwn b/doc/bugs/argument_isn__39__t_numeric:_mixing_templates_and_creation__95__date.mdwn
index 70af505c1..5485bba9c 100644
--- a/doc/bugs/argument_isn__39__t_numeric:_mixing_templates_and_creation__95__date.mdwn
+++ b/doc/bugs/argument_isn__39__t_numeric:_mixing_templates_and_creation__95__date.mdwn
@@ -56,3 +56,5 @@ An alternative fix is to wrap the entire template inside a test to see whether t
     """]]
 
 In fact, this is probably best practice for in-srcdir templates.  I'd consider this done if the documentation for the directive suggested it. -- [[Jon]]
+
+> [[done]] with  -- [[Jon]]
-- 
cgit v1.2.3


From 62fc5d0c3cfdde0ae87c5364db6f6ebfa6794b14 Mon Sep 17 00:00:00 2001
From: "http://jmtd.livejournal.com/" 
Date: Mon, 15 Nov 2010 14:41:40 +0000
Subject: I totally misinterpreted what included() is supposed to be for.

This reverts commit da9e1ea667f82d5fca9168dbed19be08040570ff
---
 doc/ikiwiki/directive/template.mdwn | 34 +++++++++++++---------------------
 1 file changed, 13 insertions(+), 21 deletions(-)

(limited to 'doc')

diff --git a/doc/ikiwiki/directive/template.mdwn b/doc/ikiwiki/directive/template.mdwn
index df391f99e..9e3ae54df 100644
--- a/doc/ikiwiki/directive/template.mdwn
+++ b/doc/ikiwiki/directive/template.mdwn
@@ -60,30 +60,22 @@ few things:
   `text`.
 * To use one block of text if a variable is set and a second if it's not,
   use `textother text`
-* Each template file included in the wiki's source will also generate a regular
-  wiki page.  In many cases you might want to prevent some of your template
-  being interpreted for the regular page.  Use the [[if]] directive with the
-  `included()` test to guard the template code.
 
 Here's a sample template:
 
-        \[[!if test="included()" then="""
-          
-          Name: \[[]]

-          Age: 

-          
-            Favorite color: 

-          
-            No favorite color.

-          
-          
-            

-            
-          
-          
-        """ else="""
-          This is a template page.
-        """]]
+        
+        Name: \[[]]

+        Age: 

+        
+        Favorite color: 

+        
+        No favorite color.

+        
+        
+        

+        
+        
+        
 
 The filled out template will be formatted the same as the rest of the page
 that contains it, so you can include WikiLinks and all other forms of wiki
-- 
cgit v1.2.3


From 5430d5dc3bc37df92eb01cd65382c0f2be78b8e7 Mon Sep 17 00:00:00 2001
From: "http://jmtd.livejournal.com/" 
Date: Mon, 15 Nov 2010 14:43:35 +0000
Subject: not quite done yet: if/included() doesn't work that way.

---
 ...sn__39__t_numeric:_mixing_templates_and_creation__95__date.mdwn | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'doc')

diff --git a/doc/bugs/argument_isn__39__t_numeric:_mixing_templates_and_creation__95__date.mdwn b/doc/bugs/argument_isn__39__t_numeric:_mixing_templates_and_creation__95__date.mdwn
index 5485bba9c..83093895b 100644
--- a/doc/bugs/argument_isn__39__t_numeric:_mixing_templates_and_creation__95__date.mdwn
+++ b/doc/bugs/argument_isn__39__t_numeric:_mixing_templates_and_creation__95__date.mdwn
@@ -46,8 +46,7 @@ A workaround is to move the template outside of the srcdir into the external tem
 
     \[[!template id=all_entry.tmpl year=2010 current=true]]
 
-An alternative fix is to wrap the entire template inside a test to see whether the page is included or not. E.g.
-
+I believed (until I tested) that the [[ikiwiki/directive/if]] directive, with the `included()` test, would be an option here, E.g.
 
     \[[!if test="included()" then="""
     ...template...
@@ -55,6 +54,4 @@ An alternative fix is to wrap the entire template inside a test to see whether t
     Nothing to see here.
     """]]
 
-In fact, this is probably best practice for in-srcdir templates.  I'd consider this done if the documentation for the directive suggested it. -- [[Jon]]
-
-> [[done]] with  -- [[Jon]]
+However this doesn't work.  I assume "included" in this context means e.g. via an `inline` or `map`, not template trans-clusion. -- [[Jon]]
-- 
cgit v1.2.3


From 84fff62948ad7c7aef664585e8afed86398e7fd4 Mon Sep 17 00:00:00 2001
From: "http://jmtd.livejournal.com/" 
Date: Mon, 15 Nov 2010 14:46:13 +0000
Subject: note about template inclusion

---
 doc/ikiwiki/directive/if.mdwn | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'doc')

diff --git a/doc/ikiwiki/directive/if.mdwn b/doc/ikiwiki/directive/if.mdwn
index 2cbf70cdf..492adf499 100644
--- a/doc/ikiwiki/directive/if.mdwn
+++ b/doc/ikiwiki/directive/if.mdwn
@@ -43,6 +43,8 @@ with the following additional tests:
 
 * included()
 
-  Tests whether the page is being included onto another page.
+  Tests whether the page is being included onto another page, for example
+  via [[inline]] or [[map]].  Note that pages inserted into other pages
+  via [[template]] are not matched here.
 
 [[!meta robots="noindex, follow"]]
-- 
cgit v1.2.3


From f6312319a49cc1860eebbafd937a0f75d8e7baeb Mon Sep 17 00:00:00 2001
From: "http://churchkey.org/author/ian/"
 
Date: Mon, 15 Nov 2010 15:50:37 +0000
Subject: added my reasons for wanting a replace-able template system

---
 doc/todo/replace_HTML::Template_with_Template_Toolkit.mdwn | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'doc')

diff --git a/doc/todo/replace_HTML::Template_with_Template_Toolkit.mdwn b/doc/todo/replace_HTML::Template_with_Template_Toolkit.mdwn
index c4e78ca0b..8650e4f2a 100644
--- a/doc/todo/replace_HTML::Template_with_Template_Toolkit.mdwn
+++ b/doc/todo/replace_HTML::Template_with_Template_Toolkit.mdwn
@@ -58,3 +58,6 @@ Yes, Template::Toolkit is very powerful. But I think it's somehow overkill for a
 I'd have to agree that Template::Toolkit is overkill and personally I'm not a fan, but it is very popular (there is even a book) and the new version (3) is alleged to be much more nimble than current version.  --[[ajt]]
 
 HTML::Template's HTML-like markup prevents me from editing templates in KompoZer or other WYSIWYG HTML editors.  The editor tries to render the template markup rather than display it verbatim, and large parts of the template become invisible.  A markup syntax that doesn't confuse editors (such as Template::Toolkit's "[% FOO %]") may promote template customization.  The ability to replace the template engine would be within the spirit of ikiwiki's extensibility. --Rocco
+
+
+I agree that being able to replace the template toolkit would be a great piece of modularity, and one I would use. If I could use the slot-based filling and the conditional logic from Template::Toolkit, we could build much more flexible inline and archivepage templates that would look different depending on where in the wiki we use them. Some of this can currently be accomplished with separate templates for each use case and a manual call to the right template in the !inline directive, but this is limited, cumbersome, and makes it difficult to reuse bits of formatting by trapping all of that information in multiple template files. -Ian
-- 
cgit v1.2.3


From eb13521f5276cdd21a3f5990b1a1a17234e40174 Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 
Date: Mon, 15 Nov 2010 23:00:48 +0000
Subject: modular, not replacement

---
 doc/todo/replace_HTML::Template_with_Template_Toolkit.mdwn | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'doc')

diff --git a/doc/todo/replace_HTML::Template_with_Template_Toolkit.mdwn b/doc/todo/replace_HTML::Template_with_Template_Toolkit.mdwn
index 8650e4f2a..9725b6541 100644
--- a/doc/todo/replace_HTML::Template_with_Template_Toolkit.mdwn
+++ b/doc/todo/replace_HTML::Template_with_Template_Toolkit.mdwn
@@ -61,3 +61,5 @@ HTML::Template's HTML-like markup prevents me from editing templates in KompoZer
 
 
 I agree that being able to replace the template toolkit would be a great piece of modularity, and one I would use. If I could use the slot-based filling and the conditional logic from Template::Toolkit, we could build much more flexible inline and archivepage templates that would look different depending on where in the wiki we use them. Some of this can currently be accomplished with separate templates for each use case and a manual call to the right template in the !inline directive, but this is limited, cumbersome, and makes it difficult to reuse bits of formatting by trapping all of that information in multiple template files. -Ian
+
+> I don't wish HTML::Template to be *replaced* by Template::Toolkit - as others have said above, it's overkill for my needs.  However, I also agree that HTML::Template has its own problems too.  The idea of making the template system modular, with a choice of which backend to use - I really like that idea. It would enable me to use some other template system I like better, such as Text::Template or Text::NeatTemplate. But I think it would be a lot of work to implement, though perhaps no more work than making the revision-control backend modular, I guess.  One would need to write an IkiWiki template interface that didn't care what the backend was, and yet is somehow still flexible enough to take advantage of special features of different backends.  There are an *awful lot* of things that use templates - not just the `pagetemplate` and `template` plugins, but a number of others which have specialized templates of their own. -- [[KathrynAndersen]]
-- 
cgit v1.2.3


From ab96249d5ad8f3ee9275be3fef9e3467b8f3ffdf Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 
Date: Mon, 15 Nov 2010 23:23:08 +0000
Subject: further thoughts

---
 doc/todo/transient_in-memory_pages.mdwn | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'doc')

diff --git a/doc/todo/transient_in-memory_pages.mdwn b/doc/todo/transient_in-memory_pages.mdwn
index edf056e4a..9c1be7362 100644
--- a/doc/todo/transient_in-memory_pages.mdwn
+++ b/doc/todo/transient_in-memory_pages.mdwn
@@ -64,3 +64,11 @@ Refinements that could be made if this approach seems reasonable:
 >>>
 >>> Do you think this approach has enough potential that I should
 >>> continue to hack on it? Any thoughts on the implementation? --[[smcv]]
+
+>>>> Ah, now I understand what you're getting at. Yes, it makes sense to put transient pages under `.ikiwiki`.
+>>>> I haven't looked at the code, but I'd be interested in seeing whether it's generic enough to be used by other plugins (such as `album`) without too much fuss.
+>>>> The idea of a transient underlay gives us a desirable feature for free: that if someone edits the transient page, it is made permanent and added to the repository.
+>>>>
+>>>> I think the tricky thing with removing these transient underlay pages is the question of how to prevent whatever auto-generated the pages in the first place from generating them again - or, conversely, how to force whatever auto-generated those pages to regenerate them if you've changed your mind.
+>>>> I think you'd need something similar to `will_render` so that transient pages would be automatically removed if whatever auto-generated them is no longer around.
+>>>> -- [[KathrynAndersen]]
-- 
cgit v1.2.3


From 9a7387a53be2b1e182003f3e86cb76d7f10c4b67 Mon Sep 17 00:00:00 2001
From: Joey Hess 
Date: Tue, 16 Nov 2010 13:19:13 -0400
Subject: thoughts

---
 .../Improving_the_efficiency_of_match__95__glob.mdwn    | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

(limited to 'doc')

diff --git a/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn b/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn
index 43571ead7..0fc059ad7 100644
--- a/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn
+++ b/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn
@@ -22,6 +22,23 @@ Here's my patch - please consider it! -- [[KathrynAndersen]]
 
 >>>>> I think it's because my patch focuses on match_glob while the memoize patch focuses on `glob2re`, and `glob2re` is called in `filecheck`, `meta` and `po` as well as in `match_glob` and `match_user`; thus the memoized `glob2re` is dealing with a bigger set of globs to look up, and thus could be just that little bit slower. -- [[KathrynAndersen]]
 
+>>>>>> What may be going on is that glob2re is already a fairly fast
+>>>>>> function, so the overhead of memoizing it with the very generic
+>>>>>> `_memoizer` (see its source) swamps the memoization gain. Note
+>>>>>> that the few functions memoized with the Memoizer before were much
+>>>>>> more expensive, so that little overhead was acceptable then.
+>>>>>>
+>>>>>> It also may be that Kathryn's patch is slightly faster due to using
+>>>>>> the construct `$foo =~ $regexp` rather than `$foo =~ /$regexp/`
+>>>>>> (probably avoids a copy or something like that internally) --
+>>>>>> this despite checking both `exists` and `defined` on the hash, which
+>>>>>> should be reundant AFAICS.
+>>>>>>
+>>>>>> My guess is that the best of both worlds would be to move
+>>>>>> the byhand memoization to glob2re and have it return a compiled
+>>>>>> `/^/i` regexp that can be used without further modifiction in most
+>>>>>> cases. --[[Joey]] 
+
 --------------------------------------------------------------
 Benchmarks done with Devel::Profile on the same testbed IkiWiki setup.  I'm just showing the start of the profile output, since that's what's relevant.
 
-- 
cgit v1.2.3


From 8de7fde49c295a6c9098767b9fdfea79de8476eb Mon Sep 17 00:00:00 2001
From: Joey Hess 
Date: Tue, 16 Nov 2010 13:24:50 -0400
Subject: already fixed

---
 ...nt_isn__39__t_numeric:_mixing_templates_and_creation__95__date.mdwn | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'doc')

diff --git a/doc/bugs/argument_isn__39__t_numeric:_mixing_templates_and_creation__95__date.mdwn b/doc/bugs/argument_isn__39__t_numeric:_mixing_templates_and_creation__95__date.mdwn
index 83093895b..b1053fc38 100644
--- a/doc/bugs/argument_isn__39__t_numeric:_mixing_templates_and_creation__95__date.mdwn
+++ b/doc/bugs/argument_isn__39__t_numeric:_mixing_templates_and_creation__95__date.mdwn
@@ -55,3 +55,6 @@ I believed (until I tested) that the [[ikiwiki/directive/if]] directive, with th
     """]]
 
 However this doesn't work.  I assume "included" in this context means e.g. via an `inline` or `map`, not template trans-clusion. -- [[Jon]]
+
+> As far as I know, this bug was fixed in
+> 4a75dee651390b79ce4ceb1d951b02e28b3ce83a on October 20th. [[done]] --[[Joey]]
-- 
cgit v1.2.3


From 2a452ddf146c4148155095e400f56b4674d76953 Mon Sep 17 00:00:00 2001
From: Joey Hess 
Date: Tue, 16 Nov 2010 13:34:41 -0400
Subject: but it already checks length..

---
 doc/bugs/aggregate_generates_long_filenames.mdwn | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'doc')

diff --git a/doc/bugs/aggregate_generates_long_filenames.mdwn b/doc/bugs/aggregate_generates_long_filenames.mdwn
index 40decb392..c38ad6c7b 100644
--- a/doc/bugs/aggregate_generates_long_filenames.mdwn
+++ b/doc/bugs/aggregate_generates_long_filenames.mdwn
@@ -11,3 +11,11 @@ It would also appear this abrubtly terminates aggregate processing (if not ikiwi
 
 
 -- [[Jon]]
+
+> I have to wonder what filesystem you have there where 147 characters
+> is a long filename. Ikiwiki already uses `POSIX::pathconf` on the srcdir
+> to look up `_PC_NAME_MAX`
+> to see if the filename is too long, and shortens it, so it seems
+> that, in additional to having a rather antique long filename limit, your
+> system also doesn't properly expose it via pathconf. Not sure what
+> ikiwiki can do here. --[[Joey]]
-- 
cgit v1.2.3


From 65e726f201d7b9919271cfe7e8a7314a6abf0fc3 Mon Sep 17 00:00:00 2001
From: Joey Hess 
Date: Tue, 16 Nov 2010 13:42:52 -0400
Subject: response

---
 ...place_HTML::Template_with_Template_Toolkit.mdwn | 24 +++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

(limited to 'doc')

diff --git a/doc/todo/replace_HTML::Template_with_Template_Toolkit.mdwn b/doc/todo/replace_HTML::Template_with_Template_Toolkit.mdwn
index 9725b6541..d55fc0aa8 100644
--- a/doc/todo/replace_HTML::Template_with_Template_Toolkit.mdwn
+++ b/doc/todo/replace_HTML::Template_with_Template_Toolkit.mdwn
@@ -5,9 +5,14 @@ features and thus makes it rather hard to give an ikiwiki site a consistent
 look. If you browse the templates provided in the tarball, you'll notice that
 more than one of them contain the `` tag, which is unnecessary.
 
+> Note that is no longer true, and I didn't have to do such an intrusive
+> change to fix it either. --[[Joey]]
+
 Maybe it's just me, I also find HTML::Template cumbersome to use, due in part
 to its use of capital letters.
 
+> Its entirely optional use of capital letters? --[[Joey]]
+
 Finally, the software seems unmaintained: the mailing list and searchable
 archives linked from
 
@@ -62,4 +67,21 @@ HTML::Template's HTML-like markup prevents me from editing templates in KompoZer
 
 I agree that being able to replace the template toolkit would be a great piece of modularity, and one I would use. If I could use the slot-based filling and the conditional logic from Template::Toolkit, we could build much more flexible inline and archivepage templates that would look different depending on where in the wiki we use them. Some of this can currently be accomplished with separate templates for each use case and a manual call to the right template in the !inline directive, but this is limited, cumbersome, and makes it difficult to reuse bits of formatting by trapping all of that information in multiple template files. -Ian
 
-> I don't wish HTML::Template to be *replaced* by Template::Toolkit - as others have said above, it's overkill for my needs.  However, I also agree that HTML::Template has its own problems too.  The idea of making the template system modular, with a choice of which backend to use - I really like that idea. It would enable me to use some other template system I like better, such as Text::Template or Text::NeatTemplate. But I think it would be a lot of work to implement, though perhaps no more work than making the revision-control backend modular, I guess.  One would need to write an IkiWiki template interface that didn't care what the backend was, and yet is somehow still flexible enough to take advantage of special features of different backends.  There are an *awful lot* of things that use templates - not just the `pagetemplate` and `template` plugins, but a number of others which have specialized templates of their own. -- [[KathrynAndersen]]
+> I don't wish HTML::Template to be *replaced* by Template::Toolkit - as
+> others have said above, it's overkill for my needs.  However, I also
+> agree that HTML::Template has its own problems too.  The idea of making
+> the template system modular, with a choice of which backend to use - I
+> really like that idea. It would enable me to use some other template
+> system I like better, such as Text::Template or Text::NeatTemplate. But I
+> think it would be a lot of work to implement, though perhaps no more work
+> than making the revision-control backend modular, I guess.  One would
+> need to write an IkiWiki template interface that didn't care what the
+> backend was, and yet is somehow still flexible enough to take advantage
+> of special features of different backends.  There are an *awful lot* of
+> things that use templates - not just the `pagetemplate` and `template`
+> plugins, but a number of others which have specialized templates of their
+> own. -- [[KathrynAndersen]]a
+
+>> A modular template system in ikiwiki is unlikely, as template objects
+>> are part of the API,  notably the `pagetemplate` hook. Unless the other
+>> system has a compatible template object. --[[Joey]] 
-- 
cgit v1.2.3


From ec6c1269d251c78d2eef68cb789de6cfc6272464 Mon Sep 17 00:00:00 2001
From: Joey Hess 
Date: Tue, 16 Nov 2010 15:00:04 -0400
Subject: more: Add pages parameter to limit where the more is displayed.
 (thanks, dark)

---
 IkiWiki/Plugin/more.pm                 | 5 ++++-
 debian/changelog                       | 2 ++
 doc/ikiwiki/directive/more.mdwn        | 5 +++++
 doc/todo/selective_more_directive.mdwn | 2 ++
 4 files changed, 13 insertions(+), 1 deletion(-)

(limited to 'doc')

diff --git a/IkiWiki/Plugin/more.pm b/IkiWiki/Plugin/more.pm
index 80e339a1b..6880e366d 100644
--- a/IkiWiki/Plugin/more.pm
+++ b/IkiWiki/Plugin/more.pm
@@ -26,7 +26,10 @@ sub preprocess (@) {
 
 	$params{linktext} = $linktext unless defined $params{linktext};
 
-	if ($params{page} ne $params{destpage}) {
+	if ($params{page} ne $params{destpage} &&
+	    (! exists $params{pages} ||
+	     pagespec_match($params{destpage}, $params{pages},
+		     location => $params{page}))) {
 		return "\n".
 			htmllink($params{page}, $params{destpage}, $params{page},
 				linktext => $params{linktext},
diff --git a/debian/changelog b/debian/changelog
index 91ff0964b..faabf1993 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 ikiwiki (3.20101113) UNRELEASED; urgency=low
 
   * websetup: Fix encoding problem when restoring old setup file.
+  * more: Add pages parameter to limit where the more is displayed.
+    (thanks, dark)
 
  -- Joey Hess   Tue, 16 Nov 2010 14:23:47 -0400
 
diff --git a/doc/ikiwiki/directive/more.mdwn b/doc/ikiwiki/directive/more.mdwn
index 506551910..bda1427f3 100644
--- a/doc/ikiwiki/directive/more.mdwn
+++ b/doc/ikiwiki/directive/more.mdwn
@@ -11,6 +11,11 @@ leads to the full version of the page. Use it like this:
 
 If the `linktext` parameter is omitted it defaults to just "more".
 
+An optional `pages` parameter can be used to specify a
+[[ikiwiki/PageSpec]], and then the "more" link will only be displayed
+when the page is inlined into a page matching that PageSpec, and otherwise
+the full content shown.
+
 Note that you can accomplish something similar using a [[toggle]] instead.
 
 [[!meta robots="noindex, follow"]]
diff --git a/doc/todo/selective_more_directive.mdwn b/doc/todo/selective_more_directive.mdwn
index 24e6ab568..2a9998205 100644
--- a/doc/todo/selective_more_directive.mdwn
+++ b/doc/todo/selective_more_directive.mdwn
@@ -24,3 +24,5 @@ I can now call it as
 I'm not entirely happy with the design, since I would rather put this information in the inline directive instead of in every story post. Unfortunately I found no way to pass parameters from the inline directive to the inlined page.
 
 -- [[dark]]
+
+> Me neither, but nor do I see a better way, so [[applied|done]]. --[[Joey]] 
-- 
cgit v1.2.3


From daf89f59e61d9091fe27dd8738b40db5fa85a5e6 Mon Sep 17 00:00:00 2001
From: Joey Hess 
Date: Tue, 16 Nov 2010 15:03:03 -0400
Subject: response

---
 doc/forum/PageSpec_results_from_independent_checkout.mdwn | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'doc')

diff --git a/doc/forum/PageSpec_results_from_independent_checkout.mdwn b/doc/forum/PageSpec_results_from_independent_checkout.mdwn
index 6b2fd6df0..693287d2b 100644
--- a/doc/forum/PageSpec_results_from_independent_checkout.mdwn
+++ b/doc/forum/PageSpec_results_from_independent_checkout.mdwn
@@ -3,3 +3,6 @@ I'd like to be able to do PageSpec matches independent of the Ikiwiki checkout,
     perl -MIkiWiki -le '$config{wikistatedir}=".ikiwiki"; IkiWiki::loadindex(); print foreach pagespec_match_list("", shift)' "bugs/*"
 
 I get the impression there's a way to build up enough state to run pagespec matches without doing any rendering, but I don't know how. Any ideas? -- JoeRayhawk
+
+> It's not possible to build up enough state without at a minimum
+> performing the scan pass of rendering on every page. --[[Joey]] 
-- 
cgit v1.2.3


From dd9796375895752621cdcce103d1ad8d8a31d6cb Mon Sep 17 00:00:00 2001
From: "http://jmtd.livejournal.com/" 
Date: Wed, 17 Nov 2010 07:47:07 +0000
Subject: ext4, default settings...

---
 doc/bugs/aggregate_generates_long_filenames.mdwn | 13 +++++++++++++
 1 file changed, 13 insertions(+)

(limited to 'doc')

diff --git a/doc/bugs/aggregate_generates_long_filenames.mdwn b/doc/bugs/aggregate_generates_long_filenames.mdwn
index c38ad6c7b..33e7b743b 100644
--- a/doc/bugs/aggregate_generates_long_filenames.mdwn
+++ b/doc/bugs/aggregate_generates_long_filenames.mdwn
@@ -19,3 +19,16 @@ It would also appear this abrubtly terminates aggregate processing (if not ikiwi
 > that, in additional to having a rather antique long filename limit, your
 > system also doesn't properly expose it via pathconf. Not sure what
 > ikiwiki can do here. --[[Joey]]
+
+>> This is an ext4 filesystem with default settings (which appears to mean
+>> 256 bytes for pathnames).  Despite the error saying file name, it's
+>> definitely a path issue since moving my test repo to `/tmp`from
+>> `/home/jon/wd/mine/www` hides the problem. I note the following comment
+>> in `aggregate.pm`:
+
+		# Make sure that the file name isn't too long. 
+		# NB: This doesn't check for path length limits.
+
+>> I don't fully grok the aggregate source yet, but I wouldn't rule out
+>> a bug in the path length checking, personally.  I'm happy to try and
+>> find it myself though :) -- [[Jon]]
-- 
cgit v1.2.3


From 03f04d48d53a3cd77215d6b086b416a1965e2feb Mon Sep 17 00:00:00 2001
From: "http://pmate.myopenid.com/" 
Date: Wed, 17 Nov 2010 08:03:09 +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 d8e55bace..699eeda7d 100644
--- a/doc/ikiwikiusers.mdwn
+++ b/doc/ikiwikiusers.mdwn
@@ -161,6 +161,7 @@ Personal sites and blogs
 * [Marco Silva](http://marcot.eti.br/) a weblog + wiki using the [darcs](http://darcs.net) backend
 * [NeX-6](http://nex-6.taht.net/) ikiwiki blog and wiki running over ipv6
 * [Jason Riedy](http://lovesgoodfood.com/jason/), which may occasionally look funny if I'm playing with my branch...
+* [pmate](http://pmate.nfshost.com)'s homepage and [blog](http://pmate.nfshost.com/blog/)
 
 Please feel free to add your own ikiwiki site!
 
-- 
cgit v1.2.3


From c02f9d224cb78a3ad880cb749ef4a11eadfad79a Mon Sep 17 00:00:00 2001
From: Jon Dowland 
Date: Wed, 17 Nov 2010 10:13:32 +0000
Subject: sorry, I'll try against master in future.

---
 ...ent_isn__39__t_numeric:_mixing_templates_and_creation__95__date.mdwn | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'doc')

diff --git a/doc/bugs/argument_isn__39__t_numeric:_mixing_templates_and_creation__95__date.mdwn b/doc/bugs/argument_isn__39__t_numeric:_mixing_templates_and_creation__95__date.mdwn
index b1053fc38..ff98ba55f 100644
--- a/doc/bugs/argument_isn__39__t_numeric:_mixing_templates_and_creation__95__date.mdwn
+++ b/doc/bugs/argument_isn__39__t_numeric:_mixing_templates_and_creation__95__date.mdwn
@@ -58,3 +58,5 @@ However this doesn't work.  I assume "included" in this context means e.g. via a
 
 > As far as I know, this bug was fixed in
 > 4a75dee651390b79ce4ceb1d951b02e28b3ce83a on October 20th. [[done]] --[[Joey]]
+
+>> Sorry Joey, I'll make sure to reproduce stuff against master in future. [[Jon]]
-- 
cgit v1.2.3


From a4cb86d73327e7850eeb524ef387b17ac5e1614d Mon Sep 17 00:00:00 2001
From: Joey Hess 
Date: Wed, 17 Nov 2010 13:20:29 -0400
Subject: response

---
 doc/bugs/aggregate_generates_long_filenames.mdwn | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'doc')

diff --git a/doc/bugs/aggregate_generates_long_filenames.mdwn b/doc/bugs/aggregate_generates_long_filenames.mdwn
index 33e7b743b..fae8333ab 100644
--- a/doc/bugs/aggregate_generates_long_filenames.mdwn
+++ b/doc/bugs/aggregate_generates_long_filenames.mdwn
@@ -32,3 +32,6 @@ It would also appear this abrubtly terminates aggregate processing (if not ikiwi
 >> I don't fully grok the aggregate source yet, but I wouldn't rule out
 >> a bug in the path length checking, personally.  I'm happy to try and
 >> find it myself though :) -- [[Jon]]
+
+>>> Path length seems unlikely, since the max is 4096 there.
+>>> --[[Joey]] 
-- 
cgit v1.2.3


From d6ff694ff7a6a4700ccbbd5819907eac73cf065a Mon Sep 17 00:00:00 2001
From: Simon McVittie 
Date: Sat, 20 Nov 2010 00:22:56 +0000
Subject: branch ready for merge, I think

---
 ...mproving_the_efficiency_of_match__95__glob.mdwn | 156 ++++++++++++---------
 1 file changed, 93 insertions(+), 63 deletions(-)

(limited to 'doc')

diff --git a/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn b/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn
index 0fc059ad7..de3cf48d3 100644
--- a/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn
+++ b/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn
@@ -1,3 +1,7 @@
+[[!template id=gitbranch branch=smcv/ready/glob-cache
+  author="[[KathrynAndersen]], [[smcv]]"]]
+[[!tag patch]]
+
 I've been profiling my IkiWiki to try to improve speed (with many pages makes speed even more important) and I've written a patch to improve the speed of match_glob.  This matcher is a good one to improve the speed of, because it gets called so many times.
 
 Here's my patch - please consider it! -- [[KathrynAndersen]]
@@ -39,7 +43,92 @@ Here's my patch - please consider it! -- [[KathrynAndersen]]
 >>>>>> `/^/i` regexp that can be used without further modifiction in most
 >>>>>> cases. --[[Joey]] 
 
+>>>>>>> Done, see `smcv/ready/glob-cache`.
+>>>>>>> Kathryn's patch is a significant improvement; my first patch on top of
+>>>>>>> that is a trivial cleanup that speeds it up a little, and the other two
+>>>>>>> patches (using precompiled regexes) have surprisingly little effect
+>>>>>>> (they don't slow it down either though, so either omit them or merge
+>>>>>>> them, whichever). Detailed benchmark results --[[smcv]]
+
 --------------------------------------------------------------
+
+[[!toggle id="smcv-benchmark" text="current benchmarks"]]
+
+[[!toggleable id="smcv-benchmark" text="""
+master at time of branch:
+
+    time elapsed (wall):   29.6348
+    time running program:  24.9212  (84.09%)
+    time profiling (est.): 4.7136  (15.91%)
+    number of calls:       1360181
+    number of exceptions:  13
+    
+    %Time    Sec.     #calls   sec/call  F  name
+    13.24    3.2986     3408   0.000968     Text::Balanced::_match_tagged
+    10.94    2.7253    79514   0.000034     IkiWiki::PageSpec::match_glob
+     3.19    0.7952    59454   0.000013     :IkiWiki/Plugin/inline.pm:223
+
+`Improve the speed of match_glob`:
+
+    time elapsed (wall):   27.9755
+    time running program:  23.5293  (84.11%)
+    time profiling (est.): 4.4461  (15.89%)
+    number of calls:       1280875
+    number of exceptions:  13
+    
+    %Time    Sec.     #calls   sec/call  F  name
+    14.56    3.4257     3408   0.001005     Text::Balanced::_match_tagged
+     7.82    1.8403    79514   0.000023     IkiWiki::PageSpec::match_glob
+     3.27    0.7698    59454   0.000013     :IkiWiki/Plugin/inline.pm:223
+
+`match_glob: streamline glob cache slightly`:
+
+    time elapsed (wall):   27.5753
+    time running program:  23.1714  (84.03%)
+    time profiling (est.): 4.4039  (15.97%)
+    number of calls:       1280875
+    number of exceptions:  13
+    
+    %Time    Sec.     #calls   sec/call  F  name
+    14.09    3.2637     3408   0.000958     Text::Balanced::_match_tagged
+     7.74    1.7926    79514   0.000023     IkiWiki::PageSpec::match_glob
+     3.30    0.7646    59454   0.000013     :IkiWiki/Plugin/inline.pm:223
+
+`glob2re: return a precompiled, anchored case-insensitiv...`:
+
+    time elapsed (wall):   27.5656
+    time running program:  23.1464  (83.97%)
+    time profiling (est.): 4.4192  (16.03%)
+    number of calls:       1282189
+    number of exceptions:  13
+    
+    %Time    Sec.     #calls   sec/call  F  name
+    14.21    3.2891     3408   0.000965     Text::Balanced::_match_tagged
+     7.72    1.7872    79514   0.000022     IkiWiki::PageSpec::match_glob
+     3.32    0.7678    59454   0.000013     :IkiWiki/Plugin/inline.pm:223
+
+`make use of precompiled regex objects`:
+
+    time elapsed (wall):   27.5357
+    time running program:  23.1289  (84.00%)
+    time profiling (est.): 4.4068  (16.00%)
+    number of calls:       1281981
+    number of exceptions:  13
+    
+    %Time    Sec.     #calls   sec/call  F  name
+    14.17    3.2776     3408   0.000962     Text::Balanced::_match_tagged
+     7.70    1.7814    79514   0.000022     IkiWiki::PageSpec::match_glob
+     3.35    0.7756    59454   0.000013     :IkiWiki/Plugin/inline.pm:223
+
+"""]]
+
+--[[smcv]]
+
+--------------------------------------------------------------
+
+[[!toggle id="ka-benchmarks" text="Kathryn's benchmarks"]]
+
+[[!toggleable id="ka-benchmarks" text="""
 Benchmarks done with Devel::Profile on the same testbed IkiWiki setup.  I'm just showing the start of the profile output, since that's what's relevant.
 
 Before:
@@ -73,73 +162,13 @@ number of exceptions:  65
 Note that the seconds per call for match_glob in the "after" case has gone down by about a third.
 
 K.A.
+"""]]
 
 --------------------------------------------------------------
 
-A second set of benchmarks, done by rebuilding the docwiki at commit f942c2db05e4
-like so:
-
-    perl -Iblib/lib -d:Profile ikiwiki.in -setup docwiki.setup --no-verbose
-
-The docwiki appears to use fewer glob matches than Kathryn's wiki.
-
-With master:
-
-    time elapsed (wall):   29.6970
-    time running program:  24.6930  (83.15%)
-    time profiling (est.): 5.0041  (16.85%)
-    number of calls:       1359180
-    number of exceptions:  13
-
-    %Time    Sec.     #calls   sec/call  F  name
-    13.62    3.3629     3406   0.000987     Text::Balanced::_match_tagged
-    10.84    2.6773    79442   0.000034     IkiWiki::PageSpec::match_glob
-     3.08    0.7598    59454   0.000013     :IkiWiki/Plugin/inline.pm:223
-     3.07    0.7593    29830   0.000025     IkiWiki::bestlink
-     2.99    0.7378    10231   0.000072     IkiWiki::PageSpec::match_link
-
-With my `smcv/memoize-glob2re` branch:
-
-    time elapsed (wall):   30.4931
-    time running program:  25.1248  (82.39%)
-    time profiling (est.): 5.3683  (17.61%)
-    number of calls:       1439943
-    number of exceptions:  13
-
-    %Time    Sec.     #calls   sec/call  F  name
-    13.19    3.3146     3406   0.000973     Text::Balanced::_match_tagged
-     8.41    2.1123    79442   0.000027     IkiWiki::PageSpec::match_glob
-     3.97    0.9979    86905   0.000011     Memoize::_memoizer
-     3.05    0.7654    59454   0.000013     :IkiWiki/Plugin/inline.pm:223
-     3.02    0.7576    29830   0.000025     IkiWiki::bestlink
-
-and in a repeated run:
-
-     8.40    2.0905    79442   0.000026     IkiWiki::PageSpec::match_glob
-
-With Kathryn's patch as seen in my `smcv/ka-glob-cache` branch:
-
-    time elapsed (wall):   27.7567
-    time running program:  22.9941  (82.84%)
-    time profiling (est.): 4.7627  (17.16%)
-    number of calls:       1279946
-    number of exceptions:  13
-
-    %Time    Sec.     #calls   sec/call  F  name
-    14.29    3.2867     3406   0.000965     Text::Balanced::_match_tagged
-     7.89    1.8136    79442   0.000023     IkiWiki::PageSpec::match_glob
-     3.30    0.7577    59454   0.000013     :IkiWiki/Plugin/inline.pm:223
-     3.24    0.7461    29830   0.000025     IkiWiki::bestlink
-     3.19    0.7332      143   0.005127  ?  IkiWiki::pagespec_match_list
-
-and in a repeated run:
-
-     7.84    1.8253    79442   0.000023     IkiWiki::PageSpec::match_glob
-
---[[smcv]]
-
---------------------------------------------------------------
+[[!toggle id="ka-patch" text="Kathryn's original patch"]]
 
+[[!toggleable id="ka-patch" text="""
 
 
 diff --git a/IkiWiki.pm b/IkiWiki.pm
@@ -174,4 +203,5 @@ index 08a3d78..c187b98 100644
  			return IkiWiki::SuccessReason->new("$glob matches $page");
  		}
 

+"""]]
 --------------------------------------------------------------
-- 
cgit v1.2.3


From c9b737cc8596f9421ba968e56839eb052e80e794 Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" 
Date: Sat, 20 Nov 2010 00:36:29 +0000
Subject: one more patch: but expanding the memoization is actually a slowdown
 for the docwiki

---
 ...mproving_the_efficiency_of_match__95__glob.mdwn | 27 ++++++++++++++++++----
 1 file changed, 23 insertions(+), 4 deletions(-)

(limited to 'doc')

diff --git a/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn b/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn
index de3cf48d3..4fe14540f 100644
--- a/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn
+++ b/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn
@@ -43,12 +43,19 @@ Here's my patch - please consider it! -- [[KathrynAndersen]]
 >>>>>> `/^/i` regexp that can be used without further modifiction in most
 >>>>>> cases. --[[Joey]] 
 
->>>>>>> Done, see `smcv/ready/glob-cache`.
+>>>>>>> Done, see `smcv/ready/glob-cache` and `smcv/glob-cache-too-far`.
+>>>>>>>
 >>>>>>> Kathryn's patch is a significant improvement; my first patch on top of
->>>>>>> that is a trivial cleanup that speeds it up a little, and the other two
+>>>>>>> that is a trivial cleanup that speeds it up a little, and the next two
 >>>>>>> patches (using precompiled regexes) have surprisingly little effect
 >>>>>>> (they don't slow it down either though, so either omit them or merge
->>>>>>> them, whichever). Detailed benchmark results --[[smcv]]
+>>>>>>> them, whichever). Detailed benchmark results below.
+>>>>>>>
+>>>>>>> Moving the memoization to `glob2re` actually seems to slow things down
+>>>>>>> again - I suspect the docwiki has few enough mentions of `user()` etc.
+>>>>>>> that caching them is a waste of time, but perhaps it's not the most
+>>>>>>> representative.
+>>>>>>> --[[smcv]]
 
 --------------------------------------------------------------
 
@@ -120,9 +127,21 @@ master at time of branch:
      7.70    1.7814    79514   0.000022     IkiWiki::PageSpec::match_glob
      3.35    0.7756    59454   0.000013     :IkiWiki/Plugin/inline.pm:223
 
-"""]]
+`move memoization from match_glob to glob2re`:
+
+    time elapsed (wall):   28.7677
+    time running program:  23.9473  (83.24%)
+    time profiling (est.): 4.8205  (16.76%)
+    number of calls:       1360181
+    number of exceptions:  13
+    
+    %Time    Sec.     #calls   sec/call  F  name
+    13.98    3.3469     3408   0.000982     Text::Balanced::_match_tagged
+     8.85    2.1194    79514   0.000027     IkiWiki::PageSpec::match_glob
+     3.24    0.7750    59454   0.000013     :IkiWiki/Plugin/inline.pm:223
 
 --[[smcv]]
+"""]]
 
 --------------------------------------------------------------
 
-- 
cgit v1.2.3


From f8f8770a652520b2f09eb2262510a04a8e353e9d Mon Sep 17 00:00:00 2001
From: Joey Hess 
Date: Sat, 20 Nov 2010 12:28:22 -0400
Subject: smcv/ready/glob-cache merged

---
 debian/changelog                                          | 1 +
 doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn | 2 ++
 2 files changed, 3 insertions(+)

(limited to 'doc')

diff --git a/debian/changelog b/debian/changelog
index 0edb78004..65c235317 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ ikiwiki (3.20101113) UNRELEASED; urgency=low
     and support all elements that HTML::Tagset knows about. 
     (Which doesn't include html5 just yet, but then the old version
     didn't either.) Bonus: 4 times faster than old regexp method.
+  * Optimise glob() pagespec. (Thanks, Kathryn and smcv)
 
  -- Joey Hess   Tue, 16 Nov 2010 14:23:47 -0400
 
diff --git a/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn b/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn
index 4fe14540f..4e1df3381 100644
--- a/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn
+++ b/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn
@@ -57,6 +57,8 @@ Here's my patch - please consider it! -- [[KathrynAndersen]]
 >>>>>>> representative.
 >>>>>>> --[[smcv]]
 
+[[done]] --[[Joey]] 
+
 --------------------------------------------------------------
 
 [[!toggle id="smcv-benchmark" text="current benchmarks"]]
-- 
cgit v1.2.3


From af0bfcc07820008f0387bfd1b35a594ed40a0246 Mon Sep 17 00:00:00 2001
From: "http://pmate.myopenid.com/" 
Date: Sat, 20 Nov 2010 17:56:35 +0000
Subject:

---
 doc/tips/nearlyfreespeech/discussion.mdwn | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'doc')

diff --git a/doc/tips/nearlyfreespeech/discussion.mdwn b/doc/tips/nearlyfreespeech/discussion.mdwn
index a003760b9..daebee2a0 100644
--- a/doc/tips/nearlyfreespeech/discussion.mdwn
+++ b/doc/tips/nearlyfreespeech/discussion.mdwn
@@ -9,3 +9,8 @@ BEGIN failed--compilation aborted at (eval 19) line 2.
 perl is 5.8.9
 
 > This is fixed in 3.1415926. --[[Joey]] 
+
+Hi!
+How can i upgrade my nearlyfreespeech installation of ikiwiki? To install it i have followed your instructions here.
+But now if I want to upgrade it to a newer version?
+Thanks for your incredible work!
-- 
cgit v1.2.3


From c1f3129583ae4a1e3e9ace89ba11c8bf6c308be3 Mon Sep 17 00:00:00 2001
From: "http://pmate.myopenid.com/" 
Date: Sat, 20 Nov 2010 17:57:56 +0000
Subject:

---
 doc/tips/nearlyfreespeech/discussion.mdwn | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'doc')

diff --git a/doc/tips/nearlyfreespeech/discussion.mdwn b/doc/tips/nearlyfreespeech/discussion.mdwn
index daebee2a0..73da608be 100644
--- a/doc/tips/nearlyfreespeech/discussion.mdwn
+++ b/doc/tips/nearlyfreespeech/discussion.mdwn
@@ -10,7 +10,8 @@ perl is 5.8.9
 
 > This is fixed in 3.1415926. --[[Joey]] 
 
-Hi!
-How can i upgrade my nearlyfreespeech installation of ikiwiki? To install it i have followed your instructions here.
-But now if I want to upgrade it to a newer version?
+
+Hi!

+How can i upgrade my nearlyfreespeech installation of ikiwiki? To install it i have followed your instructions here.

+But now if I want to upgrade it to a newer version?

 Thanks for your incredible work!
-- 
cgit v1.2.3


From 9f8cfe998e5ced7e4b2e1dd819a025b0745935ff Mon Sep 17 00:00:00 2001
From: Joey Hess 
Date: Sat, 20 Nov 2010 14:57:10 -0400
Subject: response

---
 doc/tips/nearlyfreespeech/discussion.mdwn | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'doc')

diff --git a/doc/tips/nearlyfreespeech/discussion.mdwn b/doc/tips/nearlyfreespeech/discussion.mdwn
index 73da608be..0d1f1f082 100644
--- a/doc/tips/nearlyfreespeech/discussion.mdwn
+++ b/doc/tips/nearlyfreespeech/discussion.mdwn
@@ -15,3 +15,6 @@ Hi!

 How can i upgrade my nearlyfreespeech installation of ikiwiki? To install it i have followed your instructions here.

 But now if I want to upgrade it to a newer version?

 Thanks for your incredible work!
+
+> You can move `~/ikiwiki` out of the way and then re-download and install
+> it ikiwiki. --[[Joey]]
-- 
cgit v1.2.3


From 1739dbe0a8dc943c736d69f3747251ad72a53278 Mon Sep 17 00:00:00 2001
From: Joey Hess 
Date: Sat, 20 Nov 2010 14:57:46 -0400
Subject: úpdate
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 doc/tips/nearlyfreespeech.mdwn | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'doc')

diff --git a/doc/tips/nearlyfreespeech.mdwn b/doc/tips/nearlyfreespeech.mdwn
index 4b3b02eac..a3d1ec678 100644
--- a/doc/tips/nearlyfreespeech.mdwn
+++ b/doc/tips/nearlyfreespeech.mdwn
@@ -14,7 +14,8 @@ After you [get an account](https://www.nearlyfreespeech.net/about/start.php),
 create a site using their web interface. 
 
 Mine is named `ikiwiki-test` and I used their DNS instead of getting my
-own, resulting in 
+own, resulting in . (Not being kept up
+anymore.)
 
 They gave me 2 cents free funding for signing up, which is enough to pay
 for 10 megabytes of bandwidth, or about a thousand typical page views, at
-- 
cgit v1.2.3


From f80469c34d8d81e79d4894f7a1789a949bc766c3 Mon Sep 17 00:00:00 2001
From: "http://pmate.myopenid.com/" 
Date: Sat, 20 Nov 2010 21:44:12 +0000
Subject:

---
 doc/tips/nearlyfreespeech/discussion.mdwn | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'doc')

diff --git a/doc/tips/nearlyfreespeech/discussion.mdwn b/doc/tips/nearlyfreespeech/discussion.mdwn
index 0d1f1f082..b76432566 100644
--- a/doc/tips/nearlyfreespeech/discussion.mdwn
+++ b/doc/tips/nearlyfreespeech/discussion.mdwn
@@ -18,3 +18,5 @@ Thanks for your incredible work!
 
 > You can move `~/ikiwiki` out of the way and then re-download and install
 > it ikiwiki. --[[Joey]]
+
+Thanks a lot Joey. :-)
-- 
cgit v1.2.3


From a6c3d71787c528888c3f66c7ded8dd0c8f430b7e Mon Sep 17 00:00:00 2001
From: "http://slowdog.myopenid.com/" 
Date: Sun, 21 Nov 2010 19:38:10 +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 90713d1f2..06acc9cec 100644
--- a/doc/index.mdwn
+++ b/doc/index.mdwn
@@ -17,7 +17,7 @@ All wikis are supposed to have a [[SandBox]], so this one does too.
 This site generally runs the latest release of ikiwiki; currently, it runs
 ikiwiki [[!version ]].
 
-## developer resources sas
+## developer resources
 
 The [[RoadMap]] describes where the project is going.
 The [[forum]] is open for discussions.
-- 
cgit v1.2.3


From 178d6a16c2fff68edfbe6a1af5c8a9fa91db6039 Mon Sep 17 00:00:00 2001
From: Joey Hess 
Date: Mon, 22 Nov 2010 14:05:37 -0400
Subject: comments (finally)

---
 ...ing_http_or_https_in_urls_to_allow_serving_both.mdwn | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

(limited to 'doc')

diff --git a/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn b/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn
index 20d22b9ab..4fafc2bbc 100644
--- a/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn
+++ b/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn
@@ -181,6 +181,16 @@ New API added by this branch:
 
 * `urlto(x, y, 'local')` uses `$local_url` instead of `$config{url}`
 
+  > Yikes. I see why you wanted to keep it to 3 parameters (4 is too many,
+  > and po overrides it), but I dislike overloading the third parameter
+  > like that.
+  > 
+  > There are fairly few calls to `urlto($foo, $bar)`, so why not
+  > make that always return the semi-local url form, and leave the third
+  > parameter for the cases that need a true fully-qualified url.
+  > The new form for local urls will typically be only a little bit longer,
+  > except in the unusual case where the cgiurl is elsewhere. --[[Joey]]
+
 * `IkiWiki::baseurl` has a new second argument which works like the
   third argument of `urlto`
 
@@ -199,9 +209,13 @@ Bugs:
   `cgiurl(cgiurl => $config{cgiurl}, ...)`,
   although that does look a bit strange
 
+  > I agree that makes sense. --[[Joey]]
+
 * It occurs to me that `IkiWiki::cgiurl` could probably benefit from being
   exported? Perhaps also `IkiWiki::baseurl`?
 
+  > Possibly, see [[firm_up_plugin_interface]]. --[[Joey]] 
+
 * Or, to reduce use of the unexported `baseurl` function, it might make
   sense to give `urlto` a special case that references the root of the wiki,
   with a trailing slash ready to append stuff: perhaps `urlto('/')`,
@@ -210,3 +224,6 @@ Bugs:
         do_something(baseurl => urlto('/', undef, local)`);
         do_something_else(urlto('/').'style.css');
         IkiWiki::redirect(urlto('/', undef, 1));
+
+  > AFACIS, `baseurl` is only called in 3 places so I don't think that's
+  > needed. --[[Joey]] 
-- 
cgit v1.2.3


From d916cd2f71f1c22dad947d7b2134edbbb15e7b8e Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" 
Date: Mon, 22 Nov 2010 19:45:02 +0000
Subject: respond to feedback

---
 ...ttp_or_https_in_urls_to_allow_serving_both.mdwn | 39 +++++++++++++++++++++-
 1 file changed, 38 insertions(+), 1 deletion(-)

(limited to 'doc')

diff --git a/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn b/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn
index 4fafc2bbc..80925b458 100644
--- a/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn
+++ b/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn
@@ -191,14 +191,41 @@ New API added by this branch:
   > The new form for local urls will typically be only a little bit longer,
   > except in the unusual case where the cgiurl is elsewhere. --[[Joey]]
 
+  >> So, have urlto(x, y) use `$local_url`? There are few calls, but IMO
+  >> they're for the most important things - wikilinks, img, map and
+  >> other ordinary hyperlinks. Using `$local_url` would be fine for
+  >> webserver-based use, but it does stop you browsing your wiki's
+  >> HTML over `file:///` (unless you set that as the base URL, but
+  >> then you can't move it around), and stops you moving simple
+  >> outputs (like the docwiki!) around.
+  >>
+  >> I personally think breaking the docwiki is enough to block that.
+  >>
+  >> How about this?
+  >>
+  >> * `urlto($link, $page)` with `$page` defined: relative
+  >> * `urlto($link, undef)`: local, starts with `/`
+  >> * `urlto($link)`: also local, as a side-effect
+  >> * `urlto($link, $anything, 1)` (but idiomatically, `$anything` is
+  >>   normally undef): absolute, starts with `http[s]://`
+  >>
+  >> --[[smcv]]
+
 * `IkiWiki::baseurl` has a new second argument which works like the
   third argument of `urlto`
 
+  > I assume you have no objection to this --[[smcv]]
+
 * `IkiWiki::cgiurl` uses `$local_cgiurl` if passed `local_cgiurl => 1`
 
+  > Possibly changed to making this always be local unless `cgiurl => $x`
+  > is given: see below --[[smcv]]
+
 * `IkiWiki::cgiurl` omits the trailing `?` if given no named parameters
   except `cgiurl` and/or `local_cgiurl`
 
+  > I assume you have no objection to this --[[smcv]]
+
 Bugs:
 
 * I don't think anything except `openid` calls `cgiurl` without also
@@ -211,10 +238,18 @@ Bugs:
 
   > I agree that makes sense. --[[Joey]]
 
+  >> I'm not completely sure whether you're agreeing with "perhaps do this"
+  >> or "that looks too strange", so please disambiguate:
+  >> would you accept a patch that makes `cgiurl` default to a local
+  >> (starts-with-`/`) result? If you would, that'd reduce the diff. --[[smcv]]
+
 * It occurs to me that `IkiWiki::cgiurl` could probably benefit from being
   exported? Perhaps also `IkiWiki::baseurl`?
 
-  > Possibly, see [[firm_up_plugin_interface]]. --[[Joey]] 
+  > Possibly, see [[firm_up_plugin_interface]]. --[[Joey]]
+
+  >> Not really part of this branch, though, so wontfix (unless you ask me
+  >> to do so). --[[smcv]]
 
 * Or, to reduce use of the unexported `baseurl` function, it might make
   sense to give `urlto` a special case that references the root of the wiki,
@@ -227,3 +262,5 @@ Bugs:
 
   > AFACIS, `baseurl` is only called in 3 places so I don't think that's
   > needed. --[[Joey]] 
+
+  >> OK, wontfix. --[[smcv]]
-- 
cgit v1.2.3


From 5954915a4fe8a889b8217cac99fae53cbe7f1e97 Mon Sep 17 00:00:00 2001
From: Joey Hess 
Date: Mon, 22 Nov 2010 16:04:11 -0400
Subject: response

---
 ...ttp_or_https_in_urls_to_allow_serving_both.mdwn | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

(limited to 'doc')

diff --git a/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn b/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn
index 80925b458..f8ec4c420 100644
--- a/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn
+++ b/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn
@@ -201,6 +201,10 @@ New API added by this branch:
   >>
   >> I personally think breaking the docwiki is enough to block that.
   >>
+  >>> Well, the docwiki doesn't have an url configured at all, so I assumed
+  >>> it would need to fall back to current behavior in that case. I had
+  >>> not thought about browsing wiki's html files though, good point.
+  >>
   >> How about this?
   >>
   >> * `urlto($link, $page)` with `$page` defined: relative
@@ -210,12 +214,24 @@ New API added by this branch:
   >>   normally undef): absolute, starts with `http[s]://`
   >>
   >> --[[smcv]]
+  >> 
+  >>> That makes a great deal of sense, bravo for actually removing
+  >>> parameters in the common case while maintaining backwards
+  >>> compatability!
+  >>> 
+  >>> It does highlight that it would be better to have a
+  >>> `absolute_urlto($link)` (or maybe `absolute(urlto($link))` )
+  >>> rather than the 3 parameter form. --[[Joey]]
 
 * `IkiWiki::baseurl` has a new second argument which works like the
   third argument of `urlto`
 
   > I assume you have no objection to this --[[smcv]]
 
+  >> It's so little used that I don't really care if it's a bit ugly.
+  >> (But I assume changes to `urlto` will follow through here anyway.)
+  >> --[[Joey]] 
+
 * `IkiWiki::cgiurl` uses `$local_cgiurl` if passed `local_cgiurl => 1`
 
   > Possibly changed to making this always be local unless `cgiurl => $x`
@@ -225,6 +241,8 @@ New API added by this branch:
   except `cgiurl` and/or `local_cgiurl`
 
   > I assume you have no objection to this --[[smcv]]
+  > 
+  >> Nod, although I don't know of a use case. --[[Joey]] 
 
 Bugs:
 
@@ -243,6 +261,10 @@ Bugs:
   >> would you accept a patch that makes `cgiurl` default to a local
   >> (starts-with-`/`) result? If you would, that'd reduce the diff. --[[smcv]]
 
+  >>> Yes, I absolutely think it should default to local. (Note that
+  >>> if `absolute()` were implemented as suggested above, it could also
+  >>> be used with cgiurl if necessary.) --[[Joey]]
+
 * It occurs to me that `IkiWiki::cgiurl` could probably benefit from being
   exported? Perhaps also `IkiWiki::baseurl`?
 
-- 
cgit v1.2.3


From 1968317cacc2f555af17286acf26a60ce616cc40 Mon Sep 17 00:00:00 2001
From: "http://churchkey.org/author/ian/"
 
Date: Mon, 22 Nov 2010 21:26:27 +0000
Subject: added edittemplate bug for ikiwiki verison: 3.20100815.2

---
 ...dittemplate__39__s_match__61____34____34___pagespec.mdwn | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 doc/bugs/inline_action_buttons_circumvent_exclude_criteria_from_edittemplate__39__s_match__61____34____34___pagespec.mdwn

(limited to 'doc')

diff --git a/doc/bugs/inline_action_buttons_circumvent_exclude_criteria_from_edittemplate__39__s_match__61____34____34___pagespec.mdwn b/doc/bugs/inline_action_buttons_circumvent_exclude_criteria_from_edittemplate__39__s_match__61____34____34___pagespec.mdwn
new file mode 100644
index 000000000..45481bf21
--- /dev/null
+++ b/doc/bugs/inline_action_buttons_circumvent_exclude_criteria_from_edittemplate__39__s_match__61____34____34___pagespec.mdwn
@@ -0,0 +1,13 @@
+ikiwiki verison: 3.20100815.2
+
+If I instruct editemplate to only match the top level pages in a directory using 
+
+    match="foo/* and !foo/*/* and !foo/*/*/*"
+
+everything works as expected for pages created via links on other wiki pages. So, if I open foo/bar (or any other page on the wiki) and create a link to foo/bar/bug, edittemplate appropriately does not insert any text into the new page. 
+
+However, if I use an inline directive like the following 
+
+    !inline pages="page(foo/bar/*)" rootpage="foo/bar" postform=yes actions=yes
+
+every page created via the action buttons incorrectly pulls in the text from the edittemplate registration. Changing the order of the conditions in the match="" pagespec has no impact. 
-- 
cgit v1.2.3


From 4c224ae143ebc4b13f824fe1782561a5cd165864 Mon Sep 17 00:00:00 2001
From: Simon McVittie 
Date: Mon, 22 Nov 2010 23:33:13 +0000
Subject: urlto(): if $from is undef, return a local path, not an absolute URL

---
 IkiWiki.pm             | 6 ++++++
 doc/plugins/write.mdwn | 4 ++++
 2 files changed, 10 insertions(+)

(limited to 'doc')

diff --git a/IkiWiki.pm b/IkiWiki.pm
index a4afef8e0..ee0b1f1ea 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -1148,6 +1148,12 @@ sub urlto ($$;$) {
 		return $config{url}.beautify_urlpath("/".$to);
 	}
 
+	if (! defined $from) {
+		my $u = $local_url;
+		$u =~ s{/$}{};
+		return $u.beautify_urlpath("/".$to);
+	}
+
 	my $link = abs2rel($to, dirname(htmlpage($from)));
 
 	return beautify_urlpath($link);
diff --git a/doc/plugins/write.mdwn b/doc/plugins/write.mdwn
index 6b751f0cd..33db3e707 100644
--- a/doc/plugins/write.mdwn
+++ b/doc/plugins/write.mdwn
@@ -988,6 +988,10 @@ Construct a relative url to the first parameter from the page named by the
 second. The first parameter can be either a page name, or some other
 destination file, as registered by `will_render`.
 
+If the second parameter is `undef`, the URL will be valid from any page on the
+wiki, or from the CGI; if possible it'll be a path starting with `/`, but an
+absolute URL will be used if the wiki and the CGI are on different servers.
+
 If the third parameter is passed and is true, an absolute url will be
 constructed instead of the default relative url.
 
-- 
cgit v1.2.3


From 8935a131d02ac13b6024dff9cbf7a5f837fcdc04 Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" 
Date: Tue, 23 Nov 2010 00:37:28 +0000
Subject: updated branch, not tested properly yet

---
 ...ttp_or_https_in_urls_to_allow_serving_both.mdwn | 51 ++++++++++++++++++----
 1 file changed, 42 insertions(+), 9 deletions(-)

(limited to 'doc')

diff --git a/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn b/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn
index f8ec4c420..8b0501041 100644
--- a/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn
+++ b/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn
@@ -147,7 +147,7 @@ you don't like my approach:
 
 ----
 
-[[!template id=gitbranch branch=smcv/ready/localurl author="[[smcv]]"]]
+[[!template id=gitbranch branch=smcv/localurl author="[[smcv]]"]]
 [[!tag patch]]
 
 OK, here's an alternative approach, closer in spirit to what was initially
@@ -165,14 +165,17 @@ whether `url` and `cgiurl` are on the same server with the the same URL
 scheme. In theory you could use things like `//static.example.com/wiki/`
 and `//dynamic.example.com/ikiwiki.cgi` to preserve choice of http/https
 while switching server, but I don't know how consistently browsers
-suppot that.
+support that.
 
 "local" here is short for "locally valid", because these URLs are neither
 fully relative nor fully absolute, and there doesn't seem to be a good name
 for them...
 
-I've tested this on a demo website with the CGI enabled, and it seems to
+I tested an earlier version on a demo website with the CGI enabled, and it seemed to
 work nicely (there might be bugs in some plugins, I didn't try all of them).
+I haven't yet re-tested with my updated branch, which is why it's not `ready/`
+yet.
+
 The `$config{url}` and `$config{cgiurl}` are both HTTP, but if I enable
 `httpauth`, set `cgiauthurl` to a HTTPS version of the same site and log
 in via that, links all end up in the HTTPS version.
@@ -217,11 +220,19 @@ New API added by this branch:
   >> 
   >>> That makes a great deal of sense, bravo for actually removing
   >>> parameters in the common case while maintaining backwards
-  >>> compatability!
+  >>> compatability! --[[Joey]]
+  >>>
+  >>>> Done in my `localurl` branch; not tested in a whole-wiki way
+  >>>> yet, but I did add a regression test. I've used
+  >>>> `urlto(x, undef)` rather than `urlto(x)` so far, but I could
+  >>>> go back through the codebase using the short form if you'd
+  >>>> prefer. --[[smcv]]
   >>> 
   >>> It does highlight that it would be better to have a
   >>> `absolute_urlto($link)` (or maybe `absolute(urlto($link))` )
   >>> rather than the 3 parameter form. --[[Joey]]
+  >>>
+  >>> Possibly. I haven't added this.
 
 * `IkiWiki::baseurl` has a new second argument which works like the
   third argument of `urlto`
@@ -232,19 +243,34 @@ New API added by this branch:
   >> (But I assume changes to `urlto` will follow through here anyway.)
   >> --[[Joey]] 
 
+  >>> I had to use it a bit more, as a replacement for `$config{url}`
+  >>> when doing things like referencing stylesheets or redirecting to
+  >>> the top of the wiki.
+  >>>
+  >>> I ended up redoing this without the extra parameter. Previously,
+  >>> `baseurl(undef)` was the absolute URL; now, `baseurl(undef)` is
+  >>> the local path. I know you objected to me using `baseurl()` in
+  >>> an earlier branch, because `baseurl().$x` looks confusingly
+  >>> similar to `baseurl($x)` but has totally different semantics;
+  >>> I've generally written it `baseurl(undef)` now, to be more
+  >>> explicit. --[[smcv]]
+
 * `IkiWiki::cgiurl` uses `$local_cgiurl` if passed `local_cgiurl => 1`
 
-  > Possibly changed to making this always be local unless `cgiurl => $x`
-  > is given: see below --[[smcv]]
+  > Now changed to always use the `$local_cgiurl`. --[[smcv]]
 
 * `IkiWiki::cgiurl` omits the trailing `?` if given no named parameters
   except `cgiurl` and/or `local_cgiurl`
 
   > I assume you have no objection to this --[[smcv]]
   > 
-  >> Nod, although I don't know of a use case. --[[Joey]] 
+  >> Nod, although I don't know of a use case. --[[Joey]]
+
+  >>> The use-case is that I can replace `$config{cgiurl}` with
+  >>> `IkiWiki::cgiurl()` for things like the action attribute of
+  >>> forms. --[[smcv]]
 
-Bugs:
+Fixed bugs:
 
 * I don't think anything except `openid` calls `cgiurl` without also
   passing in `local_cgiurl => 1`, so perhaps that should be the default;
@@ -265,6 +291,10 @@ Bugs:
   >>> if `absolute()` were implemented as suggested above, it could also
   >>> be used with cgiurl if necessary.) --[[Joey]]
 
+  >>>> Done (minus `absolute()`). --[[smcv]]
+
+Potential future things:
+
 * It occurs to me that `IkiWiki::cgiurl` could probably benefit from being
   exported? Perhaps also `IkiWiki::baseurl`?
 
@@ -285,4 +315,7 @@ Bugs:
   > AFACIS, `baseurl` is only called in 3 places so I don't think that's
   > needed. --[[Joey]] 
 
-  >> OK, wontfix. --[[smcv]]
+  >> OK, wontfix. For what it's worth, my branch has 6 uses in IkiWiki
+  >> core code (IkiWiki, CGI, Render and the pseudo-core part of editpage)
+  >> and 5 in plugins, since I used it for things like redirection back
+  >> to the top of the wiki --[[smcv]]
-- 
cgit v1.2.3


From 47726461a4119741affa6536deec7dd1fe52ef0d Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 
Date: Tue, 23 Nov 2010 02:18:52 +0000
Subject: Added a comment: Limitations

---
 ...omment_1_a0e976cb79f03dcff5e9a4511b90d160._comment | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 doc/forum/field_and_forms/comment_1_a0e976cb79f03dcff5e9a4511b90d160._comment

(limited to 'doc')

diff --git a/doc/forum/field_and_forms/comment_1_a0e976cb79f03dcff5e9a4511b90d160._comment b/doc/forum/field_and_forms/comment_1_a0e976cb79f03dcff5e9a4511b90d160._comment
new file mode 100644
index 000000000..3e10dbbd9
--- /dev/null
+++ b/doc/forum/field_and_forms/comment_1_a0e976cb79f03dcff5e9a4511b90d160._comment
@@ -0,0 +1,19 @@
+[[!comment format=mdwn
+ username="http://kerravonsen.dreamwidth.org/"
+ ip="60.241.8.244"
+ subject="Limitations"
+ date="2010-11-23T02:18:52Z"
+ content="""
+I'd already had a look at this idea before you posted this suggestion, and I ran into difficulties.
+So far as I can see, it makes most sense to use the mechanisms already in place for editing pages, and enhance them.
+Unfortunately, the whole edit-page setup expects a template file (by default, when editing pages, editpage.tmpl)
+and anything apart from \"submit\" buttons must have a placeholder in the template file, or it doesn't get displayed at all in the form.
+At least, that's what I've found - I could be mistaken.
+
+But if it's true, that rather puts the kybosh on dynamically generated forms, so far as I can see.
+I mean, if you knew beforehand what all your fields were going to be, you could make a copy of editpage.tmpl, add in your fields where you want, and then make a plugin that uses that template instead of editpage.tmpl, but that's very limited.
+
+If someone could come up with a way of making dynamic forms, that would solve the problem, but I've come up against a brick wall myself.  Joey?  Anyone?
+
+-- [[KathrynAndersen]]
+"""]]
-- 
cgit v1.2.3


From 78a2e59834d35da7a7ab8145beb7a30b59b95c90 Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 
Date: Tue, 23 Nov 2010 02:47:38 +0000
Subject: exclusion doesn't exclude

---
 doc/forum/Need_something_more_powerful_than_Exclude.mdwn | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 doc/forum/Need_something_more_powerful_than_Exclude.mdwn

(limited to 'doc')

diff --git a/doc/forum/Need_something_more_powerful_than_Exclude.mdwn b/doc/forum/Need_something_more_powerful_than_Exclude.mdwn
new file mode 100644
index 000000000..5e8043258
--- /dev/null
+++ b/doc/forum/Need_something_more_powerful_than_Exclude.mdwn
@@ -0,0 +1,5 @@
+When I originally looked at the "exclude" option, I thought it meant that it excluded pages completely, but it apparently doesn't.  What I've found in practice is that a file which matches the "exclude" regex is excluded from *processing*, but it is still copied over to the destination directory.  Thus, for example, if I have "^Makefile$" as the exclude pattern, and I have a file `src/foo/Makefile`, then that file is copied unaltered into `dest/foo/Makefile`.  However, what I want is for `src/foo/Makefile` to be completely ignored: that it is not only not processed, but not even *copied* into the destination directory.
+
+I'm not sure if the current behaviour is a bug or a feature, but I would like a "totally ignore this file" feature if it's possible to have one.
+
+-- [[KathrynAndersen]]
-- 
cgit v1.2.3


From efba19b3379b0b4e4199ece869c71f80be3a82d1 Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" 
Date: Tue, 23 Nov 2010 10:43:09 +0000
Subject: Added a comment: expression anchored too closely?

---
 .../comment_1_b454ead16d90479690ad8ee72cfd1428._comment      | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 doc/forum/Need_something_more_powerful_than_Exclude/comment_1_b454ead16d90479690ad8ee72cfd1428._comment

(limited to 'doc')

diff --git a/doc/forum/Need_something_more_powerful_than_Exclude/comment_1_b454ead16d90479690ad8ee72cfd1428._comment b/doc/forum/Need_something_more_powerful_than_Exclude/comment_1_b454ead16d90479690ad8ee72cfd1428._comment
new file mode 100644
index 000000000..6e29f0c19
--- /dev/null
+++ b/doc/forum/Need_something_more_powerful_than_Exclude/comment_1_b454ead16d90479690ad8ee72cfd1428._comment
@@ -0,0 +1,12 @@
+[[!comment format=mdwn
+ username="http://smcv.pseudorandom.co.uk/"
+ nickname="smcv"
+ subject="expression anchored too closely?"
+ date="2010-11-23T10:43:08Z"
+ content="""
+It looks as though you might only be excluding a top-level Makefile, and not a Makefile in subdirectories. Try excluding `(^|/)Makefile$` instead, for instance? (See `wiki_file_prune_regexps` in `IkiWiki.pm` for hints.)
+
+The match operation in `&file_pruned` ends up a bit like this:
+
+    \"foo/Makefile\" =~ m{…||…|(^|/)Makefile$}
+"""]]
-- 
cgit v1.2.3


From 9b01c9779ef682af0874efc062d9fb2e91676c23 Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" 
Date: Tue, 23 Nov 2010 10:43:21 +0000
Subject: Added a comment: expression anchored too closely?

---
 .../comment_2_0019cd6b34c8d8678b2532de57a92d15._comment      | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 doc/forum/Need_something_more_powerful_than_Exclude/comment_2_0019cd6b34c8d8678b2532de57a92d15._comment

(limited to 'doc')

diff --git a/doc/forum/Need_something_more_powerful_than_Exclude/comment_2_0019cd6b34c8d8678b2532de57a92d15._comment b/doc/forum/Need_something_more_powerful_than_Exclude/comment_2_0019cd6b34c8d8678b2532de57a92d15._comment
new file mode 100644
index 000000000..7842caeac
--- /dev/null
+++ b/doc/forum/Need_something_more_powerful_than_Exclude/comment_2_0019cd6b34c8d8678b2532de57a92d15._comment
@@ -0,0 +1,12 @@
+[[!comment format=mdwn
+ username="http://smcv.pseudorandom.co.uk/"
+ nickname="smcv"
+ subject="expression anchored too closely?"
+ date="2010-11-23T10:43:21Z"
+ content="""
+It looks as though you might only be excluding a top-level Makefile, and not a Makefile in subdirectories. Try excluding `(^|/)Makefile$` instead, for instance? (See `wiki_file_prune_regexps` in `IkiWiki.pm` for hints.)
+
+The match operation in `&file_pruned` ends up a bit like this:
+
+    \"foo/Makefile\" =~ m{…|…|…|(^|/)Makefile$}
+"""]]
-- 
cgit v1.2.3


From 172f41f6de288814fbd013f3465e658c562b10b1 Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" 
Date: Tue, 23 Nov 2010 10:43:40 +0000
Subject: removed

---
 .../comment_1_b454ead16d90479690ad8ee72cfd1428._comment      | 12 ------------
 1 file changed, 12 deletions(-)
 delete mode 100644 doc/forum/Need_something_more_powerful_than_Exclude/comment_1_b454ead16d90479690ad8ee72cfd1428._comment

(limited to 'doc')

diff --git a/doc/forum/Need_something_more_powerful_than_Exclude/comment_1_b454ead16d90479690ad8ee72cfd1428._comment b/doc/forum/Need_something_more_powerful_than_Exclude/comment_1_b454ead16d90479690ad8ee72cfd1428._comment
deleted file mode 100644
index 6e29f0c19..000000000
--- a/doc/forum/Need_something_more_powerful_than_Exclude/comment_1_b454ead16d90479690ad8ee72cfd1428._comment
+++ /dev/null
@@ -1,12 +0,0 @@
-[[!comment format=mdwn
- username="http://smcv.pseudorandom.co.uk/"
- nickname="smcv"
- subject="expression anchored too closely?"
- date="2010-11-23T10:43:08Z"
- content="""
-It looks as though you might only be excluding a top-level Makefile, and not a Makefile in subdirectories. Try excluding `(^|/)Makefile$` instead, for instance? (See `wiki_file_prune_regexps` in `IkiWiki.pm` for hints.)
-
-The match operation in `&file_pruned` ends up a bit like this:
-
-    \"foo/Makefile\" =~ m{…||…|(^|/)Makefile$}
-"""]]
-- 
cgit v1.2.3


From 9180381728e252cf474eb8a4b0460755b5c28340 Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" 
Date: Tue, 23 Nov 2010 23:50:29 +0000
Subject: tested and seems to work

---
 ...ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'doc')

diff --git a/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn b/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn
index 8b0501041..264eb9688 100644
--- a/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn
+++ b/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn
@@ -147,7 +147,7 @@ you don't like my approach:
 
 ----
 
-[[!template id=gitbranch branch=smcv/localurl author="[[smcv]]"]]
+[[!template id=gitbranch branch=smcv/ready/localurl author="[[smcv]]"]]
 [[!tag patch]]
 
 OK, here's an alternative approach, closer in spirit to what was initially
@@ -171,10 +171,10 @@ support that.
 fully relative nor fully absolute, and there doesn't seem to be a good name
 for them...
 
-I tested an earlier version on a demo website with the CGI enabled, and it seemed to
+I've tested this on a demo website with the CGI enabled, and it seemed to
 work nicely (there might be bugs in some plugins, I didn't try all of them).
-I haven't yet re-tested with my updated branch, which is why it's not `ready/`
-yet.
+The branch at [[todo/use secure cookies for SSL logins]] goes well with
+this one.
 
 The `$config{url}` and `$config{cgiurl}` are both HTTP, but if I enable
 `httpauth`, set `cgiauthurl` to a HTTPS version of the same site and log
-- 
cgit v1.2.3


From 61218e338a7517b25fc82697c3a11fff1edb6803 Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" 
Date: Tue, 23 Nov 2010 23:59:03 +0000
Subject: another branch

---
 doc/todo/use_secure_cookies_for_ssl_logins.mdwn | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 doc/todo/use_secure_cookies_for_ssl_logins.mdwn

(limited to 'doc')

diff --git a/doc/todo/use_secure_cookies_for_ssl_logins.mdwn b/doc/todo/use_secure_cookies_for_ssl_logins.mdwn
new file mode 100644
index 000000000..a91a15b98
--- /dev/null
+++ b/doc/todo/use_secure_cookies_for_ssl_logins.mdwn
@@ -0,0 +1,12 @@
+[[!template id=gitbranch branch=smcv/ready/sslcookie-auto author="[[smcv]]"]]
+[[!tag patch]]
+
+At the moment `sslcookie => 0` never creates secure cookies, so if you log in
+with SSL, your browser will send the session cookie even over plain HTTP.
+Meanwhile `sslcookie => 1` always creates secure cookies, so you can't
+usefully log in over plain http.
+
+This branch adds `sslcookie => 0, sslcookie_auto => 1` as an option; this
+uses the `HTTPS` environment variable, so if you log in over SSL you'll
+get a secure session cookie, but if you log in over HTTP, you won't.
+(The syntax for the setup file is pretty rubbish - any other suggestions?)
-- 
cgit v1.2.3


From 615bf4fe15e7300bc033724bf86eecb6a2efef49 Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 
Date: Thu, 25 Nov 2010 02:55:21 +0000
Subject: Added a comment: Missed It By That Much

---
 .../comment_2_f577ab6beb9912471949d8d18c790267._comment       | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 doc/forum/Need_something_more_powerful_than_Exclude/comment_2_f577ab6beb9912471949d8d18c790267._comment

(limited to 'doc')

diff --git a/doc/forum/Need_something_more_powerful_than_Exclude/comment_2_f577ab6beb9912471949d8d18c790267._comment b/doc/forum/Need_something_more_powerful_than_Exclude/comment_2_f577ab6beb9912471949d8d18c790267._comment
new file mode 100644
index 000000000..bd964d540
--- /dev/null
+++ b/doc/forum/Need_something_more_powerful_than_Exclude/comment_2_f577ab6beb9912471949d8d18c790267._comment
@@ -0,0 +1,11 @@
+[[!comment format=mdwn
+ username="http://kerravonsen.dreamwidth.org/"
+ ip="60.241.8.244"
+ subject="Missed It By That Much"
+ date="2010-11-25T02:55:20Z"
+ content="""
+I discovered that I not only needed to change the regexp, but I also needed to delete .ikiwiki/indexdb because `file_pruned` only gets called for files that aren't in the `%pagesources` hash, and since the file in question was already there because it had been put there before the exclude regex was changed, it wasn't even being checked!
+
+[[KathrynAndersen]]
+
+"""]]
-- 
cgit v1.2.3


From 6e97574598534c4d81d2039bc044ceceaaf44fbd Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" 
Date: Sat, 27 Nov 2010 23:29:20 +0000
Subject: rename todo/transient_in-memory_pages.mdwn to
 todo/transient_pages.mdwn

---
 doc/todo/transient_in-memory_pages.mdwn | 74 ---------------------------------
 doc/todo/transient_pages.mdwn           | 74 +++++++++++++++++++++++++++++++++
 2 files changed, 74 insertions(+), 74 deletions(-)
 delete mode 100644 doc/todo/transient_in-memory_pages.mdwn
 create mode 100644 doc/todo/transient_pages.mdwn

(limited to 'doc')

diff --git a/doc/todo/transient_in-memory_pages.mdwn b/doc/todo/transient_in-memory_pages.mdwn
deleted file mode 100644
index 9c1be7362..000000000
--- a/doc/todo/transient_in-memory_pages.mdwn
+++ /dev/null
@@ -1,74 +0,0 @@
-On [[todo/auto-create_tag_pages_according_to_a_template]], [[chrysn]]
-suggests:
-
-> Instead of creating a file that gets checked in into the RCS, the
-> source files could be left out and the output files be written as
-> long as there is no physical source file (think of a virtual underlay).
-> Something similar would be required to implement alias directive,
-> which couldn't be easily done by writing to the RCS as the page's
-> contents can change depending on which other pages claim it as an alias.
-
-`add_autofile` could be adapted to do this, or a similar API could be
-added.
-
-This would also be useful for autoindex, as suggested on
-[[plugins/autoindex/discussion]]. I'd also like to use it for
-[[plugins/contrib/album]].
-
-One refinement I'd suggest is that if the transient page is edited,
-its transient contents are evaluated and used as the initial
-content for the edit box; after that, it'd become a static page. --[[smcv]]
-
---------------------------
-
-[[!template id=gitbranch branch=smcv/transient author="[[smcv]]"]]
-[[!tag patch]]
-
-I had a look at implementing this. It turns out to be harder than I thought
-to have purely in-memory pages (several plugins want to be able to access the
-source file as a file), but I did get this proof-of-concept branch
-to write tag and autoindex pages into an underlay.
-
-This loses the ability to delete the auto-created pages (although they don't
-clutter up git this way, at least), and a lot of the code in autoindex is
-probably now redundant, so this is probably not quite ready for merge, but
-I'd welcome opinions.
-
-Usage: set `tag_underlay` and/or `autoindex_underlay` to an absolute path,
-which you must create beforehand. I suggest *srcdir* + `/.ikiwiki/transient`.
-
-Refinements that could be made if this approach seems reasonable:
-
-* make these options boolean, and have the path always be `.ikiwiki/transient`
-* improve the `remove` plugin so it also deletes from this special underlay
-
->> Perhaps it should be something more generic, so that other plugins could use it (such as "album" mentioned above).
->> The `.ikiwiki/transient` would suit this, but instead of saying "tag_underlay" or "autoindex_underlay" have "use_transient_underlay" or something like that?
->> Or to make it more flexible, have just one option "transient_underlay" which is set to an absolute path, and if it is set, then one is using a transient-underlay.
->> --[[KathrynAndersen]]
-
->>> What I had in mind was more like `tag_autocreate_transient => 1` or
->>> `autoindex_transient => 1`; you might conceivably want tags to be
->>> checked in but autoindices to be transient, and it's fine for each
->>> plugin to make its own decision. Going from that to one boolean
->>> (or just always-transient if people don't think that's too
->>> astonishing) would be trivial, though.
->>>
->>> I don't think relocating the transient underlay really makes sense,
->>> except for prototyping: you only want one, and `.ikiwiki` is as good
->>> a place as any (ikiwiki already needs to be able to write there).
->>>
->>> For [[plugins/contrib/album]] I think I'd just make the photo viewer
->>> pages always-transient - you can always make a transient page
->>> permanent by editing it, after all.
->>>
->>> Do you think this approach has enough potential that I should
->>> continue to hack on it? Any thoughts on the implementation? --[[smcv]]
-
->>>> Ah, now I understand what you're getting at. Yes, it makes sense to put transient pages under `.ikiwiki`.
->>>> I haven't looked at the code, but I'd be interested in seeing whether it's generic enough to be used by other plugins (such as `album`) without too much fuss.
->>>> The idea of a transient underlay gives us a desirable feature for free: that if someone edits the transient page, it is made permanent and added to the repository.
->>>>
->>>> I think the tricky thing with removing these transient underlay pages is the question of how to prevent whatever auto-generated the pages in the first place from generating them again - or, conversely, how to force whatever auto-generated those pages to regenerate them if you've changed your mind.
->>>> I think you'd need something similar to `will_render` so that transient pages would be automatically removed if whatever auto-generated them is no longer around.
->>>> -- [[KathrynAndersen]]
diff --git a/doc/todo/transient_pages.mdwn b/doc/todo/transient_pages.mdwn
new file mode 100644
index 000000000..9c1be7362
--- /dev/null
+++ b/doc/todo/transient_pages.mdwn
@@ -0,0 +1,74 @@
+On [[todo/auto-create_tag_pages_according_to_a_template]], [[chrysn]]
+suggests:
+
+> Instead of creating a file that gets checked in into the RCS, the
+> source files could be left out and the output files be written as
+> long as there is no physical source file (think of a virtual underlay).
+> Something similar would be required to implement alias directive,
+> which couldn't be easily done by writing to the RCS as the page's
+> contents can change depending on which other pages claim it as an alias.
+
+`add_autofile` could be adapted to do this, or a similar API could be
+added.
+
+This would also be useful for autoindex, as suggested on
+[[plugins/autoindex/discussion]]. I'd also like to use it for
+[[plugins/contrib/album]].
+
+One refinement I'd suggest is that if the transient page is edited,
+its transient contents are evaluated and used as the initial
+content for the edit box; after that, it'd become a static page. --[[smcv]]
+
+--------------------------
+
+[[!template id=gitbranch branch=smcv/transient author="[[smcv]]"]]
+[[!tag patch]]
+
+I had a look at implementing this. It turns out to be harder than I thought
+to have purely in-memory pages (several plugins want to be able to access the
+source file as a file), but I did get this proof-of-concept branch
+to write tag and autoindex pages into an underlay.
+
+This loses the ability to delete the auto-created pages (although they don't
+clutter up git this way, at least), and a lot of the code in autoindex is
+probably now redundant, so this is probably not quite ready for merge, but
+I'd welcome opinions.
+
+Usage: set `tag_underlay` and/or `autoindex_underlay` to an absolute path,
+which you must create beforehand. I suggest *srcdir* + `/.ikiwiki/transient`.
+
+Refinements that could be made if this approach seems reasonable:
+
+* make these options boolean, and have the path always be `.ikiwiki/transient`
+* improve the `remove` plugin so it also deletes from this special underlay
+
+>> Perhaps it should be something more generic, so that other plugins could use it (such as "album" mentioned above).
+>> The `.ikiwiki/transient` would suit this, but instead of saying "tag_underlay" or "autoindex_underlay" have "use_transient_underlay" or something like that?
+>> Or to make it more flexible, have just one option "transient_underlay" which is set to an absolute path, and if it is set, then one is using a transient-underlay.
+>> --[[KathrynAndersen]]
+
+>>> What I had in mind was more like `tag_autocreate_transient => 1` or
+>>> `autoindex_transient => 1`; you might conceivably want tags to be
+>>> checked in but autoindices to be transient, and it's fine for each
+>>> plugin to make its own decision. Going from that to one boolean
+>>> (or just always-transient if people don't think that's too
+>>> astonishing) would be trivial, though.
+>>>
+>>> I don't think relocating the transient underlay really makes sense,
+>>> except for prototyping: you only want one, and `.ikiwiki` is as good
+>>> a place as any (ikiwiki already needs to be able to write there).
+>>>
+>>> For [[plugins/contrib/album]] I think I'd just make the photo viewer
+>>> pages always-transient - you can always make a transient page
+>>> permanent by editing it, after all.
+>>>
+>>> Do you think this approach has enough potential that I should
+>>> continue to hack on it? Any thoughts on the implementation? --[[smcv]]
+
+>>>> Ah, now I understand what you're getting at. Yes, it makes sense to put transient pages under `.ikiwiki`.
+>>>> I haven't looked at the code, but I'd be interested in seeing whether it's generic enough to be used by other plugins (such as `album`) without too much fuss.
+>>>> The idea of a transient underlay gives us a desirable feature for free: that if someone edits the transient page, it is made permanent and added to the repository.
+>>>>
+>>>> I think the tricky thing with removing these transient underlay pages is the question of how to prevent whatever auto-generated the pages in the first place from generating them again - or, conversely, how to force whatever auto-generated those pages to regenerate them if you've changed your mind.
+>>>> I think you'd need something similar to `will_render` so that transient pages would be automatically removed if whatever auto-generated them is no longer around.
+>>>> -- [[KathrynAndersen]]
-- 
cgit v1.2.3


From 3650d0265bc501219bc6d5cd4fa91a6b6ecd793a Mon Sep 17 00:00:00 2001
From: Joey Hess 
Date: Sat, 27 Nov 2010 23:29:23 +0000
Subject:

---
 ...3f04d48d53a3cd77215d6b086b416a1965e2feb._change |  56 +++++
 ...8a20a3deaca2cb1f68fba993411b51c19e4c362._change |  62 ++++++
 ...a7db85f06674311b80b490dfc238a1eaed040f8._change |  57 +++++
 ...e4e3f7cae25082fc90a93dee41b397b0ae9be09._change |  74 +++++++
 ...ea5f43790fe2ce3cc40e9513191e72c67a1ee51._change |  69 ++++++
 ...71c429f829aac53cb449e3bb574d2a1669e025e._change |  93 ++++++++
 ...72f41f6de288814fbd013f3465e658c562b10b1._change |  66 ++++++
 ...739dbe0a8dc943c736d69f3747251ad72a53278._change |  62 ++++++
 ...78d6a16c2fff68edfbe6a1af5c8a9fa91db6039._change |  90 ++++++++
 ...968317cacc2f555af17286acf26a60ce616cc40._change |  67 ++++++
 ...b770bea3fd5b5dfb4e75237218db204139d9189._change |  51 +++++
 ...f32f5e6184b6354f671ae71578f1158c49168b6._change |  55 +++++
 ...38259dfa199e217e34cc02462f55df6b2b1fcc5._change |  56 +++++
 ...3e3e5f15e61639ccba4a7dfbab11d6fe4b9f047._change |  69 ++++++
 ...63cfa7d1e938e3b41d1b6826427f0d613b2b97c._change |  64 ++++++
 ...a452ddf146c4148155095e400f56b4674d76953._change |  64 ++++++
 ...c17255b6641e33374a446ca281a0ad6d46af1dc._change |  63 ++++++
 ...fdda536ec6bee1eff3b71c214753078cd588f8f._change |  58 +++++
 ...13a28b8f68b76aee4b94413e4e9d47dca93a34e._change |  63 ++++++
 ...08af2bb9e10d2ed899e17f9814a5514c0254dc8._change |  68 ++++++
 ...15effbb43663ad756d78b3e957ac593d0227a74._change |  55 +++++
 ...71ac78068532da53e4dad49d52c5ddccfcbff21._change |  58 +++++
 ...7726461a4119741affa6536deec7dd1fe52ef0d._change |  73 +++++++
 ...7b9f10e6254277918873a980af0cf0631326165._change |  60 ++++++
 ...3e519931f3a6b7cea0af652d749344757d4e2bc._change | 112 ++++++++++
 ...430d5dc3bc37df92eb01cd65382c0f2be78b8e7._change |  70 ++++++
 ...954915a4fe8a889b8217cac99fae53cbe7f1e97._change | 108 ++++++++++
 ...dbf25127fb776cc52a3a142b805a0c7f3cef242._change | 140 ++++++++++++
 ...ecba3b05d66bb58dc48a9027838e8b0bcbc0db9._change |  74 +++++++
 ...f750e16b8c32d2fd69209f433e7d19efa53a71f._change |  77 +++++++
 ...08cef54d63ba60efd24ae14012dda7ff8d014a9._change |  61 ++++++
 ...1218e338a7517b25fc82697c3a11fff1edb6803._change |  66 ++++++
 ...15bf4fe15e7300bc033724bf86eecb6a2efef49._change |  65 ++++++
 ...2fc5d0c3cfdde0ae87c5364db6f6ebfa6794b14._change | 102 +++++++++
 ...5873fee5e1dda78d6cf561cdd81a5dcd6d2735d._change |  63 ++++++
 ...5e726f201d7b9919271cfe7e8a7314a6abf0fc3._change |  90 ++++++++
 ...5ecc73755348f1ed13b77b2f4bdf9db4e465be4._change | 109 ++++++++++
 ...63d2578832dd0808ea98a624b49cec4bf3c0243._change |  52 +++++
 ...9a22a6f4b4dfc47a7ce39476758742036b70e63._change |  80 +++++++
 ...8a2e59834d35da7a7ab8145beb7a30b59b95c90._change |  59 ++++++
 ...4fff62948ad7c7aef664585e8afed86398e7fd4._change |  62 ++++++
 ...5d262e4cab2bfa55194b445d7fd251fa5818bc6._change |  55 +++++
 ...5ee24a9e53aec7d70bb4fb758428e59ea76e853._change |  56 +++++
 ...7a42450e1ac8e2e01b7ed2785ed43040fd14ed3._change |  55 +++++
 ...806a9795116e73ec851dfea89af45a786fbe6da._change |  58 +++++
 ...935a131d02ac13b6024dff9cbf7a5f837fcdc04._change | 161 ++++++++++++++
 ...de7fde49c295a6c9098767b9fdfea79de8476eb._change |  59 ++++++
 ...180381728e252cf474eb8a4b0460755b5c28340._change |  75 +++++++
 ...3e15cc84f47a1340f8bd06d7056ba423fe510bb._change |  60 ++++++
 ...8d0883c8949e6cde8db019bb282d5fa815ffc1a._change | 137 ++++++++++++
 ...9749dfdeac07b975cfba6eef617f3d7362eec73._change |  61 ++++++
 ...a7387a53be2b1e182003f3e86cb76d7f10c4b67._change |  76 +++++++
 ...b01c9779ef682af0874efc062d9fb2e91676c23._change |  66 ++++++
 ...c42f5786601429a0b921d6591ebf5e4c1eb4da8._change |  70 ++++++
 ...c8f86ee9c59035c9462d2c69c7b89d0c9dbc3c2._change |  58 +++++
 ...d0ac3170a8f90d2139ef75698e8af21a6435fb4._change |  58 +++++
 ...d26a72468fad69d633875b4ffb4aff8abd80023._change | 105 +++++++++
 ...f8cfe998e5ced7e4b2e1dd819a025b0745935ff._change |  59 ++++++
 ...194fbc5bced565fa751008b8ada666c411d097d._change |  60 ++++++
 ...2a1d2b2d96ede3f6a25d2d0fb89681ec5e05ff3._change |  62 ++++++
 ...4cb86d73327e7850eeb524ef387b17ac5e1614d._change |  59 ++++++
 ...6c3d71787c528888c3f66c7ded8dd0c8f430b7e._change |  57 +++++
 ...b96249d5ad8f3ee9275be3fef9e3467b8f3ffdf._change |  64 ++++++
 ...f0bfcc07820008f0387bfd1b35a594ed40a0246._change |  57 +++++
 ...f75602391ac9651e7594c65588da86d591f2c01._change |  51 +++++
 ...62581583107f6fc3e9bccf66a87a491c236757f._change |  51 +++++
 ...02f9d224cb78a3ad880cb749ef4a11eadfad79a._change |  58 +++++
 ...1f3129583ae4a1e3e9ace89ba11c8bf6c308be3._change |  60 ++++++
 ...3624227620f5034fa84b3cb1294a61fc08eeea9._change |  55 +++++
 ...8537b41320e1f38b2369f24431423dfb2f14b15._change |  61 ++++++
 ...9b737cc8596f9421ba968e56839eb052e80e794._change |  98 +++++++++
 ...a166361973e09b6756acbfe46b4a1bcfa4148d7._change |  53 +++++
 ...b45d3cf44760411746414ba1218c925ad097149._change |  65 ++++++
 ...bcd9077ad5fbef8c0622ea9c78a66c9baece804._change |  57 +++++
 ...cd80905f7ea02ef07c2174ab2e8bd5f8ab0afc3._change |  57 +++++
 ...fc1b6ac486e11cb11d6c72602bf70b0a440b747._change |  59 ++++++
 ...16104f55d8b31929d0466ca9abc3ccb4af0a8e8._change |  72 +++++++
 ...5056fb61e8332fea658363e931ec28a35681ffe._change |  68 ++++++
 ...6ff694ff7a6a4700ccbbd5819907eac73cf065a._change | 236 +++++++++++++++++++++
 ...916cd2f71f1c22dad947d7b2134edbbb15e7b8e._change | 120 +++++++++++
 ...a9e1ea667f82d5fca9168dbed19be08040570ff._change |  96 +++++++++
 ...af89f59e61d9091fe27dd8738b40db5fa85a5e6._change |  59 ++++++
 ...b3fb406733b98535d426acedd58f1633df79ade._change |  52 +++++
 ...d9796375895752621cdcce103d1ad8d8a31d6cb._change |  69 ++++++
 ...68f29eebb3917909b939869e57b985add724598._change |  61 ++++++
 ...810fe394b49955971299329136d46548d95ec6b._change |  63 ++++++
 ...aa04125d7080a9c882b629d1e0f6c7992ad462f._change |  58 +++++
 ...b13521f5276cdd21a3f5990b1a1a17234e40174._change |  58 +++++
 ...bcc0e6c9068bafaa52938a9f3aae6d6dd3d60aa._change |  55 +++++
 ...c6c1269d251c78d2eef68cb789de6cfc6272464._change | 106 +++++++++
 ...fba19b3379b0b4e4199ece869c71f80be3a82d1._change |  66 ++++++
 ...35f79a0b831e8b47f62c430c1bba538d4687521._change | 100 +++++++++
 ...54a91c3021b304fdde183834542418720e4f792._change |  71 +++++++
 ...6312319a49cc1860eebbafd937a0f75d8e7baeb._change |  59 ++++++
 ...80469c34d8d81e79d4894f7a1789a949bc766c3._change |  54 +++++
 ...8f8770a652520b2f09eb2262510a04a8e353e9d._change |  73 +++++++
 ...a71b0e6aa08b0e3b274a0b939bf657f2576e482._change |  63 ++++++
 ...feee19216182d633d251852ab62fe79c1367796._change |  61 ++++++
 .../autoindex_should_use_add__95__autofile.mdwn    |   2 +-
 99 files changed, 7017 insertions(+), 1 deletion(-)
 create mode 100644 doc/recentchanges/change_03f04d48d53a3cd77215d6b086b416a1965e2feb._change
 create mode 100644 doc/recentchanges/change_08a20a3deaca2cb1f68fba993411b51c19e4c362._change
 create mode 100644 doc/recentchanges/change_0a7db85f06674311b80b490dfc238a1eaed040f8._change
 create mode 100644 doc/recentchanges/change_0e4e3f7cae25082fc90a93dee41b397b0ae9be09._change
 create mode 100644 doc/recentchanges/change_0ea5f43790fe2ce3cc40e9513191e72c67a1ee51._change
 create mode 100644 doc/recentchanges/change_171c429f829aac53cb449e3bb574d2a1669e025e._change
 create mode 100644 doc/recentchanges/change_172f41f6de288814fbd013f3465e658c562b10b1._change
 create mode 100644 doc/recentchanges/change_1739dbe0a8dc943c736d69f3747251ad72a53278._change
 create mode 100644 doc/recentchanges/change_178d6a16c2fff68edfbe6a1af5c8a9fa91db6039._change
 create mode 100644 doc/recentchanges/change_1968317cacc2f555af17286acf26a60ce616cc40._change
 create mode 100644 doc/recentchanges/change_1b770bea3fd5b5dfb4e75237218db204139d9189._change
 create mode 100644 doc/recentchanges/change_1f32f5e6184b6354f671ae71578f1158c49168b6._change
 create mode 100644 doc/recentchanges/change_238259dfa199e217e34cc02462f55df6b2b1fcc5._change
 create mode 100644 doc/recentchanges/change_23e3e5f15e61639ccba4a7dfbab11d6fe4b9f047._change
 create mode 100644 doc/recentchanges/change_263cfa7d1e938e3b41d1b6826427f0d613b2b97c._change
 create mode 100644 doc/recentchanges/change_2a452ddf146c4148155095e400f56b4674d76953._change
 create mode 100644 doc/recentchanges/change_2c17255b6641e33374a446ca281a0ad6d46af1dc._change
 create mode 100644 doc/recentchanges/change_2fdda536ec6bee1eff3b71c214753078cd588f8f._change
 create mode 100644 doc/recentchanges/change_313a28b8f68b76aee4b94413e4e9d47dca93a34e._change
 create mode 100644 doc/recentchanges/change_408af2bb9e10d2ed899e17f9814a5514c0254dc8._change
 create mode 100644 doc/recentchanges/change_415effbb43663ad756d78b3e957ac593d0227a74._change
 create mode 100644 doc/recentchanges/change_471ac78068532da53e4dad49d52c5ddccfcbff21._change
 create mode 100644 doc/recentchanges/change_47726461a4119741affa6536deec7dd1fe52ef0d._change
 create mode 100644 doc/recentchanges/change_47b9f10e6254277918873a980af0cf0631326165._change
 create mode 100644 doc/recentchanges/change_53e519931f3a6b7cea0af652d749344757d4e2bc._change
 create mode 100644 doc/recentchanges/change_5430d5dc3bc37df92eb01cd65382c0f2be78b8e7._change
 create mode 100644 doc/recentchanges/change_5954915a4fe8a889b8217cac99fae53cbe7f1e97._change
 create mode 100644 doc/recentchanges/change_5dbf25127fb776cc52a3a142b805a0c7f3cef242._change
 create mode 100644 doc/recentchanges/change_5ecba3b05d66bb58dc48a9027838e8b0bcbc0db9._change
 create mode 100644 doc/recentchanges/change_5f750e16b8c32d2fd69209f433e7d19efa53a71f._change
 create mode 100644 doc/recentchanges/change_608cef54d63ba60efd24ae14012dda7ff8d014a9._change
 create mode 100644 doc/recentchanges/change_61218e338a7517b25fc82697c3a11fff1edb6803._change
 create mode 100644 doc/recentchanges/change_615bf4fe15e7300bc033724bf86eecb6a2efef49._change
 create mode 100644 doc/recentchanges/change_62fc5d0c3cfdde0ae87c5364db6f6ebfa6794b14._change
 create mode 100644 doc/recentchanges/change_65873fee5e1dda78d6cf561cdd81a5dcd6d2735d._change
 create mode 100644 doc/recentchanges/change_65e726f201d7b9919271cfe7e8a7314a6abf0fc3._change
 create mode 100644 doc/recentchanges/change_65ecc73755348f1ed13b77b2f4bdf9db4e465be4._change
 create mode 100644 doc/recentchanges/change_663d2578832dd0808ea98a624b49cec4bf3c0243._change
 create mode 100644 doc/recentchanges/change_69a22a6f4b4dfc47a7ce39476758742036b70e63._change
 create mode 100644 doc/recentchanges/change_78a2e59834d35da7a7ab8145beb7a30b59b95c90._change
 create mode 100644 doc/recentchanges/change_84fff62948ad7c7aef664585e8afed86398e7fd4._change
 create mode 100644 doc/recentchanges/change_85d262e4cab2bfa55194b445d7fd251fa5818bc6._change
 create mode 100644 doc/recentchanges/change_85ee24a9e53aec7d70bb4fb758428e59ea76e853._change
 create mode 100644 doc/recentchanges/change_87a42450e1ac8e2e01b7ed2785ed43040fd14ed3._change
 create mode 100644 doc/recentchanges/change_8806a9795116e73ec851dfea89af45a786fbe6da._change
 create mode 100644 doc/recentchanges/change_8935a131d02ac13b6024dff9cbf7a5f837fcdc04._change
 create mode 100644 doc/recentchanges/change_8de7fde49c295a6c9098767b9fdfea79de8476eb._change
 create mode 100644 doc/recentchanges/change_9180381728e252cf474eb8a4b0460755b5c28340._change
 create mode 100644 doc/recentchanges/change_93e15cc84f47a1340f8bd06d7056ba423fe510bb._change
 create mode 100644 doc/recentchanges/change_98d0883c8949e6cde8db019bb282d5fa815ffc1a._change
 create mode 100644 doc/recentchanges/change_99749dfdeac07b975cfba6eef617f3d7362eec73._change
 create mode 100644 doc/recentchanges/change_9a7387a53be2b1e182003f3e86cb76d7f10c4b67._change
 create mode 100644 doc/recentchanges/change_9b01c9779ef682af0874efc062d9fb2e91676c23._change
 create mode 100644 doc/recentchanges/change_9c42f5786601429a0b921d6591ebf5e4c1eb4da8._change
 create mode 100644 doc/recentchanges/change_9c8f86ee9c59035c9462d2c69c7b89d0c9dbc3c2._change
 create mode 100644 doc/recentchanges/change_9d0ac3170a8f90d2139ef75698e8af21a6435fb4._change
 create mode 100644 doc/recentchanges/change_9d26a72468fad69d633875b4ffb4aff8abd80023._change
 create mode 100644 doc/recentchanges/change_9f8cfe998e5ced7e4b2e1dd819a025b0745935ff._change
 create mode 100644 doc/recentchanges/change_a194fbc5bced565fa751008b8ada666c411d097d._change
 create mode 100644 doc/recentchanges/change_a2a1d2b2d96ede3f6a25d2d0fb89681ec5e05ff3._change
 create mode 100644 doc/recentchanges/change_a4cb86d73327e7850eeb524ef387b17ac5e1614d._change
 create mode 100644 doc/recentchanges/change_a6c3d71787c528888c3f66c7ded8dd0c8f430b7e._change
 create mode 100644 doc/recentchanges/change_ab96249d5ad8f3ee9275be3fef9e3467b8f3ffdf._change
 create mode 100644 doc/recentchanges/change_af0bfcc07820008f0387bfd1b35a594ed40a0246._change
 create mode 100644 doc/recentchanges/change_af75602391ac9651e7594c65588da86d591f2c01._change
 create mode 100644 doc/recentchanges/change_b62581583107f6fc3e9bccf66a87a491c236757f._change
 create mode 100644 doc/recentchanges/change_c02f9d224cb78a3ad880cb749ef4a11eadfad79a._change
 create mode 100644 doc/recentchanges/change_c1f3129583ae4a1e3e9ace89ba11c8bf6c308be3._change
 create mode 100644 doc/recentchanges/change_c3624227620f5034fa84b3cb1294a61fc08eeea9._change
 create mode 100644 doc/recentchanges/change_c8537b41320e1f38b2369f24431423dfb2f14b15._change
 create mode 100644 doc/recentchanges/change_c9b737cc8596f9421ba968e56839eb052e80e794._change
 create mode 100644 doc/recentchanges/change_ca166361973e09b6756acbfe46b4a1bcfa4148d7._change
 create mode 100644 doc/recentchanges/change_cb45d3cf44760411746414ba1218c925ad097149._change
 create mode 100644 doc/recentchanges/change_cbcd9077ad5fbef8c0622ea9c78a66c9baece804._change
 create mode 100644 doc/recentchanges/change_ccd80905f7ea02ef07c2174ab2e8bd5f8ab0afc3._change
 create mode 100644 doc/recentchanges/change_cfc1b6ac486e11cb11d6c72602bf70b0a440b747._change
 create mode 100644 doc/recentchanges/change_d16104f55d8b31929d0466ca9abc3ccb4af0a8e8._change
 create mode 100644 doc/recentchanges/change_d5056fb61e8332fea658363e931ec28a35681ffe._change
 create mode 100644 doc/recentchanges/change_d6ff694ff7a6a4700ccbbd5819907eac73cf065a._change
 create mode 100644 doc/recentchanges/change_d916cd2f71f1c22dad947d7b2134edbbb15e7b8e._change
 create mode 100644 doc/recentchanges/change_da9e1ea667f82d5fca9168dbed19be08040570ff._change
 create mode 100644 doc/recentchanges/change_daf89f59e61d9091fe27dd8738b40db5fa85a5e6._change
 create mode 100644 doc/recentchanges/change_db3fb406733b98535d426acedd58f1633df79ade._change
 create mode 100644 doc/recentchanges/change_dd9796375895752621cdcce103d1ad8d8a31d6cb._change
 create mode 100644 doc/recentchanges/change_e68f29eebb3917909b939869e57b985add724598._change
 create mode 100644 doc/recentchanges/change_e810fe394b49955971299329136d46548d95ec6b._change
 create mode 100644 doc/recentchanges/change_eaa04125d7080a9c882b629d1e0f6c7992ad462f._change
 create mode 100644 doc/recentchanges/change_eb13521f5276cdd21a3f5990b1a1a17234e40174._change
 create mode 100644 doc/recentchanges/change_ebcc0e6c9068bafaa52938a9f3aae6d6dd3d60aa._change
 create mode 100644 doc/recentchanges/change_ec6c1269d251c78d2eef68cb789de6cfc6272464._change
 create mode 100644 doc/recentchanges/change_efba19b3379b0b4e4199ece869c71f80be3a82d1._change
 create mode 100644 doc/recentchanges/change_f35f79a0b831e8b47f62c430c1bba538d4687521._change
 create mode 100644 doc/recentchanges/change_f54a91c3021b304fdde183834542418720e4f792._change
 create mode 100644 doc/recentchanges/change_f6312319a49cc1860eebbafd937a0f75d8e7baeb._change
 create mode 100644 doc/recentchanges/change_f80469c34d8d81e79d4894f7a1789a949bc766c3._change
 create mode 100644 doc/recentchanges/change_f8f8770a652520b2f09eb2262510a04a8e353e9d._change
 create mode 100644 doc/recentchanges/change_fa71b0e6aa08b0e3b274a0b939bf657f2576e482._change
 create mode 100644 doc/recentchanges/change_ffeee19216182d633d251852ab62fe79c1367796._change

(limited to 'doc')

diff --git a/doc/recentchanges/change_03f04d48d53a3cd77215d6b086b416a1965e2feb._change b/doc/recentchanges/change_03f04d48d53a3cd77215d6b086b416a1965e2feb._change
new file mode 100644
index 000000000..703d0dced
--- /dev/null
+++ b/doc/recentchanges/change_03f04d48d53a3cd77215d6b086b416a1965e2feb._change
@@ -0,0 +1,56 @@
+[[!meta author="""http://pmate.myopenid.com/"""]]
+
+[[!meta authorurl="""http://pmate.myopenid.com/"""]]
+
+[[!meta title="""change to ikiwikiusers on ikiwiki"""]]
+
+[[!meta permalink="http://ikiwiki.info/recentchanges/#change-03f04d48d53a3cd77215d6b086b416a1965e2feb"]]
+
+

+
Changed pages:
+
+
+[[diff|wikiicons/diff.png]]ikiwikiusers
+
+
+
+
Changed by:
+
+
+pmate [myopenid.com]
+
+
+
Commit type:
+web
+
Date:
+08:03:09 11/17/10
+

+

+
+
+[[revert|wikiicons/revert.png]]
+
+
+

+
+

+
+

+
+diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn
+index d8e55ba..699eeda 100644
+--- a/doc/ikiwikiusers.mdwn
++++ b/doc/ikiwikiusers.mdwn
+@@ -161,6 +161,7 @@ Personal sites and blogs
+ * [Marco Silva](http://marcot.eti.br/) a weblog + wiki using the [darcs](http://darcs.net) backend
+ * [NeX-6](http://nex-6.taht.net/) ikiwiki blog and wiki running over ipv6
+ * [Jason Riedy](http://lovesgoodfood.com/jason/), which may occasionally look funny if I'm playing with my branch...
++* [pmate](http://pmate.nfshost.com)'s homepage and [blog](http://pmate.nfshost.com/blog/)
+ 
+ Please feel free to add your own ikiwiki site!
+ 
+
+

+

+
+
diff --git a/doc/recentchanges/change_08a20a3deaca2cb1f68fba993411b51c19e4c362._change b/doc/recentchanges/change_08a20a3deaca2cb1f68fba993411b51c19e4c362._change
new file mode 100644
index 000000000..e55c80e85
--- /dev/null
+++ b/doc/recentchanges/change_08a20a3deaca2cb1f68fba993411b51c19e4c362._change
@@ -0,0 +1,62 @@
+[[!meta author="""joey"""]]
+
+[[!meta authorurl="""http://ikiwiki.info/ikiwiki.cgi?page=users%2Fjoey&do=goto"""]]
+
+[[!meta title="""change to todo/Improving_the_efficiency_of_match__95__glob on ikiwiki"""]]
+
+[[!meta permalink="http://ikiwiki.info/recentchanges/#change-08a20a3deaca2cb1f68fba993411b51c19e4c362"]]
+
+

+
Changed pages:
+
+
+[[diff|wikiicons/diff.png]]todo/Improving the efficiency of match_glob
+
+
+
+
Changed by:
+
+
+joey
+
+
+
Commit type:
+git
+
Date:
+11:37:59 11/10/10
+

+

+
+
+[[revert|wikiicons/revert.png]]
+
+
+

+
+
+benchmarks

+
+
+

+
+

+
+diff --git a/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn b/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn
+index 0a9d8c6..b631287 100644
+--- a/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn
++++ b/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn
+@@ -6,6 +6,9 @@ Here's my patch - please consider it! -- [[KathrynAndersen]]
+ > `memoize(glob2re)` next to the other memoize calls, would be a less
+ > verbose way to do this? --[[smcv]]
+ 
++>> I think so, yeah. Anyway, do you have any benchmark results handy,
++>> Kathryn?  --[[Joey]] 
++
+ --------------------------------------------------------------
+ <pre>
+ diff --git a/IkiWiki.pm b/IkiWiki.pm
+
+

+

+
+
diff --git a/doc/recentchanges/change_0a7db85f06674311b80b490dfc238a1eaed040f8._change b/doc/recentchanges/change_0a7db85f06674311b80b490dfc238a1eaed040f8._change
new file mode 100644
index 000000000..5140dc1ad
--- /dev/null
+++ b/doc/recentchanges/change_0a7db85f06674311b80b490dfc238a1eaed040f8._change
@@ -0,0 +1,57 @@
+[[!meta author="""https://www.google.com/accounts/o8/id?id=AItOawmMInRJfXlDaAMktsWQKahl1C7X4cGrUtE"""]]
+
+[[!meta authorurl="""https://www.google.com/accounts/o8/id?id=AItOawmMInRJfXlDaAMktsWQKahl1C7X4cGrUtE"""]]
+
+[[!meta title="""change to index on ikiwiki"""]]
+
+[[!meta permalink="http://ikiwiki.info/recentchanges/#change-0a7db85f06674311b80b490dfc238a1eaed040f8"]]
+
+

+
Changed pages:
+
+
+[[diff|wikiicons/diff.png]]index
+
+
+
+
Changed by:
+
+
+Sarfaraz
+
+
+
Commit type:
+web
+
Date:
+19:01:14 11/11/10
+

+

+
+
+[[revert|wikiicons/revert.png]]
+
+
+

+
+

+
+

+
+diff --git a/doc/index.mdwn b/doc/index.mdwn
+index 06acc9c..90713d1 100644
+--- a/doc/index.mdwn
++++ b/doc/index.mdwn
+@@ -17,7 +17,7 @@ All wikis are supposed to have a [[SandBox]], so this one does too.
+ This site generally runs the latest release of ikiwiki; currently, it runs
+ ikiwiki [[!version ]].
+ 
+-## developer resources
++## developer resources sas
+ 
+ The [[RoadMap]] describes where the project is going.
+ The [[forum]] is open for discussions.
+
+

+

+
+
diff --git a/doc/recentchanges/change_0e4e3f7cae25082fc90a93dee41b397b0ae9be09._change b/doc/recentchanges/change_0e4e3f7cae25082fc90a93dee41b397b0ae9be09._change
new file mode 100644
index 000000000..63830fd4c
--- /dev/null
+++ b/doc/recentchanges/change_0e4e3f7cae25082fc90a93dee41b397b0ae9be09._change
@@ -0,0 +1,74 @@
+[[!meta author="""http://smcv.pseudorandom.co.uk/"""]]
+
+[[!meta authorurl="""http://smcv.pseudorandom.co.uk/"""]]
+
+[[!meta title="""change to todo/transient_in-memory_pages on ikiwiki"""]]
+
+[[!meta permalink="http://ikiwiki.info/recentchanges/#change-0e4e3f7cae25082fc90a93dee41b397b0ae9be09"]]
+
+

+
Changed pages:
+
+
+[[diff|wikiicons/diff.png]]todo/transient in-memory pages
+
+
+
+
Changed by:
+
+
+smcv
+
+
+
Commit type:
+web
+
Date:
+08:10:20 11/08/10
+

+

+
+
+[[revert|wikiicons/revert.png]]
+
+
+

+
+
+suggested in two places => useful?

+
+
+

+
+

+
+diff --git a/doc/todo/transient_in-memory_pages.mdwn b/doc/todo/transient_in-memory_pages.mdwn
+new file mode 100644
+index 0000000..9808ffd
+--- /dev/null
++++ b/doc/todo/transient_in-memory_pages.mdwn
+@@ -0,0 +1,20 @@
++On [[todo/auto-create_tag_pages_according_to_a_template]], [[chrysn]]
++suggests:
++
++> Instead of creating a file that gets checked in into the RCS, the
++> source files could be left out and the output files be written as
++> long as there is no physical source file (think of a virtual underlay).
++> Something similar would be required to implement alias directive,
++> which couldn't be easily done by writing to the RCS as the page's
++> contents can change depending on which other pages claim it as an alias.
++
++`add_autofile` could be adapted to do this, or a similar API could be
++added.
++
++This would also be useful for autoindex, as suggested on
++[[plugins/autoindex/discussion]]. I'd also like to use it for
++[[plugins/contrib/album]].
++
++One refinement I'd suggest is that if the transient page is edited,
++its transient contents are evaluated and used as the initial
++content for the edit box; after that, it'd become a static page. --[[smcv]]
+
+

+

+
+
diff --git a/doc/recentchanges/change_0ea5f43790fe2ce3cc40e9513191e72c67a1ee51._change b/doc/recentchanges/change_0ea5f43790fe2ce3cc40e9513191e72c67a1ee51._change
new file mode 100644
index 000000000..99f032a4c
--- /dev/null
+++ b/doc/recentchanges/change_0ea5f43790fe2ce3cc40e9513191e72c67a1ee51._change
@@ -0,0 +1,69 @@
+[[!meta author="""joey"""]]
+
+[[!meta authorurl="""http://ikiwiki.info/ikiwiki.cgi?page=users%2Fjoey&do=goto"""]]
+
+[[!meta title="""change to security on ikiwiki"""]]
+
+[[!meta permalink="http://ikiwiki.info/recentchanges/#change-0ea5f43790fe2ce3cc40e9513191e72c67a1ee51"]]
+
+

+
Changed pages:
+
+
+[[diff|wikiicons/diff.png]]security
+
+
+
+
Changed by:
+
+
+joey
+
+
+
Commit type:
+git
+
Date:
+00:24:52 11/12/10
+

+

+
+
+[[revert|wikiicons/revert.png]]
+
+
+

+
+
+security issue

+
+
+

+
+

+
+diff --git a/doc/security.mdwn b/doc/security.mdwn
+index 34a0052..33b1992 100644
+--- a/doc/security.mdwn
++++ b/doc/security.mdwn
+@@ -440,3 +440,16 @@ with the release of ikiwiki 3.20100312.
+ A fix was also backported to Debian etch, as version 2.53.5. I recommend
+ upgrading to one of these versions if your wiki can be edited by third
+ parties.
++
++## javascript insertation via insufficient htmlscrubbing of comments
++
++Kevin Riggle noticed that it was not possible to configure
++`htmlscrubber_skip` to scrub comments while leaving unscubbed the text
++of eg, blog posts. Confusingly, setting it to "* and !comment(*)" did not
++scrub comments.
++
++Additionally, it was discovered that comments' html was never scrubbed during
++preview or moderation of comments.
++
++These problems were discovered on 12 November 2010 and fixed the same
++hour with the release of ikiwiki 3.20101112.
+
+

+

+
+
diff --git a/doc/recentchanges/change_171c429f829aac53cb449e3bb574d2a1669e025e._change b/doc/recentchanges/change_171c429f829aac53cb449e3bb574d2a1669e025e._change
new file mode 100644
index 000000000..0ff2e8207
--- /dev/null
+++ b/doc/recentchanges/change_171c429f829aac53cb449e3bb574d2a1669e025e._change
@@ -0,0 +1,93 @@
+[[!meta author="""http://kerravonsen.dreamwidth.org/"""]]
+
+[[!meta authorurl="""http://kerravonsen.dreamwidth.org/"""]]
+
+[[!meta title="""change to todo/Improving_the_efficiency_of_match__95__glob on ikiwiki"""]]
+
+[[!meta permalink="http://ikiwiki.info/recentchanges/#change-171c429f829aac53cb449e3bb574d2a1669e025e"]]
+
+

+
Changed pages:
+
+
+[[diff|wikiicons/diff.png]]todo/Improving the efficiency of match_glob
+
+
+
+
Changed by:
+
+
+kerravonsen [dreamwidth.org]
+
+
+
Commit type:
+web
+
Date:
+20:53:10 11/09/10
+

+

+
+
+[[revert|wikiicons/revert.png]]
+
+
+

+
+
+make match_glob faster - patch!

+
+
+

+
+

+
+diff --git a/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn b/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn
+new file mode 100644
+index 0000000..8f70f1d
+--- /dev/null
++++ b/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn
+@@ -0,0 +1,39 @@
++I've been profiling my IkiWiki to try to improve speed (with many pages makes speed even more important) and I've written a patch to improve the speed of match_glob.  This matcher is a good one to improve the speed of, because it gets called so many times.
++
++Here's my patch - please consider it! -- [[KathrynAndersen]]
++
++--------------------------------------------------------------
++<pre>
++diff --git a/IkiWiki.pm b/IkiWiki.pm
++index 08a3d78..c187b98 100644
++--- a/IkiWiki.pm
+++++ b/IkiWiki.pm
++@@ -2482,6 +2482,8 @@ sub derel ($$) {
++ 	return $path;
++ }
++ 
+++my %glob_cache;
+++
++ sub match_glob ($$;@) {
++ 	my $page=shift;
++ 	my $glob=shift;
++@@ -2489,8 +2491,15 @@ sub match_glob ($$;@) {
++ 	
++ 	$glob=derel($glob, $params{location});
++ 
++-	my $regexp=IkiWiki::glob2re($glob);
++-	if ($page=~/^$regexp$/i) {
+++	# Instead of converting the glob to a regex every time,
+++	# cache the compiled regex to save time.
+++	if (!exists $glob_cache{$glob}
+++	    or !defined $glob_cache{$glob})
+++	{
+++	    my $re=IkiWiki::glob2re($glob);
+++	    $glob_cache{$glob} = qr/^$re$/i;
+++	}
+++	if ($page =~ $glob_cache{$glob}) {
++ 		if (! IkiWiki::isinternal($page) || $params{internal}) {
++ 			return IkiWiki::SuccessReason->new("$glob matches $page");
++ 		}
++</pre>
++--------------------------------------------------------------
+
+

+

+
+
diff --git a/doc/recentchanges/change_172f41f6de288814fbd013f3465e658c562b10b1._change b/doc/recentchanges/change_172f41f6de288814fbd013f3465e658c562b10b1._change
new file mode 100644
index 000000000..3c15ef1e3
--- /dev/null
+++ b/doc/recentchanges/change_172f41f6de288814fbd013f3465e658c562b10b1._change
@@ -0,0 +1,66 @@
+[[!meta author="""http://smcv.pseudorandom.co.uk/"""]]
+
+[[!meta authorurl="""http://smcv.pseudorandom.co.uk/"""]]
+
+[[!meta title="""change to forum/Need_something_more_powerful_than_Exclude/comment_1_b454ead16d90479690ad8ee72cfd1428 on ikiwiki"""]]
+
+[[!meta permalink="http://ikiwiki.info/recentchanges/#change-172f41f6de288814fbd013f3465e658c562b10b1"]]
+
+

+
Changed pages:
+
+
+[[diff|wikiicons/diff.png]]forum/Need something more powerful than Exclude/comment 1 b454ead16d90479690ad8ee72cfd1428
+
+
+
+
Changed by:
+
+
+smcv
+
+
+
Commit type:
+web
+
Date:
+10:43:40 11/23/10
+

+

+
+
+[[revert|wikiicons/revert.png]]
+
+
+

+
+
+removed

+
+
+

+
+

+
+diff --git a/doc/forum/Need_something_more_powerful_than_Exclude/comment_1_b454ead16d90479690ad8ee72cfd1428._comment b/doc/forum/Need_something_more_powerful_than_Exclude/comment_1_b454ead16d90479690ad8ee72cfd1428._comment
+deleted file mode 100644
+index 6e29f0c..0000000
+--- a/doc/forum/Need_something_more_powerful_than_Exclude/comment_1_b454ead16d90479690ad8ee72cfd1428._comment
++++ /dev/null
+@@ -1,12 +0,0 @@
+-[[!comment format=mdwn
+- username="http://smcv.pseudorandom.co.uk/"
+- nickname="smcv"
+- subject="expression anchored too closely?"
+- date="2010-11-23T10:43:08Z"
+- content="""
+-It looks as though you might only be excluding a top-level Makefile, and not a Makefile in subdirectories. Try excluding `(^|/)Makefile$` instead, for instance? (See `wiki_file_prune_regexps` in `IkiWiki.pm` for hints.)
+-
+-The match operation in `&file_pruned` ends up a bit like this:
+-
+-    \"foo/Makefile\" =~ m{…||…|(^|/)Makefile$}
+-"""]]
+
+

+

+
+
diff --git a/doc/recentchanges/change_1739dbe0a8dc943c736d69f3747251ad72a53278._change b/doc/recentchanges/change_1739dbe0a8dc943c736d69f3747251ad72a53278._change
new file mode 100644
index 000000000..eda883858
--- /dev/null
+++ b/doc/recentchanges/change_1739dbe0a8dc943c736d69f3747251ad72a53278._change
@@ -0,0 +1,62 @@
+[[!meta author="""joey"""]]
+
+[[!meta authorurl="""http://ikiwiki.info/ikiwiki.cgi?page=users%2Fjoey&do=goto"""]]
+
+[[!meta title="""change to tips/nearlyfreespeech on ikiwiki"""]]
+
+[[!meta permalink="http://ikiwiki.info/recentchanges/#change-1739dbe0a8dc943c736d69f3747251ad72a53278"]]
+
+

+
Changed pages:
+
+
+[[diff|wikiicons/diff.png]]tips/nearlyfreespeech
+
+
+
+
Changed by:
+
+
+joey
+
+
+
Commit type:
+git
+
Date:
+18:57:46 11/20/10
+

+

+
+
+[[revert|wikiicons/revert.png]]
+
+
+

+
+
+úpdate

+
+
+

+
+

+
+diff --git a/doc/tips/nearlyfreespeech.mdwn b/doc/tips/nearlyfreespeech.mdwn
+index 4b3b02e..a3d1ec6 100644
+--- a/doc/tips/nearlyfreespeech.mdwn
++++ b/doc/tips/nearlyfreespeech.mdwn
+@@ -14,7 +14,8 @@ After you [get an account](https://www.nearlyfreespeech.net/about/start.php),
+ create a site using their web interface. 
+ 
+ Mine is named `ikiwiki-test` and I used their DNS instead of getting my
+-own, resulting in <http://ikiwiki-test.nfshost.com/>
++own, resulting in <http://ikiwiki-test.nfshost.com/>. (Not being kept up
++anymore.)
+ 
+ They gave me 2 cents free funding for signing up, which is enough to pay
+ for 10 megabytes of bandwidth, or about a thousand typical page views, at
+
+

+

+
+
diff --git a/doc/recentchanges/change_178d6a16c2fff68edfbe6a1af5c8a9fa91db6039._change b/doc/recentchanges/change_178d6a16c2fff68edfbe6a1af5c8a9fa91db6039._change
new file mode 100644
index 000000000..0e44d6398
--- /dev/null
+++ b/doc/recentchanges/change_178d6a16c2fff68edfbe6a1af5c8a9fa91db6039._change
@@ -0,0 +1,90 @@
+[[!meta author="""joey"""]]
+
+[[!meta authorurl="""http://ikiwiki.info/ikiwiki.cgi?page=users%2Fjoey&do=goto"""]]
+
+[[!meta title="""change to todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both on ikiwiki"""]]
+
+[[!meta permalink="http://ikiwiki.info/recentchanges/#change-178d6a16c2fff68edfbe6a1af5c8a9fa91db6039"]]
+
+

+
Changed pages:
+
+
+[[diff|wikiicons/diff.png]]todo/want to avoid ikiwiki using http or https in urls to allow serving both
+
+
+
+
Changed by:
+
+
+joey
+
+
+
Commit type:
+git
+
Date:
+18:05:37 11/22/10
+

+

+
+
+[[revert|wikiicons/revert.png]]
+
+
+

+
+
+comments (finally)

+
+
+

+
+

+
+diff --git a/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn b/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn
+index 20d22b9..4fafc2b 100644
+--- a/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn
++++ b/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn
+@@ -181,6 +181,16 @@ New API added by this branch:
+ 
+ * `urlto(x, y, 'local')` uses `$local_url` instead of `$config{url}`
+ 
++  > Yikes. I see why you wanted to keep it to 3 parameters (4 is too many,
++  > and po overrides it), but I dislike overloading the third parameter
++  > like that.
++  > 
++  > There are fairly few calls to `urlto($foo, $bar)`, so why not
++  > make that always return the semi-local url form, and leave the third
++  > parameter for the cases that need a true fully-qualified url.
++  > The new form for local urls will typically be only a little bit longer,
++  > except in the unusual case where the cgiurl is elsewhere. --[[Joey]]
++
+ * `IkiWiki::baseurl` has a new second argument which works like the
+   third argument of `urlto`
+ 
+@@ -199,9 +209,13 @@ Bugs:
+   `cgiurl(cgiurl => $config{cgiurl}, ...)`,
+   although that does look a bit strange
+ 
++  > I agree that makes sense. --[[Joey]]
++
+ * It occurs to me that `IkiWiki::cgiurl` could probably benefit from being
+   exported? Perhaps also `IkiWiki::baseurl`?
+ 
++  > Possibly, see [[firm_up_plugin_interface]]. --[[Joey]] 
++
+ * Or, to reduce use of the unexported `baseurl` function, it might make
+   sense to give `urlto` a special case that references the root of the wiki,
+   with a trailing slash ready to append stuff: perhaps `urlto('/')`,
+@@ -210,3 +224,6 @@ Bugs:
+         do_something(baseurl => urlto('/', undef, local)`);
+         do_something_else(urlto('/').'style.css');
+         IkiWiki::redirect(urlto('/', undef, 1));
++
++  > AFACIS, `baseurl` is only called in 3 places so I don't think that's
++  > needed. --[[Joey]] 
+
+

+

+
+
diff --git a/doc/recentchanges/change_1968317cacc2f555af17286acf26a60ce616cc40._change b/doc/recentchanges/change_1968317cacc2f555af17286acf26a60ce616cc40._change
new file mode 100644
index 000000000..cb4c2167a
--- /dev/null
+++ b/doc/recentchanges/change_1968317cacc2f555af17286acf26a60ce616cc40._change
@@ -0,0 +1,67 @@
+[[!meta author="""http://churchkey.org/author/ian/"""]]
+
+[[!meta authorurl="""http://churchkey.org/author/ian/"""]]
+
+[[!meta title="""change to bugs/inline_action_buttons_circumvent_exclude_criteria_from_edittemplate__39__s_match__61____34____34___pagespec on ikiwiki"""]]
+
+[[!meta permalink="http://ikiwiki.info/recentchanges/#change-1968317cacc2f555af17286acf26a60ce616cc40"]]
+
+

+
Changed pages:
+
+
+[[diff|wikiicons/diff.png]]bugs/inline action buttons circumvent exclude criteria from edittemplate's match="" pagespec
+
+
+
+
Changed by:
+
+
+ian [churchkey.org/author]
+
+
+
Commit type:
+web
+
Date:
+21:26:27 11/22/10
+

+

+
+
+[[revert|wikiicons/revert.png]]
+
+
+

+
+
+added edittemplate bug for ikiwiki verison: 3.20100815.2

+
+
+

+
+

+
+diff --git a/doc/bugs/inline_action_buttons_circumvent_exclude_criteria_from_edittemplate__39__s_match__61____34____34___pagespec.mdwn b/doc/bugs/inline_action_buttons_circumvent_exclude_criteria_from_edittemplate__39__s_match__61____34____34___pagespec.mdwn
+new file mode 100644
+index 0000000..45481bf
+--- /dev/null
++++ b/doc/bugs/inline_action_buttons_circumvent_exclude_criteria_from_edittemplate__39__s_match__61____34____34___pagespec.mdwn
+@@ -0,0 +1,13 @@
++ikiwiki verison: 3.20100815.2
++
++If I instruct editemplate to only match the top level pages in a directory using 
++
++    match="foo/* and !foo/*/* and !foo/*/*/*"
++
++everything works as expected for pages created via links on other wiki pages. So, if I open foo/bar (or any other page on the wiki) and create a link to foo/bar/bug, edittemplate appropriately does not insert any text into the new page. 
++
++However, if I use an inline directive like the following 
++
++    !inline pages="page(foo/bar/*)" rootpage="foo/bar" postform=yes actions=yes
++
++every page created via the action buttons incorrectly pulls in the text from the edittemplate registration. Changing the order of the conditions in the match="" pagespec has no impact. 
+
+

+

+
+
diff --git a/doc/recentchanges/change_1b770bea3fd5b5dfb4e75237218db204139d9189._change b/doc/recentchanges/change_1b770bea3fd5b5dfb4e75237218db204139d9189._change
new file mode 100644
index 000000000..f05151ec1
--- /dev/null
+++ b/doc/recentchanges/change_1b770bea3fd5b5dfb4e75237218db204139d9189._change
@@ -0,0 +1,51 @@
+[[!meta author="""https://www.google.com/accounts/o8/id?id=AItOawmE7z4CSv-ctBarutQCd70R3CcaSPPxjVk"""]]
+
+[[!meta authorurl="""https://www.google.com/accounts/o8/id?id=AItOawmE7z4CSv-ctBarutQCd70R3CcaSPPxjVk"""]]
+
+[[!meta title="""change to bugs/logout_in_ikiwiki on ikiwiki"""]]
+
+[[!meta permalink="http://ikiwiki.info/recentchanges/#change-1b770bea3fd5b5dfb4e75237218db204139d9189"]]
+
+

+
Changed pages:
+
+
+[[diff|wikiicons/diff.png]]bugs/logout in ikiwiki
+
+
+
+
Changed by:
+
+
+Dave
+
+
+
Commit type:
+web
+
Date:
+10:38:32 10/28/10
+

+

+
+
+[[revert|wikiicons/revert.png]]
+
+
+

+
+

+
+

+
+diff --git a/doc/bugs/logout_in_ikiwiki.mdwn b/doc/bugs/logout_in_ikiwiki.mdwn
+new file mode 100644
+index 0000000..ad89f4c
+--- /dev/null
++++ b/doc/bugs/logout_in_ikiwiki.mdwn
+@@ -0,0 +1 @@
++It looks like there is no way to logout of ikiwiki at present, meaning that if you edit the ikiwiki in, say, a cybercafe, the cookie remains... is there some other security mechanism in place that can check for authorization, or should I hack in a logout routine into ikiwiki.cgi?
+
+

+

+
+
diff --git a/doc/recentchanges/change_1f32f5e6184b6354f671ae71578f1158c49168b6._change b/doc/recentchanges/change_1f32f5e6184b6354f671ae71578f1158c49168b6._change
new file mode 100644
index 000000000..e75b5bc23
--- /dev/null
+++ b/doc/recentchanges/change_1f32f5e6184b6354f671ae71578f1158c49168b6._change
@@ -0,0 +1,55 @@
+[[!meta author="""harishcm"""]]
+
+[[!meta authorurl="""http://ikiwiki.info/ikiwiki.cgi?page=users%2Fharishcm&do=goto"""]]
+
+[[!meta title="""change to users/harishcm on ikiwiki"""]]
+
+[[!meta permalink="http://ikiwiki.info/recentchanges/#change-1f32f5e6184b6354f671ae71578f1158c49168b6"]]
+
+

+
Changed pages:
+
+
+[[diff|wikiicons/diff.png]]users/harishcm
+
+
+
+
Changed by:
+
+
+harishcm
+
+
+
Commit type:
+web
+
Date:
+05:01:58 11/05/10
+

+

+
+
+[[revert|wikiicons/revert.png]]
+
+
+

+
+
+Put link to personal website

+
+
+

+
+

+
+diff --git a/doc/users/harishcm.mdwn b/doc/users/harishcm.mdwn
+index 1647110..292a3bf 100644
+--- a/doc/users/harishcm.mdwn
++++ b/doc/users/harishcm.mdwn
+@@ -1 +1 @@
+-Using ikiwiki for my yet to be published personal website :)
++Using ikiwiki for my personal website <http://harish.19thsc.com>
+
+

+

+
+
diff --git a/doc/recentchanges/change_238259dfa199e217e34cc02462f55df6b2b1fcc5._change b/doc/recentchanges/change_238259dfa199e217e34cc02462f55df6b2b1fcc5._change
new file mode 100644
index 000000000..bd0ea25df
--- /dev/null
+++ b/doc/recentchanges/change_238259dfa199e217e34cc02462f55df6b2b1fcc5._change
@@ -0,0 +1,56 @@
+[[!meta author="""http://dtaht.myopenid.com/"""]]
+
+[[!meta authorurl="""http://dtaht.myopenid.com/"""]]
+
+[[!meta title="""change to ikiwikiusers on ikiwiki"""]]
+
+[[!meta permalink="http://ikiwiki.info/recentchanges/#change-238259dfa199e217e34cc02462f55df6b2b1fcc5"]]
+
+

+
Changed pages:
+
+
+[[diff|wikiicons/diff.png]]ikiwikiusers
+
+
+
+
Changed by:
+
+
+dtaht [myopenid.com]
+
+
+
Commit type:
+web
+
Date:
+18:23:03 10/31/10
+

+

+
+
+[[revert|wikiicons/revert.png]]
+
+
+

+
+

+
+

+
+diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn
+index 2836d96..54fa1d5 100644
+--- a/doc/ikiwikiusers.mdwn
++++ b/doc/ikiwikiusers.mdwn
+@@ -159,6 +159,7 @@ Personal sites and blogs
+ * [weakish](http://weakish.github.com)
+ * [Thomas Kane](http://planetkane.org/)
+ * [Marco Silva](http://marcot.eti.br/) a weblog + wiki using the [darcs](http://darcs.net) backend
++* [NeX-6](http://nex-6.taht.net/) ikiwiki blog and wiki running over ipv6
+ 
+ Please feel free to add your own ikiwiki site!
+ 
+
+

+

+
+
diff --git a/doc/recentchanges/change_23e3e5f15e61639ccba4a7dfbab11d6fe4b9f047._change b/doc/recentchanges/change_23e3e5f15e61639ccba4a7dfbab11d6fe4b9f047._change
new file mode 100644
index 000000000..8ad9336d8
--- /dev/null
+++ b/doc/recentchanges/change_23e3e5f15e61639ccba4a7dfbab11d6fe4b9f047._change
@@ -0,0 +1,69 @@
+[[!meta author="""https://www.google.com/accounts/o8/id?id=AItOawmwYptyV5ptNt8LCbMYsmpcNkk9_DRt-EY"""]]
+
+[[!meta authorurl="""https://www.google.com/accounts/o8/id?id=AItOawmwYptyV5ptNt8LCbMYsmpcNkk9_DRt-EY"""]]
+
+[[!meta title="""change to forum/Blog_posting_times_and_ikiwiki_state on ikiwiki"""]]
+
+[[!meta permalink="http://ikiwiki.info/recentchanges/#change-23e3e5f15e61639ccba4a7dfbab11d6fe4b9f047"]]
+
+

+
Changed pages:
+
+
+[[diff|wikiicons/diff.png]]forum/Blog posting times and ikiwiki state
+
+
+
+
Changed by:
+
+
+Matt
+
+
+
Commit type:
+web
+
Date:
+19:34:53 11/03/10
+

+

+
+
+[[revert|wikiicons/revert.png]]
+
+
+

+
+

+
+

+
+diff --git a/doc/forum/Blog_posting_times_and_ikiwiki_state.mdwn b/doc/forum/Blog_posting_times_and_ikiwiki_state.mdwn
+new file mode 100644
+index 0000000..3e6c232
+--- /dev/null
++++ b/doc/forum/Blog_posting_times_and_ikiwiki_state.mdwn
+@@ -0,0 +1,19 @@
++What I wanted
++-------------
++
++I thought to myself it would be nice to see from the console the dates that my ikiwiki blog posts were published.  Especially as I would like to know the order of my todo list without having to view the webpage.
++
++What I discovered
++-----------------
++
++Looked at the code and saw the functions for grabbing the ctime from git but couldn't reconcile them to the "Posted" date in the RSS feed.  Some more reading and I figured out that the Posted time is taken from the UNIX ctime when first uploaded into the repository and this information is stored in the page state via a Perl storable database - indexdb. (I'm sure most know this but to be clear in UNIX ctime is *not* the actual creation time of a file. UNIX has no facility for recording the actual creation time - however on first upload to the wiki it's good enough).
++
++Wrote a Perl script to query and sort indexdb.  Now I can list my todos or blog posts in the order they appear on the web.  Handy.
++
++However the ikiwiki state is specifically excluded via '.gitignore'.  I work a lot on trains and not having this file in my cloned wiki means I can't list published posts or my todos in the proper order.  I can get an approximation from git logs but, dam it, I want it the same!
++
++What can I do?
++--------------
++
++Is it a spectacularly bad idea to include the ikiwiki state file in my cloned repo (I suspect it is).  What else could be done?  Can I disable pagestate somehow or force ikiwiki to always use git commit times for Posted times?
++
+
+

+

+
+
diff --git a/doc/recentchanges/change_263cfa7d1e938e3b41d1b6826427f0d613b2b97c._change b/doc/recentchanges/change_263cfa7d1e938e3b41d1b6826427f0d613b2b97c._change
new file mode 100644
index 000000000..57edc92b2
--- /dev/null
+++ b/doc/recentchanges/change_263cfa7d1e938e3b41d1b6826427f0d613b2b97c._change
@@ -0,0 +1,64 @@
+[[!meta author="""http://jmtd.livejournal.com/"""]]
+
+[[!meta authorurl="""http://jmtd.livejournal.com/"""]]
+
+[[!meta title="""change to bugs/aggregate_generates_long_filenames on ikiwiki"""]]
+
+[[!meta permalink="http://ikiwiki.info/recentchanges/#change-263cfa7d1e938e3b41d1b6826427f0d613b2b97c"]]
+
+

+
Changed pages:
+
+
+[[diff|wikiicons/diff.png]]bugs/aggregate generates long filenames
+
+
+
+
Changed by:
+
+
+jmtd [livejournal.com]
+
+
+
Commit type:
+web
+
Date:
+06:08:30 11/15/10
+

+

+
+
+[[revert|wikiicons/revert.png]]
+
+
+

+
+
+aggregate: too long filenames

+
+
+

+
+

+
+diff --git a/doc/bugs/aggregate_generates_long_filenames.mdwn b/doc/bugs/aggregate_generates_long_filenames.mdwn
+new file mode 100644
+index 0000000..cb5e6df
+--- /dev/null
++++ b/doc/bugs/aggregate_generates_long_filenames.mdwn
+@@ -0,0 +1,10 @@
++the [[pluhins/aggregate]] plugin mashes the `title` of an aggregated post into a filename.  This results in long filenames.  I have hit a filesystem length limitation on several occasions.  Some (ab)uses of RSS, e.g., twitter,
++generate long titles.  Especially once you throw escaping into the mix:
++
++    $ ikiwiki --setup testsetup --aggregate --refresh
++    failed to write ./test/lifestream/Hidden_Features_Of_Perl__44___PHP__44___Javascript__44___C__44___C++__44___C__35____44___Java__44___Ruby___46____46____46__._aggregated.ikiwiki-new: File name too long
++    aggregation failed with code 9216
++    $ echo $?
++    25
++
++-- [[Jon]]
+
+

+

+
+
diff --git a/doc/recentchanges/change_2a452ddf146c4148155095e400f56b4674d76953._change b/doc/recentchanges/change_2a452ddf146c4148155095e400f56b4674d76953._change
new file mode 100644
index 000000000..52a0e5bd0
--- /dev/null
+++ b/doc/recentchanges/change_2a452ddf146c4148155095e400f56b4674d76953._change
@@ -0,0 +1,64 @@
+[[!meta author="""joey"""]]
+
+[[!meta authorurl="""http://ikiwiki.info/ikiwiki.cgi?page=users%2Fjoey&do=goto"""]]
+
+[[!meta title="""change to bugs/aggregate_generates_long_filenames on ikiwiki"""]]
+
+[[!meta permalink="http://ikiwiki.info/recentchanges/#change-2a452ddf146c4148155095e400f56b4674d76953"]]
+
+

+
Changed pages:
+
+
+[[diff|wikiicons/diff.png]]bugs/aggregate generates long filenames
+
+
+
+
Changed by:
+
+
+joey
+
+
+
Commit type:
+git
+
Date:
+13:34:41 11/16/10
+

+

+
+
+[[revert|wikiicons/revert.png]]
+
+
+

+
+
+but it already checks length..

+
+
+

+
+

+
+diff --git a/doc/bugs/aggregate_generates_long_filenames.mdwn b/doc/bugs/aggregate_generates_long_filenames.mdwn
+index 40decb3..c38ad6c 100644
+--- a/doc/bugs/aggregate_generates_long_filenames.mdwn
++++ b/doc/bugs/aggregate_generates_long_filenames.mdwn
+@@ -11,3 +11,11 @@ It would also appear this abrubtly terminates aggregate processing (if not ikiwi
+ 
+ 
+ -- [[Jon]]
++
++> I have to wonder what filesystem you have there where 147 characters
++> is a long filename. Ikiwiki already uses `POSIX::pathconf` on the srcdir
++> to look up `_PC_NAME_MAX`
++> to see if the filename is too long, and shortens it, so it seems
++> that, in additional to having a rather antique long filename limit, your
++> system also doesn't properly expose it via pathconf. Not sure what
++> ikiwiki can do here. --[[Joey]]
+
+

+

+
+
diff --git a/doc/recentchanges/change_2c17255b6641e33374a446ca281a0ad6d46af1dc._change b/doc/recentchanges/change_2c17255b6641e33374a446ca281a0ad6d46af1dc._change
new file mode 100644
index 000000000..999f73b87
--- /dev/null
+++ b/doc/recentchanges/change_2c17255b6641e33374a446ca281a0ad6d46af1dc._change
@@ -0,0 +1,63 @@
+[[!meta author="""http://smcv.pseudorandom.co.uk/"""]]
+
+[[!meta authorurl="""http://smcv.pseudorandom.co.uk/"""]]
+
+[[!meta title="""change to plugins/autoindex/discussion on ikiwiki"""]]
+
+[[!meta permalink="http://ikiwiki.info/recentchanges/#change-2c17255b6641e33374a446ca281a0ad6d46af1dc"]]
+
+

+
Changed pages:
+
+
+[[diff|wikiicons/diff.png]]plugins/autoindex/discussion
+
+
+
+
Changed by:
+
+
+smcv
+
+
+
Commit type:
+web
+
Date:
+08:14:26 11/08/10
+

+

+
+
+[[revert|wikiicons/revert.png]]
+
+
+

+
+
+cross-references

+
+
+

+
+

+
+diff --git a/doc/plugins/autoindex/discussion.mdwn b/doc/plugins/autoindex/discussion.mdwn
+index d8b9be6..b09481c 100644
+--- a/doc/plugins/autoindex/discussion.mdwn
++++ b/doc/plugins/autoindex/discussion.mdwn
+@@ -4,7 +4,9 @@ for the html output and not place the markdown files in the wiki source?
+ > Or better still, add a mechanism for ikiwiki to hold transient source
+ > pages in memory and render them as if they existed, without actually
+ > writing them out, as [[JoeRayhawk]] suggests below? I think
+-> add_autofile would be the way to do this. --[[smcv]]
++> add_autofile would be the way to do this.
++> I've added this to [[todo]] as [[todo/autoindex should use add__95__autofile]]
++> and [[todo/transient in-memory pages]]. --[[smcv]]
+ 
+ The reason being that I have a lot of directories which need to be autoindexed,
+ but I would prefer if the index files didn't clutter up my git repository.
+
+

+

+
+
diff --git a/doc/recentchanges/change_2fdda536ec6bee1eff3b71c214753078cd588f8f._change b/doc/recentchanges/change_2fdda536ec6bee1eff3b71c214753078cd588f8f._change
new file mode 100644
index 000000000..af18ef4de
--- /dev/null
+++ b/doc/recentchanges/change_2fdda536ec6bee1eff3b71c214753078cd588f8f._change
@@ -0,0 +1,58 @@
+[[!meta author="""143.215.206.35"""]]
+
+[[!meta authorurl="""http://ikiwiki.info/ikiwiki.cgi?page=users%2F143.215.206.35&do=goto"""]]
+
+[[!meta title="""change to news/openid on ikiwiki"""]]
+
+[[!meta permalink="http://ikiwiki.info/recentchanges/#change-2fdda536ec6bee1eff3b71c214753078cd588f8f"]]
+
+

+
Changed pages:
+
+
+[[diff|wikiicons/diff.png]]news/openid
+
+
+
+
Changed by:
+
+
+143.215.206.35
+
+
+
Commit type:
+web
+
Date:
+16:54:58 11/08/10
+

+

+
+
+[[revert|wikiicons/revert.png]]
+
+
+

+
+
+poll vote (Accept both)

+
+
+

+
+

+
+diff --git a/doc/news/openid.mdwn b/doc/news/openid.mdwn
+index 05991ff..02f7afb 100644
+--- a/doc/news/openid.mdwn
++++ b/doc/news/openid.mdwn
+@@ -10,4 +10,4 @@ log back in, try out the OpenID signup process if you don't already have an
+ OpenID, and see how OpenID works for you. And let me know your feelings about
+ making such a switch. --[[Joey]]
+ 
+-[[!poll 67 "Accept only OpenID for logins" 21 "Accept only password logins" 38 "Accept both"]]
++[[!poll 67 "Accept only OpenID for logins" 21 "Accept only password logins" 39 "Accept both"]]
+
+

+

+
+
diff --git a/doc/recentchanges/change_313a28b8f68b76aee4b94413e4e9d47dca93a34e._change b/doc/recentchanges/change_313a28b8f68b76aee4b94413e4e9d47dca93a34e._change
new file mode 100644
index 000000000..b473074e1
--- /dev/null
+++ b/doc/recentchanges/change_313a28b8f68b76aee4b94413e4e9d47dca93a34e._change
@@ -0,0 +1,63 @@
+[[!meta author="""joey"""]]
+
+[[!meta authorurl="""http://ikiwiki.info/ikiwiki.cgi?page=users%2Fjoey&do=goto"""]]
+
+[[!meta title="""change to bugs/rss_feeds_do_not_use_recommended_encoding_of_entities_for_some_fields on ikiwiki"""]]
+
+[[!meta permalink="http://ikiwiki.info/recentchanges/#change-313a28b8f68b76aee4b94413e4e9d47dca93a34e"]]
+
+

+
Changed pages:
+
+
+[[diff|wikiicons/diff.png]]bugs/rss feeds do not use recommended encoding of entities for some fields
+
+
+
+
Changed by:
+
+
+joey
+
+
+
Commit type:
+git
+
Date:
+12:50:26 10/30/10
+

+

+
+
+[[revert|wikiicons/revert.png]]
+
+
+

+
+
+response

+
+
+

+
+

+
+diff --git a/doc/bugs/rss_feeds_do_not_use_recommended_encoding_of_entities_for_some_fields.mdwn b/doc/bugs/rss_feeds_do_not_use_recommended_encoding_of_entities_for_some_fields.mdwn
+index 85c3176..0a435ce 100644
+--- a/doc/bugs/rss_feeds_do_not_use_recommended_encoding_of_entities_for_some_fields.mdwn
++++ b/doc/bugs/rss_feeds_do_not_use_recommended_encoding_of_entities_for_some_fields.mdwn
+@@ -43,3 +43,10 @@ For Atom, at least, I believe adding `type="xhtml"` to the title element will wo
+ >> have "more" apply to the front page of the blog. Is there a way to do that?
+ >> -- [[dtaht]]
+ >> 
++>>> To be clear, the RSS spec sucks to such an extent that, as far as
++>>> I know, there is no sort of title escaping that will work in all 
++>>> RSS consumers. Titles are currently escaped in the way 
++>>> that tends to break the fewest according to what I've read.
++>>> If you're unlucky enough to 
++>>> have a "&" or "<" in your **name**, then you may still run into 
++>>> problems with how that is escaped in rss feeds. --[[Joey]]
+
+

+

+
+
diff --git a/doc/recentchanges/change_408af2bb9e10d2ed899e17f9814a5514c0254dc8._change b/doc/recentchanges/change_408af2bb9e10d2ed899e17f9814a5514c0254dc8._change
new file mode 100644
index 000000000..4fd8dace1
--- /dev/null
+++ b/doc/recentchanges/change_408af2bb9e10d2ed899e17f9814a5514c0254dc8._change
@@ -0,0 +1,68 @@
+[[!meta author="""JoeRayhawk"""]]
+
+[[!meta authorurl="""http://ikiwiki.info/ikiwiki.cgi?page=users%2FJoeRayhawk&do=goto"""]]
+
+[[!meta title="""change to plugins/autoindex/discussion on ikiwiki"""]]
+
+[[!meta permalink="http://ikiwiki.info/recentchanges/#change-408af2bb9e10d2ed899e17f9814a5514c0254dc8"]]
+
+

+
Changed pages:
+
+
+[[diff|wikiicons/diff.png]]plugins/autoindex/discussion
+
+
+
+
Changed by:
+
+
+JoeRayhawk
+
+
+
Commit type:
+web
+
Date:
+00:37:14 11/07/10
+

+

+
+
+[[revert|wikiicons/revert.png]]
+
+
+

+
+
+A wish for a noninvasive autoindex.

+
+
+

+
+

+
+diff --git a/doc/plugins/autoindex/discussion.mdwn b/doc/plugins/autoindex/discussion.mdwn
+index 2d6b6f1..a48fe9d 100644
+--- a/doc/plugins/autoindex/discussion.mdwn
++++ b/doc/plugins/autoindex/discussion.mdwn
+@@ -61,3 +61,15 @@ If you just don't want to clutter your git repo, below it's a patch does the fol
+ 
+  
+ Warning:  I guess this patch may work, but I *haven't tested it yet*.  -- [[weakish]]
++
++------
++
++`autoindex_commit => 0` would be nice, but uncommited files are definitely not.
++<pre>
++remote: From /srv/git/test3
++remote:    3047077..1df636c  master     -> origin/master
++remote: error: Untracked working tree file 'test.mdwn' would be overwritten by merge.  Aborting
++remote: 'git pull --prune origin' failed:  at /usr/share/perl5/IkiWiki/Plugin/git.pm line 201.
++</pre>
++
++It'd be nice if we were able to notice directories with no associated compilable markup files and compile a simple map directive straight to HTML without any intermediate markup file being involved at all. -- JoeRayhawk
+
+

+

+
+
diff --git a/doc/recentchanges/change_415effbb43663ad756d78b3e957ac593d0227a74._change b/doc/recentchanges/change_415effbb43663ad756d78b3e957ac593d0227a74._change
new file mode 100644
index 000000000..5ef53989c
--- /dev/null
+++ b/doc/recentchanges/change_415effbb43663ad756d78b3e957ac593d0227a74._change
@@ -0,0 +1,55 @@
+[[!meta author="""civiccents"""]]
+
+[[!meta authorurl="""http://ikiwiki.info/ikiwiki.cgi?page=users%2Fciviccents&do=goto"""]]
+
+[[!meta title="""change to sandbox/D-Liberative on ikiwiki"""]]
+
+[[!meta permalink="http://ikiwiki.info/recentchanges/#change-415effbb43663ad756d78b3e957ac593d0227a74"]]
+
+

+
Changed pages:
+
+
+[[diff|wikiicons/diff.png]]sandbox/D-Liberative
+
+
+
+
Changed by:
+
+
+civiccents
+
+
+
Commit type:
+web
+
Date:
+16:40:10 11/04/10
+

+

+
+
+[[revert|wikiicons/revert.png]]
+
+
+

+
+
+grammer

+
+
+

+
+

+
+diff --git a/doc/sandbox/D-Liberative.wiki b/doc/sandbox/D-Liberative.wiki
+index 6907152..b8c94f3 100644
+--- a/doc/sandbox/D-Liberative.wiki
++++ b/doc/sandbox/D-Liberative.wiki
+@@ -1 +1 @@
+-For now its just a concept... what if we could map deliberative capacity?
++For now its just a concept... what if a community could map its deliberative capacity?
+
+

+

+
+
diff --git a/doc/recentchanges/change_471ac78068532da53e4dad49d52c5ddccfcbff21._change b/doc/recentchanges/change_471ac78068532da53e4dad49d52c5ddccfcbff21._change
new file mode 100644
index 000000000..21b129fb0
--- /dev/null
+++ b/doc/recentchanges/change_471ac78068532da53e4dad49d52c5ddccfcbff21._change
@@ -0,0 +1,58 @@
+[[!meta author="""http://jmtd.livejournal.com/"""]]
+
+[[!meta authorurl="""http://jmtd.livejournal.com/"""]]
+
+[[!meta title="""change to bugs/aggregate_generates_long_filenames on ikiwiki"""]]
+
+[[!meta permalink="http://ikiwiki.info/recentchanges/#change-471ac78068532da53e4dad49d52c5ddccfcbff21"]]
+
+

+
Changed pages:
+
+
+[[diff|wikiicons/diff.png]]bugs/aggregate generates long filenames
+
+
+
+
Changed by:
+
+
+jmtd [livejournal.com]
+
+
+
Commit type:
+web
+
Date:
+06:09:41 11/15/10
+

+

+
+
+[[revert|wikiicons/revert.png]]
+
+
+

+
+
+typo

+
+
+

+
+

+
+diff --git a/doc/bugs/aggregate_generates_long_filenames.mdwn b/doc/bugs/aggregate_generates_long_filenames.mdwn
+index cb5e6df..3d98ee8 100644
+--- a/doc/bugs/aggregate_generates_long_filenames.mdwn
++++ b/doc/bugs/aggregate_generates_long_filenames.mdwn
+@@ -1,4 +1,4 @@
+-the [[pluhins/aggregate]] plugin mashes the `title` of an aggregated post into a filename.  This results in long filenames.  I have hit a filesystem length limitation on several occasions.  Some (ab)uses of RSS, e.g., twitter,
++the [[plugins/aggregate]] plugin mashes the `title` of an aggregated post into a filename.  This results in long filenames.  I have hit a filesystem length limitation on several occasions.  Some (ab)uses of RSS, e.g., twitter,
+ generate long titles.  Especially once you throw escaping into the mix:
+ 
+     $ ikiwiki --setup testsetup --aggregate --refresh
+
+

+

+
+
diff --git a/doc/recentchanges/change_47726461a4119741affa6536deec7dd1fe52ef0d._change b/doc/recentchanges/change_47726461a4119741affa6536deec7dd1fe52ef0d._change
new file mode 100644
index 000000000..19d7c3035
--- /dev/null
+++ b/doc/recentchanges/change_47726461a4119741affa6536deec7dd1fe52ef0d._change
@@ -0,0 +1,73 @@
+[[!meta author="""http://kerravonsen.dreamwidth.org/"""]]
+
+[[!meta authorurl="""http://kerravonsen.dreamwidth.org/"""]]
+
+[[!meta title="""change to forum/field_and_forms/comment_1_a0e976cb79f03dcff5e9a4511b90d160 on ikiwiki"""]]
+
+[[!meta permalink="http://ikiwiki.info/recentchanges/#change-47726461a4119741affa6536deec7dd1fe52ef0d"]]
+
+

+
Changed pages:
+
+
+[[diff|wikiicons/diff.png]]forum/field and forms/comment 1 a0e976cb79f03dcff5e9a4511b90d160
+
+
+
+
Changed by:
+
+
+kerravonsen [dreamwidth.org]
+
+
+
Commit type:
+web
+
Date:
+02:18:52 11/23/10
+

+

+
+
+[[revert|wikiicons/revert.png]]
+
+
+

+
+
+Added a comment: Limitations

+
+
+

+
+

+
+diff --git a/doc/forum/field_and_forms/comment_1_a0e976cb79f03dcff5e9a4511b90d160._comment b/doc/forum/field_and_forms/comment_1_a0e976cb79f03dcff5e9a4511b90d160._comment
+new file mode 100644
+index 0000000..3e10dbb
+--- /dev/null
++++ b/doc/forum/field_and_forms/comment_1_a0e976cb79f03dcff5e9a4511b90d160._comment
+@@ -0,0 +1,19 @@
++[[!comment format=mdwn
++ username="http://kerravonsen.dreamwidth.org/"
++ ip="60.241.8.244"
++ subject="Limitations"
++ date="2010-11-23T02:18:52Z"
++ content="""
++I'd already had a look at this idea before you posted this suggestion, and I ran into difficulties.
++So far as I can see, it makes most sense to use the mechanisms already in place for editing pages, and enhance them.
++Unfortunately, the whole edit-page setup expects a template file (by default, when editing pages, editpage.tmpl)
++and anything apart from \"submit\" buttons must have a placeholder in the template file, or it doesn't get displayed at all in the form.
++At least, that's what I've found - I could be mistaken.
++
++But if it's true, that rather puts the kybosh on dynamically generated forms, so far as I can see.
++I mean, if you knew beforehand what all your fields were going to be, you could make a copy of editpage.tmpl, add in your fields where you want, and then make a plugin that uses that template instead of editpage.tmpl, but that's very limited.
++
++If someone could come up with a way of making dynamic forms, that would solve the problem, but I've come up against a brick wall myself.  Joey?  Anyone?
++
++-- [[KathrynAndersen]]
++"""]]
+
+

+

+
+
diff --git a/doc/recentchanges/change_47b9f10e6254277918873a980af0cf0631326165._change b/doc/recentchanges/change_47b9f10e6254277918873a980af0cf0631326165._change
new file mode 100644
index 000000000..e212c09e4
--- /dev/null
+++ b/doc/recentchanges/change_47b9f10e6254277918873a980af0cf0631326165._change
@@ -0,0 +1,60 @@
+[[!meta author="""joey"""]]
+
+[[!meta authorurl="""http://ikiwiki.info/ikiwiki.cgi?page=users%2Fjoey&do=goto"""]]
+
+[[!meta title="""change to bugs/logout_in_ikiwiki on ikiwiki"""]]
+
+[[!meta permalink="http://ikiwiki.info/recentchanges/#change-47b9f10e6254277918873a980af0cf0631326165"]]
+
+

+
Changed pages:
+
+
+[[diff|wikiicons/diff.png]]bugs/logout in ikiwiki
+
+
+
+
Changed by:
+
+
+joey
+
+
+
Commit type:
+git
+
Date:
+15:39:22 10/28/10
+

+

+
+
+[[revert|wikiicons/revert.png]]
+
+
+

+
+
+response

+
+
+

+
+

+
+diff --git a/doc/bugs/logout_in_ikiwiki.mdwn b/doc/bugs/logout_in_ikiwiki.mdwn
+index 9f974be..5df19c4 100644
+--- a/doc/bugs/logout_in_ikiwiki.mdwn
++++ b/doc/bugs/logout_in_ikiwiki.mdwn
+@@ -1,3 +1,7 @@
+ It looks like there is no way to logout of ikiwiki at present, meaning that if you edit the ikiwiki in, say, a cybercafe, the cookie remains... is there some other security mechanism in place that can check for authorization, or should I hack in a logout routine into ikiwiki.cgi?
+ 
+ > Click on "Preferences". There is a logout button there. --liw
++
++> It would be nice if it were not buried there, but putting it on the
++> action bar statically would be confusing. The best approach might be to
++> use javascript. --[[Joey]] 
+
+

+

+
+
diff --git a/doc/recentchanges/change_53e519931f3a6b7cea0af652d749344757d4e2bc._change b/doc/recentchanges/change_53e519931f3a6b7cea0af652d749344757d4e2bc._change
new file mode 100644
index 000000000..05105eacc
--- /dev/null
+++ b/doc/recentchanges/change_53e519931f3a6b7cea0af652d749344757d4e2bc._change
@@ -0,0 +1,112 @@
+[[!meta author="""http://jmtd.livejournal.com/"""]]
+
+[[!meta authorurl="""http://jmtd.livejournal.com/"""]]
+
+[[!meta title="""change to bugs/argument_isn__39__t_numeric:_mixing_templates_and_creation__95__date on ikiwiki"""]]
+
+[[!meta permalink="http://ikiwiki.info/recentchanges/#change-53e519931f3a6b7cea0af652d749344757d4e2bc"]]
+
+

+
Changed pages:
+
+
+[[diff|wikiicons/diff.png]]bugs/argument isn't numeric: mixing templates and creation_date
+
+
+
+
Changed by:
+
+
+jmtd [livejournal.com]
+
+
+
Commit type:
+web
+
Date:
+10:23:01 11/15/10
+

+

+
+
+[[revert|wikiicons/revert.png]]
+
+
+

+
+
+template files being treated as regular pages and the problems that can cause

+
+
+

+
+

+
+diff --git a/doc/bugs/argument_isn__39__t_numeric:_mixing_templates_and_creation__95__date.mdwn b/doc/bugs/argument_isn__39__t_numeric:_mixing_templates_and_creation__95__date.mdwn
+new file mode 100644
+index 0000000..70af505
+--- /dev/null
++++ b/doc/bugs/argument_isn__39__t_numeric:_mixing_templates_and_creation__95__date.mdwn
+@@ -0,0 +1,58 @@
++I get the following error when building my wiki
++
++    Argument "\x{3c}\x{54}..." isn't numeric in numeric eq (==) at /usr/share/perl5/IkiWiki.pm line 2547.
++    Argument "\x{3c}\x{54}..." isn't numeric in numeric eq (==) at /usr/share/perl5/IkiWiki.pm line 2547.
++
++that line corresponds to
++
++    sub match_creation_year ($$;@) {
++	if ((localtime($IkiWiki::pagectime{shift()}))[5] + 1900 == shift) { <-- this one
++		return IkiWiki::SuccessReason->new('creation_year matched');
++	}
++
++A git bisect shows that the offending commit introduced this hunk
++
++
++    --- /dev/null
++    +++ b/templates/all_entry.mdwn
++    @@ -0,0 +1,23 @@
++    +## <TMPL_VAR year>
++    +
++    +There
++    +<TMPL_IF current>
++    +have been
++    +<TMPL_ELSE>
++    +were
++    +</TMPL_IF>
++    +[[!pagecount pages="
++    +log/* and !tagged(aggregation) and !*/Discussion and !tagged(draft)
++    +and creation_year(<TMPL_VAR year>)
++    +and !*.png and !*.jpg
++    +"]] posts
++    +<TMPL_IF current>
++    +so far
++    +</TMPL_IF>
++    +in <TMPL_VAR year>.
++    +
++    +[[!inline pages="
++    +    log/* and !tagged(aggregation) and !*/Discussion and !tagged(draft)
++    +    and creation_year(<TMPL_VAR year>)
++    +    and !*.png and !*.jpg
++    +    " archive=yes feeds=no]]
++
++The lines which feature creation_year(<TMPL_VAR year>) are most likely the culprits.  That would explain why the error was repeated twice, and would tally with the file in `templates/` being rendered, rather than the inclusionists.
++
++A workaround is to move the template outside of the srcdir into the external templates directory and include the file suffix when using it, e.g.
++
++    \[[!template id=all_entry.tmpl year=2010 current=true]]
++
++An alternative fix is to wrap the entire template inside a test to see whether the page is included or not. E.g.
++
++
++    \[[!if test="included()" then="""
++    ...template...
++    """ else="""
++    Nothing to see here.
++    """]]
++
++In fact, this is probably best practice for in-srcdir templates.  I'd consider this done if the documentation for the directive suggested it. -- [[Jon]]
+
+

+

+
+
diff --git a/doc/recentchanges/change_5430d5dc3bc37df92eb01cd65382c0f2be78b8e7._change b/doc/recentchanges/change_5430d5dc3bc37df92eb01cd65382c0f2be78b8e7._change
new file mode 100644
index 000000000..68bd2fc0c
--- /dev/null
+++ b/doc/recentchanges/change_5430d5dc3bc37df92eb01cd65382c0f2be78b8e7._change
@@ -0,0 +1,70 @@
+[[!meta author="""http://jmtd.livejournal.com/"""]]
+
+[[!meta authorurl="""http://jmtd.livejournal.com/"""]]
+
+[[!meta title="""change to bugs/argument_isn__39__t_numeric:_mixing_templates_and_creation__95__date on ikiwiki"""]]
+
+[[!meta permalink="http://ikiwiki.info/recentchanges/#change-5430d5dc3bc37df92eb01cd65382c0f2be78b8e7"]]
+
+

+
Changed pages:
+
+
+[[diff|wikiicons/diff.png]]bugs/argument isn't numeric: mixing templates and creation_date
+
+
+
+
Changed by:
+
+
+jmtd [livejournal.com]
+
+
+
Commit type:
+web
+
Date:
+10:43:35 11/15/10
+

+

+
+
+[[revert|wikiicons/revert.png]]
+
+
+

+
+
+not quite done yet: if/included() doesn't work that way.

+
+
+

+
+

+
+diff --git a/doc/bugs/argument_isn__39__t_numeric:_mixing_templates_and_creation__95__date.mdwn b/doc/bugs/argument_isn__39__t_numeric:_mixing_templates_and_creation__95__date.mdwn
+index 5485bba..8309389 100644
+--- a/doc/bugs/argument_isn__39__t_numeric:_mixing_templates_and_creation__95__date.mdwn
++++ b/doc/bugs/argument_isn__39__t_numeric:_mixing_templates_and_creation__95__date.mdwn
+@@ -46,8 +46,7 @@ A workaround is to move the template outside of the srcdir into the external tem
+ 
+     \[[!template id=all_entry.tmpl year=2010 current=true]]
+ 
+-An alternative fix is to wrap the entire template inside a test to see whether the page is included or not. E.g.
+-
++I believed (until I tested) that the [[ikiwiki/directive/if]] directive, with the `included()` test, would be an option here, E.g.
+ 
+     \[[!if test="included()" then="""
+     ...template...
+@@ -55,6 +54,4 @@ An alternative fix is to wrap the entire template inside a test to see whether t
+     Nothing to see here.
+     """]]
+ 
+-In fact, this is probably best practice for in-srcdir templates.  I'd consider this done if the documentation for the directive suggested it. -- [[Jon]]
+-
+-> [[done]] with <http://git.ikiwiki.info/?p=ikiwiki;a=commitdiff;h=da9e1ea667f82d5fca9168dbed19be08040570ff> -- [[Jon]]
++However this doesn't work.  I assume "included" in this context means e.g. via an `inline` or `map`, not template trans-clusion. -- [[Jon]]
+
+

+

+
+
diff --git a/doc/recentchanges/change_5954915a4fe8a889b8217cac99fae53cbe7f1e97._change b/doc/recentchanges/change_5954915a4fe8a889b8217cac99fae53cbe7f1e97._change
new file mode 100644
index 000000000..518a8c974
--- /dev/null
+++ b/doc/recentchanges/change_5954915a4fe8a889b8217cac99fae53cbe7f1e97._change
@@ -0,0 +1,108 @@
+[[!meta author="""joey"""]]
+
+[[!meta authorurl="""http://ikiwiki.info/ikiwiki.cgi?page=users%2Fjoey&do=goto"""]]
+
+[[!meta title="""change to todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both on ikiwiki"""]]
+
+[[!meta permalink="http://ikiwiki.info/recentchanges/#change-5954915a4fe8a889b8217cac99fae53cbe7f1e97"]]
+
+

+
Changed pages:
+
+
+[[diff|wikiicons/diff.png]]todo/want to avoid ikiwiki using http or https in urls to allow serving both
+
+
+
+
Changed by:
+
+
+joey
+
+
+
Commit type:
+git
+
Date:
+20:04:11 11/22/10
+

+

+
+
+[[revert|wikiicons/revert.png]]
+
+
+

+
+
+response

+
+
+

+
+

+
+diff --git a/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn b/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn
+index 80925b4..f8ec4c4 100644
+--- a/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn
++++ b/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn
+@@ -201,6 +201,10 @@ New API added by this branch:
+   >>
+   >> I personally think breaking the docwiki is enough to block that.
+   >>
++  >>> Well, the docwiki doesn't have an url configured at all, so I assumed
++  >>> it would need to fall back to current behavior in that case. I had
++  >>> not thought about browsing wiki's html files though, good point.
++  >>
+   >> How about this?
+   >>
+   >> * `urlto($link, $page)` with `$page` defined: relative
+@@ -210,12 +214,24 @@ New API added by this branch:
+   >>   normally undef): absolute, starts with `http[s]://`
+   >>
+   >> --[[smcv]]
++  >> 
++  >>> That makes a great deal of sense, bravo for actually removing
++  >>> parameters in the common case while maintaining backwards
++  >>> compatability!
++  >>> 
++  >>> It does highlight that it would be better to have a
++  >>> `absolute_urlto($link)` (or maybe `absolute(urlto($link))` )
++  >>> rather than the 3 parameter form. --[[Joey]]
+ 
+ * `IkiWiki::baseurl` has a new second argument which works like the
+   third argument of `urlto`
+ 
+   > I assume you have no objection to this --[[smcv]]
+ 
++  >> It's so little used that I don't really care if it's a bit ugly.
++  >> (But I assume changes to `urlto` will follow through here anyway.)
++  >> --[[Joey]] 
++
+ * `IkiWiki::cgiurl` uses `$local_cgiurl` if passed `local_cgiurl => 1`
+ 
+   > Possibly changed to making this always be local unless `cgiurl => $x`
+@@ -225,6 +241,8 @@ New API added by this branch:
+   except `cgiurl` and/or `local_cgiurl`
+ 
+   > I assume you have no objection to this --[[smcv]]
++  > 
++  >> Nod, although I don't know of a use case. --[[Joey]] 
+ 
+ Bugs:
+ 
+@@ -243,6 +261,10 @@ Bugs:
+   >> would you accept a patch that makes `cgiurl` default to a local
+   >> (starts-with-`/`) result? If you would, that'd reduce the diff. --[[smcv]]
+ 
++  >>> Yes, I absolutely think it should default to local. (Note that
++  >>> if `absolute()` were implemented as suggested above, it could also
++  >>> be used with cgiurl if necessary.) --[[Joey]]
++
+ * It occurs to me that `IkiWiki::cgiurl` could probably benefit from being
+   exported? Perhaps also `IkiWiki::baseurl`?
+ 
+
+

+

+
+
diff --git a/doc/recentchanges/change_5dbf25127fb776cc52a3a142b805a0c7f3cef242._change b/doc/recentchanges/change_5dbf25127fb776cc52a3a142b805a0c7f3cef242._change
new file mode 100644
index 000000000..554057cb7
--- /dev/null
+++ b/doc/recentchanges/change_5dbf25127fb776cc52a3a142b805a0c7f3cef242._change
@@ -0,0 +1,140 @@
+[[!meta author="""joey"""]]
+
+[[!meta authorurl="""http://ikiwiki.info/ikiwiki.cgi?page=users%2Fjoey&do=goto"""]]
+
+[[!meta title="""change to security on ikiwiki"""]]
+
+[[!meta permalink="http://ikiwiki.info/recentchanges/#change-5dbf25127fb776cc52a3a142b805a0c7f3cef242"]]
+
+

+
Changed pages:
+
+
+[[diff|wikiicons/diff.png]]security
+
+
+
+
Changed by:
+
+
+joey
+
+
+
Commit type:
+git
+
Date:
+00:45:00 11/12/10
+

+

+
+
+[[revert|wikiicons/revert.png]]
+
+
+

+
+
+releasing version 3.20101112

+
+
+

+
+

+
+diff --git a/debian/changelog b/debian/changelog
+index 2c4c927..f8dc04e 100644
+--- a/debian/changelog
++++ b/debian/changelog
+@@ -1,4 +1,4 @@
+-ikiwiki (3.20101024) UNRELEASED; urgency=low
++ikiwiki (3.20101112) unstable; urgency=HIGH
+ 
+   * txt: Fix display when used inside a format directive.
+   * highlight: Ensure that other, more-specific format plugins,
+@@ -16,7 +16,7 @@ ikiwiki (3.20101024) UNRELEASED; urgency=low
+   * comments: Make comment() pagespec also match comments that are being
+     posted.
+ 
+- -- Joey Hess <joeyh@debian.org>  Mon, 25 Oct 2010 22:30:29 -0400
++ -- Joey Hess <joeyh@debian.org>  Fri, 12 Nov 2010 00:36:06 -0400
+ 
+ ikiwiki (3.20101023) unstable; urgency=low
+ 
+diff --git a/doc/security.mdwn b/doc/security.mdwn
+index 33b1992..2c342b1 100644
+--- a/doc/security.mdwn
++++ b/doc/security.mdwn
+@@ -449,7 +449,7 @@ of eg, blog posts. Confusingly, setting it to "* and !comment(*)" did not
+ scrub comments.
+ 
+ Additionally, it was discovered that comments' html was never scrubbed during
+-preview or moderation of comments.
++preview or moderation of comments with such a configuration.
+ 
+ These problems were discovered on 12 November 2010 and fixed the same
+ hour with the release of ikiwiki 3.20101112.
+diff --git a/ikiwiki.spec b/ikiwiki.spec
+index 7653ac6..5ef4390 100644
+--- a/ikiwiki.spec
++++ b/ikiwiki.spec
+@@ -1,5 +1,5 @@
+ Name:           ikiwiki
+-Version: 3.20101023
++Version: 3.20101112
+ Release:        1%{?dist}
+ Summary:        A wiki compiler
+ 
+diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot
+index fa65b6f..e4274d0 100644
+--- a/po/ikiwiki.pot
++++ b/po/ikiwiki.pot
+@@ -8,7 +8,7 @@ msgid ""
+ msgstr ""
+ "Project-Id-Version: PACKAGE VERSION\n"
+ "Report-Msgid-Bugs-To: \n"
+-"POT-Creation-Date: 2010-10-23 17:21-0400\n"
++"POT-Creation-Date: 2010-11-12 00:37-0400\n"
+ "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+ "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+ "Language-Team: LANGUAGE <LL@li.org>\n"
+@@ -203,7 +203,7 @@ msgstr ""
+ msgid "moderation"
+ msgstr ""
+ 
+-#: ../IkiWiki/Plugin/comments.pm:137 ../IkiWiki/Plugin/format.pm:48
++#: ../IkiWiki/Plugin/comments.pm:137 ../IkiWiki/Plugin/format.pm:50
+ #, perl-format
+ msgid "unsupported page format %s"
+ msgstr ""
+@@ -268,7 +268,7 @@ msgstr ""
+ msgid "comment moderation"
+ msgstr ""
+ 
+-#: ../IkiWiki/Plugin/comments.pm:822
++#: ../IkiWiki/Plugin/comments.pm:828
+ #, perl-format
+ msgid "%i comment"
+ msgid_plural "%i comments"
+@@ -278,7 +278,7 @@ msgstr[1] ""
+ #. translators: Here "Comment" is a verb;
+ #. translators: the user clicks on it to
+ #. translators: post a comment.
+-#: ../IkiWiki/Plugin/comments.pm:832
++#: ../IkiWiki/Plugin/comments.pm:838
+ msgid "Comment"
+ msgstr ""
+ 
+@@ -411,7 +411,7 @@ msgid ""
+ "warning: highlight perl module not available; falling back to pass through"
+ msgstr ""
+ 
+-#: ../IkiWiki/Plugin/htmltidy.pm:62
++#: ../IkiWiki/Plugin/htmltidy.pm:63
+ msgid "htmltidy failed to parse this html"
+ msgstr ""
+ 
+
+

+

+
+
diff --git a/doc/recentchanges/change_5ecba3b05d66bb58dc48a9027838e8b0bcbc0db9._change b/doc/recentchanges/change_5ecba3b05d66bb58dc48a9027838e8b0bcbc0db9._change
new file mode 100644
index 000000000..0c598219d
--- /dev/null
+++ b/doc/recentchanges/change_5ecba3b05d66bb58dc48a9027838e8b0bcbc0db9._change
@@ -0,0 +1,74 @@
+[[!meta author="""http://smcv.pseudorandom.co.uk/"""]]
+
+[[!meta authorurl="""http://smcv.pseudorandom.co.uk/"""]]
+
+[[!meta title="""change to todo/transient_in-memory_pages on ikiwiki"""]]
+
+[[!meta permalink="http://ikiwiki.info/recentchanges/#change-5ecba3b05d66bb58dc48a9027838e8b0bcbc0db9"]]
+
+

+
Changed pages:
+
+
+[[diff|wikiicons/diff.png]]todo/transient in-memory pages
+
+
+
+
Changed by:
+
+
+smcv
+
+
+
Commit type:
+web
+
Date:
+07:14:21 11/15/10
+

+

+
+
+[[revert|wikiicons/revert.png]]
+
+
+

+
+
+more discussion

+
+
+

+
+

+
+diff --git a/doc/todo/transient_in-memory_pages.mdwn b/doc/todo/transient_in-memory_pages.mdwn
+index 816e95c..edf056e 100644
+--- a/doc/todo/transient_in-memory_pages.mdwn
++++ b/doc/todo/transient_in-memory_pages.mdwn
+@@ -46,3 +46,21 @@ Refinements that could be made if this approach seems reasonable:
+ >> The `.ikiwiki/transient` would suit this, but instead of saying "tag_underlay" or "autoindex_underlay" have "use_transient_underlay" or something like that?
+ >> Or to make it more flexible, have just one option "transient_underlay" which is set to an absolute path, and if it is set, then one is using a transient-underlay.
+ >> --[[KathrynAndersen]]
++
++>>> What I had in mind was more like `tag_autocreate_transient => 1` or
++>>> `autoindex_transient => 1`; you might conceivably want tags to be
++>>> checked in but autoindices to be transient, and it's fine for each
++>>> plugin to make its own decision. Going from that to one boolean
++>>> (or just always-transient if people don't think that's too
++>>> astonishing) would be trivial, though.
++>>>
++>>> I don't think relocating the transient underlay really makes sense,
++>>> except for prototyping: you only want one, and `.ikiwiki` is as good
++>>> a place as any (ikiwiki already needs to be able to write there).
++>>>
++>>> For [[plugins/contrib/album]] I think I'd just make the photo viewer
++>>> pages always-transient - you can always make a transient page
++>>> permanent by editing it, after all.
++>>>
++>>> Do you think this approach has enough potential that I should
++>>> continue to hack on it? Any thoughts on the implementation? --[[smcv]]
+
+

+

+
+
diff --git a/doc/recentchanges/change_5f750e16b8c32d2fd69209f433e7d19efa53a71f._change b/doc/recentchanges/change_5f750e16b8c32d2fd69209f433e7d19efa53a71f._change
new file mode 100644
index 000000000..cb1e325e8
--- /dev/null
+++ b/doc/recentchanges/change_5f750e16b8c32d2fd69209f433e7d19efa53a71f._change
@@ -0,0 +1,77 @@
+[[!meta author="""joey"""]]
+
+[[!meta authorurl="""http://ikiwiki.info/ikiwiki.cgi?page=users%2Fjoey&do=goto"""]]
+
+[[!meta title="""change to security on ikiwiki"""]]
+
+[[!meta permalink="http://ikiwiki.info/recentchanges/#change-5f750e16b8c32d2fd69209f433e7d19efa53a71f"]]
+
+

+
Changed pages:
+
+
+[[diff|wikiicons/diff.png]]security
+
+
+
+
Changed by:
+
+
+joey
+
+
+
Commit type:
+git
+
Date:
+10:25:21 11/12/10
+

+

+
+
+[[revert|wikiicons/revert.png]]
+
+
+

+
+
+CVE id

+
+
+

+
+

+
+diff --git a/debian/changelog b/debian/changelog
+index f8dc04e..582a8e3 100644
+--- a/debian/changelog
++++ b/debian/changelog
+@@ -10,11 +10,11 @@ ikiwiki (3.20101112) unstable; urgency=HIGH
+     (Thanks, Tuomas Jormola)
+   * Fix htmlscrubber_skip to be matched on the source page, not the page it is
+     inlined into. Should allow setting to "* and !comment(*)" to scrub
+-    comments, but leave your blog posts unscrubbed, etc.
++    comments, but leave your blog posts unscrubbed, etc. CVE-2010-1673
+   * comments: Make postcomment() pagespec work when previewing a comment,
+-    including during moderation.
++    including during moderation. CVE-2010-1673
+   * comments: Make comment() pagespec also match comments that are being
+-    posted.
++    posted. CVE-2010-1673
+ 
+  -- Joey Hess <joeyh@debian.org>  Fri, 12 Nov 2010 00:36:06 -0400
+ 
+diff --git a/doc/security.mdwn b/doc/security.mdwn
+index 2c342b1..4fa531e 100644
+--- a/doc/security.mdwn
++++ b/doc/security.mdwn
+@@ -452,4 +452,4 @@ Additionally, it was discovered that comments' html was never scrubbed during
+ preview or moderation of comments with such a configuration.
+ 
+ These problems were discovered on 12 November 2010 and fixed the same
+-hour with the release of ikiwiki 3.20101112.
++hour with the release of ikiwiki 3.20101112. ([[!cve CVE-2010-1673]])
+
+

+

+
+
diff --git a/doc/recentchanges/change_608cef54d63ba60efd24ae14012dda7ff8d014a9._change b/doc/recentchanges/change_608cef54d63ba60efd24ae14012dda7ff8d014a9._change
new file mode 100644
index 000000000..7ee29dff3
--- /dev/null
+++ b/doc/recentchanges/change_608cef54d63ba60efd24ae14012dda7ff8d014a9._change
@@ -0,0 +1,61 @@
+[[!meta author="""http://kerravonsen.dreamwidth.org/"""]]
+
+[[!meta authorurl="""http://kerravonsen.dreamwidth.org/"""]]
+
+[[!meta title="""change to todo/Improving_the_efficiency_of_match__95__glob on ikiwiki"""]]
+
+[[!meta permalink="http://ikiwiki.info/recentchanges/#change-608cef54d63ba60efd24ae14012dda7ff8d014a9"]]
+
+

+
Changed pages:
+
+
+[[diff|wikiicons/diff.png]]todo/Improving the efficiency of match_glob
+
+
+
+
Changed by:
+
+
+kerravonsen [dreamwidth.org]
+
+
+
Commit type:
+web
+
Date:
+22:01:21 11/14/10
+

+

+
+
+[[revert|wikiicons/revert.png]]
+
+
+

+
+
+theory about differences in speed of memoize and non-memoize patches

+
+
+

+
+

+
+diff --git a/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn b/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn
+index c4d3a8e..43571ea 100644
+--- a/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn
++++ b/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn
+@@ -20,6 +20,8 @@ Here's my patch - please consider it! -- [[KathrynAndersen]]
+ >>>> is less verbose than Kathryn's patch but also not as
+ >>>> fast; I'm not sure why, tbh. --[[smcv]]
+ 
++>>>>> I think it's because my patch focuses on match_glob while the memoize patch focuses on `glob2re`, and `glob2re` is called in `filecheck`, `meta` and `po` as well as in `match_glob` and `match_user`; thus the memoized `glob2re` is dealing with a bigger set of globs to look up, and thus could be just that little bit slower. -- [[KathrynAndersen]]
++
+ --------------------------------------------------------------
+ Benchmarks done with Devel::Profile on the same testbed IkiWiki setup.  I'm just showing the start of the profile output, since that's what's relevant.
+ 
+
+

+

+
+
diff --git a/doc/recentchanges/change_61218e338a7517b25fc82697c3a11fff1edb6803._change b/doc/recentchanges/change_61218e338a7517b25fc82697c3a11fff1edb6803._change
new file mode 100644
index 000000000..b2e825460
--- /dev/null
+++ b/doc/recentchanges/change_61218e338a7517b25fc82697c3a11fff1edb6803._change
@@ -0,0 +1,66 @@
+[[!meta author="""http://smcv.pseudorandom.co.uk/"""]]
+
+[[!meta authorurl="""http://smcv.pseudorandom.co.uk/"""]]
+
+[[!meta title="""change to todo/use_secure_cookies_for_ssl_logins on ikiwiki"""]]
+
+[[!meta permalink="http://ikiwiki.info/recentchanges/#change-61218e338a7517b25fc82697c3a11fff1edb6803"]]
+
+

+
Changed pages:
+
+
+[[diff|wikiicons/diff.png]]todo/use secure cookies for ssl logins
+
+
+
+
Changed by:
+
+
+smcv
+
+
+
Commit type:
+web
+
Date:
+23:59:03 11/23/10
+

+

+
+
+[[revert|wikiicons/revert.png]]
+
+
+

+
+
+another branch

+
+
+

+
+

+
+diff --git a/doc/todo/use_secure_cookies_for_ssl_logins.mdwn b/doc/todo/use_secure_cookies_for_ssl_logins.mdwn
+new file mode 100644
+index 0000000..a91a15b
+--- /dev/null
++++ b/doc/todo/use_secure_cookies_for_ssl_logins.mdwn
+@@ -0,0 +1,12 @@
++[[!template id=gitbranch branch=smcv/ready/sslcookie-auto author="[[smcv]]"]]
++[[!tag patch]]
++
++At the moment `sslcookie => 0` never creates secure cookies, so if you log in
++with SSL, your browser will send the session cookie even over plain HTTP.
++Meanwhile `sslcookie => 1` always creates secure cookies, so you can't
++usefully log in over plain http.
++
++This branch adds `sslcookie => 0, sslcookie_auto => 1` as an option; this
++uses the `HTTPS` environment variable, so if you log in over SSL you'll
++get a secure session cookie, but if you log in over HTTP, you won't.
++(The syntax for the setup file is pretty rubbish - any other suggestions?)
+
+

+

+
+
diff --git a/doc/recentchanges/change_615bf4fe15e7300bc033724bf86eecb6a2efef49._change b/doc/recentchanges/change_615bf4fe15e7300bc033724bf86eecb6a2efef49._change
new file mode 100644
index 000000000..22b4e9219
--- /dev/null
+++ b/doc/recentchanges/change_615bf4fe15e7300bc033724bf86eecb6a2efef49._change
@@ -0,0 +1,65 @@
+[[!meta author="""http://kerravonsen.dreamwidth.org/"""]]
+
+[[!meta authorurl="""http://kerravonsen.dreamwidth.org/"""]]
+
+[[!meta title="""change to forum/Need_something_more_powerful_than_Exclude/comment_2_f577ab6beb9912471949d8d18c790267 on ikiwiki"""]]
+
+[[!meta permalink="http://ikiwiki.info/recentchanges/#change-615bf4fe15e7300bc033724bf86eecb6a2efef49"]]
+
+

+
Changed pages:
+
+
+[[diff|wikiicons/diff.png]]forum/Need something more powerful than Exclude/comment 2 f577ab6beb9912471949d8d18c790267
+
+
+
+
Changed by:
+
+
+kerravonsen [dreamwidth.org]
+
+
+
Commit type:
+web
+
Date:
+02:55:21 11/25/10
+

+

+
+
+[[revert|wikiicons/revert.png]]
+
+
+

+
+
+Added a comment: Missed It By That Much

+
+
+

+
+

+
+diff --git a/doc/forum/Need_something_more_powerful_than_Exclude/comment_2_f577ab6beb9912471949d8d18c790267._comment b/doc/forum/Need_something_more_powerful_than_Exclude/comment_2_f577ab6beb9912471949d8d18c790267._comment
+new file mode 100644
+index 0000000..bd964d5
+--- /dev/null
++++ b/doc/forum/Need_something_more_powerful_than_Exclude/comment_2_f577ab6beb9912471949d8d18c790267._comment
+@@ -0,0 +1,11 @@
++[[!comment format=mdwn
++ username="http://kerravonsen.dreamwidth.org/"
++ ip="60.241.8.244"
++ subject="Missed It By That Much"
++ date="2010-11-25T02:55:20Z"
++ content="""
++I discovered that I not only needed to change the regexp, but I also needed to delete .ikiwiki/indexdb because `file_pruned` only gets called for files that aren't in the `%pagesources` hash, and since the file in question was already there because it had been put there before the exclude regex was changed, it wasn't even being checked!
++
++[[KathrynAndersen]]
++
++"""]]
+
+

+

+
+
diff --git a/doc/recentchanges/change_62fc5d0c3cfdde0ae87c5364db6f6ebfa6794b14._change b/doc/recentchanges/change_62fc5d0c3cfdde0ae87c5364db6f6ebfa6794b14._change
new file mode 100644
index 000000000..b784d2250
--- /dev/null
+++ b/doc/recentchanges/change_62fc5d0c3cfdde0ae87c5364db6f6ebfa6794b14._change
@@ -0,0 +1,102 @@
+[[!meta author="""http://jmtd.livejournal.com/"""]]
+
+[[!meta authorurl="""http://jmtd.livejournal.com/"""]]
+
+[[!meta title="""change to ikiwiki/directive/template on ikiwiki"""]]
+
+[[!meta permalink="http://ikiwiki.info/recentchanges/#change-62fc5d0c3cfdde0ae87c5364db6f6ebfa6794b14"]]
+
+

+
Changed pages:
+
+
+[[diff|wikiicons/diff.png]]ikiwiki/directive/template
+
+
+
+
Changed by:
+
+
+jmtd [livejournal.com]
+
+
+
Commit type:
+web
+
Date:
+10:41:40 11/15/10
+

+

+
+
+[[revert|wikiicons/revert.png]]
+
+
+

+
+
+I totally misinterpreted what included() is supposed to be for.

+
+
+
+
+
+This reverts commit da9e1ea667f82d5fca9168dbed19be08040570ff

+
+
+

+
+

+
+diff --git a/doc/ikiwiki/directive/template.mdwn b/doc/ikiwiki/directive/template.mdwn
+index df391f9..9e3ae54 100644
+--- a/doc/ikiwiki/directive/template.mdwn
++++ b/doc/ikiwiki/directive/template.mdwn
+@@ -60,30 +60,22 @@ few things:
+   `<TMPL_IF variable>text</TMPL_IF>`.
+ * To use one block of text if a variable is set and a second if it's not,
+   use `<TMPL_IF variable>text<TMPL_ELSE>other text</TMPL_IF>`
+-* Each template file included in the wiki's source will also generate a regular
+-  wiki page.  In many cases you might want to prevent some of your template
+-  being interpreted for the regular page.  Use the [[if]] directive with the
+-  `included()` test to guard the template code.
+ 
+ Here's a sample template:
+ 
+-        \[[!if test="included()" then="""
+-          <span class="infobox">
+-          Name: \[[<TMPL_VAR raw_name>]]<br />
+-          Age: <TMPL_VAR age><br />
+-          <TMPL_IF color>
+-            Favorite color: <TMPL_VAR color><br />
+-          <TMPL_ELSE>
+-            No favorite color.<br />
+-          </TMPL_IF>
+-          <TMPL_IF notes>
+-            <hr />
+-            <TMPL_VAR notes>
+-          </TMPL_IF>
+-          </span>
+-        """ else="""
+-          This is a template page.
+-        """]]
++        <span class="infobox">
++        Name: \[[<TMPL_VAR raw_name>]]<br />
++        Age: <TMPL_VAR age><br />
++        <TMPL_IF color>
++        Favorite color: <TMPL_VAR color><br />
++        <TMPL_ELSE>
++        No favorite color.<br />
++        </TMPL_IF>
++        <TMPL_IF notes>
++        <hr />
++        <TMPL_VAR notes>
++        </TMPL_IF>
++        </span>
+ 
+ The filled out template will be formatted the same as the rest of the page
+ that contains it, so you can include WikiLinks and all other forms of wiki
+
+

+

+
+
diff --git a/doc/recentchanges/change_65873fee5e1dda78d6cf561cdd81a5dcd6d2735d._change b/doc/recentchanges/change_65873fee5e1dda78d6cf561cdd81a5dcd6d2735d._change
new file mode 100644
index 000000000..3924a71bd
--- /dev/null
+++ b/doc/recentchanges/change_65873fee5e1dda78d6cf561cdd81a5dcd6d2735d._change
@@ -0,0 +1,63 @@
+[[!meta author="""http://cristian.regolo.cc/"""]]
+
+[[!meta authorurl="""http://cristian.regolo.cc/"""]]
+
+[[!meta title="""change to examples/blog on ikiwiki"""]]
+
+[[!meta permalink="http://ikiwiki.info/recentchanges/#change-65873fee5e1dda78d6cf561cdd81a5dcd6d2735d"]]
+
+

+
Changed pages:
+
+
+[[diff|wikiicons/diff.png]]examples/blog
+
+
+
+
Changed by:
+
+
+cristiangreco
+
+
+
Commit type:
+web
+
Date:
+11:49:36 11/05/10
+

+

+
+
+[[revert|wikiicons/revert.png]]
+
+
+

+
+
+add link to tag plugin page

+
+
+

+
+

+
+diff --git a/doc/examples/blog.mdwn b/doc/examples/blog.mdwn
+index b256012..5f8f6c3 100644
+--- a/doc/examples/blog.mdwn
++++ b/doc/examples/blog.mdwn
+@@ -10,8 +10,8 @@ Some additional configuration you might want to do, if not using
+ 
+ * Make sure to configure ikiwiki to generate RSS or Atom feeds.
+ 
+-* Make sure you have the tag plugin enabled, and the `tagbase` set to
+-  "tags". Tag pages will then automatically be created.
++* Make sure you have the [[tag|plugins/tag]] plugin enabled, and the
++ `tagbase` set to "tags". Tag pages will then automatically be created.
+   An example of how to tag a post is:
+ 	\[[!tag life]]
+ 
+
+

+

+
+
diff --git a/doc/recentchanges/change_65e726f201d7b9919271cfe7e8a7314a6abf0fc3._change b/doc/recentchanges/change_65e726f201d7b9919271cfe7e8a7314a6abf0fc3._change
new file mode 100644
index 000000000..a70dbb1af
--- /dev/null
+++ b/doc/recentchanges/change_65e726f201d7b9919271cfe7e8a7314a6abf0fc3._change
@@ -0,0 +1,90 @@
+[[!meta author="""joey"""]]
+
+[[!meta authorurl="""http://ikiwiki.info/ikiwiki.cgi?page=users%2Fjoey&do=goto"""]]
+
+[[!meta title="""change to todo/replace_HTML::Template_with_Template_Toolkit on ikiwiki"""]]
+
+[[!meta permalink="http://ikiwiki.info/recentchanges/#change-65e726f201d7b9919271cfe7e8a7314a6abf0fc3"]]
+
+

+
Changed pages:
+
+
+[[diff|wikiicons/diff.png]]todo/replace HTML::Template with Template Toolkit
+
+
+
+
Changed by:
+
+
+joey
+
+
+
Commit type:
+git
+
Date:
+13:42:52 11/16/10
+

+

+
+
+[[revert|wikiicons/revert.png]]
+
+
+

+
+
+response

+
+
+

+
+

+
+diff --git a/doc/todo/replace_HTML::Template_with_Template_Toolkit.mdwn b/doc/todo/replace_HTML::Template_with_Template_Toolkit.mdwn
+index 9725b65..d55fc0a 100644
+--- a/doc/todo/replace_HTML::Template_with_Template_Toolkit.mdwn
++++ b/doc/todo/replace_HTML::Template_with_Template_Toolkit.mdwn
+@@ -5,9 +5,14 @@ features and thus makes it rather hard to give an ikiwiki site a consistent
+ look. If you browse the templates provided in the tarball, you'll notice that
+ more than one of them contain the `<html>` tag, which is unnecessary.
+ 
++> Note that is no longer true, and I didn't have to do such an intrusive
++> change to fix it either. --[[Joey]]
++
+ Maybe it's just me, I also find HTML::Template cumbersome to use, due in part
+ to its use of capital letters.
+ 
++> Its entirely optional use of capital letters? --[[Joey]]
++
+ Finally, the software seems unmaintained: the mailing list and searchable
+ archives linked from
+ <http://html-template.sourceforge.net/html_template.html#frequently%20asked%20questions>
+@@ -62,4 +67,21 @@ HTML::Template's HTML-like markup prevents me from editing templates in KompoZer
+ 
+ I agree that being able to replace the template toolkit would be a great piece of modularity, and one I would use. If I could use the slot-based filling and the conditional logic from Template::Toolkit, we could build much more flexible inline and archivepage templates that would look different depending on where in the wiki we use them. Some of this can currently be accomplished with separate templates for each use case and a manual call to the right template in the !inline directive, but this is limited, cumbersome, and makes it difficult to reuse bits of formatting by trapping all of that information in multiple template files. -Ian
+ 
+-> I don't wish HTML::Template to be *replaced* by Template::Toolkit - as others have said above, it's overkill for my needs.  However, I also agree that HTML::Template has its own problems too.  The idea of making the template system modular, with a choice of which backend to use - I really like that idea. It would enable me to use some other template system I like better, such as Text::Template or Text::NeatTemplate. But I think it would be a lot of work to implement, though perhaps no more work than making the revision-control backend modular, I guess.  One would need to write an IkiWiki template interface that didn't care what the backend was, and yet is somehow still flexible enough to take advantage of special features of different backends.  There are an *awful lot* of things that use templates - not just the `pagetemplate` and `template` plugins, but a number of others which have specialized templates of their own. -- [[KathrynAndersen]]
++> I don't wish HTML::Template to be *replaced* by Template::Toolkit - as
++> others have said above, it's overkill for my needs.  However, I also
++> agree that HTML::Template has its own problems too.  The idea of making
++> the template system modular, with a choice of which backend to use - I
++> really like that idea. It would enable me to use some other template
++> system I like better, such as Text::Template or Text::NeatTemplate. But I
++> think it would be a lot of work to implement, though perhaps no more work
++> than making the revision-control backend modular, I guess.  One would
++> need to write an IkiWiki template interface that didn't care what the
++> backend was, and yet is somehow still flexible enough to take advantage
++> of special features of different backends.  There are an *awful lot* of
++> things that use templates - not just the `pagetemplate` and `template`
++> plugins, but a number of others which have specialized templates of their
++> own. -- [[KathrynAndersen]]a
++
++>> A modular template system in ikiwiki is unlikely, as template objects
++>> are part of the API,  notably the `pagetemplate` hook. Unless the other
++>> system has a compatible template object. --[[Joey]] 
+
+

+

+
+
diff --git a/doc/recentchanges/change_65ecc73755348f1ed13b77b2f4bdf9db4e465be4._change b/doc/recentchanges/change_65ecc73755348f1ed13b77b2f4bdf9db4e465be4._change
new file mode 100644
index 000000000..24d7bd43d
--- /dev/null
+++ b/doc/recentchanges/change_65ecc73755348f1ed13b77b2f4bdf9db4e465be4._change
@@ -0,0 +1,109 @@
+[[!meta author="""joey"""]]
+
+[[!meta authorurl="""http://ikiwiki.info/ikiwiki.cgi?page=users%2Fjoey&do=goto"""]]
+
+[[!meta title="""change to news/version_3.20100831 news/version_3.20101112 on ikiwiki"""]]
+
+[[!meta permalink="http://ikiwiki.info/recentchanges/#change-65ecc73755348f1ed13b77b2f4bdf9db4e465be4"]]
+
+

+
Changed pages:
+
+
+[[diff|wikiicons/diff.png]]news/version 3.20100831
+
+
+[[diff|wikiicons/diff.png]]news/version 3.20101112
+
+
+
+
Changed by:
+
+
+joey
+
+
+
Commit type:
+git
+
Date:
+00:46:29 11/12/10
+

+

+
+
+[[revert|wikiicons/revert.png]]
+
+
+

+
+
+add news item for ikiwiki 3.20101112

+
+
+

+
+

+
+diff --git a/doc/news/version_3.20100831.mdwn b/doc/news/version_3.20100831.mdwn
+deleted file mode 100644
+index 152e3c2..0000000
+--- a/doc/news/version_3.20100831.mdwn
++++ /dev/null
+@@ -1,27 +0,0 @@
+-ikiwiki 3.20100831 released with [[!toggle text="these changes"]]
+-[[!toggleable text="""
+-   * filecheck: Fall back to using the file command if the freedesktop
+-     magic file cannot identify a file.
+-   * flattr: New plugin. (Thanks to jaywalk for the initial implementation
+-     at a flattr plugin! This one is less configurable, but simpler.)
+-   * smiley: warn instead of error for missing smileys (Giuseppe Bilotta)
+-   * openid: Syntax tweak to the javascript code to make it work with MSIE 7
+-     (and MSIE 8 in compat mode). Thanks to Iain McLaren for reporting
+-     the bug and providing access to debug it.
+-   * style.css: Use relative, not absolute font sizes. Thanks, Giuseppe Bilotta.
+-   * htmlscrubber: Do not scrub url anchors that contain colons.
+-   * Danish translation update. Closes: #[594673](http://bugs.debian.org/594673)
+-   * highlight: Make location of highlight's files configurable in setup
+-     file to allow for nonstandard installations.
+-   * Allow "link(.)" and similar PageSpecs. Thanks, Giuseppe Bilotta.
+-   * Run the preprocess hooks in scan mode *before* the scan hooks.
+-     This allows the po plugin to register a scan hook that runs
+-     last and rescans pages after all data from the first scan pass is
+-     completed. This avoids the po plugin needing to rebuild some pages.
+-     (intrigeri)
+-   * po: Fix some bugs that affected l10n.ikiwiki.info's unusual
+-     setup. (intrigeri)
+-   * t/bazaar.t: Work around bzr 2.2.0's new requirement to configure
+-     bzr whoami before committing.
+-   * httpauth: Avoid redirecting the user to the cgiauthurl if
+-     they already have a login session."""]]
+\ No newline at end of file
+diff --git a/doc/news/version_3.20101112.mdwn b/doc/news/version_3.20101112.mdwn
+new file mode 100644
+index 0000000..ad59144
+--- /dev/null
++++ b/doc/news/version_3.20101112.mdwn
+@@ -0,0 +1,17 @@
++ikiwiki 3.20101112 released with [[!toggle text="these changes"]]
++[[!toggleable text="""
++   * txt: Fix display when used inside a format directive.
++   * highlight: Ensure that other, more-specific format plugins,
++     like txt are used in preference to this one in case of ties.
++   * htmltidy, sortnaturally: Add missing checkconfig hook
++     registration. Closes: #[601912](http://bugs.debian.org/601912)
++     (Thanks, Craig Lennox and Tuomas Jormola)
++   * git: Use author date, not committer date. Closes: #[602012](http://bugs.debian.org/602012)
++     (Thanks, Tuomas Jormola)
++   * Fix htmlscrubber\_skip to be matched on the source page, not the page it is
++     inlined into. Should allow setting to "* and !comment(*)" to scrub
++     comments, but leave your blog posts unscrubbed, etc.
++   * comments: Make postcomment() pagespec work when previewing a comment,
++     including during moderation.
++   * comments: Make comment() pagespec also match comments that are being
++     posted."""]]
+\ No newline at end of file
+
+

+

+
+
diff --git a/doc/recentchanges/change_663d2578832dd0808ea98a624b49cec4bf3c0243._change b/doc/recentchanges/change_663d2578832dd0808ea98a624b49cec4bf3c0243._change
new file mode 100644
index 000000000..2e82b0982
--- /dev/null
+++ b/doc/recentchanges/change_663d2578832dd0808ea98a624b49cec4bf3c0243._change
@@ -0,0 +1,52 @@
+[[!meta author="""http://liw.fi/"""]]
+
+[[!meta authorurl="""http://liw.fi/"""]]
+
+[[!meta title="""change to bugs/logout_in_ikiwiki on ikiwiki"""]]
+
+[[!meta permalink="http://ikiwiki.info/recentchanges/#change-663d2578832dd0808ea98a624b49cec4bf3c0243"]]
+
+

+
Changed pages:
+
+
+[[diff|wikiicons/diff.png]]bugs/logout in ikiwiki
+
+
+
+
Changed by:
+
+
+Lars_Wirzenius
+
+
+
Commit type:
+web
+
Date:
+13:39:29 10/28/10
+

+

+
+
+[[revert|wikiicons/revert.png]]
+
+
+

+
+

+
+

+
+diff --git a/doc/bugs/logout_in_ikiwiki.mdwn b/doc/bugs/logout_in_ikiwiki.mdwn
+index ad89f4c..9f974be 100644
+--- a/doc/bugs/logout_in_ikiwiki.mdwn
++++ b/doc/bugs/logout_in_ikiwiki.mdwn
+@@ -1 +1,3 @@
+ It looks like there is no way to logout of ikiwiki at present, meaning that if you edit the ikiwiki in, say, a cybercafe, the cookie remains... is there some other security mechanism in place that can check for authorization, or should I hack in a logout routine into ikiwiki.cgi?
++
++> Click on "Preferences". There is a logout button there. --liw
+
+

+

+
+
diff --git a/doc/recentchanges/change_69a22a6f4b4dfc47a7ce39476758742036b70e63._change b/doc/recentchanges/change_69a22a6f4b4dfc47a7ce39476758742036b70e63._change
new file mode 100644
index 000000000..685541d22
--- /dev/null
+++ b/doc/recentchanges/change_69a22a6f4b4dfc47a7ce39476758742036b70e63._change
@@ -0,0 +1,80 @@
+[[!meta author="""dark"""]]
+
+[[!meta authorurl="""http://ikiwiki.info/ikiwiki.cgi?page=users%2Fdark&do=goto"""]]
+
+[[!meta title="""change to todo/selective_more_directive on ikiwiki"""]]
+
+[[!meta permalink="http://ikiwiki.info/recentchanges/#change-69a22a6f4b4dfc47a7ce39476758742036b70e63"]]
+
+

+
Changed pages:
+
+
+[[diff|wikiicons/diff.png]]todo/selective more directive
+
+
+
+
Changed by:
+
+
+dark
+
+
+
Commit type:
+web
+
Date:
+16:55:20 11/01/10
+

+

+
+
+[[revert|wikiicons/revert.png]]
+
+
+

+
+
+proposal plus patch

+
+
+

+
+

+
+diff --git a/doc/todo/selective_more_directive.mdwn b/doc/todo/selective_more_directive.mdwn
+new file mode 100644
+index 0000000..24e6ab5
+--- /dev/null
++++ b/doc/todo/selective_more_directive.mdwn
+@@ -0,0 +1,26 @@
++I'm setting up a blog for NaNoWriMo and other story-writing, which means long posts every day. I want to have excerpts on the front page, which link to the full length story posts. I also want a dedicated page for each story which inlines the story in full and in chronological order. I can use the "more" directive to achieve this effect on the front page but then it spoils the story page. My solution was to add a pages= parameter to the more directive to make it more selective.
++
++    --- /usr/share/perl5/IkiWiki/Plugin/more.pm     2010-10-09 00:09:24.000000000 +0000
++    +++ .ikiwiki/IkiWiki/Plugin/more.pm    2010-11-01 20:24:59.000000000 +0000
++    @@ -26,7 +26,10 @@
++     
++            $params{linktext} = $linktext unless defined $params{linktext};
++     
++    -       if ($params{page} ne $params{destpage}) {
++    +       if ($params{page} ne $params{destpage} &&
++    +           (! exists $params{pages} ||
++    +            pagespec_match($params{destpage}, $params{pages},
++    +                  location => $params{page}))) {
++                    return "\n".
++                           htmllink($params{page}, $params{destpage}, $params{page},
++                                    linktext => $params{linktext},
++
++I can now call it as 
++
++    \[[!more pages="index" linktext="Chapter 1" text="""
++    etc
++    """]]
++
++I'm not entirely happy with the design, since I would rather put this information in the inline directive instead of in every story post. Unfortunately I found no way to pass parameters from the inline directive to the inlined page.
++
++-- [[dark]]
+
+

+

+
+
diff --git a/doc/recentchanges/change_78a2e59834d35da7a7ab8145beb7a30b59b95c90._change b/doc/recentchanges/change_78a2e59834d35da7a7ab8145beb7a30b59b95c90._change
new file mode 100644
index 000000000..81292322e
--- /dev/null
+++ b/doc/recentchanges/change_78a2e59834d35da7a7ab8145beb7a30b59b95c90._change
@@ -0,0 +1,59 @@
+[[!meta author="""http://kerravonsen.dreamwidth.org/"""]]
+
+[[!meta authorurl="""http://kerravonsen.dreamwidth.org/"""]]
+
+[[!meta title="""change to forum/Need_something_more_powerful_than_Exclude on ikiwiki"""]]
+
+[[!meta permalink="http://ikiwiki.info/recentchanges/#change-78a2e59834d35da7a7ab8145beb7a30b59b95c90"]]
+
+

+
Changed pages:
+
+
+[[diff|wikiicons/diff.png]]forum/Need something more powerful than Exclude
+
+
+
+
Changed by:
+
+
+kerravonsen [dreamwidth.org]
+
+
+
Commit type:
+web
+
Date:
+02:47:38 11/23/10
+

+

+
+
+[[revert|wikiicons/revert.png]]
+
+
+

+
+
+exclusion doesn't exclude

+
+
+

+
+

+
+diff --git a/doc/forum/Need_something_more_powerful_than_Exclude.mdwn b/doc/forum/Need_something_more_powerful_than_Exclude.mdwn
+new file mode 100644
+index 0000000..5e80432
+--- /dev/null
++++ b/doc/forum/Need_something_more_powerful_than_Exclude.mdwn
+@@ -0,0 +1,5 @@
++When I originally looked at the "exclude" option, I thought it meant that it excluded pages completely, but it apparently doesn't.  What I've found in practice is that a file which matches the "exclude" regex is excluded from *processing*, but it is still copied over to the destination directory.  Thus, for example, if I have "^Makefile$" as the exclude pattern, and I have a file `src/foo/Makefile`, then that file is copied unaltered into `dest/foo/Makefile`.  However, what I want is for `src/foo/Makefile` to be completely ignored: that it is not only not processed, but not even *copied* into the destination directory.
++
++I'm not sure if the current behaviour is a bug or a feature, but I would like a "totally ignore this file" feature if it's possible to have one.
++
++-- [[KathrynAndersen]]
+
+

+

+
+
diff --git a/doc/recentchanges/change_84fff62948ad7c7aef664585e8afed86398e7fd4._change b/doc/recentchanges/change_84fff62948ad7c7aef664585e8afed86398e7fd4._change
new file mode 100644
index 000000000..11774dd92
--- /dev/null
+++ b/doc/recentchanges/change_84fff62948ad7c7aef664585e8afed86398e7fd4._change
@@ -0,0 +1,62 @@
+[[!meta author="""http://jmtd.livejournal.com/"""]]
+
+[[!meta authorurl="""http://jmtd.livejournal.com/"""]]
+
+[[!meta title="""change to ikiwiki/directive/if on ikiwiki"""]]
+
+[[!meta permalink="http://ikiwiki.info/recentchanges/#change-84fff62948ad7c7aef664585e8afed86398e7fd4"]]
+
+

+
Changed pages:
+
+
+[[diff|wikiicons/diff.png]]ikiwiki/directive/if
+
+
+
+
Changed by:
+
+
+jmtd [livejournal.com]
+
+
+
Commit type:
+web
+
Date:
+10:46:13 11/15/10
+

+

+
+
+[[revert|wikiicons/revert.png]]
+
+
+

+
+
+note about template inclusion

+
+
+

+
+

+
+diff --git a/doc/ikiwiki/directive/if.mdwn b/doc/ikiwiki/directive/if.mdwn
+index 2cbf70c..492adf4 100644
+--- a/doc/ikiwiki/directive/if.mdwn
++++ b/doc/ikiwiki/directive/if.mdwn
+@@ -43,6 +43,8 @@ with the following additional tests:
+ 
+ * included()
+ 
+-  Tests whether the page is being included onto another page.
++  Tests whether the page is being included onto another page, for example
++  via [[inline]] or [[map]].  Note that pages inserted into other pages
++  via [[template]] are not matched here.
+ 
+ [[!meta robots="noindex, follow"]]
+
+

+

+
+
diff --git a/doc/recentchanges/change_85d262e4cab2bfa55194b445d7fd251fa5818bc6._change b/doc/recentchanges/change_85d262e4cab2bfa55194b445d7fd251fa5818bc6._change
new file mode 100644
index 000000000..4a0b34b6b
--- /dev/null
+++ b/doc/recentchanges/change_85d262e4cab2bfa55194b445d7fd251fa5818bc6._change
@@ -0,0 +1,55 @@
+[[!meta author="""http://edrex.myopenid.com/"""]]
+
+[[!meta authorurl="""http://edrex.myopenid.com/"""]]
+
+[[!meta title="""change to todo/auto-create_tag_pages_according_to_a_template on ikiwiki"""]]
+
+[[!meta permalink="http://ikiwiki.info/recentchanges/#change-85d262e4cab2bfa55194b445d7fd251fa5818bc6"]]
+
+

+
Changed pages:
+
+
+[[diff|wikiicons/diff.png]]todo/auto-create tag pages according to a template
+
+
+
+
Changed by:
+
+
+edrex
+
+
+
Commit type:
+web
+
Date:
+17:24:17 10/30/10
+

+

+
+
+[[revert|wikiicons/revert.png]]
+
+
+

+
+

+
+

+
+diff --git a/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn b/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
+index 92c3b76..676e2bc 100644
+--- a/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
++++ b/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
+@@ -260,5 +260,6 @@ required to implement [[todo/alias directive]], which couldn't be easily done
+ by writing to the RCS as the page's contents can change depending on which
+ other pages claim it as an alias. --[[chrysn]]
+ 
++I agree with [[chrysn]]. In fact, is there any good reason that the core tag plugin doesn't do this? The current usability is horrible, to the point that I have gone 2.5 years with Ikiwiki and haven't yet started using tags. -- [[Eric|http://wiki.pdxhub.org/people/eric]]
+ 
+ [[!tag done]]
+
+

+

+
+
diff --git a/doc/recentchanges/change_85ee24a9e53aec7d70bb4fb758428e59ea76e853._change b/doc/recentchanges/change_85ee24a9e53aec7d70bb4fb758428e59ea76e853._change
new file mode 100644
index 000000000..11cb32339
--- /dev/null
+++ b/doc/recentchanges/change_85ee24a9e53aec7d70bb4fb758428e59ea76e853._change
@@ -0,0 +1,56 @@
+[[!meta author="""http://jmtd.livejournal.com/"""]]
+
+[[!meta authorurl="""http://jmtd.livejournal.com/"""]]
+
+[[!meta title="""change to bugs/aggregate_generates_long_filenames on ikiwiki"""]]
+
+[[!meta permalink="http://ikiwiki.info/recentchanges/#change-85ee24a9e53aec7d70bb4fb758428e59ea76e853"]]
+
+

+
Changed pages:
+
+
+[[diff|wikiicons/diff.png]]bugs/aggregate generates long filenames
+
+
+
+
Changed by:
+
+
+jmtd [livejournal.com]
+
+
+
Commit type:
+web
+
Date:
+06:11:40 11/15/10
+

+

+
+
+[[revert|wikiicons/revert.png]]
+
+
+

+
+

+
+

+
+diff --git a/doc/bugs/aggregate_generates_long_filenames.mdwn b/doc/bugs/aggregate_generates_long_filenames.mdwn
+index 3d98ee8..40decb3 100644
+--- a/doc/bugs/aggregate_generates_long_filenames.mdwn
++++ b/doc/bugs/aggregate_generates_long_filenames.mdwn
+@@ -7,4 +7,7 @@ generate long titles.  Especially once you throw escaping into the mix:
+     $ echo $?
+     25
+ 
++It would also appear this abrubtly terminates aggregate processing (if not ikiwiki itself).  Only after moving my test repo to `/tmp` to shorten the filename did I see newer RSS feeds (from a totally different source) picked up.
++
++
+ -- [[Jon]]
+
+

+

+
+
diff --git a/doc/recentchanges/change_87a42450e1ac8e2e01b7ed2785ed43040fd14ed3._change b/doc/recentchanges/change_87a42450e1ac8e2e01b7ed2785ed43040fd14ed3._change
new file mode 100644
index 000000000..cb834a317
--- /dev/null
+++ b/doc/recentchanges/change_87a42450e1ac8e2e01b7ed2785ed43040fd14ed3._change
@@ -0,0 +1,55 @@
+[[!meta author="""http://jugglingbits.wordpress.com/"""]]
+
+[[!meta authorurl="""http://jugglingbits.wordpress.com/"""]]
+
+[[!meta title="""change to forum/How_to_list_new_pages__44___inline__63__ on ikiwiki"""]]
+
+[[!meta permalink="http://ikiwiki.info/recentchanges/#change-87a42450e1ac8e2e01b7ed2785ed43040fd14ed3"]]
+
+

+
Changed pages:
+
+
+[[diff|wikiicons/diff.png]]forum/How to list new pages, inline?
+
+
+
+
Changed by:
+
+
+thomas11
+
+
+
Commit type:
+web
+
Date:
+03:51:29 11/06/10
+

+

+
+
+[[revert|wikiicons/revert.png]]
+
+
+

+
+

+
+

+
+diff --git a/doc/forum/How_to_list_new_pages__44___inline__63__.mdwn b/doc/forum/How_to_list_new_pages__44___inline__63__.mdwn
+new file mode 100644
+index 0000000..f28e8b9
+--- /dev/null
++++ b/doc/forum/How_to_list_new_pages__44___inline__63__.mdwn
+@@ -0,0 +1,5 @@
++Hi, I'd love to include a "New posts" list into my front page, like at <http://danhixon.github.com/> for example.
++
++It should be different from recent changes in that it shouldn't show modifications of existing pages, and in that it would be inside a page with other content.
++
++Thanks, Thomas
+
+

+

+
+
diff --git a/doc/recentchanges/change_8806a9795116e73ec851dfea89af45a786fbe6da._change b/doc/recentchanges/change_8806a9795116e73ec851dfea89af45a786fbe6da._change
new file mode 100644
index 000000000..9b90d51aa
--- /dev/null
+++ b/doc/recentchanges/change_8806a9795116e73ec851dfea89af45a786fbe6da._change
@@ -0,0 +1,58 @@
+[[!meta author="""dark"""]]
+
+[[!meta authorurl="""http://ikiwiki.info/ikiwiki.cgi?page=users%2Fdark&do=goto"""]]
+
+[[!meta title="""change to news/openid on ikiwiki"""]]
+
+[[!meta permalink="http://ikiwiki.info/recentchanges/#change-8806a9795116e73ec851dfea89af45a786fbe6da"]]
+
+

+
Changed pages:
+
+
+[[diff|wikiicons/diff.png]]news/openid
+
+
+
+
Changed by:
+
+
+dark
+
+
+
Commit type:
+web
+
Date:
+17:49:10 11/11/10
+

+

+
+
+[[revert|wikiicons/revert.png]]
+
+
+

+
+
+poll vote (Accept both)

+
+
+

+
+

+
+diff --git a/doc/news/openid.mdwn b/doc/news/openid.mdwn
+index 5b145fe..87f6403 100644
+--- a/doc/news/openid.mdwn
++++ b/doc/news/openid.mdwn
+@@ -10,4 +10,4 @@ log back in, try out the OpenID signup process if you don't already have an
+ OpenID, and see how OpenID works for you. And let me know your feelings about
+ making such a switch. --[[Joey]]
+ 
+-[[!poll 67 "Accept only OpenID for logins" 21 "Accept only password logins" 40 "Accept both"]]
++[[!poll 67 "Accept only OpenID for logins" 21 "Accept only password logins" 41 "Accept both"]]
+
+

+

+
+
diff --git a/doc/recentchanges/change_8935a131d02ac13b6024dff9cbf7a5f837fcdc04._change b/doc/recentchanges/change_8935a131d02ac13b6024dff9cbf7a5f837fcdc04._change
new file mode 100644
index 000000000..12ef0e9ab
--- /dev/null
+++ b/doc/recentchanges/change_8935a131d02ac13b6024dff9cbf7a5f837fcdc04._change
@@ -0,0 +1,161 @@
+[[!meta author="""http://smcv.pseudorandom.co.uk/"""]]
+
+[[!meta authorurl="""http://smcv.pseudorandom.co.uk/"""]]
+
+[[!meta title="""change to todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both on ikiwiki"""]]
+
+[[!meta permalink="http://ikiwiki.info/recentchanges/#change-8935a131d02ac13b6024dff9cbf7a5f837fcdc04"]]
+
+

+
Changed pages:
+
+
+[[diff|wikiicons/diff.png]]todo/want to avoid ikiwiki using http or https in urls to allow serving both
+
+
+
+
Changed by:
+
+
+smcv
+
+
+
Commit type:
+web
+
Date:
+00:37:28 11/23/10
+

+

+
+
+[[revert|wikiicons/revert.png]]
+
+
+

+
+
+updated branch, not tested properly yet

+
+
+

+
+

+
+diff --git a/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn b/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn
+index f8ec4c4..8b05010 100644
+--- a/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn
++++ b/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn
+@@ -147,7 +147,7 @@ you don't like my approach:
+ 
+ ----
+ 
+-[[!template id=gitbranch branch=smcv/ready/localurl author="[[smcv]]"]]
++[[!template id=gitbranch branch=smcv/localurl author="[[smcv]]"]]
+ [[!tag patch]]
+ 
+ OK, here's an alternative approach, closer in spirit to what was initially
+@@ -165,14 +165,17 @@ whether `url` and `cgiurl` are on the same server with the the same URL
+ scheme. In theory you could use things like `//static.example.com/wiki/`
+ and `//dynamic.example.com/ikiwiki.cgi` to preserve choice of http/https
+ while switching server, but I don't know how consistently browsers
+-suppot that.
++support that.
+ 
+ "local" here is short for "locally valid", because these URLs are neither
+ fully relative nor fully absolute, and there doesn't seem to be a good name
+ for them...
+ 
+-I've tested this on a demo website with the CGI enabled, and it seems to
++I tested an earlier version on a demo website with the CGI enabled, and it seemed to
+ work nicely (there might be bugs in some plugins, I didn't try all of them).
++I haven't yet re-tested with my updated branch, which is why it's not `ready/`
++yet.
++
+ The `$config{url}` and `$config{cgiurl}` are both HTTP, but if I enable
+ `httpauth`, set `cgiauthurl` to a HTTPS version of the same site and log
+ in via that, links all end up in the HTTPS version.
+@@ -217,11 +220,19 @@ New API added by this branch:
+   >> 
+   >>> That makes a great deal of sense, bravo for actually removing
+   >>> parameters in the common case while maintaining backwards
+-  >>> compatability!
++  >>> compatability! --[[Joey]]
++  >>>
++  >>>> Done in my `localurl` branch; not tested in a whole-wiki way
++  >>>> yet, but I did add a regression test. I've used
++  >>>> `urlto(x, undef)` rather than `urlto(x)` so far, but I could
++  >>>> go back through the codebase using the short form if you'd
++  >>>> prefer. --[[smcv]]
+   >>> 
+   >>> It does highlight that it would be better to have a
+   >>> `absolute_urlto($link)` (or maybe `absolute(urlto($link))` )
+   >>> rather than the 3 parameter form. --[[Joey]]
++  >>>
++  >>> Possibly. I haven't added this.
+ 
+ * `IkiWiki::baseurl` has a new second argument which works like the
+   third argument of `urlto`
+@@ -232,19 +243,34 @@ New API added by this branch:
+   >> (But I assume changes to `urlto` will follow through here anyway.)
+   >> --[[Joey]] 
+ 
++  >>> I had to use it a bit more, as a replacement for `$config{url}`
++  >>> when doing things like referencing stylesheets or redirecting to
++  >>> the top of the wiki.
++  >>>
++  >>> I ended up redoing this without the extra parameter. Previously,
++  >>> `baseurl(undef)` was the absolute URL; now, `baseurl(undef)` is
++  >>> the local path. I know you objected to me using `baseurl()` in
++  >>> an earlier branch, because `baseurl().$x` looks confusingly
++  >>> similar to `baseurl($x)` but has totally different semantics;
++  >>> I've generally written it `baseurl(undef)` now, to be more
++  >>> explicit. --[[smcv]]
++
+ * `IkiWiki::cgiurl` uses `$local_cgiurl` if passed `local_cgiurl => 1`
+ 
+-  > Possibly changed to making this always be local unless `cgiurl => $x`
+-  > is given: see below --[[smcv]]
++  > Now changed to always use the `$local_cgiurl`. --[[smcv]]
+ 
+ * `IkiWiki::cgiurl` omits the trailing `?` if given no named parameters
+   except `cgiurl` and/or `local_cgiurl`
+ 
+   > I assume you have no objection to this --[[smcv]]
+   > 
+-  >> Nod, although I don't know of a use case. --[[Joey]] 
++  >> Nod, although I don't know of a use case. --[[Joey]]
++
++  >>> The use-case is that I can replace `$config{cgiurl}` with
++  >>> `IkiWiki::cgiurl()` for things like the action attribute of
++  >>> forms. --[[smcv]]
+ 
+-Bugs:
++Fixed bugs:
+ 
+ * I don't think anything except `openid` calls `cgiurl` without also
+   passing in `local_cgiurl => 1`, so perhaps that should be the default;
+@@ -265,6 +291,10 @@ Bugs:
+   >>> if `absolute()` were implemented as suggested above, it could also
+   >>> be used with cgiurl if necessary.) --[[Joey]]
+ 
++  >>>> Done (minus `absolute()`). --[[smcv]]
++
++Potential future things:
++
+ * It occurs to me that `IkiWiki::cgiurl` could probably benefit from being
+   exported? Perhaps also `IkiWiki::baseurl`?
+ 
+@@ -285,4 +315,7 @@ Bugs:
+   > AFACIS, `baseurl` is only called in 3 places so I don't think that's
+   > needed. --[[Joey]] 
+ 
+-  >> OK, wontfix. --[[smcv]]
++  >> OK, wontfix. For what it's worth, my branch has 6 uses in IkiWiki
++  >> core code (IkiWiki, CGI, Render and the pseudo-core part of editpage)
++  >> and 5 in plugins, since I used it for things like redirection back
++  >> to the top of the wiki --[[smcv]]
+
+

+

+
+
diff --git a/doc/recentchanges/change_8de7fde49c295a6c9098767b9fdfea79de8476eb._change b/doc/recentchanges/change_8de7fde49c295a6c9098767b9fdfea79de8476eb._change
new file mode 100644
index 000000000..f89be517c
--- /dev/null
+++ b/doc/recentchanges/change_8de7fde49c295a6c9098767b9fdfea79de8476eb._change
@@ -0,0 +1,59 @@
+[[!meta author="""joey"""]]
+
+[[!meta authorurl="""http://ikiwiki.info/ikiwiki.cgi?page=users%2Fjoey&do=goto"""]]
+
+[[!meta title="""change to bugs/argument_isn__39__t_numeric:_mixing_templates_and_creation__95__date on ikiwiki"""]]
+
+[[!meta permalink="http://ikiwiki.info/recentchanges/#change-8de7fde49c295a6c9098767b9fdfea79de8476eb"]]
+
+

+
Changed pages:
+
+
+[[diff|wikiicons/diff.png]]bugs/argument isn't numeric: mixing templates and creation_date
+
+
+
+
Changed by:
+
+
+joey
+
+
+
Commit type:
+git
+
Date:
+13:24:50 11/16/10
+

+

+
+
+[[revert|wikiicons/revert.png]]
+
+
+

+
+
+already fixed

+
+
+

+
+

+
+diff --git a/doc/bugs/argument_isn__39__t_numeric:_mixing_templates_and_creation__95__date.mdwn b/doc/bugs/argument_isn__39__t_numeric:_mixing_templates_and_creation__95__date.mdwn
+index 8309389..b1053fc 100644
+--- a/doc/bugs/argument_isn__39__t_numeric:_mixing_templates_and_creation__95__date.mdwn
++++ b/doc/bugs/argument_isn__39__t_numeric:_mixing_templates_and_creation__95__date.mdwn
+@@ -55,3 +55,6 @@ I believed (until I tested) that the [[ikiwiki/directive/if]] directive, with th
+     """]]
+ 
+ However this doesn't work.  I assume "included" in this context means e.g. via an `inline` or `map`, not template trans-clusion. -- [[Jon]]
++
++> As far as I know, this bug was fixed in
++> 4a75dee651390b79ce4ceb1d951b02e28b3ce83a on October 20th. [[done]] --[[Joey]]
+
+

+

+
+
diff --git a/doc/recentchanges/change_9180381728e252cf474eb8a4b0460755b5c28340._change b/doc/recentchanges/change_9180381728e252cf474eb8a4b0460755b5c28340._change
new file mode 100644
index 000000000..617d642b9
--- /dev/null
+++ b/doc/recentchanges/change_9180381728e252cf474eb8a4b0460755b5c28340._change
@@ -0,0 +1,75 @@
+[[!meta author="""http://smcv.pseudorandom.co.uk/"""]]
+
+[[!meta authorurl="""http://smcv.pseudorandom.co.uk/"""]]
+
+[[!meta title="""change to todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both on ikiwiki"""]]
+
+[[!meta permalink="http://ikiwiki.info/recentchanges/#change-9180381728e252cf474eb8a4b0460755b5c28340"]]
+
+

+
Changed pages:
+
+
+[[diff|wikiicons/diff.png]]todo/want to avoid ikiwiki using http or https in urls to allow serving both
+
+
+
+
Changed by:
+
+
+smcv
+
+
+
Commit type:
+web
+
Date:
+23:50:29 11/23/10
+

+

+
+
+[[revert|wikiicons/revert.png]]
+
+
+

+
+
+tested and seems to work

+
+
+

+
+

+
+diff --git a/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn b/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn
+index 8b05010..264eb96 100644
+--- a/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn
++++ b/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn
+@@ -147,7 +147,7 @@ you don't like my approach:
+ 
+ ----
+ 
+-[[!template id=gitbranch branch=smcv/localurl author="[[smcv]]"]]
++[[!template id=gitbranch branch=smcv/ready/localurl author="[[smcv]]"]]
+ [[!tag patch]]
+ 
+ OK, here's an alternative approach, closer in spirit to what was initially
+@@ -171,10 +171,10 @@ support that.
+ fully relative nor fully absolute, and there doesn't seem to be a good name
+ for them...
+ 
+-I tested an earlier version on a demo website with the CGI enabled, and it seemed to
++I've tested this on a demo website with the CGI enabled, and it seemed to
+ work nicely (there might be bugs in some plugins, I didn't try all of them).
+-I haven't yet re-tested with my updated branch, which is why it's not `ready/`
+-yet.
++The branch at [[todo/use secure cookies for SSL logins]] goes well with
++this one.
+ 
+ The `$config{url}` and `$config{cgiurl}` are both HTTP, but if I enable
+ `httpauth`, set `cgiauthurl` to a HTTPS version of the same site and log
+
+

+

+
+
diff --git a/doc/recentchanges/change_93e15cc84f47a1340f8bd06d7056ba423fe510bb._change b/doc/recentchanges/change_93e15cc84f47a1340f8bd06d7056ba423fe510bb._change
new file mode 100644
index 000000000..2df071529
--- /dev/null
+++ b/doc/recentchanges/change_93e15cc84f47a1340f8bd06d7056ba423fe510bb._change
@@ -0,0 +1,60 @@
+[[!meta author="""http://smcv.pseudorandom.co.uk/"""]]
+
+[[!meta authorurl="""http://smcv.pseudorandom.co.uk/"""]]
+
+[[!meta title="""change to plugins/autoindex/discussion on ikiwiki"""]]
+
+[[!meta permalink="http://ikiwiki.info/recentchanges/#change-93e15cc84f47a1340f8bd06d7056ba423fe510bb"]]
+
+

+
Changed pages:
+
+
+[[diff|wikiicons/diff.png]]plugins/autoindex/discussion
+
+
+
+
Changed by:
+
+
+smcv
+
+
+
Commit type:
+web
+
Date:
+08:02:36 11/08/10
+

+

+
+
+[[revert|wikiicons/revert.png]]
+
+
+

+
+

+
+

+
+diff --git a/doc/plugins/autoindex/discussion.mdwn b/doc/plugins/autoindex/discussion.mdwn
+index a48fe9d..d8b9be6 100644
+--- a/doc/plugins/autoindex/discussion.mdwn
++++ b/doc/plugins/autoindex/discussion.mdwn
+@@ -1,6 +1,11 @@
+ Would it be possible to add an option to only generate the index files
+ for the html output and not place the markdown files in the wiki source?
+ 
++> Or better still, add a mechanism for ikiwiki to hold transient source
++> pages in memory and render them as if they existed, without actually
++> writing them out, as [[JoeRayhawk]] suggests below? I think
++> add_autofile would be the way to do this. --[[smcv]]
++
+ The reason being that I have a lot of directories which need to be autoindexed,
+ but I would prefer if the index files didn't clutter up my git repository.
+ 
+
+

+

+
+
diff --git a/doc/recentchanges/change_98d0883c8949e6cde8db019bb282d5fa815ffc1a._change b/doc/recentchanges/change_98d0883c8949e6cde8db019bb282d5fa815ffc1a._change
new file mode 100644
index 000000000..1ca5dd2b1
--- /dev/null
+++ b/doc/recentchanges/change_98d0883c8949e6cde8db019bb282d5fa815ffc1a._change
@@ -0,0 +1,137 @@
+[[!meta author="""http://smcv.pseudorandom.co.uk/"""]]
+
+[[!meta authorurl="""http://smcv.pseudorandom.co.uk/"""]]
+
+[[!meta title="""change to todo/Improving_the_efficiency_of_match__95__glob on ikiwiki"""]]
+
+[[!meta permalink="http://ikiwiki.info/recentchanges/#change-98d0883c8949e6cde8db019bb282d5fa815ffc1a"]]
+
+

+
Changed pages:
+
+
+[[diff|wikiicons/diff.png]]todo/Improving the efficiency of match_glob
+
+
+
+
Changed by:
+
+
+smcv
+
+
+
Commit type:
+web
+
Date:
+12:50:31 11/14/10
+

+

+
+
+[[revert|wikiicons/revert.png]]
+
+
+

+
+
+branches imported into git; benchmark results

+
+
+

+
+

+
+diff --git a/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn b/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn
+index ff9784d..c4d3a8e 100644
+--- a/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn
++++ b/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn
+@@ -15,6 +15,11 @@ Here's my patch - please consider it! -- [[KathrynAndersen]]
+ >>> rather than /$re/ so I think that would make sense.
+ >>> -- [[KathrynAndersen]]
+ 
++>>>> Git branch `smcv/ka-glob-cache` has Kathryn's patch. Git
++>>>> branch `smcv/memoize-glob2re` does as I suggested, which
++>>>> is less verbose than Kathryn's patch but also not as
++>>>> fast; I'm not sure why, tbh. --[[smcv]]
++
+ --------------------------------------------------------------
+ Benchmarks done with Devel::Profile on the same testbed IkiWiki setup.  I'm just showing the start of the profile output, since that's what's relevant.
+ 
+@@ -51,6 +56,72 @@ Note that the seconds per call for match_glob in the "after" case has gone down
+ K.A.
+ 
+ --------------------------------------------------------------
++
++A second set of benchmarks, done by rebuilding the docwiki at commit f942c2db05e4
++like so:
++
++    perl -Iblib/lib -d:Profile ikiwiki.in -setup docwiki.setup --no-verbose
++
++The docwiki appears to use fewer glob matches than Kathryn's wiki.
++
++With master:
++
++    time elapsed (wall):   29.6970
++    time running program:  24.6930  (83.15%)
++    time profiling (est.): 5.0041  (16.85%)
++    number of calls:       1359180
++    number of exceptions:  13
++
++    %Time    Sec.     #calls   sec/call  F  name
++    13.62    3.3629     3406   0.000987     Text::Balanced::_match_tagged
++    10.84    2.6773    79442   0.000034     IkiWiki::PageSpec::match_glob
++     3.08    0.7598    59454   0.000013     <anon>:IkiWiki/Plugin/inline.pm:223
++     3.07    0.7593    29830   0.000025     IkiWiki::bestlink
++     2.99    0.7378    10231   0.000072     IkiWiki::PageSpec::match_link
++
++With my `smcv/memoize-glob2re` branch:
++
++    time elapsed (wall):   30.4931
++    time running program:  25.1248  (82.39%)
++    time profiling (est.): 5.3683  (17.61%)
++    number of calls:       1439943
++    number of exceptions:  13
++
++    %Time    Sec.     #calls   sec/call  F  name
++    13.19    3.3146     3406   0.000973     Text::Balanced::_match_tagged
++     8.41    2.1123    79442   0.000027     IkiWiki::PageSpec::match_glob
++     3.97    0.9979    86905   0.000011     Memoize::_memoizer
++     3.05    0.7654    59454   0.000013     <anon>:IkiWiki/Plugin/inline.pm:223
++     3.02    0.7576    29830   0.000025     IkiWiki::bestlink
++
++and in a repeated run:
++
++     8.40    2.0905    79442   0.000026     IkiWiki::PageSpec::match_glob
++
++With Kathryn's patch as seen in my `smcv/ka-glob-cache` branch:
++
++    time elapsed (wall):   27.7567
++    time running program:  22.9941  (82.84%)
++    time profiling (est.): 4.7627  (17.16%)
++    number of calls:       1279946
++    number of exceptions:  13
++
++    %Time    Sec.     #calls   sec/call  F  name
++    14.29    3.2867     3406   0.000965     Text::Balanced::_match_tagged
++     7.89    1.8136    79442   0.000023     IkiWiki::PageSpec::match_glob
++     3.30    0.7577    59454   0.000013     <anon>:IkiWiki/Plugin/inline.pm:223
++     3.24    0.7461    29830   0.000025     IkiWiki::bestlink
++     3.19    0.7332      143   0.005127  ?  IkiWiki::pagespec_match_list
++
++and in a repeated run:
++
++     7.84    1.8253    79442   0.000023     IkiWiki::PageSpec::match_glob
++
++--[[smcv]]
++
++--------------------------------------------------------------
++
++
+ <pre>
+ diff --git a/IkiWiki.pm b/IkiWiki.pm
+ index 08a3d78..c187b98 100644
+
+

+

+
+
diff --git a/doc/recentchanges/change_99749dfdeac07b975cfba6eef617f3d7362eec73._change b/doc/recentchanges/change_99749dfdeac07b975cfba6eef617f3d7362eec73._change
new file mode 100644
index 000000000..71b01cedf
--- /dev/null
+++ b/doc/recentchanges/change_99749dfdeac07b975cfba6eef617f3d7362eec73._change
@@ -0,0 +1,61 @@
+[[!meta author="""https://www.google.com/accounts/o8/id?id=AItOawmE7z4CSv-ctBarutQCd70R3CcaSPPxjVk"""]]
+
+[[!meta authorurl="""https://www.google.com/accounts/o8/id?id=AItOawmE7z4CSv-ctBarutQCd70R3CcaSPPxjVk"""]]
+
+[[!meta title="""change to bugs/more_and_RSS_generation on ikiwiki"""]]
+
+[[!meta permalink="http://ikiwiki.info/recentchanges/#change-99749dfdeac07b975cfba6eef617f3d7362eec73"]]
+
+

+
Changed pages:
+
+
+[[diff|wikiicons/diff.png]]bugs/more and RSS generation
+
+
+
+
Changed by:
+
+
+Dave
+
+
+
Commit type:
+web
+
Date:
+10:28:04 10/28/10
+

+

+
+
+[[revert|wikiicons/revert.png]]
+
+
+

+
+
+more plugin and rss

+
+
+

+
+

+
+diff --git a/doc/bugs/more_and_RSS_generation.mdwn b/doc/bugs/more_and_RSS_generation.mdwn
+new file mode 100644
+index 0000000..72d636f
+--- /dev/null
++++ b/doc/bugs/more_and_RSS_generation.mdwn
+@@ -0,0 +1,7 @@
++I'd like the more plugin and RSS to play better together. In the case of the html generation of the main page of a blog, I'd like to get the first paragraph out, but keep RSS as a full feed.
++
++Maybe there is a different plugin (I also tried toggle)? 
++
++I also note, that at least currently, more seems to break on a few pages, not being parsed at all when aggregated into the front page. 
++
++see also: [[/bugs/rss_feeds_do_not_use_recommended_encoding_of_entities_for_some_fields/]]
+
+

+

+
+
diff --git a/doc/recentchanges/change_9a7387a53be2b1e182003f3e86cb76d7f10c4b67._change b/doc/recentchanges/change_9a7387a53be2b1e182003f3e86cb76d7f10c4b67._change
new file mode 100644
index 000000000..335d14a87
--- /dev/null
+++ b/doc/recentchanges/change_9a7387a53be2b1e182003f3e86cb76d7f10c4b67._change
@@ -0,0 +1,76 @@
+[[!meta author="""joey"""]]
+
+[[!meta authorurl="""http://ikiwiki.info/ikiwiki.cgi?page=users%2Fjoey&do=goto"""]]
+
+[[!meta title="""change to todo/Improving_the_efficiency_of_match__95__glob on ikiwiki"""]]
+
+[[!meta permalink="http://ikiwiki.info/recentchanges/#change-9a7387a53be2b1e182003f3e86cb76d7f10c4b67"]]
+
+

+
Changed pages:
+
+
+[[diff|wikiicons/diff.png]]todo/Improving the efficiency of match_glob
+
+
+
+
Changed by:
+
+
+joey
+
+
+
Commit type:
+git
+
Date:
+13:19:13 11/16/10
+

+

+
+
+[[revert|wikiicons/revert.png]]
+
+
+

+
+
+thoughts

+
+
+

+
+

+
+diff --git a/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn b/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn
+index 43571ea..0fc059a 100644
+--- a/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn
++++ b/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn
+@@ -22,6 +22,23 @@ Here's my patch - please consider it! -- [[KathrynAndersen]]
+ 
+ >>>>> I think it's because my patch focuses on match_glob while the memoize patch focuses on `glob2re`, and `glob2re` is called in `filecheck`, `meta` and `po` as well as in `match_glob` and `match_user`; thus the memoized `glob2re` is dealing with a bigger set of globs to look up, and thus could be just that little bit slower. -- [[KathrynAndersen]]
+ 
++>>>>>> What may be going on is that glob2re is already a fairly fast
++>>>>>> function, so the overhead of memoizing it with the very generic
++>>>>>> `_memoizer` (see its source) swamps the memoization gain. Note
++>>>>>> that the few functions memoized with the Memoizer before were much
++>>>>>> more expensive, so that little overhead was acceptable then.
++>>>>>>
++>>>>>> It also may be that Kathryn's patch is slightly faster due to using
++>>>>>> the construct `$foo =~ $regexp` rather than `$foo =~ /$regexp/`
++>>>>>> (probably avoids a copy or something like that internally) --
++>>>>>> this despite checking both `exists` and `defined` on the hash, which
++>>>>>> should be reundant AFAICS.
++>>>>>>
++>>>>>> My guess is that the best of both worlds would be to move
++>>>>>> the byhand memoization to glob2re and have it return a compiled
++>>>>>> `/^/i` regexp that can be used without further modifiction in most
++>>>>>> cases. --[[Joey]] 
++
+ --------------------------------------------------------------
+ Benchmarks done with Devel::Profile on the same testbed IkiWiki setup.  I'm just showing the start of the profile output, since that's what's relevant.
+ 
+
+

+

+
+
diff --git a/doc/recentchanges/change_9b01c9779ef682af0874efc062d9fb2e91676c23._change b/doc/recentchanges/change_9b01c9779ef682af0874efc062d9fb2e91676c23._change
new file mode 100644
index 000000000..db8fdff3e
--- /dev/null
+++ b/doc/recentchanges/change_9b01c9779ef682af0874efc062d9fb2e91676c23._change
@@ -0,0 +1,66 @@
+[[!meta author="""http://smcv.pseudorandom.co.uk/"""]]
+
+[[!meta authorurl="""http://smcv.pseudorandom.co.uk/"""]]
+
+[[!meta title="""change to forum/Need_something_more_powerful_than_Exclude/comment_2_0019cd6b34c8d8678b2532de57a92d15 on ikiwiki"""]]
+
+[[!meta permalink="http://ikiwiki.info/recentchanges/#change-9b01c9779ef682af0874efc062d9fb2e91676c23"]]
+
+

+
Changed pages:
+
+
+[[diff|wikiicons/diff.png]]forum/Need something more powerful than Exclude/comment 2 0019cd6b34c8d8678b2532de57a92d15
+
+
+
+
Changed by:
+
+
+smcv
+
+
+
Commit type:
+web
+
Date:
+10:43:21 11/23/10
+

+

+
+
+[[revert|wikiicons/revert.png]]
+
+
+

+
+
+Added a comment: expression anchored too closely?

+
+
+

+
+

+
+diff --git a/doc/forum/Need_something_more_powerful_than_Exclude/comment_2_0019cd6b34c8d8678b2532de57a92d15._comment b/doc/forum/Need_something_more_powerful_than_Exclude/comment_2_0019cd6b34c8d8678b2532de57a92d15._comment
+new file mode 100644
+index 0000000..7842cae
+--- /dev/null
++++ b/doc/forum/Need_something_more_powerful_than_Exclude/comment_2_0019cd6b34c8d8678b2532de57a92d15._comment
+@@ -0,0 +1,12 @@
++[[!comment format=mdwn
++ username="http://smcv.pseudorandom.co.uk/"
++ nickname="smcv"
++ subject="expression anchored too closely?"
++ date="2010-11-23T10:43:21Z"
++ content="""
++It looks as though you might only be excluding a top-level Makefile, and not a Makefile in subdirectories. Try excluding `(^|/)Makefile$` instead, for instance? (See `wiki_file_prune_regexps` in `IkiWiki.pm` for hints.)
++
++The match operation in `&file_pruned` ends up a bit like this:
++
++    \"foo/Makefile\" =~ m{…|…|…|(^|/)Makefile$}
++"""]]
+
+

+

+
+
diff --git a/doc/recentchanges/change_9c42f5786601429a0b921d6591ebf5e4c1eb4da8._change b/doc/recentchanges/change_9c42f5786601429a0b921d6591ebf5e4c1eb4da8._change
new file mode 100644
index 000000000..f235de4ed
--- /dev/null
+++ b/doc/recentchanges/change_9c42f5786601429a0b921d6591ebf5e4c1eb4da8._change
@@ -0,0 +1,70 @@
+[[!meta author="""http://smcv.pseudorandom.co.uk/"""]]
+
+[[!meta authorurl="""http://smcv.pseudorandom.co.uk/"""]]
+
+[[!meta title="""change to plugins/autoindex/discussion on ikiwiki"""]]
+
+[[!meta permalink="http://ikiwiki.info/recentchanges/#change-9c42f5786601429a0b921d6591ebf5e4c1eb4da8"]]
+
+

+
Changed pages:
+
+
+[[diff|wikiicons/diff.png]]plugins/autoindex/discussion
+
+
+
+
Changed by:
+
+
+smcv
+
+
+
Commit type:
+web
+
Date:
+08:17:07 11/08/10
+

+

+
+
+[[revert|wikiicons/revert.png]]
+
+
+

+
+
+put the problematic patch in a toggleable to make discussion more visible

+
+
+

+
+

+
+diff --git a/doc/plugins/autoindex/discussion.mdwn b/doc/plugins/autoindex/discussion.mdwn
+index b09481c..6b13d23 100644
+--- a/doc/plugins/autoindex/discussion.mdwn
++++ b/doc/plugins/autoindex/discussion.mdwn
+@@ -22,6 +22,8 @@ If you just don't want to clutter your git repo, below it's a patch does the fol
+ 
+ * If you set autoindex_commit to 1 (this is the default), auto-generated index files will be put in the repo provided you enabled rcs backend.
+ 
++[[!toggle id="patch-for-autoindex_commit" text="patch for autoindex_commit"]]
++[[!toggleable id="patch-for-autoindex_commit" text="""
+ <pre>
+ --- autoindex.pm.orig	2009-10-01 17:13:51.000000000 +0800
+ +++ autoindex.pm	2009-10-01 17:21:09.000000000 +0800
+@@ -65,7 +67,7 @@ If you just don't want to clutter your git repo, below it's a patch does the fol
+  				gettext("automatic index generation"),
+  				undef, undef);
+ </pre>
+-
++"""]]
+  
+ Warning:  I guess this patch may work, but I *haven't tested it yet*.  -- [[weakish]]
+ 
+
+

+

+
+
diff --git a/doc/recentchanges/change_9c8f86ee9c59035c9462d2c69c7b89d0c9dbc3c2._change b/doc/recentchanges/change_9c8f86ee9c59035c9462d2c69c7b89d0c9dbc3c2._change
new file mode 100644
index 000000000..44bac63c5
--- /dev/null
+++ b/doc/recentchanges/change_9c8f86ee9c59035c9462d2c69c7b89d0c9dbc3c2._change
@@ -0,0 +1,58 @@
+[[!meta author="""134.100.5.65"""]]
+
+[[!meta authorurl="""http://ikiwiki.info/ikiwiki.cgi?page=users%2F134.100.5.65&do=goto"""]]
+
+[[!meta title="""change to news/openid on ikiwiki"""]]
+
+[[!meta permalink="http://ikiwiki.info/recentchanges/#change-9c8f86ee9c59035c9462d2c69c7b89d0c9dbc3c2"]]
+
+

+
Changed pages:
+
+
+[[diff|wikiicons/diff.png]]news/openid
+
+
+
+
Changed by:
+
+
+134.100.5.65
+
+
+
Commit type:
+web
+
Date:
+16:05:26 11/09/10
+

+

+
+
+[[revert|wikiicons/revert.png]]
+
+
+

+
+
+poll vote (Accept both)

+
+
+

+
+

+
+diff --git a/doc/news/openid.mdwn b/doc/news/openid.mdwn
+index 02f7afb..5b145fe 100644
+--- a/doc/news/openid.mdwn
++++ b/doc/news/openid.mdwn
+@@ -10,4 +10,4 @@ log back in, try out the OpenID signup process if you don't already have an
+ OpenID, and see how OpenID works for you. And let me know your feelings about
+ making such a switch. --[[Joey]]
+ 
+-[[!poll 67 "Accept only OpenID for logins" 21 "Accept only password logins" 39 "Accept both"]]
++[[!poll 67 "Accept only OpenID for logins" 21 "Accept only password logins" 40 "Accept both"]]
+
+

+

+
+
diff --git a/doc/recentchanges/change_9d0ac3170a8f90d2139ef75698e8af21a6435fb4._change b/doc/recentchanges/change_9d0ac3170a8f90d2139ef75698e8af21a6435fb4._change
new file mode 100644
index 000000000..e65592910
--- /dev/null
+++ b/doc/recentchanges/change_9d0ac3170a8f90d2139ef75698e8af21a6435fb4._change
@@ -0,0 +1,58 @@
+[[!meta author="""http://jmtd.livejournal.com/"""]]
+
+[[!meta authorurl="""http://jmtd.livejournal.com/"""]]
+
+[[!meta title="""change to bugs/argument_isn__39__t_numeric:_mixing_templates_and_creation__95__date on ikiwiki"""]]
+
+[[!meta permalink="http://ikiwiki.info/recentchanges/#change-9d0ac3170a8f90d2139ef75698e8af21a6435fb4"]]
+
+

+
Changed pages:
+
+
+[[diff|wikiicons/diff.png]]bugs/argument isn't numeric: mixing templates and creation_date
+
+
+
+
Changed by:
+
+
+jmtd [livejournal.com]
+
+
+
Commit type:
+web
+
Date:
+10:28:50 11/15/10
+

+

+
+
+[[revert|wikiicons/revert.png]]
+
+
+

+
+
+done with commit da9e1ea667f82d5fca916

+
+
+

+
+

+
+diff --git a/doc/bugs/argument_isn__39__t_numeric:_mixing_templates_and_creation__95__date.mdwn b/doc/bugs/argument_isn__39__t_numeric:_mixing_templates_and_creation__95__date.mdwn
+index 70af505..5485bba 100644
+--- a/doc/bugs/argument_isn__39__t_numeric:_mixing_templates_and_creation__95__date.mdwn
++++ b/doc/bugs/argument_isn__39__t_numeric:_mixing_templates_and_creation__95__date.mdwn
+@@ -56,3 +56,5 @@ An alternative fix is to wrap the entire template inside a test to see whether t
+     """]]
+ 
+ In fact, this is probably best practice for in-srcdir templates.  I'd consider this done if the documentation for the directive suggested it. -- [[Jon]]
++
++> [[done]] with <http://git.ikiwiki.info/?p=ikiwiki;a=commitdiff;h=da9e1ea667f82d5fca9168dbed19be08040570ff> -- [[Jon]]
+
+

+

+
+
diff --git a/doc/recentchanges/change_9d26a72468fad69d633875b4ffb4aff8abd80023._change b/doc/recentchanges/change_9d26a72468fad69d633875b4ffb4aff8abd80023._change
new file mode 100644
index 000000000..c53b0bfea
--- /dev/null
+++ b/doc/recentchanges/change_9d26a72468fad69d633875b4ffb4aff8abd80023._change
@@ -0,0 +1,105 @@
+[[!meta author="""smcv"""]]
+
+[[!meta authorurl="""http://ikiwiki.info/ikiwiki.cgi?page=users%2Fsmcv&do=goto"""]]
+
+[[!meta title="""change to todo/auto-create_tag_pages_according_to_a_template todo/autoindex_should_use_add__95__autofile todo/transient_in-memory_pages on ikiwiki"""]]
+
+[[!meta permalink="http://ikiwiki.info/recentchanges/#change-9d26a72468fad69d633875b4ffb4aff8abd80023"]]
+
+
+
+
+[[revert|wikiicons/revert.png]]
+
+
+

+
+
+point to my 'transient' branch

+
+
+

+
+

+
+diff --git a/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn b/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
+index 676e2bc..e065c4a 100644
+--- a/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
++++ b/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
+@@ -262,4 +262,6 @@ other pages claim it as an alias. --[[chrysn]]
+ 
+ I agree with [[chrysn]]. In fact, is there any good reason that the core tag plugin doesn't do this? The current usability is horrible, to the point that I have gone 2.5 years with Ikiwiki and haven't yet started using tags. -- [[Eric|http://wiki.pdxhub.org/people/eric]]
+ 
++> See [[todo/transient in-memory pages]] for progress on this. --[[smcv]]
++
+ [[!tag done]]
+diff --git a/doc/todo/autoindex_should_use_add__95__autofile.mdwn b/doc/todo/autoindex_should_use_add__95__autofile.mdwn
+index 517567e..64f81c8 100644
+--- a/doc/todo/autoindex_should_use_add__95__autofile.mdwn
++++ b/doc/todo/autoindex_should_use_add__95__autofile.mdwn
+@@ -1,2 +1,4 @@
+ `add_autofile` is a generic version of [[plugins/autoindex]]'s code,
+ so the latter should probably use the former. --[[smcv]]
++
++> See [[todo/transient in-memory pages]] for progress on this. --[[smcv]]
+diff --git a/doc/todo/transient_in-memory_pages.mdwn b/doc/todo/transient_in-memory_pages.mdwn
+index 9808ffd..5dbbe4f 100644
+--- a/doc/todo/transient_in-memory_pages.mdwn
++++ b/doc/todo/transient_in-memory_pages.mdwn
+@@ -18,3 +18,26 @@ This would also be useful for autoindex, as suggested on
+ One refinement I'd suggest is that if the transient page is edited,
+ its transient contents are evaluated and used as the initial
+ content for the edit box; after that, it'd become a static page. --[[smcv]]
++
++--------------------------
++
++[[!template id=gitbranch branch=smcv/transient author="[[smcv]]"]]
++[[!tag patch]]
++
++I had a look at implementing this. It turns out to be harder than I thought
++to have purely in-memory pages (several plugins want to be able to access the
++source file as a file), but I did get this proof-of-concept branch
++to write tag and autoindex pages into an underlay.
++
++This loses the ability to delete the auto-created pages (although they don't
++clutter up git this way, at least), and a lot of the code in autoindex is
++probably now redundant, so this is probably not quite ready for merge, but
++I'd welcome opinions.
++
++Usage: set `tag_underlay` and/or `autoindex_underlay` to an absolute path,
++which you must create beforehand. I suggest *srcdir* + `/.ikiwiki/transient`.
++
++Refinements that could be made if this approach seems reasonable:
++
++* make these options boolean, and have the path always be `.ikiwiki/transient`
++* improve the `remove` plugin so it also deletes from this special underlay
+
+

+

+
+
diff --git a/doc/recentchanges/change_9f8cfe998e5ced7e4b2e1dd819a025b0745935ff._change b/doc/recentchanges/change_9f8cfe998e5ced7e4b2e1dd819a025b0745935ff._change
new file mode 100644
index 000000000..14b34496c
--- /dev/null
+++ b/doc/recentchanges/change_9f8cfe998e5ced7e4b2e1dd819a025b0745935ff._change
@@ -0,0 +1,59 @@
+[[!meta author="""joey"""]]
+
+[[!meta authorurl="""http://ikiwiki.info/ikiwiki.cgi?page=users%2Fjoey&do=goto"""]]
+
+[[!meta title="""change to tips/nearlyfreespeech/discussion on ikiwiki"""]]
+
+[[!meta permalink="http://ikiwiki.info/recentchanges/#change-9f8cfe998e5ced7e4b2e1dd819a025b0745935ff"]]
+
+

+
Changed pages:
+
+
+[[diff|wikiicons/diff.png]]tips/nearlyfreespeech/discussion
+
+
+
+
Changed by:
+
+
+joey
+
+
+
Commit type:
+git
+
Date:
+18:57:10 11/20/10
+

+

+
+
+[[revert|wikiicons/revert.png]]
+
+
+

+
+
+response

+
+
+

+
+

+
+diff --git a/doc/tips/nearlyfreespeech/discussion.mdwn b/doc/tips/nearlyfreespeech/discussion.mdwn
+index 73da608..0d1f1f0 100644
+--- a/doc/tips/nearlyfreespeech/discussion.mdwn
++++ b/doc/tips/nearlyfreespeech/discussion.mdwn
+@@ -15,3 +15,6 @@ Hi!<br />
+ How can i upgrade my nearlyfreespeech installation of ikiwiki? To install it i have followed your instructions here.<br>
+ But now if I want to upgrade it to a newer version?<br />
+ Thanks for your incredible work!
++
++> You can move `~/ikiwiki` out of the way and then re-download and install
++> it ikiwiki. --[[Joey]]
+
+

+

+
+
diff --git a/doc/recentchanges/change_a194fbc5bced565fa751008b8ada666c411d097d._change b/doc/recentchanges/change_a194fbc5bced565fa751008b8ada666c411d097d._change
new file mode 100644
index 000000000..0ea9a66ce
--- /dev/null
+++ b/doc/recentchanges/change_a194fbc5bced565fa751008b8ada666c411d097d._change
@@ -0,0 +1,60 @@
+[[!meta author="""http://lovesgoodfood.com/jason/"""]]
+
+[[!meta authorurl="""http://lovesgoodfood.com/jason/"""]]
+
+[[!meta title="""change to ikiwikiusers on ikiwiki"""]]
+
+[[!meta permalink="http://ikiwiki.info/recentchanges/#change-a194fbc5bced565fa751008b8ada666c411d097d"]]
+
+

+
Changed pages:
+
+
+[[diff|wikiicons/diff.png]]ikiwikiusers
+
+
+
+
Changed by:
+
+
+Jason_Riedy
+
+
+
Commit type:
+web
+
Date:
+17:12:48 11/03/10
+

+

+
+
+[[revert|wikiicons/revert.png]]
+
+
+

+
+
+Add myself.

+
+
+

+
+

+
+diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn
+index 54fa1d5..d8e55ba 100644
+--- a/doc/ikiwikiusers.mdwn
++++ b/doc/ikiwikiusers.mdwn
+@@ -160,6 +160,7 @@ Personal sites and blogs
+ * [Thomas Kane](http://planetkane.org/)
+ * [Marco Silva](http://marcot.eti.br/) a weblog + wiki using the [darcs](http://darcs.net) backend
+ * [NeX-6](http://nex-6.taht.net/) ikiwiki blog and wiki running over ipv6
++* [Jason Riedy](http://lovesgoodfood.com/jason/), which may occasionally look funny if I'm playing with my branch...
+ 
+ Please feel free to add your own ikiwiki site!
+ 
+
+

+

+
+
diff --git a/doc/recentchanges/change_a2a1d2b2d96ede3f6a25d2d0fb89681ec5e05ff3._change b/doc/recentchanges/change_a2a1d2b2d96ede3f6a25d2d0fb89681ec5e05ff3._change
new file mode 100644
index 000000000..bfbbc74f9
--- /dev/null
+++ b/doc/recentchanges/change_a2a1d2b2d96ede3f6a25d2d0fb89681ec5e05ff3._change
@@ -0,0 +1,62 @@
+[[!meta author="""https://www.google.com/accounts/o8/id?id=AItOawmwYptyV5ptNt8LCbMYsmpcNkk9_DRt-EY"""]]
+
+[[!meta authorurl="""https://www.google.com/accounts/o8/id?id=AItOawmwYptyV5ptNt8LCbMYsmpcNkk9_DRt-EY"""]]
+
+[[!meta title="""change to forum/Blog_posting_times_and_ikiwiki_state/comment_1_87304dfa2caea7e526cdb04917524e8c on ikiwiki"""]]
+
+[[!meta permalink="http://ikiwiki.info/recentchanges/#change-a2a1d2b2d96ede3f6a25d2d0fb89681ec5e05ff3"]]
+
+

+
Changed pages:
+
+
+[[diff|wikiicons/diff.png]]forum/Blog posting times and ikiwiki state/comment 1 87304dfa2caea7e526cdb04917524e8c
+
+
+
+
Changed by:
+
+
+Matt
+
+
+
Commit type:
+web
+
Date:
+07:52:53 11/04/10
+

+

+
+
+[[revert|wikiicons/revert.png]]
+
+
+

+
+
+Added a comment

+
+
+

+
+

+
+diff --git a/doc/forum/Blog_posting_times_and_ikiwiki_state/comment_1_87304dfa2caea7e526cdb04917524e8c._comment b/doc/forum/Blog_posting_times_and_ikiwiki_state/comment_1_87304dfa2caea7e526cdb04917524e8c._comment
+new file mode 100644
+index 0000000..62bae02
+--- /dev/null
++++ b/doc/forum/Blog_posting_times_and_ikiwiki_state/comment_1_87304dfa2caea7e526cdb04917524e8c._comment
+@@ -0,0 +1,8 @@
++[[!comment format=mdwn
++ username="https://www.google.com/accounts/o8/id?id=AItOawmwYptyV5ptNt8LCbMYsmpcNkk9_DRt-EY"
++ nickname="Matt"
++ subject="comment 1"
++ date="2010-11-04T11:52:53Z"
++ content="""
++Perhaps I have a different setup from you but on my laptop I don't have ikiwiki installed - only a clone of the git repo.  You mean to run --gettime on the post-update git hook?
++"""]]
+
+

+

+
+
diff --git a/doc/recentchanges/change_a4cb86d73327e7850eeb524ef387b17ac5e1614d._change b/doc/recentchanges/change_a4cb86d73327e7850eeb524ef387b17ac5e1614d._change
new file mode 100644
index 000000000..eab83ca54
--- /dev/null
+++ b/doc/recentchanges/change_a4cb86d73327e7850eeb524ef387b17ac5e1614d._change
@@ -0,0 +1,59 @@
+[[!meta author="""joey"""]]
+
+[[!meta authorurl="""http://ikiwiki.info/ikiwiki.cgi?page=users%2Fjoey&do=goto"""]]
+
+[[!meta title="""change to bugs/aggregate_generates_long_filenames on ikiwiki"""]]
+
+[[!meta permalink="http://ikiwiki.info/recentchanges/#change-a4cb86d73327e7850eeb524ef387b17ac5e1614d"]]
+
+

+
Changed pages:
+
+
+[[diff|wikiicons/diff.png]]bugs/aggregate generates long filenames
+
+
+
+
Changed by:
+
+
+joey
+
+
+
Commit type:
+git
+
Date:
+17:20:29 11/17/10
+

+

+
+
+[[revert|wikiicons/revert.png]]
+
+
+

+
+
+response

+
+
+

+
+

+
+diff --git a/doc/bugs/aggregate_generates_long_filenames.mdwn b/doc/bugs/aggregate_generates_long_filenames.mdwn
+index 33e7b74..fae8333 100644
+--- a/doc/bugs/aggregate_generates_long_filenames.mdwn
++++ b/doc/bugs/aggregate_generates_long_filenames.mdwn
+@@ -32,3 +32,6 @@ It would also appear this abrubtly terminates aggregate processing (if not ikiwi
+ >> I don't fully grok the aggregate source yet, but I wouldn't rule out
+ >> a bug in the path length checking, personally.  I'm happy to try and
+ >> find it myself though :) -- [[Jon]]
++
++>>> Path length seems unlikely, since the max is 4096 there.
++>>> --[[Joey]] 
+
+

+

+
+
diff --git a/doc/recentchanges/change_a6c3d71787c528888c3f66c7ded8dd0c8f430b7e._change b/doc/recentchanges/change_a6c3d71787c528888c3f66c7ded8dd0c8f430b7e._change
new file mode 100644
index 000000000..61a399c0a
--- /dev/null
+++ b/doc/recentchanges/change_a6c3d71787c528888c3f66c7ded8dd0c8f430b7e._change
@@ -0,0 +1,57 @@
+[[!meta author="""http://slowdog.myopenid.com/"""]]
+
+[[!meta authorurl="""http://slowdog.myopenid.com/"""]]
+
+[[!meta title="""change to index on ikiwiki"""]]
+
+[[!meta permalink="http://ikiwiki.info/recentchanges/#change-a6c3d71787c528888c3f66c7ded8dd0c8f430b7e"]]
+
+

+
Changed pages:
+
+
+[[diff|wikiicons/diff.png]]index
+
+
+
+
Changed by:
+
+
+slowdog [myopenid.com]
+
+
+
Commit type:
+web
+
Date:
+19:38:10 11/21/10
+

+

+
+
+[[revert|wikiicons/revert.png]]
+
+
+

+
+

+
+

+
+diff --git a/doc/index.mdwn b/doc/index.mdwn
+index 90713d1..06acc9c 100644
+--- a/doc/index.mdwn
++++ b/doc/index.mdwn
+@@ -17,7 +17,7 @@ All wikis are supposed to have a [[SandBox]], so this one does too.
+ This site generally runs the latest release of ikiwiki; currently, it runs
+ ikiwiki [[!version ]].
+ 
+-## developer resources sas
++## developer resources
+ 
+ The [[RoadMap]] describes where the project is going.
+ The [[forum]] is open for discussions.
+
+

+

+
+
diff --git a/doc/recentchanges/change_ab96249d5ad8f3ee9275be3fef9e3467b8f3ffdf._change b/doc/recentchanges/change_ab96249d5ad8f3ee9275be3fef9e3467b8f3ffdf._change
new file mode 100644
index 000000000..a9c8f9653
--- /dev/null
+++ b/doc/recentchanges/change_ab96249d5ad8f3ee9275be3fef9e3467b8f3ffdf._change
@@ -0,0 +1,64 @@
+[[!meta author="""http://kerravonsen.dreamwidth.org/"""]]
+
+[[!meta authorurl="""http://kerravonsen.dreamwidth.org/"""]]
+
+[[!meta title="""change to todo/transient_in-memory_pages on ikiwiki"""]]
+
+[[!meta permalink="http://ikiwiki.info/recentchanges/#change-ab96249d5ad8f3ee9275be3fef9e3467b8f3ffdf"]]
+
+

+
Changed pages:
+
+
+[[diff|wikiicons/diff.png]]todo/transient in-memory pages
+
+
+
+
Changed by:
+
+
+kerravonsen [dreamwidth.org]
+
+
+
Commit type:
+web
+
Date:
+19:23:08 11/15/10
+

+

+
+
+[[revert|wikiicons/revert.png]]
+
+
+

+
+
+further thoughts

+
+
+

+
+

+
+diff --git a/doc/todo/transient_in-memory_pages.mdwn b/doc/todo/transient_in-memory_pages.mdwn
+index edf056e..9c1be73 100644
+--- a/doc/todo/transient_in-memory_pages.mdwn
++++ b/doc/todo/transient_in-memory_pages.mdwn
+@@ -64,3 +64,11 @@ Refinements that could be made if this approach seems reasonable:
+ >>>
+ >>> Do you think this approach has enough potential that I should
+ >>> continue to hack on it? Any thoughts on the implementation? --[[smcv]]
++
++>>>> Ah, now I understand what you're getting at. Yes, it makes sense to put transient pages under `.ikiwiki`.
++>>>> I haven't looked at the code, but I'd be interested in seeing whether it's generic enough to be used by other plugins (such as `album`) without too much fuss.
++>>>> The idea of a transient underlay gives us a desirable feature for free: that if someone edits the transient page, it is made permanent and added to the repository.
++>>>>
++>>>> I think the tricky thing with removing these transient underlay pages is the question of how to prevent whatever auto-generated the pages in the first place from generating them again - or, conversely, how to force whatever auto-generated those pages to regenerate them if you've changed your mind.
++>>>> I think you'd need something similar to `will_render` so that transient pages would be automatically removed if whatever auto-generated them is no longer around.
++>>>> -- [[KathrynAndersen]]
+
+

+

+
+
diff --git a/doc/recentchanges/change_af0bfcc07820008f0387bfd1b35a594ed40a0246._change b/doc/recentchanges/change_af0bfcc07820008f0387bfd1b35a594ed40a0246._change
new file mode 100644
index 000000000..d66b4872d
--- /dev/null
+++ b/doc/recentchanges/change_af0bfcc07820008f0387bfd1b35a594ed40a0246._change
@@ -0,0 +1,57 @@
+[[!meta author="""http://pmate.myopenid.com/"""]]
+
+[[!meta authorurl="""http://pmate.myopenid.com/"""]]
+
+[[!meta title="""change to tips/nearlyfreespeech/discussion on ikiwiki"""]]
+
+[[!meta permalink="http://ikiwiki.info/recentchanges/#change-af0bfcc07820008f0387bfd1b35a594ed40a0246"]]
+
+

+
Changed pages:
+
+
+[[diff|wikiicons/diff.png]]tips/nearlyfreespeech/discussion
+
+
+
+
Changed by:
+
+
+pmate [myopenid.com]
+
+
+
Commit type:
+web
+
Date:
+17:56:35 11/20/10
+

+

+
+
+[[revert|wikiicons/revert.png]]
+
+
+

+
+

+
+

+
+diff --git a/doc/tips/nearlyfreespeech/discussion.mdwn b/doc/tips/nearlyfreespeech/discussion.mdwn
+index a003760..daebee2 100644
+--- a/doc/tips/nearlyfreespeech/discussion.mdwn
++++ b/doc/tips/nearlyfreespeech/discussion.mdwn
+@@ -9,3 +9,8 @@ BEGIN failed--compilation aborted at (eval 19) line 2.
+ perl is 5.8.9
+ 
+ > This is fixed in 3.1415926. --[[Joey]] 
++
++Hi!
++How can i upgrade my nearlyfreespeech installation of ikiwiki? To install it i have followed your instructions here.
++But now if I want to upgrade it to a newer version?
++Thanks for your incredible work!
+
+

+

+
+
diff --git a/doc/recentchanges/change_af75602391ac9651e7594c65588da86d591f2c01._change b/doc/recentchanges/change_af75602391ac9651e7594c65588da86d591f2c01._change
new file mode 100644
index 000000000..34bad8586
--- /dev/null
+++ b/doc/recentchanges/change_af75602391ac9651e7594c65588da86d591f2c01._change
@@ -0,0 +1,51 @@
+[[!meta author="""https://www.google.com/accounts/o8/id?id=AItOawna2L5uKII-LuYyGFfQ_1VRGHbID0xYPYc"""]]
+
+[[!meta authorurl="""https://www.google.com/accounts/o8/id?id=AItOawna2L5uKII-LuYyGFfQ_1VRGHbID0xYPYc"""]]
+
+[[!meta title="""change to sandbox/Mooooo on ikiwiki"""]]
+
+[[!meta permalink="http://ikiwiki.info/recentchanges/#change-af75602391ac9651e7594c65588da86d591f2c01"]]
+
+

+
Changed pages:
+
+
+[[diff|wikiicons/diff.png]]sandbox/Mooooo
+
+
+
+
Changed by:
+
+
+Andrew
+
+
+
Commit type:
+web
+
Date:
+09:31:35 11/08/10
+

+

+
+
+[[revert|wikiicons/revert.png]]
+
+
+

+
+

+
+

+
+diff --git a/doc/sandbox/Mooooo.mdwn b/doc/sandbox/Mooooo.mdwn
+new file mode 100644
+index 0000000..6f11d35
+--- /dev/null
++++ b/doc/sandbox/Mooooo.mdwn
+@@ -0,0 +1 @@
++Hrm.
+
+

+

+
+
diff --git a/doc/recentchanges/change_b62581583107f6fc3e9bccf66a87a491c236757f._change b/doc/recentchanges/change_b62581583107f6fc3e9bccf66a87a491c236757f._change
new file mode 100644
index 000000000..9cd21da53
--- /dev/null
+++ b/doc/recentchanges/change_b62581583107f6fc3e9bccf66a87a491c236757f._change
@@ -0,0 +1,51 @@
+[[!meta author="""https://www.google.com/accounts/o8/id?id=AItOawmrVK0l7LGe93rzchPlVg7bukNgTsqTbn8"""]]
+
+[[!meta authorurl="""https://www.google.com/accounts/o8/id?id=AItOawmrVK0l7LGe93rzchPlVg7bukNgTsqTbn8"""]]
+
+[[!meta title="""change to forum/ikiwiki_+_mathjax on ikiwiki"""]]
+
+[[!meta permalink="http://ikiwiki.info/recentchanges/#change-b62581583107f6fc3e9bccf66a87a491c236757f"]]
+
+

+
Changed pages:
+
+
+[[diff|wikiicons/diff.png]]forum/ikiwiki + mathjax
+
+
+
+
Changed by:
+
+
+micheal
+
+
+
Commit type:
+web
+
Date:
+16:26:45 10/30/10
+

+

+
+
+[[revert|wikiicons/revert.png]]
+
+
+

+
+

+
+

+
+diff --git a/doc/forum/ikiwiki_+_mathjax.mdwn b/doc/forum/ikiwiki_+_mathjax.mdwn
+new file mode 100644
+index 0000000..1279a2c
+--- /dev/null
++++ b/doc/forum/ikiwiki_+_mathjax.mdwn
+@@ -0,0 +1 @@
++Is it possible to use [mathjax](http://www.mathjax.org/) in ikiwiki to typeset math formulas? If so, is this compatible with the [wmd](http://ikiwiki.info/plugins/wmd/) plugin?
+
+

+

+
+
diff --git a/doc/recentchanges/change_c02f9d224cb78a3ad880cb749ef4a11eadfad79a._change b/doc/recentchanges/change_c02f9d224cb78a3ad880cb749ef4a11eadfad79a._change
new file mode 100644
index 000000000..e22162fac
--- /dev/null
+++ b/doc/recentchanges/change_c02f9d224cb78a3ad880cb749ef4a11eadfad79a._change
@@ -0,0 +1,58 @@
+[[!meta author="""jmtd"""]]
+
+[[!meta authorurl="""http://ikiwiki.info/ikiwiki.cgi?page=users%2Fjmtd&do=goto"""]]
+
+[[!meta title="""change to bugs/argument_isn__39__t_numeric:_mixing_templates_and_creation__95__date on ikiwiki"""]]
+
+[[!meta permalink="http://ikiwiki.info/recentchanges/#change-c02f9d224cb78a3ad880cb749ef4a11eadfad79a"]]
+
+

+
Changed pages:
+
+
+[[diff|wikiicons/diff.png]]bugs/argument isn't numeric: mixing templates and creation_date
+
+
+
+
Changed by:
+
+
+jmtd
+
+
+
Commit type:
+git
+
Date:
+10:13:32 11/17/10
+

+

+
+
+[[revert|wikiicons/revert.png]]
+
+
+

+
+
+sorry, I'll try against master in future.

+
+
+

+
+

+
+diff --git a/doc/bugs/argument_isn__39__t_numeric:_mixing_templates_and_creation__95__date.mdwn b/doc/bugs/argument_isn__39__t_numeric:_mixing_templates_and_creation__95__date.mdwn
+index b1053fc..ff98ba5 100644
+--- a/doc/bugs/argument_isn__39__t_numeric:_mixing_templates_and_creation__95__date.mdwn
++++ b/doc/bugs/argument_isn__39__t_numeric:_mixing_templates_and_creation__95__date.mdwn
+@@ -58,3 +58,5 @@ However this doesn't work.  I assume "included" in this context means e.g. via a
+ 
+ > As far as I know, this bug was fixed in
+ > 4a75dee651390b79ce4ceb1d951b02e28b3ce83a on October 20th. [[done]] --[[Joey]]
++
++>> Sorry Joey, I'll make sure to reproduce stuff against master in future. [[Jon]]
+
+

+

+
+
diff --git a/doc/recentchanges/change_c1f3129583ae4a1e3e9ace89ba11c8bf6c308be3._change b/doc/recentchanges/change_c1f3129583ae4a1e3e9ace89ba11c8bf6c308be3._change
new file mode 100644
index 000000000..340fc6c39
--- /dev/null
+++ b/doc/recentchanges/change_c1f3129583ae4a1e3e9ace89ba11c8bf6c308be3._change
@@ -0,0 +1,60 @@
+[[!meta author="""http://pmate.myopenid.com/"""]]
+
+[[!meta authorurl="""http://pmate.myopenid.com/"""]]
+
+[[!meta title="""change to tips/nearlyfreespeech/discussion on ikiwiki"""]]
+
+[[!meta permalink="http://ikiwiki.info/recentchanges/#change-c1f3129583ae4a1e3e9ace89ba11c8bf6c308be3"]]
+
+

+
Changed pages:
+
+
+[[diff|wikiicons/diff.png]]tips/nearlyfreespeech/discussion
+
+
+
+
Changed by:
+
+
+pmate [myopenid.com]
+
+
+
Commit type:
+web
+
Date:
+17:57:56 11/20/10
+

+

+
+
+[[revert|wikiicons/revert.png]]
+
+
+

+
+

+
+

+
+diff --git a/doc/tips/nearlyfreespeech/discussion.mdwn b/doc/tips/nearlyfreespeech/discussion.mdwn
+index daebee2..73da608 100644
+--- a/doc/tips/nearlyfreespeech/discussion.mdwn
++++ b/doc/tips/nearlyfreespeech/discussion.mdwn
+@@ -10,7 +10,8 @@ perl is 5.8.9
+ 
+ > This is fixed in 3.1415926. --[[Joey]] 
+ 
+-Hi!
+-How can i upgrade my nearlyfreespeech installation of ikiwiki? To install it i have followed your instructions here.
+-But now if I want to upgrade it to a newer version?
++
++Hi!<br />
++How can i upgrade my nearlyfreespeech installation of ikiwiki? To install it i have followed your instructions here.<br>
++But now if I want to upgrade it to a newer version?<br />
+ Thanks for your incredible work!
+
+

+

+
+
diff --git a/doc/recentchanges/change_c3624227620f5034fa84b3cb1294a61fc08eeea9._change b/doc/recentchanges/change_c3624227620f5034fa84b3cb1294a61fc08eeea9._change
new file mode 100644
index 000000000..f6790d834
--- /dev/null
+++ b/doc/recentchanges/change_c3624227620f5034fa84b3cb1294a61fc08eeea9._change
@@ -0,0 +1,55 @@
+[[!meta author="""civiccents"""]]
+
+[[!meta authorurl="""http://ikiwiki.info/ikiwiki.cgi?page=users%2Fciviccents&do=goto"""]]
+
+[[!meta title="""change to sandbox/D-Liberative on ikiwiki"""]]
+
+[[!meta permalink="http://ikiwiki.info/recentchanges/#change-c3624227620f5034fa84b3cb1294a61fc08eeea9"]]
+
+

+
Changed pages:
+
+
+[[diff|wikiicons/diff.png]]sandbox/D-Liberative
+
+
+
+
Changed by:
+
+
+civiccents
+
+
+
Commit type:
+web
+
Date:
+17:54:17 11/03/10
+

+

+
+
+[[revert|wikiicons/revert.png]]
+
+
+

+
+
+test

+
+
+

+
+

+
+diff --git a/doc/sandbox/D-Liberative.wiki b/doc/sandbox/D-Liberative.wiki
+new file mode 100644
+index 0000000..6907152
+--- /dev/null
++++ b/doc/sandbox/D-Liberative.wiki
+@@ -0,0 +1 @@
++For now its just a concept... what if we could map deliberative capacity?
+
+

+

+
+
diff --git a/doc/recentchanges/change_c8537b41320e1f38b2369f24431423dfb2f14b15._change b/doc/recentchanges/change_c8537b41320e1f38b2369f24431423dfb2f14b15._change
new file mode 100644
index 000000000..faf921e65
--- /dev/null
+++ b/doc/recentchanges/change_c8537b41320e1f38b2369f24431423dfb2f14b15._change
@@ -0,0 +1,61 @@
+[[!meta author="""http://smcv.pseudorandom.co.uk/"""]]
+
+[[!meta authorurl="""http://smcv.pseudorandom.co.uk/"""]]
+
+[[!meta title="""change to forum/Blog_posting_times_and_ikiwiki_state on ikiwiki"""]]
+
+[[!meta permalink="http://ikiwiki.info/recentchanges/#change-c8537b41320e1f38b2369f24431423dfb2f14b15"]]
+
+

+
Changed pages:
+
+
+[[diff|wikiicons/diff.png]]forum/Blog posting times and ikiwiki state
+
+
+
+
Changed by:
+
+
+smcv
+
+
+
Commit type:
+web
+
Date:
+06:58:53 11/04/10
+

+

+
+
+[[revert|wikiicons/revert.png]]
+
+
+

+
+

+
+

+
+diff --git a/doc/forum/Blog_posting_times_and_ikiwiki_state.mdwn b/doc/forum/Blog_posting_times_and_ikiwiki_state.mdwn
+index 3e6c232..0c1da5b 100644
+--- a/doc/forum/Blog_posting_times_and_ikiwiki_state.mdwn
++++ b/doc/forum/Blog_posting_times_and_ikiwiki_state.mdwn
+@@ -17,3 +17,12 @@ What can I do?
+ 
+ Is it a spectacularly bad idea to include the ikiwiki state file in my cloned repo (I suspect it is).  What else could be done?  Can I disable pagestate somehow or force ikiwiki to always use git commit times for Posted times?
+ 
++> Have you tried running ikiwiki with the `--gettime` option on your laptop,
++> to force it to retrieve initial commit times from git? You should only
++> need to do that once, and it'll be cached in the pagestate thereafter.
++>
++> Because that functionality is slow on every supported VCS except git,
++> ikiwiki tries to avoid using it unless it's really needed. [[rcs]]
++> lists it as "fast" for git, though, so depending how fast it really is
++> and how large your wiki is, you might be able to get away with running
++> ikiwiki with `--gettime` all the time? --[[smcv]]
+
+

+

+
+
diff --git a/doc/recentchanges/change_c9b737cc8596f9421ba968e56839eb052e80e794._change b/doc/recentchanges/change_c9b737cc8596f9421ba968e56839eb052e80e794._change
new file mode 100644
index 000000000..6ea4e0e20
--- /dev/null
+++ b/doc/recentchanges/change_c9b737cc8596f9421ba968e56839eb052e80e794._change
@@ -0,0 +1,98 @@
+[[!meta author="""http://smcv.pseudorandom.co.uk/"""]]
+
+[[!meta authorurl="""http://smcv.pseudorandom.co.uk/"""]]
+
+[[!meta title="""change to todo/Improving_the_efficiency_of_match__95__glob on ikiwiki"""]]
+
+[[!meta permalink="http://ikiwiki.info/recentchanges/#change-c9b737cc8596f9421ba968e56839eb052e80e794"]]
+
+

+
Changed pages:
+
+
+[[diff|wikiicons/diff.png]]todo/Improving the efficiency of match_glob
+
+
+
+
Changed by:
+
+
+smcv
+
+
+
Commit type:
+web
+
Date:
+00:36:29 11/20/10
+

+

+
+
+[[revert|wikiicons/revert.png]]
+
+
+

+
+
+one more patch: but expanding the memoization is actually a slowdown for the docwiki

+
+
+

+
+

+
+diff --git a/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn b/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn
+index de3cf48..4fe1454 100644
+--- a/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn
++++ b/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn
+@@ -43,12 +43,19 @@ Here's my patch - please consider it! -- [[KathrynAndersen]]
+ >>>>>> `/^/i` regexp that can be used without further modifiction in most
+ >>>>>> cases. --[[Joey]] 
+ 
+->>>>>>> Done, see `smcv/ready/glob-cache`.
++>>>>>>> Done, see `smcv/ready/glob-cache` and `smcv/glob-cache-too-far`.
++>>>>>>>
+ >>>>>>> Kathryn's patch is a significant improvement; my first patch on top of
+->>>>>>> that is a trivial cleanup that speeds it up a little, and the other two
++>>>>>>> that is a trivial cleanup that speeds it up a little, and the next two
+ >>>>>>> patches (using precompiled regexes) have surprisingly little effect
+ >>>>>>> (they don't slow it down either though, so either omit them or merge
+->>>>>>> them, whichever). Detailed benchmark results --[[smcv]]
++>>>>>>> them, whichever). Detailed benchmark results below.
++>>>>>>>
++>>>>>>> Moving the memoization to `glob2re` actually seems to slow things down
++>>>>>>> again - I suspect the docwiki has few enough mentions of `user()` etc.
++>>>>>>> that caching them is a waste of time, but perhaps it's not the most
++>>>>>>> representative.
++>>>>>>> --[[smcv]]
+ 
+ --------------------------------------------------------------
+ 
+@@ -120,9 +127,21 @@ master at time of branch:
+      7.70    1.7814    79514   0.000022     IkiWiki::PageSpec::match_glob
+      3.35    0.7756    59454   0.000013     <anon>:IkiWiki/Plugin/inline.pm:223
+ 
+-"""]]
++`move memoization from match_glob to glob2re`:
++
++    time elapsed (wall):   28.7677
++    time running program:  23.9473  (83.24%)
++    time profiling (est.): 4.8205  (16.76%)
++    number of calls:       1360181
++    number of exceptions:  13
++    
++    %Time    Sec.     #calls   sec/call  F  name
++    13.98    3.3469     3408   0.000982     Text::Balanced::_match_tagged
++     8.85    2.1194    79514   0.000027     IkiWiki::PageSpec::match_glob
++     3.24    0.7750    59454   0.000013     <anon>:IkiWiki/Plugin/inline.pm:223
+ 
+ --[[smcv]]
++"""]]
+ 
+ --------------------------------------------------------------
+ 
+
+

+

+
+
diff --git a/doc/recentchanges/change_ca166361973e09b6756acbfe46b4a1bcfa4148d7._change b/doc/recentchanges/change_ca166361973e09b6756acbfe46b4a1bcfa4148d7._change
new file mode 100644
index 000000000..3bfe0d0a0
--- /dev/null
+++ b/doc/recentchanges/change_ca166361973e09b6756acbfe46b4a1bcfa4148d7._change
@@ -0,0 +1,53 @@
+[[!meta author="""dark"""]]
+
+[[!meta authorurl="""http://ikiwiki.info/ikiwiki.cgi?page=users%2Fdark&do=goto"""]]
+
+[[!meta title="""change to users/dark on ikiwiki"""]]
+
+[[!meta permalink="http://ikiwiki.info/recentchanges/#change-ca166361973e09b6756acbfe46b4a1bcfa4148d7"]]
+
+

+
Changed pages:
+
+
+[[diff|wikiicons/diff.png]]users/dark
+
+
+
+
Changed by:
+
+
+dark
+
+
+
Commit type:
+web
+
Date:
+16:53:42 11/01/10
+

+

+
+
+[[revert|wikiicons/revert.png]]
+
+
+

+
+

+
+

+
+diff --git a/doc/users/dark.mdwn b/doc/users/dark.mdwn
+new file mode 100644
+index 0000000..e1d06d0
+--- /dev/null
++++ b/doc/users/dark.mdwn
+@@ -0,0 +1,3 @@
++[[!meta title="Richard Braakman"]]
++
++Lars Wirzenius convinced me to try ikiwiki for blogging :)
+
+

+

+
+
diff --git a/doc/recentchanges/change_cb45d3cf44760411746414ba1218c925ad097149._change b/doc/recentchanges/change_cb45d3cf44760411746414ba1218c925ad097149._change
new file mode 100644
index 000000000..5bd6a2199
--- /dev/null
+++ b/doc/recentchanges/change_cb45d3cf44760411746414ba1218c925ad097149._change
@@ -0,0 +1,65 @@
+[[!meta author="""joey"""]]
+
+[[!meta authorurl="""http://ikiwiki.info/ikiwiki.cgi?page=users%2Fjoey&do=goto"""]]
+
+[[!meta title="""change to bugs/logout_in_ikiwiki on ikiwiki"""]]
+
+[[!meta permalink="http://ikiwiki.info/recentchanges/#change-cb45d3cf44760411746414ba1218c925ad097149"]]
+
+

+
Changed pages:
+
+
+[[diff|wikiicons/diff.png]]bugs/logout in ikiwiki
+
+
+
+
Changed by:
+
+
+joey
+
+
+
Commit type:
+git
+
Date:
+12:59:31 10/30/10
+

+

+
+
+[[revert|wikiicons/revert.png]]
+
+
+

+
+
+re the openid_provider cookie

+
+
+

+
+

+
+diff --git a/doc/bugs/logout_in_ikiwiki.mdwn b/doc/bugs/logout_in_ikiwiki.mdwn
+index 3ca85fd..d9b6df6 100644
+--- a/doc/bugs/logout_in_ikiwiki.mdwn
++++ b/doc/bugs/logout_in_ikiwiki.mdwn
+@@ -12,6 +12,12 @@ It looks like there is no way to logout of ikiwiki at present, meaning that if y
+ >> (I'd argue also in favor of the openid_provider cookie expiring 
+ >>  in less time than it does now, and being session based)
+ 
++>>> (The `openid_provider` cookie is purely a convenience cookie to
++>>> auto-select the user's openid provider the next time they log
++>>> in. As such, it cannot be a session cookie. It does not provide any
++>>> personally-identifying information so it should not really matter 
++>>> when it expires.) --[[Joey]]
++
+ >> It would be nice to move navigational elements to the upper right corner 
+ >> of the page...
+ 
+
+

+

+
+
diff --git a/doc/recentchanges/change_cbcd9077ad5fbef8c0622ea9c78a66c9baece804._change b/doc/recentchanges/change_cbcd9077ad5fbef8c0622ea9c78a66c9baece804._change
new file mode 100644
index 000000000..f9603cdfd
--- /dev/null
+++ b/doc/recentchanges/change_cbcd9077ad5fbef8c0622ea9c78a66c9baece804._change
@@ -0,0 +1,57 @@
+[[!meta author="""https://www.google.com/accounts/o8/id?id=AItOawlOh8Cp-kxb0kaANKSNGrtw5XvdyHGJ3dk"""]]
+
+[[!meta authorurl="""https://www.google.com/accounts/o8/id?id=AItOawlOh8Cp-kxb0kaANKSNGrtw5XvdyHGJ3dk"""]]
+
+[[!meta title="""change to sandbox/Testing_blog_entry on ikiwiki"""]]
+
+[[!meta permalink="http://ikiwiki.info/recentchanges/#change-cbcd9077ad5fbef8c0622ea9c78a66c9baece804"]]
+
+

+
Changed pages:
+
+
+[[diff|wikiicons/diff.png]]sandbox/Testing blog entry
+
+
+
+
Changed by:
+
+
+Henning
+
+
+
Commit type:
+web
+
Date:
+05:17:43 11/06/10
+

+

+
+
+[[revert|wikiicons/revert.png]]
+
+
+

+
+

+
+

+
+diff --git a/doc/sandbox/Testing_blog_entry.mdwn b/doc/sandbox/Testing_blog_entry.mdwn
+new file mode 100644
+index 0000000..aa5fa5b
+--- /dev/null
++++ b/doc/sandbox/Testing_blog_entry.mdwn
+@@ -0,0 +1,7 @@
++# Be cool, this is a test!
++
++Hello guys, this is *just a test* entry.
++
++* Did I say
++* that I love
++* bulleted lists?
+
+

+

+
+
diff --git a/doc/recentchanges/change_ccd80905f7ea02ef07c2174ab2e8bd5f8ab0afc3._change b/doc/recentchanges/change_ccd80905f7ea02ef07c2174ab2e8bd5f8ab0afc3._change
new file mode 100644
index 000000000..fc7bcda4e
--- /dev/null
+++ b/doc/recentchanges/change_ccd80905f7ea02ef07c2174ab2e8bd5f8ab0afc3._change
@@ -0,0 +1,57 @@
+[[!meta author="""http://cristian.regolo.cc/"""]]
+
+[[!meta authorurl="""http://cristian.regolo.cc/"""]]
+
+[[!meta title="""change to setup/byhand on ikiwiki"""]]
+
+[[!meta permalink="http://ikiwiki.info/recentchanges/#change-ccd80905f7ea02ef07c2174ab2e8bd5f8ab0afc3"]]
+
+

+
Changed pages:
+
+
+[[diff|wikiicons/diff.png]]setup/byhand
+
+
+
+
Changed by:
+
+
+cristiangreco
+
+
+
Commit type:
+web
+
Date:
+10:13:12 11/02/10
+

+

+
+
+[[revert|wikiicons/revert.png]]
+
+
+

+
+

+
+

+
+diff --git a/doc/setup/byhand.mdwn b/doc/setup/byhand.mdwn
+index 86cff5a..75a5648 100644
+--- a/doc/setup/byhand.mdwn
++++ b/doc/setup/byhand.mdwn
+@@ -104,7 +104,7 @@ is ok, run `ikiwiki --setup ikiwiki.setup`, and you're done!
+ There are lots of other configuration options in ikiwiki.setup that you
+ can uncomment, configure, and enable by re-running
+ `ikiwiki --setup ikiwiki.setup`. Be sure to browse through all the
+-[[plugins]]..
++[[plugins]].
+ 
+ ## Put your wiki in revision control.
+ 
+
+

+

+
+
diff --git a/doc/recentchanges/change_cfc1b6ac486e11cb11d6c72602bf70b0a440b747._change b/doc/recentchanges/change_cfc1b6ac486e11cb11d6c72602bf70b0a440b747._change
new file mode 100644
index 000000000..cd8f5cb07
--- /dev/null
+++ b/doc/recentchanges/change_cfc1b6ac486e11cb11d6c72602bf70b0a440b747._change
@@ -0,0 +1,59 @@
+[[!meta author="""https://www.google.com/accounts/o8/id?id=AItOawmE7z4CSv-ctBarutQCd70R3CcaSPPxjVk"""]]
+
+[[!meta authorurl="""https://www.google.com/accounts/o8/id?id=AItOawmE7z4CSv-ctBarutQCd70R3CcaSPPxjVk"""]]
+
+[[!meta title="""change to bugs/logout_in_ikiwiki on ikiwiki"""]]
+
+[[!meta permalink="http://ikiwiki.info/recentchanges/#change-cfc1b6ac486e11cb11d6c72602bf70b0a440b747"]]
+
+

+
Changed pages:
+
+
+[[diff|wikiicons/diff.png]]bugs/logout in ikiwiki
+
+
+
+
Changed by:
+
+
+Dave
+
+
+
Commit type:
+web
+
Date:
+20:58:34 10/28/10
+

+

+
+
+[[revert|wikiicons/revert.png]]
+
+
+

+
+

+
+

+
+diff --git a/doc/bugs/logout_in_ikiwiki.mdwn b/doc/bugs/logout_in_ikiwiki.mdwn
+index a9c407b..3ca85fd 100644
+--- a/doc/bugs/logout_in_ikiwiki.mdwn
++++ b/doc/bugs/logout_in_ikiwiki.mdwn
+@@ -16,7 +16,10 @@ It looks like there is no way to logout of ikiwiki at present, meaning that if y
+ >> of the page...
+ 
+ >> I have two kinds of pages (wiki and blog), and three classes of users  
++
+ >> anonymous users - display things like login, help, and recentchanges,
++
+ >> non-admin users - on a per subdir basis (blog and !blog) display 
+ >> logout, help, recentchanges, edit, comment 
++
+ >> admin users - logout, help, recentchanges, edit, comment, etc
+
+

+

+
+
diff --git a/doc/recentchanges/change_d16104f55d8b31929d0466ca9abc3ccb4af0a8e8._change b/doc/recentchanges/change_d16104f55d8b31929d0466ca9abc3ccb4af0a8e8._change
new file mode 100644
index 000000000..d2c139b20
--- /dev/null
+++ b/doc/recentchanges/change_d16104f55d8b31929d0466ca9abc3ccb4af0a8e8._change
@@ -0,0 +1,72 @@
+[[!meta author="""joey"""]]
+
+[[!meta authorurl="""http://ikiwiki.info/ikiwiki.cgi?page=users%2Fjoey&do=goto"""]]
+
+[[!meta title="""change to bugs/more_and_RSS_generation on ikiwiki"""]]
+
+[[!meta permalink="http://ikiwiki.info/recentchanges/#change-d16104f55d8b31929d0466ca9abc3ccb4af0a8e8"]]
+
+

+
Changed pages:
+
+
+[[diff|wikiicons/diff.png]]bugs/more and RSS generation
+
+
+
+
Changed by:
+
+
+joey
+
+
+
Commit type:
+git
+
Date:
+12:41:31 10/30/10
+

+

+
+
+[[revert|wikiicons/revert.png]]
+
+
+

+
+
+response

+
+
+

+
+

+
+diff --git a/doc/bugs/more_and_RSS_generation.mdwn b/doc/bugs/more_and_RSS_generation.mdwn
+index 72d636f..00ab43f 100644
+--- a/doc/bugs/more_and_RSS_generation.mdwn
++++ b/doc/bugs/more_and_RSS_generation.mdwn
+@@ -2,6 +2,19 @@ I'd like the more plugin and RSS to play better together. In the case of the htm
+ 
+ Maybe there is a different plugin (I also tried toggle)? 
+ 
++> I am not a fan of the more directive (thus the rant about it sucking
++> embedded in its [[example|ikiwiki/directive/more]]). But I don't think 
++> that weakening it to not work in rss feeds is a good idea, if someone
++> wants to force users to go somewhere to view their full content, 
++> they should be able to do it, even though it does suck.
++> 
++> The toggle directive will degrade fairly well in an rss feed to
++> display the full text. (There is an annoying toggle link that does
++> nothing when embedded in an rss feed). --[[Joey]]
++
+ I also note, that at least currently, more seems to break on a few pages, not being parsed at all when aggregated into the front page. 
+ 
++> It's just a simple directive, it should work anywhere any directive will,
++> and does as far as I can see. Details? --[[Joey]]
++
+ see also: [[/bugs/rss_feeds_do_not_use_recommended_encoding_of_entities_for_some_fields/]]
+
+

+

+
+
diff --git a/doc/recentchanges/change_d5056fb61e8332fea658363e931ec28a35681ffe._change b/doc/recentchanges/change_d5056fb61e8332fea658363e931ec28a35681ffe._change
new file mode 100644
index 000000000..5ed5137ba
--- /dev/null
+++ b/doc/recentchanges/change_d5056fb61e8332fea658363e931ec28a35681ffe._change
@@ -0,0 +1,68 @@
+[[!meta author="""joey"""]]
+
+[[!meta authorurl="""http://ikiwiki.info/ikiwiki.cgi?page=users%2Fjoey&do=goto"""]]
+
+[[!meta title="""change to plugins/htmlscrubber on ikiwiki"""]]
+
+[[!meta permalink="http://ikiwiki.info/recentchanges/#change-d5056fb61e8332fea658363e931ec28a35681ffe"]]
+
+

+
Changed pages:
+
+
+[[diff|wikiicons/diff.png]]plugins/htmlscrubber
+
+
+
+
Changed by:
+
+
+joey
+
+
+
Commit type:
+git
+
Date:
+00:24:33 11/12/10
+

+

+
+
+[[revert|wikiicons/revert.png]]
+
+
+

+
+
+add example of skipping blog posts while scrubbing comments

+
+
+

+
+

+
+diff --git a/doc/plugins/htmlscrubber.mdwn b/doc/plugins/htmlscrubber.mdwn
+index c59b46e..080575c 100644
+--- a/doc/plugins/htmlscrubber.mdwn
++++ b/doc/plugins/htmlscrubber.mdwn
+@@ -32,10 +32,11 @@ other HTML-related functionality, such as whether [[meta]] allows
+ potentially unsafe HTML tags.
+ 
+ The `htmlscrubber_skip` configuration setting can be used to skip scrubbing
+-of some pages. Set it to a [[ikiwiki/PageSpec]], such as "!*/Discussion",
+-and pages matching that can have all the evil CSS, JavsScript, and unsafe
+-html elements you like. One safe way to use this is to use [[lockedit]] to
+-lock those pages, so only admins can edit them.
++of some pages. Set it to a [[ikiwiki/PageSpec]], such as 
++"posts/* and !comment(*) and !*/Discussion", and pages matching that can have
++all the evil CSS, JavsScript, and unsafe html elements you like. One safe
++way to use this is to use [[lockedit]] to lock those pages, so only admins
++can edit them.
+ 
+ ----
+ 
+
+

+

+
+
diff --git a/doc/recentchanges/change_d6ff694ff7a6a4700ccbbd5819907eac73cf065a._change b/doc/recentchanges/change_d6ff694ff7a6a4700ccbbd5819907eac73cf065a._change
new file mode 100644
index 000000000..235b8a592
--- /dev/null
+++ b/doc/recentchanges/change_d6ff694ff7a6a4700ccbbd5819907eac73cf065a._change
@@ -0,0 +1,236 @@
+[[!meta author="""smcv"""]]
+
+[[!meta authorurl="""http://ikiwiki.info/ikiwiki.cgi?page=users%2Fsmcv&do=goto"""]]
+
+[[!meta title="""change to todo/Improving_the_efficiency_of_match__95__glob on ikiwiki"""]]
+
+[[!meta permalink="http://ikiwiki.info/recentchanges/#change-d6ff694ff7a6a4700ccbbd5819907eac73cf065a"]]
+
+

+
Changed pages:
+
+
+[[diff|wikiicons/diff.png]]todo/Improving the efficiency of match_glob
+
+
+
+
Changed by:
+
+
+smcv
+
+
+
Commit type:
+git
+
Date:
+00:22:56 11/20/10
+

+

+
+
+[[revert|wikiicons/revert.png]]
+
+
+

+
+
+branch ready for merge, I think

+
+
+

+
+

+
+diff --git a/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn b/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn
+index 0fc059a..de3cf48 100644
+--- a/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn
++++ b/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn
+@@ -1,3 +1,7 @@
++[[!template id=gitbranch branch=smcv/ready/glob-cache
++  author="[[KathrynAndersen]], [[smcv]]"]]
++[[!tag patch]]
++
+ I've been profiling my IkiWiki to try to improve speed (with many pages makes speed even more important) and I've written a patch to improve the speed of match_glob.  This matcher is a good one to improve the speed of, because it gets called so many times.
+ 
+ Here's my patch - please consider it! -- [[KathrynAndersen]]
+@@ -39,7 +43,92 @@ Here's my patch - please consider it! -- [[KathrynAndersen]]
+ >>>>>> `/^/i` regexp that can be used without further modifiction in most
+ >>>>>> cases. --[[Joey]] 
+ 
++>>>>>>> Done, see `smcv/ready/glob-cache`.
++>>>>>>> Kathryn's patch is a significant improvement; my first patch on top of
++>>>>>>> that is a trivial cleanup that speeds it up a little, and the other two
++>>>>>>> patches (using precompiled regexes) have surprisingly little effect
++>>>>>>> (they don't slow it down either though, so either omit them or merge
++>>>>>>> them, whichever). Detailed benchmark results --[[smcv]]
++
+ --------------------------------------------------------------
++
++[[!toggle id="smcv-benchmark" text="current benchmarks"]]
++
++[[!toggleable id="smcv-benchmark" text="""
++master at time of branch:
++
++    time elapsed (wall):   29.6348
++    time running program:  24.9212  (84.09%)
++    time profiling (est.): 4.7136  (15.91%)
++    number of calls:       1360181
++    number of exceptions:  13
++    
++    %Time    Sec.     #calls   sec/call  F  name
++    13.24    3.2986     3408   0.000968     Text::Balanced::_match_tagged
++    10.94    2.7253    79514   0.000034     IkiWiki::PageSpec::match_glob
++     3.19    0.7952    59454   0.000013     <anon>:IkiWiki/Plugin/inline.pm:223
++
++`Improve the speed of match_glob`:
++
++    time elapsed (wall):   27.9755
++    time running program:  23.5293  (84.11%)
++    time profiling (est.): 4.4461  (15.89%)
++    number of calls:       1280875
++    number of exceptions:  13
++    
++    %Time    Sec.     #calls   sec/call  F  name
++    14.56    3.4257     3408   0.001005     Text::Balanced::_match_tagged
++     7.82    1.8403    79514   0.000023     IkiWiki::PageSpec::match_glob
++     3.27    0.7698    59454   0.000013     <anon>:IkiWiki/Plugin/inline.pm:223
++
++`match_glob: streamline glob cache slightly`:
++
++    time elapsed (wall):   27.5753
++    time running program:  23.1714  (84.03%)
++    time profiling (est.): 4.4039  (15.97%)
++    number of calls:       1280875
++    number of exceptions:  13
++    
++    %Time    Sec.     #calls   sec/call  F  name
++    14.09    3.2637     3408   0.000958     Text::Balanced::_match_tagged
++     7.74    1.7926    79514   0.000023     IkiWiki::PageSpec::match_glob
++     3.30    0.7646    59454   0.000013     <anon>:IkiWiki/Plugin/inline.pm:223
++
++`glob2re: return a precompiled, anchored case-insensitiv...`:
++
++    time elapsed (wall):   27.5656
++    time running program:  23.1464  (83.97%)
++    time profiling (est.): 4.4192  (16.03%)
++    number of calls:       1282189
++    number of exceptions:  13
++    
++    %Time    Sec.     #calls   sec/call  F  name
++    14.21    3.2891     3408   0.000965     Text::Balanced::_match_tagged
++     7.72    1.7872    79514   0.000022     IkiWiki::PageSpec::match_glob
++     3.32    0.7678    59454   0.000013     <anon>:IkiWiki/Plugin/inline.pm:223
++
++`make use of precompiled regex objects`:
++
++    time elapsed (wall):   27.5357
++    time running program:  23.1289  (84.00%)
++    time profiling (est.): 4.4068  (16.00%)
++    number of calls:       1281981
++    number of exceptions:  13
++    
++    %Time    Sec.     #calls   sec/call  F  name
++    14.17    3.2776     3408   0.000962     Text::Balanced::_match_tagged
++     7.70    1.7814    79514   0.000022     IkiWiki::PageSpec::match_glob
++     3.35    0.7756    59454   0.000013     <anon>:IkiWiki/Plugin/inline.pm:223
++
++"""]]
++
++--[[smcv]]
++
++--------------------------------------------------------------
++
++[[!toggle id="ka-benchmarks" text="Kathryn's benchmarks"]]
++
++[[!toggleable id="ka-benchmarks" text="""
+ Benchmarks done with Devel::Profile on the same testbed IkiWiki setup.  I'm just showing the start of the profile output, since that's what's relevant.
+ 
+ Before:
+@@ -73,73 +162,13 @@ number of exceptions:  65
+ Note that the seconds per call for match_glob in the "after" case has gone down by about a third.
+ 
+ K.A.
++"""]]
+ 
+ --------------------------------------------------------------
+ 
+-A second set of benchmarks, done by rebuilding the docwiki at commit f942c2db05e4
+-like so:
+-
+-    perl -Iblib/lib -d:Profile ikiwiki.in -setup docwiki.setup --no-verbose
+-
+-The docwiki appears to use fewer glob matches than Kathryn's wiki.
+-
+-With master:
+-
+-    time elapsed (wall):   29.6970
+-    time running program:  24.6930  (83.15%)
+-    time profiling (est.): 5.0041  (16.85%)
+-    number of calls:       1359180
+-    number of exceptions:  13
+-
+-    %Time    Sec.     #calls   sec/call  F  name
+-    13.62    3.3629     3406   0.000987     Text::Balanced::_match_tagged
+-    10.84    2.6773    79442   0.000034     IkiWiki::PageSpec::match_glob
+-     3.08    0.7598    59454   0.000013     <anon>:IkiWiki/Plugin/inline.pm:223
+-     3.07    0.7593    29830   0.000025     IkiWiki::bestlink
+-     2.99    0.7378    10231   0.000072     IkiWiki::PageSpec::match_link
+-
+-With my `smcv/memoize-glob2re` branch:
+-
+-    time elapsed (wall):   30.4931
+-    time running program:  25.1248  (82.39%)
+-    time profiling (est.): 5.3683  (17.61%)
+-    number of calls:       1439943
+-    number of exceptions:  13
+-
+-    %Time    Sec.     #calls   sec/call  F  name
+-    13.19    3.3146     3406   0.000973     Text::Balanced::_match_tagged
+-     8.41    2.1123    79442   0.000027     IkiWiki::PageSpec::match_glob
+-     3.97    0.9979    86905   0.000011     Memoize::_memoizer
+-     3.05    0.7654    59454   0.000013     <anon>:IkiWiki/Plugin/inline.pm:223
+-     3.02    0.7576    29830   0.000025     IkiWiki::bestlink
+-
+-and in a repeated run:
+-
+-     8.40    2.0905    79442   0.000026     IkiWiki::PageSpec::match_glob
+-
+-With Kathryn's patch as seen in my `smcv/ka-glob-cache` branch:
+-
+-    time elapsed (wall):   27.7567
+-    time running program:  22.9941  (82.84%)
+-    time profiling (est.): 4.7627  (17.16%)
+-    number of calls:       1279946
+-    number of exceptions:  13
+-
+-    %Time    Sec.     #calls   sec/call  F  name
+-    14.29    3.2867     3406   0.000965     Text::Balanced::_match_tagged
+-     7.89    1.8136    79442   0.000023     IkiWiki::PageSpec::match_glob
+-     3.30    0.7577    59454   0.000013     <anon>:IkiWiki/Plugin/inline.pm:223
+-     3.24    0.7461    29830   0.000025     IkiWiki::bestlink
+-     3.19    0.7332      143   0.005127  ?  IkiWiki::pagespec_match_list
+-
+-and in a repeated run:
+-
+-     7.84    1.8253    79442   0.000023     IkiWiki::PageSpec::match_glob
+-
+---[[smcv]]
+-
+---------------------------------------------------------------
++[[!toggle id="ka-patch" text="Kathryn's original patch"]]
+ 
++[[!toggleable id="ka-patch" text="""
+ 
+ <pre>
+ diff --git a/IkiWiki.pm b/IkiWiki.pm
+@@ -174,4 +203,5 @@ index 08a3d78..c187b98 100644
+  			return IkiWiki::SuccessReason->new("$glob matches $page");
+  		}
+ </pre>
++"""]]
+ --------------------------------------------------------------
+
+

+

+
+
diff --git a/doc/recentchanges/change_d916cd2f71f1c22dad947d7b2134edbbb15e7b8e._change b/doc/recentchanges/change_d916cd2f71f1c22dad947d7b2134edbbb15e7b8e._change
new file mode 100644
index 000000000..6a128e5df
--- /dev/null
+++ b/doc/recentchanges/change_d916cd2f71f1c22dad947d7b2134edbbb15e7b8e._change
@@ -0,0 +1,120 @@
+[[!meta author="""http://smcv.pseudorandom.co.uk/"""]]
+
+[[!meta authorurl="""http://smcv.pseudorandom.co.uk/"""]]
+
+[[!meta title="""change to todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both on ikiwiki"""]]
+
+[[!meta permalink="http://ikiwiki.info/recentchanges/#change-d916cd2f71f1c22dad947d7b2134edbbb15e7b8e"]]
+
+

+
Changed pages:
+
+
+[[diff|wikiicons/diff.png]]todo/want to avoid ikiwiki using http or https in urls to allow serving both
+
+
+
+
Changed by:
+
+
+smcv
+
+
+
Commit type:
+web
+
Date:
+19:45:02 11/22/10
+

+

+
+
+[[revert|wikiicons/revert.png]]
+
+
+

+
+
+respond to feedback

+
+
+

+
+

+
+diff --git a/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn b/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn
+index 4fafc2b..80925b4 100644
+--- a/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn
++++ b/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn
+@@ -191,14 +191,41 @@ New API added by this branch:
+   > The new form for local urls will typically be only a little bit longer,
+   > except in the unusual case where the cgiurl is elsewhere. --[[Joey]]
+ 
++  >> So, have urlto(x, y) use `$local_url`? There are few calls, but IMO
++  >> they're for the most important things - wikilinks, img, map and
++  >> other ordinary hyperlinks. Using `$local_url` would be fine for
++  >> webserver-based use, but it does stop you browsing your wiki's
++  >> HTML over `file:///` (unless you set that as the base URL, but
++  >> then you can't move it around), and stops you moving simple
++  >> outputs (like the docwiki!) around.
++  >>
++  >> I personally think breaking the docwiki is enough to block that.
++  >>
++  >> How about this?
++  >>
++  >> * `urlto($link, $page)` with `$page` defined: relative
++  >> * `urlto($link, undef)`: local, starts with `/`
++  >> * `urlto($link)`: also local, as a side-effect
++  >> * `urlto($link, $anything, 1)` (but idiomatically, `$anything` is
++  >>   normally undef): absolute, starts with `http[s]://`
++  >>
++  >> --[[smcv]]
++
+ * `IkiWiki::baseurl` has a new second argument which works like the
+   third argument of `urlto`
+ 
++  > I assume you have no objection to this --[[smcv]]
++
+ * `IkiWiki::cgiurl` uses `$local_cgiurl` if passed `local_cgiurl => 1`
+ 
++  > Possibly changed to making this always be local unless `cgiurl => $x`
++  > is given: see below --[[smcv]]
++
+ * `IkiWiki::cgiurl` omits the trailing `?` if given no named parameters
+   except `cgiurl` and/or `local_cgiurl`
+ 
++  > I assume you have no objection to this --[[smcv]]
++
+ Bugs:
+ 
+ * I don't think anything except `openid` calls `cgiurl` without also
+@@ -211,10 +238,18 @@ Bugs:
+ 
+   > I agree that makes sense. --[[Joey]]
+ 
++  >> I'm not completely sure whether you're agreeing with "perhaps do this"
++  >> or "that looks too strange", so please disambiguate:
++  >> would you accept a patch that makes `cgiurl` default to a local
++  >> (starts-with-`/`) result? If you would, that'd reduce the diff. --[[smcv]]
++
+ * It occurs to me that `IkiWiki::cgiurl` could probably benefit from being
+   exported? Perhaps also `IkiWiki::baseurl`?
+ 
+-  > Possibly, see [[firm_up_plugin_interface]]. --[[Joey]] 
++  > Possibly, see [[firm_up_plugin_interface]]. --[[Joey]]
++
++  >> Not really part of this branch, though, so wontfix (unless you ask me
++  >> to do so). --[[smcv]]
+ 
+ * Or, to reduce use of the unexported `baseurl` function, it might make
+   sense to give `urlto` a special case that references the root of the wiki,
+@@ -227,3 +262,5 @@ Bugs:
+ 
+   > AFACIS, `baseurl` is only called in 3 places so I don't think that's
+   > needed. --[[Joey]] 
++
++  >> OK, wontfix. --[[smcv]]
+
+

+

+
+
diff --git a/doc/recentchanges/change_da9e1ea667f82d5fca9168dbed19be08040570ff._change b/doc/recentchanges/change_da9e1ea667f82d5fca9168dbed19be08040570ff._change
new file mode 100644
index 000000000..2a24ad4e2
--- /dev/null
+++ b/doc/recentchanges/change_da9e1ea667f82d5fca9168dbed19be08040570ff._change
@@ -0,0 +1,96 @@
+[[!meta author="""http://jmtd.livejournal.com/"""]]
+
+[[!meta authorurl="""http://jmtd.livejournal.com/"""]]
+
+[[!meta title="""change to ikiwiki/directive/template on ikiwiki"""]]
+
+[[!meta permalink="http://ikiwiki.info/recentchanges/#change-da9e1ea667f82d5fca9168dbed19be08040570ff"]]
+
+

+
Changed pages:
+
+
+[[diff|wikiicons/diff.png]]ikiwiki/directive/template
+
+
+
+
Changed by:
+
+
+jmtd [livejournal.com]
+
+
+
Commit type:
+web
+
Date:
+10:28:05 11/15/10
+

+

+
+
+[[revert|wikiicons/revert.png]]
+
+
+

+
+
+guard templates with the if directive where necessary

+
+
+

+
+

+
+diff --git a/doc/ikiwiki/directive/template.mdwn b/doc/ikiwiki/directive/template.mdwn
+index 9e3ae54..df391f9 100644
+--- a/doc/ikiwiki/directive/template.mdwn
++++ b/doc/ikiwiki/directive/template.mdwn
+@@ -60,22 +60,30 @@ few things:
+   `<TMPL_IF variable>text</TMPL_IF>`.
+ * To use one block of text if a variable is set and a second if it's not,
+   use `<TMPL_IF variable>text<TMPL_ELSE>other text</TMPL_IF>`
++* Each template file included in the wiki's source will also generate a regular
++  wiki page.  In many cases you might want to prevent some of your template
++  being interpreted for the regular page.  Use the [[if]] directive with the
++  `included()` test to guard the template code.
+ 
+ Here's a sample template:
+ 
+-        <span class="infobox">
+-        Name: \[[<TMPL_VAR raw_name>]]<br />
+-        Age: <TMPL_VAR age><br />
+-        <TMPL_IF color>
+-        Favorite color: <TMPL_VAR color><br />
+-        <TMPL_ELSE>
+-        No favorite color.<br />
+-        </TMPL_IF>
+-        <TMPL_IF notes>
+-        <hr />
+-        <TMPL_VAR notes>
+-        </TMPL_IF>
+-        </span>
++        \[[!if test="included()" then="""
++          <span class="infobox">
++          Name: \[[<TMPL_VAR raw_name>]]<br />
++          Age: <TMPL_VAR age><br />
++          <TMPL_IF color>
++            Favorite color: <TMPL_VAR color><br />
++          <TMPL_ELSE>
++            No favorite color.<br />
++          </TMPL_IF>
++          <TMPL_IF notes>
++            <hr />
++            <TMPL_VAR notes>
++          </TMPL_IF>
++          </span>
++        """ else="""
++          This is a template page.
++        """]]
+ 
+ The filled out template will be formatted the same as the rest of the page
+ that contains it, so you can include WikiLinks and all other forms of wiki
+
+

+

+
+
diff --git a/doc/recentchanges/change_daf89f59e61d9091fe27dd8738b40db5fa85a5e6._change b/doc/recentchanges/change_daf89f59e61d9091fe27dd8738b40db5fa85a5e6._change
new file mode 100644
index 000000000..6705227a9
--- /dev/null
+++ b/doc/recentchanges/change_daf89f59e61d9091fe27dd8738b40db5fa85a5e6._change
@@ -0,0 +1,59 @@
+[[!meta author="""joey"""]]
+
+[[!meta authorurl="""http://ikiwiki.info/ikiwiki.cgi?page=users%2Fjoey&do=goto"""]]
+
+[[!meta title="""change to forum/PageSpec_results_from_independent_checkout on ikiwiki"""]]
+
+[[!meta permalink="http://ikiwiki.info/recentchanges/#change-daf89f59e61d9091fe27dd8738b40db5fa85a5e6"]]
+
+

+
Changed pages:
+
+
+[[diff|wikiicons/diff.png]]forum/PageSpec results from independent checkout
+
+
+
+
Changed by:
+
+
+joey
+
+
+
Commit type:
+git
+
Date:
+19:03:03 11/16/10
+

+

+
+
+[[revert|wikiicons/revert.png]]
+
+
+

+
+
+response

+
+
+

+
+

+
+diff --git a/doc/forum/PageSpec_results_from_independent_checkout.mdwn b/doc/forum/PageSpec_results_from_independent_checkout.mdwn
+index 6b2fd6d..693287d 100644
+--- a/doc/forum/PageSpec_results_from_independent_checkout.mdwn
++++ b/doc/forum/PageSpec_results_from_independent_checkout.mdwn
+@@ -3,3 +3,6 @@ I'd like to be able to do PageSpec matches independent of the Ikiwiki checkout,
+     perl -MIkiWiki -le '$config{wikistatedir}=".ikiwiki"; IkiWiki::loadindex(); print foreach pagespec_match_list("", shift)' "bugs/*"
+ 
+ I get the impression there's a way to build up enough state to run pagespec matches without doing any rendering, but I don't know how. Any ideas? -- JoeRayhawk
++
++> It's not possible to build up enough state without at a minimum
++> performing the scan pass of rendering on every page. --[[Joey]] 
+
+

+

+
+
diff --git a/doc/recentchanges/change_db3fb406733b98535d426acedd58f1633df79ade._change b/doc/recentchanges/change_db3fb406733b98535d426acedd58f1633df79ade._change
new file mode 100644
index 000000000..56c9170e6
--- /dev/null
+++ b/doc/recentchanges/change_db3fb406733b98535d426acedd58f1633df79ade._change
@@ -0,0 +1,52 @@
+[[!meta author="""http://smcv.pseudorandom.co.uk/"""]]
+
+[[!meta authorurl="""http://smcv.pseudorandom.co.uk/"""]]
+
+[[!meta title="""change to todo/autoindex_should_use_add__95__autofile on ikiwiki"""]]
+
+[[!meta permalink="http://ikiwiki.info/recentchanges/#change-db3fb406733b98535d426acedd58f1633df79ade"]]
+
+

+
Changed pages:
+
+
+[[diff|wikiicons/diff.png]]todo/autoindex should use add_autofile
+
+
+
+
Changed by:
+
+
+smcv
+
+
+
Commit type:
+web
+
Date:
+08:11:32 11/08/10
+

+

+
+
+[[revert|wikiicons/revert.png]]
+
+
+

+
+

+
+

+
+diff --git a/doc/todo/autoindex_should_use_add__95__autofile.mdwn b/doc/todo/autoindex_should_use_add__95__autofile.mdwn
+new file mode 100644
+index 0000000..517567e
+--- /dev/null
++++ b/doc/todo/autoindex_should_use_add__95__autofile.mdwn
+@@ -0,0 +1,2 @@
++`add_autofile` is a generic version of [[plugins/autoindex]]'s code,
++so the latter should probably use the former. --[[smcv]]
+
+

+

+
+
diff --git a/doc/recentchanges/change_dd9796375895752621cdcce103d1ad8d8a31d6cb._change b/doc/recentchanges/change_dd9796375895752621cdcce103d1ad8d8a31d6cb._change
new file mode 100644
index 000000000..24ab79826
--- /dev/null
+++ b/doc/recentchanges/change_dd9796375895752621cdcce103d1ad8d8a31d6cb._change
@@ -0,0 +1,69 @@
+[[!meta author="""http://jmtd.livejournal.com/"""]]
+
+[[!meta authorurl="""http://jmtd.livejournal.com/"""]]
+
+[[!meta title="""change to bugs/aggregate_generates_long_filenames on ikiwiki"""]]
+
+[[!meta permalink="http://ikiwiki.info/recentchanges/#change-dd9796375895752621cdcce103d1ad8d8a31d6cb"]]
+
+

+
Changed pages:
+
+
+[[diff|wikiicons/diff.png]]bugs/aggregate generates long filenames
+
+
+
+
Changed by:
+
+
+jmtd [livejournal.com]
+
+
+
Commit type:
+web
+
Date:
+07:47:07 11/17/10
+

+

+
+
+[[revert|wikiicons/revert.png]]
+
+
+

+
+
+ext4, default settings...

+
+
+

+
+

+
+diff --git a/doc/bugs/aggregate_generates_long_filenames.mdwn b/doc/bugs/aggregate_generates_long_filenames.mdwn
+index c38ad6c..33e7b74 100644
+--- a/doc/bugs/aggregate_generates_long_filenames.mdwn
++++ b/doc/bugs/aggregate_generates_long_filenames.mdwn
+@@ -19,3 +19,16 @@ It would also appear this abrubtly terminates aggregate processing (if not ikiwi
+ > that, in additional to having a rather antique long filename limit, your
+ > system also doesn't properly expose it via pathconf. Not sure what
+ > ikiwiki can do here. --[[Joey]]
++
++>> This is an ext4 filesystem with default settings (which appears to mean
++>> 256 bytes for pathnames).  Despite the error saying file name, it's
++>> definitely a path issue since moving my test repo to `/tmp`from
++>> `/home/jon/wd/mine/www` hides the problem. I note the following comment
++>> in `aggregate.pm`:
++
++		# Make sure that the file name isn't too long. 
++		# NB: This doesn't check for path length limits.
++
++>> I don't fully grok the aggregate source yet, but I wouldn't rule out
++>> a bug in the path length checking, personally.  I'm happy to try and
++>> find it myself though :) -- [[Jon]]
+
+

+

+
+
diff --git a/doc/recentchanges/change_e68f29eebb3917909b939869e57b985add724598._change b/doc/recentchanges/change_e68f29eebb3917909b939869e57b985add724598._change
new file mode 100644
index 000000000..05c362968
--- /dev/null
+++ b/doc/recentchanges/change_e68f29eebb3917909b939869e57b985add724598._change
@@ -0,0 +1,61 @@
+[[!meta author="""http://smcv.pseudorandom.co.uk/"""]]
+
+[[!meta authorurl="""http://smcv.pseudorandom.co.uk/"""]]
+
+[[!meta title="""change to plugins/contrib/default_content_for___42__copyright__42___and___42__license__42__ on ikiwiki"""]]
+
+[[!meta permalink="http://ikiwiki.info/recentchanges/#change-e68f29eebb3917909b939869e57b985add724598"]]
+
+

+
Changed pages:
+
+
+[[diff|wikiicons/diff.png]]plugins/contrib/default content for *copyright* and *license*
+
+
+
+
Changed by:
+
+
+smcv
+
+
+
Commit type:
+web
+
Date:
+14:24:46 11/01/10
+

+

+
+
+[[revert|wikiicons/revert.png]]
+
+
+

+
+
+ugh, now with better syntax

+
+
+

+
+

+
+diff --git a/doc/plugins/contrib/default_content_for___42__copyright__42___and___42__license__42__.mdwn b/doc/plugins/contrib/default_content_for___42__copyright__42___and___42__license__42__.mdwn
+index c131143..16c147b 100644
+--- a/doc/plugins/contrib/default_content_for___42__copyright__42___and___42__license__42__.mdwn
++++ b/doc/plugins/contrib/default_content_for___42__copyright__42___and___42__license__42__.mdwn
+@@ -46,7 +46,7 @@ by ikiwiki are likewise fine.  --[[tschwinge]]
+ > that it doesn't support setting defaults for a given "subdirectory"
+ > only. --[[smcv]]
+ 
+-[[!template id=gitbranch name=smcv/contrib/defcopyright author="[[tschwinge]]"]]
++[[!template id=gitbranch branch=smcv/contrib/defcopyright author="[[tschwinge]]"]]
+ 
+ > For `./gitremotes` convenience (taking the Linus approach to backups :-) )
+ > I've added this to my git repository as a branch. No review, approval or
+
+

+

+
+
diff --git a/doc/recentchanges/change_e810fe394b49955971299329136d46548d95ec6b._change b/doc/recentchanges/change_e810fe394b49955971299329136d46548d95ec6b._change
new file mode 100644
index 000000000..b69fabd45
--- /dev/null
+++ b/doc/recentchanges/change_e810fe394b49955971299329136d46548d95ec6b._change
@@ -0,0 +1,63 @@
+[[!meta author="""http://smcv.pseudorandom.co.uk/"""]]
+
+[[!meta authorurl="""http://smcv.pseudorandom.co.uk/"""]]
+
+[[!meta title="""change to todo/Improving_the_efficiency_of_match__95__glob on ikiwiki"""]]
+
+[[!meta permalink="http://ikiwiki.info/recentchanges/#change-e810fe394b49955971299329136d46548d95ec6b"]]
+
+

+
Changed pages:
+
+
+[[diff|wikiicons/diff.png]]todo/Improving the efficiency of match_glob
+
+
+
+
Changed by:
+
+
+smcv
+
+
+
Commit type:
+web
+
Date:
+09:26:16 11/10/10
+

+

+
+
+[[revert|wikiicons/revert.png]]
+
+
+

+
+
+possible improvement

+
+
+

+
+

+
+diff --git a/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn b/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn
+index 8f70f1d..0a9d8c6 100644
+--- a/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn
++++ b/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn
+@@ -2,6 +2,10 @@ I've been profiling my IkiWiki to try to improve speed (with many pages makes sp
+ 
+ Here's my patch - please consider it! -- [[KathrynAndersen]]
+ 
++> It seems to me as though changing `glob2re` to return qr/$re/, and calling
++> `memoize(glob2re)` next to the other memoize calls, would be a less
++> verbose way to do this? --[[smcv]]
++
+ --------------------------------------------------------------
+ <pre>
+ diff --git a/IkiWiki.pm b/IkiWiki.pm
+
+

+

+
+
diff --git a/doc/recentchanges/change_eaa04125d7080a9c882b629d1e0f6c7992ad462f._change b/doc/recentchanges/change_eaa04125d7080a9c882b629d1e0f6c7992ad462f._change
new file mode 100644
index 000000000..a40a8ce27
--- /dev/null
+++ b/doc/recentchanges/change_eaa04125d7080a9c882b629d1e0f6c7992ad462f._change
@@ -0,0 +1,58 @@
+[[!meta author="""https://www.google.com/accounts/o8/id?id=AItOawlOh8Cp-kxb0kaANKSNGrtw5XvdyHGJ3dk"""]]
+
+[[!meta authorurl="""https://www.google.com/accounts/o8/id?id=AItOawlOh8Cp-kxb0kaANKSNGrtw5XvdyHGJ3dk"""]]
+
+[[!meta title="""change to sandbox on ikiwiki"""]]
+
+[[!meta permalink="http://ikiwiki.info/recentchanges/#change-eaa04125d7080a9c882b629d1e0f6c7992ad462f"]]
+
+

+
Changed pages:
+
+
+[[diff|wikiicons/diff.png]]sandbox
+
+
+
+
Changed by:
+
+
+Henning
+
+
+
Commit type:
+web
+
Date:
+05:15:29 11/06/10
+

+

+
+
+[[revert|wikiicons/revert.png]]
+
+
+

+
+
+Added crucial hello-world line

+
+
+

+
+

+
+diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
+index c665e67..df9d688 100644
+--- a/doc/sandbox.mdwn
++++ b/doc/sandbox.mdwn
+@@ -1,3 +1,5 @@
++Hello, world!
++
+ This is the [[SandBox]], a page anyone can edit to try out ikiwiki
+ (version [[!version  ]]).
+ 
+
+

+

+
+
diff --git a/doc/recentchanges/change_eb13521f5276cdd21a3f5990b1a1a17234e40174._change b/doc/recentchanges/change_eb13521f5276cdd21a3f5990b1a1a17234e40174._change
new file mode 100644
index 000000000..3643d9cac
--- /dev/null
+++ b/doc/recentchanges/change_eb13521f5276cdd21a3f5990b1a1a17234e40174._change
@@ -0,0 +1,58 @@
+[[!meta author="""http://kerravonsen.dreamwidth.org/"""]]
+
+[[!meta authorurl="""http://kerravonsen.dreamwidth.org/"""]]
+
+[[!meta title="""change to todo/replace_HTML::Template_with_Template_Toolkit on ikiwiki"""]]
+
+[[!meta permalink="http://ikiwiki.info/recentchanges/#change-eb13521f5276cdd21a3f5990b1a1a17234e40174"]]
+
+

+
Changed pages:
+
+
+[[diff|wikiicons/diff.png]]todo/replace HTML::Template with Template Toolkit
+
+
+
+
Changed by:
+
+
+kerravonsen [dreamwidth.org]
+
+
+
Commit type:
+web
+
Date:
+19:00:48 11/15/10
+

+

+
+
+[[revert|wikiicons/revert.png]]
+
+
+

+
+
+modular, not replacement

+
+
+

+
+

+
+diff --git a/doc/todo/replace_HTML::Template_with_Template_Toolkit.mdwn b/doc/todo/replace_HTML::Template_with_Template_Toolkit.mdwn
+index 8650e4f..9725b65 100644
+--- a/doc/todo/replace_HTML::Template_with_Template_Toolkit.mdwn
++++ b/doc/todo/replace_HTML::Template_with_Template_Toolkit.mdwn
+@@ -61,3 +61,5 @@ HTML::Template's HTML-like markup prevents me from editing templates in KompoZer
+ 
+ 
+ I agree that being able to replace the template toolkit would be a great piece of modularity, and one I would use. If I could use the slot-based filling and the conditional logic from Template::Toolkit, we could build much more flexible inline and archivepage templates that would look different depending on where in the wiki we use them. Some of this can currently be accomplished with separate templates for each use case and a manual call to the right template in the !inline directive, but this is limited, cumbersome, and makes it difficult to reuse bits of formatting by trapping all of that information in multiple template files. -Ian
++
++> I don't wish HTML::Template to be *replaced* by Template::Toolkit - as others have said above, it's overkill for my needs.  However, I also agree that HTML::Template has its own problems too.  The idea of making the template system modular, with a choice of which backend to use - I really like that idea. It would enable me to use some other template system I like better, such as Text::Template or Text::NeatTemplate. But I think it would be a lot of work to implement, though perhaps no more work than making the revision-control backend modular, I guess.  One would need to write an IkiWiki template interface that didn't care what the backend was, and yet is somehow still flexible enough to take advantage of special features of different backends.  There are an *awful lot* of things that use templates - not just the `pagetemplate` and `template` plugins, but a number of others which have specialized templates of their own. -- [[KathrynAndersen]]
+
+

+

+
+
diff --git a/doc/recentchanges/change_ebcc0e6c9068bafaa52938a9f3aae6d6dd3d60aa._change b/doc/recentchanges/change_ebcc0e6c9068bafaa52938a9f3aae6d6dd3d60aa._change
new file mode 100644
index 000000000..eb22db19f
--- /dev/null
+++ b/doc/recentchanges/change_ebcc0e6c9068bafaa52938a9f3aae6d6dd3d60aa._change
@@ -0,0 +1,55 @@
+[[!meta author="""https://www.google.com/accounts/o8/id?id=AItOawmrVK0l7LGe93rzchPlVg7bukNgTsqTbn8"""]]
+
+[[!meta authorurl="""https://www.google.com/accounts/o8/id?id=AItOawmrVK0l7LGe93rzchPlVg7bukNgTsqTbn8"""]]
+
+[[!meta title="""change to todo/Add_nicer_math_formatting on ikiwiki"""]]
+
+[[!meta permalink="http://ikiwiki.info/recentchanges/#change-ebcc0e6c9068bafaa52938a9f3aae6d6dd3d60aa"]]
+
+

+
Changed pages:
+
+
+[[diff|wikiicons/diff.png]]todo/Add nicer math formatting
+
+
+
+
Changed by:
+
+
+micheal
+
+
+
Commit type:
+web
+
Date:
+09:35:34 11/12/10
+

+

+
+
+[[revert|wikiicons/revert.png]]
+
+
+

+
+

+
+

+
+diff --git a/doc/todo/Add_nicer_math_formatting.mdwn b/doc/todo/Add_nicer_math_formatting.mdwn
+index 6e082c1..3a5e94a 100644
+--- a/doc/todo/Add_nicer_math_formatting.mdwn
++++ b/doc/todo/Add_nicer_math_formatting.mdwn
+@@ -21,4 +21,6 @@ It would be nice to add nicer math formatting.  I currently use the
+ > I've posted a question about this to its forum:  --[[Joey]] 
+ > <https://sourceforge.net/projects/jsmath/forums/forum/592273/topic/3831574> 
+ 
++I think [mathjax](http://www.mathjax.org/) would be the best option. This is the math rendering engine used in mathoverflow.
++
+ [[!tag wishlist]]
+
+

+

+
+
diff --git a/doc/recentchanges/change_ec6c1269d251c78d2eef68cb789de6cfc6272464._change b/doc/recentchanges/change_ec6c1269d251c78d2eef68cb789de6cfc6272464._change
new file mode 100644
index 000000000..13d0c0641
--- /dev/null
+++ b/doc/recentchanges/change_ec6c1269d251c78d2eef68cb789de6cfc6272464._change
@@ -0,0 +1,106 @@
+[[!meta author="""joey"""]]
+
+[[!meta authorurl="""http://ikiwiki.info/ikiwiki.cgi?page=users%2Fjoey&do=goto"""]]
+
+[[!meta title="""change to ikiwiki/directive/more todo/selective_more_directive on ikiwiki"""]]
+
+[[!meta permalink="http://ikiwiki.info/recentchanges/#change-ec6c1269d251c78d2eef68cb789de6cfc6272464"]]
+
+

+
Changed pages:
+
+
+[[diff|wikiicons/diff.png]]ikiwiki/directive/more
+
+
+[[diff|wikiicons/diff.png]]todo/selective more directive
+
+
+
+
Changed by:
+
+
+joey
+
+
+
Commit type:
+git
+
Date:
+19:00:04 11/16/10
+

+

+
+
+[[revert|wikiicons/revert.png]]
+
+
+

+
+
+more: Add pages parameter to limit where the more is displayed. (thanks, dark)

+
+
+

+
+

+
+diff --git a/IkiWiki/Plugin/more.pm b/IkiWiki/Plugin/more.pm
+index 80e339a..6880e36 100644
+--- a/IkiWiki/Plugin/more.pm
++++ b/IkiWiki/Plugin/more.pm
+@@ -26,7 +26,10 @@ sub preprocess (@) {
+ 
+ 	$params{linktext} = $linktext unless defined $params{linktext};
+ 
+-	if ($params{page} ne $params{destpage}) {
++	if ($params{page} ne $params{destpage} &&
++	    (! exists $params{pages} ||
++	     pagespec_match($params{destpage}, $params{pages},
++		     location => $params{page}))) {
+ 		return "\n".
+ 			htmllink($params{page}, $params{destpage}, $params{page},
+ 				linktext => $params{linktext},
+diff --git a/debian/changelog b/debian/changelog
+index 91ff096..faabf19 100644
+--- a/debian/changelog
++++ b/debian/changelog
+@@ -1,6 +1,8 @@
+ ikiwiki (3.20101113) UNRELEASED; urgency=low
+ 
+   * websetup: Fix encoding problem when restoring old setup file.
++  * more: Add pages parameter to limit where the more is displayed.
++    (thanks, dark)
+ 
+  -- Joey Hess <joeyh@debian.org>  Tue, 16 Nov 2010 14:23:47 -0400
+ 
+diff --git a/doc/ikiwiki/directive/more.mdwn b/doc/ikiwiki/directive/more.mdwn
+index 5065519..bda1427 100644
+--- a/doc/ikiwiki/directive/more.mdwn
++++ b/doc/ikiwiki/directive/more.mdwn
+@@ -11,6 +11,11 @@ leads to the full version of the page. Use it like this:
+ 
+ If the `linktext` parameter is omitted it defaults to just "more".
+ 
++An optional `pages` parameter can be used to specify a
++[[ikiwiki/PageSpec]], and then the "more" link will only be displayed
++when the page is inlined into a page matching that PageSpec, and otherwise
++the full content shown.
++
+ Note that you can accomplish something similar using a [[toggle]] instead.
+ 
+ [[!meta robots="noindex, follow"]]
+diff --git a/doc/todo/selective_more_directive.mdwn b/doc/todo/selective_more_directive.mdwn
+index 24e6ab5..2a99982 100644
+--- a/doc/todo/selective_more_directive.mdwn
++++ b/doc/todo/selective_more_directive.mdwn
+@@ -24,3 +24,5 @@ I can now call it as
+ I'm not entirely happy with the design, since I would rather put this information in the inline directive instead of in every story post. Unfortunately I found no way to pass parameters from the inline directive to the inlined page.
+ 
+ -- [[dark]]
++
++> Me neither, but nor do I see a better way, so [[applied|done]]. --[[Joey]] 
+
+

+

+
+
diff --git a/doc/recentchanges/change_efba19b3379b0b4e4199ece869c71f80be3a82d1._change b/doc/recentchanges/change_efba19b3379b0b4e4199ece869c71f80be3a82d1._change
new file mode 100644
index 000000000..17cc453bb
--- /dev/null
+++ b/doc/recentchanges/change_efba19b3379b0b4e4199ece869c71f80be3a82d1._change
@@ -0,0 +1,66 @@
+[[!meta author="""http://smcv.pseudorandom.co.uk/"""]]
+
+[[!meta authorurl="""http://smcv.pseudorandom.co.uk/"""]]
+
+[[!meta title="""change to forum/Need_something_more_powerful_than_Exclude/comment_1_b454ead16d90479690ad8ee72cfd1428 on ikiwiki"""]]
+
+[[!meta permalink="http://ikiwiki.info/recentchanges/#change-efba19b3379b0b4e4199ece869c71f80be3a82d1"]]
+
+

+
Changed pages:
+
+
+[[diff|wikiicons/diff.png]]forum/Need something more powerful than Exclude/comment 1 b454ead16d90479690ad8ee72cfd1428
+
+
+
+
Changed by:
+
+
+smcv
+
+
+
Commit type:
+web
+
Date:
+10:43:09 11/23/10
+

+

+
+
+[[revert|wikiicons/revert.png]]
+
+
+

+
+
+Added a comment: expression anchored too closely?

+
+
+

+
+

+
+diff --git a/doc/forum/Need_something_more_powerful_than_Exclude/comment_1_b454ead16d90479690ad8ee72cfd1428._comment b/doc/forum/Need_something_more_powerful_than_Exclude/comment_1_b454ead16d90479690ad8ee72cfd1428._comment
+new file mode 100644
+index 0000000..6e29f0c
+--- /dev/null
++++ b/doc/forum/Need_something_more_powerful_than_Exclude/comment_1_b454ead16d90479690ad8ee72cfd1428._comment
+@@ -0,0 +1,12 @@
++[[!comment format=mdwn
++ username="http://smcv.pseudorandom.co.uk/"
++ nickname="smcv"
++ subject="expression anchored too closely?"
++ date="2010-11-23T10:43:08Z"
++ content="""
++It looks as though you might only be excluding a top-level Makefile, and not a Makefile in subdirectories. Try excluding `(^|/)Makefile$` instead, for instance? (See `wiki_file_prune_regexps` in `IkiWiki.pm` for hints.)
++
++The match operation in `&file_pruned` ends up a bit like this:
++
++    \"foo/Makefile\" =~ m{…||…|(^|/)Makefile$}
++"""]]
+
+

+

+
+
diff --git a/doc/recentchanges/change_f35f79a0b831e8b47f62c430c1bba538d4687521._change b/doc/recentchanges/change_f35f79a0b831e8b47f62c430c1bba538d4687521._change
new file mode 100644
index 000000000..c0a50712c
--- /dev/null
+++ b/doc/recentchanges/change_f35f79a0b831e8b47f62c430c1bba538d4687521._change
@@ -0,0 +1,100 @@
+[[!meta author="""http://kerravonsen.dreamwidth.org/"""]]
+
+[[!meta authorurl="""http://kerravonsen.dreamwidth.org/"""]]
+
+[[!meta title="""change to todo/Improving_the_efficiency_of_match__95__glob on ikiwiki"""]]
+
+[[!meta permalink="http://ikiwiki.info/recentchanges/#change-f35f79a0b831e8b47f62c430c1bba538d4687521"]]
+
+

+
Changed pages:
+
+
+[[diff|wikiicons/diff.png]]todo/Improving the efficiency of match_glob
+
+
+
+
Changed by:
+
+
+kerravonsen [dreamwidth.org]
+
+
+
Commit type:
+web
+
Date:
+17:08:45 11/10/10
+

+

+
+
+[[revert|wikiicons/revert.png]]
+
+
+

+
+
+response with benchmark

+
+
+

+
+

+
+diff --git a/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn b/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn
+index b631287..ff9784d 100644
+--- a/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn
++++ b/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn
+@@ -9,6 +9,47 @@ Here's my patch - please consider it! -- [[KathrynAndersen]]
+ >> I think so, yeah. Anyway, do you have any benchmark results handy,
+ >> Kathryn?  --[[Joey]] 
+ 
++>>> See below.
++>>> Also, would it make more sense for glob2re to return qr/^$re$/i rather than qr/$re/?  Everything that uses glob2re seems to use
++	$foo =~ /^$re$/i
++>>> rather than /$re/ so I think that would make sense.
++>>> -- [[KathrynAndersen]]
++
++--------------------------------------------------------------
++Benchmarks done with Devel::Profile on the same testbed IkiWiki setup.  I'm just showing the start of the profile output, since that's what's relevant.
++
++Before:
++<pre>
++time elapsed (wall):   27.4173
++time running program:  22.5909  (82.40%)
++time profiling (est.): 4.8264  (17.60%)
++number of calls:       1314729
++number of exceptions:  65
++
++%Time    Sec.     #calls   sec/call  F  name
++11.05    2.4969    62333   0.000040     IkiWiki::PageSpec::match_glob
++ 4.10    0.9261      679   0.001364     Text::Balanced::_match_tagged
++ 2.72    0.6139    59812   0.000010     IkiWiki::SuccessReason::merge_influences
++</pre>
++
++After:
++<pre>
++time elapsed (wall):   26.1843
++time running program:  21.5673  (82.37%)
++time profiling (est.): 4.6170  (17.63%)
++number of calls:       1252433
++number of exceptions:  65
++
++%Time    Sec.     #calls   sec/call  F  name
++ 7.66    1.6521    62333   0.000027     IkiWiki::PageSpec::match_glob
++ 4.33    0.9336      679   0.001375     Text::Balanced::_match_tagged
++ 2.81    0.6057    59812   0.000010     IkiWiki::SuccessReason::merge_influences
++</pre>
++
++Note that the seconds per call for match_glob in the "after" case has gone down by about a third.
++
++K.A.
++
+ --------------------------------------------------------------
+ <pre>
+ diff --git a/IkiWiki.pm b/IkiWiki.pm
+
+

+

+
+
diff --git a/doc/recentchanges/change_f54a91c3021b304fdde183834542418720e4f792._change b/doc/recentchanges/change_f54a91c3021b304fdde183834542418720e4f792._change
new file mode 100644
index 000000000..8d7d2471a
--- /dev/null
+++ b/doc/recentchanges/change_f54a91c3021b304fdde183834542418720e4f792._change
@@ -0,0 +1,71 @@
+[[!meta author="""https://www.google.com/accounts/o8/id?id=AItOawmE7z4CSv-ctBarutQCd70R3CcaSPPxjVk"""]]
+
+[[!meta authorurl="""https://www.google.com/accounts/o8/id?id=AItOawmE7z4CSv-ctBarutQCd70R3CcaSPPxjVk"""]]
+
+[[!meta title="""change to bugs/logout_in_ikiwiki on ikiwiki"""]]
+
+[[!meta permalink="http://ikiwiki.info/recentchanges/#change-f54a91c3021b304fdde183834542418720e4f792"]]
+
+

+
Changed pages:
+
+
+[[diff|wikiicons/diff.png]]bugs/logout in ikiwiki
+
+
+
+
Changed by:
+
+
+Dave
+
+
+
Commit type:
+web
+
Date:
+20:56:13 10/28/10
+

+

+
+
+[[revert|wikiicons/revert.png]]
+
+
+

+
+
+trying to figure out how to make ikiwiki slightly more interactive

+
+
+

+
+

+
+diff --git a/doc/bugs/logout_in_ikiwiki.mdwn b/doc/bugs/logout_in_ikiwiki.mdwn
+index 5df19c4..a9c407b 100644
+--- a/doc/bugs/logout_in_ikiwiki.mdwn
++++ b/doc/bugs/logout_in_ikiwiki.mdwn
+@@ -5,3 +5,18 @@ It looks like there is no way to logout of ikiwiki at present, meaning that if y
+ > It would be nice if it were not buried there, but putting it on the
+ > action bar statically would be confusing. The best approach might be to
+ > use javascript. --[[Joey]] 
++
++
++>> I agree that javascript seems to be a solution, but my brain falls 
++>> off the end of the world while looking at ways to manipulate the DOM. 
++>> (I'd argue also in favor of the openid_provider cookie expiring 
++>>  in less time than it does now, and being session based)
++
++>> It would be nice to move navigational elements to the upper right corner 
++>> of the page...
++
++>> I have two kinds of pages (wiki and blog), and three classes of users  
++>> anonymous users - display things like login, help, and recentchanges,
++>> non-admin users - on a per subdir basis (blog and !blog) display 
++>> logout, help, recentchanges, edit, comment 
++>> admin users - logout, help, recentchanges, edit, comment, etc
+
+

+

+
+
diff --git a/doc/recentchanges/change_f6312319a49cc1860eebbafd937a0f75d8e7baeb._change b/doc/recentchanges/change_f6312319a49cc1860eebbafd937a0f75d8e7baeb._change
new file mode 100644
index 000000000..3f06369b5
--- /dev/null
+++ b/doc/recentchanges/change_f6312319a49cc1860eebbafd937a0f75d8e7baeb._change
@@ -0,0 +1,59 @@
+[[!meta author="""http://churchkey.org/author/ian/"""]]
+
+[[!meta authorurl="""http://churchkey.org/author/ian/"""]]
+
+[[!meta title="""change to todo/replace_HTML::Template_with_Template_Toolkit on ikiwiki"""]]
+
+[[!meta permalink="http://ikiwiki.info/recentchanges/#change-f6312319a49cc1860eebbafd937a0f75d8e7baeb"]]
+
+

+
Changed pages:
+
+
+[[diff|wikiicons/diff.png]]todo/replace HTML::Template with Template Toolkit
+
+
+
+
Changed by:
+
+
+ian [churchkey.org/author]
+
+
+
Commit type:
+web
+
Date:
+11:50:37 11/15/10
+

+

+
+
+[[revert|wikiicons/revert.png]]
+
+
+

+
+
+added my reasons for wanting a replace-able template system

+
+
+

+
+

+
+diff --git a/doc/todo/replace_HTML::Template_with_Template_Toolkit.mdwn b/doc/todo/replace_HTML::Template_with_Template_Toolkit.mdwn
+index c4e78ca..8650e4f 100644
+--- a/doc/todo/replace_HTML::Template_with_Template_Toolkit.mdwn
++++ b/doc/todo/replace_HTML::Template_with_Template_Toolkit.mdwn
+@@ -58,3 +58,6 @@ Yes, Template::Toolkit is very powerful. But I think it's somehow overkill for a
+ I'd have to agree that Template::Toolkit is overkill and personally I'm not a fan, but it is very popular (there is even a book) and the new version (3) is alleged to be much more nimble than current version.  --[[ajt]]
+ 
+ HTML::Template's HTML-like markup prevents me from editing templates in KompoZer or other WYSIWYG HTML editors.  The editor tries to render the template markup rather than display it verbatim, and large parts of the template become invisible.  A markup syntax that doesn't confuse editors (such as Template::Toolkit's "[% FOO %]") may promote template customization.  The ability to replace the template engine would be within the spirit of ikiwiki's extensibility. --Rocco
++
++
++I agree that being able to replace the template toolkit would be a great piece of modularity, and one I would use. If I could use the slot-based filling and the conditional logic from Template::Toolkit, we could build much more flexible inline and archivepage templates that would look different depending on where in the wiki we use them. Some of this can currently be accomplished with separate templates for each use case and a manual call to the right template in the !inline directive, but this is limited, cumbersome, and makes it difficult to reuse bits of formatting by trapping all of that information in multiple template files. -Ian
+
+

+

+
+
diff --git a/doc/recentchanges/change_f80469c34d8d81e79d4894f7a1789a949bc766c3._change b/doc/recentchanges/change_f80469c34d8d81e79d4894f7a1789a949bc766c3._change
new file mode 100644
index 000000000..3076c3a1b
--- /dev/null
+++ b/doc/recentchanges/change_f80469c34d8d81e79d4894f7a1789a949bc766c3._change
@@ -0,0 +1,54 @@
+[[!meta author="""http://pmate.myopenid.com/"""]]
+
+[[!meta authorurl="""http://pmate.myopenid.com/"""]]
+
+[[!meta title="""change to tips/nearlyfreespeech/discussion on ikiwiki"""]]
+
+[[!meta permalink="http://ikiwiki.info/recentchanges/#change-f80469c34d8d81e79d4894f7a1789a949bc766c3"]]
+
+

+
Changed pages:
+
+
+[[diff|wikiicons/diff.png]]tips/nearlyfreespeech/discussion
+
+
+
+
Changed by:
+
+
+pmate [myopenid.com]
+
+
+
Commit type:
+web
+
Date:
+21:44:12 11/20/10
+

+

+
+
+[[revert|wikiicons/revert.png]]
+
+
+

+
+

+
+

+
+diff --git a/doc/tips/nearlyfreespeech/discussion.mdwn b/doc/tips/nearlyfreespeech/discussion.mdwn
+index 0d1f1f0..b764325 100644
+--- a/doc/tips/nearlyfreespeech/discussion.mdwn
++++ b/doc/tips/nearlyfreespeech/discussion.mdwn
+@@ -18,3 +18,5 @@ Thanks for your incredible work!
+ 
+ > You can move `~/ikiwiki` out of the way and then re-download and install
+ > it ikiwiki. --[[Joey]]
++
++Thanks a lot Joey. :-)
+
+

+

+
+
diff --git a/doc/recentchanges/change_f8f8770a652520b2f09eb2262510a04a8e353e9d._change b/doc/recentchanges/change_f8f8770a652520b2f09eb2262510a04a8e353e9d._change
new file mode 100644
index 000000000..4f394e68c
--- /dev/null
+++ b/doc/recentchanges/change_f8f8770a652520b2f09eb2262510a04a8e353e9d._change
@@ -0,0 +1,73 @@
+[[!meta author="""joey"""]]
+
+[[!meta authorurl="""http://ikiwiki.info/ikiwiki.cgi?page=users%2Fjoey&do=goto"""]]
+
+[[!meta title="""change to todo/Improving_the_efficiency_of_match__95__glob on ikiwiki"""]]
+
+[[!meta permalink="http://ikiwiki.info/recentchanges/#change-f8f8770a652520b2f09eb2262510a04a8e353e9d"]]
+
+

+
Changed pages:
+
+
+[[diff|wikiicons/diff.png]]todo/Improving the efficiency of match_glob
+
+
+
+
Changed by:
+
+
+joey
+
+
+
Commit type:
+git
+
Date:
+16:28:22 11/20/10
+

+

+
+
+[[revert|wikiicons/revert.png]]
+
+
+

+
+
+smcv/ready/glob-cache merged

+
+
+

+
+

+
+diff --git a/debian/changelog b/debian/changelog
+index 0edb780..65c2353 100644
+--- a/debian/changelog
++++ b/debian/changelog
+@@ -8,6 +8,7 @@ ikiwiki (3.20101113) UNRELEASED; urgency=low
+     and support all elements that HTML::Tagset knows about. 
+     (Which doesn't include html5 just yet, but then the old version
+     didn't either.) Bonus: 4 times faster than old regexp method.
++  * Optimise glob() pagespec. (Thanks, Kathryn and smcv)
+ 
+  -- Joey Hess <joeyh@debian.org>  Tue, 16 Nov 2010 14:23:47 -0400
+ 
+diff --git a/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn b/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn
+index 4fe1454..4e1df33 100644
+--- a/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn
++++ b/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn
+@@ -57,6 +57,8 @@ Here's my patch - please consider it! -- [[KathrynAndersen]]
+ >>>>>>> representative.
+ >>>>>>> --[[smcv]]
+ 
++[[done]] --[[Joey]] 
++
+ --------------------------------------------------------------
+ 
+ [[!toggle id="smcv-benchmark" text="current benchmarks"]]
+
+

+

+
+
diff --git a/doc/recentchanges/change_fa71b0e6aa08b0e3b274a0b939bf657f2576e482._change b/doc/recentchanges/change_fa71b0e6aa08b0e3b274a0b939bf657f2576e482._change
new file mode 100644
index 000000000..042b63b08
--- /dev/null
+++ b/doc/recentchanges/change_fa71b0e6aa08b0e3b274a0b939bf657f2576e482._change
@@ -0,0 +1,63 @@
+[[!meta author="""http://smcv.pseudorandom.co.uk/"""]]
+
+[[!meta authorurl="""http://smcv.pseudorandom.co.uk/"""]]
+
+[[!meta title="""change to plugins/contrib/default_content_for___42__copyright__42___and___42__license__42__ on ikiwiki"""]]
+
+[[!meta permalink="http://ikiwiki.info/recentchanges/#change-fa71b0e6aa08b0e3b274a0b939bf657f2576e482"]]
+
+

+
Changed pages:
+
+
+[[diff|wikiicons/diff.png]]plugins/contrib/default content for *copyright* and *license*
+
+
+
+
Changed by:
+
+
+smcv
+
+
+
Commit type:
+web
+
Date:
+14:23:43 11/01/10
+

+

+
+
+[[revert|wikiicons/revert.png]]
+
+
+

+
+
+added to git

+
+
+

+
+

+
+diff --git a/doc/plugins/contrib/default_content_for___42__copyright__42___and___42__license__42__.mdwn b/doc/plugins/contrib/default_content_for___42__copyright__42___and___42__license__42__.mdwn
+index ce2779d..c131143 100644
+--- a/doc/plugins/contrib/default_content_for___42__copyright__42___and___42__license__42__.mdwn
++++ b/doc/plugins/contrib/default_content_for___42__copyright__42___and___42__license__42__.mdwn
+@@ -45,3 +45,10 @@ by ikiwiki are likewise fine.  --[[tschwinge]]
+ > and can extend beyond just copyright and license, but has the disadvantage
+ > that it doesn't support setting defaults for a given "subdirectory"
+ > only. --[[smcv]]
++
++[[!template id=gitbranch name=smcv/contrib/defcopyright author="[[tschwinge]]"]]
++
++> For `./gitremotes` convenience (taking the Linus approach to backups :-) )
++> I've added this to my git repository as a branch. No review, approval or
++> ownership is implied, feel free to replace this with a branch in any other
++> repository --[[smcv]]
+
+

+

+
+
diff --git a/doc/recentchanges/change_ffeee19216182d633d251852ab62fe79c1367796._change b/doc/recentchanges/change_ffeee19216182d633d251852ab62fe79c1367796._change
new file mode 100644
index 000000000..a9995d8b6
--- /dev/null
+++ b/doc/recentchanges/change_ffeee19216182d633d251852ab62fe79c1367796._change
@@ -0,0 +1,61 @@
+[[!meta author="""http://kerravonsen.dreamwidth.org/"""]]
+
+[[!meta authorurl="""http://kerravonsen.dreamwidth.org/"""]]
+
+[[!meta title="""change to todo/transient_in-memory_pages on ikiwiki"""]]
+
+[[!meta permalink="http://ikiwiki.info/recentchanges/#change-ffeee19216182d633d251852ab62fe79c1367796"]]
+
+

+
Changed pages:
+
+
+[[diff|wikiicons/diff.png]]todo/transient in-memory pages
+
+
+
+
Changed by:
+
+
+kerravonsen [dreamwidth.org]
+
+
+
Commit type:
+web
+
Date:
+01:43:56 11/15/10
+

+

+
+
+[[revert|wikiicons/revert.png]]
+
+
+

+
+
+make it more generic?

+
+
+

+
+

+
+diff --git a/doc/todo/transient_in-memory_pages.mdwn b/doc/todo/transient_in-memory_pages.mdwn
+index 5dbbe4f..816e95c 100644
+--- a/doc/todo/transient_in-memory_pages.mdwn
++++ b/doc/todo/transient_in-memory_pages.mdwn
+@@ -41,3 +41,8 @@ Refinements that could be made if this approach seems reasonable:
+ 
+ * make these options boolean, and have the path always be `.ikiwiki/transient`
+ * improve the `remove` plugin so it also deletes from this special underlay
++
++>> Perhaps it should be something more generic, so that other plugins could use it (such as "album" mentioned above).
++>> The `.ikiwiki/transient` would suit this, but instead of saying "tag_underlay" or "autoindex_underlay" have "use_transient_underlay" or something like that?
++>> Or to make it more flexible, have just one option "transient_underlay" which is set to an absolute path, and if it is set, then one is using a transient-underlay.
++>> --[[KathrynAndersen]]
+
+

+

+
+
diff --git a/doc/todo/autoindex_should_use_add__95__autofile.mdwn b/doc/todo/autoindex_should_use_add__95__autofile.mdwn
index 64f81c82e..19c5004f8 100644
--- a/doc/todo/autoindex_should_use_add__95__autofile.mdwn
+++ b/doc/todo/autoindex_should_use_add__95__autofile.mdwn
@@ -1,4 +1,4 @@
 `add_autofile` is a generic version of [[plugins/autoindex]]'s code,
 so the latter should probably use the former. --[[smcv]]
 
-> See [[todo/transient in-memory pages]] for progress on this. --[[smcv]]
+> See [[todo/transient_pages]] for progress on this. --[[smcv]]
-- 
cgit v1.2.3


From 3acf76ac54434d24d7acb668878a987c40212f30 Mon Sep 17 00:00:00 2001
From: Joey Hess 
Date: Sat, 27 Nov 2010 23:29:25 +0000
Subject:

---
 doc/todo/auto-create_tag_pages_according_to_a_template.mdwn | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'doc')

diff --git a/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn b/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
index e065c4a3d..16dc78fb2 100644
--- a/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
+++ b/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
@@ -260,8 +260,8 @@ required to implement [[todo/alias directive]], which couldn't be easily done
 by writing to the RCS as the page's contents can change depending on which
 other pages claim it as an alias. --[[chrysn]]
 
-I agree with [[chrysn]]. In fact, is there any good reason that the core tag plugin doesn't do this? The current usability is horrible, to the point that I have gone 2.5 years with Ikiwiki and haven't yet started using tags. -- [[Eric|http://wiki.pdxhub.org/people/eric]]
+I agree with [[chrysn]]. In fact, is there any good reason that the core tag plugin doesn't do this? The current usability is horrible, to the point that I have gone 2.5 years with Ikiwiki and haven't yet started using tags. -- 
 
-> See [[todo/transient in-memory pages]] for progress on this. --[[smcv]]
+> See [[todo/transient_pages]] for progress on this. --[[smcv]]
 
 [[!tag done]]
-- 
cgit v1.2.3


From 3c2d9e10380d7e2c38f8368f2bd922a62b240ef9 Mon Sep 17 00:00:00 2001
From: Joey Hess 
Date: Sat, 27 Nov 2010 23:29:27 +0000
Subject:

---
 doc/plugins/autoindex/discussion.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'doc')

diff --git a/doc/plugins/autoindex/discussion.mdwn b/doc/plugins/autoindex/discussion.mdwn
index 6b13d2342..76d09cd3c 100644
--- a/doc/plugins/autoindex/discussion.mdwn
+++ b/doc/plugins/autoindex/discussion.mdwn
@@ -6,7 +6,7 @@ for the html output and not place the markdown files in the wiki source?
 > writing them out, as [[JoeRayhawk]] suggests below? I think
 > add_autofile would be the way to do this.
 > I've added this to [[todo]] as [[todo/autoindex should use add__95__autofile]]
-> and [[todo/transient in-memory pages]]. --[[smcv]]
+> and [[todo/transient_pages]]. --[[smcv]]
 
 The reason being that I have a lot of directories which need to be autoindexed,
 but I would prefer if the index files didn't clutter up my git repository.
-- 
cgit v1.2.3


From d5b03507cd3598ccb41fb8cc5eb6e00b467cb8b3 Mon Sep 17 00:00:00 2001
From: Joey Hess 
Date: Sat, 27 Nov 2010 19:41:51 -0400
Subject: remove files apparently misstaged and committed during link fixup
 after a rename

---
 ...3f04d48d53a3cd77215d6b086b416a1965e2feb._change |  56 -----
 ...8a20a3deaca2cb1f68fba993411b51c19e4c362._change |  62 ------
 ...a7db85f06674311b80b490dfc238a1eaed040f8._change |  57 -----
 ...e4e3f7cae25082fc90a93dee41b397b0ae9be09._change |  74 -------
 ...ea5f43790fe2ce3cc40e9513191e72c67a1ee51._change |  69 ------
 ...71c429f829aac53cb449e3bb574d2a1669e025e._change |  93 --------
 ...72f41f6de288814fbd013f3465e658c562b10b1._change |  66 ------
 ...739dbe0a8dc943c736d69f3747251ad72a53278._change |  62 ------
 ...78d6a16c2fff68edfbe6a1af5c8a9fa91db6039._change |  90 --------
 ...968317cacc2f555af17286acf26a60ce616cc40._change |  67 ------
 ...b770bea3fd5b5dfb4e75237218db204139d9189._change |  51 -----
 ...f32f5e6184b6354f671ae71578f1158c49168b6._change |  55 -----
 ...38259dfa199e217e34cc02462f55df6b2b1fcc5._change |  56 -----
 ...3e3e5f15e61639ccba4a7dfbab11d6fe4b9f047._change |  69 ------
 ...63cfa7d1e938e3b41d1b6826427f0d613b2b97c._change |  64 ------
 ...a452ddf146c4148155095e400f56b4674d76953._change |  64 ------
 ...c17255b6641e33374a446ca281a0ad6d46af1dc._change |  63 ------
 ...fdda536ec6bee1eff3b71c214753078cd588f8f._change |  58 -----
 ...13a28b8f68b76aee4b94413e4e9d47dca93a34e._change |  63 ------
 ...08af2bb9e10d2ed899e17f9814a5514c0254dc8._change |  68 ------
 ...15effbb43663ad756d78b3e957ac593d0227a74._change |  55 -----
 ...71ac78068532da53e4dad49d52c5ddccfcbff21._change |  58 -----
 ...7726461a4119741affa6536deec7dd1fe52ef0d._change |  73 -------
 ...7b9f10e6254277918873a980af0cf0631326165._change |  60 ------
 ...3e519931f3a6b7cea0af652d749344757d4e2bc._change | 112 ----------
 ...430d5dc3bc37df92eb01cd65382c0f2be78b8e7._change |  70 ------
 ...954915a4fe8a889b8217cac99fae53cbe7f1e97._change | 108 ----------
 ...dbf25127fb776cc52a3a142b805a0c7f3cef242._change | 140 ------------
 ...ecba3b05d66bb58dc48a9027838e8b0bcbc0db9._change |  74 -------
 ...f750e16b8c32d2fd69209f433e7d19efa53a71f._change |  77 -------
 ...08cef54d63ba60efd24ae14012dda7ff8d014a9._change |  61 ------
 ...1218e338a7517b25fc82697c3a11fff1edb6803._change |  66 ------
 ...15bf4fe15e7300bc033724bf86eecb6a2efef49._change |  65 ------
 ...2fc5d0c3cfdde0ae87c5364db6f6ebfa6794b14._change | 102 ---------
 ...5873fee5e1dda78d6cf561cdd81a5dcd6d2735d._change |  63 ------
 ...5e726f201d7b9919271cfe7e8a7314a6abf0fc3._change |  90 --------
 ...5ecc73755348f1ed13b77b2f4bdf9db4e465be4._change | 109 ----------
 ...63d2578832dd0808ea98a624b49cec4bf3c0243._change |  52 -----
 ...9a22a6f4b4dfc47a7ce39476758742036b70e63._change |  80 -------
 ...8a2e59834d35da7a7ab8145beb7a30b59b95c90._change |  59 ------
 ...4fff62948ad7c7aef664585e8afed86398e7fd4._change |  62 ------
 ...5d262e4cab2bfa55194b445d7fd251fa5818bc6._change |  55 -----
 ...5ee24a9e53aec7d70bb4fb758428e59ea76e853._change |  56 -----
 ...7a42450e1ac8e2e01b7ed2785ed43040fd14ed3._change |  55 -----
 ...806a9795116e73ec851dfea89af45a786fbe6da._change |  58 -----
 ...935a131d02ac13b6024dff9cbf7a5f837fcdc04._change | 161 --------------
 ...de7fde49c295a6c9098767b9fdfea79de8476eb._change |  59 ------
 ...180381728e252cf474eb8a4b0460755b5c28340._change |  75 -------
 ...3e15cc84f47a1340f8bd06d7056ba423fe510bb._change |  60 ------
 ...8d0883c8949e6cde8db019bb282d5fa815ffc1a._change | 137 ------------
 ...9749dfdeac07b975cfba6eef617f3d7362eec73._change |  61 ------
 ...a7387a53be2b1e182003f3e86cb76d7f10c4b67._change |  76 -------
 ...b01c9779ef682af0874efc062d9fb2e91676c23._change |  66 ------
 ...c42f5786601429a0b921d6591ebf5e4c1eb4da8._change |  70 ------
 ...c8f86ee9c59035c9462d2c69c7b89d0c9dbc3c2._change |  58 -----
 ...d0ac3170a8f90d2139ef75698e8af21a6435fb4._change |  58 -----
 ...d26a72468fad69d633875b4ffb4aff8abd80023._change | 105 ---------
 ...f8cfe998e5ced7e4b2e1dd819a025b0745935ff._change |  59 ------
 ...194fbc5bced565fa751008b8ada666c411d097d._change |  60 ------
 ...2a1d2b2d96ede3f6a25d2d0fb89681ec5e05ff3._change |  62 ------
 ...4cb86d73327e7850eeb524ef387b17ac5e1614d._change |  59 ------
 ...6c3d71787c528888c3f66c7ded8dd0c8f430b7e._change |  57 -----
 ...b96249d5ad8f3ee9275be3fef9e3467b8f3ffdf._change |  64 ------
 ...f0bfcc07820008f0387bfd1b35a594ed40a0246._change |  57 -----
 ...f75602391ac9651e7594c65588da86d591f2c01._change |  51 -----
 ...62581583107f6fc3e9bccf66a87a491c236757f._change |  51 -----
 ...02f9d224cb78a3ad880cb749ef4a11eadfad79a._change |  58 -----
 ...1f3129583ae4a1e3e9ace89ba11c8bf6c308be3._change |  60 ------
 ...3624227620f5034fa84b3cb1294a61fc08eeea9._change |  55 -----
 ...8537b41320e1f38b2369f24431423dfb2f14b15._change |  61 ------
 ...9b737cc8596f9421ba968e56839eb052e80e794._change |  98 ---------
 ...a166361973e09b6756acbfe46b4a1bcfa4148d7._change |  53 -----
 ...b45d3cf44760411746414ba1218c925ad097149._change |  65 ------
 ...bcd9077ad5fbef8c0622ea9c78a66c9baece804._change |  57 -----
 ...cd80905f7ea02ef07c2174ab2e8bd5f8ab0afc3._change |  57 -----
 ...fc1b6ac486e11cb11d6c72602bf70b0a440b747._change |  59 ------
 ...16104f55d8b31929d0466ca9abc3ccb4af0a8e8._change |  72 -------
 ...5056fb61e8332fea658363e931ec28a35681ffe._change |  68 ------
 ...6ff694ff7a6a4700ccbbd5819907eac73cf065a._change | 236 ---------------------
 ...916cd2f71f1c22dad947d7b2134edbbb15e7b8e._change | 120 -----------
 ...a9e1ea667f82d5fca9168dbed19be08040570ff._change |  96 ---------
 ...af89f59e61d9091fe27dd8738b40db5fa85a5e6._change |  59 ------
 ...b3fb406733b98535d426acedd58f1633df79ade._change |  52 -----
 ...d9796375895752621cdcce103d1ad8d8a31d6cb._change |  69 ------
 ...68f29eebb3917909b939869e57b985add724598._change |  61 ------
 ...810fe394b49955971299329136d46548d95ec6b._change |  63 ------
 ...aa04125d7080a9c882b629d1e0f6c7992ad462f._change |  58 -----
 ...b13521f5276cdd21a3f5990b1a1a17234e40174._change |  58 -----
 ...bcc0e6c9068bafaa52938a9f3aae6d6dd3d60aa._change |  55 -----
 ...c6c1269d251c78d2eef68cb789de6cfc6272464._change | 106 ---------
 ...fba19b3379b0b4e4199ece869c71f80be3a82d1._change |  66 ------
 ...35f79a0b831e8b47f62c430c1bba538d4687521._change | 100 ---------
 ...54a91c3021b304fdde183834542418720e4f792._change |  71 -------
 ...6312319a49cc1860eebbafd937a0f75d8e7baeb._change |  59 ------
 ...80469c34d8d81e79d4894f7a1789a949bc766c3._change |  54 -----
 ...8f8770a652520b2f09eb2262510a04a8e353e9d._change |  73 -------
 ...a71b0e6aa08b0e3b274a0b939bf657f2576e482._change |  63 ------
 ...feee19216182d633d251852ab62fe79c1367796._change |  61 ------
 98 files changed, 7016 deletions(-)
 delete mode 100644 doc/recentchanges/change_03f04d48d53a3cd77215d6b086b416a1965e2feb._change
 delete mode 100644 doc/recentchanges/change_08a20a3deaca2cb1f68fba993411b51c19e4c362._change
 delete mode 100644 doc/recentchanges/change_0a7db85f06674311b80b490dfc238a1eaed040f8._change
 delete mode 100644 doc/recentchanges/change_0e4e3f7cae25082fc90a93dee41b397b0ae9be09._change
 delete mode 100644 doc/recentchanges/change_0ea5f43790fe2ce3cc40e9513191e72c67a1ee51._change
 delete mode 100644 doc/recentchanges/change_171c429f829aac53cb449e3bb574d2a1669e025e._change
 delete mode 100644 doc/recentchanges/change_172f41f6de288814fbd013f3465e658c562b10b1._change
 delete mode 100644 doc/recentchanges/change_1739dbe0a8dc943c736d69f3747251ad72a53278._change
 delete mode 100644 doc/recentchanges/change_178d6a16c2fff68edfbe6a1af5c8a9fa91db6039._change
 delete mode 100644 doc/recentchanges/change_1968317cacc2f555af17286acf26a60ce616cc40._change
 delete mode 100644 doc/recentchanges/change_1b770bea3fd5b5dfb4e75237218db204139d9189._change
 delete mode 100644 doc/recentchanges/change_1f32f5e6184b6354f671ae71578f1158c49168b6._change
 delete mode 100644 doc/recentchanges/change_238259dfa199e217e34cc02462f55df6b2b1fcc5._change
 delete mode 100644 doc/recentchanges/change_23e3e5f15e61639ccba4a7dfbab11d6fe4b9f047._change
 delete mode 100644 doc/recentchanges/change_263cfa7d1e938e3b41d1b6826427f0d613b2b97c._change
 delete mode 100644 doc/recentchanges/change_2a452ddf146c4148155095e400f56b4674d76953._change
 delete mode 100644 doc/recentchanges/change_2c17255b6641e33374a446ca281a0ad6d46af1dc._change
 delete mode 100644 doc/recentchanges/change_2fdda536ec6bee1eff3b71c214753078cd588f8f._change
 delete mode 100644 doc/recentchanges/change_313a28b8f68b76aee4b94413e4e9d47dca93a34e._change
 delete mode 100644 doc/recentchanges/change_408af2bb9e10d2ed899e17f9814a5514c0254dc8._change
 delete mode 100644 doc/recentchanges/change_415effbb43663ad756d78b3e957ac593d0227a74._change
 delete mode 100644 doc/recentchanges/change_471ac78068532da53e4dad49d52c5ddccfcbff21._change
 delete mode 100644 doc/recentchanges/change_47726461a4119741affa6536deec7dd1fe52ef0d._change
 delete mode 100644 doc/recentchanges/change_47b9f10e6254277918873a980af0cf0631326165._change
 delete mode 100644 doc/recentchanges/change_53e519931f3a6b7cea0af652d749344757d4e2bc._change
 delete mode 100644 doc/recentchanges/change_5430d5dc3bc37df92eb01cd65382c0f2be78b8e7._change
 delete mode 100644 doc/recentchanges/change_5954915a4fe8a889b8217cac99fae53cbe7f1e97._change
 delete mode 100644 doc/recentchanges/change_5dbf25127fb776cc52a3a142b805a0c7f3cef242._change
 delete mode 100644 doc/recentchanges/change_5ecba3b05d66bb58dc48a9027838e8b0bcbc0db9._change
 delete mode 100644 doc/recentchanges/change_5f750e16b8c32d2fd69209f433e7d19efa53a71f._change
 delete mode 100644 doc/recentchanges/change_608cef54d63ba60efd24ae14012dda7ff8d014a9._change
 delete mode 100644 doc/recentchanges/change_61218e338a7517b25fc82697c3a11fff1edb6803._change
 delete mode 100644 doc/recentchanges/change_615bf4fe15e7300bc033724bf86eecb6a2efef49._change
 delete mode 100644 doc/recentchanges/change_62fc5d0c3cfdde0ae87c5364db6f6ebfa6794b14._change
 delete mode 100644 doc/recentchanges/change_65873fee5e1dda78d6cf561cdd81a5dcd6d2735d._change
 delete mode 100644 doc/recentchanges/change_65e726f201d7b9919271cfe7e8a7314a6abf0fc3._change
 delete mode 100644 doc/recentchanges/change_65ecc73755348f1ed13b77b2f4bdf9db4e465be4._change
 delete mode 100644 doc/recentchanges/change_663d2578832dd0808ea98a624b49cec4bf3c0243._change
 delete mode 100644 doc/recentchanges/change_69a22a6f4b4dfc47a7ce39476758742036b70e63._change
 delete mode 100644 doc/recentchanges/change_78a2e59834d35da7a7ab8145beb7a30b59b95c90._change
 delete mode 100644 doc/recentchanges/change_84fff62948ad7c7aef664585e8afed86398e7fd4._change
 delete mode 100644 doc/recentchanges/change_85d262e4cab2bfa55194b445d7fd251fa5818bc6._change
 delete mode 100644 doc/recentchanges/change_85ee24a9e53aec7d70bb4fb758428e59ea76e853._change
 delete mode 100644 doc/recentchanges/change_87a42450e1ac8e2e01b7ed2785ed43040fd14ed3._change
 delete mode 100644 doc/recentchanges/change_8806a9795116e73ec851dfea89af45a786fbe6da._change
 delete mode 100644 doc/recentchanges/change_8935a131d02ac13b6024dff9cbf7a5f837fcdc04._change
 delete mode 100644 doc/recentchanges/change_8de7fde49c295a6c9098767b9fdfea79de8476eb._change
 delete mode 100644 doc/recentchanges/change_9180381728e252cf474eb8a4b0460755b5c28340._change
 delete mode 100644 doc/recentchanges/change_93e15cc84f47a1340f8bd06d7056ba423fe510bb._change
 delete mode 100644 doc/recentchanges/change_98d0883c8949e6cde8db019bb282d5fa815ffc1a._change
 delete mode 100644 doc/recentchanges/change_99749dfdeac07b975cfba6eef617f3d7362eec73._change
 delete mode 100644 doc/recentchanges/change_9a7387a53be2b1e182003f3e86cb76d7f10c4b67._change
 delete mode 100644 doc/recentchanges/change_9b01c9779ef682af0874efc062d9fb2e91676c23._change
 delete mode 100644 doc/recentchanges/change_9c42f5786601429a0b921d6591ebf5e4c1eb4da8._change
 delete mode 100644 doc/recentchanges/change_9c8f86ee9c59035c9462d2c69c7b89d0c9dbc3c2._change
 delete mode 100644 doc/recentchanges/change_9d0ac3170a8f90d2139ef75698e8af21a6435fb4._change
 delete mode 100644 doc/recentchanges/change_9d26a72468fad69d633875b4ffb4aff8abd80023._change
 delete mode 100644 doc/recentchanges/change_9f8cfe998e5ced7e4b2e1dd819a025b0745935ff._change
 delete mode 100644 doc/recentchanges/change_a194fbc5bced565fa751008b8ada666c411d097d._change
 delete mode 100644 doc/recentchanges/change_a2a1d2b2d96ede3f6a25d2d0fb89681ec5e05ff3._change
 delete mode 100644 doc/recentchanges/change_a4cb86d73327e7850eeb524ef387b17ac5e1614d._change
 delete mode 100644 doc/recentchanges/change_a6c3d71787c528888c3f66c7ded8dd0c8f430b7e._change
 delete mode 100644 doc/recentchanges/change_ab96249d5ad8f3ee9275be3fef9e3467b8f3ffdf._change
 delete mode 100644 doc/recentchanges/change_af0bfcc07820008f0387bfd1b35a594ed40a0246._change
 delete mode 100644 doc/recentchanges/change_af75602391ac9651e7594c65588da86d591f2c01._change
 delete mode 100644 doc/recentchanges/change_b62581583107f6fc3e9bccf66a87a491c236757f._change
 delete mode 100644 doc/recentchanges/change_c02f9d224cb78a3ad880cb749ef4a11eadfad79a._change
 delete mode 100644 doc/recentchanges/change_c1f3129583ae4a1e3e9ace89ba11c8bf6c308be3._change
 delete mode 100644 doc/recentchanges/change_c3624227620f5034fa84b3cb1294a61fc08eeea9._change
 delete mode 100644 doc/recentchanges/change_c8537b41320e1f38b2369f24431423dfb2f14b15._change
 delete mode 100644 doc/recentchanges/change_c9b737cc8596f9421ba968e56839eb052e80e794._change
 delete mode 100644 doc/recentchanges/change_ca166361973e09b6756acbfe46b4a1bcfa4148d7._change
 delete mode 100644 doc/recentchanges/change_cb45d3cf44760411746414ba1218c925ad097149._change
 delete mode 100644 doc/recentchanges/change_cbcd9077ad5fbef8c0622ea9c78a66c9baece804._change
 delete mode 100644 doc/recentchanges/change_ccd80905f7ea02ef07c2174ab2e8bd5f8ab0afc3._change
 delete mode 100644 doc/recentchanges/change_cfc1b6ac486e11cb11d6c72602bf70b0a440b747._change
 delete mode 100644 doc/recentchanges/change_d16104f55d8b31929d0466ca9abc3ccb4af0a8e8._change
 delete mode 100644 doc/recentchanges/change_d5056fb61e8332fea658363e931ec28a35681ffe._change
 delete mode 100644 doc/recentchanges/change_d6ff694ff7a6a4700ccbbd5819907eac73cf065a._change
 delete mode 100644 doc/recentchanges/change_d916cd2f71f1c22dad947d7b2134edbbb15e7b8e._change
 delete mode 100644 doc/recentchanges/change_da9e1ea667f82d5fca9168dbed19be08040570ff._change
 delete mode 100644 doc/recentchanges/change_daf89f59e61d9091fe27dd8738b40db5fa85a5e6._change
 delete mode 100644 doc/recentchanges/change_db3fb406733b98535d426acedd58f1633df79ade._change
 delete mode 100644 doc/recentchanges/change_dd9796375895752621cdcce103d1ad8d8a31d6cb._change
 delete mode 100644 doc/recentchanges/change_e68f29eebb3917909b939869e57b985add724598._change
 delete mode 100644 doc/recentchanges/change_e810fe394b49955971299329136d46548d95ec6b._change
 delete mode 100644 doc/recentchanges/change_eaa04125d7080a9c882b629d1e0f6c7992ad462f._change
 delete mode 100644 doc/recentchanges/change_eb13521f5276cdd21a3f5990b1a1a17234e40174._change
 delete mode 100644 doc/recentchanges/change_ebcc0e6c9068bafaa52938a9f3aae6d6dd3d60aa._change
 delete mode 100644 doc/recentchanges/change_ec6c1269d251c78d2eef68cb789de6cfc6272464._change
 delete mode 100644 doc/recentchanges/change_efba19b3379b0b4e4199ece869c71f80be3a82d1._change
 delete mode 100644 doc/recentchanges/change_f35f79a0b831e8b47f62c430c1bba538d4687521._change
 delete mode 100644 doc/recentchanges/change_f54a91c3021b304fdde183834542418720e4f792._change
 delete mode 100644 doc/recentchanges/change_f6312319a49cc1860eebbafd937a0f75d8e7baeb._change
 delete mode 100644 doc/recentchanges/change_f80469c34d8d81e79d4894f7a1789a949bc766c3._change
 delete mode 100644 doc/recentchanges/change_f8f8770a652520b2f09eb2262510a04a8e353e9d._change
 delete mode 100644 doc/recentchanges/change_fa71b0e6aa08b0e3b274a0b939bf657f2576e482._change
 delete mode 100644 doc/recentchanges/change_ffeee19216182d633d251852ab62fe79c1367796._change

(limited to 'doc')

diff --git a/doc/recentchanges/change_03f04d48d53a3cd77215d6b086b416a1965e2feb._change b/doc/recentchanges/change_03f04d48d53a3cd77215d6b086b416a1965e2feb._change
deleted file mode 100644
index 703d0dced..000000000
--- a/doc/recentchanges/change_03f04d48d53a3cd77215d6b086b416a1965e2feb._change
+++ /dev/null
@@ -1,56 +0,0 @@
-[[!meta author="""http://pmate.myopenid.com/"""]]
-
-[[!meta authorurl="""http://pmate.myopenid.com/"""]]
-
-[[!meta title="""change to ikiwikiusers on ikiwiki"""]]
-
-[[!meta permalink="http://ikiwiki.info/recentchanges/#change-03f04d48d53a3cd77215d6b086b416a1965e2feb"]]
-
-

-
Changed pages:
-
-
-[[diff|wikiicons/diff.png]]ikiwikiusers
-
-
-
-
Changed by:
-
-
-pmate [myopenid.com]
-
-
-
Commit type:
-web
-
Date:
-08:03:09 11/17/10
-

-

-
-
-[[revert|wikiicons/revert.png]]
-
-
-

-
-

-
-

-
-diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn
-index d8e55ba..699eeda 100644
---- a/doc/ikiwikiusers.mdwn
-+++ b/doc/ikiwikiusers.mdwn
-@@ -161,6 +161,7 @@ Personal sites and blogs
- * [Marco Silva](http://marcot.eti.br/) a weblog + wiki using the [darcs](http://darcs.net) backend
- * [NeX-6](http://nex-6.taht.net/) ikiwiki blog and wiki running over ipv6
- * [Jason Riedy](http://lovesgoodfood.com/jason/), which may occasionally look funny if I'm playing with my branch...
-+* [pmate](http://pmate.nfshost.com)'s homepage and [blog](http://pmate.nfshost.com/blog/)
- 
- Please feel free to add your own ikiwiki site!
- 
-
-

-

-
-
diff --git a/doc/recentchanges/change_08a20a3deaca2cb1f68fba993411b51c19e4c362._change b/doc/recentchanges/change_08a20a3deaca2cb1f68fba993411b51c19e4c362._change
deleted file mode 100644
index e55c80e85..000000000
--- a/doc/recentchanges/change_08a20a3deaca2cb1f68fba993411b51c19e4c362._change
+++ /dev/null
@@ -1,62 +0,0 @@
-[[!meta author="""joey"""]]
-
-[[!meta authorurl="""http://ikiwiki.info/ikiwiki.cgi?page=users%2Fjoey&do=goto"""]]
-
-[[!meta title="""change to todo/Improving_the_efficiency_of_match__95__glob on ikiwiki"""]]
-
-[[!meta permalink="http://ikiwiki.info/recentchanges/#change-08a20a3deaca2cb1f68fba993411b51c19e4c362"]]
-
-

-
Changed pages:
-
-
-[[diff|wikiicons/diff.png]]todo/Improving the efficiency of match_glob
-
-
-
-
Changed by:
-
-
-joey
-
-
-
Commit type:
-git
-
Date:
-11:37:59 11/10/10
-

-

-
-
-[[revert|wikiicons/revert.png]]
-
-
-

-
-
-benchmarks

-
-
-

-
-

-
-diff --git a/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn b/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn
-index 0a9d8c6..b631287 100644
---- a/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn
-+++ b/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn
-@@ -6,6 +6,9 @@ Here's my patch - please consider it! -- [[KathrynAndersen]]
- > `memoize(glob2re)` next to the other memoize calls, would be a less
- > verbose way to do this? --[[smcv]]
- 
-+>> I think so, yeah. Anyway, do you have any benchmark results handy,
-+>> Kathryn?  --[[Joey]] 
-+
- --------------------------------------------------------------
- <pre>
- diff --git a/IkiWiki.pm b/IkiWiki.pm
-
-

-

-
-
diff --git a/doc/recentchanges/change_0a7db85f06674311b80b490dfc238a1eaed040f8._change b/doc/recentchanges/change_0a7db85f06674311b80b490dfc238a1eaed040f8._change
deleted file mode 100644
index 5140dc1ad..000000000
--- a/doc/recentchanges/change_0a7db85f06674311b80b490dfc238a1eaed040f8._change
+++ /dev/null
@@ -1,57 +0,0 @@
-[[!meta author="""https://www.google.com/accounts/o8/id?id=AItOawmMInRJfXlDaAMktsWQKahl1C7X4cGrUtE"""]]
-
-[[!meta authorurl="""https://www.google.com/accounts/o8/id?id=AItOawmMInRJfXlDaAMktsWQKahl1C7X4cGrUtE"""]]
-
-[[!meta title="""change to index on ikiwiki"""]]
-
-[[!meta permalink="http://ikiwiki.info/recentchanges/#change-0a7db85f06674311b80b490dfc238a1eaed040f8"]]
-
-

-
Changed pages:
-
-
-[[diff|wikiicons/diff.png]]index
-
-
-
-
Changed by:
-
-
-Sarfaraz
-
-
-
Commit type:
-web
-
Date:
-19:01:14 11/11/10
-

-

-
-
-[[revert|wikiicons/revert.png]]
-
-
-

-
-

-
-

-
-diff --git a/doc/index.mdwn b/doc/index.mdwn
-index 06acc9c..90713d1 100644
---- a/doc/index.mdwn
-+++ b/doc/index.mdwn
-@@ -17,7 +17,7 @@ All wikis are supposed to have a [[SandBox]], so this one does too.
- This site generally runs the latest release of ikiwiki; currently, it runs
- ikiwiki [[!version ]].
- 
--## developer resources
-+## developer resources sas
- 
- The [[RoadMap]] describes where the project is going.
- The [[forum]] is open for discussions.
-
-

-

-
-
diff --git a/doc/recentchanges/change_0e4e3f7cae25082fc90a93dee41b397b0ae9be09._change b/doc/recentchanges/change_0e4e3f7cae25082fc90a93dee41b397b0ae9be09._change
deleted file mode 100644
index 63830fd4c..000000000
--- a/doc/recentchanges/change_0e4e3f7cae25082fc90a93dee41b397b0ae9be09._change
+++ /dev/null
@@ -1,74 +0,0 @@
-[[!meta author="""http://smcv.pseudorandom.co.uk/"""]]
-
-[[!meta authorurl="""http://smcv.pseudorandom.co.uk/"""]]
-
-[[!meta title="""change to todo/transient_in-memory_pages on ikiwiki"""]]
-
-[[!meta permalink="http://ikiwiki.info/recentchanges/#change-0e4e3f7cae25082fc90a93dee41b397b0ae9be09"]]
-
-

-
Changed pages:
-
-
-[[diff|wikiicons/diff.png]]todo/transient in-memory pages
-
-
-
-
Changed by:
-
-
-smcv
-
-
-
Commit type:
-web
-
Date:
-08:10:20 11/08/10
-

-

-
-
-[[revert|wikiicons/revert.png]]
-
-
-

-
-
-suggested in two places => useful?

-
-
-

-
-

-
-diff --git a/doc/todo/transient_in-memory_pages.mdwn b/doc/todo/transient_in-memory_pages.mdwn
-new file mode 100644
-index 0000000..9808ffd
---- /dev/null
-+++ b/doc/todo/transient_in-memory_pages.mdwn
-@@ -0,0 +1,20 @@
-+On [[todo/auto-create_tag_pages_according_to_a_template]], [[chrysn]]
-+suggests:
-+
-+> Instead of creating a file that gets checked in into the RCS, the
-+> source files could be left out and the output files be written as
-+> long as there is no physical source file (think of a virtual underlay).
-+> Something similar would be required to implement alias directive,
-+> which couldn't be easily done by writing to the RCS as the page's
-+> contents can change depending on which other pages claim it as an alias.
-+
-+`add_autofile` could be adapted to do this, or a similar API could be
-+added.
-+
-+This would also be useful for autoindex, as suggested on
-+[[plugins/autoindex/discussion]]. I'd also like to use it for
-+[[plugins/contrib/album]].
-+
-+One refinement I'd suggest is that if the transient page is edited,
-+its transient contents are evaluated and used as the initial
-+content for the edit box; after that, it'd become a static page. --[[smcv]]
-
-

-

-
-
diff --git a/doc/recentchanges/change_0ea5f43790fe2ce3cc40e9513191e72c67a1ee51._change b/doc/recentchanges/change_0ea5f43790fe2ce3cc40e9513191e72c67a1ee51._change
deleted file mode 100644
index 99f032a4c..000000000
--- a/doc/recentchanges/change_0ea5f43790fe2ce3cc40e9513191e72c67a1ee51._change
+++ /dev/null
@@ -1,69 +0,0 @@
-[[!meta author="""joey"""]]
-
-[[!meta authorurl="""http://ikiwiki.info/ikiwiki.cgi?page=users%2Fjoey&do=goto"""]]
-
-[[!meta title="""change to security on ikiwiki"""]]
-
-[[!meta permalink="http://ikiwiki.info/recentchanges/#change-0ea5f43790fe2ce3cc40e9513191e72c67a1ee51"]]
-
-

-
Changed pages:
-
-
-[[diff|wikiicons/diff.png]]security
-
-
-
-
Changed by:
-
-
-joey
-
-
-
Commit type:
-git
-
Date:
-00:24:52 11/12/10
-

-

-
-
-[[revert|wikiicons/revert.png]]
-
-
-

-
-
-security issue

-
-
-

-
-

-
-diff --git a/doc/security.mdwn b/doc/security.mdwn
-index 34a0052..33b1992 100644
---- a/doc/security.mdwn
-+++ b/doc/security.mdwn
-@@ -440,3 +440,16 @@ with the release of ikiwiki 3.20100312.
- A fix was also backported to Debian etch, as version 2.53.5. I recommend
- upgrading to one of these versions if your wiki can be edited by third
- parties.
-+
-+## javascript insertation via insufficient htmlscrubbing of comments
-+
-+Kevin Riggle noticed that it was not possible to configure
-+`htmlscrubber_skip` to scrub comments while leaving unscubbed the text
-+of eg, blog posts. Confusingly, setting it to "* and !comment(*)" did not
-+scrub comments.
-+
-+Additionally, it was discovered that comments' html was never scrubbed during
-+preview or moderation of comments.
-+
-+These problems were discovered on 12 November 2010 and fixed the same
-+hour with the release of ikiwiki 3.20101112.
-
-

-

-
-
diff --git a/doc/recentchanges/change_171c429f829aac53cb449e3bb574d2a1669e025e._change b/doc/recentchanges/change_171c429f829aac53cb449e3bb574d2a1669e025e._change
deleted file mode 100644
index 0ff2e8207..000000000
--- a/doc/recentchanges/change_171c429f829aac53cb449e3bb574d2a1669e025e._change
+++ /dev/null
@@ -1,93 +0,0 @@
-[[!meta author="""http://kerravonsen.dreamwidth.org/"""]]
-
-[[!meta authorurl="""http://kerravonsen.dreamwidth.org/"""]]
-
-[[!meta title="""change to todo/Improving_the_efficiency_of_match__95__glob on ikiwiki"""]]
-
-[[!meta permalink="http://ikiwiki.info/recentchanges/#change-171c429f829aac53cb449e3bb574d2a1669e025e"]]
-
-

-
Changed pages:
-
-
-[[diff|wikiicons/diff.png]]todo/Improving the efficiency of match_glob
-
-
-
-
Changed by:
-
-
-kerravonsen [dreamwidth.org]
-
-
-
Commit type:
-web
-
Date:
-20:53:10 11/09/10
-

-

-
-
-[[revert|wikiicons/revert.png]]
-
-
-

-
-
-make match_glob faster - patch!

-
-
-

-
-

-
-diff --git a/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn b/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn
-new file mode 100644
-index 0000000..8f70f1d
---- /dev/null
-+++ b/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn
-@@ -0,0 +1,39 @@
-+I've been profiling my IkiWiki to try to improve speed (with many pages makes speed even more important) and I've written a patch to improve the speed of match_glob.  This matcher is a good one to improve the speed of, because it gets called so many times.
-+
-+Here's my patch - please consider it! -- [[KathrynAndersen]]
-+
-+--------------------------------------------------------------
-+<pre>
-+diff --git a/IkiWiki.pm b/IkiWiki.pm
-+index 08a3d78..c187b98 100644
-+--- a/IkiWiki.pm
-++++ b/IkiWiki.pm
-+@@ -2482,6 +2482,8 @@ sub derel ($$) {
-+ 	return $path;
-+ }
-+ 
-++my %glob_cache;
-++
-+ sub match_glob ($$;@) {
-+ 	my $page=shift;
-+ 	my $glob=shift;
-+@@ -2489,8 +2491,15 @@ sub match_glob ($$;@) {
-+ 	
-+ 	$glob=derel($glob, $params{location});
-+ 
-+-	my $regexp=IkiWiki::glob2re($glob);
-+-	if ($page=~/^$regexp$/i) {
-++	# Instead of converting the glob to a regex every time,
-++	# cache the compiled regex to save time.
-++	if (!exists $glob_cache{$glob}
-++	    or !defined $glob_cache{$glob})
-++	{
-++	    my $re=IkiWiki::glob2re($glob);
-++	    $glob_cache{$glob} = qr/^$re$/i;
-++	}
-++	if ($page =~ $glob_cache{$glob}) {
-+ 		if (! IkiWiki::isinternal($page) || $params{internal}) {
-+ 			return IkiWiki::SuccessReason->new("$glob matches $page");
-+ 		}
-+</pre>
-+--------------------------------------------------------------
-
-

-

-
-
diff --git a/doc/recentchanges/change_172f41f6de288814fbd013f3465e658c562b10b1._change b/doc/recentchanges/change_172f41f6de288814fbd013f3465e658c562b10b1._change
deleted file mode 100644
index 3c15ef1e3..000000000
--- a/doc/recentchanges/change_172f41f6de288814fbd013f3465e658c562b10b1._change
+++ /dev/null
@@ -1,66 +0,0 @@
-[[!meta author="""http://smcv.pseudorandom.co.uk/"""]]
-
-[[!meta authorurl="""http://smcv.pseudorandom.co.uk/"""]]
-
-[[!meta title="""change to forum/Need_something_more_powerful_than_Exclude/comment_1_b454ead16d90479690ad8ee72cfd1428 on ikiwiki"""]]
-
-[[!meta permalink="http://ikiwiki.info/recentchanges/#change-172f41f6de288814fbd013f3465e658c562b10b1"]]
-
-

-
Changed pages:
-
-
-[[diff|wikiicons/diff.png]]forum/Need something more powerful than Exclude/comment 1 b454ead16d90479690ad8ee72cfd1428
-
-
-
-
Changed by:
-
-
-smcv
-
-
-
Commit type:
-web
-
Date:
-10:43:40 11/23/10
-

-

-
-
-[[revert|wikiicons/revert.png]]
-
-
-

-
-
-removed

-
-
-

-
-

-
-diff --git a/doc/forum/Need_something_more_powerful_than_Exclude/comment_1_b454ead16d90479690ad8ee72cfd1428._comment b/doc/forum/Need_something_more_powerful_than_Exclude/comment_1_b454ead16d90479690ad8ee72cfd1428._comment
-deleted file mode 100644
-index 6e29f0c..0000000
---- a/doc/forum/Need_something_more_powerful_than_Exclude/comment_1_b454ead16d90479690ad8ee72cfd1428._comment
-+++ /dev/null
-@@ -1,12 +0,0 @@
--[[!comment format=mdwn
-- username="http://smcv.pseudorandom.co.uk/"
-- nickname="smcv"
-- subject="expression anchored too closely?"
-- date="2010-11-23T10:43:08Z"
-- content="""
--It looks as though you might only be excluding a top-level Makefile, and not a Makefile in subdirectories. Try excluding `(^|/)Makefile$` instead, for instance? (See `wiki_file_prune_regexps` in `IkiWiki.pm` for hints.)
--
--The match operation in `&file_pruned` ends up a bit like this:
--
--    \"foo/Makefile\" =~ m{…||…|(^|/)Makefile$}
--"""]]
-
-

-

-
-
diff --git a/doc/recentchanges/change_1739dbe0a8dc943c736d69f3747251ad72a53278._change b/doc/recentchanges/change_1739dbe0a8dc943c736d69f3747251ad72a53278._change
deleted file mode 100644
index eda883858..000000000
--- a/doc/recentchanges/change_1739dbe0a8dc943c736d69f3747251ad72a53278._change
+++ /dev/null
@@ -1,62 +0,0 @@
-[[!meta author="""joey"""]]
-
-[[!meta authorurl="""http://ikiwiki.info/ikiwiki.cgi?page=users%2Fjoey&do=goto"""]]
-
-[[!meta title="""change to tips/nearlyfreespeech on ikiwiki"""]]
-
-[[!meta permalink="http://ikiwiki.info/recentchanges/#change-1739dbe0a8dc943c736d69f3747251ad72a53278"]]
-
-

-
Changed pages:
-
-
-[[diff|wikiicons/diff.png]]tips/nearlyfreespeech
-
-
-
-
Changed by:
-
-
-joey
-
-
-
Commit type:
-git
-
Date:
-18:57:46 11/20/10
-

-

-
-
-[[revert|wikiicons/revert.png]]
-
-
-

-
-
-úpdate

-
-
-

-
-

-
-diff --git a/doc/tips/nearlyfreespeech.mdwn b/doc/tips/nearlyfreespeech.mdwn
-index 4b3b02e..a3d1ec6 100644
---- a/doc/tips/nearlyfreespeech.mdwn
-+++ b/doc/tips/nearlyfreespeech.mdwn
-@@ -14,7 +14,8 @@ After you [get an account](https://www.nearlyfreespeech.net/about/start.php),
- create a site using their web interface. 
- 
- Mine is named `ikiwiki-test` and I used their DNS instead of getting my
--own, resulting in <http://ikiwiki-test.nfshost.com/>
-+own, resulting in <http://ikiwiki-test.nfshost.com/>. (Not being kept up
-+anymore.)
- 
- They gave me 2 cents free funding for signing up, which is enough to pay
- for 10 megabytes of bandwidth, or about a thousand typical page views, at
-
-

-

-
-
diff --git a/doc/recentchanges/change_178d6a16c2fff68edfbe6a1af5c8a9fa91db6039._change b/doc/recentchanges/change_178d6a16c2fff68edfbe6a1af5c8a9fa91db6039._change
deleted file mode 100644
index 0e44d6398..000000000
--- a/doc/recentchanges/change_178d6a16c2fff68edfbe6a1af5c8a9fa91db6039._change
+++ /dev/null
@@ -1,90 +0,0 @@
-[[!meta author="""joey"""]]
-
-[[!meta authorurl="""http://ikiwiki.info/ikiwiki.cgi?page=users%2Fjoey&do=goto"""]]
-
-[[!meta title="""change to todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both on ikiwiki"""]]
-
-[[!meta permalink="http://ikiwiki.info/recentchanges/#change-178d6a16c2fff68edfbe6a1af5c8a9fa91db6039"]]
-
-

-
Changed pages:
-
-
-[[diff|wikiicons/diff.png]]todo/want to avoid ikiwiki using http or https in urls to allow serving both
-
-
-
-
Changed by:
-
-
-joey
-
-
-
Commit type:
-git
-
Date:
-18:05:37 11/22/10
-

-

-
-
-[[revert|wikiicons/revert.png]]
-
-
-

-
-
-comments (finally)

-
-
-

-
-

-
-diff --git a/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn b/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn
-index 20d22b9..4fafc2b 100644
---- a/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn
-+++ b/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn
-@@ -181,6 +181,16 @@ New API added by this branch:
- 
- * `urlto(x, y, 'local')` uses `$local_url` instead of `$config{url}`
- 
-+  > Yikes. I see why you wanted to keep it to 3 parameters (4 is too many,
-+  > and po overrides it), but I dislike overloading the third parameter
-+  > like that.
-+  > 
-+  > There are fairly few calls to `urlto($foo, $bar)`, so why not
-+  > make that always return the semi-local url form, and leave the third
-+  > parameter for the cases that need a true fully-qualified url.
-+  > The new form for local urls will typically be only a little bit longer,
-+  > except in the unusual case where the cgiurl is elsewhere. --[[Joey]]
-+
- * `IkiWiki::baseurl` has a new second argument which works like the
-   third argument of `urlto`
- 
-@@ -199,9 +209,13 @@ Bugs:
-   `cgiurl(cgiurl => $config{cgiurl}, ...)`,
-   although that does look a bit strange
- 
-+  > I agree that makes sense. --[[Joey]]
-+
- * It occurs to me that `IkiWiki::cgiurl` could probably benefit from being
-   exported? Perhaps also `IkiWiki::baseurl`?
- 
-+  > Possibly, see [[firm_up_plugin_interface]]. --[[Joey]] 
-+
- * Or, to reduce use of the unexported `baseurl` function, it might make
-   sense to give `urlto` a special case that references the root of the wiki,
-   with a trailing slash ready to append stuff: perhaps `urlto('/')`,
-@@ -210,3 +224,6 @@ Bugs:
-         do_something(baseurl => urlto('/', undef, local)`);
-         do_something_else(urlto('/').'style.css');
-         IkiWiki::redirect(urlto('/', undef, 1));
-+
-+  > AFACIS, `baseurl` is only called in 3 places so I don't think that's
-+  > needed. --[[Joey]] 
-
-

-

-
-
diff --git a/doc/recentchanges/change_1968317cacc2f555af17286acf26a60ce616cc40._change b/doc/recentchanges/change_1968317cacc2f555af17286acf26a60ce616cc40._change
deleted file mode 100644
index cb4c2167a..000000000
--- a/doc/recentchanges/change_1968317cacc2f555af17286acf26a60ce616cc40._change
+++ /dev/null
@@ -1,67 +0,0 @@
-[[!meta author="""http://churchkey.org/author/ian/"""]]
-
-[[!meta authorurl="""http://churchkey.org/author/ian/"""]]
-
-[[!meta title="""change to bugs/inline_action_buttons_circumvent_exclude_criteria_from_edittemplate__39__s_match__61____34____34___pagespec on ikiwiki"""]]
-
-[[!meta permalink="http://ikiwiki.info/recentchanges/#change-1968317cacc2f555af17286acf26a60ce616cc40"]]
-
-

-
Changed pages:
-
-
-[[diff|wikiicons/diff.png]]bugs/inline action buttons circumvent exclude criteria from edittemplate's match="" pagespec
-
-
-
-
Changed by:
-
-
-ian [churchkey.org/author]
-
-
-
Commit type:
-web
-
Date:
-21:26:27 11/22/10
-

-

-
-
-[[revert|wikiicons/revert.png]]
-
-
-

-
-
-added edittemplate bug for ikiwiki verison: 3.20100815.2

-
-
-

-
-

-
-diff --git a/doc/bugs/inline_action_buttons_circumvent_exclude_criteria_from_edittemplate__39__s_match__61____34____34___pagespec.mdwn b/doc/bugs/inline_action_buttons_circumvent_exclude_criteria_from_edittemplate__39__s_match__61____34____34___pagespec.mdwn
-new file mode 100644
-index 0000000..45481bf
---- /dev/null
-+++ b/doc/bugs/inline_action_buttons_circumvent_exclude_criteria_from_edittemplate__39__s_match__61____34____34___pagespec.mdwn
-@@ -0,0 +1,13 @@
-+ikiwiki verison: 3.20100815.2
-+
-+If I instruct editemplate to only match the top level pages in a directory using 
-+
-+    match="foo/* and !foo/*/* and !foo/*/*/*"
-+
-+everything works as expected for pages created via links on other wiki pages. So, if I open foo/bar (or any other page on the wiki) and create a link to foo/bar/bug, edittemplate appropriately does not insert any text into the new page. 
-+
-+However, if I use an inline directive like the following 
-+
-+    !inline pages="page(foo/bar/*)" rootpage="foo/bar" postform=yes actions=yes
-+
-+every page created via the action buttons incorrectly pulls in the text from the edittemplate registration. Changing the order of the conditions in the match="" pagespec has no impact. 
-
-

-

-
-
diff --git a/doc/recentchanges/change_1b770bea3fd5b5dfb4e75237218db204139d9189._change b/doc/recentchanges/change_1b770bea3fd5b5dfb4e75237218db204139d9189._change
deleted file mode 100644
index f05151ec1..000000000
--- a/doc/recentchanges/change_1b770bea3fd5b5dfb4e75237218db204139d9189._change
+++ /dev/null
@@ -1,51 +0,0 @@
-[[!meta author="""https://www.google.com/accounts/o8/id?id=AItOawmE7z4CSv-ctBarutQCd70R3CcaSPPxjVk"""]]
-
-[[!meta authorurl="""https://www.google.com/accounts/o8/id?id=AItOawmE7z4CSv-ctBarutQCd70R3CcaSPPxjVk"""]]
-
-[[!meta title="""change to bugs/logout_in_ikiwiki on ikiwiki"""]]
-
-[[!meta permalink="http://ikiwiki.info/recentchanges/#change-1b770bea3fd5b5dfb4e75237218db204139d9189"]]
-
-

-
Changed pages:
-
-
-[[diff|wikiicons/diff.png]]bugs/logout in ikiwiki
-
-
-
-
Changed by:
-
-
-Dave
-
-
-
Commit type:
-web
-
Date:
-10:38:32 10/28/10
-

-

-
-
-[[revert|wikiicons/revert.png]]
-
-
-

-
-

-
-

-
-diff --git a/doc/bugs/logout_in_ikiwiki.mdwn b/doc/bugs/logout_in_ikiwiki.mdwn
-new file mode 100644
-index 0000000..ad89f4c
---- /dev/null
-+++ b/doc/bugs/logout_in_ikiwiki.mdwn
-@@ -0,0 +1 @@
-+It looks like there is no way to logout of ikiwiki at present, meaning that if you edit the ikiwiki in, say, a cybercafe, the cookie remains... is there some other security mechanism in place that can check for authorization, or should I hack in a logout routine into ikiwiki.cgi?
-
-

-

-
-
diff --git a/doc/recentchanges/change_1f32f5e6184b6354f671ae71578f1158c49168b6._change b/doc/recentchanges/change_1f32f5e6184b6354f671ae71578f1158c49168b6._change
deleted file mode 100644
index e75b5bc23..000000000
--- a/doc/recentchanges/change_1f32f5e6184b6354f671ae71578f1158c49168b6._change
+++ /dev/null
@@ -1,55 +0,0 @@
-[[!meta author="""harishcm"""]]
-
-[[!meta authorurl="""http://ikiwiki.info/ikiwiki.cgi?page=users%2Fharishcm&do=goto"""]]
-
-[[!meta title="""change to users/harishcm on ikiwiki"""]]
-
-[[!meta permalink="http://ikiwiki.info/recentchanges/#change-1f32f5e6184b6354f671ae71578f1158c49168b6"]]
-
-

-
Changed pages:
-
-
-[[diff|wikiicons/diff.png]]users/harishcm
-
-
-
-
Changed by:
-
-
-harishcm
-
-
-
Commit type:
-web
-
Date:
-05:01:58 11/05/10
-

-

-
-
-[[revert|wikiicons/revert.png]]
-
-
-

-
-
-Put link to personal website

-
-
-

-
-

-
-diff --git a/doc/users/harishcm.mdwn b/doc/users/harishcm.mdwn
-index 1647110..292a3bf 100644
---- a/doc/users/harishcm.mdwn
-+++ b/doc/users/harishcm.mdwn
-@@ -1 +1 @@
--Using ikiwiki for my yet to be published personal website :)
-+Using ikiwiki for my personal website <http://harish.19thsc.com>
-
-

-

-
-
diff --git a/doc/recentchanges/change_238259dfa199e217e34cc02462f55df6b2b1fcc5._change b/doc/recentchanges/change_238259dfa199e217e34cc02462f55df6b2b1fcc5._change
deleted file mode 100644
index bd0ea25df..000000000
--- a/doc/recentchanges/change_238259dfa199e217e34cc02462f55df6b2b1fcc5._change
+++ /dev/null
@@ -1,56 +0,0 @@
-[[!meta author="""http://dtaht.myopenid.com/"""]]
-
-[[!meta authorurl="""http://dtaht.myopenid.com/"""]]
-
-[[!meta title="""change to ikiwikiusers on ikiwiki"""]]
-
-[[!meta permalink="http://ikiwiki.info/recentchanges/#change-238259dfa199e217e34cc02462f55df6b2b1fcc5"]]
-
-

-
Changed pages:
-
-
-[[diff|wikiicons/diff.png]]ikiwikiusers
-
-
-
-
Changed by:
-
-
-dtaht [myopenid.com]
-
-
-
Commit type:
-web
-
Date:
-18:23:03 10/31/10
-

-

-
-
-[[revert|wikiicons/revert.png]]
-
-
-

-
-

-
-

-
-diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn
-index 2836d96..54fa1d5 100644
---- a/doc/ikiwikiusers.mdwn
-+++ b/doc/ikiwikiusers.mdwn
-@@ -159,6 +159,7 @@ Personal sites and blogs
- * [weakish](http://weakish.github.com)
- * [Thomas Kane](http://planetkane.org/)
- * [Marco Silva](http://marcot.eti.br/) a weblog + wiki using the [darcs](http://darcs.net) backend
-+* [NeX-6](http://nex-6.taht.net/) ikiwiki blog and wiki running over ipv6
- 
- Please feel free to add your own ikiwiki site!
- 
-
-

-

-
-
diff --git a/doc/recentchanges/change_23e3e5f15e61639ccba4a7dfbab11d6fe4b9f047._change b/doc/recentchanges/change_23e3e5f15e61639ccba4a7dfbab11d6fe4b9f047._change
deleted file mode 100644
index 8ad9336d8..000000000
--- a/doc/recentchanges/change_23e3e5f15e61639ccba4a7dfbab11d6fe4b9f047._change
+++ /dev/null
@@ -1,69 +0,0 @@
-[[!meta author="""https://www.google.com/accounts/o8/id?id=AItOawmwYptyV5ptNt8LCbMYsmpcNkk9_DRt-EY"""]]
-
-[[!meta authorurl="""https://www.google.com/accounts/o8/id?id=AItOawmwYptyV5ptNt8LCbMYsmpcNkk9_DRt-EY"""]]
-
-[[!meta title="""change to forum/Blog_posting_times_and_ikiwiki_state on ikiwiki"""]]
-
-[[!meta permalink="http://ikiwiki.info/recentchanges/#change-23e3e5f15e61639ccba4a7dfbab11d6fe4b9f047"]]
-
-

-
Changed pages:
-
-
-[[diff|wikiicons/diff.png]]forum/Blog posting times and ikiwiki state
-
-
-
-
Changed by:
-
-
-Matt
-
-
-
Commit type:
-web
-
Date:
-19:34:53 11/03/10
-

-

-
-
-[[revert|wikiicons/revert.png]]
-
-
-

-
-

-
-

-
-diff --git a/doc/forum/Blog_posting_times_and_ikiwiki_state.mdwn b/doc/forum/Blog_posting_times_and_ikiwiki_state.mdwn
-new file mode 100644
-index 0000000..3e6c232
---- /dev/null
-+++ b/doc/forum/Blog_posting_times_and_ikiwiki_state.mdwn
-@@ -0,0 +1,19 @@
-+What I wanted
-+-------------
-+
-+I thought to myself it would be nice to see from the console the dates that my ikiwiki blog posts were published.  Especially as I would like to know the order of my todo list without having to view the webpage.
-+
-+What I discovered
-+-----------------
-+
-+Looked at the code and saw the functions for grabbing the ctime from git but couldn't reconcile them to the "Posted" date in the RSS feed.  Some more reading and I figured out that the Posted time is taken from the UNIX ctime when first uploaded into the repository and this information is stored in the page state via a Perl storable database - indexdb. (I'm sure most know this but to be clear in UNIX ctime is *not* the actual creation time of a file. UNIX has no facility for recording the actual creation time - however on first upload to the wiki it's good enough).
-+
-+Wrote a Perl script to query and sort indexdb.  Now I can list my todos or blog posts in the order they appear on the web.  Handy.
-+
-+However the ikiwiki state is specifically excluded via '.gitignore'.  I work a lot on trains and not having this file in my cloned wiki means I can't list published posts or my todos in the proper order.  I can get an approximation from git logs but, dam it, I want it the same!
-+
-+What can I do?
-+--------------
-+
-+Is it a spectacularly bad idea to include the ikiwiki state file in my cloned repo (I suspect it is).  What else could be done?  Can I disable pagestate somehow or force ikiwiki to always use git commit times for Posted times?
-+
-
-

-

-
-
diff --git a/doc/recentchanges/change_263cfa7d1e938e3b41d1b6826427f0d613b2b97c._change b/doc/recentchanges/change_263cfa7d1e938e3b41d1b6826427f0d613b2b97c._change
deleted file mode 100644
index 57edc92b2..000000000
--- a/doc/recentchanges/change_263cfa7d1e938e3b41d1b6826427f0d613b2b97c._change
+++ /dev/null
@@ -1,64 +0,0 @@
-[[!meta author="""http://jmtd.livejournal.com/"""]]
-
-[[!meta authorurl="""http://jmtd.livejournal.com/"""]]
-
-[[!meta title="""change to bugs/aggregate_generates_long_filenames on ikiwiki"""]]
-
-[[!meta permalink="http://ikiwiki.info/recentchanges/#change-263cfa7d1e938e3b41d1b6826427f0d613b2b97c"]]
-
-

-
Changed pages:
-
-
-[[diff|wikiicons/diff.png]]bugs/aggregate generates long filenames
-
-
-
-
Changed by:
-
-
-jmtd [livejournal.com]
-
-
-
Commit type:
-web
-
Date:
-06:08:30 11/15/10
-

-

-
-
-[[revert|wikiicons/revert.png]]
-
-
-

-
-
-aggregate: too long filenames

-
-
-

-
-

-
-diff --git a/doc/bugs/aggregate_generates_long_filenames.mdwn b/doc/bugs/aggregate_generates_long_filenames.mdwn
-new file mode 100644
-index 0000000..cb5e6df
---- /dev/null
-+++ b/doc/bugs/aggregate_generates_long_filenames.mdwn
-@@ -0,0 +1,10 @@
-+the [[pluhins/aggregate]] plugin mashes the `title` of an aggregated post into a filename.  This results in long filenames.  I have hit a filesystem length limitation on several occasions.  Some (ab)uses of RSS, e.g., twitter,
-+generate long titles.  Especially once you throw escaping into the mix:
-+
-+    $ ikiwiki --setup testsetup --aggregate --refresh
-+    failed to write ./test/lifestream/Hidden_Features_Of_Perl__44___PHP__44___Javascript__44___C__44___C++__44___C__35____44___Java__44___Ruby___46____46____46__._aggregated.ikiwiki-new: File name too long
-+    aggregation failed with code 9216
-+    $ echo $?
-+    25
-+
-+-- [[Jon]]
-
-

-

-
-
diff --git a/doc/recentchanges/change_2a452ddf146c4148155095e400f56b4674d76953._change b/doc/recentchanges/change_2a452ddf146c4148155095e400f56b4674d76953._change
deleted file mode 100644
index 52a0e5bd0..000000000
--- a/doc/recentchanges/change_2a452ddf146c4148155095e400f56b4674d76953._change
+++ /dev/null
@@ -1,64 +0,0 @@
-[[!meta author="""joey"""]]
-
-[[!meta authorurl="""http://ikiwiki.info/ikiwiki.cgi?page=users%2Fjoey&do=goto"""]]
-
-[[!meta title="""change to bugs/aggregate_generates_long_filenames on ikiwiki"""]]
-
-[[!meta permalink="http://ikiwiki.info/recentchanges/#change-2a452ddf146c4148155095e400f56b4674d76953"]]
-
-

-
Changed pages:
-
-
-[[diff|wikiicons/diff.png]]bugs/aggregate generates long filenames
-
-
-
-
Changed by:
-
-
-joey
-
-
-
Commit type:
-git
-
Date:
-13:34:41 11/16/10
-

-

-
-
-[[revert|wikiicons/revert.png]]
-
-
-

-
-
-but it already checks length..

-
-
-

-
-

-
-diff --git a/doc/bugs/aggregate_generates_long_filenames.mdwn b/doc/bugs/aggregate_generates_long_filenames.mdwn
-index 40decb3..c38ad6c 100644
---- a/doc/bugs/aggregate_generates_long_filenames.mdwn
-+++ b/doc/bugs/aggregate_generates_long_filenames.mdwn
-@@ -11,3 +11,11 @@ It would also appear this abrubtly terminates aggregate processing (if not ikiwi
- 
- 
- -- [[Jon]]
-+
-+> I have to wonder what filesystem you have there where 147 characters
-+> is a long filename. Ikiwiki already uses `POSIX::pathconf` on the srcdir
-+> to look up `_PC_NAME_MAX`
-+> to see if the filename is too long, and shortens it, so it seems
-+> that, in additional to having a rather antique long filename limit, your
-+> system also doesn't properly expose it via pathconf. Not sure what
-+> ikiwiki can do here. --[[Joey]]
-
-

-

-
-
diff --git a/doc/recentchanges/change_2c17255b6641e33374a446ca281a0ad6d46af1dc._change b/doc/recentchanges/change_2c17255b6641e33374a446ca281a0ad6d46af1dc._change
deleted file mode 100644
index 999f73b87..000000000
--- a/doc/recentchanges/change_2c17255b6641e33374a446ca281a0ad6d46af1dc._change
+++ /dev/null
@@ -1,63 +0,0 @@
-[[!meta author="""http://smcv.pseudorandom.co.uk/"""]]
-
-[[!meta authorurl="""http://smcv.pseudorandom.co.uk/"""]]
-
-[[!meta title="""change to plugins/autoindex/discussion on ikiwiki"""]]
-
-[[!meta permalink="http://ikiwiki.info/recentchanges/#change-2c17255b6641e33374a446ca281a0ad6d46af1dc"]]
-
-

-
Changed pages:
-
-
-[[diff|wikiicons/diff.png]]plugins/autoindex/discussion
-
-
-
-
Changed by:
-
-
-smcv
-
-
-
Commit type:
-web
-
Date:
-08:14:26 11/08/10
-

-

-
-
-[[revert|wikiicons/revert.png]]
-
-
-

-
-
-cross-references

-
-
-

-
-

-
-diff --git a/doc/plugins/autoindex/discussion.mdwn b/doc/plugins/autoindex/discussion.mdwn
-index d8b9be6..b09481c 100644
---- a/doc/plugins/autoindex/discussion.mdwn
-+++ b/doc/plugins/autoindex/discussion.mdwn
-@@ -4,7 +4,9 @@ for the html output and not place the markdown files in the wiki source?
- > Or better still, add a mechanism for ikiwiki to hold transient source
- > pages in memory and render them as if they existed, without actually
- > writing them out, as [[JoeRayhawk]] suggests below? I think
--> add_autofile would be the way to do this. --[[smcv]]
-+> add_autofile would be the way to do this.
-+> I've added this to [[todo]] as [[todo/autoindex should use add__95__autofile]]
-+> and [[todo/transient in-memory pages]]. --[[smcv]]
- 
- The reason being that I have a lot of directories which need to be autoindexed,
- but I would prefer if the index files didn't clutter up my git repository.
-
-

-

-
-
diff --git a/doc/recentchanges/change_2fdda536ec6bee1eff3b71c214753078cd588f8f._change b/doc/recentchanges/change_2fdda536ec6bee1eff3b71c214753078cd588f8f._change
deleted file mode 100644
index af18ef4de..000000000
--- a/doc/recentchanges/change_2fdda536ec6bee1eff3b71c214753078cd588f8f._change
+++ /dev/null
@@ -1,58 +0,0 @@
-[[!meta author="""143.215.206.35"""]]
-
-[[!meta authorurl="""http://ikiwiki.info/ikiwiki.cgi?page=users%2F143.215.206.35&do=goto"""]]
-
-[[!meta title="""change to news/openid on ikiwiki"""]]
-
-[[!meta permalink="http://ikiwiki.info/recentchanges/#change-2fdda536ec6bee1eff3b71c214753078cd588f8f"]]
-
-

-
Changed pages:
-
-
-[[diff|wikiicons/diff.png]]news/openid
-
-
-
-
Changed by:
-
-
-143.215.206.35
-
-
-
Commit type:
-web
-
Date:
-16:54:58 11/08/10
-

-

-
-
-[[revert|wikiicons/revert.png]]
-
-
-

-
-
-poll vote (Accept both)

-
-
-

-
-

-
-diff --git a/doc/news/openid.mdwn b/doc/news/openid.mdwn
-index 05991ff..02f7afb 100644
---- a/doc/news/openid.mdwn
-+++ b/doc/news/openid.mdwn
-@@ -10,4 +10,4 @@ log back in, try out the OpenID signup process if you don't already have an
- OpenID, and see how OpenID works for you. And let me know your feelings about
- making such a switch. --[[Joey]]
- 
--[[!poll 67 "Accept only OpenID for logins" 21 "Accept only password logins" 38 "Accept both"]]
-+[[!poll 67 "Accept only OpenID for logins" 21 "Accept only password logins" 39 "Accept both"]]
-
-

-

-
-
diff --git a/doc/recentchanges/change_313a28b8f68b76aee4b94413e4e9d47dca93a34e._change b/doc/recentchanges/change_313a28b8f68b76aee4b94413e4e9d47dca93a34e._change
deleted file mode 100644
index b473074e1..000000000
--- a/doc/recentchanges/change_313a28b8f68b76aee4b94413e4e9d47dca93a34e._change
+++ /dev/null
@@ -1,63 +0,0 @@
-[[!meta author="""joey"""]]
-
-[[!meta authorurl="""http://ikiwiki.info/ikiwiki.cgi?page=users%2Fjoey&do=goto"""]]
-
-[[!meta title="""change to bugs/rss_feeds_do_not_use_recommended_encoding_of_entities_for_some_fields on ikiwiki"""]]
-
-[[!meta permalink="http://ikiwiki.info/recentchanges/#change-313a28b8f68b76aee4b94413e4e9d47dca93a34e"]]
-
-

-
Changed pages:
-
-
-[[diff|wikiicons/diff.png]]bugs/rss feeds do not use recommended encoding of entities for some fields
-
-
-
-
Changed by:
-
-
-joey
-
-
-
Commit type:
-git
-
Date:
-12:50:26 10/30/10
-

-

-
-
-[[revert|wikiicons/revert.png]]
-
-
-

-
-
-response

-
-
-

-
-

-
-diff --git a/doc/bugs/rss_feeds_do_not_use_recommended_encoding_of_entities_for_some_fields.mdwn b/doc/bugs/rss_feeds_do_not_use_recommended_encoding_of_entities_for_some_fields.mdwn
-index 85c3176..0a435ce 100644
---- a/doc/bugs/rss_feeds_do_not_use_recommended_encoding_of_entities_for_some_fields.mdwn
-+++ b/doc/bugs/rss_feeds_do_not_use_recommended_encoding_of_entities_for_some_fields.mdwn
-@@ -43,3 +43,10 @@ For Atom, at least, I believe adding `type="xhtml"` to the title element will wo
- >> have "more" apply to the front page of the blog. Is there a way to do that?
- >> -- [[dtaht]]
- >> 
-+>>> To be clear, the RSS spec sucks to such an extent that, as far as
-+>>> I know, there is no sort of title escaping that will work in all 
-+>>> RSS consumers. Titles are currently escaped in the way 
-+>>> that tends to break the fewest according to what I've read.
-+>>> If you're unlucky enough to 
-+>>> have a "&" or "<" in your **name**, then you may still run into 
-+>>> problems with how that is escaped in rss feeds. --[[Joey]]
-
-

-

-
-
diff --git a/doc/recentchanges/change_408af2bb9e10d2ed899e17f9814a5514c0254dc8._change b/doc/recentchanges/change_408af2bb9e10d2ed899e17f9814a5514c0254dc8._change
deleted file mode 100644
index 4fd8dace1..000000000
--- a/doc/recentchanges/change_408af2bb9e10d2ed899e17f9814a5514c0254dc8._change
+++ /dev/null
@@ -1,68 +0,0 @@
-[[!meta author="""JoeRayhawk"""]]
-
-[[!meta authorurl="""http://ikiwiki.info/ikiwiki.cgi?page=users%2FJoeRayhawk&do=goto"""]]
-
-[[!meta title="""change to plugins/autoindex/discussion on ikiwiki"""]]
-
-[[!meta permalink="http://ikiwiki.info/recentchanges/#change-408af2bb9e10d2ed899e17f9814a5514c0254dc8"]]
-
-

-
Changed pages:
-
-
-[[diff|wikiicons/diff.png]]plugins/autoindex/discussion
-
-
-
-
Changed by:
-
-
-JoeRayhawk
-
-
-
Commit type:
-web
-
Date:
-00:37:14 11/07/10
-

-

-
-
-[[revert|wikiicons/revert.png]]
-
-
-

-
-
-A wish for a noninvasive autoindex.

-
-
-

-
-

-
-diff --git a/doc/plugins/autoindex/discussion.mdwn b/doc/plugins/autoindex/discussion.mdwn
-index 2d6b6f1..a48fe9d 100644
---- a/doc/plugins/autoindex/discussion.mdwn
-+++ b/doc/plugins/autoindex/discussion.mdwn
-@@ -61,3 +61,15 @@ If you just don't want to clutter your git repo, below it's a patch does the fol
- 
-  
- Warning:  I guess this patch may work, but I *haven't tested it yet*.  -- [[weakish]]
-+
-+------
-+
-+`autoindex_commit => 0` would be nice, but uncommited files are definitely not.
-+<pre>
-+remote: From /srv/git/test3
-+remote:    3047077..1df636c  master     -> origin/master
-+remote: error: Untracked working tree file 'test.mdwn' would be overwritten by merge.  Aborting
-+remote: 'git pull --prune origin' failed:  at /usr/share/perl5/IkiWiki/Plugin/git.pm line 201.
-+</pre>
-+
-+It'd be nice if we were able to notice directories with no associated compilable markup files and compile a simple map directive straight to HTML without any intermediate markup file being involved at all. -- JoeRayhawk
-
-

-

-
-
diff --git a/doc/recentchanges/change_415effbb43663ad756d78b3e957ac593d0227a74._change b/doc/recentchanges/change_415effbb43663ad756d78b3e957ac593d0227a74._change
deleted file mode 100644
index 5ef53989c..000000000
--- a/doc/recentchanges/change_415effbb43663ad756d78b3e957ac593d0227a74._change
+++ /dev/null
@@ -1,55 +0,0 @@
-[[!meta author="""civiccents"""]]
-
-[[!meta authorurl="""http://ikiwiki.info/ikiwiki.cgi?page=users%2Fciviccents&do=goto"""]]
-
-[[!meta title="""change to sandbox/D-Liberative on ikiwiki"""]]
-
-[[!meta permalink="http://ikiwiki.info/recentchanges/#change-415effbb43663ad756d78b3e957ac593d0227a74"]]
-
-

-
Changed pages:
-
-
-[[diff|wikiicons/diff.png]]sandbox/D-Liberative
-
-
-
-
Changed by:
-
-
-civiccents
-
-
-
Commit type:
-web
-
Date:
-16:40:10 11/04/10
-

-

-
-
-[[revert|wikiicons/revert.png]]
-
-
-

-
-
-grammer

-
-
-

-
-

-
-diff --git a/doc/sandbox/D-Liberative.wiki b/doc/sandbox/D-Liberative.wiki
-index 6907152..b8c94f3 100644
---- a/doc/sandbox/D-Liberative.wiki
-+++ b/doc/sandbox/D-Liberative.wiki
-@@ -1 +1 @@
--For now its just a concept... what if we could map deliberative capacity?
-+For now its just a concept... what if a community could map its deliberative capacity?
-
-

-

-
-
diff --git a/doc/recentchanges/change_471ac78068532da53e4dad49d52c5ddccfcbff21._change b/doc/recentchanges/change_471ac78068532da53e4dad49d52c5ddccfcbff21._change
deleted file mode 100644
index 21b129fb0..000000000
--- a/doc/recentchanges/change_471ac78068532da53e4dad49d52c5ddccfcbff21._change
+++ /dev/null
@@ -1,58 +0,0 @@
-[[!meta author="""http://jmtd.livejournal.com/"""]]
-
-[[!meta authorurl="""http://jmtd.livejournal.com/"""]]
-
-[[!meta title="""change to bugs/aggregate_generates_long_filenames on ikiwiki"""]]
-
-[[!meta permalink="http://ikiwiki.info/recentchanges/#change-471ac78068532da53e4dad49d52c5ddccfcbff21"]]
-
-

-
Changed pages:
-
-
-[[diff|wikiicons/diff.png]]bugs/aggregate generates long filenames
-
-
-
-
Changed by:
-
-
-jmtd [livejournal.com]
-
-
-
Commit type:
-web
-
Date:
-06:09:41 11/15/10
-

-

-
-
-[[revert|wikiicons/revert.png]]
-
-
-

-
-
-typo

-
-
-

-
-

-
-diff --git a/doc/bugs/aggregate_generates_long_filenames.mdwn b/doc/bugs/aggregate_generates_long_filenames.mdwn
-index cb5e6df..3d98ee8 100644
---- a/doc/bugs/aggregate_generates_long_filenames.mdwn
-+++ b/doc/bugs/aggregate_generates_long_filenames.mdwn
-@@ -1,4 +1,4 @@
--the [[pluhins/aggregate]] plugin mashes the `title` of an aggregated post into a filename.  This results in long filenames.  I have hit a filesystem length limitation on several occasions.  Some (ab)uses of RSS, e.g., twitter,
-+the [[plugins/aggregate]] plugin mashes the `title` of an aggregated post into a filename.  This results in long filenames.  I have hit a filesystem length limitation on several occasions.  Some (ab)uses of RSS, e.g., twitter,
- generate long titles.  Especially once you throw escaping into the mix:
- 
-     $ ikiwiki --setup testsetup --aggregate --refresh
-
-

-

-
-
diff --git a/doc/recentchanges/change_47726461a4119741affa6536deec7dd1fe52ef0d._change b/doc/recentchanges/change_47726461a4119741affa6536deec7dd1fe52ef0d._change
deleted file mode 100644
index 19d7c3035..000000000
--- a/doc/recentchanges/change_47726461a4119741affa6536deec7dd1fe52ef0d._change
+++ /dev/null
@@ -1,73 +0,0 @@
-[[!meta author="""http://kerravonsen.dreamwidth.org/"""]]
-
-[[!meta authorurl="""http://kerravonsen.dreamwidth.org/"""]]
-
-[[!meta title="""change to forum/field_and_forms/comment_1_a0e976cb79f03dcff5e9a4511b90d160 on ikiwiki"""]]
-
-[[!meta permalink="http://ikiwiki.info/recentchanges/#change-47726461a4119741affa6536deec7dd1fe52ef0d"]]
-
-

-
Changed pages:
-
-
-[[diff|wikiicons/diff.png]]forum/field and forms/comment 1 a0e976cb79f03dcff5e9a4511b90d160
-
-
-
-
Changed by:
-
-
-kerravonsen [dreamwidth.org]
-
-
-
Commit type:
-web
-
Date:
-02:18:52 11/23/10
-

-

-
-
-[[revert|wikiicons/revert.png]]
-
-
-

-
-
-Added a comment: Limitations

-
-
-

-
-

-
-diff --git a/doc/forum/field_and_forms/comment_1_a0e976cb79f03dcff5e9a4511b90d160._comment b/doc/forum/field_and_forms/comment_1_a0e976cb79f03dcff5e9a4511b90d160._comment
-new file mode 100644
-index 0000000..3e10dbb
---- /dev/null
-+++ b/doc/forum/field_and_forms/comment_1_a0e976cb79f03dcff5e9a4511b90d160._comment
-@@ -0,0 +1,19 @@
-+[[!comment format=mdwn
-+ username="http://kerravonsen.dreamwidth.org/"
-+ ip="60.241.8.244"
-+ subject="Limitations"
-+ date="2010-11-23T02:18:52Z"
-+ content="""
-+I'd already had a look at this idea before you posted this suggestion, and I ran into difficulties.
-+So far as I can see, it makes most sense to use the mechanisms already in place for editing pages, and enhance them.
-+Unfortunately, the whole edit-page setup expects a template file (by default, when editing pages, editpage.tmpl)
-+and anything apart from \"submit\" buttons must have a placeholder in the template file, or it doesn't get displayed at all in the form.
-+At least, that's what I've found - I could be mistaken.
-+
-+But if it's true, that rather puts the kybosh on dynamically generated forms, so far as I can see.
-+I mean, if you knew beforehand what all your fields were going to be, you could make a copy of editpage.tmpl, add in your fields where you want, and then make a plugin that uses that template instead of editpage.tmpl, but that's very limited.
-+
-+If someone could come up with a way of making dynamic forms, that would solve the problem, but I've come up against a brick wall myself.  Joey?  Anyone?
-+
-+-- [[KathrynAndersen]]
-+"""]]
-
-

-

-
-
diff --git a/doc/recentchanges/change_47b9f10e6254277918873a980af0cf0631326165._change b/doc/recentchanges/change_47b9f10e6254277918873a980af0cf0631326165._change
deleted file mode 100644
index e212c09e4..000000000
--- a/doc/recentchanges/change_47b9f10e6254277918873a980af0cf0631326165._change
+++ /dev/null
@@ -1,60 +0,0 @@
-[[!meta author="""joey"""]]
-
-[[!meta authorurl="""http://ikiwiki.info/ikiwiki.cgi?page=users%2Fjoey&do=goto"""]]
-
-[[!meta title="""change to bugs/logout_in_ikiwiki on ikiwiki"""]]
-
-[[!meta permalink="http://ikiwiki.info/recentchanges/#change-47b9f10e6254277918873a980af0cf0631326165"]]
-
-

-
Changed pages:
-
-
-[[diff|wikiicons/diff.png]]bugs/logout in ikiwiki
-
-
-
-
Changed by:
-
-
-joey
-
-
-
Commit type:
-git
-
Date:
-15:39:22 10/28/10
-

-

-
-
-[[revert|wikiicons/revert.png]]
-
-
-

-
-
-response

-
-
-

-
-

-
-diff --git a/doc/bugs/logout_in_ikiwiki.mdwn b/doc/bugs/logout_in_ikiwiki.mdwn
-index 9f974be..5df19c4 100644
---- a/doc/bugs/logout_in_ikiwiki.mdwn
-+++ b/doc/bugs/logout_in_ikiwiki.mdwn
-@@ -1,3 +1,7 @@
- It looks like there is no way to logout of ikiwiki at present, meaning that if you edit the ikiwiki in, say, a cybercafe, the cookie remains... is there some other security mechanism in place that can check for authorization, or should I hack in a logout routine into ikiwiki.cgi?
- 
- > Click on "Preferences". There is a logout button there. --liw
-+
-+> It would be nice if it were not buried there, but putting it on the
-+> action bar statically would be confusing. The best approach might be to
-+> use javascript. --[[Joey]] 
-
-

-

-
-
diff --git a/doc/recentchanges/change_53e519931f3a6b7cea0af652d749344757d4e2bc._change b/doc/recentchanges/change_53e519931f3a6b7cea0af652d749344757d4e2bc._change
deleted file mode 100644
index 05105eacc..000000000
--- a/doc/recentchanges/change_53e519931f3a6b7cea0af652d749344757d4e2bc._change
+++ /dev/null
@@ -1,112 +0,0 @@
-[[!meta author="""http://jmtd.livejournal.com/"""]]
-
-[[!meta authorurl="""http://jmtd.livejournal.com/"""]]
-
-[[!meta title="""change to bugs/argument_isn__39__t_numeric:_mixing_templates_and_creation__95__date on ikiwiki"""]]
-
-[[!meta permalink="http://ikiwiki.info/recentchanges/#change-53e519931f3a6b7cea0af652d749344757d4e2bc"]]
-
-

-
Changed pages:
-
-
-[[diff|wikiicons/diff.png]]bugs/argument isn't numeric: mixing templates and creation_date
-
-
-
-
Changed by:
-
-
-jmtd [livejournal.com]
-
-
-
Commit type:
-web
-
Date:
-10:23:01 11/15/10
-

-

-
-
-[[revert|wikiicons/revert.png]]
-
-
-

-
-
-template files being treated as regular pages and the problems that can cause

-
-
-

-
-

-
-diff --git a/doc/bugs/argument_isn__39__t_numeric:_mixing_templates_and_creation__95__date.mdwn b/doc/bugs/argument_isn__39__t_numeric:_mixing_templates_and_creation__95__date.mdwn
-new file mode 100644
-index 0000000..70af505
---- /dev/null
-+++ b/doc/bugs/argument_isn__39__t_numeric:_mixing_templates_and_creation__95__date.mdwn
-@@ -0,0 +1,58 @@
-+I get the following error when building my wiki
-+
-+    Argument "\x{3c}\x{54}..." isn't numeric in numeric eq (==) at /usr/share/perl5/IkiWiki.pm line 2547.
-+    Argument "\x{3c}\x{54}..." isn't numeric in numeric eq (==) at /usr/share/perl5/IkiWiki.pm line 2547.
-+
-+that line corresponds to
-+
-+    sub match_creation_year ($$;@) {
-+	if ((localtime($IkiWiki::pagectime{shift()}))[5] + 1900 == shift) { <-- this one
-+		return IkiWiki::SuccessReason->new('creation_year matched');
-+	}
-+
-+A git bisect shows that the offending commit introduced this hunk
-+
-+
-+    --- /dev/null
-+    +++ b/templates/all_entry.mdwn
-+    @@ -0,0 +1,23 @@
-+    +## <TMPL_VAR year>
-+    +
-+    +There
-+    +<TMPL_IF current>
-+    +have been
-+    +<TMPL_ELSE>
-+    +were
-+    +</TMPL_IF>
-+    +[[!pagecount pages="
-+    +log/* and !tagged(aggregation) and !*/Discussion and !tagged(draft)
-+    +and creation_year(<TMPL_VAR year>)
-+    +and !*.png and !*.jpg
-+    +"]] posts
-+    +<TMPL_IF current>
-+    +so far
-+    +</TMPL_IF>
-+    +in <TMPL_VAR year>.
-+    +
-+    +[[!inline pages="
-+    +    log/* and !tagged(aggregation) and !*/Discussion and !tagged(draft)
-+    +    and creation_year(<TMPL_VAR year>)
-+    +    and !*.png and !*.jpg
-+    +    " archive=yes feeds=no]]
-+
-+The lines which feature creation_year(<TMPL_VAR year>) are most likely the culprits.  That would explain why the error was repeated twice, and would tally with the file in `templates/` being rendered, rather than the inclusionists.
-+
-+A workaround is to move the template outside of the srcdir into the external templates directory and include the file suffix when using it, e.g.
-+
-+    \[[!template id=all_entry.tmpl year=2010 current=true]]
-+
-+An alternative fix is to wrap the entire template inside a test to see whether the page is included or not. E.g.
-+
-+
-+    \[[!if test="included()" then="""
-+    ...template...
-+    """ else="""
-+    Nothing to see here.
-+    """]]
-+
-+In fact, this is probably best practice for in-srcdir templates.  I'd consider this done if the documentation for the directive suggested it. -- [[Jon]]
-
-

-

-
-
diff --git a/doc/recentchanges/change_5430d5dc3bc37df92eb01cd65382c0f2be78b8e7._change b/doc/recentchanges/change_5430d5dc3bc37df92eb01cd65382c0f2be78b8e7._change
deleted file mode 100644
index 68bd2fc0c..000000000
--- a/doc/recentchanges/change_5430d5dc3bc37df92eb01cd65382c0f2be78b8e7._change
+++ /dev/null
@@ -1,70 +0,0 @@
-[[!meta author="""http://jmtd.livejournal.com/"""]]
-
-[[!meta authorurl="""http://jmtd.livejournal.com/"""]]
-
-[[!meta title="""change to bugs/argument_isn__39__t_numeric:_mixing_templates_and_creation__95__date on ikiwiki"""]]
-
-[[!meta permalink="http://ikiwiki.info/recentchanges/#change-5430d5dc3bc37df92eb01cd65382c0f2be78b8e7"]]
-
-

-
Changed pages:
-
-
-[[diff|wikiicons/diff.png]]bugs/argument isn't numeric: mixing templates and creation_date
-
-
-
-
Changed by:
-
-
-jmtd [livejournal.com]
-
-
-
Commit type:
-web
-
Date:
-10:43:35 11/15/10
-

-

-
-
-[[revert|wikiicons/revert.png]]
-
-
-

-
-
-not quite done yet: if/included() doesn't work that way.

-
-
-

-
-

-
-diff --git a/doc/bugs/argument_isn__39__t_numeric:_mixing_templates_and_creation__95__date.mdwn b/doc/bugs/argument_isn__39__t_numeric:_mixing_templates_and_creation__95__date.mdwn
-index 5485bba..8309389 100644
---- a/doc/bugs/argument_isn__39__t_numeric:_mixing_templates_and_creation__95__date.mdwn
-+++ b/doc/bugs/argument_isn__39__t_numeric:_mixing_templates_and_creation__95__date.mdwn
-@@ -46,8 +46,7 @@ A workaround is to move the template outside of the srcdir into the external tem
- 
-     \[[!template id=all_entry.tmpl year=2010 current=true]]
- 
--An alternative fix is to wrap the entire template inside a test to see whether the page is included or not. E.g.
--
-+I believed (until I tested) that the [[ikiwiki/directive/if]] directive, with the `included()` test, would be an option here, E.g.
- 
-     \[[!if test="included()" then="""
-     ...template...
-@@ -55,6 +54,4 @@ An alternative fix is to wrap the entire template inside a test to see whether t
-     Nothing to see here.
-     """]]
- 
--In fact, this is probably best practice for in-srcdir templates.  I'd consider this done if the documentation for the directive suggested it. -- [[Jon]]
--
--> [[done]] with <http://git.ikiwiki.info/?p=ikiwiki;a=commitdiff;h=da9e1ea667f82d5fca9168dbed19be08040570ff> -- [[Jon]]
-+However this doesn't work.  I assume "included" in this context means e.g. via an `inline` or `map`, not template trans-clusion. -- [[Jon]]
-
-

-

-
-
diff --git a/doc/recentchanges/change_5954915a4fe8a889b8217cac99fae53cbe7f1e97._change b/doc/recentchanges/change_5954915a4fe8a889b8217cac99fae53cbe7f1e97._change
deleted file mode 100644
index 518a8c974..000000000
--- a/doc/recentchanges/change_5954915a4fe8a889b8217cac99fae53cbe7f1e97._change
+++ /dev/null
@@ -1,108 +0,0 @@
-[[!meta author="""joey"""]]
-
-[[!meta authorurl="""http://ikiwiki.info/ikiwiki.cgi?page=users%2Fjoey&do=goto"""]]
-
-[[!meta title="""change to todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both on ikiwiki"""]]
-
-[[!meta permalink="http://ikiwiki.info/recentchanges/#change-5954915a4fe8a889b8217cac99fae53cbe7f1e97"]]
-
-

-
Changed pages:
-
-
-[[diff|wikiicons/diff.png]]todo/want to avoid ikiwiki using http or https in urls to allow serving both
-
-
-
-
Changed by:
-
-
-joey
-
-
-
Commit type:
-git
-
Date:
-20:04:11 11/22/10
-

-

-
-
-[[revert|wikiicons/revert.png]]
-
-
-

-
-
-response

-
-
-

-
-

-
-diff --git a/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn b/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn
-index 80925b4..f8ec4c4 100644
---- a/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn
-+++ b/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn
-@@ -201,6 +201,10 @@ New API added by this branch:
-   >>
-   >> I personally think breaking the docwiki is enough to block that.
-   >>
-+  >>> Well, the docwiki doesn't have an url configured at all, so I assumed
-+  >>> it would need to fall back to current behavior in that case. I had
-+  >>> not thought about browsing wiki's html files though, good point.
-+  >>
-   >> How about this?
-   >>
-   >> * `urlto($link, $page)` with `$page` defined: relative
-@@ -210,12 +214,24 @@ New API added by this branch:
-   >>   normally undef): absolute, starts with `http[s]://`
-   >>
-   >> --[[smcv]]
-+  >> 
-+  >>> That makes a great deal of sense, bravo for actually removing
-+  >>> parameters in the common case while maintaining backwards
-+  >>> compatability!
-+  >>> 
-+  >>> It does highlight that it would be better to have a
-+  >>> `absolute_urlto($link)` (or maybe `absolute(urlto($link))` )
-+  >>> rather than the 3 parameter form. --[[Joey]]
- 
- * `IkiWiki::baseurl` has a new second argument which works like the
-   third argument of `urlto`
- 
-   > I assume you have no objection to this --[[smcv]]
- 
-+  >> It's so little used that I don't really care if it's a bit ugly.
-+  >> (But I assume changes to `urlto` will follow through here anyway.)
-+  >> --[[Joey]] 
-+
- * `IkiWiki::cgiurl` uses `$local_cgiurl` if passed `local_cgiurl => 1`
- 
-   > Possibly changed to making this always be local unless `cgiurl => $x`
-@@ -225,6 +241,8 @@ New API added by this branch:
-   except `cgiurl` and/or `local_cgiurl`
- 
-   > I assume you have no objection to this --[[smcv]]
-+  > 
-+  >> Nod, although I don't know of a use case. --[[Joey]] 
- 
- Bugs:
- 
-@@ -243,6 +261,10 @@ Bugs:
-   >> would you accept a patch that makes `cgiurl` default to a local
-   >> (starts-with-`/`) result? If you would, that'd reduce the diff. --[[smcv]]
- 
-+  >>> Yes, I absolutely think it should default to local. (Note that
-+  >>> if `absolute()` were implemented as suggested above, it could also
-+  >>> be used with cgiurl if necessary.) --[[Joey]]
-+
- * It occurs to me that `IkiWiki::cgiurl` could probably benefit from being
-   exported? Perhaps also `IkiWiki::baseurl`?
- 
-
-

-

-
-
diff --git a/doc/recentchanges/change_5dbf25127fb776cc52a3a142b805a0c7f3cef242._change b/doc/recentchanges/change_5dbf25127fb776cc52a3a142b805a0c7f3cef242._change
deleted file mode 100644
index 554057cb7..000000000
--- a/doc/recentchanges/change_5dbf25127fb776cc52a3a142b805a0c7f3cef242._change
+++ /dev/null
@@ -1,140 +0,0 @@
-[[!meta author="""joey"""]]
-
-[[!meta authorurl="""http://ikiwiki.info/ikiwiki.cgi?page=users%2Fjoey&do=goto"""]]
-
-[[!meta title="""change to security on ikiwiki"""]]
-
-[[!meta permalink="http://ikiwiki.info/recentchanges/#change-5dbf25127fb776cc52a3a142b805a0c7f3cef242"]]
-
-

-
Changed pages:
-
-
-[[diff|wikiicons/diff.png]]security
-
-
-
-
Changed by:
-
-
-joey
-
-
-
Commit type:
-git
-
Date:
-00:45:00 11/12/10
-

-

-
-
-[[revert|wikiicons/revert.png]]
-
-
-

-
-
-releasing version 3.20101112

-
-
-

-
-

-
-diff --git a/debian/changelog b/debian/changelog
-index 2c4c927..f8dc04e 100644
---- a/debian/changelog
-+++ b/debian/changelog
-@@ -1,4 +1,4 @@
--ikiwiki (3.20101024) UNRELEASED; urgency=low
-+ikiwiki (3.20101112) unstable; urgency=HIGH
- 
-   * txt: Fix display when used inside a format directive.
-   * highlight: Ensure that other, more-specific format plugins,
-@@ -16,7 +16,7 @@ ikiwiki (3.20101024) UNRELEASED; urgency=low
-   * comments: Make comment() pagespec also match comments that are being
-     posted.
- 
-- -- Joey Hess <joeyh@debian.org>  Mon, 25 Oct 2010 22:30:29 -0400
-+ -- Joey Hess <joeyh@debian.org>  Fri, 12 Nov 2010 00:36:06 -0400
- 
- ikiwiki (3.20101023) unstable; urgency=low
- 
-diff --git a/doc/security.mdwn b/doc/security.mdwn
-index 33b1992..2c342b1 100644
---- a/doc/security.mdwn
-+++ b/doc/security.mdwn
-@@ -449,7 +449,7 @@ of eg, blog posts. Confusingly, setting it to "* and !comment(*)" did not
- scrub comments.
- 
- Additionally, it was discovered that comments' html was never scrubbed during
--preview or moderation of comments.
-+preview or moderation of comments with such a configuration.
- 
- These problems were discovered on 12 November 2010 and fixed the same
- hour with the release of ikiwiki 3.20101112.
-diff --git a/ikiwiki.spec b/ikiwiki.spec
-index 7653ac6..5ef4390 100644
---- a/ikiwiki.spec
-+++ b/ikiwiki.spec
-@@ -1,5 +1,5 @@
- Name:           ikiwiki
--Version: 3.20101023
-+Version: 3.20101112
- Release:        1%{?dist}
- Summary:        A wiki compiler
- 
-diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot
-index fa65b6f..e4274d0 100644
---- a/po/ikiwiki.pot
-+++ b/po/ikiwiki.pot
-@@ -8,7 +8,7 @@ msgid ""
- msgstr ""
- "Project-Id-Version: PACKAGE VERSION\n"
- "Report-Msgid-Bugs-To: \n"
--"POT-Creation-Date: 2010-10-23 17:21-0400\n"
-+"POT-Creation-Date: 2010-11-12 00:37-0400\n"
- "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
- "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
- "Language-Team: LANGUAGE <LL@li.org>\n"
-@@ -203,7 +203,7 @@ msgstr ""
- msgid "moderation"
- msgstr ""
- 
--#: ../IkiWiki/Plugin/comments.pm:137 ../IkiWiki/Plugin/format.pm:48
-+#: ../IkiWiki/Plugin/comments.pm:137 ../IkiWiki/Plugin/format.pm:50
- #, perl-format
- msgid "unsupported page format %s"
- msgstr ""
-@@ -268,7 +268,7 @@ msgstr ""
- msgid "comment moderation"
- msgstr ""
- 
--#: ../IkiWiki/Plugin/comments.pm:822
-+#: ../IkiWiki/Plugin/comments.pm:828
- #, perl-format
- msgid "%i comment"
- msgid_plural "%i comments"
-@@ -278,7 +278,7 @@ msgstr[1] ""
- #. translators: Here "Comment" is a verb;
- #. translators: the user clicks on it to
- #. translators: post a comment.
--#: ../IkiWiki/Plugin/comments.pm:832
-+#: ../IkiWiki/Plugin/comments.pm:838
- msgid "Comment"
- msgstr ""
- 
-@@ -411,7 +411,7 @@ msgid ""
- "warning: highlight perl module not available; falling back to pass through"
- msgstr ""
- 
--#: ../IkiWiki/Plugin/htmltidy.pm:62
-+#: ../IkiWiki/Plugin/htmltidy.pm:63
- msgid "htmltidy failed to parse this html"
- msgstr ""
- 
-
-

-

-
-
diff --git a/doc/recentchanges/change_5ecba3b05d66bb58dc48a9027838e8b0bcbc0db9._change b/doc/recentchanges/change_5ecba3b05d66bb58dc48a9027838e8b0bcbc0db9._change
deleted file mode 100644
index 0c598219d..000000000
--- a/doc/recentchanges/change_5ecba3b05d66bb58dc48a9027838e8b0bcbc0db9._change
+++ /dev/null
@@ -1,74 +0,0 @@
-[[!meta author="""http://smcv.pseudorandom.co.uk/"""]]
-
-[[!meta authorurl="""http://smcv.pseudorandom.co.uk/"""]]
-
-[[!meta title="""change to todo/transient_in-memory_pages on ikiwiki"""]]
-
-[[!meta permalink="http://ikiwiki.info/recentchanges/#change-5ecba3b05d66bb58dc48a9027838e8b0bcbc0db9"]]
-
-

-
Changed pages:
-
-
-[[diff|wikiicons/diff.png]]todo/transient in-memory pages
-
-
-
-
Changed by:
-
-
-smcv
-
-
-
Commit type:
-web
-
Date:
-07:14:21 11/15/10
-

-

-
-
-[[revert|wikiicons/revert.png]]
-
-
-

-
-
-more discussion

-
-
-

-
-

-
-diff --git a/doc/todo/transient_in-memory_pages.mdwn b/doc/todo/transient_in-memory_pages.mdwn
-index 816e95c..edf056e 100644
---- a/doc/todo/transient_in-memory_pages.mdwn
-+++ b/doc/todo/transient_in-memory_pages.mdwn
-@@ -46,3 +46,21 @@ Refinements that could be made if this approach seems reasonable:
- >> The `.ikiwiki/transient` would suit this, but instead of saying "tag_underlay" or "autoindex_underlay" have "use_transient_underlay" or something like that?
- >> Or to make it more flexible, have just one option "transient_underlay" which is set to an absolute path, and if it is set, then one is using a transient-underlay.
- >> --[[KathrynAndersen]]
-+
-+>>> What I had in mind was more like `tag_autocreate_transient => 1` or
-+>>> `autoindex_transient => 1`; you might conceivably want tags to be
-+>>> checked in but autoindices to be transient, and it's fine for each
-+>>> plugin to make its own decision. Going from that to one boolean
-+>>> (or just always-transient if people don't think that's too
-+>>> astonishing) would be trivial, though.
-+>>>
-+>>> I don't think relocating the transient underlay really makes sense,
-+>>> except for prototyping: you only want one, and `.ikiwiki` is as good
-+>>> a place as any (ikiwiki already needs to be able to write there).
-+>>>
-+>>> For [[plugins/contrib/album]] I think I'd just make the photo viewer
-+>>> pages always-transient - you can always make a transient page
-+>>> permanent by editing it, after all.
-+>>>
-+>>> Do you think this approach has enough potential that I should
-+>>> continue to hack on it? Any thoughts on the implementation? --[[smcv]]
-
-

-

-
-
diff --git a/doc/recentchanges/change_5f750e16b8c32d2fd69209f433e7d19efa53a71f._change b/doc/recentchanges/change_5f750e16b8c32d2fd69209f433e7d19efa53a71f._change
deleted file mode 100644
index cb1e325e8..000000000
--- a/doc/recentchanges/change_5f750e16b8c32d2fd69209f433e7d19efa53a71f._change
+++ /dev/null
@@ -1,77 +0,0 @@
-[[!meta author="""joey"""]]
-
-[[!meta authorurl="""http://ikiwiki.info/ikiwiki.cgi?page=users%2Fjoey&do=goto"""]]
-
-[[!meta title="""change to security on ikiwiki"""]]
-
-[[!meta permalink="http://ikiwiki.info/recentchanges/#change-5f750e16b8c32d2fd69209f433e7d19efa53a71f"]]
-
-

-
Changed pages:
-
-
-[[diff|wikiicons/diff.png]]security
-
-
-
-
Changed by:
-
-
-joey
-
-
-
Commit type:
-git
-
Date:
-10:25:21 11/12/10
-

-

-
-
-[[revert|wikiicons/revert.png]]
-
-
-

-
-
-CVE id

-
-
-

-
-

-
-diff --git a/debian/changelog b/debian/changelog
-index f8dc04e..582a8e3 100644
---- a/debian/changelog
-+++ b/debian/changelog
-@@ -10,11 +10,11 @@ ikiwiki (3.20101112) unstable; urgency=HIGH
-     (Thanks, Tuomas Jormola)
-   * Fix htmlscrubber_skip to be matched on the source page, not the page it is
-     inlined into. Should allow setting to "* and !comment(*)" to scrub
--    comments, but leave your blog posts unscrubbed, etc.
-+    comments, but leave your blog posts unscrubbed, etc. CVE-2010-1673
-   * comments: Make postcomment() pagespec work when previewing a comment,
--    including during moderation.
-+    including during moderation. CVE-2010-1673
-   * comments: Make comment() pagespec also match comments that are being
--    posted.
-+    posted. CVE-2010-1673
- 
-  -- Joey Hess <joeyh@debian.org>  Fri, 12 Nov 2010 00:36:06 -0400
- 
-diff --git a/doc/security.mdwn b/doc/security.mdwn
-index 2c342b1..4fa531e 100644
---- a/doc/security.mdwn
-+++ b/doc/security.mdwn
-@@ -452,4 +452,4 @@ Additionally, it was discovered that comments' html was never scrubbed during
- preview or moderation of comments with such a configuration.
- 
- These problems were discovered on 12 November 2010 and fixed the same
--hour with the release of ikiwiki 3.20101112.
-+hour with the release of ikiwiki 3.20101112. ([[!cve CVE-2010-1673]])
-
-

-

-
-
diff --git a/doc/recentchanges/change_608cef54d63ba60efd24ae14012dda7ff8d014a9._change b/doc/recentchanges/change_608cef54d63ba60efd24ae14012dda7ff8d014a9._change
deleted file mode 100644
index 7ee29dff3..000000000
--- a/doc/recentchanges/change_608cef54d63ba60efd24ae14012dda7ff8d014a9._change
+++ /dev/null
@@ -1,61 +0,0 @@
-[[!meta author="""http://kerravonsen.dreamwidth.org/"""]]
-
-[[!meta authorurl="""http://kerravonsen.dreamwidth.org/"""]]
-
-[[!meta title="""change to todo/Improving_the_efficiency_of_match__95__glob on ikiwiki"""]]
-
-[[!meta permalink="http://ikiwiki.info/recentchanges/#change-608cef54d63ba60efd24ae14012dda7ff8d014a9"]]
-
-

-
Changed pages:
-
-
-[[diff|wikiicons/diff.png]]todo/Improving the efficiency of match_glob
-
-
-
-
Changed by:
-
-
-kerravonsen [dreamwidth.org]
-
-
-
Commit type:
-web
-
Date:
-22:01:21 11/14/10
-

-

-
-
-[[revert|wikiicons/revert.png]]
-
-
-

-
-
-theory about differences in speed of memoize and non-memoize patches

-
-
-

-
-

-
-diff --git a/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn b/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn
-index c4d3a8e..43571ea 100644
---- a/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn
-+++ b/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn
-@@ -20,6 +20,8 @@ Here's my patch - please consider it! -- [[KathrynAndersen]]
- >>>> is less verbose than Kathryn's patch but also not as
- >>>> fast; I'm not sure why, tbh. --[[smcv]]
- 
-+>>>>> I think it's because my patch focuses on match_glob while the memoize patch focuses on `glob2re`, and `glob2re` is called in `filecheck`, `meta` and `po` as well as in `match_glob` and `match_user`; thus the memoized `glob2re` is dealing with a bigger set of globs to look up, and thus could be just that little bit slower. -- [[KathrynAndersen]]
-+
- --------------------------------------------------------------
- Benchmarks done with Devel::Profile on the same testbed IkiWiki setup.  I'm just showing the start of the profile output, since that's what's relevant.
- 
-
-

-

-
-
diff --git a/doc/recentchanges/change_61218e338a7517b25fc82697c3a11fff1edb6803._change b/doc/recentchanges/change_61218e338a7517b25fc82697c3a11fff1edb6803._change
deleted file mode 100644
index b2e825460..000000000
--- a/doc/recentchanges/change_61218e338a7517b25fc82697c3a11fff1edb6803._change
+++ /dev/null
@@ -1,66 +0,0 @@
-[[!meta author="""http://smcv.pseudorandom.co.uk/"""]]
-
-[[!meta authorurl="""http://smcv.pseudorandom.co.uk/"""]]
-
-[[!meta title="""change to todo/use_secure_cookies_for_ssl_logins on ikiwiki"""]]
-
-[[!meta permalink="http://ikiwiki.info/recentchanges/#change-61218e338a7517b25fc82697c3a11fff1edb6803"]]
-
-

-
Changed pages:
-
-
-[[diff|wikiicons/diff.png]]todo/use secure cookies for ssl logins
-
-
-
-
Changed by:
-
-
-smcv
-
-
-
Commit type:
-web
-
Date:
-23:59:03 11/23/10
-

-

-
-
-[[revert|wikiicons/revert.png]]
-
-
-

-
-
-another branch

-
-
-

-
-

-
-diff --git a/doc/todo/use_secure_cookies_for_ssl_logins.mdwn b/doc/todo/use_secure_cookies_for_ssl_logins.mdwn
-new file mode 100644
-index 0000000..a91a15b
---- /dev/null
-+++ b/doc/todo/use_secure_cookies_for_ssl_logins.mdwn
-@@ -0,0 +1,12 @@
-+[[!template id=gitbranch branch=smcv/ready/sslcookie-auto author="[[smcv]]"]]
-+[[!tag patch]]
-+
-+At the moment `sslcookie => 0` never creates secure cookies, so if you log in
-+with SSL, your browser will send the session cookie even over plain HTTP.
-+Meanwhile `sslcookie => 1` always creates secure cookies, so you can't
-+usefully log in over plain http.
-+
-+This branch adds `sslcookie => 0, sslcookie_auto => 1` as an option; this
-+uses the `HTTPS` environment variable, so if you log in over SSL you'll
-+get a secure session cookie, but if you log in over HTTP, you won't.
-+(The syntax for the setup file is pretty rubbish - any other suggestions?)
-
-

-

-
-
diff --git a/doc/recentchanges/change_615bf4fe15e7300bc033724bf86eecb6a2efef49._change b/doc/recentchanges/change_615bf4fe15e7300bc033724bf86eecb6a2efef49._change
deleted file mode 100644
index 22b4e9219..000000000
--- a/doc/recentchanges/change_615bf4fe15e7300bc033724bf86eecb6a2efef49._change
+++ /dev/null
@@ -1,65 +0,0 @@
-[[!meta author="""http://kerravonsen.dreamwidth.org/"""]]
-
-[[!meta authorurl="""http://kerravonsen.dreamwidth.org/"""]]
-
-[[!meta title="""change to forum/Need_something_more_powerful_than_Exclude/comment_2_f577ab6beb9912471949d8d18c790267 on ikiwiki"""]]
-
-[[!meta permalink="http://ikiwiki.info/recentchanges/#change-615bf4fe15e7300bc033724bf86eecb6a2efef49"]]
-
-

-
Changed pages:
-
-
-[[diff|wikiicons/diff.png]]forum/Need something more powerful than Exclude/comment 2 f577ab6beb9912471949d8d18c790267
-
-
-
-
Changed by:
-
-
-kerravonsen [dreamwidth.org]
-
-
-
Commit type:
-web
-
Date:
-02:55:21 11/25/10
-

-

-
-
-[[revert|wikiicons/revert.png]]
-
-
-

-
-
-Added a comment: Missed It By That Much

-
-
-

-
-

-
-diff --git a/doc/forum/Need_something_more_powerful_than_Exclude/comment_2_f577ab6beb9912471949d8d18c790267._comment b/doc/forum/Need_something_more_powerful_than_Exclude/comment_2_f577ab6beb9912471949d8d18c790267._comment
-new file mode 100644
-index 0000000..bd964d5
---- /dev/null
-+++ b/doc/forum/Need_something_more_powerful_than_Exclude/comment_2_f577ab6beb9912471949d8d18c790267._comment
-@@ -0,0 +1,11 @@
-+[[!comment format=mdwn
-+ username="http://kerravonsen.dreamwidth.org/"
-+ ip="60.241.8.244"
-+ subject="Missed It By That Much"
-+ date="2010-11-25T02:55:20Z"
-+ content="""
-+I discovered that I not only needed to change the regexp, but I also needed to delete .ikiwiki/indexdb because `file_pruned` only gets called for files that aren't in the `%pagesources` hash, and since the file in question was already there because it had been put there before the exclude regex was changed, it wasn't even being checked!
-+
-+[[KathrynAndersen]]
-+
-+"""]]
-
-

-

-
-
diff --git a/doc/recentchanges/change_62fc5d0c3cfdde0ae87c5364db6f6ebfa6794b14._change b/doc/recentchanges/change_62fc5d0c3cfdde0ae87c5364db6f6ebfa6794b14._change
deleted file mode 100644
index b784d2250..000000000
--- a/doc/recentchanges/change_62fc5d0c3cfdde0ae87c5364db6f6ebfa6794b14._change
+++ /dev/null
@@ -1,102 +0,0 @@
-[[!meta author="""http://jmtd.livejournal.com/"""]]
-
-[[!meta authorurl="""http://jmtd.livejournal.com/"""]]
-
-[[!meta title="""change to ikiwiki/directive/template on ikiwiki"""]]
-
-[[!meta permalink="http://ikiwiki.info/recentchanges/#change-62fc5d0c3cfdde0ae87c5364db6f6ebfa6794b14"]]
-
-

-
Changed pages:
-
-
-[[diff|wikiicons/diff.png]]ikiwiki/directive/template
-
-
-
-
Changed by:
-
-
-jmtd [livejournal.com]
-
-
-
Commit type:
-web
-
Date:
-10:41:40 11/15/10
-

-

-
-
-[[revert|wikiicons/revert.png]]
-
-
-

-
-
-I totally misinterpreted what included() is supposed to be for.

-
-
-
-
-
-This reverts commit da9e1ea667f82d5fca9168dbed19be08040570ff

-
-
-

-
-

-
-diff --git a/doc/ikiwiki/directive/template.mdwn b/doc/ikiwiki/directive/template.mdwn
-index df391f9..9e3ae54 100644
---- a/doc/ikiwiki/directive/template.mdwn
-+++ b/doc/ikiwiki/directive/template.mdwn
-@@ -60,30 +60,22 @@ few things:
-   `<TMPL_IF variable>text</TMPL_IF>`.
- * To use one block of text if a variable is set and a second if it's not,
-   use `<TMPL_IF variable>text<TMPL_ELSE>other text</TMPL_IF>`
--* Each template file included in the wiki's source will also generate a regular
--  wiki page.  In many cases you might want to prevent some of your template
--  being interpreted for the regular page.  Use the [[if]] directive with the
--  `included()` test to guard the template code.
- 
- Here's a sample template:
- 
--        \[[!if test="included()" then="""
--          <span class="infobox">
--          Name: \[[<TMPL_VAR raw_name>]]<br />
--          Age: <TMPL_VAR age><br />
--          <TMPL_IF color>
--            Favorite color: <TMPL_VAR color><br />
--          <TMPL_ELSE>
--            No favorite color.<br />
--          </TMPL_IF>
--          <TMPL_IF notes>
--            <hr />
--            <TMPL_VAR notes>
--          </TMPL_IF>
--          </span>
--        """ else="""
--          This is a template page.
--        """]]
-+        <span class="infobox">
-+        Name: \[[<TMPL_VAR raw_name>]]<br />
-+        Age: <TMPL_VAR age><br />
-+        <TMPL_IF color>
-+        Favorite color: <TMPL_VAR color><br />
-+        <TMPL_ELSE>
-+        No favorite color.<br />
-+        </TMPL_IF>
-+        <TMPL_IF notes>
-+        <hr />
-+        <TMPL_VAR notes>
-+        </TMPL_IF>
-+        </span>
- 
- The filled out template will be formatted the same as the rest of the page
- that contains it, so you can include WikiLinks and all other forms of wiki
-
-

-

-
-
diff --git a/doc/recentchanges/change_65873fee5e1dda78d6cf561cdd81a5dcd6d2735d._change b/doc/recentchanges/change_65873fee5e1dda78d6cf561cdd81a5dcd6d2735d._change
deleted file mode 100644
index 3924a71bd..000000000
--- a/doc/recentchanges/change_65873fee5e1dda78d6cf561cdd81a5dcd6d2735d._change
+++ /dev/null
@@ -1,63 +0,0 @@
-[[!meta author="""http://cristian.regolo.cc/"""]]
-
-[[!meta authorurl="""http://cristian.regolo.cc/"""]]
-
-[[!meta title="""change to examples/blog on ikiwiki"""]]
-
-[[!meta permalink="http://ikiwiki.info/recentchanges/#change-65873fee5e1dda78d6cf561cdd81a5dcd6d2735d"]]
-
-

-
Changed pages:
-
-
-[[diff|wikiicons/diff.png]]examples/blog
-
-
-
-
Changed by:
-
-
-cristiangreco
-
-
-
Commit type:
-web
-
Date:
-11:49:36 11/05/10
-

-

-
-
-[[revert|wikiicons/revert.png]]
-
-
-

-
-
-add link to tag plugin page

-
-
-

-
-

-
-diff --git a/doc/examples/blog.mdwn b/doc/examples/blog.mdwn
-index b256012..5f8f6c3 100644
---- a/doc/examples/blog.mdwn
-+++ b/doc/examples/blog.mdwn
-@@ -10,8 +10,8 @@ Some additional configuration you might want to do, if not using
- 
- * Make sure to configure ikiwiki to generate RSS or Atom feeds.
- 
--* Make sure you have the tag plugin enabled, and the `tagbase` set to
--  "tags". Tag pages will then automatically be created.
-+* Make sure you have the [[tag|plugins/tag]] plugin enabled, and the
-+ `tagbase` set to "tags". Tag pages will then automatically be created.
-   An example of how to tag a post is:
- 	\[[!tag life]]
- 
-
-

-

-
-
diff --git a/doc/recentchanges/change_65e726f201d7b9919271cfe7e8a7314a6abf0fc3._change b/doc/recentchanges/change_65e726f201d7b9919271cfe7e8a7314a6abf0fc3._change
deleted file mode 100644
index a70dbb1af..000000000
--- a/doc/recentchanges/change_65e726f201d7b9919271cfe7e8a7314a6abf0fc3._change
+++ /dev/null
@@ -1,90 +0,0 @@
-[[!meta author="""joey"""]]
-
-[[!meta authorurl="""http://ikiwiki.info/ikiwiki.cgi?page=users%2Fjoey&do=goto"""]]
-
-[[!meta title="""change to todo/replace_HTML::Template_with_Template_Toolkit on ikiwiki"""]]
-
-[[!meta permalink="http://ikiwiki.info/recentchanges/#change-65e726f201d7b9919271cfe7e8a7314a6abf0fc3"]]
-
-

-
Changed pages:
-
-
-[[diff|wikiicons/diff.png]]todo/replace HTML::Template with Template Toolkit
-
-
-
-
Changed by:
-
-
-joey
-
-
-
Commit type:
-git
-
Date:
-13:42:52 11/16/10
-

-

-
-
-[[revert|wikiicons/revert.png]]
-
-
-

-
-
-response

-
-
-

-
-

-
-diff --git a/doc/todo/replace_HTML::Template_with_Template_Toolkit.mdwn b/doc/todo/replace_HTML::Template_with_Template_Toolkit.mdwn
-index 9725b65..d55fc0a 100644
---- a/doc/todo/replace_HTML::Template_with_Template_Toolkit.mdwn
-+++ b/doc/todo/replace_HTML::Template_with_Template_Toolkit.mdwn
-@@ -5,9 +5,14 @@ features and thus makes it rather hard to give an ikiwiki site a consistent
- look. If you browse the templates provided in the tarball, you'll notice that
- more than one of them contain the `<html>` tag, which is unnecessary.
- 
-+> Note that is no longer true, and I didn't have to do such an intrusive
-+> change to fix it either. --[[Joey]]
-+
- Maybe it's just me, I also find HTML::Template cumbersome to use, due in part
- to its use of capital letters.
- 
-+> Its entirely optional use of capital letters? --[[Joey]]
-+
- Finally, the software seems unmaintained: the mailing list and searchable
- archives linked from
- <http://html-template.sourceforge.net/html_template.html#frequently%20asked%20questions>
-@@ -62,4 +67,21 @@ HTML::Template's HTML-like markup prevents me from editing templates in KompoZer
- 
- I agree that being able to replace the template toolkit would be a great piece of modularity, and one I would use. If I could use the slot-based filling and the conditional logic from Template::Toolkit, we could build much more flexible inline and archivepage templates that would look different depending on where in the wiki we use them. Some of this can currently be accomplished with separate templates for each use case and a manual call to the right template in the !inline directive, but this is limited, cumbersome, and makes it difficult to reuse bits of formatting by trapping all of that information in multiple template files. -Ian
- 
--> I don't wish HTML::Template to be *replaced* by Template::Toolkit - as others have said above, it's overkill for my needs.  However, I also agree that HTML::Template has its own problems too.  The idea of making the template system modular, with a choice of which backend to use - I really like that idea. It would enable me to use some other template system I like better, such as Text::Template or Text::NeatTemplate. But I think it would be a lot of work to implement, though perhaps no more work than making the revision-control backend modular, I guess.  One would need to write an IkiWiki template interface that didn't care what the backend was, and yet is somehow still flexible enough to take advantage of special features of different backends.  There are an *awful lot* of things that use templates - not just the `pagetemplate` and `template` plugins, but a number of others which have specialized templates of their own. -- [[KathrynAndersen]]
-+> I don't wish HTML::Template to be *replaced* by Template::Toolkit - as
-+> others have said above, it's overkill for my needs.  However, I also
-+> agree that HTML::Template has its own problems too.  The idea of making
-+> the template system modular, with a choice of which backend to use - I
-+> really like that idea. It would enable me to use some other template
-+> system I like better, such as Text::Template or Text::NeatTemplate. But I
-+> think it would be a lot of work to implement, though perhaps no more work
-+> than making the revision-control backend modular, I guess.  One would
-+> need to write an IkiWiki template interface that didn't care what the
-+> backend was, and yet is somehow still flexible enough to take advantage
-+> of special features of different backends.  There are an *awful lot* of
-+> things that use templates - not just the `pagetemplate` and `template`
-+> plugins, but a number of others which have specialized templates of their
-+> own. -- [[KathrynAndersen]]a
-+
-+>> A modular template system in ikiwiki is unlikely, as template objects
-+>> are part of the API,  notably the `pagetemplate` hook. Unless the other
-+>> system has a compatible template object. --[[Joey]] 
-
-

-

-
-
diff --git a/doc/recentchanges/change_65ecc73755348f1ed13b77b2f4bdf9db4e465be4._change b/doc/recentchanges/change_65ecc73755348f1ed13b77b2f4bdf9db4e465be4._change
deleted file mode 100644
index 24d7bd43d..000000000
--- a/doc/recentchanges/change_65ecc73755348f1ed13b77b2f4bdf9db4e465be4._change
+++ /dev/null
@@ -1,109 +0,0 @@
-[[!meta author="""joey"""]]
-
-[[!meta authorurl="""http://ikiwiki.info/ikiwiki.cgi?page=users%2Fjoey&do=goto"""]]
-
-[[!meta title="""change to news/version_3.20100831 news/version_3.20101112 on ikiwiki"""]]
-
-[[!meta permalink="http://ikiwiki.info/recentchanges/#change-65ecc73755348f1ed13b77b2f4bdf9db4e465be4"]]
-
-

-
Changed pages:
-
-
-[[diff|wikiicons/diff.png]]news/version 3.20100831
-
-
-[[diff|wikiicons/diff.png]]news/version 3.20101112
-
-
-
-
Changed by:
-
-
-joey
-
-
-
Commit type:
-git
-
Date:
-00:46:29 11/12/10
-

-

-
-
-[[revert|wikiicons/revert.png]]
-
-
-

-
-
-add news item for ikiwiki 3.20101112

-
-
-

-
-

-
-diff --git a/doc/news/version_3.20100831.mdwn b/doc/news/version_3.20100831.mdwn
-deleted file mode 100644
-index 152e3c2..0000000
---- a/doc/news/version_3.20100831.mdwn
-+++ /dev/null
-@@ -1,27 +0,0 @@
--ikiwiki 3.20100831 released with [[!toggle text="these changes"]]
--[[!toggleable text="""
--   * filecheck: Fall back to using the file command if the freedesktop
--     magic file cannot identify a file.
--   * flattr: New plugin. (Thanks to jaywalk for the initial implementation
--     at a flattr plugin! This one is less configurable, but simpler.)
--   * smiley: warn instead of error for missing smileys (Giuseppe Bilotta)
--   * openid: Syntax tweak to the javascript code to make it work with MSIE 7
--     (and MSIE 8 in compat mode). Thanks to Iain McLaren for reporting
--     the bug and providing access to debug it.
--   * style.css: Use relative, not absolute font sizes. Thanks, Giuseppe Bilotta.
--   * htmlscrubber: Do not scrub url anchors that contain colons.
--   * Danish translation update. Closes: #[594673](http://bugs.debian.org/594673)
--   * highlight: Make location of highlight's files configurable in setup
--     file to allow for nonstandard installations.
--   * Allow "link(.)" and similar PageSpecs. Thanks, Giuseppe Bilotta.
--   * Run the preprocess hooks in scan mode *before* the scan hooks.
--     This allows the po plugin to register a scan hook that runs
--     last and rescans pages after all data from the first scan pass is
--     completed. This avoids the po plugin needing to rebuild some pages.
--     (intrigeri)
--   * po: Fix some bugs that affected l10n.ikiwiki.info's unusual
--     setup. (intrigeri)
--   * t/bazaar.t: Work around bzr 2.2.0's new requirement to configure
--     bzr whoami before committing.
--   * httpauth: Avoid redirecting the user to the cgiauthurl if
--     they already have a login session."""]]
-\ No newline at end of file
-diff --git a/doc/news/version_3.20101112.mdwn b/doc/news/version_3.20101112.mdwn
-new file mode 100644
-index 0000000..ad59144
---- /dev/null
-+++ b/doc/news/version_3.20101112.mdwn
-@@ -0,0 +1,17 @@
-+ikiwiki 3.20101112 released with [[!toggle text="these changes"]]
-+[[!toggleable text="""
-+   * txt: Fix display when used inside a format directive.
-+   * highlight: Ensure that other, more-specific format plugins,
-+     like txt are used in preference to this one in case of ties.
-+   * htmltidy, sortnaturally: Add missing checkconfig hook
-+     registration. Closes: #[601912](http://bugs.debian.org/601912)
-+     (Thanks, Craig Lennox and Tuomas Jormola)
-+   * git: Use author date, not committer date. Closes: #[602012](http://bugs.debian.org/602012)
-+     (Thanks, Tuomas Jormola)
-+   * Fix htmlscrubber\_skip to be matched on the source page, not the page it is
-+     inlined into. Should allow setting to "* and !comment(*)" to scrub
-+     comments, but leave your blog posts unscrubbed, etc.
-+   * comments: Make postcomment() pagespec work when previewing a comment,
-+     including during moderation.
-+   * comments: Make comment() pagespec also match comments that are being
-+     posted."""]]
-\ No newline at end of file
-
-

-

-
-
diff --git a/doc/recentchanges/change_663d2578832dd0808ea98a624b49cec4bf3c0243._change b/doc/recentchanges/change_663d2578832dd0808ea98a624b49cec4bf3c0243._change
deleted file mode 100644
index 2e82b0982..000000000
--- a/doc/recentchanges/change_663d2578832dd0808ea98a624b49cec4bf3c0243._change
+++ /dev/null
@@ -1,52 +0,0 @@
-[[!meta author="""http://liw.fi/"""]]
-
-[[!meta authorurl="""http://liw.fi/"""]]
-
-[[!meta title="""change to bugs/logout_in_ikiwiki on ikiwiki"""]]
-
-[[!meta permalink="http://ikiwiki.info/recentchanges/#change-663d2578832dd0808ea98a624b49cec4bf3c0243"]]
-
-

-
Changed pages:
-
-
-[[diff|wikiicons/diff.png]]bugs/logout in ikiwiki
-
-
-
-
Changed by:
-
-
-Lars_Wirzenius
-
-
-
Commit type:
-web
-
Date:
-13:39:29 10/28/10
-

-

-
-
-[[revert|wikiicons/revert.png]]
-
-
-

-
-

-
-

-
-diff --git a/doc/bugs/logout_in_ikiwiki.mdwn b/doc/bugs/logout_in_ikiwiki.mdwn
-index ad89f4c..9f974be 100644
---- a/doc/bugs/logout_in_ikiwiki.mdwn
-+++ b/doc/bugs/logout_in_ikiwiki.mdwn
-@@ -1 +1,3 @@
- It looks like there is no way to logout of ikiwiki at present, meaning that if you edit the ikiwiki in, say, a cybercafe, the cookie remains... is there some other security mechanism in place that can check for authorization, or should I hack in a logout routine into ikiwiki.cgi?
-+
-+> Click on "Preferences". There is a logout button there. --liw
-
-

-

-
-
diff --git a/doc/recentchanges/change_69a22a6f4b4dfc47a7ce39476758742036b70e63._change b/doc/recentchanges/change_69a22a6f4b4dfc47a7ce39476758742036b70e63._change
deleted file mode 100644
index 685541d22..000000000
--- a/doc/recentchanges/change_69a22a6f4b4dfc47a7ce39476758742036b70e63._change
+++ /dev/null
@@ -1,80 +0,0 @@
-[[!meta author="""dark"""]]
-
-[[!meta authorurl="""http://ikiwiki.info/ikiwiki.cgi?page=users%2Fdark&do=goto"""]]
-
-[[!meta title="""change to todo/selective_more_directive on ikiwiki"""]]
-
-[[!meta permalink="http://ikiwiki.info/recentchanges/#change-69a22a6f4b4dfc47a7ce39476758742036b70e63"]]
-
-

-
Changed pages:
-
-
-[[diff|wikiicons/diff.png]]todo/selective more directive
-
-
-
-
Changed by:
-
-
-dark
-
-
-
Commit type:
-web
-
Date:
-16:55:20 11/01/10
-

-

-
-
-[[revert|wikiicons/revert.png]]
-
-
-

-
-
-proposal plus patch

-
-
-

-
-

-
-diff --git a/doc/todo/selective_more_directive.mdwn b/doc/todo/selective_more_directive.mdwn
-new file mode 100644
-index 0000000..24e6ab5
---- /dev/null
-+++ b/doc/todo/selective_more_directive.mdwn
-@@ -0,0 +1,26 @@
-+I'm setting up a blog for NaNoWriMo and other story-writing, which means long posts every day. I want to have excerpts on the front page, which link to the full length story posts. I also want a dedicated page for each story which inlines the story in full and in chronological order. I can use the "more" directive to achieve this effect on the front page but then it spoils the story page. My solution was to add a pages= parameter to the more directive to make it more selective.
-+
-+    --- /usr/share/perl5/IkiWiki/Plugin/more.pm     2010-10-09 00:09:24.000000000 +0000
-+    +++ .ikiwiki/IkiWiki/Plugin/more.pm    2010-11-01 20:24:59.000000000 +0000
-+    @@ -26,7 +26,10 @@
-+     
-+            $params{linktext} = $linktext unless defined $params{linktext};
-+     
-+    -       if ($params{page} ne $params{destpage}) {
-+    +       if ($params{page} ne $params{destpage} &&
-+    +           (! exists $params{pages} ||
-+    +            pagespec_match($params{destpage}, $params{pages},
-+    +                  location => $params{page}))) {
-+                    return "\n".
-+                           htmllink($params{page}, $params{destpage}, $params{page},
-+                                    linktext => $params{linktext},
-+
-+I can now call it as 
-+
-+    \[[!more pages="index" linktext="Chapter 1" text="""
-+    etc
-+    """]]
-+
-+I'm not entirely happy with the design, since I would rather put this information in the inline directive instead of in every story post. Unfortunately I found no way to pass parameters from the inline directive to the inlined page.
-+
-+-- [[dark]]
-
-

-

-
-
diff --git a/doc/recentchanges/change_78a2e59834d35da7a7ab8145beb7a30b59b95c90._change b/doc/recentchanges/change_78a2e59834d35da7a7ab8145beb7a30b59b95c90._change
deleted file mode 100644
index 81292322e..000000000
--- a/doc/recentchanges/change_78a2e59834d35da7a7ab8145beb7a30b59b95c90._change
+++ /dev/null
@@ -1,59 +0,0 @@
-[[!meta author="""http://kerravonsen.dreamwidth.org/"""]]
-
-[[!meta authorurl="""http://kerravonsen.dreamwidth.org/"""]]
-
-[[!meta title="""change to forum/Need_something_more_powerful_than_Exclude on ikiwiki"""]]
-
-[[!meta permalink="http://ikiwiki.info/recentchanges/#change-78a2e59834d35da7a7ab8145beb7a30b59b95c90"]]
-
-

-
Changed pages:
-
-
-[[diff|wikiicons/diff.png]]forum/Need something more powerful than Exclude
-
-
-
-
Changed by:
-
-
-kerravonsen [dreamwidth.org]
-
-
-
Commit type:
-web
-
Date:
-02:47:38 11/23/10
-

-

-
-
-[[revert|wikiicons/revert.png]]
-
-
-

-
-
-exclusion doesn't exclude

-
-
-

-
-

-
-diff --git a/doc/forum/Need_something_more_powerful_than_Exclude.mdwn b/doc/forum/Need_something_more_powerful_than_Exclude.mdwn
-new file mode 100644
-index 0000000..5e80432
---- /dev/null
-+++ b/doc/forum/Need_something_more_powerful_than_Exclude.mdwn
-@@ -0,0 +1,5 @@
-+When I originally looked at the "exclude" option, I thought it meant that it excluded pages completely, but it apparently doesn't.  What I've found in practice is that a file which matches the "exclude" regex is excluded from *processing*, but it is still copied over to the destination directory.  Thus, for example, if I have "^Makefile$" as the exclude pattern, and I have a file `src/foo/Makefile`, then that file is copied unaltered into `dest/foo/Makefile`.  However, what I want is for `src/foo/Makefile` to be completely ignored: that it is not only not processed, but not even *copied* into the destination directory.
-+
-+I'm not sure if the current behaviour is a bug or a feature, but I would like a "totally ignore this file" feature if it's possible to have one.
-+
-+-- [[KathrynAndersen]]
-
-

-

-
-
diff --git a/doc/recentchanges/change_84fff62948ad7c7aef664585e8afed86398e7fd4._change b/doc/recentchanges/change_84fff62948ad7c7aef664585e8afed86398e7fd4._change
deleted file mode 100644
index 11774dd92..000000000
--- a/doc/recentchanges/change_84fff62948ad7c7aef664585e8afed86398e7fd4._change
+++ /dev/null
@@ -1,62 +0,0 @@
-[[!meta author="""http://jmtd.livejournal.com/"""]]
-
-[[!meta authorurl="""http://jmtd.livejournal.com/"""]]
-
-[[!meta title="""change to ikiwiki/directive/if on ikiwiki"""]]
-
-[[!meta permalink="http://ikiwiki.info/recentchanges/#change-84fff62948ad7c7aef664585e8afed86398e7fd4"]]
-
-

-
Changed pages:
-
-
-[[diff|wikiicons/diff.png]]ikiwiki/directive/if
-
-
-
-
Changed by:
-
-
-jmtd [livejournal.com]
-
-
-
Commit type:
-web
-
Date:
-10:46:13 11/15/10
-

-

-
-
-[[revert|wikiicons/revert.png]]
-
-
-

-
-
-note about template inclusion

-
-
-

-
-

-
-diff --git a/doc/ikiwiki/directive/if.mdwn b/doc/ikiwiki/directive/if.mdwn
-index 2cbf70c..492adf4 100644
---- a/doc/ikiwiki/directive/if.mdwn
-+++ b/doc/ikiwiki/directive/if.mdwn
-@@ -43,6 +43,8 @@ with the following additional tests:
- 
- * included()
- 
--  Tests whether the page is being included onto another page.
-+  Tests whether the page is being included onto another page, for example
-+  via [[inline]] or [[map]].  Note that pages inserted into other pages
-+  via [[template]] are not matched here.
- 
- [[!meta robots="noindex, follow"]]
-
-

-

-
-
diff --git a/doc/recentchanges/change_85d262e4cab2bfa55194b445d7fd251fa5818bc6._change b/doc/recentchanges/change_85d262e4cab2bfa55194b445d7fd251fa5818bc6._change
deleted file mode 100644
index 4a0b34b6b..000000000
--- a/doc/recentchanges/change_85d262e4cab2bfa55194b445d7fd251fa5818bc6._change
+++ /dev/null
@@ -1,55 +0,0 @@
-[[!meta author="""http://edrex.myopenid.com/"""]]
-
-[[!meta authorurl="""http://edrex.myopenid.com/"""]]
-
-[[!meta title="""change to todo/auto-create_tag_pages_according_to_a_template on ikiwiki"""]]
-
-[[!meta permalink="http://ikiwiki.info/recentchanges/#change-85d262e4cab2bfa55194b445d7fd251fa5818bc6"]]
-
-

-
Changed pages:
-
-
-[[diff|wikiicons/diff.png]]todo/auto-create tag pages according to a template
-
-
-
-
Changed by:
-
-
-edrex
-
-
-
Commit type:
-web
-
Date:
-17:24:17 10/30/10
-

-

-
-
-[[revert|wikiicons/revert.png]]
-
-
-

-
-

-
-

-
-diff --git a/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn b/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
-index 92c3b76..676e2bc 100644
---- a/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
-+++ b/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
-@@ -260,5 +260,6 @@ required to implement [[todo/alias directive]], which couldn't be easily done
- by writing to the RCS as the page's contents can change depending on which
- other pages claim it as an alias. --[[chrysn]]
- 
-+I agree with [[chrysn]]. In fact, is there any good reason that the core tag plugin doesn't do this? The current usability is horrible, to the point that I have gone 2.5 years with Ikiwiki and haven't yet started using tags. -- [[Eric|http://wiki.pdxhub.org/people/eric]]
- 
- [[!tag done]]
-
-

-

-
-
diff --git a/doc/recentchanges/change_85ee24a9e53aec7d70bb4fb758428e59ea76e853._change b/doc/recentchanges/change_85ee24a9e53aec7d70bb4fb758428e59ea76e853._change
deleted file mode 100644
index 11cb32339..000000000
--- a/doc/recentchanges/change_85ee24a9e53aec7d70bb4fb758428e59ea76e853._change
+++ /dev/null
@@ -1,56 +0,0 @@
-[[!meta author="""http://jmtd.livejournal.com/"""]]
-
-[[!meta authorurl="""http://jmtd.livejournal.com/"""]]
-
-[[!meta title="""change to bugs/aggregate_generates_long_filenames on ikiwiki"""]]
-
-[[!meta permalink="http://ikiwiki.info/recentchanges/#change-85ee24a9e53aec7d70bb4fb758428e59ea76e853"]]
-
-

-
Changed pages:
-
-
-[[diff|wikiicons/diff.png]]bugs/aggregate generates long filenames
-
-
-
-
Changed by:
-
-
-jmtd [livejournal.com]
-
-
-
Commit type:
-web
-
Date:
-06:11:40 11/15/10
-

-

-
-
-[[revert|wikiicons/revert.png]]
-
-
-

-
-

-
-

-
-diff --git a/doc/bugs/aggregate_generates_long_filenames.mdwn b/doc/bugs/aggregate_generates_long_filenames.mdwn
-index 3d98ee8..40decb3 100644
---- a/doc/bugs/aggregate_generates_long_filenames.mdwn
-+++ b/doc/bugs/aggregate_generates_long_filenames.mdwn
-@@ -7,4 +7,7 @@ generate long titles.  Especially once you throw escaping into the mix:
-     $ echo $?
-     25
- 
-+It would also appear this abrubtly terminates aggregate processing (if not ikiwiki itself).  Only after moving my test repo to `/tmp` to shorten the filename did I see newer RSS feeds (from a totally different source) picked up.
-+
-+
- -- [[Jon]]
-
-

-

-
-
diff --git a/doc/recentchanges/change_87a42450e1ac8e2e01b7ed2785ed43040fd14ed3._change b/doc/recentchanges/change_87a42450e1ac8e2e01b7ed2785ed43040fd14ed3._change
deleted file mode 100644
index cb834a317..000000000
--- a/doc/recentchanges/change_87a42450e1ac8e2e01b7ed2785ed43040fd14ed3._change
+++ /dev/null
@@ -1,55 +0,0 @@
-[[!meta author="""http://jugglingbits.wordpress.com/"""]]
-
-[[!meta authorurl="""http://jugglingbits.wordpress.com/"""]]
-
-[[!meta title="""change to forum/How_to_list_new_pages__44___inline__63__ on ikiwiki"""]]
-
-[[!meta permalink="http://ikiwiki.info/recentchanges/#change-87a42450e1ac8e2e01b7ed2785ed43040fd14ed3"]]
-
-

-
Changed pages:
-
-
-[[diff|wikiicons/diff.png]]forum/How to list new pages, inline?
-
-
-
-
Changed by:
-
-
-thomas11
-
-
-
Commit type:
-web
-
Date:
-03:51:29 11/06/10
-

-

-
-
-[[revert|wikiicons/revert.png]]
-
-
-

-
-

-
-

-
-diff --git a/doc/forum/How_to_list_new_pages__44___inline__63__.mdwn b/doc/forum/How_to_list_new_pages__44___inline__63__.mdwn
-new file mode 100644
-index 0000000..f28e8b9
---- /dev/null
-+++ b/doc/forum/How_to_list_new_pages__44___inline__63__.mdwn
-@@ -0,0 +1,5 @@
-+Hi, I'd love to include a "New posts" list into my front page, like at <http://danhixon.github.com/> for example.
-+
-+It should be different from recent changes in that it shouldn't show modifications of existing pages, and in that it would be inside a page with other content.
-+
-+Thanks, Thomas
-
-

-

-
-
diff --git a/doc/recentchanges/change_8806a9795116e73ec851dfea89af45a786fbe6da._change b/doc/recentchanges/change_8806a9795116e73ec851dfea89af45a786fbe6da._change
deleted file mode 100644
index 9b90d51aa..000000000
--- a/doc/recentchanges/change_8806a9795116e73ec851dfea89af45a786fbe6da._change
+++ /dev/null
@@ -1,58 +0,0 @@
-[[!meta author="""dark"""]]
-
-[[!meta authorurl="""http://ikiwiki.info/ikiwiki.cgi?page=users%2Fdark&do=goto"""]]
-
-[[!meta title="""change to news/openid on ikiwiki"""]]
-
-[[!meta permalink="http://ikiwiki.info/recentchanges/#change-8806a9795116e73ec851dfea89af45a786fbe6da"]]
-
-

-
Changed pages:
-
-
-[[diff|wikiicons/diff.png]]news/openid
-
-
-
-
Changed by:
-
-
-dark
-
-
-
Commit type:
-web
-
Date:
-17:49:10 11/11/10
-

-

-
-
-[[revert|wikiicons/revert.png]]
-
-
-

-
-
-poll vote (Accept both)

-
-
-

-
-

-
-diff --git a/doc/news/openid.mdwn b/doc/news/openid.mdwn
-index 5b145fe..87f6403 100644
---- a/doc/news/openid.mdwn
-+++ b/doc/news/openid.mdwn
-@@ -10,4 +10,4 @@ log back in, try out the OpenID signup process if you don't already have an
- OpenID, and see how OpenID works for you. And let me know your feelings about
- making such a switch. --[[Joey]]
- 
--[[!poll 67 "Accept only OpenID for logins" 21 "Accept only password logins" 40 "Accept both"]]
-+[[!poll 67 "Accept only OpenID for logins" 21 "Accept only password logins" 41 "Accept both"]]
-
-

-

-
-
diff --git a/doc/recentchanges/change_8935a131d02ac13b6024dff9cbf7a5f837fcdc04._change b/doc/recentchanges/change_8935a131d02ac13b6024dff9cbf7a5f837fcdc04._change
deleted file mode 100644
index 12ef0e9ab..000000000
--- a/doc/recentchanges/change_8935a131d02ac13b6024dff9cbf7a5f837fcdc04._change
+++ /dev/null
@@ -1,161 +0,0 @@
-[[!meta author="""http://smcv.pseudorandom.co.uk/"""]]
-
-[[!meta authorurl="""http://smcv.pseudorandom.co.uk/"""]]
-
-[[!meta title="""change to todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both on ikiwiki"""]]
-
-[[!meta permalink="http://ikiwiki.info/recentchanges/#change-8935a131d02ac13b6024dff9cbf7a5f837fcdc04"]]
-
-

-
Changed pages:
-
-
-[[diff|wikiicons/diff.png]]todo/want to avoid ikiwiki using http or https in urls to allow serving both
-
-
-
-
Changed by:
-
-
-smcv
-
-
-
Commit type:
-web
-
Date:
-00:37:28 11/23/10
-

-

-
-
-[[revert|wikiicons/revert.png]]
-
-
-

-
-
-updated branch, not tested properly yet

-
-
-

-
-

-
-diff --git a/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn b/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn
-index f8ec4c4..8b05010 100644
---- a/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn
-+++ b/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn
-@@ -147,7 +147,7 @@ you don't like my approach:
- 
- ----
- 
--[[!template id=gitbranch branch=smcv/ready/localurl author="[[smcv]]"]]
-+[[!template id=gitbranch branch=smcv/localurl author="[[smcv]]"]]
- [[!tag patch]]
- 
- OK, here's an alternative approach, closer in spirit to what was initially
-@@ -165,14 +165,17 @@ whether `url` and `cgiurl` are on the same server with the the same URL
- scheme. In theory you could use things like `//static.example.com/wiki/`
- and `//dynamic.example.com/ikiwiki.cgi` to preserve choice of http/https
- while switching server, but I don't know how consistently browsers
--suppot that.
-+support that.
- 
- "local" here is short for "locally valid", because these URLs are neither
- fully relative nor fully absolute, and there doesn't seem to be a good name
- for them...
- 
--I've tested this on a demo website with the CGI enabled, and it seems to
-+I tested an earlier version on a demo website with the CGI enabled, and it seemed to
- work nicely (there might be bugs in some plugins, I didn't try all of them).
-+I haven't yet re-tested with my updated branch, which is why it's not `ready/`
-+yet.
-+
- The `$config{url}` and `$config{cgiurl}` are both HTTP, but if I enable
- `httpauth`, set `cgiauthurl` to a HTTPS version of the same site and log
- in via that, links all end up in the HTTPS version.
-@@ -217,11 +220,19 @@ New API added by this branch:
-   >> 
-   >>> That makes a great deal of sense, bravo for actually removing
-   >>> parameters in the common case while maintaining backwards
--  >>> compatability!
-+  >>> compatability! --[[Joey]]
-+  >>>
-+  >>>> Done in my `localurl` branch; not tested in a whole-wiki way
-+  >>>> yet, but I did add a regression test. I've used
-+  >>>> `urlto(x, undef)` rather than `urlto(x)` so far, but I could
-+  >>>> go back through the codebase using the short form if you'd
-+  >>>> prefer. --[[smcv]]
-   >>> 
-   >>> It does highlight that it would be better to have a
-   >>> `absolute_urlto($link)` (or maybe `absolute(urlto($link))` )
-   >>> rather than the 3 parameter form. --[[Joey]]
-+  >>>
-+  >>> Possibly. I haven't added this.
- 
- * `IkiWiki::baseurl` has a new second argument which works like the
-   third argument of `urlto`
-@@ -232,19 +243,34 @@ New API added by this branch:
-   >> (But I assume changes to `urlto` will follow through here anyway.)
-   >> --[[Joey]] 
- 
-+  >>> I had to use it a bit more, as a replacement for `$config{url}`
-+  >>> when doing things like referencing stylesheets or redirecting to
-+  >>> the top of the wiki.
-+  >>>
-+  >>> I ended up redoing this without the extra parameter. Previously,
-+  >>> `baseurl(undef)` was the absolute URL; now, `baseurl(undef)` is
-+  >>> the local path. I know you objected to me using `baseurl()` in
-+  >>> an earlier branch, because `baseurl().$x` looks confusingly
-+  >>> similar to `baseurl($x)` but has totally different semantics;
-+  >>> I've generally written it `baseurl(undef)` now, to be more
-+  >>> explicit. --[[smcv]]
-+
- * `IkiWiki::cgiurl` uses `$local_cgiurl` if passed `local_cgiurl => 1`
- 
--  > Possibly changed to making this always be local unless `cgiurl => $x`
--  > is given: see below --[[smcv]]
-+  > Now changed to always use the `$local_cgiurl`. --[[smcv]]
- 
- * `IkiWiki::cgiurl` omits the trailing `?` if given no named parameters
-   except `cgiurl` and/or `local_cgiurl`
- 
-   > I assume you have no objection to this --[[smcv]]
-   > 
--  >> Nod, although I don't know of a use case. --[[Joey]] 
-+  >> Nod, although I don't know of a use case. --[[Joey]]
-+
-+  >>> The use-case is that I can replace `$config{cgiurl}` with
-+  >>> `IkiWiki::cgiurl()` for things like the action attribute of
-+  >>> forms. --[[smcv]]
- 
--Bugs:
-+Fixed bugs:
- 
- * I don't think anything except `openid` calls `cgiurl` without also
-   passing in `local_cgiurl => 1`, so perhaps that should be the default;
-@@ -265,6 +291,10 @@ Bugs:
-   >>> if `absolute()` were implemented as suggested above, it could also
-   >>> be used with cgiurl if necessary.) --[[Joey]]
- 
-+  >>>> Done (minus `absolute()`). --[[smcv]]
-+
-+Potential future things:
-+
- * It occurs to me that `IkiWiki::cgiurl` could probably benefit from being
-   exported? Perhaps also `IkiWiki::baseurl`?
- 
-@@ -285,4 +315,7 @@ Bugs:
-   > AFACIS, `baseurl` is only called in 3 places so I don't think that's
-   > needed. --[[Joey]] 
- 
--  >> OK, wontfix. --[[smcv]]
-+  >> OK, wontfix. For what it's worth, my branch has 6 uses in IkiWiki
-+  >> core code (IkiWiki, CGI, Render and the pseudo-core part of editpage)
-+  >> and 5 in plugins, since I used it for things like redirection back
-+  >> to the top of the wiki --[[smcv]]
-
-

-

-
-
diff --git a/doc/recentchanges/change_8de7fde49c295a6c9098767b9fdfea79de8476eb._change b/doc/recentchanges/change_8de7fde49c295a6c9098767b9fdfea79de8476eb._change
deleted file mode 100644
index f89be517c..000000000
--- a/doc/recentchanges/change_8de7fde49c295a6c9098767b9fdfea79de8476eb._change
+++ /dev/null
@@ -1,59 +0,0 @@
-[[!meta author="""joey"""]]
-
-[[!meta authorurl="""http://ikiwiki.info/ikiwiki.cgi?page=users%2Fjoey&do=goto"""]]
-
-[[!meta title="""change to bugs/argument_isn__39__t_numeric:_mixing_templates_and_creation__95__date on ikiwiki"""]]
-
-[[!meta permalink="http://ikiwiki.info/recentchanges/#change-8de7fde49c295a6c9098767b9fdfea79de8476eb"]]
-
-

-
Changed pages:
-
-
-[[diff|wikiicons/diff.png]]bugs/argument isn't numeric: mixing templates and creation_date
-
-
-
-
Changed by:
-
-
-joey
-
-
-
Commit type:
-git
-
Date:
-13:24:50 11/16/10
-

-

-
-
-[[revert|wikiicons/revert.png]]
-
-
-

-
-
-already fixed

-
-
-

-
-

-
-diff --git a/doc/bugs/argument_isn__39__t_numeric:_mixing_templates_and_creation__95__date.mdwn b/doc/bugs/argument_isn__39__t_numeric:_mixing_templates_and_creation__95__date.mdwn
-index 8309389..b1053fc 100644
---- a/doc/bugs/argument_isn__39__t_numeric:_mixing_templates_and_creation__95__date.mdwn
-+++ b/doc/bugs/argument_isn__39__t_numeric:_mixing_templates_and_creation__95__date.mdwn
-@@ -55,3 +55,6 @@ I believed (until I tested) that the [[ikiwiki/directive/if]] directive, with th
-     """]]
- 
- However this doesn't work.  I assume "included" in this context means e.g. via an `inline` or `map`, not template trans-clusion. -- [[Jon]]
-+
-+> As far as I know, this bug was fixed in
-+> 4a75dee651390b79ce4ceb1d951b02e28b3ce83a on October 20th. [[done]] --[[Joey]]
-
-

-

-
-
diff --git a/doc/recentchanges/change_9180381728e252cf474eb8a4b0460755b5c28340._change b/doc/recentchanges/change_9180381728e252cf474eb8a4b0460755b5c28340._change
deleted file mode 100644
index 617d642b9..000000000
--- a/doc/recentchanges/change_9180381728e252cf474eb8a4b0460755b5c28340._change
+++ /dev/null
@@ -1,75 +0,0 @@
-[[!meta author="""http://smcv.pseudorandom.co.uk/"""]]
-
-[[!meta authorurl="""http://smcv.pseudorandom.co.uk/"""]]
-
-[[!meta title="""change to todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both on ikiwiki"""]]
-
-[[!meta permalink="http://ikiwiki.info/recentchanges/#change-9180381728e252cf474eb8a4b0460755b5c28340"]]
-
-

-
Changed pages:
-
-
-[[diff|wikiicons/diff.png]]todo/want to avoid ikiwiki using http or https in urls to allow serving both
-
-
-
-
Changed by:
-
-
-smcv
-
-
-
Commit type:
-web
-
Date:
-23:50:29 11/23/10
-

-

-
-
-[[revert|wikiicons/revert.png]]
-
-
-

-
-
-tested and seems to work

-
-
-

-
-

-
-diff --git a/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn b/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn
-index 8b05010..264eb96 100644
---- a/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn
-+++ b/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn
-@@ -147,7 +147,7 @@ you don't like my approach:
- 
- ----
- 
--[[!template id=gitbranch branch=smcv/localurl author="[[smcv]]"]]
-+[[!template id=gitbranch branch=smcv/ready/localurl author="[[smcv]]"]]
- [[!tag patch]]
- 
- OK, here's an alternative approach, closer in spirit to what was initially
-@@ -171,10 +171,10 @@ support that.
- fully relative nor fully absolute, and there doesn't seem to be a good name
- for them...
- 
--I tested an earlier version on a demo website with the CGI enabled, and it seemed to
-+I've tested this on a demo website with the CGI enabled, and it seemed to
- work nicely (there might be bugs in some plugins, I didn't try all of them).
--I haven't yet re-tested with my updated branch, which is why it's not `ready/`
--yet.
-+The branch at [[todo/use secure cookies for SSL logins]] goes well with
-+this one.
- 
- The `$config{url}` and `$config{cgiurl}` are both HTTP, but if I enable
- `httpauth`, set `cgiauthurl` to a HTTPS version of the same site and log
-
-

-

-
-
diff --git a/doc/recentchanges/change_93e15cc84f47a1340f8bd06d7056ba423fe510bb._change b/doc/recentchanges/change_93e15cc84f47a1340f8bd06d7056ba423fe510bb._change
deleted file mode 100644
index 2df071529..000000000
--- a/doc/recentchanges/change_93e15cc84f47a1340f8bd06d7056ba423fe510bb._change
+++ /dev/null
@@ -1,60 +0,0 @@
-[[!meta author="""http://smcv.pseudorandom.co.uk/"""]]
-
-[[!meta authorurl="""http://smcv.pseudorandom.co.uk/"""]]
-
-[[!meta title="""change to plugins/autoindex/discussion on ikiwiki"""]]
-
-[[!meta permalink="http://ikiwiki.info/recentchanges/#change-93e15cc84f47a1340f8bd06d7056ba423fe510bb"]]
-
-

-
Changed pages:
-
-
-[[diff|wikiicons/diff.png]]plugins/autoindex/discussion
-
-
-
-
Changed by:
-
-
-smcv
-
-
-
Commit type:
-web
-
Date:
-08:02:36 11/08/10
-

-

-
-
-[[revert|wikiicons/revert.png]]
-
-
-

-
-

-
-

-
-diff --git a/doc/plugins/autoindex/discussion.mdwn b/doc/plugins/autoindex/discussion.mdwn
-index a48fe9d..d8b9be6 100644
---- a/doc/plugins/autoindex/discussion.mdwn
-+++ b/doc/plugins/autoindex/discussion.mdwn
-@@ -1,6 +1,11 @@
- Would it be possible to add an option to only generate the index files
- for the html output and not place the markdown files in the wiki source?
- 
-+> Or better still, add a mechanism for ikiwiki to hold transient source
-+> pages in memory and render them as if they existed, without actually
-+> writing them out, as [[JoeRayhawk]] suggests below? I think
-+> add_autofile would be the way to do this. --[[smcv]]
-+
- The reason being that I have a lot of directories which need to be autoindexed,
- but I would prefer if the index files didn't clutter up my git repository.
- 
-
-

-

-
-
diff --git a/doc/recentchanges/change_98d0883c8949e6cde8db019bb282d5fa815ffc1a._change b/doc/recentchanges/change_98d0883c8949e6cde8db019bb282d5fa815ffc1a._change
deleted file mode 100644
index 1ca5dd2b1..000000000
--- a/doc/recentchanges/change_98d0883c8949e6cde8db019bb282d5fa815ffc1a._change
+++ /dev/null
@@ -1,137 +0,0 @@
-[[!meta author="""http://smcv.pseudorandom.co.uk/"""]]
-
-[[!meta authorurl="""http://smcv.pseudorandom.co.uk/"""]]
-
-[[!meta title="""change to todo/Improving_the_efficiency_of_match__95__glob on ikiwiki"""]]
-
-[[!meta permalink="http://ikiwiki.info/recentchanges/#change-98d0883c8949e6cde8db019bb282d5fa815ffc1a"]]
-
-

-
Changed pages:
-
-
-[[diff|wikiicons/diff.png]]todo/Improving the efficiency of match_glob
-
-
-
-
Changed by:
-
-
-smcv
-
-
-
Commit type:
-web
-
Date:
-12:50:31 11/14/10
-

-

-
-
-[[revert|wikiicons/revert.png]]
-
-
-

-
-
-branches imported into git; benchmark results

-
-
-

-
-

-
-diff --git a/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn b/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn
-index ff9784d..c4d3a8e 100644
---- a/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn
-+++ b/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn
-@@ -15,6 +15,11 @@ Here's my patch - please consider it! -- [[KathrynAndersen]]
- >>> rather than /$re/ so I think that would make sense.
- >>> -- [[KathrynAndersen]]
- 
-+>>>> Git branch `smcv/ka-glob-cache` has Kathryn's patch. Git
-+>>>> branch `smcv/memoize-glob2re` does as I suggested, which
-+>>>> is less verbose than Kathryn's patch but also not as
-+>>>> fast; I'm not sure why, tbh. --[[smcv]]
-+
- --------------------------------------------------------------
- Benchmarks done with Devel::Profile on the same testbed IkiWiki setup.  I'm just showing the start of the profile output, since that's what's relevant.
- 
-@@ -51,6 +56,72 @@ Note that the seconds per call for match_glob in the "after" case has gone down
- K.A.
- 
- --------------------------------------------------------------
-+
-+A second set of benchmarks, done by rebuilding the docwiki at commit f942c2db05e4
-+like so:
-+
-+    perl -Iblib/lib -d:Profile ikiwiki.in -setup docwiki.setup --no-verbose
-+
-+The docwiki appears to use fewer glob matches than Kathryn's wiki.
-+
-+With master:
-+
-+    time elapsed (wall):   29.6970
-+    time running program:  24.6930  (83.15%)
-+    time profiling (est.): 5.0041  (16.85%)
-+    number of calls:       1359180
-+    number of exceptions:  13
-+
-+    %Time    Sec.     #calls   sec/call  F  name
-+    13.62    3.3629     3406   0.000987     Text::Balanced::_match_tagged
-+    10.84    2.6773    79442   0.000034     IkiWiki::PageSpec::match_glob
-+     3.08    0.7598    59454   0.000013     <anon>:IkiWiki/Plugin/inline.pm:223
-+     3.07    0.7593    29830   0.000025     IkiWiki::bestlink
-+     2.99    0.7378    10231   0.000072     IkiWiki::PageSpec::match_link
-+
-+With my `smcv/memoize-glob2re` branch:
-+
-+    time elapsed (wall):   30.4931
-+    time running program:  25.1248  (82.39%)
-+    time profiling (est.): 5.3683  (17.61%)
-+    number of calls:       1439943
-+    number of exceptions:  13
-+
-+    %Time    Sec.     #calls   sec/call  F  name
-+    13.19    3.3146     3406   0.000973     Text::Balanced::_match_tagged
-+     8.41    2.1123    79442   0.000027     IkiWiki::PageSpec::match_glob
-+     3.97    0.9979    86905   0.000011     Memoize::_memoizer
-+     3.05    0.7654    59454   0.000013     <anon>:IkiWiki/Plugin/inline.pm:223
-+     3.02    0.7576    29830   0.000025     IkiWiki::bestlink
-+
-+and in a repeated run:
-+
-+     8.40    2.0905    79442   0.000026     IkiWiki::PageSpec::match_glob
-+
-+With Kathryn's patch as seen in my `smcv/ka-glob-cache` branch:
-+
-+    time elapsed (wall):   27.7567
-+    time running program:  22.9941  (82.84%)
-+    time profiling (est.): 4.7627  (17.16%)
-+    number of calls:       1279946
-+    number of exceptions:  13
-+
-+    %Time    Sec.     #calls   sec/call  F  name
-+    14.29    3.2867     3406   0.000965     Text::Balanced::_match_tagged
-+     7.89    1.8136    79442   0.000023     IkiWiki::PageSpec::match_glob
-+     3.30    0.7577    59454   0.000013     <anon>:IkiWiki/Plugin/inline.pm:223
-+     3.24    0.7461    29830   0.000025     IkiWiki::bestlink
-+     3.19    0.7332      143   0.005127  ?  IkiWiki::pagespec_match_list
-+
-+and in a repeated run:
-+
-+     7.84    1.8253    79442   0.000023     IkiWiki::PageSpec::match_glob
-+
-+--[[smcv]]
-+
-+--------------------------------------------------------------
-+
-+
- <pre>
- diff --git a/IkiWiki.pm b/IkiWiki.pm
- index 08a3d78..c187b98 100644
-
-

-

-
-
diff --git a/doc/recentchanges/change_99749dfdeac07b975cfba6eef617f3d7362eec73._change b/doc/recentchanges/change_99749dfdeac07b975cfba6eef617f3d7362eec73._change
deleted file mode 100644
index 71b01cedf..000000000
--- a/doc/recentchanges/change_99749dfdeac07b975cfba6eef617f3d7362eec73._change
+++ /dev/null
@@ -1,61 +0,0 @@
-[[!meta author="""https://www.google.com/accounts/o8/id?id=AItOawmE7z4CSv-ctBarutQCd70R3CcaSPPxjVk"""]]
-
-[[!meta authorurl="""https://www.google.com/accounts/o8/id?id=AItOawmE7z4CSv-ctBarutQCd70R3CcaSPPxjVk"""]]
-
-[[!meta title="""change to bugs/more_and_RSS_generation on ikiwiki"""]]
-
-[[!meta permalink="http://ikiwiki.info/recentchanges/#change-99749dfdeac07b975cfba6eef617f3d7362eec73"]]
-
-

-
Changed pages:
-
-
-[[diff|wikiicons/diff.png]]bugs/more and RSS generation
-
-
-
-
Changed by:
-
-
-Dave
-
-
-
Commit type:
-web
-
Date:
-10:28:04 10/28/10
-

-

-
-
-[[revert|wikiicons/revert.png]]
-
-
-

-
-
-more plugin and rss

-
-
-

-
-

-
-diff --git a/doc/bugs/more_and_RSS_generation.mdwn b/doc/bugs/more_and_RSS_generation.mdwn
-new file mode 100644
-index 0000000..72d636f
---- /dev/null
-+++ b/doc/bugs/more_and_RSS_generation.mdwn
-@@ -0,0 +1,7 @@
-+I'd like the more plugin and RSS to play better together. In the case of the html generation of the main page of a blog, I'd like to get the first paragraph out, but keep RSS as a full feed.
-+
-+Maybe there is a different plugin (I also tried toggle)? 
-+
-+I also note, that at least currently, more seems to break on a few pages, not being parsed at all when aggregated into the front page. 
-+
-+see also: [[/bugs/rss_feeds_do_not_use_recommended_encoding_of_entities_for_some_fields/]]
-
-

-

-
-
diff --git a/doc/recentchanges/change_9a7387a53be2b1e182003f3e86cb76d7f10c4b67._change b/doc/recentchanges/change_9a7387a53be2b1e182003f3e86cb76d7f10c4b67._change
deleted file mode 100644
index 335d14a87..000000000
--- a/doc/recentchanges/change_9a7387a53be2b1e182003f3e86cb76d7f10c4b67._change
+++ /dev/null
@@ -1,76 +0,0 @@
-[[!meta author="""joey"""]]
-
-[[!meta authorurl="""http://ikiwiki.info/ikiwiki.cgi?page=users%2Fjoey&do=goto"""]]
-
-[[!meta title="""change to todo/Improving_the_efficiency_of_match__95__glob on ikiwiki"""]]
-
-[[!meta permalink="http://ikiwiki.info/recentchanges/#change-9a7387a53be2b1e182003f3e86cb76d7f10c4b67"]]
-
-

-
Changed pages:
-
-
-[[diff|wikiicons/diff.png]]todo/Improving the efficiency of match_glob
-
-
-
-
Changed by:
-
-
-joey
-
-
-
Commit type:
-git
-
Date:
-13:19:13 11/16/10
-

-

-
-
-[[revert|wikiicons/revert.png]]
-
-
-

-
-
-thoughts

-
-
-

-
-

-
-diff --git a/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn b/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn
-index 43571ea..0fc059a 100644
---- a/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn
-+++ b/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn
-@@ -22,6 +22,23 @@ Here's my patch - please consider it! -- [[KathrynAndersen]]
- 
- >>>>> I think it's because my patch focuses on match_glob while the memoize patch focuses on `glob2re`, and `glob2re` is called in `filecheck`, `meta` and `po` as well as in `match_glob` and `match_user`; thus the memoized `glob2re` is dealing with a bigger set of globs to look up, and thus could be just that little bit slower. -- [[KathrynAndersen]]
- 
-+>>>>>> What may be going on is that glob2re is already a fairly fast
-+>>>>>> function, so the overhead of memoizing it with the very generic
-+>>>>>> `_memoizer` (see its source) swamps the memoization gain. Note
-+>>>>>> that the few functions memoized with the Memoizer before were much
-+>>>>>> more expensive, so that little overhead was acceptable then.
-+>>>>>>
-+>>>>>> It also may be that Kathryn's patch is slightly faster due to using
-+>>>>>> the construct `$foo =~ $regexp` rather than `$foo =~ /$regexp/`
-+>>>>>> (probably avoids a copy or something like that internally) --
-+>>>>>> this despite checking both `exists` and `defined` on the hash, which
-+>>>>>> should be reundant AFAICS.
-+>>>>>>
-+>>>>>> My guess is that the best of both worlds would be to move
-+>>>>>> the byhand memoization to glob2re and have it return a compiled
-+>>>>>> `/^/i` regexp that can be used without further modifiction in most
-+>>>>>> cases. --[[Joey]] 
-+
- --------------------------------------------------------------
- Benchmarks done with Devel::Profile on the same testbed IkiWiki setup.  I'm just showing the start of the profile output, since that's what's relevant.
- 
-
-

-

-
-
diff --git a/doc/recentchanges/change_9b01c9779ef682af0874efc062d9fb2e91676c23._change b/doc/recentchanges/change_9b01c9779ef682af0874efc062d9fb2e91676c23._change
deleted file mode 100644
index db8fdff3e..000000000
--- a/doc/recentchanges/change_9b01c9779ef682af0874efc062d9fb2e91676c23._change
+++ /dev/null
@@ -1,66 +0,0 @@
-[[!meta author="""http://smcv.pseudorandom.co.uk/"""]]
-
-[[!meta authorurl="""http://smcv.pseudorandom.co.uk/"""]]
-
-[[!meta title="""change to forum/Need_something_more_powerful_than_Exclude/comment_2_0019cd6b34c8d8678b2532de57a92d15 on ikiwiki"""]]
-
-[[!meta permalink="http://ikiwiki.info/recentchanges/#change-9b01c9779ef682af0874efc062d9fb2e91676c23"]]
-
-

-
Changed pages:
-
-
-[[diff|wikiicons/diff.png]]forum/Need something more powerful than Exclude/comment 2 0019cd6b34c8d8678b2532de57a92d15
-
-
-
-
Changed by:
-
-
-smcv
-
-
-
Commit type:
-web
-
Date:
-10:43:21 11/23/10
-

-

-
-
-[[revert|wikiicons/revert.png]]
-
-
-

-
-
-Added a comment: expression anchored too closely?

-
-
-

-
-

-
-diff --git a/doc/forum/Need_something_more_powerful_than_Exclude/comment_2_0019cd6b34c8d8678b2532de57a92d15._comment b/doc/forum/Need_something_more_powerful_than_Exclude/comment_2_0019cd6b34c8d8678b2532de57a92d15._comment
-new file mode 100644
-index 0000000..7842cae
---- /dev/null
-+++ b/doc/forum/Need_something_more_powerful_than_Exclude/comment_2_0019cd6b34c8d8678b2532de57a92d15._comment
-@@ -0,0 +1,12 @@
-+[[!comment format=mdwn
-+ username="http://smcv.pseudorandom.co.uk/"
-+ nickname="smcv"
-+ subject="expression anchored too closely?"
-+ date="2010-11-23T10:43:21Z"
-+ content="""
-+It looks as though you might only be excluding a top-level Makefile, and not a Makefile in subdirectories. Try excluding `(^|/)Makefile$` instead, for instance? (See `wiki_file_prune_regexps` in `IkiWiki.pm` for hints.)
-+
-+The match operation in `&file_pruned` ends up a bit like this:
-+
-+    \"foo/Makefile\" =~ m{…|…|…|(^|/)Makefile$}
-+"""]]
-
-

-

-
-
diff --git a/doc/recentchanges/change_9c42f5786601429a0b921d6591ebf5e4c1eb4da8._change b/doc/recentchanges/change_9c42f5786601429a0b921d6591ebf5e4c1eb4da8._change
deleted file mode 100644
index f235de4ed..000000000
--- a/doc/recentchanges/change_9c42f5786601429a0b921d6591ebf5e4c1eb4da8._change
+++ /dev/null
@@ -1,70 +0,0 @@
-[[!meta author="""http://smcv.pseudorandom.co.uk/"""]]
-
-[[!meta authorurl="""http://smcv.pseudorandom.co.uk/"""]]
-
-[[!meta title="""change to plugins/autoindex/discussion on ikiwiki"""]]
-
-[[!meta permalink="http://ikiwiki.info/recentchanges/#change-9c42f5786601429a0b921d6591ebf5e4c1eb4da8"]]
-
-

-
Changed pages:
-
-
-[[diff|wikiicons/diff.png]]plugins/autoindex/discussion
-
-
-
-
Changed by:
-
-
-smcv
-
-
-
Commit type:
-web
-
Date:
-08:17:07 11/08/10
-

-

-
-
-[[revert|wikiicons/revert.png]]
-
-
-

-
-
-put the problematic patch in a toggleable to make discussion more visible

-
-
-

-
-

-
-diff --git a/doc/plugins/autoindex/discussion.mdwn b/doc/plugins/autoindex/discussion.mdwn
-index b09481c..6b13d23 100644
---- a/doc/plugins/autoindex/discussion.mdwn
-+++ b/doc/plugins/autoindex/discussion.mdwn
-@@ -22,6 +22,8 @@ If you just don't want to clutter your git repo, below it's a patch does the fol
- 
- * If you set autoindex_commit to 1 (this is the default), auto-generated index files will be put in the repo provided you enabled rcs backend.
- 
-+[[!toggle id="patch-for-autoindex_commit" text="patch for autoindex_commit"]]
-+[[!toggleable id="patch-for-autoindex_commit" text="""
- <pre>
- --- autoindex.pm.orig	2009-10-01 17:13:51.000000000 +0800
- +++ autoindex.pm	2009-10-01 17:21:09.000000000 +0800
-@@ -65,7 +67,7 @@ If you just don't want to clutter your git repo, below it's a patch does the fol
-  				gettext("automatic index generation"),
-  				undef, undef);
- </pre>
--
-+"""]]
-  
- Warning:  I guess this patch may work, but I *haven't tested it yet*.  -- [[weakish]]
- 
-
-

-

-
-
diff --git a/doc/recentchanges/change_9c8f86ee9c59035c9462d2c69c7b89d0c9dbc3c2._change b/doc/recentchanges/change_9c8f86ee9c59035c9462d2c69c7b89d0c9dbc3c2._change
deleted file mode 100644
index 44bac63c5..000000000
--- a/doc/recentchanges/change_9c8f86ee9c59035c9462d2c69c7b89d0c9dbc3c2._change
+++ /dev/null
@@ -1,58 +0,0 @@
-[[!meta author="""134.100.5.65"""]]
-
-[[!meta authorurl="""http://ikiwiki.info/ikiwiki.cgi?page=users%2F134.100.5.65&do=goto"""]]
-
-[[!meta title="""change to news/openid on ikiwiki"""]]
-
-[[!meta permalink="http://ikiwiki.info/recentchanges/#change-9c8f86ee9c59035c9462d2c69c7b89d0c9dbc3c2"]]
-
-

-
Changed pages:
-
-
-[[diff|wikiicons/diff.png]]news/openid
-
-
-
-
Changed by:
-
-
-134.100.5.65
-
-
-
Commit type:
-web
-
Date:
-16:05:26 11/09/10
-

-

-
-
-[[revert|wikiicons/revert.png]]
-
-
-

-
-
-poll vote (Accept both)

-
-
-

-
-

-
-diff --git a/doc/news/openid.mdwn b/doc/news/openid.mdwn
-index 02f7afb..5b145fe 100644
---- a/doc/news/openid.mdwn
-+++ b/doc/news/openid.mdwn
-@@ -10,4 +10,4 @@ log back in, try out the OpenID signup process if you don't already have an
- OpenID, and see how OpenID works for you. And let me know your feelings about
- making such a switch. --[[Joey]]
- 
--[[!poll 67 "Accept only OpenID for logins" 21 "Accept only password logins" 39 "Accept both"]]
-+[[!poll 67 "Accept only OpenID for logins" 21 "Accept only password logins" 40 "Accept both"]]
-
-

-

-
-
diff --git a/doc/recentchanges/change_9d0ac3170a8f90d2139ef75698e8af21a6435fb4._change b/doc/recentchanges/change_9d0ac3170a8f90d2139ef75698e8af21a6435fb4._change
deleted file mode 100644
index e65592910..000000000
--- a/doc/recentchanges/change_9d0ac3170a8f90d2139ef75698e8af21a6435fb4._change
+++ /dev/null
@@ -1,58 +0,0 @@
-[[!meta author="""http://jmtd.livejournal.com/"""]]
-
-[[!meta authorurl="""http://jmtd.livejournal.com/"""]]
-
-[[!meta title="""change to bugs/argument_isn__39__t_numeric:_mixing_templates_and_creation__95__date on ikiwiki"""]]
-
-[[!meta permalink="http://ikiwiki.info/recentchanges/#change-9d0ac3170a8f90d2139ef75698e8af21a6435fb4"]]
-
-

-
Changed pages:
-
-
-[[diff|wikiicons/diff.png]]bugs/argument isn't numeric: mixing templates and creation_date
-
-
-
-
Changed by:
-
-
-jmtd [livejournal.com]
-
-
-
Commit type:
-web
-
Date:
-10:28:50 11/15/10
-

-

-
-
-[[revert|wikiicons/revert.png]]
-
-
-

-
-
-done with commit da9e1ea667f82d5fca916

-
-
-

-
-

-
-diff --git a/doc/bugs/argument_isn__39__t_numeric:_mixing_templates_and_creation__95__date.mdwn b/doc/bugs/argument_isn__39__t_numeric:_mixing_templates_and_creation__95__date.mdwn
-index 70af505..5485bba 100644
---- a/doc/bugs/argument_isn__39__t_numeric:_mixing_templates_and_creation__95__date.mdwn
-+++ b/doc/bugs/argument_isn__39__t_numeric:_mixing_templates_and_creation__95__date.mdwn
-@@ -56,3 +56,5 @@ An alternative fix is to wrap the entire template inside a test to see whether t
-     """]]
- 
- In fact, this is probably best practice for in-srcdir templates.  I'd consider this done if the documentation for the directive suggested it. -- [[Jon]]
-+
-+> [[done]] with <http://git.ikiwiki.info/?p=ikiwiki;a=commitdiff;h=da9e1ea667f82d5fca9168dbed19be08040570ff> -- [[Jon]]
-
-

-

-
-
diff --git a/doc/recentchanges/change_9d26a72468fad69d633875b4ffb4aff8abd80023._change b/doc/recentchanges/change_9d26a72468fad69d633875b4ffb4aff8abd80023._change
deleted file mode 100644
index c53b0bfea..000000000
--- a/doc/recentchanges/change_9d26a72468fad69d633875b4ffb4aff8abd80023._change
+++ /dev/null
@@ -1,105 +0,0 @@
-[[!meta author="""smcv"""]]
-
-[[!meta authorurl="""http://ikiwiki.info/ikiwiki.cgi?page=users%2Fsmcv&do=goto"""]]
-
-[[!meta title="""change to todo/auto-create_tag_pages_according_to_a_template todo/autoindex_should_use_add__95__autofile todo/transient_in-memory_pages on ikiwiki"""]]
-
-[[!meta permalink="http://ikiwiki.info/recentchanges/#change-9d26a72468fad69d633875b4ffb4aff8abd80023"]]
-
-
-
-
-[[revert|wikiicons/revert.png]]
-
-
-

-
-
-point to my 'transient' branch

-
-
-

-
-

-
-diff --git a/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn b/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
-index 676e2bc..e065c4a 100644
---- a/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
-+++ b/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
-@@ -262,4 +262,6 @@ other pages claim it as an alias. --[[chrysn]]
- 
- I agree with [[chrysn]]. In fact, is there any good reason that the core tag plugin doesn't do this? The current usability is horrible, to the point that I have gone 2.5 years with Ikiwiki and haven't yet started using tags. -- [[Eric|http://wiki.pdxhub.org/people/eric]]
- 
-+> See [[todo/transient in-memory pages]] for progress on this. --[[smcv]]
-+
- [[!tag done]]
-diff --git a/doc/todo/autoindex_should_use_add__95__autofile.mdwn b/doc/todo/autoindex_should_use_add__95__autofile.mdwn
-index 517567e..64f81c8 100644
---- a/doc/todo/autoindex_should_use_add__95__autofile.mdwn
-+++ b/doc/todo/autoindex_should_use_add__95__autofile.mdwn
-@@ -1,2 +1,4 @@
- `add_autofile` is a generic version of [[plugins/autoindex]]'s code,
- so the latter should probably use the former. --[[smcv]]
-+
-+> See [[todo/transient in-memory pages]] for progress on this. --[[smcv]]
-diff --git a/doc/todo/transient_in-memory_pages.mdwn b/doc/todo/transient_in-memory_pages.mdwn
-index 9808ffd..5dbbe4f 100644
---- a/doc/todo/transient_in-memory_pages.mdwn
-+++ b/doc/todo/transient_in-memory_pages.mdwn
-@@ -18,3 +18,26 @@ This would also be useful for autoindex, as suggested on
- One refinement I'd suggest is that if the transient page is edited,
- its transient contents are evaluated and used as the initial
- content for the edit box; after that, it'd become a static page. --[[smcv]]
-+
-+--------------------------
-+
-+[[!template id=gitbranch branch=smcv/transient author="[[smcv]]"]]
-+[[!tag patch]]
-+
-+I had a look at implementing this. It turns out to be harder than I thought
-+to have purely in-memory pages (several plugins want to be able to access the
-+source file as a file), but I did get this proof-of-concept branch
-+to write tag and autoindex pages into an underlay.
-+
-+This loses the ability to delete the auto-created pages (although they don't
-+clutter up git this way, at least), and a lot of the code in autoindex is
-+probably now redundant, so this is probably not quite ready for merge, but
-+I'd welcome opinions.
-+
-+Usage: set `tag_underlay` and/or `autoindex_underlay` to an absolute path,
-+which you must create beforehand. I suggest *srcdir* + `/.ikiwiki/transient`.
-+
-+Refinements that could be made if this approach seems reasonable:
-+
-+* make these options boolean, and have the path always be `.ikiwiki/transient`
-+* improve the `remove` plugin so it also deletes from this special underlay
-
-

-

-
-
diff --git a/doc/recentchanges/change_9f8cfe998e5ced7e4b2e1dd819a025b0745935ff._change b/doc/recentchanges/change_9f8cfe998e5ced7e4b2e1dd819a025b0745935ff._change
deleted file mode 100644
index 14b34496c..000000000
--- a/doc/recentchanges/change_9f8cfe998e5ced7e4b2e1dd819a025b0745935ff._change
+++ /dev/null
@@ -1,59 +0,0 @@
-[[!meta author="""joey"""]]
-
-[[!meta authorurl="""http://ikiwiki.info/ikiwiki.cgi?page=users%2Fjoey&do=goto"""]]
-
-[[!meta title="""change to tips/nearlyfreespeech/discussion on ikiwiki"""]]
-
-[[!meta permalink="http://ikiwiki.info/recentchanges/#change-9f8cfe998e5ced7e4b2e1dd819a025b0745935ff"]]
-
-

-
Changed pages:
-
-
-[[diff|wikiicons/diff.png]]tips/nearlyfreespeech/discussion
-
-
-
-
Changed by:
-
-
-joey
-
-
-
Commit type:
-git
-
Date:
-18:57:10 11/20/10
-

-

-
-
-[[revert|wikiicons/revert.png]]
-
-
-

-
-
-response

-
-
-

-
-

-
-diff --git a/doc/tips/nearlyfreespeech/discussion.mdwn b/doc/tips/nearlyfreespeech/discussion.mdwn
-index 73da608..0d1f1f0 100644
---- a/doc/tips/nearlyfreespeech/discussion.mdwn
-+++ b/doc/tips/nearlyfreespeech/discussion.mdwn
-@@ -15,3 +15,6 @@ Hi!<br />
- How can i upgrade my nearlyfreespeech installation of ikiwiki? To install it i have followed your instructions here.<br>
- But now if I want to upgrade it to a newer version?<br />
- Thanks for your incredible work!
-+
-+> You can move `~/ikiwiki` out of the way and then re-download and install
-+> it ikiwiki. --[[Joey]]
-
-

-

-
-
diff --git a/doc/recentchanges/change_a194fbc5bced565fa751008b8ada666c411d097d._change b/doc/recentchanges/change_a194fbc5bced565fa751008b8ada666c411d097d._change
deleted file mode 100644
index 0ea9a66ce..000000000
--- a/doc/recentchanges/change_a194fbc5bced565fa751008b8ada666c411d097d._change
+++ /dev/null
@@ -1,60 +0,0 @@
-[[!meta author="""http://lovesgoodfood.com/jason/"""]]
-
-[[!meta authorurl="""http://lovesgoodfood.com/jason/"""]]
-
-[[!meta title="""change to ikiwikiusers on ikiwiki"""]]
-
-[[!meta permalink="http://ikiwiki.info/recentchanges/#change-a194fbc5bced565fa751008b8ada666c411d097d"]]
-
-

-
Changed pages:
-
-
-[[diff|wikiicons/diff.png]]ikiwikiusers
-
-
-
-
Changed by:
-
-
-Jason_Riedy
-
-
-
Commit type:
-web
-
Date:
-17:12:48 11/03/10
-

-

-
-
-[[revert|wikiicons/revert.png]]
-
-
-

-
-
-Add myself.

-
-
-

-
-

-
-diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn
-index 54fa1d5..d8e55ba 100644
---- a/doc/ikiwikiusers.mdwn
-+++ b/doc/ikiwikiusers.mdwn
-@@ -160,6 +160,7 @@ Personal sites and blogs
- * [Thomas Kane](http://planetkane.org/)
- * [Marco Silva](http://marcot.eti.br/) a weblog + wiki using the [darcs](http://darcs.net) backend
- * [NeX-6](http://nex-6.taht.net/) ikiwiki blog and wiki running over ipv6
-+* [Jason Riedy](http://lovesgoodfood.com/jason/), which may occasionally look funny if I'm playing with my branch...
- 
- Please feel free to add your own ikiwiki site!
- 
-
-

-

-
-
diff --git a/doc/recentchanges/change_a2a1d2b2d96ede3f6a25d2d0fb89681ec5e05ff3._change b/doc/recentchanges/change_a2a1d2b2d96ede3f6a25d2d0fb89681ec5e05ff3._change
deleted file mode 100644
index bfbbc74f9..000000000
--- a/doc/recentchanges/change_a2a1d2b2d96ede3f6a25d2d0fb89681ec5e05ff3._change
+++ /dev/null
@@ -1,62 +0,0 @@
-[[!meta author="""https://www.google.com/accounts/o8/id?id=AItOawmwYptyV5ptNt8LCbMYsmpcNkk9_DRt-EY"""]]
-
-[[!meta authorurl="""https://www.google.com/accounts/o8/id?id=AItOawmwYptyV5ptNt8LCbMYsmpcNkk9_DRt-EY"""]]
-
-[[!meta title="""change to forum/Blog_posting_times_and_ikiwiki_state/comment_1_87304dfa2caea7e526cdb04917524e8c on ikiwiki"""]]
-
-[[!meta permalink="http://ikiwiki.info/recentchanges/#change-a2a1d2b2d96ede3f6a25d2d0fb89681ec5e05ff3"]]
-
-

-
Changed pages:
-
-
-[[diff|wikiicons/diff.png]]forum/Blog posting times and ikiwiki state/comment 1 87304dfa2caea7e526cdb04917524e8c
-
-
-
-
Changed by:
-
-
-Matt
-
-
-
Commit type:
-web
-
Date:
-07:52:53 11/04/10
-

-

-
-
-[[revert|wikiicons/revert.png]]
-
-
-

-
-
-Added a comment

-
-
-

-
-

-
-diff --git a/doc/forum/Blog_posting_times_and_ikiwiki_state/comment_1_87304dfa2caea7e526cdb04917524e8c._comment b/doc/forum/Blog_posting_times_and_ikiwiki_state/comment_1_87304dfa2caea7e526cdb04917524e8c._comment
-new file mode 100644
-index 0000000..62bae02
---- /dev/null
-+++ b/doc/forum/Blog_posting_times_and_ikiwiki_state/comment_1_87304dfa2caea7e526cdb04917524e8c._comment
-@@ -0,0 +1,8 @@
-+[[!comment format=mdwn
-+ username="https://www.google.com/accounts/o8/id?id=AItOawmwYptyV5ptNt8LCbMYsmpcNkk9_DRt-EY"
-+ nickname="Matt"
-+ subject="comment 1"
-+ date="2010-11-04T11:52:53Z"
-+ content="""
-+Perhaps I have a different setup from you but on my laptop I don't have ikiwiki installed - only a clone of the git repo.  You mean to run --gettime on the post-update git hook?
-+"""]]
-
-

-

-
-
diff --git a/doc/recentchanges/change_a4cb86d73327e7850eeb524ef387b17ac5e1614d._change b/doc/recentchanges/change_a4cb86d73327e7850eeb524ef387b17ac5e1614d._change
deleted file mode 100644
index eab83ca54..000000000
--- a/doc/recentchanges/change_a4cb86d73327e7850eeb524ef387b17ac5e1614d._change
+++ /dev/null
@@ -1,59 +0,0 @@
-[[!meta author="""joey"""]]
-
-[[!meta authorurl="""http://ikiwiki.info/ikiwiki.cgi?page=users%2Fjoey&do=goto"""]]
-
-[[!meta title="""change to bugs/aggregate_generates_long_filenames on ikiwiki"""]]
-
-[[!meta permalink="http://ikiwiki.info/recentchanges/#change-a4cb86d73327e7850eeb524ef387b17ac5e1614d"]]
-
-

-
Changed pages:
-
-
-[[diff|wikiicons/diff.png]]bugs/aggregate generates long filenames
-
-
-
-
Changed by:
-
-
-joey
-
-
-
Commit type:
-git
-
Date:
-17:20:29 11/17/10
-

-

-
-
-[[revert|wikiicons/revert.png]]
-
-
-

-
-
-response

-
-
-

-
-

-
-diff --git a/doc/bugs/aggregate_generates_long_filenames.mdwn b/doc/bugs/aggregate_generates_long_filenames.mdwn
-index 33e7b74..fae8333 100644
---- a/doc/bugs/aggregate_generates_long_filenames.mdwn
-+++ b/doc/bugs/aggregate_generates_long_filenames.mdwn
-@@ -32,3 +32,6 @@ It would also appear this abrubtly terminates aggregate processing (if not ikiwi
- >> I don't fully grok the aggregate source yet, but I wouldn't rule out
- >> a bug in the path length checking, personally.  I'm happy to try and
- >> find it myself though :) -- [[Jon]]
-+
-+>>> Path length seems unlikely, since the max is 4096 there.
-+>>> --[[Joey]] 
-
-

-

-
-
diff --git a/doc/recentchanges/change_a6c3d71787c528888c3f66c7ded8dd0c8f430b7e._change b/doc/recentchanges/change_a6c3d71787c528888c3f66c7ded8dd0c8f430b7e._change
deleted file mode 100644
index 61a399c0a..000000000
--- a/doc/recentchanges/change_a6c3d71787c528888c3f66c7ded8dd0c8f430b7e._change
+++ /dev/null
@@ -1,57 +0,0 @@
-[[!meta author="""http://slowdog.myopenid.com/"""]]
-
-[[!meta authorurl="""http://slowdog.myopenid.com/"""]]
-
-[[!meta title="""change to index on ikiwiki"""]]
-
-[[!meta permalink="http://ikiwiki.info/recentchanges/#change-a6c3d71787c528888c3f66c7ded8dd0c8f430b7e"]]
-
-

-
Changed pages:
-
-
-[[diff|wikiicons/diff.png]]index
-
-
-
-
Changed by:
-
-
-slowdog [myopenid.com]
-
-
-
Commit type:
-web
-
Date:
-19:38:10 11/21/10
-

-

-
-
-[[revert|wikiicons/revert.png]]
-
-
-

-
-

-
-

-
-diff --git a/doc/index.mdwn b/doc/index.mdwn
-index 90713d1..06acc9c 100644
---- a/doc/index.mdwn
-+++ b/doc/index.mdwn
-@@ -17,7 +17,7 @@ All wikis are supposed to have a [[SandBox]], so this one does too.
- This site generally runs the latest release of ikiwiki; currently, it runs
- ikiwiki [[!version ]].
- 
--## developer resources sas
-+## developer resources
- 
- The [[RoadMap]] describes where the project is going.
- The [[forum]] is open for discussions.
-
-

-

-
-
diff --git a/doc/recentchanges/change_ab96249d5ad8f3ee9275be3fef9e3467b8f3ffdf._change b/doc/recentchanges/change_ab96249d5ad8f3ee9275be3fef9e3467b8f3ffdf._change
deleted file mode 100644
index a9c8f9653..000000000
--- a/doc/recentchanges/change_ab96249d5ad8f3ee9275be3fef9e3467b8f3ffdf._change
+++ /dev/null
@@ -1,64 +0,0 @@
-[[!meta author="""http://kerravonsen.dreamwidth.org/"""]]
-
-[[!meta authorurl="""http://kerravonsen.dreamwidth.org/"""]]
-
-[[!meta title="""change to todo/transient_in-memory_pages on ikiwiki"""]]
-
-[[!meta permalink="http://ikiwiki.info/recentchanges/#change-ab96249d5ad8f3ee9275be3fef9e3467b8f3ffdf"]]
-
-

-
Changed pages:
-
-
-[[diff|wikiicons/diff.png]]todo/transient in-memory pages
-
-
-
-
Changed by:
-
-
-kerravonsen [dreamwidth.org]
-
-
-
Commit type:
-web
-
Date:
-19:23:08 11/15/10
-

-

-
-
-[[revert|wikiicons/revert.png]]
-
-
-

-
-
-further thoughts

-
-
-

-
-

-
-diff --git a/doc/todo/transient_in-memory_pages.mdwn b/doc/todo/transient_in-memory_pages.mdwn
-index edf056e..9c1be73 100644
---- a/doc/todo/transient_in-memory_pages.mdwn
-+++ b/doc/todo/transient_in-memory_pages.mdwn
-@@ -64,3 +64,11 @@ Refinements that could be made if this approach seems reasonable:
- >>>
- >>> Do you think this approach has enough potential that I should
- >>> continue to hack on it? Any thoughts on the implementation? --[[smcv]]
-+
-+>>>> Ah, now I understand what you're getting at. Yes, it makes sense to put transient pages under `.ikiwiki`.
-+>>>> I haven't looked at the code, but I'd be interested in seeing whether it's generic enough to be used by other plugins (such as `album`) without too much fuss.
-+>>>> The idea of a transient underlay gives us a desirable feature for free: that if someone edits the transient page, it is made permanent and added to the repository.
-+>>>>
-+>>>> I think the tricky thing with removing these transient underlay pages is the question of how to prevent whatever auto-generated the pages in the first place from generating them again - or, conversely, how to force whatever auto-generated those pages to regenerate them if you've changed your mind.
-+>>>> I think you'd need something similar to `will_render` so that transient pages would be automatically removed if whatever auto-generated them is no longer around.
-+>>>> -- [[KathrynAndersen]]
-
-

-

-
-
diff --git a/doc/recentchanges/change_af0bfcc07820008f0387bfd1b35a594ed40a0246._change b/doc/recentchanges/change_af0bfcc07820008f0387bfd1b35a594ed40a0246._change
deleted file mode 100644
index d66b4872d..000000000
--- a/doc/recentchanges/change_af0bfcc07820008f0387bfd1b35a594ed40a0246._change
+++ /dev/null
@@ -1,57 +0,0 @@
-[[!meta author="""http://pmate.myopenid.com/"""]]
-
-[[!meta authorurl="""http://pmate.myopenid.com/"""]]
-
-[[!meta title="""change to tips/nearlyfreespeech/discussion on ikiwiki"""]]
-
-[[!meta permalink="http://ikiwiki.info/recentchanges/#change-af0bfcc07820008f0387bfd1b35a594ed40a0246"]]
-
-

-
Changed pages:
-
-
-[[diff|wikiicons/diff.png]]tips/nearlyfreespeech/discussion
-
-
-
-
Changed by:
-
-
-pmate [myopenid.com]
-
-
-
Commit type:
-web
-
Date:
-17:56:35 11/20/10
-

-

-
-
-[[revert|wikiicons/revert.png]]
-
-
-

-
-

-
-

-
-diff --git a/doc/tips/nearlyfreespeech/discussion.mdwn b/doc/tips/nearlyfreespeech/discussion.mdwn
-index a003760..daebee2 100644
---- a/doc/tips/nearlyfreespeech/discussion.mdwn
-+++ b/doc/tips/nearlyfreespeech/discussion.mdwn
-@@ -9,3 +9,8 @@ BEGIN failed--compilation aborted at (eval 19) line 2.
- perl is 5.8.9
- 
- > This is fixed in 3.1415926. --[[Joey]] 
-+
-+Hi!
-+How can i upgrade my nearlyfreespeech installation of ikiwiki? To install it i have followed your instructions here.
-+But now if I want to upgrade it to a newer version?
-+Thanks for your incredible work!
-
-

-

-
-
diff --git a/doc/recentchanges/change_af75602391ac9651e7594c65588da86d591f2c01._change b/doc/recentchanges/change_af75602391ac9651e7594c65588da86d591f2c01._change
deleted file mode 100644
index 34bad8586..000000000
--- a/doc/recentchanges/change_af75602391ac9651e7594c65588da86d591f2c01._change
+++ /dev/null
@@ -1,51 +0,0 @@
-[[!meta author="""https://www.google.com/accounts/o8/id?id=AItOawna2L5uKII-LuYyGFfQ_1VRGHbID0xYPYc"""]]
-
-[[!meta authorurl="""https://www.google.com/accounts/o8/id?id=AItOawna2L5uKII-LuYyGFfQ_1VRGHbID0xYPYc"""]]
-
-[[!meta title="""change to sandbox/Mooooo on ikiwiki"""]]
-
-[[!meta permalink="http://ikiwiki.info/recentchanges/#change-af75602391ac9651e7594c65588da86d591f2c01"]]
-
-

-
Changed pages:
-
-
-[[diff|wikiicons/diff.png]]sandbox/Mooooo
-
-
-
-
Changed by:
-
-
-Andrew
-
-
-
Commit type:
-web
-
Date:
-09:31:35 11/08/10
-

-

-
-
-[[revert|wikiicons/revert.png]]
-
-
-

-
-

-
-

-
-diff --git a/doc/sandbox/Mooooo.mdwn b/doc/sandbox/Mooooo.mdwn
-new file mode 100644
-index 0000000..6f11d35
---- /dev/null
-+++ b/doc/sandbox/Mooooo.mdwn
-@@ -0,0 +1 @@
-+Hrm.
-
-

-

-
-
diff --git a/doc/recentchanges/change_b62581583107f6fc3e9bccf66a87a491c236757f._change b/doc/recentchanges/change_b62581583107f6fc3e9bccf66a87a491c236757f._change
deleted file mode 100644
index 9cd21da53..000000000
--- a/doc/recentchanges/change_b62581583107f6fc3e9bccf66a87a491c236757f._change
+++ /dev/null
@@ -1,51 +0,0 @@
-[[!meta author="""https://www.google.com/accounts/o8/id?id=AItOawmrVK0l7LGe93rzchPlVg7bukNgTsqTbn8"""]]
-
-[[!meta authorurl="""https://www.google.com/accounts/o8/id?id=AItOawmrVK0l7LGe93rzchPlVg7bukNgTsqTbn8"""]]
-
-[[!meta title="""change to forum/ikiwiki_+_mathjax on ikiwiki"""]]
-
-[[!meta permalink="http://ikiwiki.info/recentchanges/#change-b62581583107f6fc3e9bccf66a87a491c236757f"]]
-
-

-
Changed pages:
-
-
-[[diff|wikiicons/diff.png]]forum/ikiwiki + mathjax
-
-
-
-
Changed by:
-
-
-micheal
-
-
-
Commit type:
-web
-
Date:
-16:26:45 10/30/10
-

-

-
-
-[[revert|wikiicons/revert.png]]
-
-
-

-
-

-
-

-
-diff --git a/doc/forum/ikiwiki_+_mathjax.mdwn b/doc/forum/ikiwiki_+_mathjax.mdwn
-new file mode 100644
-index 0000000..1279a2c
---- /dev/null
-+++ b/doc/forum/ikiwiki_+_mathjax.mdwn
-@@ -0,0 +1 @@
-+Is it possible to use [mathjax](http://www.mathjax.org/) in ikiwiki to typeset math formulas? If so, is this compatible with the [wmd](http://ikiwiki.info/plugins/wmd/) plugin?
-
-

-

-
-
diff --git a/doc/recentchanges/change_c02f9d224cb78a3ad880cb749ef4a11eadfad79a._change b/doc/recentchanges/change_c02f9d224cb78a3ad880cb749ef4a11eadfad79a._change
deleted file mode 100644
index e22162fac..000000000
--- a/doc/recentchanges/change_c02f9d224cb78a3ad880cb749ef4a11eadfad79a._change
+++ /dev/null
@@ -1,58 +0,0 @@
-[[!meta author="""jmtd"""]]
-
-[[!meta authorurl="""http://ikiwiki.info/ikiwiki.cgi?page=users%2Fjmtd&do=goto"""]]
-
-[[!meta title="""change to bugs/argument_isn__39__t_numeric:_mixing_templates_and_creation__95__date on ikiwiki"""]]
-
-[[!meta permalink="http://ikiwiki.info/recentchanges/#change-c02f9d224cb78a3ad880cb749ef4a11eadfad79a"]]
-
-

-
Changed pages:
-
-
-[[diff|wikiicons/diff.png]]bugs/argument isn't numeric: mixing templates and creation_date
-
-
-
-
Changed by:
-
-
-jmtd
-
-
-
Commit type:
-git
-
Date:
-10:13:32 11/17/10
-

-

-
-
-[[revert|wikiicons/revert.png]]
-
-
-

-
-
-sorry, I'll try against master in future.

-
-
-

-
-

-
-diff --git a/doc/bugs/argument_isn__39__t_numeric:_mixing_templates_and_creation__95__date.mdwn b/doc/bugs/argument_isn__39__t_numeric:_mixing_templates_and_creation__95__date.mdwn
-index b1053fc..ff98ba5 100644
---- a/doc/bugs/argument_isn__39__t_numeric:_mixing_templates_and_creation__95__date.mdwn
-+++ b/doc/bugs/argument_isn__39__t_numeric:_mixing_templates_and_creation__95__date.mdwn
-@@ -58,3 +58,5 @@ However this doesn't work.  I assume "included" in this context means e.g. via a
- 
- > As far as I know, this bug was fixed in
- > 4a75dee651390b79ce4ceb1d951b02e28b3ce83a on October 20th. [[done]] --[[Joey]]
-+
-+>> Sorry Joey, I'll make sure to reproduce stuff against master in future. [[Jon]]
-
-

-

-
-
diff --git a/doc/recentchanges/change_c1f3129583ae4a1e3e9ace89ba11c8bf6c308be3._change b/doc/recentchanges/change_c1f3129583ae4a1e3e9ace89ba11c8bf6c308be3._change
deleted file mode 100644
index 340fc6c39..000000000
--- a/doc/recentchanges/change_c1f3129583ae4a1e3e9ace89ba11c8bf6c308be3._change
+++ /dev/null
@@ -1,60 +0,0 @@
-[[!meta author="""http://pmate.myopenid.com/"""]]
-
-[[!meta authorurl="""http://pmate.myopenid.com/"""]]
-
-[[!meta title="""change to tips/nearlyfreespeech/discussion on ikiwiki"""]]
-
-[[!meta permalink="http://ikiwiki.info/recentchanges/#change-c1f3129583ae4a1e3e9ace89ba11c8bf6c308be3"]]
-
-

-
Changed pages:
-
-
-[[diff|wikiicons/diff.png]]tips/nearlyfreespeech/discussion
-
-
-
-
Changed by:
-
-
-pmate [myopenid.com]
-
-
-
Commit type:
-web
-
Date:
-17:57:56 11/20/10
-

-

-
-
-[[revert|wikiicons/revert.png]]
-
-
-

-
-

-
-

-
-diff --git a/doc/tips/nearlyfreespeech/discussion.mdwn b/doc/tips/nearlyfreespeech/discussion.mdwn
-index daebee2..73da608 100644
---- a/doc/tips/nearlyfreespeech/discussion.mdwn
-+++ b/doc/tips/nearlyfreespeech/discussion.mdwn
-@@ -10,7 +10,8 @@ perl is 5.8.9
- 
- > This is fixed in 3.1415926. --[[Joey]] 
- 
--Hi!
--How can i upgrade my nearlyfreespeech installation of ikiwiki? To install it i have followed your instructions here.
--But now if I want to upgrade it to a newer version?
-+
-+Hi!<br />
-+How can i upgrade my nearlyfreespeech installation of ikiwiki? To install it i have followed your instructions here.<br>
-+But now if I want to upgrade it to a newer version?<br />
- Thanks for your incredible work!
-
-

-

-
-
diff --git a/doc/recentchanges/change_c3624227620f5034fa84b3cb1294a61fc08eeea9._change b/doc/recentchanges/change_c3624227620f5034fa84b3cb1294a61fc08eeea9._change
deleted file mode 100644
index f6790d834..000000000
--- a/doc/recentchanges/change_c3624227620f5034fa84b3cb1294a61fc08eeea9._change
+++ /dev/null
@@ -1,55 +0,0 @@
-[[!meta author="""civiccents"""]]
-
-[[!meta authorurl="""http://ikiwiki.info/ikiwiki.cgi?page=users%2Fciviccents&do=goto"""]]
-
-[[!meta title="""change to sandbox/D-Liberative on ikiwiki"""]]
-
-[[!meta permalink="http://ikiwiki.info/recentchanges/#change-c3624227620f5034fa84b3cb1294a61fc08eeea9"]]
-
-

-
Changed pages:
-
-
-[[diff|wikiicons/diff.png]]sandbox/D-Liberative
-
-
-
-
Changed by:
-
-
-civiccents
-
-
-
Commit type:
-web
-
Date:
-17:54:17 11/03/10
-

-

-
-
-[[revert|wikiicons/revert.png]]
-
-
-

-
-
-test

-
-
-

-
-

-
-diff --git a/doc/sandbox/D-Liberative.wiki b/doc/sandbox/D-Liberative.wiki
-new file mode 100644
-index 0000000..6907152
---- /dev/null
-+++ b/doc/sandbox/D-Liberative.wiki
-@@ -0,0 +1 @@
-+For now its just a concept... what if we could map deliberative capacity?
-
-

-

-
-
diff --git a/doc/recentchanges/change_c8537b41320e1f38b2369f24431423dfb2f14b15._change b/doc/recentchanges/change_c8537b41320e1f38b2369f24431423dfb2f14b15._change
deleted file mode 100644
index faf921e65..000000000
--- a/doc/recentchanges/change_c8537b41320e1f38b2369f24431423dfb2f14b15._change
+++ /dev/null
@@ -1,61 +0,0 @@
-[[!meta author="""http://smcv.pseudorandom.co.uk/"""]]
-
-[[!meta authorurl="""http://smcv.pseudorandom.co.uk/"""]]
-
-[[!meta title="""change to forum/Blog_posting_times_and_ikiwiki_state on ikiwiki"""]]
-
-[[!meta permalink="http://ikiwiki.info/recentchanges/#change-c8537b41320e1f38b2369f24431423dfb2f14b15"]]
-
-

-
Changed pages:
-
-
-[[diff|wikiicons/diff.png]]forum/Blog posting times and ikiwiki state
-
-
-
-
Changed by:
-
-
-smcv
-
-
-
Commit type:
-web
-
Date:
-06:58:53 11/04/10
-

-

-
-
-[[revert|wikiicons/revert.png]]
-
-
-

-
-

-
-

-
-diff --git a/doc/forum/Blog_posting_times_and_ikiwiki_state.mdwn b/doc/forum/Blog_posting_times_and_ikiwiki_state.mdwn
-index 3e6c232..0c1da5b 100644
---- a/doc/forum/Blog_posting_times_and_ikiwiki_state.mdwn
-+++ b/doc/forum/Blog_posting_times_and_ikiwiki_state.mdwn
-@@ -17,3 +17,12 @@ What can I do?
- 
- Is it a spectacularly bad idea to include the ikiwiki state file in my cloned repo (I suspect it is).  What else could be done?  Can I disable pagestate somehow or force ikiwiki to always use git commit times for Posted times?
- 
-+> Have you tried running ikiwiki with the `--gettime` option on your laptop,
-+> to force it to retrieve initial commit times from git? You should only
-+> need to do that once, and it'll be cached in the pagestate thereafter.
-+>
-+> Because that functionality is slow on every supported VCS except git,
-+> ikiwiki tries to avoid using it unless it's really needed. [[rcs]]
-+> lists it as "fast" for git, though, so depending how fast it really is
-+> and how large your wiki is, you might be able to get away with running
-+> ikiwiki with `--gettime` all the time? --[[smcv]]
-
-

-

-
-
diff --git a/doc/recentchanges/change_c9b737cc8596f9421ba968e56839eb052e80e794._change b/doc/recentchanges/change_c9b737cc8596f9421ba968e56839eb052e80e794._change
deleted file mode 100644
index 6ea4e0e20..000000000
--- a/doc/recentchanges/change_c9b737cc8596f9421ba968e56839eb052e80e794._change
+++ /dev/null
@@ -1,98 +0,0 @@
-[[!meta author="""http://smcv.pseudorandom.co.uk/"""]]
-
-[[!meta authorurl="""http://smcv.pseudorandom.co.uk/"""]]
-
-[[!meta title="""change to todo/Improving_the_efficiency_of_match__95__glob on ikiwiki"""]]
-
-[[!meta permalink="http://ikiwiki.info/recentchanges/#change-c9b737cc8596f9421ba968e56839eb052e80e794"]]
-
-

-
Changed pages:
-
-
-[[diff|wikiicons/diff.png]]todo/Improving the efficiency of match_glob
-
-
-
-
Changed by:
-
-
-smcv
-
-
-
Commit type:
-web
-
Date:
-00:36:29 11/20/10
-

-

-
-
-[[revert|wikiicons/revert.png]]
-
-
-

-
-
-one more patch: but expanding the memoization is actually a slowdown for the docwiki

-
-
-

-
-

-
-diff --git a/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn b/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn
-index de3cf48..4fe1454 100644
---- a/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn
-+++ b/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn
-@@ -43,12 +43,19 @@ Here's my patch - please consider it! -- [[KathrynAndersen]]
- >>>>>> `/^/i` regexp that can be used without further modifiction in most
- >>>>>> cases. --[[Joey]] 
- 
-->>>>>>> Done, see `smcv/ready/glob-cache`.
-+>>>>>>> Done, see `smcv/ready/glob-cache` and `smcv/glob-cache-too-far`.
-+>>>>>>>
- >>>>>>> Kathryn's patch is a significant improvement; my first patch on top of
-->>>>>>> that is a trivial cleanup that speeds it up a little, and the other two
-+>>>>>>> that is a trivial cleanup that speeds it up a little, and the next two
- >>>>>>> patches (using precompiled regexes) have surprisingly little effect
- >>>>>>> (they don't slow it down either though, so either omit them or merge
-->>>>>>> them, whichever). Detailed benchmark results --[[smcv]]
-+>>>>>>> them, whichever). Detailed benchmark results below.
-+>>>>>>>
-+>>>>>>> Moving the memoization to `glob2re` actually seems to slow things down
-+>>>>>>> again - I suspect the docwiki has few enough mentions of `user()` etc.
-+>>>>>>> that caching them is a waste of time, but perhaps it's not the most
-+>>>>>>> representative.
-+>>>>>>> --[[smcv]]
- 
- --------------------------------------------------------------
- 
-@@ -120,9 +127,21 @@ master at time of branch:
-      7.70    1.7814    79514   0.000022     IkiWiki::PageSpec::match_glob
-      3.35    0.7756    59454   0.000013     <anon>:IkiWiki/Plugin/inline.pm:223
- 
--"""]]
-+`move memoization from match_glob to glob2re`:
-+
-+    time elapsed (wall):   28.7677
-+    time running program:  23.9473  (83.24%)
-+    time profiling (est.): 4.8205  (16.76%)
-+    number of calls:       1360181
-+    number of exceptions:  13
-+    
-+    %Time    Sec.     #calls   sec/call  F  name
-+    13.98    3.3469     3408   0.000982     Text::Balanced::_match_tagged
-+     8.85    2.1194    79514   0.000027     IkiWiki::PageSpec::match_glob
-+     3.24    0.7750    59454   0.000013     <anon>:IkiWiki/Plugin/inline.pm:223
- 
- --[[smcv]]
-+"""]]
- 
- --------------------------------------------------------------
- 
-
-

-

-
-
diff --git a/doc/recentchanges/change_ca166361973e09b6756acbfe46b4a1bcfa4148d7._change b/doc/recentchanges/change_ca166361973e09b6756acbfe46b4a1bcfa4148d7._change
deleted file mode 100644
index 3bfe0d0a0..000000000
--- a/doc/recentchanges/change_ca166361973e09b6756acbfe46b4a1bcfa4148d7._change
+++ /dev/null
@@ -1,53 +0,0 @@
-[[!meta author="""dark"""]]
-
-[[!meta authorurl="""http://ikiwiki.info/ikiwiki.cgi?page=users%2Fdark&do=goto"""]]
-
-[[!meta title="""change to users/dark on ikiwiki"""]]
-
-[[!meta permalink="http://ikiwiki.info/recentchanges/#change-ca166361973e09b6756acbfe46b4a1bcfa4148d7"]]
-
-

-
Changed pages:
-
-
-[[diff|wikiicons/diff.png]]users/dark
-
-
-
-
Changed by:
-
-
-dark
-
-
-
Commit type:
-web
-
Date:
-16:53:42 11/01/10
-

-

-
-
-[[revert|wikiicons/revert.png]]
-
-
-

-
-

-
-

-
-diff --git a/doc/users/dark.mdwn b/doc/users/dark.mdwn
-new file mode 100644
-index 0000000..e1d06d0
---- /dev/null
-+++ b/doc/users/dark.mdwn
-@@ -0,0 +1,3 @@
-+[[!meta title="Richard Braakman"]]
-+
-+Lars Wirzenius convinced me to try ikiwiki for blogging :)
-
-

-

-
-
diff --git a/doc/recentchanges/change_cb45d3cf44760411746414ba1218c925ad097149._change b/doc/recentchanges/change_cb45d3cf44760411746414ba1218c925ad097149._change
deleted file mode 100644
index 5bd6a2199..000000000
--- a/doc/recentchanges/change_cb45d3cf44760411746414ba1218c925ad097149._change
+++ /dev/null
@@ -1,65 +0,0 @@
-[[!meta author="""joey"""]]
-
-[[!meta authorurl="""http://ikiwiki.info/ikiwiki.cgi?page=users%2Fjoey&do=goto"""]]
-
-[[!meta title="""change to bugs/logout_in_ikiwiki on ikiwiki"""]]
-
-[[!meta permalink="http://ikiwiki.info/recentchanges/#change-cb45d3cf44760411746414ba1218c925ad097149"]]
-
-

-
Changed pages:
-
-
-[[diff|wikiicons/diff.png]]bugs/logout in ikiwiki
-
-
-
-
Changed by:
-
-
-joey
-
-
-
Commit type:
-git
-
Date:
-12:59:31 10/30/10
-

-

-
-
-[[revert|wikiicons/revert.png]]
-
-
-

-
-
-re the openid_provider cookie

-
-
-

-
-

-
-diff --git a/doc/bugs/logout_in_ikiwiki.mdwn b/doc/bugs/logout_in_ikiwiki.mdwn
-index 3ca85fd..d9b6df6 100644
---- a/doc/bugs/logout_in_ikiwiki.mdwn
-+++ b/doc/bugs/logout_in_ikiwiki.mdwn
-@@ -12,6 +12,12 @@ It looks like there is no way to logout of ikiwiki at present, meaning that if y
- >> (I'd argue also in favor of the openid_provider cookie expiring 
- >>  in less time than it does now, and being session based)
- 
-+>>> (The `openid_provider` cookie is purely a convenience cookie to
-+>>> auto-select the user's openid provider the next time they log
-+>>> in. As such, it cannot be a session cookie. It does not provide any
-+>>> personally-identifying information so it should not really matter 
-+>>> when it expires.) --[[Joey]]
-+
- >> It would be nice to move navigational elements to the upper right corner 
- >> of the page...
- 
-
-

-

-
-
diff --git a/doc/recentchanges/change_cbcd9077ad5fbef8c0622ea9c78a66c9baece804._change b/doc/recentchanges/change_cbcd9077ad5fbef8c0622ea9c78a66c9baece804._change
deleted file mode 100644
index f9603cdfd..000000000
--- a/doc/recentchanges/change_cbcd9077ad5fbef8c0622ea9c78a66c9baece804._change
+++ /dev/null
@@ -1,57 +0,0 @@
-[[!meta author="""https://www.google.com/accounts/o8/id?id=AItOawlOh8Cp-kxb0kaANKSNGrtw5XvdyHGJ3dk"""]]
-
-[[!meta authorurl="""https://www.google.com/accounts/o8/id?id=AItOawlOh8Cp-kxb0kaANKSNGrtw5XvdyHGJ3dk"""]]
-
-[[!meta title="""change to sandbox/Testing_blog_entry on ikiwiki"""]]
-
-[[!meta permalink="http://ikiwiki.info/recentchanges/#change-cbcd9077ad5fbef8c0622ea9c78a66c9baece804"]]
-
-

-
Changed pages:
-
-
-[[diff|wikiicons/diff.png]]sandbox/Testing blog entry
-
-
-
-
Changed by:
-
-
-Henning
-
-
-
Commit type:
-web
-
Date:
-05:17:43 11/06/10
-

-

-
-
-[[revert|wikiicons/revert.png]]
-
-
-

-
-

-
-

-
-diff --git a/doc/sandbox/Testing_blog_entry.mdwn b/doc/sandbox/Testing_blog_entry.mdwn
-new file mode 100644
-index 0000000..aa5fa5b
---- /dev/null
-+++ b/doc/sandbox/Testing_blog_entry.mdwn
-@@ -0,0 +1,7 @@
-+# Be cool, this is a test!
-+
-+Hello guys, this is *just a test* entry.
-+
-+* Did I say
-+* that I love
-+* bulleted lists?
-
-

-

-
-
diff --git a/doc/recentchanges/change_ccd80905f7ea02ef07c2174ab2e8bd5f8ab0afc3._change b/doc/recentchanges/change_ccd80905f7ea02ef07c2174ab2e8bd5f8ab0afc3._change
deleted file mode 100644
index fc7bcda4e..000000000
--- a/doc/recentchanges/change_ccd80905f7ea02ef07c2174ab2e8bd5f8ab0afc3._change
+++ /dev/null
@@ -1,57 +0,0 @@
-[[!meta author="""http://cristian.regolo.cc/"""]]
-
-[[!meta authorurl="""http://cristian.regolo.cc/"""]]
-
-[[!meta title="""change to setup/byhand on ikiwiki"""]]
-
-[[!meta permalink="http://ikiwiki.info/recentchanges/#change-ccd80905f7ea02ef07c2174ab2e8bd5f8ab0afc3"]]
-
-

-
Changed pages:
-
-
-[[diff|wikiicons/diff.png]]setup/byhand
-
-
-
-
Changed by:
-
-
-cristiangreco
-
-
-
Commit type:
-web
-
Date:
-10:13:12 11/02/10
-

-

-
-
-[[revert|wikiicons/revert.png]]
-
-
-

-
-

-
-

-
-diff --git a/doc/setup/byhand.mdwn b/doc/setup/byhand.mdwn
-index 86cff5a..75a5648 100644
---- a/doc/setup/byhand.mdwn
-+++ b/doc/setup/byhand.mdwn
-@@ -104,7 +104,7 @@ is ok, run `ikiwiki --setup ikiwiki.setup`, and you're done!
- There are lots of other configuration options in ikiwiki.setup that you
- can uncomment, configure, and enable by re-running
- `ikiwiki --setup ikiwiki.setup`. Be sure to browse through all the
--[[plugins]]..
-+[[plugins]].
- 
- ## Put your wiki in revision control.
- 
-
-

-

-
-
diff --git a/doc/recentchanges/change_cfc1b6ac486e11cb11d6c72602bf70b0a440b747._change b/doc/recentchanges/change_cfc1b6ac486e11cb11d6c72602bf70b0a440b747._change
deleted file mode 100644
index cd8f5cb07..000000000
--- a/doc/recentchanges/change_cfc1b6ac486e11cb11d6c72602bf70b0a440b747._change
+++ /dev/null
@@ -1,59 +0,0 @@
-[[!meta author="""https://www.google.com/accounts/o8/id?id=AItOawmE7z4CSv-ctBarutQCd70R3CcaSPPxjVk"""]]
-
-[[!meta authorurl="""https://www.google.com/accounts/o8/id?id=AItOawmE7z4CSv-ctBarutQCd70R3CcaSPPxjVk"""]]
-
-[[!meta title="""change to bugs/logout_in_ikiwiki on ikiwiki"""]]
-
-[[!meta permalink="http://ikiwiki.info/recentchanges/#change-cfc1b6ac486e11cb11d6c72602bf70b0a440b747"]]
-
-

-
Changed pages:
-
-
-[[diff|wikiicons/diff.png]]bugs/logout in ikiwiki
-
-
-
-
Changed by:
-
-
-Dave
-
-
-
Commit type:
-web
-
Date:
-20:58:34 10/28/10
-

-

-
-
-[[revert|wikiicons/revert.png]]
-
-
-

-
-

-
-

-
-diff --git a/doc/bugs/logout_in_ikiwiki.mdwn b/doc/bugs/logout_in_ikiwiki.mdwn
-index a9c407b..3ca85fd 100644
---- a/doc/bugs/logout_in_ikiwiki.mdwn
-+++ b/doc/bugs/logout_in_ikiwiki.mdwn
-@@ -16,7 +16,10 @@ It looks like there is no way to logout of ikiwiki at present, meaning that if y
- >> of the page...
- 
- >> I have two kinds of pages (wiki and blog), and three classes of users  
-+
- >> anonymous users - display things like login, help, and recentchanges,
-+
- >> non-admin users - on a per subdir basis (blog and !blog) display 
- >> logout, help, recentchanges, edit, comment 
-+
- >> admin users - logout, help, recentchanges, edit, comment, etc
-
-

-

-
-
diff --git a/doc/recentchanges/change_d16104f55d8b31929d0466ca9abc3ccb4af0a8e8._change b/doc/recentchanges/change_d16104f55d8b31929d0466ca9abc3ccb4af0a8e8._change
deleted file mode 100644
index d2c139b20..000000000
--- a/doc/recentchanges/change_d16104f55d8b31929d0466ca9abc3ccb4af0a8e8._change
+++ /dev/null
@@ -1,72 +0,0 @@
-[[!meta author="""joey"""]]
-
-[[!meta authorurl="""http://ikiwiki.info/ikiwiki.cgi?page=users%2Fjoey&do=goto"""]]
-
-[[!meta title="""change to bugs/more_and_RSS_generation on ikiwiki"""]]
-
-[[!meta permalink="http://ikiwiki.info/recentchanges/#change-d16104f55d8b31929d0466ca9abc3ccb4af0a8e8"]]
-
-

-
Changed pages:
-
-
-[[diff|wikiicons/diff.png]]bugs/more and RSS generation
-
-
-
-
Changed by:
-
-
-joey
-
-
-
Commit type:
-git
-
Date:
-12:41:31 10/30/10
-

-

-
-
-[[revert|wikiicons/revert.png]]
-
-
-

-
-
-response

-
-
-

-
-

-
-diff --git a/doc/bugs/more_and_RSS_generation.mdwn b/doc/bugs/more_and_RSS_generation.mdwn
-index 72d636f..00ab43f 100644
---- a/doc/bugs/more_and_RSS_generation.mdwn
-+++ b/doc/bugs/more_and_RSS_generation.mdwn
-@@ -2,6 +2,19 @@ I'd like the more plugin and RSS to play better together. In the case of the htm
- 
- Maybe there is a different plugin (I also tried toggle)? 
- 
-+> I am not a fan of the more directive (thus the rant about it sucking
-+> embedded in its [[example|ikiwiki/directive/more]]). But I don't think 
-+> that weakening it to not work in rss feeds is a good idea, if someone
-+> wants to force users to go somewhere to view their full content, 
-+> they should be able to do it, even though it does suck.
-+> 
-+> The toggle directive will degrade fairly well in an rss feed to
-+> display the full text. (There is an annoying toggle link that does
-+> nothing when embedded in an rss feed). --[[Joey]]
-+
- I also note, that at least currently, more seems to break on a few pages, not being parsed at all when aggregated into the front page. 
- 
-+> It's just a simple directive, it should work anywhere any directive will,
-+> and does as far as I can see. Details? --[[Joey]]
-+
- see also: [[/bugs/rss_feeds_do_not_use_recommended_encoding_of_entities_for_some_fields/]]
-
-

-

-
-
diff --git a/doc/recentchanges/change_d5056fb61e8332fea658363e931ec28a35681ffe._change b/doc/recentchanges/change_d5056fb61e8332fea658363e931ec28a35681ffe._change
deleted file mode 100644
index 5ed5137ba..000000000
--- a/doc/recentchanges/change_d5056fb61e8332fea658363e931ec28a35681ffe._change
+++ /dev/null
@@ -1,68 +0,0 @@
-[[!meta author="""joey"""]]
-
-[[!meta authorurl="""http://ikiwiki.info/ikiwiki.cgi?page=users%2Fjoey&do=goto"""]]
-
-[[!meta title="""change to plugins/htmlscrubber on ikiwiki"""]]
-
-[[!meta permalink="http://ikiwiki.info/recentchanges/#change-d5056fb61e8332fea658363e931ec28a35681ffe"]]
-
-

-
Changed pages:
-
-
-[[diff|wikiicons/diff.png]]plugins/htmlscrubber
-
-
-
-
Changed by:
-
-
-joey
-
-
-
Commit type:
-git
-
Date:
-00:24:33 11/12/10
-

-

-
-
-[[revert|wikiicons/revert.png]]
-
-
-

-
-
-add example of skipping blog posts while scrubbing comments

-
-
-

-
-

-
-diff --git a/doc/plugins/htmlscrubber.mdwn b/doc/plugins/htmlscrubber.mdwn
-index c59b46e..080575c 100644
---- a/doc/plugins/htmlscrubber.mdwn
-+++ b/doc/plugins/htmlscrubber.mdwn
-@@ -32,10 +32,11 @@ other HTML-related functionality, such as whether [[meta]] allows
- potentially unsafe HTML tags.
- 
- The `htmlscrubber_skip` configuration setting can be used to skip scrubbing
--of some pages. Set it to a [[ikiwiki/PageSpec]], such as "!*/Discussion",
--and pages matching that can have all the evil CSS, JavsScript, and unsafe
--html elements you like. One safe way to use this is to use [[lockedit]] to
--lock those pages, so only admins can edit them.
-+of some pages. Set it to a [[ikiwiki/PageSpec]], such as 
-+"posts/* and !comment(*) and !*/Discussion", and pages matching that can have
-+all the evil CSS, JavsScript, and unsafe html elements you like. One safe
-+way to use this is to use [[lockedit]] to lock those pages, so only admins
-+can edit them.
- 
- ----
- 
-
-

-

-
-
diff --git a/doc/recentchanges/change_d6ff694ff7a6a4700ccbbd5819907eac73cf065a._change b/doc/recentchanges/change_d6ff694ff7a6a4700ccbbd5819907eac73cf065a._change
deleted file mode 100644
index 235b8a592..000000000
--- a/doc/recentchanges/change_d6ff694ff7a6a4700ccbbd5819907eac73cf065a._change
+++ /dev/null
@@ -1,236 +0,0 @@
-[[!meta author="""smcv"""]]
-
-[[!meta authorurl="""http://ikiwiki.info/ikiwiki.cgi?page=users%2Fsmcv&do=goto"""]]
-
-[[!meta title="""change to todo/Improving_the_efficiency_of_match__95__glob on ikiwiki"""]]
-
-[[!meta permalink="http://ikiwiki.info/recentchanges/#change-d6ff694ff7a6a4700ccbbd5819907eac73cf065a"]]
-
-

-
Changed pages:
-
-
-[[diff|wikiicons/diff.png]]todo/Improving the efficiency of match_glob
-
-
-
-
Changed by:
-
-
-smcv
-
-
-
Commit type:
-git
-
Date:
-00:22:56 11/20/10
-

-

-
-
-[[revert|wikiicons/revert.png]]
-
-
-

-
-
-branch ready for merge, I think

-
-
-

-
-

-
-diff --git a/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn b/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn
-index 0fc059a..de3cf48 100644
---- a/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn
-+++ b/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn
-@@ -1,3 +1,7 @@
-+[[!template id=gitbranch branch=smcv/ready/glob-cache
-+  author="[[KathrynAndersen]], [[smcv]]"]]
-+[[!tag patch]]
-+
- I've been profiling my IkiWiki to try to improve speed (with many pages makes speed even more important) and I've written a patch to improve the speed of match_glob.  This matcher is a good one to improve the speed of, because it gets called so many times.
- 
- Here's my patch - please consider it! -- [[KathrynAndersen]]
-@@ -39,7 +43,92 @@ Here's my patch - please consider it! -- [[KathrynAndersen]]
- >>>>>> `/^/i` regexp that can be used without further modifiction in most
- >>>>>> cases. --[[Joey]] 
- 
-+>>>>>>> Done, see `smcv/ready/glob-cache`.
-+>>>>>>> Kathryn's patch is a significant improvement; my first patch on top of
-+>>>>>>> that is a trivial cleanup that speeds it up a little, and the other two
-+>>>>>>> patches (using precompiled regexes) have surprisingly little effect
-+>>>>>>> (they don't slow it down either though, so either omit them or merge
-+>>>>>>> them, whichever). Detailed benchmark results --[[smcv]]
-+
- --------------------------------------------------------------
-+
-+[[!toggle id="smcv-benchmark" text="current benchmarks"]]
-+
-+[[!toggleable id="smcv-benchmark" text="""
-+master at time of branch:
-+
-+    time elapsed (wall):   29.6348
-+    time running program:  24.9212  (84.09%)
-+    time profiling (est.): 4.7136  (15.91%)
-+    number of calls:       1360181
-+    number of exceptions:  13
-+    
-+    %Time    Sec.     #calls   sec/call  F  name
-+    13.24    3.2986     3408   0.000968     Text::Balanced::_match_tagged
-+    10.94    2.7253    79514   0.000034     IkiWiki::PageSpec::match_glob
-+     3.19    0.7952    59454   0.000013     <anon>:IkiWiki/Plugin/inline.pm:223
-+
-+`Improve the speed of match_glob`:
-+
-+    time elapsed (wall):   27.9755
-+    time running program:  23.5293  (84.11%)
-+    time profiling (est.): 4.4461  (15.89%)
-+    number of calls:       1280875
-+    number of exceptions:  13
-+    
-+    %Time    Sec.     #calls   sec/call  F  name
-+    14.56    3.4257     3408   0.001005     Text::Balanced::_match_tagged
-+     7.82    1.8403    79514   0.000023     IkiWiki::PageSpec::match_glob
-+     3.27    0.7698    59454   0.000013     <anon>:IkiWiki/Plugin/inline.pm:223
-+
-+`match_glob: streamline glob cache slightly`:
-+
-+    time elapsed (wall):   27.5753
-+    time running program:  23.1714  (84.03%)
-+    time profiling (est.): 4.4039  (15.97%)
-+    number of calls:       1280875
-+    number of exceptions:  13
-+    
-+    %Time    Sec.     #calls   sec/call  F  name
-+    14.09    3.2637     3408   0.000958     Text::Balanced::_match_tagged
-+     7.74    1.7926    79514   0.000023     IkiWiki::PageSpec::match_glob
-+     3.30    0.7646    59454   0.000013     <anon>:IkiWiki/Plugin/inline.pm:223
-+
-+`glob2re: return a precompiled, anchored case-insensitiv...`:
-+
-+    time elapsed (wall):   27.5656
-+    time running program:  23.1464  (83.97%)
-+    time profiling (est.): 4.4192  (16.03%)
-+    number of calls:       1282189
-+    number of exceptions:  13
-+    
-+    %Time    Sec.     #calls   sec/call  F  name
-+    14.21    3.2891     3408   0.000965     Text::Balanced::_match_tagged
-+     7.72    1.7872    79514   0.000022     IkiWiki::PageSpec::match_glob
-+     3.32    0.7678    59454   0.000013     <anon>:IkiWiki/Plugin/inline.pm:223
-+
-+`make use of precompiled regex objects`:
-+
-+    time elapsed (wall):   27.5357
-+    time running program:  23.1289  (84.00%)
-+    time profiling (est.): 4.4068  (16.00%)
-+    number of calls:       1281981
-+    number of exceptions:  13
-+    
-+    %Time    Sec.     #calls   sec/call  F  name
-+    14.17    3.2776     3408   0.000962     Text::Balanced::_match_tagged
-+     7.70    1.7814    79514   0.000022     IkiWiki::PageSpec::match_glob
-+     3.35    0.7756    59454   0.000013     <anon>:IkiWiki/Plugin/inline.pm:223
-+
-+"""]]
-+
-+--[[smcv]]
-+
-+--------------------------------------------------------------
-+
-+[[!toggle id="ka-benchmarks" text="Kathryn's benchmarks"]]
-+
-+[[!toggleable id="ka-benchmarks" text="""
- Benchmarks done with Devel::Profile on the same testbed IkiWiki setup.  I'm just showing the start of the profile output, since that's what's relevant.
- 
- Before:
-@@ -73,73 +162,13 @@ number of exceptions:  65
- Note that the seconds per call for match_glob in the "after" case has gone down by about a third.
- 
- K.A.
-+"""]]
- 
- --------------------------------------------------------------
- 
--A second set of benchmarks, done by rebuilding the docwiki at commit f942c2db05e4
--like so:
--
--    perl -Iblib/lib -d:Profile ikiwiki.in -setup docwiki.setup --no-verbose
--
--The docwiki appears to use fewer glob matches than Kathryn's wiki.
--
--With master:
--
--    time elapsed (wall):   29.6970
--    time running program:  24.6930  (83.15%)
--    time profiling (est.): 5.0041  (16.85%)
--    number of calls:       1359180
--    number of exceptions:  13
--
--    %Time    Sec.     #calls   sec/call  F  name
--    13.62    3.3629     3406   0.000987     Text::Balanced::_match_tagged
--    10.84    2.6773    79442   0.000034     IkiWiki::PageSpec::match_glob
--     3.08    0.7598    59454   0.000013     <anon>:IkiWiki/Plugin/inline.pm:223
--     3.07    0.7593    29830   0.000025     IkiWiki::bestlink
--     2.99    0.7378    10231   0.000072     IkiWiki::PageSpec::match_link
--
--With my `smcv/memoize-glob2re` branch:
--
--    time elapsed (wall):   30.4931
--    time running program:  25.1248  (82.39%)
--    time profiling (est.): 5.3683  (17.61%)
--    number of calls:       1439943
--    number of exceptions:  13
--
--    %Time    Sec.     #calls   sec/call  F  name
--    13.19    3.3146     3406   0.000973     Text::Balanced::_match_tagged
--     8.41    2.1123    79442   0.000027     IkiWiki::PageSpec::match_glob
--     3.97    0.9979    86905   0.000011     Memoize::_memoizer
--     3.05    0.7654    59454   0.000013     <anon>:IkiWiki/Plugin/inline.pm:223
--     3.02    0.7576    29830   0.000025     IkiWiki::bestlink
--
--and in a repeated run:
--
--     8.40    2.0905    79442   0.000026     IkiWiki::PageSpec::match_glob
--
--With Kathryn's patch as seen in my `smcv/ka-glob-cache` branch:
--
--    time elapsed (wall):   27.7567
--    time running program:  22.9941  (82.84%)
--    time profiling (est.): 4.7627  (17.16%)
--    number of calls:       1279946
--    number of exceptions:  13
--
--    %Time    Sec.     #calls   sec/call  F  name
--    14.29    3.2867     3406   0.000965     Text::Balanced::_match_tagged
--     7.89    1.8136    79442   0.000023     IkiWiki::PageSpec::match_glob
--     3.30    0.7577    59454   0.000013     <anon>:IkiWiki/Plugin/inline.pm:223
--     3.24    0.7461    29830   0.000025     IkiWiki::bestlink
--     3.19    0.7332      143   0.005127  ?  IkiWiki::pagespec_match_list
--
--and in a repeated run:
--
--     7.84    1.8253    79442   0.000023     IkiWiki::PageSpec::match_glob
--
----[[smcv]]
--
----------------------------------------------------------------
-+[[!toggle id="ka-patch" text="Kathryn's original patch"]]
- 
-+[[!toggleable id="ka-patch" text="""
- 
- <pre>
- diff --git a/IkiWiki.pm b/IkiWiki.pm
-@@ -174,4 +203,5 @@ index 08a3d78..c187b98 100644
-  			return IkiWiki::SuccessReason->new("$glob matches $page");
-  		}
- </pre>
-+"""]]
- --------------------------------------------------------------
-
-

-

-
-
diff --git a/doc/recentchanges/change_d916cd2f71f1c22dad947d7b2134edbbb15e7b8e._change b/doc/recentchanges/change_d916cd2f71f1c22dad947d7b2134edbbb15e7b8e._change
deleted file mode 100644
index 6a128e5df..000000000
--- a/doc/recentchanges/change_d916cd2f71f1c22dad947d7b2134edbbb15e7b8e._change
+++ /dev/null
@@ -1,120 +0,0 @@
-[[!meta author="""http://smcv.pseudorandom.co.uk/"""]]
-
-[[!meta authorurl="""http://smcv.pseudorandom.co.uk/"""]]
-
-[[!meta title="""change to todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both on ikiwiki"""]]
-
-[[!meta permalink="http://ikiwiki.info/recentchanges/#change-d916cd2f71f1c22dad947d7b2134edbbb15e7b8e"]]
-
-

-
Changed pages:
-
-
-[[diff|wikiicons/diff.png]]todo/want to avoid ikiwiki using http or https in urls to allow serving both
-
-
-
-
Changed by:
-
-
-smcv
-
-
-
Commit type:
-web
-
Date:
-19:45:02 11/22/10
-

-

-
-
-[[revert|wikiicons/revert.png]]
-
-
-

-
-
-respond to feedback

-
-
-

-
-

-
-diff --git a/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn b/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn
-index 4fafc2b..80925b4 100644
---- a/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn
-+++ b/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn
-@@ -191,14 +191,41 @@ New API added by this branch:
-   > The new form for local urls will typically be only a little bit longer,
-   > except in the unusual case where the cgiurl is elsewhere. --[[Joey]]
- 
-+  >> So, have urlto(x, y) use `$local_url`? There are few calls, but IMO
-+  >> they're for the most important things - wikilinks, img, map and
-+  >> other ordinary hyperlinks. Using `$local_url` would be fine for
-+  >> webserver-based use, but it does stop you browsing your wiki's
-+  >> HTML over `file:///` (unless you set that as the base URL, but
-+  >> then you can't move it around), and stops you moving simple
-+  >> outputs (like the docwiki!) around.
-+  >>
-+  >> I personally think breaking the docwiki is enough to block that.
-+  >>
-+  >> How about this?
-+  >>
-+  >> * `urlto($link, $page)` with `$page` defined: relative
-+  >> * `urlto($link, undef)`: local, starts with `/`
-+  >> * `urlto($link)`: also local, as a side-effect
-+  >> * `urlto($link, $anything, 1)` (but idiomatically, `$anything` is
-+  >>   normally undef): absolute, starts with `http[s]://`
-+  >>
-+  >> --[[smcv]]
-+
- * `IkiWiki::baseurl` has a new second argument which works like the
-   third argument of `urlto`
- 
-+  > I assume you have no objection to this --[[smcv]]
-+
- * `IkiWiki::cgiurl` uses `$local_cgiurl` if passed `local_cgiurl => 1`
- 
-+  > Possibly changed to making this always be local unless `cgiurl => $x`
-+  > is given: see below --[[smcv]]
-+
- * `IkiWiki::cgiurl` omits the trailing `?` if given no named parameters
-   except `cgiurl` and/or `local_cgiurl`
- 
-+  > I assume you have no objection to this --[[smcv]]
-+
- Bugs:
- 
- * I don't think anything except `openid` calls `cgiurl` without also
-@@ -211,10 +238,18 @@ Bugs:
- 
-   > I agree that makes sense. --[[Joey]]
- 
-+  >> I'm not completely sure whether you're agreeing with "perhaps do this"
-+  >> or "that looks too strange", so please disambiguate:
-+  >> would you accept a patch that makes `cgiurl` default to a local
-+  >> (starts-with-`/`) result? If you would, that'd reduce the diff. --[[smcv]]
-+
- * It occurs to me that `IkiWiki::cgiurl` could probably benefit from being
-   exported? Perhaps also `IkiWiki::baseurl`?
- 
--  > Possibly, see [[firm_up_plugin_interface]]. --[[Joey]] 
-+  > Possibly, see [[firm_up_plugin_interface]]. --[[Joey]]
-+
-+  >> Not really part of this branch, though, so wontfix (unless you ask me
-+  >> to do so). --[[smcv]]
- 
- * Or, to reduce use of the unexported `baseurl` function, it might make
-   sense to give `urlto` a special case that references the root of the wiki,
-@@ -227,3 +262,5 @@ Bugs:
- 
-   > AFACIS, `baseurl` is only called in 3 places so I don't think that's
-   > needed. --[[Joey]] 
-+
-+  >> OK, wontfix. --[[smcv]]
-
-

-

-
-
diff --git a/doc/recentchanges/change_da9e1ea667f82d5fca9168dbed19be08040570ff._change b/doc/recentchanges/change_da9e1ea667f82d5fca9168dbed19be08040570ff._change
deleted file mode 100644
index 2a24ad4e2..000000000
--- a/doc/recentchanges/change_da9e1ea667f82d5fca9168dbed19be08040570ff._change
+++ /dev/null
@@ -1,96 +0,0 @@
-[[!meta author="""http://jmtd.livejournal.com/"""]]
-
-[[!meta authorurl="""http://jmtd.livejournal.com/"""]]
-
-[[!meta title="""change to ikiwiki/directive/template on ikiwiki"""]]
-
-[[!meta permalink="http://ikiwiki.info/recentchanges/#change-da9e1ea667f82d5fca9168dbed19be08040570ff"]]
-
-

-
Changed pages:
-
-
-[[diff|wikiicons/diff.png]]ikiwiki/directive/template
-
-
-
-
Changed by:
-
-
-jmtd [livejournal.com]
-
-
-
Commit type:
-web
-
Date:
-10:28:05 11/15/10
-

-

-
-
-[[revert|wikiicons/revert.png]]
-
-
-

-
-
-guard templates with the if directive where necessary

-
-
-

-
-

-
-diff --git a/doc/ikiwiki/directive/template.mdwn b/doc/ikiwiki/directive/template.mdwn
-index 9e3ae54..df391f9 100644
---- a/doc/ikiwiki/directive/template.mdwn
-+++ b/doc/ikiwiki/directive/template.mdwn
-@@ -60,22 +60,30 @@ few things:
-   `<TMPL_IF variable>text</TMPL_IF>`.
- * To use one block of text if a variable is set and a second if it's not,
-   use `<TMPL_IF variable>text<TMPL_ELSE>other text</TMPL_IF>`
-+* Each template file included in the wiki's source will also generate a regular
-+  wiki page.  In many cases you might want to prevent some of your template
-+  being interpreted for the regular page.  Use the [[if]] directive with the
-+  `included()` test to guard the template code.
- 
- Here's a sample template:
- 
--        <span class="infobox">
--        Name: \[[<TMPL_VAR raw_name>]]<br />
--        Age: <TMPL_VAR age><br />
--        <TMPL_IF color>
--        Favorite color: <TMPL_VAR color><br />
--        <TMPL_ELSE>
--        No favorite color.<br />
--        </TMPL_IF>
--        <TMPL_IF notes>
--        <hr />
--        <TMPL_VAR notes>
--        </TMPL_IF>
--        </span>
-+        \[[!if test="included()" then="""
-+          <span class="infobox">
-+          Name: \[[<TMPL_VAR raw_name>]]<br />
-+          Age: <TMPL_VAR age><br />
-+          <TMPL_IF color>
-+            Favorite color: <TMPL_VAR color><br />
-+          <TMPL_ELSE>
-+            No favorite color.<br />
-+          </TMPL_IF>
-+          <TMPL_IF notes>
-+            <hr />
-+            <TMPL_VAR notes>
-+          </TMPL_IF>
-+          </span>
-+        """ else="""
-+          This is a template page.
-+        """]]
- 
- The filled out template will be formatted the same as the rest of the page
- that contains it, so you can include WikiLinks and all other forms of wiki
-
-

-

-
-
diff --git a/doc/recentchanges/change_daf89f59e61d9091fe27dd8738b40db5fa85a5e6._change b/doc/recentchanges/change_daf89f59e61d9091fe27dd8738b40db5fa85a5e6._change
deleted file mode 100644
index 6705227a9..000000000
--- a/doc/recentchanges/change_daf89f59e61d9091fe27dd8738b40db5fa85a5e6._change
+++ /dev/null
@@ -1,59 +0,0 @@
-[[!meta author="""joey"""]]
-
-[[!meta authorurl="""http://ikiwiki.info/ikiwiki.cgi?page=users%2Fjoey&do=goto"""]]
-
-[[!meta title="""change to forum/PageSpec_results_from_independent_checkout on ikiwiki"""]]
-
-[[!meta permalink="http://ikiwiki.info/recentchanges/#change-daf89f59e61d9091fe27dd8738b40db5fa85a5e6"]]
-
-

-
Changed pages:
-
-
-[[diff|wikiicons/diff.png]]forum/PageSpec results from independent checkout
-
-
-
-
Changed by:
-
-
-joey
-
-
-
Commit type:
-git
-
Date:
-19:03:03 11/16/10
-

-

-
-
-[[revert|wikiicons/revert.png]]
-
-
-

-
-
-response

-
-
-

-
-

-
-diff --git a/doc/forum/PageSpec_results_from_independent_checkout.mdwn b/doc/forum/PageSpec_results_from_independent_checkout.mdwn
-index 6b2fd6d..693287d 100644
---- a/doc/forum/PageSpec_results_from_independent_checkout.mdwn
-+++ b/doc/forum/PageSpec_results_from_independent_checkout.mdwn
-@@ -3,3 +3,6 @@ I'd like to be able to do PageSpec matches independent of the Ikiwiki checkout,
-     perl -MIkiWiki -le '$config{wikistatedir}=".ikiwiki"; IkiWiki::loadindex(); print foreach pagespec_match_list("", shift)' "bugs/*"
- 
- I get the impression there's a way to build up enough state to run pagespec matches without doing any rendering, but I don't know how. Any ideas? -- JoeRayhawk
-+
-+> It's not possible to build up enough state without at a minimum
-+> performing the scan pass of rendering on every page. --[[Joey]] 
-
-

-

-
-
diff --git a/doc/recentchanges/change_db3fb406733b98535d426acedd58f1633df79ade._change b/doc/recentchanges/change_db3fb406733b98535d426acedd58f1633df79ade._change
deleted file mode 100644
index 56c9170e6..000000000
--- a/doc/recentchanges/change_db3fb406733b98535d426acedd58f1633df79ade._change
+++ /dev/null
@@ -1,52 +0,0 @@
-[[!meta author="""http://smcv.pseudorandom.co.uk/"""]]
-
-[[!meta authorurl="""http://smcv.pseudorandom.co.uk/"""]]
-
-[[!meta title="""change to todo/autoindex_should_use_add__95__autofile on ikiwiki"""]]
-
-[[!meta permalink="http://ikiwiki.info/recentchanges/#change-db3fb406733b98535d426acedd58f1633df79ade"]]
-
-

-
Changed pages:
-
-
-[[diff|wikiicons/diff.png]]todo/autoindex should use add_autofile
-
-
-
-
Changed by:
-
-
-smcv
-
-
-
Commit type:
-web
-
Date:
-08:11:32 11/08/10
-

-

-
-
-[[revert|wikiicons/revert.png]]
-
-
-

-
-

-
-

-
-diff --git a/doc/todo/autoindex_should_use_add__95__autofile.mdwn b/doc/todo/autoindex_should_use_add__95__autofile.mdwn
-new file mode 100644
-index 0000000..517567e
---- /dev/null
-+++ b/doc/todo/autoindex_should_use_add__95__autofile.mdwn
-@@ -0,0 +1,2 @@
-+`add_autofile` is a generic version of [[plugins/autoindex]]'s code,
-+so the latter should probably use the former. --[[smcv]]
-
-

-

-
-
diff --git a/doc/recentchanges/change_dd9796375895752621cdcce103d1ad8d8a31d6cb._change b/doc/recentchanges/change_dd9796375895752621cdcce103d1ad8d8a31d6cb._change
deleted file mode 100644
index 24ab79826..000000000
--- a/doc/recentchanges/change_dd9796375895752621cdcce103d1ad8d8a31d6cb._change
+++ /dev/null
@@ -1,69 +0,0 @@
-[[!meta author="""http://jmtd.livejournal.com/"""]]
-
-[[!meta authorurl="""http://jmtd.livejournal.com/"""]]
-
-[[!meta title="""change to bugs/aggregate_generates_long_filenames on ikiwiki"""]]
-
-[[!meta permalink="http://ikiwiki.info/recentchanges/#change-dd9796375895752621cdcce103d1ad8d8a31d6cb"]]
-
-

-
Changed pages:
-
-
-[[diff|wikiicons/diff.png]]bugs/aggregate generates long filenames
-
-
-
-
Changed by:
-
-
-jmtd [livejournal.com]
-
-
-
Commit type:
-web
-
Date:
-07:47:07 11/17/10
-

-

-
-
-[[revert|wikiicons/revert.png]]
-
-
-

-
-
-ext4, default settings...

-
-
-

-
-

-
-diff --git a/doc/bugs/aggregate_generates_long_filenames.mdwn b/doc/bugs/aggregate_generates_long_filenames.mdwn
-index c38ad6c..33e7b74 100644
---- a/doc/bugs/aggregate_generates_long_filenames.mdwn
-+++ b/doc/bugs/aggregate_generates_long_filenames.mdwn
-@@ -19,3 +19,16 @@ It would also appear this abrubtly terminates aggregate processing (if not ikiwi
- > that, in additional to having a rather antique long filename limit, your
- > system also doesn't properly expose it via pathconf. Not sure what
- > ikiwiki can do here. --[[Joey]]
-+
-+>> This is an ext4 filesystem with default settings (which appears to mean
-+>> 256 bytes for pathnames).  Despite the error saying file name, it's
-+>> definitely a path issue since moving my test repo to `/tmp`from
-+>> `/home/jon/wd/mine/www` hides the problem. I note the following comment
-+>> in `aggregate.pm`:
-+
-+		# Make sure that the file name isn't too long. 
-+		# NB: This doesn't check for path length limits.
-+
-+>> I don't fully grok the aggregate source yet, but I wouldn't rule out
-+>> a bug in the path length checking, personally.  I'm happy to try and
-+>> find it myself though :) -- [[Jon]]
-
-

-

-
-
diff --git a/doc/recentchanges/change_e68f29eebb3917909b939869e57b985add724598._change b/doc/recentchanges/change_e68f29eebb3917909b939869e57b985add724598._change
deleted file mode 100644
index 05c362968..000000000
--- a/doc/recentchanges/change_e68f29eebb3917909b939869e57b985add724598._change
+++ /dev/null
@@ -1,61 +0,0 @@
-[[!meta author="""http://smcv.pseudorandom.co.uk/"""]]
-
-[[!meta authorurl="""http://smcv.pseudorandom.co.uk/"""]]
-
-[[!meta title="""change to plugins/contrib/default_content_for___42__copyright__42___and___42__license__42__ on ikiwiki"""]]
-
-[[!meta permalink="http://ikiwiki.info/recentchanges/#change-e68f29eebb3917909b939869e57b985add724598"]]
-
-

-
Changed pages:
-
-
-[[diff|wikiicons/diff.png]]plugins/contrib/default content for *copyright* and *license*
-
-
-
-
Changed by:
-
-
-smcv
-
-
-
Commit type:
-web
-
Date:
-14:24:46 11/01/10
-

-

-
-
-[[revert|wikiicons/revert.png]]
-
-
-

-
-
-ugh, now with better syntax

-
-
-

-
-

-
-diff --git a/doc/plugins/contrib/default_content_for___42__copyright__42___and___42__license__42__.mdwn b/doc/plugins/contrib/default_content_for___42__copyright__42___and___42__license__42__.mdwn
-index c131143..16c147b 100644
---- a/doc/plugins/contrib/default_content_for___42__copyright__42___and___42__license__42__.mdwn
-+++ b/doc/plugins/contrib/default_content_for___42__copyright__42___and___42__license__42__.mdwn
-@@ -46,7 +46,7 @@ by ikiwiki are likewise fine.  --[[tschwinge]]
- > that it doesn't support setting defaults for a given "subdirectory"
- > only. --[[smcv]]
- 
--[[!template id=gitbranch name=smcv/contrib/defcopyright author="[[tschwinge]]"]]
-+[[!template id=gitbranch branch=smcv/contrib/defcopyright author="[[tschwinge]]"]]
- 
- > For `./gitremotes` convenience (taking the Linus approach to backups :-) )
- > I've added this to my git repository as a branch. No review, approval or
-
-

-

-
-
diff --git a/doc/recentchanges/change_e810fe394b49955971299329136d46548d95ec6b._change b/doc/recentchanges/change_e810fe394b49955971299329136d46548d95ec6b._change
deleted file mode 100644
index b69fabd45..000000000
--- a/doc/recentchanges/change_e810fe394b49955971299329136d46548d95ec6b._change
+++ /dev/null
@@ -1,63 +0,0 @@
-[[!meta author="""http://smcv.pseudorandom.co.uk/"""]]
-
-[[!meta authorurl="""http://smcv.pseudorandom.co.uk/"""]]
-
-[[!meta title="""change to todo/Improving_the_efficiency_of_match__95__glob on ikiwiki"""]]
-
-[[!meta permalink="http://ikiwiki.info/recentchanges/#change-e810fe394b49955971299329136d46548d95ec6b"]]
-
-

-
Changed pages:
-
-
-[[diff|wikiicons/diff.png]]todo/Improving the efficiency of match_glob
-
-
-
-
Changed by:
-
-
-smcv
-
-
-
Commit type:
-web
-
Date:
-09:26:16 11/10/10
-

-

-
-
-[[revert|wikiicons/revert.png]]
-
-
-

-
-
-possible improvement

-
-
-

-
-

-
-diff --git a/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn b/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn
-index 8f70f1d..0a9d8c6 100644
---- a/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn
-+++ b/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn
-@@ -2,6 +2,10 @@ I've been profiling my IkiWiki to try to improve speed (with many pages makes sp
- 
- Here's my patch - please consider it! -- [[KathrynAndersen]]
- 
-+> It seems to me as though changing `glob2re` to return qr/$re/, and calling
-+> `memoize(glob2re)` next to the other memoize calls, would be a less
-+> verbose way to do this? --[[smcv]]
-+
- --------------------------------------------------------------
- <pre>
- diff --git a/IkiWiki.pm b/IkiWiki.pm
-
-

-

-
-
diff --git a/doc/recentchanges/change_eaa04125d7080a9c882b629d1e0f6c7992ad462f._change b/doc/recentchanges/change_eaa04125d7080a9c882b629d1e0f6c7992ad462f._change
deleted file mode 100644
index a40a8ce27..000000000
--- a/doc/recentchanges/change_eaa04125d7080a9c882b629d1e0f6c7992ad462f._change
+++ /dev/null
@@ -1,58 +0,0 @@
-[[!meta author="""https://www.google.com/accounts/o8/id?id=AItOawlOh8Cp-kxb0kaANKSNGrtw5XvdyHGJ3dk"""]]
-
-[[!meta authorurl="""https://www.google.com/accounts/o8/id?id=AItOawlOh8Cp-kxb0kaANKSNGrtw5XvdyHGJ3dk"""]]
-
-[[!meta title="""change to sandbox on ikiwiki"""]]
-
-[[!meta permalink="http://ikiwiki.info/recentchanges/#change-eaa04125d7080a9c882b629d1e0f6c7992ad462f"]]
-
-

-
Changed pages:
-
-
-[[diff|wikiicons/diff.png]]sandbox
-
-
-
-
Changed by:
-
-
-Henning
-
-
-
Commit type:
-web
-
Date:
-05:15:29 11/06/10
-

-

-
-
-[[revert|wikiicons/revert.png]]
-
-
-

-
-
-Added crucial hello-world line

-
-
-

-
-

-
-diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
-index c665e67..df9d688 100644
---- a/doc/sandbox.mdwn
-+++ b/doc/sandbox.mdwn
-@@ -1,3 +1,5 @@
-+Hello, world!
-+
- This is the [[SandBox]], a page anyone can edit to try out ikiwiki
- (version [[!version  ]]).
- 
-
-

-

-
-
diff --git a/doc/recentchanges/change_eb13521f5276cdd21a3f5990b1a1a17234e40174._change b/doc/recentchanges/change_eb13521f5276cdd21a3f5990b1a1a17234e40174._change
deleted file mode 100644
index 3643d9cac..000000000
--- a/doc/recentchanges/change_eb13521f5276cdd21a3f5990b1a1a17234e40174._change
+++ /dev/null
@@ -1,58 +0,0 @@
-[[!meta author="""http://kerravonsen.dreamwidth.org/"""]]
-
-[[!meta authorurl="""http://kerravonsen.dreamwidth.org/"""]]
-
-[[!meta title="""change to todo/replace_HTML::Template_with_Template_Toolkit on ikiwiki"""]]
-
-[[!meta permalink="http://ikiwiki.info/recentchanges/#change-eb13521f5276cdd21a3f5990b1a1a17234e40174"]]
-
-

-
Changed pages:
-
-
-[[diff|wikiicons/diff.png]]todo/replace HTML::Template with Template Toolkit
-
-
-
-
Changed by:
-
-
-kerravonsen [dreamwidth.org]
-
-
-
Commit type:
-web
-
Date:
-19:00:48 11/15/10
-

-

-
-
-[[revert|wikiicons/revert.png]]
-
-
-

-
-
-modular, not replacement

-
-
-

-
-

-
-diff --git a/doc/todo/replace_HTML::Template_with_Template_Toolkit.mdwn b/doc/todo/replace_HTML::Template_with_Template_Toolkit.mdwn
-index 8650e4f..9725b65 100644
---- a/doc/todo/replace_HTML::Template_with_Template_Toolkit.mdwn
-+++ b/doc/todo/replace_HTML::Template_with_Template_Toolkit.mdwn
-@@ -61,3 +61,5 @@ HTML::Template's HTML-like markup prevents me from editing templates in KompoZer
- 
- 
- I agree that being able to replace the template toolkit would be a great piece of modularity, and one I would use. If I could use the slot-based filling and the conditional logic from Template::Toolkit, we could build much more flexible inline and archivepage templates that would look different depending on where in the wiki we use them. Some of this can currently be accomplished with separate templates for each use case and a manual call to the right template in the !inline directive, but this is limited, cumbersome, and makes it difficult to reuse bits of formatting by trapping all of that information in multiple template files. -Ian
-+
-+> I don't wish HTML::Template to be *replaced* by Template::Toolkit - as others have said above, it's overkill for my needs.  However, I also agree that HTML::Template has its own problems too.  The idea of making the template system modular, with a choice of which backend to use - I really like that idea. It would enable me to use some other template system I like better, such as Text::Template or Text::NeatTemplate. But I think it would be a lot of work to implement, though perhaps no more work than making the revision-control backend modular, I guess.  One would need to write an IkiWiki template interface that didn't care what the backend was, and yet is somehow still flexible enough to take advantage of special features of different backends.  There are an *awful lot* of things that use templates - not just the `pagetemplate` and `template` plugins, but a number of others which have specialized templates of their own. -- [[KathrynAndersen]]
-
-

-

-
-
diff --git a/doc/recentchanges/change_ebcc0e6c9068bafaa52938a9f3aae6d6dd3d60aa._change b/doc/recentchanges/change_ebcc0e6c9068bafaa52938a9f3aae6d6dd3d60aa._change
deleted file mode 100644
index eb22db19f..000000000
--- a/doc/recentchanges/change_ebcc0e6c9068bafaa52938a9f3aae6d6dd3d60aa._change
+++ /dev/null
@@ -1,55 +0,0 @@
-[[!meta author="""https://www.google.com/accounts/o8/id?id=AItOawmrVK0l7LGe93rzchPlVg7bukNgTsqTbn8"""]]
-
-[[!meta authorurl="""https://www.google.com/accounts/o8/id?id=AItOawmrVK0l7LGe93rzchPlVg7bukNgTsqTbn8"""]]
-
-[[!meta title="""change to todo/Add_nicer_math_formatting on ikiwiki"""]]
-
-[[!meta permalink="http://ikiwiki.info/recentchanges/#change-ebcc0e6c9068bafaa52938a9f3aae6d6dd3d60aa"]]
-
-

-
Changed pages:
-
-
-[[diff|wikiicons/diff.png]]todo/Add nicer math formatting
-
-
-
-
Changed by:
-
-
-micheal
-
-
-
Commit type:
-web
-
Date:
-09:35:34 11/12/10
-

-

-
-
-[[revert|wikiicons/revert.png]]
-
-
-

-
-

-
-

-
-diff --git a/doc/todo/Add_nicer_math_formatting.mdwn b/doc/todo/Add_nicer_math_formatting.mdwn
-index 6e082c1..3a5e94a 100644
---- a/doc/todo/Add_nicer_math_formatting.mdwn
-+++ b/doc/todo/Add_nicer_math_formatting.mdwn
-@@ -21,4 +21,6 @@ It would be nice to add nicer math formatting.  I currently use the
- > I've posted a question about this to its forum:  --[[Joey]] 
- > <https://sourceforge.net/projects/jsmath/forums/forum/592273/topic/3831574> 
- 
-+I think [mathjax](http://www.mathjax.org/) would be the best option. This is the math rendering engine used in mathoverflow.
-+
- [[!tag wishlist]]
-
-

-

-
-
diff --git a/doc/recentchanges/change_ec6c1269d251c78d2eef68cb789de6cfc6272464._change b/doc/recentchanges/change_ec6c1269d251c78d2eef68cb789de6cfc6272464._change
deleted file mode 100644
index 13d0c0641..000000000
--- a/doc/recentchanges/change_ec6c1269d251c78d2eef68cb789de6cfc6272464._change
+++ /dev/null
@@ -1,106 +0,0 @@
-[[!meta author="""joey"""]]
-
-[[!meta authorurl="""http://ikiwiki.info/ikiwiki.cgi?page=users%2Fjoey&do=goto"""]]
-
-[[!meta title="""change to ikiwiki/directive/more todo/selective_more_directive on ikiwiki"""]]
-
-[[!meta permalink="http://ikiwiki.info/recentchanges/#change-ec6c1269d251c78d2eef68cb789de6cfc6272464"]]
-
-

-
Changed pages:
-
-
-[[diff|wikiicons/diff.png]]ikiwiki/directive/more
-
-
-[[diff|wikiicons/diff.png]]todo/selective more directive
-
-
-
-
Changed by:
-
-
-joey
-
-
-
Commit type:
-git
-
Date:
-19:00:04 11/16/10
-

-

-
-
-[[revert|wikiicons/revert.png]]
-
-
-

-
-
-more: Add pages parameter to limit where the more is displayed. (thanks, dark)

-
-
-

-
-

-
-diff --git a/IkiWiki/Plugin/more.pm b/IkiWiki/Plugin/more.pm
-index 80e339a..6880e36 100644
---- a/IkiWiki/Plugin/more.pm
-+++ b/IkiWiki/Plugin/more.pm
-@@ -26,7 +26,10 @@ sub preprocess (@) {
- 
- 	$params{linktext} = $linktext unless defined $params{linktext};
- 
--	if ($params{page} ne $params{destpage}) {
-+	if ($params{page} ne $params{destpage} &&
-+	    (! exists $params{pages} ||
-+	     pagespec_match($params{destpage}, $params{pages},
-+		     location => $params{page}))) {
- 		return "\n".
- 			htmllink($params{page}, $params{destpage}, $params{page},
- 				linktext => $params{linktext},
-diff --git a/debian/changelog b/debian/changelog
-index 91ff096..faabf19 100644
---- a/debian/changelog
-+++ b/debian/changelog
-@@ -1,6 +1,8 @@
- ikiwiki (3.20101113) UNRELEASED; urgency=low
- 
-   * websetup: Fix encoding problem when restoring old setup file.
-+  * more: Add pages parameter to limit where the more is displayed.
-+    (thanks, dark)
- 
-  -- Joey Hess <joeyh@debian.org>  Tue, 16 Nov 2010 14:23:47 -0400
- 
-diff --git a/doc/ikiwiki/directive/more.mdwn b/doc/ikiwiki/directive/more.mdwn
-index 5065519..bda1427 100644
---- a/doc/ikiwiki/directive/more.mdwn
-+++ b/doc/ikiwiki/directive/more.mdwn
-@@ -11,6 +11,11 @@ leads to the full version of the page. Use it like this:
- 
- If the `linktext` parameter is omitted it defaults to just "more".
- 
-+An optional `pages` parameter can be used to specify a
-+[[ikiwiki/PageSpec]], and then the "more" link will only be displayed
-+when the page is inlined into a page matching that PageSpec, and otherwise
-+the full content shown.
-+
- Note that you can accomplish something similar using a [[toggle]] instead.
- 
- [[!meta robots="noindex, follow"]]
-diff --git a/doc/todo/selective_more_directive.mdwn b/doc/todo/selective_more_directive.mdwn
-index 24e6ab5..2a99982 100644
---- a/doc/todo/selective_more_directive.mdwn
-+++ b/doc/todo/selective_more_directive.mdwn
-@@ -24,3 +24,5 @@ I can now call it as
- I'm not entirely happy with the design, since I would rather put this information in the inline directive instead of in every story post. Unfortunately I found no way to pass parameters from the inline directive to the inlined page.
- 
- -- [[dark]]
-+
-+> Me neither, but nor do I see a better way, so [[applied|done]]. --[[Joey]] 
-
-

-

-
-
diff --git a/doc/recentchanges/change_efba19b3379b0b4e4199ece869c71f80be3a82d1._change b/doc/recentchanges/change_efba19b3379b0b4e4199ece869c71f80be3a82d1._change
deleted file mode 100644
index 17cc453bb..000000000
--- a/doc/recentchanges/change_efba19b3379b0b4e4199ece869c71f80be3a82d1._change
+++ /dev/null
@@ -1,66 +0,0 @@
-[[!meta author="""http://smcv.pseudorandom.co.uk/"""]]
-
-[[!meta authorurl="""http://smcv.pseudorandom.co.uk/"""]]
-
-[[!meta title="""change to forum/Need_something_more_powerful_than_Exclude/comment_1_b454ead16d90479690ad8ee72cfd1428 on ikiwiki"""]]
-
-[[!meta permalink="http://ikiwiki.info/recentchanges/#change-efba19b3379b0b4e4199ece869c71f80be3a82d1"]]
-
-

-
Changed pages:
-
-
-[[diff|wikiicons/diff.png]]forum/Need something more powerful than Exclude/comment 1 b454ead16d90479690ad8ee72cfd1428
-
-
-
-
Changed by:
-
-
-smcv
-
-
-
Commit type:
-web
-
Date:
-10:43:09 11/23/10
-

-

-
-
-[[revert|wikiicons/revert.png]]
-
-
-

-
-
-Added a comment: expression anchored too closely?

-
-
-

-
-

-
-diff --git a/doc/forum/Need_something_more_powerful_than_Exclude/comment_1_b454ead16d90479690ad8ee72cfd1428._comment b/doc/forum/Need_something_more_powerful_than_Exclude/comment_1_b454ead16d90479690ad8ee72cfd1428._comment
-new file mode 100644
-index 0000000..6e29f0c
---- /dev/null
-+++ b/doc/forum/Need_something_more_powerful_than_Exclude/comment_1_b454ead16d90479690ad8ee72cfd1428._comment
-@@ -0,0 +1,12 @@
-+[[!comment format=mdwn
-+ username="http://smcv.pseudorandom.co.uk/"
-+ nickname="smcv"
-+ subject="expression anchored too closely?"
-+ date="2010-11-23T10:43:08Z"
-+ content="""
-+It looks as though you might only be excluding a top-level Makefile, and not a Makefile in subdirectories. Try excluding `(^|/)Makefile$` instead, for instance? (See `wiki_file_prune_regexps` in `IkiWiki.pm` for hints.)
-+
-+The match operation in `&file_pruned` ends up a bit like this:
-+
-+    \"foo/Makefile\" =~ m{…||…|(^|/)Makefile$}
-+"""]]
-
-

-

-
-
diff --git a/doc/recentchanges/change_f35f79a0b831e8b47f62c430c1bba538d4687521._change b/doc/recentchanges/change_f35f79a0b831e8b47f62c430c1bba538d4687521._change
deleted file mode 100644
index c0a50712c..000000000
--- a/doc/recentchanges/change_f35f79a0b831e8b47f62c430c1bba538d4687521._change
+++ /dev/null
@@ -1,100 +0,0 @@
-[[!meta author="""http://kerravonsen.dreamwidth.org/"""]]
-
-[[!meta authorurl="""http://kerravonsen.dreamwidth.org/"""]]
-
-[[!meta title="""change to todo/Improving_the_efficiency_of_match__95__glob on ikiwiki"""]]
-
-[[!meta permalink="http://ikiwiki.info/recentchanges/#change-f35f79a0b831e8b47f62c430c1bba538d4687521"]]
-
-

-
Changed pages:
-
-
-[[diff|wikiicons/diff.png]]todo/Improving the efficiency of match_glob
-
-
-
-
Changed by:
-
-
-kerravonsen [dreamwidth.org]
-
-
-
Commit type:
-web
-
Date:
-17:08:45 11/10/10
-

-

-
-
-[[revert|wikiicons/revert.png]]
-
-
-

-
-
-response with benchmark

-
-
-

-
-

-
-diff --git a/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn b/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn
-index b631287..ff9784d 100644
---- a/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn
-+++ b/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn
-@@ -9,6 +9,47 @@ Here's my patch - please consider it! -- [[KathrynAndersen]]
- >> I think so, yeah. Anyway, do you have any benchmark results handy,
- >> Kathryn?  --[[Joey]] 
- 
-+>>> See below.
-+>>> Also, would it make more sense for glob2re to return qr/^$re$/i rather than qr/$re/?  Everything that uses glob2re seems to use
-+	$foo =~ /^$re$/i
-+>>> rather than /$re/ so I think that would make sense.
-+>>> -- [[KathrynAndersen]]
-+
-+--------------------------------------------------------------
-+Benchmarks done with Devel::Profile on the same testbed IkiWiki setup.  I'm just showing the start of the profile output, since that's what's relevant.
-+
-+Before:
-+<pre>
-+time elapsed (wall):   27.4173
-+time running program:  22.5909  (82.40%)
-+time profiling (est.): 4.8264  (17.60%)
-+number of calls:       1314729
-+number of exceptions:  65
-+
-+%Time    Sec.     #calls   sec/call  F  name
-+11.05    2.4969    62333   0.000040     IkiWiki::PageSpec::match_glob
-+ 4.10    0.9261      679   0.001364     Text::Balanced::_match_tagged
-+ 2.72    0.6139    59812   0.000010     IkiWiki::SuccessReason::merge_influences
-+</pre>
-+
-+After:
-+<pre>
-+time elapsed (wall):   26.1843
-+time running program:  21.5673  (82.37%)
-+time profiling (est.): 4.6170  (17.63%)
-+number of calls:       1252433
-+number of exceptions:  65
-+
-+%Time    Sec.     #calls   sec/call  F  name
-+ 7.66    1.6521    62333   0.000027     IkiWiki::PageSpec::match_glob
-+ 4.33    0.9336      679   0.001375     Text::Balanced::_match_tagged
-+ 2.81    0.6057    59812   0.000010     IkiWiki::SuccessReason::merge_influences
-+</pre>
-+
-+Note that the seconds per call for match_glob in the "after" case has gone down by about a third.
-+
-+K.A.
-+
- --------------------------------------------------------------
- <pre>
- diff --git a/IkiWiki.pm b/IkiWiki.pm
-
-

-

-
-
diff --git a/doc/recentchanges/change_f54a91c3021b304fdde183834542418720e4f792._change b/doc/recentchanges/change_f54a91c3021b304fdde183834542418720e4f792._change
deleted file mode 100644
index 8d7d2471a..000000000
--- a/doc/recentchanges/change_f54a91c3021b304fdde183834542418720e4f792._change
+++ /dev/null
@@ -1,71 +0,0 @@
-[[!meta author="""https://www.google.com/accounts/o8/id?id=AItOawmE7z4CSv-ctBarutQCd70R3CcaSPPxjVk"""]]
-
-[[!meta authorurl="""https://www.google.com/accounts/o8/id?id=AItOawmE7z4CSv-ctBarutQCd70R3CcaSPPxjVk"""]]
-
-[[!meta title="""change to bugs/logout_in_ikiwiki on ikiwiki"""]]
-
-[[!meta permalink="http://ikiwiki.info/recentchanges/#change-f54a91c3021b304fdde183834542418720e4f792"]]
-
-

-
Changed pages:
-
-
-[[diff|wikiicons/diff.png]]bugs/logout in ikiwiki
-
-
-
-
Changed by:
-
-
-Dave
-
-
-
Commit type:
-web
-
Date:
-20:56:13 10/28/10
-

-

-
-
-[[revert|wikiicons/revert.png]]
-
-
-

-
-
-trying to figure out how to make ikiwiki slightly more interactive

-
-
-

-
-

-
-diff --git a/doc/bugs/logout_in_ikiwiki.mdwn b/doc/bugs/logout_in_ikiwiki.mdwn
-index 5df19c4..a9c407b 100644
---- a/doc/bugs/logout_in_ikiwiki.mdwn
-+++ b/doc/bugs/logout_in_ikiwiki.mdwn
-@@ -5,3 +5,18 @@ It looks like there is no way to logout of ikiwiki at present, meaning that if y
- > It would be nice if it were not buried there, but putting it on the
- > action bar statically would be confusing. The best approach might be to
- > use javascript. --[[Joey]] 
-+
-+
-+>> I agree that javascript seems to be a solution, but my brain falls 
-+>> off the end of the world while looking at ways to manipulate the DOM. 
-+>> (I'd argue also in favor of the openid_provider cookie expiring 
-+>>  in less time than it does now, and being session based)
-+
-+>> It would be nice to move navigational elements to the upper right corner 
-+>> of the page...
-+
-+>> I have two kinds of pages (wiki and blog), and three classes of users  
-+>> anonymous users - display things like login, help, and recentchanges,
-+>> non-admin users - on a per subdir basis (blog and !blog) display 
-+>> logout, help, recentchanges, edit, comment 
-+>> admin users - logout, help, recentchanges, edit, comment, etc
-
-

-

-
-
diff --git a/doc/recentchanges/change_f6312319a49cc1860eebbafd937a0f75d8e7baeb._change b/doc/recentchanges/change_f6312319a49cc1860eebbafd937a0f75d8e7baeb._change
deleted file mode 100644
index 3f06369b5..000000000
--- a/doc/recentchanges/change_f6312319a49cc1860eebbafd937a0f75d8e7baeb._change
+++ /dev/null
@@ -1,59 +0,0 @@
-[[!meta author="""http://churchkey.org/author/ian/"""]]
-
-[[!meta authorurl="""http://churchkey.org/author/ian/"""]]
-
-[[!meta title="""change to todo/replace_HTML::Template_with_Template_Toolkit on ikiwiki"""]]
-
-[[!meta permalink="http://ikiwiki.info/recentchanges/#change-f6312319a49cc1860eebbafd937a0f75d8e7baeb"]]
-
-

-
Changed pages:
-
-
-[[diff|wikiicons/diff.png]]todo/replace HTML::Template with Template Toolkit
-
-
-
-
Changed by:
-
-
-ian [churchkey.org/author]
-
-
-
Commit type:
-web
-
Date:
-11:50:37 11/15/10
-

-

-
-
-[[revert|wikiicons/revert.png]]
-
-
-

-
-
-added my reasons for wanting a replace-able template system

-
-
-

-
-

-
-diff --git a/doc/todo/replace_HTML::Template_with_Template_Toolkit.mdwn b/doc/todo/replace_HTML::Template_with_Template_Toolkit.mdwn
-index c4e78ca..8650e4f 100644
---- a/doc/todo/replace_HTML::Template_with_Template_Toolkit.mdwn
-+++ b/doc/todo/replace_HTML::Template_with_Template_Toolkit.mdwn
-@@ -58,3 +58,6 @@ Yes, Template::Toolkit is very powerful. But I think it's somehow overkill for a
- I'd have to agree that Template::Toolkit is overkill and personally I'm not a fan, but it is very popular (there is even a book) and the new version (3) is alleged to be much more nimble than current version.  --[[ajt]]
- 
- HTML::Template's HTML-like markup prevents me from editing templates in KompoZer or other WYSIWYG HTML editors.  The editor tries to render the template markup rather than display it verbatim, and large parts of the template become invisible.  A markup syntax that doesn't confuse editors (such as Template::Toolkit's "[% FOO %]") may promote template customization.  The ability to replace the template engine would be within the spirit of ikiwiki's extensibility. --Rocco
-+
-+
-+I agree that being able to replace the template toolkit would be a great piece of modularity, and one I would use. If I could use the slot-based filling and the conditional logic from Template::Toolkit, we could build much more flexible inline and archivepage templates that would look different depending on where in the wiki we use them. Some of this can currently be accomplished with separate templates for each use case and a manual call to the right template in the !inline directive, but this is limited, cumbersome, and makes it difficult to reuse bits of formatting by trapping all of that information in multiple template files. -Ian
-
-

-

-
-
diff --git a/doc/recentchanges/change_f80469c34d8d81e79d4894f7a1789a949bc766c3._change b/doc/recentchanges/change_f80469c34d8d81e79d4894f7a1789a949bc766c3._change
deleted file mode 100644
index 3076c3a1b..000000000
--- a/doc/recentchanges/change_f80469c34d8d81e79d4894f7a1789a949bc766c3._change
+++ /dev/null
@@ -1,54 +0,0 @@
-[[!meta author="""http://pmate.myopenid.com/"""]]
-
-[[!meta authorurl="""http://pmate.myopenid.com/"""]]
-
-[[!meta title="""change to tips/nearlyfreespeech/discussion on ikiwiki"""]]
-
-[[!meta permalink="http://ikiwiki.info/recentchanges/#change-f80469c34d8d81e79d4894f7a1789a949bc766c3"]]
-
-

-
Changed pages:
-
-
-[[diff|wikiicons/diff.png]]tips/nearlyfreespeech/discussion
-
-
-
-
Changed by:
-
-
-pmate [myopenid.com]
-
-
-
Commit type:
-web
-
Date:
-21:44:12 11/20/10
-

-

-
-
-[[revert|wikiicons/revert.png]]
-
-
-

-
-

-
-

-
-diff --git a/doc/tips/nearlyfreespeech/discussion.mdwn b/doc/tips/nearlyfreespeech/discussion.mdwn
-index 0d1f1f0..b764325 100644
---- a/doc/tips/nearlyfreespeech/discussion.mdwn
-+++ b/doc/tips/nearlyfreespeech/discussion.mdwn
-@@ -18,3 +18,5 @@ Thanks for your incredible work!
- 
- > You can move `~/ikiwiki` out of the way and then re-download and install
- > it ikiwiki. --[[Joey]]
-+
-+Thanks a lot Joey. :-)
-
-

-

-
-
diff --git a/doc/recentchanges/change_f8f8770a652520b2f09eb2262510a04a8e353e9d._change b/doc/recentchanges/change_f8f8770a652520b2f09eb2262510a04a8e353e9d._change
deleted file mode 100644
index 4f394e68c..000000000
--- a/doc/recentchanges/change_f8f8770a652520b2f09eb2262510a04a8e353e9d._change
+++ /dev/null
@@ -1,73 +0,0 @@
-[[!meta author="""joey"""]]
-
-[[!meta authorurl="""http://ikiwiki.info/ikiwiki.cgi?page=users%2Fjoey&do=goto"""]]
-
-[[!meta title="""change to todo/Improving_the_efficiency_of_match__95__glob on ikiwiki"""]]
-
-[[!meta permalink="http://ikiwiki.info/recentchanges/#change-f8f8770a652520b2f09eb2262510a04a8e353e9d"]]
-
-

-
Changed pages:
-
-
-[[diff|wikiicons/diff.png]]todo/Improving the efficiency of match_glob
-
-
-
-
Changed by:
-
-
-joey
-
-
-
Commit type:
-git
-
Date:
-16:28:22 11/20/10
-

-

-
-
-[[revert|wikiicons/revert.png]]
-
-
-

-
-
-smcv/ready/glob-cache merged

-
-
-

-
-

-
-diff --git a/debian/changelog b/debian/changelog
-index 0edb780..65c2353 100644
---- a/debian/changelog
-+++ b/debian/changelog
-@@ -8,6 +8,7 @@ ikiwiki (3.20101113) UNRELEASED; urgency=low
-     and support all elements that HTML::Tagset knows about. 
-     (Which doesn't include html5 just yet, but then the old version
-     didn't either.) Bonus: 4 times faster than old regexp method.
-+  * Optimise glob() pagespec. (Thanks, Kathryn and smcv)
- 
-  -- Joey Hess <joeyh@debian.org>  Tue, 16 Nov 2010 14:23:47 -0400
- 
-diff --git a/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn b/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn
-index 4fe1454..4e1df33 100644
---- a/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn
-+++ b/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn
-@@ -57,6 +57,8 @@ Here's my patch - please consider it! -- [[KathrynAndersen]]
- >>>>>>> representative.
- >>>>>>> --[[smcv]]
- 
-+[[done]] --[[Joey]] 
-+
- --------------------------------------------------------------
- 
- [[!toggle id="smcv-benchmark" text="current benchmarks"]]
-
-

-

-
-
diff --git a/doc/recentchanges/change_fa71b0e6aa08b0e3b274a0b939bf657f2576e482._change b/doc/recentchanges/change_fa71b0e6aa08b0e3b274a0b939bf657f2576e482._change
deleted file mode 100644
index 042b63b08..000000000
--- a/doc/recentchanges/change_fa71b0e6aa08b0e3b274a0b939bf657f2576e482._change
+++ /dev/null
@@ -1,63 +0,0 @@
-[[!meta author="""http://smcv.pseudorandom.co.uk/"""]]
-
-[[!meta authorurl="""http://smcv.pseudorandom.co.uk/"""]]
-
-[[!meta title="""change to plugins/contrib/default_content_for___42__copyright__42___and___42__license__42__ on ikiwiki"""]]
-
-[[!meta permalink="http://ikiwiki.info/recentchanges/#change-fa71b0e6aa08b0e3b274a0b939bf657f2576e482"]]
-
-

-
Changed pages:
-
-
-[[diff|wikiicons/diff.png]]plugins/contrib/default content for *copyright* and *license*
-
-
-
-
Changed by:
-
-
-smcv
-
-
-
Commit type:
-web
-
Date:
-14:23:43 11/01/10
-

-

-
-
-[[revert|wikiicons/revert.png]]
-
-
-

-
-
-added to git

-
-
-

-
-

-
-diff --git a/doc/plugins/contrib/default_content_for___42__copyright__42___and___42__license__42__.mdwn b/doc/plugins/contrib/default_content_for___42__copyright__42___and___42__license__42__.mdwn
-index ce2779d..c131143 100644
---- a/doc/plugins/contrib/default_content_for___42__copyright__42___and___42__license__42__.mdwn
-+++ b/doc/plugins/contrib/default_content_for___42__copyright__42___and___42__license__42__.mdwn
-@@ -45,3 +45,10 @@ by ikiwiki are likewise fine.  --[[tschwinge]]
- > and can extend beyond just copyright and license, but has the disadvantage
- > that it doesn't support setting defaults for a given "subdirectory"
- > only. --[[smcv]]
-+
-+[[!template id=gitbranch name=smcv/contrib/defcopyright author="[[tschwinge]]"]]
-+
-+> For `./gitremotes` convenience (taking the Linus approach to backups :-) )
-+> I've added this to my git repository as a branch. No review, approval or
-+> ownership is implied, feel free to replace this with a branch in any other
-+> repository --[[smcv]]
-
-

-

-
-
diff --git a/doc/recentchanges/change_ffeee19216182d633d251852ab62fe79c1367796._change b/doc/recentchanges/change_ffeee19216182d633d251852ab62fe79c1367796._change
deleted file mode 100644
index a9995d8b6..000000000
--- a/doc/recentchanges/change_ffeee19216182d633d251852ab62fe79c1367796._change
+++ /dev/null
@@ -1,61 +0,0 @@
-[[!meta author="""http://kerravonsen.dreamwidth.org/"""]]
-
-[[!meta authorurl="""http://kerravonsen.dreamwidth.org/"""]]
-
-[[!meta title="""change to todo/transient_in-memory_pages on ikiwiki"""]]
-
-[[!meta permalink="http://ikiwiki.info/recentchanges/#change-ffeee19216182d633d251852ab62fe79c1367796"]]
-
-

-
Changed pages:
-
-
-[[diff|wikiicons/diff.png]]todo/transient in-memory pages
-
-
-
-
Changed by:
-
-
-kerravonsen [dreamwidth.org]
-
-
-
Commit type:
-web
-
Date:
-01:43:56 11/15/10
-

-

-
-
-[[revert|wikiicons/revert.png]]
-
-
-

-
-
-make it more generic?

-
-
-

-
-

-
-diff --git a/doc/todo/transient_in-memory_pages.mdwn b/doc/todo/transient_in-memory_pages.mdwn
-index 5dbbe4f..816e95c 100644
---- a/doc/todo/transient_in-memory_pages.mdwn
-+++ b/doc/todo/transient_in-memory_pages.mdwn
-@@ -41,3 +41,8 @@ Refinements that could be made if this approach seems reasonable:
- 
- * make these options boolean, and have the path always be `.ikiwiki/transient`
- * improve the `remove` plugin so it also deletes from this special underlay
-+
-+>> Perhaps it should be something more generic, so that other plugins could use it (such as "album" mentioned above).
-+>> The `.ikiwiki/transient` would suit this, but instead of saying "tag_underlay" or "autoindex_underlay" have "use_transient_underlay" or something like that?
-+>> Or to make it more flexible, have just one option "transient_underlay" which is set to an absolute path, and if it is set, then one is using a transient-underlay.
-+>> --[[KathrynAndersen]]
-
-

-

-
-
-- 
cgit v1.2.3


From 47b4682ba7e8d2a0a5da87adbfb4adc3f857370f Mon Sep 17 00:00:00 2001
From: Joey Hess 
Date: Sun, 28 Nov 2010 19:23:06 -0400
Subject: bug

---
 doc/bugs/git_commit_adds_files_that_were_not_tracked.mdwn | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 doc/bugs/git_commit_adds_files_that_were_not_tracked.mdwn

(limited to 'doc')

diff --git a/doc/bugs/git_commit_adds_files_that_were_not_tracked.mdwn b/doc/bugs/git_commit_adds_files_that_were_not_tracked.mdwn
new file mode 100644
index 000000000..6f7d4b72a
--- /dev/null
+++ b/doc/bugs/git_commit_adds_files_that_were_not_tracked.mdwn
@@ -0,0 +1,9 @@
+Commit 3650d0265bc501219bc6d5cd4fa91a6b6ecd793a seems to have been caused by
+a bug in ikiwiki. recentchanges/* was added to the git repo incorrectly.
+
+Part of the problem seems to be that git's `rcs_commit` does a git add followed
+by a `rcs_commit_staged`, and so calling `rcs_commit` on files that were
+not checked in before adds them, incorrectly.
+
+I'm unsure yet why the recentchanges files were being committed. Possibly
+because of the link fixup code run when renaming a page. --[[Joey]] 
-- 
cgit v1.2.3


From c20eae4b264c83122c96fb94fe59c4d3d50c1fbb Mon Sep 17 00:00:00 2001
From: "http://lindi.myopenid.com/" 
Date: Mon, 29 Nov 2010 12:19:36 +0000
Subject:

---
 ...ed_SSH_keys:__34___shows_only_first_139_characters_of_each_key.mdwn | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 doc/bugs/__34__Currently_enabled_SSH_keys:__34___shows_only_first_139_characters_of_each_key.mdwn

(limited to 'doc')

diff --git a/doc/bugs/__34__Currently_enabled_SSH_keys:__34___shows_only_first_139_characters_of_each_key.mdwn b/doc/bugs/__34__Currently_enabled_SSH_keys:__34___shows_only_first_139_characters_of_each_key.mdwn
new file mode 100644
index 000000000..db88c9e97
--- /dev/null
+++ b/doc/bugs/__34__Currently_enabled_SSH_keys:__34___shows_only_first_139_characters_of_each_key.mdwn
@@ -0,0 +1,3 @@
+At least at http://free-thursday.pieni.net/ikiwiki.cgi the "SSH keys" page shows only the first 139 characters of each SSH key. I'm using iceweasel in 1024x768 resolution and there are not scrollbars visible.
+
+Please contact me at timo.lindfors@iki.fi
-- 
cgit v1.2.3


From 3b7bf9a285bac3c17c9372756cb61c7b32e1e518 Mon Sep 17 00:00:00 2001
From: "http://liw.fi/" 
Date: Mon, 29 Nov 2010 12:22:04 +0000
Subject:

---
 ...ed_SSH_keys:__34___shows_only_first_139_characters_of_each_key.mdwn | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'doc')

diff --git a/doc/bugs/__34__Currently_enabled_SSH_keys:__34___shows_only_first_139_characters_of_each_key.mdwn b/doc/bugs/__34__Currently_enabled_SSH_keys:__34___shows_only_first_139_characters_of_each_key.mdwn
index db88c9e97..1dd843af3 100644
--- a/doc/bugs/__34__Currently_enabled_SSH_keys:__34___shows_only_first_139_characters_of_each_key.mdwn
+++ b/doc/bugs/__34__Currently_enabled_SSH_keys:__34___shows_only_first_139_characters_of_each_key.mdwn
@@ -1,3 +1,6 @@
 At least at http://free-thursday.pieni.net/ikiwiki.cgi the "SSH keys" page shows only the first 139 characters of each SSH key. I'm using iceweasel in 1024x768 resolution and there are not scrollbars visible.
 
 Please contact me at timo.lindfors@iki.fi
+
+> I have access to the same wiki, and do not see the problem Timo sees. I see 380 chars of the SSH keys, and do have a scrollbar.
+> Weird. --liw
-- 
cgit v1.2.3


From 2e2e9638c8010295d730f3e2f947a33a5929f051 Mon Sep 17 00:00:00 2001
From: Remy 
Date: Mon, 29 Nov 2010 14:45:50 +0000
Subject:

---
 doc/users/Remy.mdwn | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 doc/users/Remy.mdwn

(limited to 'doc')

diff --git a/doc/users/Remy.mdwn b/doc/users/Remy.mdwn
new file mode 100644
index 000000000..5cde4c43d
--- /dev/null
+++ b/doc/users/Remy.mdwn
@@ -0,0 +1 @@
+Test page
-- 
cgit v1.2.3


From fab1dc364f5cb073f0321887923f305db9366130 Mon Sep 17 00:00:00 2001
From: Joey Hess 
Date: Mon, 29 Nov 2010 12:10:17 -0400
Subject: bug moved to ikiwiki-hosting

---
 ...SSH_keys:__34___shows_only_first_139_characters_of_each_key.mdwn | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'doc')

diff --git a/doc/bugs/__34__Currently_enabled_SSH_keys:__34___shows_only_first_139_characters_of_each_key.mdwn b/doc/bugs/__34__Currently_enabled_SSH_keys:__34___shows_only_first_139_characters_of_each_key.mdwn
index 1dd843af3..3c3352f66 100644
--- a/doc/bugs/__34__Currently_enabled_SSH_keys:__34___shows_only_first_139_characters_of_each_key.mdwn
+++ b/doc/bugs/__34__Currently_enabled_SSH_keys:__34___shows_only_first_139_characters_of_each_key.mdwn
@@ -4,3 +4,9 @@ Please contact me at timo.lindfors@iki.fi
 
 > I have access to the same wiki, and do not see the problem Timo sees. I see 380 chars of the SSH keys, and do have a scrollbar.
 > Weird. --liw
+
+> Also, that's a Branchable.com site and the bug, if any is
+> in ikiwiki-hosting's plugin, not ikiwiki proper. Moved
+> [here](http://ikiwiki-hosting.branchable.com/bugs/__34__Currently_enabled_SSH_keys:__34___shows_only_first_139_characters_of_each_key/) --[[Joey]] 
+
+[[!tag done]]
-- 
cgit v1.2.3


From e8276cf13a38be929a45faeb9085e408e9d76cd7 Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" 
Date: Mon, 29 Nov 2010 16:19:15 +0000
Subject: related bug

---
 doc/bugs/git_commit_adds_files_that_were_not_tracked.mdwn | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'doc')

diff --git a/doc/bugs/git_commit_adds_files_that_were_not_tracked.mdwn b/doc/bugs/git_commit_adds_files_that_were_not_tracked.mdwn
index 6f7d4b72a..1b6eeb2a5 100644
--- a/doc/bugs/git_commit_adds_files_that_were_not_tracked.mdwn
+++ b/doc/bugs/git_commit_adds_files_that_were_not_tracked.mdwn
@@ -7,3 +7,5 @@ not checked in before adds them, incorrectly.
 
 I'm unsure yet why the recentchanges files were being committed. Possibly
 because of the link fixup code run when renaming a page. --[[Joey]] 
+
+> See also [[bugs/rename fixup not attributed to author]]. --[[smcv]]
-- 
cgit v1.2.3


From b342d0960666804b595a105919e1288f6057a686 Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" 
Date: Mon, 29 Nov 2010 16:22:50 +0000
Subject: bug page

---
 doc/bugs/rename_fixup_not_attributed_to_author.mdwn | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 doc/bugs/rename_fixup_not_attributed_to_author.mdwn

(limited to 'doc')

diff --git a/doc/bugs/rename_fixup_not_attributed_to_author.mdwn b/doc/bugs/rename_fixup_not_attributed_to_author.mdwn
new file mode 100644
index 000000000..3122307a2
--- /dev/null
+++ b/doc/bugs/rename_fixup_not_attributed_to_author.mdwn
@@ -0,0 +1,9 @@
+When I renamed `todo/transient_in-memory_pages` to [[todo/transient pages]],
+`rename::fixlinks` was meant to blame me for the link-fixing commit, and title it
+`update for rename of %s to %s`. Instead, it blamed Joey for the commit,
+and didn't set a commit message.
+
+(It also committed a pile of recentchanges pages which shouldn't have
+been committed, for which see [[bugs/git_commit_adds_files_that_were_not_tracked]].)
+
+--[[smcv]]
-- 
cgit v1.2.3


From a5120846cb6461616dce4d0042a4fd45211170e4 Mon Sep 17 00:00:00 2001
From: Joey Hess 
Date: Mon, 29 Nov 2010 13:28:28 -0400
Subject: rename: Fix to pass named parameters to rcs_commit

---
 IkiWiki/Plugin/rename.pm                                  | 9 ++++-----
 debian/changelog                                          | 1 +
 doc/bugs/git_commit_adds_files_that_were_not_tracked.mdwn | 7 +++++++
 doc/bugs/rename_fixup_not_attributed_to_author.mdwn       | 3 +++
 4 files changed, 15 insertions(+), 5 deletions(-)

(limited to 'doc')

diff --git a/IkiWiki/Plugin/rename.pm b/IkiWiki/Plugin/rename.pm
index ad5e72645..a05e85be0 100644
--- a/IkiWiki/Plugin/rename.pm
+++ b/IkiWiki/Plugin/rename.pm
@@ -574,11 +574,10 @@ sub fixlinks ($$$) {
 				eval { writefile($file, $config{srcdir}, $content) };
 				next if $@;
 				my $conflict=IkiWiki::rcs_commit(
-					$file,
-					sprintf(gettext("update for rename of %s to %s"), $rename->{srcfile}, $rename->{destfile}),
-					$token,
-					$session->param("name"),
-					$session->remote_addr(),
+					file => $file,
+					message => sprintf(gettext("update for rename of %s to %s"), $rename->{srcfile}, $rename->{destfile}),
+					token => $token,
+					session => $session,
 				);
 				push @fixedlinks, $page if ! defined $conflict;
 			}
diff --git a/debian/changelog b/debian/changelog
index 6f97399d8..bab5eeb88 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,7 @@ ikiwiki (3.20101113) UNRELEASED; urgency=low
   * edittemplate: Fix crash if using a .tmpl file or other non-page file
     as a template for a new page.
   * git: Fix temp file location.
+  * rename: Fix to pass named parameters to rcs_commit.
 
  -- Joey Hess   Tue, 16 Nov 2010 14:23:47 -0400
 
diff --git a/doc/bugs/git_commit_adds_files_that_were_not_tracked.mdwn b/doc/bugs/git_commit_adds_files_that_were_not_tracked.mdwn
index 1b6eeb2a5..829e80327 100644
--- a/doc/bugs/git_commit_adds_files_that_were_not_tracked.mdwn
+++ b/doc/bugs/git_commit_adds_files_that_were_not_tracked.mdwn
@@ -9,3 +9,10 @@ I'm unsure yet why the recentchanges files were being committed. Possibly
 because of the link fixup code run when renaming a page. --[[Joey]] 
 
 > See also [[bugs/rename fixup not attributed to author]]. --[[smcv]]
+
+> Ok, there was a call to `rcs_commit` that was still using non-named
+> parameters, which confused it thuroughly, and I think caused
+> 'git add .' to be called. I've fixed that.
+> 
+> I think there is still potential for the problem I described above to
+> occur during a rename or possibly otherwise. --[[Joey]] 
diff --git a/doc/bugs/rename_fixup_not_attributed_to_author.mdwn b/doc/bugs/rename_fixup_not_attributed_to_author.mdwn
index 3122307a2..bcfafac22 100644
--- a/doc/bugs/rename_fixup_not_attributed_to_author.mdwn
+++ b/doc/bugs/rename_fixup_not_attributed_to_author.mdwn
@@ -7,3 +7,6 @@ and didn't set a commit message.
 been committed, for which see [[bugs/git_commit_adds_files_that_were_not_tracked]].)
 
 --[[smcv]]
+
+> It was calling `rcs_commit` old-style, and so not passing the session
+> object that is used to get the user's name. [[fixed|done]] --[[Joey]] 
-- 
cgit v1.2.3


From 170cb0247926d0b7c736e61b2ff66d6a3095f271 Mon Sep 17 00:00:00 2001
From: Joey Hess 
Date: Mon, 29 Nov 2010 13:42:03 -0400
Subject: git: Avoid adding files when committing, so as not to implicitly add
 files like recentchanges files that are not normally checked in, when fixing
 links after rename.

---
 IkiWiki/Plugin/git.pm                                | 20 +++++++++++---------
 debian/changelog                                     |  3 +++
 .../git_commit_adds_files_that_were_not_tracked.mdwn |  3 ++-
 3 files changed, 16 insertions(+), 10 deletions(-)

(limited to 'doc')

diff --git a/IkiWiki/Plugin/git.pm b/IkiWiki/Plugin/git.pm
index 39d88d002..3db4af729 100644
--- a/IkiWiki/Plugin/git.pm
+++ b/IkiWiki/Plugin/git.pm
@@ -496,16 +496,16 @@ sub rcs_commit (@) {
 		return $conflict if defined $conflict;
 	}
 
-	rcs_add($params{file});
-	return rcs_commit_staged(
-		message => $params{message},
-		session => $params{session},
-	);
+	return rcs_commit_helper(@_);
 }
 
 sub rcs_commit_staged (@) {
 	# Commits all staged changes. Changes can be staged using rcs_add,
 	# rcs_remove, and rcs_rename.
+	return rcs_commit_helper(@_);
+}
+
+sub rcs_commit_helper (@) {
 	my %params=@_;
 	
 	my %env=%ENV;
@@ -546,10 +546,12 @@ sub rcs_commit_staged (@) {
 			$params{message}.=".";
 		}
 	}
-	push @opts, '-q';
-	# git commit returns non-zero if file has not been really changed.
-	# so we should ignore its exit status (hence run_or_non).
-	if (run_or_non('git', 'commit', @opts, '-m', $params{message})) {
+	if (exists $params{file}) {
+		push @opts, '--', $params{file};
+	}
+	# git commit returns non-zero if nothing really changed.
+	# So we should ignore its exit status (hence run_or_non).
+	if (run_or_non('git', 'commit', '-m', $params{message}, '-q', @opts)) {
 		if (length $config{gitorigin_branch}) {
 			run_or_cry('git', 'push', $config{gitorigin_branch});
 		}
diff --git a/debian/changelog b/debian/changelog
index bab5eeb88..1ae992b7a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,9 @@ ikiwiki (3.20101113) UNRELEASED; urgency=low
     as a template for a new page.
   * git: Fix temp file location.
   * rename: Fix to pass named parameters to rcs_commit.
+  * git: Avoid adding files when committing, so as not to implicitly add
+    files like recentchanges files that are not normally checked in,
+    when fixing links after rename.
 
  -- Joey Hess   Tue, 16 Nov 2010 14:23:47 -0400
 
diff --git a/doc/bugs/git_commit_adds_files_that_were_not_tracked.mdwn b/doc/bugs/git_commit_adds_files_that_were_not_tracked.mdwn
index 829e80327..587650c61 100644
--- a/doc/bugs/git_commit_adds_files_that_were_not_tracked.mdwn
+++ b/doc/bugs/git_commit_adds_files_that_were_not_tracked.mdwn
@@ -15,4 +15,5 @@ because of the link fixup code run when renaming a page. --[[Joey]]
 > 'git add .' to be called. I've fixed that.
 > 
 > I think there is still potential for the problem I described above to
-> occur during a rename or possibly otherwise. --[[Joey]] 
+> occur during a rename or possibly otherwise. Ok.. fixed `rcs_commit`
+> to not add too. [[done]] --[[Joey]] 
-- 
cgit v1.2.3


From e7cb11b40735a976f0cb565824c3d892bd75af44 Mon Sep 17 00:00:00 2001
From: Joey Hess 
Date: Mon, 29 Nov 2010 14:09:02 -0400
Subject: comment

---
 doc/todo/use_secure_cookies_for_ssl_logins.mdwn | 13 +++++++++++++
 1 file changed, 13 insertions(+)

(limited to 'doc')

diff --git a/doc/todo/use_secure_cookies_for_ssl_logins.mdwn b/doc/todo/use_secure_cookies_for_ssl_logins.mdwn
index a91a15b98..a7030d08c 100644
--- a/doc/todo/use_secure_cookies_for_ssl_logins.mdwn
+++ b/doc/todo/use_secure_cookies_for_ssl_logins.mdwn
@@ -10,3 +10,16 @@ This branch adds `sslcookie => 0, sslcookie_auto => 1` as an option; this
 uses the `HTTPS` environment variable, so if you log in over SSL you'll
 get a secure session cookie, but if you log in over HTTP, you won't.
 (The syntax for the setup file is pretty rubbish - any other suggestions?)
+
+> Does this need to be a configurable option at all? The behavior could
+> just be changed in the sslcookie = 0 case. It seems sorta reasonable
+> that, once I've logged in via https, I need to re-login if I then
+> switch to http.
+> 
+> And, if your change is made, the sslcookie option could probably itself
+> be dropped too -- at least I don't see a real use case for it if ikiwiki
+> is more paranoid about cookies by default.
+> 
+> Might be best to fix
+> [[todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both]]
+> first, so that dual https/http sites can better be set up. --[[Joey]]
-- 
cgit v1.2.3


From b3f7c6a9a579208f555a9ae7a409474d68897d04 Mon Sep 17 00:00:00 2001
From: Joey Hess 
Date: Mon, 29 Nov 2010 14:13:49 -0400
Subject: add news item for ikiwiki 3.20101129

---
 doc/news/version_3.20100915.mdwn | 28 ----------------------------
 doc/news/version_3.20101129.mdwn | 20 ++++++++++++++++++++
 2 files changed, 20 insertions(+), 28 deletions(-)
 delete mode 100644 doc/news/version_3.20100915.mdwn
 create mode 100644 doc/news/version_3.20101129.mdwn

(limited to 'doc')

diff --git a/doc/news/version_3.20100915.mdwn b/doc/news/version_3.20100915.mdwn
deleted file mode 100644
index 90c5cc37a..000000000
--- a/doc/news/version_3.20100915.mdwn
+++ /dev/null
@@ -1,28 +0,0 @@
-ikiwiki 3.20100915 released with [[!toggle text="these changes"]]
-[[!toggleable text="""
-   * needsbuild hook interface changed; the hooks should now return
-     the modified array of things that need built. (Backwards compatibility
-     code keeps plugins using the old interface working.)
-   * Remove PATH overriding code in ikiwiki script that was present to make
-     perl taint checking happy, but taint checking is disabled.
-   * teximg: Use Unicode UTF-8 encoding by default. Closes: #[596067](http://bugs.debian.org/596067)
-     Thanks, Paul Menzel.
-   * po: Make the po\_master\_language use a langpair like "en|English",
-     so it can be configured via the web.
-   * po: Allow enabling via web setup.
-   * po: Auto-upgrade old format settings to new formats when writing
-     setup file.
-   * Pass array of names of files that have been deleted to needsbuild hook
-     as second parameter, to allow for plugins that needs access to this
-     information earlier than the delete hook.
-   * actiontabs: Improve tab padding.
-   * blueview: Fix display of links to translated pages in the page header.
-   * Set isPermaLink="no" for guids in rss feeds.
-   * blogspam: Fix crash when content contained utf-8.
-   * external: Disable RPC::XML's "smart" encoding, which sent ints
-     for strings that contained only a number, fixing a longstanding crash
-     of the rst plugin.
-   * git: When updating from remote, use git pull --prune, to avoid possible
-     errors from conflicting obsolete remote branches.
-   * cutpaste: Fix bug that occured in some cases involving inlines when
-     text was pasted on a page before being cut."""]]
\ No newline at end of file
diff --git a/doc/news/version_3.20101129.mdwn b/doc/news/version_3.20101129.mdwn
new file mode 100644
index 000000000..366ad6e27
--- /dev/null
+++ b/doc/news/version_3.20101129.mdwn
@@ -0,0 +1,20 @@
+ikiwiki 3.20101129 released with [[!toggle text="these changes"]]
+[[!toggleable text="""
+   * websetup: Fix encoding problem when restoring old setup file.
+   * more: Add pages parameter to limit where the more is displayed.
+     (thanks, dark)
+   * Fix escaping of filenames in historyurl. (Thanks, aj)
+   * inline: Improve RSS url munging to use a proper html parser,
+     and support all elements that HTML::Tagset knows about.
+     (Which doesn't include html5 just yet, but then the old version
+     didn't either.) Bonus: 4 times faster than old regexp method.
+   * Optimise glob() pagespec. (Thanks, Kathryn and smcv)
+   * highlight: Support new format of filetypes.conf used by version 3.2
+     of the highlight package.
+   * edittemplate: Fix crash if using a .tmpl file or other non-page file
+     as a template for a new page.
+   * git: Fix temp file location.
+   * rename: Fix to pass named parameters to rcs\_commit.
+   * git: Avoid adding files when committing, so as not to implicitly add
+     files like recentchanges files that are not normally checked in,
+     when fixing links after rename."""]]
\ No newline at end of file
-- 
cgit v1.2.3


From f60f15704e1f98ceea023561c9e411b6fc3ac4ea Mon Sep 17 00:00:00 2001
From: Joey Hess 
Date: Mon, 29 Nov 2010 14:59:15 -0400
Subject: tweak urlto description

---
 doc/plugins/write.mdwn | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'doc')

diff --git a/doc/plugins/write.mdwn b/doc/plugins/write.mdwn
index 33db3e707..726ace8d3 100644
--- a/doc/plugins/write.mdwn
+++ b/doc/plugins/write.mdwn
@@ -988,9 +988,10 @@ Construct a relative url to the first parameter from the page named by the
 second. The first parameter can be either a page name, or some other
 destination file, as registered by `will_render`.
 
-If the second parameter is `undef`, the URL will be valid from any page on the
-wiki, or from the CGI; if possible it'll be a path starting with `/`, but an
-absolute URL will be used if the wiki and the CGI are on different servers.
+If the second parameter is `undef` (or not specified), the URL will be
+valid from any page on the wiki, or from the CGI; if possible it'll
+be a path starting with `/`, but an absolute URL will be used if
+the wiki and the CGI are on different domains.
 
 If the third parameter is passed and is true, an absolute url will be
 constructed instead of the default relative url.
-- 
cgit v1.2.3


From 53d466a07f542dca86732764ab4f13608d701a1c Mon Sep 17 00:00:00 2001
From: Joey Hess 
Date: Mon, 29 Nov 2010 14:59:48 -0400
Subject: second parameter of urlto is optional

---
 IkiWiki.pm             | 2 +-
 doc/plugins/write.mdwn | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'doc')

diff --git a/IkiWiki.pm b/IkiWiki.pm
index a893edb3b..97946bfcf 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -1134,7 +1134,7 @@ sub beautify_urlpath ($) {
 	return $url;
 }
 
-sub urlto ($$;$) {
+sub urlto ($;$$) {
 	my $to=shift;
 	my $from=shift;
 	my $absolute=shift;
diff --git a/doc/plugins/write.mdwn b/doc/plugins/write.mdwn
index 726ace8d3..ccdf9f393 100644
--- a/doc/plugins/write.mdwn
+++ b/doc/plugins/write.mdwn
@@ -982,7 +982,7 @@ This is the standard gettext function, although slightly optimised.
 
 This is the standard ngettext function, although slightly optimised.
 
-### `urlto($$;$)`
+### `urlto($;$$)`
 
 Construct a relative url to the first parameter from the page named by the
 second. The first parameter can be either a page name, or some other
-- 
cgit v1.2.3


From 141dc37d361107a6607b3ff549f107c26fa700d4 Mon Sep 17 00:00:00 2001
From: Joey Hess 
Date: Mon, 29 Nov 2010 15:00:22 -0400
Subject: merged localurl branch; changelog

---
 debian/changelog                                             | 12 ++++++++++++
 ...ki_using_http_or_https_in_urls_to_allow_serving_both.mdwn |  2 ++
 2 files changed, 14 insertions(+)

(limited to 'doc')

diff --git a/debian/changelog b/debian/changelog
index fd271dab1..ec995a08a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+ikiwiki (3.20101130) UNRELEASED; urgency=low
+
+  * Better support for serving the same site by both http and https.
+    Links generated by the CGI will now remain on https if it was accessed
+    via https.
+    (Thanks, smcv)
+  * API: urlto without a defined second parameter now generates an url
+    that starts with "/" (when possible; eg when the site's url and cgiurl
+    are on the same domain).
+
+ -- Joey Hess   Mon, 29 Nov 2010 14:44:13 -0400
+
 ikiwiki (3.20101129) unstable; urgency=low
 
   * websetup: Fix encoding problem when restoring old setup file.
diff --git a/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn b/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn
index 264eb9688..f7938b061 100644
--- a/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn
+++ b/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn
@@ -319,3 +319,5 @@ Potential future things:
   >> core code (IkiWiki, CGI, Render and the pseudo-core part of editpage)
   >> and 5 in plugins, since I used it for things like redirection back
   >> to the top of the wiki --[[smcv]]
+
+[[merged|done]] --[[Joey]] 
-- 
cgit v1.2.3


From 7c2252137a8eb59813ab7c253804de20c45219a9 Mon Sep 17 00:00:00 2001
From: Joey Hess 
Date: Mon, 29 Nov 2010 15:09:38 -0400
Subject: more tweaks to urlto documentation

---
 doc/plugins/write.mdwn | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'doc')

diff --git a/doc/plugins/write.mdwn b/doc/plugins/write.mdwn
index ccdf9f393..3cab7588e 100644
--- a/doc/plugins/write.mdwn
+++ b/doc/plugins/write.mdwn
@@ -1,4 +1,4 @@
-Ikiwiki's plugin interface allows all kinds of useful [[plugins]] to be
+lkiwiki's plugin interface allows all kinds of useful [[plugins]] to be
 written to extend ikiwiki in many ways. Despite the length of this page,
 it's not really hard. This page is a complete reference to everything a
 plugin might want to do. There is also a quick [[tutorial]].
@@ -988,13 +988,13 @@ Construct a relative url to the first parameter from the page named by the
 second. The first parameter can be either a page name, or some other
 destination file, as registered by `will_render`.
 
-If the second parameter is `undef` (or not specified), the URL will be
+If the second parameter is not specified (or `undef`), the URL will be
 valid from any page on the wiki, or from the CGI; if possible it'll
 be a path starting with `/`, but an absolute URL will be used if
 the wiki and the CGI are on different domains.
 
-If the third parameter is passed and is true, an absolute url will be
-constructed instead of the default relative url.
+If the third parameter is passed and is true, the url will be a fully
+absolute url. This is useful when generating an url to publish elsewhere.
 
 ### `newpagefile($$)`
 
-- 
cgit v1.2.3


From a1e221f31d279cdeb5e2431a398bd843a142a83c Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" 
Date: Mon, 29 Nov 2010 19:33:47 +0000
Subject: now with added simplicity

---
 doc/todo/use_secure_cookies_for_ssl_logins.mdwn | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

(limited to 'doc')

diff --git a/doc/todo/use_secure_cookies_for_ssl_logins.mdwn b/doc/todo/use_secure_cookies_for_ssl_logins.mdwn
index a7030d08c..f72b2d2d5 100644
--- a/doc/todo/use_secure_cookies_for_ssl_logins.mdwn
+++ b/doc/todo/use_secure_cookies_for_ssl_logins.mdwn
@@ -15,11 +15,20 @@ get a secure session cookie, but if you log in over HTTP, you won't.
 > just be changed in the sslcookie = 0 case. It seems sorta reasonable
 > that, once I've logged in via https, I need to re-login if I then
 > switch to http.
-> 
+
+>> Even better. I've amended the branch to have this behaviour, which
+>> turns it into a one-line patch. --[[smcv]]
+
 > And, if your change is made, the sslcookie option could probably itself
 > be dropped too -- at least I don't see a real use case for it if ikiwiki
 > is more paranoid about cookies by default.
-> 
+
+>> I haven't done that; it might make sense to do so, but I think it'd be
+>> better to leave it in as a safety-catch (or in case someone's
+>> using a webserver that doesn't put `$HTTPS` in the environment). --s
+
 > Might be best to fix
 > [[todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both]]
 > first, so that dual https/http sites can better be set up. --[[Joey]]
+
+>> Thanks for merging that! :-) --s
-- 
cgit v1.2.3


From 5f4f0b5bdd2d9f9bfaa55acf1fa02b1889281a60 Mon Sep 17 00:00:00 2001
From: Joey Hess 
Date: Mon, 29 Nov 2010 16:32:23 -0400
Subject: merged sslcookie-auto

---
 debian/changelog                                | 3 +++
 doc/todo/use_secure_cookies_for_ssl_logins.mdwn | 2 ++
 2 files changed, 5 insertions(+)

(limited to 'doc')

diff --git a/debian/changelog b/debian/changelog
index ec995a08a..82f9ece19 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,9 @@ ikiwiki (3.20101130) UNRELEASED; urgency=low
   * API: urlto without a defined second parameter now generates an url
     that starts with "/" (when possible; eg when the site's url and cgiurl
     are on the same domain).
+  * Now when users log in via https, ikiwiki sends a secure cookie, that can
+    only be used over https. If the user switches to using http, they will
+    need to re-login. (smcv)
 
  -- Joey Hess   Mon, 29 Nov 2010 14:44:13 -0400
 
diff --git a/doc/todo/use_secure_cookies_for_ssl_logins.mdwn b/doc/todo/use_secure_cookies_for_ssl_logins.mdwn
index f72b2d2d5..194db2f36 100644
--- a/doc/todo/use_secure_cookies_for_ssl_logins.mdwn
+++ b/doc/todo/use_secure_cookies_for_ssl_logins.mdwn
@@ -32,3 +32,5 @@ get a secure session cookie, but if you log in over HTTP, you won't.
 > first, so that dual https/http sites can better be set up. --[[Joey]]
 
 >> Thanks for merging that! :-) --s
+
+[[merged|done]] --[[Joey]] 
-- 
cgit v1.2.3


From 9abe516c2e52e7af941750f6e57727ad9b828f91 Mon Sep 17 00:00:00 2001
From: "http://joey.kitenet.net/" 
Date: Mon, 29 Nov 2010 20:39:37 +0000
Subject: Added a comment: use an inline directive

---
 .../comment_1_e989b18bade34a92a9c8fe7099036e15._comment     | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 doc/forum/How_to_list_new_pages__44___inline__63__/comment_1_e989b18bade34a92a9c8fe7099036e15._comment

(limited to 'doc')

diff --git a/doc/forum/How_to_list_new_pages__44___inline__63__/comment_1_e989b18bade34a92a9c8fe7099036e15._comment b/doc/forum/How_to_list_new_pages__44___inline__63__/comment_1_e989b18bade34a92a9c8fe7099036e15._comment
new file mode 100644
index 000000000..cf6f642d4
--- /dev/null
+++ b/doc/forum/How_to_list_new_pages__44___inline__63__/comment_1_e989b18bade34a92a9c8fe7099036e15._comment
@@ -0,0 +1,13 @@
+[[!comment format=mdwn
+ username="http://joey.kitenet.net/"
+ nickname="joey"
+ subject="use an inline directive"
+ date="2010-11-29T20:39:37Z"
+ content="""
+This is what the [[ikiwiki/directive/inline]] directive is for. It's often used, to for example, show new posts to a blog. If you want to show new posts to anywhere in your site, or whatever, you can configure the [[ikiwiki/PageSpec]] in it to do that, too. 
+
+For example, you could use this:
+
+    The most recent 3 pages added to this site:
+    \[[!inline pages=\"*\" archive=yes show=4]]
+"""]]
-- 
cgit v1.2.3


From 3941efc3d0d7949ab5b79a95cd33220c70b747fb Mon Sep 17 00:00:00 2001
From: "http://joey.kitenet.net/" 
Date: Mon, 29 Nov 2010 20:41:49 +0000
Subject: Added a comment

---
 .../comment_3_1ed260b0083a290688425a006a83f603._comment           | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 doc/forum/Need_something_more_powerful_than_Exclude/comment_3_1ed260b0083a290688425a006a83f603._comment

(limited to 'doc')

diff --git a/doc/forum/Need_something_more_powerful_than_Exclude/comment_3_1ed260b0083a290688425a006a83f603._comment b/doc/forum/Need_something_more_powerful_than_Exclude/comment_3_1ed260b0083a290688425a006a83f603._comment
new file mode 100644
index 000000000..8b93acd79
--- /dev/null
+++ b/doc/forum/Need_something_more_powerful_than_Exclude/comment_3_1ed260b0083a290688425a006a83f603._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="http://joey.kitenet.net/"
+ nickname="joey"
+ subject="comment 3"
+ date="2010-11-29T20:41:49Z"
+ content="""
+`%pagesources` gets nuked when you rebuild the whole wiki with eg, ikiwiki -setup or ikiwiki -rebuild. So you shouldn't normally need to remove the indexdb, just rebuild when making this sort of change that affects the whole site.
+"""]]
-- 
cgit v1.2.3


From 44942bfd84fbde3e03c03aceecdec959d5b6e93e Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 
Date: Tue, 30 Nov 2010 02:35:44 +0000
Subject: Added a comment

---
 .../comment_4_c39bdaf38e1e20db74eb26f0560bd673._comment        | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 doc/forum/Need_something_more_powerful_than_Exclude/comment_4_c39bdaf38e1e20db74eb26f0560bd673._comment

(limited to 'doc')

diff --git a/doc/forum/Need_something_more_powerful_than_Exclude/comment_4_c39bdaf38e1e20db74eb26f0560bd673._comment b/doc/forum/Need_something_more_powerful_than_Exclude/comment_4_c39bdaf38e1e20db74eb26f0560bd673._comment
new file mode 100644
index 000000000..15f1fecb8
--- /dev/null
+++ b/doc/forum/Need_something_more_powerful_than_Exclude/comment_4_c39bdaf38e1e20db74eb26f0560bd673._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="http://kerravonsen.dreamwidth.org/"
+ ip="60.241.8.244"
+ subject="comment 4"
+ date="2010-11-30T02:35:43Z"
+ content="""
+One would think that would be the case, yes, but for some reason it didn't work for me. 8-(
+
+[[KathrynAndersen]]
+"""]]
-- 
cgit v1.2.3


From ad5e9c0085a02bfcf9c33095881ec4f173aaed00 Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" 
Date: Thu, 2 Dec 2010 00:00:10 +0000
Subject: branch has reached usefulness

---
 doc/todo/transient_pages.mdwn | 38 +++++++++++++++++++++++++++++++++++++-
 1 file changed, 37 insertions(+), 1 deletion(-)

(limited to 'doc')

diff --git a/doc/todo/transient_pages.mdwn b/doc/todo/transient_pages.mdwn
index 9c1be7362..642114d97 100644
--- a/doc/todo/transient_pages.mdwn
+++ b/doc/todo/transient_pages.mdwn
@@ -21,9 +21,45 @@ content for the edit box; after that, it'd become a static page. --[[smcv]]
 
 --------------------------
 
-[[!template id=gitbranch branch=smcv/transient author="[[smcv]]"]]
+[[!template id=gitbranch branch=smcv/ready/transient author="[[smcv]]"]]
 [[!tag patch]]
 
+I think this branch is now enough to be useful. It adds the following:
+
+If the `transient` plugin is loaded, `$srcdir/.ikiwiki/transient` is added
+as an underlay.
+
+Pages with the default extension in the transient underlay are automatically
+deleted if a page of the same name is created in the srcdir (or an underlay
+closer to the srcdir in stacking order).
+
+`tag` enables `transient`, and if `tag_autocreate_commit` is set to 0
+(default 1), autocreated tags are written to the transient underlay.
+
+`autoindex` uses autofiles. It also enables `transient`, and if
+`autoindex_commit` is set to 0 (default 1), autoindexes are written to
+the transient underlay.
+
+autoindex ignores pages in the transient underlay when deciding whether
+to generate an index.
+
+Not done yet:
+
+`remove` can't remove transient pages: this turns out to be harder than
+I'd hoped, because I don't want to introduce a vulnerability in the
+non-regular-file detection...
+
+Transient tags that don't match any pages aren't deleted: I'm not sure
+that that's a good idea anyway, though. Similarly, transient autoindexes
+of directories that become empty aren't deleted.
+
+Recent changes and aggregated files could conceivably go in the transient
+underlay too.
+
+--------------------------
+
+## An earlier version
+
 I had a look at implementing this. It turns out to be harder than I thought
 to have purely in-memory pages (several plugins want to be able to access the
 source file as a file), but I did get this proof-of-concept branch
-- 
cgit v1.2.3


From dae4a144e7219ce596f9d96206176a3d1d1ad4a5 Mon Sep 17 00:00:00 2001
From: Joey Hess 
Date: Wed, 1 Dec 2010 20:35:26 -0400
Subject: add news item for ikiwiki 3.20101201

---
 doc/news/version_3.20100915.mdwn | 28 ----------------------------
 doc/news/version_3.20101201.mdwn |  5 +++++
 2 files changed, 5 insertions(+), 28 deletions(-)
 delete mode 100644 doc/news/version_3.20100915.mdwn
 create mode 100644 doc/news/version_3.20101201.mdwn

(limited to 'doc')

diff --git a/doc/news/version_3.20100915.mdwn b/doc/news/version_3.20100915.mdwn
deleted file mode 100644
index 90c5cc37a..000000000
--- a/doc/news/version_3.20100915.mdwn
+++ /dev/null
@@ -1,28 +0,0 @@
-ikiwiki 3.20100915 released with [[!toggle text="these changes"]]
-[[!toggleable text="""
-   * needsbuild hook interface changed; the hooks should now return
-     the modified array of things that need built. (Backwards compatibility
-     code keeps plugins using the old interface working.)
-   * Remove PATH overriding code in ikiwiki script that was present to make
-     perl taint checking happy, but taint checking is disabled.
-   * teximg: Use Unicode UTF-8 encoding by default. Closes: #[596067](http://bugs.debian.org/596067)
-     Thanks, Paul Menzel.
-   * po: Make the po\_master\_language use a langpair like "en|English",
-     so it can be configured via the web.
-   * po: Allow enabling via web setup.
-   * po: Auto-upgrade old format settings to new formats when writing
-     setup file.
-   * Pass array of names of files that have been deleted to needsbuild hook
-     as second parameter, to allow for plugins that needs access to this
-     information earlier than the delete hook.
-   * actiontabs: Improve tab padding.
-   * blueview: Fix display of links to translated pages in the page header.
-   * Set isPermaLink="no" for guids in rss feeds.
-   * blogspam: Fix crash when content contained utf-8.
-   * external: Disable RPC::XML's "smart" encoding, which sent ints
-     for strings that contained only a number, fixing a longstanding crash
-     of the rst plugin.
-   * git: When updating from remote, use git pull --prune, to avoid possible
-     errors from conflicting obsolete remote branches.
-   * cutpaste: Fix bug that occured in some cases involving inlines when
-     text was pasted on a page before being cut."""]]
\ No newline at end of file
diff --git a/doc/news/version_3.20101201.mdwn b/doc/news/version_3.20101201.mdwn
new file mode 100644
index 000000000..410640c75
--- /dev/null
+++ b/doc/news/version_3.20101201.mdwn
@@ -0,0 +1,5 @@
+ikiwiki 3.20101201 released with [[!toggle text="these changes"]]
+[[!toggleable text="""
+   * meta: Fix calling of htmlscrubber to pass the page parameter.
+     The change of the htmlscrubber to look at page rather than destpage
+     caused htmlscrubber\_skip to not work for meta directives."""]]
\ No newline at end of file
-- 
cgit v1.2.3


From 9b6e881f884de4a813f11582909a61e6cdff705c Mon Sep 17 00:00:00 2001
From: "http://christian.amsuess.com/chrysn" 
Date: Fri, 3 Dec 2010 12:59:53 +0000
Subject: prevent my name from having that ugly question mark in front of it

---
 doc/users/chrysn.mdwn | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 doc/users/chrysn.mdwn

(limited to 'doc')

diff --git a/doc/users/chrysn.mdwn b/doc/users/chrysn.mdwn
new file mode 100644
index 000000000..0daa3b2b9
--- /dev/null
+++ b/doc/users/chrysn.mdwn
@@ -0,0 +1,4 @@
+* **name**: chrysn
+* **website**: 
+* **uses ikiwiki for**: a bunch of internal documentation / organization projects
+* **likes ikiwiki because**: it is a distributed organization tool that pretends to be a web app for the non-programmers out there
-- 
cgit v1.2.3


From a016d965ae518f85ed0f940d194a14f541257186 Mon Sep 17 00:00:00 2001
From: "http://jmtd.livejournal.com/" 
Date: Sun, 5 Dec 2010 13:25:56 +0000
Subject: is this paws-ible?

---
 .../how_can_I_use___39____47____39___as_tagbase__63__.mdwn  | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 doc/forum/how_can_I_use___39____47____39___as_tagbase__63__.mdwn

(limited to 'doc')

diff --git a/doc/forum/how_can_I_use___39____47____39___as_tagbase__63__.mdwn b/doc/forum/how_can_I_use___39____47____39___as_tagbase__63__.mdwn
new file mode 100644
index 000000000..c7cd7efa8
--- /dev/null
+++ b/doc/forum/how_can_I_use___39____47____39___as_tagbase__63__.mdwn
@@ -0,0 +1,13 @@
+I'd like tags to be top-level pages, like /some-tag.
+
+I achieve this most of the time by *not* defining `tagbase`.
+
+However, this goes wrong if the name of a tag matches the name of a page further down a tree.
+
+Example:
+
+ * tag scm, corresponding page /scm
+ * a page /log/scm tagged 'scm' does not link to /scm
+ * a page /log/puppet tagged 'scm' does not link to /scm
+
+Is this possible, or am I pushing tags too far (again)? -- [[Jon]]
-- 
cgit v1.2.3


From 50a88d2399ca15c3976d59be5c1a6cac1dafe60c Mon Sep 17 00:00:00 2001
From: "http://jmtd.livejournal.com/" 
Date: Sun, 5 Dec 2010 13:27:09 +0000
Subject:

---
 doc/forum/how_can_I_use___39____47____39___as_tagbase__63__.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'doc')

diff --git a/doc/forum/how_can_I_use___39____47____39___as_tagbase__63__.mdwn b/doc/forum/how_can_I_use___39____47____39___as_tagbase__63__.mdwn
index c7cd7efa8..8a24152dc 100644
--- a/doc/forum/how_can_I_use___39____47____39___as_tagbase__63__.mdwn
+++ b/doc/forum/how_can_I_use___39____47____39___as_tagbase__63__.mdwn
@@ -8,6 +8,6 @@ Example:
 
  * tag scm, corresponding page /scm
  * a page /log/scm tagged 'scm' does not link to /scm
- * a page /log/puppet tagged 'scm' does not link to /scm
+ * a page /log/puppet tagged 'scm' links to /log/scm in the Tags: section
 
 Is this possible, or am I pushing tags too far (again)? -- [[Jon]]
-- 
cgit v1.2.3


From b297f76f14471d7a6e1ad265357d7a788609c4c3 Mon Sep 17 00:00:00 2001
From: 
 "https://www.google.com/accounts/o8/id?id=AItOawlcaGfdn9Kye1Gc8aGb67PDVQW4mKbQD7E"
 
Date: Sun, 5 Dec 2010 17:26:45 +0000
Subject: ping for review

---
 doc/plugins/aggregate/discussion.mdwn | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'doc')

diff --git a/doc/plugins/aggregate/discussion.mdwn b/doc/plugins/aggregate/discussion.mdwn
index 77005a6a1..6e6c23e61 100644
--- a/doc/plugins/aggregate/discussion.mdwn
+++ b/doc/plugins/aggregate/discussion.mdwn
@@ -116,3 +116,5 @@ with some cookies. What I've done is write a custom plugin to populate
 It works, but I have to remember to apply the diff whenever I update
 ikiwiki.  Can you provide a more elegant means of allowing cookies and/or
 the user agent to be programmatically manipulated? --[[schmonz]]
+
+> Ping -- is the above patch perhaps acceptable (or near-acceptable)? -- [[schmonz]]
-- 
cgit v1.2.3


From 103996f209929d862d69fd6f999967dcdf5db7be Mon Sep 17 00:00:00 2001
From: "http://xlogon.net/bacuh" 
Date: Sun, 5 Dec 2010 20:10:32 +0000
Subject:

---
 doc/forum/using_l10n__39__d_basewiki.mdwn | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 doc/forum/using_l10n__39__d_basewiki.mdwn

(limited to 'doc')

diff --git a/doc/forum/using_l10n__39__d_basewiki.mdwn b/doc/forum/using_l10n__39__d_basewiki.mdwn
new file mode 100644
index 000000000..a361d18c9
--- /dev/null
+++ b/doc/forum/using_l10n__39__d_basewiki.mdwn
@@ -0,0 +1,7 @@
+Hey there!
+
+I'm trying to get the translated version of basewiki activated in my wiki. Setting "locale => 'de_DE.UTF-8'" gave me some german messages on the CLI and a few changes in the wiki itself but the basewiki is still english. The files in /usr/share/ikiwiki/po/de/ are there.
+
+As I understand, [[plugins/po]] is just for translating.
+
+So, what am I doing wrong? 
-- 
cgit v1.2.3


From 6461bad3839cd35c623216b65fc41e1572115cf4 Mon Sep 17 00:00:00 2001
From: "http://joey.kitenet.net/" 
Date: Sun, 5 Dec 2010 20:12:17 +0000
Subject: Added a comment

---
 .../comment_1_eaab671848ee6129f6fe9399474eeac0._comment           | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 doc/forum/using_l10n__39__d_basewiki/comment_1_eaab671848ee6129f6fe9399474eeac0._comment

(limited to 'doc')

diff --git a/doc/forum/using_l10n__39__d_basewiki/comment_1_eaab671848ee6129f6fe9399474eeac0._comment b/doc/forum/using_l10n__39__d_basewiki/comment_1_eaab671848ee6129f6fe9399474eeac0._comment
new file mode 100644
index 000000000..1f21b485b
--- /dev/null
+++ b/doc/forum/using_l10n__39__d_basewiki/comment_1_eaab671848ee6129f6fe9399474eeac0._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="http://joey.kitenet.net/"
+ nickname="joey"
+ subject="comment 1"
+ date="2010-12-05T20:12:17Z"
+ content="""
+The translated basewiki depends on the po plugin being enabled and configured with the language(s) to use.
+"""]]
-- 
cgit v1.2.3


From abd4ec558efc12efe4286237d6a2f22f15e79ad4 Mon Sep 17 00:00:00 2001
From: "http://joey.kitenet.net/" 
Date: Sun, 5 Dec 2010 20:15:28 +0000
Subject: Added a comment

---
 .../comment_1_e7897651ba8d9156526d36d6b7744eae._comment           | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 doc/forum/how_can_I_use___39____47____39___as_tagbase__63__/comment_1_e7897651ba8d9156526d36d6b7744eae._comment

(limited to 'doc')

diff --git a/doc/forum/how_can_I_use___39____47____39___as_tagbase__63__/comment_1_e7897651ba8d9156526d36d6b7744eae._comment b/doc/forum/how_can_I_use___39____47____39___as_tagbase__63__/comment_1_e7897651ba8d9156526d36d6b7744eae._comment
new file mode 100644
index 000000000..361c51b09
--- /dev/null
+++ b/doc/forum/how_can_I_use___39____47____39___as_tagbase__63__/comment_1_e7897651ba8d9156526d36d6b7744eae._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="http://joey.kitenet.net/"
+ nickname="joey"
+ subject="comment 1"
+ date="2010-12-05T20:15:28Z"
+ content="""
+From the code, it seems to me like setting tagbase to \"/\" would actually do what you want. Does it not work?
+"""]]
-- 
cgit v1.2.3


From a863ecdb0f9e90337833ee3fe3f85313f7621dc6 Mon Sep 17 00:00:00 2001
From: "http://xlogon.net/bacuh" 
Date: Sun, 5 Dec 2010 22:48:53 +0000
Subject: Added a comment

---
 .../comment_2_d907676a1db1210ca59506673c564359._comment        | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 doc/forum/using_l10n__39__d_basewiki/comment_2_d907676a1db1210ca59506673c564359._comment

(limited to 'doc')

diff --git a/doc/forum/using_l10n__39__d_basewiki/comment_2_d907676a1db1210ca59506673c564359._comment b/doc/forum/using_l10n__39__d_basewiki/comment_2_d907676a1db1210ca59506673c564359._comment
new file mode 100644
index 000000000..c8d1e4e04
--- /dev/null
+++ b/doc/forum/using_l10n__39__d_basewiki/comment_2_d907676a1db1210ca59506673c564359._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="http://xlogon.net/bacuh"
+ ip="93.182.190.4"
+ subject="comment 2"
+ date="2010-12-05T22:48:53Z"
+ content="""
+This works, thanks.
+
+But is there also a way to get \"Edit\" etc. and the buttons behind it translated?
+"""]]
-- 
cgit v1.2.3


From e0b58215f7fdf64ff3e888a5402b22e89081091a Mon Sep 17 00:00:00 2001
From: "http://joey.kitenet.net/" 
Date: Sun, 5 Dec 2010 22:53:12 +0000
Subject: Added a comment

---
 .../comment_3_5e9d5bc5ecaf63f9bfe3315b09a279aa._comment        | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 doc/forum/using_l10n__39__d_basewiki/comment_3_5e9d5bc5ecaf63f9bfe3315b09a279aa._comment

(limited to 'doc')

diff --git a/doc/forum/using_l10n__39__d_basewiki/comment_3_5e9d5bc5ecaf63f9bfe3315b09a279aa._comment b/doc/forum/using_l10n__39__d_basewiki/comment_3_5e9d5bc5ecaf63f9bfe3315b09a279aa._comment
new file mode 100644
index 000000000..f72bb37af
--- /dev/null
+++ b/doc/forum/using_l10n__39__d_basewiki/comment_3_5e9d5bc5ecaf63f9bfe3315b09a279aa._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="http://joey.kitenet.net/"
+ nickname="joey"
+ subject="comment 3"
+ date="2010-12-05T22:53:12Z"
+ content="""
+That requires translating the templates, which has never quite been finished. [[todo/l10n]] discusses that.
+
+(You can edit the templates yourself of course and manually translate.)
+"""]]
-- 
cgit v1.2.3


From 3f4ec334df4cc2c169edfbcef3fa530cbae0d7f1 Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 
Date: Mon, 6 Dec 2010 02:02:30 +0000
Subject: updating the docs in keeping with latest version - multi-page reports

---
 .../contrib/report/ikiwiki/directive/report.mdwn   | 24 +++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

(limited to 'doc')

diff --git a/doc/plugins/contrib/report/ikiwiki/directive/report.mdwn b/doc/plugins/contrib/report/ikiwiki/directive/report.mdwn
index 8f8e6b4e8..df88b33ad 100644
--- a/doc/plugins/contrib/report/ikiwiki/directive/report.mdwn
+++ b/doc/plugins/contrib/report/ikiwiki/directive/report.mdwn
@@ -30,6 +30,11 @@ them work as wiki pages.
 
 **pages**: A PageSpec to determine the pages to report on.
 
+**pagenames**: If given instead of pages, this is interpreted as a
+space-separated list of links to pages, and they are shown in exactly the order
+given: the sort and pages parameters cannot be used in conjunction with this
+one.  If they are used, they will be ignored.
+
 **trail**: A page or pages to use as a "trail" page.
 
 When a trail page is used, the matching pages are limited to (a subset
@@ -45,6 +50,11 @@ For example:
 This will take the links from both the "animals/cats" page and the
 "animals/dogs" page as the set of pages to apply the PageSpec to.
 
+**start**: Start the report at the given page-index; the index starts
+from zero.
+
+**count**: Report only on N pages where count=N.
+
 **sort**: A SortSpec to determine how the matching pages should be sorted.
 
 **here_only**: Report on the current page only.
@@ -86,7 +96,19 @@ The "mood_summary" template might be like this:
     ### 
     () \[[]]
     
-    
+ 
+### Multi-page Reports
+
+Reports can now be split over multiple pages, so that there aren't
+too many items per report-page.
+
+**per_page**: how many items to show per report-page.
+
+**first_page_is_index**: If true, the first page of the report is just
+an index which contains links to the other report pages.
+If false, the first page will contain report-content as well as links
+to the other pages.
+
 ### Advanced Options
 
 The following options are used to improve efficiency when dealing
-- 
cgit v1.2.3


From 20df2ee6fe0b9cbde72f47193ede4ac7f971d617 Mon Sep 17 00:00:00 2001
From: Giuseppe Bilotta 
Date: Mon, 6 Dec 2010 14:06:37 +0100
Subject: Some comments on fields namespacing

---
 doc/plugins/contrib/field/discussion.mdwn | 45 +++++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)

(limited to 'doc')

diff --git a/doc/plugins/contrib/field/discussion.mdwn b/doc/plugins/contrib/field/discussion.mdwn
index 191f8b27d..80d0b2b71 100644
--- a/doc/plugins/contrib/field/discussion.mdwn
+++ b/doc/plugins/contrib/field/discussion.mdwn
@@ -327,6 +327,51 @@ smcv's discuission of field author vs meta author above. --[[Joey]]
 
 -----
 
+I think the main point is: what is (or should be) the main point of the
+field plugin? If it's essentially a way to present a consistent
+interface to access page-related structured information, then it makes
+sense to have it very general. Plugins registering with fields would
+then present ways for recovering the structure information from the page
+(`ymlfront`, `meta`, etc),  ways to manipulate it (like `meta` does),
+etc.
+
+In this sense, security should be entirely up to the plugins, although
+the fields plugin could provide some auxiliary infrastructure (like
+determining where the data comes from and raise or lower the security
+level accoringly).
+
+Namespacing is important, and it should be considered at the field
+plugin interface level. A plugin should be able to register as
+responsible for the processing of all data belonging to a given
+namespace, but plugins should be able to set data in any namespace. So
+for example, `meta` register are `meta` fields processing, and whatever
+method is used to set the data (`meta` directive, `ymlfront`, etc) it
+gets a say on what to do with data in its namespace.
+
+What I'm thinking of is something you could call fieldsets. The nice
+thing about them is that, aside from the ones defined by plugins (like
+`meta`), it would be possible to define custom ones (with a generic,
+default processor) in an appropriate file (like smileys and shortcuts)
+with a syntax like:
+
+    [[!fieldset book namespace=book
+       fields="author title isbn"
+       fieldtype="text text text"]]
+
+after which, you coude use
+
+    [[!book author="A. U. Thor"
+            title="Fields of Iki"]]
+
+and the data would be available under the book namespace, and thus
+as BOOK_AUTHOR, BOOK_TITLE etc in templates.
+
+Security, in this sense, would be up to the plugin responsible for the
+namespace processing (the default handler would HTML-escape text fields
+scrub, html fields, safeurl()ify url fields, etc.)
+
+-----
+
 I was just looking at HTML5 and wondered if the field plugin should generate the new Microdata tags (as well as the internal structures)?  -- [[Will]]
 
 > This could just as easily be done as a separate plugin.  Feel free to do so. --[[KathrynAndersen]]
-- 
cgit v1.2.3


From 449db24c671c485aaa97b2212f29ed1ab3bb0487 Mon Sep 17 00:00:00 2001
From: jeremyb 
Date: Mon, 6 Dec 2010 21:52:11 +0000
Subject: test

---
 doc/sandbox.mdwn | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'doc')

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index df9d688b8..07191eb4f 100644
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -57,6 +57,8 @@ Bulleted list
 * [GNU](http://www.gnu.org/)
 * Joey's blog
 
+testing 123
+
 ----
 
 This **SandBox** is also a [[blog]]!
-- 
cgit v1.2.3


From f8555c9ae1868e0f8ec4861826965ebd003740b8 Mon Sep 17 00:00:00 2001
From: intrigeri 
Date: Tue, 7 Dec 2010 11:35:32 +0100
Subject: Replying.

---
 doc/todo/mirrorlist_with_per-mirror_usedirs_settings.mdwn | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'doc')

diff --git a/doc/todo/mirrorlist_with_per-mirror_usedirs_settings.mdwn b/doc/todo/mirrorlist_with_per-mirror_usedirs_settings.mdwn
index 484f85cbb..d40be0b08 100644
--- a/doc/todo/mirrorlist_with_per-mirror_usedirs_settings.mdwn
+++ b/doc/todo/mirrorlist_with_per-mirror_usedirs_settings.mdwn
@@ -48,3 +48,14 @@ and decided this time it was really needed to implement this feature.
 >>      $untainted{$key} = possibly_foolish_untaint($tainted->{key});
 >>
 >> --[[smcv]]
+
+>>> You are fully right about the complex `$config` entries. I'll
+>>> convert this to use what you are suggesting, i.e. what we ended up
+>>> choosing for the `po_slave_languages` setting.
+>>>
+>>> About the merges in this branch: Joey told me once he did not care
+>>> about this; moreover the `--no-merges` git log option makes it
+>>> easy to filter these out. I'll try merging tagged releases only in
+>>> the future, though.
+>>>
+>>> --[[intrigeri]]
-- 
cgit v1.2.3


From b852ca8133cc175230799e9844633f46cd439dec Mon Sep 17 00:00:00 2001
From: "https://mukund.startssl.com/" 
Date: Tue, 7 Dec 2010 16:03:52 +0000
Subject: Update Banu link and add description of use

---
 doc/ikiwikiusers.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'doc')

diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn
index 699eeda7d..645e9538c 100644
--- a/doc/ikiwikiusers.mdwn
+++ b/doc/ikiwikiusers.mdwn
@@ -60,7 +60,7 @@ Projects & Organizations
 * [Serialist](http://serialist.net/)'s static pages (documentation, blog).  We actually have ikiwiki generate its static content as HTML fragments using a modified page.tmpl template, and then the FastCGI powering our site grabs those fragments and embeds them in the standard dynamic site template.
 * [Apua IT](http://apua.se/)
 * [PDFpirate Community](http://community.pdfpirate.org/)
-* [Banu](https://www.banu.com/)
+* [Banu](https://banu.com/) uses Ikiwiki for its website, to convert static Markdown pages into PHP scripts which are served along with non-Ikiwiki PHP generated contents. The static contents benefit from use of Ikiwiki's plugins. Ikiwiki is purely used as a CMS and no wiki or web-based editing is allowed. Ikiwiki is run offline, and the resulting scripts are uploaded using rsync to the website.
 
 Personal sites and blogs
 ========================
-- 
cgit v1.2.3


From 5d6c604bdc03d5009378273cb4e465319dff4b58 Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 
Date: Wed, 8 Dec 2010 03:12:35 +0000
Subject: namespaces are othogonal to the issue of security

---
 doc/plugins/contrib/field/discussion.mdwn | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'doc')

diff --git a/doc/plugins/contrib/field/discussion.mdwn b/doc/plugins/contrib/field/discussion.mdwn
index 80d0b2b71..cd479263a 100644
--- a/doc/plugins/contrib/field/discussion.mdwn
+++ b/doc/plugins/contrib/field/discussion.mdwn
@@ -370,6 +370,18 @@ Security, in this sense, would be up to the plugin responsible for the
 namespace processing (the default handler would HTML-escape text fields
 scrub, html fields, safeurl()ify url fields, etc.)
 
+> So, are you saying that getting a field value is sort of a two-stage process?  Get the value from anywhere, and then call the "security processor" for that namespace to "secure" the value?  I think "namespaces" are really orthogonal to this issue.  What the issue seems to be is:
+
+   * what form do we expect the raw field to be in? (text, URL, HTML)
+   * what form do we expect the "secured" output to be in? (raw HTML, scrubbed HTML, escaped HTML, URL)
+
+> Only if we know both these things will we know what sort of security processing needs to be done.
+> There is also a difference between field values that are used inside pagetemplate, and field values which are used as part of a page's content (e.g. with ftemplate).  If you have a TITLE, you want it to be HTML-escaped if you're using it inside pagetemplate, but you don't want it to be HTML-escaped if you're using it inside a page's content.  On the other hand, if you have, say, FEEDLINKS used inside pagetemplate, you don't wish it to be HTML-escaped at all, or your page content will be completely stuffed.
+
+> So, somehow, we have to know the meaning of a field before we can use it properly, which kind of goes against the idea of having something generic.
+
+> --[[KathrynAndersen]]
+
 -----
 
 I was just looking at HTML5 and wondered if the field plugin should generate the new Microdata tags (as well as the internal structures)?  -- [[Will]]
-- 
cgit v1.2.3


From 99d74b3d6aaf464ffc35ca6504623b547fa340e6 Mon Sep 17 00:00:00 2001
From: Joey Hess 
Date: Sat, 11 Dec 2010 14:48:52 -0400
Subject: add themes page and remove actiontabs.css from css_market since it is
 a theme

---
 doc/css_market.mdwn             |  12 ++--
 doc/css_market/actiontabs.css   | 122 ----------------------------------------
 doc/plugins/theme.mdwn          |   7 +--
 doc/themes.mdwn                 |  16 ++++++
 doc/themes/actiontabs_small.png | Bin 0 -> 19202 bytes
 doc/themes/blueview_small.png   | Bin 0 -> 18543 bytes
 doc/themes/none_small.png       | Bin 0 -> 18516 bytes
 7 files changed, 23 insertions(+), 134 deletions(-)
 delete mode 100644 doc/css_market/actiontabs.css
 create mode 100644 doc/themes.mdwn
 create mode 100644 doc/themes/actiontabs_small.png
 create mode 100644 doc/themes/blueview_small.png
 create mode 100644 doc/themes/none_small.png

(limited to 'doc')

diff --git a/doc/css_market.mdwn b/doc/css_market.mdwn
index c167388a7..1838b2f60 100644
--- a/doc/css_market.mdwn
+++ b/doc/css_market.mdwn
@@ -4,9 +4,11 @@ User contributed stylesheet files for ikiwiki. Unless otherwise noted,
 these style sheets can be installed by copying them into your wiki's source
 dir with a filename of `local.css`.
 
+Some of stylesheets have developed into fullfledged [[themes]] that are
+included in ikiwiki for easy use.
+
 Feel free to add your own stylesheets here. (Upload as wiki pages; wiki
-gnomes will convert them to css files..) Selected ones from here are
-included in the [[theme_plugin|plugins/theme]].
+gnomes will convert them to css files..)
 
 * **[[css_market/zack.css]]**, contributed by [[StefanoZacchiroli]],
   customized mostly for *blogging purposes*, can be seen in action on 
@@ -46,15 +48,11 @@ included in the [[theme_plugin|plugins/theme]].
 
 * **[contraste.css][4]**, contributed by [[Blanko]]. Can be seen on [Contraste Demo][5]. Local.css and templates available [here][6].
 
-* **[[css_market/actiontabs.css]]**, contributed by [[svend]]. This style sheet displays
-  the action list (Edit, RecentChanges, etc.) as tabs. This is in use at [branchable](http://www.branchable.com/).
-  [[!meta stylesheet="actiontabs"]]
-
 * **[wiki.css](http://cyborginstitute.net/includes/wiki.css)** by [[tychoish]]. 
   I typically throw this in as `local.css` in new wikis as a slightly more clear and readable
   layout for wikis that need to be functional and elegant, but not necessarily uniquely designed. 
   Currently in use by the [the outeralliance wiki](http://oa.criticalfutures.com/). 
-  
+ 
 
 If your web browser allows selecting between multiple stylesheets, this
 page can be viewed using many of the stylesheets above. For example, if
diff --git a/doc/css_market/actiontabs.css b/doc/css_market/actiontabs.css
deleted file mode 100644
index a1dc47e92..000000000
--- a/doc/css_market/actiontabs.css
+++ /dev/null
@@ -1,122 +0,0 @@
-/* ikiwiki local style sheet */
-
-/* Add local styling here, instead of modifying style.css. */
-
-a {
-	text-decoration: none;
-	color: #005a9c;
-}
-
-a:hover {
-	text-decoration: underline;
-}
-
-
-hr {
-	border-style: none;
-	background-color: #999;
-	height: 1px;
-}
-
-code, pre {
-    background: #eee;
-}
-
-pre {
-    padding: .5em;
-}
-
-body {
-	margin: 0;
-	padding: 0;
-	font-family: sans-serif;
-	color: black;
-	background: white;
-}
-
-.pageheader {
-	margin: 0;
-	padding: 1em 2em 0 2em;
-	background: #eee;
-	border-color: #999;
-	border-style: none none solid none;
-	border-width: 1px;
-}
-
-.header {
-	font-size: 100%;
-	font-weight: normal;
-}
-
-.title {
-	display: block;
-	margin-top: .2em;
-	font: 140% sans-serif;
-	text-transform: capitalize;
-}
-
-.actions {
-	text-align: right;
-	padding: 0;
-}
-
-#content, #comments, #footer {
-  	margin: 1em 2em;
-}
-
-#pageinfo {
-	border-color: #999;
-}
-
-.inlinepage {
-	margin: .4em 0;
-	padding: .4em 0;
-	border-style: none;
-	border-top: 1px solid #aaa;
-}
-
-.inlineheader {
-	font-size: 120%;
-	font-weight: normal;
-}
-
-h1 { font: 120% sans-serif }
-h2 { font: bold 100% sans-serif }
-h3 { font: italic 100% sans-serif }
-h4, h5, h6 { font: small-caps 100% sans-serif }
-
-/* Smaller headings for inline pages */
-.inlinepage h1 { font-size: 110% }
-.inlinepage h2 { font-size: 100% }
-.inlinepage h3 { font-size: 100% }
-
-.pageheader .actions ul {
-	border-style: none
-}
-
-.actions ul {
-	font-size: 75%;
-	padding: 0;
-	border-style: none;
-}
-
-.actions ul li a {
-	text-decoration: none;
-}
-
-.actions ul li {
-	margin: 0;
-	padding: .1em .5em 0 .5em;
-	background: white;
-	border-color: #999;
-	border-style: solid solid none solid;
-	border-width: 1px;
-}
-
-div.recentchanges {
-	border-style: none;
-}
-
-.pagecloud {
-	width: auto;
-}
diff --git a/doc/plugins/theme.mdwn b/doc/plugins/theme.mdwn
index 2622abc88..ebbb0be8e 100644
--- a/doc/plugins/theme.mdwn
+++ b/doc/plugins/theme.mdwn
@@ -4,11 +4,8 @@
 The theme plugin allows easily applying a theme to your wiki, by
 configuring the `theme` setting in the setup file with the name of a theme
 to use. The themes you can choose from are all subdirectories, typically
-inside `/usr/share/ikiwiki/themes/`.
-
-A theme provides, via the underlay, an enhanced version of the regular
-[[style.css]]. This leaves [[local.css]] free for you to further
-customise. Themes can also provide header and background images.
+inside `/usr/share/ikiwiki/themes/`. See [[themes]] for an overview
+of the themes included in ikiwiki.
 
 You can set the theme via the **theme** option in your config file (after
 enabling the plugin). Refresh the wiki after changing it to see the changes.
diff --git a/doc/themes.mdwn b/doc/themes.mdwn
new file mode 100644
index 000000000..daa38cd44
--- /dev/null
+++ b/doc/themes.mdwn
@@ -0,0 +1,16 @@
+Ikiwiki now comes with several themes contributed by users.
+You can enable the [[theme_plugin|plugins/theme]] to use any of these.
+
+A theme provides, via the underlay, an enhanced version of the regular
+[[style.css]]. This leaves [[local.css]] free for you to further
+customise. Themes can also provide header and background images.
+
+[[!img align=left actiontabs_small.png]] The actiontabs theme, contributed by
+[[svend]]. This style sheet displays the action list
+(Edit, RecentChanges, etc.) as tabs.
+
+[[!img align=left blueview_small.png]] The blueview theme, contributed by
+[[BerndZeimetz]], featuring a panorama photo he took.
+
+[[!img align=left none_small.png]] For completeness, ikiwiki's default
+anti-theme.
diff --git a/doc/themes/actiontabs_small.png b/doc/themes/actiontabs_small.png
new file mode 100644
index 000000000..4b05ad3dc
Binary files /dev/null and b/doc/themes/actiontabs_small.png differ
diff --git a/doc/themes/blueview_small.png b/doc/themes/blueview_small.png
new file mode 100644
index 000000000..74972c4c3
Binary files /dev/null and b/doc/themes/blueview_small.png differ
diff --git a/doc/themes/none_small.png b/doc/themes/none_small.png
new file mode 100644
index 000000000..8272ae606
Binary files /dev/null and b/doc/themes/none_small.png differ
-- 
cgit v1.2.3


From f7ff06074e8dabb9ca068308688989c1005096bf Mon Sep 17 00:00:00 2001
From: Joey Hess 
Date: Sat, 11 Dec 2010 14:50:53 -0400
Subject: tweak

---
 doc/themes.mdwn                         |  12 ++++++------
 themes/goldtype/background_darkness.png | Bin 0 -> 165 bytes
 themes/goldtype/base.css                |   1 +
 themes/goldtype/header_background.png   | Bin 0 -> 196261 bytes
 themes/goldtype/style.css               |  23 +++++++++++++++++++++++
 5 files changed, 30 insertions(+), 6 deletions(-)
 create mode 100644 themes/goldtype/background_darkness.png
 create mode 120000 themes/goldtype/base.css
 create mode 100644 themes/goldtype/header_background.png
 create mode 100644 themes/goldtype/style.css

(limited to 'doc')

diff --git a/doc/themes.mdwn b/doc/themes.mdwn
index daa38cd44..d8ce3a812 100644
--- a/doc/themes.mdwn
+++ b/doc/themes.mdwn
@@ -1,16 +1,16 @@
-Ikiwiki now comes with several themes contributed by users.
-You can enable the [[theme_plugin|plugins/theme]] to use any of these.
-
 A theme provides, via the underlay, an enhanced version of the regular
 [[style.css]]. This leaves [[local.css]] free for you to further
 customise. Themes can also provide header and background images.
 
-[[!img align=left actiontabs_small.png]] The actiontabs theme, contributed by
+Ikiwiki now comes with several themes contributed by users.
+You can enable the [[theme_plugin|plugins/theme]] to use any of these:
+
+[[!img actiontabs_small.png align=left]] The actiontabs theme, contributed by
 [[svend]]. This style sheet displays the action list
 (Edit, RecentChanges, etc.) as tabs.
 
-[[!img align=left blueview_small.png]] The blueview theme, contributed by
+[[!img blueview_small.png align=left]] The blueview theme, contributed by
 [[BerndZeimetz]], featuring a panorama photo he took.
 
-[[!img align=left none_small.png]] For completeness, ikiwiki's default
+[[!img none_small.png align=left]] For completeness, ikiwiki's default
 anti-theme.
diff --git a/themes/goldtype/background_darkness.png b/themes/goldtype/background_darkness.png
new file mode 100644
index 000000000..0a1cb4e9e
Binary files /dev/null and b/themes/goldtype/background_darkness.png differ
diff --git a/themes/goldtype/base.css b/themes/goldtype/base.css
new file mode 120000
index 000000000..d9318772d
--- /dev/null
+++ b/themes/goldtype/base.css
@@ -0,0 +1 @@
+../blueview/style.css
\ No newline at end of file
diff --git a/themes/goldtype/header_background.png b/themes/goldtype/header_background.png
new file mode 100644
index 000000000..50b11dd23
Binary files /dev/null and b/themes/goldtype/header_background.png differ
diff --git a/themes/goldtype/style.css b/themes/goldtype/style.css
new file mode 100644
index 000000000..9c217c746
--- /dev/null
+++ b/themes/goldtype/style.css
@@ -0,0 +1,23 @@
+/*
+ * goldtype theme for ikiwiki
+ */
+
+.pageheader {
+	background-repeat: no-repeat;
+	background-color: #f2d98d;
+	padding: 0;
+	padding-right: 1em;
+	margin-bottom: 2em;
+}
+
+html, body {
+	background-color: #f2d98d;
+}
+
+#content a:hover, #comments a:hover, .sidebar a:hover,
+#content a:visited:hover, #comments a:visited:hover, .sidebar a:visited:hover {
+    color: red;
+}
+#content a:visited, #comments a:visited, .sidebar a:visited {
+    color: #37485e;
+}
-- 
cgit v1.2.3


From 526cfc50450ca5811c7ef474a15c484aeac8d786 Mon Sep 17 00:00:00 2001
From: Joey Hess 
Date: Sat, 11 Dec 2010 14:52:56 -0400
Subject: layout

---
 doc/themes.mdwn | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'doc')

diff --git a/doc/themes.mdwn b/doc/themes.mdwn
index d8ce3a812..b934fc776 100644
--- a/doc/themes.mdwn
+++ b/doc/themes.mdwn
@@ -9,8 +9,14 @@ You can enable the [[theme_plugin|plugins/theme]] to use any of these:
 [[svend]]. This style sheet displays the action list
 (Edit, RecentChanges, etc.) as tabs.
 
+

+
 [[!img blueview_small.png align=left]] The blueview theme, contributed by
 [[BerndZeimetz]], featuring a panorama photo he took.
 
+

+
 [[!img none_small.png align=left]] For completeness, ikiwiki's default
 anti-theme.
+
+

-- 
cgit v1.2.3


From 042a81cde78df8b5c445739a27d7b1e870fa94e4 Mon Sep 17 00:00:00 2001
From: Joey Hess 
Date: Sat, 11 Dec 2010 14:55:24 -0400
Subject: linkage to themes

---
 doc/css.mdwn      | 2 +-
 doc/features.mdwn | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'doc')

diff --git a/doc/css.mdwn b/doc/css.mdwn
index 35db57b0c..bc070cb99 100644
--- a/doc/css.mdwn
+++ b/doc/css.mdwn
@@ -9,7 +9,7 @@ defining brand new rendering rules.
 While ikiwiki's default use of stylesheets is intentionally quite plain and
 minimalistic, CSS allows creating any kind of look you can dream up.
 
-The [[theme_plugin|plugins/theme]] provides some prepackaged themes in an
+The [[theme_plugin|plugins/theme]] provides some prepackaged [[themes]] in an
 easy to use way.
 
 The [[css_market]] page is an attempt to collect user contributed local.css
diff --git a/doc/features.mdwn b/doc/features.mdwn
index 1f8168703..0dbdba5df 100644
--- a/doc/features.mdwn
+++ b/doc/features.mdwn
@@ -77,6 +77,8 @@ Ikiwiki aims to produce
 Ikiwiki generates html using [[templates]], and uses [[css]], so you
 can change the look and layout of all pages in any way you would like.
 
+Ikiwiki ships with several ready to use [[themes]].
+
 ## [[Plugins]]
 
 Plugins can be used to add additional features to ikiwiki. The interface is
-- 
cgit v1.2.3


From 29eb118ded6a08340eff11a3fa1d5cfc12630355 Mon Sep 17 00:00:00 2001
From: Joey Hess 
Date: Sat, 11 Dec 2010 14:57:40 -0400
Subject: simplify

---
 doc/themes.mdwn | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'doc')

diff --git a/doc/themes.mdwn b/doc/themes.mdwn
index b934fc776..9a01df790 100644
--- a/doc/themes.mdwn
+++ b/doc/themes.mdwn
@@ -1,6 +1,6 @@
-A theme provides, via the underlay, an enhanced version of the regular
-[[style.css]]. This leaves [[local.css]] free for you to further
-customise. Themes can also provide header and background images.
+A theme provides a style.css file, and any associated images to give
+ikiwiki a nice look and feel. The local.css [[CSS]] file is left
+free for you to further customize.
 
 Ikiwiki now comes with several themes contributed by users.
 You can enable the [[theme_plugin|plugins/theme]] to use any of these:
-- 
cgit v1.2.3


From cd49b82b153e9b4ea6b69ea7026e18ee5e9d2efc Mon Sep 17 00:00:00 2001
From: Joey Hess 
Date: Sat, 11 Dec 2010 14:58:51 -0400
Subject: clarify

---
 doc/themes.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'doc')

diff --git a/doc/themes.mdwn b/doc/themes.mdwn
index 9a01df790..cf1932fcb 100644
--- a/doc/themes.mdwn
+++ b/doc/themes.mdwn
@@ -12,7 +12,7 @@ You can enable the [[theme_plugin|plugins/theme]] to use any of these:
 

 
 [[!img blueview_small.png align=left]] The blueview theme, contributed by
-[[BerndZeimetz]], featuring a panorama photo he took.
+[[BerndZeimetz]], featuring a tiling panoramic photo he took.
 
 

 
-- 
cgit v1.2.3


From 338a04190f5af2b5e77730d19c570b5fae60066d Mon Sep 17 00:00:00 2001
From: Joey Hess 
Date: Sat, 11 Dec 2010 16:04:06 -0400
Subject: goldtype: New theme, based on blueview, contributed by Lars
 Wirzenius.

---
 debian/changelog              |   1 +
 debian/copyright              |   4 ++++
 doc/themes.mdwn               |   9 +++++++--
 doc/themes/goldtype_small.png | Bin 0 -> 19240 bytes
 4 files changed, 12 insertions(+), 2 deletions(-)
 create mode 100644 doc/themes/goldtype_small.png

(limited to 'doc')

diff --git a/debian/changelog b/debian/changelog
index fae2f15b4..ea6356f72 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ ikiwiki (3.20101202) UNRELEASED; urgency=low
     need to re-login. (smcv)
   * inline: Display feed buttons for nested inlines, linking to the inlined
     page's feed. (Giuseppe Bilotta)
+  * goldtype: New theme, based on blueview, contributed by Lars Wirzenius.
 
  -- Joey Hess   Mon, 29 Nov 2010 14:44:13 -0400
 
diff --git a/debian/copyright b/debian/copyright
index 74391e2cf..300dd110b 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -214,6 +214,10 @@ Files: underlays/themes/blueview/*
 Copyright: © 2009,2010 Bernd Zeimetz
 License: GPL-2+
 
+Files: underlays/themes/goldtype/*
+Copyright: © Lars Wirzenius
+License: GPL-2+
+
 License: BSD-C2
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions
diff --git a/doc/themes.mdwn b/doc/themes.mdwn
index cf1932fcb..57f899677 100644
--- a/doc/themes.mdwn
+++ b/doc/themes.mdwn
@@ -5,17 +5,22 @@ free for you to further customize.
 Ikiwiki now comes with several themes contributed by users.
 You can enable the [[theme_plugin|plugins/theme]] to use any of these:
 
-[[!img actiontabs_small.png align=left]] The actiontabs theme, contributed by
+[[!img actiontabs_small.png align=left]] The **actiontabs** theme, contributed by
 [[svend]]. This style sheet displays the action list
 (Edit, RecentChanges, etc.) as tabs.
 
 

 
-[[!img blueview_small.png align=left]] The blueview theme, contributed by
+[[!img blueview_small.png align=left]] The **blueview** theme, contributed by
 [[BerndZeimetz]], featuring a tiling panoramic photo he took.
 
 

 
+[[!img goldtype_small.png align=left]] The **goldtype** theme, based on
+blueview and featuring the photography of Lars Wirzenius.
+
+

+
 [[!img none_small.png align=left]] For completeness, ikiwiki's default
 anti-theme.
 
diff --git a/doc/themes/goldtype_small.png b/doc/themes/goldtype_small.png
new file mode 100644
index 000000000..a011bb200
Binary files /dev/null and b/doc/themes/goldtype_small.png differ
-- 
cgit v1.2.3


From 9a6ddcd5aff22e95115fb86d74184241538d1ad6 Mon Sep 17 00:00:00 2001
From: "http://clkao.org/" 
Date: Sun, 12 Dec 2010 07:33:25 +0000
Subject:

---
 doc/tips/psgi.mdwn | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 doc/tips/psgi.mdwn

(limited to 'doc')

diff --git a/doc/tips/psgi.mdwn b/doc/tips/psgi.mdwn
new file mode 100644
index 000000000..0d2eeefc8
--- /dev/null
+++ b/doc/tips/psgi.mdwn
@@ -0,0 +1,21 @@
+Here's the app.psgi file if you want to run ikiwiki with [PSGI](http://plackperl.org) instead of apache or other web servers:
+
+    use Plack::App::CGIBin;
+    use Plack::Builder;
+    use Plack::App::File;
+    
+    builder {
+        mount '/ikiwiki.cgi' => Plack::App::CGIBin->new(file => './ikiwiki.cgi')->to_app;
+        enable "Plack::Middleware::Static",
+            path => sub { s!(^(?:/[^.]*)?/?$)!${1}/index.html! },
+                root => '.';
+        mount '/' => Plack::App::File->new(root => ".")->to_app;
+    };
+
+Put it in your destdir and now your can run `plackup -p `.
+
+Note that you should configure your `url` and `cgiurl` to point to the listening address of plackup.
+
+Also, the app.psgi residing in the destdir means that /app.psgi is accessible from the web server.
+
+Hopefully some day ikiwiki web ui will speak psgi natively.
-- 
cgit v1.2.3


From d0fdc973d3c793fa6f315014fcfa6823d057372a Mon Sep 17 00:00:00 2001
From: Giuseppe Bilotta 
Date: Thu, 16 Dec 2010 18:47:38 +0100
Subject: reply to KA about fieldsets and field types

---
 doc/plugins/contrib/field/discussion.mdwn | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

(limited to 'doc')

diff --git a/doc/plugins/contrib/field/discussion.mdwn b/doc/plugins/contrib/field/discussion.mdwn
index cd479263a..6161f80df 100644
--- a/doc/plugins/contrib/field/discussion.mdwn
+++ b/doc/plugins/contrib/field/discussion.mdwn
@@ -376,10 +376,28 @@ scrub, html fields, safeurl()ify url fields, etc.)
    * what form do we expect the "secured" output to be in? (raw HTML, scrubbed HTML, escaped HTML, URL)
 
 > Only if we know both these things will we know what sort of security processing needs to be done.
+
+>> Fieldsets are orthogonal to the security issue in the sense that you can use
+>> them without worrying about the field security issue, but they happen to be
+>> a rather clean way of answering those two questions, by allowing you to
+>> attach preprocessing attributes to a field in a way that the user
+>> (supposedly) cannot mingle with.
+
 > There is also a difference between field values that are used inside pagetemplate, and field values which are used as part of a page's content (e.g. with ftemplate).  If you have a TITLE, you want it to be HTML-escaped if you're using it inside pagetemplate, but you don't want it to be HTML-escaped if you're using it inside a page's content.  On the other hand, if you have, say, FEEDLINKS used inside pagetemplate, you don't wish it to be HTML-escaped at all, or your page content will be completely stuffed.
 
+>> Not to talk about the many different ways date-like fields might be need
+>> processing. It has already been proposed to solve this problem by exposing
+>> the field values under different names depending on the kind or amout of
+>> postprocessing they had (e.g. RAW_SOMEFIELD, SOMEFIELD, to which we could add
+>> HTML_SOMEFIELD, URL_SOMEFIELD or whatever). Again, fieldsets offer a simple way
+>> of letting Ikiwiki know what kind of postprocessing should be offered for
+>> that particular field.
+
 > So, somehow, we have to know the meaning of a field before we can use it properly, which kind of goes against the idea of having something generic.
 
+>> We could have a default field type (text, for example), and a way to set a
+>> different field type (which is what my fieldset proposal was about).
+
 > --[[KathrynAndersen]]
 
 -----
-- 
cgit v1.2.3


From 02056f7792b3fb2f7b6cd099325243fe0ad53e82 Mon Sep 17 00:00:00 2001
From: Joey Hess 
Date: Thu, 16 Dec 2010 14:08:32 -0400
Subject: response

---
 doc/todo/mirrorlist_with_per-mirror_usedirs_settings.mdwn | 13 +++++++++++++
 1 file changed, 13 insertions(+)

(limited to 'doc')

diff --git a/doc/todo/mirrorlist_with_per-mirror_usedirs_settings.mdwn b/doc/todo/mirrorlist_with_per-mirror_usedirs_settings.mdwn
index d40be0b08..88c82f66c 100644
--- a/doc/todo/mirrorlist_with_per-mirror_usedirs_settings.mdwn
+++ b/doc/todo/mirrorlist_with_per-mirror_usedirs_settings.mdwn
@@ -27,6 +27,8 @@ and decided this time it was really needed to implement this feature.
 
 >> (I'm not an ikiwiki committer, opinions may vary.)
 >>
+>>> In my opinion, you're an ikiwiki committer! --[[Joey]]
+>>
 >> This would be easier to review if there weren't a million merges from
 >> master; perhaps either leave a branch as-is, or rebase it, or merge
 >> only at "significant" times like after a release?
@@ -59,3 +61,14 @@ and decided this time it was really needed to implement this feature.
 >>> the future, though.
 >>>
 >>> --[[intrigeri]]
+
+>>>> FWIW, I don't care about merge commits etc because I review
+>>>> `git diff ...intrigeri/mirrorlist` -- and if I want to dig deeper
+>>>> into the why of some code, I'll probably checkout the branch and
+>>>> use git blame.
+>>>>
+>>>> I agree with what smcv said, my other concern though is that
+>>>> this is such an edge case, that supporting it just adds clutter.
+>>>> Have to wonder if it wouldn't perhaps be better to do something
+>>>> using the goto plugin and cgiurl, so that the mirror doesn't have
+>>>> to know about the configuration of the other mirror. --[[Joey]]
-- 
cgit v1.2.3


From 075d48c5f2287e6195258a1f0993eb8f69741f51 Mon Sep 17 00:00:00 2001
From: Joey Hess 
Date: Thu, 16 Dec 2010 14:13:25 -0400
Subject: response

---
 doc/plugins/aggregate/discussion.mdwn | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'doc')

diff --git a/doc/plugins/aggregate/discussion.mdwn b/doc/plugins/aggregate/discussion.mdwn
index 6e6c23e61..a3336ee08 100644
--- a/doc/plugins/aggregate/discussion.mdwn
+++ b/doc/plugins/aggregate/discussion.mdwn
@@ -118,3 +118,6 @@ ikiwiki.  Can you provide a more elegant means of allowing cookies and/or
 the user agent to be programmatically manipulated? --[[schmonz]]
 
 > Ping -- is the above patch perhaps acceptable (or near-acceptable)? -- [[schmonz]]
+
+>> Pong.. I'd be happier with a more 100% solution that let cookies be used
+>> w/o needing to write a custom plugin to do it. --[[Joey]] 
-- 
cgit v1.2.3


From 937c0629bf3d4629088171d182ada03edad46304 Mon Sep 17 00:00:00 2001
From: Joey Hess 
Date: Thu, 16 Dec 2010 14:15:55 -0400
Subject: response

---
 doc/ikiwiki/directive/aggregate/discussion.mdwn | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'doc')

diff --git a/doc/ikiwiki/directive/aggregate/discussion.mdwn b/doc/ikiwiki/directive/aggregate/discussion.mdwn
index cf3d2022f..ddece9746 100644
--- a/doc/ikiwiki/directive/aggregate/discussion.mdwn
+++ b/doc/ikiwiki/directive/aggregate/discussion.mdwn
@@ -1,3 +1,10 @@
 It would be awesome if table could aggregrate remote CSVs too. I want something like:
 
      !table file="http://cyclehireapp.com/cyclehirelive/cyclehire.csv"
+
+> Ok, but that has nothing to do with the aggregate plugin. File a
+> [[todo]]?
+> 
+> Anyway, it seems difficult, how would it know when the remote content
+> had changed? Aggregate has its cron job support and has time stamps
+> in rss feeds to rely on. --[[Joey]] 
-- 
cgit v1.2.3


From c14ffd2d9b05b5620126ecba9b7405d0543b1cc7 Mon Sep 17 00:00:00 2001
From: 
 "https://www.google.com/accounts/o8/id?id=AItOawmmrCBT31sEjqngJkIJ0N4kcpab_tFfwSg"
 
Date: Fri, 17 Dec 2010 01:07:26 +0000
Subject:

---
 doc/sandbox.mdwn | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'doc')

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 07191eb4f..e0bdb6d03 100644
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -59,6 +59,8 @@ Bulleted list
 
 testing 123
 
+I wonder how org-mode would look once formatted with ikiwiki..
+
 ----
 
 This **SandBox** is also a [[blog]]!
-- 
cgit v1.2.3


From dd88e501fb597751d06c31efc56d4a7bc5d88971 Mon Sep 17 00:00:00 2001
From: 
 "https://www.google.com/accounts/o8/id?id=AItOawmmrCBT31sEjqngJkIJ0N4kcpab_tFfwSg"
 
Date: Fri, 17 Dec 2010 01:08:28 +0000
Subject:

---
 doc/sandbox/Fantasia.mdwn | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 doc/sandbox/Fantasia.mdwn

(limited to 'doc')

diff --git a/doc/sandbox/Fantasia.mdwn b/doc/sandbox/Fantasia.mdwn
new file mode 100644
index 000000000..8845ec967
--- /dev/null
+++ b/doc/sandbox/Fantasia.mdwn
@@ -0,0 +1,10 @@
+>> Block
+>>> Two Block
+
+[[blog]] blog
+
+* one
+* two
+
+# one
+# two
-- 
cgit v1.2.3


From 85396112f4117714896bcc33c136879135fcd7ff Mon Sep 17 00:00:00 2001
From: "http://www.tychoish.com/" 
Date: Sun, 19 Dec 2010 17:35:49 +0000
Subject: adding new personal site to the users page.

---
 doc/ikiwikiusers.mdwn | 1 +
 1 file changed, 1 insertion(+)

(limited to 'doc')

diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn
index 645e9538c..cd274c445 100644
--- a/doc/ikiwikiusers.mdwn
+++ b/doc/ikiwikiusers.mdwn
@@ -162,6 +162,7 @@ Personal sites and blogs
 * [NeX-6](http://nex-6.taht.net/) ikiwiki blog and wiki running over ipv6
 * [Jason Riedy](http://lovesgoodfood.com/jason/), which may occasionally look funny if I'm playing with my branch...
 * [pmate](http://pmate.nfshost.com)'s homepage and [blog](http://pmate.nfshost.com/blog/)
+* [tychoish.com](http://tychoish.com/) - a blog/wiki mashup. blog posts are "rhizomes."
 
 Please feel free to add your own ikiwiki site!
 
-- 
cgit v1.2.3


From b0749319efa4179451b6ed280a735109f812fded Mon Sep 17 00:00:00 2001
From: "http://people.debian.org/~vagrant/id/"
 
Date: Mon, 20 Dec 2010 03:33:35 +0000
Subject:

---
 doc/sandbox/D-Liberative.wiki | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'doc')

diff --git a/doc/sandbox/D-Liberative.wiki b/doc/sandbox/D-Liberative.wiki
index b8c94f310..9b6e3ee2b 100644
--- a/doc/sandbox/D-Liberative.wiki
+++ b/doc/sandbox/D-Liberative.wiki
@@ -1 +1,3 @@
 For now its just a concept... what if a community could map its deliberative capacity?
+
+how, pray tell, would one do that?
-- 
cgit v1.2.3


From e5ed3c9e3801360cc00ce4f4f325f68ac0770bff Mon Sep 17 00:00:00 2001
From: "http://people.debian.org/~vagrant/id/"
 
Date: Mon, 20 Dec 2010 04:15:51 +0000
Subject: removed

---
 doc/sandbox/D-Liberative.wiki | 3 ---
 1 file changed, 3 deletions(-)
 delete mode 100644 doc/sandbox/D-Liberative.wiki

(limited to 'doc')

diff --git a/doc/sandbox/D-Liberative.wiki b/doc/sandbox/D-Liberative.wiki
deleted file mode 100644
index 9b6e3ee2b..000000000
--- a/doc/sandbox/D-Liberative.wiki
+++ /dev/null
@@ -1,3 +0,0 @@
-For now its just a concept... what if a community could map its deliberative capacity?
-
-how, pray tell, would one do that?
-- 
cgit v1.2.3