17 files changed, 209 insertions, 116 deletions
diff --git a/doc/news/code_swarm.mdwn b/doc/news/code_swarm.mdwn
index bdc373432..09b68523e 100644
--- a/doc/news/code_swarm.mdwn
+++ b/doc/news/code_swarm.mdwn
@@ -1,7 +1,7 @@
 I've produced a [code_swarm](http://vis.cs.ucdavis.edu/~ogawa/codeswarm/)
 visualization of the first 2+ years of ikiwiki's commit history. 
 
-[[!img screenshot.png size="480x360"]]
+[[!img screenshot.png size="480x360" alt="screenshot"]]
 
 * [15 mb avi](http://kitenet.net/~joey/screencasts/ikiwiki_swarm.avi)
 * [stream on vimeo](http://vimeo.com/1324348)
diff --git a/doc/news/git_push_to_this_wiki.mdwn b/doc/news/git_push_to_this_wiki.mdwn
new file mode 100644
index 000000000..4b3fcbe69
--- /dev/null
+++ b/doc/news/git_push_to_this_wiki.mdwn
@@ -0,0 +1,3 @@
+Now you can use [[git]] to clone this wiki, and push your changes back,
+thanks to ikiwiki's new support for [[tips/untrusted_git_push]]. Enjoy
+working on the wiki while offline! --[[Joey]]
diff --git a/doc/news/git_push_to_this_wiki/discussion.mdwn b/doc/news/git_push_to_this_wiki/discussion.mdwn
new file mode 100644
index 000000000..33230c7ef
--- /dev/null
+++ b/doc/news/git_push_to_this_wiki/discussion.mdwn
@@ -0,0 +1,37 @@
+Thanks, Joey!  This is awesome...I had to try it out :)
+--[[JasonBlevins]]
+
+I am really happy to hear of this new feature, that I was (more or less)
+secretly dreaming of. But - and that's why I'm still insanely editing
+this wiki inside a web browser - I wonder how I'll use it for real: my
+own master branch contains a few dozens merge commits, and one is created
+every time I `git pull` ikiwiki repository (or another clone of it, living
+on one of my other boxes that by chance had Internet access more recently).
+I do not want to clutter Joey's repository with these commits, so I guess
+I have to learn some more of Git everything-is-possible world (a nice thing
+is: I am not limited anymore to "Emacs can do it", and I'm now in a position
+to say "Git can do it" or "ikiwiki already does it", depending on the
+situation). Well, let's focus. Git wizards amongst us (let's use this wiki
+as if it were users@ikiwiki.info, ok?), what would you suggest? I was thinking
+of having a new branch in my cloned repository, dedicated to editing this wiki;
+I could use `rebase` instead of `fetch+merge` to get the new upstream commits
+into this special-purpose branch. I guess it would work nicely if I had only
+one offline box with not-yet-pushed changes at the same time, but would break
+in awful and various ways when it is not the case. Any alternative idea?
+--[[intrigeri]]
+
+> Not that I'm very careful to avoid pushing merge commits (see git log ;-), 
+> but I sometimes use `git pull --rebase` to pull changes from a repo. That
+> will rebase your local changes on top of the changes pulled, avoiding the
+> merge commits. I'm sure more involved solutions are possible. --[[Joey]]
+
+> I decided to use my local `master` branch as a copy of `origin/master`
+> (kitenet) and move my local modifications to a separate branch.  I'm using
+> `master` to edit the wiki but there is still the problem of new upstream
+> commits since the last pull.  I already had this problem as Joey had pushed
+> some changes while I was editing locally.  Not knowing about
+> `pull --rebase`, I took the long way out: branch, roll back HEAD, rebase,
+> and merge.  That was too much work...It looks like `pull --rebase` is the
+> way to go. --[[JasonBlevins]]
+
+Awesome ! --[[xma]]
diff --git a/doc/news/ikiwiki_version_3.0.mdwn b/doc/news/ikiwiki_version_3.0.mdwn
new file mode 100644
index 000000000..7ca636cf2
--- /dev/null
+++ b/doc/news/ikiwiki_version_3.0.mdwn
@@ -0,0 +1,42 @@
+Ikiwiki has reached version 3.0 and entered a new phase in its
+[[development_cycle|roadmap]].
+
+The 3.0 release of ikiwiki changes several defaults and finishes
+some transitions. You will need to modify your wikis to work with
+ikiwiki 3.0. A document explaining the process is available
+in [[tips/upgrade_to_3.0]].
+
+The highlights of the changes in version 3.0 include:
+
+* Support for uploading [[attachments|plugins/attachment]].
+* Can [[plugins/rename]] and [[plugins/remove]] pages and files via the web.
+* [[Web_based_setup|plugins/websetup]].
+* Blog-style [[plugins/comments]] as an alternative to Discussion pages.
+* Many other new plugins including [[plugins/htmlbalance]], [[plugins/format]],
+  [[plugins/progress]], [[plugins/color]], [[plugins/autoindex]],
+  [[plugins/cutpaste]], [[plugins/hnb]], [[plugins/creole]], [[plugins/txt]],
+  [[plugins/amazon_s3]], [[plugins/pinger]], [[plugins/pingee]],
+  [[plugins/edittemplate]]
+* The RecentChanges page is compiled statically, not generated from the CGI.
+* Support for additional revision control systems: [[rcs/bzr]],
+  [[rcs/monotone]]
+* Support for [[tips/untrusted_git_push]].
+* A new version (3.00) of the plugin API, exporting additional
+  commonly used functions from `IkiWiki.pm`.
+* Nearly everything in ikiwiki is now a plugin, from WikiLinks to
+  page editing, to RecentChanges.
+* Far too many bug fixes, features, and enhancements to list here.
+
+Thanks to the many contributors to ikiwiki 3.0, including:
+
+  Jelmer Vernooij, Recai Oktaş, William Uther, Simon McVittie, Axel Beckert,
+  Bernd Zeimetz, Gabriel McManus, Paweł Tęcza, Peter Simons, Manoj
+  Srivastava, Patrick Winnertz, Jeremie Koenig, Josh Triplett, thm, Michael
+  Gold, Jason Blevins, Alexandre Dupas, Henrik Brix Andersen, Thomas Keller,
+  Enrico Zini, intrigeri, Scott Bronson, Brian May, Adeodato Simó, Brian
+  Downing, Nis Martensen. (And anyone I missed.)
+
+Also, thanks to the users, bug submitters, and documentation wiki editors.
+Without you, ikiwiki would just be a little thing I use for my home page.
+
+--[[Joey]]
diff --git a/doc/news/openid.mdwn b/doc/news/openid.mdwn
index ad76606aa..c2a871f0a 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 59 "Accept only OpenID for logins" 18 "Accept only password logins" 35 "Accept both"]]
+[[!poll 61 "Accept only OpenID for logins" 18 "Accept only password logins" 36 "Accept both"]]
diff --git a/doc/news/openid/discussion.mdwn b/doc/news/openid/discussion.mdwn
index 3d5e9dc22..aa9f3f0be 100644
--- a/doc/news/openid/discussion.mdwn
+++ b/doc/news/openid/discussion.mdwn
@@ -42,7 +42,7 @@ only Apache/iptables rules for this? Maybe it's related to
 
 > Error: /srv/web/ikiwiki.info/todo/Configurable_minimum_length_of_log_message_for_web_edits/index.html independently created, not overwriting with version from todo/Configurable_minimum_length_of_log_message_for_web_edits
 
-[[jondowland]]
+[[users/jon]]
 
 ----
 
diff --git a/doc/news/version_2.62.1.mdwn b/doc/news/version_2.62.1.mdwn
deleted file mode 100644
index e82ccfa21..000000000
--- a/doc/news/version_2.62.1.mdwn
+++ /dev/null
@@ -1,3 +0,0 @@
-ikiwiki 2.62.1 released with [[!toggle text="these changes"]]
-[[!toggleable text="""
-   * filecheck: Fixed two bits broken in move from attachment."""]]
-\ No newline at end of file
diff --git a/doc/news/version_2.63.mdwn b/doc/news/version_2.63.mdwn
deleted file mode 100644
index 165f60ceb..000000000
--- a/doc/news/version_2.63.mdwn
+++ /dev/null
@@ -1,21 +0,0 @@
-ikiwiki 2.63 released with [[!toggle text="these changes"]]
-[[!toggleable text="""
-   * Set cookies HttpOnly.
-   * Typo. Closes: #[497003](http://bugs.debian.org/497003)
-   * Ignore failure to install files into /etc, in case install is running as
-     non-root.
-   * Work around perl $\_ scoping nonsense that caused breakage when loading
-     external plugins.
-   * style.css: Add missing semicolon. Closes: #[497176](http://bugs.debian.org/497176)
-   * filecheck: Fall back to testing for binary or plain text files
-     if no mime type is detected.
-   * table: Support header=column to make the table header be the first
-     column of the data. (AlexandreDupas)
-   * For fine control over what characters are allowed, unescaped in
-     source filenames, the wiki\_file\_chars setting is added. For example,
-     set to "-[:alnum:]+/.\_" to disable colons from being used in source files
-     (which can cause troubl om Windows).
-   * po/Makefile: update po files when the pot file has changed.
-     Closes: #[497951](http://bugs.debian.org/497951)
-   * editpage: New core plugin factoring out page editing to allow disabling it
-     if desired."""]]
-\ No newline at end of file
diff --git a/doc/news/version_2.64.mdwn b/doc/news/version_2.64.mdwn
deleted file mode 100644
index 137ca1a5c..000000000
--- a/doc/news/version_2.64.mdwn
+++ /dev/null
@@ -1,25 +0,0 @@
-ikiwiki 2.64 released with [[!toggle text="these changes"]]
-[[!toggleable text="""
-   * Avoid uninitialised value when --dumpsetup is used and no srcdir/destdir
-     specified.
-   * ddate: Stop clobbering timeformat when not enabled.
-   * progress: New plugin to generate progress bars (willu)
-   * Add allow\_symlinks\_before\_srcdir to config so websetup doesn't eat it.
-   * img: Support sizes like 200x. Closes: #[475149](http://bugs.debian.org/475149)
-   * goodstuff: Remove otl plugin from the bundle since it needs a significant
-     external dependency and is not commonly used. If you use otl, make sure
-     you explicitly enable it now.
-   * goodstuff: Add more, progress, and table plugins to the bundle.
-   * Improve error message if external plugin fails to load. Closes: #[498458](http://bugs.debian.org/498458)
-   * Directive documentation broken out of the plugin documentation and into
-     pages suitable to be used as an underlay. Thanks to Willu for doing most
-     of the tedious work.
-   * Move the directive documentation into its own underlay, separate from
-     basewiki, since it's sorta large compared to the rest of basewiki.
-   * listdirectives: Enable use of the directives underlay.
-   * Removed the obsolete blog page from the basewiki. ikiwiki/blog still
-     remains, but is now deprecated too.
-   * Removed old redirecton pages from basewiki (helponformatting,
-     markdown, openid, pagespec, preprocessordirective, subpage, wikilink).
-   * inline: Treat rootpage as a link, so that it can refer to a subpage
-     without hardcoding the path."""]]
-\ No newline at end of file
diff --git a/doc/news/version_2.65.mdwn b/doc/news/version_2.65.mdwn
deleted file mode 100644
index db6afd988..000000000
--- a/doc/news/version_2.65.mdwn
+++ /dev/null
@@ -1,25 +0,0 @@
-ikiwiki 2.65 released with [[!toggle text="these changes"]]
-[[!toggleable text="""
-   * aggregate: Expire excess or old items on the same pass that adds them,
-     not only on subsequent passes.
-   * editdiff: Broken since 2.62 due to wrong syntax, now fixed.
-   * aggregate: Support atom feeds with only a summary element, and no content
-     elements.
-   * progress: Display an error if the progress cannot be parsed, and allow
-     the percent parameter to only optionally end with "%".
-   * Fix reversion in use of ikiwiki -verbose -setup with a setup file that
-     enables syslog. Setup output is once again output to stdout in this
-     case.
-   * edittemplate: Default new page file type to the same type as the template.
-     (willu)
-   * edittemplate: Add "silent" parameter. (Willu)
-   * edittemplate: Link to template, to allow creating it. (Willu)
-   * editpage: Add a missing check that the page name contains only legal
-     characters, in addition to the existing check for pruned filenames.
-   * Print a debug message if a page has multiple source files.
-   * Add keepextension parameter to htmlize hook. (Willu)
-   * rename, remove: Don't rely on a form parameter to tell whether the page
-     should be treated as an attachment.
-   * rename: Add support for moving SubPages of a page when renaming it.
-     (Sponsored by The TOVA Company.)
-   * rename: Hide type field from rename form when renaming attachments."""]]
-\ No newline at end of file
diff --git a/doc/news/version_2.66.mdwn b/doc/news/version_2.66.mdwn
deleted file mode 100644
index 029c7a1b9..000000000
--- a/doc/news/version_2.66.mdwn
+++ /dev/null
@@ -1,39 +0,0 @@
-ikiwiki 2.66 released with [[!toggle text="these changes"]]
-[[!toggleable text="""
-   * recentchanges: Fix redirects to non-page files.
-   * aggregate: Avoid uninitialized value warnings for pages with no recorded
-     ctime.
-   * attachment: Add admin() pagespec to test if the uploading user is a wiki
-     admin.
-   * git: Fix handling of utf-8 filenames in recentchanges.
-   * tag: Make edit link for new tags ensure that the tags are created
-     inside tagbase, when it's set.
-   * template: Make edit link for new templates ensure the page is located
-     under toplevel templates directory.
-   * htmlscrubber: Add a config setting that can be used to disable the
-     scrubber acting on a set of pages.
-   * Expand usage message and add --help. Closes: #[500344](http://bugs.debian.org/500344)
-   * Beautify urls used in various places. (smcv)
-   * Export pagetitle, titlepage, linkpage.
-   * htmltidy: Avoid returning undef if tidy fails. Also avoid returning the
-     untidied content if tidy crashes. In either case, it seems best to tidy
-     the content to nothing.
-   * htmltidy: Avoid spewing tidy errors to stderr.
-   * Reorganize index file, add a format version field. Upgrades to the new
-     index format should be transparent.
-   * Add %wikistate, which is like %pagestate except not specific to a given
-     page, and is preserved across rebuilds.
-   * editpage: Be more aggressive (and less buggy) about cleaning up
-     temporary files rendered during page preview.
-   * Add an indexpages option, which causes foo/index.mdwn to be the source
-     for page foo when foo.mdwn doesn't exist. Also, when it's enabled,
-     creating a new page will save it to foo/index.mdwn by default.
-     Closes: #[474611](http://bugs.debian.org/474611)
-     (Sponsored by The TOVA Company.)
-   * httpauth: Document that ikiwiki.cgi has to be in a directory subject to
-     authentication. Closes: #[500524](http://bugs.debian.org/500524)
-   * inline: Fix handling of rootpage that doesn't exist.
-   * attachment: Support adding attachments to pages even as they are being
-     created.
-   * remove, rename: Allow acting on attachments as a page is being created.
-   * Updated French translation. Closes: #[500929](http://bugs.debian.org/500929)"""]]
-\ No newline at end of file
diff --git a/doc/news/version_2.68.mdwn b/doc/news/version_2.68.mdwn
new file mode 100644
index 000000000..b7e625026
--- /dev/null
+++ b/doc/news/version_2.68.mdwn
@@ -0,0 +1,44 @@
+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
new file mode 100644
index 000000000..a277541fe
--- /dev/null
+++ b/doc/news/version_2.69.mdwn
@@ -0,0 +1,24 @@
+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
new file mode 100644
index 000000000..f0830efa1
--- /dev/null
+++ b/doc/news/version_2.70.mdwn
@@ -0,0 +1,3 @@
+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
new file mode 100644
index 000000000..2c8609988
--- /dev/null
+++ b/doc/news/version_2.71.mdwn
@@ -0,0 +1,28 @@
+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
new file mode 100644
index 000000000..26274a3c8
--- /dev/null
+++ b/doc/news/version_2.72.mdwn
@@ -0,0 +1,9 @@
+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.09.mdwn b/doc/news/version_3.09.mdwn
new file mode 100644
index 000000000..d5e1a6545
--- /dev/null
+++ b/doc/news/version_3.09.mdwn
@@ -0,0 +1,16 @@
+ikiwiki 3.09 released with [[!toggle text="these changes"]]
+[[!toggleable text="""
+   * inline: Add title\_natural sort order, using Sort::Naturally
+     (chrysn)
+   * inline: Fix urls to feed when feedfile is used on an index page.
+   * git, mercurial: Fix --getctime to return file creation time,
+     not last commit time.
+   * Updated French translation (Jean-Luc Coulon). Closes: #[521072](http://bugs.debian.org/521072)
+   * css: Add clear: both to inlinefooter.
+   * comments: Fix too loose test for comments pages that matched
+     normal pages with "comment\_" in their name. Closes: #[521322](http://bugs.debian.org/521322)
+   * comments: Fix anchor ids to be legal xhtml. Closes: #[521339](http://bugs.debian.org/521339)
+   * Fix documentation of anonok\_pagespec. Closes: #[521793](http://bugs.debian.org/521793)
+   * Add missing suggests on libtext-textile-perl. Closes: #[522039](http://bugs.debian.org/522039)
+   * recentchanges: change to using do=goto links for user links.
+   * Fix git test suite to use a bare repo."""]]
+\ No newline at end of file