summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--IkiWiki/CGI.pm2
-rw-r--r--IkiWiki/Plugin/remove.pm2
-rw-r--r--debian/changelog2
3 files changed, 3 insertions, 3 deletions
diff --git a/IkiWiki/CGI.pm b/IkiWiki/CGI.pm
index cd4a5574c..bb26add9a 100644
--- 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 2b8cf0414..3c1e0c713 100644
--- 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 55213df9c..f17eed3e5 100644
--- 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