Merge tag '3.20120202' into trail3-integrated

8 files changed, 33 insertions, 50 deletions

diff --git a/doc/news/version_3.20110711.mdwn b/doc/news/version_3.20110711.mdwn
deleted file mode 100644
index c4006cbe7..000000000
--- a/doc/news/version_3.20110711.mdwn
+++ /dev/null
@@ -1,7 +0,0 @@
-ikiwiki 3.20110711 released with [[!toggle text="these changes"]]
-[[!toggleable text="""
-   * Add build dep on python-support. Closes: #[633536](http://bugs.debian.org/633536)
-   * attachment: Bugfix to move upload attachments out of holding area
-     when saving.
-   * attachment: Bugfix for trying to attach files to a subpage of the index
-     page."""]]
\ No newline at end of file
diff --git a/doc/news/version_3.20110712.mdwn b/doc/news/version_3.20110712.mdwn
deleted file mode 100644
index 8744d688d..000000000
--- a/doc/news/version_3.20110712.mdwn
+++ /dev/null
@@ -1,6 +0,0 @@
-ikiwiki 3.20110712 released with [[!toggle text="these changes"]]
-[[!toggleable text="""
-   * attachment: Bugfix to create directory when moving attachment out of
-     holding area.
-   * Display attachment manipulation links always, since attachments can be
-     uploaded via javascript."""]]
\ No newline at end of file
diff --git a/doc/news/version_3.20110715.mdwn b/doc/news/version_3.20110715.mdwn
deleted file mode 100644
index da291dafb..000000000
--- a/doc/news/version_3.20110715.mdwn
+++ /dev/null
@@ -1,5 +0,0 @@
-ikiwiki 3.20110715 released with [[!toggle text="these changes"]]
-[[!toggleable text="""
-   * rename: Fix logic error that broke renaming pages when the attachment
-     plugin was disabled.
-   * rename: Fix logic error that bypassed the usual pagespec checks."""]]
\ No newline at end of file
diff --git a/doc/news/version_3.20110905.mdwn b/doc/news/version_3.20110905.mdwn
deleted file mode 100644
index bff02c3af..000000000
--- a/doc/news/version_3.20110905.mdwn
+++ /dev/null
@@ -1,32 +0,0 @@
-ikiwiki 3.20110905 released with [[!toggle text="these changes"]]
-[[!toggleable text="""
-   * mercurial: Openid nicknames are now used when committing. (Daniel Andersson)
-   * mercurial: Implement rcs\_commit\_staged so comments, attachments, etc
-     can be used. (Daniel Andersson)
-   * mercurial: Implement rcs\_rename, rcs\_remove. (Daniel Andersson)
-   * mercurial: Fix viewing of a diff containing non-utf8 changes.
-     (Daniel Andersson)
-   * mercurial: Make both rcs\_getctime and rcs\_getmtime fast. (Daniel Andersson)
-   * mercurial: Implement rcs\_diff. (Daniel Andersson)
-   * po: Add `LANG\_CODE` and `LANG\_NAME` template variables. (intrigeri)
-   * Fix typo in Danish translation of shortcuts page that caused exponential
-     regexp blowup.
-   * Fix escaping of html entities in permalinks.
-   * Fix escaping of html entities in tag names.
-   * Avoid using named capture groups in heredoc code for oldperl compatibility.
-   * Put in a workaround for #622591, by ensuring Search::Xapian gets loaded
-     before Image::Magick.
-   * Add unminified jquery js and css files to source.
-   * Update to jquery 1.6.2, and jquery-ui 1.8.14.
-   * Use lockf rather than flock when taking the cgilock, for better
-     portability.
-   * search: Fix encoding bug in calculation of maximum term size.
-   * inline: When indexing internal pages for searching, use the url of
-     the inlining page.
-   * Fix comments testsuite to not rely on Date::Parse's ability to
-     parse the date Columbus discovered America. Closes: #[640350](http://bugs.debian.org/640350)
-   * Avoid warning message when generating setup file if highlight
-     is not installed. Closes: #[637606](http://bugs.debian.org/637606)
-   * Promote RPC::XML to a Recommends, since it's used by auto-blog.setup.
-     Closes: #[637603](http://bugs.debian.org/637603)
-   * Fix web revert of a file deletion."""]]
\ No newline at end of file
diff --git a/doc/news/version_3.20111107.mdwn b/doc/news/version_3.20111107.mdwn
new file mode 100644
index 000000000..5af8ae647
--- /dev/null
+++ b/doc/news/version_3.20111107.mdwn
@@ -0,0 +1,12 @@
+ikiwiki 3.20111107 released with [[!toggle text="these changes"]]
+[[!toggleable text="""
+   * img: Bugfix to width/height tags for scaled down image when only
+     one dimension was provided. Thanks, Per Carlson.
+   * editpage: Fix FormattingHelp link on Discussion pages.
+   * The umask setting can now be set to private, group, or public,
+     avoiding the need to enter octal correctly which is particularly
+     difficult in yaml setup files. (smcv)
+   * graphviz: Support urls embedded in the graph, by having graphviz
+     generate an imagemap.
+   * graphviz: Support wikilinks embedded in the graph.
+     (Sponsored by The TOVA Company.)"""]]
\ No newline at end of file
diff --git a/doc/news/version_3.20111229.mdwn b/doc/news/version_3.20111229.mdwn
new file mode 100644
index 000000000..18c4f8d12
--- /dev/null
+++ b/doc/news/version_3.20111229.mdwn
@@ -0,0 +1,7 @@
+ikiwiki 3.20111229 released with [[!toggle text="these changes"]]
+[[!toggleable text="""
+   * Consume all stdin when rcs\_receive short-circuits,
+     to avoid git SIGPIPE race.
+   * Add path and path\_natural sort orders (smcv)
+   * Test coverage can be checked with `make coverage` (smcv)
+   * tag: encode categories using numeric values. (tango)"""]]
\ No newline at end of file
diff --git a/doc/news/version_3.20120109.mdwn b/doc/news/version_3.20120109.mdwn
new file mode 100644
index 000000000..de53c5d67
--- /dev/null
+++ b/doc/news/version_3.20120109.mdwn
@@ -0,0 +1,9 @@
+ikiwiki 3.20120109 released with [[!toggle text="these changes"]]
+[[!toggleable text="""
+   * mdwn: Can use the discount markdown library, via the
+     Text::Markdown::Discount perl module. This is preferred if available
+     since it's the fastest currently supported markdown library, speeding up
+     ikiwiki's markdown rendering by a factor of 40.
+     (However, when multimarkdown is enabled, Text::Markdown::Multimarkdown
+     is still used.)
+   * On Debian, depend on libtext-markdown-discount."""]]
\ No newline at end of file
diff --git a/doc/news/version_3.20120115.mdwn b/doc/news/version_3.20120115.mdwn
new file mode 100644
index 000000000..ba665c666
--- /dev/null
+++ b/doc/news/version_3.20120115.mdwn
@@ -0,0 +1,5 @@
+ikiwiki 3.20120115 released with [[!toggle text="these changes"]]
+[[!toggleable text="""
+   * Make backlink(.) work. Thanks, Giuseppe Bilotta.
+   * mdwn: Workaround discount's eliding of <style> blocks.
+   * attachment: Fix utf-8 display bug."""]]
\ No newline at end of file