Recent changes to this wiki:

Add usage example
diff --git a/doc/ikiwiki/directive/format.mdwn b/doc/ikiwiki/directive/format.mdwn
index 04ed139..ae976fa 100644
--- a/doc/ikiwiki/directive/format.mdwn
+++ b/doc/ikiwiki/directive/format.mdwn
@@ -26,4 +26,12 @@ supported. For example:
 	print "hello, world\n";
 	"""]]
 
+`format` can also be used to format entire source files and display them on a page. Simply put an [[inline]] directive with the `raw` attribute set inside a `format`. This can be useful if you want to both serve the file raw, as well as show it syntax highlighted on a page. An example:
+
+	\[[!format python """
+	[[!inline pages="program.py" raw="yes"]]
+	"""]]
+
+	\[[View raw file|program.py]]
+
 [[!meta robots="noindex, follow"]]

fix format directives
diff --git a/doc/tips/importing_posts_from_wordpress/ikiwiki-wordpress-import.mdwn b/doc/tips/importing_posts_from_wordpress/ikiwiki-wordpress-import.mdwn
index a59d4b5..629fae8 100644
--- a/doc/tips/importing_posts_from_wordpress/ikiwiki-wordpress-import.mdwn
+++ b/doc/tips/importing_posts_from_wordpress/ikiwiki-wordpress-import.mdwn
@@ -238,7 +238,7 @@ sub unique_comment_location {
 I modified the script a bit so categories and tags would actually show up in the output file.
 
 -----
-[[!format '''
+[[!format python '''
 #!/usr/bin/env python
 
 """
@@ -353,7 +353,7 @@ I have another version of the script, which uses the `timestamp` from the script
 (Hopefully I've escaped everything properly; if I missed something, check the source.)
 
 -----
-[[!format '''
+[[!format python '''
 #!/usr/bin/env python
 
 """

Added a comment
diff --git a/doc/forum/missing_pages_redirected_to_search-SOLVED/comment_2_bc0291b1afc2e9b4a853c168d3adfd78._comment b/doc/forum/missing_pages_redirected_to_search-SOLVED/comment_2_bc0291b1afc2e9b4a853c168d3adfd78._comment
new file mode 100644
index 0000000..d170ab4
--- /dev/null
+++ b/doc/forum/missing_pages_redirected_to_search-SOLVED/comment_2_bc0291b1afc2e9b4a853c168d3adfd78._comment
@@ -0,0 +1,83 @@
+[[!comment format=mdwn
+ username="https://launchpad.net/~eliasson"
+ nickname="eliasson"
+ subject="comment 2"
+ date="2016-01-31T20:07:52Z"
+ content="""
+Using Apache 2.4.10 (Debian 8's package) I solved it the following way:
+
+1. In the Apache site configuration, set `ErrorDocument 404` to the ikiwiki.cgi URL path.
+2. Apply the following patch to the plugins search and 404. The easiest and probably cleanest way is to copy the plugins to your `$libdir/IkiWiki/Plugins` and edit them there. It works with xapian omega search but wouldn't work with google, since the *P* CGI parameter is not set (instead, omega uses the `QUERY_STRING` environment variable). Perhaps one day I'll make this a proper patch and submit as a pull request.
+
+[Apache 2.4.13 adds support](https://httpd.apache.org/docs/2.4/mod/core.html#errordocument) for dynamic strings in `ErrorDocument`s, so you could do something similar to the solution for Nginx above. Until that is packaged in your stable Linux distro of choice, this hack can be used.
+
+<pre>
+<code>
+diff --git a/IkiWiki/Plugin/404.pm b/IkiWiki/Plugin/404.pm
+index 42cfa9e..a12fd40 100644
+--- a/IkiWiki/Plugin/404.pm
++++ b/IkiWiki/Plugin/404.pm
+@@ -74,7 +74,9 @@ sub cgi ($) {
+ 		my $page = cgi_page_from_404(
+ 			Encode::decode_utf8($ENV{REDIRECT_URL}),
+ 			$config{url}, $config{usedirs});
+-		IkiWiki::Plugin::goto::cgi_goto($cgi, $page);
++
++		$ENV{QUERY_STRING}=\"P=$page\";
++		IkiWiki::Plugin::search::search($cgi);
+ 	}
+ }
+ 
+diff --git a/IkiWiki/Plugin/search.pm b/IkiWiki/Plugin/search.pm
+index 24b16fe..24d7b3c 100644
+--- a/IkiWiki/Plugin/search.pm
++++ b/IkiWiki/Plugin/search.pm
+@@ -183,24 +183,31 @@ sub delete (@) {
+ 	}
+ }
+ 
++sub search($) {
++	my $cgi=shift;
++
++	if ($config{google_search}) {
++		print $cgi->redirect(\"https://www.google.com/search?sitesearch=$config{url}&q=\".$cgi->param('P'));
++		exit 0;
++	}
++	else {
++		# only works for GET requests
++		chdir(\"$config{wikistatedir}/xapian\") || error(\"chdir: $!\");
++		$ENV{OMEGA_CONFIG_FILE}=\"./omega.conf\";
++		$ENV{CGIURL}=IkiWiki::cgiurl();
++		IkiWiki::loadindex();
++		$ENV{HELPLINK}=htmllink(\"\", \"\", \"ikiwiki/searching\",
++					noimageinline => 1, linktext => \"Help\");
++
++		exec($config{omega_cgi}) || error(\"$config{omega_cgi} failed: $!\");
++	}
++}
++
+ sub cgi ($) {
+ 	my $cgi=shift;
+ 
+ 	if (defined $cgi->param('P')) {
+-		if ($config{google_search}) {
+-			print $cgi->redirect(\"https://www.google.com/search?sitesearch=$config{url}&q=\".$cgi->param('P'));
+-			exit 0;
+-		}
+-		else {
+-			# only works for GET requests
+-			chdir(\"$config{wikistatedir}/xapian\") || error(\"chdir: $!\");
+-			$ENV{OMEGA_CONFIG_FILE}=\"./omega.conf\";
+-			$ENV{CGIURL}=IkiWiki::cgiurl();
+-			IkiWiki::loadindex();
+-			$ENV{HELPLINK}=htmllink(\"\", \"\", \"ikiwiki/searching\",
+-				noimageinline => 1, linktext => \"Help\");
+-			exec($config{omega_cgi}) || error(\"$config{omega_cgi} failed: $!\");
+-		}
++		search($cgi);
+ 	}
+ }
+ 
+</code>
+</pre>
+"""]]

diff --git a/doc/bugs/Remove_redirect_pages_from_inline_pages.mdwn b/doc/bugs/Remove_redirect_pages_from_inline_pages.mdwn
index a43bd40..a9067e0 100644
--- a/doc/bugs/Remove_redirect_pages_from_inline_pages.mdwn
+++ b/doc/bugs/Remove_redirect_pages_from_inline_pages.mdwn
@@ -13,3 +13,9 @@ Any ideas how to handle this situation?
 
 > Well, you can adjust the inline's pagespec to exclude it, or even tag it
 > with a tag that the pagespec is adjusted to exclude. --[[Joey]]
+
+>> I did it by making a new tag called "redir", tagging the redir page with it and then modifying the *pages* attribute of my inline to exclude pages with that tag. However, there is the same problem with the archives, probably the [[plugins/calendar]] if you use that and likely some other cases that I haven't thought about. In all these places you need to explicitly exclude redir pages. I think that ideally redir pages should have some special treatment that excludes them by default in most situations, because they are not real pages in a sense. They can have a body but if the browser is working properly it will never be shown.
+>>
+>> How about adding a new PageSpec called redir(glob) and excluding such pages from the post(glob) PageSpec? I think this behaviour makes more sense and thus should be the default, but if a user wants the old behaviour that's still available as "page(glob) or redir(glob)".
+>>
+>> Good URL redirections are important because they allow you to move things around without breaking incoming links from external sites and people's browsing history (which you can't fix, unlike internal links). --[[anton]], 2016-01-31

changed my mind, short usernames are cool
diff --git a/doc/users/Anton_Eliasson.mdwn b/doc/users/Anton_Eliasson.mdwn
index 0ea44c2..3d09d64 100644
--- a/doc/users/Anton_Eliasson.mdwn
+++ b/doc/users/Anton_Eliasson.mdwn
@@ -1 +1 @@
-[Anton uses Ikiwiki](https://www.antoneliasson.se/)
+[[!meta redir="anton"]]

diff --git a/doc/users/anton.mdwn b/doc/users/anton.mdwn
new file mode 100644
index 0000000..2b65117
--- /dev/null
+++ b/doc/users/anton.mdwn
@@ -0,0 +1,3 @@
+[[!meta title="Anton Eliasson"]]
+
+[Anton uses Ikiwiki](https://www.antoneliasson.se/)

diff --git a/doc/users/Anton_Eliasson.mdwn b/doc/users/Anton_Eliasson.mdwn
new file mode 100644
index 0000000..0ea44c2
--- /dev/null
+++ b/doc/users/Anton_Eliasson.mdwn
@@ -0,0 +1 @@
+[Anton uses Ikiwiki](https://www.antoneliasson.se/)

diff --git a/doc/bugs/po_plugin_config_crasher.mdwn b/doc/bugs/po_plugin_config_crasher.mdwn
index 9669597..7009174 100644
--- a/doc/bugs/po_plugin_config_crasher.mdwn
+++ b/doc/bugs/po_plugin_config_crasher.mdwn
@@ -33,3 +33,10 @@ Is this helpful or have I done anything stupid ? -- Michael
 > This would be helpful if I could reproduce the crash from your instructions, but I couldn't :-(
 > Which version of ikiwiki is this?
 > --[[smcv]]
+
+>> It was version 3.20141016.2 as it is in debian stable / jessie  
+>> I tried again with version 3.20160121 as it is in debian sid  
+>> same behavior as described  
+>>  
+>> I did setup a new blog with auto-blog.setup, activated the po plugin with the defaults  
+>> and get the error again (running ikiwiki --setup twice) --Michael

Add patch tag
diff --git a/doc/todo/highlight_line_numbers.mdwn b/doc/todo/highlight_line_numbers.mdwn
index f51c01f..b5d2ef3 100644
--- a/doc/todo/highlight_line_numbers.mdwn
+++ b/doc/todo/highlight_line_numbers.mdwn
@@ -1,6 +1,6 @@
 The highlight library used by the highlight plugin has many features that are not accessible through the ikiwiki format directive.  I've created a patch that exposes the line numbering option and opens the door to expose other options more easily.
 
-The patch is in a github branch here: <https://github.com/trapperhoney/ikiwiki/tree/linenumbers>
+The [[!taglink patch]] is in a github branch here: <https://github.com/trapperhoney/ikiwiki/tree/linenumbers>
 
 I made a test/demo of the feature here: <http://www.angrydoughnuts.com/temp/ikiwiki/>
 

rename patch/highlight_line_numbers.mdwn to todo/highlight_line_numbers.mdwn
diff --git a/doc/patch/highlight_line_numbers.mdwn b/doc/patch/highlight_line_numbers.mdwn
deleted file mode 100644
index f51c01f..0000000
--- a/doc/patch/highlight_line_numbers.mdwn
+++ /dev/null
@@ -1,7 +0,0 @@
-The highlight library used by the highlight plugin has many features that are not accessible through the ikiwiki format directive.  I've created a patch that exposes the line numbering option and opens the door to expose other options more easily.
-
-The patch is in a github branch here: <https://github.com/trapperhoney/ikiwiki/tree/linenumbers>
-
-I made a test/demo of the feature here: <http://www.angrydoughnuts.com/temp/ikiwiki/>
-
-And the updated plugin documentation is here: <http://www.angrydoughnuts.com/temp/ikiwiki/html/plugins/highlight.html>
diff --git a/doc/todo/highlight_line_numbers.mdwn b/doc/todo/highlight_line_numbers.mdwn
new file mode 100644
index 0000000..f51c01f
--- /dev/null
+++ b/doc/todo/highlight_line_numbers.mdwn
@@ -0,0 +1,7 @@
+The highlight library used by the highlight plugin has many features that are not accessible through the ikiwiki format directive.  I've created a patch that exposes the line numbering option and opens the door to expose other options more easily.
+
+The patch is in a github branch here: <https://github.com/trapperhoney/ikiwiki/tree/linenumbers>
+
+I made a test/demo of the feature here: <http://www.angrydoughnuts.com/temp/ikiwiki/>
+
+And the updated plugin documentation is here: <http://www.angrydoughnuts.com/temp/ikiwiki/html/plugins/highlight.html>

rename todo/highlight_line_numbers.mdwn to patch/highlight_line_numbers.mdwn
diff --git a/doc/patch/highlight_line_numbers.mdwn b/doc/patch/highlight_line_numbers.mdwn
new file mode 100644
index 0000000..f51c01f
--- /dev/null
+++ b/doc/patch/highlight_line_numbers.mdwn
@@ -0,0 +1,7 @@
+The highlight library used by the highlight plugin has many features that are not accessible through the ikiwiki format directive.  I've created a patch that exposes the line numbering option and opens the door to expose other options more easily.
+
+The patch is in a github branch here: <https://github.com/trapperhoney/ikiwiki/tree/linenumbers>
+
+I made a test/demo of the feature here: <http://www.angrydoughnuts.com/temp/ikiwiki/>
+
+And the updated plugin documentation is here: <http://www.angrydoughnuts.com/temp/ikiwiki/html/plugins/highlight.html>
diff --git a/doc/todo/highlight_line_numbers.mdwn b/doc/todo/highlight_line_numbers.mdwn
deleted file mode 100644
index f51c01f..0000000
--- a/doc/todo/highlight_line_numbers.mdwn
+++ /dev/null
@@ -1,7 +0,0 @@
-The highlight library used by the highlight plugin has many features that are not accessible through the ikiwiki format directive.  I've created a patch that exposes the line numbering option and opens the door to expose other options more easily.
-
-The patch is in a github branch here: <https://github.com/trapperhoney/ikiwiki/tree/linenumbers>
-
-I made a test/demo of the feature here: <http://www.angrydoughnuts.com/temp/ikiwiki/>
-
-And the updated plugin documentation is here: <http://www.angrydoughnuts.com/temp/ikiwiki/html/plugins/highlight.html>

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 4c39ce8..7941f0f 100644
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -39,6 +39,22 @@ testing markdown
 - blah
     - more blah
 
+## bir
+- bir
+
+## iki
+- iki
+
+* yildiz
+** cyildiz
+
+- tire
+-- ctire
+
+* *i dene*
+* **b dene**
+
+
 1. number
 2. list
     a. ick

point to Ubuntu packages since the bug report is from Ubuntu
diff --git a/doc/bugs/Images_detected_as_application__47__octet-stream__44___not_image__47____42__.mdwn b/doc/bugs/Images_detected_as_application__47__octet-stream__44___not_image__47____42__.mdwn
index 8078fbb..940c0e2 100644
--- a/doc/bugs/Images_detected_as_application__47__octet-stream__44___not_image__47____42__.mdwn
+++ b/doc/bugs/Images_detected_as_application__47__octet-stream__44___not_image__47____42__.mdwn
@@ -26,8 +26,8 @@ Other notes:
 
 > File type detection relies on some of the external packages in ikiwiki's Suggests list.
 >
-> Do you have [[!debpkg file]] installed?
+> Do you have [[!ubupkg file]] installed?
 >
-> Do you have [[!debpkg libfile-mimeinfo-perl]] installed?
+> Do you have [[!ubupkg libfile-mimeinfo-perl]] installed?
 >
 > --[[smcv]]

additional packages required
diff --git a/doc/bugs/Images_detected_as_application__47__octet-stream__44___not_image__47____42__.mdwn b/doc/bugs/Images_detected_as_application__47__octet-stream__44___not_image__47____42__.mdwn
index f3baaac..8078fbb 100644
--- a/doc/bugs/Images_detected_as_application__47__octet-stream__44___not_image__47____42__.mdwn
+++ b/doc/bugs/Images_detected_as_application__47__octet-stream__44___not_image__47____42__.mdwn
@@ -21,3 +21,13 @@ Workaround:
 Other notes:
 
  * Downloading and uploading from a Windows machine via Firefox
+
+---
+
+> File type detection relies on some of the external packages in ikiwiki's Suggests list.
+>
+> Do you have [[!debpkg file]] installed?
+>
+> Do you have [[!debpkg libfile-mimeinfo-perl]] installed?
+>
+> --[[smcv]]

not a bug
diff --git a/doc/bugs/local.css_overwritten_by_ikiwiki_--setup.mdwn b/doc/bugs/local.css_overwritten_by_ikiwiki_--setup.mdwn
index d2b3004..222a951 100644
--- a/doc/bugs/local.css_overwritten_by_ikiwiki_--setup.mdwn
+++ b/doc/bugs/local.css_overwritten_by_ikiwiki_--setup.mdwn
@@ -17,3 +17,12 @@ What happens instead:
 Workaround:
 
  * Create mylocal.css, and manually copy it over local.css every time
+
+---
+
+> This is [[working as intended|done]]. IkiWiki is a wiki compiler: everything
+> in its `$destdir`, in your case `~/public_html/MYWIKI`, is intended to be
+> under its control. Please create `local.css` in the `$srcdir`
+> (probably `~/MYWIKI`) and commit it to the VCS, or enable the
+> [[plugins/attachment]] plugin and "attach" it to the top-level `index` page.
+> IkiWiki will copy it into the `$destdir` whenever it changes. --[[smcv]]

diff --git a/doc/todo/highlight_line_numbers.mdwn b/doc/todo/highlight_line_numbers.mdwn
new file mode 100644
index 0000000..f51c01f
--- /dev/null
+++ b/doc/todo/highlight_line_numbers.mdwn
@@ -0,0 +1,7 @@
+The highlight library used by the highlight plugin has many features that are not accessible through the ikiwiki format directive.  I've created a patch that exposes the line numbering option and opens the door to expose other options more easily.
+
+The patch is in a github branch here: <https://github.com/trapperhoney/ikiwiki/tree/linenumbers>
+
+I made a test/demo of the feature here: <http://www.angrydoughnuts.com/temp/ikiwiki/>
+
+And the updated plugin documentation is here: <http://www.angrydoughnuts.com/temp/ikiwiki/html/plugins/highlight.html>

created
diff --git a/doc/bugs/Images_detected_as_application__47__octet-stream__44___not_image__47____42__.mdwn b/doc/bugs/Images_detected_as_application__47__octet-stream__44___not_image__47____42__.mdwn
new file mode 100644
index 0000000..f3baaac
--- /dev/null
+++ b/doc/bugs/Images_detected_as_application__47__octet-stream__44___not_image__47____42__.mdwn
@@ -0,0 +1,23 @@
+Steps to reproduce:
+
+ * Running ikiwiki version 3.20130904.1ubuntu1 on Ubuntu 14.04 LTS
+ * Also installed `perlmagick` and `libxml-writer-perl`
+ * Enable attachment plugin
+ * Set attachment rule to `mimetype(image/*)`
+ * Attempt to attach an image (e.g. downloaded version of https://commons.wikimedia.org/wiki/Category:Lolcats#/media/File:You_gotz_a_lolcat.jpg )
+
+What should happen:
+
+ * Attachment is uploaded
+
+What happens instead:
+
+ * Error message: `prohibited by allowed_attachments (file MIME type is application/octet-stream, not image/*)`
+
+Workaround:
+
+ * Change attachment rule to `mimetype(image/*) or application/octet-stream`
+
+Other notes:
+
+ * Downloading and uploading from a Windows machine via Firefox

created
diff --git a/doc/todo/Preferred_option_for___34__Page_location__34__.mdwn b/doc/todo/Preferred_option_for___34__Page_location__34__.mdwn
new file mode 100644
index 0000000..977d8d2
--- /dev/null
+++ b/doc/todo/Preferred_option_for___34__Page_location__34__.mdwn
@@ -0,0 +1,8 @@
+It looks like the auto-generated options for "Page location" are:
+
+ * enforced_lowercase
+ * Capitals_As_Typed
+ * subpage/enforced_lowercase
+ * subpage/Capitals_As_Typed
+
+And the default option is `Capitals_As_Typed`. If it isn't already possible (and I've just missed it), could future version allow the admin to pick which of these is the default? (I'd prefer `subpage/enforced_lowercase`)

created
diff --git a/doc/bugs/Intermittent_delays_after_editing__63__.mdwn b/doc/bugs/Intermittent_delays_after_editing__63__.mdwn
new file mode 100644
index 0000000..9671925
--- /dev/null
+++ b/doc/bugs/Intermittent_delays_after_editing__63__.mdwn
@@ -0,0 +1,47 @@
+Steps to reproduce:
+
+ * Running ikiwiki version 3.20130904.1ubuntu1 on Ubuntu 14.04 LTS
+ * ikiwiki accessed via `https://DOMAIN/wiki/ikiwiki.cgi` using fcgiwrap and Nginx
+ * Start ikiwiki site
+ * Edit an existing page
+
+What should happen:
+
+ * Change is immediately available
+
+What happens instead:
+
+ * Change is sometimes not immediately available
+ * After (approx) 1-2 minutes, change is available
+
+Other notes:
+
+ * Similarly for creating new pages
+ * Not consistent (the next edit may be visible immediately)
+ * If changes are visible from one browser, may not be visible from another browser on a different machine, logged in as the same user (admin)
+ * Seems to be happening less / not at all after running the site for approx 30-60 minutes
+ * fcgiwrap is invoked with Supervisor (aka supervisord)
+ * Related Nginx location blocks:
+
+```
+# non-wiki files at DOMAIN/...
+location / {
+    try_files $uri $uri/ /index.html =404;
+}
+
+# wiki files at DOMAIN/wiki
+location /wiki {
+    alias /home/USERNAME/public_html/WIKINAME;
+}
+
+# wiki script at DOMAIN/wiki/ikiwiki.cgi
+location /wiki/ikiwiki.cgi {
+    fastcgi_pass  unix:/tmp/fcgi.socket;
+    fastcgi_index ikiwiki.cgi;
+    fastcgi_param SCRIPT_FILENAME    /home/USERNAME/public_html/WIKINAME/ikiwiki.cgi;
+    fastcgi_param DOCUMENT_ROOT    /home/USERNAME/public_html/WIKINAME;
+    include /etc/nginx/fastcgi_params;
+}
+```
+
+Please let me know if this is expected/known, and/or if there's anything helpful I can add to the report.

created
diff --git a/doc/bugs/local.css_overwritten_by_ikiwiki_--setup.mdwn b/doc/bugs/local.css_overwritten_by_ikiwiki_--setup.mdwn
new file mode 100644
index 0000000..d2b3004
--- /dev/null
+++ b/doc/bugs/local.css_overwritten_by_ikiwiki_--setup.mdwn
@@ -0,0 +1,19 @@
+Steps to reproduce:
+
+ * Running ikiwiki 3.20130904.1ubuntu1 on Ubuntu 14.04 LTS
+ * Modify `~/public_html/MYWIKI/local.css`
+ * Run `ikiwiki --setup MYWIKI.setup` (or update via websetup interface)
+
+What should happen:
+
+ * Setup is updated/site is rebuilt
+ * local.css is retained and used
+
+What happens instead:
+
+ * Setup is updated (works)
+ * local.css reverts to blank version
+
+Workaround:
+
+ * Create mylocal.css, and manually copy it over local.css every time

Added a comment: Doh!
diff --git a/doc/forum/Can_I_disable_discussion_links__63__/comment_1_f4f06262082ec86a95e67fef96113f91._comment b/doc/forum/Can_I_disable_discussion_links__63__/comment_1_f4f06262082ec86a95e67fef96113f91._comment
new file mode 100644
index 0000000..1b5ef1e
--- /dev/null
+++ b/doc/forum/Can_I_disable_discussion_links__63__/comment_1_f4f06262082ec86a95e67fef96113f91._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="mx.david.rix@3bf9592fa655d6681eedf8add3d3b830d00a40d3"
+ nickname="mx.david.rix"
+ subject="Doh!"
+ date="2016-01-22T15:09:53Z"
+ content="""
+Found it on the setup interface while I was looking for something else. Must've missed it the first time.
+"""]]

added query
diff --git a/doc/forum/Can_I_disable_discussion_links__63__.mdwn b/doc/forum/Can_I_disable_discussion_links__63__.mdwn
new file mode 100644
index 0000000..8c70a81
--- /dev/null
+++ b/doc/forum/Can_I_disable_discussion_links__63__.mdwn
@@ -0,0 +1 @@
+Is it possible to disable the "Discussion" link on every page? I'm struggling to search for "discussion" topics without bringing up lots of discussion pages :D

test
diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 25e5324..4c39ce8 100644
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -22,6 +22,36 @@ Hello!
 pre formated text?
 ~~~
 
+```
+testing markdown
+```
+
+# one
+
+- foo
+
+## two
+
+- bar
+
+###
+
+- blah
+    - more blah
+
+1. number
+2. list
+    a. ick
+    b. bar
+
+| table | here |
+|----|.----.|
+| test adfasdfasdfa | 2 |
+| subtest | adfad|
+
+ok no formating.
+
+
 > This is a blockquote.
 >
 > This is the first level of quoting.

Announce version 3.20160121
diff --git a/doc/news/version_3.20141016.mdwn b/doc/news/version_3.20141016.mdwn
deleted file mode 100644
index 3579794..0000000
--- a/doc/news/version_3.20141016.mdwn
+++ /dev/null
@@ -1,39 +0,0 @@
-ikiwiki 3.20141016 released with [[!toggle text="these changes"]]
-[[!toggleable text="""
-[ Joey Hess ]
-
-  * Fix crash that can occur when only_committed_changes is set and a
-    file is deleted from the underlay.
-
-[ Simon McVittie ]
-
-  * core: avoid dangerous use of CGI->param in list context, which led
-    to a security flaw in Bugzilla; as far as we can tell, ikiwiki
-    is not vulnerable to a similar attack, but it's best to be safe
-  * core: new reverse_proxy option prevents ikiwiki from trying to detect
-    how to make self-referential URLs by using the CGI environment variables,
-    for instance when it's deployed behind a HTTP reverse proxy
-    (Closes: [[!debbug 745759]])
-  * core: the default User-Agent is now "ikiwiki/$version" to work around
-    ModSecurity rules assuming that only malware uses libwww-perl
-  * core: use protocol-relative URLs (e.g. //www.example.com/wiki) so that
-    https stays on https and http stays on http, particularly if the
-    html5 option is enabled
-  * core: avoid mixed content when a https cgiurl links to http static pages
-    on the same server (the static pages are assumed to be accessible via
-    https too)
-  * core: force the correct top URL in w3mmode
-  * google plugin: Use search form
-  * docwiki: replace Paypal and Flattr buttons with text links
-  * comments: don't record the IP address in the wiki if the user is
-    logged in via passwordauth or httpauth
-  * templates: add ARIA roles to some page elements, if html5 is enabled.
-    Thanks, Patrick
-  * debian: build-depend on libmagickcore-6.q16-2-extra | libmagickcore-extra
-    so we can thumbnail SVGs in the docwiki
-  * debian: explicitly depend and build-depend on libcgi-pm-perl
-  * debian: drop unused python-support dependency
-  * debian: rename debian/link to debian/links so the intended symlinks appear
-  * debian: fix some wrong paths in the copyright file
-"""]]
-[[!meta date="2014-10-17 01:01:53 +0100"]]
diff --git a/doc/news/version_3.20160121.mdwn b/doc/news/version_3.20160121.mdwn
new file mode 100644
index 0000000..2e727a6
--- /dev/null
+++ b/doc/news/version_3.20160121.mdwn
@@ -0,0 +1,46 @@
+ikiwiki 3.20160121 released with [[!toggle text="these changes"]]
+[[!toggleable text="""
+ * [ [[Amitai Schlair|schmonz]] ]
+   * [[plugins/meta]]: Fix `\[[!meta name=foo]]` by closing the open quote.
+   * Avoid unescaped `{` in regular expressions
+   * meta test: Add tests for many behaviors of the directive.
+   * img test: Bail gracefully when [[!cpan ImageMagick]] is not present.
+ * [ [[Joey Hess|joey]] ]
+   * [[plugins/emailauth]]: Added `emailauth_sender` config.
+   * Modified `page.tmpl` to to set html `lang=` and `dir=` when
+     values have been specified for them, which the [[plugins/po|po plugin]] does.
+   * Specifically license the javascript underlay under the permissive
+     basewiki license.
+ * [ [[Simon McVittie|smcv]] ]
+   * [[plugins/git]]: if no committer identity is known, set it to
+     `IkiWiki <ikiwiki.info>` in `.git/config`. This resolves commit errors
+     in versions of git that require a non-trivial committer identity.
+   * [[plugins/inline]], [[plugins/trail]]: rename `show`, `feedshow` parameters to `limit`, `feedlimit`
+     (with backwards compatibility)
+   * [[plugins/pagestats]]: add `show` option to show [[plugins/meta]] fields. Thanks, [[Louis|spalax]]
+   * [[plugins/inline]]: force RSS `<comments>` to be a fully absolute URL as required
+     by the W3C validator. Please use Atom feeds if relative URLs are
+     desirable on your site.
+   * [[plugins/inline]]: add `<atom:link rel="self">` to RSS feeds as recommended by
+     the W3C validator
+   * [[plugins/inline]]: do not produce links containing `/./` or `/../`
+   * syslog: accept and encode UTF-8 messages
+   * syslog: don't fail to log if the wiki name contains `%s`
+   * Change dependencies from transitional package [[!debpkg perlmagick]]
+     to [[!debpkg libimage-magick-perl]] (Closes: #[789221](http://bugs.debian.org/789221))
+   * debian/copyright: update for the rename of `openid-selector` to
+     `login-selector`
+   * d/control: remove leading article from Description
+     (lintian: description-synopsis-starts-with-article)
+   * d/control: Standards-Version: 3.9.6, no changes required
+   * Wrap and sort control files (`wrap-and-sort -abst`)
+   * Silence "used only once: possible typo" warnings for variables
+     that are part of modules' APIs
+   * Run [[!debpkg autopkgtest]] tests using [[!debpkg autodep8]] and the pkg-perl team's
+     infrastructure
+   * Add enough build-dependencies to run all tests, except for
+     non-git VCSs
+   * tests: consistently use `done_testing` instead of `no_plan`
+   * `t/img.t`: do not spuriously skip
+   * img test: skip testing PDFs if unsupported
+   * img test: use the right filenames when testing that deletion occurs"""]]

Compose relative URLs in RSS feeds correctly
If the relative link from the (page generating the) RSS to the target
would start with "./" or "../", just concatenating it with the URL to
the directory containing the RSS is not sufficient. Go via
URI::new_abs to fix this.
diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index 5ea5f35..c3895d9 100644
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -613,7 +613,7 @@ sub absolute_urls ($$) {
 					$v=$baseurl.$v; # anchor
 				}
 				elsif ($dv=~/^(?!\w+:)[^\/]/) {
-					$v=$url.$v; # relative url
+					$v=URI->new_abs($v, $url)->canonical; # relative url
 				}
 				elsif ($dv=~/^\//) {
 					if (! defined $urltop) {
diff --git a/doc/bugs/rss_output_relative_links.mdwn b/doc/bugs/rss_output_relative_links.mdwn
index ff607cb..7a2e4d1 100644
--- a/doc/bugs/rss_output_relative_links.mdwn
+++ b/doc/bugs/rss_output_relative_links.mdwn
@@ -1,3 +1,5 @@
 RSS output contains relative links. Ie. 
 http://kitenet.net/~joey/blog/index.rss contains a link to 
 http://kitenet.net/~joey/blog/../blog.html
+
+> Finally [[done]] for the first release of 2016. --[[smcv]]
diff --git a/t/inline.t b/t/inline.t
index 859e170..8c0f1c3 100755
--- a/t/inline.t
+++ b/t/inline.t
@@ -46,6 +46,9 @@ write_old_file("antagonists.mdwn",
 # using old spelling of "limit" ("show") to verify backwards compat
 write_old_file("enemies.mdwn",
 	'[[!inline pages="enemies/*" postform=no rootpage=enemies sort=title reverse=yes show=2]]');
+# to test correct processing of ../
+write_old_file("blah/blah/enemies.mdwn",
+	'[[!inline pages="enemies/*" postform=no rootpage=enemies sort=title reverse=yes show=2]]');
 foreach my $page (qw(protagonists/shepard protagonists/link
 		antagonists/saren antagonists/ganondorf
 		friends/garrus friends/liara friends/midna friends/telma
@@ -53,6 +56,9 @@ foreach my $page (qw(protagonists/shepard protagonists/link
 		enemies/zant)) {
 	write_old_file("$page.mdwn", "this page is {$page}");
 }
+# test cross-linking between pages as rendered in RSS
+write_old_file("enemies/zant.mdwn", "this page is {enemies/zant}\n\n".
+	"Zant hates [[friends/Midna]].");
 
 ok(! system(@command));
 ok(! system(@command, "--refresh"));
@@ -81,4 +87,18 @@ like($blob, qr[this page is \{enemies/zant}.*this page is \{enemies/rachni}]s,
 unlike($blob, qr{enemies/(?:benezia|geth)},
 	'pages excluded by show should not be present');
 
+$blob = readfile("t/tmp/out/enemies.rss");
+like($blob, qr[this page is \{enemies/zant}.*this page is \{enemies/rachni}]s,
+	'first two pages in reversed sort order are present');
+like($blob,
+	qr[Zant hates &lt;a href=(?:['"]|&quot;)http://example\.com/friends/midna.html(?:['"]|&quot;)&gt;Midna&lt;/a&gt;]s,
+	'link is correctly relative');
+
+$blob = readfile("t/tmp/out/blah/blah/enemies.rss");
+like($blob, qr[this page is \{enemies/zant}.*this page is \{enemies/rachni}]s,
+	'first two pages in reversed sort order are present');
+like($blob,
+	qr[Zant hates &lt;a href=(?:['"]|&quot;)http://example\.com/friends/midna.html(?:['"]|&quot;)&gt;Midna&lt;/a&gt;]s,
+	'link is correctly relative');
+
 done_testing;

close
diff --git a/doc/bugs/feed_does_not_validate.mdwn b/doc/bugs/feed_does_not_validate.mdwn
index 315ff97..9e9b2ee 100644
--- a/doc/bugs/feed_does_not_validate.mdwn
+++ b/doc/bugs/feed_does_not_validate.mdwn
@@ -5,3 +5,17 @@ the link to "comments" should be a full URL and there's a "self" tag missing.
 coming from [this bug report](https://www.drupal.org/node/1843576)
 
 -- [[anarcat]]
+
+> [[Fixed|done]]. Now people are going to complain that the RSS feed
+> hard-codes `http:` or `https:` instead, but we can't win there,
+> because RSS.
+>
+> If you just want to serve a feed with less bureaucracy, I suggest
+> using Atom feeds - they have sane semantics for relative URL references,
+> and a specification that actually specifies, instead of
+> [a family of vague, mutually incompatible specifications](https://web.archive.org/web/20110726001954/http://diveintomark.org/archives/2004/02/04/incompatible-rss).
+> In particular,
+> [my Atom feed validates](https://validator.w3.org/feed/check.cgi?url=http%3A%2F%2Fsmcv.pseudorandom.co.uk%2Findex.atom)
+> (rel="comments" seems to be missing from the IANA registry,
+> but that isn't a validity error).
+> --[[smcv]]

Added a comment
diff --git a/doc/forum/How_to_fix_wide_character_syslog_error__63__/comment_1_fce9619a48eba6d9559e2c33ba6322c9._comment b/doc/forum/How_to_fix_wide_character_syslog_error__63__/comment_1_fce9619a48eba6d9559e2c33ba6322c9._comment
new file mode 100644
index 0000000..2de135f
--- /dev/null
+++ b/doc/forum/How_to_fix_wide_character_syslog_error__63__/comment_1_fce9619a48eba6d9559e2c33ba6322c9._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="smcv"
+ subject="comment 1"
+ date="2016-01-21T07:33:19Z"
+ content="""
+What was on the next line after that message?
+
+I suspect this is a bug which still exists in 3.20150614. I think I've now fixed it
+for the next version of ikiwiki.
+"""]]

couldn't reproduce this :-(
diff --git a/doc/bugs/po_plugin_config_crasher.mdwn b/doc/bugs/po_plugin_config_crasher.mdwn
index a5fd055..9669597 100644
--- a/doc/bugs/po_plugin_config_crasher.mdwn
+++ b/doc/bugs/po_plugin_config_crasher.mdwn
@@ -10,6 +10,8 @@ I suspect the relevant configuration is this:
 Config problems in ikiwiki.setup should really not cause the whole site
 build to crash; this can make it hard to recover. --[[Joey]]
 
+> Given who's reporting this, am I right in assuming that's with ikiwiki 3.20150614? --[[smcv]]
+
 ---
 
 I try to setup a small site with the auto-blog.setup and played a bit with it:
@@ -27,3 +29,7 @@ tune any of the pagespec variables in the setup and at the inline directives of
 except leaving the po_translateable_pages empty, than the rebuild works and doesn't create any po files (as expected).
 
 Is this helpful or have I done anything stupid ? -- Michael
+
+> This would be helpful if I could reproduce the crash from your instructions, but I couldn't :-(
+> Which version of ikiwiki is this?
+> --[[smcv]]

escape pagespec so the HTML is more legible
diff --git a/doc/bugs/po_plugin_config_crasher.mdwn b/doc/bugs/po_plugin_config_crasher.mdwn
index 22afa67..a5fd055 100644
--- a/doc/bugs/po_plugin_config_crasher.mdwn
+++ b/doc/bugs/po_plugin_config_crasher.mdwn
@@ -11,8 +11,9 @@ Config problems in ikiwiki.setup should really not cause the whole site
 build to crash; this can make it hard to recover. --[[Joey]]
 
 ---
+
 I try to setup a small site with the auto-blog.setup and played a bit with it:
-If I activate the po plugin and set po_translateable_pages to something meaningful (like the example: '* and !*/Discussion'),
+If I activate the po plugin and set po_translateable_pages to something meaningful (like the example: `* and !*/Discussion`),
 then I'll get the same error
 
     syntax error in pagespec "\"page(./posts/*)"

img test: skip testing PDFs if unsupported
diff --git a/debian/changelog b/debian/changelog
index 90d6aa6..dc2fe2f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -36,6 +36,7 @@ ikiwiki (3.20150615) UNRELEASED; urgency=medium
   * d/control: Standards-Version: 3.9.6, no changes required
   * Silence "used only once: possible typo" warnings for variables
     that are part of modules' APIs
+  * img test: skip testing PDFs if unsupported
 
  -- Simon McVittie <smcv@debian.org>  Mon, 15 Jun 2015 18:13:23 +0100
 
diff --git a/doc/bugs/img_test_failure_on_nix.mdwn b/doc/bugs/img_test_failure_on_nix.mdwn
index 3b9e076..911cc66 100644
--- a/doc/bugs/img_test_failure_on_nix.mdwn
+++ b/doc/bugs/img_test_failure_on_nix.mdwn
@@ -27,3 +27,7 @@ Peter Simons wrote:
 >>
 >> If the result is `$VAR1 = [ undef ]`, then we can easily make the test skip that bit if PDFs don't work.
 >> --[[smcv]]
+
+>>> That configuration test doesn't actually work because of the way
+>>> ImageMagick processes PDFs via ghostscript, but loading a sample
+>>> PDF and probing its width does seem to work. [[done]] --[[smcv]]
diff --git a/t/img.t b/t/img.t
index 1f2e7d0..0fceebe 100755
--- a/t/img.t
+++ b/t/img.t
@@ -38,6 +38,9 @@ push @command, qw(--set usedirs=0 --plugin img t/tmp/in t/tmp/out --verbose);
 my $magick = new Image::Magick;
 my $SVGS_WORK = defined $magick->QueryFormat("svg");
 
+$magick->Read("t/img/twopages.pdf");
+my $PDFS_WORK = defined $magick->Get("width");
+
 ok(! system("rm -rf t/tmp; mkdir -p t/tmp/in"));
 
 ok(! system("cp t/img/redsquare.png t/tmp/in/redsquare.png"));
@@ -60,6 +63,14 @@ if ($SVGS_WORK) {
 	$maybe_svg_img = "[[!img emptysquare.svg size=10x]]";
 }
 
+my $maybe_pdf_img = "";
+if ($PDFS_WORK) {
+	$maybe_pdf_img = <<EOF;
+[[!img twopages.pdf size=12x]]
+[[!img twopages.pdf size=16x pagenumber=1]]
+EOF
+}
+
 writefile("imgconversions.mdwn", "t/tmp/in", <<EOF
 [[!img redsquare.png]]
 [[!img redsquare.png size=10x]]
@@ -68,8 +79,7 @@ writefile("imgconversions.mdwn", "t/tmp/in", <<EOF
 [[!img a:b:c.png size=x4]]
 [[!img a:b:c:d:e:f:g:h:i:j.png size=x6]]
 $maybe_svg_img
-[[!img twopages.pdf size=12x]]
-[[!img twopages.pdf size=16x pagenumber=1]]
+$maybe_pdf_img
 EOF
 );
 ok(utime(333333333, 333333333, "t/tmp/in/imgconversions.mdwn"));
@@ -93,13 +103,20 @@ is(size("$outpath/10x-redsquare.png"), "10x10");
 ok(! -e "$outpath/30x-redsquare.png");
 ok($outhtml =~ /width="30" height="30".*expecting 30x30/);
 
-if ($SVGS_WORK) {
+SKIP: {
+	skip "SVG support not installed (try libmagickcore-extra)", 1
+		unless $SVGS_WORK;
 	# if this fails, you need libmagickcore-6.q16-2-extra installed
-	is(size("$outpath/10x-emptysquare.png"), "10x10");
+	is(size("$outpath/10x-bluesquare.png"), "10x10");
+}
+
+SKIP: {
+	skip "PDF support not installed (try ghostscript)", 2
+		unless $PDFS_WORK;
+	is(size("$outpath/12x-twopages.png"), "12x12");
+	is(size("$outpath/16x-p1-twopages.png"), "16x2");
 }
 
-is(size("$outpath/12x-twopages.png"), "12x12");
-is(size("$outpath/16x-p1-twopages.png"), "16x2");
 ok($outhtml =~ /width="8" height="8".*expecting 8x8/);
 is(size("$outpath/x8-hello:world.png"), "8x8");
 is(size("$outpath/x4-a:b:c.png"), "4x4");

further invastigation on the rebuilding crash
diff --git a/doc/bugs/po_plugin_config_crasher.mdwn b/doc/bugs/po_plugin_config_crasher.mdwn
index a0014a3..22afa67 100644
--- a/doc/bugs/po_plugin_config_crasher.mdwn
+++ b/doc/bugs/po_plugin_config_crasher.mdwn
@@ -9,3 +9,20 @@ I suspect the relevant configuration is this:
 
 Config problems in ikiwiki.setup should really not cause the whole site
 build to crash; this can make it hard to recover. --[[Joey]]
+
+---
+I try to setup a small site with the auto-blog.setup and played a bit with it:
+If I activate the po plugin and set po_translateable_pages to something meaningful (like the example: '* and !*/Discussion'),
+then I'll get the same error
+
+    syntax error in pagespec "\"page(./posts/*)"
+
+but only after a second run of the ikiwiki --setup site.setup
+
+My try to get a clue: deleting any po and pot files and run the rebuild again - works fine  
+run the rebuild a second time - error as above
+
+tune any of the pagespec variables in the setup and at the inline directives of the blog or sidebar dosn't change anything
+except leaving the po_translateable_pages empty, than the rebuild works and doesn't create any po files (as expected).
+
+Is this helpful or have I done anything stupid ? -- Michael

diff --git a/doc/plugins/contrib/tracking.mdwn b/doc/plugins/contrib/tracking.mdwn
index 20e6463..d2ed71e 100644
--- a/doc/plugins/contrib/tracking.mdwn
+++ b/doc/plugins/contrib/tracking.mdwn
@@ -27,4 +27,4 @@ This plugin includes the necessary tracking codes for Piwik and/or Google Analyt
 
 * single files: [tracking.pm](https://git.bzed.at/raw/~bzed/ikiwiki.git/tracking/IkiWiki!Plugin!tracking.pm) [piwik.tmpl](https://git.bzed.at/raw/~bzed/ikiwiki.git/tracking/templates!piwik.tmpl) [google_analytics.tmpl](https://git.bzed.at/raw/~bzed/ikiwiki.git/tracking/templates!google_analytics.tmpl)
 * browse repository: <https://git.bzed.at/tree/~bzed%2Fikiwiki.git/tracking>
-* git repo: `git://git.bzed.at/~bzed/ikiwiki.git` or <https://git.bzed.at/summary/~bzed%2Fikiwiki.git> (Use the tracking branch)
+* git repo: `git://git.bzed.at/~bzed/ikiwiki.git` or <https://git.bzed.at/r/~bzed/ikiwiki.git> (Use the tracking branch)

fix urls
diff --git a/doc/plugins/contrib/plusone.mdwn b/doc/plugins/contrib/plusone.mdwn
index a8d4c67..af7c06c 100644
--- a/doc/plugins/contrib/plusone.mdwn
+++ b/doc/plugins/contrib/plusone.mdwn
@@ -30,6 +30,6 @@ The plusone directive allows to override the automativally generated url by spec
 
 ## DOWNLOAD
 
-* single file: [plusone.pm](http://git.recluse.de/?p=users/bzed/ikiwiki.git;a=blob_plain;f=IkiWiki/Plugin/plusone.pm;hb=refs/heads/plusone)
-* browse repository: <http://git.recluse.de/?p=users/bzed/ikiwiki.git;a=shortlog;h=refs/heads/plusone>
-* git repo: `git://git.recluse.de/users/bzed/ikiwiki.git` or <http://git.recluse.de/repos/users/bzed/ikiwiki.git> (Use the plusone branch)
+* single file: [plusone.pm](https://git.bzed.at/raw/~bzed/ikiwiki.git/plusone/IkiWiki!Plugin!plusone.pm)
+* browse repository: <https://git.bzed.at/blob/~bzed%2Fikiwiki.git/plusone/IkiWiki%2FPlugin%2Fplusone.pm>
+* git repo: `git://git.recluse.de/users/bzed/ikiwiki.git` or <https://git.bzed.at/r/~bzed/ikiwiki.git> (Use the plusone branch)

fix urls for tracking plugin
diff --git a/doc/plugins/contrib/tracking.mdwn b/doc/plugins/contrib/tracking.mdwn
index 06d4120..20e6463 100644
--- a/doc/plugins/contrib/tracking.mdwn
+++ b/doc/plugins/contrib/tracking.mdwn
@@ -25,6 +25,6 @@ This plugin includes the necessary tracking codes for Piwik and/or Google Analyt
 
 ## DOWNLOAD
 
-* single files: [tracking.pm](http://git.recluse.de/?p=users/bzed/ikiwiki.git;a=blob;f=IkiWiki/Plugin/tracking.pm;hb=refs/heads/tracking) [piwik.tmpl](http://git.recluse.de/?p=users/bzed/ikiwiki.git;a=blob;f=templates/piwik.tmpl;hb=refs/heads/tracking) [google_analytics.tmpl](http://git.recluse.de/?p=users/bzed/ikiwiki.git;a=blob;f=templates/google_analytics.tmpl;hb=refs/heads/tracking)
-* browse repository: <http://git.recluse.de/?p=users/bzed/ikiwiki.git;a=shortlog;h=refs/heads/tracking>
-* git repo: `git://git.recluse.de/users/bzed/ikiwiki.git` or <http://git.recluse.de/repos/users/bzed/ikiwiki.git> (Use the tracking branch)
+* single files: [tracking.pm](https://git.bzed.at/raw/~bzed/ikiwiki.git/tracking/IkiWiki!Plugin!tracking.pm) [piwik.tmpl](https://git.bzed.at/raw/~bzed/ikiwiki.git/tracking/templates!piwik.tmpl) [google_analytics.tmpl](https://git.bzed.at/raw/~bzed/ikiwiki.git/tracking/templates!google_analytics.tmpl)
+* browse repository: <https://git.bzed.at/tree/~bzed%2Fikiwiki.git/tracking>
+* git repo: `git://git.bzed.at/~bzed/ikiwiki.git` or <https://git.bzed.at/summary/~bzed%2Fikiwiki.git> (Use the tracking branch)

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 099853d..25e5324 100644
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -8,7 +8,7 @@ This is the [[SandBox]], a page anyone can edit to try out ikiwiki
 vvvv
 CamelCase ?
 
-What about [[this page]]?
+What about [[this page]], nono better [[that page]]?
 
 hello world (right back at ya)
 

initial
diff --git a/doc/sandbox/that_page.mdwn b/doc/sandbox/that_page.mdwn
new file mode 100644
index 0000000..8eacc87
--- /dev/null
+++ b/doc/sandbox/that_page.mdwn
@@ -0,0 +1,5 @@
+## This is that page
+
+That page is goood.
+
+How to set viewing permissions?

Add missing backquote.
diff --git a/doc/templates.mdwn b/doc/templates.mdwn
index c45316e..378e579 100644
--- a/doc/templates.mdwn
+++ b/doc/templates.mdwn
@@ -92,7 +92,7 @@ Here is a full list of the template files used:
 * `editpage.tmpl`, `editconflict.tmpl`, `editcreationconflict.tmpl`,
   `editfailedsave.tmpl`, `editpagegone.tmpl`, `pocreatepage.tmpl`,
   `editcomment.tmpl` `commentmoderation.tmpl`, `renamesummary.tmpl`,
-  `passwordmail.tmpl`, `emailauth.tmpl, `login-selector.tmpl`, 
+  `passwordmail.tmpl`, `emailauth.tmpl`, `login-selector.tmpl`, 
   `revert.tmpl` - Parts of ikiwiki's user interface; do not normally need
   to be customised.
 

Remote "test45" template.
diff --git a/doc/templates/test45.mdwn b/doc/templates/test45.mdwn
deleted file mode 100644
index bbac541..0000000
--- a/doc/templates/test45.mdwn
+++ /dev/null
@@ -1,12 +0,0 @@
-[[!templatebody <<ENDBODY
-<div class="notebox">
-<TMPL_VAR text> (This is a note, made using the test45 template.)
-</div>
-ENDBODY]]
-
-Use this template to insert a note into a page. This template is a duplicate of note, but with test45 text appended to it. The note will be styled to
-float to the right of other text on the page. This template has one
-parameter:
-<ul>
-<li>`text` - the text to display in the note
-</ul>

Asking about fastCGI and Nginx under Arch
diff --git a/doc/forum/FastCGI_problem_on_Arch.mdwn b/doc/forum/FastCGI_problem_on_Arch.mdwn
new file mode 100644
index 0000000..2911b74
--- /dev/null
+++ b/doc/forum/FastCGI_problem_on_Arch.mdwn
@@ -0,0 +1,13 @@
+Hello. 
+
+Sorry to disturb here, but I'm struggling running ikiwiki under Arch on a RaspberryPi.  
+I have a default user: alarm that both runs the nginx server and which created the ikiwiki site.  
+Everything sits in the home folder.  
+
+I've followed the instructions [here](http://ikiwiki.info/tips/dot_cgi/#index3h2) regarding the configuration of FastCGI, but there is a slight mistake in it I think.
+Nowadays, the ikiwiki.cgi sits in the subfolder that is the same as the wiki name under public_html/ and not directly under public_html/. But it does not really matter. I corrected that in my script.
+ 
+But somehow, even if I play around with the fastcgi parameters, I either get a 403, or the server is trying to send me the ikiwiki.cgi file to download, but does not run it.
+
+I've changed the permissions on the socket, I even tried to run the server as root, nothing changes. Still same errors. If anyone can help, I'd appreciate.
+  

diff --git a/doc/plugins/contrib/pandoc.mdwn b/doc/plugins/contrib/pandoc.mdwn
index c938036..b9501a0 100644
--- a/doc/plugins/contrib/pandoc.mdwn
+++ b/doc/plugins/contrib/pandoc.mdwn
@@ -4,4 +4,4 @@ This plugin enables Markdown processing using [Pandoc](http://johnmacfarlane.net
 
 This is an expanded and updated version of [[Jason Blevin|users/jasonblevins]]'s pandoc plugin. Get it and see further details at <https://github.com/dubiousjim/pandoc-iki>.
 
-A version, merging enhancements in various forks is available at <https://github.com/sciunto/ikiwiki-pandoc>. PR are welcome.
+Several authors are maintaining a code here: <https://github.com/sciunto-org/ikiwiki-pandoc>. Several enhancements found on github were merged and we keep developing the plugin. PR are welcome. :)

Hi
diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 1b0c5d5..099853d 100644
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -16,6 +16,8 @@ wait how does versioning work
 
 test, is it being saved? Probably. I will check. This seems really straightforward.
 
+Hello!
+
 ~~~
 pre formated text?
 ~~~

Added a comment: Protocol-relative URLs are not always an option; change your url and cgiurl settings
diff --git a/doc/forum/Let_rss_point_to_https_/comment_2_02d04263197df6d488e5e39d2686a772._comment b/doc/forum/Let_rss_point_to_https_/comment_2_02d04263197df6d488e5e39d2686a772._comment
new file mode 100644
index 0000000..94b6cd7
--- /dev/null
+++ b/doc/forum/Let_rss_point_to_https_/comment_2_02d04263197df6d488e5e39d2686a772._comment
@@ -0,0 +1,26 @@
+[[!comment format=mdwn
+ username="smcv"
+ subject="Protocol-relative URLs are not always an option; change your url and cgiurl settings"
+ date="2015-12-13T22:20:13Z"
+ content="""
+IkiWiki already uses relative (`../foo/`), hostname-relative (`/foo`) or
+protocol-relative (`//example.com/foo/`) URLs wherever it can. However, not
+everything is allowed to be relative: in particular, more or less
+everything in RSS has to be absolute, either because the specification says so,
+or because in practice RSS consumers usually get relative URLs wrong.
+When we generated XHTML 1.0, `<base href=... />` had to be absolute too,
+but now that we always generate HTML 5 it's relative, so RSS is one of the
+few places the full `url` and `cgiurl` are used.
+
+If you have a certificate that's trusted by \"normal\" browsers (like LetsEncrypt),
+then there's no disadvantage in changing your `url` and `cgiurl` to
+both be `https://...`, and rebuilding your wiki. At this point I would only
+recommend using plain `http://` if you either have no certificate, or a
+self-signed or otherwise not-universally-trusted certificate for a non-public
+website.
+
+Because IkiWiki mostly outputs relative URLs, accesses via `http` will stay
+on `http`, unless you also reconfigure your web server (not specific to
+IkiWiki, for instance if you use Apache see
+[RedirectSSL on the Apache wiki](https://wiki.apache.org/httpd/RedirectSSL).
+"""]]

Added a comment: Question/Proposal
diff --git a/doc/forum/Let_rss_point_to_https_/comment_1_571d9f380068bf9130f8b68d1af22dae._comment b/doc/forum/Let_rss_point_to_https_/comment_1_571d9f380068bf9130f8b68d1af22dae._comment
new file mode 100644
index 0000000..b352e24
--- /dev/null
+++ b/doc/forum/Let_rss_point_to_https_/comment_1_571d9f380068bf9130f8b68d1af22dae._comment
@@ -0,0 +1,9 @@
+[[!comment format=mdwn
+ username="spalax"
+ subject="Question/Proposal"
+ date="2015-12-12T22:04:09Z"
+ content="""
+Wouldn't use the `//` in the URL, to make the URL protocol relative, solve the problem? It [seems to be already used](http://source.ikiwiki.branchable.com/?p=source.git;a=blob;f=IkiWiki.pm;h=fe5af6d15a769250879accb6592b45d84f5c555e;hb=HEAD#l680), but if you ask this question, this means that the rss feed does not use it. Now someone has to track how the feed url is generated, and why it does not use this protocol-relutive URL (sorry, I will not do this myself: I would not find the time to do so these days).
+
+-- [[Louis|spalax]]
+"""]]

diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn
index 964505a..2ce5f88 100644
--- a/doc/ikiwikiusers.mdwn
+++ b/doc/ikiwikiusers.mdwn
@@ -214,4 +214,4 @@ Personal sites and blogs
   * [Mim](http://mim.tem.blog.br)
 * [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)
+* [Matto's personal website](https://box.matto.nl)

diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn
index 83586e5..964505a 100644
--- a/doc/ikiwikiusers.mdwn
+++ b/doc/ikiwikiusers.mdwn
@@ -214,3 +214,4 @@ Personal sites and blogs
   * [Mim](http://mim.tem.blog.br)
 * [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)

diff --git a/doc/forum/Let_rss_point_to_https_.mdwn b/doc/forum/Let_rss_point_to_https_.mdwn
new file mode 100644
index 0000000..6959a0c
--- /dev/null
+++ b/doc/forum/Let_rss_point_to_https_.mdwn
@@ -0,0 +1,8 @@
+Now that we can use the certificates of Lets encrypt, many wikis will move to
+https in stead of http.
+
+However, the RSS and Atom-feeds are still pointing at http
+
+Is there a way to configure the RSS- and Atomfeeds to be pointing to
+https://... ?
+

respond
diff --git a/doc/ikiwiki/wikilink/discussion.mdwn b/doc/ikiwiki/wikilink/discussion.mdwn
index 6c186ec..65a45b9 100644
--- a/doc/ikiwiki/wikilink/discussion.mdwn
+++ b/doc/ikiwiki/wikilink/discussion.mdwn
@@ -18,6 +18,8 @@ BTW, ikiwiki doesn't displays the #foo anchor in the example
 > It would be much easier though if it was translated to the heading's name,
 > so on could to `\[[page#name]]`. --Timoses
 
+>> That's [[plugins/headinganchors]]. --smcv
+
 > No such syntax exists in markdown.  ikiwiki could certainly have a
 > [[preprocessor_directive|directive]] for it, though.
 > --[[JoshTriplett]]
@@ -90,11 +92,27 @@ Is it possible to refer to a page, say \[[foobar]], such that the link text is t
 
 > Not yet. :-) Any suggestion for a syntax for it? Maybe something like \[[|foobar]] ? --[[Joey]]
 
-> I am thinking that it would be useful to parse parts of one wiki page into another. Here something like `\[[page=anchor]]` would be really nice to simply parse the content of that section, as opposed to `\[[page#anchor]]` which only creates a link to that section. -- [[Timoses]]
-
 I like your suggestion because it's short and conscise. However, it would be nice to be able to refer to more or less arbitrary meta tags in links, not just "title". To do that, the link needs two parameters: the page name and the tag name, i.e. \[[pagename!metatag]]. Any sufficiently weird separater can be used instead of '!', of course. I like \[[pagename->metatag]], too, because it reminds me of accessing a data member of a structure (which is what referencing a meta tag is, really). --Peter
 
 > I dislike \[[pagename->metatag]] because other wikis use that as their normal link/label syntax.
 > I'm not sure that it is a good idea to refer to arbitrary meta tags in links in the first place - what other meta tags would you really be interested in?  Description?  Author?  It makes sense to me to refer to the title, because that is a "label" for a page.
 > As for syntax, I do like the \[[|foobar]] idea, or perhaps something like what <a href="http://www.pmwiki.org">PmWiki</a> does - they have their links the other way around, so they go \[[page|label]] and for link-text-as-title, they have \[[page|+]].  So for IkiWiki, that would be \[[+|page]] I guess.
 > --[[KathrynAndersen]]
+
+----
+
+I am thinking that it would be useful to parse parts of one wiki page into another. Here something like `\[[page=anchor]]` would be really nice to simply parse the content of that section, as opposed to `\[[page#anchor]]` which only creates a link to that section. -- [[Timoses]]
+
+> When you say "parse parts" do you mean taking a section of a wiki page and including its text
+> in a different wiki page? So for instance you might want `/installation` to include the
+> `Downloading binaries` section of `/download`, but not the rest of that page?
+>
+> That's really a separate feature request (inlining isn't linking), and is also rather difficult
+> to do in IkiWiki's processing model: at the time that [[wikilinks|ikiwiki/wikilink]] and
+> [[directives|ikiwiki/directive]] are processed, the page content is still Markdown or
+> whatever other format is relevant, not HTML. That makes sections difficult to identify.
+>
+> I would suggest making the desired section a separate page (for example you might
+> call it `/download/binaries`), and including that whole page everywhere it should
+> appear (for example in both `/download` and `/installation`) using
+> `\[[!inline pages="download/binaries" raw=yes]]`. --[[smcv]]

diff --git a/doc/ikiwiki/wikilink/discussion.mdwn b/doc/ikiwiki/wikilink/discussion.mdwn
index 3e33d12..6c186ec 100644
--- a/doc/ikiwiki/wikilink/discussion.mdwn
+++ b/doc/ikiwiki/wikilink/discussion.mdwn
@@ -13,6 +13,11 @@ BTW, ikiwiki doesn't displays the #foo anchor in the example
 
 --[[Paweł|ptecza]]
 
+> Just found out that headers are already indexed with `index1h1 ... indexMhN`.
+> So one can link to headings with `\[[page|#index2h3]]` for example. 
+> It would be much easier though if it was translated to the heading's name,
+> so on could to `\[[page#name]]`. --Timoses
+
 > No such syntax exists in markdown.  ikiwiki could certainly have a
 > [[preprocessor_directive|directive]] for it, though.
 > --[[JoshTriplett]]

diff --git a/doc/ikiwiki/wikilink/discussion.mdwn b/doc/ikiwiki/wikilink/discussion.mdwn
index 3ba1429..3e33d12 100644
--- a/doc/ikiwiki/wikilink/discussion.mdwn
+++ b/doc/ikiwiki/wikilink/discussion.mdwn
@@ -85,7 +85,7 @@ Is it possible to refer to a page, say \[[foobar]], such that the link text is t
 
 > Not yet. :-) Any suggestion for a syntax for it? Maybe something like \[[|foobar]] ? --[[Joey]]
 
-> I am thinking that it would be useful to parse parts of one wiki page into another. Here something like [[page=anchor]] would be really nice to simply parse the content of that section, as opposed to [[page#anchor]] which only creates a link to that section. -- [[Timoses]]
+> I am thinking that it would be useful to parse parts of one wiki page into another. Here something like `\[[page=anchor]]` would be really nice to simply parse the content of that section, as opposed to `\[[page#anchor]]` which only creates a link to that section. -- [[Timoses]]
 
 I like your suggestion because it's short and conscise. However, it would be nice to be able to refer to more or less arbitrary meta tags in links, not just "title". To do that, the link needs two parameters: the page name and the tag name, i.e. \[[pagename!metatag]]. Any sufficiently weird separater can be used instead of '!', of course. I like \[[pagename->metatag]], too, because it reminds me of accessing a data member of a structure (which is what referencing a meta tag is, really). --Peter
 

diff --git a/doc/ikiwiki/wikilink/discussion.mdwn b/doc/ikiwiki/wikilink/discussion.mdwn
index 58bb8ca..3ba1429 100644
--- a/doc/ikiwiki/wikilink/discussion.mdwn
+++ b/doc/ikiwiki/wikilink/discussion.mdwn
@@ -85,6 +85,8 @@ Is it possible to refer to a page, say \[[foobar]], such that the link text is t
 
 > Not yet. :-) Any suggestion for a syntax for it? Maybe something like \[[|foobar]] ? --[[Joey]]
 
+> I am thinking that it would be useful to parse parts of one wiki page into another. Here something like [[page=anchor]] would be really nice to simply parse the content of that section, as opposed to [[page#anchor]] which only creates a link to that section. -- [[Timoses]]
+
 I like your suggestion because it's short and conscise. However, it would be nice to be able to refer to more or less arbitrary meta tags in links, not just "title". To do that, the link needs two parameters: the page name and the tag name, i.e. \[[pagename!metatag]]. Any sufficiently weird separater can be used instead of '!', of course. I like \[[pagename->metatag]], too, because it reminds me of accessing a data member of a structure (which is what referencing a meta tag is, really). --Peter
 
 > I dislike \[[pagename->metatag]] because other wikis use that as their normal link/label syntax.

underlays/javascript/* use ikiwiki's permissive license
I'm the sole author and copyright holder of these files.
diff --git a/debian/copyright b/debian/copyright
index d6c66b3..28b5aa5 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -6,7 +6,7 @@ Copyright: © 2006-2011 Joey Hess <joey@ikiwiki.info>
 License: GPL-2+
 
 Files: templates/* underlays/basewiki/* doc/ikiwiki/directive/*
- ikiwiki.setup po/underlays/*
+ ikiwiki.setup po/underlays/* underlays/javascript/*
 Copyright: © 2006-2010 Joey Hess <joey@ikiwiki.info>
 License: permissive
 
diff --git a/doc/bugs/Please_add_copyright_notice_in_embedded_JS.mdwn b/doc/bugs/Please_add_copyright_notice_in_embedded_JS.mdwn
index b01957d..79194df 100644
--- a/doc/bugs/Please_add_copyright_notice_in_embedded_JS.mdwn
+++ b/doc/bugs/Please_add_copyright_notice_in_embedded_JS.mdwn
@@ -12,3 +12,9 @@ Thanks
 > holder; nobody else can give an authoritative answer about the JS's license. Joey,
 > if you want `underlays/javascript` to be permissively-licensed, please amend
 > `debian/copyright` accordingly. --[[smcv]]
+> 
+>> It was intended to be permissive. I've amended the copyright file.
+>> [[done]]
+>> 
+>> I wouldn't mind including information readable by librejs in those
+>> files, if someone wants to send a patch. --[[Joey]]

it is deliberate that internal options aren't saved
diff --git a/doc/bugs/dumpsetup_does_not_save_wikistatedir.mdwn b/doc/bugs/dumpsetup_does_not_save_wikistatedir.mdwn
index cf7bc63..236460f 100644
--- a/doc/bugs/dumpsetup_does_not_save_wikistatedir.mdwn
+++ b/doc/bugs/dumpsetup_does_not_save_wikistatedir.mdwn
@@ -3,3 +3,10 @@ Calling ikiwiki with a bunch of options, including the `--dumpsetup somefile.set
 Strange since same [[kind of bugs|bugs/dumpsetup_does_not_save_destdir]] have been fixed for `destdir`.
 
 --[[bbb]]
+
+> Options flagged as `internal` are not saved, and are not meant to be useful to save.
+> `wikistatedir` is one of those. Why do you want `wikistatedir` to be in the dumped setup?
+>
+> `wikistatedir` is always `$config{srcdir}/.ikiwiki` unless you are doing something
+> incredibly strange.
+> --[[smcv]]

it's either GPL-2+ or very permissive; copyright holder should clarify
diff --git a/doc/bugs/Please_add_copyright_notice_in_embedded_JS.mdwn b/doc/bugs/Please_add_copyright_notice_in_embedded_JS.mdwn
index b224170..b01957d 100644
--- a/doc/bugs/Please_add_copyright_notice_in_embedded_JS.mdwn
+++ b/doc/bugs/Please_add_copyright_notice_in_embedded_JS.mdwn
@@ -3,3 +3,12 @@ Hello,
 We got a report that http://www.gnu.org/software/hurd/ "embeds apparently non-free JS". This is because the embedded ikiwiki.js javascript file does not wear a copyright notice, to tell which licence this file is shipped under.  Could you add such a copyright notice?
 
 Thanks
+
+> Everything in ikiwiki is [[freesoftware]]. The JavaScript in `underlays/javascript`
+> appears to be GPL-2+, but might have been intended to be under the permissive basewiki
+> license.
+>
+> [[Joey]] appears to be the only author, so is presumably the only copyright
+> holder; nobody else can give an authoritative answer about the JS's license. Joey,
+> if you want `underlays/javascript` to be permissively-licensed, please amend
+> `debian/copyright` accordingly. --[[smcv]]

request feedback
diff --git a/doc/bugs/img_test_failure_on_nix.mdwn b/doc/bugs/img_test_failure_on_nix.mdwn
index 5e439f7..3b9e076 100644
--- a/doc/bugs/img_test_failure_on_nix.mdwn
+++ b/doc/bugs/img_test_failure_on_nix.mdwn
@@ -15,3 +15,15 @@ Peter Simons wrote:
 	Failed 2/19 subtests 
  
 > Do you have any idea how to fix this issue?
+
+>> As far as I can tell, this indicates that your ImageMagick doesn't
+>> support PDF (in Debian and its derivatives this requires `libmagickcore-extra`).
+>> Please run tests on a system with a fully-featured ImageMagick (in Debian we put
+>> `libmagickcore-extra` in the `Build-Depends-Indep` for this), or if you are testing
+>> at install time on arbitrary end-user systems, please tell me what this says on a
+>> system where the test fails:
+>>
+>>     perl -MData::Dumper -MImage::Magick -e 'print Dumper([(new Image::Magick)->QueryFormat("pdf")])'
+>>
+>> If the result is `$VAR1 = [ undef ]`, then we can easily make the test skip that bit if PDFs don't work.
+>> --[[smcv]]

tag reviewed
diff --git a/doc/todo/add_aria_landmarks_to_make_ikiwiki_websites_more_accessible.mdwn b/doc/todo/add_aria_landmarks_to_make_ikiwiki_websites_more_accessible.mdwn
index d13fa0a..81cf2c4 100644
--- a/doc/todo/add_aria_landmarks_to_make_ikiwiki_websites_more_accessible.mdwn
+++ b/doc/todo/add_aria_landmarks_to_make_ikiwiki_websites_more_accessible.mdwn
@@ -65,7 +65,9 @@ General points:
 
 The `role` attribute is not allowed by the XHTML 1.0 Strict DTD, so we
 should only emit it in HTML5 mode (and we should probably
-[[todo/generate_HTML5_by_default]]).
+[[todo/generate_HTML5_by_default]]). --[[smcv]]
+
+> Now we do. --[[smcv]]
 
 Specific roles:
 
@@ -93,3 +95,5 @@ but only in HTML5 mode for the reason given above. I have not applied
 a role to the sidebar just yet.
 
 --[[smcv]]
+
+> Feedback desired. Tagging this [[reviewed]] to take it off the patches list --[[smcv]]

close
diff --git a/doc/todo/Option_linktext_for_pagestats_directive.mdwn b/doc/todo/Option_linktext_for_pagestats_directive.mdwn
index ab5eb22..f855299 100644
--- a/doc/todo/Option_linktext_for_pagestats_directive.mdwn
+++ b/doc/todo/Option_linktext_for_pagestats_directive.mdwn
@@ -201,3 +201,5 @@ browse=http://git.pseudorandom.co.uk/smcv/ikiwiki.git/shortlog/refs/heads/pagest
 >> Here's a branch. It depends on my `ready/limit` branch
 >> from [[todo/pick a new canonical name for equivalent of SQL limit]].
 >> --[[smcv]]
+
+>>> [[Merged|done]] --[[smcv]]

close
diff --git a/doc/todo/pick_a_new_canonical_name_for_equivalent_of_SQL_limit.mdwn b/doc/todo/pick_a_new_canonical_name_for_equivalent_of_SQL_limit.mdwn
index 4e70f81..875402e 100644
--- a/doc/todo/pick_a_new_canonical_name_for_equivalent_of_SQL_limit.mdwn
+++ b/doc/todo/pick_a_new_canonical_name_for_equivalent_of_SQL_limit.mdwn
@@ -42,3 +42,5 @@ browse=http://git.pseudorandom.co.uk/smcv/ikiwiki.git/shortlog/refs/heads/ready/
 
 I personally prefer `\[[!inline limit=10]]` so I have put that in a branch.
 Agreement/objections/better ideas welcome. --[[smcv]]
+
+> In the absence of any feedback I've applied that branch. [[done]] --[[smcv]]

Merge remote-tracking branch 'smcv/ready/limit'
Added a comment
diff --git a/doc/forum/problem_with_git_after_a_commit_of_ikiwiki/comment_3_ea7ae2cf2e1f897a653a81bd20fe55db._comment b/doc/forum/problem_with_git_after_a_commit_of_ikiwiki/comment_3_ea7ae2cf2e1f897a653a81bd20fe55db._comment
new file mode 100644
index 0000000..5b06d06
--- /dev/null
+++ b/doc/forum/problem_with_git_after_a_commit_of_ikiwiki/comment_3_ea7ae2cf2e1f897a653a81bd20fe55db._comment
@@ -0,0 +1,9 @@
+[[!comment format=mdwn
+ username="smcv"
+ subject="comment 3"
+ date="2015-11-30T19:58:43Z"
+ content="""
+I've made essentially the change [[chrysn]] suggested in git master. It will be in the next release.
+
+I've also added Debian [autopkgtest](https://tracker.debian.org/pkg/autopkgtest) support; conveniently, it exhibited this bug, so we can make sure it stays fixed.
+"""]]

create todo wishlist patch for match_userdir idea
diff --git a/doc/todo/userdir__40____41___pagespec_directive_to_match_userpage_and_SubPages.mdwn b/doc/todo/userdir__40____41___pagespec_directive_to_match_userpage_and_SubPages.mdwn
new file mode 100644
index 0000000..b64bf0a
--- /dev/null
+++ b/doc/todo/userdir__40____41___pagespec_directive_to_match_userpage_and_SubPages.mdwn
@@ -0,0 +1,13 @@
+[[!tag wishlist patch ]]
+[[!template id=gitbranch branch=bfree/userdirps author="niall"]]
+I've written a very small plugin, inspired by 
+[[forum/Can_ikiwiki_be_configured_as_multi_user_blog__63__]] 
+which adds match_userdir to IkiWiki::PageSpec
+
+userdir() in a [[IkiWiki/PageSpec]] takes no arguments and checks 
+if the page is the users userpage or a SubPage of it.
+
+The plugin is named userdirps.
+
+In case my gitbranch template is wrong:
+[[https://github.com/bfree/ikiwiki/commit/1f699d15c0778702cc5264dd3c8f822c6b0609ba]]

add bfree git to hopefully use branch in todo item
diff --git a/doc/git.mdwn b/doc/git.mdwn
index dd066c3..85e3e07 100644
--- a/doc/git.mdwn
+++ b/doc/git.mdwn
@@ -83,6 +83,7 @@ think about merging them. This is recommended. :-)
 * [[jcflack]] `git://github.com/jcflack/ikiwiki.git`
 * [[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`
 
 ## branches
 

Added a comment: "please tell me" when this happens, severity
diff --git a/doc/forum/problem_with_git_after_a_commit_of_ikiwiki/comment_2_7ef0d94691095f1cd316ad0d2c423796._comment b/doc/forum/problem_with_git_after_a_commit_of_ikiwiki/comment_2_7ef0d94691095f1cd316ad0d2c423796._comment
new file mode 100644
index 0000000..88533ce
--- /dev/null
+++ b/doc/forum/problem_with_git_after_a_commit_of_ikiwiki/comment_2_7ef0d94691095f1cd316ad0d2c423796._comment
@@ -0,0 +1,15 @@
+[[!comment format=mdwn
+ username="http://christian.amsuess.com/chrysn"
+ subject="&quot;please tell me&quot; when this happens, severity"
+ date="2015-11-15T13:45:29Z"
+ content="""
+i think that this is an issue to be considered, as it breaks ikiwiki installations that previously worked. the scenario this happened in for me was this:
+
+ages ago, i set up a dedicated user for ikiwiki on a server, and created wikis there with cgi and commit access for power users. things worked nicely, commits from web users showed up with author \"username <username@web>\" and committer \"gitusername <gitusername@hostname.(none)>\"; not exactly pretty, but it worked.
+
+when upgrading git, the wiki kept working for directly pushing users, but when web users did a change, it was written in the source directory, but not committed (with the error message showing up in the log, but no error message to the users). only when they looked in the recent changes, they noted their modifications missing, and power users would never see their changes.
+
+i suggest that ikiwiki provide a default value for committer (eg. \"ikiwiki <username@hostname>\") to circumvent this issue.
+
+(i didn't pinpoint the exact git version this changed in, but it's between 1.7 and 1.9).
+"""]]

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index ad925f6..1b0c5d5 100644
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -1,5 +1,5 @@
 [[!template  id=test45 text="""Here is the text to insert into my note."""]]
-
+dddddddddddd
 
 [[!meta date="Thu Jun 16 22:04:33 2005" updated="Thu Dec 22 01:23:20 2011"]]
 

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 0eb26a3..ad925f6 100644
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -5,7 +5,7 @@
 
 This is the [[SandBox]], a page anyone can edit to try out ikiwiki
 (version [[!version  ]]).
-
+vvvv
 CamelCase ?
 
 What about [[this page]]?

add my personal website
diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn
index 47a1369..83586e5 100644
--- a/doc/ikiwikiusers.mdwn
+++ b/doc/ikiwikiusers.mdwn
@@ -213,3 +213,4 @@ Personal sites and blogs
   * [Igreja Universal do Reino do Iuri](http://iuri.tem.blog.br)
   * [Mim](http://mim.tem.blog.br)
 * [Mídia Capoeira](https://capoeira.li/blog/) - independent journalism initiative
+* [Sean Whitton's personal website](http://spwhitton.name/)

diff --git a/doc/forum/How_to_fix_wide_character_syslog_error__63__.mdwn b/doc/forum/How_to_fix_wide_character_syslog_error__63__.mdwn
new file mode 100644
index 0000000..5562cb5
--- /dev/null
+++ b/doc/forum/How_to_fix_wide_character_syslog_error__63__.mdwn
@@ -0,0 +1,5 @@
+When running `ikiwiki rebuild` I got error:
+
+    failed to syslog: Wide character in syswrite at /usr/lib/perl/5.18/Sys/Syslog.pm line 546
+
+Ubuntu 14.04. ikiwiki 20150107.

Modified page.tmpl to to set html lang= and dir= when values have been specified for them, which the po plugin does.
Note that I modified the patch slightly, to avoid blank lines before the
<html>, on the off chance bad html parsers care.
diff --git a/debian/changelog b/debian/changelog
index a605b51..182733b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ ikiwiki (3.20150615) UNRELEASED; urgency=medium
 
   [ Joey Hess ]
   * emailauth: Added emailauth_sender config.
+  * Modified page.tmpl to to set html lang= and dir= when
+    values have been specified for them, which the po plugin does.
 
  -- Simon McVittie <smcv@debian.org>  Mon, 15 Jun 2015 18:13:23 +0100
 
diff --git a/doc/todo/Page_template_with_RTL_support.mdwn b/doc/todo/Page_template_with_RTL_support.mdwn
index e903421..7f11fd5 100644
--- a/doc/todo/Page_template_with_RTL_support.mdwn
+++ b/doc/todo/Page_template_with_RTL_support.mdwn
@@ -1,8 +1,8 @@
 Hi,
 
-I've modified page.tmpl to take into account rtl languages. Basically I've modified the <html> tag to generate
+I've modified page.tmpl to take into account rtl languages. Basically I've modified the `<html>` tag to generate
 
-<html dir="$DIRECTION" lang="$LANG">
+	<html dir="$DIRECTION" lang="$LANG">
 
 if the PO plugin is enabled.
 
@@ -12,3 +12,5 @@ Pasting it here: https://paste.debian.net/318146/
 
 
 Cheers.
+
+> [[applied|done]] --[[Joey]]
diff --git a/templates/page.tmpl b/templates/page.tmpl
index 9e8b330..183d733 100644
--- a/templates/page.tmpl
+++ b/templates/page.tmpl
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml">
+<TMPL_IF HTML_LANG_CODE><html lang="<TMPL_VAR HTML_LANG_CODE>" dir="<TMPL_VAR HTML_LANG_DIR>" xmlns="http://www.w3.org/1999/xhtml"><TMPL_ELSE><html xmlns="http://www.w3.org/1999/xhtml"></TMPL_IF>
 <head>
 <TMPL_IF DYNAMIC>
 <TMPL_IF FORCEBASEURL><base href="<TMPL_VAR FORCEBASEURL>" /><TMPL_ELSE>

diff --git a/doc/todo/Page_template_with_RTL_support.mdwn b/doc/todo/Page_template_with_RTL_support.mdwn
index 1993fb4..e903421 100644
--- a/doc/todo/Page_template_with_RTL_support.mdwn
+++ b/doc/todo/Page_template_with_RTL_support.mdwn
@@ -8,23 +8,7 @@ if the PO plugin is enabled.
 
 I can't seem to attach a patch - sending it to Joey.
 Copy pasting markup here seems to be quite problematic.
-Trying anyway:
+Pasting it here: https://paste.debian.net/318146/
 
-<pre>
-    diff --git a/templates/page.tmpl b/templates/page.tmpl
-    index 9e8b330..7f1c0cb 100644
-    --- a/templates/page.tmpl
-    +++ b/templates/page.tmpl
-    @@ -1,5 +1,9 @@
-     <!DOCTYPE html>
-    +<TMPL_IF HTML_LANG_CODE>
-    +<html lang="<TMPL_VAR HTML_LANG_CODE>" dir="<TMPL_VAR HTML_LANG_DIR>" xmlns="http://www.w3.org/1999/xhtml">
-    +<TMPL_ELSE>
-     <html xmlns="http://www.w3.org/1999/xhtml">
-    +</TMPL_IF>
-     <head>
-     <TMPL_IF DYNAMIC>
-     <TMPL_IF FORCEBASEURL><base href="<TMPL_VAR FORCEBASEURL>" /><TMPL_ELSE>
-</pre>
-Cheers
-u.
+
+Cheers.

diff --git a/doc/todo/Page_template_with_RTL_support.mdwn b/doc/todo/Page_template_with_RTL_support.mdwn
index b25e699..1993fb4 100644
--- a/doc/todo/Page_template_with_RTL_support.mdwn
+++ b/doc/todo/Page_template_with_RTL_support.mdwn
@@ -6,5 +6,25 @@ I've modified page.tmpl to take into account rtl languages. Basically I've modif
 
 if the PO plugin is enabled.
 
+I can't seem to attach a patch - sending it to Joey.
+Copy pasting markup here seems to be quite problematic.
+Trying anyway:
+
+<pre>
+    diff --git a/templates/page.tmpl b/templates/page.tmpl
+    index 9e8b330..7f1c0cb 100644
+    --- a/templates/page.tmpl
+    +++ b/templates/page.tmpl
+    @@ -1,5 +1,9 @@
+     <!DOCTYPE html>
+    +<TMPL_IF HTML_LANG_CODE>
+    +<html lang="<TMPL_VAR HTML_LANG_CODE>" dir="<TMPL_VAR HTML_LANG_DIR>" xmlns="http://www.w3.org/1999/xhtml">
+    +<TMPL_ELSE>
+     <html xmlns="http://www.w3.org/1999/xhtml">
+    +</TMPL_IF>
+     <head>
+     <TMPL_IF DYNAMIC>
+     <TMPL_IF FORCEBASEURL><base href="<TMPL_VAR FORCEBASEURL>" /><TMPL_ELSE>
+</pre>
 Cheers
 u.

diff --git a/doc/todo/Page_template_with_RTL_support.mdwn b/doc/todo/Page_template_with_RTL_support.mdwn
new file mode 100644
index 0000000..b25e699
--- /dev/null
+++ b/doc/todo/Page_template_with_RTL_support.mdwn
@@ -0,0 +1,10 @@
+Hi,
+
+I've modified page.tmpl to take into account rtl languages. Basically I've modified the <html> tag to generate
+
+<html dir="$DIRECTION" lang="$LANG">
+
+if the PO plugin is enabled.
+
+Cheers
+u.

revert link spam
This reverts commit 2acafb8b3fc4dc2e061a1f811610f67a67c7358b
diff --git a/doc/security.mdwn b/doc/security.mdwn
index a05adb8..d5a0266 100644
--- a/doc/security.mdwn
+++ b/doc/security.mdwn
@@ -506,5 +506,3 @@ The hole was reported on March 24th, a fix was developed on March 27th,
 and the fixed version 3.20150329 was released on the 29th. A fix was backported
 to Debian jessie as version 3.20141016.2 and to Debian wheezy as version
 3.20120629.2. An upgrade is recommended for sites using CGI and openid.
-
-<a href="http://onet.pl">onet</a>

diff --git a/doc/security.mdwn b/doc/security.mdwn
index d5a0266..a05adb8 100644
--- a/doc/security.mdwn
+++ b/doc/security.mdwn
@@ -506,3 +506,5 @@ The hole was reported on March 24th, a fix was developed on March 27th,
 and the fixed version 3.20150329 was released on the 29th. A fix was backported
 to Debian jessie as version 3.20141016.2 and to Debian wheezy as version
 3.20120629.2. An upgrade is recommended for sites using CGI and openid.
+
+<a href="http://onet.pl">onet</a>

Added a comment
diff --git a/doc/forum/Error:_CGI::tmpFileName_failed_to_return_the_uploaded_file_name/comment_4_e7453e7f84c494e80e9341feff931141._comment b/doc/forum/Error:_CGI::tmpFileName_failed_to_return_the_uploaded_file_name/comment_4_e7453e7f84c494e80e9341feff931141._comment
new file mode 100644
index 0000000..f522b22
--- /dev/null
+++ b/doc/forum/Error:_CGI::tmpFileName_failed_to_return_the_uploaded_file_name/comment_4_e7453e7f84c494e80e9341feff931141._comment
@@ -0,0 +1,9 @@
+[[!comment format=mdwn
+ username="smcv"
+ subject="comment 4"
+ date="2015-10-01T19:48:38Z"
+ content="""
+This could be [#786586](https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=786586) and [#786587](https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=786587), which have a matching symptom. (The two Debian bugs are aspects of the same thing.)
+
+Workaround: remove libcgi-pm-perl and use the older CGI.pm in Perl.
+"""]]

todo: headless git branches: benchmarking and comments from old email thread
diff --git a/doc/todo/headless_git_branches.mdwn b/doc/todo/headless_git_branches.mdwn
index bedf21d..d9bb380 100644
--- a/doc/todo/headless_git_branches.mdwn
+++ b/doc/todo/headless_git_branches.mdwn
@@ -77,6 +77,55 @@ at git show-ref to deduce whether to throw an error or not.
 > Ah, but then git-log would still complain "bad revision 'HEAD'"
 > --[[Joey]] 
 
+    jrayhawk@piny:/srv/git/jrayhawk.git$ time perl -e 'for( $i = 1; $i < 10000; $i++) { system("git", "show-ref", "--quiet", "--verify", "--", "refs/heads/master"); }'
+    
+    real  0m10.988s
+    user  0m0.120s
+    sys   0m1.210s
+
+> FWIW, "an extra millisecond per edit" vs "full git coverage" is no
+> contest for me; I use that patch on seven different systems, including
+> freedesktop.org, because I've spent more time explaining to users either
+> why Ikiwiki won't work on their empty repositories or why their
+> repositories need useless initial commits (a la Branchable) that make
+> pushing not work and why denyNonFastForwards=0 and git push -f are
+> necessary than all the milliseconds that could've been saved in the
+> world.
+> 
+> But, since we're having fun rearranging deck chairs on the RMS Perl
+> (toot toot)...
+> 
+> There's some discrepency here I wasn't expecting:
+
+    jrayhawk@piny:/srv/git/jrayhawk.git$ time dash -c 'i=0; while [ $i -lt 10000 ]; do i=$((i+1)); git show-ref --quiet --verify -- refs/heads/master; done'
+    
+    real  0m9.986s
+    user  0m0.170s
+    sys   0m0.940s
+
+> While looking around in the straces, I notice Perl, unlike {b,d}ash
+> appears to do PATH lookup on every invocation of git, adding up to
+> around 110 microseconds apiece on a post-2.6.38 16-thread QPI system:
+
+    29699      0.000112 execve("/home/jrayhawk/bin/git", ["git", "show-ref", "--quiet", "--verify", "--", "refs/heads/master"], [/* 17 vars */]) = -1 ENOENT (No such file or directory)
+    29699      0.000116 execve("/usr/local/bin/git", ["git", "show-ref", "--quiet", "--verify", "--", "refs/heads/master"], [/* 17 vars */]) = -1 ENOENT (No such file or directory)
+    29699      0.000084 execve("/usr/bin/git", ["git", "show-ref", "--quiet", "--verify", "--", "refs/heads/master"], [/* 17 vars */]) = 0
+
+> You can probably save a reasonable number of context switches and
+> RCU-heavy (or, previously, lock-heavy) dentry lookups by doing a Perl
+> equivalent of `which git` and using the result. It might even add up to
+> a whole millisecond in some circumstances!
+> 
+> No idea where the rest of that time is going. Probably cache misses
+> on the giant Perl runtime or something.
+> 
+> ...
+> 
+> Now I feel dirty for having spent more time talking about optimization
+> than that optimization is likely to save. This must be what being an
+> engineer feels like.
+> --jrayhawk
+
 <pre>
 @@ -474,7 +478,10 @@ sub rcs_update () {
  	# Update working directory.
@@ -98,6 +147,19 @@ called on every refresh. Probably could be dealt with similarly as above.
 Also, is there any point in breaking the pull up into a
 fetch followed by a merge? --[[Joey]] 
 
+> The same benchmarking applies, at least.
+>
+> Re: fetch/merge: We can't test for the nonexistence of the origin branch
+> without fetching it, and we can't merge it if it is, indeed,
+> nonexistant.
+>
+> Unless you're implying that it would be better to just spam stderr with
+> unnecessary scary messages and/or ignore/suppress them and lose the
+> ability to respond appropriately to every other error condition. As
+> maintainer, you deal with a disproportionate amount of the resulting
+> support fallout, so I'm perfectly satisfied letting you make that call.
+> --jrayhawk
+
 <pre>
 @@ -559,7 +566,7 @@ sub rcs_commit_helper (@) {
  	# So we should ignore its exit status (hence run_or_non).
@@ -111,3 +173,6 @@ fetch followed by a merge? --[[Joey]]
 </pre>
 
 This seems fine to apply. --[[Joey]]
+
+> Hooray!
+> --jrayhawk

Added a comment: Still seeing this
diff --git a/doc/forum/Error:_CGI::tmpFileName_failed_to_return_the_uploaded_file_name/comment_3_0dbc7bea39c6f69c4615250bc2d63d84._comment b/doc/forum/Error:_CGI::tmpFileName_failed_to_return_the_uploaded_file_name/comment_3_0dbc7bea39c6f69c4615250bc2d63d84._comment
new file mode 100644
index 0000000..5c4e81b
--- /dev/null
+++ b/doc/forum/Error:_CGI::tmpFileName_failed_to_return_the_uploaded_file_name/comment_3_0dbc7bea39c6f69c4615250bc2d63d84._comment
@@ -0,0 +1,7 @@
+[[!comment format=mdwn
+ username="JohnGoerzen"
+ subject="Still seeing this"
+ date="2015-09-28T16:22:21Z"
+ content="""
+I'm running 20141016.2 on Debian jessie and I'm seeing this.  From what I can tell, all known bugs around this should be fixed.  Any ideas?
+"""]]

Revert "removed"
This reverts commit df37decd8c61398c321602bdbd91397ac13a3bc0.
diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
new file mode 100644
index 0000000..0eb26a3
--- /dev/null
+++ b/doc/sandbox.mdwn
@@ -0,0 +1,154 @@
+[[!template  id=test45 text="""Here is the text to insert into my note."""]]
+
+
+[[!meta date="Thu Jun 16 22:04:33 2005" updated="Thu Dec 22 01:23:20 2011"]]
+
+This is the [[SandBox]], a page anyone can edit to try out ikiwiki
+(version [[!version  ]]).
+
+CamelCase ?
+
+What about [[this page]]?
+
+hello world (right back at ya)
+
+wait how does versioning work
+
+test, is it being saved? Probably. I will check. This seems really straightforward.
+
+~~~
+pre formated text?
+~~~
+
+> This is a blockquote.
+>
+> This is the first level of quoting.
+A block of text
+>
+> > This is a nested blockquote.
+>
+>> Without a space works too.
+>>> to three levels
+
+This is pretty sweet
+
+Azerty
+** Qsdf **
+
+>
+> Back to the first level.
+>
+> added a line in level 1
+> and another
+
+
+Numbered list 
+
+1. First item.
+    1. Sub item.
+    1. Number 2
+1. Another.
+1. And another..
+    1. foo
+    2. bar
+    3. quz
+    3. quze
+
+Bulleted list
+
+* item
+* *italic item*
+* item
+* one
+  * footballs; runner; unices
+  * Cool !
+    * test
+  * this
+* something else
+  * some more
+  * and more
+    * and
+      * this
+> a blockquote
+> in a list
+> how is this handled
+        *this  _ _ _
+      * this 2
+      * this 3
+
+test _this_ out.
+
+`test this code block`
+[[!wikipedia War_of_1812]]
+----
+
+[[!template id=note text="this is generated by the [[plugins/haiku]] plugin"]]
+[[!haiku hint="sandbox play"]]
+
+----
+
+## Different sorts of links:
+
+* [[Features]]
+* <http://ikiwiki.info/ikiwiki/formatting/>
+* [[different_name_for_a_WikiLink|ikiwiki/WikiLink]]
+* <http://www.gnu.org/>
+* [GNU](http://www.gnu.org/)
+* <a href="http://kitenet.net/~joey/">Joey's blog</a>
+
+----
+
+# header1
+
+## header2
+
+### header3
+
+#### header4
+
+##### header 5
+
+**bold**
+
+_italic_
+
+test ms
+
+opopopo
+----
+
+This **SandBox** is also a [[blog]]!
+
+[[!inline pages="sandbox/* and !*/Discussion" rootpage="sandbox" show="4" archive="yes"]]
+
+Testy test!
+
+
+<p>
+This is an email link:
+<a href="mailto:erik.josefsson@europarl.europa.eu?Subject=Hello%20again" target="_top">
+Send Mail</a>
+</p>
+
+What follows is some preformatted text.  Each line is proceeded by four spaces.
+
+    Test
+
+    <Test>
+
+    <test>
+    <test>
+
+    <test>
+      <child />
+    </test>
+
+...Now why doesn't it work like that on my own copy of ikiwiki? :(
+
+Räksmörgås.
+
+`pre?`
+
+Testing. Test. 試験として書き込みします。
+
+Καλημέρα!

removed
diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
deleted file mode 100644
index 0eb26a3..0000000
--- a/doc/sandbox.mdwn
+++ /dev/null
@@ -1,154 +0,0 @@
-[[!template  id=test45 text="""Here is the text to insert into my note."""]]
-
-
-[[!meta date="Thu Jun 16 22:04:33 2005" updated="Thu Dec 22 01:23:20 2011"]]
-
-This is the [[SandBox]], a page anyone can edit to try out ikiwiki
-(version [[!version  ]]).
-
-CamelCase ?
-
-What about [[this page]]?
-
-hello world (right back at ya)
-
-wait how does versioning work
-
-test, is it being saved? Probably. I will check. This seems really straightforward.
-
-~~~
-pre formated text?
-~~~
-
-> This is a blockquote.
->
-> This is the first level of quoting.
-A block of text
->
-> > This is a nested blockquote.
->
->> Without a space works too.
->>> to three levels
-
-This is pretty sweet
-
-Azerty
-** Qsdf **
-
->
-> Back to the first level.
->
-> added a line in level 1
-> and another
-
-
-Numbered list 
-
-1. First item.
-    1. Sub item.
-    1. Number 2
-1. Another.
-1. And another..
-    1. foo
-    2. bar
-    3. quz
-    3. quze
-
-Bulleted list
-
-* item
-* *italic item*
-* item
-* one
-  * footballs; runner; unices
-  * Cool !
-    * test
-  * this
-* something else
-  * some more
-  * and more
-    * and
-      * this
-> a blockquote
-> in a list
-> how is this handled
-        *this  _ _ _
-      * this 2
-      * this 3
-
-test _this_ out.
-
-`test this code block`
-[[!wikipedia War_of_1812]]
-----
-
-[[!template id=note text="this is generated by the [[plugins/haiku]] plugin"]]
-[[!haiku hint="sandbox play"]]
-
-----
-
-## Different sorts of links:
-
-* [[Features]]
-* <http://ikiwiki.info/ikiwiki/formatting/>
-* [[different_name_for_a_WikiLink|ikiwiki/WikiLink]]
-* <http://www.gnu.org/>
-* [GNU](http://www.gnu.org/)
-* <a href="http://kitenet.net/~joey/">Joey's blog</a>
-
-----
-
-# header1
-
-## header2
-
-### header3
-
-#### header4
-
-##### header 5
-
-**bold**
-
-_italic_
-
-test ms
-
-opopopo
-----
-
-This **SandBox** is also a [[blog]]!
-
-[[!inline pages="sandbox/* and !*/Discussion" rootpage="sandbox" show="4" archive="yes"]]
-
-Testy test!
-
-
-<p>
-This is an email link:
-<a href="mailto:erik.josefsson@europarl.europa.eu?Subject=Hello%20again" target="_top">
-Send Mail</a>
-</p>
-
-What follows is some preformatted text.  Each line is proceeded by four spaces.
-
-    Test
-
-    <Test>
-
-    <test>
-    <test>
-
-    <test>
-      <child />
-    </test>
-
-...Now why doesn't it work like that on my own copy of ikiwiki? :(
-
-Räksmörgås.
-
-`pre?`
-
-Testing. Test. 試験として書き込みします。
-
-Καλημέρα!

todo
diff --git a/doc/todo/need_a_way_to_close_a_bug_via_a_comment.mdwn b/doc/todo/need_a_way_to_close_a_bug_via_a_comment.mdwn
new file mode 100644
index 0000000..dfa52cf
--- /dev/null
+++ b/doc/todo/need_a_way_to_close_a_bug_via_a_comment.mdwn
@@ -0,0 +1,12 @@
+When ikiwiki is being used for issue tracking, it would be convenient to
+have a way to close a bug from a comment, rather than editing the bug
+report page in a wiki-manner.
+
+So, some way to set a tag from a comment, such that it applies to the
+parent page.
+
+Turning on allowdirectives may make that work (I have not tried), but
+it's probably too heavyweight/intrusive/possible a security issue.
+
+Maybe extend the comment directive with a field to set/unset tags?
+--[[Joey]]

remove references to no longer present gitpush plugin
diff --git a/doc/tips/distributed_wikis.mdwn b/doc/tips/distributed_wikis.mdwn
index 92d4ce9..229f271 100644
--- a/doc/tips/distributed_wikis.mdwn
+++ b/doc/tips/distributed_wikis.mdwn
@@ -15,7 +15,7 @@ There are several possible level of decentralisation:
  1. [[a simple HTML mirror|tips/Git_repository_and_web_server_on_different_hosts/]]
  2. [[separate ikiwiki and git servers|tips/Hosting_Ikiwiki_and_master_git_repository_on_different_machines]]
  3. separate `srcdir`, still requires a central bare repo - uses [[plugins/pinger]]
- 4. completely distinct ikiwiki installs, synchronised with [[plugins/contrib/gitpush]]
+ 4. completely distinct ikiwiki installs
 
 Here's a graphic overview of those:
 
@@ -60,7 +60,7 @@ Step by step setup instructions for this are detailed below.
 [[!img decentralized_wikis.svg size=400x]]
 
 In this configuration, each wiki is fully independent and pushes its
-changes to other wikis using the [[plugins/contrib/gitpush]] plugin.
+changes to other wikis using git.
 
 ## Step by step setup instructions
 
@@ -207,12 +207,11 @@ The following entries will be different from the above setup file:
     git_wrapper: /home/user/source.git/hooks/post-commit
     git_test_receive_wrapper: /home/user/source.git/hooks/pre-receive
 
-To do this, the mirror needs to push back to the master, using the [[plugins/contrib/gitpush]] plugin:
+To make the mirror push back to the master, use, for example:
 
-    git_push_to:
-    - git://wiki.example.com/
+    git_wrapper_background_command: git push git://wiki.example.com/
 
-This will ensure that commits done on the mirror will propagate back to the master.
+This will help ensure that commits done on the mirror will propagate back to the master.
 
 ## Other ideas
 

turn recipe into a shell script
diff --git a/doc/todo/commandline_comment_moderation.mdwn b/doc/todo/commandline_comment_moderation.mdwn
index 0a3ff62..429c115 100644
--- a/doc/todo/commandline_comment_moderation.mdwn
+++ b/doc/todo/commandline_comment_moderation.mdwn
@@ -8,18 +8,32 @@ It seems to me it would be great to have some tool to filter through that...
 So it turns out it was over 3000 comments. The vast majority of those (every one but 42 comments) were from the IP `46.161.41.34` which i recommend null-routing everywhere. I used the following shell magic to figure that out:
 
 <pre>
-# locate the transient directory
-cd $source/.ikiwiki/transient
+#!/bin/sh
+
+set -e
+
+cd .ikiwiki/transient || {
+    echo could not find comments, make sure you are in a ikiwiki source directory.
+    exit 1
+    }
 # count the number of comments
-find . -name '*._comment_pending' | wc
+echo found $(find . -name '*._comment_pending' | wc -l) pending comments
 # number of comments per IP
+echo IP distribution:
 find . -name '*._comment_pending' | xargs grep -h ip= | sort | uniq -c | sort -n
-# generate a banlist for insertion in `banusers`, assuming all the pending comments are spam
+# generate a banlist for insertion in `banusers`, assuming all the
+# pending comments are spam
+echo banlist would look like:
 find . -name '*._comment_pending' | xargs grep -h ip= | sort -u| sed 's/ ip="//;s/"//;s/^/- ip(/;s/$/)/'
-# remove comments from a bad guy
-find . -name '*._comment_pending' | xargs grep -l 'ip="46.161.41.34"'| xargs rm
-# flush all pending comments
-find . -name '*._comment_pending' -delete
+
+echo to remove comments from a specific IP, use one of those:
+find . -name '*._comment_pending' | xargs grep -h ip= | sort -u \
+    | sed 's/ ip="//;s/"//;' \
+    | while read ip; do
+          echo "find . -name '*._comment_pending' | xargs grep -l 'ip=\"$ip\"'| xargs rm"
+      done
+echo to flush all pending comments, use:
+echo "find . -name '*._comment_pending' -delete"
 </pre>
 
 The remaining 42 comments I reviewed throught the web interface, then flushed using the above command. My final addition to the banlist is:
@@ -42,3 +56,5 @@ The remaining 42 comments I reviewed throught the web interface, then flushed us
 </pre>
 
  --[[anarcat]]
+
+Update: i made a script, above. And the banlist is much larger now so the above list is pretty much out of date now... --[[anarcat]]

switched to jak's theme on my blog
diff --git a/doc/tips/bootstrap_themes_evaluation.mdwn b/doc/tips/bootstrap_themes_evaluation.mdwn
index fca014e..f1f6553 100644
--- a/doc/tips/bootstrap_themes_evaluation.mdwn
+++ b/doc/tips/bootstrap_themes_evaluation.mdwn
@@ -10,3 +10,5 @@ In order to figure out exactly which ones fares the best, i made test wikis for
 * <http://bootstrap-anderbubble.wiki.orangeseeds.org/> demos the theme from [anderbubble](https://github.com/anderbubble/ikiwiki-bootstrap), another separate implementation
 
 Hopefully this will help others figure out what the heck is going on here... Personnally, I think I prefer the JAK linux one, but i don't like the idea of depending on a theme-specific plugin...  -- [[anarcat]]
+
+Update: I ended up forking the Jak theme also... My experience has been documented in [this blog post](http://anarc.at/blog/2015-09-09-bootstrap/?updated). --[[anarcat]]

diff --git a/doc/tips/bootstrap_themes_evaluation.mdwn b/doc/tips/bootstrap_themes_evaluation.mdwn
new file mode 100644
index 0000000..fca014e
--- /dev/null
+++ b/doc/tips/bootstrap_themes_evaluation.mdwn
@@ -0,0 +1,12 @@
+There are now 4 or more ikiwiki bootstrap themes flying around in the [[theme_market]]. It is quite confusing.
+
+In order to figure out exactly which ones fares the best, i made test wikis for all of them. All the wikis have a sidebar with the sidebar plugin enable, so if you don't see it, it's because the theme doesn't support it.
+
+* <http://bootstrap-jak.wiki.orangeseeds.org/> demos the [jak-linux.org](http://jak-linux.org/about/) original bootstrap 2 theme, now updated to 3.3.4. note that this theme needs the [bootmenu](https://github.com/dnstap/dnstap-ikiwiki/blob/master/libdir/IkiWiki/Plugin/bootmenu.pm) plugin to generate a menu, and doesn't support the sidebar plugin
+* <http://bootstrap-ramseydsilva.wiki.orangeseeds.org> demos the [ramseydsilva](https://github.com/ramseydsilva/ikiwiki-bootstrap-theme) bootstrap 3 theme
+* <http://bootstrap-hiatobr.wiki.orangeseeds.org> demos the [hiatobr](https://notabug.org/hiatobr/ikiwiki-bootstrap-theme-2) fork of the above
+* <http://bootstrap-dequis.wiki.orangeseeds.org> demos the [dequis](https://github.com/dequis/ikiwiki-bootstrap-theme) theme, *another* fork of the above
+* <http://bootstrap-tgpfeiffer.wiki.orangeseeds.org> demos the [tgpfeiffer](https://github.com/tgpfeiffer/ikiwiki-bootstrap-template) rewrite
+* <http://bootstrap-anderbubble.wiki.orangeseeds.org/> demos the theme from [anderbubble](https://github.com/anderbubble/ikiwiki-bootstrap), another separate implementation
+
+Hopefully this will help others figure out what the heck is going on here... Personnally, I think I prefer the JAK linux one, but i don't like the idea of depending on a theme-specific plugin...  -- [[anarcat]]

found two more bootstrap themes for iki... graah
diff --git a/doc/theme_market.mdwn b/doc/theme_market.mdwn
index f825e2a..3cd6149 100644
--- a/doc/theme_market.mdwn
+++ b/doc/theme_market.mdwn
@@ -12,6 +12,10 @@ Feel free to add your own [[theme|themes]] here, but first consider writing a si
 
  * **[[Bootstrap theme|http://anonscm.debian.org/gitweb/?p=users/jak/website.git;a=summary]]**, contributed by [[JAK LINUX|http://jak-linux.org/about/]], based on [[Twitter Bootstrap|http://twitter.github.com/bootstrap/]]
 
- * **[[Bootstrap 3|https://github.com/ramseydsilva/ikiwiki-bootstrap-theme]]**, contributed by [[ramsey]], based on [[Twitter Bootstrap 3|http://getbootstrap.com]]
+ * **[[Bootstrap 3|https://github.com/ramseydsilva/ikiwiki-bootstrap-theme]]**, contributed by [[ramsey]], based on [[Twitter Bootstrap 3|http://getbootstrap.com]], also modified by [dequis.org](https://github.com/dequis/ikiwiki-bootstrap-theme/tree/dequis.org)
 
  * **[[Bootstrap 2|https://notabug.org/hiatobr/ikiwiki-bootstrap-theme-2]]**, contributed by [Hacklab Independência](https://hi.ato.br), a fork of [[ramsey]]'s [[Bootstrap 3|https://github.com/ramseydsilva/ikiwiki-bootstrap-theme]] original work. You may see examples on [[my user page|/users/desci]]
+
+ * yet another **[Bootstrap 3](https://github.com/anderbubble/ikiwiki-bootstrap)** theme, contributed by anderbubble
+
+ * and one more **[Bootstrap 3](https://github.com/tgpfeiffer/ikiwiki-bootstrap-template)** theme (can't you guys get along already?!), contributed by tgpfeiffer, this one shipping a copy of the bootstrap files

it's Mail::Sendmail, not Mail::SendMail
diff --git a/doc/plugins/notifyemail.mdwn b/doc/plugins/notifyemail.mdwn
index 642b266..7a5b532 100644
--- a/doc/plugins/notifyemail.mdwn
+++ b/doc/plugins/notifyemail.mdwn
@@ -1,7 +1,7 @@
 This plugin allows users to subscribe to pages, and emails them when
 those pages are created or changed.
 
-It needs the [[!cpan Mail::SendMail]] perl module, and sends mail
+It needs the [[!cpan Mail::Sendmail]] perl module, and sends mail
 using the local MTA.
 
 Each user can configure which pages they are interested in, using an

Added a comment: Change the `page.tmpl` template
diff --git a/doc/forum/How_to_configure_the_position_of_the_automatically_created_links__63__/comment_1_173687ee3dfdd9d949c1fa6d9b3cce4c._comment b/doc/forum/How_to_configure_the_position_of_the_automatically_created_links__63__/comment_1_173687ee3dfdd9d949c1fa6d9b3cce4c._comment
new file mode 100644
index 0000000..c8c7b65
--- /dev/null
+++ b/doc/forum/How_to_configure_the_position_of_the_automatically_created_links__63__/comment_1_173687ee3dfdd9d949c1fa6d9b3cce4c._comment
@@ -0,0 +1,9 @@
+[[!comment format=mdwn
+ username="spalax"
+ subject="Change the `page.tmpl` template"
+ date="2015-08-28T15:23:54Z"
+ content="""
+You can change the [page.tmpl](http://source.ikiwiki.branchable.com/?p=source.git;a=blob;f=templates/page.tmpl) template (look for `BACKLINKS` in it). To overwrite the default `page.tmpl`, copy it in, say, a `templates` folder in your repository, and change the setup file to use this folder as a template folder.
+
+-- [[Louis|spalax]]
+"""]]

diff --git a/doc/forum/How_to_configure_the_position_of_the_automatically_created_links__63__.mdwn b/doc/forum/How_to_configure_the_position_of_the_automatically_created_links__63__.mdwn
new file mode 100644
index 0000000..95572be
--- /dev/null
+++ b/doc/forum/How_to_configure_the_position_of_the_automatically_created_links__63__.mdwn
@@ -0,0 +1,5 @@
+Ikiwiki creates on every page automatically a specific link list at the bottom of the page. 
+
+How can I move this list to the top or to the left? How can I have it both on the top and on the bottom of the page?
+
+Since I want to change it globally I tried to find an option in local.css but didn't find anything related.

bug
diff --git a/doc/bugs/po_plugin_config_crasher.mdwn b/doc/bugs/po_plugin_config_crasher.mdwn
new file mode 100644
index 0000000..a0014a3
--- /dev/null
+++ b/doc/bugs/po_plugin_config_crasher.mdwn
@@ -0,0 +1,11 @@
+Saw a site using the po plugin crash with:
+
+	syntax error in pagespec "\"page(./tips/*)"
+
+I suspect the relevant configuration is this:
+
+	po_translatable_pages: /index or /hugo or /hugo/keys or /about or /archive or /tips
+	  or /talks or /imprint or /copyright or /blog or /posts  or /law or /quotes or /quotes/*
+
+Config problems in ikiwiki.setup should really not cause the whole site
+build to crash; this can make it hard to recover. --[[Joey]]

diff --git a/doc/users/kjs.mdwn b/doc/users/kjs.mdwn
index 325d748..0519cf9 100644
--- a/doc/users/kjs.mdwn
+++ b/doc/users/kjs.mdwn
@@ -36,8 +36,7 @@ link to the album. Useful for visual index of albums.
 * Extract GPS data and populate a [[plugins/osm]] waypoint if available.
 * Add span around osm icon to allow for styling.
 
-For my public websites above the image metadata is "manually" ie shell script
-populated but I'll eventually start using automatic metadata for new images.
+For my public websites above have been using the tweaked img plugin for many months now. It works well except when deleting images, this seems to require a removal of the indexdb and a rebuild... not very convenient.
 
 A simple test wiki with downloadable setup and data can be found at:
 <http://src.kalleswork.net/masterbranch/>

Added a comment
diff --git a/doc/forum/Inline__44___sort_and_show_-_is_it_possible_to_achieve_equivalent_to_tail_command/comment_2_3e5d32aab68e21b3c4b6145e61b0b744._comment b/doc/forum/Inline__44___sort_and_show_-_is_it_possible_to_achieve_equivalent_to_tail_command/comment_2_3e5d32aab68e21b3c4b6145e61b0b744._comment
new file mode 100644
index 0000000..42331b1
--- /dev/null
+++ b/doc/forum/Inline__44___sort_and_show_-_is_it_possible_to_achieve_equivalent_to_tail_command/comment_2_3e5d32aab68e21b3c4b6145e61b0b744._comment
@@ -0,0 +1,14 @@
+[[!comment format=mdwn
+ username="kjs"
+ subject="comment 2"
+ date="2015-08-16T20:09:33Z"
+ content="""
+I could do a patch if I could program... The img plugin stuff is more a working accident of mine ;)
+
+For now I've reverted to showing all albums in reverse chronological order. Atleast then people aren't confused by different ordering of the homepage inline and the actual album.
+
+I'll see if I can have a look at the show last patch as you suggest, but that won't happen shortly.
+
+Regards
+
+"""]]

Added a comment
diff --git a/doc/forum/Inline__44___sort_and_show_-_is_it_possible_to_achieve_equivalent_to_tail_command/comment_1_e62f3ae89da8c66e94d37bd148fbebbd._comment b/doc/forum/Inline__44___sort_and_show_-_is_it_possible_to_achieve_equivalent_to_tail_command/comment_1_e62f3ae89da8c66e94d37bd148fbebbd._comment
new file mode 100644
index 0000000..d9fdabc
--- /dev/null
+++ b/doc/forum/Inline__44___sort_and_show_-_is_it_possible_to_achieve_equivalent_to_tail_command/comment_1_e62f3ae89da8c66e94d37bd148fbebbd._comment
@@ -0,0 +1,14 @@
+[[!comment format=mdwn
+ username="smcv"
+ subject="comment 1"
+ date="2015-08-15T12:33:11Z"
+ content="""
+I don't think this is currently possible: `show` takes the first *n*
+pages after sorting.
+
+Care to contribute a patch adding `show=\"last 10\"`? Then you could do
+
+    \[[inline pages=\"...\" sort=\"-age\" show=\"last 10\"]]
+
+and I think that would have the result you want.
+"""]]

diff --git a/doc/forum/Inline__44___sort_and_show_-_is_it_possible_to_achieve_equivalent_to_tail_command.mdwn b/doc/forum/Inline__44___sort_and_show_-_is_it_possible_to_achieve_equivalent_to_tail_command.mdwn
new file mode 100644
index 0000000..9418f67
--- /dev/null
+++ b/doc/forum/Inline__44___sort_and_show_-_is_it_possible_to_achieve_equivalent_to_tail_command.mdwn
@@ -0,0 +1,10 @@
+As per above. I'm using a inline to show most recent pages using meta(date). I want to limit the number of items to 20 but here is the catch I want to maintain chronological order. Kind of like using `sort -n | tail`.
+
+Showing the `n` oldest pages in chronological order starting with the first is easy just combine sort and show. Same thing goes for showing the `n` most recent pages in reverse chronological order.
+
+Can't figure out if what I want to do is doable.
+
+A bit of background:
+I'm using my [[tweaked img plugin|kjs]] to populate meta data from images. The meta date is set according to the image exif data. On the homepage I show thumbnails of the 20 most recent images. This is a site of family photos (why I can't share the link here) and such and it's a bit confusing to show all sequences in reverse. I.e first image shows all the presents opened then they repackage themselves and end up with ribbons.
+
+-[[kjs]]

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 795d103..0eb26a3 100644
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -30,6 +30,7 @@ A block of text
 >> Without a space works too.
 >>> to three levels
 
+This is pretty sweet
 
 Azerty
 ** Qsdf **

Added a comment
diff --git a/doc/forum/__34__S.__34___gets_replace_by___34__a.__34___in_my_ikiwiki/comment_3_a12366764c50df62a4734c73418b592e._comment b/doc/forum/__34__S.__34___gets_replace_by___34__a.__34___in_my_ikiwiki/comment_3_a12366764c50df62a4734c73418b592e._comment
new file mode 100644
index 0000000..895cf76
--- /dev/null
+++ b/doc/forum/__34__S.__34___gets_replace_by___34__a.__34___in_my_ikiwiki/comment_3_a12366764c50df62a4734c73418b592e._comment
@@ -0,0 +1,13 @@
+[[!comment format=mdwn
+ username="smcv"
+ subject="comment 3"
+ date="2015-08-12T16:08:10Z"
+ content="""
+There is a `MKD_NOALPHALIST` option to discount (assuming that's the Markdown implementation you're using), but it isn't clear which way should be preferred in general.
+
+With that option off, people complain that they can't have alphabetical sub-lists (Google for \"markdown alpha list\" to see this feature request in various places).
+
+With that option on, you get unexpected results for things like your example. It's also liable to break initials (`S. J. McVittie is an ikiwiki contributor`) or the French abbreviation for Monsieur (`M. Poirot is a famous French-speaking detective`).
+
+The original Markdown didn't have lettered lists; neither does CommonMark, although it's a feature request in CommonMark.
+"""]]

Added a comment: Markdown is weird like that
diff --git a/doc/forum/__34__S.__34___gets_replace_by___34__a.__34___in_my_ikiwiki/comment_2_73c0052ee7852b2bdc9e92ba6136f20e._comment b/doc/forum/__34__S.__34___gets_replace_by___34__a.__34___in_my_ikiwiki/comment_2_73c0052ee7852b2bdc9e92ba6136f20e._comment
new file mode 100644
index 0000000..23a4f97
--- /dev/null
+++ b/doc/forum/__34__S.__34___gets_replace_by___34__a.__34___in_my_ikiwiki/comment_2_73c0052ee7852b2bdc9e92ba6136f20e._comment
@@ -0,0 +1,37 @@
+[[!comment format=mdwn
+ username="smcv"
+ subject="Markdown is weird like that"
+ date="2015-08-12T15:51:38Z"
+ content="""
+Is it right at the beginning of a line, such that Markdown interprets it as a numbered list item for an HTML `<ol>`?
+
+~~~
+a. One
+b. Two
+c. Three
+
+a. One
+a. Two
+a. Three
+
+S. One
+X. Two
+Z. Three
+~~~
+
+are all interpreted as
+
+a. One
+b. Two
+c. Three
+
+If this is what's going on, you can use:
+
+`p\. 49`
+
+to get:
+
+p\. 49
+
+or adjust your spacing so it isn't the first thing on a line.
+"""]]

Added a comment
diff --git a/doc/forum/__34__S.__34___gets_replace_by___34__a.__34___in_my_ikiwiki/comment_1_1a842bc7d56e9b40a43cb64c8a76e776._comment b/doc/forum/__34__S.__34___gets_replace_by___34__a.__34___in_my_ikiwiki/comment_1_1a842bc7d56e9b40a43cb64c8a76e776._comment
new file mode 100644
index 0000000..dacbe7f
--- /dev/null
+++ b/doc/forum/__34__S.__34___gets_replace_by___34__a.__34___in_my_ikiwiki/comment_1_1a842bc7d56e9b40a43cb64c8a76e776._comment
@@ -0,0 +1,7 @@
+[[!comment format=mdwn
+ username="openmedi"
+ subject="comment 1"
+ date="2015-08-12T15:44:58Z"
+ content="""
+As we can see (and this is lucky in hindsight): The problem doesn't show on the ikiwiki.info site itself. So maybe I did indeed something wrong. Hm.
+"""]]

diff --git a/doc/forum/__34__S.__34___gets_replace_by___34__a.__34___in_my_ikiwiki.mdwn b/doc/forum/__34__S.__34___gets_replace_by___34__a.__34___in_my_ikiwiki.mdwn
new file mode 100644
index 0000000..1f22f09
--- /dev/null
+++ b/doc/forum/__34__S.__34___gets_replace_by___34__a.__34___in_my_ikiwiki.mdwn
@@ -0,0 +1,7 @@
+I assume this is a bug:
+
+When when writing the string "S." on a page, it gets replace with "a." for some reason. I am using "ikiwiki version 3.20150614" form pkgsrc on OS X 10.10.4.
+
+If this is not a bug: Where would I be able to change that behaviour?
+
+P.S.: "S." is the short form of the German "Seite" (en: "p." and "page") and is used frquently in citations, so it's kind of important…

test
diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index b9f68de..795d103 100644
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -1,5 +1,4 @@
-[[!osm ]]
-[[!waypoint  lat="45°30N" lon="73°40W" name="My city" tag="city"]]
+[[!template  id=test45 text="""Here is the text to insert into my note."""]]
 
 
 [[!meta date="Thu Jun 16 22:04:33 2005" updated="Thu Dec 22 01:23:20 2011"]]

diff --git a/doc/templates/test45.mdwn b/doc/templates/test45.mdwn
new file mode 100644
index 0000000..bbac541
--- /dev/null
+++ b/doc/templates/test45.mdwn
@@ -0,0 +1,12 @@
+[[!templatebody <<ENDBODY
+<div class="notebox">
+<TMPL_VAR text> (This is a note, made using the test45 template.)
+</div>
+ENDBODY]]
+
+Use this template to insert a note into a page. This template is a duplicate of note, but with test45 text appended to it. The note will be styled to
+float to the right of other text on the page. This template has one
+parameter:
+<ul>
+<li>`text` - the text to display in the note
+</ul>