Update and improve email templates

This PR contains the following changes: * Rename all email templates in the form TYPE_#_DESCRIPTION.txt for better sorting. * Streamlined committer invite process: * Per discussion on dev@community with Craig Russell, new recommendation is to point the candidate immediately at the iCLA so they can get on with it, rather than unnecessarily delaying the process. * Info in the initial response after committer acceptance was moved into the next or prior email, as appropriate * Addition of new PMC member vote / result templates * Minor updates to the release process templates, consistent with the 2.2.0 and 2.3.0 releases * Minor updates to other templates - outdated URLs, etc. * Removal of templates we don't use anymore: * release discussion (merged with release notice) * release discussion python script (1.x) * archive discussion (follow ASF policy, archive more aggressively) * merge discussion (replaced by GitHub PRs) * release notes discussion (merged with release notice) * board report request for help (no longer necessary)
apache · Jan 9, 2019 · 7ae5e4e7b6243935a37ca0b96234f722351a82c4 · 7ae5e4e
1 parent df2c19e
commit 7ae5e4e7b6243935a37ca0b96234f722351a82c4
Showing 34 changed files with 191 additions and 305 deletions.
diff --git a/email/archive_notice.txt b/email/archive_notice.txt
@@ -0,0 +1,26 @@
+From: %YOU%
+To: dev@couchdb.apache.org
+Subject: [NOTICE] Archive Apache CouchDB %VERSION%
+================================================================================
+
+Dear community,
+
+I would like to archive Apache CouchDB %VERSION%.
+
+Apache release policy states: "Each project's distribution directory SHOULD contain the latest release in each branch that is currently under development. When development ceases on a version branch, releases of that branch SHOULD be removed."
+
+[IF A BRANCH IS KILLED:]
+As development on the #.#.# branch has ended, it is time to archive this release.
+
+[IF A VERSION IS AN OLD BRANCH VERSION]
+Since we've released #.#.#, it is time to archive #.#.#-1.
+
+Archiving this release means that we no longer support it, and we will remove any references to it from our website and our wiki. However, the original files will still be available to anyone browsing the release archives at:
+
+    http://archive.apache.org/dist/couchdb/
+
+    http://wiki.apache.org/couchdb/CurrentReleases#Archived_Releases
+
+You do not need to respond if you are in agreement. If there is no response in 72 hours, I will assume lazy consensus. If we reach consensus, I archive the release.
+
+Thanks,
diff --git a/email/vote_committer.txt → email/committer_1_vote.txt b/email/vote_committer.txt → email/committer_1_vote.txt
diff --git a/email/result_committer.txt → email/committer_2_result.txt b/email/result_committer.txt → email/committer_2_result.txt
@@ -17,5 +17,3 @@ The results are:
 The vote is %RESULT%.
 
 Thanks,
-
-%VOTE_THREAD%
diff --git a/email/invite_committer.txt → email/committer_3_invite.txt b/email/invite_committer.txt → email/committer_3_invite.txt
@@ -26,4 +26,22 @@ Of course, you can decline and continue to contribute as you do now. If you do d
 
 Either way, please let us know in reply to the private@couchdb.apache.org list only. If you accept, we will announce your new position on the dev@couchdb.apache.org list after your account is created.
 
+[CHECK http://people.apache.org/committer-index.html - IF PRESENT, USE THIS PARAGRAPH]
+If you accept, since you already have an Apache id, the PMC will grant you write access to the repository.
+
+[CHECK http://people.apache.org/unlistedclas.html - IF PRESENT, USE THIS PARAGRAPH]
+If you accept, since you already have an iCLA on file, the PMC will request an Apache id for you. In your response, please choose an id that is not already in use. See http://people.apache.org/committer-index.html
+]
+
+[OTHERWISE, USE THIS SECTION]
+If you accept, the next step is to register an iCLA:
+
+  1. Details of the iCLA and the forms are found here: http://www.apache.org/licenses/#clas There is also an online form for generating your iCLA: https://asf.icla.online/
+
+  2. Instructions for its completion and return to the Secretary of the ASF are found at http://www.apache.org/licenses/#submitting . Do not submit ICLAs to anyone but secretary, but please do cc: [private@couchdb.apache.org]
+
+  3. When you transmit the completed iCLA, request to notify Apache CouchDB and choose a unique Apache id. Look to see if your preferred id is already taken at http://people.apache.org/committer-index.html . This will allow the Secretary to notify the PMC when your iCLA has been recorded.
+
+  4. Be sure to reply to this email and let us know you've completed your iCLA.
+
 On behalf of the CouchDB PMC,
diff --git a/email/accept_committer.txt → email/committer_4_accept.txt b/email/accept_committer.txt → email/committer_4_accept.txt
@@ -8,20 +8,6 @@ Dear %NAME%,
 
 Welcome. Here are the next steps.
 
-You need to send a Contributor License Agreement to the ASF. Normally you would send an Individual CLA. It may also be necessary to send a Corporate CLA. Ask us if you have any questions about this.
-
-Find out how to do this here:
-
-    http://www.apache.org/licenses/#clas
-
-You will need to choose a preferred ASF user ID.
-
-In order to ensure your ID available, you can view a list of taken IDs at:
-
-    http://people.apache.org/committer-index.html
-
-Please notify us when you have submitted the CLA and by what means you did so. This will enable us to monitor its progress.
-
 We will arrange for your Apache user account when the CLA has been recorded. After this we will make an announcement to the dev@couchdb.apache.org list, and your new position will be official.
 
 You will receive a few emails from various different people as this process moves forward. You will also be given commit access half way through this process, but please do not make any commits until your new position has been announced. Remember that CouchDB follows a Review-Then-Commit process; this does not change once given direct commit access.

diff --git a/email/done_committer.txt → email/committer_5_done.txt b/email/done_committer.txt → email/committer_5_done.txt
@@ -10,32 +10,23 @@ As you know, %ID% is your new committer account.
 
 You now have write access to certain parts of the ASF.
 
-A guide for your first steps as a committer can be found here:
+Don't forget to work your way through the steps here:
 
-    https://cwiki.apache.org/confluence/display/COUCHDB/Committer+First+Steps
+    http://s.apache.org/couchdb-committer-first-steps
 
-If you intend to contribute to Apache CouchDB's version-controlled
-repositories, and have a GitHub account, We strongly urge you to complete
-the GitHub/ASF integration process here:
-
-    https://gitbox.apache.org/setup/
-
-The CouchDB community guide can be found here:
-
-    https://cwiki.apache.org/confluence/display/COUCHDB/Community+Guide
-
-General ASF committers resources are here:
-
-    https://svn.apache.org/repos/private/committers
+While all of the items are important, we want to remind you of three specific
+ones that are key.
 
 We abide by a code of conduct and a set of bylaws. You should familiarise yourself with both documents. As a committer, people will look to you for cues about how to act. Please help us set the right standard.
 
-View those documents here:
-
     http://couchdb.apache.org/conduct.html
 
     http://couchdb.apache.org/bylaws.html
 
+You will want to complete the Git / GitHub / ASF integration step for the best experience when committing to our repositories:
+
+    https://gitbox.apache.org/setup/
+
 Naturally, if you don't understand anything be sure to ask us on the CouchDB dev mailing list. Documentation is maintained by volunteers and can be out-of-date or incomplete. Please help us fix that!
 
 Thanks,
diff --git a/email/announce_committer.txt → email/committer_6_announce.txt b/email/announce_committer.txt → email/committer_6_announce.txt
diff --git a/email/discuss_archive.txt b/email/discuss_archive.txt
diff --git a/email/discuss_release.py b/email/discuss_release.py
diff --git a/email/discuss_release.txt b/email/discuss_release.txt
diff --git a/email/reminder_meeting.txt → email/meeting_reminder.txt b/email/reminder_meeting.txt → email/meeting_reminder.txt
@@ -1,11 +1,11 @@
 From: %YOU%
 To: dev@couchdb.apache.org
-Subject: [REMINDER] Weekly IRC meeting, %DATE% at 20:00 GMT
+Subject: [REMINDER] Weekly IRC meeting, %DATE% at 20:00 UTC
 ================================================================================
 
 Dear community,
 
-Please join our weekly IRC meeting, %DATE% at 20:00 GMT.
+Please join our weekly IRC meeting, %DATE% at 20:00 UTC.
 
 Everyone is welcome to attend this meeting.
 

diff --git a/email/acknowledge_nomination.txt → email/nomination_acknowledge.txt b/email/acknowledge_nomination.txt → email/nomination_acknowledge.txt
@@ -12,6 +12,6 @@ Your nomination has been acknowledged.
 
 Please see the community guide for more information:
 
-    http://wiki.apache.org/couchdb/Community_Guide#Nominating_a_Committer
+    https://cwiki.apache.org/confluence/display/COUCHDB/Community+Guide
 
 On behalf of the CouchDB PMC,
diff --git a/email/notice_release.txt b/email/notice_release.txt
diff --git a/email/pmc_1_vote.txt b/email/pmc_1_vote.txt
@@ -0,0 +1,22 @@
+From: %YOU%
+To: private@couchdb.apache.org
+Subject: [VOTE] Elect %NAME% as PMC member
+================================================================================
+
+Dear PMC,
+
+I would like to elect %NAME% as a PMC member.
+
+%REASONS%
+
+A successful election would signify that the PMC trusts this person sufficiently to represent the project at the highest level, and to participate in all project decision-making activities.
+
+Required reading:
+
+    http://couchdb.apache.org/bylaws.html#pmc
+
+Per the bylaws, this vote uses the lazy 2/3 majority approval model, meaning that three binding +1 votes and twice as many binding +1 votes as binding -1 votes are needed.
+
+Please cast your votes now.
+
+Thanks,
diff --git a/email/pmc_2_result.txt b/email/pmc_2_result.txt
@@ -0,0 +1,20 @@
+From: %YOU%
+To: private@couchdb.apache.org
+Subject: [RESULT] (Was: Re: [VOTE] (Was: Re: [DISCUSS] Elect %NAME% as PMC member))
+================================================================================
+
+Dear PMC, 
+
+The vote has now closed.
+
+The results are:
+
+    +1 - %PLUS_ONE_VOTES% votes
+    +0 - %PLUS_ZERO_VOTES% votes
+    -0 - %MINUS_ZERO_VOTES% votes
+    -1 - %MINUS_ONE_VOTES% votes
+
+The vote is %RESULT%.
+
+Thanks,
+
diff --git a/email/invite_pmc.txt → email/pmc_3_invite.txt b/email/invite_pmc.txt → email/pmc_3_invite.txt
@@ -27,9 +27,9 @@ We invite people to the PMC who show broad interest and contribution across the
 
 Please take a moment to familiarise yourself with:
 
-http://www.apache.org/dev/pmc.html
+    http://www.apache.org/dev/pmc.html
 
-http://apache.org/foundation/marks/responsibility.html
+    http://apache.org/foundation/marks/responsibility.html
 
 There is no requirement to accept this invitation. You may decline or accept it. But either way, please let us know by "replying all" to this email. If you agree, we will announce your new position on the developer list.
 

diff --git a/email/notify_pmc.txt → email/pmc_4_notify.txt b/email/notify_pmc.txt → email/pmc_4_notify.txt
diff --git a/email/done_pmc.txt → email/pmc_5_done.txt b/email/done_pmc.txt → email/pmc_5_done.txt
diff --git a/email/announce_pmc.txt → email/pmc_6_announce.txt b/email/announce_pmc.txt → email/pmc_6_announce.txt
diff --git a/email/release_1_notice.txt b/email/release_1_notice.txt
@@ -0,0 +1,26 @@
+From: %YOU%
+To: dev@couchdb.apache.org
+Subject: [NOTICE] CouchDB %RELEASE_TYPE% release this month
+================================================================================
+
+Dear community,
+
+This is advance notice that we plan to do a %RELEASE_TYPE% release this month.
+
+The following versions are targeted:
+
+ * %VERSIONS%
+
+Please use this time to review any outstanding changes to be made, merging them in as necessary. The current list of changes we expect to land for this release is here:
+
+    https://github.com/apache/couchdb/milestone/%MILESTONE%
+
+The current release note draft is here:
+
+    https://docs.couchdb.org/en/latest/whatsnew/#.#.html
+
+Please read this through and suggest any changes via PR against the apache/couchdb-documentation repository. The information was taken from the GitHub issue tracker and PR notes, and aims to be descriptive and useful to the average CouchDB user.
+
+I will send out a follow-up reminder, with progress report, in one week.
+
+Thanks,
diff --git a/email/request_binaries.txt → email/release_2_optional_binaries.txt b/email/request_binaries.txt → email/release_2_optional_binaries.txt
@@ -9,7 +9,7 @@ This is a request to prepare binaries for the %VERSION%-rc.%CANDIDATE% release.
 
 Please follow the release procedure:
 
-    http://wiki.apache.org/couchdb/Release_Procedure#Preparing_the_Binary_Packages
+    https://cwiki.apache.org/confluence/display/COUCHDB/Release+Procedure#ReleaseProcedure-PreparingthemacOSorWindowsBinaryPackages
 
 Everyone is welcome to prepare binaries for this release.