diff --git a/doc/todo/Make_recentchanges_CGI_more_configurable.mdwn b/doc/todo/Make_recentchanges_CGI_more_configurable.mdwn
index 57a545a8b..063b42b7f 100644
--- a/doc/todo/Make_recentchanges_CGI_more_configurable.mdwn
+++ b/doc/todo/Make_recentchanges_CGI_more_configurable.mdwn
@@ -89,4 +89,6 @@ It's probably better to add the functionality I'm looking for in the editing-rel
 >>>> exports, so, we should review whether to add them to that list. Also, I'd rename the
 >>>> copy of `htmllink` to something unique (`myhtmllink`? you can probably do better than
 >>>> that) and reference that name in `linkify`, to quash a warning about redefining the
->>>> existing one. Great work!  *— [[Jon]], 2024-09-10*
+>>>> existing one. Also: in the logic immediately after generating the CONTRIBUTIONS link,
+>>>> we could actually call the real `htmllink` to handle the rest, which would remove the
+>>>> need for some of those utility functions. Great work!  *— [[Jon]], 2024-09-10*

diff --git a/doc/todo/Make_recentchanges_CGI_more_configurable.mdwn b/doc/todo/Make_recentchanges_CGI_more_configurable.mdwn
index cc51b4d79..57a545a8b 100644
--- a/doc/todo/Make_recentchanges_CGI_more_configurable.mdwn
+++ b/doc/todo/Make_recentchanges_CGI_more_configurable.mdwn
@@ -77,3 +77,16 @@ It's probably better to add the functionality I'm looking for in the editing-rel
 >>> Thanks, here's my working [[modified link plugin|https://codeberg.org/AwesomeAdam54321/ikiplugins/src/branch/main/IkiWiki/Plugin/link_local.pm]]
 >>> based on your instructions.
 >>> Would the functionality be accepted into ikiwiki's link plugin? I could make adjustments if necessary. _— [[awesomeadam]], 2024-09-10_
+
+>>>> Nice! I think I might use this myself, too: on [my site](https://jmtd.net) I have CGI
+>>>> turned on for comments, but I don't do web-based page editing. I'll do a full review
+>>>> once I'm back at work. For now, I'd say that this works well as an independent plugin
+>>>> from `link.pm`, so it probably makes sense to keep it that way rather than modify
+>>>> `link.pm`, but I'd like to see this as a plugin included in IkiWiki. One quick hint,
+>>>> I noticed after a quick scan over: rather than copy the utility functions from
+>>>> `IkiWiki.pm`, you can reference them with e.g. `IkiWiki::abs2rel`. This wouldn't be
+>>>> necessary if we included those utility functions in the list of things that `IkiWiki.pm`
+>>>> exports, so, we should review whether to add them to that list. Also, I'd rename the
+>>>> copy of `htmllink` to something unique (`myhtmllink`? you can probably do better than
+>>>> that) and reference that name in `linkify`, to quash a warning about redefining the
+>>>> existing one. Great work!  *— [[Jon]], 2024-09-10*

diff --git a/doc/todo/Make_recentchanges_CGI_more_configurable.mdwn b/doc/todo/Make_recentchanges_CGI_more_configurable.mdwn
index e900149bc..cc51b4d79 100644
--- a/doc/todo/Make_recentchanges_CGI_more_configurable.mdwn
+++ b/doc/todo/Make_recentchanges_CGI_more_configurable.mdwn
@@ -76,4 +76,4 @@ It's probably better to add the functionality I'm looking for in the editing-rel
 
 >>> Thanks, here's my working [[modified link plugin|https://codeberg.org/AwesomeAdam54321/ikiplugins/src/branch/main/IkiWiki/Plugin/link_local.pm]]
 >>> based on your instructions.
->>> Would the functionality be accepted into ikiwiki's link plugin? I could make adjustments if necessary.
+>>> Would the functionality be accepted into ikiwiki's link plugin? I could make adjustments if necessary. _— [[awesomeadam]], 2024-09-10_

diff --git a/doc/todo/Make_recentchanges_CGI_more_configurable.mdwn b/doc/todo/Make_recentchanges_CGI_more_configurable.mdwn
index 54191d648..e900149bc 100644
--- a/doc/todo/Make_recentchanges_CGI_more_configurable.mdwn
+++ b/doc/todo/Make_recentchanges_CGI_more_configurable.mdwn
@@ -73,3 +73,7 @@ It's probably better to add the functionality I'm looking for in the editing-rel
 >> Then, in the copy of `htmllink`, you can find the chunk of code which generates the links
 >> for missing pages (search for `"<span class=\"createlink\">`) and adjust it to be a static
 >> link to your `CONTRIBUTING` page. *— [[Jon]], 2024-09-09*
+
+>>> Thanks, here's my working [[modified link plugin|https://codeberg.org/AwesomeAdam54321/ikiplugins/src/branch/main/IkiWiki/Plugin/link_local.pm]]
+>>> based on your instructions.
+>>> Would the functionality be accepted into ikiwiki's link plugin? I could make adjustments if necessary.

diff --git a/doc/users/awesomeadam/discussion.mdwn b/doc/users/awesomeadam/discussion.mdwn
index 39aaf43f6..77a389b80 100644
--- a/doc/users/awesomeadam/discussion.mdwn
+++ b/doc/users/awesomeadam/discussion.mdwn
@@ -1,3 +1,5 @@
 Thanks for participating in the [[forum/theme poll]]! Your vote was for antitheme, with your last commit message reading [Undo my vote for "other" theme, since I use the antitheme with local.css](https://source.ikiwiki.branchable.com/?p=source.git;a=blobdiff;f=doc/forum/theme_poll.mdwn;h=47cafc9369b6ea30c82494a9e3f1735f45e218d5;hp=f86b8e3726bf0f2c301ec6001873392cd6155565;hb=b250476ebe183adeb2eb0973ae800258518ddd8c;hpb=6efba197e496cbfe86fa7fb8ab065cc37e45c642).
 
 The intention of the poll choice was to capture people using the antitheme with only light modifications: if you've done any kind of theming or styling via local.css, the more appropriate poll choice would be "Other". *— [[Jon]], 2024-09-05*
+
+> Thanks for the clarification, I've changed my vote to "other" in [Change my vote from antitheme to "other" theme](http://source.ikiwiki.branchable.com/?p=source.git;a=commit;h=2bfbd13aaa86529ec681dc52b91c662ae650fb15) to better reflect that I customised the antitheme :-).

diff --git a/doc/forum/theme_poll.mdwn b/doc/forum/theme_poll.mdwn
index 47cafc936..730694300 100644
--- a/doc/forum/theme_poll.mdwn
+++ b/doc/forum/theme_poll.mdwn
@@ -1,9 +1,9 @@
 Existing IkiWiki users: which [[themes]] do you use on your site?
 
-[[!poll 2 "antitheme (i.e., none)"
+[[!poll 1 "antitheme (i.e., none)"
 1 "actiontabs"
 0 "blueview"
 0 goldtype
 0 monochrome
-4 "other, including heavily modified versions of the above"
+5 "other, including heavily modified versions of the above"
 ]]

diff --git a/doc/todo/Make_recentchanges_CGI_more_configurable.mdwn b/doc/todo/Make_recentchanges_CGI_more_configurable.mdwn
index 3eb34b249..54191d648 100644
--- a/doc/todo/Make_recentchanges_CGI_more_configurable.mdwn
+++ b/doc/todo/Make_recentchanges_CGI_more_configurable.mdwn
@@ -65,3 +65,11 @@ It's probably better to add the functionality I'm looking for in the editing-rel
 > in any scenario where you don't want CGI is likely to have some risky corner cases. Cleaner
 > would be CGI off; a separate plugin handles dealing with ?-plugins; and anarcat's changes to
 > make recentchanges work properly with CGI off. *— [[Jon]], 2024-09-05*
+
+>> you'd need to make a copy of the `link` plugin, explicitly disable `link` and enable your
+>> copy. You'd then need to add a (renamed?) copy of `htmllink` from `IkiWiki.pm` to the copy,
+>> and call that instead, within the `linkify` subroutine.
+>> 
+>> Then, in the copy of `htmllink`, you can find the chunk of code which generates the links
+>> for missing pages (search for `"<span class=\"createlink\">`) and adjust it to be a static
+>> link to your `CONTRIBUTING` page. *— [[Jon]], 2024-09-09*

diff --git a/doc/users/awesomeadam/discussion.mdwn b/doc/users/awesomeadam/discussion.mdwn
new file mode 100644
index 000000000..39aaf43f6
--- /dev/null
+++ b/doc/users/awesomeadam/discussion.mdwn
@@ -0,0 +1,3 @@
+Thanks for participating in the [[forum/theme poll]]! Your vote was for antitheme, with your last commit message reading [Undo my vote for "other" theme, since I use the antitheme with local.css](https://source.ikiwiki.branchable.com/?p=source.git;a=blobdiff;f=doc/forum/theme_poll.mdwn;h=47cafc9369b6ea30c82494a9e3f1735f45e218d5;hp=f86b8e3726bf0f2c301ec6001873392cd6155565;hb=b250476ebe183adeb2eb0973ae800258518ddd8c;hpb=6efba197e496cbfe86fa7fb8ab065cc37e45c642).
+
+The intention of the poll choice was to capture people using the antitheme with only light modifications: if you've done any kind of theming or styling via local.css, the more appropriate poll choice would be "Other". *— [[Jon]], 2024-09-05*

diff --git a/doc/todo/Make_recentchanges_CGI_more_configurable.mdwn b/doc/todo/Make_recentchanges_CGI_more_configurable.mdwn
index 35c7fd1c9..3eb34b249 100644
--- a/doc/todo/Make_recentchanges_CGI_more_configurable.mdwn
+++ b/doc/todo/Make_recentchanges_CGI_more_configurable.mdwn
@@ -55,3 +55,13 @@ It's probably better to add the functionality I'm looking for in the editing-rel
 >> Yes, I've disabled the CGI before this and the recentchanges page worked as expected. The reason I want to set the cgiurl to `CONTRIBUTING` is so that the `Edit` action and all the wikilinks to nonexistent pages(the ones with '?' prepended) will be shown, since they aren't shown if the CGI is disabled. It's normally better to not show them at all when the CGI is disabled, but it would be useful to link to a contribution guide page instead if there was an option for it.
 >>
 >> I could just use the sidebar plugin instead and link to `CONTRIBUTING` from there, but then the missing pages on the wiki won't be visible from a glance... -- [[awesomeadam]]
+
+> (Let me preface this by first saying that presently I am not able to do any open
+> source work, including IkiWiki, for _reasons_ but I'm hoping that will change within the next few
+> weeks.)
+> Without looking at the code first (which might undermine my assumptions), I feel the cleanest
+> way to achieve what you want would be if it were possible for a plugin to be triggered during
+> link generation (the ? for broken links) and for that plugin to exist. I think enabling CGI
+> in any scenario where you don't want CGI is likely to have some risky corner cases. Cleaner
+> would be CGI off; a separate plugin handles dealing with ?-plugins; and anarcat's changes to
+> make recentchanges work properly with CGI off. *— [[Jon]], 2024-09-05*

diff --git a/doc/todo/Make_recentchanges_CGI_more_configurable.mdwn b/doc/todo/Make_recentchanges_CGI_more_configurable.mdwn
index bc87e129b..35c7fd1c9 100644
--- a/doc/todo/Make_recentchanges_CGI_more_configurable.mdwn
+++ b/doc/todo/Make_recentchanges_CGI_more_configurable.mdwn
@@ -52,6 +52,6 @@ It's probably better to add the functionality I'm looking for in the editing-rel
 >
 > see also [[plugins/sidebar]]. -- [[anarcat]]
 
->> Yes, I've disabled the CGI before this and the recentchanges page worked as expected. The reason I want to set the cgiurl to `CONTRIBUTING` is so that the `Edit` action and all the wikilinks to nonexistent pages(the ones with '?' prepended) will be shown, since they aren't shown if the CGI is disabled.
+>> Yes, I've disabled the CGI before this and the recentchanges page worked as expected. The reason I want to set the cgiurl to `CONTRIBUTING` is so that the `Edit` action and all the wikilinks to nonexistent pages(the ones with '?' prepended) will be shown, since they aren't shown if the CGI is disabled. It's normally better to not show them at all when the CGI is disabled, but it would be useful to link to a contribution guide page instead if there was an option for it.
 >>
 >> I could just use the sidebar plugin instead and link to `CONTRIBUTING` from there, but then the missing pages on the wiki won't be visible from a glance... -- [[awesomeadam]]

diff --git a/doc/todo/Make_recentchanges_CGI_more_configurable.mdwn b/doc/todo/Make_recentchanges_CGI_more_configurable.mdwn
index 552a4fa96..bc87e129b 100644
--- a/doc/todo/Make_recentchanges_CGI_more_configurable.mdwn
+++ b/doc/todo/Make_recentchanges_CGI_more_configurable.mdwn
@@ -54,4 +54,4 @@ It's probably better to add the functionality I'm looking for in the editing-rel
 
 >> Yes, I've disabled the CGI before this and the recentchanges page worked as expected. The reason I want to set the cgiurl to `CONTRIBUTING` is so that the `Edit` action and all the wikilinks to nonexistent pages(the ones with '?' prepended) will be shown, since they aren't shown if the CGI is disabled.
 >>
->> I could just use the sidebar plugin instead and link to `CONTRIBUTING` from there, but then the missing pages on the wiki won't be visible from a glance. -- [[awesomeadam]]
+>> I could just use the sidebar plugin instead and link to `CONTRIBUTING` from there, but then the missing pages on the wiki won't be visible from a glance... -- [[awesomeadam]]

diff --git a/doc/todo/Make_recentchanges_CGI_more_configurable.mdwn b/doc/todo/Make_recentchanges_CGI_more_configurable.mdwn
index d8a8040b7..552a4fa96 100644
--- a/doc/todo/Make_recentchanges_CGI_more_configurable.mdwn
+++ b/doc/todo/Make_recentchanges_CGI_more_configurable.mdwn
@@ -46,8 +46,12 @@ The only problem I encountered was that the `recentchanges` plugin doesn't have
 ```
 [[!tag patch]]
 
-It's probably better to add the functionality I'm looking for in the editing-related plugins like `link` and `editpage`, but I'm not that familiar with Ikiwiki internals yet. Please let me know if that's preferrable. --[[awesomeadam]]
+It's probably better to add the functionality I'm looking for in the editing-related plugins like `link` and `editpage`, but I'm not that familiar with Ikiwiki internals yet. Please let me know if that's preferrable. -- [[awesomeadam]]
 
 > This feels odd to me: if you want to disable CGI (which is, effectively, what linking to CONTRIBUTING would do, no?), just disable CGI, then use the theme or something else to add a link? I have already patched ikiwiki to have recentchanges work properly without CGI, FWIW, in [[todo/proper_links_in_recentchanges_without_CGI]], have you tried that?
 >
 > see also [[plugins/sidebar]]. -- [[anarcat]]
+
+>> Yes, I've disabled the CGI before this and the recentchanges page worked as expected. The reason I want to set the cgiurl to `CONTRIBUTING` is so that the `Edit` action and all the wikilinks to nonexistent pages(the ones with '?' prepended) will be shown, since they aren't shown if the CGI is disabled.
+>>
+>> I could just use the sidebar plugin instead and link to `CONTRIBUTING` from there, but then the missing pages on the wiki won't be visible from a glance. -- [[awesomeadam]]

diff --git a/doc/todo/Make_recentchanges_CGI_more_configurable.mdwn b/doc/todo/Make_recentchanges_CGI_more_configurable.mdwn
index eba78c957..d8a8040b7 100644
--- a/doc/todo/Make_recentchanges_CGI_more_configurable.mdwn
+++ b/doc/todo/Make_recentchanges_CGI_more_configurable.mdwn
@@ -47,3 +47,7 @@ The only problem I encountered was that the `recentchanges` plugin doesn't have
 [[!tag patch]]
 
 It's probably better to add the functionality I'm looking for in the editing-related plugins like `link` and `editpage`, but I'm not that familiar with Ikiwiki internals yet. Please let me know if that's preferrable. --[[awesomeadam]]
+
+> This feels odd to me: if you want to disable CGI (which is, effectively, what linking to CONTRIBUTING would do, no?), just disable CGI, then use the theme or something else to add a link? I have already patched ikiwiki to have recentchanges work properly without CGI, FWIW, in [[todo/proper_links_in_recentchanges_without_CGI]], have you tried that?
+>
+> see also [[plugins/sidebar]]. -- [[anarcat]]

diff --git a/doc/todo/Make_recentchanges_CGI_more_configurable.mdwn b/doc/todo/Make_recentchanges_CGI_more_configurable.mdwn
index 455e5f9f3..eba78c957 100644
--- a/doc/todo/Make_recentchanges_CGI_more_configurable.mdwn
+++ b/doc/todo/Make_recentchanges_CGI_more_configurable.mdwn
@@ -5,10 +5,6 @@ The only problem I encountered was that the `recentchanges` plugin doesn't have
 ```
 --- a/IkiWiki/Plugin/recentchanges.pm	1970-01-01 07:30:01.000000000 +0730
 +++ b/IkiWiki/Plugin/recentchanges.pm	2024-09-03 14:13:29.351231651 +0800
-@@ -1,0 +1,0 @@
- 
- use warnings;
- use strict;
 @@ -40,11 +39,19 @@
  			safe => 1,
  			rebuild => 0,

diff --git a/doc/todo/Make_recentchanges_CGI_more_configurable.mdwn b/doc/todo/Make_recentchanges_CGI_more_configurable.mdwn
index 00c303485..455e5f9f3 100644
--- a/doc/todo/Make_recentchanges_CGI_more_configurable.mdwn
+++ b/doc/todo/Make_recentchanges_CGI_more_configurable.mdwn
@@ -48,5 +48,6 @@ The only problem I encountered was that the `recentchanges` plugin doesn't have
  			do => "goto",
  			page => IkiWiki::userpage($change->{author}),
 ```
+[[!tag patch]]
 
 It's probably better to add the functionality I'm looking for in the editing-related plugins like `link` and `editpage`, but I'm not that familiar with Ikiwiki internals yet. Please let me know if that's preferrable. --[[awesomeadam]]

diff --git a/doc/todo/Make_recentchanges_CGI_more_configurable.mdwn b/doc/todo/Make_recentchanges_CGI_more_configurable.mdwn
index 45a39317b..00c303485 100644
--- a/doc/todo/Make_recentchanges_CGI_more_configurable.mdwn
+++ b/doc/todo/Make_recentchanges_CGI_more_configurable.mdwn
@@ -49,4 +49,4 @@ The only problem I encountered was that the `recentchanges` plugin doesn't have
  			page => IkiWiki::userpage($change->{author}),
 ```
 
-It's probably better to add the functionality I'm looking for in the editing-related plugins like `link` and `editpage`, but I'm not that familiar with Ikiwiki internals yet. Please let me know if that's preferrable.
+It's probably better to add the functionality I'm looking for in the editing-related plugins like `link` and `editpage`, but I'm not that familiar with Ikiwiki internals yet. Please let me know if that's preferrable. --[[awesomeadam]]

diff --git a/doc/todo/Make_recentchanges_CGI_more_configurable.mdwn b/doc/todo/Make_recentchanges_CGI_more_configurable.mdwn
index 04386acea..45a39317b 100644
--- a/doc/todo/Make_recentchanges_CGI_more_configurable.mdwn
+++ b/doc/todo/Make_recentchanges_CGI_more_configurable.mdwn
@@ -4,7 +4,7 @@ The only problem I encountered was that the `recentchanges` plugin doesn't have
 
 ```
 --- a/IkiWiki/Plugin/recentchanges.pm	1970-01-01 07:30:01.000000000 +0730
-+++ b/IkiWiki/Plugin/recentchanges_local.pm	2024-09-03 14:13:29.351231651 +0800
++++ b/IkiWiki/Plugin/recentchanges.pm	2024-09-03 14:13:29.351231651 +0800
 @@ -1,0 +1,0 @@
  
  use warnings;

diff --git a/doc/todo/Make_recentchanges_CGI_more_configurable.mdwn b/doc/todo/Make_recentchanges_CGI_more_configurable.mdwn
new file mode 100644
index 000000000..04386acea
--- /dev/null
+++ b/doc/todo/Make_recentchanges_CGI_more_configurable.mdwn
@@ -0,0 +1,52 @@
+Although my wiki is static, I'd still like all the editing functionality to be visible and link to the contributing guide page. I've achieved this by setting the cgiurl as the link to `CONTRIBUTING` on my wiki, and disabling plugins that define the `Preferences` action since there is no CGI for it to use.
+
+The only problem I encountered was that the `recentchanges` plugin doesn't have a setup option to explicitly disable using the CGI for linking to changed pages when the cgiurl is set. Below is a patch that adds a configuration option for this:
+
+```
+--- a/IkiWiki/Plugin/recentchanges.pm	1970-01-01 07:30:01.000000000 +0730
++++ b/IkiWiki/Plugin/recentchanges_local.pm	2024-09-03 14:13:29.351231651 +0800
+@@ -1,0 +1,0 @@
+ 
+ use warnings;
+ use strict;
+@@ -40,11 +39,19 @@
+ 			safe => 1,
+ 			rebuild => 0,
+ 		},
++		recentchangescgi => {
++			type => "boolean",
++			example => 1,
++			description => "Enable recentchanges CGI?",
++			safe => 1,
++			rebuild => 1,
++		},
+ }
+ 
+ sub checkconfig () {
+ 	$config{recentchangespage}='recentchanges' unless defined $config{recentchangespage};
+ 	$config{recentchangesnum}=100 unless defined $config{recentchangesnum};
++	$config{recentchangescgi}=1 unless defined $config{recentchangescgi};
+ }
+ 
+ sub refresh ($) {
+@@ -168,7 +175,7 @@
+ 	my $has_diffurl=0;
+ 	$change->{pages} = [
+ 		map {
+-			if (length $config{cgiurl}) {
++			if (length $config{cgiurl} && $config{recentchangescgi}) {
+ 				$_->{link} = "<a href=\"".
+ 					IkiWiki::cgiurl(
+ 						do => "goto",
+@@ -210,7 +217,7 @@
+ 		$change->{authorurl}=$change->{user};
+ 		$change->{user}=defined $change->{nickname} ? $change->{nickname} : $oiduser;
+ 	}
+-	elsif (length $config{cgiurl}) {
++	elsif (length $config{cgiurl} && $config{recentchangescgi}) {
+ 		$change->{authorurl} = IkiWiki::cgiurl(
+ 			do => "goto",
+ 			page => IkiWiki::userpage($change->{author}),
+```
+
+It's probably better to add the functionality I'm looking for in the editing-related plugins like `link` and `editpage`, but I'm not that familiar with Ikiwiki internals yet. Please let me know if that's preferrable.

diff --git a/doc/forum/postcommit_errors_during_site_rebuilding_/comment_2_02d8d5fe6dfdc4bb7c016f16ef528ea8._comment b/doc/forum/postcommit_errors_during_site_rebuilding_/comment_2_02d8d5fe6dfdc4bb7c016f16ef528ea8._comment
new file mode 100644
index 000000000..f8037d67a
--- /dev/null
+++ b/doc/forum/postcommit_errors_during_site_rebuilding_/comment_2_02d8d5fe6dfdc4bb7c016f16ef528ea8._comment
@@ -0,0 +1,19 @@
+[[!comment format=mdwn
+ username="jmtd@d79be1606aba831a3b476d5fff7d99f4b321eab2"
+ nickname="jmtd"
+ avatar="http://cdn.libravatar.org/avatar/96f1bc700fdf0fc814f40c90391a6b53"
+ subject="comment 2"
+ date="2024-08-27T10:04:11Z"
+ content="""
+Are you trying to use the configuration options `git_wrapped_backround_command` or `wrapper_background_command`? Those are what are triggering the warning. If you don't need those features, disable them in your setup file to silence the warning.
+
+If you do want them, can you ignore the warnings for now? What are you using them for -- perhaps we can find an alternative way of achieving the same thing.
+
+More detail:
+
+This is the code triggering the warning: <http://source.ikiwiki.branchable.com/?p=source.git;a=blob;f=IkiWiki/Wrapper.pm;h=1b8c558e5a46ae55aa14be4f09e59ef5ad5a504b;hb=HEAD#l283>
+
+If a background command is specified, then this code is generated and run. It uses function `daemon` (from 4.4BSD in 1995, added to glibc at the same time, not part of POSIX) and it seems Apple are going to remove it from a future macOS.
+
+We would have to look into whether their suggested remedy (use `posix_spawn` instead, or maybe we could `fork/exec`) would be appropriate for all the hosts/operating systems that IkiWiki might be run on.
+"""]]

diff --git a/doc/forum/postcommit_errors_during_site_rebuilding_/comment_1_83214cf430e86d09df09521418b8fa6f._comment b/doc/forum/postcommit_errors_during_site_rebuilding_/comment_1_83214cf430e86d09df09521418b8fa6f._comment
new file mode 100644
index 000000000..747c06d68
--- /dev/null
+++ b/doc/forum/postcommit_errors_during_site_rebuilding_/comment_1_83214cf430e86d09df09521418b8fa6f._comment
@@ -0,0 +1,9 @@
+[[!comment format=mdwn
+ username="jmtd@d79be1606aba831a3b476d5fff7d99f4b321eab2"
+ nickname="jmtd"
+ avatar="http://cdn.libravatar.org/avatar/96f1bc700fdf0fc814f40c90391a6b53"
+ subject="comment 1"
+ date="2024-08-26T15:38:22Z"
+ content="""
+Give us a bit more information about what you are observing and the environment in which you are running it. It _looks_ like you get two warnings (not errors). Is that the only problem, or does something not work? It also seems you are on macOS. Can you share the macOS version *and* the IkiWiki version you are using?
+"""]]

diff --git a/doc/forum/postcommit_errors_during_site_rebuilding_.mdwn b/doc/forum/postcommit_errors_during_site_rebuilding_.mdwn
new file mode 100644
index 000000000..528cd9f91
--- /dev/null
+++ b/doc/forum/postcommit_errors_during_site_rebuilding_.mdwn
@@ -0,0 +1,12 @@
+```
+generating wrappers..
+/Users/jojo/mysite-workingcopy/.git/hooks/post-commit.c:116:7: warning: 'daemon' is deprecated: first deprecated in macOS 10.5 - Use posix_spawn APIs instead. [-Wdeprecated-declarations]
+                if (daemon(1, 0) == 0) {
+                    ^
+/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/stdlib.h:299:6: note: 'daemon' has been explicitly marked deprecated here
+int      daemon(int, int) __DARWIN_1050(daemon) __OSX_AVAILABLE_BUT_DEPRECATED_MSG(__MAC_10_0, __MAC_10_5, __IPHONE_2_0, __IPHONE_2_0, "Use posix_spawn APIs instead.") __WATCHOS_PROHIBITED __TVOS_PROHIBITED;
+         ^
+1 warning generated.
+```
+
+How can I fix this?

diff --git a/doc/forum/applications_for_htmx_in_ikiwiki/comment_4_c57e3793d2d3c34c4812d6c035c35311._comment b/doc/forum/applications_for_htmx_in_ikiwiki/comment_4_c57e3793d2d3c34c4812d6c035c35311._comment
new file mode 100644
index 000000000..8b8d40bea
--- /dev/null
+++ b/doc/forum/applications_for_htmx_in_ikiwiki/comment_4_c57e3793d2d3c34c4812d6c035c35311._comment
@@ -0,0 +1,19 @@
+[[!comment format=mdwn
+ username="jmtd"
+ avatar="http://cdn.libravatar.org/avatar/cae0ebd82377a48ef9f1f14ff23b3e0f"
+ subject="comment 4"
+ date="2024-08-21T21:11:42Z"
+ content="""
+Some quick notes. the htmx library is tiny: 49567 bytes. To make the \"add comment\" form embed into the current page onclick, instead of a page refresh, requires the following adjustments to the \"add comment\" anchor tag:
+
+```
+<a rel=\"nofollow\" href=\"<TMPL_VAR ADDCOMMENTURL>\"                                                      
+    hx-target=\".addcomment\"                                                                            
+    hx-swap=beforend                                                                                   
+    hx-get=\"<TMPL_VAR ADDCOMMENTURL>\"                                                                  
+    hx-select=\".editcomment form\"                                                                      
+>Add a comment</a>
+```
+
+i.e. the four new attributes. That's it! Obviously some significant refinements could be made, but I'm pretty amazed how little is needed to get something functional working.
+"""]]

diff --git a/doc/forum/applications_for_htmx_in_ikiwiki/comment_3_7f22a3b966590feea87748319da2f8d3._comment b/doc/forum/applications_for_htmx_in_ikiwiki/comment_3_7f22a3b966590feea87748319da2f8d3._comment
new file mode 100644
index 000000000..fc8ffbc57
--- /dev/null
+++ b/doc/forum/applications_for_htmx_in_ikiwiki/comment_3_7f22a3b966590feea87748319da2f8d3._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="jmtd"
+ avatar="http://cdn.libravatar.org/avatar/cae0ebd82377a48ef9f1f14ff23b3e0f"
+ subject="comment 3"
+ date="2024-08-20T17:58:18Z"
+ content="""
+RE Jquery; it would be good to understand and document exactly what options cause it to be pulled in. 
+"""]]

diff --git a/doc/forum/applications_for_htmx_in_ikiwiki/comment_2_39c11cd6b892e6958d262870f5d91c1a._comment b/doc/forum/applications_for_htmx_in_ikiwiki/comment_2_39c11cd6b892e6958d262870f5d91c1a._comment
new file mode 100644
index 000000000..40fbdb607
--- /dev/null
+++ b/doc/forum/applications_for_htmx_in_ikiwiki/comment_2_39c11cd6b892e6958d262870f5d91c1a._comment
@@ -0,0 +1,12 @@
+[[!comment format=mdwn
+ username="jmtd"
+ avatar="http://cdn.libravatar.org/avatar/cae0ebd82377a48ef9f1f14ff23b3e0f"
+ subject="comment 2"
+ date="2024-08-20T17:41:54Z"
+ content="""
+I agree, the big locks are a pressing issue and will limit the usefulness of anything like this. 
+
+I’d hope that something like this could be optional, and unless opted in you wouldn’t pay the price (= need to bundle the js)
+
+I’m sure the same could be achieved without htmx, but it might be an especially quick/ergonomic way to achieve it. 
+"""]]

diff --git a/doc/forum/applications_for_htmx_in_ikiwiki/comment_1_c65cedd0999d876d2921d57ea4b367af._comment b/doc/forum/applications_for_htmx_in_ikiwiki/comment_1_c65cedd0999d876d2921d57ea4b367af._comment
new file mode 100644
index 000000000..aa86c350a
--- /dev/null
+++ b/doc/forum/applications_for_htmx_in_ikiwiki/comment_1_c65cedd0999d876d2921d57ea4b367af._comment
@@ -0,0 +1,12 @@
+[[!comment format=mdwn
+ username="anarcat"
+ avatar="http://cdn.libravatar.org/avatar/825d3c30cb96a053b5335e51b8d0bd49"
+ subject="not sure"
+ date="2024-08-20T16:02:05Z"
+ content="""
+I'm not sure. We already have jquery in ikiwiki (or at least it's there in my site) and it's one of those huge blobs i'd like to get rid of.
+
+I'd love to have more \"live\" previews, but the blocker for this right now is not, IMHO, Javascript or browser-level interactivity, it's how *slow* ikiwiki is over CGI. There's a *single* CGI endpoint that has huge lock contention: that's most of where people spend time when doing comments or, frankly, anything, through the web interface.
+
+Unless we fix that *first*, i doubt any live thing like this will be anywhere near useful... I'm also not convinced we *need* htmx to do the things you're refering to here, but i'm not a frontend developer and i'm old, so i could very well be wrong about that. :) -- [[anarcat]]
+"""]]

diff --git a/doc/forum/applications_for_htmx_in_ikiwiki.mdwn b/doc/forum/applications_for_htmx_in_ikiwiki.mdwn
index 47acb7ca4..af2861f88 100644
--- a/doc/forum/applications_for_htmx_in_ikiwiki.mdwn
+++ b/doc/forum/applications_for_htmx_in_ikiwiki.mdwn
@@ -11,4 +11,4 @@ One thing I’m not sure about is the principle of graceful degradation. That’
 
 Thoughts?
 
-—[Jon]], 2024-08-20
+—[[Jon]], 2024-08-20

diff --git a/doc/forum/applications_for_htmx_in_ikiwiki.mdwn b/doc/forum/applications_for_htmx_in_ikiwiki.mdwn
new file mode 100644
index 000000000..47acb7ca4
--- /dev/null
+++ b/doc/forum/applications_for_htmx_in_ikiwiki.mdwn
@@ -0,0 +1,14 @@
+I’ve been reading a little about [htmx](https://htmx.org/): a JavaScript library which lets you declaratively define actions on page elements that call web API endpoints (without a page refresh), those return HTML snippets, and the snippets are inserted into the live page at defined points. 
+
+I thought that was pretty interesting and I wonders if there are opportunities to deploy it to enhance ikiwiki. What do you think? Examples:
+
+ * edit page. Could generate and populate the edit form within the loaded page without a full refresh 
+ * edit preview. Could be on demand within the edit page, or even automatic
+ * comment moderation. Handle deleting spam, approving comments and rebuilds etc asynchronously
+ * posting comments without leaving the parent page 
+
+One thing I’m not sure about is the principle of graceful degradation. That’s something we probanly want in ikiwiki: no JavaScript, things work as normal. I’m fairly sure this isn’t something modern web developers are interested in, so I don’t know to what extent it’s possible with htmx. 
+
+Thoughts?
+
+—[Jon]], 2024-08-20

diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn
index 27dfbf4ce..c0b987b82 100644
--- a/doc/ikiwikiusers.mdwn
+++ b/doc/ikiwikiusers.mdwn
@@ -109,6 +109,7 @@ Projects & Organizations
 * [[coido architects|http://coido.de]] architectural company, located in Hamburg, Germany and Rotterdam, Netherlands (also rather complex build adding masonry and gallery scripts and some pjaxing to the picture, providing CGI access for the customer)
 * [[guppy|http://guppy.branchable.com/index.en.html]] an internationalized modular Python IRC bot
 * [[ChessWOB|https://www.chesswob.org]] Chess Without Boundaries
+* [[Debian Enhancement Proposals|https://dep-team.pages.debian.net/]]
 
 Personal sites and blogs
 ========================

diff --git a/doc/download.mdwn b/doc/download.mdwn
index 602715d10..91f9749dc 100644
--- a/doc/download.mdwn
+++ b/doc/download.mdwn
@@ -48,3 +48,5 @@ The [openSUSE Build Service](http://software.opensuse.org/search?baseproject=ALL
 A [PKGBUILD for Arch Linux](https://aur.archlinux.org/packages/ikiwiki/) is in the AUR.
 
 A basic [Homebrew](https://brew.sh) Tap is available at <https://github.com/naosnz/homebrew-ikiwiki> ([[discussion|forum/Can someone add Ikiwiki in Homebrew?]])
+
+Guix has an [ikiwiki package](https://packages.guix.gnu.org/packages/ikiwiki).

diff --git a/doc/forum/theme_poll.mdwn b/doc/forum/theme_poll.mdwn
index f86b8e372..47cafc936 100644
--- a/doc/forum/theme_poll.mdwn
+++ b/doc/forum/theme_poll.mdwn
@@ -5,5 +5,5 @@ Existing IkiWiki users: which [[themes]] do you use on your site?
 0 "blueview"
 0 goldtype
 0 monochrome
-5 "other, including heavily modified versions of the above"
+4 "other, including heavily modified versions of the above"
 ]]

diff --git a/doc/forum/theme_poll.mdwn b/doc/forum/theme_poll.mdwn
index 730694300..f86b8e372 100644
--- a/doc/forum/theme_poll.mdwn
+++ b/doc/forum/theme_poll.mdwn
@@ -1,6 +1,6 @@
 Existing IkiWiki users: which [[themes]] do you use on your site?
 
-[[!poll 1 "antitheme (i.e., none)"
+[[!poll 2 "antitheme (i.e., none)"
 1 "actiontabs"
 0 "blueview"
 0 goldtype

diff --git a/doc/forum/theme_poll.mdwn b/doc/forum/theme_poll.mdwn
index 185b5ced7..730694300 100644
--- a/doc/forum/theme_poll.mdwn
+++ b/doc/forum/theme_poll.mdwn
@@ -5,5 +5,5 @@ Existing IkiWiki users: which [[themes]] do you use on your site?
 0 "blueview"
 0 goldtype
 0 monochrome
-4 "other, including heavily modified versions of the above"
+5 "other, including heavily modified versions of the above"
 ]]

diff --git a/doc/todo/support_mdwn_front_matter.mdwn b/doc/todo/support_mdwn_front_matter.mdwn
index d6e2b1a79..00291aea7 100644
--- a/doc/todo/support_mdwn_front_matter.mdwn
+++ b/doc/todo/support_mdwn_front_matter.mdwn
@@ -36,4 +36,4 @@ References:
 *— [[Jon]], 2021-10-15*
 
 > Alternatively, a new plugin with a [[filter|plugins/write]] hook would be able to do the necessary key translations to `meta` definitions.
-> _-- [[adam|awesomeadam]], 2024-07-31_
+> _-- [[awesomeadam]], 2024-07-31_

diff --git a/doc/bugs/wiki_links_still_processed_inside_code_blocks.mdwn b/doc/bugs/wiki_links_still_processed_inside_code_blocks.mdwn
index 70b5318f0..1ea8bb1b9 100644
--- a/doc/bugs/wiki_links_still_processed_inside_code_blocks.mdwn
+++ b/doc/bugs/wiki_links_still_processed_inside_code_blocks.mdwn
@@ -70,6 +70,6 @@ and have it render like:
 >>> should fix it.
 >>> Nevermind, it generally seems that footnotes aren't allowed in tables
 >>> and footnotes can't be referred to more than once in Markdown.
->>> --[[adam|awesomeadam]]
+>>> --[[awesomeadam]]
 
 [[!debbug 487397]]

diff --git a/doc/todo/support_mdwn_front_matter.mdwn b/doc/todo/support_mdwn_front_matter.mdwn
index 804139230..d6e2b1a79 100644
--- a/doc/todo/support_mdwn_front_matter.mdwn
+++ b/doc/todo/support_mdwn_front_matter.mdwn
@@ -34,3 +34,6 @@ References:
  * [Jekyll 'front matter'](https://jekyllrb.com/docs/front-matter/)
 
 *— [[Jon]], 2021-10-15*
+
+> Alternatively, a new plugin with a [[filter|plugins/write]] hook would be able to do the necessary key translations to `meta` definitions.
+> _-- [[adam|awesomeadam]], 2024-07-31_

diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn
index 4915b57ac..27dfbf4ce 100644
--- a/doc/ikiwikiusers.mdwn
+++ b/doc/ikiwikiusers.mdwn
@@ -227,3 +227,4 @@ Personal sites and blogs
 * [Coyote Works](http://coyote.works/) - Work In Progress site of Stephen Michael Kellat
 * [cat.chessmuse.com](https://cat.chessmuse.com) - alip's chess blog
 * [wesl.ee](https://wesl.ee)'s personal wiki
+* [Summer Camp Island wiki](https://sumcamisl.neocities.org) (no CGI)

diff --git a/doc/forum/Can__39__t_get_ikiwiki_to_display_more_than_10_posts./comment_2_08fd791519e8abb4ddfb1835387f797c._comment b/doc/forum/Can__39__t_get_ikiwiki_to_display_more_than_10_posts./comment_2_08fd791519e8abb4ddfb1835387f797c._comment
new file mode 100644
index 000000000..c663dcdd1
--- /dev/null
+++ b/doc/forum/Can__39__t_get_ikiwiki_to_display_more_than_10_posts./comment_2_08fd791519e8abb4ddfb1835387f797c._comment
@@ -0,0 +1,18 @@
+[[!comment format=mdwn
+ username="afc54"
+ avatar="http://cdn.libravatar.org/avatar/52d07197a05a068033c9ba45f2681ae7"
+ subject="Success! Thanks!"
+ date="2024-07-08T22:16:23Z"
+ content="""
+Ok, thanks.  I know next to nothing about ikiwiki, but it appears that the FreedomBox places the blog files in /var/lib/ikiwiki/<name-of-blog>.  From there:
+
+    find . -type f -exec grep 'show=\"10\"' {} \; -print
+    [[!inline pages=\"page(./posts/*) and !*/Discussion\" show=\"10\"
+    ./index.mdwn
+    grep: ./.ikiwiki/sessions.db: Permission denied
+    grep: ./.ikiwiki/userdb: Permission denied
+
+so replaced the show=\"10\" with show=\"100\" but no change.  Turns out that change doesn't propagate until a blog rebuild is done.  So, changed the numbacklinks to 100 from the ikiwiki interface and after the rebuild was done, I now see all posts.
+
+The ikiwiki version on the FreedomBox is 3.20200202.3-1 (per aptitude).  Not sure if newer versiona have this variable settable from the \"setup\" page, but it would be a good idea.
+"""]]

diff --git a/doc/forum/Can__39__t_get_ikiwiki_to_display_more_than_10_posts./comment_1_e550b47f7a01b62d54c508b473694745._comment b/doc/forum/Can__39__t_get_ikiwiki_to_display_more_than_10_posts./comment_1_e550b47f7a01b62d54c508b473694745._comment
new file mode 100644
index 000000000..75ce297dc
--- /dev/null
+++ b/doc/forum/Can__39__t_get_ikiwiki_to_display_more_than_10_posts./comment_1_e550b47f7a01b62d54c508b473694745._comment
@@ -0,0 +1,13 @@
+[[!comment format=mdwn
+ username="j@000101868664dfd137e5c70844b577c209cb6be6"
+ nickname="j"
+ avatar="http://cdn.libravatar.org/avatar/3eba91441afbd8b8c56aa6ea4e0c577f"
+ subject="comment 1"
+ date="2024-07-03T03:49:41Z"
+ content="""
+[[backlinks]] are links from other pages back to the current page, that are shown at the bottom of a page by default. It's not related to the blog listing.
+
+The blog listing is generated with an [[ikiwiki/directive/inline]] directive.
+
+Go to the page that contains your blog listing and edit it. You will see the inline directive with a parameter `limit=\"10\"` (or `show=\"10\"`, which is outdated but still works).
+"""]]

diff --git a/doc/forum/Can__39__t_get_ikiwiki_to_display_more_than_10_posts..mdwn b/doc/forum/Can__39__t_get_ikiwiki_to_display_more_than_10_posts..mdwn
new file mode 100644
index 000000000..8eb257a1e
--- /dev/null
+++ b/doc/forum/Can__39__t_get_ikiwiki_to_display_more_than_10_posts..mdwn
@@ -0,0 +1,13 @@
+Trying to figure out why ikiwiki never displays more than 10 posts no matter what the value of the numbacklinks variable says.  I have tried 0 (to show all) and 100 (I only have 22 posts) but it always displays 10.
+
+The /var/lib/ikiwiki/<name-of-blog>.setup variable:
+
+numbacklinks: 0
+
+whose description says:
+
+    how many backlinks to show before hiding excess (0 to show all)
+
+properly reflects the changes made with the ikiwiki setup interface.  I'm running ikiwiki on a FreedomBox.
+
+Maybe I'm not understanding what this variable is supposed to do, but it seems to be the only one that has anything to do with how many posts to show.  I would like to show all the posts, not just the most recent 10 when entering the blog.  Can anyone tell me why this is not working?  Thanks. 

diff --git a/doc/bugs/Commonmark_support.mdwn b/doc/bugs/Commonmark_support.mdwn
index c2f66c200..ddf8cf48a 100644
--- a/doc/bugs/Commonmark_support.mdwn
+++ b/doc/bugs/Commonmark_support.mdwn
@@ -52,3 +52,11 @@ Patch: <https://github.com/jmtd/ikiwiki/commit/c76eeac8152604ce3d7d1672fe404c8ee
 > > 5. as far as I can tell from my [magic script](https://gitlab.com/anarcat/scripts/-/blob/a6dbda602d8d8e9c0ef810d308e35a09ff538836/in-debian), neither `libcmark` or `libperl-commonmark` are packaged. There isn't even a WNPP bug. I do wonder if that's a criteria for inclusion though; I wouldn't keep code away merely because it's not in Debian. (What *is* our criterion, actually? I'd say "unit tests and integration in CI", but, while we have the former, we don't have the latter, and not having Debian package might make testing this harder.... )
 > > 
 > > -- anarcat
+
+> I tried this patch on Fedora 39 (which has perl-commonmark 0.290000 and libcmark 0.30.3 packaged),
+> but immediately encountered a problem where all wikilinks and directives stopped working.
+> `\[[foo]]` in the source page becomes simply `foo` in the generated HTML, as if CommonMark ate the double brackets.
+>
+> I don't have a different system to compare if it's specific to the Fedora packages. Did you face this problem?
+>
+> -- j@ustink.org 2024-06-29

diff --git a/doc/forum/theme_poll.mdwn b/doc/forum/theme_poll.mdwn
index 9f4309f33..185b5ced7 100644
--- a/doc/forum/theme_poll.mdwn
+++ b/doc/forum/theme_poll.mdwn
@@ -1,6 +1,6 @@
 Existing IkiWiki users: which [[themes]] do you use on your site?
 
-[[!poll 0 "antitheme (i.e., none)"
+[[!poll 1 "antitheme (i.e., none)"
 1 "actiontabs"
 0 "blueview"
 0 goldtype

diff --git a/doc/setup.mdwn b/doc/setup.mdwn
index 2d3b54139..2a0ef3889 100644
--- a/doc/setup.mdwn
+++ b/doc/setup.mdwn
@@ -8,6 +8,8 @@ If you're using Debian or Ubuntu, ikiwiki is an <code><a href="http://www.debian
 
 For those using Fedora, [IkiWiki is available as Fedora package](https://packages.fedoraproject.org/pkgs/ikiwiki/ikiwiki/).
 
+For those using Alpine Linux, [IkiWiki is available as an Alpine package](https://pkgs.alpinelinux.org/package/edge/community/x86_64/ikiwiki), thus installable via <code>apk add ikiwiki</code>.
+
 Otherwise, see the [[download]] and [[install]] pages.
 
 You may also want to try out IkiWiki in a [[container|containers]].

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 33fab4f23..606c8d6f8 100644
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -280,6 +280,7 @@ If you're using Debian or Ubuntu, ikiwiki is an apt-get install ikiwiki away. If
 You may also want to try out IkiWiki in a container.
 
 This line was added using the web interface
+> Indeed
 
 [[!table data="""
 Table|

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 98f41593a..33fab4f23 100644
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -280,3 +280,10 @@ If you're using Debian or Ubuntu, ikiwiki is an apt-get install ikiwiki away. If
 You may also want to try out IkiWiki in a container.
 
 This line was added using the web interface
+
+[[!table data="""
+Table|
+Wiki|Ikiwiki
+Compiler?|Yes
+Cool?|Indubitably
+"""]]

diff --git a/doc/templates/episode.mdwn b/doc/templates/episode.mdwn
index 8be69c6ea..b18d32b21 100644
--- a/doc/templates/episode.mdwn
+++ b/doc/templates/episode.mdwn
@@ -2,7 +2,7 @@
 <div class="infobox">
 [[!table data="""
 **<TMPL_VAR title>**|
-[[!img img/<TMPL_VAR image> size=425x caption="<TMPL_VAR imagecaption>"]]|
+[[!img img/<TMPL_VAR raw_image> size=425x caption="<TMPL_VAR imagecaption>"]]|
 Season|<TMPL_VAR partOfSeason>
 Episode|<TMPL_VAR episodeNumber>
 Air date|<TMPL_VAR airDate>

diff --git a/doc/bugs/wiki_links_still_processed_inside_code_blocks.mdwn b/doc/bugs/wiki_links_still_processed_inside_code_blocks.mdwn
index 18901383a..70b5318f0 100644
--- a/doc/bugs/wiki_links_still_processed_inside_code_blocks.mdwn
+++ b/doc/bugs/wiki_links_still_processed_inside_code_blocks.mdwn
@@ -68,6 +68,8 @@ and have it render like:
 >>> (both the table plugin and markdown) because the markup isn't processed
 >>> in the page context. What you describe regarding the processing order
 >>> should fix it.
+>>> Nevermind, it generally seems that footnotes aren't allowed in tables
+>>> and footnotes can't be referred to more than once in Markdown.
 >>> --[[adam|awesomeadam]]
 
 [[!debbug 487397]]

diff --git a/doc/templates/character.mdwn b/doc/templates/character.mdwn
index 971b51258..0cd230124 100644
--- a/doc/templates/character.mdwn
+++ b/doc/templates/character.mdwn
@@ -26,7 +26,7 @@ This template is used to create an infobox for a character of a TV show. It uses
 these parameters:
 
 * name - the name of the character
-* image - the file path of an image in the wiki
+* image - the file path of an image in the wiki, under the img directory
 * imagecaption - the image caption
 * aliases - the aliases of the character
 * relatives - the relatives of the character

diff --git a/doc/templates/episode.mdwn b/doc/templates/episode.mdwn
index a82cff4cb..8be69c6ea 100644
--- a/doc/templates/episode.mdwn
+++ b/doc/templates/episode.mdwn
@@ -2,7 +2,7 @@
 <div class="infobox">
 [[!table data="""
 **<TMPL_VAR title>**|
-[[!img <TMPL_VAR image> size=425x caption="<TMPL_VAR imagecaption>"]]|
+[[!img img/<TMPL_VAR image> size=425x caption="<TMPL_VAR imagecaption>"]]|
 Season|<TMPL_VAR partOfSeason>
 Episode|<TMPL_VAR episodeNumber>
 Air date|<TMPL_VAR airDate>
@@ -19,7 +19,7 @@ This template is used to create an infobox for an episode of a TV show. It uses
 these parameters:
 
 * title - the title of the episode
-* image - the file path of an image in the wiki
+* image - the file path of an image in the wiki, under the img directory
 * imagecaption - the image caption
 * partOfSeason - the season number
 * episodeNumber - notes about the episode number

diff --git a/doc/bugs/wiki_links_still_processed_inside_code_blocks.mdwn b/doc/bugs/wiki_links_still_processed_inside_code_blocks.mdwn
index 9f0a1d102..18901383a 100644
--- a/doc/bugs/wiki_links_still_processed_inside_code_blocks.mdwn
+++ b/doc/bugs/wiki_links_still_processed_inside_code_blocks.mdwn
@@ -64,4 +64,10 @@ and have it render like:
 >>
 >> --[[isbear]]
 
+>>> I found a bug where footnotes can't be added inside tables
+>>> (both the table plugin and markdown) because the markup isn't processed
+>>> in the page context. What you describe regarding the processing order
+>>> should fix it.
+>>> --[[adam|awesomeadam]]
+
 [[!debbug 487397]]

diff --git a/doc/templates/character.mdwn b/doc/templates/character.mdwn
new file mode 100644
index 000000000..971b51258
--- /dev/null
+++ b/doc/templates/character.mdwn
@@ -0,0 +1,44 @@
+[[!templatebody <<ENDBODY
+<div class="infobox">
+[[!table data="""
+**<TMPL_VAR name>**|
+[[!img img/<TMPL_VAR image> size=265x caption="<TMPL_VAR imagecaption>"]]|
+Aliases|<TMPL_VAR aliases>
+Relatives|<TMPL_VAR relatives>
+Affiliation|<TMPL_VAR affiliation>
+Occupation|<TMPL_VAR occupation>
+**Biographical Information**|
+Marital status|<TMPL_VAR marital>
+Date of birth|<TMPL_VAR birthDate>
+Place of birth|<TMPL_VAR birthPlace>
+**Physical Description**|
+Species|<TMPL_VAR species>
+Gender|<TMPL_VAR gender>
+**Appearances**|
+Portrayed by|<TMPL_VAR portrayedby>
+Appears in|<TMPL_VAR raw_appearsin>
+Debut|[[<TMPL_VAR raw_debut>]]
+"""]]
+</div>
+ENDBODY]]
+
+This template is used to create an infobox for a character of a TV show. It uses
+these parameters:
+
+* name - the name of the character
+* image - the file path of an image in the wiki
+* imagecaption - the image caption
+* aliases - the aliases of the character
+* relatives - the relatives of the character
+* affiliation - the affiliation of the character
+* occupation - the character's occupation
+* marital - the character's marital status
+* birthDate - the character's birth date
+* birthPlace - the character's birth place
+* species - the species of the character
+* gender - the gender of the character
+* portrayedby - the actors that portray the character
+* appearsin - notes about the episodes the character appears in
+* debut - the episode that debuts the character
+
+This template uses the [[table|plugins/table]] and [[img|plugins/img]] directives.

diff --git a/doc/templates/episode.mdwn b/doc/templates/episode.mdwn
index 0650a096c..a82cff4cb 100644
--- a/doc/templates/episode.mdwn
+++ b/doc/templates/episode.mdwn
@@ -10,7 +10,7 @@ Writer|<TMPL_VAR writer>
 Director|<TMPL_VAR director>
 Episode guide|
 Previous|Next
-[[<TMPL_VAR previousEpisode>]]|[[<TMPL_VAR nextEpisode>]]
+[[<TMPL_VAR raw_previousEpisode>]]|[[<TMPL_VAR raw_nextEpisode>]]
 """]]
 </div>
 ENDBODY]]

diff --git a/doc/templates/episode.mdwn b/doc/templates/episode.mdwn
index a056128b8..0650a096c 100644
--- a/doc/templates/episode.mdwn
+++ b/doc/templates/episode.mdwn
@@ -4,7 +4,7 @@
 **<TMPL_VAR title>**|
 [[!img <TMPL_VAR image> size=425x caption="<TMPL_VAR imagecaption>"]]|
 Season|<TMPL_VAR partOfSeason>
-Episode|<TMPL_VAR episodeNumber> 
+Episode|<TMPL_VAR episodeNumber>
 Air date|<TMPL_VAR airDate>
 Writer|<TMPL_VAR writer>
 Director|<TMPL_VAR director>

diff --git a/doc/templates/episode.mdwn b/doc/templates/episode.mdwn
index 6c1a91911..a056128b8 100644
--- a/doc/templates/episode.mdwn
+++ b/doc/templates/episode.mdwn
@@ -29,4 +29,4 @@ these parameters:
 * previousEpisode - name of previous episode
 * nextEpisode - name of next episode
 
-This template uses the table and img directives.
+This template uses the [[plugins/table]] and [[plugins/img]] directives.

diff --git a/doc/templates/episode.mdwn b/doc/templates/episode.mdwn
new file mode 100644
index 000000000..6c1a91911
--- /dev/null
+++ b/doc/templates/episode.mdwn
@@ -0,0 +1,32 @@
+[[!templatebody <<ENDBODY
+<div class="infobox">
+[[!table data="""
+**<TMPL_VAR title>**|
+[[!img <TMPL_VAR image> size=425x caption="<TMPL_VAR imagecaption>"]]|
+Season|<TMPL_VAR partOfSeason>
+Episode|<TMPL_VAR episodeNumber> 
+Air date|<TMPL_VAR airDate>
+Writer|<TMPL_VAR writer>
+Director|<TMPL_VAR director>
+Episode guide|
+Previous|Next
+[[<TMPL_VAR previousEpisode>]]|[[<TMPL_VAR nextEpisode>]]
+"""]]
+</div>
+ENDBODY]]
+
+This template is used to create an infobox for an episode of a TV show. It uses
+these parameters:
+
+* title - the title of the episode
+* image - the file path of an image in the wiki
+* imagecaption - the image caption
+* partOfSeason - the season number
+* episodeNumber - notes about the episode number
+* airDate - the date the episode aired
+* writer - list of writers involved
+* director - list of directors involved
+* previousEpisode - name of previous episode
+* nextEpisode - name of next episode
+
+This template uses the table and img directives.

diff --git a/doc/forum/Why_does_ikiwiki_refer_to_markdown_files_as___34__mdwn__34__.mdwn b/doc/forum/Why_does_ikiwiki_refer_to_markdown_files_as___34__mdwn__34__.mdwn
index ba4ddc558..50bb37c34 100644
--- a/doc/forum/Why_does_ikiwiki_refer_to_markdown_files_as___34__mdwn__34__.mdwn
+++ b/doc/forum/Why_does_ikiwiki_refer_to_markdown_files_as___34__mdwn__34__.mdwn
@@ -1 +1,3 @@
 I am going through the ikiwiki docs on this website, and I get confused by the docs' insistence of referring to markdown as "mdwn" files.  Mdwn files are normal markdown files, am I right?  Can ikiwiki understand and work with .md files, instead of mdwn?
+> Yes, ikiwiki can work with .md files just fine. The file extension is conventionally named after the plugin that parses the markup so that it's trivial to find it's name.
+> *— [[awesomeadam]], 2023-06-13*

diff --git a/doc/users/awesomeadam.mdwn b/doc/users/awesomeadam.mdwn
new file mode 100644
index 000000000..e965047ad
--- /dev/null
+++ b/doc/users/awesomeadam.mdwn
@@ -0,0 +1 @@
+Hello

diff --git a/doc/bugs/po_plugin_broken_with_po4a_0.70.mdwn b/doc/bugs/po_plugin_broken_with_po4a_0.70.mdwn
index 2bbc38ec5..111e55f6f 100644
--- a/doc/bugs/po_plugin_broken_with_po4a_0.70.mdwn
+++ b/doc/bugs/po_plugin_broken_with_po4a_0.70.mdwn
@@ -9,6 +9,8 @@ I think this patch is sufficient: <https://salsa.debian.org/jmtd/ikiwiki/-/commi
 *— [[Jon]], 2024-06-11*
 
 > I've pushed a Debian package update with a slightly more involved patch:
+>
 > <https://salsa.debian.org/debian/ikiwiki/-/blob/debian/master/debian/patches/0001-Adjustments-for-po4a-0.7.0.patch?ref_type=heads>
+>
 > I'm unavailable for a couple of weeks so I'll let it "soak" in Debian before committing it here.
 > *— [[Jon]], 2024-06-12*

diff --git a/doc/bugs/po_plugin_broken_with_po4a_0.70.mdwn b/doc/bugs/po_plugin_broken_with_po4a_0.70.mdwn
index 5cc5d5597..2bbc38ec5 100644
--- a/doc/bugs/po_plugin_broken_with_po4a_0.70.mdwn
+++ b/doc/bugs/po_plugin_broken_with_po4a_0.70.mdwn
@@ -7,3 +7,8 @@ I think this patch is sufficient: <https://salsa.debian.org/jmtd/ikiwiki/-/commi
 [[!tag patch]]
 
 *— [[Jon]], 2024-06-11*
+
+> I've pushed a Debian package update with a slightly more involved patch:
+> <https://salsa.debian.org/debian/ikiwiki/-/blob/debian/master/debian/patches/0001-Adjustments-for-po4a-0.7.0.patch?ref_type=heads>
+> I'm unavailable for a couple of weeks so I'll let it "soak" in Debian before committing it here.
+> *— [[Jon]], 2024-06-12*

diff --git a/doc/bugs/po_plugin_broken_with_po4a_0.70.mdwn b/doc/bugs/po_plugin_broken_with_po4a_0.70.mdwn
index 299a54d93..5cc5d5597 100644
--- a/doc/bugs/po_plugin_broken_with_po4a_0.70.mdwn
+++ b/doc/bugs/po_plugin_broken_with_po4a_0.70.mdwn
@@ -4,5 +4,6 @@ po plugin is broken.
 This was reported as a FTBFS bug in Debian: <https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1072760>
 
 I think this patch is sufficient: <https://salsa.debian.org/jmtd/ikiwiki/-/commit/65f13f08901806a3b458cd625369e27bf19722e0>
+[[!tag patch]]
 
 *— [[Jon]], 2024-06-11*

diff --git a/doc/bugs/po_plugin_broken_with_po4a_0.70.mdwn b/doc/bugs/po_plugin_broken_with_po4a_0.70.mdwn
new file mode 100644
index 000000000..299a54d93
--- /dev/null
+++ b/doc/bugs/po_plugin_broken_with_po4a_0.70.mdwn
@@ -0,0 +1,8 @@
+po4a version 0.70 and newer appear to have changed the API enough that the IkiWiki
+po plugin is broken.
+
+This was reported as a FTBFS bug in Debian: <https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1072760>
+
+I think this patch is sufficient: <https://salsa.debian.org/jmtd/ikiwiki/-/commit/65f13f08901806a3b458cd625369e27bf19722e0>
+
+*— [[Jon]], 2024-06-11*

diff --git a/doc/forum/theme_poll.mdwn b/doc/forum/theme_poll.mdwn
index 6e9b7501e..9f4309f33 100644
--- a/doc/forum/theme_poll.mdwn
+++ b/doc/forum/theme_poll.mdwn
@@ -2,8 +2,8 @@ Existing IkiWiki users: which [[themes]] do you use on your site?
 
 [[!poll 0 "antitheme (i.e., none)"
 1 "actiontabs"
-1 "blueview"
+0 "blueview"
 0 goldtype
 0 monochrome
-3 "other, including heavily modified versions of the above"
+4 "other, including heavily modified versions of the above"
 ]]

diff --git a/doc/forum/theme_poll.mdwn b/doc/forum/theme_poll.mdwn
index 733119560..6e9b7501e 100644
--- a/doc/forum/theme_poll.mdwn
+++ b/doc/forum/theme_poll.mdwn
@@ -1,8 +1,8 @@
 Existing IkiWiki users: which [[themes]] do you use on your site?
 
 [[!poll 0 "antitheme (i.e., none)"
-2 "actiontabs"
-0 blueview
+1 "actiontabs"
+1 "blueview"
 0 goldtype
 0 monochrome
 3 "other, including heavily modified versions of the above"

diff --git a/doc/forum/theme_poll.mdwn b/doc/forum/theme_poll.mdwn
index 2e924c8f2..733119560 100644
--- a/doc/forum/theme_poll.mdwn
+++ b/doc/forum/theme_poll.mdwn
@@ -1,7 +1,7 @@
 Existing IkiWiki users: which [[themes]] do you use on your site?
 
 [[!poll 0 "antitheme (i.e., none)"
-1 "actiontabs"
+2 "actiontabs"
 0 blueview
 0 goldtype
 0 monochrome

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index be7d7a7a6..98f41593a 100644
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -279,10 +279,4 @@ If you're using Debian or Ubuntu, ikiwiki is an apt-get install ikiwiki away. If
 
 You may also want to try out IkiWiki in a container.
 
-This line was added using the web interface.
-
-<<<<<<< HEAD
-This is concurrent edit #1.
-=======
-This is concurrent edit #2.
->>>>>>> 2144dad74c4a4cd027c47bda480f13c1b901df45
+This line was added using the web interface

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 128c3fcf8..be7d7a7a6 100644
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -281,4 +281,8 @@ You may also want to try out IkiWiki in a container.
 
 This line was added using the web interface.
 
+<<<<<<< HEAD
 This is concurrent edit #1.
+=======
+This is concurrent edit #2.
+>>>>>>> 2144dad74c4a4cd027c47bda480f13c1b901df45

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 9492c4bb6..128c3fcf8 100644
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -280,3 +280,5 @@ If you're using Debian or Ubuntu, ikiwiki is an apt-get install ikiwiki away. If
 You may also want to try out IkiWiki in a container.
 
 This line was added using the web interface.
+
+This is concurrent edit #1.

diff --git a/doc/forum/theme_poll.mdwn b/doc/forum/theme_poll.mdwn
index f9c06d84f..2e924c8f2 100644
--- a/doc/forum/theme_poll.mdwn
+++ b/doc/forum/theme_poll.mdwn
@@ -5,5 +5,5 @@ Existing IkiWiki users: which [[themes]] do you use on your site?
 0 blueview
 0 goldtype
 0 monochrome
-2 "other, including heavily modified versions of the above"
+3 "other, including heavily modified versions of the above"
 ]]

diff --git a/doc/forum/theme_poll.mdwn b/doc/forum/theme_poll.mdwn
index 610b16407..f9c06d84f 100644
--- a/doc/forum/theme_poll.mdwn
+++ b/doc/forum/theme_poll.mdwn
@@ -1,7 +1,7 @@
 Existing IkiWiki users: which [[themes]] do you use on your site?
 
 [[!poll 0 "antitheme (i.e., none)"
-0 actiontabs
+1 "actiontabs"
 0 blueview
 0 goldtype
 0 monochrome

diff --git a/doc/todo/support_for_light_and_dark_mode.mdwn b/doc/todo/support_for_light_and_dark_mode.mdwn
index 85495608b..f3a9b09ff 100644
--- a/doc/todo/support_for_light_and_dark_mode.mdwn
+++ b/doc/todo/support_for_light_and_dark_mode.mdwn
@@ -94,3 +94,23 @@ is probably the best way to implement this.
 > 
 > If we add such a theme (name TBC), would you be happy to move `ikiwiki.info`
 > to it? — [[Jon]], *2024-03-18*
+
+>> I've been poking at this a little bit more over the last couple of weeks.
+>> Besides <https://ikiwiki.info>, I'm not sure anyone would use a new
+>> "lightdark" theme. I strongly suspect most people either use an existing
+>> theme or something custom (I started a [[forum/theme poll]] to try and
+>> gather some data). So I don't think it's worth much effort _unless_
+>> <https://ikiwiki.info> was going to use it.
+>> 
+>> There's a third strand of work not mentioned here or in
+>> [[support dark mode in antitheme]]: making the other existing themes
+>> support light-and-dark mode. That could be valuable, at least in the
+>> short term.
+>> 
+>> I concur that adjusting the antitheme to support light/dark mode could
+>> be regarded as a breaking change for existing users. I think we should
+>> consider putting that on the [[roadmap]] for a 4.x, and/or extending
+>> [[ikiwiki-transition]] to handle this case. Perhaps a "lightdark" theme
+>> could be enabled as part of a transition if we can detect where it
+>> introduces a problem (or perhaps mechanically detecting that is impractical).
+>> — [[Jon]], *2024-04-23*

diff --git a/doc/forum/theme_poll.mdwn b/doc/forum/theme_poll.mdwn
index 44c5d97d8..610b16407 100644
--- a/doc/forum/theme_poll.mdwn
+++ b/doc/forum/theme_poll.mdwn
@@ -5,5 +5,5 @@ Existing IkiWiki users: which [[themes]] do you use on your site?
 0 blueview
 0 goldtype
 0 monochrome
-1 "other, including heavily modified versions of the above"
+2 "other, including heavily modified versions of the above"
 ]]

diff --git a/doc/forum/theme_poll.mdwn b/doc/forum/theme_poll.mdwn
index c22d0f80a..44c5d97d8 100644
--- a/doc/forum/theme_poll.mdwn
+++ b/doc/forum/theme_poll.mdwn
@@ -1,10 +1,9 @@
 Existing IkiWiki users: which [[themes]] do you use on your site?
 
-[[!poll
-0 "antitheme (i.e., none)"
+[[!poll 0 "antitheme (i.e., none)"
 0 actiontabs
 0 blueview
 0 goldtype
 0 monochrome
-0 "other, including heavily modified versions of the above"
+1 "other, including heavily modified versions of the above"
 ]]

diff --git a/doc/forum/theme_poll.mdwn b/doc/forum/theme_poll.mdwn
index 945adf243..c22d0f80a 100644
--- a/doc/forum/theme_poll.mdwn
+++ b/doc/forum/theme_poll.mdwn
@@ -1,7 +1,7 @@
 Existing IkiWiki users: which [[themes]] do you use on your site?
 
 [[!poll
-0 "antitheme (i.e., none)
+0 "antitheme (i.e., none)"
 0 actiontabs
 0 blueview
 0 goldtype

diff --git a/doc/forum/theme_poll.mdwn b/doc/forum/theme_poll.mdwn
new file mode 100644
index 000000000..945adf243
--- /dev/null
+++ b/doc/forum/theme_poll.mdwn
@@ -0,0 +1,10 @@
+Existing IkiWiki users: which [[themes]] do you use on your site?
+
+[[!poll
+0 "antitheme (i.e., none)
+0 actiontabs
+0 blueview
+0 goldtype
+0 monochrome
+0 "other, including heavily modified versions of the above"
+]]

diff --git a/doc/forum/Is_it_possible_to_change_default_mdwn_suffix__63__/comment_3_2e0236f533e0016d41a5e7707fcad8bd._comment b/doc/forum/Is_it_possible_to_change_default_mdwn_suffix__63__/comment_3_2e0236f533e0016d41a5e7707fcad8bd._comment
new file mode 100644
index 000000000..473887706
--- /dev/null
+++ b/doc/forum/Is_it_possible_to_change_default_mdwn_suffix__63__/comment_3_2e0236f533e0016d41a5e7707fcad8bd._comment
@@ -0,0 +1,14 @@
+[[!comment format=mdwn
+ username="jmtd"
+ avatar="http://cdn.libravatar.org/avatar/cae0ebd82377a48ef9f1f14ff23b3e0f"
+ subject="comment 3"
+ date="2024-04-16T14:06:32Z"
+ content="""
+> why was I able to remove joey's comment
+
+IkiWiki is (largely) a Wiki, and the base behaviour of a Wiki is everyone can edit it, and anything can be reverted (including your deletion)
+
+A related, unanswered question: [[forum/Everyone can remove comments]]. I reported this as a bug, too: [[bugs/logged in users can remove any comments]].
+
+On a related note, I'll assume [this edit](http://source.ikiwiki.branchable.com/?p=source.git;a=blobdiff;f=doc/security/discussion.mdwn;h=f510eb21780143dc3ad1f6c0d033f05e623885b4;hp=ddf61c5f8771c581a449fd07f106f62cc3d60026;hb=8ac1f2d18a99a10e9783500710ade73d833c01e8;hpb=eecb06e7e55d3a77e8567b59892de38b7e8d507c) of yours was accidental; please don't deliberately nuke any more useful pages. We have a [[sandbox]] for experiments.
+"""]]

diff --git a/doc/forum/Is_it_possible_to_change_default_mdwn_suffix__63__/comment_1_2a449c6017ecdb4f557963266fb4ec41._comment b/doc/forum/Is_it_possible_to_change_default_mdwn_suffix__63__/comment_1_2a449c6017ecdb4f557963266fb4ec41._comment
new file mode 100644
index 000000000..da6377607
--- /dev/null
+++ b/doc/forum/Is_it_possible_to_change_default_mdwn_suffix__63__/comment_1_2a449c6017ecdb4f557963266fb4ec41._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="http://joey.kitenet.net/"
+ nickname="joey"
+ subject="comment 1"
+ date="2011-05-20T14:12:38Z"
+ content="""
+It's fairly easy to make a copy of the mdwn plugin and s/mdwn/foo/ in it and get what you want. But I don't see value in providing this option in ikiwiki as it just reduces interoperability. Not all options are good options, and this would be a bad one.
+"""]]

diff --git a/doc/security/discussion.mdwn b/doc/security/discussion.mdwn
index f510eb217..ddf61c5f8 100644
--- a/doc/security/discussion.mdwn
+++ b/doc/security/discussion.mdwn
@@ -1 +1,33 @@
-what
+Copied from an email I sent --[[Joey]]
+
+> Apart from restricting escape characters and characters with special
+> meanings to the filesystem (such as '/') or the version control system
+> (which may not cope with \n), why limit filenames at all?
+
+Suppose that git-add and git-commit a shell scripts:
+
+	#!/bin/sh
+	/opt/git/git commit $1
+
+	#!/bin/sh
+	/opt/git/git add $1
+
+Ok, that's crappy code, but git add and commit are only run by a trusted 
+user at the command line, so it's hardly a security hole. (And frankly, 
+I'm not all too impressed with the real shell code I've seen in git-* 
+..) 
+
+But there's no security problem until ikiwiki calls it on a filename 
+that a web user made up. Now, suppose that ikiwiki decided to allow
+spaces in filenames. Nothing else new, just spaces. Of course, the above 
+bad code will fail to add and commit such files.
+
+But it won't just fail, it can even expose private data. Suppose that $1
+is "foo.mdwn .ikiwiki/userdb foo.mdwn". Then the userdb, with its
+passwords and emails is committed, along with foo.mdwn.
+
+Moral: ikiwiki interfaces with code that was not necessarily written for the
+security context that ikiwiki runs in. Even the most innocuous filenames can do
+very unexpected things if you let the shell get ahold of them. Ikiwiki needs to
+sanitize the hell out of user inputted data before letting it anywhere near the
+shell.

diff --git a/doc/security/discussion.mdwn b/doc/security/discussion.mdwn
index ddf61c5f8..f510eb217 100644
--- a/doc/security/discussion.mdwn
+++ b/doc/security/discussion.mdwn
@@ -1,33 +1 @@
-Copied from an email I sent --[[Joey]]
-
-> Apart from restricting escape characters and characters with special
-> meanings to the filesystem (such as '/') or the version control system
-> (which may not cope with \n), why limit filenames at all?
-
-Suppose that git-add and git-commit a shell scripts:
-
-	#!/bin/sh
-	/opt/git/git commit $1
-
-	#!/bin/sh
-	/opt/git/git add $1
-
-Ok, that's crappy code, but git add and commit are only run by a trusted 
-user at the command line, so it's hardly a security hole. (And frankly, 
-I'm not all too impressed with the real shell code I've seen in git-* 
-..) 
-
-But there's no security problem until ikiwiki calls it on a filename 
-that a web user made up. Now, suppose that ikiwiki decided to allow
-spaces in filenames. Nothing else new, just spaces. Of course, the above 
-bad code will fail to add and commit such files.
-
-But it won't just fail, it can even expose private data. Suppose that $1
-is "foo.mdwn .ikiwiki/userdb foo.mdwn". Then the userdb, with its
-passwords and emails is committed, along with foo.mdwn.
-
-Moral: ikiwiki interfaces with code that was not necessarily written for the
-security context that ikiwiki runs in. Even the most innocuous filenames can do
-very unexpected things if you let the shell get ahold of them. Ikiwiki needs to
-sanitize the hell out of user inputted data before letting it anywhere near the
-shell.
+what

diff --git a/doc/forum/Is_it_possible_to_change_default_mdwn_suffix__63__/comment_1_1727c384fe0f21798f7e6ce5bc1eea6d._comment b/doc/forum/Is_it_possible_to_change_default_mdwn_suffix__63__/comment_1_1727c384fe0f21798f7e6ce5bc1eea6d._comment
new file mode 100644
index 000000000..8da494c91
--- /dev/null
+++ b/doc/forum/Is_it_possible_to_change_default_mdwn_suffix__63__/comment_1_1727c384fe0f21798f7e6ce5bc1eea6d._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="StallmansFootFood"
+ avatar="http://cdn.libravatar.org/avatar/8c660ea87eee68646308adcb49383863"
+ subject="comment 1"
+ date="2024-04-15T13:34:00Z"
+ content="""
+why was I able to remove joey's comment that he had posted 10 years ago?  I should've been barred from doing that; I /was/ expecting to be barred from doing that.  Now, have I nuked joey's useful comment?
+"""]]

diff --git a/doc/forum/Is_it_possible_to_change_default_mdwn_suffix__63__/comment_1_2a449c6017ecdb4f557963266fb4ec41._comment b/doc/forum/Is_it_possible_to_change_default_mdwn_suffix__63__/comment_1_2a449c6017ecdb4f557963266fb4ec41._comment
deleted file mode 100644
index da6377607..000000000
--- a/doc/forum/Is_it_possible_to_change_default_mdwn_suffix__63__/comment_1_2a449c6017ecdb4f557963266fb4ec41._comment
+++ /dev/null
@@ -1,8 +0,0 @@
-[[!comment format=mdwn
- username="http://joey.kitenet.net/"
- nickname="joey"
- subject="comment 1"
- date="2011-05-20T14:12:38Z"
- content="""
-It's fairly easy to make a copy of the mdwn plugin and s/mdwn/foo/ in it and get what you want. But I don't see value in providing this option in ikiwiki as it just reduces interoperability. Not all options are good options, and this would be a bad one.
-"""]]

diff --git a/doc/forum/Why_does_ikiwiki_refer_to_markdown_files_as___34__mdwn__34__.mdwn b/doc/forum/Why_does_ikiwiki_refer_to_markdown_files_as___34__mdwn__34__.mdwn
new file mode 100644
index 000000000..ba4ddc558
--- /dev/null
+++ b/doc/forum/Why_does_ikiwiki_refer_to_markdown_files_as___34__mdwn__34__.mdwn
@@ -0,0 +1 @@
+I am going through the ikiwiki docs on this website, and I get confused by the docs' insistence of referring to markdown as "mdwn" files.  Mdwn files are normal markdown files, am I right?  Can ikiwiki understand and work with .md files, instead of mdwn?

diff --git a/doc/bugs/Please_change_admin_user_for_ikiwiki.info.mdwn b/doc/bugs/Please_change_admin_user_for_ikiwiki.info.mdwn
new file mode 100644
index 000000000..e7c2a7346
--- /dev/null
+++ b/doc/bugs/Please_change_admin_user_for_ikiwiki.info.mdwn
@@ -0,0 +1 @@
+Please change the admin user password for ikiwiki.info as this is too weak

diff --git a/doc/tips/auto_replace_some_string_with_a_signature.mdwn b/doc/tips/auto_replace_some_string_with_a_signature.mdwn
index a629a9a36..5b1c2f524 100644
--- a/doc/tips/auto_replace_some_string_with_a_signature.mdwn
+++ b/doc/tips/auto_replace_some_string_with_a_signature.mdwn
@@ -10,7 +10,7 @@ To set this up for a local clone:
 
 1. add this line to `.git/info/attributes`
 
-    *.mdwn filter=signature
+        *.mdwn filter=signature
 
    You could choose to add this to `.gitattributes` instead, and
    commit that to the repository as well. You could also adjust
@@ -20,7 +20,7 @@ To set this up for a local clone:
 2. Configure a "clean" filter for your local clone which performs
    the substitution, e.g.
 
-    git config filter.signature.clean 'sed "s#~~~~#*— [[Jon]], $(date +%Y-%m-%d)*#"'
+        git config filter.signature.clean 'sed "s#~~~~#*— \[[Jon]], $(date +%Y-%m-%d)*#"'
 
    "signature" here can be anything so long as it matches the name
    in the attributes file, above.

diff --git a/doc/tips/auto_replace_some_string_with_a_signature.mdwn b/doc/tips/auto_replace_some_string_with_a_signature.mdwn
new file mode 100644
index 000000000..a629a9a36
--- /dev/null
+++ b/doc/tips/auto_replace_some_string_with_a_signature.mdwn
@@ -0,0 +1,26 @@
+Some other wikis offer a feature where a particular string in your
+text is substituted for a _signature_, e.g., `~~~~` is expanded to
+something of your choosing.
+
+If you are using [[git]], you can achieve something similar, at
+least for edits in a local clone of your repository, by leveraging
+Git filters.
+
+To set this up for a local clone:
+
+1. add this line to `.git/info/attributes`
+
+    *.mdwn filter=signature
+
+   You could choose to add this to `.gitattributes` instead, and
+   commit that to the repository as well. You could also adjust
+   the path match to your settings/tastes. Here, we are only
+   applying this for edits to [[plugins/mdwn]] files.
+
+2. Configure a "clean" filter for your local clone which performs
+   the substitution, e.g.
+
+    git config filter.signature.clean 'sed "s#~~~~#*— [[Jon]], $(date +%Y-%m-%d)*#"'
+
+   "signature" here can be anything so long as it matches the name
+   in the attributes file, above.

diff --git a/doc/bugs/attribute_charset_is_not_valid_for_form_element.mdwn b/doc/bugs/attribute_charset_is_not_valid_for_form_element.mdwn
index f1038259a..f95fdc7a5 100644
--- a/doc/bugs/attribute_charset_is_not_valid_for_form_element.mdwn
+++ b/doc/bugs/attribute_charset_is_not_valid_for_form_element.mdwn
@@ -14,3 +14,6 @@ The WHATWG spec page above suggests the only valid value for the attribute is UT
 > I don't think we should keep the attribute at all. According to [MDN](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/form#accept-charset), it defaults to the page encoding, which seems fine to me, and much more reasonable than having to specify a (possibly different?!) charset everywhere... So I would just remove this. -- [[anarcat]]
 
 >> Thanks for the info! I've removed it in the linked branch. *— [[Jon]], 2024-04-05*
+
+>>> I've tested this out a little now and I think it's good to go.
+>>> [[done]]. *— [[Jon]], 2024-04-06*

diff --git a/doc/bugs/attribute_charset_is_not_valid_for_form_element.mdwn b/doc/bugs/attribute_charset_is_not_valid_for_form_element.mdwn
index 11aa3fbe7..f1038259a 100644
--- a/doc/bugs/attribute_charset_is_not_valid_for_form_element.mdwn
+++ b/doc/bugs/attribute_charset_is_not_valid_for_form_element.mdwn
@@ -12,3 +12,5 @@ The WHATWG spec page above suggests the only valid value for the attribute is UT
 *— [[Jon]], 2024-04-05*
 
 > I don't think we should keep the attribute at all. According to [MDN](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/form#accept-charset), it defaults to the page encoding, which seems fine to me, and much more reasonable than having to specify a (possibly different?!) charset everywhere... So I would just remove this. -- [[anarcat]]
+
+>> Thanks for the info! I've removed it in the linked branch. *— [[Jon]], 2024-04-05*

diff --git a/doc/bugs/attribute_charset_is_not_valid_for_form_element.mdwn b/doc/bugs/attribute_charset_is_not_valid_for_form_element.mdwn
index 7c76fdd2c..11aa3fbe7 100644
--- a/doc/bugs/attribute_charset_is_not_valid_for_form_element.mdwn
+++ b/doc/bugs/attribute_charset_is_not_valid_for_form_element.mdwn
@@ -10,3 +10,5 @@ IkiWiki generates `form` elements with `charset` attributes in a few places. The
 The WHATWG spec page above suggests the only valid value for the attribute is UTF-8. Is it superfluous? Or does the presence of the attribute change browser behaviour?
  
 *— [[Jon]], 2024-04-05*
+
+> I don't think we should keep the attribute at all. According to [MDN](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/form#accept-charset), it defaults to the page encoding, which seems fine to me, and much more reasonable than having to specify a (possibly different?!) charset everywhere... So I would just remove this. -- [[anarcat]]

diff --git a/doc/bugs/attribute_charset_is_not_valid_for_form_element.mdwn b/doc/bugs/attribute_charset_is_not_valid_for_form_element.mdwn
index f6ae6aa2f..7c76fdd2c 100644
--- a/doc/bugs/attribute_charset_is_not_valid_for_form_element.mdwn
+++ b/doc/bugs/attribute_charset_is_not_valid_for_form_element.mdwn
@@ -1,3 +1,5 @@
+[[!template id=gitbranch branch=jon/form-attribute-accept-charset author="[[Jon]]"]][[!tag patch]]
+
 Originally reported to Debian in 2009 at <https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=523701>
 
 IkiWiki generates `form` elements with `charset` attributes in a few places. The Debian bug pointed at the "add comment" form, but there are other instances.

diff --git a/doc/bugs/attribute_charset_is_not_valid_for_form_element.mdwn b/doc/bugs/attribute_charset_is_not_valid_for_form_element.mdwn
new file mode 100644
index 000000000..f6ae6aa2f
--- /dev/null
+++ b/doc/bugs/attribute_charset_is_not_valid_for_form_element.mdwn
@@ -0,0 +1,10 @@
+Originally reported to Debian in 2009 at <https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=523701>
+
+IkiWiki generates `form` elements with `charset` attributes in a few places. The Debian bug pointed at the "add comment" form, but there are other instances.
+
+`charset` is not a valid attribute for the form element in HTML(5). We probably want `accept-charset`, instead:
+<https://html.spec.whatwg.org/multipage/forms.html#attr-form-accept-charset>
+
+The WHATWG spec page above suggests the only valid value for the attribute is UTF-8. Is it superfluous? Or does the presence of the attribute change browser behaviour?
+ 
+*&mdash; [[Jon]], 2024-04-05*

diff --git a/doc/todo/really_generate_HTML5_by_default.mdwn b/doc/todo/really_generate_HTML5_by_default.mdwn
index 48c09457d..3865554b3 100644
--- a/doc/todo/really_generate_HTML5_by_default.mdwn
+++ b/doc/todo/really_generate_HTML5_by_default.mdwn
@@ -3,3 +3,5 @@
 It's been 10 years since the HTML5 option was added. At the time there was some concern about legacy support for IE8. I rather suspect that the number of IE8 ikiwiki users (or ikiwiki users concerned about IE8) approximates zero, today. But if not, perhaps we should [[todo/clarify what browser support is important for IkiWiki]].
 
 *— [[Jon]], 2020-12-30*
+
+> [[done]]. *— [[Jon]], 2024-04-02*

diff --git a/doc/todo/finish_html5_migration.mdwn b/doc/todo/finish_html5_migration.mdwn
index ffda0f984..d1d476f33 100644
--- a/doc/todo/finish_html5_migration.mdwn
+++ b/doc/todo/finish_html5_migration.mdwn
@@ -45,5 +45,5 @@ Steps 3 and 4 should happen in the same release.
 >> Fab, thanks for the ACK. I've pushed (1). I've written (2) (linked to this
 >> page via the gitbranch template) but I'm not sure whether to put out a
 >> minor release before committing that, and see what response we get first
->> (if any).
->> +*— [[Jon]], 2024-04-02*
+>> (if any).[[!tag patch]]
+>> *— [[Jon]], 2024-04-02*

diff --git a/doc/todo/finish_html5_migration.mdwn b/doc/todo/finish_html5_migration.mdwn
index b9198cff9..ffda0f984 100644
--- a/doc/todo/finish_html5_migration.mdwn
+++ b/doc/todo/finish_html5_migration.mdwn
@@ -1,3 +1,5 @@
+[[!template id=gitbranch branch=jon/finish-html5-migration author="[[Jon]]"]]
+
 We should get rid of the html5 config option, remove all the branching around
 it in the templates and unconditionally use the semantic container elements.
 The advantages are twofold: users will get the semantic containers by default
@@ -39,3 +41,9 @@ Steps 3 and 4 should happen in the same release.
 *— [[Jon]], 2024-04-01*
 
 > I'd love to see this happen. Theming ikiwiki is Hard, partly because Perl's templating is rather unusual compared to more modern alternatives (e.g. PHP, ERB, Jinja), but also because there's a lot of legacy lying around... -- [[anarcat]]
+
+>> Fab, thanks for the ACK. I've pushed (1). I've written (2) (linked to this
+>> page via the gitbranch template) but I'm not sure whether to put out a
+>> minor release before committing that, and see what response we get first
+>> (if any).
+>> +*— [[Jon]], 2024-04-02*

diff --git a/doc/todo/finish_html5_migration.mdwn b/doc/todo/finish_html5_migration.mdwn
index 45dfd6f31..b9198cff9 100644
--- a/doc/todo/finish_html5_migration.mdwn
+++ b/doc/todo/finish_html5_migration.mdwn
@@ -37,3 +37,5 @@ Steps 1/2 and 3/4 should take place in different releases.
 Steps 3 and 4 should happen in the same release.
 
 *— [[Jon]], 2024-04-01*
+
+> I'd love to see this happen. Theming ikiwiki is Hard, partly because Perl's templating is rather unusual compared to more modern alternatives (e.g. PHP, ERB, Jinja), but also because there's a lot of legacy lying around... -- [[anarcat]]

diff --git a/doc/todo/finish_html5_migration.mdwn b/doc/todo/finish_html5_migration.mdwn
index 5daf62c88..45dfd6f31 100644
--- a/doc/todo/finish_html5_migration.mdwn
+++ b/doc/todo/finish_html5_migration.mdwn
@@ -35,3 +35,5 @@ We should take the following steps
 I think steps 1 and 2 could take place in the same release.
 Steps 1/2 and 3/4 should take place in different releases.
 Steps 3 and 4 should happen in the same release.
+
+*— [[Jon]], 2024-04-01*

diff --git a/doc/todo/finish_html5_migration.mdwn b/doc/todo/finish_html5_migration.mdwn
new file mode 100644
index 000000000..5daf62c88
--- /dev/null
+++ b/doc/todo/finish_html5_migration.mdwn
@@ -0,0 +1,37 @@
+We should get rid of the html5 config option, remove all the branching around
+it in the templates and unconditionally use the semantic container elements.
+The advantages are twofold: users will get the semantic containers by default
+and working with ikiwiki's templates will be greatly simplified.
+
+In 490a1eca (2014), we moved to always generating HTML (5) ([[cf|todo/generate_HTML5_by_default]])
+and the `html5` config option was re-purposed to control whether
+the template used newer HTML elements such as `section`, `footer`,
+etc. The option remained default to off, because ten years ago,
+a significant fraction of web users were using MSIE versions (≤ 8) that
+didn't support them.
+
+As of 2024, [caniuse report](https://caniuse.com/usage-table) IE8 usage at
+0.02%. There are no statistically signifiant browsers in use that do not
+support the elements we gate behind the `html5` config option.
+([cf](https://caniuse.com/html5semantic))
+
+We should take the following steps
+
+1. default `html5` config option to true. This would not
+   affect existing installations which have a fully-populated configuration
+   file, which will contain either the user's preference or the previous
+   default of 0. The exception is if the user has deleted the `html5` key
+   from the config file which is unlikely.
+
+2. Print a warning that the `html5` configuration option is deprecated if it is
+   set to 0, explaining that it will be removed in a future release. (Possibly
+   pointing at this page).
+
+3. Remove the template branching `<TMPL_IF HTML5>`, replacing it with the
+   true branch
+
+4. Remove the config option.
+
+I think steps 1 and 2 could take place in the same release.
+Steps 1/2 and 3/4 should take place in different releases.
+Steps 3 and 4 should happen in the same release.

diff --git a/doc/users/jon.mdwn b/doc/users/jon.mdwn
index 0dad31f61..0e825b28d 100644
--- a/doc/users/jon.mdwn
+++ b/doc/users/jon.mdwn
@@ -7,9 +7,10 @@ since 2008, as well as a number of private instances.
 ## contributions
 
 I've worked on a few different issues and bugs over the years (they
-are probably linked in "Backlinks", below) but these days my main
-effort is the [Opinionated Ikiwiki](https://github.com/jmtd/opinionated-ikiwiki/)
-[[container|containers]].
+are probably linked in "Backlinks", below). I slowly maintain
+the [Opinionated Ikiwiki](https://github.com/jmtd/opinionated-ikiwiki/)
+[[container|containers]]. I have recently taken on the Debian packaging.
+My current focus is working upstream.
 
 ## historic
 

diff --git a/doc/bugs/backlinks_onhover_thing_can_go_weird.mdwn b/doc/bugs/backlinks_onhover_thing_can_go_weird.mdwn
index 15cb4d1c9..75055fd87 100644
--- a/doc/bugs/backlinks_onhover_thing_can_go_weird.mdwn
+++ b/doc/bugs/backlinks_onhover_thing_can_go_weird.mdwn
@@ -50,5 +50,5 @@ further down the list, but of course then you are outside the hover region.
 >> The above works for me on ikiwiki.info which does not have `html5:1`
 >> so far as I can tell *— [[Jon]], 2020-04-21*
 
->>> [[!tag patch]]Patch in my repo, commit f051f84f632c3eaf86c5cff172692ce71ad5375d.
+>>> [[!tag patch]]Patch in my repo, branch `more-backlinks-details-tag`.
 >>> (I must say this looks *much* nicer, IMHO) *—[[Jon]], 2020-10-07*

diff --git a/doc/todo/add_a_search_plugin_that_uses_duckduckgo.mdwn b/doc/todo/add_a_search_plugin_that_uses_duckduckgo.mdwn
new file mode 100644
index 000000000..12c7f5e28
--- /dev/null
+++ b/doc/todo/add_a_search_plugin_that_uses_duckduckgo.mdwn
@@ -0,0 +1,7 @@
+[[!template id=gitbranch branch=jon/duckduckgo-plugin author="[[Jon]]"]]
+
+The (external) [[plugins/search]] plugin uses Google. For those who have
+privacy concerns about Google, it would be nice to have a drop-in replacement.
+Such as on that used "duckduckgo" instead.
+
+(See also:  [[todo/Change the ikiwiki.info search box to not using Google]]

diff --git a/doc/bugs/backlinks_onhover_thing_can_go_weird.mdwn b/doc/bugs/backlinks_onhover_thing_can_go_weird.mdwn
index 171714b3f..15cb4d1c9 100644
--- a/doc/bugs/backlinks_onhover_thing_can_go_weird.mdwn
+++ b/doc/bugs/backlinks_onhover_thing_can_go_weird.mdwn
@@ -1,3 +1,5 @@
+[[!template id=gitbranch branch=jon/more-backlinks-details-tag author="[[Jon]]"]]
+
 I was just hovering over the '...' next to the backlinks on a page on
 <http://ikiwiki.info/>. In terms of the size of my browser window, this was
 towards the bottom-right of the screen.
@@ -49,5 +51,4 @@ further down the list, but of course then you are outside the hover region.
 >> so far as I can tell *— [[Jon]], 2020-04-21*
 
 >>> [[!tag patch]]Patch in my repo, commit f051f84f632c3eaf86c5cff172692ce71ad5375d.
->>> [[!template id=gitbranch branch=jon/more-backlinks-html5-use-details-tag author="[[Jon]]"]]
 >>> (I must say this looks *much* nicer, IMHO) *—[[Jon]], 2020-10-07*
diff --git a/doc/todo/add_a_search_plugin_that_uses_duckduckgo.mdwn b/doc/todo/add_a_search_plugin_that_uses_duckduckgo.mdwn
index 12c7f5e28..8ce3ec13d 100644
--- a/doc/todo/add_a_search_plugin_that_uses_duckduckgo.mdwn
+++ b/doc/todo/add_a_search_plugin_that_uses_duckduckgo.mdwn
@@ -4,4 +4,4 @@ The (external) [[plugins/search]] plugin uses Google. For those who have
 privacy concerns about Google, it would be nice to have a drop-in replacement.
 Such as on that used "duckduckgo" instead.
 
-(See also:  [[todo/Change the ikiwiki.info search box to not using Google]]
+(See also:  [[todo/Change the ikiwiki.info search box to not using Google]])
diff --git a/doc/users/jon.mdwn b/doc/users/jon.mdwn
index 06368154d..0dad31f61 100644
--- a/doc/users/jon.mdwn
+++ b/doc/users/jon.mdwn
@@ -2,6 +2,7 @@
 
 I've been using IkiWiki for [my personal site](https://jmtd.net/)
 since 2008, as well as a number of private instances.
+[[I joined the IkiWiki maintainers in 2024|contact]].
 
 ## contributions
 
@@ -19,3 +20,12 @@ was discussing IkiWiki in some technical detail and suggesting it as a good
 piece of software for this task.
 
  * slides at <http://www.staff.ncl.ac.uk/jon.dowland/unix/docs/>.
+
+## Review requested
+
+I prefer to have another pair of eyeballs ACK my own patches where
+possible. These are ready for a look:
+
+ * [[bugs/backlinks onhover thing can go weird]]
+ * [[todo/don't generate an empty parentlink span]]
+ * [[todo/add a search plugin that uses duckduckgo]]

diff --git a/doc/todo/don__39__t_generate_an_empty_parentlink_span.mdwn b/doc/todo/don__39__t_generate_an_empty_parentlink_span.mdwn
new file mode 100644
index 000000000..ceadfca5e
--- /dev/null
+++ b/doc/todo/don__39__t_generate_an_empty_parentlink_span.mdwn
@@ -0,0 +1,9 @@
+[[!template id=gitbranch branch=jmtd/no-empty-parentlinks-span author="[[Jon]]"]]
+
+For the top-level wiki page, the `<span class=parentlink` is generated but its empty.
+
+This was reported in Debian in 2009 <https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=523693>
+
+I actually closed it recently, because I disagreed with the suggested patch. However, there's a more agreeable fix: just wrap the parentlinks section in a test of HAS_PARENTLINKS. [[!tag patch]]
+
+*&mdash; [[Jon]], 2024-03-29*

diff --git a/doc/git.mdwn b/doc/git.mdwn
index 4a3c6408e..29f0d37a8 100644
--- a/doc/git.mdwn
+++ b/doc/git.mdwn
@@ -32,7 +32,7 @@ think about merging them. This is recommended. :-)
 * [[intrigeri]] `https://gitlab.tails.boum.org/tails/ikiwiki.git`
 * [[gmcmanus]] `git://github.com/gmcmanus/ikiwiki.git`
 * [[jelmer]] `git://git.samba.org/jelmer/ikiwiki.git`
-* [[jon]] `git://github.com/jmtd/ikiwiki.git`
+* [[jon]] `https://salsa.debian.org/jmtd/ikiwiki.git`
 * [[jonas|JonasSmedegaard]] `git://source.jones.dk/ikiwiki-upstream`
 * [[arpitjain]] `git://github.com/arpitjain11/ikiwiki.git`
 * [[schmonz]] `git://github.com/schmonz/ikiwiki.git`