Merge branch 'master' into next

Conflicts:

	debian/changelog
	po/ikiwiki.pot

diff --combined debian/changelog
index 2a872bb0ea186e6bbdd2870617ff1e21b57ab6b4,7875d425be9fe7796e0976e88194ac6287d2cf72..66db70288902f59227924176d85e1e33580716a1
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,21 -1,3 +1,21 @@@
 +ikiwiki (3.00) UNRELEASED; urgency=low
 +
 +  * Remove support for GlobLists.
 +  * Remove support for configuring allowed attachments, locked pages,
 +    and banned users from the admin preferences page. These can only be
 +    controlled via the setup file now.
 +  * ikiwiki-transition moveprefs can be used to move the above
 +    admin preferences into a setup file.
 +  * prefix_directives and aggregate_internal are now turned on by default.
 +  * ikiwiki-transition prefix_directives syntax changed
 +  * googlecalendar: removed this deprecated plugin. Use htmlscrubber_skip
 +    instead.
 +  * embed: This plugin is deprecated, use htmlscrubber_skip instead.
 +    Closes: ##462970.
 +  * Version 3.00 of the plugin API.
 +
 + -- Joey Hess <joeyh@debian.org>  Wed, 24 Dec 2008 19:49:36 -0500
 +
  ikiwiki (2.72) unstable; urgency=low
  
    * Avoid comments in recentchanges being broken links (smcv)
@@@ -26,7 -8,7 +26,7 @@@
    * inline: Run format hook first, to ensure other format hooks can affect
      inlined content.  Closes: #509710
  
-  -- Joey Hess <joeyh@debian.org>  Wed, 24 Dec 2008 19:49:32 -0500
+  -- Joey Hess <joeyh@debian.org>  Sun, 28 Dec 2008 15:01:02 -0500
  
  ikiwiki (2.71) unstable; urgency=low
  

diff --combined po/ikiwiki.pot
index bfbaaf0faedabb4115704dde6a93cdb762810d09,1f59b99c71b610a906920da1cbb83b3abc2ff885..7f664d11132cd388115c0d68f98e08a30f8c64b6
--- 1/po/ikiwiki.pot
--- 2/po/ikiwiki.pot
+++ b/po/ikiwiki.pot
@@@ -8,7 -8,7 +8,7 @@@ msgid "
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
  "Report-Msgid-Bugs-To: \n"
- "POT-Creation-Date: 2008-12-26 21:41-0500\n"
+ "POT-Creation-Date: 2008-12-28 15:01-0500\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"
@@@ -24,7 -24,7 +24,7 @@@ msgstr "
  msgid "login failed, perhaps you need to turn on cookies?"
  msgstr ""
  
 -#: ../IkiWiki/CGI.pm:163 ../IkiWiki/CGI.pm:310
 +#: ../IkiWiki/CGI.pm:163 ../IkiWiki/CGI.pm:280
  msgid "Your login session has expired."
  msgstr ""
  
@@@ -40,87 -40,87 +40,87 @@@ msgstr "
  msgid "Admin"
  msgstr ""
  
 -#: ../IkiWiki/CGI.pm:253
 +#: ../IkiWiki/CGI.pm:226
  msgid "Preferences saved."
  msgstr ""
  
 -#: ../IkiWiki/CGI.pm:271
 +#: ../IkiWiki/CGI.pm:241
  msgid "You are banned."
  msgstr ""
  
 -#: ../IkiWiki/CGI.pm:401 ../IkiWiki/CGI.pm:402 ../IkiWiki.pm:1204
 +#: ../IkiWiki/CGI.pm:371 ../IkiWiki/CGI.pm:372 ../IkiWiki.pm:1204
  msgid "Error"
  msgstr ""
  
 -#: ../IkiWiki/Plugin/aggregate.pm:80
 +#: ../IkiWiki/Plugin/aggregate.pm:84
  msgid "Aggregation triggered via web."
  msgstr ""
  
 -#: ../IkiWiki/Plugin/aggregate.pm:89
 +#: ../IkiWiki/Plugin/aggregate.pm:93
  msgid "Nothing to do right now, all feeds are up-to-date!"
  msgstr ""
  
 -#: ../IkiWiki/Plugin/aggregate.pm:216
 +#: ../IkiWiki/Plugin/aggregate.pm:220
  #, perl-format
  msgid "missing %s parameter"
  msgstr ""
  
 -#: ../IkiWiki/Plugin/aggregate.pm:251
 +#: ../IkiWiki/Plugin/aggregate.pm:255
  msgid "new feed"
  msgstr ""
  
 -#: ../IkiWiki/Plugin/aggregate.pm:265
 +#: ../IkiWiki/Plugin/aggregate.pm:269
  msgid "posts"
  msgstr ""
  
 -#: ../IkiWiki/Plugin/aggregate.pm:267
 +#: ../IkiWiki/Plugin/aggregate.pm:271
  msgid "new"
  msgstr ""
  
 -#: ../IkiWiki/Plugin/aggregate.pm:431
 +#: ../IkiWiki/Plugin/aggregate.pm:435
  #, perl-format
  msgid "expiring %s (%s days old)"
  msgstr ""
  
 -#: ../IkiWiki/Plugin/aggregate.pm:438
 +#: ../IkiWiki/Plugin/aggregate.pm:442
  #, perl-format
  msgid "expiring %s"
  msgstr ""
  
 -#: ../IkiWiki/Plugin/aggregate.pm:465
 +#: ../IkiWiki/Plugin/aggregate.pm:469
  #, perl-format
  msgid "last checked %s"
  msgstr ""
  
 -#: ../IkiWiki/Plugin/aggregate.pm:469
 +#: ../IkiWiki/Plugin/aggregate.pm:473
  #, perl-format
  msgid "checking feed %s ..."
  msgstr ""
  
 -#: ../IkiWiki/Plugin/aggregate.pm:474
 +#: ../IkiWiki/Plugin/aggregate.pm:478
  #, perl-format
  msgid "could not find feed at %s"
  msgstr ""
  
 -#: ../IkiWiki/Plugin/aggregate.pm:493
 +#: ../IkiWiki/Plugin/aggregate.pm:497
  msgid "feed not found"
  msgstr ""
  
 -#: ../IkiWiki/Plugin/aggregate.pm:504
 +#: ../IkiWiki/Plugin/aggregate.pm:508
  #, perl-format
  msgid "(invalid UTF-8 stripped from feed)"
  msgstr ""
  
 -#: ../IkiWiki/Plugin/aggregate.pm:512
 +#: ../IkiWiki/Plugin/aggregate.pm:516
  #, perl-format
  msgid "(feed entities escaped)"
  msgstr ""
  
 -#: ../IkiWiki/Plugin/aggregate.pm:520
 +#: ../IkiWiki/Plugin/aggregate.pm:524
  msgid "feed crashed XML::Feed!"
  msgstr ""
  
 -#: ../IkiWiki/Plugin/aggregate.pm:601
 +#: ../IkiWiki/Plugin/aggregate.pm:605
  #, perl-format
  msgid "creating new page %s"
  msgstr ""
@@@ -155,15 -155,15 +155,15 @@@ msgstr "
  msgid "there is already a page named %s"
  msgstr ""
  
 -#: ../IkiWiki/Plugin/attachment.pm:82
 +#: ../IkiWiki/Plugin/attachment.pm:65
  msgid "prohibited by allowed_attachments"
  msgstr ""
  
 -#: ../IkiWiki/Plugin/attachment.pm:190
 +#: ../IkiWiki/Plugin/attachment.pm:140
  msgid "bad attachment filename"
  msgstr ""
  
 -#: ../IkiWiki/Plugin/attachment.pm:232
 +#: ../IkiWiki/Plugin/attachment.pm:182
  msgid "attachment upload"
  msgstr ""
  
@@@ -328,6 -328,10 +328,6 @@@ msgstr "
  msgid "Failed to parse url, cannot determine domain name"
  msgstr ""
  
 -#: ../IkiWiki/Plugin/googlecalendar.pm:34
 -msgid "failed to find url in html"
 -msgstr ""
 -
  #: ../IkiWiki/Plugin/graphviz.pm:67
  msgid "failed to run graphviz"
  msgstr ""
@@@ -399,7 -403,7 +399,7 @@@ msgstr "
  msgid "failed to run dot"
  msgstr ""
  
 -#: ../IkiWiki/Plugin/lockedit.pm:49 ../IkiWiki/Plugin/lockedit.pm:66
 +#: ../IkiWiki/Plugin/lockedit.pm:47
  #, perl-format
  msgid "%s is locked and cannot be edited"
  msgstr ""
@@@ -1001,7 -1005,7 +1001,7 @@@ msgstr "
  msgid "preprocessing loop detected on %s at depth %i"
  msgstr ""
  
 -#: ../IkiWiki.pm:1695
 +#: ../IkiWiki.pm:1661
  msgid "yes"
  msgstr ""