Merge pull request #12 from zopefoundation/dataflake/track_plone_sche…

…dule

Sync up with the Plone roadmap

docs/developer/roadmap.rst

@@ -1,23 +1,33 @@
 Zope development roadmap
 ========================
 
-The Zope development and support roadmap. **Last updated: May 2021**
+The Zope development and support roadmap. **Last updated: October 2021**
 
+If you use Plone, please visit the `Plone release schedule
+<https://plone.org/download/release-schedule>`_ for all Plone-specific details.
+Support for Zope releases aims to track support for the respective Plone
+version(s) built on top of them.
 
-Zope 6 - development version
-----------------------------
 
-* TBD (no release planned yet)
+Zope 6 - future version
+-----------------------
+At this moment there are no planned or actual changes that introduce backwards
+incompatibilities and thus merit a new major version, so there is no planned
+release date for Zope 6. All development still happens on Zope 5.
 
 
 Zope 5 - stable version
 -----------------------
+Plone 6, which is still under development, will use Zope 5.
 
 * Python support:
-    - 3.6
+    - 3.6 (`Python 3.6 will reach end of support in December 2021
+      <https://www.python.org/dev/peps/pep-0494/#lifespan>`_, Zope will stop
+      supporting it officially at that time)
     - 3.7
     - 3.8
     - 3.9
+    - 3.10 (planned for early 2022)
 
 * Support schedule:
     - Full support: ongoing
@@ -27,6 +37,8 @@ Zope 5 - stable version
 
 Zope 4 - previous version
 -------------------------
+The Plone 5.2 release series, which is the current stable release series for
+Plone, uses Zope 4.
 
 * Python support:
     - 2.7
@@ -37,27 +49,20 @@ Zope 4 - previous version
 
 * Support schedule:
     - Full support: ended on 2020-10-08 (the Zope 5.0 release date)
-    - Bug fixes: until 2021-12-31
-    - Security fixes: until 2022-12-31 [2]_
+    - Bug fixes: until 2021-12-31 or until Plone 6.0 is released, whichever
+      comes later
+    - Security fixes: until 2022-12-31
 
 
 Zope 2.13 - old version
 -----------------------
+Plone 4.3, 5.0 and 5.1 are running on top of Zope 2.13. Zope 2.13 is no longer
+officially supported.
 
 * Python support:
     - 2.7
 
 * Support schedule:
     - Full support: ended
     - Bug fixes: ended
-    - Security fixes: ended on 2020-12-31 [1]_
-
-
-
-See the `Plone release schedule <https://plone.org/download/release-schedule>`_
-for details about Plone version support. Zope will track some of their
-milestones with its own releases.
-
-
-.. [1] End of security fix support for Plone releases based on Zope 2.13
-.. [2] End of security fix support for Plone releases based on Zope 4
+    - Security fixes: ended