- major revamp and cull of obsolete pages

docs/community.rst

@@ -1,24 +1,59 @@
-The Zope Community
-==================
+Community
+=========
 
 The Zope community is one of the Largest and most professional
 open-source communities worldwide.
 
+Getting in touch
+----------------
+
 Security
-  To report a security problem, send an email to security-response@zope.org
+  To report a security problem, please contact the `Plone Security Team
+  <https://plone.org/community/security>`_ via email (security@plone.org).
 
-IRC
-  freenode.net hosts lots of Zope and Zope products / application
-  related IRC channels. Visit irc.freenode.net and try one of the
-  Following channels: #zope, #zope.de, #zope3-dev #plone, #bluebream,
-  #grok
+E-Mail
+  Several Zope-related email lists are maintained on the `Zope community list
+  server <https://mail.zope.org>`_.
+
+Web sites and forums
+  The Plone community forums have a lively `Zope discussion category
+  <https://community.plone.org/c/zope>`_.
 
-Web sites
-  Localized Zope  related web sites, eg  www.zope.de Audience /  Tool /
-  Product targeted websites, eg  zope2.zope.org , bluebream.zope.org ,
-  grok.zope.org , docs.zope.org , buildout.zope.org
+  All projects under the Zope umbrella are maintained under the `GitHub
+  zopefoundation organization <https://github.com/zopefoundation>`_. Each
+  project has an issue tracker for questions, feature requests and bug
+  reports.
+
+IRC
+  `freenode.net <https://freenode.net>`_ hosts lots of Zope and Zope
+  products / application related IRC channels. Visit irc.freenode.net and
+  try one of the Following channels: #zope, #zope.de, #plone, #grok
 
 Planets
   News collections from different Zope related blogs, like `Planet
-  Plone <http://planet.plone.org/>`_ and `Planet Python
-  <http://planetpython.org/>`_ .
+  Plone <https://planet.plone.org/>`_ and `Planet Python
+  <https://planetpython.org/>`_ .
+
+
+The Zope Foundation
+-------------------
+The Zope Foundation had the goal to promote, maintain, and develop the
+Zope platform, which it did successfully for many years. It is merging with
+the Plone Foundation and passed its responsibilities to the Plone Foundation
+in 2018.
+
+
+The Plone Foundation
+--------------------
+Our community includes the open source community of contributors to
+the Zope software, contributors to the documentation and web
+infrastructure, as well as the community of businesses and
+organizations that use Zope.
+
+The Plone Foundation is the copyright holder of the Zope software and many
+extensions and associated software maintained in the `zopefoundation` GitHub organization at https://www.github.com/zopefoundation.
+
+The Plone Foundation also manages the zope.org website as well as supporting
+infrastructure for open source collaboration.
+
+For more information, visit https://plone.org/foundation

docs/conf.py

@@ -87,8 +87,8 @@
 # a list of builtin themes.
 #
 html_theme = 'sphinx_rtd_theme'
-html_logo = 'logo.gif'
-html_favicon = 'favicon.ico'
+#html_logo = '_static/logo.gif'
+html_favicon = '_static/favicon.ico'
 
 
 # Theme options are theme-specific and customize the look and feel of a theme
@@ -163,4 +163,4 @@
 
 
 # Example configuration for intersphinx: refer to the Python standard library.
-intersphinx_mapping = {'https://docs.python.org/': None}
+intersphinx_mapping = {'https://docs.python.org/3/': None}

docs/developer/becoming-a-committer.rst

@@ -9,8 +9,12 @@ Applying for Committer Status
 Detailed instructions for gaining commit rights to the Zope repositories are
 at https://plone.org/foundation/contributors-agreement/contributors-agreement-explained.
 
-1. Print, fill out and sign the
-   :download:`Plone Contributor Agreement <./Plone_Contributor_Agreement.pdf>`.
+.. note::
+    Exisiting Plone contributors are required to submit the contributor
+    agreement again to gain access to the Zope repositories.
+
+1. Print, fill out and sign the `Plone Contributor Agreement
+   <https://plone.org/foundation/contributors-agreement/agreement.pdf>`_.
    On page 2 enter `Zope` in the field for `program`.
 
 2. Scan the agreement and submit it by email to agreements@plone.org

docs/developer/bug-trackers.rst

@@ -1,89 +1,16 @@
 .. _zope-bug-trackers:
 
-Bug Trackers for Zope-related Projects
-======================================
+Bug Trackers
+============
 
-The Zope developer community uses the
-`Launchpad platform <http://launchpad.net>`_ for managing bug reports.
+The Zope developer community uses the `GitHub zopefoundation organization
+<https://github.com/zopefoundation>`_ to host all projects. Each repository has
+its own issue tracker for bug reports, feature requests or questions.
 
 
-.. _ztk-bug-tracker:
+Zope developers track bugs within Zope using the ``Zope`` project on GitHub:
 
-Zope Toolkit
-------------
+ https://github.com/zopefoundation/Zope/issues
 
-The `zopetoolkit project group on Launchpad
-<https://launchpad.net/zopetoolkit>`_ is an "umbrella" for the various
-ZTK projects, each of which has its own bug tracker (see the project links
-on that page).  You can see an overview of bugs across all ``zopetoolkit``
-projects:
-
- https://bugs.launchpad.net/zopetoolkit
-
-
-.. _zope2-bug-tracker:
-
-Zope2
------
-
-Zope2 developers track bugs within Zope2 using the ``zope2`` project on
-Launchpad:
-
- https://bugs.launchpad.net/zope2/
-
-Notifications from Launchpad for each new or updated issue are
-sent to the ``zope2-tracker`` mailing list:
-
- http://mail.zope.org/mailman/listinfo/zope2-tracker
-
-To work on bugs in the ``zope2`` project, you need to be member of the
-Zope 2 developer team on Launchpad.  Join the team:
-
- https://launchpad.net/~zope2-dev
-
-
-.. _grok-bug-tracker:
-
-Grok
-----
-
-The Grok developers track their bugs using the ``grok`` project
-on Launchpad:
-
- https://bugs.launchpad.net/grok
-
-To work on bugs in the ``grok`` project, you need to be member of the
-Grok developer team on Launchpad.  Join the team:
-
- https://launchpad.net/~grok-development-team
-
-
-.. _bluebream-bug-tracker:
-
-BlueBream
----------
-
-The BlueBream developers track their bugs using the ``bluebream`` project
-on Launchpad:
-
- https://bugs.launchpad.net/bluebream
-
-To work on bugs in the ``bluebream`` project, you need to be member of the
-BlueBream developer team on Launchpad.  Join the team:
-
- https://launchpad.net/~bluebream
-
-
-.. _zope3-bug-tracker:
-
-Zope 3
-++++++
-
-Zope3 bugs are tracked within the ``zope3`` project on Launchpad:
-
- https://bugs.launchpad.net/zope3
-
-.. note:
-   Most effort in this project days is now devoted to migrating
-   the bugs to other, active projects (``zope2``, ``bluebream``, ``grok``,
-   or one of the ``zopetoolkit`` projects).
+To work on bugs in the ``Zope`` project, you need to sign the Plone Foundation
+contributor agreement. :doc:`becoming-a-committer` explains how to do that.