3 files changed, 112 insertions, 94 deletions

diff --git a/www/zope-zwiki/Makefile b/www/zope-zwiki/Makefile
index 0e6488d773ca..e86d5020b3c6 100644
--- a/www/zope-zwiki/Makefile
+++ b/www/zope-zwiki/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	zwiki
-PORTVERSION=	0.29.0
+PORTVERSION=	0.31.0
 CATEGORIES=	www zope
 MASTER_SITES=	http://zwiki.org/releases/
 PKGNAMEPREFIX=	zope-
diff --git a/www/zope-zwiki/distinfo b/www/zope-zwiki/distinfo
index 1cdd123e3a45..022c8aa10cab 100644
--- a/www/zope-zwiki/distinfo
+++ b/www/zope-zwiki/distinfo
@@ -1,2 +1,2 @@
-MD5 (zope/ZWiki-0.29.0.tgz) = 48e1ac580c19d74112e0deb89682d5e9
-SIZE (zope/ZWiki-0.29.0.tgz) = 229255
+MD5 (zope/ZWiki-0.31.0.tgz) = 6ff95ed93f0d9d9e43c34960995e7050
+SIZE (zope/ZWiki-0.31.0.tgz) = 275147
diff --git a/www/zope-zwiki/pkg-plist b/www/zope-zwiki/pkg-plist
index bdcd187e38c2..32ca4f50a2ef 100644
--- a/www/zope-zwiki/pkg-plist
+++ b/www/zope-zwiki/pkg-plist
@@ -1,46 +1,70 @@
-%%ZOPEPRODUCTDIR%%/ZWiki/Extensions/.cvsignore
-%%ZOPEPRODUCTDIR%%/ZWiki/Extensions/Install.py
-%%ZOPEPRODUCTDIR%%/ZWiki/Extensions/README
-%%ZOPEPRODUCTDIR%%/ZWiki/Extensions/__init__.py
-%%ZOPEPRODUCTDIR%%/ZWiki/Extensions/fixprops.py
-%%ZOPEPRODUCTDIR%%/ZWiki/Extensions/mailin.py
-%%ZOPEPRODUCTDIR%%/ZWiki/Extensions/Install.pyc
-%%ZOPEPRODUCTDIR%%/ZWiki/Extensions/__init__.pyc
-%%ZOPEPRODUCTDIR%%/ZWiki/Extensions/fixprops.pyc
-%%ZOPEPRODUCTDIR%%/ZWiki/Extensions/mailin.pyc
-%%ZOPEPRODUCTDIR%%/ZWiki/.cvsignore
 %%ZOPEPRODUCTDIR%%/ZWiki/Admin.py
+%%ZOPEPRODUCTDIR%%/ZWiki/Admin.pyc
 %%ZOPEPRODUCTDIR%%/ZWiki/CHANGES.txt
 %%ZOPEPRODUCTDIR%%/ZWiki/CMF.py
+%%ZOPEPRODUCTDIR%%/ZWiki/CMF.pyc
 %%ZOPEPRODUCTDIR%%/ZWiki/CMFInit.py
+%%ZOPEPRODUCTDIR%%/ZWiki/CMFInit.pyc
 %%ZOPEPRODUCTDIR%%/ZWiki/CatalogAwareness.py
+%%ZOPEPRODUCTDIR%%/ZWiki/CatalogAwareness.pyc
+%%ZOPEPRODUCTDIR%%/ZWiki/Comments.py
+%%ZOPEPRODUCTDIR%%/ZWiki/Comments.pyc
 %%ZOPEPRODUCTDIR%%/ZWiki/Defaults.py
+%%ZOPEPRODUCTDIR%%/ZWiki/Defaults.pyc
 %%ZOPEPRODUCTDIR%%/ZWiki/Diff.py
+%%ZOPEPRODUCTDIR%%/ZWiki/Diff.pyc
 %%ZOPEPRODUCTDIR%%/ZWiki/Editing.py
+%%ZOPEPRODUCTDIR%%/ZWiki/Editing.pyc
+%%ZOPEPRODUCTDIR%%/ZWiki/Extensions/Install.py
+%%ZOPEPRODUCTDIR%%/ZWiki/Extensions/Install.pyc
+%%ZOPEPRODUCTDIR%%/ZWiki/Extensions/README
+%%ZOPEPRODUCTDIR%%/ZWiki/Extensions/__init__.py
+%%ZOPEPRODUCTDIR%%/ZWiki/Extensions/__init__.pyc
+%%ZOPEPRODUCTDIR%%/ZWiki/Extensions/fixprops.py
+%%ZOPEPRODUCTDIR%%/ZWiki/Extensions/fixprops.pyc
+%%ZOPEPRODUCTDIR%%/ZWiki/Extensions/mailin.py
+%%ZOPEPRODUCTDIR%%/ZWiki/Extensions/mailin.pyc
 %%ZOPEPRODUCTDIR%%/ZWiki/Fit.py
+%%ZOPEPRODUCTDIR%%/ZWiki/Fit.pyc
 %%ZOPEPRODUCTDIR%%/ZWiki/GPL.txt
+%%ZOPEPRODUCTDIR%%/ZWiki/I18nSupport.py
+%%ZOPEPRODUCTDIR%%/ZWiki/I18nSupport.pyc
 %%ZOPEPRODUCTDIR%%/ZWiki/LICENSE.txt
-%%ZOPEPRODUCTDIR%%/ZWiki/LocalizerSupport.py
 %%ZOPEPRODUCTDIR%%/ZWiki/Mail.py
-%%ZOPEPRODUCTDIR%%/ZWiki/Messages.py
+%%ZOPEPRODUCTDIR%%/ZWiki/Mail.pyc
 %%ZOPEPRODUCTDIR%%/ZWiki/Outline.py
+%%ZOPEPRODUCTDIR%%/ZWiki/Outline.pyc
 %%ZOPEPRODUCTDIR%%/ZWiki/OutlineSupport.py
+%%ZOPEPRODUCTDIR%%/ZWiki/OutlineSupport.pyc
 %%ZOPEPRODUCTDIR%%/ZWiki/PageTypes.py
+%%ZOPEPRODUCTDIR%%/ZWiki/PageTypes.pyc
 %%ZOPEPRODUCTDIR%%/ZWiki/Permissions.py
+%%ZOPEPRODUCTDIR%%/ZWiki/Permissions.pyc
 %%ZOPEPRODUCTDIR%%/ZWiki/PurpleNumbers.py
+%%ZOPEPRODUCTDIR%%/ZWiki/PurpleNumbers.pyc
 %%ZOPEPRODUCTDIR%%/ZWiki/README.txt
+%%ZOPEPRODUCTDIR%%/ZWiki/Rating.py
+%%ZOPEPRODUCTDIR%%/ZWiki/Rating.pyc
 %%ZOPEPRODUCTDIR%%/ZWiki/Regexps.py
+%%ZOPEPRODUCTDIR%%/ZWiki/Regexps.pyc
 %%ZOPEPRODUCTDIR%%/ZWiki/Regulations.py
+%%ZOPEPRODUCTDIR%%/ZWiki/Regulations.pyc
 %%ZOPEPRODUCTDIR%%/ZWiki/TextFormatter.py
+%%ZOPEPRODUCTDIR%%/ZWiki/TextFormatter.pyc
 %%ZOPEPRODUCTDIR%%/ZWiki/Tracker.py
+%%ZOPEPRODUCTDIR%%/ZWiki/Tracker.pyc
 %%ZOPEPRODUCTDIR%%/ZWiki/UI.py
+%%ZOPEPRODUCTDIR%%/ZWiki/UI.pyc
 %%ZOPEPRODUCTDIR%%/ZWiki/Utils.py
+%%ZOPEPRODUCTDIR%%/ZWiki/Utils.pyc
 %%ZOPEPRODUCTDIR%%/ZWiki/WWML.py
+%%ZOPEPRODUCTDIR%%/ZWiki/WWML.pyc
 %%ZOPEPRODUCTDIR%%/ZWiki/ZWikiPage.py
+%%ZOPEPRODUCTDIR%%/ZWiki/ZWikiPage.pyc
 %%ZOPEPRODUCTDIR%%/ZWiki/ZWikiWeb.py
+%%ZOPEPRODUCTDIR%%/ZWiki/ZWikiWeb.pyc
 %%ZOPEPRODUCTDIR%%/ZWiki/__init__.py
-%%ZOPEPRODUCTDIR%%/ZWiki/refresh.txt
-%%ZOPEPRODUCTDIR%%/ZWiki/version.txt
+%%ZOPEPRODUCTDIR%%/ZWiki/__init__.pyc
 %%ZOPEPRODUCTDIR%%/ZWiki/content/basic/FrontPage.stx
 %%ZOPEPRODUCTDIR%%/ZWiki/content/basic/HelpPage.stx
 %%ZOPEPRODUCTDIR%%/ZWiki/content/basic/WikiWikiWeb.stx
@@ -50,43 +74,57 @@
 %%ZOPEPRODUCTDIR%%/ZWiki/content/dtml/RecentChanges.stxdtml
 %%ZOPEPRODUCTDIR%%/ZWiki/content/dtml/SearchPage.stxdtml
 %%ZOPEPRODUCTDIR%%/ZWiki/content/dtml/UserOptions.stxdtml
-%%ZOPEPRODUCTDIR%%/ZWiki/content/misc/print.dtml
 %%ZOPEPRODUCTDIR%%/ZWiki/content/misc/README
+%%ZOPEPRODUCTDIR%%/ZWiki/content/misc/print.dtml
 %%ZOPEPRODUCTDIR%%/ZWiki/content/misc/toc.py
 %%ZOPEPRODUCTDIR%%/ZWiki/content/misc/view_source.dtml
 %%ZOPEPRODUCTDIR%%/ZWiki/content/tracker/FilterIssues.stxdtml
 %%ZOPEPRODUCTDIR%%/ZWiki/content/tracker/IssueTracker.stxdtml
-%%ZOPEPRODUCTDIR%%/ZWiki/dtml/zwikiPageAdd.dtml
-%%ZOPEPRODUCTDIR%%/ZWiki/dtml/zwikiWebAdd.dtml
-%%ZOPEPRODUCTDIR%%/ZWiki/functionaltests/.cvsignore
-%%ZOPEPRODUCTDIR%%/ZWiki/i18n/fr-CA.po
+%%ZOPEPRODUCTDIR%%/ZWiki/ftests/curltest.py
+%%ZOPEPRODUCTDIR%%/ZWiki/ftests/curltest.pyc
+%%ZOPEPRODUCTDIR%%/ZWiki/ftests/test_plone_zwiki_org.py
+%%ZOPEPRODUCTDIR%%/ZWiki/ftests/test_plone_zwiki_org.pyc
+%%ZOPEPRODUCTDIR%%/ZWiki/ftests/test_zwiki_org.py
+%%ZOPEPRODUCTDIR%%/ZWiki/ftests/test_zwiki_org.pyc
 %%ZOPEPRODUCTDIR%%/ZWiki/i18n/en.po
 %%ZOPEPRODUCTDIR%%/ZWiki/i18n/es.po
-%%ZOPEPRODUCTDIR%%/ZWiki/i18n/zwiki.pot
+%%ZOPEPRODUCTDIR%%/ZWiki/i18n/fr-CA.po
 %%ZOPEPRODUCTDIR%%/ZWiki/i18n/fr.po
 %%ZOPEPRODUCTDIR%%/ZWiki/i18n/ga.po
+%%ZOPEPRODUCTDIR%%/ZWiki/i18n/it.po
+%%ZOPEPRODUCTDIR%%/ZWiki/i18n/pt-BR.po
+%%ZOPEPRODUCTDIR%%/ZWiki/i18n/zh-CN.po
+%%ZOPEPRODUCTDIR%%/ZWiki/i18n/zh-TW.po
+%%ZOPEPRODUCTDIR%%/ZWiki/i18n/zwiki.pot
 %%ZOPEPRODUCTDIR%%/ZWiki/images/ZWikiPage_icon.gif
-%%ZOPEPRODUCTDIR%%/ZWiki/skins/default/backlinks.pt
-%%ZOPEPRODUCTDIR%%/ZWiki/skins/default/README
-%%ZOPEPRODUCTDIR%%/ZWiki/skins/default/contentspage.pt
-%%ZOPEPRODUCTDIR%%/ZWiki/skins/default/diffform.pt
-%%ZOPEPRODUCTDIR%%/ZWiki/skins/default/editform.pt
-%%ZOPEPRODUCTDIR%%/ZWiki/skins/default/filterissues.pt
-%%ZOPEPRODUCTDIR%%/ZWiki/skins/default/filterissuesdtml.dtml
-%%ZOPEPRODUCTDIR%%/ZWiki/skins/default/issuetracker.pt
-%%ZOPEPRODUCTDIR%%/ZWiki/skins/default/issuetrackerdtml.dtml
-%%ZOPEPRODUCTDIR%%/ZWiki/skins/default/recentchanges.pt
-%%ZOPEPRODUCTDIR%%/ZWiki/skins/default/recentchangesdtml.dtml
-%%ZOPEPRODUCTDIR%%/ZWiki/skins/default/searchwiki.pt
-%%ZOPEPRODUCTDIR%%/ZWiki/skins/default/searchwikidtml.dtml
-%%ZOPEPRODUCTDIR%%/ZWiki/skins/default/stylesheet.css
-%%ZOPEPRODUCTDIR%%/ZWiki/skins/default/subscribeform.pt
-%%ZOPEPRODUCTDIR%%/ZWiki/skins/default/useroptions.pt
-%%ZOPEPRODUCTDIR%%/ZWiki/skins/default/useroptionsdtml.dtml
-%%ZOPEPRODUCTDIR%%/ZWiki/skins/default/wikipage.pt
-%%ZOPEPRODUCTDIR%%/ZWiki/skins/default/wikipage_macros.pt
-%%ZOPEPRODUCTDIR%%/ZWiki/skins/zwiki_plone/backlinks.pt
+%%ZOPEPRODUCTDIR%%/ZWiki/refresh.txt
+%%ZOPEPRODUCTDIR%%/ZWiki/skins/standard/README
+%%ZOPEPRODUCTDIR%%/ZWiki/skins/standard/backlinks.pt
+%%ZOPEPRODUCTDIR%%/ZWiki/skins/standard/badtemplate.pt
+%%ZOPEPRODUCTDIR%%/ZWiki/skins/standard/contentspage.pt
+%%ZOPEPRODUCTDIR%%/ZWiki/skins/standard/diffform.pt
+%%ZOPEPRODUCTDIR%%/ZWiki/skins/standard/editform.pt
+%%ZOPEPRODUCTDIR%%/ZWiki/skins/standard/filterissues.pt
+%%ZOPEPRODUCTDIR%%/ZWiki/skins/standard/filterissuesdtml.dtml
+%%ZOPEPRODUCTDIR%%/ZWiki/skins/standard/issuepropertiesformdtml.dtml
+%%ZOPEPRODUCTDIR%%/ZWiki/skins/standard/issuetracker.pt
+%%ZOPEPRODUCTDIR%%/ZWiki/skins/standard/issuetrackerdtml.dtml
+%%ZOPEPRODUCTDIR%%/ZWiki/skins/standard/ratingform.pt
+%%ZOPEPRODUCTDIR%%/ZWiki/skins/standard/recentchanges.pt
+%%ZOPEPRODUCTDIR%%/ZWiki/skins/standard/recentchangesdtml.dtml
+%%ZOPEPRODUCTDIR%%/ZWiki/skins/standard/searchwiki.pt
+%%ZOPEPRODUCTDIR%%/ZWiki/skins/standard/searchwikidtml.dtml
+%%ZOPEPRODUCTDIR%%/ZWiki/skins/standard/stylesheet.css
+%%ZOPEPRODUCTDIR%%/ZWiki/skins/standard/subscribeform.pt
+%%ZOPEPRODUCTDIR%%/ZWiki/skins/standard/useroptions.pt
+%%ZOPEPRODUCTDIR%%/ZWiki/skins/standard/useroptionsdtml.dtml
+%%ZOPEPRODUCTDIR%%/ZWiki/skins/standard/wikipage.pt
+%%ZOPEPRODUCTDIR%%/ZWiki/skins/standard/wikipage_macros.pt
+%%ZOPEPRODUCTDIR%%/ZWiki/skins/zmi/README
+%%ZOPEPRODUCTDIR%%/ZWiki/skins/zmi/addwikiform.dtml
+%%ZOPEPRODUCTDIR%%/ZWiki/skins/zmi/addwikipageform.dtml
 %%ZOPEPRODUCTDIR%%/ZWiki/skins/zwiki_plone/README
+%%ZOPEPRODUCTDIR%%/ZWiki/skins/zwiki_plone/backlinks.pt
 %%ZOPEPRODUCTDIR%%/ZWiki/skins/zwiki_plone/contentspage.pt
 %%ZOPEPRODUCTDIR%%/ZWiki/skins/zwiki_plone/diffform.pt
 %%ZOPEPRODUCTDIR%%/ZWiki/skins/zwiki_plone/editform.pt
@@ -103,87 +141,67 @@
 %%ZOPEPRODUCTDIR%%/ZWiki/skins/zwiki_plone/useroptions.pt
 %%ZOPEPRODUCTDIR%%/ZWiki/skins/zwiki_plone/useroptionsdtml.dtml
 %%ZOPEPRODUCTDIR%%/ZWiki/skins/zwiki_plone/wiki_icon.gif
-%%ZOPEPRODUCTDIR%%/ZWiki/skins/zwiki_plone/wikifolder_edit.py
-%%ZOPEPRODUCTDIR%%/ZWiki/skins/zwiki_plone/wikifolder_edit_form.pt
 %%ZOPEPRODUCTDIR%%/ZWiki/skins/zwiki_plone/wikinav_portlet.pt
 %%ZOPEPRODUCTDIR%%/ZWiki/skins/zwiki_plone/wikipage_footer.pt
 %%ZOPEPRODUCTDIR%%/ZWiki/skins/zwiki_plone/wikipage_header.pt
 %%ZOPEPRODUCTDIR%%/ZWiki/skins/zwiki_plone/wikipage_icon.gif
 %%ZOPEPRODUCTDIR%%/ZWiki/skins/zwiki_plone/wikipage_view.pt
-%%ZOPEPRODUCTDIR%%/ZWiki/skins/zwiki_plone/wikifolder_edit.pyc
-%%ZOPEPRODUCTDIR%%/ZWiki/tests/.cvsignore
 %%ZOPEPRODUCTDIR%%/ZWiki/tests/README.txt
 %%ZOPEPRODUCTDIR%%/ZWiki/tests/__init__.py
-%%ZOPEPRODUCTDIR%%/ZWiki/tests/framework.py
-%%ZOPEPRODUCTDIR%%/ZWiki/tests/support.py
-%%ZOPEPRODUCTDIR%%/ZWiki/tests/testAdmin.py
-%%ZOPEPRODUCTDIR%%/ZWiki/tests/testCMFPlone.py
-%%ZOPEPRODUCTDIR%%/ZWiki/tests/testCatalogAwareness.py
-%%ZOPEPRODUCTDIR%%/ZWiki/tests/testDiff.py
-%%ZOPEPRODUCTDIR%%/ZWiki/tests/testEditing.py
-%%ZOPEPRODUCTDIR%%/ZWiki/tests/testMail.py
-%%ZOPEPRODUCTDIR%%/ZWiki/tests/testMessages.py
-%%ZOPEPRODUCTDIR%%/ZWiki/tests/testOutline.py
-%%ZOPEPRODUCTDIR%%/ZWiki/tests/testPageTypes.py
-%%ZOPEPRODUCTDIR%%/ZWiki/tests/testParents.py
-%%ZOPEPRODUCTDIR%%/ZWiki/tests/testPurpleNumbers.py
-%%ZOPEPRODUCTDIR%%/ZWiki/tests/testZWikiPage.py
-%%ZOPEPRODUCTDIR%%/ZWiki/tests/testZWikiWeb.py
-%%ZOPEPRODUCTDIR%%/ZWiki/tests/testmailin.py
 %%ZOPEPRODUCTDIR%%/ZWiki/tests/__init__.pyc
+%%ZOPEPRODUCTDIR%%/ZWiki/tests/framework.py
 %%ZOPEPRODUCTDIR%%/ZWiki/tests/framework.pyc
+%%ZOPEPRODUCTDIR%%/ZWiki/tests/support.py
 %%ZOPEPRODUCTDIR%%/ZWiki/tests/support.pyc
+%%ZOPEPRODUCTDIR%%/ZWiki/tests/testAdmin.py
 %%ZOPEPRODUCTDIR%%/ZWiki/tests/testAdmin.pyc
+%%ZOPEPRODUCTDIR%%/ZWiki/tests/testCMFPlone.py
 %%ZOPEPRODUCTDIR%%/ZWiki/tests/testCMFPlone.pyc
+%%ZOPEPRODUCTDIR%%/ZWiki/tests/testCatalogAwareness.py
 %%ZOPEPRODUCTDIR%%/ZWiki/tests/testCatalogAwareness.pyc
+%%ZOPEPRODUCTDIR%%/ZWiki/tests/testComments.py
+%%ZOPEPRODUCTDIR%%/ZWiki/tests/testComments.pyc
+%%ZOPEPRODUCTDIR%%/ZWiki/tests/testDiff.py
 %%ZOPEPRODUCTDIR%%/ZWiki/tests/testDiff.pyc
+%%ZOPEPRODUCTDIR%%/ZWiki/tests/testEditing.py
 %%ZOPEPRODUCTDIR%%/ZWiki/tests/testEditing.pyc
+%%ZOPEPRODUCTDIR%%/ZWiki/tests/testI18n.py
+%%ZOPEPRODUCTDIR%%/ZWiki/tests/testI18n.pyc
+%%ZOPEPRODUCTDIR%%/ZWiki/tests/testMail.py
 %%ZOPEPRODUCTDIR%%/ZWiki/tests/testMail.pyc
-%%ZOPEPRODUCTDIR%%/ZWiki/tests/testMessages.pyc
+%%ZOPEPRODUCTDIR%%/ZWiki/tests/testOutline.py
 %%ZOPEPRODUCTDIR%%/ZWiki/tests/testOutline.pyc
+%%ZOPEPRODUCTDIR%%/ZWiki/tests/testPageTypes.py
 %%ZOPEPRODUCTDIR%%/ZWiki/tests/testPageTypes.pyc
+%%ZOPEPRODUCTDIR%%/ZWiki/tests/testParents.py
 %%ZOPEPRODUCTDIR%%/ZWiki/tests/testParents.pyc
+%%ZOPEPRODUCTDIR%%/ZWiki/tests/testPurpleNumbers.py
 %%ZOPEPRODUCTDIR%%/ZWiki/tests/testPurpleNumbers.pyc
+%%ZOPEPRODUCTDIR%%/ZWiki/tests/testRating.py
+%%ZOPEPRODUCTDIR%%/ZWiki/tests/testRating.pyc
+%%ZOPEPRODUCTDIR%%/ZWiki/tests/testTracker.py
+%%ZOPEPRODUCTDIR%%/ZWiki/tests/testTracker.pyc
+%%ZOPEPRODUCTDIR%%/ZWiki/tests/testUI.py
+%%ZOPEPRODUCTDIR%%/ZWiki/tests/testUI.pyc
+%%ZOPEPRODUCTDIR%%/ZWiki/tests/testZWikiPage.py
 %%ZOPEPRODUCTDIR%%/ZWiki/tests/testZWikiPage.pyc
+%%ZOPEPRODUCTDIR%%/ZWiki/tests/testZWikiWeb.py
 %%ZOPEPRODUCTDIR%%/ZWiki/tests/testZWikiWeb.pyc
+%%ZOPEPRODUCTDIR%%/ZWiki/tests/testmailin.py
 %%ZOPEPRODUCTDIR%%/ZWiki/tests/testmailin.pyc
-%%ZOPEPRODUCTDIR%%/ZWiki/Admin.pyc
-%%ZOPEPRODUCTDIR%%/ZWiki/CMF.pyc
-%%ZOPEPRODUCTDIR%%/ZWiki/CMFInit.pyc
-%%ZOPEPRODUCTDIR%%/ZWiki/CatalogAwareness.pyc
-%%ZOPEPRODUCTDIR%%/ZWiki/Defaults.pyc
-%%ZOPEPRODUCTDIR%%/ZWiki/Diff.pyc
-%%ZOPEPRODUCTDIR%%/ZWiki/Editing.pyc
-%%ZOPEPRODUCTDIR%%/ZWiki/Fit.pyc
-%%ZOPEPRODUCTDIR%%/ZWiki/LocalizerSupport.pyc
-%%ZOPEPRODUCTDIR%%/ZWiki/Mail.pyc
-%%ZOPEPRODUCTDIR%%/ZWiki/Messages.pyc
-%%ZOPEPRODUCTDIR%%/ZWiki/Outline.pyc
-%%ZOPEPRODUCTDIR%%/ZWiki/OutlineSupport.pyc
-%%ZOPEPRODUCTDIR%%/ZWiki/PageTypes.pyc
-%%ZOPEPRODUCTDIR%%/ZWiki/Permissions.pyc
-%%ZOPEPRODUCTDIR%%/ZWiki/PurpleNumbers.pyc
-%%ZOPEPRODUCTDIR%%/ZWiki/Regexps.pyc
-%%ZOPEPRODUCTDIR%%/ZWiki/Regulations.pyc
-%%ZOPEPRODUCTDIR%%/ZWiki/TextFormatter.pyc
-%%ZOPEPRODUCTDIR%%/ZWiki/Tracker.pyc
-%%ZOPEPRODUCTDIR%%/ZWiki/UI.pyc
-%%ZOPEPRODUCTDIR%%/ZWiki/Utils.pyc
-%%ZOPEPRODUCTDIR%%/ZWiki/WWML.pyc
-%%ZOPEPRODUCTDIR%%/ZWiki/ZWikiPage.pyc
-%%ZOPEPRODUCTDIR%%/ZWiki/ZWikiWeb.pyc
-%%ZOPEPRODUCTDIR%%/ZWiki/__init__.pyc
+%%ZOPEPRODUCTDIR%%/ZWiki/version.txt
+%%ZOPEPRODUCTDIR%%/ZWiki/.cvsignore
 @dirrm %%ZOPEPRODUCTDIR%%/ZWiki/Extensions
 @dirrm %%ZOPEPRODUCTDIR%%/ZWiki/content/basic
 @dirrm %%ZOPEPRODUCTDIR%%/ZWiki/content/dtml
 @dirrm %%ZOPEPRODUCTDIR%%/ZWiki/content/misc
 @dirrm %%ZOPEPRODUCTDIR%%/ZWiki/content/tracker
 @dirrm %%ZOPEPRODUCTDIR%%/ZWiki/content
-@dirrm %%ZOPEPRODUCTDIR%%/ZWiki/dtml
-@dirrm %%ZOPEPRODUCTDIR%%/ZWiki/functionaltests
+@dirrm %%ZOPEPRODUCTDIR%%/ZWiki/ftests
 @dirrm %%ZOPEPRODUCTDIR%%/ZWiki/i18n
 @dirrm %%ZOPEPRODUCTDIR%%/ZWiki/images
-@dirrm %%ZOPEPRODUCTDIR%%/ZWiki/skins/default
+@dirrm %%ZOPEPRODUCTDIR%%/ZWiki/skins/standard
+@dirrm %%ZOPEPRODUCTDIR%%/ZWiki/skins/zmi
 @dirrm %%ZOPEPRODUCTDIR%%/ZWiki/skins/zwiki_plone
 @dirrm %%ZOPEPRODUCTDIR%%/ZWiki/skins
 @dirrm %%ZOPEPRODUCTDIR%%/ZWiki/tests