From: Joey Hess <joey@kitenet.net>
Date: Mon, 28 Mar 2011 16:30:57 +0000 (-0400)
Subject: releasing version 3.20110328
X-Git-Tag: 3.20110328^0
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/232c8a6dfce9ec58c7959d7a4eaf8d0d3870429e?hp=--cc
releasing version 3.20110328
---
232c8a6dfce9ec58c7959d7a4eaf8d0d3870429e
diff --git a/debian/changelog b/debian/changelog
index 91c4c6d24..0eaff10fc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-ikiwiki (3.20110328) UNRELEASED; urgency=low
+ikiwiki (3.20110328) unstable; urgency=low
* Yaml formatted setup files are now produced by default.
(Perl formatted setup files can still be used.)
@@ -9,7 +9,7 @@ ikiwiki (3.20110328) UNRELEASED; urgency=low
* meta: Security fix; don't allow alternative stylesheets to be added
on pages where the htmlscrubber is enabled.
- -- Joey Hess <joeyh@debian.org> Thu, 24 Mar 2011 13:34:34 -0400
+ -- Joey Hess <joeyh@debian.org> Mon, 28 Mar 2011 12:23:26 -0400
ikiwiki (3.20110321) unstable; urgency=low
diff --git a/doc/security.mdwn b/doc/security.mdwn
index 2b387ac23..53222a3a6 100644
--- a/doc/security.mdwn
+++ b/doc/security.mdwn
@@ -22,8 +22,8 @@ this would be to limit web commits to those done by a certain user.
## other stuff to look at
-I need to audit the git backend a bit, and have been meaning to
-see if any CRLF injection type things can be done in the CGI code.
+I have been meaning to see if any CRLF injection type things can be
+done in the CGI code.
----
diff --git a/ikiwiki.spec b/ikiwiki.spec
index efc061272..b251fd240 100644
--- a/ikiwiki.spec
+++ b/ikiwiki.spec
@@ -1,5 +1,5 @@
Name: ikiwiki
-Version: 3.20110321
+Version: 3.20110328
Release: 1%{?dist}
Summary: A wiki compiler
diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot
index 8e4ee6435..65c4dd9ad 100644
--- a/po/ikiwiki.pot
+++ b/po/ikiwiki.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-21 14:47-0400\n"
+"POT-Creation-Date: 2011-03-28 12:25-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -52,7 +52,7 @@ msgstr ""
msgid "You are banned."
msgstr ""
-#: ../IkiWiki/CGI.pm:464 ../IkiWiki/CGI.pm:465 ../IkiWiki.pm:1430
+#: ../IkiWiki/CGI.pm:464 ../IkiWiki/CGI.pm:465 ../IkiWiki.pm:1443
msgid "Error"
msgstr ""
@@ -270,7 +270,7 @@ msgstr ""
msgid "comment moderation"
msgstr ""
-#: ../IkiWiki/Plugin/comments.pm:826
+#: ../IkiWiki/Plugin/comments.pm:824
#, perl-format
msgid "%i comment"
msgid_plural "%i comments"
@@ -280,7 +280,7 @@ msgstr[1] ""
#. translators: Here "Comment" is a verb;
#. translators: the user clicks on it to
#. translators: post a comment.
-#: ../IkiWiki/Plugin/comments.pm:836
+#: ../IkiWiki/Plugin/comments.pm:834
msgid "Comment"
msgstr ""
@@ -362,7 +362,7 @@ msgid "%s is an attachment, not a page."
msgstr ""
#: ../IkiWiki/Plugin/git.pm:776 ../IkiWiki/Plugin/git.pm:839
-#: ../IkiWiki.pm:1640
+#: ../IkiWiki.pm:1653
#, perl-format
msgid "you are not allowed to change %s"
msgstr ""
@@ -611,87 +611,87 @@ msgstr ""
msgid "warning: Old po4a detected! Recommend upgrade to 0.35."
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:176
+#: ../IkiWiki/Plugin/po.pm:179
#, perl-format
msgid "%s is not a valid language code"
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:188
+#: ../IkiWiki/Plugin/po.pm:191
#, perl-format
msgid ""
"%s is not a valid value for po_link_to, falling back to po_link_to=default"
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:193
+#: ../IkiWiki/Plugin/po.pm:196
msgid ""
"po_link_to=negotiated requires usedirs to be enabled, falling back to "
"po_link_to=default"
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:457
+#: ../IkiWiki/Plugin/po.pm:460
msgid "updated PO files"
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:480
+#: ../IkiWiki/Plugin/po.pm:483
msgid ""
"Can not remove a translation. If the master page is removed, however, its "
"translations will be removed as well."
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:500
+#: ../IkiWiki/Plugin/po.pm:503
msgid ""
"Can not rename a translation. If the master page is renamed, however, its "
"translations will be renamed as well."
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:942
+#: ../IkiWiki/Plugin/po.pm:949
#, perl-format
msgid "POT file (%s) does not exist"
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:956
+#: ../IkiWiki/Plugin/po.pm:963
#, perl-format
msgid "failed to copy underlay PO file to %s"
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:965
+#: ../IkiWiki/Plugin/po.pm:972
#, perl-format
msgid "failed to update %s"
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:971
+#: ../IkiWiki/Plugin/po.pm:978
#, perl-format
msgid "failed to copy the POT file to %s"
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:1007
+#: ../IkiWiki/Plugin/po.pm:1014
msgid "N/A"
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:1018
+#: ../IkiWiki/Plugin/po.pm:1025
#, perl-format
msgid "failed to translate %s"
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:1097
+#: ../IkiWiki/Plugin/po.pm:1104
msgid "removed obsolete PO files"
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:1154 ../IkiWiki/Plugin/po.pm:1166
-#: ../IkiWiki/Plugin/po.pm:1205
+#: ../IkiWiki/Plugin/po.pm:1161 ../IkiWiki/Plugin/po.pm:1173
+#: ../IkiWiki/Plugin/po.pm:1212
#, perl-format
msgid "failed to write %s"
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:1164
+#: ../IkiWiki/Plugin/po.pm:1171
msgid "failed to translate"
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:1217
+#: ../IkiWiki/Plugin/po.pm:1224
msgid "invalid gettext data, go back to previous page to continue edit"
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:1259
+#: ../IkiWiki/Plugin/po.pm:1266
#, perl-format
msgid "%s has invalid syntax: must use CODE|NAME"
msgstr ""
@@ -1204,49 +1204,49 @@ msgstr ""
msgid "Discussion"
msgstr ""
-#: ../IkiWiki.pm:544
+#: ../IkiWiki.pm:557
msgid "Must specify url to wiki with --url when using --cgi"
msgstr ""
-#: ../IkiWiki.pm:616
+#: ../IkiWiki.pm:629
msgid "cannot use multiple rcs plugins"
msgstr ""
-#: ../IkiWiki.pm:646
+#: ../IkiWiki.pm:659
#, perl-format
msgid "failed to load external plugin needed for %s plugin: %s"
msgstr ""
-#: ../IkiWiki.pm:1412
+#: ../IkiWiki.pm:1425
#, perl-format
msgid "preprocessing loop detected on %s at depth %i"
msgstr ""
-#: ../IkiWiki.pm:1596
+#: ../IkiWiki.pm:1609
#, perl-format
msgid "bad file name %s"
msgstr ""
-#: ../IkiWiki.pm:1896
+#: ../IkiWiki.pm:1909
#, perl-format
msgid "template %s not found"
msgstr ""
-#: ../IkiWiki.pm:2146
+#: ../IkiWiki.pm:2159
msgid "yes"
msgstr ""
-#: ../IkiWiki.pm:2223
+#: ../IkiWiki.pm:2236
#, perl-format
msgid "invalid sort type %s"
msgstr ""
-#: ../IkiWiki.pm:2244
+#: ../IkiWiki.pm:2257
#, perl-format
msgid "unknown sort type %s"
msgstr ""
-#: ../IkiWiki.pm:2380
+#: ../IkiWiki.pm:2393
#, perl-format
msgid "cannot match pages: %s"
msgstr ""