Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info

diff --git a/IkiWiki/CGI.pm b/IkiWiki/CGI.pm
index cd4a5574ce9b9d1239b87a4329c41c4dc1871290..bb26add9addfe64447e15324db5e8b754b271385 100644 (file)
--- a/IkiWiki/CGI.pm
+++ b/IkiWiki/CGI.pm
@@ -52,7 +52,7 @@ sub redirect ($$) {
 }
 
 sub decode_cgi_utf8 ($) {
-       # decode_form_utf8 method is needed for 5.10
+       # decode_form_utf8 method is needed for 5.01
        if ($] < 5.01) {
                my $cgi = shift;
                foreach my $f ($cgi->param) {

diff --git a/IkiWiki/Plugin/remove.pm b/IkiWiki/Plugin/remove.pm
index 2b8cf0414aa9198624c2f91e238a6fbf3c446d44..3c1e0c713c85b0b679b1d00c0ed19e56ea685006 100644 (file)
--- a/IkiWiki/Plugin/remove.pm
+++ b/IkiWiki/Plugin/remove.pm
@@ -51,7 +51,7 @@ sub check_canremove ($$$) {
                        IkiWiki::Plugin::attachment::check_canattach($session, $page, $file);
                }
                else {
-                       error("renaming of attachments is not allowed");
+                       error("removal of attachments is not allowed");
                }
        }
 

diff --git a/debian/changelog b/debian/changelog
index 55213df9c234e8961e0501eab46646732c7b47f9..f17eed3e53ebcbf1b8ae8b60ab7561df528a86b2 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -262,7 +262,7 @@ ikiwiki (3.141592) unstable; urgency=low
 
   * Add new hooks: canremove, canrename, rename. (intrigeri)
   * rename: Refactor subpage rename handling code into rename hook. (intrigeri)
-  * po: New plugin<F11>, suporting translation of wiki pages using po files.
+  * po: New plugin, suporting translation of wiki pages using po files.
     (intrigeri)
   * Add build machinery to build po files to translate the underlay wikis,
   * Add further build machinery to generate translated underlays from