Merge branch 'master' into po

Conflicts:
	debian/changelog

10 files changed, 52 insertions, 124 deletions

diff --git a/doc/news/discussion.mdwn b/doc/news/discussion.mdwn
index c3674a92d..351e39c62 100644
--- a/doc/news/discussion.mdwn
+++ b/doc/news/discussion.mdwn
@@ -1,3 +1,12 @@
+## Ikiwiki 3.12
+
+Joey, what about news for Ikiwiki 3.12? The changelog says is has been released
+6 days ago... :) --[[Paweł|ptecza]]
+
+---
+
+## Ikiwiki 2.14
+
 Hi Joey! Where can I find the source package for ikiwiki 2.14? I rather prefer
 `wget` than `git` to download it :) I've just checked
 [Debian page of ikiwiki source package](http://packages.debian.org/unstable/source/ikiwiki)
diff --git a/doc/news/openid.mdwn b/doc/news/openid.mdwn
index c2a871f0a..cc13a6548 100644
--- a/doc/news/openid.mdwn
+++ b/doc/news/openid.mdwn
@@ -10,4 +10,4 @@ log back in, try out the OpenID signup process if you don't already have an
 OpenID, and see how OpenID works for you. And let me know your feelings about
 making such a switch. --[[Joey]]
 
-[[!poll 61 "Accept only OpenID for logins" 18 "Accept only password logins" 36 "Accept both"]]
+[[!poll 62 "Accept only OpenID for logins" 19 "Accept only password logins" 36 "Accept both"]]
diff --git a/doc/news/version_2.68.mdwn b/doc/news/version_2.68.mdwn
deleted file mode 100644
index b7e625026..000000000
--- a/doc/news/version_2.68.mdwn
+++ /dev/null
@@ -1,44 +0,0 @@
-ikiwiki 2.68 released with [[!toggle text="these changes"]]
-[[!toggleable text="""
-   * Add support for checking pushes from untrusted git committers. This can be
-     used to set up anonymous git pushes, and other similar things.
-   * format: New plugin, allows embedding differently formatted text inside a
-     page (ie, otl inside a mdwn page, or syntax highlighted code inside a
-     page).
-   * relativedate: New javascript-alicious plugin that makes all dates display
-     relative, in a very nice way, if I say so myself.
-   * Optimise the no-op post-commit hook, to speed up web edits by a fraction
-     of a second.
-   * git: Allow [[sha1\_commit]] to be used in the diffurl, to support cgit.
-   * shortcut: Fix display of shortcuts while previewing.
-   * Plugins that used to override displaytime should instead override
-     formattime. displaytime will call that, and may wrap markup around the
-     formatted time.
-   * Add an underlay for javascript, and add ikiwiki.js containing some utility
-     code.
-   * toggle: Stop embedding the full toggle code on each page using it, and
-     move it to toggle.js in the javascript underlay.
-   * recentchanges: Make feed links point back to anchors on the recentchanges
-     page. (JasonBlevins)
-   * Fix issue with utf-8 in wikiname breaking session cookies, by
-     entity-encoding the wikiname in the session cookie.
-   * Use the pure perl Data::Dumper when generating setup files to ensure that
-     utf-8 characters are written out as such, and not as the encoded perl
-     strings the C Data::Dumper produces.
-   * inline: Only the last feed link was put on the page, fix this to include
-     all feed links. So rss will be included along with atom, and pages with
-     multiple feeds will get links added for all feeds.
-   * tag: When tagpage is set, force the links created by tagging to point at
-     the toplevel tagpage, and not closer subpages. The html links already went
-     there, but internally the links were not recorded as absolute, which could
-     cause confusing backlinks etc.
-   * Add an inject function, that can be used by plugins that want to
-     replace one of ikiwiki's functions with their own version.
-     (This is a scary thing that grubs through the symbol table, and replaces
-     all exported occurances of a function with the injected version.)
-   * external: RPC functions can be injected to replace exported functions.
-   * Updated French translation. Closes: #[502694](http://bugs.debian.org/502694)
-   * Updated Spanish translation from the ever vigilant Victor Moral.
-   * Updated Danish translation from Jonas Smedegaard. Closes: #[503117](http://bugs.debian.org/503117)
-   * Preserve syslog setting when doing `ikiwiki -setup foo -dumpsetup bar`
-   * Several fixes to --render mode."""]]
\ No newline at end of file
diff --git a/doc/news/version_2.69.mdwn b/doc/news/version_2.69.mdwn
deleted file mode 100644
index a277541fe..000000000
--- a/doc/news/version_2.69.mdwn
+++ /dev/null
@@ -1,24 +0,0 @@
-ikiwiki 2.69 released with [[!toggle text="these changes"]]
-[[!toggleable text="""
-   * Avoid multiple ikiwiki cgi processes piling up, eating all memory,
-     and thrashing, by making the cgi wrapper wait on a cgilock.
-     If you had to set apache's MaxClients low to avoid ikiwiki thrashing your
-     server, you can now turn it up to a high value.
-   * Stop busy-waiting in lockwiki, as this could delay ikiwiki from waking up
-     for up to one second. The bailout code is no longer needed after above
-     change.
-   * Remove support for unused optional wait parameter from lockwiki.
-   * aggregate: Try to query XML::Feed for the base url when derelevatising
-     links. Since this needs the just released XML::Feed 0.3, as well
-     as a not yet released XML::RSS, it will fall back to the old method
-     if no xml:base info is available.
-   * meta: Plugin is now enabled by default since the basewiki uses it.
-   * txt: Do not encode quotes when filtering the txt, as that broke
-     later parsing of any directives on the page.
-   * Fix the link() pagespec to match links that are internally recorded as
-     absolute.
-   * Add rel=nofollow to recentchanges\_links for the same (weak) reasons it
-     was earlier added to edit links.
-   * tag: Normalize tagbase so leading/trailing slashes in it don't break
-     things.
-   * bzr: Fix dates for recentchanges."""]]
\ No newline at end of file
diff --git a/doc/news/version_2.70.mdwn b/doc/news/version_2.70.mdwn
deleted file mode 100644
index f0830efa1..000000000
--- a/doc/news/version_2.70.mdwn
+++ /dev/null
@@ -1,3 +0,0 @@
-ikiwiki 2.70 released with [[!toggle text="these changes"]]
-[[!toggleable text="""
-   * Avoid crash on malformed utf-8 discovered by intrigeri."""]]
\ No newline at end of file
diff --git a/doc/news/version_2.71.mdwn b/doc/news/version_2.71.mdwn
deleted file mode 100644
index 2c8609988..000000000
--- a/doc/news/version_2.71.mdwn
+++ /dev/null
@@ -1,28 +0,0 @@
-ikiwiki 2.71 released with [[!toggle text="these changes"]]
-[[!toggleable text="""
-   * comments: Blog-style comment support, contributed by Simon McVittie.
-   * htmlbalance: New plugin contributed by Simon McVittie.
-   * Change deb dependencies to list Text::Markdown before markdown (really
-     this time).
-   * Improve escaping of wikilinks and preprocessor directives in content
-     produced by aggregate and recentchanges.
-   * French translation update from Philippe Batailler. Closes: #[506250](http://bugs.debian.org/506250)
-   * Spanish translation update from Victor Moral.
-   * Fix handling of wrappergroup option.
-   * Correct --dumpsetup to include the srcdir in the setup file.
-   * German translation update from Kai Wasserbäch. Closes: #[507056](http://bugs.debian.org/507056)
-   * inline: Support emptyfeeds=no option to skip generating empty feeds.
-   * inline: Support feedfile option to change the filename of the feed
-     generated.
-   * meta: Pass info to htmlscrubber so htmlscrubber\_skip can take effect.
-   * htmlbalance: don't compact whitespace, and set misc other options (smcv)
-   * rename: Fix double-escaping of page name in edit box.
-   * monotone: When getting the log, tell monotone how many entries
-     we want, rather than closing the pipe, which it dislikes. (thm)
-   * Coding style change: Remove explcit vim folding markers.
-   * aggregate: If a feed fails to be downloaded, try again immediatly
-     next time aggregation is run, even if the usual time has not passed.
-     Closes: #[508622](http://bugs.debian.org/508622) (Michael Gold)
-   * meta: Process meta date during scan pass so that the date will always
-     affect sorting in inlines.
-   * Improve display of some openids (smcv)"""]]
\ No newline at end of file
diff --git a/doc/news/version_2.72.mdwn b/doc/news/version_2.72.mdwn
deleted file mode 100644
index 26274a3c8..000000000
--- a/doc/news/version_2.72.mdwn
+++ /dev/null
@@ -1,9 +0,0 @@
-ikiwiki 2.72 released with [[!toggle text="these changes"]]
-[[!toggleable text="""
-   * Avoid comments in recentchanges being broken links (smcv)
-   * Add deprecation warning for GlobLists, which will stop working in 3.0.
-   * camelcase: Add camelcase\_ignore setting.
-   * googlecalendar: Add runtime deprecation warning.
-   * comments: Deal with users entering unqualified or partial urls.
-   * inline: Run format hook first, to ensure other format hooks can affect
-     inlined content.  Closes: #[509710](http://bugs.debian.org/509710)"""]]
\ No newline at end of file
diff --git a/doc/news/version_3.10.mdwn b/doc/news/version_3.10.mdwn
deleted file mode 100644
index 9d9c33c58..000000000
--- a/doc/news/version_3.10.mdwn
+++ /dev/null
@@ -1,15 +0,0 @@
-ikiwiki 3.10 released with [[!toggle text="these changes"]]
-[[!toggleable text="""
-   * darcs: Finally added support for this VCS, thanks to many
-     contributors:
-     - Thomas Schwinge wrote the original file, implementing only rcs\_commit.
-     - Benjamin A'Lee contributed an alternative implementation.
-     - Tuomo Valkonen contributed rcs\_getctime and stub rcs\_recentchanges.
-     - Simon Michael contributed multiple changes.
-     - Petr Ročkai fixed rcs\_recentchanges.
-     - Sven M. Hallberg merged the above and added missing features.
-   * Add missing newline to Confirm Password prompt.
-   * Add missing permalink support to archivepage and titlepage templates.
-   * debian/control: Wrap fields.
-   * inline: Add author info to archive display.
-   * Add a microblog template that is useful for inlining microblogging posts."""]]
\ No newline at end of file
diff --git a/doc/news/version_3.11.mdwn b/doc/news/version_3.11.mdwn
new file mode 100644
index 000000000..2d1dc7063
--- /dev/null
+++ b/doc/news/version_3.11.mdwn
@@ -0,0 +1,23 @@
+ikiwiki 3.11 released with [[!toggle text="these changes"]]
+[[!toggleable text="""
+   * Avoid using python-support. Closes: #[525086](http://bugs.debian.org/525086)
+   * websetup: Display stderr in browser if ikiwiki setup fails.
+   * blogspam: Load RPC::XML library in checkconfig, so that an
+     error can be printed at that point if it's not available,
+     allowing the admin to see it during wiki setup.
+     Closes: #[520015](http://bugs.debian.org/520015)
+   * websetup: If setup fails, restore old setup file.
+   * relativedate: Deal with clock skew.
+   * Add IkiWiki::ErrorReason objects, and modify pagespecs to return
+     them in cases where they fail to match due to a configuration or syntax
+     error.
+   * pagespec\_match\_list: New API function, matches pages in a list
+     and throws an error if the pagespec is bad.
+   * inline, brokenlinks, calendar, linkmap, map, orphans, pagecount,
+     pagestate, postsparkline: Display a handy error message if the pagespec
+     is erronious.
+   * comments: Add link to comment post form to allow user to sign in
+     if they wish to, if the configuration makes signin optional
+     for commenting.
+   * Updated Danish translation from Jonas Smedegaard. Closes: #[525751](http://bugs.debian.org/525751)
+   * translation.mdwn: Typo fixes. Closes: #[525753](http://bugs.debian.org/525753)"""]]
diff --git a/doc/news/version_3.12.mdwn b/doc/news/version_3.12.mdwn
new file mode 100644
index 000000000..722316233
--- /dev/null
+++ b/doc/news/version_3.12.mdwn
@@ -0,0 +1,19 @@
+You may want to run `ikiwiki-transition deduplinks /path/to/srcdir`
+after upgrading to this version of ikiwiki. This command will
+optimise your wiki's saved state, removing duplicate information
+that can slow ikiwiki down.
+
+ikiwiki 3.12 released with [[!toggle text="these changes"]]
+[[!toggleable text="""
+  * Re-enable python-support and add python:Depends to control file.
+  * ikiwiki-makerepo: Avoid using abs_path, as it apparently
+    fails on nonexistant directories with some broken perl
+    versions.
+  * inline: Minor optimisation.
+  * add_link: New function, which plugins should use rather than
+    modifying %links directly, to avoid it accumulating duplicates.
+  * ikiwiki-transition: Add a deduplinks action, that can be used
+    to remove duplicate links and optimise a wiki w/o rebuilding it.
+  * external: Fix pagespec_match and pagespec_match_list.
+    Closes: #527281
+"""]]