Upgrade to Twisted 1.0.5.

Twisted no longer supports Python 2.1.
author: Neil Blakey-Milner <nbm@FreeBSD.org> 2003-05-12 11:25:26 +0000
committer: Neil Blakey-Milner <nbm@FreeBSD.org> 2003-05-12 11:25:26 +0000
commit: ecb1fa8756d45e461d6cb61a8aa131d55ebefde2 (patch)
tree: df2ffbaab6045ea29fc0d2dc4f185b179dde9374 /devel/py-twisted
parent: editors/xemacs-comm-packages is obsolete. *_DEPENDS pointed to (diff)
4 files changed, 158 insertions, 314 deletions
diff --git a/devel/py-twisted/Makefile b/devel/py-twisted/Makefile
index e627e8b6d1f1..b3efb3b52d5f 100644
--- a/devel/py-twisted/Makefile
+++ b/devel/py-twisted/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	twisted
-PORTVERSION=	1.0.4
+PORTVERSION=	1.0.5
 CATEGORIES=	devel net python
 MASTER_SITES=	http://twisted.sourceforge.net/ \
 		http://twistedmatrix.com/downloads/
diff --git a/devel/py-twisted/distinfo b/devel/py-twisted/distinfo
index 12676d834545..51b2ab9c195f 100644
--- a/devel/py-twisted/distinfo
+++ b/devel/py-twisted/distinfo
@@ -1 +1 @@
-MD5 (Twisted-1.0.4.tar.bz2) = 03f943e0c960d3b94e7e113a9f49b1d0
+MD5 (Twisted-1.0.5.tar.bz2) = 33d0cf733174ff131dd7f21ba0719782
diff --git a/devel/py-twisted/pkg-plist b/devel/py-twisted/pkg-plist
index 290f31f17b4f..2aeaae82ec64 100644
--- a/devel/py-twisted/pkg-plist
+++ b/devel/py-twisted/pkg-plist
@@ -592,9 +592,6 @@ lib/%%PYTHON_VERSION%%/site-packages/twisted/protocols/pop3.pyo
 lib/%%PYTHON_VERSION%%/site-packages/twisted/protocols/portforward.py
 lib/%%PYTHON_VERSION%%/site-packages/twisted/protocols/portforward.pyc
 lib/%%PYTHON_VERSION%%/site-packages/twisted/protocols/portforward.pyo
-lib/%%PYTHON_VERSION%%/site-packages/twisted/protocols/protocol.py
-lib/%%PYTHON_VERSION%%/site-packages/twisted/protocols/protocol.pyc
-lib/%%PYTHON_VERSION%%/site-packages/twisted/protocols/protocol.pyo
 lib/%%PYTHON_VERSION%%/site-packages/twisted/protocols/shoutcast.py
 lib/%%PYTHON_VERSION%%/site-packages/twisted/protocols/shoutcast.pyc
 lib/%%PYTHON_VERSION%%/site-packages/twisted/protocols/shoutcast.pyo
@@ -625,12 +622,9 @@ lib/%%PYTHON_VERSION%%/site-packages/twisted/python/compat.pyo
 lib/%%PYTHON_VERSION%%/site-packages/twisted/python/components.py
 lib/%%PYTHON_VERSION%%/site-packages/twisted/python/components.pyc
 lib/%%PYTHON_VERSION%%/site-packages/twisted/python/components.pyo
-lib/%%PYTHON_VERSION%%/site-packages/twisted/python/defer.py
-lib/%%PYTHON_VERSION%%/site-packages/twisted/python/defer.pyc
-lib/%%PYTHON_VERSION%%/site-packages/twisted/python/defer.pyo
-lib/%%PYTHON_VERSION%%/site-packages/twisted/python/delay.py
-lib/%%PYTHON_VERSION%%/site-packages/twisted/python/delay.pyc
-lib/%%PYTHON_VERSION%%/site-packages/twisted/python/delay.pyo
+lib/%%PYTHON_VERSION%%/site-packages/twisted/python/context.py
+lib/%%PYTHON_VERSION%%/site-packages/twisted/python/context.pyc
+lib/%%PYTHON_VERSION%%/site-packages/twisted/python/context.pyo
 lib/%%PYTHON_VERSION%%/site-packages/twisted/python/dispatch.py
 lib/%%PYTHON_VERSION%%/site-packages/twisted/python/dispatch.pyc
 lib/%%PYTHON_VERSION%%/site-packages/twisted/python/dispatch.pyo
@@ -676,9 +670,6 @@ lib/%%PYTHON_VERSION%%/site-packages/twisted/python/plugin.pyo
 lib/%%PYTHON_VERSION%%/site-packages/twisted/python/rebuild.py
 lib/%%PYTHON_VERSION%%/site-packages/twisted/python/rebuild.pyc
 lib/%%PYTHON_VERSION%%/site-packages/twisted/python/rebuild.pyo
-lib/%%PYTHON_VERSION%%/site-packages/twisted/python/reference.py
-lib/%%PYTHON_VERSION%%/site-packages/twisted/python/reference.pyc
-lib/%%PYTHON_VERSION%%/site-packages/twisted/python/reference.pyo
 lib/%%PYTHON_VERSION%%/site-packages/twisted/python/reflect.py
 lib/%%PYTHON_VERSION%%/site-packages/twisted/python/reflect.pyc
 lib/%%PYTHON_VERSION%%/site-packages/twisted/python/reflect.pyo
@@ -715,6 +706,9 @@ lib/%%PYTHON_VERSION%%/site-packages/twisted/python/usage.pyo
 lib/%%PYTHON_VERSION%%/site-packages/twisted/python/util.py
 lib/%%PYTHON_VERSION%%/site-packages/twisted/python/util.pyc
 lib/%%PYTHON_VERSION%%/site-packages/twisted/python/util.pyo
+lib/%%PYTHON_VERSION%%/site-packages/twisted/python/win32.py
+lib/%%PYTHON_VERSION%%/site-packages/twisted/python/win32.pyc
+lib/%%PYTHON_VERSION%%/site-packages/twisted/python/win32.pyo
 lib/%%PYTHON_VERSION%%/site-packages/twisted/runner/__init__.py
 lib/%%PYTHON_VERSION%%/site-packages/twisted/runner/__init__.pyc
 lib/%%PYTHON_VERSION%%/site-packages/twisted/runner/__init__.pyo
@@ -727,6 +721,7 @@ lib/%%PYTHON_VERSION%%/site-packages/twisted/runner/inetdconf.pyo
 lib/%%PYTHON_VERSION%%/site-packages/twisted/runner/inetdtap.py
 lib/%%PYTHON_VERSION%%/site-packages/twisted/runner/inetdtap.pyc
 lib/%%PYTHON_VERSION%%/site-packages/twisted/runner/inetdtap.pyo
+lib/%%PYTHON_VERSION%%/site-packages/twisted/runner/portmap.so
 lib/%%PYTHON_VERSION%%/site-packages/twisted/runner/procmon.py
 lib/%%PYTHON_VERSION%%/site-packages/twisted/runner/procmon.pyc
 lib/%%PYTHON_VERSION%%/site-packages/twisted/runner/procmon.pyo
@@ -935,12 +930,18 @@ lib/%%PYTHON_VERSION%%/site-packages/twisted/test/test_bounce.pyo
 lib/%%PYTHON_VERSION%%/site-packages/twisted/test/test_coil.py
 lib/%%PYTHON_VERSION%%/site-packages/twisted/test/test_coil.pyc
 lib/%%PYTHON_VERSION%%/site-packages/twisted/test/test_coil.pyo
+lib/%%PYTHON_VERSION%%/site-packages/twisted/test/test_compat.py
+lib/%%PYTHON_VERSION%%/site-packages/twisted/test/test_compat.pyc
+lib/%%PYTHON_VERSION%%/site-packages/twisted/test/test_compat.pyo
 lib/%%PYTHON_VERSION%%/site-packages/twisted/test/test_components.py
 lib/%%PYTHON_VERSION%%/site-packages/twisted/test/test_components.pyc
 lib/%%PYTHON_VERSION%%/site-packages/twisted/test/test_components.pyo
 lib/%%PYTHON_VERSION%%/site-packages/twisted/test/test_conch.py
 lib/%%PYTHON_VERSION%%/site-packages/twisted/test/test_conch.pyc
 lib/%%PYTHON_VERSION%%/site-packages/twisted/test/test_conch.pyo
+lib/%%PYTHON_VERSION%%/site-packages/twisted/test/test_context.py
+lib/%%PYTHON_VERSION%%/site-packages/twisted/test/test_context.pyc
+lib/%%PYTHON_VERSION%%/site-packages/twisted/test/test_context.pyo
 lib/%%PYTHON_VERSION%%/site-packages/twisted/test/test_cred.py
 lib/%%PYTHON_VERSION%%/site-packages/twisted/test/test_cred.pyc
 lib/%%PYTHON_VERSION%%/site-packages/twisted/test/test_cred.pyo
@@ -968,6 +969,9 @@ lib/%%PYTHON_VERSION%%/site-packages/twisted/test/test_enterprise.pyo
 lib/%%PYTHON_VERSION%%/site-packages/twisted/test/test_explorer.py
 lib/%%PYTHON_VERSION%%/site-packages/twisted/test/test_explorer.pyc
 lib/%%PYTHON_VERSION%%/site-packages/twisted/test/test_explorer.pyo
+lib/%%PYTHON_VERSION%%/site-packages/twisted/test/test_factories.py
+lib/%%PYTHON_VERSION%%/site-packages/twisted/test/test_factories.pyc
+lib/%%PYTHON_VERSION%%/site-packages/twisted/test/test_factories.pyo
 lib/%%PYTHON_VERSION%%/site-packages/twisted/test/test_failure.py
 lib/%%PYTHON_VERSION%%/site-packages/twisted/test/test_failure.pyc
 lib/%%PYTHON_VERSION%%/site-packages/twisted/test/test_failure.pyo
@@ -1007,6 +1011,9 @@ lib/%%PYTHON_VERSION%%/site-packages/twisted/test/test_jelly.pyo
 lib/%%PYTHON_VERSION%%/site-packages/twisted/test/test_journal.py
 lib/%%PYTHON_VERSION%%/site-packages/twisted/test/test_journal.pyc
 lib/%%PYTHON_VERSION%%/site-packages/twisted/test/test_journal.pyo
+lib/%%PYTHON_VERSION%%/site-packages/twisted/test/test_log.py
+lib/%%PYTHON_VERSION%%/site-packages/twisted/test/test_log.pyc
+lib/%%PYTHON_VERSION%%/site-packages/twisted/test/test_log.pyo
 lib/%%PYTHON_VERSION%%/site-packages/twisted/test/test_logfile.py
 lib/%%PYTHON_VERSION%%/site-packages/twisted/test/test_logfile.pyc
 lib/%%PYTHON_VERSION%%/site-packages/twisted/test/test_logfile.pyo
@@ -1160,9 +1167,18 @@ lib/%%PYTHON_VERSION%%/site-packages/twisted/trial/__init__.pyo
 lib/%%PYTHON_VERSION%%/site-packages/twisted/trial/remote.py
 lib/%%PYTHON_VERSION%%/site-packages/twisted/trial/remote.pyc
 lib/%%PYTHON_VERSION%%/site-packages/twisted/trial/remote.pyo
+lib/%%PYTHON_VERSION%%/site-packages/twisted/trial/reporter.py
+lib/%%PYTHON_VERSION%%/site-packages/twisted/trial/reporter.pyc
+lib/%%PYTHON_VERSION%%/site-packages/twisted/trial/reporter.pyo
+lib/%%PYTHON_VERSION%%/site-packages/twisted/trial/runner.py
+lib/%%PYTHON_VERSION%%/site-packages/twisted/trial/runner.pyc
+lib/%%PYTHON_VERSION%%/site-packages/twisted/trial/runner.pyo
 lib/%%PYTHON_VERSION%%/site-packages/twisted/trial/unittest.py
 lib/%%PYTHON_VERSION%%/site-packages/twisted/trial/unittest.pyc
 lib/%%PYTHON_VERSION%%/site-packages/twisted/trial/unittest.pyo
+lib/%%PYTHON_VERSION%%/site-packages/twisted/trial/util.py
+lib/%%PYTHON_VERSION%%/site-packages/twisted/trial/util.pyc
+lib/%%PYTHON_VERSION%%/site-packages/twisted/trial/util.pyo
 lib/%%PYTHON_VERSION%%/site-packages/twisted/web/__init__.py
 lib/%%PYTHON_VERSION%%/site-packages/twisted/web/__init__.pyc
 lib/%%PYTHON_VERSION%%/site-packages/twisted/web/__init__.pyo
@@ -1250,6 +1266,12 @@ lib/%%PYTHON_VERSION%%/site-packages/twisted/web/widgets.pyo
 lib/%%PYTHON_VERSION%%/site-packages/twisted/web/wmvc.py
 lib/%%PYTHON_VERSION%%/site-packages/twisted/web/wmvc.pyc
 lib/%%PYTHON_VERSION%%/site-packages/twisted/web/wmvc.pyo
+lib/%%PYTHON_VERSION%%/site-packages/twisted/web/woven/FlashConduit.fla
+lib/%%PYTHON_VERSION%%/site-packages/twisted/web/woven/FlashConduit.swf
+lib/%%PYTHON_VERSION%%/site-packages/twisted/web/woven/FlashConduitGlue.html
+lib/%%PYTHON_VERSION%%/site-packages/twisted/web/woven/WebConduit2_mozilla.js
+lib/%%PYTHON_VERSION%%/site-packages/twisted/web/woven/WebConduit2_msie.js
+lib/%%PYTHON_VERSION%%/site-packages/twisted/web/woven/WebConduitGlue.html
 lib/%%PYTHON_VERSION%%/site-packages/twisted/web/woven/__init__.py
 lib/%%PYTHON_VERSION%%/site-packages/twisted/web/woven/__init__.pyc
 lib/%%PYTHON_VERSION%%/site-packages/twisted/web/woven/__init__.pyo
@@ -1338,18 +1360,11 @@ lib/%%PYTHON_VERSION%%/site-packages/twisted/zoot/zoottap.pyo
 %%PORTDOCS%%share/doc/twisted/api/epydoc.css
 %%PORTDOCS%%share/doc/twisted/api/index.html
 %%PORTDOCS%%share/doc/twisted/api/private/Queue.Queue.html
-%%PORTDOCS%%share/doc/twisted/api/private/Tkinter.BaseWidget.html
-%%PORTDOCS%%share/doc/twisted/api/private/Tkinter.Frame.html
-%%PORTDOCS%%share/doc/twisted/api/private/Tkinter.Grid.html
-%%PORTDOCS%%share/doc/twisted/api/private/Tkinter.Menu.html
-%%PORTDOCS%%share/doc/twisted/api/private/Tkinter.Misc.html
-%%PORTDOCS%%share/doc/twisted/api/private/Tkinter.Pack.html
-%%PORTDOCS%%share/doc/twisted/api/private/Tkinter.Place.html
-%%PORTDOCS%%share/doc/twisted/api/private/Tkinter.Toplevel.html
-%%PORTDOCS%%share/doc/twisted/api/private/Tkinter.Widget.html
-%%PORTDOCS%%share/doc/twisted/api/private/Tkinter.Wm.html
 %%PORTDOCS%%share/doc/twisted/api/private/UserDict.UserDict.html
 %%PORTDOCS%%share/doc/twisted/api/private/UserList.UserList.html
+%%PORTDOCS%%share/doc/twisted/api/private/__builtin__.object.html
+%%PORTDOCS%%share/doc/twisted/api/private/__builtin__.str.html
+%%PORTDOCS%%share/doc/twisted/api/private/__builtin__.type.html
 %%PORTDOCS%%share/doc/twisted/api/private/codecs.Codec.html
 %%PORTDOCS%%share/doc/twisted/api/private/codecs.StreamReader.html
 %%PORTDOCS%%share/doc/twisted/api/private/codecs.StreamWriter.html
@@ -1368,11 +1383,6 @@ lib/%%PYTHON_VERSION%%/site-packages/twisted/zoot/zoottap.pyo
 %%PORTDOCS%%share/doc/twisted/api/private/help.html
 %%PORTDOCS%%share/doc/twisted/api/private/index.html
 %%PORTDOCS%%share/doc/twisted/api/private/indices.html
-%%PORTDOCS%%share/doc/twisted/api/private/tkCommonDialog.Dialog.html
-%%PORTDOCS%%share/doc/twisted/api/private/tkFileDialog._Dialog.html
-%%PORTDOCS%%share/doc/twisted/api/private/tkSimpleDialog.Dialog.html
-%%PORTDOCS%%share/doc/twisted/api/private/tkSimpleDialog._QueryDialog.html
-%%PORTDOCS%%share/doc/twisted/api/private/tkSimpleDialog._QueryString.html
 %%PORTDOCS%%share/doc/twisted/api/private/toc-everything.html
 %%PORTDOCS%%share/doc/twisted/api/private/toc-twisted.coil.app.html
 %%PORTDOCS%%share/doc/twisted/api/private/toc-twisted.coil.coil.html
@@ -1564,7 +1574,6 @@ lib/%%PYTHON_VERSION%%/site-packages/twisted/zoot/zoottap.pyo
 %%PORTDOCS%%share/doc/twisted/api/private/toc-twisted.protocols.policies.html
 %%PORTDOCS%%share/doc/twisted/api/private/toc-twisted.protocols.pop3.html
 %%PORTDOCS%%share/doc/twisted/api/private/toc-twisted.protocols.portforward.html
-%%PORTDOCS%%share/doc/twisted/api/private/toc-twisted.protocols.protocol.html
 %%PORTDOCS%%share/doc/twisted/api/private/toc-twisted.protocols.shoutcast.html
 %%PORTDOCS%%share/doc/twisted/api/private/toc-twisted.protocols.smtp.html
 %%PORTDOCS%%share/doc/twisted/api/private/toc-twisted.protocols.socks.html
@@ -1574,8 +1583,7 @@ lib/%%PYTHON_VERSION%%/site-packages/twisted/zoot/zoottap.pyo
 %%PORTDOCS%%share/doc/twisted/api/private/toc-twisted.protocols.wire.html
 %%PORTDOCS%%share/doc/twisted/api/private/toc-twisted.python.compat.html
 %%PORTDOCS%%share/doc/twisted/api/private/toc-twisted.python.components.html
-%%PORTDOCS%%share/doc/twisted/api/private/toc-twisted.python.defer.html
-%%PORTDOCS%%share/doc/twisted/api/private/toc-twisted.python.delay.html
+%%PORTDOCS%%share/doc/twisted/api/private/toc-twisted.python.context.html
 %%PORTDOCS%%share/doc/twisted/api/private/toc-twisted.python.dispatch.html
 %%PORTDOCS%%share/doc/twisted/api/private/toc-twisted.python.domhelpers.html
 %%PORTDOCS%%share/doc/twisted/api/private/toc-twisted.python.dxprofile.html
@@ -1592,7 +1600,6 @@ lib/%%PYTHON_VERSION%%/site-packages/twisted/zoot/zoottap.pyo
 %%PORTDOCS%%share/doc/twisted/api/private/toc-twisted.python.otp.html
 %%PORTDOCS%%share/doc/twisted/api/private/toc-twisted.python.plugin.html
 %%PORTDOCS%%share/doc/twisted/api/private/toc-twisted.python.rebuild.html
-%%PORTDOCS%%share/doc/twisted/api/private/toc-twisted.python.reference.html
 %%PORTDOCS%%share/doc/twisted/api/private/toc-twisted.python.reflect.html
 %%PORTDOCS%%share/doc/twisted/api/private/toc-twisted.python.register.html
 %%PORTDOCS%%share/doc/twisted/api/private/toc-twisted.python.roots.html
@@ -1605,6 +1612,7 @@ lib/%%PYTHON_VERSION%%/site-packages/twisted/zoot/zoottap.pyo
 %%PORTDOCS%%share/doc/twisted/api/private/toc-twisted.python.timeoutqueue.html
 %%PORTDOCS%%share/doc/twisted/api/private/toc-twisted.python.usage.html
 %%PORTDOCS%%share/doc/twisted/api/private/toc-twisted.python.util.html
+%%PORTDOCS%%share/doc/twisted/api/private/toc-twisted.python.win32.html
 %%PORTDOCS%%share/doc/twisted/api/private/toc-twisted.runner.html
 %%PORTDOCS%%share/doc/twisted/api/private/toc-twisted.runner.inetd.html
 %%PORTDOCS%%share/doc/twisted/api/private/toc-twisted.runner.inetdconf.html
@@ -1666,7 +1674,10 @@ lib/%%PYTHON_VERSION%%/site-packages/twisted/zoot/zoottap.pyo
 %%PORTDOCS%%share/doc/twisted/api/private/toc-twisted.test.html
 %%PORTDOCS%%share/doc/twisted/api/private/toc-twisted.trial.html
 %%PORTDOCS%%share/doc/twisted/api/private/toc-twisted.trial.remote.html
+%%PORTDOCS%%share/doc/twisted/api/private/toc-twisted.trial.reporter.html
+%%PORTDOCS%%share/doc/twisted/api/private/toc-twisted.trial.runner.html
 %%PORTDOCS%%share/doc/twisted/api/private/toc-twisted.trial.unittest.html
+%%PORTDOCS%%share/doc/twisted/api/private/toc-twisted.trial.util.html
 %%PORTDOCS%%share/doc/twisted/api/private/toc-twisted.web.client.html
 %%PORTDOCS%%share/doc/twisted/api/private/toc-twisted.web.distrib.html
 %%PORTDOCS%%share/doc/twisted/api/private/toc-twisted.web.domhandlers.html
@@ -1734,10 +1745,6 @@ lib/%%PYTHON_VERSION%%/site-packages/twisted/zoot/zoottap.pyo
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.coil.coil.ConfigCollection.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.coil.coil.Configurator.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.coil.coil.DispenserStorage.html
-%%PORTDOCS%%share/doc/twisted/api/private/twisted.coil.coil.ICollection.html
-%%PORTDOCS%%share/doc/twisted/api/private/twisted.coil.coil.IConfigCollection.html
-%%PORTDOCS%%share/doc/twisted/api/private/twisted.coil.coil.IConfigurator.html
-%%PORTDOCS%%share/doc/twisted/api/private/twisted.coil.coil.IStaticCollection.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.coil.coil.InvalidConfiguration.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.coil.coil.StaticCollection.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.coil.coil.html
@@ -1826,7 +1833,6 @@ lib/%%PYTHON_VERSION%%/site-packages/twisted/zoot/zoottap.pyo
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.conch.ui.ansi.ColorText.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.conch.ui.ansi.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.conch.ui.html
-%%PORTDOCS%%share/doc/twisted/api/private/twisted.conch.ui.tkvt100.VT100Frame.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.conch.ui.tkvt100.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.copyright.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.cred.authorizer.Authorizer.html
@@ -1841,7 +1847,6 @@ lib/%%PYTHON_VERSION%%/site-packages/twisted/zoot/zoottap.pyo
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.cred.identity.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.cred.perspective.Perspective.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.cred.perspective.html
-%%PORTDOCS%%share/doc/twisted/api/private/twisted.cred.service.IService.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.cred.service.Service.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.cred.service.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.cred.util.html
@@ -1907,13 +1912,6 @@ lib/%%PYTHON_VERSION%%/site-packages/twisted/zoot/zoottap.pyo
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.im.gtkcommon.InputOutputWindow.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.im.gtkcommon.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.im.html
-%%PORTDOCS%%share/doc/twisted/api/private/twisted.im.interfaces.IAccount.html
-%%PORTDOCS%%share/doc/twisted/api/private/twisted.im.interfaces.IChatUI.html
-%%PORTDOCS%%share/doc/twisted/api/private/twisted.im.interfaces.IClient.html
-%%PORTDOCS%%share/doc/twisted/api/private/twisted.im.interfaces.IConversation.html
-%%PORTDOCS%%share/doc/twisted/api/private/twisted.im.interfaces.IGroup.html
-%%PORTDOCS%%share/doc/twisted/api/private/twisted.im.interfaces.IGroupConversation.html
-%%PORTDOCS%%share/doc/twisted/api/private/twisted.im.interfaces.IPerson.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.im.interfaces.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.im.ircsupport.IRCAccount.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.im.ircsupport.IRCGroup.html
@@ -2002,46 +2000,9 @@ lib/%%PYTHON_VERSION%%/site-packages/twisted/zoot/zoottap.pyo
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.internet.gtkreactor.PortableGtkReactor.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.internet.gtkreactor.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.internet.html
-%%PORTDOCS%%share/doc/twisted/api/private/twisted.internet.interfaces.IConnector.html
-%%PORTDOCS%%share/doc/twisted/api/private/twisted.internet.interfaces.IConsumer.html
-%%PORTDOCS%%share/doc/twisted/api/private/twisted.internet.interfaces.IDelayedCall.html
-%%PORTDOCS%%share/doc/twisted/api/private/twisted.internet.interfaces.IFileDescriptor.html
-%%PORTDOCS%%share/doc/twisted/api/private/twisted.internet.interfaces.IFinishableConsumer.html
-%%PORTDOCS%%share/doc/twisted/api/private/twisted.internet.interfaces.IListeningPort.html
-%%PORTDOCS%%share/doc/twisted/api/private/twisted.internet.interfaces.IMulticastTransport.html
-%%PORTDOCS%%share/doc/twisted/api/private/twisted.internet.interfaces.IProcessTransport.html
-%%PORTDOCS%%share/doc/twisted/api/private/twisted.internet.interfaces.IProducer.html
-%%PORTDOCS%%share/doc/twisted/api/private/twisted.internet.interfaces.IProtocol.html
-%%PORTDOCS%%share/doc/twisted/api/private/twisted.internet.interfaces.IProtocolFactory.html
-%%PORTDOCS%%share/doc/twisted/api/private/twisted.internet.interfaces.IPullProducer.html
-%%PORTDOCS%%share/doc/twisted/api/private/twisted.internet.interfaces.IPushProducer.html
-%%PORTDOCS%%share/doc/twisted/api/private/twisted.internet.interfaces.IReactorArbitrary.html
-%%PORTDOCS%%share/doc/twisted/api/private/twisted.internet.interfaces.IReactorCore.html
-%%PORTDOCS%%share/doc/twisted/api/private/twisted.internet.interfaces.IReactorFDSet.html
-%%PORTDOCS%%share/doc/twisted/api/private/twisted.internet.interfaces.IReactorMulticast.html
-%%PORTDOCS%%share/doc/twisted/api/private/twisted.internet.interfaces.IReactorPluggableResolver.html
-%%PORTDOCS%%share/doc/twisted/api/private/twisted.internet.interfaces.IReactorProcess.html
-%%PORTDOCS%%share/doc/twisted/api/private/twisted.internet.interfaces.IReactorSSL.html
-%%PORTDOCS%%share/doc/twisted/api/private/twisted.internet.interfaces.IReactorTCP.html
-%%PORTDOCS%%share/doc/twisted/api/private/twisted.internet.interfaces.IReactorThreads.html
-%%PORTDOCS%%share/doc/twisted/api/private/twisted.internet.interfaces.IReactorTime.html
-%%PORTDOCS%%share/doc/twisted/api/private/twisted.internet.interfaces.IReactorUDP.html
-%%PORTDOCS%%share/doc/twisted/api/private/twisted.internet.interfaces.IReactorUNIX.html
-%%PORTDOCS%%share/doc/twisted/api/private/twisted.internet.interfaces.IReadDescriptor.html
-%%PORTDOCS%%share/doc/twisted/api/private/twisted.internet.interfaces.IReadWriteDescriptor.html
-%%PORTDOCS%%share/doc/twisted/api/private/twisted.internet.interfaces.IResolver.html
-%%PORTDOCS%%share/doc/twisted/api/private/twisted.internet.interfaces.IResolverSimple.html
-%%PORTDOCS%%share/doc/twisted/api/private/twisted.internet.interfaces.ISSLTransport.html
-%%PORTDOCS%%share/doc/twisted/api/private/twisted.internet.interfaces.IServiceCollection.html
-%%PORTDOCS%%share/doc/twisted/api/private/twisted.internet.interfaces.ITCPTransport.html
-%%PORTDOCS%%share/doc/twisted/api/private/twisted.internet.interfaces.ITransport.html
-%%PORTDOCS%%share/doc/twisted/api/private/twisted.internet.interfaces.IUDPConnectedTransport.html
-%%PORTDOCS%%share/doc/twisted/api/private/twisted.internet.interfaces.IUDPTransport.html
-%%PORTDOCS%%share/doc/twisted/api/private/twisted.internet.interfaces.IWriteDescriptor.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.internet.interfaces.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.internet.javareactor.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.internet.kqreactor.html
-%%PORTDOCS%%share/doc/twisted/api/private/twisted.internet.main.Delayeds.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.internet.main.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.internet.pollreactor.PollReactor.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.internet.pollreactor.html
@@ -2078,7 +2039,6 @@ lib/%%PYTHON_VERSION%%/site-packages/twisted/zoot/zoottap.pyo
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.internet.serialport.win32serialport.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.internet.ssl.Client.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.internet.ssl.ClientContextFactory.html
-%%PORTDOCS%%share/doc/twisted/api/private/twisted.internet.ssl.Connection.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.internet.ssl.Connector.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.internet.ssl.ContextFactory.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.internet.ssl.DefaultOpenSSLContextFactory.html
@@ -2095,6 +2055,7 @@ lib/%%PYTHON_VERSION%%/site-packages/twisted/zoot/zoottap.pyo
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.internet.tcp.Connector.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.internet.tcp.Port.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.internet.tcp.Server.html
+%%PORTDOCS%%share/doc/twisted/api/private/twisted.internet.tcp._TLSMixin.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.internet.tcp.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.internet.threads.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.internet.tksupport.html
@@ -2161,7 +2122,6 @@ lib/%%PYTHON_VERSION%%/site-packages/twisted/zoot/zoottap.pyo
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.mail.mail.BounceDomain.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.mail.mail.DomainWithDefaultDict.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.mail.mail.FileMessage.html
-%%PORTDOCS%%share/doc/twisted/api/private/twisted.mail.mail.IDomain.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.mail.mail.MailService.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.mail.mail.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.mail.maildir.AbstractMaildirDomain.html
@@ -2210,7 +2170,6 @@ lib/%%PYTHON_VERSION%%/site-packages/twisted/zoot/zoottap.pyo
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.manhole.explorer.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.manhole.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.manhole.service.FakeStdIO.html
-%%PORTDOCS%%share/doc/twisted/api/private/twisted.manhole.service.IManholeClient.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.manhole.service.Perspective.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.manhole.service.Service.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.manhole.service.html
@@ -2291,8 +2250,6 @@ lib/%%PYTHON_VERSION%%/site-packages/twisted/zoot/zoottap.pyo
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.persisted.dirdbm.Shelf.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.persisted.dirdbm.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.persisted.html
-%%PORTDOCS%%share/doc/twisted/api/private/twisted.persisted.journal.base.ICommand.html
-%%PORTDOCS%%share/doc/twisted/api/private/twisted.persisted.journal.base.ICommandLog.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.persisted.journal.base.Journal.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.persisted.journal.base.LoadingService.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.persisted.journal.base.MemoryJournal.html
@@ -2318,7 +2275,6 @@ lib/%%PYTHON_VERSION%%/site-packages/twisted/zoot/zoottap.pyo
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.popsicle.freezer.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.popsicle.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.popsicle.mailsicle.DefaultSaver.html
-%%PORTDOCS%%share/doc/twisted/api/private/twisted.popsicle.mailsicle.IHeaderSaver.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.popsicle.mailsicle.IdentitySaver.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.popsicle.mailsicle.Mailsicle.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.popsicle.mailsicle.MailsicleAuthorizer.html
@@ -2414,7 +2370,6 @@ lib/%%PYTHON_VERSION%%/site-packages/twisted/zoot/zoottap.pyo
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.protocols.htb.FilterByHost.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.protocols.htb.FilterByServer.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.protocols.htb.HierarchicalBucketFilter.html
-%%PORTDOCS%%share/doc/twisted/api/private/twisted.protocols.htb.IBucketFilter.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.protocols.htb.ShapedConsumer.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.protocols.htb.ShapedProtocolFactory.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.protocols.htb.ShapedTransport.html
@@ -2426,18 +2381,13 @@ lib/%%PYTHON_VERSION%%/site-packages/twisted/zoot/zoottap.pyo
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.protocols.http.Request.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.protocols.http.StringTransport.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.protocols.http.html
-%%PORTDOCS%%share/doc/twisted/api/private/twisted.protocols.imap4.AuthenticationError.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.protocols.imap4.Command.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.protocols.imap4.CramMD5ClientAuthenticator.html
+%%PORTDOCS%%share/doc/twisted/api/private/twisted.protocols.imap4.CramMD5Identity.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.protocols.imap4.CramMD5ServerAuthenticator.html
-%%PORTDOCS%%share/doc/twisted/api/private/twisted.protocols.imap4.IAccount.html
-%%PORTDOCS%%share/doc/twisted/api/private/twisted.protocols.imap4.IClientAuthentication.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.protocols.imap4.IMAP4Client.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.protocols.imap4.IMAP4Exception.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.protocols.imap4.IMAP4Server.html
-%%PORTDOCS%%share/doc/twisted/api/private/twisted.protocols.imap4.IMailbox.html
-%%PORTDOCS%%share/doc/twisted/api/private/twisted.protocols.imap4.IMailboxListener.html
-%%PORTDOCS%%share/doc/twisted/api/private/twisted.protocols.imap4.IServerAuthentication.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.protocols.imap4.IllegalClientResponse.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.protocols.imap4.IllegalIdentifierError.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.protocols.imap4.IllegalMailboxEncoding.html
@@ -2526,12 +2476,10 @@ lib/%%PYTHON_VERSION%%/site-packages/twisted/zoot/zoottap.pyo
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.protocols.portforward.ProxyFactory.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.protocols.portforward.ProxyServer.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.protocols.portforward.html
-%%PORTDOCS%%share/doc/twisted/api/private/twisted.protocols.protocol.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.protocols.shoutcast.ShoutcastClient.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.protocols.shoutcast.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.protocols.smtp.Address.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.protocols.smtp.AddressError.html
-%%PORTDOCS%%share/doc/twisted/api/private/twisted.protocols.smtp.IMessage.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.protocols.smtp.NDeferred.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.protocols.smtp.SMTP.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.protocols.smtp.SMTPClient.html
@@ -2569,24 +2517,18 @@ lib/%%PYTHON_VERSION%%/site-packages/twisted/zoot/zoottap.pyo
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.protocols.wire.Time.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.protocols.wire.Who.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.protocols.wire.html
-%%PORTDOCS%%share/doc/twisted/api/private/twisted.python.compat.StopIteration.html
-%%PORTDOCS%%share/doc/twisted/api/private/twisted.python.compat._ListIterator.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.python.compat.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.python.components.Adapter.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.python.components.AdapterRegistry.html
+%%PORTDOCS%%share/doc/twisted/api/private/twisted.python.components.CannotAdapt.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.python.components.Componentized.html
-%%PORTDOCS%%share/doc/twisted/api/private/twisted.python.components.Interface.html
+%%PORTDOCS%%share/doc/twisted/api/private/twisted.python.components.MetaInterface.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.python.components._Nothing.html
+%%PORTDOCS%%share/doc/twisted/api/private/twisted.python.components._ThingWithTwoSlots.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.python.components.html
-%%PORTDOCS%%share/doc/twisted/api/private/twisted.python.defer.html
-%%PORTDOCS%%share/doc/twisted/api/private/twisted.python.delay.IDelayed.html
-%%PORTDOCS%%share/doc/twisted/api/private/twisted.python.delay.Later.html
-%%PORTDOCS%%share/doc/twisted/api/private/twisted.python.delay.LockstepSimulation.html
-%%PORTDOCS%%share/doc/twisted/api/private/twisted.python.delay.Looping.html
-%%PORTDOCS%%share/doc/twisted/api/private/twisted.python.delay.Steps.html
-%%PORTDOCS%%share/doc/twisted/api/private/twisted.python.delay.StopLooping.html
-%%PORTDOCS%%share/doc/twisted/api/private/twisted.python.delay.Time.html
-%%PORTDOCS%%share/doc/twisted/api/private/twisted.python.delay.html
+%%PORTDOCS%%share/doc/twisted/api/private/twisted.python.context.ContextTracker.html
+%%PORTDOCS%%share/doc/twisted/api/private/twisted.python.context.ThreadedContextTracker.html
+%%PORTDOCS%%share/doc/twisted/api/private/twisted.python.context.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.python.dispatch.EventDispatcher.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.python.dispatch.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.python.domhelpers.html
@@ -2620,12 +2562,14 @@ lib/%%PYTHON_VERSION%%/site-packages/twisted/zoot/zoottap.pyo
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.python.htmlizer.HTMLWriter.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.python.htmlizer.TokenPrinter.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.python.htmlizer.html
-%%PORTDOCS%%share/doc/twisted/api/private/twisted.python.log.Log.html
-%%PORTDOCS%%share/doc/twisted/api/private/twisted.python.log.LogOwner.html
+%%PORTDOCS%%share/doc/twisted/api/private/twisted.python.log.DefaultObserver.html
+%%PORTDOCS%%share/doc/twisted/api/private/twisted.python.log.EscapeFromTheMeaninglessConfinesOfCapital.html
+%%PORTDOCS%%share/doc/twisted/api/private/twisted.python.log.FileLogObserver.html
+%%PORTDOCS%%share/doc/twisted/api/private/twisted.python.log.ILogContext.html
+%%PORTDOCS%%share/doc/twisted/api/private/twisted.python.log.LogPublisher.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.python.log.Logger.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.python.log.NullFile.html
-%%PORTDOCS%%share/doc/twisted/api/private/twisted.python.log.Output.html
-%%PORTDOCS%%share/doc/twisted/api/private/twisted.python.log.ThreadedLogOwner.html
+%%PORTDOCS%%share/doc/twisted/api/private/twisted.python.log.StdioOnnaStick.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.python.log.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.python.logfile.BaseLogFile.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.python.logfile.DailyLogFile.html
@@ -2654,19 +2598,14 @@ lib/%%PYTHON_VERSION%%/site-packages/twisted/zoot/zoottap.pyo
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.python.plugin.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.python.rebuild.Sensitive.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.python.rebuild.html
-%%PORTDOCS%%share/doc/twisted/api/private/twisted.python.reference.AttributeReference.html
-%%PORTDOCS%%share/doc/twisted/api/private/twisted.python.reference.Deferred.html
-%%PORTDOCS%%share/doc/twisted/api/private/twisted.python.reference.Reference.html
-%%PORTDOCS%%share/doc/twisted/api/private/twisted.python.reference.Resolver.html
-%%PORTDOCS%%share/doc/twisted/api/private/twisted.python.reference.html
+%%PORTDOCS%%share/doc/twisted/api/private/twisted.python.reflect.AccessorType.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.python.reflect.OriginalAccessor.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.python.reflect.Promise.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.python.reflect.QueueMethod.html
+%%PORTDOCS%%share/doc/twisted/api/private/twisted.python.reflect.SRE_Pattern.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.python.reflect.Settable.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.python.reflect.Summer.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.python.reflect.html
-%%PORTDOCS%%share/doc/twisted/api/private/twisted.python.reflect.object.html
-%%PORTDOCS%%share/doc/twisted/api/private/twisted.python.reflect.type22.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.python.register.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.python.roots.Collection.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.python.roots.Constrained.html
@@ -2699,6 +2638,7 @@ lib/%%PYTHON_VERSION%%/site-packages/twisted/zoot/zoottap.pyo
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.python.usage.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.python.util.OrderedDict.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.python.util.html
+%%PORTDOCS%%share/doc/twisted/api/private/twisted.python.win32.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.runner.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.runner.inetd.InetdFactory.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.runner.inetd.InetdProtocol.html
@@ -2759,21 +2699,8 @@ lib/%%PYTHON_VERSION%%/site-packages/twisted/zoot/zoottap.pyo
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.scripts.tapconvert.LoaderTap.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.scripts.tapconvert.LoaderXML.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.scripts.tapconvert.html
-%%PORTDOCS%%share/doc/twisted/api/private/twisted.scripts.tkconch.GeneralOptions.html
-%%PORTDOCS%%share/doc/twisted/api/private/twisted.scripts.tkconch.SSHClientFactory.html
-%%PORTDOCS%%share/doc/twisted/api/private/twisted.scripts.tkconch.SSHClientTransport.html
-%%PORTDOCS%%share/doc/twisted/api/private/twisted.scripts.tkconch.SSHConnection.html
-%%PORTDOCS%%share/doc/twisted/api/private/twisted.scripts.tkconch.SSHSession.html
-%%PORTDOCS%%share/doc/twisted/api/private/twisted.scripts.tkconch.SSHUserAuthClient.html
-%%PORTDOCS%%share/doc/twisted/api/private/twisted.scripts.tkconch.TkConchMenu.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.scripts.tkconch.html
-%%PORTDOCS%%share/doc/twisted/api/private/twisted.scripts.tkmktap.ParameterLine.html
-%%PORTDOCS%%share/doc/twisted/api/private/twisted.scripts.tkmktap.TkAppMenu.html
-%%PORTDOCS%%share/doc/twisted/api/private/twisted.scripts.tkmktap.TkConfigFrame.html
-%%PORTDOCS%%share/doc/twisted/api/private/twisted.scripts.tkmktap.TkMkAppFrame.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.scripts.tkmktap.html
-%%PORTDOCS%%share/doc/twisted/api/private/twisted.scripts.tktwistd.TkTwistdFrame.html
-%%PORTDOCS%%share/doc/twisted/api/private/twisted.scripts.tktwistd.TkTwistdMenu.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.scripts.tktwistd.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.scripts.trial.Options.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.scripts.trial.html
@@ -2878,18 +2805,7 @@ lib/%%PYTHON_VERSION%%/site-packages/twisted/zoot/zoottap.pyo
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.spread.ui.gtkutil.ButtonBar.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.spread.ui.gtkutil.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.spread.ui.html
-%%PORTDOCS%%share/doc/twisted/api/private/twisted.spread.ui.tktree.FileNode.html
-%%PORTDOCS%%share/doc/twisted/api/private/twisted.spread.ui.tktree.ListboxTree.html
-%%PORTDOCS%%share/doc/twisted/api/private/twisted.spread.ui.tktree.ListboxTreeItem.html
-%%PORTDOCS%%share/doc/twisted/api/private/twisted.spread.ui.tktree.Node.html
-%%PORTDOCS%%share/doc/twisted/api/private/twisted.spread.ui.tktree.TreeItem.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.spread.ui.tktree.html
-%%PORTDOCS%%share/doc/twisted/api/private/twisted.spread.ui.tkutil.CList.html
-%%PORTDOCS%%share/doc/twisted/api/private/twisted.spread.ui.tkutil.DirectoryBrowser.html
-%%PORTDOCS%%share/doc/twisted/api/private/twisted.spread.ui.tkutil.GenericLogin.html
-%%PORTDOCS%%share/doc/twisted/api/private/twisted.spread.ui.tkutil.Login.html
-%%PORTDOCS%%share/doc/twisted/api/private/twisted.spread.ui.tkutil.ProgressBar.html
-%%PORTDOCS%%share/doc/twisted/api/private/twisted.spread.ui.tkutil._QueryPassword.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.spread.ui.tkutil.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.spread.util.CallbackPageCollector.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.spread.util.LocalAsRemote.html
@@ -2931,23 +2847,28 @@ lib/%%PYTHON_VERSION%%/site-packages/twisted/zoot/zoottap.pyo
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.trial.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.trial.remote.DecodeReport.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.trial.remote.DemoRemoteReporter.html
-%%PORTDOCS%%share/doc/twisted/api/private/twisted.trial.remote.IRemoteReporter.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.trial.remote.JellyReporter.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.trial.remote.NullTransport.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.trial.remote.OneWayBanana.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.trial.remote.TrialProcessProtocol.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.trial.remote._Demo.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.trial.remote.html
+%%PORTDOCS%%share/doc/twisted/api/private/twisted.trial.reporter.MinimalReporter.html
+%%PORTDOCS%%share/doc/twisted/api/private/twisted.trial.reporter.Reporter.html
+%%PORTDOCS%%share/doc/twisted/api/private/twisted.trial.reporter.TextReporter.html
+%%PORTDOCS%%share/doc/twisted/api/private/twisted.trial.reporter.TreeReporter.html
+%%PORTDOCS%%share/doc/twisted/api/private/twisted.trial.reporter.VerboseTextReporter.html
+%%PORTDOCS%%share/doc/twisted/api/private/twisted.trial.reporter.html
+%%PORTDOCS%%share/doc/twisted/api/private/twisted.trial.runner.SingletonRunner.html
+%%PORTDOCS%%share/doc/twisted/api/private/twisted.trial.runner.TestClassRunner.html
+%%PORTDOCS%%share/doc/twisted/api/private/twisted.trial.runner.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.trial.unittest.FailTest.html
-%%PORTDOCS%%share/doc/twisted/api/private/twisted.trial.unittest.MinimalReporter.html
-%%PORTDOCS%%share/doc/twisted/api/private/twisted.trial.unittest.Reporter.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.trial.unittest.SkipTest.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.trial.unittest.TestCase.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.trial.unittest.TestSuite.html
-%%PORTDOCS%%share/doc/twisted/api/private/twisted.trial.unittest.TextReporter.html
-%%PORTDOCS%%share/doc/twisted/api/private/twisted.trial.unittest.TreeReporter.html
-%%PORTDOCS%%share/doc/twisted/api/private/twisted.trial.unittest.VerboseTextReporter.html
+%%PORTDOCS%%share/doc/twisted/api/private/twisted.trial.unittest.Tester.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.trial.unittest.html
+%%PORTDOCS%%share/doc/twisted/api/private/twisted.trial.util.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.web.client.HTTPClientFactory.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.web.client.HTTPDownloader.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.web.client.HTTPPageDownloader.html
@@ -3009,7 +2930,6 @@ lib/%%PYTHON_VERSION%%/site-packages/twisted/zoot/zoottap.pyo
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.web.proxy.ReverseProxyRequest.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.web.proxy.ReverseProxyResource.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.web.proxy.html
-%%PORTDOCS%%share/doc/twisted/api/private/twisted.web.resource.IResource.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.web.resource.Resource.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.web.resource.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.web.rewrite.RewriterResource.html
@@ -3017,6 +2937,7 @@ lib/%%PYTHON_VERSION%%/site-packages/twisted/zoot/zoottap.pyo
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.web.script.AlreadyCached.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.web.script.CacheScanner.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.web.script.PythonScript.html
+%%PORTDOCS%%share/doc/twisted/api/private/twisted.web.script.ResourceScriptDirectory.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.web.script.ResourceScriptWrapper.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.web.script.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.web.server.Request.html
@@ -3031,6 +2952,7 @@ lib/%%PYTHON_VERSION%%/site-packages/twisted/zoot/zoottap.pyo
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.web.spider.HTTPDownloader.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.web.spider.SpiderSender.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.web.spider.html
+%%PORTDOCS%%share/doc/twisted/api/private/twisted.web.static.ASISProcessor.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.web.static.Data.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.web.static.DirectoryListing.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.web.static.File.html
@@ -3107,10 +3029,6 @@ lib/%%PYTHON_VERSION%%/site-packages/twisted/zoot/zoottap.pyo
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.web.woven.input.NewObject.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.web.woven.input.SingleValue.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.web.woven.input.html
-%%PORTDOCS%%share/doc/twisted/api/private/twisted.web.woven.interfaces.IController.html
-%%PORTDOCS%%share/doc/twisted/api/private/twisted.web.woven.interfaces.IModel.html
-%%PORTDOCS%%share/doc/twisted/api/private/twisted.web.woven.interfaces.IView.html
-%%PORTDOCS%%share/doc/twisted/api/private/twisted.web.woven.interfaces.IWovenLivePage.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.web.woven.interfaces.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.web.woven.model.AttributeModel.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.web.woven.model.AttributeWrapper.html
@@ -3135,7 +3053,6 @@ lib/%%PYTHON_VERSION%%/site-packages/twisted/zoot/zoottap.pyo
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.web.woven.tapestry.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.web.woven.template.DOMController.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.web.woven.template.DOMTemplate.html
-%%PORTDOCS%%share/doc/twisted/api/private/twisted.web.woven.template.INodeMutator.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.web.woven.template.NodeMutator.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.web.woven.template.NodeNodeMutator.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.web.woven.template.NoneNodeMutator.html
@@ -3175,6 +3092,7 @@ lib/%%PYTHON_VERSION%%/site-packages/twisted/zoot/zoottap.pyo
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.web.woven.widgets.Link.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.web.woven.widgets.List.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.web.woven.widgets.Option.html
+%%PORTDOCS%%share/doc/twisted/api/private/twisted.web.woven.widgets.ParagraphText.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.web.woven.widgets.PasswordText.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.web.woven.widgets.RadioButton.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.web.woven.widgets.RawText.html
@@ -3200,8 +3118,6 @@ lib/%%PYTHON_VERSION%%/site-packages/twisted/zoot/zoottap.pyo
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.words.ircservice.IRCGateway.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.words.ircservice.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.words.service.Group.html
-%%PORTDOCS%%share/doc/twisted/api/private/twisted.words.service.IWordsClient.html
-%%PORTDOCS%%share/doc/twisted/api/private/twisted.words.service.IWordsPolicy.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.words.service.NormalPolicy.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.words.service.NotInCollectionError.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.words.service.NotInGroupError.html
@@ -3237,21 +3153,13 @@ lib/%%PYTHON_VERSION%%/site-packages/twisted/zoot/zoottap.pyo
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.zoot.zoot.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.zoot.zoottap.Options.html
 %%PORTDOCS%%share/doc/twisted/api/private/twisted.zoot.zoottap.html
-%%PORTDOCS%%share/doc/twisted/api/private/types.InstanceType.html
-%%PORTDOCS%%share/doc/twisted/api/private/types.StringType.html
+%%PORTDOCS%%share/doc/twisted/api/private/types.instance.html
 %%PORTDOCS%%share/doc/twisted/api/public/Queue.Queue.html
-%%PORTDOCS%%share/doc/twisted/api/public/Tkinter.BaseWidget.html
-%%PORTDOCS%%share/doc/twisted/api/public/Tkinter.Frame.html
-%%PORTDOCS%%share/doc/twisted/api/public/Tkinter.Grid.html
-%%PORTDOCS%%share/doc/twisted/api/public/Tkinter.Menu.html
-%%PORTDOCS%%share/doc/twisted/api/public/Tkinter.Misc.html
-%%PORTDOCS%%share/doc/twisted/api/public/Tkinter.Pack.html
-%%PORTDOCS%%share/doc/twisted/api/public/Tkinter.Place.html
-%%PORTDOCS%%share/doc/twisted/api/public/Tkinter.Toplevel.html
-%%PORTDOCS%%share/doc/twisted/api/public/Tkinter.Widget.html
-%%PORTDOCS%%share/doc/twisted/api/public/Tkinter.Wm.html
 %%PORTDOCS%%share/doc/twisted/api/public/UserDict.UserDict.html
 %%PORTDOCS%%share/doc/twisted/api/public/UserList.UserList.html
+%%PORTDOCS%%share/doc/twisted/api/public/__builtin__.object.html
+%%PORTDOCS%%share/doc/twisted/api/public/__builtin__.str.html
+%%PORTDOCS%%share/doc/twisted/api/public/__builtin__.type.html
 %%PORTDOCS%%share/doc/twisted/api/public/epydoc.css
 %%PORTDOCS%%share/doc/twisted/api/public/exceptions.AssertionError.html
 %%PORTDOCS%%share/doc/twisted/api/public/exceptions.EnvironmentError.html
@@ -3267,8 +3175,6 @@ lib/%%PYTHON_VERSION%%/site-packages/twisted/zoot/zoottap.pyo
 %%PORTDOCS%%share/doc/twisted/api/public/help.html
 %%PORTDOCS%%share/doc/twisted/api/public/index.html
 %%PORTDOCS%%share/doc/twisted/api/public/indices.html
-%%PORTDOCS%%share/doc/twisted/api/public/tkCommonDialog.Dialog.html
-%%PORTDOCS%%share/doc/twisted/api/public/tkSimpleDialog.Dialog.html
 %%PORTDOCS%%share/doc/twisted/api/public/toc-everything.html
 %%PORTDOCS%%share/doc/twisted/api/public/toc-twisted.coil.app.html
 %%PORTDOCS%%share/doc/twisted/api/public/toc-twisted.coil.coil.html
@@ -3460,7 +3366,6 @@ lib/%%PYTHON_VERSION%%/site-packages/twisted/zoot/zoottap.pyo
 %%PORTDOCS%%share/doc/twisted/api/public/toc-twisted.protocols.policies.html
 %%PORTDOCS%%share/doc/twisted/api/public/toc-twisted.protocols.pop3.html
 %%PORTDOCS%%share/doc/twisted/api/public/toc-twisted.protocols.portforward.html
-%%PORTDOCS%%share/doc/twisted/api/public/toc-twisted.protocols.protocol.html
 %%PORTDOCS%%share/doc/twisted/api/public/toc-twisted.protocols.shoutcast.html
 %%PORTDOCS%%share/doc/twisted/api/public/toc-twisted.protocols.smtp.html
 %%PORTDOCS%%share/doc/twisted/api/public/toc-twisted.protocols.socks.html
@@ -3470,8 +3375,7 @@ lib/%%PYTHON_VERSION%%/site-packages/twisted/zoot/zoottap.pyo
 %%PORTDOCS%%share/doc/twisted/api/public/toc-twisted.protocols.wire.html
 %%PORTDOCS%%share/doc/twisted/api/public/toc-twisted.python.compat.html
 %%PORTDOCS%%share/doc/twisted/api/public/toc-twisted.python.components.html
-%%PORTDOCS%%share/doc/twisted/api/public/toc-twisted.python.defer.html
-%%PORTDOCS%%share/doc/twisted/api/public/toc-twisted.python.delay.html
+%%PORTDOCS%%share/doc/twisted/api/public/toc-twisted.python.context.html
 %%PORTDOCS%%share/doc/twisted/api/public/toc-twisted.python.dispatch.html
 %%PORTDOCS%%share/doc/twisted/api/public/toc-twisted.python.domhelpers.html
 %%PORTDOCS%%share/doc/twisted/api/public/toc-twisted.python.dxprofile.html
@@ -3488,7 +3392,6 @@ lib/%%PYTHON_VERSION%%/site-packages/twisted/zoot/zoottap.pyo
 %%PORTDOCS%%share/doc/twisted/api/public/toc-twisted.python.otp.html
 %%PORTDOCS%%share/doc/twisted/api/public/toc-twisted.python.plugin.html
 %%PORTDOCS%%share/doc/twisted/api/public/toc-twisted.python.rebuild.html
-%%PORTDOCS%%share/doc/twisted/api/public/toc-twisted.python.reference.html
 %%PORTDOCS%%share/doc/twisted/api/public/toc-twisted.python.reflect.html
 %%PORTDOCS%%share/doc/twisted/api/public/toc-twisted.python.register.html
 %%PORTDOCS%%share/doc/twisted/api/public/toc-twisted.python.roots.html
@@ -3501,6 +3404,7 @@ lib/%%PYTHON_VERSION%%/site-packages/twisted/zoot/zoottap.pyo
 %%PORTDOCS%%share/doc/twisted/api/public/toc-twisted.python.timeoutqueue.html
 %%PORTDOCS%%share/doc/twisted/api/public/toc-twisted.python.usage.html
 %%PORTDOCS%%share/doc/twisted/api/public/toc-twisted.python.util.html
+%%PORTDOCS%%share/doc/twisted/api/public/toc-twisted.python.win32.html
 %%PORTDOCS%%share/doc/twisted/api/public/toc-twisted.runner.html
 %%PORTDOCS%%share/doc/twisted/api/public/toc-twisted.runner.inetd.html
 %%PORTDOCS%%share/doc/twisted/api/public/toc-twisted.runner.inetdconf.html
@@ -3562,7 +3466,10 @@ lib/%%PYTHON_VERSION%%/site-packages/twisted/zoot/zoottap.pyo
 %%PORTDOCS%%share/doc/twisted/api/public/toc-twisted.test.html
 %%PORTDOCS%%share/doc/twisted/api/public/toc-twisted.trial.html
 %%PORTDOCS%%share/doc/twisted/api/public/toc-twisted.trial.remote.html
+%%PORTDOCS%%share/doc/twisted/api/public/toc-twisted.trial.reporter.html
+%%PORTDOCS%%share/doc/twisted/api/public/toc-twisted.trial.runner.html
 %%PORTDOCS%%share/doc/twisted/api/public/toc-twisted.trial.unittest.html
+%%PORTDOCS%%share/doc/twisted/api/public/toc-twisted.trial.util.html
 %%PORTDOCS%%share/doc/twisted/api/public/toc-twisted.web.client.html
 %%PORTDOCS%%share/doc/twisted/api/public/toc-twisted.web.distrib.html
 %%PORTDOCS%%share/doc/twisted/api/public/toc-twisted.web.domhandlers.html
@@ -3630,10 +3537,6 @@ lib/%%PYTHON_VERSION%%/site-packages/twisted/zoot/zoottap.pyo
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.coil.coil.ConfigCollection.html
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.coil.coil.Configurator.html
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.coil.coil.DispenserStorage.html
-%%PORTDOCS%%share/doc/twisted/api/public/twisted.coil.coil.ICollection.html
-%%PORTDOCS%%share/doc/twisted/api/public/twisted.coil.coil.IConfigCollection.html
-%%PORTDOCS%%share/doc/twisted/api/public/twisted.coil.coil.IConfigurator.html
-%%PORTDOCS%%share/doc/twisted/api/public/twisted.coil.coil.IStaticCollection.html
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.coil.coil.InvalidConfiguration.html
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.coil.coil.StaticCollection.html
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.coil.coil.html
@@ -3722,7 +3625,6 @@ lib/%%PYTHON_VERSION%%/site-packages/twisted/zoot/zoottap.pyo
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.conch.ui.ansi.ColorText.html
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.conch.ui.ansi.html
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.conch.ui.html
-%%PORTDOCS%%share/doc/twisted/api/public/twisted.conch.ui.tkvt100.VT100Frame.html
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.conch.ui.tkvt100.html
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.copyright.html
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.cred.authorizer.Authorizer.html
@@ -3737,7 +3639,6 @@ lib/%%PYTHON_VERSION%%/site-packages/twisted/zoot/zoottap.pyo
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.cred.identity.html
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.cred.perspective.Perspective.html
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.cred.perspective.html
-%%PORTDOCS%%share/doc/twisted/api/public/twisted.cred.service.IService.html
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.cred.service.Service.html
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.cred.service.html
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.cred.util.html
@@ -3801,13 +3702,6 @@ lib/%%PYTHON_VERSION%%/site-packages/twisted/zoot/zoottap.pyo
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.im.gtkcommon.InputOutputWindow.html
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.im.gtkcommon.html
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.im.html
-%%PORTDOCS%%share/doc/twisted/api/public/twisted.im.interfaces.IAccount.html
-%%PORTDOCS%%share/doc/twisted/api/public/twisted.im.interfaces.IChatUI.html
-%%PORTDOCS%%share/doc/twisted/api/public/twisted.im.interfaces.IClient.html
-%%PORTDOCS%%share/doc/twisted/api/public/twisted.im.interfaces.IConversation.html
-%%PORTDOCS%%share/doc/twisted/api/public/twisted.im.interfaces.IGroup.html
-%%PORTDOCS%%share/doc/twisted/api/public/twisted.im.interfaces.IGroupConversation.html
-%%PORTDOCS%%share/doc/twisted/api/public/twisted.im.interfaces.IPerson.html
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.im.interfaces.html
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.im.ircsupport.IRCAccount.html
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.im.ircsupport.IRCGroup.html
@@ -3880,42 +3774,6 @@ lib/%%PYTHON_VERSION%%/site-packages/twisted/zoot/zoottap.pyo
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.internet.gtk2reactor.html
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.internet.gtkreactor.html
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.internet.html
-%%PORTDOCS%%share/doc/twisted/api/public/twisted.internet.interfaces.IConnector.html
-%%PORTDOCS%%share/doc/twisted/api/public/twisted.internet.interfaces.IConsumer.html
-%%PORTDOCS%%share/doc/twisted/api/public/twisted.internet.interfaces.IDelayedCall.html
-%%PORTDOCS%%share/doc/twisted/api/public/twisted.internet.interfaces.IFileDescriptor.html
-%%PORTDOCS%%share/doc/twisted/api/public/twisted.internet.interfaces.IFinishableConsumer.html
-%%PORTDOCS%%share/doc/twisted/api/public/twisted.internet.interfaces.IListeningPort.html
-%%PORTDOCS%%share/doc/twisted/api/public/twisted.internet.interfaces.IMulticastTransport.html
-%%PORTDOCS%%share/doc/twisted/api/public/twisted.internet.interfaces.IProcessTransport.html
-%%PORTDOCS%%share/doc/twisted/api/public/twisted.internet.interfaces.IProducer.html
-%%PORTDOCS%%share/doc/twisted/api/public/twisted.internet.interfaces.IProtocol.html
-%%PORTDOCS%%share/doc/twisted/api/public/twisted.internet.interfaces.IProtocolFactory.html
-%%PORTDOCS%%share/doc/twisted/api/public/twisted.internet.interfaces.IPullProducer.html
-%%PORTDOCS%%share/doc/twisted/api/public/twisted.internet.interfaces.IPushProducer.html
-%%PORTDOCS%%share/doc/twisted/api/public/twisted.internet.interfaces.IReactorArbitrary.html
-%%PORTDOCS%%share/doc/twisted/api/public/twisted.internet.interfaces.IReactorCore.html
-%%PORTDOCS%%share/doc/twisted/api/public/twisted.internet.interfaces.IReactorFDSet.html
-%%PORTDOCS%%share/doc/twisted/api/public/twisted.internet.interfaces.IReactorMulticast.html
-%%PORTDOCS%%share/doc/twisted/api/public/twisted.internet.interfaces.IReactorPluggableResolver.html
-%%PORTDOCS%%share/doc/twisted/api/public/twisted.internet.interfaces.IReactorProcess.html
-%%PORTDOCS%%share/doc/twisted/api/public/twisted.internet.interfaces.IReactorSSL.html
-%%PORTDOCS%%share/doc/twisted/api/public/twisted.internet.interfaces.IReactorTCP.html
-%%PORTDOCS%%share/doc/twisted/api/public/twisted.internet.interfaces.IReactorThreads.html
-%%PORTDOCS%%share/doc/twisted/api/public/twisted.internet.interfaces.IReactorTime.html
-%%PORTDOCS%%share/doc/twisted/api/public/twisted.internet.interfaces.IReactorUDP.html
-%%PORTDOCS%%share/doc/twisted/api/public/twisted.internet.interfaces.IReactorUNIX.html
-%%PORTDOCS%%share/doc/twisted/api/public/twisted.internet.interfaces.IReadDescriptor.html
-%%PORTDOCS%%share/doc/twisted/api/public/twisted.internet.interfaces.IReadWriteDescriptor.html
-%%PORTDOCS%%share/doc/twisted/api/public/twisted.internet.interfaces.IResolver.html
-%%PORTDOCS%%share/doc/twisted/api/public/twisted.internet.interfaces.IResolverSimple.html
-%%PORTDOCS%%share/doc/twisted/api/public/twisted.internet.interfaces.ISSLTransport.html
-%%PORTDOCS%%share/doc/twisted/api/public/twisted.internet.interfaces.IServiceCollection.html
-%%PORTDOCS%%share/doc/twisted/api/public/twisted.internet.interfaces.ITCPTransport.html
-%%PORTDOCS%%share/doc/twisted/api/public/twisted.internet.interfaces.ITransport.html
-%%PORTDOCS%%share/doc/twisted/api/public/twisted.internet.interfaces.IUDPConnectedTransport.html
-%%PORTDOCS%%share/doc/twisted/api/public/twisted.internet.interfaces.IUDPTransport.html
-%%PORTDOCS%%share/doc/twisted/api/public/twisted.internet.interfaces.IWriteDescriptor.html
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.internet.interfaces.html
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.internet.javareactor.html
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.internet.kqreactor.html
@@ -4024,7 +3882,6 @@ lib/%%PYTHON_VERSION%%/site-packages/twisted/zoot/zoottap.pyo
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.mail.mail.BounceDomain.html
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.mail.mail.DomainWithDefaultDict.html
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.mail.mail.FileMessage.html
-%%PORTDOCS%%share/doc/twisted/api/public/twisted.mail.mail.IDomain.html
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.mail.mail.MailService.html
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.mail.mail.html
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.mail.maildir.AbstractMaildirDomain.html
@@ -4071,7 +3928,6 @@ lib/%%PYTHON_VERSION%%/site-packages/twisted/zoot/zoottap.pyo
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.manhole.explorer.html
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.manhole.html
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.manhole.service.FakeStdIO.html
-%%PORTDOCS%%share/doc/twisted/api/public/twisted.manhole.service.IManholeClient.html
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.manhole.service.Perspective.html
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.manhole.service.Service.html
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.manhole.service.html
@@ -4144,8 +4000,6 @@ lib/%%PYTHON_VERSION%%/site-packages/twisted/zoot/zoottap.pyo
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.persisted.dirdbm.Shelf.html
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.persisted.dirdbm.html
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.persisted.html
-%%PORTDOCS%%share/doc/twisted/api/public/twisted.persisted.journal.base.ICommand.html
-%%PORTDOCS%%share/doc/twisted/api/public/twisted.persisted.journal.base.ICommandLog.html
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.persisted.journal.base.Journal.html
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.persisted.journal.base.LoadingService.html
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.persisted.journal.base.MemoryJournal.html
@@ -4171,7 +4025,6 @@ lib/%%PYTHON_VERSION%%/site-packages/twisted/zoot/zoottap.pyo
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.popsicle.freezer.html
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.popsicle.html
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.popsicle.mailsicle.DefaultSaver.html
-%%PORTDOCS%%share/doc/twisted/api/public/twisted.popsicle.mailsicle.IHeaderSaver.html
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.popsicle.mailsicle.IdentitySaver.html
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.popsicle.mailsicle.Mailsicle.html
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.popsicle.mailsicle.MailsicleAuthorizer.html
@@ -4267,7 +4120,6 @@ lib/%%PYTHON_VERSION%%/site-packages/twisted/zoot/zoottap.pyo
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.protocols.htb.FilterByHost.html
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.protocols.htb.FilterByServer.html
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.protocols.htb.HierarchicalBucketFilter.html
-%%PORTDOCS%%share/doc/twisted/api/public/twisted.protocols.htb.IBucketFilter.html
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.protocols.htb.ShapedConsumer.html
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.protocols.htb.ShapedProtocolFactory.html
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.protocols.htb.ShapedTransport.html
@@ -4279,17 +4131,11 @@ lib/%%PYTHON_VERSION%%/site-packages/twisted/zoot/zoottap.pyo
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.protocols.http.Request.html
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.protocols.http.StringTransport.html
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.protocols.http.html
-%%PORTDOCS%%share/doc/twisted/api/public/twisted.protocols.imap4.AuthenticationError.html
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.protocols.imap4.CramMD5ClientAuthenticator.html
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.protocols.imap4.CramMD5ServerAuthenticator.html
-%%PORTDOCS%%share/doc/twisted/api/public/twisted.protocols.imap4.IAccount.html
-%%PORTDOCS%%share/doc/twisted/api/public/twisted.protocols.imap4.IClientAuthentication.html
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.protocols.imap4.IMAP4Client.html
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.protocols.imap4.IMAP4Exception.html
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.protocols.imap4.IMAP4Server.html
-%%PORTDOCS%%share/doc/twisted/api/public/twisted.protocols.imap4.IMailbox.html
-%%PORTDOCS%%share/doc/twisted/api/public/twisted.protocols.imap4.IMailboxListener.html
-%%PORTDOCS%%share/doc/twisted/api/public/twisted.protocols.imap4.IServerAuthentication.html
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.protocols.imap4.IllegalClientResponse.html
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.protocols.imap4.IllegalIdentifierError.html
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.protocols.imap4.IllegalMailboxEncoding.html
@@ -4376,12 +4222,10 @@ lib/%%PYTHON_VERSION%%/site-packages/twisted/zoot/zoottap.pyo
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.protocols.portforward.ProxyFactory.html
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.protocols.portforward.ProxyServer.html
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.protocols.portforward.html
-%%PORTDOCS%%share/doc/twisted/api/public/twisted.protocols.protocol.html
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.protocols.shoutcast.ShoutcastClient.html
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.protocols.shoutcast.html
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.protocols.smtp.Address.html
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.protocols.smtp.AddressError.html
-%%PORTDOCS%%share/doc/twisted/api/public/twisted.protocols.smtp.IMessage.html
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.protocols.smtp.NDeferred.html
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.protocols.smtp.SMTP.html
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.protocols.smtp.SMTPClient.html
@@ -4419,21 +4263,13 @@ lib/%%PYTHON_VERSION%%/site-packages/twisted/zoot/zoottap.pyo
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.protocols.wire.Time.html
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.protocols.wire.Who.html
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.protocols.wire.html
-%%PORTDOCS%%share/doc/twisted/api/public/twisted.python.compat.StopIteration.html
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.python.compat.html
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.python.components.AdapterRegistry.html
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.python.components.Componentized.html
-%%PORTDOCS%%share/doc/twisted/api/public/twisted.python.components.Interface.html
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.python.components.html
-%%PORTDOCS%%share/doc/twisted/api/public/twisted.python.defer.html
-%%PORTDOCS%%share/doc/twisted/api/public/twisted.python.delay.IDelayed.html
-%%PORTDOCS%%share/doc/twisted/api/public/twisted.python.delay.Later.html
-%%PORTDOCS%%share/doc/twisted/api/public/twisted.python.delay.LockstepSimulation.html
-%%PORTDOCS%%share/doc/twisted/api/public/twisted.python.delay.Looping.html
-%%PORTDOCS%%share/doc/twisted/api/public/twisted.python.delay.Steps.html
-%%PORTDOCS%%share/doc/twisted/api/public/twisted.python.delay.StopLooping.html
-%%PORTDOCS%%share/doc/twisted/api/public/twisted.python.delay.Time.html
-%%PORTDOCS%%share/doc/twisted/api/public/twisted.python.delay.html
+%%PORTDOCS%%share/doc/twisted/api/public/twisted.python.context.ContextTracker.html
+%%PORTDOCS%%share/doc/twisted/api/public/twisted.python.context.ThreadedContextTracker.html
+%%PORTDOCS%%share/doc/twisted/api/public/twisted.python.context.html
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.python.dispatch.EventDispatcher.html
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.python.dispatch.html
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.python.domhelpers.html
@@ -4467,8 +4303,14 @@ lib/%%PYTHON_VERSION%%/site-packages/twisted/zoot/zoottap.pyo
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.python.htmlizer.HTMLWriter.html
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.python.htmlizer.TokenPrinter.html
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.python.htmlizer.html
-%%PORTDOCS%%share/doc/twisted/api/public/twisted.python.log.Log.html
+%%PORTDOCS%%share/doc/twisted/api/public/twisted.python.log.DefaultObserver.html
+%%PORTDOCS%%share/doc/twisted/api/public/twisted.python.log.EscapeFromTheMeaninglessConfinesOfCapital.html
+%%PORTDOCS%%share/doc/twisted/api/public/twisted.python.log.FileLogObserver.html
+%%PORTDOCS%%share/doc/twisted/api/public/twisted.python.log.ILogContext.html
+%%PORTDOCS%%share/doc/twisted/api/public/twisted.python.log.LogPublisher.html
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.python.log.Logger.html
+%%PORTDOCS%%share/doc/twisted/api/public/twisted.python.log.NullFile.html
+%%PORTDOCS%%share/doc/twisted/api/public/twisted.python.log.StdioOnnaStick.html
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.python.log.html
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.python.logfile.BaseLogFile.html
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.python.logfile.DailyLogFile.html
@@ -4495,19 +4337,14 @@ lib/%%PYTHON_VERSION%%/site-packages/twisted/zoot/zoottap.pyo
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.python.plugin.html
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.python.rebuild.Sensitive.html
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.python.rebuild.html
-%%PORTDOCS%%share/doc/twisted/api/public/twisted.python.reference.AttributeReference.html
-%%PORTDOCS%%share/doc/twisted/api/public/twisted.python.reference.Deferred.html
-%%PORTDOCS%%share/doc/twisted/api/public/twisted.python.reference.Reference.html
-%%PORTDOCS%%share/doc/twisted/api/public/twisted.python.reference.Resolver.html
-%%PORTDOCS%%share/doc/twisted/api/public/twisted.python.reference.html
+%%PORTDOCS%%share/doc/twisted/api/public/twisted.python.reflect.AccessorType.html
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.python.reflect.OriginalAccessor.html
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.python.reflect.Promise.html
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.python.reflect.QueueMethod.html
+%%PORTDOCS%%share/doc/twisted/api/public/twisted.python.reflect.SRE_Pattern.html
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.python.reflect.Settable.html
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.python.reflect.Summer.html
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.python.reflect.html
-%%PORTDOCS%%share/doc/twisted/api/public/twisted.python.reflect.object.html
-%%PORTDOCS%%share/doc/twisted/api/public/twisted.python.reflect.type22.html
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.python.register.html
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.python.roots.Collection.html
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.python.roots.Constrained.html
@@ -4537,6 +4374,7 @@ lib/%%PYTHON_VERSION%%/site-packages/twisted/zoot/zoottap.pyo
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.python.usage.html
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.python.util.OrderedDict.html
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.python.util.html
+%%PORTDOCS%%share/doc/twisted/api/public/twisted.python.win32.html
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.runner.html
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.runner.inetd.InetdFactory.html
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.runner.inetd.InetdProtocol.html
@@ -4597,21 +4435,8 @@ lib/%%PYTHON_VERSION%%/site-packages/twisted/zoot/zoottap.pyo
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.scripts.tapconvert.LoaderTap.html
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.scripts.tapconvert.LoaderXML.html
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.scripts.tapconvert.html
-%%PORTDOCS%%share/doc/twisted/api/public/twisted.scripts.tkconch.GeneralOptions.html
-%%PORTDOCS%%share/doc/twisted/api/public/twisted.scripts.tkconch.SSHClientFactory.html
-%%PORTDOCS%%share/doc/twisted/api/public/twisted.scripts.tkconch.SSHClientTransport.html
-%%PORTDOCS%%share/doc/twisted/api/public/twisted.scripts.tkconch.SSHConnection.html
-%%PORTDOCS%%share/doc/twisted/api/public/twisted.scripts.tkconch.SSHSession.html
-%%PORTDOCS%%share/doc/twisted/api/public/twisted.scripts.tkconch.SSHUserAuthClient.html
-%%PORTDOCS%%share/doc/twisted/api/public/twisted.scripts.tkconch.TkConchMenu.html
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.scripts.tkconch.html
-%%PORTDOCS%%share/doc/twisted/api/public/twisted.scripts.tkmktap.ParameterLine.html
-%%PORTDOCS%%share/doc/twisted/api/public/twisted.scripts.tkmktap.TkAppMenu.html
-%%PORTDOCS%%share/doc/twisted/api/public/twisted.scripts.tkmktap.TkConfigFrame.html
-%%PORTDOCS%%share/doc/twisted/api/public/twisted.scripts.tkmktap.TkMkAppFrame.html
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.scripts.tkmktap.html
-%%PORTDOCS%%share/doc/twisted/api/public/twisted.scripts.tktwistd.TkTwistdFrame.html
-%%PORTDOCS%%share/doc/twisted/api/public/twisted.scripts.tktwistd.TkTwistdMenu.html
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.scripts.tktwistd.html
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.scripts.trial.Options.html
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.scripts.trial.html
@@ -4707,17 +4532,7 @@ lib/%%PYTHON_VERSION%%/site-packages/twisted/zoot/zoottap.pyo
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.spread.ui.gtkutil.ButtonBar.html
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.spread.ui.gtkutil.html
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.spread.ui.html
-%%PORTDOCS%%share/doc/twisted/api/public/twisted.spread.ui.tktree.FileNode.html
-%%PORTDOCS%%share/doc/twisted/api/public/twisted.spread.ui.tktree.ListboxTree.html
-%%PORTDOCS%%share/doc/twisted/api/public/twisted.spread.ui.tktree.ListboxTreeItem.html
-%%PORTDOCS%%share/doc/twisted/api/public/twisted.spread.ui.tktree.Node.html
-%%PORTDOCS%%share/doc/twisted/api/public/twisted.spread.ui.tktree.TreeItem.html
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.spread.ui.tktree.html
-%%PORTDOCS%%share/doc/twisted/api/public/twisted.spread.ui.tkutil.CList.html
-%%PORTDOCS%%share/doc/twisted/api/public/twisted.spread.ui.tkutil.DirectoryBrowser.html
-%%PORTDOCS%%share/doc/twisted/api/public/twisted.spread.ui.tkutil.GenericLogin.html
-%%PORTDOCS%%share/doc/twisted/api/public/twisted.spread.ui.tkutil.Login.html
-%%PORTDOCS%%share/doc/twisted/api/public/twisted.spread.ui.tkutil.ProgressBar.html
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.spread.ui.tkutil.html
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.spread.util.CallbackPageCollector.html
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.spread.util.LocalAsRemote.html
@@ -4759,22 +4574,27 @@ lib/%%PYTHON_VERSION%%/site-packages/twisted/zoot/zoottap.pyo
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.trial.html
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.trial.remote.DecodeReport.html
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.trial.remote.DemoRemoteReporter.html
-%%PORTDOCS%%share/doc/twisted/api/public/twisted.trial.remote.IRemoteReporter.html
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.trial.remote.JellyReporter.html
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.trial.remote.NullTransport.html
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.trial.remote.OneWayBanana.html
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.trial.remote.TrialProcessProtocol.html
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.trial.remote.html
+%%PORTDOCS%%share/doc/twisted/api/public/twisted.trial.reporter.MinimalReporter.html
+%%PORTDOCS%%share/doc/twisted/api/public/twisted.trial.reporter.Reporter.html
+%%PORTDOCS%%share/doc/twisted/api/public/twisted.trial.reporter.TextReporter.html
+%%PORTDOCS%%share/doc/twisted/api/public/twisted.trial.reporter.TreeReporter.html
+%%PORTDOCS%%share/doc/twisted/api/public/twisted.trial.reporter.VerboseTextReporter.html
+%%PORTDOCS%%share/doc/twisted/api/public/twisted.trial.reporter.html
+%%PORTDOCS%%share/doc/twisted/api/public/twisted.trial.runner.SingletonRunner.html
+%%PORTDOCS%%share/doc/twisted/api/public/twisted.trial.runner.TestClassRunner.html
+%%PORTDOCS%%share/doc/twisted/api/public/twisted.trial.runner.html
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.trial.unittest.FailTest.html
-%%PORTDOCS%%share/doc/twisted/api/public/twisted.trial.unittest.MinimalReporter.html
-%%PORTDOCS%%share/doc/twisted/api/public/twisted.trial.unittest.Reporter.html
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.trial.unittest.SkipTest.html
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.trial.unittest.TestCase.html
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.trial.unittest.TestSuite.html
-%%PORTDOCS%%share/doc/twisted/api/public/twisted.trial.unittest.TextReporter.html
-%%PORTDOCS%%share/doc/twisted/api/public/twisted.trial.unittest.TreeReporter.html
-%%PORTDOCS%%share/doc/twisted/api/public/twisted.trial.unittest.VerboseTextReporter.html
+%%PORTDOCS%%share/doc/twisted/api/public/twisted.trial.unittest.Tester.html
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.trial.unittest.html
+%%PORTDOCS%%share/doc/twisted/api/public/twisted.trial.util.html
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.web.client.HTTPClientFactory.html
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.web.client.HTTPDownloader.html
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.web.client.HTTPPageDownloader.html
@@ -4833,7 +4653,6 @@ lib/%%PYTHON_VERSION%%/site-packages/twisted/zoot/zoottap.pyo
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.web.proxy.ReverseProxyRequest.html
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.web.proxy.ReverseProxyResource.html
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.web.proxy.html
-%%PORTDOCS%%share/doc/twisted/api/public/twisted.web.resource.IResource.html
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.web.resource.Resource.html
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.web.resource.html
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.web.rewrite.RewriterResource.html
@@ -4841,6 +4660,7 @@ lib/%%PYTHON_VERSION%%/site-packages/twisted/zoot/zoottap.pyo
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.web.script.AlreadyCached.html
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.web.script.CacheScanner.html
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.web.script.PythonScript.html
+%%PORTDOCS%%share/doc/twisted/api/public/twisted.web.script.ResourceScriptDirectory.html
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.web.script.ResourceScriptWrapper.html
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.web.script.html
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.web.server.Request.html
@@ -4854,6 +4674,7 @@ lib/%%PYTHON_VERSION%%/site-packages/twisted/zoot/zoottap.pyo
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.web.spider.HTTPDownloader.html
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.web.spider.SpiderSender.html
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.web.spider.html
+%%PORTDOCS%%share/doc/twisted/api/public/twisted.web.static.ASISProcessor.html
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.web.static.Data.html
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.web.static.DirectoryListing.html
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.web.static.File.html
@@ -4928,10 +4749,6 @@ lib/%%PYTHON_VERSION%%/site-packages/twisted/zoot/zoottap.pyo
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.web.woven.input.NewObject.html
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.web.woven.input.SingleValue.html
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.web.woven.input.html
-%%PORTDOCS%%share/doc/twisted/api/public/twisted.web.woven.interfaces.IController.html
-%%PORTDOCS%%share/doc/twisted/api/public/twisted.web.woven.interfaces.IModel.html
-%%PORTDOCS%%share/doc/twisted/api/public/twisted.web.woven.interfaces.IView.html
-%%PORTDOCS%%share/doc/twisted/api/public/twisted.web.woven.interfaces.IWovenLivePage.html
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.web.woven.interfaces.html
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.web.woven.model.AttributeModel.html
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.web.woven.model.AttributeWrapper.html
@@ -4955,7 +4772,6 @@ lib/%%PYTHON_VERSION%%/site-packages/twisted/zoot/zoottap.pyo
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.web.woven.tapestry.html
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.web.woven.template.DOMController.html
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.web.woven.template.DOMTemplate.html
-%%PORTDOCS%%share/doc/twisted/api/public/twisted.web.woven.template.INodeMutator.html
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.web.woven.template.NodeMutator.html
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.web.woven.template.NodeNodeMutator.html
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.web.woven.template.NoneNodeMutator.html
@@ -4995,6 +4811,7 @@ lib/%%PYTHON_VERSION%%/site-packages/twisted/zoot/zoottap.pyo
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.web.woven.widgets.Link.html
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.web.woven.widgets.List.html
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.web.woven.widgets.Option.html
+%%PORTDOCS%%share/doc/twisted/api/public/twisted.web.woven.widgets.ParagraphText.html
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.web.woven.widgets.PasswordText.html
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.web.woven.widgets.RadioButton.html
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.web.woven.widgets.RawText.html
@@ -5018,8 +4835,6 @@ lib/%%PYTHON_VERSION%%/site-packages/twisted/zoot/zoottap.pyo
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.words.ircservice.IRCGateway.html
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.words.ircservice.html
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.words.service.Group.html
-%%PORTDOCS%%share/doc/twisted/api/public/twisted.words.service.IWordsClient.html
-%%PORTDOCS%%share/doc/twisted/api/public/twisted.words.service.IWordsPolicy.html
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.words.service.NormalPolicy.html
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.words.service.NotInCollectionError.html
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.words.service.NotInGroupError.html
@@ -5055,8 +4870,11 @@ lib/%%PYTHON_VERSION%%/site-packages/twisted/zoot/zoottap.pyo
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.zoot.zoot.html
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.zoot.zoottap.Options.html
 %%PORTDOCS%%share/doc/twisted/api/public/twisted.zoot.zoottap.html
-%%PORTDOCS%%share/doc/twisted/api/public/types.InstanceType.html
-%%PORTDOCS%%share/doc/twisted/api/public/types.StringType.html
+%%PORTDOCS%%share/doc/twisted/api/public/types.instance.html
+%%PORTDOCS%%share/doc/twisted/benchmarks/tpclient.py
+%%PORTDOCS%%share/doc/twisted/benchmarks/tpclient_nt.py
+%%PORTDOCS%%share/doc/twisted/benchmarks/tpserver.py
+%%PORTDOCS%%share/doc/twisted/benchmarks/tpserver_nt.py
 %%PORTDOCS%%share/doc/twisted/fun/Twisted.Quotes
 %%PORTDOCS%%share/doc/twisted/fun/lightbulb
 %%PORTDOCS%%share/doc/twisted/fun/register.html
@@ -5119,8 +4937,12 @@ lib/%%PYTHON_VERSION%%/site-packages/twisted/zoot/zoottap.pyo
 %%PORTDOCS%%share/doc/twisted/howto/clients.xhtml
 %%PORTDOCS%%share/doc/twisted/howto/coding-standard.html
 %%PORTDOCS%%share/doc/twisted/howto/coding-standard.xhtml
+%%PORTDOCS%%share/doc/twisted/howto/components.html
+%%PORTDOCS%%share/doc/twisted/howto/components.xhtml
 %%PORTDOCS%%share/doc/twisted/howto/conch_client.html
 %%PORTDOCS%%share/doc/twisted/howto/conch_client.xhtml
+%%PORTDOCS%%share/doc/twisted/howto/controllerindepth.html
+%%PORTDOCS%%share/doc/twisted/howto/controllerindepth.xhtml
 %%PORTDOCS%%share/doc/twisted/howto/cred.html
 %%PORTDOCS%%share/doc/twisted/howto/cred.xhtml
 %%PORTDOCS%%share/doc/twisted/howto/debug-with-emacs.html
@@ -5131,16 +4953,18 @@ lib/%%PYTHON_VERSION%%/site-packages/twisted/zoot/zoottap.pyo
 %%PORTDOCS%%share/doc/twisted/howto/dirdbm.xhtml
 %%PORTDOCS%%share/doc/twisted/howto/doc-standard.html
 %%PORTDOCS%%share/doc/twisted/howto/doc-standard.xhtml
-%%PORTDOCS%%share/doc/twisted/howto/domtemplate.html
-%%PORTDOCS%%share/doc/twisted/howto/domtemplate.xhtml
 %%PORTDOCS%%share/doc/twisted/howto/enterprise.html
 %%PORTDOCS%%share/doc/twisted/howto/enterprise.xhtml
 %%PORTDOCS%%share/doc/twisted/howto/extend-lore.html
 %%PORTDOCS%%share/doc/twisted/howto/extend-lore.xhtml
 %%PORTDOCS%%share/doc/twisted/howto/faq.html
 %%PORTDOCS%%share/doc/twisted/howto/faq.xhtml
+%%PORTDOCS%%share/doc/twisted/howto/formindepth.html
+%%PORTDOCS%%share/doc/twisted/howto/formindepth.xhtml
 %%PORTDOCS%%share/doc/twisted/howto/glossary.html
 %%PORTDOCS%%share/doc/twisted/howto/glossary.xhtml
+%%PORTDOCS%%share/doc/twisted/howto/guardindepth.html
+%%PORTDOCS%%share/doc/twisted/howto/guardindepth.xhtml
 %%PORTDOCS%%share/doc/twisted/howto/howto.tidyrc
 %%PORTDOCS%%share/doc/twisted/howto/im.html
 %%PORTDOCS%%share/doc/twisted/howto/im.xhtml
@@ -5154,8 +4978,15 @@ lib/%%PYTHON_VERSION%%/site-packages/twisted/zoot/zoottap.pyo
 %%PORTDOCS%%share/doc/twisted/howto/listings/HelloWorld/HelloWorld.rpy
 %%PORTDOCS%%share/doc/twisted/howto/listings/HelloWorld/HelloWorld2.html
 %%PORTDOCS%%share/doc/twisted/howto/listings/HelloWorld/HelloWorld2.rpy
-%%PORTDOCS%%share/doc/twisted/howto/listings/TwistedQuotes/WebQuotes.xhtml
-%%PORTDOCS%%share/doc/twisted/howto/listings/TwistedQuotes/WovenQuotes.xhtml
+%%PORTDOCS%%share/doc/twisted/howto/listings/PicturePile/directory-listing.html
+%%PORTDOCS%%share/doc/twisted/howto/listings/PicturePile/directory-listing2.html
+%%PORTDOCS%%share/doc/twisted/howto/listings/PicturePile/directory-listing3.html
+%%PORTDOCS%%share/doc/twisted/howto/listings/PicturePile/directory-listing4.html
+%%PORTDOCS%%share/doc/twisted/howto/listings/PicturePile/image-display.html
+%%PORTDOCS%%share/doc/twisted/howto/listings/PicturePile/picturepile.py
+%%PORTDOCS%%share/doc/twisted/howto/listings/PicturePile/picturepile2.py
+%%PORTDOCS%%share/doc/twisted/howto/listings/PicturePile/picturepile3.py
+%%PORTDOCS%%share/doc/twisted/howto/listings/PicturePile/picturepile4.py
 %%PORTDOCS%%share/doc/twisted/howto/listings/TwistedQuotes/__init__.py
 %%PORTDOCS%%share/doc/twisted/howto/listings/TwistedQuotes/pbquote.py
 %%PORTDOCS%%share/doc/twisted/howto/listings/TwistedQuotes/pbquoteclient.py
@@ -5168,9 +4999,6 @@ lib/%%PYTHON_VERSION%%/site-packages/twisted/zoot/zoottap.pyo
 %%PORTDOCS%%share/doc/twisted/howto/listings/TwistedQuotes/soap.rpy
 %%PORTDOCS%%share/doc/twisted/howto/listings/TwistedQuotes/webquote.rpy
 %%PORTDOCS%%share/doc/twisted/howto/listings/TwistedQuotes/webquote.rtl
-%%PORTDOCS%%share/doc/twisted/howto/listings/TwistedQuotes/webquoteresource.py
-%%PORTDOCS%%share/doc/twisted/howto/listings/TwistedQuotes/wovenquotes.py
-%%PORTDOCS%%share/doc/twisted/howto/listings/TwistedQuotes/wovenquotes.rpy
 %%PORTDOCS%%share/doc/twisted/howto/listings/TwistedQuotes/xmlquote.rpy
 %%PORTDOCS%%share/doc/twisted/howto/listings/application/app1.py
 %%PORTDOCS%%share/doc/twisted/howto/listings/application/app2.py
@@ -5224,16 +5052,22 @@ lib/%%PYTHON_VERSION%%/site-packages/twisted/zoot/zoottap.pyo
 %%PORTDOCS%%share/doc/twisted/howto/listings/process/process.py
 %%PORTDOCS%%share/doc/twisted/howto/listings/process/quotes.py
 %%PORTDOCS%%share/doc/twisted/howto/listings/process/trueandfalse.py
+%%PORTDOCS%%share/doc/twisted/howto/livepage.html
+%%PORTDOCS%%share/doc/twisted/howto/livepage.xhtml
 %%PORTDOCS%%share/doc/twisted/howto/lore.html
 %%PORTDOCS%%share/doc/twisted/howto/lore.xhtml
 %%PORTDOCS%%share/doc/twisted/howto/manhole.html
 %%PORTDOCS%%share/doc/twisted/howto/manhole.xhtml
+%%PORTDOCS%%share/doc/twisted/howto/modelindepth.html
+%%PORTDOCS%%share/doc/twisted/howto/modelindepth.xhtml
 %%PORTDOCS%%share/doc/twisted/howto/names.html
 %%PORTDOCS%%share/doc/twisted/howto/names.xhtml
 %%PORTDOCS%%share/doc/twisted/howto/options.html
 %%PORTDOCS%%share/doc/twisted/howto/options.xhtml
 %%PORTDOCS%%share/doc/twisted/howto/overview.html
 %%PORTDOCS%%share/doc/twisted/howto/overview.xhtml
+%%PORTDOCS%%share/doc/twisted/howto/pageindepth.html
+%%PORTDOCS%%share/doc/twisted/howto/pageindepth.xhtml
 %%PORTDOCS%%share/doc/twisted/howto/pb-copyable.html
 %%PORTDOCS%%share/doc/twisted/howto/pb-copyable.xhtml
 %%PORTDOCS%%share/doc/twisted/howto/pb-cred.html
@@ -5246,6 +5080,8 @@ lib/%%PYTHON_VERSION%%/site-packages/twisted/zoot/zoottap.pyo
 %%PORTDOCS%%share/doc/twisted/howto/pb.xhtml
 %%PORTDOCS%%share/doc/twisted/howto/pclients.html
 %%PORTDOCS%%share/doc/twisted/howto/pclients.xhtml
+%%PORTDOCS%%share/doc/twisted/howto/picturepile.html
+%%PORTDOCS%%share/doc/twisted/howto/picturepile.xhtml
 %%PORTDOCS%%share/doc/twisted/howto/plugin.html
 %%PORTDOCS%%share/doc/twisted/howto/plugin.xhtml
 %%PORTDOCS%%share/doc/twisted/howto/process.html
@@ -5277,35 +5113,44 @@ lib/%%PYTHON_VERSION%%/site-packages/twisted/zoot/zoottap.pyo
 %%PORTDOCS%%share/doc/twisted/howto/udp.xhtml
 %%PORTDOCS%%share/doc/twisted/howto/using-twistedweb.html
 %%PORTDOCS%%share/doc/twisted/howto/using-twistedweb.xhtml
+%%PORTDOCS%%share/doc/twisted/howto/viewindepth.html
+%%PORTDOCS%%share/doc/twisted/howto/viewindepth.xhtml
 %%PORTDOCS%%share/doc/twisted/howto/vision.html
 %%PORTDOCS%%share/doc/twisted/howto/vision.xhtml
 %%PORTDOCS%%share/doc/twisted/howto/web-overview.html
 %%PORTDOCS%%share/doc/twisted/howto/web-overview.xhtml
 %%PORTDOCS%%share/doc/twisted/howto/website-template.tpl
-%%PORTDOCS%%share/doc/twisted/howto/widgets.html
-%%PORTDOCS%%share/doc/twisted/howto/widgets.xhtml
 %%PORTDOCS%%share/doc/twisted/howto/woven.html
 %%PORTDOCS%%share/doc/twisted/howto/woven.xhtml
 %%PORTDOCS%%share/doc/twisted/howto/xmlrpc.html
 %%PORTDOCS%%share/doc/twisted/howto/xmlrpc.xhtml
 %%PORTDOCS%%share/doc/twisted/img/TwistedLogo.bmp
+%%PORTDOCS%%share/doc/twisted/img/controller.png
 %%PORTDOCS%%share/doc/twisted/img/deferred-attach.dia
 %%PORTDOCS%%share/doc/twisted/img/deferred-attach.png
 %%PORTDOCS%%share/doc/twisted/img/deferred-process.dia
 %%PORTDOCS%%share/doc/twisted/img/deferred-process.png
 %%PORTDOCS%%share/doc/twisted/img/deferred.dia
 %%PORTDOCS%%share/doc/twisted/img/deferred.png
+%%PORTDOCS%%share/doc/twisted/img/livepage.png
+%%PORTDOCS%%share/doc/twisted/img/model.png
 %%PORTDOCS%%share/doc/twisted/img/myhtml-output.png
+%%PORTDOCS%%share/doc/twisted/img/plone_root_model.png
 %%PORTDOCS%%share/doc/twisted/img/twisted-overview.dia
 %%PORTDOCS%%share/doc/twisted/img/twisted-overview.png
+%%PORTDOCS%%share/doc/twisted/img/twisted_1.gif
+%%PORTDOCS%%share/doc/twisted/img/twisted_2.gif
+%%PORTDOCS%%share/doc/twisted/img/view.png
 %%PORTDOCS%%share/doc/twisted/img/web-overview.dia
 %%PORTDOCS%%share/doc/twisted/img/web-overview.png
 %%PORTDOCS%%share/doc/twisted/img/web-widgets.dia
 %%PORTDOCS%%share/doc/twisted/img/web-widgets.png
+%%PORTDOCS%%share/doc/twisted/img/woven_after.png
+%%PORTDOCS%%share/doc/twisted/img/woven_before.png
+%%PORTDOCS%%share/doc/twisted/img/woven_overview.png
 %%PORTDOCS%%share/doc/twisted/legal/contributor-agreement.html
 %%PORTDOCS%%share/doc/twisted/man/coil-man.xhtml
 %%PORTDOCS%%share/doc/twisted/man/im-man.xhtml
-%%PORTDOCS%%share/doc/twisted/man/manhole-man.xhtml
 %%PORTDOCS%%share/doc/twisted/man/mktap-man.xhtml
 %%PORTDOCS%%share/doc/twisted/man/t-im-man.xhtml
 %%PORTDOCS%%share/doc/twisted/man/tapconvert-man.xhtml
@@ -5324,7 +5169,6 @@ lib/%%PYTHON_VERSION%%/site-packages/twisted/zoot/zoottap.pyo
 %%PORTDOCS%%share/doc/twisted/vision/security.xhtml
 %%PORTDOCS%%share/examples/twisted/scripts/advogato.py
 %%PORTDOCS%%share/examples/twisted/scripts/bananabench.py
-%%PORTDOCS%%share/examples/twisted/scripts/bugs.tac
 %%PORTDOCS%%share/examples/twisted/scripts/cocoaDemo/English.lproj/InfoPlist.strings
 %%PORTDOCS%%share/examples/twisted/scripts/cocoaDemo/English.lproj/MainMenu.nib/classes.nib
 %%PORTDOCS%%share/examples/twisted/scripts/cocoaDemo/English.lproj/MainMenu.nib/info.nib
@@ -5335,7 +5179,6 @@ lib/%%PYTHON_VERSION%%/site-packages/twisted/zoot/zoottap.pyo
 %%PORTDOCS%%share/examples/twisted/scripts/cocoaDemo/cocoaDemo.pbproj/project.pbxproj
 %%PORTDOCS%%share/examples/twisted/scripts/courier.py
 %%PORTDOCS%%share/examples/twisted/scripts/cursesclient.py
-%%PORTDOCS%%share/examples/twisted/scripts/dbauth.tac
 %%PORTDOCS%%share/examples/twisted/scripts/dlpage.py
 %%PORTDOCS%%share/examples/twisted/scripts/dns-service.py
 %%PORTDOCS%%share/examples/twisted/scripts/echoclient.py
@@ -5346,7 +5189,6 @@ lib/%%PYTHON_VERSION%%/site-packages/twisted/zoot/zoottap.pyo
 %%PORTDOCS%%share/examples/twisted/scripts/echoserv_threaded.py
 %%PORTDOCS%%share/examples/twisted/scripts/echoserv_udp.py
 %%PORTDOCS%%share/examples/twisted/scripts/example.html
-%%PORTDOCS%%share/examples/twisted/scripts/forum.tac
 %%PORTDOCS%%share/examples/twisted/scripts/ftpclient.py
 %%PORTDOCS%%share/examples/twisted/scripts/gethostbyname.py
 %%PORTDOCS%%share/examples/twisted/scripts/getpage.py
@@ -5358,7 +5200,6 @@ lib/%%PYTHON_VERSION%%/site-packages/twisted/zoot/zoottap.pyo
 %%PORTDOCS%%share/examples/twisted/scripts/insultsexample.py
 %%PORTDOCS%%share/examples/twisted/scripts/ircLogBot.py
 %%PORTDOCS%%share/examples/twisted/scripts/lj.rpy.py
-%%PORTDOCS%%share/examples/twisted/scripts/metrics.tac
 %%PORTDOCS%%share/examples/twisted/scripts/minchat.py
 %%PORTDOCS%%share/examples/twisted/scripts/mouse.py
 %%PORTDOCS%%share/examples/twisted/scripts/oscardemo.py
@@ -5392,6 +5233,7 @@ lib/%%PYTHON_VERSION%%/site-packages/twisted/zoot/zoottap.pyo
 %%PORTDOCS%%share/examples/twisted/scripts/simple.rtl
 %%PORTDOCS%%share/examples/twisted/scripts/simpleclient.py
 %%PORTDOCS%%share/examples/twisted/scripts/simpleserv.py
+%%PORTDOCS%%share/examples/twisted/scripts/slides-template.tpl
 %%PORTDOCS%%share/examples/twisted/scripts/soap.py
 %%PORTDOCS%%share/examples/twisted/scripts/spider.py
 %%PORTDOCS%%share/examples/twisted/scripts/sshsimpleclient.py
@@ -5434,6 +5276,7 @@ lib/%%PYTHON_VERSION%%/site-packages/twisted/zoot/zoottap.pyo
 %%PORTDOCS%%@dirrm share/doc/twisted/howto/listings/lore
 %%PORTDOCS%%@dirrm share/doc/twisted/howto/listings/application
 %%PORTDOCS%%@dirrm share/doc/twisted/howto/listings/TwistedQuotes
+%%PORTDOCS%%@dirrm share/doc/twisted/howto/listings/PicturePile
 %%PORTDOCS%%@dirrm share/doc/twisted/howto/listings/HelloWorld
 %%PORTDOCS%%@dirrm share/doc/twisted/howto/listings
 %%PORTDOCS%%@dirrm share/doc/twisted/howto
@@ -5454,6 +5297,7 @@ lib/%%PYTHON_VERSION%%/site-packages/twisted/zoot/zoottap.pyo
 %%PORTDOCS%%@dirrm share/doc/twisted/historic/2002
 %%PORTDOCS%%@dirrm share/doc/twisted/historic
 %%PORTDOCS%%@dirrm share/doc/twisted/fun
+%%PORTDOCS%%@dirrm share/doc/twisted/benchmarks
 %%PORTDOCS%%@dirrm share/doc/twisted/api/public
 %%PORTDOCS%%@dirrm share/doc/twisted/api/private
 %%PORTDOCS%%@dirrm share/doc/twisted/api
diff --git a/devel/py-twisted/pkg-req b/devel/py-twisted/pkg-req
index fa6390a94fa5..3a3e08f87e4d 100644
--- a/devel/py-twisted/pkg-req
+++ b/devel/py-twisted/pkg-req
@@ -4,12 +4,12 @@ PATH=$PATH:/usr/local/bin
 
 if [ "x$1" = "xINSTALL" -o "x$2" = "xINSTALL" ]; then
   PYTHON_GT=`python -c 'import string, sys; \
-                        print string.split(sys.version)[0] >= "2.1"'`
+                        print string.split(sys.version)[0] >= "2.2"'`
   if [ "x${PYTHON_GT}" = "x1" ]; then
     exit 0
   else
     echo "-----------------------------------------------------------"
-    echo "Twisted requires Python version 2.1 or greater -"
+    echo "Twisted requires Python version 2.2 or greater -"
     echo "  please update your Python installation before proceeding."
     echo "-----------------------------------------------------------"
     exit 1
author	Neil Blakey-Milner <nbm@FreeBSD.org>	2003-05-12 11:25:26 +0000
committer	Neil Blakey-Milner <nbm@FreeBSD.org>	2003-05-12 11:25:26 +0000
commit	ecb1fa8756d45e461d6cb61a8aa131d55ebefde2 (patch)
tree	df2ffbaab6045ea29fc0d2dc4f185b179dde9374 /devel/py-twisted
parent	editors/xemacs-comm-packages is obsolete. *_DEPENDS pointed to (diff)