Merge commit 'upstream/master' into prv/po

Conflicts:

	t/syntax.t

4 files changed, 26 insertions, 23 deletions

diff --git a/doc/download.mdwn b/doc/download.mdwn
index 354929052..067938f87 100644
--- a/doc/download.mdwn
+++ b/doc/download.mdwn
@@ -17,7 +17,7 @@ ikiwiki, there have been lots of enhancements and bug fixes since those
 versions.
 """]]
 
-        aptitude install ikiwiki
+        apt-get install ikiwiki
 
 Or download the deb from <http://packages.debian.org/unstable/web/ikiwiki>.
 
diff --git a/doc/news/version_3.01.mdwn b/doc/news/version_3.01.mdwn
deleted file mode 100644
index 3f2c8f2d0..000000000
--- a/doc/news/version_3.01.mdwn
+++ /dev/null
@@ -1,21 +0,0 @@
-News for ikiwiki 3.01:
-
-   If your wiki uses git, and you have a `diffurl` configured in
-   its setup file, you should be aware that gitweb has stopped
-   supporting the url form commonly used for the `diffurl`.
-   You can change your setup to use the newer gitweb url form:
-
- 	http://git.example.com/gitweb.cgi?p=wiki.git;a=blobdiff;f=\[[file]];h=\[[sha1_to]];hp=\[[sha1_from]];hb=\[[sha1_commit]];hpb=\[[sha1_parent]]
-
-   The changes from the old form are the addition of the `hpb` parameter,
-   and the change to the value used for the `hb` parameter.
-
-ikiwiki 3.01 released with [[!toggle text="these changes"]]
-[[!toggleable text="""
-   * ikiwiki-makerepo: Fix injecting of empty mercurial and bzr repositories.
-     Closes: #[510518](http://bugs.debian.org/510518)
-   * Fix documentation about git hook to use right name. Closes: #[510393](http://bugs.debian.org/510393)
-   * yesno: Always accept English even when localised.
-   * yesno: Also accept 1 and 0 as input.
-   * A recent change to gitweb removed support for the form of diffurl
-     that many ikiwiki setups use. Document how to use the new url form."""]]
diff --git a/doc/news/version_3.02.mdwn b/doc/news/version_3.02.mdwn
new file mode 100644
index 000000000..f4e17a375
--- /dev/null
+++ b/doc/news/version_3.02.mdwn
@@ -0,0 +1,24 @@
+ikiwiki 3.02 released with [[!toggle text="these changes"]]
+[[!toggleable text="""
+   * blogspam: New plugin, adding spam filtering for page editing / comment
+     posting using the BlogSpam.net API.
+   * Add auto-blog.setup, which will set up an ikiwiki instance tuned for use
+     in blogging.
+   * checkcontent: New hook, can be used to implement arbitrary content
+     filters, including spam filters.
+   * table: Fix misparsed links in external files.
+   * table: Find links in external files in scan pass.
+   * rename: Show full names of affected pages.
+   * comments: Fix cache avoidance hack.
+   * repolist: New plugin to support the rel=vcs-* microformat.
+   * goodstuff: Include repolist by default. (But it does nothing until
+     configured with the repository locations.)
+   * comments: Add support for removing comments via web interface. (smcv)
+   * Consistently allow use of relative paths in all PageSpecs
+     that take a page name parameter. Previously, match\_created\_before(),
+     match\_created\_after(), match\_sourcepage(), and match\_destpage()
+     did not support that, and the docs were not clear.
+   * pinger: Get whole url, don't just head, avoids problems on
+     the nostromo web server.
+   * Recommend libterm-readline-gnu-perl since that makes auto.setup
+     behave better."""]]
\ No newline at end of file
diff --git a/doc/plugins/calendar.mdwn b/doc/plugins/calendar.mdwn
index c9e95ce7e..d695762b7 100644
--- a/doc/plugins/calendar.mdwn
+++ b/doc/plugins/calendar.mdwn
@@ -6,7 +6,7 @@ The directive displays a calendar, similar to the typical calendars shown on
 some blogs.
 
 Since ikiwiki is a wiki compiler, to keep the calendar up-to-date,
-wikis that include it need to be preiodically refreshes, typically by cron
+wikis that include it need to be periodically refreshes, typically by cron
 at midnight. Example crontab:
 
 	0 0 * * * ikiwiki -setup ~/ikiwiki.setup -refresh