Even more updates to deal with the doctest module, including the forward port...

Even more updates to deal with the doctest module, including the forward port of c111722 from the 2.12 branch

doc/CHANGES.rst

@@ -113,12 +113,12 @@ Features Added
   - zope.app.form = 3.12.1
   - zope.broken = 3.6.0
   - zope.browsermenu = 3.9.0
-  - zope.browserpage = 3.11.0
-  - zope.browserresource = 3.10.2
-  - zope.component = 3.9.3
-  - zope.configuration = 3.7.1
-  - zope.container = 3.11.0
-  - zope.contentprovider = 3.6.1
+  - zope.browserpage = 3.12.1
+  - zope.browserresource = 3.10.3
+  - zope.component = 3.9.4
+  - zope.configuration = 3.7.2
+  - zope.container = 3.11.1
+  - zope.contentprovider = 3.7.1
   - zope.contenttype = 3.5.1
   - zope.copypastemove = 3.6.0
   - zope.dublincore = 3.6.0

versions.cfg

@@ -39,12 +39,12 @@ zope.annotation = 3.5.0
 zope.broken = 3.6.0
 zope.browser = 1.3
 zope.browsermenu = 3.9.1
-zope.browserpage = 3.11.0
-zope.browserresource = 3.10.2
-zope.component = 3.9.3
-zope.configuration = 3.7.1
-zope.container = 3.11.0
-zope.contentprovider = 3.6.1
+zope.browserpage = 3.12.1
+zope.browserresource = 3.10.3
+zope.component = 3.9.4
+zope.configuration = 3.7.2
+zope.container = 3.11.1
+zope.contentprovider = 3.7.1
 zope.contenttype = 3.5.1
 zope.datetime = 3.4.0
 zope.deferredimport = 3.5.0
@@ -52,8 +52,8 @@ zope.dottedname = 3.4.6
 zope.event = 3.4.1
 zope.exceptions = 3.5.2
 zope.filerepresentation = 3.6.0
-zope.i18n = 3.7.2
-zope.i18nmessageid = 3.5.1
+zope.i18n = 3.7.3
+zope.i18nmessageid = 3.5.2
 zope.interface = 3.5.3
 zope.lifecycleevent = 3.6.0
 zope.location = 3.9.0