Skip to content

Commit

Permalink
Switch Zope Foundation administrative information to point to the Plo…
Browse files Browse the repository at this point in the history
…ne foundation instead
  • Loading branch information
MatthewWilkes committed May 7, 2019
1 parent 8624a12 commit 14c1aa6
Show file tree
Hide file tree
Showing 7 changed files with 15 additions and 14 deletions.
Binary file added docs/developer/Plone_Contributor_Agreement.pdf
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
11 changes: 5 additions & 6 deletions docs/developer/becoming-a-committer.rst
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,14 @@ Becoming a Contributor
Applying for Committer Status
-----------------------------

Instructions on gaining commit rights to the Zope repositories are given at <https://plone.org/foundation/contributors-agreement/contributors-agreement-explained>_`

1. Print, fill out and sign the
:download:`Zope Committer Agreement <./Zope_Foundation_Committer_Agreement.pdf>`.
:download:`Plone Contributor Agreement <./Plone_Contributor_Agreement.pdf>`.

2. Submit the agreement to the Zope Foundation via email to
contributor-admin@zope.org.
2. Scan the agreement and submit it by email to agreements@plone.org

3. Wait for an acknowledgement. If you don't get this in a reasonable amount
of time, then ask back on the Zope Foundation list
(foundation-info@zope.org).
3. You will be added to the GitHub repository shortly.

Subscribe to the Mailing Lists
------------------------------
Expand Down
2 changes: 1 addition & 1 deletion docs/developer/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ Becoming a Zope Committer
subversion-writable-checkouts


Repository committee operations (internal)
Repository committee operations (obsolete)
------------------------------------------

.. toctree::
Expand Down
16 changes: 9 additions & 7 deletions docs/foundation.rst
Original file line number Diff line number Diff line change
@@ -1,15 +1,17 @@
The Zope Foundation
===================
The Plone Foundation
====================

The Zope Foundation had the goal to promote, maintain, and develop the
Zope platform, which it did successfully for many years. It passed its
responsibilities to the Plone foundation in 2018.

The Zope Foundation has the goal to promote, maintain, and develop the
Zope platform. It does this by supporting the Zope community.

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 Zope Foundation is the copyright
organizations that use Zope. The Plone Foundation is the copyright
holder of the Zope software and many extensions and associated
software. The Zope Foundation also manages the zope.org website, and
software. The Plone Foundation also manages the zope.org website, and
manages the infrastructure for open source collaboration.

For more information, visit http://foundation.zope.org.
For more information, visit https://plone.org/foundation

3 comments on commit 14c1aa6

@icemac
Copy link
Member

@icemac icemac commented on 14c1aa6 May 9, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hm, this commit is not yet visible e. g. on https://www.zope.org/developer/becoming-a-committer.html.
@dataflake Is there something else to be done besides this commit?

@dataflake
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This stuff is not automatically pulled and built on the machine. I have to go in and do that, which in this case is a good thing. I will need to add information about the ZF so people don't continually ask what happened to it.

@dataflake
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@icemac @MatthewWilkes I have made a few wording changes and put it on the live site now.

Please sign in to comment.