Recent changes to this wiki:

guh, then i mess up the markdown, how ironic... btw, commonmark parsed my original version correctly :p
diff --git a/doc/todo/Track_Markdown_Standardisation_Efforts.mdwn b/doc/todo/Track_Markdown_Standardisation_Efforts.mdwn
index 3992be1..90aba7a 100644
--- a/doc/todo/Track_Markdown_Standardisation_Efforts.mdwn
+++ b/doc/todo/Track_Markdown_Standardisation_Efforts.mdwn
@@ -31,7 +31,7 @@ It might be worth following...
 > grab. It should be a fairly simple implementation after all...
 > Then it should probably be mentionned in [this discussion][] for 
 > everyone's benefit as well. --[[anarcat]]
-> 
-> [standards]: https://xkcd.com/927/
-> [Perl library]: https://metacpan.org/release/CommonMark
-> [this discussion]: https://talk.commonmark.org/t/i-wonder-if-there-is-a-wiki-engine-that-uses-markdown/1281/18
+ 
+[standards]: https://xkcd.com/927/
+[Perl library]: https://metacpan.org/release/CommonMark
+[this discussion]: https://talk.commonmark.org/t/i-wonder-if-there-is-a-wiki-engine-that-uses-markdown/1281/18

clarify and more links
diff --git a/doc/todo/Track_Markdown_Standardisation_Efforts.mdwn b/doc/todo/Track_Markdown_Standardisation_Efforts.mdwn
index 545098e..3992be1 100644
--- a/doc/todo/Track_Markdown_Standardisation_Efforts.mdwn
+++ b/doc/todo/Track_Markdown_Standardisation_Efforts.mdwn
@@ -17,18 +17,21 @@ It might be worth following...
 > or recommends a different (and hopefully better) third-party library.
 > --[[smcv]]
 
-> I am not sure the noise is so much "recent" anymore: that article 
+> I am not sure the noise is so much "recent" anymore: that article
 > announcing Commonmark is from 2012 and markdown.github.com is from
-> around 2014.
-> 
-> Presumably, Commonmark will become official in 2016, but you know what
-> they say about standards: <https://xkcd.com/927/>
+> around 2014. Presumably, Commonmark will become official in 2016,
+> but you know what they say about [standards][]...
 >
-> I guess the only thing that Ikiwiki would need to do would be to 
-> somewhat support Commonmark. There's a Perl library that wraps the C
-> library here: https://metacpan.org/release/CommonMark
+> I guess the only thing that Ikiwiki would need to do would be to
+> somewhat support Commonmark. There's a [Perl library][] that wraps
+> the C library, but nothing native yet.
 >
 > I guess we would need to test how it performs and compares with 
 > Discount, but having it as a third party module is up for anyone's
 > grab. It should be a fairly simple implementation after all...
-> --[[anarcat]]
+> Then it should probably be mentionned in [this discussion][] for 
+> everyone's benefit as well. --[[anarcat]]
+> 
+> [standards]: https://xkcd.com/927/
+> [Perl library]: https://metacpan.org/release/CommonMark
+> [this discussion]: https://talk.commonmark.org/t/i-wonder-if-there-is-a-wiki-engine-that-uses-markdown/1281/18

some response
diff --git a/doc/todo/Track_Markdown_Standardisation_Efforts.mdwn b/doc/todo/Track_Markdown_Standardisation_Efforts.mdwn
index 7ab4e0f..545098e 100644
--- a/doc/todo/Track_Markdown_Standardisation_Efforts.mdwn
+++ b/doc/todo/Track_Markdown_Standardisation_Efforts.mdwn
@@ -16,3 +16,19 @@ It might be worth following...
 > Markdown unless someone either changes the behaviour of Discount,
 > or recommends a different (and hopefully better) third-party library.
 > --[[smcv]]
+
+> I am not sure the noise is so much "recent" anymore: that article 
+> announcing Commonmark is from 2012 and markdown.github.com is from
+> around 2014.
+> 
+> Presumably, Commonmark will become official in 2016, but you know what
+> they say about standards: <https://xkcd.com/927/>
+>
+> I guess the only thing that Ikiwiki would need to do would be to 
+> somewhat support Commonmark. There's a Perl library that wraps the C
+> library here: https://metacpan.org/release/CommonMark
+>
+> I guess we would need to test how it performs and compares with 
+> Discount, but having it as a third party module is up for anyone's
+> grab. It should be a fairly simple implementation after all...
+> --[[anarcat]]

diff --git a/doc/forum/How_to_add_additional_math_delimites_for_pandoc_plugin.mdwn b/doc/forum/How_to_add_additional_math_delimites_for_pandoc_plugin.mdwn
new file mode 100644
index 0000000..4b429f9
--- /dev/null
+++ b/doc/forum/How_to_add_additional_math_delimites_for_pandoc_plugin.mdwn
@@ -0,0 +1 @@
+In my ikiwiki + pandoc + mathjax setup the delimiters $ for inline math and $$ for display math are currently recognized. How can I add additional delimiters, for example \( and \) for inline and \[ \] for display math?

diff --git a/doc/forum/Using_ikiwiki_via_command_line:_Workflow_and_permission_problem.mdwn b/doc/forum/Using_ikiwiki_via_command_line:_Workflow_and_permission_problem.mdwn
index b547ab4..12d1ab9 100644
--- a/doc/forum/Using_ikiwiki_via_command_line:_Workflow_and_permission_problem.mdwn
+++ b/doc/forum/Using_ikiwiki_via_command_line:_Workflow_and_permission_problem.mdwn
@@ -1,4 +1,4 @@
-I use my ikiwiki for personal notes only on my laptop locally and now I am trying to edit it with emacs and push from command line. 
+I use my ikiwiki for personal notes only on my laptop locally (the html pages are under ~/public_html/mywiki) and now I am trying to edit it with emacs and push from command line. 
 
 I have some questions about this: 
 
@@ -19,4 +19,5 @@ Is this correct so far or is there a better workflow?
 
 3\. What's the best and fastest way to preview a page in my browser after editing it with emacs without updating the whole wiki?
 
+
 -- anna19 --

diff --git a/doc/forum/Using_ikiwiki_via_command_line:_Workflow_and_permission_problem.mdwn b/doc/forum/Using_ikiwiki_via_command_line:_Workflow_and_permission_problem.mdwn
index 059a41f..b547ab4 100644
--- a/doc/forum/Using_ikiwiki_via_command_line:_Workflow_and_permission_problem.mdwn
+++ b/doc/forum/Using_ikiwiki_via_command_line:_Workflow_and_permission_problem.mdwn
@@ -15,8 +15,8 @@ Since I also sometimes want to edit it from the web interface, I tested it and n
 
 Is this correct so far or is there a better workflow?
 
-2. After editing and saving the page from the web interface it is saved with root permissions in ~/mywiki how can I make ikiwiki to save everything with my username as group and owner?
+2\. After editing and saving the page from the web interface it is saved with root permissions in ~/mywiki how can I make ikiwiki to save everything with my username as group and owner?
 
-3. What's the best and fastest way to preview a page in my browser after editing it with emacs without updating the whole wiki?
+3\. What's the best and fastest way to preview a page in my browser after editing it with emacs without updating the whole wiki?
 
 -- anna19 --

diff --git a/doc/forum/Using_ikiwiki_via_command_line:_Workflow_and_permission_problem.mdwn b/doc/forum/Using_ikiwiki_via_command_line:_Workflow_and_permission_problem.mdwn
index 3a87117..059a41f 100644
--- a/doc/forum/Using_ikiwiki_via_command_line:_Workflow_and_permission_problem.mdwn
+++ b/doc/forum/Using_ikiwiki_via_command_line:_Workflow_and_permission_problem.mdwn
@@ -2,7 +2,7 @@ I use my ikiwiki for personal notes only on my laptop locally and now I am tryin
 
 I have some questions about this: 
 
-1. Is the following workflow correct: 
+1\. Is the following workflow correct: 
 
 
 - goto ~/mywiki

diff --git a/doc/forum/Using_ikiwiki_via_command_line:_Workflow_and_permission_problem.mdwn b/doc/forum/Using_ikiwiki_via_command_line:_Workflow_and_permission_problem.mdwn
index eb85f36..3a87117 100644
--- a/doc/forum/Using_ikiwiki_via_command_line:_Workflow_and_permission_problem.mdwn
+++ b/doc/forum/Using_ikiwiki_via_command_line:_Workflow_and_permission_problem.mdwn
@@ -4,6 +4,7 @@ I have some questions about this:
 
 1. Is the following workflow correct: 
 
+
 - goto ~/mywiki
 - edit and save ~/mypage.mdwm with emacs
 - git add ~/mypage.mdwm

added username
diff --git a/doc/forum/Using_ikiwiki_via_command_line:_Workflow_and_permission_problem.mdwn b/doc/forum/Using_ikiwiki_via_command_line:_Workflow_and_permission_problem.mdwn
index 7229d81..eb85f36 100644
--- a/doc/forum/Using_ikiwiki_via_command_line:_Workflow_and_permission_problem.mdwn
+++ b/doc/forum/Using_ikiwiki_via_command_line:_Workflow_and_permission_problem.mdwn
@@ -17,3 +17,5 @@ Is this correct so far or is there a better workflow?
 2. After editing and saving the page from the web interface it is saved with root permissions in ~/mywiki how can I make ikiwiki to save everything with my username as group and owner?
 
 3. What's the best and fastest way to preview a page in my browser after editing it with emacs without updating the whole wiki?
+
+-- anna19 --

diff --git a/doc/forum/Using_ikiwiki_via_command_line:_Workflow_and_permission_problem.mdwn b/doc/forum/Using_ikiwiki_via_command_line:_Workflow_and_permission_problem.mdwn
new file mode 100644
index 0000000..7229d81
--- /dev/null
+++ b/doc/forum/Using_ikiwiki_via_command_line:_Workflow_and_permission_problem.mdwn
@@ -0,0 +1,19 @@
+I use my ikiwiki for personal notes only on my laptop locally and now I am trying to edit it with emacs and push from command line. 
+
+I have some questions about this: 
+
+1. Is the following workflow correct: 
+
+- goto ~/mywiki
+- edit and save ~/mypage.mdwm with emacs
+- git add ~/mypage.mdwm
+- git commit -m "mypage edit"
+- git push
+
+Since I also sometimes want to edit it from the web interface, I tested it and noticed that it doesn't seem that I have to pull before editing. If I save an edit from the web interface the directory ~/mywiki is updated magically without using git pull. 
+
+Is this correct so far or is there a better workflow?
+
+2. After editing and saving the page from the web interface it is saved with root permissions in ~/mywiki how can I make ikiwiki to save everything with my username as group and owner?
+
+3. What's the best and fastest way to preview a page in my browser after editing it with emacs without updating the whole wiki?

Added a comment: I have narrowed this problem down.
diff --git a/doc/forum/Attachment_file_doesn__39__t_get_attached_to_page/comment_3_b3a75eeea04757b56c793d0d987f11c1._comment b/doc/forum/Attachment_file_doesn__39__t_get_attached_to_page/comment_3_b3a75eeea04757b56c793d0d987f11c1._comment
new file mode 100644
index 0000000..918292a
--- /dev/null
+++ b/doc/forum/Attachment_file_doesn__39__t_get_attached_to_page/comment_3_b3a75eeea04757b56c793d0d987f11c1._comment
@@ -0,0 +1,15 @@
+[[!comment format=mdwn
+ username="https://me.yahoo.com/zoredache#d4929"
+ nickname="Zoredache"
+ subject="I have narrowed this problem down."
+ date="2016-08-23T20:51:51Z"
+ content="""
+The attachments do not seem to get attached to the page, if the page has a space in the name.
+
+For comparability with a wiki I had imported content from I adjusted the `wiki_file_chars` to `wiki_file_chars: '-[:alnum:]+/._ '`.
+
+Attachments work work fine when being attached to a page that matches '-[:alnum:]+/._', but if you have a space in the page name attachments fail.
+
+Is there anyway to fix Ikiwiki attachments to work when the above `wiki_file_chars` value that permits space characters?
+
+"""]]

removed
diff --git a/doc/forum/Attachment_file_doesn__39__t_get_attached_to_page/comment_3_b992025181bb0a9ffc38f69650ed92ed._comment b/doc/forum/Attachment_file_doesn__39__t_get_attached_to_page/comment_3_b992025181bb0a9ffc38f69650ed92ed._comment
deleted file mode 100644
index ff85c10..0000000
--- a/doc/forum/Attachment_file_doesn__39__t_get_attached_to_page/comment_3_b992025181bb0a9ffc38f69650ed92ed._comment
+++ /dev/null
@@ -1,13 +0,0 @@
-[[!comment format=mdwn
- username="https://me.yahoo.com/zoredache#d4929"
- nickname="Zoredache"
- subject="I have narrowed this problem down."
- date="2016-08-23T20:49:08Z"
- content="""
-The attachments do not seem to get attached to the page, if the page has a space in the name.
-
-For comparability with a wiki I had imported content from I adjusted the `wiki_file_chars` to `wiki_file_chars: '-[:alnum:]+/._ '`.
-
-Attachments work work fine when being attached to a page that matches `'-[:alnum:]+/._'`, but if you have a space in the page name attachments fail.
-
-"""]]

Added a comment: I have narrowed this problem down.
diff --git a/doc/forum/Attachment_file_doesn__39__t_get_attached_to_page/comment_3_b992025181bb0a9ffc38f69650ed92ed._comment b/doc/forum/Attachment_file_doesn__39__t_get_attached_to_page/comment_3_b992025181bb0a9ffc38f69650ed92ed._comment
new file mode 100644
index 0000000..ff85c10
--- /dev/null
+++ b/doc/forum/Attachment_file_doesn__39__t_get_attached_to_page/comment_3_b992025181bb0a9ffc38f69650ed92ed._comment
@@ -0,0 +1,13 @@
+[[!comment format=mdwn
+ username="https://me.yahoo.com/zoredache#d4929"
+ nickname="Zoredache"
+ subject="I have narrowed this problem down."
+ date="2016-08-23T20:49:08Z"
+ content="""
+The attachments do not seem to get attached to the page, if the page has a space in the name.
+
+For comparability with a wiki I had imported content from I adjusted the `wiki_file_chars` to `wiki_file_chars: '-[:alnum:]+/._ '`.
+
+Attachments work work fine when being attached to a page that matches `'-[:alnum:]+/._'`, but if you have a space in the page name attachments fail.
+
+"""]]

Add commonmark.
diff --git a/doc/todo/Track_Markdown_Standardisation_Efforts.mdwn b/doc/todo/Track_Markdown_Standardisation_Efforts.mdwn
index 85dfddf..7ab4e0f 100644
--- a/doc/todo/Track_Markdown_Standardisation_Efforts.mdwn
+++ b/doc/todo/Track_Markdown_Standardisation_Efforts.mdwn
@@ -3,6 +3,7 @@ Just a quick note that some people are making noise about Markdown standardisati
   * <http://markdown.github.com/>
   * <http://www.codinghorror.com/blog/2012/10/the-future-of-markdown.html>
   * <http://johnmacfarlane.net/babelmark2/faq.html#what-are-some-big-questions-that-the-markdown-spec-does-not-answer>
+  * <http://commonmark.org/>
 
 It might be worth following...
 

Revert spam
diff --git a/doc/__8226____9__Get_CAll___64___1__42__855.709__126__2847___64___E.p.s.o.n_P.r.i.n.t.e.r_T.e.c.h.n.i.c.a.l_S.u.p.p.o.r.t_C.o.n.t.a.c.t_N.u.m.b.e.r.mdwn b/doc/__8226____9__Get_CAll___64___1__42__855.709__126__2847___64___E.p.s.o.n_P.r.i.n.t.e.r_T.e.c.h.n.i.c.a.l_S.u.p.p.o.r.t_C.o.n.t.a.c.t_N.u.m.b.e.r.mdwn
deleted file mode 100644
index 3383fc7..0000000
--- a/doc/__8226____9__Get_CAll___64___1__42__855.709__126__2847___64___E.p.s.o.n_P.r.i.n.t.e.r_T.e.c.h.n.i.c.a.l_S.u.p.p.o.r.t_C.o.n.t.a.c.t_N.u.m.b.e.r.mdwn
+++ /dev/null
@@ -1,7 +0,0 @@
-[[!if test="enabled(meta)" then="""
-[[!meta title="RecentChanges"]]
-"""]]
-Recent changes to this wiki:
-
-[[!inline pages="internal(recentchanges/change_*) and !*/Discussion" 
-template=recentchanges show=0]]
diff --git a/doc/bugs/RecentChanges_broken_with_empty_svnpath.mdwn b/doc/bugs/RecentChanges_broken_with_empty_svnpath.mdwn
index 5bcc034..c852df5 100644
--- a/doc/bugs/RecentChanges_broken_with_empty_svnpath.mdwn
+++ b/doc/bugs/RecentChanges_broken_with_empty_svnpath.mdwn
@@ -1,4 +1,4 @@
-The [[•	Get_CAll_@_1*855.709~2847_@_E.p.s.o.n_P.r.i.n.t.e.r_T.e.c.h.n.i.c.a.l_S.u.p.p.o.r.t_C.o.n.t.a.c.t_N.u.m.b.e.r]] page is broken (doesn't show any history at all) when used with an empty svnpath in the ikiwiki.setup file.
+The [[RecentChanges]] page is broken (doesn't show any history at all) when used with an empty svnpath in the ikiwiki.setup file.
 
 Say you have the following configuration:
 
@@ -6,7 +6,7 @@ Say you have the following configuration:
     svnrepo => "ssh+svn://foo.bar.com/wiki",
     svnpath => "",
 
-In the above, $svnpath need to be either empty or "/" - both trigger the 'next unless' check in IkiWiki/Rcs/svn.pm:rcs_recentchanges() as shown in the patch below, thus causing all files to be ignored for [[•	Get_CAll_@_1*855.709~2847_@_E.p.s.o.n_P.r.i.n.t.e.r_T.e.c.h.n.i.c.a.l_S.u.p.p.o.r.t_C.o.n.t.a.c.t_N.u.m.b.e.r]].
+In the above, $svnpath need to be either empty or "/" - both trigger the 'next unless' check in IkiWiki/Rcs/svn.pm:rcs_recentchanges() as shown in the patch below, thus causing all files to be ignored for [[RecentChanges]].
 
 I can not see why this check is needed in the first place, so here's a patch for removing it :)
 
diff --git a/doc/bugs/RecentChanges_contains_invalid_XHTML.mdwn b/doc/bugs/RecentChanges_contains_invalid_XHTML.mdwn
index 2b21285..eb95e99 100644
--- a/doc/bugs/RecentChanges_contains_invalid_XHTML.mdwn
+++ b/doc/bugs/RecentChanges_contains_invalid_XHTML.mdwn
@@ -1,6 +1,6 @@
 The final `</div>` in `recentchanges.tmpl` gets wrapped in a
 `<p>` tag for some reason, resulting in the following invalid XHTML at
-the end of the [[•	Get_CAll_@_1*855.709~2847_@_E.p.s.o.n_P.r.i.n.t.e.r_T.e.c.h.n.i.c.a.l_S.u.p.p.o.r.t_C.o.n.t.a.c.t_N.u.m.b.e.r]] page
+the end of the [[RecentChanges]] page
 
     <p></div></p>
 
@@ -11,7 +11,7 @@ the end of the [[•	Get_CAll_@_1*855.709~2847_@_E.p.s.o.n_P.r.i.n.t.e.r_T.e.c.h
 Also, there is a problem with the `<img>` tags generated by the smiley
 plugin which end up wrapped in a `<pre>` tag in the inline diff output.
 `<img>` tags is not allowed within a `<pre>` block.  Maybe the smiley
-plugin should be disabled on [[•	Get_CAll_@_1*855.709~2847_@_E.p.s.o.n_P.r.i.n.t.e.r_T.e.c.h.n.i.c.a.l_S.u.p.p.o.r.t_C.o.n.t.a.c.t_N.u.m.b.e.r]]?
+plugin should be disabled on [[RecentChanges]]?
 
 > See [[Smileys_in_the_block_code]], which is now fixed. --[[Joey]]
 
diff --git a/doc/bugs/RecentChanges_links_to_deleted_pages.mdwn b/doc/bugs/RecentChanges_links_to_deleted_pages.mdwn
index a957b72..0eaeafb 100644
--- a/doc/bugs/RecentChanges_links_to_deleted_pages.mdwn
+++ b/doc/bugs/RecentChanges_links_to_deleted_pages.mdwn
@@ -1,4 +1,4 @@
-[[•	Get_CAll_@_1*855.709~2847_@_E.p.s.o.n_P.r.i.n.t.e.r_T.e.c.h.n.i.c.a.l_S.u.p.p.o.r.t_C.o.n.t.a.c.t_N.u.m.b.e.r]] should not link to pages that are being deleted. For as
+[[RecentChanges]] should not link to pages that are being deleted. For as
 example, see the change with the title 'add news item for ikiwiki 2.60'
 which includes the deletion of "news/version 2.52". Maybe it should be made
 clear in RecentChanges that the change to the file is it being deleted.
diff --git a/doc/bugs/cannot_revert_page_deletion.mdwn b/doc/bugs/cannot_revert_page_deletion.mdwn
index e633c44..651b4d0 100644
--- a/doc/bugs/cannot_revert_page_deletion.mdwn
+++ b/doc/bugs/cannot_revert_page_deletion.mdwn
@@ -1,4 +1,4 @@
-After deleting a page with the "remove" button, it seems that the page deletion cannot be reverted using the "revert" icon in [[•	Get_CAll_@_1*855.709~2847_@_E.p.s.o.n_P.r.i.n.t.e.r_T.e.c.h.n.i.c.a.l_S.u.p.p.o.r.t_C.o.n.t.a.c.t_N.u.m.b.e.r]]. 
+After deleting a page with the "remove" button, it seems that the page deletion cannot be reverted using the "revert" icon in [[RecentChanges]]. 
 It ironically says that "Error: ?$pagename does not exist". See [[http://ikiwiki.info/ikiwiki.cgi?rev=860c2c84d98ea0a38a4f91dacef6d4e09f6e6c2e&do=revert]]. [[JeanPrivat]]
 
 > And it only gets that far if the remove plugin is enabled. Otherwise it
diff --git a/doc/bugs/comments_produce_broken_links_in_RecentChanges.mdwn b/doc/bugs/comments_produce_broken_links_in_RecentChanges.mdwn
index 243a2cf..dae0085 100644
--- a/doc/bugs/comments_produce_broken_links_in_RecentChanges.mdwn
+++ b/doc/bugs/comments_produce_broken_links_in_RecentChanges.mdwn
@@ -1,4 +1,4 @@
-Comments produce links like `sandbox/comment_1` in [[•	Get_CAll_@_1*855.709~2847_@_E.p.s.o.n_P.r.i.n.t.e.r_T.e.c.h.n.i.c.a.l_S.u.p.p.o.r.t_C.o.n.t.a.c.t_N.u.m.b.e.r]], which,
+Comments produce links like `sandbox/comment_1` in [[RecentChanges]], which,
 when clicked, redirect to a page that does not exist.
 
 The `recentchanges` branch in my repository contains one possible [[patch]],
diff --git a/doc/bugs/discussion.mdwn b/doc/bugs/discussion.mdwn
index 89d41b6..474e075 100644
--- a/doc/bugs/discussion.mdwn
+++ b/doc/bugs/discussion.mdwn
@@ -8,7 +8,7 @@ the ikiwiki.cgi CGI wrapper. ..."
 
   Enable [[CGI]] mode. In cgi mode ikiwiki __runs as a cgi script__, and
   supports editing pages, signing in, registration, and displaying
-  [[•	Get_CAll_@_1*855.709~2847_@_E.p.s.o.n_P.r.i.n.t.e.r_T.e.c.h.n.i.c.a.l_S.u.p.p.o.r.t_C.o.n.t.a.c.t_N.u.m.b.e.r]].
+  [[RecentChanges]].
 
   __To use ikiwiki as a [[CGI]] program you need to use --wrapper or --setup
   to generate a wrapper.__ The wrapper will generally need to run suid 6755
diff --git a/doc/bugs/firefox_doesn__39__t_want_to_load_updated_pages_at_ikiwiki.info.mdwn b/doc/bugs/firefox_doesn__39__t_want_to_load_updated_pages_at_ikiwiki.info.mdwn
index c2e6c85..558eb90 100644
--- a/doc/bugs/firefox_doesn__39__t_want_to_load_updated_pages_at_ikiwiki.info.mdwn
+++ b/doc/bugs/firefox_doesn__39__t_want_to_load_updated_pages_at_ikiwiki.info.mdwn
@@ -1,4 +1,4 @@
-I'm using firefox-3.0.8-alt0.M41.1 (Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.0.4pre) Gecko/2008100921 Firefox/3.0). I have noticed that quite often it shows an old state of a page at http://ikiwiki.info, e.g., [[•	Get_CAll_@_1*855.709~2847_@_E.p.s.o.n_P.r.i.n.t.e.r_T.e.c.h.n.i.c.a.l_S.u.p.p.o.r.t_C.o.n.t.a.c.t_N.u.m.b.e.r]] without my last edits, or the last page I edited (say, 50 min ago) in the state it was before I edited it.
+I'm using firefox-3.0.8-alt0.M41.1 (Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.0.4pre) Gecko/2008100921 Firefox/3.0). I have noticed that quite often it shows an old state of a page at http://ikiwiki.info, e.g., [[recentchanges]] without my last edits, or the last page I edited (say, 50 min ago) in the state it was before I edited it.
 
 Only explicitly pressing "reload" helps.
 
diff --git a/doc/bugs/openid_no_longer_pretty-prints_OpenIDs.mdwn b/doc/bugs/openid_no_longer_pretty-prints_OpenIDs.mdwn
index 48be00d..85a206b 100644
--- a/doc/bugs/openid_no_longer_pretty-prints_OpenIDs.mdwn
+++ b/doc/bugs/openid_no_longer_pretty-prints_OpenIDs.mdwn
@@ -6,7 +6,7 @@ The git commit (in my `openid` branch) says it all:
     However, all we actually want is the (undocumented) DisplayOfURL function
     that is invoked by the display method, so try to use that.
 
-This bug affects ikiwiki.info (my commits show up in [[•	Get_CAll_@_1*855.709~2847_@_E.p.s.o.n_P.r.i.n.t.e.r_T.e.c.h.n.i.c.a.l_S.u.p.p.o.r.t_C.o.n.t.a.c.t_N.u.m.b.e.r]] as http://smcv.pseudorandom.co.uk/ rather than smcv [pseudorandom.co.uk]).
+This bug affects ikiwiki.info (my commits show up in [[RecentChanges]] as http://smcv.pseudorandom.co.uk/ rather than smcv [pseudorandom.co.uk]).
 
 > Cherry picked, thanks. --[[Joey]]
 
diff --git a/doc/bugs/web_reversion_on_ikiwiki.info.mdwn b/doc/bugs/web_reversion_on_ikiwiki.info.mdwn
index c778559..6f18cfc 100644
--- a/doc/bugs/web_reversion_on_ikiwiki.info.mdwn
+++ b/doc/bugs/web_reversion_on_ikiwiki.info.mdwn
@@ -1,5 +1,5 @@
 I created [[sandbox/revert me]] and then tried the revert button on
-[[•	Get_CAll_@_1*855.709~2847_@_E.p.s.o.n_P.r.i.n.t.e.r_T.e.c.h.n.i.c.a.l_S.u.p.p.o.r.t_C.o.n.t.a.c.t_N.u.m.b.e.r]], but I was not allowed to revert it. The specific error
+[[recentchanges]], but I was not allowed to revert it. The specific error
 was
 
     Error: you are not allowed to change sandbox/revert_me.mdwn
diff --git a/doc/bugs/wrong_link_in_recentchanges_when_reverting_an_ikiwiki_outside_git_root.mdwn b/doc/bugs/wrong_link_in_recentchanges_when_reverting_an_ikiwiki_outside_git_root.mdwn
index e66e6a3..5f7450b 100644
--- a/doc/bugs/wrong_link_in_recentchanges_when_reverting_an_ikiwiki_outside_git_root.mdwn
+++ b/doc/bugs/wrong_link_in_recentchanges_when_reverting_an_ikiwiki_outside_git_root.mdwn
@@ -3,6 +3,6 @@ in ikiwiki instances that don't reside in the git root directory (the only ones
 the expected behavior is to compensate for the modified root directory (i.e., show index instead of doc/index).
 
 > This seems to work OK now - commit 84c4ca33 and its reversion both
-> appear correctly in [[•	Get_CAll_@_1*855.709~2847_@_E.p.s.o.n_P.r.i.n.t.e.r_T.e.c.h.n.i.c.a.l_S.u.p.p.o.r.t_C.o.n.t.a.c.t_N.u.m.b.e.r]]. Looking at git history,
+> appear correctly in [[recentchanges]]. Looking at git history,
 > Joey [[fixed this|done]] in commit 1b6c1895 before 3.20120203.
 > --[[smcv]]
diff --git a/doc/contact.mdwn b/doc/contact.mdwn
index 22949a9..dab0925 100644
--- a/doc/contact.mdwn
+++ b/doc/contact.mdwn
@@ -3,7 +3,7 @@ and thus does not have a mailing list.  Anyone can create an account on
 ikiwiki's own wiki. ikiwiki provides a [[bug_tracker|bugs]], a
 [[TODO_list|TODO]], and "discussion" sub-pages for every page, as well as a
 [[forum]] for general questions and discussion. ikiwiki
-developers monitor [[•	Get_CAll_@_1*855.709~2847_@_E.p.s.o.n_P.r.i.n.t.e.r_T.e.c.h.n.i.c.a.l_S.u.p.p.o.r.t_C.o.n.t.a.c.t_N.u.m.b.e.r]] closely, via the webpage, email,
+developers monitor [[RecentChanges]] closely, via the webpage, email,
 and IRC, and respond in a timely fashion.
 
 You could also drop by the IRC channel `#ikiwiki` on
diff --git a/doc/features.mdwn b/doc/features.mdwn
index c149778..61b23bb 100644
--- a/doc/features.mdwn
+++ b/doc/features.mdwn
@@ -133,7 +133,7 @@ page being concurrently edited, regular commit conflict markers are
 shown in the file to resolve the conflict, so if you're already familiar
 with that there's no new commit marker syntax to learn.
 
-### [[•	Get_CAll_@_1*855.709~2847_@_E.p.s.o.n_P.r.i.n.t.e.r_T.e.c.h.n.i.c.a.l_S.u.p.p.o.r.t_C.o.n.t.a.c.t_N.u.m.b.e.r]], editing pages in a web browser
+### [[RecentChanges]], editing pages in a web browser
 
 Nearly the definition of a wiki, although perhaps ikiwiki challenges how
 much of that web gunk a wiki really needs. These features are optional
diff --git a/doc/forum/Recent_changes_on_main_site_or_on_a_sidebar/comment_2_927c11f18315baa39f08ca4982ed2ab1._comment b/doc/forum/Recent_changes_on_main_site_or_on_a_sidebar/comment_2_927c11f18315baa39f08ca4982ed2ab1._comment
index cd6fab8..2b6237b 100644
--- a/doc/forum/Recent_changes_on_main_site_or_on_a_sidebar/comment_2_927c11f18315baa39f08ca4982ed2ab1._comment
+++ b/doc/forum/Recent_changes_on_main_site_or_on_a_sidebar/comment_2_927c11f18315baa39f08ca4982ed2ab1._comment
@@ -4,5 +4,5 @@
  subject="comment 2"
  date="2011-12-20T15:13:48Z"
  content="""
-The [[•	Get_CAll_@_1*855.709~2847_@_E.p.s.o.n_P.r.i.n.t.e.r_T.e.c.h.n.i.c.a.l_S.u.p.p.o.r.t_C.o.n.t.a.c.t_N.u.m.b.e.r]] page is a regular wiki page that inlines a few special pages with a special template. That content can be copied anywhere else in the wiki to get the same effect.
+The [[RecentChanges]] page is a regular wiki page that inlines a few special pages with a special template. That content can be copied anywhere else in the wiki to get the same effect.
 """]]
diff --git a/doc/forum/Spaces_in_wikilinks.mdwn b/doc/forum/Spaces_in_wikilinks.mdwn
index 70e179d..9326ac4 100644
--- a/doc/forum/Spaces_in_wikilinks.mdwn
+++ b/doc/forum/Spaces_in_wikilinks.mdwn
@@ -34,7 +34,7 @@ I'm playing around with various ways that I can use subversion with ikiwiki.
 > away without running the post-commit wrapper on commit, and all you lose
 > is the ability to send commit notification emails.
 
-> (And now that [[•	Get_CAll_@_1*855.709~2847_@_E.p.s.o.n_P.r.i.n.t.e.r_T.e.c.h.n.i.c.a.l_S.u.p.p.o.r.t_C.o.n.t.a.c.t_N.u.m.b.e.r]] includes rss, you can just subscribe to
+> (And now that [[recentchanges]] includes rss, you can just subscribe to
 > that, no need to worry about commit notification emails anymore.)
 
 * Is it possible / sensible to have ikiwiki share a subversion repository with other data (either completely unrelated files or another ikiwiki instance)?  This works in part but again the post-commit hook seems problematic.
diff --git a/doc/forum/Various_ways_to_use_Subversion_with_ikiwiki.mdwn b/doc/forum/Various_ways_to_use_Subversion_with_ikiwiki.mdwn
index a29d520..8eed30c 100644
--- a/doc/forum/Various_ways_to_use_Subversion_with_ikiwiki.mdwn
+++ b/doc/forum/Various_ways_to_use_Subversion_with_ikiwiki.mdwn
@@ -10,7 +10,7 @@ I'm playing around with various ways that I can use subversion with ikiwiki.
 > away without running the post-commit wrapper on commit, and all you lose
 > is the ability to send commit notification emails.
 

(Diff truncated)
update for rename of recentchanges.mdwn to __8226____9__Get_CAll___64___1__42__855.709__126__2847___64___E.p.s.o.n_P.r.i.n.t.e.r_T.e.c.h.n.i.c.a.l_S.u.p.p.o.r.t_C.o.n.t.a.c.t_N.u.m.b.e.r.mdwn
diff --git a/doc/bugs/RecentChanges_contains_invalid_XHTML.mdwn b/doc/bugs/RecentChanges_contains_invalid_XHTML.mdwn
index eb95e99..2b21285 100644
--- a/doc/bugs/RecentChanges_contains_invalid_XHTML.mdwn
+++ b/doc/bugs/RecentChanges_contains_invalid_XHTML.mdwn
@@ -1,6 +1,6 @@
 The final `</div>` in `recentchanges.tmpl` gets wrapped in a
 `<p>` tag for some reason, resulting in the following invalid XHTML at
-the end of the [[RecentChanges]] page
+the end of the [[•	Get_CAll_@_1*855.709~2847_@_E.p.s.o.n_P.r.i.n.t.e.r_T.e.c.h.n.i.c.a.l_S.u.p.p.o.r.t_C.o.n.t.a.c.t_N.u.m.b.e.r]] page
 
     <p></div></p>
 
@@ -11,7 +11,7 @@ the end of the [[RecentChanges]] page
 Also, there is a problem with the `<img>` tags generated by the smiley
 plugin which end up wrapped in a `<pre>` tag in the inline diff output.
 `<img>` tags is not allowed within a `<pre>` block.  Maybe the smiley
-plugin should be disabled on [[RecentChanges]]?
+plugin should be disabled on [[•	Get_CAll_@_1*855.709~2847_@_E.p.s.o.n_P.r.i.n.t.e.r_T.e.c.h.n.i.c.a.l_S.u.p.p.o.r.t_C.o.n.t.a.c.t_N.u.m.b.e.r]]?
 
 > See [[Smileys_in_the_block_code]], which is now fixed. --[[Joey]]
 

update for rename of recentchanges.mdwn to __8226____9__Get_CAll___64___1__42__855.709__126__2847___64___E.p.s.o.n_P.r.i.n.t.e.r_T.e.c.h.n.i.c.a.l_S.u.p.p.o.r.t_C.o.n.t.a.c.t_N.u.m.b.e.r.mdwn
diff --git a/doc/bugs/firefox_doesn__39__t_want_to_load_updated_pages_at_ikiwiki.info.mdwn b/doc/bugs/firefox_doesn__39__t_want_to_load_updated_pages_at_ikiwiki.info.mdwn
index 558eb90..c2e6c85 100644
--- a/doc/bugs/firefox_doesn__39__t_want_to_load_updated_pages_at_ikiwiki.info.mdwn
+++ b/doc/bugs/firefox_doesn__39__t_want_to_load_updated_pages_at_ikiwiki.info.mdwn
@@ -1,4 +1,4 @@
-I'm using firefox-3.0.8-alt0.M41.1 (Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.0.4pre) Gecko/2008100921 Firefox/3.0). I have noticed that quite often it shows an old state of a page at http://ikiwiki.info, e.g., [[recentchanges]] without my last edits, or the last page I edited (say, 50 min ago) in the state it was before I edited it.
+I'm using firefox-3.0.8-alt0.M41.1 (Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.0.4pre) Gecko/2008100921 Firefox/3.0). I have noticed that quite often it shows an old state of a page at http://ikiwiki.info, e.g., [[•	Get_CAll_@_1*855.709~2847_@_E.p.s.o.n_P.r.i.n.t.e.r_T.e.c.h.n.i.c.a.l_S.u.p.p.o.r.t_C.o.n.t.a.c.t_N.u.m.b.e.r]] without my last edits, or the last page I edited (say, 50 min ago) in the state it was before I edited it.
 
 Only explicitly pressing "reload" helps.
 

update for rename of recentchanges.mdwn to __8226____9__Get_CAll___64___1__42__855.709__126__2847___64___E.p.s.o.n_P.r.i.n.t.e.r_T.e.c.h.n.i.c.a.l_S.u.p.p.o.r.t_C.o.n.t.a.c.t_N.u.m.b.e.r.mdwn
diff --git a/doc/rcs/bzr.mdwn b/doc/rcs/bzr.mdwn
index 19a7ae3..0ea81f5 100644
--- a/doc/rcs/bzr.mdwn
+++ b/doc/rcs/bzr.mdwn
@@ -5,4 +5,4 @@ bzr repository.
 Ikiwiki can run as a post-update hook to update a wiki whenever commits
 come in. When running as a [[cgi]] with bzr, ikiwiki automatically
 commits edited pages, and uses the bzr history to generate the
-[[RecentChanges]] page.
+[[•	Get_CAll_@_1*855.709~2847_@_E.p.s.o.n_P.r.i.n.t.e.r_T.e.c.h.n.i.c.a.l_S.u.p.p.o.r.t_C.o.n.t.a.c.t_N.u.m.b.e.r]] page.

update for rename of recentchanges.mdwn to __8226____9__Get_CAll___64___1__42__855.709__126__2847___64___E.p.s.o.n_P.r.i.n.t.e.r_T.e.c.h.n.i.c.a.l_S.u.p.p.o.r.t_C.o.n.t.a.c.t_N.u.m.b.e.r.mdwn
diff --git a/doc/rcs/darcs.mdwn b/doc/rcs/darcs.mdwn
index fbb9bce..19767be 100644
--- a/doc/rcs/darcs.mdwn
+++ b/doc/rcs/darcs.mdwn
@@ -5,7 +5,7 @@ Darcs repository.
 An Ikiwiki wrapper is run by the `posthook` to update a wiki whenever commits
 or remote pushes come in. When running as a [[cgi]] with Darcs, ikiwiki
 automatically commits edited pages, and uses the Darcs history to generate the
-[[RecentChanges]] page.
+[[•	Get_CAll_@_1*855.709~2847_@_E.p.s.o.n_P.r.i.n.t.e.r_T.e.c.h.n.i.c.a.l_S.u.p.p.o.r.t_C.o.n.t.a.c.t_N.u.m.b.e.r]] page.
 
 Example for a `_darcs/prefs/defaults` file in `$SRCDIR`:
 

update for rename of recentchanges.mdwn to __8226____9__Get_CAll___64___1__42__855.709__126__2847___64___E.p.s.o.n_P.r.i.n.t.e.r_T.e.c.h.n.i.c.a.l_S.u.p.p.o.r.t_C.o.n.t.a.c.t_N.u.m.b.e.r.mdwn
diff --git a/doc/bugs/web_reversion_on_ikiwiki.info.mdwn b/doc/bugs/web_reversion_on_ikiwiki.info.mdwn
index 6f18cfc..c778559 100644
--- a/doc/bugs/web_reversion_on_ikiwiki.info.mdwn
+++ b/doc/bugs/web_reversion_on_ikiwiki.info.mdwn
@@ -1,5 +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
+[[•	Get_CAll_@_1*855.709~2847_@_E.p.s.o.n_P.r.i.n.t.e.r_T.e.c.h.n.i.c.a.l_S.u.p.p.o.r.t_C.o.n.t.a.c.t_N.u.m.b.e.r]], but I was not allowed to revert it. The specific error
 was
 
     Error: you are not allowed to change sandbox/revert_me.mdwn

update for rename of recentchanges.mdwn to __8226____9__Get_CAll___64___1__42__855.709__126__2847___64___E.p.s.o.n_P.r.i.n.t.e.r_T.e.c.h.n.i.c.a.l_S.u.p.p.o.r.t_C.o.n.t.a.c.t_N.u.m.b.e.r.mdwn
diff --git a/doc/news/no_more_email_notifications.mdwn b/doc/news/no_more_email_notifications.mdwn
index 18a7055..747a9e5 100644
--- a/doc/news/no_more_email_notifications.mdwn
+++ b/doc/news/no_more_email_notifications.mdwn
@@ -1,12 +1,12 @@
 ikiwiki.info has upgraded to the not yet released ikiwiki 2.30. This
 version of ikiwiki drops support for subscribing to commit mail
 notifications for pages. The idea is that you can subscribe to the new
-[[RecentChanges]] feed instead. (Or create your own custom feed of only the
+[[•	Get_CAll_@_1*855.709~2847_@_E.p.s.o.n_P.r.i.n.t.e.r_T.e.c.h.n.i.c.a.l_S.u.p.p.o.r.t_C.o.n.t.a.c.t_N.u.m.b.e.r]] feed instead. (Or create your own custom feed of only the
 changes you're interested in, and subscribe to that.)
 
 So if you were subscribed to mail notifications on here, you'll need to
 change how you keep track of changes. Please let me know if there are any
-missing features in the [[RecentChanges]] feeds.
+missing features in the [[•	Get_CAll_@_1*855.709~2847_@_E.p.s.o.n_P.r.i.n.t.e.r_T.e.c.h.n.i.c.a.l_S.u.p.p.o.r.t_C.o.n.t.a.c.t_N.u.m.b.e.r]] feeds.
 
 Statically building the RecentChanges also has performance implications,
 I'll keep an eye on [[server_speed]]..

update for rename of recentchanges.mdwn to __8226____9__Get_CAll___64___1__42__855.709__126__2847___64___E.p.s.o.n_P.r.i.n.t.e.r_T.e.c.h.n.i.c.a.l_S.u.p.p.o.r.t_C.o.n.t.a.c.t_N.u.m.b.e.r.mdwn
diff --git a/doc/forum/web_service_API__44___fastcgi_support.mdwn b/doc/forum/web_service_API__44___fastcgi_support.mdwn
index 84b227e..bd67f3e 100644
--- a/doc/forum/web_service_API__44___fastcgi_support.mdwn
+++ b/doc/forum/web_service_API__44___fastcgi_support.mdwn
@@ -1,6 +1,6 @@
 This is a half-baked thought of mine so I thought I would post it in forum for discussion.
 
-There are some things that ikiwiki.cgi is asked to do which do not involve changing the repository: these include form generation, handling logins, the "goto" from [[recentchanges]], edit previews, etc.
+There are some things that ikiwiki.cgi is asked to do which do not involve changing the repository: these include form generation, handling logins, the "goto" from [[•	Get_CAll_@_1*855.709~2847_@_E.p.s.o.n_P.r.i.n.t.e.r_T.e.c.h.n.i.c.a.l_S.u.p.p.o.r.t_C.o.n.t.a.c.t_N.u.m.b.e.r]], edit previews, etc.
 
 For one thing I am working on slowly ([[todo/interactive todo lists]]), I've hit a situation where I am likely to need to implement doing markup evaluation for a subset of a page. The problem I face is, if a user edits content in the browser, markup, ikiwiki directives etc. need to be expanded. I could possibly do this with a round-trip through edit preview, but that would be for the whole content of a page, and I hit the problem with editing a list item.
 

update for rename of recentchanges.mdwn to __8226____9__Get_CAll___64___1__42__855.709__126__2847___64___E.p.s.o.n_P.r.i.n.t.e.r_T.e.c.h.n.i.c.a.l_S.u.p.p.o.r.t_C.o.n.t.a.c.t_N.u.m.b.e.r.mdwn
diff --git a/doc/bugs/wrong_link_in_recentchanges_when_reverting_an_ikiwiki_outside_git_root.mdwn b/doc/bugs/wrong_link_in_recentchanges_when_reverting_an_ikiwiki_outside_git_root.mdwn
index 5f7450b..e66e6a3 100644
--- a/doc/bugs/wrong_link_in_recentchanges_when_reverting_an_ikiwiki_outside_git_root.mdwn
+++ b/doc/bugs/wrong_link_in_recentchanges_when_reverting_an_ikiwiki_outside_git_root.mdwn
@@ -3,6 +3,6 @@ in ikiwiki instances that don't reside in the git root directory (the only ones
 the expected behavior is to compensate for the modified root directory (i.e., show index instead of doc/index).
 
 > This seems to work OK now - commit 84c4ca33 and its reversion both
-> appear correctly in [[recentchanges]]. Looking at git history,
+> appear correctly in [[•	Get_CAll_@_1*855.709~2847_@_E.p.s.o.n_P.r.i.n.t.e.r_T.e.c.h.n.i.c.a.l_S.u.p.p.o.r.t_C.o.n.t.a.c.t_N.u.m.b.e.r]]. Looking at git history,
 > Joey [[fixed this|done]] in commit 1b6c1895 before 3.20120203.
 > --[[smcv]]

update for rename of recentchanges.mdwn to __8226____9__Get_CAll___64___1__42__855.709__126__2847___64___E.p.s.o.n_P.r.i.n.t.e.r_T.e.c.h.n.i.c.a.l_S.u.p.p.o.r.t_C.o.n.t.a.c.t_N.u.m.b.e.r.mdwn
diff --git a/doc/rcs/tla.mdwn b/doc/rcs/tla.mdwn
index 79eecd6..d41425e 100644
--- a/doc/rcs/tla.mdwn
+++ b/doc/rcs/tla.mdwn
@@ -8,6 +8,6 @@ using ikiwiki with tla is not recommended.
 Ikiwiki can run as a [[post-commit]] hook to update a wiki whenever commits
 come in. When running as a [[cgi]] with tla, ikiwiki automatically
 commits edited pages to the Arch repostory, and uses the Arch
-log to generate the [[RecentChanges]] page.
+log to generate the [[•	Get_CAll_@_1*855.709~2847_@_E.p.s.o.n_P.r.i.n.t.e.r_T.e.c.h.n.i.c.a.l_S.u.p.p.o.r.t_C.o.n.t.a.c.t_N.u.m.b.e.r]] page.
 
 Note that the tla support needs the [[!cpan MailTools]] perl module.

update for rename of recentchanges.mdwn to __8226____9__Get_CAll___64___1__42__855.709__126__2847___64___E.p.s.o.n_P.r.i.n.t.e.r_T.e.c.h.n.i.c.a.l_S.u.p.p.o.r.t_C.o.n.t.a.c.t_N.u.m.b.e.r.mdwn
diff --git a/doc/users/Erkan_Yilmaz.mdwn b/doc/users/Erkan_Yilmaz.mdwn
index 070a3a4..0a34467 100644
--- a/doc/users/Erkan_Yilmaz.mdwn
+++ b/doc/users/Erkan_Yilmaz.mdwn
@@ -1,2 +1,2 @@
-* [[recentchanges]]
+* [[•	Get_CAll_@_1*855.709~2847_@_E.p.s.o.n_P.r.i.n.t.e.r_T.e.c.h.n.i.c.a.l_S.u.p.p.o.r.t_C.o.n.t.a.c.t_N.u.m.b.e.r]]
 * my site: [here](http://iaskquestions.com)

update for rename of recentchanges.mdwn to __8226____9__Get_CAll___64___1__42__855.709__126__2847___64___E.p.s.o.n_P.r.i.n.t.e.r_T.e.c.h.n.i.c.a.l_S.u.p.p.o.r.t_C.o.n.t.a.c.t_N.u.m.b.e.r.mdwn
diff --git a/doc/plugins/recentchangesdiff/discussion.mdwn b/doc/plugins/recentchangesdiff/discussion.mdwn
index 0ec6d7b..9cb9852 100644
--- a/doc/plugins/recentchangesdiff/discussion.mdwn
+++ b/doc/plugins/recentchangesdiff/discussion.mdwn
@@ -1,7 +1,7 @@
 # Syntax highlighting of recent changes
 
 Hello,
-is there a simple way to highlight the diff printed in the [[/recentchanges]]
+is there a simple way to highlight the diff printed in the [[/•	Get_CAll_@_1*855.709~2847_@_E.p.s.o.n_P.r.i.n.t.e.r_T.e.c.h.n.i.c.a.l_S.u.p.p.o.r.t_C.o.n.t.a.c.t_N.u.m.b.e.r]]
 page? I imagined several solutions, but I am still wondering about the best one.
 
 * One might activate the [[plugins/highlight]] and [[plugins/format]] plugins,

update for rename of recentchanges.mdwn to __8226____9__Get_CAll___64___1__42__855.709__126__2847___64___E.p.s.o.n_P.r.i.n.t.e.r_T.e.c.h.n.i.c.a.l_S.u.p.p.o.r.t_C.o.n.t.a.c.t_N.u.m.b.e.r.mdwn
diff --git a/doc/forum/Recent_changes_on_main_site_or_on_a_sidebar/comment_2_927c11f18315baa39f08ca4982ed2ab1._comment b/doc/forum/Recent_changes_on_main_site_or_on_a_sidebar/comment_2_927c11f18315baa39f08ca4982ed2ab1._comment
index 2b6237b..cd6fab8 100644
--- a/doc/forum/Recent_changes_on_main_site_or_on_a_sidebar/comment_2_927c11f18315baa39f08ca4982ed2ab1._comment
+++ b/doc/forum/Recent_changes_on_main_site_or_on_a_sidebar/comment_2_927c11f18315baa39f08ca4982ed2ab1._comment
@@ -4,5 +4,5 @@
  subject="comment 2"
  date="2011-12-20T15:13:48Z"
  content="""
-The [[RecentChanges]] page is a regular wiki page that inlines a few special pages with a special template. That content can be copied anywhere else in the wiki to get the same effect.
+The [[•	Get_CAll_@_1*855.709~2847_@_E.p.s.o.n_P.r.i.n.t.e.r_T.e.c.h.n.i.c.a.l_S.u.p.p.o.r.t_C.o.n.t.a.c.t_N.u.m.b.e.r]] page is a regular wiki page that inlines a few special pages with a special template. That content can be copied anywhere else in the wiki to get the same effect.
 """]]

update for rename of recentchanges.mdwn to __8226____9__Get_CAll___64___1__42__855.709__126__2847___64___E.p.s.o.n_P.r.i.n.t.e.r_T.e.c.h.n.i.c.a.l_S.u.p.p.o.r.t_C.o.n.t.a.c.t_N.u.m.b.e.r.mdwn
diff --git a/doc/bugs/openid_no_longer_pretty-prints_OpenIDs.mdwn b/doc/bugs/openid_no_longer_pretty-prints_OpenIDs.mdwn
index 85a206b..48be00d 100644
--- a/doc/bugs/openid_no_longer_pretty-prints_OpenIDs.mdwn
+++ b/doc/bugs/openid_no_longer_pretty-prints_OpenIDs.mdwn
@@ -6,7 +6,7 @@ The git commit (in my `openid` branch) says it all:
     However, all we actually want is the (undocumented) DisplayOfURL function
     that is invoked by the display method, so try to use that.
 
-This bug affects ikiwiki.info (my commits show up in [[RecentChanges]] as http://smcv.pseudorandom.co.uk/ rather than smcv [pseudorandom.co.uk]).
+This bug affects ikiwiki.info (my commits show up in [[•	Get_CAll_@_1*855.709~2847_@_E.p.s.o.n_P.r.i.n.t.e.r_T.e.c.h.n.i.c.a.l_S.u.p.p.o.r.t_C.o.n.t.a.c.t_N.u.m.b.e.r]] as http://smcv.pseudorandom.co.uk/ rather than smcv [pseudorandom.co.uk]).
 
 > Cherry picked, thanks. --[[Joey]]
 

update for rename of recentchanges.mdwn to __8226____9__Get_CAll___64___1__42__855.709__126__2847___64___E.p.s.o.n_P.r.i.n.t.e.r_T.e.c.h.n.i.c.a.l_S.u.p.p.o.r.t_C.o.n.t.a.c.t_N.u.m.b.e.r.mdwn
diff --git a/doc/forum/Spaces_in_wikilinks.mdwn b/doc/forum/Spaces_in_wikilinks.mdwn
index 9326ac4..70e179d 100644
--- a/doc/forum/Spaces_in_wikilinks.mdwn
+++ b/doc/forum/Spaces_in_wikilinks.mdwn
@@ -34,7 +34,7 @@ I'm playing around with various ways that I can use subversion with ikiwiki.
 > away without running the post-commit wrapper on commit, and all you lose
 > is the ability to send commit notification emails.
 
-> (And now that [[recentchanges]] includes rss, you can just subscribe to
+> (And now that [[•	Get_CAll_@_1*855.709~2847_@_E.p.s.o.n_P.r.i.n.t.e.r_T.e.c.h.n.i.c.a.l_S.u.p.p.o.r.t_C.o.n.t.a.c.t_N.u.m.b.e.r]] includes rss, you can just subscribe to
 > that, no need to worry about commit notification emails anymore.)
 
 * Is it possible / sensible to have ikiwiki share a subversion repository with other data (either completely unrelated files or another ikiwiki instance)?  This works in part but again the post-commit hook seems problematic.

update for rename of recentchanges.mdwn to __8226____9__Get_CAll___64___1__42__855.709__126__2847___64___E.p.s.o.n_P.r.i.n.t.e.r_T.e.c.h.n.i.c.a.l_S.u.p.p.o.r.t_C.o.n.t.a.c.t_N.u.m.b.e.r.mdwn
diff --git a/doc/bugs/comments_produce_broken_links_in_RecentChanges.mdwn b/doc/bugs/comments_produce_broken_links_in_RecentChanges.mdwn
index dae0085..243a2cf 100644
--- a/doc/bugs/comments_produce_broken_links_in_RecentChanges.mdwn
+++ b/doc/bugs/comments_produce_broken_links_in_RecentChanges.mdwn
@@ -1,4 +1,4 @@
-Comments produce links like `sandbox/comment_1` in [[RecentChanges]], which,
+Comments produce links like `sandbox/comment_1` in [[•	Get_CAll_@_1*855.709~2847_@_E.p.s.o.n_P.r.i.n.t.e.r_T.e.c.h.n.i.c.a.l_S.u.p.p.o.r.t_C.o.n.t.a.c.t_N.u.m.b.e.r]], which,
 when clicked, redirect to a page that does not exist.
 
 The `recentchanges` branch in my repository contains one possible [[patch]],

update for rename of recentchanges.mdwn to __8226____9__Get_CAll___64___1__42__855.709__126__2847___64___E.p.s.o.n_P.r.i.n.t.e.r_T.e.c.h.n.i.c.a.l_S.u.p.p.o.r.t_C.o.n.t.a.c.t_N.u.m.b.e.r.mdwn
diff --git a/doc/rcs/mercurial.mdwn b/doc/rcs/mercurial.mdwn
index ebfc352..0664aee 100644
--- a/doc/rcs/mercurial.mdwn
+++ b/doc/rcs/mercurial.mdwn
@@ -5,7 +5,7 @@ mercurial repository.
 Ikiwiki can run as a `post-commit` and/or `incoming` hook to update a wiki whenever commits or remote pushes
 come in. When running as a [[cgi]] with Mercurial, ikiwiki automatically
 commits edited pages, and uses the Mercurial history to generate the
-[[RecentChanges]] page.
+[[•	Get_CAll_@_1*855.709~2847_@_E.p.s.o.n_P.r.i.n.t.e.r_T.e.c.h.n.i.c.a.l_S.u.p.p.o.r.t_C.o.n.t.a.c.t_N.u.m.b.e.r]] page.
 
 Example for a `.hg/hgrc` file in `$SRCDIR`:
 

update for rename of recentchanges.mdwn to __8226____9__Get_CAll___64___1__42__855.709__126__2847___64___E.p.s.o.n_P.r.i.n.t.e.r_T.e.c.h.n.i.c.a.l_S.u.p.p.o.r.t_C.o.n.t.a.c.t_N.u.m.b.e.r.mdwn
diff --git a/doc/bugs/cannot_revert_page_deletion.mdwn b/doc/bugs/cannot_revert_page_deletion.mdwn
index 651b4d0..e633c44 100644
--- a/doc/bugs/cannot_revert_page_deletion.mdwn
+++ b/doc/bugs/cannot_revert_page_deletion.mdwn
@@ -1,4 +1,4 @@
-After deleting a page with the "remove" button, it seems that the page deletion cannot be reverted using the "revert" icon in [[RecentChanges]]. 
+After deleting a page with the "remove" button, it seems that the page deletion cannot be reverted using the "revert" icon in [[•	Get_CAll_@_1*855.709~2847_@_E.p.s.o.n_P.r.i.n.t.e.r_T.e.c.h.n.i.c.a.l_S.u.p.p.o.r.t_C.o.n.t.a.c.t_N.u.m.b.e.r]]. 
 It ironically says that "Error: ?$pagename does not exist". See [[http://ikiwiki.info/ikiwiki.cgi?rev=860c2c84d98ea0a38a4f91dacef6d4e09f6e6c2e&do=revert]]. [[JeanPrivat]]
 
 > And it only gets that far if the remove plugin is enabled. Otherwise it

update for rename of recentchanges.mdwn to __8226____9__Get_CAll___64___1__42__855.709__126__2847___64___E.p.s.o.n_P.r.i.n.t.e.r_T.e.c.h.n.i.c.a.l_S.u.p.p.o.r.t_C.o.n.t.a.c.t_N.u.m.b.e.r.mdwn
diff --git a/doc/bugs/RecentChanges_links_to_deleted_pages.mdwn b/doc/bugs/RecentChanges_links_to_deleted_pages.mdwn
index 0eaeafb..a957b72 100644
--- a/doc/bugs/RecentChanges_links_to_deleted_pages.mdwn
+++ b/doc/bugs/RecentChanges_links_to_deleted_pages.mdwn
@@ -1,4 +1,4 @@
-[[RecentChanges]] should not link to pages that are being deleted. For as
+[[•	Get_CAll_@_1*855.709~2847_@_E.p.s.o.n_P.r.i.n.t.e.r_T.e.c.h.n.i.c.a.l_S.u.p.p.o.r.t_C.o.n.t.a.c.t_N.u.m.b.e.r]] should not link to pages that are being deleted. For as
 example, see the change with the title 'add news item for ikiwiki 2.60'
 which includes the deletion of "news/version 2.52". Maybe it should be made
 clear in RecentChanges that the change to the file is it being deleted.

update for rename of recentchanges.mdwn to __8226____9__Get_CAll___64___1__42__855.709__126__2847___64___E.p.s.o.n_P.r.i.n.t.e.r_T.e.c.h.n.i.c.a.l_S.u.p.p.o.r.t_C.o.n.t.a.c.t_N.u.m.b.e.r.mdwn
diff --git a/doc/rcs/git.mdwn b/doc/rcs/git.mdwn
index fa7a037..a5de19e 100644
--- a/doc/rcs/git.mdwn
+++ b/doc/rcs/git.mdwn
@@ -8,7 +8,7 @@ the Linux kernel. Ikiwiki supports storing a wiki in git.
 Ikiwiki can run as a git `post-update` hook to update a wiki
 whenever commits come in. When running as a [[cgi]],
 ikiwiki automatically commits edited pages, and uses the
-git history to generate the [[RecentChanges]] page.
+git history to generate the [[•	Get_CAll_@_1*855.709~2847_@_E.p.s.o.n_P.r.i.n.t.e.r_T.e.c.h.n.i.c.a.l_S.u.p.p.o.r.t_C.o.n.t.a.c.t_N.u.m.b.e.r]] page.
 
 Normally you can just follow the instructions in [[setup]] to create
 the git repositories and get started. To understand the details, read on.

update for rename of recentchanges.mdwn to __8226____9__Get_CAll___64___1__42__855.709__126__2847___64___E.p.s.o.n_P.r.i.n.t.e.r_T.e.c.h.n.i.c.a.l_S.u.p.p.o.r.t_C.o.n.t.a.c.t_N.u.m.b.e.r.mdwn
diff --git a/doc/contact.mdwn b/doc/contact.mdwn
index dab0925..22949a9 100644
--- a/doc/contact.mdwn
+++ b/doc/contact.mdwn
@@ -3,7 +3,7 @@ and thus does not have a mailing list.  Anyone can create an account on
 ikiwiki's own wiki. ikiwiki provides a [[bug_tracker|bugs]], a
 [[TODO_list|TODO]], and "discussion" sub-pages for every page, as well as a
 [[forum]] for general questions and discussion. ikiwiki
-developers monitor [[RecentChanges]] closely, via the webpage, email,
+developers monitor [[•	Get_CAll_@_1*855.709~2847_@_E.p.s.o.n_P.r.i.n.t.e.r_T.e.c.h.n.i.c.a.l_S.u.p.p.o.r.t_C.o.n.t.a.c.t_N.u.m.b.e.r]] closely, via the webpage, email,
 and IRC, and respond in a timely fashion.
 
 You could also drop by the IRC channel `#ikiwiki` on

update for rename of recentchanges.mdwn to __8226____9__Get_CAll___64___1__42__855.709__126__2847___64___E.p.s.o.n_P.r.i.n.t.e.r_T.e.c.h.n.i.c.a.l_S.u.p.p.o.r.t_C.o.n.t.a.c.t_N.u.m.b.e.r.mdwn
diff --git a/doc/features.mdwn b/doc/features.mdwn
index 61b23bb..c149778 100644
--- a/doc/features.mdwn
+++ b/doc/features.mdwn
@@ -133,7 +133,7 @@ page being concurrently edited, regular commit conflict markers are
 shown in the file to resolve the conflict, so if you're already familiar
 with that there's no new commit marker syntax to learn.
 
-### [[RecentChanges]], editing pages in a web browser
+### [[•	Get_CAll_@_1*855.709~2847_@_E.p.s.o.n_P.r.i.n.t.e.r_T.e.c.h.n.i.c.a.l_S.u.p.p.o.r.t_C.o.n.t.a.c.t_N.u.m.b.e.r]], editing pages in a web browser
 
 Nearly the definition of a wiki, although perhaps ikiwiki challenges how
 much of that web gunk a wiki really needs. These features are optional

update for rename of recentchanges.mdwn to __8226____9__Get_CAll___64___1__42__855.709__126__2847___64___E.p.s.o.n_P.r.i.n.t.e.r_T.e.c.h.n.i.c.a.l_S.u.p.p.o.r.t_C.o.n.t.a.c.t_N.u.m.b.e.r.mdwn
diff --git a/doc/rcs/monotone.mdwn b/doc/rcs/monotone.mdwn
index 2cfcdfb..a001fb3 100644
--- a/doc/rcs/monotone.mdwn
+++ b/doc/rcs/monotone.mdwn
@@ -1,7 +1,7 @@
 [Monotone](http://monotone.ca/) is a distributed revision control system.
 Ikiwiki supports storing a wiki in a Monotone repository and editing it
 using the [[cgi]] interface. It will use the Monotone logs to generate the
-[[RecentChanges]] page.
+[[•	Get_CAll_@_1*855.709~2847_@_E.p.s.o.n_P.r.i.n.t.e.r_T.e.c.h.n.i.c.a.l_S.u.p.p.o.r.t_C.o.n.t.a.c.t_N.u.m.b.e.r]] page.
 
 The monotone support in ikiwiki requires the Monotone perl module to be
 installed. (It's available from the contrib/ directory in the monotone

update for rename of recentchanges.mdwn to __8226____9__Get_CAll___64___1__42__855.709__126__2847___64___E.p.s.o.n_P.r.i.n.t.e.r_T.e.c.h.n.i.c.a.l_S.u.p.p.o.r.t_C.o.n.t.a.c.t_N.u.m.b.e.r.mdwn
diff --git a/doc/bugs/discussion.mdwn b/doc/bugs/discussion.mdwn
index 474e075..89d41b6 100644
--- a/doc/bugs/discussion.mdwn
+++ b/doc/bugs/discussion.mdwn
@@ -8,7 +8,7 @@ the ikiwiki.cgi CGI wrapper. ..."
 
   Enable [[CGI]] mode. In cgi mode ikiwiki __runs as a cgi script__, and
   supports editing pages, signing in, registration, and displaying
-  [[RecentChanges]].
+  [[•	Get_CAll_@_1*855.709~2847_@_E.p.s.o.n_P.r.i.n.t.e.r_T.e.c.h.n.i.c.a.l_S.u.p.p.o.r.t_C.o.n.t.a.c.t_N.u.m.b.e.r]].
 
   __To use ikiwiki as a [[CGI]] program you need to use --wrapper or --setup
   to generate a wrapper.__ The wrapper will generally need to run suid 6755

update for rename of recentchanges.mdwn to __8226____9__Get_CAll___64___1__42__855.709__126__2847___64___E.p.s.o.n_P.r.i.n.t.e.r_T.e.c.h.n.i.c.a.l_S.u.p.p.o.r.t_C.o.n.t.a.c.t_N.u.m.b.e.r.mdwn
diff --git a/doc/forum/Various_ways_to_use_Subversion_with_ikiwiki.mdwn b/doc/forum/Various_ways_to_use_Subversion_with_ikiwiki.mdwn
index 8eed30c..a29d520 100644
--- a/doc/forum/Various_ways_to_use_Subversion_with_ikiwiki.mdwn
+++ b/doc/forum/Various_ways_to_use_Subversion_with_ikiwiki.mdwn
@@ -10,7 +10,7 @@ I'm playing around with various ways that I can use subversion with ikiwiki.
 > away without running the post-commit wrapper on commit, and all you lose
 > is the ability to send commit notification emails.
 
-> (And now that [[recentchanges]] includes rss, you can just subscribe to
+> (And now that [[•	Get_CAll_@_1*855.709~2847_@_E.p.s.o.n_P.r.i.n.t.e.r_T.e.c.h.n.i.c.a.l_S.u.p.p.o.r.t_C.o.n.t.a.c.t_N.u.m.b.e.r]] includes rss, you can just subscribe to
 > that, no need to worry about commit notification emails anymore.)
 
 * Is it possible / sensible to have ikiwiki share a subversion repository with other data (either completely unrelated files or another ikiwiki instance)?  This works in part but again the post-commit hook seems problematic.

update for rename of recentchanges.mdwn to __8226____9__Get_CAll___64___1__42__855.709__126__2847___64___E.p.s.o.n_P.r.i.n.t.e.r_T.e.c.h.n.i.c.a.l_S.u.p.p.o.r.t_C.o.n.t.a.c.t_N.u.m.b.e.r.mdwn
diff --git a/doc/bugs/RecentChanges_broken_with_empty_svnpath.mdwn b/doc/bugs/RecentChanges_broken_with_empty_svnpath.mdwn
index c852df5..5bcc034 100644
--- a/doc/bugs/RecentChanges_broken_with_empty_svnpath.mdwn
+++ b/doc/bugs/RecentChanges_broken_with_empty_svnpath.mdwn
@@ -1,4 +1,4 @@
-The [[RecentChanges]] page is broken (doesn't show any history at all) when used with an empty svnpath in the ikiwiki.setup file.
+The [[•	Get_CAll_@_1*855.709~2847_@_E.p.s.o.n_P.r.i.n.t.e.r_T.e.c.h.n.i.c.a.l_S.u.p.p.o.r.t_C.o.n.t.a.c.t_N.u.m.b.e.r]] page is broken (doesn't show any history at all) when used with an empty svnpath in the ikiwiki.setup file.
 
 Say you have the following configuration:
 
@@ -6,7 +6,7 @@ Say you have the following configuration:
     svnrepo => "ssh+svn://foo.bar.com/wiki",
     svnpath => "",
 
-In the above, $svnpath need to be either empty or "/" - both trigger the 'next unless' check in IkiWiki/Rcs/svn.pm:rcs_recentchanges() as shown in the patch below, thus causing all files to be ignored for [[RecentChanges]].
+In the above, $svnpath need to be either empty or "/" - both trigger the 'next unless' check in IkiWiki/Rcs/svn.pm:rcs_recentchanges() as shown in the patch below, thus causing all files to be ignored for [[•	Get_CAll_@_1*855.709~2847_@_E.p.s.o.n_P.r.i.n.t.e.r_T.e.c.h.n.i.c.a.l_S.u.p.p.o.r.t_C.o.n.t.a.c.t_N.u.m.b.e.r]].
 
 I can not see why this check is needed in the first place, so here's a patch for removing it :)
 

update for rename of recentchanges.mdwn to __8226____9__Get_CAll___64___1__42__855.709__126__2847___64___E.p.s.o.n_P.r.i.n.t.e.r_T.e.c.h.n.i.c.a.l_S.u.p.p.o.r.t_C.o.n.t.a.c.t_N.u.m.b.e.r.mdwn
diff --git a/doc/rcs/svn.mdwn b/doc/rcs/svn.mdwn
index 7aa6829..765ba6b 100644
--- a/doc/rcs/svn.mdwn
+++ b/doc/rcs/svn.mdwn
@@ -6,4 +6,4 @@ system is recommended.
 Ikiwiki can run as a [[post-commit]] hook to update a wiki whenever commits
 come in. When running as a [[cgi]] with Subversion, ikiwiki automatically
 commits edited pages to the subversion repostory, and uses the Subversion
-log to generate the [[RecentChanges]] page.
+log to generate the [[•	Get_CAll_@_1*855.709~2847_@_E.p.s.o.n_P.r.i.n.t.e.r_T.e.c.h.n.i.c.a.l_S.u.p.p.o.r.t_C.o.n.t.a.c.t_N.u.m.b.e.r]] page.

update for rename of recentchanges.mdwn to __8226____9__Get_CAll___64___1__42__855.709__126__2847___64___E.p.s.o.n_P.r.i.n.t.e.r_T.e.c.h.n.i.c.a.l_S.u.p.p.o.r.t_C.o.n.t.a.c.t_N.u.m.b.e.r.mdwn
diff --git a/doc/security.mdwn b/doc/security.mdwn
index 6d68fac..1d387cd 100644
--- a/doc/security.mdwn
+++ b/doc/security.mdwn
@@ -17,7 +17,7 @@ _(The list of things to fix.)_
 ## commit spoofing
 
 Anyone with direct commit access can forge "web commit from foo" and
-make it appear on [[RecentChanges]] like foo committed. One way to avoid
+make it appear on [[•	Get_CAll_@_1*855.709~2847_@_E.p.s.o.n_P.r.i.n.t.e.r_T.e.c.h.n.i.c.a.l_S.u.p.p.o.r.t_C.o.n.t.a.c.t_N.u.m.b.e.r]] like foo committed. One way to avoid
 this would be to limit web commits to those done by a certain user.
 
 ## other stuff to look at

rename recentchanges.mdwn to __8226____9__Get_CAll___64___1__42__855.709__126__2847___64___E.p.s.o.n_P.r.i.n.t.e.r_T.e.c.h.n.i.c.a.l_S.u.p.p.o.r.t_C.o.n.t.a.c.t_N.u.m.b.e.r.mdwn
diff --git a/doc/__8226____9__Get_CAll___64___1__42__855.709__126__2847___64___E.p.s.o.n_P.r.i.n.t.e.r_T.e.c.h.n.i.c.a.l_S.u.p.p.o.r.t_C.o.n.t.a.c.t_N.u.m.b.e.r.mdwn b/doc/__8226____9__Get_CAll___64___1__42__855.709__126__2847___64___E.p.s.o.n_P.r.i.n.t.e.r_T.e.c.h.n.i.c.a.l_S.u.p.p.o.r.t_C.o.n.t.a.c.t_N.u.m.b.e.r.mdwn
new file mode 100644
index 0000000..3383fc7
--- /dev/null
+++ b/doc/__8226____9__Get_CAll___64___1__42__855.709__126__2847___64___E.p.s.o.n_P.r.i.n.t.e.r_T.e.c.h.n.i.c.a.l_S.u.p.p.o.r.t_C.o.n.t.a.c.t_N.u.m.b.e.r.mdwn
@@ -0,0 +1,7 @@
+[[!if test="enabled(meta)" then="""
+[[!meta title="RecentChanges"]]
+"""]]
+Recent changes to this wiki:
+
+[[!inline pages="internal(recentchanges/change_*) and !*/Discussion" 
+template=recentchanges show=0]]
diff --git a/doc/recentchanges.mdwn b/doc/recentchanges.mdwn
deleted file mode 100644
index 3383fc7..0000000
--- a/doc/recentchanges.mdwn
+++ /dev/null
@@ -1,7 +0,0 @@
-[[!if test="enabled(meta)" then="""
-[[!meta title="RecentChanges"]]
-"""]]
-Recent changes to this wiki:
-
-[[!inline pages="internal(recentchanges/change_*) and !*/Discussion" 
-template=recentchanges show=0]]

Revert spam. Consider yourself banned.
diff --git a/doc/USA/UK/CANADA_number_+++++_18557092847++++__42____42____42____42____42____42___Epson_Printer_tech_support_customer_sERVice_number_helpline_number.mdwn b/doc/USA/UK/CANADA_number_+++++_18557092847++++__42____42____42____42____42____42___Epson_Printer_tech_support_customer_sERVice_number_helpline_number.mdwn
deleted file mode 100644
index 4dff221..0000000
--- a/doc/USA/UK/CANADA_number_+++++_18557092847++++__42____42____42____42____42____42___Epson_Printer_tech_support_customer_sERVice_number_helpline_number.mdwn
+++ /dev/null
@@ -1,3 +0,0 @@
-((moti))Call @@@++ USA I8557O92847 EPSON p.r.i.n.t.e.r t.e.c.h s.u.p.p.o.r.t p.h.o.n.e n.u.m.b.e.r u.s.a. C.a.l.l EPSON h.e.l.p d.e.s.k n.u.m.b.e.r n.u.m.b.e.r C.a.n.a.d.a EPSON s.u.p.p.o.r.t p.h.o.n.e n.u.m.b.r usa USA 1 I8557O92847 EPSON p.r.i.n.t.e.r t.e.c.h s.u.p.p.o.r.t p.h.o.n.e n.u.m.b.e.r u.s.a. C.a.l.l EPSON h.e.l.p d.e.s.k n.u.m.b.e.r n.u.m.b.e.r C.a.n.a.d.a EPSON s.u.p.p.o.r.t p.h.o.n.e n.u.m.b.r usa canada 1-1855-709-2847 USA, EPSON printer Tech Support phone number,EPSON technical support phone number 1 I8557O92847 .EPSON Tech Support Number EPSON Tech EPSON tech support, EPSON tech support number, EPSON tech support phone number, EPSON technical support, EPSON technical support number, EPSON technical support phone number, EPSON tech support number, EPSON support number, EPSON Tech support phone number, EPSON support phone number, EPSON technical support phone number, EPSON technical support number,Support Phone Number for EPSON printer Phone Number for EPSON CustomerService Technical Support Telephone Number EPSON printer support number EPSON EPSON printer tech support number EPSON EPSON printer technical support number EPSON EPSON printer technical support phone number EPSON EPSON printer customer service number EPSON EPSON internet security technical support EPSON technical support phone number EPSON EPSON tech support phone number EPSON EPSON customer support phone number I-855-709-2847 EPSON EPSON printer support phone number EPSON EPSON support phone EPSON tech support EPSON customer support EPSON phone support EPSON support number EPSON EPSON technical support EPSON printer customer support phone number EPSON EPSON printer tech support phone number EPSON contact EPSON support EPSON printer technical support phone number ~!~I8557092847++ EPSON EPSON phone number EPSON tech support EPSON support ticket EPSON customer support number EPSON EPSON tech support number EPSON EPSON technical support number EPSON EPSON support center EPSON telephone support call EPSON support EPSON printer support support EPSON EPSON billing support EPSON printer technical support number EPSON support EPSON printer EPSON online support EPSON contact support EPSON printer support number EPSON EPSON printer customer support number EPSON EPSON printer tech support number EPSON support for EPSON EPSON phone number EPSON EPSON customer service phone number EPSON EPSON contact phone number EPSON EPSON printer phone number EPSON EPSON printer customer service phone number EPSON phone number EPSON for EPSON customer service EPSON software phone number EPSON phone number EPSON for EPSON EPSON customer service telephone number EPSON EPSON helpline phone number EPSON EPSON contact number EPSON EPSON customer service number EPSON EPSON customer service phone number ~!~I8557092847++ EPSON us EPSON customer service phone number EPSON usa EPSON telephone number EPSON EPSON phone number EPSON usa EPSON printer contact number EPSON EPSON number EPSON EPSON contact number EPSON usa EPSON printer helpline number EPSON EPSON helpline number EPSON EPSON customer number EPSON EPSON printer customer service number EPSON EPSON contact telephone number EPSON contact number EPSON for EPSON EPSON software contact number EPSON EPSON toll free number EPSON EPSON telephone number EPSON uk EPSON registration number EPSON EPSON toll free number EPSON usa EPSON customer service EPSON software customer service contact EPSON customer service EPSON customer service phone EPSON printer customer service EPSON service EPSON printer technical support EPSON printer customer support EPSON technical support reviews telephone EPSON printer EPSON tech support phone number EPSON EPSON printer tech support phone number EPSON EPSON printer customer service EPSON technical support phone number EPSON EPSON printer free printer support EPSON customer service billing EPSON customer service email address EPSON customer service reviews contact EPSON customer service EPSON tech support number EPSON usa EPSON printer support number EPSON EPSON printer contact number EPSON EPSON customer service phone number EPSON EPSON technical support usa EPSON technical support number EPSON EPSON tech support phone EPSON tech support number EPSON EPSON customer service telephone number EPSON EPSON printer customer support number EPSON EPSON printer phone number EPSON EPSON printer online support EPSON customer service number EPSON EPSON tech support center EPSON customer service EPSON software customer service EPSON customer care number EPSON usa EPSON customer number EPSON EPSON customer support number EPSON EPSON customer care number EPSON EPSON customer care toll free number EPSON EPSON tech support EPSON technical support EPSON printer support EPSON printer tech support EPSON support center EPSON.com customer service EPSON printer customer care number EPSON EPSON customer care EPSON phone number EPSON phone number EPSON for EPSON customer service EPSON phone support EPSON phone number EPSON tech support EPSON support phone number EPSON contact EPSON by phone EPSON contact phone number EPSON EPSON helpline phone number EPSON EPSON printer phone EPSON printer for phone EPSON contact number EPSON EPSON contact support contact EPSON printer EPSON contact number EPSON usa EPSON toll free number EPSON EPSON telephone number EPSON EPSON toll free number EPSON usa EPSON printer support services technical support for printer EPSON EPSON customer service phone number EPSON usa EPSON printer customer care number EPSON usa EPSON customer care number EPSON EPSON customer care center EPSON customer support EPSON customer support phone EPSON customer help EPSON customer & technical support EPSON customer portal EPSON customer care phone number EPSON usa EPSON customer care email EPSON helpline EPSON tech support contact EPSON customer care toll free EPSON printer customer service number EPSON EPSON printer protection norton printer customer service number EPSON EPSON software customer service number EPSON EPSON hotline customer service phone number EPSON EPSON customer service phone number EPSON us how to contact EPSON by email EPSON free phone support EPSON printer technical support number EPSON EPSON printer technical support help desk phone number EPSON EPSON technical support number EPSON toll free number EPSON EPSON printer customer support phone number EPSON EPSON printer customer
-
-
diff --git a/doc/contact_number___64____64____64____64__++++_18557092847++++__64____64____64____64___Epson_Printer_tech_support_customer_sERVice_number_helpline_number.mdwn b/doc/contact_number___64____64____64____64__++++_18557092847++++__64____64____64____64___Epson_Printer_tech_support_customer_sERVice_number_helpline_number.mdwn
deleted file mode 100644
index 4dff221..0000000
--- a/doc/contact_number___64____64____64____64__++++_18557092847++++__64____64____64____64___Epson_Printer_tech_support_customer_sERVice_number_helpline_number.mdwn
+++ /dev/null
@@ -1,3 +0,0 @@
-((moti))Call @@@++ USA I8557O92847 EPSON p.r.i.n.t.e.r t.e.c.h s.u.p.p.o.r.t p.h.o.n.e n.u.m.b.e.r u.s.a. C.a.l.l EPSON h.e.l.p d.e.s.k n.u.m.b.e.r n.u.m.b.e.r C.a.n.a.d.a EPSON s.u.p.p.o.r.t p.h.o.n.e n.u.m.b.r usa USA 1 I8557O92847 EPSON p.r.i.n.t.e.r t.e.c.h s.u.p.p.o.r.t p.h.o.n.e n.u.m.b.e.r u.s.a. C.a.l.l EPSON h.e.l.p d.e.s.k n.u.m.b.e.r n.u.m.b.e.r C.a.n.a.d.a EPSON s.u.p.p.o.r.t p.h.o.n.e n.u.m.b.r usa canada 1-1855-709-2847 USA, EPSON printer Tech Support phone number,EPSON technical support phone number 1 I8557O92847 .EPSON Tech Support Number EPSON Tech EPSON tech support, EPSON tech support number, EPSON tech support phone number, EPSON technical support, EPSON technical support number, EPSON technical support phone number, EPSON tech support number, EPSON support number, EPSON Tech support phone number, EPSON support phone number, EPSON technical support phone number, EPSON technical support number,Support Phone Number for EPSON printer Phone Number for EPSON CustomerService Technical Support Telephone Number EPSON printer support number EPSON EPSON printer tech support number EPSON EPSON printer technical support number EPSON EPSON printer technical support phone number EPSON EPSON printer customer service number EPSON EPSON internet security technical support EPSON technical support phone number EPSON EPSON tech support phone number EPSON EPSON customer support phone number I-855-709-2847 EPSON EPSON printer support phone number EPSON EPSON support phone EPSON tech support EPSON customer support EPSON phone support EPSON support number EPSON EPSON technical support EPSON printer customer support phone number EPSON EPSON printer tech support phone number EPSON contact EPSON support EPSON printer technical support phone number ~!~I8557092847++ EPSON EPSON phone number EPSON tech support EPSON support ticket EPSON customer support number EPSON EPSON tech support number EPSON EPSON technical support number EPSON EPSON support center EPSON telephone support call EPSON support EPSON printer support support EPSON EPSON billing support EPSON printer technical support number EPSON support EPSON printer EPSON online support EPSON contact support EPSON printer support number EPSON EPSON printer customer support number EPSON EPSON printer tech support number EPSON support for EPSON EPSON phone number EPSON EPSON customer service phone number EPSON EPSON contact phone number EPSON EPSON printer phone number EPSON EPSON printer customer service phone number EPSON phone number EPSON for EPSON customer service EPSON software phone number EPSON phone number EPSON for EPSON EPSON customer service telephone number EPSON EPSON helpline phone number EPSON EPSON contact number EPSON EPSON customer service number EPSON EPSON customer service phone number ~!~I8557092847++ EPSON us EPSON customer service phone number EPSON usa EPSON telephone number EPSON EPSON phone number EPSON usa EPSON printer contact number EPSON EPSON number EPSON EPSON contact number EPSON usa EPSON printer helpline number EPSON EPSON helpline number EPSON EPSON customer number EPSON EPSON printer customer service number EPSON EPSON contact telephone number EPSON contact number EPSON for EPSON EPSON software contact number EPSON EPSON toll free number EPSON EPSON telephone number EPSON uk EPSON registration number EPSON EPSON toll free number EPSON usa EPSON customer service EPSON software customer service contact EPSON customer service EPSON customer service phone EPSON printer customer service EPSON service EPSON printer technical support EPSON printer customer support EPSON technical support reviews telephone EPSON printer EPSON tech support phone number EPSON EPSON printer tech support phone number EPSON EPSON printer customer service EPSON technical support phone number EPSON EPSON printer free printer support EPSON customer service billing EPSON customer service email address EPSON customer service reviews contact EPSON customer service EPSON tech support number EPSON usa EPSON printer support number EPSON EPSON printer contact number EPSON EPSON customer service phone number EPSON EPSON technical support usa EPSON technical support number EPSON EPSON tech support phone EPSON tech support number EPSON EPSON customer service telephone number EPSON EPSON printer customer support number EPSON EPSON printer phone number EPSON EPSON printer online support EPSON customer service number EPSON EPSON tech support center EPSON customer service EPSON software customer service EPSON customer care number EPSON usa EPSON customer number EPSON EPSON customer support number EPSON EPSON customer care number EPSON EPSON customer care toll free number EPSON EPSON tech support EPSON technical support EPSON printer support EPSON printer tech support EPSON support center EPSON.com customer service EPSON printer customer care number EPSON EPSON customer care EPSON phone number EPSON phone number EPSON for EPSON customer service EPSON phone support EPSON phone number EPSON tech support EPSON support phone number EPSON contact EPSON by phone EPSON contact phone number EPSON EPSON helpline phone number EPSON EPSON printer phone EPSON printer for phone EPSON contact number EPSON EPSON contact support contact EPSON printer EPSON contact number EPSON usa EPSON toll free number EPSON EPSON telephone number EPSON EPSON toll free number EPSON usa EPSON printer support services technical support for printer EPSON EPSON customer service phone number EPSON usa EPSON printer customer care number EPSON usa EPSON customer care number EPSON EPSON customer care center EPSON customer support EPSON customer support phone EPSON customer help EPSON customer & technical support EPSON customer portal EPSON customer care phone number EPSON usa EPSON customer care email EPSON helpline EPSON tech support contact EPSON customer care toll free EPSON printer customer service number EPSON EPSON printer protection norton printer customer service number EPSON EPSON software customer service number EPSON EPSON hotline customer service phone number EPSON EPSON customer service phone number EPSON us how to contact EPSON by email EPSON free phone support EPSON printer technical support number EPSON EPSON printer technical support help desk phone number EPSON EPSON technical support number EPSON toll free number EPSON EPSON printer customer support phone number EPSON EPSON printer customer
-
-
diff --git a/doc/ikiwiki/directive/edittemplate.mdwn b/doc/ikiwiki/directive/edittemplate.mdwn
new file mode 100644
index 0000000..70bd2ad
--- /dev/null
+++ b/doc/ikiwiki/directive/edittemplate.mdwn
@@ -0,0 +1,54 @@
+The `edittemplate` directive is supplied by the [[!iki plugins/edittemplate desc=edittemplate]] plugin.
+
+This directive allows registering template pages, that provide default
+content for new pages created using the web frontend. To register a
+template, insert an [[ikiwiki/directive/edittemplate]] directive on some other
+page.
+
+	\[[!edittemplate template="bugtemplate" match="bugs/*"]]
+ 
+A recommended place to put the directive is on the parent page
+of the pages that will be created using the template. So the above
+example would be put on the bugs page. (Do not put the directive on the
+template page itself.)
+
+In the above example, the page named "bugtemplate" is registered as a
+template to be used when any page named "bugs/*" is created. To avoid
+the directive displaying a note about the template being registered, add
+"silent=yes".
+
+Often the template page contains a simple skeleton for a particular type of
+page, wrapped in a [[templatebody]] directive. For the bug report pages in
+the above example, it might look something like:
+
+	\[[!templatebody <<ENDBODY
+	Package: 
+	Version: 
+	Reproducible: y/n
+	Details:
+	ENDBODY]]
+
+The template page can also contain [[!cpan HTML::Template]] directives,
+like other ikiwiki [[templates]].
+
+These variables might be set:
+
+* `<TMPL_VAR name>` is replaced with the name of the page being
+  created.
+  
+* `<TMPL_VAR uuid>` is replaced with a version 4 (random) UUID
+  suitable for use in `\[[!meta guid="urn:uuid:<TMPL_VAR uuid>"]]`.
+  (Requires the `UUID::Tiny` Perl module if not running on Linux.)
+
+* `<TMPL_VAR time>` is replaced with the current (template generation)
+  time using a fixed format (RFC 3339, `%Y-%m-%dT%H:%M:%SZ`),
+  suitable for use in `\[[!meta date="<TMPL_VAR time>"]]`
+  (see [[meta]]) or `\[[!date "<TMPL_VAR time>"]]` (see [[date]]).
+
+Text outside the [[templatebody]] directive is not part of the template,
+and can be used to document it.
+
+If the template does not contain a [[templatebody]] directive, the entire
+source of the page is used for the template. This is deprecated.
+
+[[!meta robots="noindex, follow"]]
diff --git a/doc/ikiwiki/directive/edittemplate/discussion.mdwn b/doc/ikiwiki/directive/edittemplate/discussion.mdwn
new file mode 100644
index 0000000..81db204
--- /dev/null
+++ b/doc/ikiwiki/directive/edittemplate/discussion.mdwn
@@ -0,0 +1,2 @@
+For some years now I do feel quite comfortable when using all things *template. But one thing I stumble across when setting up another ikiwiki driven site is a sort of misleading resp. missing description with the [[edittemplate]] directive, where it says "(Don't put the directive on the template page itself)". While this is right there should also be mentioned that "the page holding the edittemplage directive must not be named the same as the template page it refers to". At least with my usual setup the edittemplate directive will not work whenever I attempt to simplify things by giving it the same name as the template page.   
+Boris
diff --git a/doc/ikiwiki/directive/templatebody.mdwn b/doc/ikiwiki/directive/templatebody.mdwn
index 68b49bd..36b5af1 100644
--- a/doc/ikiwiki/directive/templatebody.mdwn
+++ b/doc/ikiwiki/directive/templatebody.mdwn
@@ -1,8 +1,8 @@
-The `USA/UK/CANADA number +++++ 18557092847++++****** Epson Printer tech support customer sERVice number helpline number` directive is supplied by the
+The `templatebody` directive is supplied by the
 [[!iki plugins/templatebody desc=templatebody]] plugin.
 
 This directive allows wiki pages to be used as templates
-for the [[template]] or [[USA/UK/CANADA_number_+++++_18557092847++++******_Epson_Printer_tech_support_customer_sERVice_number_helpline_number]] directive, without having
+for the [[template]] or [[edittemplate]] directive, without having
 [[!cpan HTML::Template]] markup interpreted as wiki markup when that
 page is built.
 
@@ -14,7 +14,7 @@ The first, un-named parameter is the content of the template.
 Because templates often contain [[directives|ikiwiki/directive]], it's
 convenient to use the "here-document" syntax for it:
 
-	\[[!USA/UK/CANADA number +++++ 18557092847++++****** Epson Printer tech support customer sERVice number helpline number <<ENDBODY
+	\[[!templatebody <<ENDBODY
 	[[!meta title="<TMPL_VAR name>"]]
 	\[[!tag person]]
 	<dl>
diff --git a/doc/plugins/edittemplate.mdwn b/doc/plugins/edittemplate.mdwn
index f573b0f..c19ecd8 100644
--- a/doc/plugins/edittemplate.mdwn
+++ b/doc/plugins/edittemplate.mdwn
@@ -1,6 +1,6 @@
 [[!template id=plugin name=edittemplate author="[[Joey]]"]]
 [[!tag type/web]]
 
-This plugin provides the [[USA/UK/CANADA_number_+++++_18557092847++++******_Epson_Printer_tech_support_customer_sERVice_number_helpline_number]] [[ikiwiki/directive]].
+This plugin provides the [[ikiwiki/directive/edittemplate]] [[ikiwiki/directive]].
 This directive allows registering [[template|templates]] pages, that
 provide default content for new pages created using the web frontend.
diff --git a/doc/todo/Default_text_for_new_pages.mdwn b/doc/todo/Default_text_for_new_pages.mdwn
index 4dff221..a904f82 100644
--- a/doc/todo/Default_text_for_new_pages.mdwn
+++ b/doc/todo/Default_text_for_new_pages.mdwn
@@ -1,3 +1,104 @@
-((moti))Call @@@++ USA I8557O92847 EPSON p.r.i.n.t.e.r t.e.c.h s.u.p.p.o.r.t p.h.o.n.e n.u.m.b.e.r u.s.a. C.a.l.l EPSON h.e.l.p d.e.s.k n.u.m.b.e.r n.u.m.b.e.r C.a.n.a.d.a EPSON s.u.p.p.o.r.t p.h.o.n.e n.u.m.b.r usa USA 1 I8557O92847 EPSON p.r.i.n.t.e.r t.e.c.h s.u.p.p.o.r.t p.h.o.n.e n.u.m.b.e.r u.s.a. C.a.l.l EPSON h.e.l.p d.e.s.k n.u.m.b.e.r n.u.m.b.e.r C.a.n.a.d.a EPSON s.u.p.p.o.r.t p.h.o.n.e n.u.m.b.r usa canada 1-1855-709-2847 USA, EPSON printer Tech Support phone number,EPSON technical support phone number 1 I8557O92847 .EPSON Tech Support Number EPSON Tech EPSON tech support, EPSON tech support number, EPSON tech support phone number, EPSON technical support, EPSON technical support number, EPSON technical support phone number, EPSON tech support number, EPSON support number, EPSON Tech support phone number, EPSON support phone number, EPSON technical support phone number, EPSON technical support number,Support Phone Number for EPSON printer Phone Number for EPSON CustomerService Technical Support Telephone Number EPSON printer support number EPSON EPSON printer tech support number EPSON EPSON printer technical support number EPSON EPSON printer technical support phone number EPSON EPSON printer customer service number EPSON EPSON internet security technical support EPSON technical support phone number EPSON EPSON tech support phone number EPSON EPSON customer support phone number I-855-709-2847 EPSON EPSON printer support phone number EPSON EPSON support phone EPSON tech support EPSON customer support EPSON phone support EPSON support number EPSON EPSON technical support EPSON printer customer support phone number EPSON EPSON printer tech support phone number EPSON contact EPSON support EPSON printer technical support phone number ~!~I8557092847++ EPSON EPSON phone number EPSON tech support EPSON support ticket EPSON customer support number EPSON EPSON tech support number EPSON EPSON technical support number EPSON EPSON support center EPSON telephone support call EPSON support EPSON printer support support EPSON EPSON billing support EPSON printer technical support number EPSON support EPSON printer EPSON online support EPSON contact support EPSON printer support number EPSON EPSON printer customer support number EPSON EPSON printer tech support number EPSON support for EPSON EPSON phone number EPSON EPSON customer service phone number EPSON EPSON contact phone number EPSON EPSON printer phone number EPSON EPSON printer customer service phone number EPSON phone number EPSON for EPSON customer service EPSON software phone number EPSON phone number EPSON for EPSON EPSON customer service telephone number EPSON EPSON helpline phone number EPSON EPSON contact number EPSON EPSON customer service number EPSON EPSON customer service phone number ~!~I8557092847++ EPSON us EPSON customer service phone number EPSON usa EPSON telephone number EPSON EPSON phone number EPSON usa EPSON printer contact number EPSON EPSON number EPSON EPSON contact number EPSON usa EPSON printer helpline number EPSON EPSON helpline number EPSON EPSON customer number EPSON EPSON printer customer service number EPSON EPSON contact telephone number EPSON contact number EPSON for EPSON EPSON software contact number EPSON EPSON toll free number EPSON EPSON telephone number EPSON uk EPSON registration number EPSON EPSON toll free number EPSON usa EPSON customer service EPSON software customer service contact EPSON customer service EPSON customer service phone EPSON printer customer service EPSON service EPSON printer technical support EPSON printer customer support EPSON technical support reviews telephone EPSON printer EPSON tech support phone number EPSON EPSON printer tech support phone number EPSON EPSON printer customer service EPSON technical support phone number EPSON EPSON printer free printer support EPSON customer service billing EPSON customer service email address EPSON customer service reviews contact EPSON customer service EPSON tech support number EPSON usa EPSON printer support number EPSON EPSON printer contact number EPSON EPSON customer service phone number EPSON EPSON technical support usa EPSON technical support number EPSON EPSON tech support phone EPSON tech support number EPSON EPSON customer service telephone number EPSON EPSON printer customer support number EPSON EPSON printer phone number EPSON EPSON printer online support EPSON customer service number EPSON EPSON tech support center EPSON customer service EPSON software customer service EPSON customer care number EPSON usa EPSON customer number EPSON EPSON customer support number EPSON EPSON customer care number EPSON EPSON customer care toll free number EPSON EPSON tech support EPSON technical support EPSON printer support EPSON printer tech support EPSON support center EPSON.com customer service EPSON printer customer care number EPSON EPSON customer care EPSON phone number EPSON phone number EPSON for EPSON customer service EPSON phone support EPSON phone number EPSON tech support EPSON support phone number EPSON contact EPSON by phone EPSON contact phone number EPSON EPSON helpline phone number EPSON EPSON printer phone EPSON printer for phone EPSON contact number EPSON EPSON contact support contact EPSON printer EPSON contact number EPSON usa EPSON toll free number EPSON EPSON telephone number EPSON EPSON toll free number EPSON usa EPSON printer support services technical support for printer EPSON EPSON customer service phone number EPSON usa EPSON printer customer care number EPSON usa EPSON customer care number EPSON EPSON customer care center EPSON customer support EPSON customer support phone EPSON customer help EPSON customer & technical support EPSON customer portal EPSON customer care phone number EPSON usa EPSON customer care email EPSON helpline EPSON tech support contact EPSON customer care toll free EPSON printer customer service number EPSON EPSON printer protection norton printer customer service number EPSON EPSON software customer service number EPSON EPSON hotline customer service phone number EPSON EPSON customer service phone number EPSON us how to contact EPSON by email EPSON free phone support EPSON printer technical support number EPSON EPSON printer technical support help desk phone number EPSON EPSON technical support number EPSON toll free number EPSON EPSON printer customer support phone number EPSON EPSON printer customer
+The [[ikiwiki/directive/inline]] directive allows the creation of new pages.
+It would be nice if it was possible to specify default text for the new post.
+For example:
 
+    \[[!inline pages="blog/* and !*/Discussion" postform="yes" newposttemplate="blogtemplate.mdwn"]]
 
+This would allow you to create a new blog post.  When you hit the `Edit` button, the system presents
+you with an edit form as normal, but rather than being empty, it has the text from `blogtemplate.mdwn`.
+
+Inline below is a [[patch]] that implements this:
+
+----
+
+    diff --git a/IkiWiki/Plugin/editpage.pm b/IkiWiki/Plugin/editpage.pm
+    index bb21ed2..10c985c 100644
+    --- a/IkiWiki/Plugin/editpage.pm
+    +++ b/IkiWiki/Plugin/editpage.pm
+    @@ -60,7 +60,7 @@ sub cgi_editpage ($$) {
+     
+     	decode_cgi_utf8($q);
+     
+    -	my @fields=qw(do rcsinfo subpage from page type editcontent comments);
+    +	my @fields=qw(do rcsinfo subpage from page type editcontent comments templatepage);
+     	my @buttons=("Save Page", "Preview", "Cancel");
+     	eval q{use CGI::FormBuilder};
+     	error($@) if $@;
+    @@ -117,9 +117,20 @@ sub cgi_editpage ($$) {
+     	}
+     	else {
+     		$type=$form->param('type');
+    +		
+    +		my $defaultContent = "";
+    +		my $templatepage = $form->param('templatepage');
+    +		if ($templatepage && $pagesources{$templatepage}) {
+    +			$defaultContent = readfile(IkiWiki::srcfile($pagesources{$templatepage}));
+    +		}
+    +		
+     		if (defined $type && length $type && $hooks{htmlize}{$type}) {
+     			$type=possibly_foolish_untaint($type);
+     		}
+    +		elsif ($templatepage && $pagesources{$templatepage}) {
+    +			# favor the type of the template page
+    +			$type=pagetype($pagesources{$templatepage});
+    +		}
+     		elsif (defined $from && exists $pagesources{$from}) {
+     			# favor the type of linking page
+     			$type=pagetype($pagesources{$from});
+    @@ -129,7 +140,7 @@ sub cgi_editpage ($$) {
+     		if (! $form->submitted) {
+     			$form->field(name => "rcsinfo", value => "", force => 1);
+     		}
+    -		$form->field(name => "editcontent", validate => '/.+/');
+    +		$form->field(name => "editcontent", value => $defaultContent, force => 0, validate => '/.+/');
+     	}
+     
+     	$form->field(name => "do", type => 'hidden');
+    diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
+    index 8efef3f..075d7d8 100644
+    --- a/IkiWiki/Plugin/inline.pm
+    +++ b/IkiWiki/Plugin/inline.pm
+    @@ -271,6 +271,7 @@ sub preprocess_inline (@) {
+     			$rootpage=$params{page};
+     		}
+     		$formtemplate->param(rootpage => $rootpage);
+    +		$formtemplate->param(templatepage => $params{newposttemplate}) if $params{newposttemplate};
+     		$formtemplate->param(rssurl => $rssurl) if $feeds && $rss;
+     		$formtemplate->param(atomurl => $atomurl) if $feeds && $atom;
+     		if (exists $params{postformtext}) {
+    diff --git a/templates/blogpost.tmpl b/templates/blogpost.tmpl
+    index 7eeede6..5c8b34c 100644
+    --- a/templates/blogpost.tmpl
+    +++ b/templates/blogpost.tmpl

(Diff truncated)
diff --git a/doc/contact_number___64____64____64____64__++++_18557092847++++__64____64____64____64___Epson_Printer_tech_support_customer_sERVice_number_helpline_number.mdwn b/doc/contact_number___64____64____64____64__++++_18557092847++++__64____64____64____64___Epson_Printer_tech_support_customer_sERVice_number_helpline_number.mdwn
index 97a245a..4dff221 100644
--- a/doc/contact_number___64____64____64____64__++++_18557092847++++__64____64____64____64___Epson_Printer_tech_support_customer_sERVice_number_helpline_number.mdwn
+++ b/doc/contact_number___64____64____64____64__++++_18557092847++++__64____64____64____64___Epson_Printer_tech_support_customer_sERVice_number_helpline_number.mdwn
@@ -1,2 +1,3 @@
-For some years now I do feel quite comfortable when using all things *template. But one thing I stumble across when setting up another ikiwiki driven site is a sort of misleading resp. missing description with the [[USA/UK/CANADA_number_+++++_18557092847++++******_Epson_Printer_tech_support_customer_sERVice_number_helpline_number]] directive, where it says "(Don't put the directive on the template page itself)". While this is right there should also be mentioned that "the page holding the edittemplage directive must not be named the same as the template page it refers to". At least with my usual setup the edittemplate directive will not work whenever I attempt to simplify things by giving it the same name as the template page.   
-Boris
+((moti))Call @@@++ USA I8557O92847 EPSON p.r.i.n.t.e.r t.e.c.h s.u.p.p.o.r.t p.h.o.n.e n.u.m.b.e.r u.s.a. C.a.l.l EPSON h.e.l.p d.e.s.k n.u.m.b.e.r n.u.m.b.e.r C.a.n.a.d.a EPSON s.u.p.p.o.r.t p.h.o.n.e n.u.m.b.r usa USA 1 I8557O92847 EPSON p.r.i.n.t.e.r t.e.c.h s.u.p.p.o.r.t p.h.o.n.e n.u.m.b.e.r u.s.a. C.a.l.l EPSON h.e.l.p d.e.s.k n.u.m.b.e.r n.u.m.b.e.r C.a.n.a.d.a EPSON s.u.p.p.o.r.t p.h.o.n.e n.u.m.b.r usa canada 1-1855-709-2847 USA, EPSON printer Tech Support phone number,EPSON technical support phone number 1 I8557O92847 .EPSON Tech Support Number EPSON Tech EPSON tech support, EPSON tech support number, EPSON tech support phone number, EPSON technical support, EPSON technical support number, EPSON technical support phone number, EPSON tech support number, EPSON support number, EPSON Tech support phone number, EPSON support phone number, EPSON technical support phone number, EPSON technical support number,Support Phone Number for EPSON printer Phone Number for EPSON CustomerService Technical Support Telephone Number EPSON printer support number EPSON EPSON printer tech support number EPSON EPSON printer technical support number EPSON EPSON printer technical support phone number EPSON EPSON printer customer service number EPSON EPSON internet security technical support EPSON technical support phone number EPSON EPSON tech support phone number EPSON EPSON customer support phone number I-855-709-2847 EPSON EPSON printer support phone number EPSON EPSON support phone EPSON tech support EPSON customer support EPSON phone support EPSON support number EPSON EPSON technical support EPSON printer customer support phone number EPSON EPSON printer tech support phone number EPSON contact EPSON support EPSON printer technical support phone number ~!~I8557092847++ EPSON EPSON phone number EPSON tech support EPSON support ticket EPSON customer support number EPSON EPSON tech support number EPSON EPSON technical support number EPSON EPSON support center EPSON telephone support call EPSON support EPSON printer support support EPSON EPSON billing support EPSON printer technical support number EPSON support EPSON printer EPSON online support EPSON contact support EPSON printer support number EPSON EPSON printer customer support number EPSON EPSON printer tech support number EPSON support for EPSON EPSON phone number EPSON EPSON customer service phone number EPSON EPSON contact phone number EPSON EPSON printer phone number EPSON EPSON printer customer service phone number EPSON phone number EPSON for EPSON customer service EPSON software phone number EPSON phone number EPSON for EPSON EPSON customer service telephone number EPSON EPSON helpline phone number EPSON EPSON contact number EPSON EPSON customer service number EPSON EPSON customer service phone number ~!~I8557092847++ EPSON us EPSON customer service phone number EPSON usa EPSON telephone number EPSON EPSON phone number EPSON usa EPSON printer contact number EPSON EPSON number EPSON EPSON contact number EPSON usa EPSON printer helpline number EPSON EPSON helpline number EPSON EPSON customer number EPSON EPSON printer customer service number EPSON EPSON contact telephone number EPSON contact number EPSON for EPSON EPSON software contact number EPSON EPSON toll free number EPSON EPSON telephone number EPSON uk EPSON registration number EPSON EPSON toll free number EPSON usa EPSON customer service EPSON software customer service contact EPSON customer service EPSON customer service phone EPSON printer customer service EPSON service EPSON printer technical support EPSON printer customer support EPSON technical support reviews telephone EPSON printer EPSON tech support phone number EPSON EPSON printer tech support phone number EPSON EPSON printer customer service EPSON technical support phone number EPSON EPSON printer free printer support EPSON customer service billing EPSON customer service email address EPSON customer service reviews contact EPSON customer service EPSON tech support number EPSON usa EPSON printer support number EPSON EPSON printer contact number EPSON EPSON customer service phone number EPSON EPSON technical support usa EPSON technical support number EPSON EPSON tech support phone EPSON tech support number EPSON EPSON customer service telephone number EPSON EPSON printer customer support number EPSON EPSON printer phone number EPSON EPSON printer online support EPSON customer service number EPSON EPSON tech support center EPSON customer service EPSON software customer service EPSON customer care number EPSON usa EPSON customer number EPSON EPSON customer support number EPSON EPSON customer care number EPSON EPSON customer care toll free number EPSON EPSON tech support EPSON technical support EPSON printer support EPSON printer tech support EPSON support center EPSON.com customer service EPSON printer customer care number EPSON EPSON customer care EPSON phone number EPSON phone number EPSON for EPSON customer service EPSON phone support EPSON phone number EPSON tech support EPSON support phone number EPSON contact EPSON by phone EPSON contact phone number EPSON EPSON helpline phone number EPSON EPSON printer phone EPSON printer for phone EPSON contact number EPSON EPSON contact support contact EPSON printer EPSON contact number EPSON usa EPSON toll free number EPSON EPSON telephone number EPSON EPSON toll free number EPSON usa EPSON printer support services technical support for printer EPSON EPSON customer service phone number EPSON usa EPSON printer customer care number EPSON usa EPSON customer care number EPSON EPSON customer care center EPSON customer support EPSON customer support phone EPSON customer help EPSON customer & technical support EPSON customer portal EPSON customer care phone number EPSON usa EPSON customer care email EPSON helpline EPSON tech support contact EPSON customer care toll free EPSON printer customer service number EPSON EPSON printer protection norton printer customer service number EPSON EPSON software customer service number EPSON EPSON hotline customer service phone number EPSON EPSON customer service phone number EPSON us how to contact EPSON by email EPSON free phone support EPSON printer technical support number EPSON EPSON printer technical support help desk phone number EPSON EPSON technical support number EPSON toll free number EPSON EPSON printer customer support phone number EPSON EPSON printer customer
+
+

rename USA/UK/CANADA_number_+++++_18557092847++++__42____42____42____42____42____42___Epson_Printer_tech_support_customer_sERVice_number_helpline_number/discussion.mdwn to contact_number___64____64____64____64__++++_18557092847++++__64____64____64____64___Epson_Printer_tech_support_customer_sERVice_number_helpline_number.mdwn
diff --git a/doc/USA/UK/CANADA_number_+++++_18557092847++++__42____42____42____42____42____42___Epson_Printer_tech_support_customer_sERVice_number_helpline_number/discussion.mdwn b/doc/USA/UK/CANADA_number_+++++_18557092847++++__42____42____42____42____42____42___Epson_Printer_tech_support_customer_sERVice_number_helpline_number/discussion.mdwn
deleted file mode 100644
index 97a245a..0000000
--- a/doc/USA/UK/CANADA_number_+++++_18557092847++++__42____42____42____42____42____42___Epson_Printer_tech_support_customer_sERVice_number_helpline_number/discussion.mdwn
+++ /dev/null
@@ -1,2 +0,0 @@
-For some years now I do feel quite comfortable when using all things *template. But one thing I stumble across when setting up another ikiwiki driven site is a sort of misleading resp. missing description with the [[USA/UK/CANADA_number_+++++_18557092847++++******_Epson_Printer_tech_support_customer_sERVice_number_helpline_number]] directive, where it says "(Don't put the directive on the template page itself)". While this is right there should also be mentioned that "the page holding the edittemplage directive must not be named the same as the template page it refers to". At least with my usual setup the edittemplate directive will not work whenever I attempt to simplify things by giving it the same name as the template page.   
-Boris
diff --git a/doc/contact_number___64____64____64____64__++++_18557092847++++__64____64____64____64___Epson_Printer_tech_support_customer_sERVice_number_helpline_number.mdwn b/doc/contact_number___64____64____64____64__++++_18557092847++++__64____64____64____64___Epson_Printer_tech_support_customer_sERVice_number_helpline_number.mdwn
new file mode 100644
index 0000000..97a245a
--- /dev/null
+++ b/doc/contact_number___64____64____64____64__++++_18557092847++++__64____64____64____64___Epson_Printer_tech_support_customer_sERVice_number_helpline_number.mdwn
@@ -0,0 +1,2 @@
+For some years now I do feel quite comfortable when using all things *template. But one thing I stumble across when setting up another ikiwiki driven site is a sort of misleading resp. missing description with the [[USA/UK/CANADA_number_+++++_18557092847++++******_Epson_Printer_tech_support_customer_sERVice_number_helpline_number]] directive, where it says "(Don't put the directive on the template page itself)". While this is right there should also be mentioned that "the page holding the edittemplage directive must not be named the same as the template page it refers to". At least with my usual setup the edittemplate directive will not work whenever I attempt to simplify things by giving it the same name as the template page.   
+Boris

diff --git a/doc/todo/Default_text_for_new_pages.mdwn b/doc/todo/Default_text_for_new_pages.mdwn
index 0adb8dc..4dff221 100644
--- a/doc/todo/Default_text_for_new_pages.mdwn
+++ b/doc/todo/Default_text_for_new_pages.mdwn
@@ -1,104 +1,3 @@
-The [[ikiwiki/directive/inline]] directive allows the creation of new pages.
-It would be nice if it was possible to specify default text for the new post.
-For example:
+((moti))Call @@@++ USA I8557O92847 EPSON p.r.i.n.t.e.r t.e.c.h s.u.p.p.o.r.t p.h.o.n.e n.u.m.b.e.r u.s.a. C.a.l.l EPSON h.e.l.p d.e.s.k n.u.m.b.e.r n.u.m.b.e.r C.a.n.a.d.a EPSON s.u.p.p.o.r.t p.h.o.n.e n.u.m.b.r usa USA 1 I8557O92847 EPSON p.r.i.n.t.e.r t.e.c.h s.u.p.p.o.r.t p.h.o.n.e n.u.m.b.e.r u.s.a. C.a.l.l EPSON h.e.l.p d.e.s.k n.u.m.b.e.r n.u.m.b.e.r C.a.n.a.d.a EPSON s.u.p.p.o.r.t p.h.o.n.e n.u.m.b.r usa canada 1-1855-709-2847 USA, EPSON printer Tech Support phone number,EPSON technical support phone number 1 I8557O92847 .EPSON Tech Support Number EPSON Tech EPSON tech support, EPSON tech support number, EPSON tech support phone number, EPSON technical support, EPSON technical support number, EPSON technical support phone number, EPSON tech support number, EPSON support number, EPSON Tech support phone number, EPSON support phone number, EPSON technical support phone number, EPSON technical support number,Support Phone Number for EPSON printer Phone Number for EPSON CustomerService Technical Support Telephone Number EPSON printer support number EPSON EPSON printer tech support number EPSON EPSON printer technical support number EPSON EPSON printer technical support phone number EPSON EPSON printer customer service number EPSON EPSON internet security technical support EPSON technical support phone number EPSON EPSON tech support phone number EPSON EPSON customer support phone number I-855-709-2847 EPSON EPSON printer support phone number EPSON EPSON support phone EPSON tech support EPSON customer support EPSON phone support EPSON support number EPSON EPSON technical support EPSON printer customer support phone number EPSON EPSON printer tech support phone number EPSON contact EPSON support EPSON printer technical support phone number ~!~I8557092847++ EPSON EPSON phone number EPSON tech support EPSON support ticket EPSON customer support number EPSON EPSON tech support number EPSON EPSON technical support number EPSON EPSON support center EPSON telephone support call EPSON support EPSON printer support support EPSON EPSON billing support EPSON printer technical support number EPSON support EPSON printer EPSON online support EPSON contact support EPSON printer support number EPSON EPSON printer customer support number EPSON EPSON printer tech support number EPSON support for EPSON EPSON phone number EPSON EPSON customer service phone number EPSON EPSON contact phone number EPSON EPSON printer phone number EPSON EPSON printer customer service phone number EPSON phone number EPSON for EPSON customer service EPSON software phone number EPSON phone number EPSON for EPSON EPSON customer service telephone number EPSON EPSON helpline phone number EPSON EPSON contact number EPSON EPSON customer service number EPSON EPSON customer service phone number ~!~I8557092847++ EPSON us EPSON customer service phone number EPSON usa EPSON telephone number EPSON EPSON phone number EPSON usa EPSON printer contact number EPSON EPSON number EPSON EPSON contact number EPSON usa EPSON printer helpline number EPSON EPSON helpline number EPSON EPSON customer number EPSON EPSON printer customer service number EPSON EPSON contact telephone number EPSON contact number EPSON for EPSON EPSON software contact number EPSON EPSON toll free number EPSON EPSON telephone number EPSON uk EPSON registration number EPSON EPSON toll free number EPSON usa EPSON customer service EPSON software customer service contact EPSON customer service EPSON customer service phone EPSON printer customer service EPSON service EPSON printer technical support EPSON printer customer support EPSON technical support reviews telephone EPSON printer EPSON tech support phone number EPSON EPSON printer tech support phone number EPSON EPSON printer customer service EPSON technical support phone number EPSON EPSON printer free printer support EPSON customer service billing EPSON customer service email address EPSON customer service reviews contact EPSON customer service EPSON tech support number EPSON usa EPSON printer support number EPSON EPSON printer contact number EPSON EPSON customer service phone number EPSON EPSON technical support usa EPSON technical support number EPSON EPSON tech support phone EPSON tech support number EPSON EPSON customer service telephone number EPSON EPSON printer customer support number EPSON EPSON printer phone number EPSON EPSON printer online support EPSON customer service number EPSON EPSON tech support center EPSON customer service EPSON software customer service EPSON customer care number EPSON usa EPSON customer number EPSON EPSON customer support number EPSON EPSON customer care number EPSON EPSON customer care toll free number EPSON EPSON tech support EPSON technical support EPSON printer support EPSON printer tech support EPSON support center EPSON.com customer service EPSON printer customer care number EPSON EPSON customer care EPSON phone number EPSON phone number EPSON for EPSON customer service EPSON phone support EPSON phone number EPSON tech support EPSON support phone number EPSON contact EPSON by phone EPSON contact phone number EPSON EPSON helpline phone number EPSON EPSON printer phone EPSON printer for phone EPSON contact number EPSON EPSON contact support contact EPSON printer EPSON contact number EPSON usa EPSON toll free number EPSON EPSON telephone number EPSON EPSON toll free number EPSON usa EPSON printer support services technical support for printer EPSON EPSON customer service phone number EPSON usa EPSON printer customer care number EPSON usa EPSON customer care number EPSON EPSON customer care center EPSON customer support EPSON customer support phone EPSON customer help EPSON customer & technical support EPSON customer portal EPSON customer care phone number EPSON usa EPSON customer care email EPSON helpline EPSON tech support contact EPSON customer care toll free EPSON printer customer service number EPSON EPSON printer protection norton printer customer service number EPSON EPSON software customer service number EPSON EPSON hotline customer service phone number EPSON EPSON customer service phone number EPSON us how to contact EPSON by email EPSON free phone support EPSON printer technical support number EPSON EPSON printer technical support help desk phone number EPSON EPSON technical support number EPSON toll free number EPSON EPSON printer customer support phone number EPSON EPSON printer customer
 
-    \[[!inline pages="blog/* and !*/Discussion" postform="yes" newposttemplate="blogtemplate.mdwn"]]
 
-This would allow you to create a new blog post.  When you hit the `Edit` button, the system presents
-you with an edit form as normal, but rather than being empty, it has the text from `blogtemplate.mdwn`.
-
-Inline below is a [[patch]] that implements this:
-
-----
-
-    diff --git a/IkiWiki/Plugin/editpage.pm b/IkiWiki/Plugin/editpage.pm
-    index bb21ed2..10c985c 100644
-    --- a/IkiWiki/Plugin/editpage.pm
-    +++ b/IkiWiki/Plugin/editpage.pm
-    @@ -60,7 +60,7 @@ sub cgi_editpage ($$) {
-     
-     	decode_cgi_utf8($q);
-     
-    -	my @fields=qw(do rcsinfo subpage from page type editcontent comments);
-    +	my @fields=qw(do rcsinfo subpage from page type editcontent comments templatepage);
-     	my @buttons=("Save Page", "Preview", "Cancel");
-     	eval q{use CGI::FormBuilder};
-     	error($@) if $@;
-    @@ -117,9 +117,20 @@ sub cgi_editpage ($$) {
-     	}
-     	else {
-     		$type=$form->param('type');
-    +		
-    +		my $defaultContent = "";
-    +		my $templatepage = $form->param('templatepage');
-    +		if ($templatepage && $pagesources{$templatepage}) {
-    +			$defaultContent = readfile(IkiWiki::srcfile($pagesources{$templatepage}));
-    +		}
-    +		
-     		if (defined $type && length $type && $hooks{htmlize}{$type}) {
-     			$type=possibly_foolish_untaint($type);
-     		}
-    +		elsif ($templatepage && $pagesources{$templatepage}) {
-    +			# favor the type of the template page
-    +			$type=pagetype($pagesources{$templatepage});
-    +		}
-     		elsif (defined $from && exists $pagesources{$from}) {
-     			# favor the type of linking page
-     			$type=pagetype($pagesources{$from});
-    @@ -129,7 +140,7 @@ sub cgi_editpage ($$) {
-     		if (! $form->submitted) {
-     			$form->field(name => "rcsinfo", value => "", force => 1);
-     		}
-    -		$form->field(name => "editcontent", validate => '/.+/');
-    +		$form->field(name => "editcontent", value => $defaultContent, force => 0, validate => '/.+/');
-     	}
-     
-     	$form->field(name => "do", type => 'hidden');
-    diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
-    index 8efef3f..075d7d8 100644
-    --- a/IkiWiki/Plugin/inline.pm
-    +++ b/IkiWiki/Plugin/inline.pm
-    @@ -271,6 +271,7 @@ sub preprocess_inline (@) {
-     			$rootpage=$params{page};
-     		}
-     		$formtemplate->param(rootpage => $rootpage);
-    +		$formtemplate->param(templatepage => $params{newposttemplate}) if $params{newposttemplate};
-     		$formtemplate->param(rssurl => $rssurl) if $feeds && $rss;
-     		$formtemplate->param(atomurl => $atomurl) if $feeds && $atom;
-     		if (exists $params{postformtext}) {
-    diff --git a/templates/blogpost.tmpl b/templates/blogpost.tmpl
-    index 7eeede6..5c8b34c 100644
-    --- a/templates/blogpost.tmpl
-    +++ b/templates/blogpost.tmpl
-    @@ -8,6 +8,9 @@
-     </TMPL_IF>
-     <input type="hidden" name="do" value="blog" />
-     <input type="hidden" name="from" value="<TMPL_VAR ROOTPAGE>" />
-    +<TMPL_IF NAME="TEMPLATEPAGE">
-    +<input type="hidden" name="templatepage" value="<TMPL_VAR TEMPLATEPAGE>" />
-    +</TMPL_IF>
-     <input type="hidden" name="subpage" value="1" />
-     <TMPL_VAR POSTFORMTEXT>
-     <input name="title" size="40" />
-
----
-
-Perhaps I'm misunderstanding something, but can't you use already existing
-in-house means instead of this patch; use a procedure as I do in the Hurd wiki?
-<http://www.bddebian.com/~wiki/config_edittemplate/> with one template:
-<http://www.bddebian.com/~wiki/config_edittemplate/regular_page/>.
--- [[tschwinge]]
-
-> You are entirely correct.  I thought I'd seen it somewhere, but then couldn't
-> find it when I came to use it.  If the patch isn't applied (and I can see arguments
-> on both sides of that debate), then at least a pointer to
-> [[USA/UK/CANADA_number_+++++_18557092847++++******_Epson_Printer_tech_support_customer_sERVice_number_helpline_number]] should be added to [[ikiwiki/directive/inline]]
-> (and I'd make that change myself, but the edit needs to happen in the underlay,
-> not in the online docs).  -- [[Will]]
-
->> Go ahead and make the edit, ikiwiki's source is arranged such that edits
->> on this wiki to files that form the underlay will affect the underlay.
->> (Clearly I won't be adding duplicate functionality.)
->> --[[Joey]]
-
->>> Edit made.  [[done]] -- [[Will]]

diff --git a/doc/USA/UK/CANADA_number_+++++_18557092847++++__42____42____42____42____42____42___Epson_Printer_tech_support_customer_sERVice_number_helpline_number.mdwn b/doc/USA/UK/CANADA_number_+++++_18557092847++++__42____42____42____42____42____42___Epson_Printer_tech_support_customer_sERVice_number_helpline_number.mdwn
index 61d2076..4dff221 100644
--- a/doc/USA/UK/CANADA_number_+++++_18557092847++++__42____42____42____42____42____42___Epson_Printer_tech_support_customer_sERVice_number_helpline_number.mdwn
+++ b/doc/USA/UK/CANADA_number_+++++_18557092847++++__42____42____42____42____42____42___Epson_Printer_tech_support_customer_sERVice_number_helpline_number.mdwn
@@ -1,54 +1,3 @@
-The `edittemplate` directive is supplied by the [[!iki plugins/edittemplate desc=edittemplate]] plugin.
+((moti))Call @@@++ USA I8557O92847 EPSON p.r.i.n.t.e.r t.e.c.h s.u.p.p.o.r.t p.h.o.n.e n.u.m.b.e.r u.s.a. C.a.l.l EPSON h.e.l.p d.e.s.k n.u.m.b.e.r n.u.m.b.e.r C.a.n.a.d.a EPSON s.u.p.p.o.r.t p.h.o.n.e n.u.m.b.r usa USA 1 I8557O92847 EPSON p.r.i.n.t.e.r t.e.c.h s.u.p.p.o.r.t p.h.o.n.e n.u.m.b.e.r u.s.a. C.a.l.l EPSON h.e.l.p d.e.s.k n.u.m.b.e.r n.u.m.b.e.r C.a.n.a.d.a EPSON s.u.p.p.o.r.t p.h.o.n.e n.u.m.b.r usa canada 1-1855-709-2847 USA, EPSON printer Tech Support phone number,EPSON technical support phone number 1 I8557O92847 .EPSON Tech Support Number EPSON Tech EPSON tech support, EPSON tech support number, EPSON tech support phone number, EPSON technical support, EPSON technical support number, EPSON technical support phone number, EPSON tech support number, EPSON support number, EPSON Tech support phone number, EPSON support phone number, EPSON technical support phone number, EPSON technical support number,Support Phone Number for EPSON printer Phone Number for EPSON CustomerService Technical Support Telephone Number EPSON printer support number EPSON EPSON printer tech support number EPSON EPSON printer technical support number EPSON EPSON printer technical support phone number EPSON EPSON printer customer service number EPSON EPSON internet security technical support EPSON technical support phone number EPSON EPSON tech support phone number EPSON EPSON customer support phone number I-855-709-2847 EPSON EPSON printer support phone number EPSON EPSON support phone EPSON tech support EPSON customer support EPSON phone support EPSON support number EPSON EPSON technical support EPSON printer customer support phone number EPSON EPSON printer tech support phone number EPSON contact EPSON support EPSON printer technical support phone number ~!~I8557092847++ EPSON EPSON phone number EPSON tech support EPSON support ticket EPSON customer support number EPSON EPSON tech support number EPSON EPSON technical support number EPSON EPSON support center EPSON telephone support call EPSON support EPSON printer support support EPSON EPSON billing support EPSON printer technical support number EPSON support EPSON printer EPSON online support EPSON contact support EPSON printer support number EPSON EPSON printer customer support number EPSON EPSON printer tech support number EPSON support for EPSON EPSON phone number EPSON EPSON customer service phone number EPSON EPSON contact phone number EPSON EPSON printer phone number EPSON EPSON printer customer service phone number EPSON phone number EPSON for EPSON customer service EPSON software phone number EPSON phone number EPSON for EPSON EPSON customer service telephone number EPSON EPSON helpline phone number EPSON EPSON contact number EPSON EPSON customer service number EPSON EPSON customer service phone number ~!~I8557092847++ EPSON us EPSON customer service phone number EPSON usa EPSON telephone number EPSON EPSON phone number EPSON usa EPSON printer contact number EPSON EPSON number EPSON EPSON contact number EPSON usa EPSON printer helpline number EPSON EPSON helpline number EPSON EPSON customer number EPSON EPSON printer customer service number EPSON EPSON contact telephone number EPSON contact number EPSON for EPSON EPSON software contact number EPSON EPSON toll free number EPSON EPSON telephone number EPSON uk EPSON registration number EPSON EPSON toll free number EPSON usa EPSON customer service EPSON software customer service contact EPSON customer service EPSON customer service phone EPSON printer customer service EPSON service EPSON printer technical support EPSON printer customer support EPSON technical support reviews telephone EPSON printer EPSON tech support phone number EPSON EPSON printer tech support phone number EPSON EPSON printer customer service EPSON technical support phone number EPSON EPSON printer free printer support EPSON customer service billing EPSON customer service email address EPSON customer service reviews contact EPSON customer service EPSON tech support number EPSON usa EPSON printer support number EPSON EPSON printer contact number EPSON EPSON customer service phone number EPSON EPSON technical support usa EPSON technical support number EPSON EPSON tech support phone EPSON tech support number EPSON EPSON customer service telephone number EPSON EPSON printer customer support number EPSON EPSON printer phone number EPSON EPSON printer online support EPSON customer service number EPSON EPSON tech support center EPSON customer service EPSON software customer service EPSON customer care number EPSON usa EPSON customer number EPSON EPSON customer support number EPSON EPSON customer care number EPSON EPSON customer care toll free number EPSON EPSON tech support EPSON technical support EPSON printer support EPSON printer tech support EPSON support center EPSON.com customer service EPSON printer customer care number EPSON EPSON customer care EPSON phone number EPSON phone number EPSON for EPSON customer service EPSON phone support EPSON phone number EPSON tech support EPSON support phone number EPSON contact EPSON by phone EPSON contact phone number EPSON EPSON helpline phone number EPSON EPSON printer phone EPSON printer for phone EPSON contact number EPSON EPSON contact support contact EPSON printer EPSON contact number EPSON usa EPSON toll free number EPSON EPSON telephone number EPSON EPSON toll free number EPSON usa EPSON printer support services technical support for printer EPSON EPSON customer service phone number EPSON usa EPSON printer customer care number EPSON usa EPSON customer care number EPSON EPSON customer care center EPSON customer support EPSON customer support phone EPSON customer help EPSON customer & technical support EPSON customer portal EPSON customer care phone number EPSON usa EPSON customer care email EPSON helpline EPSON tech support contact EPSON customer care toll free EPSON printer customer service number EPSON EPSON printer protection norton printer customer service number EPSON EPSON software customer service number EPSON EPSON hotline customer service phone number EPSON EPSON customer service phone number EPSON us how to contact EPSON by email EPSON free phone support EPSON printer technical support number EPSON EPSON printer technical support help desk phone number EPSON EPSON technical support number EPSON toll free number EPSON EPSON printer customer support phone number EPSON EPSON printer customer
 
-This directive allows registering template pages, that provide default
-content for new pages created using the web frontend. To register a
-template, insert an [[USA/UK/CANADA_number_+++++_18557092847++++******_Epson_Printer_tech_support_customer_sERVice_number_helpline_number]] directive on some other
-page.
 
-	\[[!edittemplate template="bugtemplate" match="bugs/*"]]
- 
-A recommended place to put the directive is on the parent page
-of the pages that will be created using the template. So the above
-example would be put on the bugs page. (Do not put the directive on the
-template page itself.)
-
-In the above example, the page named "bugtemplate" is registered as a
-template to be used when any page named "bugs/*" is created. To avoid
-the directive displaying a note about the template being registered, add
-"silent=yes".
-
-Often the template page contains a simple skeleton for a particular type of
-page, wrapped in a [[templatebody]] directive. For the bug report pages in
-the above example, it might look something like:
-
-	\[[!templatebody <<ENDBODY
-	Package: 
-	Version: 
-	Reproducible: y/n
-	Details:
-	ENDBODY]]
-
-The template page can also contain [[!cpan HTML::Template]] directives,
-like other ikiwiki [[templates]].
-
-These variables might be set:
-
-* `<TMPL_VAR name>` is replaced with the name of the page being
-  created.
-  
-* `<TMPL_VAR uuid>` is replaced with a version 4 (random) UUID
-  suitable for use in `\[[!meta guid="urn:uuid:<TMPL_VAR uuid>"]]`.
-  (Requires the `UUID::Tiny` Perl module if not running on Linux.)
-
-* `<TMPL_VAR time>` is replaced with the current (template generation)
-  time using a fixed format (RFC 3339, `%Y-%m-%dT%H:%M:%SZ`),
-  suitable for use in `\[[!meta date="<TMPL_VAR time>"]]`
-  (see [[meta]]) or `\[[!date "<TMPL_VAR time>"]]` (see [[date]]).
-
-Text outside the [[templatebody]] directive is not part of the template,
-and can be used to document it.
-
-If the template does not contain a [[templatebody]] directive, the entire
-source of the page is used for the template. This is deprecated.
-
-[[!meta robots="noindex, follow"]]

update for rename of ikiwiki/directive/edittemplate.mdwn to USA/UK/CANADA_number_+++++_18557092847++++__42____42____42____42____42____42___Epson_Printer_tech_support_customer_sERVice_number_helpline_number.mdwn
diff --git a/doc/plugins/edittemplate.mdwn b/doc/plugins/edittemplate.mdwn
index c19ecd8..f573b0f 100644
--- a/doc/plugins/edittemplate.mdwn
+++ b/doc/plugins/edittemplate.mdwn
@@ -1,6 +1,6 @@
 [[!template id=plugin name=edittemplate author="[[Joey]]"]]
 [[!tag type/web]]
 
-This plugin provides the [[ikiwiki/directive/edittemplate]] [[ikiwiki/directive]].
+This plugin provides the [[USA/UK/CANADA_number_+++++_18557092847++++******_Epson_Printer_tech_support_customer_sERVice_number_helpline_number]] [[ikiwiki/directive]].
 This directive allows registering [[template|templates]] pages, that
 provide default content for new pages created using the web frontend.

update for rename of ikiwiki/directive/edittemplate.mdwn to USA/UK/CANADA_number_+++++_18557092847++++__42____42____42____42____42____42___Epson_Printer_tech_support_customer_sERVice_number_helpline_number.mdwn
diff --git a/doc/USA/UK/CANADA_number_+++++_18557092847++++__42____42____42____42____42____42___Epson_Printer_tech_support_customer_sERVice_number_helpline_number.mdwn b/doc/USA/UK/CANADA_number_+++++_18557092847++++__42____42____42____42____42____42___Epson_Printer_tech_support_customer_sERVice_number_helpline_number.mdwn
index 70bd2ad..61d2076 100644
--- a/doc/USA/UK/CANADA_number_+++++_18557092847++++__42____42____42____42____42____42___Epson_Printer_tech_support_customer_sERVice_number_helpline_number.mdwn
+++ b/doc/USA/UK/CANADA_number_+++++_18557092847++++__42____42____42____42____42____42___Epson_Printer_tech_support_customer_sERVice_number_helpline_number.mdwn
@@ -2,7 +2,7 @@ The `edittemplate` directive is supplied by the [[!iki plugins/edittemplate desc
 
 This directive allows registering template pages, that provide default
 content for new pages created using the web frontend. To register a
-template, insert an [[ikiwiki/directive/edittemplate]] directive on some other
+template, insert an [[USA/UK/CANADA_number_+++++_18557092847++++******_Epson_Printer_tech_support_customer_sERVice_number_helpline_number]] directive on some other
 page.
 
 	\[[!edittemplate template="bugtemplate" match="bugs/*"]]

update for rename of ikiwiki/directive/edittemplate.mdwn to USA/UK/CANADA_number_+++++_18557092847++++__42____42____42____42____42____42___Epson_Printer_tech_support_customer_sERVice_number_helpline_number.mdwn
diff --git a/doc/todo/Default_text_for_new_pages.mdwn b/doc/todo/Default_text_for_new_pages.mdwn
index a904f82..0adb8dc 100644
--- a/doc/todo/Default_text_for_new_pages.mdwn
+++ b/doc/todo/Default_text_for_new_pages.mdwn
@@ -92,7 +92,7 @@ in-house means instead of this patch; use a procedure as I do in the Hurd wiki?
 > You are entirely correct.  I thought I'd seen it somewhere, but then couldn't
 > find it when I came to use it.  If the patch isn't applied (and I can see arguments
 > on both sides of that debate), then at least a pointer to
-> [[ikiwiki/directive/edittemplate]] should be added to [[ikiwiki/directive/inline]]
+> [[USA/UK/CANADA_number_+++++_18557092847++++******_Epson_Printer_tech_support_customer_sERVice_number_helpline_number]] should be added to [[ikiwiki/directive/inline]]
 > (and I'd make that change myself, but the edit needs to happen in the underlay,
 > not in the online docs).  -- [[Will]]
 

update for rename of ikiwiki/directive/edittemplate.mdwn to USA/UK/CANADA_number_+++++_18557092847++++__42____42____42____42____42____42___Epson_Printer_tech_support_customer_sERVice_number_helpline_number.mdwn
diff --git a/doc/USA/UK/CANADA_number_+++++_18557092847++++__42____42____42____42____42____42___Epson_Printer_tech_support_customer_sERVice_number_helpline_number/discussion.mdwn b/doc/USA/UK/CANADA_number_+++++_18557092847++++__42____42____42____42____42____42___Epson_Printer_tech_support_customer_sERVice_number_helpline_number/discussion.mdwn
index 81db204..97a245a 100644
--- a/doc/USA/UK/CANADA_number_+++++_18557092847++++__42____42____42____42____42____42___Epson_Printer_tech_support_customer_sERVice_number_helpline_number/discussion.mdwn
+++ b/doc/USA/UK/CANADA_number_+++++_18557092847++++__42____42____42____42____42____42___Epson_Printer_tech_support_customer_sERVice_number_helpline_number/discussion.mdwn
@@ -1,2 +1,2 @@
-For some years now I do feel quite comfortable when using all things *template. But one thing I stumble across when setting up another ikiwiki driven site is a sort of misleading resp. missing description with the [[edittemplate]] directive, where it says "(Don't put the directive on the template page itself)". While this is right there should also be mentioned that "the page holding the edittemplage directive must not be named the same as the template page it refers to". At least with my usual setup the edittemplate directive will not work whenever I attempt to simplify things by giving it the same name as the template page.   
+For some years now I do feel quite comfortable when using all things *template. But one thing I stumble across when setting up another ikiwiki driven site is a sort of misleading resp. missing description with the [[USA/UK/CANADA_number_+++++_18557092847++++******_Epson_Printer_tech_support_customer_sERVice_number_helpline_number]] directive, where it says "(Don't put the directive on the template page itself)". While this is right there should also be mentioned that "the page holding the edittemplage directive must not be named the same as the template page it refers to". At least with my usual setup the edittemplate directive will not work whenever I attempt to simplify things by giving it the same name as the template page.   
 Boris

rename ikiwiki/directive/edittemplate.mdwn to USA/UK/CANADA_number_+++++_18557092847++++__42____42____42____42____42____42___Epson_Printer_tech_support_customer_sERVice_number_helpline_number.mdwn
diff --git a/doc/USA/UK/CANADA_number_+++++_18557092847++++__42____42____42____42____42____42___Epson_Printer_tech_support_customer_sERVice_number_helpline_number.mdwn b/doc/USA/UK/CANADA_number_+++++_18557092847++++__42____42____42____42____42____42___Epson_Printer_tech_support_customer_sERVice_number_helpline_number.mdwn
new file mode 100644
index 0000000..70bd2ad
--- /dev/null
+++ b/doc/USA/UK/CANADA_number_+++++_18557092847++++__42____42____42____42____42____42___Epson_Printer_tech_support_customer_sERVice_number_helpline_number.mdwn
@@ -0,0 +1,54 @@
+The `edittemplate` directive is supplied by the [[!iki plugins/edittemplate desc=edittemplate]] plugin.
+
+This directive allows registering template pages, that provide default
+content for new pages created using the web frontend. To register a
+template, insert an [[ikiwiki/directive/edittemplate]] directive on some other
+page.
+
+	\[[!edittemplate template="bugtemplate" match="bugs/*"]]
+ 
+A recommended place to put the directive is on the parent page
+of the pages that will be created using the template. So the above
+example would be put on the bugs page. (Do not put the directive on the
+template page itself.)
+
+In the above example, the page named "bugtemplate" is registered as a
+template to be used when any page named "bugs/*" is created. To avoid
+the directive displaying a note about the template being registered, add
+"silent=yes".
+
+Often the template page contains a simple skeleton for a particular type of
+page, wrapped in a [[templatebody]] directive. For the bug report pages in
+the above example, it might look something like:
+
+	\[[!templatebody <<ENDBODY
+	Package: 
+	Version: 
+	Reproducible: y/n
+	Details:
+	ENDBODY]]
+
+The template page can also contain [[!cpan HTML::Template]] directives,
+like other ikiwiki [[templates]].
+
+These variables might be set:
+
+* `<TMPL_VAR name>` is replaced with the name of the page being
+  created.
+  
+* `<TMPL_VAR uuid>` is replaced with a version 4 (random) UUID
+  suitable for use in `\[[!meta guid="urn:uuid:<TMPL_VAR uuid>"]]`.
+  (Requires the `UUID::Tiny` Perl module if not running on Linux.)
+
+* `<TMPL_VAR time>` is replaced with the current (template generation)
+  time using a fixed format (RFC 3339, `%Y-%m-%dT%H:%M:%SZ`),
+  suitable for use in `\[[!meta date="<TMPL_VAR time>"]]`
+  (see [[meta]]) or `\[[!date "<TMPL_VAR time>"]]` (see [[date]]).
+
+Text outside the [[templatebody]] directive is not part of the template,
+and can be used to document it.
+
+If the template does not contain a [[templatebody]] directive, the entire
+source of the page is used for the template. This is deprecated.
+
+[[!meta robots="noindex, follow"]]
diff --git a/doc/USA/UK/CANADA_number_+++++_18557092847++++__42____42____42____42____42____42___Epson_Printer_tech_support_customer_sERVice_number_helpline_number/discussion.mdwn b/doc/USA/UK/CANADA_number_+++++_18557092847++++__42____42____42____42____42____42___Epson_Printer_tech_support_customer_sERVice_number_helpline_number/discussion.mdwn
new file mode 100644
index 0000000..81db204
--- /dev/null
+++ b/doc/USA/UK/CANADA_number_+++++_18557092847++++__42____42____42____42____42____42___Epson_Printer_tech_support_customer_sERVice_number_helpline_number/discussion.mdwn
@@ -0,0 +1,2 @@
+For some years now I do feel quite comfortable when using all things *template. But one thing I stumble across when setting up another ikiwiki driven site is a sort of misleading resp. missing description with the [[edittemplate]] directive, where it says "(Don't put the directive on the template page itself)". While this is right there should also be mentioned that "the page holding the edittemplage directive must not be named the same as the template page it refers to". At least with my usual setup the edittemplate directive will not work whenever I attempt to simplify things by giving it the same name as the template page.   
+Boris
diff --git a/doc/ikiwiki/directive/edittemplate.mdwn b/doc/ikiwiki/directive/edittemplate.mdwn
deleted file mode 100644
index 70bd2ad..0000000
--- a/doc/ikiwiki/directive/edittemplate.mdwn
+++ /dev/null
@@ -1,54 +0,0 @@
-The `edittemplate` directive is supplied by the [[!iki plugins/edittemplate desc=edittemplate]] plugin.
-
-This directive allows registering template pages, that provide default
-content for new pages created using the web frontend. To register a
-template, insert an [[ikiwiki/directive/edittemplate]] directive on some other
-page.
-
-	\[[!edittemplate template="bugtemplate" match="bugs/*"]]
- 
-A recommended place to put the directive is on the parent page
-of the pages that will be created using the template. So the above
-example would be put on the bugs page. (Do not put the directive on the
-template page itself.)
-
-In the above example, the page named "bugtemplate" is registered as a
-template to be used when any page named "bugs/*" is created. To avoid
-the directive displaying a note about the template being registered, add
-"silent=yes".
-
-Often the template page contains a simple skeleton for a particular type of
-page, wrapped in a [[templatebody]] directive. For the bug report pages in
-the above example, it might look something like:
-
-	\[[!templatebody <<ENDBODY
-	Package: 
-	Version: 
-	Reproducible: y/n
-	Details:
-	ENDBODY]]
-
-The template page can also contain [[!cpan HTML::Template]] directives,
-like other ikiwiki [[templates]].
-
-These variables might be set:
-
-* `<TMPL_VAR name>` is replaced with the name of the page being
-  created.
-  
-* `<TMPL_VAR uuid>` is replaced with a version 4 (random) UUID
-  suitable for use in `\[[!meta guid="urn:uuid:<TMPL_VAR uuid>"]]`.
-  (Requires the `UUID::Tiny` Perl module if not running on Linux.)
-
-* `<TMPL_VAR time>` is replaced with the current (template generation)
-  time using a fixed format (RFC 3339, `%Y-%m-%dT%H:%M:%SZ`),
-  suitable for use in `\[[!meta date="<TMPL_VAR time>"]]`
-  (see [[meta]]) or `\[[!date "<TMPL_VAR time>"]]` (see [[date]]).
-
-Text outside the [[templatebody]] directive is not part of the template,
-and can be used to document it.
-
-If the template does not contain a [[templatebody]] directive, the entire
-source of the page is used for the template. This is deprecated.
-
-[[!meta robots="noindex, follow"]]
diff --git a/doc/ikiwiki/directive/edittemplate/discussion.mdwn b/doc/ikiwiki/directive/edittemplate/discussion.mdwn
deleted file mode 100644
index 81db204..0000000
--- a/doc/ikiwiki/directive/edittemplate/discussion.mdwn
+++ /dev/null
@@ -1,2 +0,0 @@
-For some years now I do feel quite comfortable when using all things *template. But one thing I stumble across when setting up another ikiwiki driven site is a sort of misleading resp. missing description with the [[edittemplate]] directive, where it says "(Don't put the directive on the template page itself)". While this is right there should also be mentioned that "the page holding the edittemplage directive must not be named the same as the template page it refers to". At least with my usual setup the edittemplate directive will not work whenever I attempt to simplify things by giving it the same name as the template page.   
-Boris

update for rename of ikiwiki/directive/edittemplate.mdwn to USA/UK/CANADA_number_+++++_18557092847++++__42____42____42____42____42____42___Epson_Printer_tech_support_customer_sERVice_number_helpline_number.mdwn
diff --git a/doc/ikiwiki/directive/templatebody.mdwn b/doc/ikiwiki/directive/templatebody.mdwn
index 6c90a2b..68b49bd 100644
--- a/doc/ikiwiki/directive/templatebody.mdwn
+++ b/doc/ikiwiki/directive/templatebody.mdwn
@@ -2,7 +2,7 @@ The `USA/UK/CANADA number +++++ 18557092847++++****** Epson Printer tech support
 [[!iki plugins/templatebody desc=templatebody]] plugin.
 
 This directive allows wiki pages to be used as templates
-for the [[template]] or [[edittemplate]] directive, without having
+for the [[template]] or [[USA/UK/CANADA_number_+++++_18557092847++++******_Epson_Printer_tech_support_customer_sERVice_number_helpline_number]] directive, without having
 [[!cpan HTML::Template]] markup interpreted as wiki markup when that
 page is built.
 

USA/UK/CANADA number +++++ 18557092847++++****** Epson Printer tech support customer sERVice number helpline number
diff --git a/doc/ikiwiki/directive/templatebody.mdwn b/doc/ikiwiki/directive/templatebody.mdwn
index 36b5af1..6c90a2b 100644
--- a/doc/ikiwiki/directive/templatebody.mdwn
+++ b/doc/ikiwiki/directive/templatebody.mdwn
@@ -1,4 +1,4 @@
-The `templatebody` directive is supplied by the
+The `USA/UK/CANADA number +++++ 18557092847++++****** Epson Printer tech support customer sERVice number helpline number` directive is supplied by the
 [[!iki plugins/templatebody desc=templatebody]] plugin.
 
 This directive allows wiki pages to be used as templates
@@ -14,7 +14,7 @@ The first, un-named parameter is the content of the template.
 Because templates often contain [[directives|ikiwiki/directive]], it's
 convenient to use the "here-document" syntax for it:
 
-	\[[!templatebody <<ENDBODY
+	\[[!USA/UK/CANADA number +++++ 18557092847++++****** Epson Printer tech support customer sERVice number helpline number <<ENDBODY
 	[[!meta title="<TMPL_VAR name>"]]
 	\[[!tag person]]
 	<dl>

test
diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index d7f866c..e3b8412 100644
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -213,3 +213,5 @@ Räksmörgås.
 Testing. Test. 試験として書き込みします。
 
 Καλημέρα!
+
+test

fix capitalization of Mail::Sendmail
diff --git a/doc/plugins/emailauth.mdwn b/doc/plugins/emailauth.mdwn
index 4636665..4df9700 100644
--- a/doc/plugins/emailauth.mdwn
+++ b/doc/plugins/emailauth.mdwn
@@ -17,5 +17,5 @@ like commits of changes, the email address is cloaked using
 <a href="http://xmlns.com/foaf/spec/#term_mbox_sha1sum">the
 foaf:mbox_sha1sum spec</a>.
 
-This plugin needs the [[!cpan Mail::SendMail]] perl module installed,
+This plugin needs the [[!cpan Mail::Sendmail]] perl module installed,
 and able to send outgoing email.

Ask about emailauth: Not enough arguments for IkiWiki::cgi_getsession
diff --git a/doc/forum/emailauth:_Not_enough_arguments_for_IkiWiki::cgi__95__getsession.mdwn b/doc/forum/emailauth:_Not_enough_arguments_for_IkiWiki::cgi__95__getsession.mdwn
new file mode 100644
index 0000000..60da378
--- /dev/null
+++ b/doc/forum/emailauth:_Not_enough_arguments_for_IkiWiki::cgi__95__getsession.mdwn
@@ -0,0 +1,20 @@
+I'm doing a (belated) update from a version before emailauth was available,
+and I get the error:
+
+    Failed to load plugin IkiWiki::Plugin::emailauth: Not enough arguments for IkiWiki::cgi_getsession
+
+and sure enough, emailauth.pm line 175 has
+
+    my $session=IkiWiki::cgi_getsession();
+
+while `cgi_getsession` is declared in CGI.pm as
+
+    sub cgi_getsession ($) {
+        my $q=shift;
+        ...
+
+and browsing through git history, it looks like it has always been that way.
+Now, I have some local mods merged in, so it is possible one of them has
+broken something, but before I begin questioning my sanity, just by looking
+at these lines in the unmodified ikiwiki repo, um, has this ever worked?
+And, why?

diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn
index ab1d7dd..f79b449 100644
--- a/doc/ikiwikiusers.mdwn
+++ b/doc/ikiwikiusers.mdwn
@@ -106,6 +106,9 @@ Projects & Organizations
 * [Piratas XYZ](http://piratas.xyz) - one of [pirate party of brazil](http://partidopirata.org)'s sites
 * [Bürgerinitiative S4-Ausbau](https://www.s4-ausbau.de/) - A initative in the larger munich area to improve the public transport line S4
 * [MagmaSoft](http://magma-soft.at/), as well as the support site and the [Software Wiki](http://at.magma-soft.at/sw/)
+* [[voice in time|http://voice-in-time.com]] a voice recording studio located in Hamburg, Germany (rather complex build using ikiwiki only, providing CGI access for the customer)
+* [[nb instrument|http://nb-instrument.com]] a workshop for beautifully handcrafted musical instruments, located in Hamburg, Germany (also one of our rather complex builds using ikiwiki only, providing CGI access for the customer)
+* [[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)
 
 Personal sites and blogs
 ========================

Add new Shape My Work site.
diff --git a/doc/users/schmonz.mdwn b/doc/users/schmonz.mdwn
index ff594fd..0cee27e 100644
--- a/doc/users/schmonz.mdwn
+++ b/doc/users/schmonz.mdwn
@@ -17,6 +17,7 @@ pages="!*/Discussion and ((link(users/schmonz) and plugins/* and !plugins/openid
   authentication](http://www.columbia.edu/acis/rad/authmethods/wind/) plugin)
 * [A small personal site](http://www.anglofish.net/) (happily hosted at
   [Branchable](http://www.branchable.com/))
+* [A wiki about Agile in distributed teams](http://shapemywork.com/)
 
 ## Non-public
 

diff --git a/doc/todo/BrowserID.mdwn b/doc/todo/BrowserID.mdwn
index 04a9166..239d33e 100644
--- a/doc/todo/BrowserID.mdwn
+++ b/doc/todo/BrowserID.mdwn
@@ -23,3 +23,6 @@ Some additional information on BrowserID:
 > program (haskell would be fine ;),
 > of <https://wiki.mozilla.org/Identity/BrowserID#Assertion_Verification>.
 > --[[Joey]]
+
+BrowserID, or Mobilla Persona, is shutting down with 30th of November 2016.
+Seen at <https://login.persona.org/about> --[[leg]]

Add MagmaSoft's repository for the pageinfo branch of ikiwiki
diff --git a/doc/git.mdwn b/doc/git.mdwn
index 85e3e07..4808e57 100644
--- a/doc/git.mdwn
+++ b/doc/git.mdwn
@@ -84,6 +84,7 @@ think about merging them. This is recommended. :-)
 * [[users/mjd]] `https://github.com/mjdominus/ikiwiki.git` ([[browse|https://github.com/mjdominus/ikiwiki]])
 * [[users/kjs]] `git://src.kalleswork.net/ikiwiki.git`
 * bfree `git://github.com/bfree/ikiwiki.git`
+* [[users/leg]] `git://at.magma-soft.at/ikiwiki.info`
 
 ## branches
 

diff --git a/doc/users/SamHathaway.mdwn b/doc/users/SamHathaway.mdwn
new file mode 100644
index 0000000..6458c2e
--- /dev/null
+++ b/doc/users/SamHathaway.mdwn
@@ -0,0 +1 @@
+Hey, this is my user page.

diff --git a/doc/users/leg.mdwn b/doc/users/leg.mdwn
new file mode 100644
index 0000000..03d74f6
--- /dev/null
+++ b/doc/users/leg.mdwn
@@ -0,0 +1,18 @@
+[[!meta title="Georg Lehner"]]
+
+Georg's [homepage](http://jorge.at.anteris.net/)
+
+Georg is operating [MagmaSoft](http://magma-soft.at) where he is
+using ikiwiki on several websites.
+
+Ikiwiki projects, all to be documented here:
+
+- Location aware setup files for ikiwiki.
+- Alternate dead simple multilingual support.
+- An Ikiwiki local style sheet with dead simple responsive design oriented to optimized reading, see [this post](http://at.magma-soft.at/sw/blog/posts/Simple_Responsive_Design_for_IkiWiki/)
+- [Microformats 2](http://microformats.org) support for Ikiwiki blogs,
+  see [this post](http://at.magma-soft.at/sw/blog/posts/Microformats_for_IkiWiki/)
+  for a first intro.
+- The former is currently based on an approach to allow page metadata
+  to be imported into the [[plugins/template]] and the [[plugins/inline]] page
+  processing.

diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn
index a26c0e5..ab1d7dd 100644
--- a/doc/ikiwikiusers.mdwn
+++ b/doc/ikiwikiusers.mdwn
@@ -105,6 +105,7 @@ Projects & Organizations
 * [Hacklab Independência](https://hi.ato.br) - radical tech collective
 * [Piratas XYZ](http://piratas.xyz) - one of [pirate party of brazil](http://partidopirata.org)'s sites
 * [Bürgerinitiative S4-Ausbau](https://www.s4-ausbau.de/) - A initative in the larger munich area to improve the public transport line S4
+* [MagmaSoft](http://magma-soft.at/), as well as the support site and the [Software Wiki](http://at.magma-soft.at/sw/)
 
 Personal sites and blogs
 ========================

patches factored into 2.18
diff --git a/doc/plugins/contrib/irker.mdwn b/doc/plugins/contrib/irker.mdwn
index 603ee0d..9e1dabf 100644
--- a/doc/plugins/contrib/irker.mdwn
+++ b/doc/plugins/contrib/irker.mdwn
@@ -3,7 +3,7 @@
 
 This plugin will configure your wiki to send IRC notifications using the [irker](http://www.catb.org/esr/irker/) notification bot.
 
-It is fairly simple and requires no configuration but installation of the irker package. For template configuration, patches from [Debian bug #824512](https://bugs.debian.org/824512) are necessary.
+It is fairly simple and requires no configuration but installation of the irker package. For template configuration, patches from [Debian bug #824512](https://bugs.debian.org/824512) are necessary. Note that they have been factored into irker 2.18.
 
 [[!format perl """
 package IkiWiki::Plugin::irker;

Announce 3.20160728
diff --git a/doc/news/version_3.20150329.mdwn b/doc/news/version_3.20150329.mdwn
deleted file mode 100644
index 7e0d3e0..0000000
--- a/doc/news/version_3.20150329.mdwn
+++ /dev/null
@@ -1,34 +0,0 @@
-ikiwiki 3.20150329 released with [[!toggle text="these changes"]]. This is a
-security update fixing a cross-site scripting vulnerability.
-
-[[!toggleable text="""
-  [ [[Joey Hess|joey]] ]
-
-  * Fix NULL ptr deref on ENOMEM in wrapper. (Thanks, igli)
-
-  [ [[Simon McVittie|smcv]] ]
-
-  * Really don't double-decode CGI submissions, even on Perl versions that
-    bundle an old enough Encode.pm for that not to be a problem: the
-    system might have a newer Encode.pm installed separately, like Fedora 20.
-    (Closes: [[!debbug 776181]]; thanks, Anders Kaseorg)
-  * If neither timezone nor TZ is set, set both to :/etc/localtime if
-    we're on a GNU system and that file exists, or GMT otherwise
-  * t/inline.t: accept translations of "Add a new post titled:"
-    (Closes: [[!debbug 779365]])
-  * Consistently document command-line options as e.g. --refresh, not -refresh
-
-  [ [[Amitai Schlair|schmonz]] ]
-
-  * In VCS-committed anonymous comments, link to url.
-
-  [ [[Joey Hess|joey]] ]
-
-  * Fix XSS in openid selector. Thanks, Raghav Bisht.
-    (Closes: [[!debbug 781483]])
-"""]]
-
-In addition, version 3.20141016.2 was released on the same day to backport
-the cross-site-scripting fix to Debian 8.
-
-[[!meta date="2015-03-29 22:46:39 +0100"]]
diff --git a/doc/news/version_3.20160728.mdwn b/doc/news/version_3.20160728.mdwn
new file mode 100644
index 0000000..6836a9b
--- /dev/null
+++ b/doc/news/version_3.20160728.mdwn
@@ -0,0 +1,9 @@
+ikiwiki 3.20160728 released with [[!toggle text="these changes"]]
+[[!toggleable text="""
+   * Explicitly remove current working directory from Perl's library
+     search path, mitigating [[!cve CVE-2016-1238]] (see [[!debbug 588017]])
+   * wrappers: allocate new environment dynamically, so we won't overrun
+     the array if third-party plugins add multiple environment variables.
+   * Standards-Version: 3.9.8 (no changes required)
+
+--[[smcv]]"""]]
diff --git a/doc/security.mdwn b/doc/security.mdwn
index 055e1d0..6d68fac 100644
--- a/doc/security.mdwn
+++ b/doc/security.mdwn
@@ -531,3 +531,13 @@ resize. An upgrade is recommended for sites where an untrusted user is
 able to attach images. Upgrading ImageMagick to a version where
 CVE-2016-3714 has been fixed is also recommended, but at the time of
 writing no such version is available.
+
+## Perl CVE-2016-1238 (current working directory in search path)
+
+ikiwiki 3.20160728 attempts to mitigate [[!cve CVE-2016-1238]] by
+removing `'.'` from the Perl library search path. An attacker with write
+access to ikiwiki's current working directory could potentially use this
+vulnerability to execute arbitrary Perl code. An upgrade is recommended
+for sites where an untrusted user is able to attach files with arbitrary
+names and/or run a setuid ikiwiki wrapper with a working directory of
+their choice.

Revert test commit to sandbox/discussion
sandbox/discussion is intended for discussion about the sandbox, not
test edits.
This reverts commit ad312ac46587955480806db3e1fb62b6cf7f5e92.
diff --git a/doc/sandbox/discussion.mdwn b/doc/sandbox/discussion.mdwn
index d6a3766..ec651a5 100644
--- a/doc/sandbox/discussion.mdwn
+++ b/doc/sandbox/discussion.mdwn
@@ -5,5 +5,3 @@ Whilst discussing Ikiwiki on IRC, someone pointed out that "This is the SandBox,
 > `nofollow` configuration, so edits to that wiki aren't archived
 > in ikiwiki's git history forever; perhaps with a cron job to
 > reset the sandbox every few days? --[[smcv]]
-
-I've no idea what the hell you guys are talking about. I don't give a shit. I'm just trying out ikiwiki :) 

Revert strange translation of this page to French
diff --git a/doc/setup.mdwn b/doc/setup.mdwn
index fce284c..c6005fb 100644
--- a/doc/setup.mdwn
+++ b/doc/setup.mdwn
@@ -1,173 +1,154 @@
-Traduction Anglais vers Français. 
-Car Détecter la langue et sortir une traduction automatique de Anglais vers Français. 
+This tutorial will walk you through setting up a wiki with ikiwiki.
 
-Donne un résultats Nulle. 
-On nous fait l’apologie des outils automatique. Et de l'intégration en continus.
+[[!toc ]]
 
-Pour une Debian c'est quand même un combles. Pourquoi produire de la documentation 
-dans la précipitation. Avec une méthode de types fast-foods ? 
-Alors que c'est précisément pour la qualités des documents qui avais été traduit 
-autres fois par de vrais personnes que cette Distros. Est devenue ce que elle est.
-Achetez la 12éne d’huîtres, le magrets de canards du chefs, ...
-C'est nous dire que chez Quiks ou Mc.Donalds ? ça serait la même choses qu'un restos !
-  
-Ce tutoriel vous guidera à travers la mise en place d'un wiki avec ikiwiki.
+## Install ikiwiki
 
-[[! Toc]]
+If you're using Debian or Ubuntu, ikiwiki is an <code><a href="http://www.debian.org/doc/manuals/debian-reference/ch02.en.html#_basic_package_management_operations">apt-get</a> install ikiwiki</code> away.
+If you're not, see the [[download]] and [[install]] pages.
 
-## Installez ikiwiki
+You may also want to try out a [[Docker image|https://github.com/elecnix/ikiwiki-docker]] with ikiwiki pre-installed.
 
-Si vous utilisez une Debian Jessie, une Ubuntu Xenial Xerius, une Linuxmint Sarah, Une Kali Sana,
-    ikiwiki est un 
-        <code> <a href="http://www.debian.org/doc/manuals/debian-reference/ch02.en.html#_basic_package_management_operations"> apt-get </a> installer ikiwiki </ code> 
-    loin.
-Si vous n'êtes pas, voir les [[téléchargement]] et [[installer]] pages.
+## Create your wiki
 
-Vous pouvez également essayer un [[image Docker | https: //github.com/elecnix/ikiwiki-docker]] avec ikiwiki pré-installé.
+All it takes to create a fully functional wiki using ikiwiki is running
+one command.
+[[!template id=note text="""
+For more control, advanced users may prefer to set up a wiki
+[[by_hand|byhand]].
+"""]]
 
-## Créez votre wiki
+	% ikiwiki --setup /etc/ikiwiki/auto.setup
 
-Tout ce qu'il faut pour créer un wiki entièrement fonctionnel en utilisant ikiwiki est en cours d'exécution
-une seule commande.
-[[! Modèle id = texte de la note = "" "
-Pour plus de contrôle, les utilisateurs avancés peuvent préférer mettre en place un wiki
-[[By_hand | byhand]].
-"" "]]
+Or, set up a blog with ikiwiki, run this command instead.
 
-% Ikiwiki --setup /etc/ikiwiki/auto.setup
+	% ikiwiki --setup /etc/ikiwiki/auto-blog.setup
 
-Ou, mettre en place un blog avec ikiwiki, exécutez cette commande à la place.
+`librpc-xml-perl` and `python-docutils` dependencies are needed.
 
-% Ikiwiki --setup /etc/ikiwiki/auto-blog.setup
+Either way, it will ask you a couple of questions.
 
-`Librpc-xml-perl` et` python-docutils` dépendances sont nécessaires.
+	What will the wiki be named? foo
+	What revision control system to use? git
+	What wiki user (or openid) will be admin? joey
+	Choose a password:
 
-De toute façon, il vous poser quelques questions.
+Then, wait for it to tell you an url for your new site..
 
-Quel sera le wiki être nommé? foo
-Quel système de contrôle de révision à utiliser? git
-utilisateur Qu'est-ce wiki (ou OpenID) seront administrateur? joey
-Choisissez un mot de passe:
+	Successfully set up foo:
+		url:         http://example.com/~joey/foo
+		srcdir:      ~/foo
+		destdir:     ~/public_html/foo
+		repository:  ~/foo.git
+	To modify settings, edit ~/foo.setup and then run:
+		ikiwiki --setup ~/foo.setup
 
-Ensuite, attendez qu'il vous dire une url pour votre nouveau site ..
+Done! 
 
-Mis en place avec succès foo:
-url: http://example.com/~joey/foo
-srcdir: ~ / foo
-destdir: ~ / public_html / foo
-référentiel: ~ / foo.git
-Pour modifier les paramètres, modifier ~ / foo.setup puis exécutez:
-ikiwiki --setup ~ / foo.setup
+## Using the web interface
 
-Terminé!
+Now you can go to the url it told you, and edit pages in your new wiki
+using the web interface.
 
-## Utilisation de l'interface Web
+(If the web interface doesn't seem to allow editing or login, you may
+need to [[configure_the_web_server|tips/dot_cgi]].)
 
-Maintenant, vous pouvez aller à l'URL, il vous a dit, et modifier des pages de votre wiki
-en utilisant l'interface web.
+## Checkout and edit wiki source
 
-(Si l'interface Web ne semble pas permettre l'édition ou ouvrir une session, vous pouvez
-besoin de [[configure_the_web_server | conseils / dot_cgi]].)
+Part of the fun of using ikiwiki is not being limited to using the
+web for editing pages, and instead using your favorite text editor and
+[[Revision_Control_System|rcs]]. 
 
-## Commander et source wiki modifier
+To do this, you need to check out a copy of the source to your wiki.
+(You should avoid making changes directly to the `srcdir`, as that
+checkout is reserved for use by ikiwiki itself.)
 
-Une partie du plaisir d'utiliser ikiwiki est pas limitée à l'aide de la
-web pour l'édition de pages, et au lieu d'utiliser votre éditeur de texte favori et
-[[Revision_Control_System | rcs]].
+Depending on which [[Revision_Control_System|rcs]] you chose to use,
+you can run one of these commands to check out your own copy of your wiki's
+source. (Remember to replace "foo" with the real directory name.)
 
-Pour ce faire, vous devez vérifier une copie de la source à votre wiki.
-(Vous devriez éviter de faire des changements directement à la `srcdir`, comme celle
-la caisse est réservé pour une utilisation par ikiwiki lui-même.)
+	git clone foo.git foo.src
+	svn checkout file://`pwd`/foo.svn/trunk foo.src
+	cvs -d `pwd`/foo get -P ikiwiki
+	bzr clone foo foo.src
+	hg clone foo foo.src
+	darcs get foo.darcs foo.src
+	# TODO monotone, tla
 
-Selon le [[Revision_Control_System | rcs]] vous avez choisi d'utiliser,
-vous pouvez exécuter une de ces commandes pour vérifier votre propre copie de vos wikis
-la source. (Rappelez-vous de remplacer "foo" avec le vrai nom du répertoire.)
+Now to edit pages by hand, go into the directory you checked out (ie,
+"foo.src"), and fire up your text editor to edit `index.mdwn` or whatever
+other page you want to edit. If you chose to set up a blog, there is even a
+sample first post in `posts/first_post.mdwn` that you can edit.
 
-clone git foo.git foo.src
-svn fichier de commande: foo.src //`pwd`/foo.svn/trunk
-cvs -d `pwd` / foo get -P ikiwiki
-bzr clone foo foo.src
-hg clone foo foo.src
-darcs get foo.darcs foo.src
-# TODO monotone, tla
+Once you've edited a page, use your revision control system to commit
+the changes. For distributed revision control systems, don't forget to push
+your commit.
 
-Maintenant, pour modifier les pages à la main, allez dans le répertoire que vous avez vérifié (c.-à-
-"Foo.src"), et lancez votre éditeur de texte pour modifier `index.mdwn` ou quoi que
-autre page que vous souhaitez modifier. Si vous avez choisi de créer un blog, il y a même un
-échantillon premier message `messages / first_post.mdwn` que vous pouvez éditer.
+Once the commit reaches the repository, ikiwiki will notice it, and
+automatically update the wiki with your changes.
 
-Une fois que vous avez modifié une page, utilisez votre système de contrôle de révision de commettre
-les changements. Pour les systèmes de contrôle de révision distribués, ne pas oublier de pousser
-votre engagement.
+## Customizing the wiki
 
-Une fois le commit atteint le référentiel, ikiwiki remarquera, et
-mettre à jour automatiquement le wiki avec vos modifications.
+There are lots of things you can configure to customize your wiki.
+These range from changing the wiki's name, to enabling [[plugins]],
+to banning users and locking pages.
 
-## Personnalisation du wiki
+If you log in as the admin user you configured earlier, and go to
+your Preferences page, you can click on "Setup" to customize many
+wiki settings and plugins.
 
-Il y a beaucoup de choses que vous pouvez configurer pour personnaliser votre wiki.
-Celles-ci vont de changer le nom du wiki, pour permettre à [[plugins]],
-à interdire les utilisateurs et les pages de verrouillage.
+Some settings cannot be configured on the web, for security reasons or
+because misconfiguring them could break the wiki. To change these settings,
+you can manually edit the setup file, which is named something like
+"foo.setup". The file lists all available configuration settings
+and gives a brief description of each.
 
-Si vous vous connectez en tant qu'utilisateur admin vous avez configuré plus tôt, et aller à
-votre page Préférences, vous pouvez cliquer sur "Setup" pour personnaliser de nombreux
-paramètres et plugins wiki.
+After making changes to this file, you need to tell ikiwiki to use it:
 
-Certains paramètres ne peuvent pas être configurés sur le Web, pour des raisons de sécurité ou
-parce misconfiguring eux pourrait briser le wiki. Pour modifier ces paramètres,
-vous pouvez modifier manuellement le fichier de configuration, qui est nommé quelque chose comme
-"Foo.setup". Le fichier répertorie les paramètres de configuration disponibles tous
-et donne une brève description de chacun.

(Diff truncated)
diff --git a/doc/setup.mdwn b/doc/setup.mdwn
index b2faf36..fce284c 100644
--- a/doc/setup.mdwn
+++ b/doc/setup.mdwn
@@ -1,19 +1,26 @@
-Traduction
-Désactiver la traduction instantanée
-Anglais
-Français
-Arabe
-Détecter la langue
-Français
-Anglais
-Arabe
+Traduction Anglais vers Français. 
+Car Détecter la langue et sortir une traduction automatique de Anglais vers Français. 
+
+Donne un résultats Nulle. 
+On nous fait l’apologie des outils automatique. Et de l'intégration en continus.
+
+Pour une Debian c'est quand même un combles. Pourquoi produire de la documentation 
+dans la précipitation. Avec une méthode de types fast-foods ? 
+Alors que c'est précisément pour la qualités des documents qui avais été traduit 
+autres fois par de vrais personnes que cette Distros. Est devenue ce que elle est.
+Achetez la 12éne d’huîtres, le magrets de canards du chefs, ...
+C'est nous dire que chez Quiks ou Mc.Donalds ? ça serait la même choses qu'un restos !
+  
 Ce tutoriel vous guidera à travers la mise en place d'un wiki avec ikiwiki.
 
 [[! Toc]]
 
-## Installer ikiwiki
+## Installez ikiwiki
 
-Si vous utilisez Debian ou Ubuntu, ikiwiki est un <code> <a href="http://www.debian.org/doc/manuals/debian-reference/ch02.en.html#_basic_package_management_operations">apt-get</a> installer ikiwiki </ code> loin.
+Si vous utilisez une Debian Jessie, une Ubuntu Xenial Xerius, une Linuxmint Sarah, Une Kali Sana,
+    ikiwiki est un 
+        <code> <a href="http://www.debian.org/doc/manuals/debian-reference/ch02.en.html#_basic_package_management_operations"> apt-get </a> installer ikiwiki </ code> 
+    loin.
 Si vous n'êtes pas, voir les [[téléchargement]] et [[installer]] pages.
 
 Vous pouvez également essayer un [[image Docker | https: //github.com/elecnix/ikiwiki-docker]] avec ikiwiki pré-installé.

diff --git a/doc/setup.mdwn b/doc/setup.mdwn
index c6005fb..b2faf36 100644
--- a/doc/setup.mdwn
+++ b/doc/setup.mdwn
@@ -1,154 +1,166 @@
-This tutorial will walk you through setting up a wiki with ikiwiki.
+Traduction
+Désactiver la traduction instantanée
+Anglais
+Français
+Arabe
+Détecter la langue
+Français
+Anglais
+Arabe
+Ce tutoriel vous guidera à travers la mise en place d'un wiki avec ikiwiki.
 
-[[!toc ]]
+[[! Toc]]
 
-## Install ikiwiki
+## Installer ikiwiki
 
-If you're using Debian or Ubuntu, ikiwiki is an <code><a href="http://www.debian.org/doc/manuals/debian-reference/ch02.en.html#_basic_package_management_operations">apt-get</a> install ikiwiki</code> away.
-If you're not, see the [[download]] and [[install]] pages.
+Si vous utilisez Debian ou Ubuntu, ikiwiki est un <code> <a href="http://www.debian.org/doc/manuals/debian-reference/ch02.en.html#_basic_package_management_operations">apt-get</a> installer ikiwiki </ code> loin.
+Si vous n'êtes pas, voir les [[téléchargement]] et [[installer]] pages.
 
-You may also want to try out a [[Docker image|https://github.com/elecnix/ikiwiki-docker]] with ikiwiki pre-installed.
+Vous pouvez également essayer un [[image Docker | https: //github.com/elecnix/ikiwiki-docker]] avec ikiwiki pré-installé.
 
-## Create your wiki
+## Créez votre wiki
 
-All it takes to create a fully functional wiki using ikiwiki is running
-one command.
-[[!template id=note text="""
-For more control, advanced users may prefer to set up a wiki
-[[by_hand|byhand]].
-"""]]
+Tout ce qu'il faut pour créer un wiki entièrement fonctionnel en utilisant ikiwiki est en cours d'exécution
+une seule commande.
+[[! Modèle id = texte de la note = "" "
+Pour plus de contrôle, les utilisateurs avancés peuvent préférer mettre en place un wiki
+[[By_hand | byhand]].
+"" "]]
 
-	% ikiwiki --setup /etc/ikiwiki/auto.setup
+% Ikiwiki --setup /etc/ikiwiki/auto.setup
 
-Or, set up a blog with ikiwiki, run this command instead.
+Ou, mettre en place un blog avec ikiwiki, exécutez cette commande à la place.
 
-	% ikiwiki --setup /etc/ikiwiki/auto-blog.setup
+% Ikiwiki --setup /etc/ikiwiki/auto-blog.setup
 
-`librpc-xml-perl` and `python-docutils` dependencies are needed.
+`Librpc-xml-perl` et` python-docutils` dépendances sont nécessaires.
 
-Either way, it will ask you a couple of questions.
+De toute façon, il vous poser quelques questions.
 
-	What will the wiki be named? foo
-	What revision control system to use? git
-	What wiki user (or openid) will be admin? joey
-	Choose a password:
+Quel sera le wiki être nommé? foo
+Quel système de contrôle de révision à utiliser? git
+utilisateur Qu'est-ce wiki (ou OpenID) seront administrateur? joey
+Choisissez un mot de passe:
 
-Then, wait for it to tell you an url for your new site..
+Ensuite, attendez qu'il vous dire une url pour votre nouveau site ..
 
-	Successfully set up foo:
-		url:         http://example.com/~joey/foo
-		srcdir:      ~/foo
-		destdir:     ~/public_html/foo
-		repository:  ~/foo.git
-	To modify settings, edit ~/foo.setup and then run:
-		ikiwiki --setup ~/foo.setup
+Mis en place avec succès foo:
+url: http://example.com/~joey/foo
+srcdir: ~ / foo
+destdir: ~ / public_html / foo
+référentiel: ~ / foo.git
+Pour modifier les paramètres, modifier ~ / foo.setup puis exécutez:
+ikiwiki --setup ~ / foo.setup
 
-Done! 
+Terminé!
 
-## Using the web interface
+## Utilisation de l'interface Web
 
-Now you can go to the url it told you, and edit pages in your new wiki
-using the web interface.
+Maintenant, vous pouvez aller à l'URL, il vous a dit, et modifier des pages de votre wiki
+en utilisant l'interface web.
 
-(If the web interface doesn't seem to allow editing or login, you may
-need to [[configure_the_web_server|tips/dot_cgi]].)
+(Si l'interface Web ne semble pas permettre l'édition ou ouvrir une session, vous pouvez
+besoin de [[configure_the_web_server | conseils / dot_cgi]].)
 
-## Checkout and edit wiki source
+## Commander et source wiki modifier
 
-Part of the fun of using ikiwiki is not being limited to using the
-web for editing pages, and instead using your favorite text editor and
-[[Revision_Control_System|rcs]]. 
+Une partie du plaisir d'utiliser ikiwiki est pas limitée à l'aide de la
+web pour l'édition de pages, et au lieu d'utiliser votre éditeur de texte favori et
+[[Revision_Control_System | rcs]].
 
-To do this, you need to check out a copy of the source to your wiki.
-(You should avoid making changes directly to the `srcdir`, as that
-checkout is reserved for use by ikiwiki itself.)
+Pour ce faire, vous devez vérifier une copie de la source à votre wiki.
+(Vous devriez éviter de faire des changements directement à la `srcdir`, comme celle
+la caisse est réservé pour une utilisation par ikiwiki lui-même.)
 
-Depending on which [[Revision_Control_System|rcs]] you chose to use,
-you can run one of these commands to check out your own copy of your wiki's
-source. (Remember to replace "foo" with the real directory name.)
+Selon le [[Revision_Control_System | rcs]] vous avez choisi d'utiliser,
+vous pouvez exécuter une de ces commandes pour vérifier votre propre copie de vos wikis
+la source. (Rappelez-vous de remplacer "foo" avec le vrai nom du répertoire.)
 
-	git clone foo.git foo.src
-	svn checkout file://`pwd`/foo.svn/trunk foo.src
-	cvs -d `pwd`/foo get -P ikiwiki
-	bzr clone foo foo.src
-	hg clone foo foo.src
-	darcs get foo.darcs foo.src
-	# TODO monotone, tla
+clone git foo.git foo.src
+svn fichier de commande: foo.src //`pwd`/foo.svn/trunk
+cvs -d `pwd` / foo get -P ikiwiki
+bzr clone foo foo.src
+hg clone 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,
-"foo.src"), and fire up your text editor to edit `index.mdwn` or whatever
-other page you want to edit. If you chose to set up a blog, there is even a
-sample first post in `posts/first_post.mdwn` that you can edit.
+Maintenant, pour modifier les pages à la main, allez dans le répertoire que vous avez vérifié (c.-à-
+"Foo.src"), et lancez votre éditeur de texte pour modifier `index.mdwn` ou quoi que
+autre page que vous souhaitez modifier. Si vous avez choisi de créer un blog, il y a même un
+échantillon premier message `messages / first_post.mdwn` que vous pouvez éditer.
 
-Once you've edited a page, use your revision control system to commit
-the changes. For distributed revision control systems, don't forget to push
-your commit.
+Une fois que vous avez modifié une page, utilisez votre système de contrôle de révision de commettre
+les changements. Pour les systèmes de contrôle de révision distribués, ne pas oublier de pousser
+votre engagement.
 
-Once the commit reaches the repository, ikiwiki will notice it, and
-automatically update the wiki with your changes.
+Une fois le commit atteint le référentiel, ikiwiki remarquera, et
+mettre à jour automatiquement le wiki avec vos modifications.
 
-## Customizing the wiki
+## Personnalisation du wiki
 
-There are lots of things you can configure to customize your wiki.
-These range from changing the wiki's name, to enabling [[plugins]],
-to banning users and locking pages.
+Il y a beaucoup de choses que vous pouvez configurer pour personnaliser votre wiki.
+Celles-ci vont de changer le nom du wiki, pour permettre à [[plugins]],
+à interdire les utilisateurs et les pages de verrouillage.
 
-If you log in as the admin user you configured earlier, and go to
-your Preferences page, you can click on "Setup" to customize many
-wiki settings and plugins.
+Si vous vous connectez en tant qu'utilisateur admin vous avez configuré plus tôt, et aller à
+votre page Préférences, vous pouvez cliquer sur "Setup" pour personnaliser de nombreux
+paramètres et plugins wiki.
 
-Some settings cannot be configured on the web, for security reasons or
-because misconfiguring them could break the wiki. To change these settings,
-you can manually edit the setup file, which is named something like
-"foo.setup". The file lists all available configuration settings
-and gives a brief description of each.
+Certains paramètres ne peuvent pas être configurés sur le Web, pour des raisons de sécurité ou
+parce misconfiguring eux pourrait briser le wiki. Pour modifier ces paramètres,
+vous pouvez modifier manuellement le fichier de configuration, qui est nommé quelque chose comme
+"Foo.setup". Le fichier répertorie les paramètres de configuration disponibles tous
+et donne une brève description de chacun.
 
-After making changes to this file, you need to tell ikiwiki to use it:
+Après avoir modifié ce fichier, vous devez ikiwiki dire de l'utiliser:
 
-	% ikiwiki --setup foo.setup
+% Ikiwiki --setup foo.setup
 
-Alternatively, you can ask ikiwiki to change settings in the file for you:

(Diff truncated)
Everyone is using comments here... let's go with the crowd
diff --git a/doc/forum/Best_way_to_share_settings_between_repositories.mdwn b/doc/forum/Best_way_to_share_settings_between_repositories.mdwn
index 9c5e6d1..0b0590e 100644
--- a/doc/forum/Best_way_to_share_settings_between_repositories.mdwn
+++ b/doc/forum/Best_way_to_share_settings_between_repositories.mdwn
@@ -7,7 +7,3 @@ What is a good way to share such settings (without having to copy them twice or
 I tried to discuss that same point in [[laptop_wiki_with_git discussion|tips/laptop_wiki_with_git/discussion]].
 
 --[[bbb]]
-
-> I have found you can use multiple setup files like this: `ikiwiki --setup COMMON.setup --setup MY.setup`. The options from the later one will override options from the previous.
->
-> You should not use ikiwiki to edit your setup then and edit it manually. Not a problem for me.

Added a comment: Using multiple setup files
diff --git a/doc/forum/Best_way_to_share_settings_between_repositories/comment_1_cce1312c0017224cc2814fc978c4638d._comment b/doc/forum/Best_way_to_share_settings_between_repositories/comment_1_cce1312c0017224cc2814fc978c4638d._comment
new file mode 100644
index 0000000..5675421
--- /dev/null
+++ b/doc/forum/Best_way_to_share_settings_between_repositories/comment_1_cce1312c0017224cc2814fc978c4638d._comment
@@ -0,0 +1,9 @@
+[[!comment format=mdwn
+ username="Martian"
+ subject="Using multiple setup files"
+ date="2016-06-30T10:42:45Z"
+ content="""
+I have found you can use multiple setup files like this: `ikiwiki --setup COMMON.setup --setup MY.setup`. The options from the later one will override options from the previous.
+
+You should not use ikiwiki to edit your setup then and edit it manually. Not a problem for me.
+"""]]

Add todo/multiple setup option on command line
diff --git a/doc/todo/multiple_setup_option_on_command_line.mdwn b/doc/todo/multiple_setup_option_on_command_line.mdwn
new file mode 100644
index 0000000..382faf2
--- /dev/null
+++ b/doc/todo/multiple_setup_option_on_command_line.mdwn
@@ -0,0 +1,13 @@
+While playing with Perl setup I by accident found multiple setups can be specified on command line like:
+
+    ikiwiki --setup COMMON.setup --setup MY.setup
+
+Could this be an official feature, in which case it would be nice documented or an "undocumented one" to avoid?
+
+What about Perl setup files which are undocumented but in the source code.
+I have found out after all...
+
+See also:
+
+* [[/forum/Best_way_to_share_settings_between_repositories]]
+* [[/todo/support_includes_in_setup_files]]

Add information about multiple setup options.
diff --git a/doc/forum/Best_way_to_share_settings_between_repositories.mdwn b/doc/forum/Best_way_to_share_settings_between_repositories.mdwn
index 0b0590e..9c5e6d1 100644
--- a/doc/forum/Best_way_to_share_settings_between_repositories.mdwn
+++ b/doc/forum/Best_way_to_share_settings_between_repositories.mdwn
@@ -7,3 +7,7 @@ What is a good way to share such settings (without having to copy them twice or
 I tried to discuss that same point in [[laptop_wiki_with_git discussion|tips/laptop_wiki_with_git/discussion]].
 
 --[[bbb]]
+
+> I have found you can use multiple setup files like this: `ikiwiki --setup COMMON.setup --setup MY.setup`. The options from the later one will override options from the previous.
+>
+> You should not use ikiwiki to edit your setup then and edit it manually. Not a problem for me.

diff --git a/doc/todo/dynamic_rootpage.mdwn b/doc/todo/dynamic_rootpage.mdwn
index 3c39484..fc6d7f0 100644
--- a/doc/todo/dynamic_rootpage.mdwn
+++ b/doc/todo/dynamic_rootpage.mdwn
@@ -1,5 +1,5 @@
 I prefer to use a current year, month and day to archive my blog posts, for example
-`post/2007/11/12/foo-bar-baz` path is better for me then `post/foo-bar-baz`.
+`post/2007/11/12/foo-bar-baz` path is better for me than `post/foo-bar-baz`.
 Unfortunately it seems that `rootpage` parameter of inline plugin is very static.
 Is it a chance to make it more dynamic? Now I have to use `svn mkdir` command
 to create appropriate subdirectories by hand.

wkhtmltopdf project has moved off of Google Code onto a dedicated site
diff --git a/doc/todo/pdf_output.mdwn b/doc/todo/pdf_output.mdwn
index a0f3240..e273f60 100644
--- a/doc/todo/pdf_output.mdwn
+++ b/doc/todo/pdf_output.mdwn
@@ -2,7 +2,7 @@ Some time ago there was a [[question|http://ikiwiki.info/forum/how_to_get_nice_p
 
 Note that for example dokuwiki has a [[nice plugin|http://danjer.doudouke.org/tech/dokutexit]] which converts the wiki page to latex and then to pdf and you can customize the latex-preamble.
 
-> I've actually written one, it's just not publicly released.  You can check it out from the "experimental" branch of my <a href="https://github.com/rubykat/ikiplugins">ikiplugins githup repo</a>.  It's called "html2pdf" and it depends on the static version of <a href="http://code.google.com/p/wkhtmltopdf/">wkhtmltopdf</a> rather than requiring a whole LaTeX setup. It's only been used on Ubuntu, so I can't say what problems there might be on other setups, but it works for me.  It's not properly documented; I'd appreciate some help with that.
+> I've actually written one, it's just not publicly released.  You can check it out from the "experimental" branch of my <a href="https://github.com/rubykat/ikiplugins">ikiplugins githup repo</a>.  It's called "html2pdf" and it depends on the static version of <a href="http://wkhtmltopdf.org">wkhtmltopdf</a> rather than requiring a whole LaTeX setup. It's only been used on Ubuntu, so I can't say what problems there might be on other setups, but it works for me.  It's not properly documented; I'd appreciate some help with that.
 > -- [[KathrynAndersen]]
 
 >> Thanks, I downloaded the git-repro and did `sudo cp html2pdf.pm /usr/share/perl5/IkiWiki/Plugin/` then I added html2pdf to the addplugins line in my setup-file (`mywiki.setup`) as well a new line `html2pdf_pages=>"/*",`. Then I did `sudo ikiwiki --setup mywiki.setup`. However there is no button or something like that which let's me create the pdf's

diff --git a/doc/setup/byhand/discussion.mdwn b/doc/setup/byhand/discussion.mdwn
index 6fc931a..deb79a8 100644
--- a/doc/setup/byhand/discussion.mdwn
+++ b/doc/setup/byhand/discussion.mdwn
@@ -18,3 +18,5 @@ One possible thing is security: Is it just a precaution or would anyone with "wr
 > to commit directly to the VCS, would be able to replace it. That breaks ikiwiki's
 > security model, because replacing the setup file is sufficient to achieve
 > arbitrary code execution as the user running the CGI and VCS hooks. --[[smcv]]
+
+>> Thanks. After all found it here: [[security]]. Now I wonder if I always use a file from the master branch, while limiting users to staging, it might fly...

apache on fedora and suid bit
diff --git a/doc/tips/dot_cgi.mdwn b/doc/tips/dot_cgi.mdwn
index 3fc4048..8667fed 100644
--- a/doc/tips/dot_cgi.mdwn
+++ b/doc/tips/dot_cgi.mdwn
@@ -45,6 +45,8 @@ configuration changes should work anywhere.
 
 	ErrorDocument 404 /cgi-bin/ikiwiki.cgi
 
+* On Fedora (and RHEL, CentOS, and derivatives) you may need to change CGI mode from `06755` to `755` as suid/sgid bit is prohibited by `suexec`. ([Bug 1341568](https://bugzilla.redhat.com/show_bug.cgi?id=1341658))
+
 ## lighttpd
 
 Here is how to enable cgi on [lighttpd](http://www.lighttpd.net/) and

yes, not committing the setup file to the same VCS is a security thing
diff --git a/doc/setup/byhand/discussion.mdwn b/doc/setup/byhand/discussion.mdwn
index 4d009f2..6fc931a 100644
--- a/doc/setup/byhand/discussion.mdwn
+++ b/doc/setup/byhand/discussion.mdwn
@@ -13,3 +13,8 @@ The page says *"Note that this file should **not** be put in your wiki's directo
 One possible thing is security: Is it just a precaution or would anyone with "write" access to wiki be able to replace the file?
 
  --[[Martian]]
+
+> Anyone with the ability to delete/replace attachments via the web UI, or the ability
+> to commit directly to the VCS, would be able to replace it. That breaks ikiwiki's
+> security model, because replacing the setup file is sufficient to achieve
+> arbitrary code execution as the user running the CGI and VCS hooks. --[[smcv]]

Why not putting setup file in git?
diff --git a/doc/setup/byhand/discussion.mdwn b/doc/setup/byhand/discussion.mdwn
index 9419767..4d009f2 100644
--- a/doc/setup/byhand/discussion.mdwn
+++ b/doc/setup/byhand/discussion.mdwn
@@ -5,3 +5,11 @@ What directory is the 'working copy'? There can be two interpretations: the curr
 > copies of all the versioned files, and whatever VCS-specific cruft that
 > entails. So, a working copy is everything you get when you `git clone`
 > a repository. --[[Joey]]
+
+-------------------
+
+The page says *"Note that this file should **not** be put in your wiki's directory with the rest of the files."* Why is that?
+
+One possible thing is security: Is it just a precaution or would anyone with "write" access to wiki be able to replace the file?
+
+ --[[Martian]]

Added a comment
diff --git a/doc/forum/Attachment_file_doesn__39__t_get_attached_to_page/comment_2_c6cd4450fea32e08474e90edf4dd99b9._comment b/doc/forum/Attachment_file_doesn__39__t_get_attached_to_page/comment_2_c6cd4450fea32e08474e90edf4dd99b9._comment
new file mode 100644
index 0000000..376d3a6
--- /dev/null
+++ b/doc/forum/Attachment_file_doesn__39__t_get_attached_to_page/comment_2_c6cd4450fea32e08474e90edf4dd99b9._comment
@@ -0,0 +1,44 @@
+[[!comment format=mdwn
+ username="https://me.yahoo.com/zoredache#d4929"
+ nickname="Zoredache"
+ subject="comment 2"
+ date="2016-06-20T19:38:40Z"
+ content="""
+> If there are any error or warning messages, they'd be in your web server's error log
+
+No obvious errors in the log.  When I attempt to attach something, all I see is some stuff from git, that I seem to see with every modification.
+
+    [Mon Jun 20 12:32:29.322642 2016] [cgi:error] [pid 35431] [client 10.2.4.243:51566] AH01215: To /srv/www/notes.example.org/wiki/wiki.git, referer: https://notes.example.org/wikicgi/ikiwiki.cgi
+    [Mon Jun 20 12:32:29.322688 2016] [cgi:error] [pid 35431] [client 10.2.4.243:51566] AH01215:    3afefec..a6ad76c  master -> master, referer: https://notes.example.org/wikicgi/ikiwiki.cgi
+
+> What version of ikiwiki are you using?, Which OS distribution?
+
+I am seeing the same results on a couple systems of various configs.  The newest version is running on a Debian Jessie system with the backports ikiwiki.
+
+    # apt-cache policy ikiwiki
+    ikiwiki:
+      Installed: 3.20160509~bpo8+1
+      Candidate: 3.20160509~bpo8+1
+      Package pin: 3.20160509~bpo8+1
+      Version table:
+     *** 3.20160509~bpo8+1 600
+            100 http://httpredir.debian.org/debian/ jessie-backports/main amd64 Packages
+            100 /var/lib/dpkg/status
+
+> What version of CGI.pm?
+
+    # head -2 /usr/share/perl/5.20.2/CGI.pm 
+    package CGI;
+    require 5.008001;
+    # dpkg -S /usr/share/perl/5.20.2/CGI.pm
+    perl-modules: /usr/share/perl/5.20.2/CGI.pm
+    # apt-cache policy perl-modules
+    perl-modules:
+      Installed: 5.20.2-3+deb8u5
+      Candidate: 5.20.2-3+deb8u5
+      Version table:
+     *** 5.20.2-3+deb8u5 0
+            500 http://httpredir.debian.org/debian/ jessie/main amd64 Packages
+            100 /var/lib/dpkg/status
+
+"""]]

diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn
index d79bc63..a26c0e5 100644
--- a/doc/ikiwikiusers.mdwn
+++ b/doc/ikiwikiusers.mdwn
@@ -217,3 +217,4 @@ Personal sites and blogs
 * [Mídia Capoeira](https://capoeira.li/blog/) - independent journalism initiative
 * [Sean Whitton's personal website](http://spwhitton.name/)
 * [Matto's personal website](https://box.matto.nl)
+* [Rob Sayers' personal website](http://www.robsayers.com)

Link to a work-in-progress plugin
diff --git a/doc/users/spalax.mdwn b/doc/users/spalax.mdwn
index a9a030c..d9e9c5f 100644
--- a/doc/users/spalax.mdwn
+++ b/doc/users/spalax.mdwn
@@ -13,6 +13,7 @@ I wrote and maintain a few plugins, which are available here: [[https://atelier.
 I have a few things in mind. Their status is something between *I will implement it someday* to *maybe someone could need this* or *I will need it if I implement this killer website I have in mind*.
 
 * [[plugins/contrib/htaccessmanager]]: Create a cgi page to manage a htaccess file.
+* [[forum/Questions_about_a_new_plugin]]
 
 
 # Contact

Added a comment: More thought about the `pageversion` plugin
diff --git a/doc/forum/Questions_about_a_new_plugin/comment_4_5ca8289d6f9d22dfcc4db92e3635bb18._comment b/doc/forum/Questions_about_a_new_plugin/comment_4_5ca8289d6f9d22dfcc4db92e3635bb18._comment
new file mode 100644
index 0000000..63d38dd
--- /dev/null
+++ b/doc/forum/Questions_about_a_new_plugin/comment_4_5ca8289d6f9d22dfcc4db92e3635bb18._comment
@@ -0,0 +1,35 @@
+[[!comment format=mdwn
+ username="spalax"
+ subject="More thought about the `pageversion` plugin"
+ date="2016-06-14T15:36:32Z"
+ content="""
+I like your idea of a pagespec:
+
+    # index.mdwn - assume ... is a glob that matches sismologie but not its subpages
+    [[!report pages=\"first-trail-member(...)\"]]
+
+What I have in mind now, assuming that my website have the following structure:
+
+    $ tree
+    ├── blog.mdwn
+    └── blog
+        ├── bar.mdwn
+        ├── bar
+        │   ├── 20151108.mdwn
+        │   └── 20160413.mdwn
+        ├── foo.mdwn
+        └── foo
+            ├── 20160103.mdwn
+            └── 20160605.mdwn
+
+I can have a plugin that implements:
+
+- a directive ``[[!versionof parent]]`` in every *actual* article (`bar/20151108.mdwn`, `bar/20160413`, `foo/20160103`, `foo/20160605`) which does two things:
+  - it registers the pages as being a version of its parent page;
+  - it displays a text ``Other versions of this article: ...``.
+- a pagespec function ``latestversion``, so that the ``blog.mdwn`` page can list the last version of each article using something like ``[[!report pages=\"*/* and latestversion()]]``;
+- a directive ``[[!redir_to_latest_version]]`` (or a nicer, shorter name) in *'meta'* articles (`foo.mdwn`, `bar.mdwn`), which redirects the page to the latest version of the article (so that ``http://example.com/blog/foo`` redirects to ``http://example.com/blog/foo/20160605`` (the latest version of ``foo``)).
+
+Anyway, thank you very much: it may not be the definitive form yet, but it is already much more clean than it was at the beginning.
+
+"""]]

Added a comment: more info required
diff --git a/doc/forum/Attachment_file_doesn__39__t_get_attached_to_page/comment_1_58867ff018717ff56f362060c38b1aeb._comment b/doc/forum/Attachment_file_doesn__39__t_get_attached_to_page/comment_1_58867ff018717ff56f362060c38b1aeb._comment
new file mode 100644
index 0000000..48f086b
--- /dev/null
+++ b/doc/forum/Attachment_file_doesn__39__t_get_attached_to_page/comment_1_58867ff018717ff56f362060c38b1aeb._comment
@@ -0,0 +1,15 @@
+[[!comment format=mdwn
+ username="smcv"
+ subject="more info required"
+ date="2016-06-11T12:17:14Z"
+ content="""
+If there are any error or warning messages, they'd be in your web server's
+error log, for example `/var/log/apache2/error.log` in the default Apache
+configuration on Debian or Ubuntu.
+
+What version of ikiwiki are you using?
+
+Which OS distribution?
+
+What version of CGI.pm?
+"""]]

Added a comment
diff --git a/doc/forum/Questions_about_a_new_plugin/comment_3_4426af9c9bc164b5e0a9c60cb812a445._comment b/doc/forum/Questions_about_a_new_plugin/comment_3_4426af9c9bc164b5e0a9c60cb812a445._comment
new file mode 100644
index 0000000..143ae56
--- /dev/null
+++ b/doc/forum/Questions_about_a_new_plugin/comment_3_4426af9c9bc164b5e0a9c60cb812a445._comment
@@ -0,0 +1,33 @@
+[[!comment format=mdwn
+ username="smcv"
+ subject="comment 3"
+ date="2016-06-11T12:14:21Z"
+ content="""
+> It references the relative latest page (.../sismologie and not .../sismologie/20150819), and needs to access the meta information, fields and tags.
+
+I think this might be the right place to \"cut the knot\": instead of indirecting
+through the \"latest\" page, why not something like this? (this is pseudocode
+describing a hypothetical plugin, not something you can do right now):
+
+    # index.mdwn
+    [[!report pages=\"newest(sismologie/*)\" ...]]
+
+Or you could keep the indirection but make it explicit, without introducing
+copying:
+
+    # sismologie.mdwn
+    [[!inline pages=\"./*\" trail=\"yes\" sort=\"age\"]]
+
+    # index.mdwn - assume ... is a glob that matches sismologie but not its subpages
+    [[!report pages=\"first-trail-member(...)\"]]
+
+(`first-trail-member` doesn't exist, but it could.)
+
+Or maybe a distinct data structure:
+
+    # sismologie.mdwn
+    [[!versions pages=\"./*\"]]
+
+    # index.mdwn - assume ... is a glob that matches sismologie but not its subpages
+    [[!report pages=\"version-of(...)\"]]
+"""]]

Added a comment: More information
diff --git a/doc/forum/Questions_about_a_new_plugin/comment_2_d9787194e5b1420f2400da8e023ed228._comment b/doc/forum/Questions_about_a_new_plugin/comment_2_d9787194e5b1420f2400da8e023ed228._comment
new file mode 100644
index 0000000..8fe2505
--- /dev/null
+++ b/doc/forum/Questions_about_a_new_plugin/comment_2_d9787194e5b1420f2400da8e023ed228._comment
@@ -0,0 +1,33 @@
+[[!comment format=mdwn
+ username="spalax"
+ subject="More information"
+ date="2016-06-10T18:58:08Z"
+ content="""
+>    [[!if test=\"doc/* and created_after(.)\" all=\"no\"
+>      then=\"\"\"[[!template id=\"note\" text=\"[Newer versions are available|doc]\"]]\"\"\"]]
+
+I like that!
+
+> Why not ask us about your real use-case, in case it turns out that it doesn't match exactly after putting more thought into it? :-)
+
+Good point: I explained what I wanted; I did not explain why.
+
+
+The reason I want the metadata, fields and tags to be copied from the last subpage to the main page is to inline them.
+
+On my professional website (I am a math teacher), I have [a page list](http://paternault.fr/pedago) where I list some activities I do in class. For instance, [I describe here](http://paternault.fr/pedago/sismologie/20150110) how I got my students to learn statistics by debunking a psychic's claim. However, I greatly improved this the following year, and published a [new version of the same article](http://paternault.fr/pedago/sismologie/20150819/).
+
+So far I have three pages: ``.../sismologie/20150110`` and ``.../sismologie/20150819`` (the *actual* articles), and ``.../sismologie/`` (which should reflect the latest article). I want:
+
+- both articles to be available;
+- only the latest one to be visible on the [page list](http://paternault.fr/pedago) (not to highlight outdated articles).
+
+The [page list](http://paternault.fr/pedago) is generated using [the report directive](https://framagit.org/lpaternault/www/blob/bbe26353eda6a6c95c207fb635134765e70ac637/www/pedago.mdwn#L51-55) (from the [[report plugin|plugins/contrib/report]]). It references the relative latest page (``.../sismologie`` and not ``.../sismologie/20150819``), and needs to access the meta information, fields and tags.
+
+Right now, what I do is [copying \"by hand\"](https://framagit.org/lpaternault/www/blob/bbe26353eda6a6c95c207fb635134765e70ac637/www/pedago/sismologie.mdwn#L1-9) the [meta information of the latest article](https://framagit.org/lpaternault/www/blob/bbe26353eda6a6c95c207fb635134765e70ac637/www/pedago/sismologie/20150819.mdwn#L1-4), which can be error prone, and is tedious to keep up to date. I am thinking about the page version plugin I described earlier not to repeat myself.
+
+Sorry for the long post… I hope it is clear enough…
+
+[[Louis|spalax]]
+
+"""]]

diff --git a/doc/forum/Attachment_file_doesn__39__t_get_attached_to_page.mdwn b/doc/forum/Attachment_file_doesn__39__t_get_attached_to_page.mdwn
index 6a278c5..bc5c064 100644
--- a/doc/forum/Attachment_file_doesn__39__t_get_attached_to_page.mdwn
+++ b/doc/forum/Attachment_file_doesn__39__t_get_attached_to_page.mdwn
@@ -6,8 +6,6 @@ On the web server the attachment is at `$srcdir/.ikiwiki/attachments/MiscNotes/d
 
 Is this expected?  Is my file being rejected for some reason?  It is about 100k, which is under the value required by the `allowed_attachments`.  Is there some error logs somewhere that I look at to see more information about why this is failing?
 
-Chris
-
 
     # wiki.setup
     ...

diff --git a/doc/forum/Attachment_file_doesn__39__t_get_attached_to_page.mdwn b/doc/forum/Attachment_file_doesn__39__t_get_attached_to_page.mdwn
new file mode 100644
index 0000000..6a278c5
--- /dev/null
+++ b/doc/forum/Attachment_file_doesn__39__t_get_attached_to_page.mdwn
@@ -0,0 +1,51 @@
+I am trying to use the attachment plugin, but it isn't working the way I expect.
+
+I attempted to add a PDF as an attachment `dns_example.pdf` to a example_page (https://notes.example.org/wiki/MiscNotes/dns_docs_page).  The upload appears to happen, I can click the insert links button and links will be inserted into the page.  When I click the save-page button, the attachment does not appear to be attached.  No errors are displayed.
+
+On the web server the attachment is at `$srcdir/.ikiwiki/attachments/MiscNotes/dns_docs_page/dns_example.pdf`, but doesn't get copied over to the `$destdir` folder at all.  I would expect that it should have been moved to `$srcdir/MiscNotes/dns_docs_page/dns_example.pdf` and added to the git repo, and then copied over to `$destdir`.  Am I missing some setting in my configuration or something?
+
+Is this expected?  Is my file being rejected for some reason?  It is about 100k, which is under the value required by the `allowed_attachments`.  Is there some error logs somewhere that I look at to see more information about why this is failing?
+
+Chris
+
+
+    # wiki.setup
+    ...
+    # where the source of the wiki is located
+    srcdir: /srv/www/notes.example.org/wiki/wiki.wc
+    # where to build the wiki
+    destdir: /srv/www/notes.example.org/wiki/www
+    # base url to the wiki
+    url: https://notes.example.org/wiki
+    # url to the ikiwiki.cgi
+    cgiurl: https://notes.example.org/wikicgi/ikiwiki.cgi
+    # filename of cgi wrapper to generate
+    cgi_wrapper: /srv/www/notes.example.org/wiki/cgi/ikiwiki.cgi
+    # mode for cgi_wrapper (can safely be made suid)
+    cgi_wrappermode: 06755
+    # rcs backend to use
+    rcs: git
+    # plugins to add to the default configuration
+    add_plugins:
+    - httpauth
+    - pagestats
+    - attachment
+    - 404
+    - table
+    - tag
+    - map
+    - search
+    - repolist
+    - brokenlinks
+    - orphans
+    - autoindex
+    - meta
+    - img
+    - txt
+    - template
+    - theme
+    ...
+    # attachment plugin
+    # enhanced PageSpec specifying what attachments are allowed
+    allowed_attachments: maxsize(15mb)
+

new user: www.s4-ausbau.de
diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn
index 0decaa3..d79bc63 100644
--- a/doc/ikiwikiusers.mdwn
+++ b/doc/ikiwikiusers.mdwn
@@ -97,13 +97,14 @@ Projects & Organizations
 * [[CAS Libres|http://cas-libres.poivron.org]] - A French feminist radio program.
 * [[Les Barricades|http://barricades.int.eu.org]] - A French socialist choir (CSS has been adapted from the one of [[Grésille|http://www.gresille.org]]).
 * [DKØTU Amateur Radio Station](http://www.dk0tu.de), TU Berlin
-* [[Plan A|http://www.plan-a-muenchen.de/]] - A proposal for improvement of the urban public transport in Munich (by PRO BAHN, Bund Naturschutz and others)
+* [[Plan A|http://www.plan-a-muenchen.de/]] - A proposal for improvement of the urban public transport in Munich (by [[PRO BAHN|http://www.pro-bahn.de/]], Bund Naturschutz and others)
 * [[Smuxi IRC Client|https://smuxi.im/]] - powerful IRC client for GNOME
 * [[hplusroadmap|http://diyhpl.us/wiki/]] - a community for open source hardware, do-it-yourself biohacking and practical transhumanism
 * [[OpenAFS|http://wiki.openafs.org]] - an open-source, cross-platform distributed file system
 * [Copyleft.org](http://copyleft.org/)
 * [Hacklab Independência](https://hi.ato.br) - radical tech collective
 * [Piratas XYZ](http://piratas.xyz) - one of [pirate party of brazil](http://partidopirata.org)'s sites
+* [Bürgerinitiative S4-Ausbau](https://www.s4-ausbau.de/) - A initative in the larger munich area to improve the public transport line S4
 
 Personal sites and blogs
 ========================

Added a comment: I'm not so sure that copying metadata is desirable
diff --git a/doc/forum/Questions_about_a_new_plugin/comment_1_52f30b2d89d9223fd367603534d06435._comment b/doc/forum/Questions_about_a_new_plugin/comment_1_52f30b2d89d9223fd367603534d06435._comment
new file mode 100644
index 0000000..0a9d861
--- /dev/null
+++ b/doc/forum/Questions_about_a_new_plugin/comment_1_52f30b2d89d9223fd367603534d06435._comment
@@ -0,0 +1,59 @@
+[[!comment format=mdwn
+ username="smcv"
+ subject="I'm not so sure that copying metadata is desirable"
+ date="2016-06-09T15:09:30Z"
+ content="""
+I'm not so sure that copying metadata around is the right solution to the
+use case that you outlined. If you do that, then `/doc/v2.0/` and `/doc/` will
+be indistinguishable anywhere that pages are listed by their metadata - it's as
+though you'd copied the text content of `doc/v2.0.mdwn` into `doc.mdwn`. For
+example, if it's tagged `readme`, then a list of pages matching `tagged(readme)`
+will have two apparently identical entries, one of which is `/doc/` and the other
+is `/doc/v2.0/`.
+
+Why not do this instead?
+
+```
+# doc/v2.0.mdwn
+[[!tag readme]]
+[[!meta title=\"Foobar documentation, version 2.0\"]]
+
+[[!if test=\"doc/* and created_after(.)\" all=\"no\"
+  then=\"\"\"[[!template id=\"note\" text=\"[Newer versions are available|doc]\"]]\"\"\"]]
+
+Here is new documentation about Foobar.
+
+# doc/v1.0.mdwn
+[[!tag readme]]
+[[!meta title=\"Foobar documentation, version 1.0\"]]
+
+[[!if test=\"doc/* and created_after(.)\" all=\"no\"
+  then=\"\"\"[[!template id=\"note\" text=\"[Newer versions are available|doc]\"]]\"\"\"]]
+
+Here is documentation about Foobar.
+
+# doc.mdwn
+[[!meta title=\"Foobar documentation\"]]
+[[!inline pages=\"doc/*\" limit=\"1\" sort=\"age\" feeds=\"no\" actions=\"no\" raw=\"yes\"]]
+
+Older versions:
+
+[[!inline pages=\"doc/*\" skip=\"1\" archive=\"yes\"]]
+```
+
+... or even (with a bit of new code)
+
+```
+# doc.mdwn
+[[!meta redir_first_match=\"doc/*\" sort=\"age\"]]
+```
+
+In real life you'd probably want to use a special `[[!template]]` for the link
+to the latest version, so that it's easier to make them all consistent, but
+for those examples I'm just using the standard [[templates/note]] and some markup.
+
+> this is not my usecase, but it matches exactly
+
+Why not ask us about your real use-case, in case it turns out that it *doesn't*
+match exactly after putting more thought into it? :-)
+"""]]

Questions about a new plugin
diff --git a/doc/forum/Questions_about_a_new_plugin.mdwn b/doc/forum/Questions_about_a_new_plugin.mdwn
new file mode 100644
index 0000000..970c103
--- /dev/null
+++ b/doc/forum/Questions_about_a_new_plugin.mdwn
@@ -0,0 +1,41 @@
+Hello,
+I have a plugin in mind, but before starting to write some code, I come to you to see if something similar already exists, or if there is an easier way to do it.
+
+# What I want
+
+I want to be able to have several versions of the same page. For instance (this is not my usecase, but it matches exactly), let's say I am developping a software, with several versions published, and I want:
+
+* the latest documentation to be available at ``http://example.com/doc``;
+* the documentation for previous (or current version, with permanent URL) available at ``http://example.com/doc/v2_0``.
+
+What I am thinking about is:
+
+* my wiki has the documentation written in pages `doc/v1_0.mdwn`, `doc/v2_0.mdwn`, and so on;
+* the `doc.mdwn` page contains nothing but code to copy metadata from the latest `doc/*mdwn` page, that is: [[plugins/meta]] information, [[plugins/tag]], and [[plugins/contrib/ymlfront]].
+
+# What I have in mind
+
+What I have in mind is a plugin providing a directive ``pageversion`` such that the `doc.mdwn` page contains only:
+
+    [[!pageversion pages="doc/* and !doc/*/*"]]
+
+This would grab the latest documentation page, copy its content, and copy meta information, tags and fields.
+
+# How to do it
+
+I see two ways to do it, but both have big drawbacks.
+
+* I could, in the ``preprocess`` function of the plugin, copy the *interesting* part of the ``%pagestate`` global variable. In pseudo-code, something like:
+
+      $pagestate{doc}{meta} = $pagestate{doc/v2_0}{meta};
+      $pagestate{doc}{fields} = $pagestate{doc/v2_0}{fields};
+      $pagestate{doc}{tags} = $pagestate{doc/v2_0}{tags}; # This one definitely would not work, but it is pseudo-code
+
+  I fear that some necessary side effects would not occur. For instance, setting date using the [[plugins/meta]] plugin [sets the page creation time at a deeper level](http://source.ikiwiki.branchable.com/?p=source.git;a=blob;f=IkiWiki/Plugin/meta.pm;h=ea099f955ac1c486cdd2baf6636e330a8eae569c;hb=HEAD#l154). Copying ``%pagestate`` would bypass this.
+
+* I could, in the ``preprocess`` function, call the ``preprocess`` function for those three plugins. But this would mean guessing what the original directive arguments were, which can be tricky.
+
+# My questions
+
+* Does something similar already exist?
+* Do you have any better idea about how to do it?

Added a comment: cool!
diff --git a/doc/forum/ikiwiki_can__39__t_find_imagemagick/comment_10_600daf7b0498f4fccd06b8852c4ac776._comment b/doc/forum/ikiwiki_can__39__t_find_imagemagick/comment_10_600daf7b0498f4fccd06b8852c4ac776._comment
new file mode 100644
index 0000000..1cbf36d
--- /dev/null
+++ b/doc/forum/ikiwiki_can__39__t_find_imagemagick/comment_10_600daf7b0498f4fccd06b8852c4ac776._comment
@@ -0,0 +1,7 @@
+[[!comment format=mdwn
+ username="http://schmonz.livejournal.com/"
+ subject="cool!"
+ date="2016-06-07T15:14:00Z"
+ content="""
+Glad it's fixed. Enjoy :-)
+"""]]

Added a comment
diff --git a/doc/forum/ikiwiki_can__39__t_find_imagemagick/comment_9_4e6a50817e6df952001407b84a3ccc9b._comment b/doc/forum/ikiwiki_can__39__t_find_imagemagick/comment_9_4e6a50817e6df952001407b84a3ccc9b._comment
new file mode 100644
index 0000000..1967f8d
--- /dev/null
+++ b/doc/forum/ikiwiki_can__39__t_find_imagemagick/comment_9_4e6a50817e6df952001407b84a3ccc9b._comment
@@ -0,0 +1,9 @@
+[[!comment format=mdwn
+ username="openmedi"
+ subject="comment 9"
+ date="2016-06-07T13:55:27Z"
+ content="""
+>\"What's in your $PATH?\"
+
+This question helped me to solve the problem! I had the order wrong. First came brew, then the os, then pkgsrc. Now the right perl is found and with it imagemagick.
+"""]]

Added a comment: ok
diff --git a/doc/forum/ikiwiki_can__39__t_find_imagemagick/comment_8_2829ff122d902050c512cdead7a1aabd._comment b/doc/forum/ikiwiki_can__39__t_find_imagemagick/comment_8_2829ff122d902050c512cdead7a1aabd._comment
new file mode 100644
index 0000000..6b3745c
--- /dev/null
+++ b/doc/forum/ikiwiki_can__39__t_find_imagemagick/comment_8_2829ff122d902050c512cdead7a1aabd._comment
@@ -0,0 +1,9 @@
+[[!comment format=mdwn
+ username="http://schmonz.livejournal.com/"
+ subject="ok"
+ date="2016-06-07T12:39:41Z"
+ content="""
+I see. Yeah, `pkgin` should work fine too. (Since ikiwiki also depends on perl, if you installed ikiwiki first, you'd get perl that way just as well.)
+
+What's in your `$PATH`? When you get that in-page error, how are you running ikiwiki?
+"""]]

Added a comment
diff --git a/doc/forum/ikiwiki_can__39__t_find_imagemagick/comment_7_2ebb00a20c9b2f664fd133568f8af281._comment b/doc/forum/ikiwiki_can__39__t_find_imagemagick/comment_7_2ebb00a20c9b2f664fd133568f8af281._comment
new file mode 100644
index 0000000..164bb3a
--- /dev/null
+++ b/doc/forum/ikiwiki_can__39__t_find_imagemagick/comment_7_2ebb00a20c9b2f664fd133568f8af281._comment
@@ -0,0 +1,9 @@
+[[!comment format=mdwn
+ username="openmedi"
+ subject="comment 7"
+ date="2016-06-07T11:23:41Z"
+ content="""
+Oh and as regards to the part that fails: If I try to use the img directive, [this is the inline error I see when browsing to the page where the picture should be.](http://imgur.com/oCe0NyM)
+
+\[\[!img Error: Image::Magick is not installed]]
+"""]]

Added a comment
diff --git a/doc/forum/ikiwiki_can__39__t_find_imagemagick/comment_6_1ed093f9dde0f785c07d73d25413d6ee._comment b/doc/forum/ikiwiki_can__39__t_find_imagemagick/comment_6_1ed093f9dde0f785c07d73d25413d6ee._comment
new file mode 100644
index 0000000..fd9ed11
--- /dev/null
+++ b/doc/forum/ikiwiki_can__39__t_find_imagemagick/comment_6_1ed093f9dde0f785c07d73d25413d6ee._comment
@@ -0,0 +1,17 @@
+[[!comment format=mdwn
+ username="openmedi"
+ subject="comment 6"
+ date="2016-06-07T11:19:47Z"
+ content="""
+Hm. Maybe the problem is more that I don't understand what needs to happen to make imagemagick available for ikiwiki. I though it would be enough to install imagemagick and have my prefered perl in the path, but that seems not to be the case? I'm, also not sure what \"`cd www/ikiwiki && make install` automatically brings in Perl\" means. Aren't we installing ikiwiki etc. through pkgsrc with `sudo pkgin -y install ikiwiki`? Am I mistaken that you suggesting building ikiwiki myself? Sorry, if I'm getting things wrong.
+
+What I though would need to happen:
+
+1. [update to the latest branch of joyent pkgsrc](http://pkgsrc.joyent.com/install-on-osx/)
+1. sudo pkgin -y update
+1. sudo pkgin -y full-upgrade
+1. sudo pkgin -y install p5-PerlMagick (this installs all the dependencies, including a useable perl, I thought)
+1. sudo pkgin -y install ikiwiki
+
+This is wrong/not enough?
+"""]]

Add required packages
diff --git a/doc/plugins/contrib/datetime_cmp.mdwn b/doc/plugins/contrib/datetime_cmp.mdwn
index ba35b37..47eaffa 100644
--- a/doc/plugins/contrib/datetime_cmp.mdwn
+++ b/doc/plugins/contrib/datetime_cmp.mdwn
@@ -11,6 +11,8 @@ creation or modification times.
 It also sets the date of the next modification of the page on relevant date, so
 that the page will be rebuilt if the condition changes.
 
+It requires the DateTime::Format::Duration perl module (on Debian : ``apt-get install libdatetime-format-duration-perl``).
+
 ## List of functions
 
 The list of functions is given by the following regexp:

Added a comment: what didn't work with pkgsrc?
diff --git a/doc/forum/ikiwiki_can__39__t_find_imagemagick/comment_5_d2abd6f58de45faa3cdee6059a319c2d._comment b/doc/forum/ikiwiki_can__39__t_find_imagemagick/comment_5_d2abd6f58de45faa3cdee6059a319c2d._comment
new file mode 100644
index 0000000..fc2e9af
--- /dev/null
+++ b/doc/forum/ikiwiki_can__39__t_find_imagemagick/comment_5_d2abd6f58de45faa3cdee6059a319c2d._comment
@@ -0,0 +1,15 @@
+[[!comment format=mdwn
+ username="http://schmonz.livejournal.com/"
+ subject="what didn't work with pkgsrc?"
+ date="2016-06-06T12:17:22Z"
+ content="""
+I use the `img` plugin on my site. ikiwiki, perl, and imagemagick are all installed from pkgsrc on my laptop (OS X 10.11.5) and server (NetBSD 7.0.1). As the pkgsrc package maintainer for ikiwiki, if something's broken for you, I'd like to fix it.
+
+`cd www/ikiwiki && make install` automatically brings in Perl as one of many runtime dependencies. (Usually it's the most recent stable perl, though at the moment it's still 5.22.2. I'm a little surprised we're not already on 5.24.0.)
+
+If you define `PKG_OPTIONS.ikiwiki+=imagemagick` in `/etc/mk.conf`, then installing ikiwiki will also automatically bring in ImageMagick and its Perl bindings.
+
+If you don't define that option, you can install them yourself with `cd graphics/p5-PerlMagick && make install`.
+
+What have you tried? What happened when you tried?
+"""]]