Merge remote branch 'upstream/master' into prv/po

Conflicts:
	IkiWiki/Plugin/po.pm

10 files changed, 114 insertions, 80 deletions

diff --git a/doc/news/version_3.20091031.mdwn b/doc/news/version_3.20091031.mdwn
deleted file mode 100644
index bb77bfa31..000000000
--- a/doc/news/version_3.20091031.mdwn
+++ /dev/null
@@ -1,13 +0,0 @@
-ikiwiki 3.20091031 released with [[!toggle text="these changes"]]
-[[!toggleable text="""
-   * po: Fix breakage caused by changes to render code.
-   * mdwn: Avoid trying to use multimarkdown if it is not installed.
-   * moderatedcomments: New plugin to allow comment moderation w/o relying
-     on blogspam.net.
-   * When redirecting to a page, ie, after editing, ensure that the
-     url is uri-encoded. Most browsers other than MSIE don't care, but it's
-     the right thing to do.
-   * Add a spec file to allow building rpm from the source package.
-   * google: Pass the whole wiki url to google, not just the domain,
-     so that search works correctly for wikis that are located in
-     subdirectories of domains."""]]
\ No newline at end of file
diff --git a/doc/news/version_3.20091113.mdwn b/doc/news/version_3.20091113.mdwn
deleted file mode 100644
index 579174011..000000000
--- a/doc/news/version_3.20091113.mdwn
+++ /dev/null
@@ -1,18 +0,0 @@
-ikiwiki 3.20091113 released with [[!toggle text="these changes"]]
-[[!toggleable text="""
-   * underlay: Fix example values put in setup file to be array
-     references.
-   * underlay: Avoid crashing if lists of underlays (or template
-     directories) are not configured.
-   * Moved the postscan hook to run on the raw html of a page, before
-     the template is filled out. This improves the search plugin's indexing,
-     since it will not include navigational elements from the page template
-     or sidebar.
-   * localstyle: New plugin, allows overrding the toplevel local.css
-     with one that is closer to a page.
-   * httpauth: Add cgiauthurl setting that can be used to do http basic auth
-     only when ikiwiki needs authentication, rather than for any access to
-     the cgi/wiki.
-   * inline: Do not generate feeds for nested inlines.
-   * inline: Allow direct inclusion of non-page files in raw mode.
-   * inline: Fix display of all pages when archive=yes or show=0 are used."""]]
diff --git a/doc/news/version_3.20091202.mdwn b/doc/news/version_3.20091202.mdwn
deleted file mode 100644
index 60f17fe63..000000000
--- a/doc/news/version_3.20091202.mdwn
+++ /dev/null
@@ -1,17 +0,0 @@
-ikiwiki 3.20091202 released with [[!toggle text="these changes"]]
-[[!toggleable text="""
-   * meta: Generate meta description tags even when the html scrubber is
-     enabled.
-   * meta: Allow use of DESCRIPTION in templates to get at the meta description
-     value. (Thanks, NicolasLimare)
-   * inline: Use caching of inlined pages to speed up builds of inlines that
-     include feeds. Speedup of about 25% for small inlines; could be much
-     larger for inlines of many, or complex pages.
-   * Added (incomplete) Turkish po file. Closes: #[556744](http://bugs.debian.org/556744)
-     Thanks, Recai Oktaş
-   * date: New plugin that allows inserting date directives that expand to
-     pretty-printed dates, using the same formatting as used for page
-     modification date display, etc.
-   * htmllink: Allow a title attribute to be specified.
-   * calendar: Add title attributes for all links in the calendars.
-   * calendar: Fix month wraparound error that broke in December."""]]
\ No newline at end of file
diff --git a/doc/news/version_3.20091218.mdwn b/doc/news/version_3.20091218.mdwn
deleted file mode 100644
index 224e81c4e..000000000
--- a/doc/news/version_3.20091218.mdwn
+++ /dev/null
@@ -1,11 +0,0 @@
-ikiwiki 3.20091218 released with [[!toggle text="these changes"]]
-[[!toggleable text="""
-   * Add complete Spanish basewiki translation done by Fernando Gonzalez de
-     Requena.
-   * Improve javascript onload handling.
-   * monotone: Deal with format change in version 0.45.
-     (Thanks, Richard Levitte)
-   * cvs: Add missing bit to Automator.
-   * attachment: Fix reversion in attachment sorting by age.
-   * Fix utf-8 problems in rename, remove, attachment, 404, sourcepage, and
-     goto."""]]
\ No newline at end of file
diff --git a/doc/news/version_3.20100102.3.mdwn b/doc/news/version_3.20100102.3.mdwn
deleted file mode 100644
index b8f61978c..000000000
--- a/doc/news/version_3.20100102.3.mdwn
+++ /dev/null
@@ -1,21 +0,0 @@
-ikiwiki 3.20100102.3 released with [[!toggle text="these changes"]]
-[[!toggleable text="""
-   Happy palindrome day!
-
-   * pagestats: Add show parameter. Closes: #[562129](http://bugs.debian.org/562129) (David Paleino)
-   * toc: Add startlevel parameter. (kerravonsen)
-   * Remove example ikiwiki setup file from the Debian package. This
-     re-enables linking to /usr/share/ikiwiki/examples which has the
-     example sites also used by auto-blog.setup. The example setup file
-     can be generated at any time using ikiwiki --dumpsetup so I do
-     not see a reason to ship it. Closes: #[562183](http://bugs.debian.org/562183)
-   * Use env hack in python scripts.
-   * comments: Add a checksum to the name of comment pages, to
-     avoid merge conflicts when comments are posted to two branches of a
-     site.
-   * linkmap: Add option to omit disconnected pages from the map.
-   * inline: Fix bug that limited displayed pages when feedshow was
-     specified w/o show.
-   * Fix several places that did not properly handle capitalization of
-     the discussionpage setting. Specifically, fixes discussion actions
-     on discussion pages, and unbreaks the opendiscussion plugin."""]]
diff --git a/doc/news/version_3.20100515.mdwn b/doc/news/version_3.20100515.mdwn
new file mode 100644
index 000000000..043346c88
--- /dev/null
+++ b/doc/news/version_3.20100515.mdwn
@@ -0,0 +1,58 @@
+News for ikiwiki 3.20100515:
+
+   There are two significant changes to the page.tmpl template in this version.
+   If you have a locally modified version of that template, you will need to
+   update it at least to contain the following in the HTML `<head>`:
+
+	<TMPL_IF DYNAMIC>
+	<TMPL_IF FORCEBASEURL><base href="<TMPL_VAR FORCEBASEURL>" /><TMPL_ELSE>
+	<TMPL_IF BASEURL><base href="<TMPL_VAR BASEURL>" /></TMPL_IF>
+	</TMPL_IF>
+	</TMPL_IF>
+
+   Also, the footer should be wrapped in `<TMPL_UNLESS DYNAMIC> ... </TMPL_UNLESS>`
+
+   There is a new "comment()" pagespec, that can be used to match a
+   comment on a page. It is recommended to use it instead of the old
+   method of using a pagespec such as "internal(comment\_*)" to match
+   things that looked like comments. The old pagespec will now also match
+   comments that are held for moderation; likely not what you want.
+
+   There have also been some changes to the style.css in this version,
+   particularly to support the new openid selector. If you have a modified
+   version, of style.css, updating it (or moving it to local.css) is
+   recommended.
+
+ikiwiki 3.20100515 released with [[!toggle text="these changes"]]
+[[!toggleable text="""
+   * Removed misc.tmpl. Now to theme ikiwiki, you only need to customise
+     a single template, page.tmpl.
+   * If you have a locally customised page.tmpl, it needs to be updated
+     to set &lt;base&gt; when BASEURL or FORCEBASEURL is set.
+   * comments: Comments pending moderation are now stored in the srcdir
+     alongside accepted comments, but with a `._comment_pending` extension.
+     This allows easier byhand moderation, as the "\_pending" need
+     only be stripped off and the comment be committed to version control.
+   * The `comment_pending()` pagespec can be used to match such unmoderated
+     comments, which makes it easy to add a feed of them, or a counter
+     indicating how many there are.
+   * Belatedly added a `comment()` pagespec.
+   * Gave comment and page editing forms some CSS and accessability love.
+   * Renamed postscan hook to indexhtml, to reflect its changed position,
+     and typical use.
+   * inline: Call indexhtml when inlining internal pages, so their
+     text can be indexed for searching.
+   * Delete hooks are passed deleted internal pages.
+   * openid: Incorporated a fancy openid-selector signin form.
+     (Based on <http://code.google.com/p/openid-selector/>)
+   * openid: Use "openid\_identifier" as the form field, as required
+     by OpenID Authentication v2.0 spec.
+   * Removed the openidsignup option. Instead, my recommendation is to
+     leave passwordauth enabled and let people who don't have an openid use it.
+     The openid selector form avoids the UI annoyance of having both openid
+     and passwordauth on one form.
+   * calendar: Allow negative month to be specified. -1 is last month, etc.
+     (And also negative years.)
+   * calendar: Display year in title of month calendar.
+   * Use xhtml friendly pubdate setting.
+   * remove, rename: Add guards against XSRF attacks."""]]
diff --git a/doc/news/version_3.20100518.2.mdwn b/doc/news/version_3.20100518.2.mdwn
new file mode 100644
index 000000000..64ce3f863
--- /dev/null
+++ b/doc/news/version_3.20100518.2.mdwn
@@ -0,0 +1,3 @@
+ikiwiki 3.20100518.2 released with [[!toggle text="these changes"]]
+[[!toggleable text="""
+   * Fix a typo in the last release."""]]
\ No newline at end of file
diff --git a/doc/news/version_3.20100518.mdwn b/doc/news/version_3.20100518.mdwn
new file mode 100644
index 000000000..f622a4be9
--- /dev/null
+++ b/doc/news/version_3.20100518.mdwn
@@ -0,0 +1,6 @@
+ikiwiki 3.20100518 released with [[!toggle text="these changes"]]
+[[!toggleable text="""
+   * page.tmpl: Accidentially broke po plugin's otherlanguages list styling
+     when modifying for html5; now fixed.
+   * Fix a bug that prevented matching deleted comments, and so did not update
+     pages that had contained them."""]]
\ No newline at end of file
diff --git a/doc/news/version_3.20100610.mdwn b/doc/news/version_3.20100610.mdwn
new file mode 100644
index 000000000..ee7c86d72
--- /dev/null
+++ b/doc/news/version_3.20100610.mdwn
@@ -0,0 +1,18 @@
+ikiwiki 3.20100610 released with [[!toggle text="these changes"]]
+[[!toggleable text="""
+   * creation\_day() etc use local time, not gmtime. To match calendars, which
+     use local time.
+   * img: Fill in missing height or width when scaling image.
+   * Remove example blog tag pages; allow autotag creation to create them
+     when used.
+   * Fix support for globbing in tagged() pagespecs.
+   * Fix display of sidebar when previewing page edit. (Thanks, privat)
+   * relativedate: Fix problem with localised dates not working.
+   * editpage: Avoid storing accidental state changes when previewing pages.
+   * page.tmpl: Add a div around the page content, and comments, to aide in
+     sidebar styling.
+   * style.css: Improvements to make floating sidebar fit much better on
+     pages with inlines.
+   * calendar: Shorten day names, and improve styling of month calendar.
+   * style.css: Reduced sidebar width back to 20ex from 30; the month calendar
+     will now fit in the smaller width, and 30 was feeling too large."""]]
\ No newline at end of file
diff --git a/doc/news/version_3.20100623.mdwn b/doc/news/version_3.20100623.mdwn
new file mode 100644
index 000000000..684217e26
--- /dev/null
+++ b/doc/news/version_3.20100623.mdwn
@@ -0,0 +1,29 @@
+ikiwiki 3.20100623 released with [[!toggle text="these changes"]]
+[[!toggleable text="""
+   * openid: Add openid\_realm and openid\_cgiurl configuration options,
+     useful in a few edge case setups.
+   * attachment: Show files from underlay in attachments list.
+   * img: Support hspace and vspace attributes.
+   * editpage: Rename "comments" field to avoid CSS conflict with the
+     comments div.
+   * edittemplate: Make silent mode not disable display when the template
+     page does not exist, so it can be easily created.
+   * edittemplate: Look for template pages under templates/ like everything
+     else (still looks in old location for backwards compatibility).
+   * attachment: When inserting links, insert img directives for images,
+     if that plugin is enabled.
+   * websetup: Allow enabling plugins listed in disable\_plugins.
+   * editpage, comments: Fix broken links in sidebar (due to forcebaseurl).
+     (Thanks, privat)
+   * calendar: Tune archive\_pagespec to only match pages, not other files.
+   * Fix issues with combining unicode srcdirs and source files.
+     (Workaround bug #586045)
+   * Make --gettime be honored after initial setup.
+   * git: Fix --gettime to properly support utf8 filenames.
+   * attachment: Support Windows paths when taking basename of client-supplied
+     file name.
+   * theme: New plugin, allows easily themeing a site via the underlay.
+   * Added actiontabs theme by Svend Sorensen.
+   * Added blueview theme by Bernd Zeimetz.
+   * mercurial: Fix buggy getctime code. Closes: #[586279](http://bugs.debian.org/586279)
+   * link: Enhanced to handle URLs and email addresses. (Bernd Zeimetz)"""]]
\ No newline at end of file