Merge pull request #3 from robertkowalski/superfluous
remove board report
diff --git a/.gitignore b/.gitignore
index 93f1361..2aa9e9c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
node_modules
npm-debug.log
+*~
diff --git a/email/archive_notice.txt b/email/archive_notice.txt
new file mode 100644
index 0000000..cf7c782
--- /dev/null
+++ 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 b/email/committer_1_vote.txt
similarity index 79%
rename from email/vote_committer.txt
rename to email/committer_1_vote.txt
index b2523a0..786ee56 100644
--- a/email/vote_committer.txt
+++ b/email/committer_1_vote.txt
@@ -9,7 +9,7 @@
%REASONS%
-A successful election would signify that the PMC trusts this person to be loyal to the project and its interestes. This includes a binding vote in project decisions and write access to project infrastructure.
+A successful election would signify that the PMC trusts this person to be loyal to the project and its interests. This includes a binding vote in project decisions and write access to project infrastructure.
Required reading:
diff --git a/email/result_committer.txt b/email/committer_2_result.txt
similarity index 96%
rename from email/result_committer.txt
rename to email/committer_2_result.txt
index 7c6aadf..dc62439 100644
--- a/email/result_committer.txt
+++ b/email/committer_2_result.txt
@@ -17,5 +17,3 @@
The vote is %RESULT%.
Thanks,
-
-%VOTE_THREAD%
diff --git a/email/committer_3_invite.txt b/email/committer_3_invite.txt
new file mode 100644
index 0000000..dec3373
--- /dev/null
+++ b/email/committer_3_invite.txt
@@ -0,0 +1,47 @@
+From: %YOU%
+To: %INDIVIDUAL%
+CC: private@couchdb.apache.org
+Subject: Invitation to become a CouchDB committer
+================================================================================
+
+Dear %NAME%,
+
+The Apache CouchDB Project Management Committee (PMC) would like to invite you to become a committer. Committers are given a binding vote in certain project decisions, as well as write access to public project infrastructure.
+
+We value your contributions to date, and believe that you are committed to the project. We mean this in the sense of being loyal to the project and its interests. It is a position of trust, not an expectation of activity level.
+
+You can read more about the role in our bylaws:
+
+ http://couchdb.apache.org/bylaws.html#committers
+
+Please also familiarise yourself with our code of conduct:
+
+ http://couchdb.apache.org/conduct.html
+
+While these documents apply to all community members, by accepting this invitation you are indicating that you have read and agree to them.
+
+Accepting this invitation does not obligate you to contribute. The ASF is a volunteer organisation and it is normal for people's contribution levels to vary. We welcome more contributions from you, but there is no expectation, and this position of trust will not expire through inactivity.
+
+Of course, you can decline and continue to contribute as you do now. If you do decline, it will be kept private, unless you say otherwise.
+
+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 b/email/committer_4_accept.txt
similarity index 61%
rename from email/accept_committer.txt
rename to email/committer_4_accept.txt
index 483e772..c2c2ce0 100644
--- a/email/accept_committer.txt
+++ b/email/committer_4_accept.txt
@@ -8,23 +8,9 @@
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.
+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.
In response to this email, please indicate:
diff --git a/email/done_committer.txt b/email/committer_5_done.txt
similarity index 68%
rename from email/done_committer.txt
rename to email/committer_5_done.txt
index 8b68af0..154421d 100644
--- a/email/done_committer.txt
+++ b/email/committer_5_done.txt
@@ -10,26 +10,23 @@
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
-The CouchDB community guide can be found here:
-
- https://cwiki.apache.org/confluence/display/COUCHDB/Community+Guide
-
-General 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 b/email/committer_6_announce.txt
similarity index 100%
rename from email/announce_committer.txt
rename to email/committer_6_announce.txt
diff --git a/email/discuss_archive.txt b/email/discuss_archive.txt
deleted file mode 100644
index f3f2b78..0000000
--- a/email/discuss_archive.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-From: %YOU%
-To: dev@couchdb.apache.org
-Subject: [DISCUSS] Archive Apache CouchDB 1.2.1
-================================================================================
-
-Dear community,
-
-I would like to archive Apache CouchDB %VERSION%.
-
-Reasons:
-
- * %REASON%
-
-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.
-
-For more information, see:
-
- 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/discuss_release.py b/email/discuss_release.py
deleted file mode 100755
index 875ba36..0000000
--- a/email/discuss_release.py
+++ /dev/null
@@ -1,94 +0,0 @@
-#!/usr/bin/env python
-
-# Licensed under the Apache License, Version 2.0 (the "License"); you may not
-# use this file except in compliance with the License. You may obtain a copy of
-# the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations under
-# the License.
-
-# This script is for use by committers.
-#
-# It should be used in accordance with the project release procedure.
-#
-# cf. http://wiki.apache.org/couchdb/Release_Procedure
-
-from docutils import core
-import sys, os, tempfile
-
-EMAIL_TPL = 'discuss_release.txt'
-
-def red(s):
- return '\033[1;31m%s\033[0m' % s
-
-def get_section(doc_path, version):
-
- version_info = version.split('.')
- if version_info[2] == '0':
- branch = '.'.join(version_info[:2]) + '.x Branch'
- start = lambda x: x.startswith(branch)
- end = lambda x: x.rstrip().endswith('.x Branch')
- else:
- start = lambda x: x.startswith('Version ' + version)
- end = lambda x: x.startswith('Version ')
-
- state, lines = 0, []
- with open(doc_path) as f:
- for ln in f:
- #print state, ln, start(ln), end(ln)
- #raw_input('')
- if state == 0 and start(ln):
- state = 1
- elif state == 1 and end(ln):
- break
- if state:
- lines.append(ln)
-
- if version_info[2] == '0':
- return ''.join(lines[7:]).rstrip()
- else:
- return ''.join(lines[3:]).rstrip()
-
-def main(cache, branch, version):
-
- dir = os.path.dirname(os.path.abspath(__file__))
- with open(os.path.join(dir, EMAIL_TPL)) as f:
- tpl = f.read()
-
- print red('Parsing documentation')
- changelog_fn = os.path.join(cache, 'branch', branch, 'changelog.rst')
- changelog = get_section(changelog_fn, version)
-
- tpl = tpl.replace('%VERSION%', version)
- tpl = tpl.replace('%CHANGELOG%', changelog)
- print 'Email text:'
- print tpl
- print 'Send the email to: dev@couchdb.apache.org'
-
-if __name__ == '__main__':
-
- if len(sys.argv) < 2:
- print 'Usage: discuss_release.py <cache-dir> <branch> <version>'
- sys.exit(0)
-
- if not os.path.isdir(sys.argv[1]):
- print 'error: no cache directory'
- sys.exit(1)
-
- cache = sys.argv[1]
- if len(sys.argv) < 3:
- print 'error: no branch'
- sys.exit(1)
-
- branch = sys.argv[2]
- if len(sys.argv) < 4:
- print 'error: no version'
- sys.exit(1)
-
- version = sys.argv[3]
- main(cache, branch, version)
diff --git a/email/discuss_release.txt b/email/discuss_release.txt
deleted file mode 100644
index ef7c979..0000000
--- a/email/discuss_release.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-From: %YOU%
-To: dev@couchdb.apache.org
-Subject: [DISCUSS] Release Apache CouchDB %VERSION%
-================================================================================
-
-Dear community,
-
-I would like to propose that we release Apache CouchDB %VERSION%.
-
-The project aims to produce time-based releases. If your favourite feature is not ready for this version, it can be included in the next version. However, if you know of anything that should block the release, please speak up now.
-
-The %VERSION% changelog as it stands:
-
-%CHANGELOG%
-
-Are these accurate? Please double check any work you may have done and make sure that the corresponding changelog entries are up-to-date.
-
-Thanks,
diff --git a/email/invite_committer.txt b/email/invite_committer.txt
deleted file mode 100644
index e19d793..0000000
--- a/email/invite_committer.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-From: %YOU%
-To: %INDIVIDUAL%
-CC: private@couchdb.apache.org
-Subject: Invitation to become a CouchDB committer
-================================================================================
-
-Dear %NAME%,
-
-The Apache CouchDB Project Management Committee (PMC) would like to invite you to become a committer. Committers are given a binding vote in certain project decisions, as well as write access to public project infrastructure.
-
-We value your contributions to date, and believe that you are committed to the project. We mean this in the sense of being loyal to the project and its interests. It is a position of trust, not an expectation of activity level.
-
-You can read more about the role in our bylaws:
-
- http://couchdb.apache.org/bylaws.html#committers
-
-Please also familiarise yourself with our code of conduct:
-
- http://couchdb.apache.org/conduct.html
-
-While these documents apply to all community members, by accepting this invitation you are indicating that you have read and agree to them.
-
-Accepting this invitation does not obligate you to contribute. The ASF is a volunteer organisation and it is normal for people's contribution levels to vary. We welcome more contributions from you, but there is no expectation, and this position of trust will not expire through inactivity.
-
-Of course, you can decline and continue to contribute as you do now. If you do decline, it will be kept private, unless you say otherwise.
-
-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.
-
-On behalf of the CouchDB PMC,
diff --git a/email/reminder_meeting.txt b/email/meeting_reminder.txt
similarity index 82%
rename from email/reminder_meeting.txt
rename to email/meeting_reminder.txt
index 96e7e42..5c623be 100644
--- a/email/reminder_meeting.txt
+++ b/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 b/email/nomination_acknowledge.txt
similarity index 80%
rename from email/acknowledge_nomination.txt
rename to email/nomination_acknowledge.txt
index db49d1a..440c6df 100644
--- a/email/acknowledge_nomination.txt
+++ b/email/nomination_acknowledge.txt
@@ -12,6 +12,6 @@
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
deleted file mode 100644
index c2da335..0000000
--- a/email/notice_release.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-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 release lines are targeted:
-
- * %RELEASE_LINES%
-
-We intend to start the voting in three weeks from today. Please use this time to review any outstanding changes to be made, merging them in as necessary, and taking particular care to update NEWS and CHANGES.
-
-For more information, see:
-
- http://wiki.apache.org/couchdb/Release_Procedure#Timetable
-
-For the release calendar, see:
-
- http://wiki.apache.org/couchdb/Release_Calendar
-
-Per the release procedure, I will send out a follow-up merge request in one week.
-
-Thanks,
diff --git a/email/pmc_1_vote.txt b/email/pmc_1_vote.txt
new file mode 100644
index 0000000..596f2d8
--- /dev/null
+++ 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/result_committer.txt b/email/pmc_2_result.txt
similarity index 92%
copy from email/result_committer.txt
copy to email/pmc_2_result.txt
index 7c6aadf..6ee8432 100644
--- a/email/result_committer.txt
+++ b/email/pmc_2_result.txt
@@ -1,6 +1,6 @@
From: %YOU%
To: private@couchdb.apache.org
-Subject: [RESULT] (Was: Re: [VOTE] (Was: Re: [DISCUSS] Elect %NAME% as committer))
+Subject: [RESULT] (Was: Re: [VOTE] (Was: Re: [DISCUSS] Elect %NAME% as PMC member))
================================================================================
Dear PMC,
@@ -18,4 +18,3 @@
Thanks,
-%VOTE_THREAD%
diff --git a/email/invite_pmc.txt b/email/pmc_3_invite.txt
similarity index 94%
rename from email/invite_pmc.txt
rename to email/pmc_3_invite.txt
index 9e45ce8..0973a16 100644
--- a/email/invite_pmc.txt
+++ b/email/pmc_3_invite.txt
@@ -27,9 +27,9 @@
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 b/email/pmc_4_notify.txt
similarity index 100%
rename from email/notify_pmc.txt
rename to email/pmc_4_notify.txt
diff --git a/email/done_pmc.txt b/email/pmc_5_done.txt
similarity index 100%
rename from email/done_pmc.txt
rename to email/pmc_5_done.txt
diff --git a/email/announce_pmc.txt b/email/pmc_6_announce.txt
similarity index 100%
rename from email/announce_pmc.txt
rename to email/pmc_6_announce.txt
diff --git a/email/release_1_notice.txt b/email/release_1_notice.txt
new file mode 100644
index 0000000..54cc93f
--- /dev/null
+++ 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 b/email/release_2_optional_binaries.txt
similarity index 74%
rename from email/request_binaries.txt
rename to email/release_2_optional_binaries.txt
index 11d4dd9..c4a63c5 100644
--- a/email/request_binaries.txt
+++ b/email/release_2_optional_binaries.txt
@@ -9,7 +9,7 @@
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.
diff --git a/email/release_2_vote.txt b/email/release_2_vote.txt
new file mode 100644
index 0000000..e1f8d11
--- /dev/null
+++ b/email/release_2_vote.txt
@@ -0,0 +1,36 @@
+From: %YOU%
+To: dev@couchdb.apache.org
+Subject: [DISCUSS] Release Apache CouchDB %VERSION%
+================================================================================
+
+Dear community,
+
+I would like to propose that we release Apache CouchDB %VERSION%.
+
+[IF THIS IS ANY RC OTHER THAN -RC1]
+Changes since the last round:
+
+ https://github.com/apache/couchdb/compare/#.#.#-RC#...#.#.#-RC#
+
+[FOR ALL RELEASES]
+Candidate release notes:
+
+ https://docs.couchdb.org/en/latest/whatsnew/#.#.html
+
+We encourage the whole community to download and test these release artefacts so that any critical issues can be resolved before the release is made. Everyone is free to vote on this release, so dig right in! (Only PMC members have binding votes, but they depend on community feedback to gauge if an official release is ready to be made.)
+
+The release artefacts we are voting on are available here:
+
+ https://dist.apache.org/repos/dist/dev/couchdb/source/#.#.#/rc.#/
+
+There, you will find a tarball, a GPG signature, and SHA256/SHA512 checksums.
+
+Please follow the test procedure here:
+
+ https://cwiki.apache.org/confluence/display/COUCHDB/Testing+a+Source+Release
+
+Please remember that "RC#" is an annotation. If the vote passes, these artefacts will be released as Apache CouchDB %VERSION%.
+
+Please cast your votes now.
+
+Thanks,
diff --git a/email/result_release.txt b/email/release_3_result.txt
similarity index 100%
rename from email/result_release.txt
rename to email/release_3_result.txt
diff --git a/email/release_4_schedule.txt b/email/release_4_schedule.txt
new file mode 100644
index 0000000..22ace91
--- /dev/null
+++ b/email/release_4_schedule.txt
@@ -0,0 +1,25 @@
+From: %YOU%
+To: dev@couchdb.apache.org
+Subject: [NOTICE] Scheduling of Apache CouchDB VERSION release
+================================================================================
+
+Dear community,
+
+The Apache CouchDB VERSION release is ready to go. There will be a short delay
+while we wait for the Apache mirror system to sync up.
+
+I plan to make the announcement at:
+
+ %DATE% %TIME%
+
+I will use these release notes:
+
+ https://docs.couchdb.org/en/stable/whatsnew/#.#.html
+
+You can track the status of the Apache mirror system here:
+
+ https://www.apache.org/mirrors/
+
+Please make any necessary preparations.
+
+Thanks,
diff --git a/email/release_5_announce.txt b/email/release_5_announce.txt
new file mode 100644
index 0000000..51700e6
--- /dev/null
+++ b/email/release_5_announce.txt
@@ -0,0 +1,36 @@
+From: %YOU%
+To: announce@apache.org, announce@couchdb.apache.org, user@couchdb.apache.org, dev@couchdb.apache.org, marketing@couchdb.apache.org
+Subject: [ANNOUNCE] Apache CouchDB %VERSION% released
+=======================================================================
+
+Dear community,
+
+Apache CouchDB® %VERSION% has been released and is available for download.
+
+Apache CouchDB® lets you access your data where you need it. The Couch Replication Protocol is implemented in a variety of projects and products that span every imaginable computing environment from globally distributed server-clusters, over mobile phones to web browsers.
+
+Store your data safely, on your own servers, or with any leading cloud provider. Your web- and native applications love CouchDB, because it speaks JSON natively and supports binary data for all your data storage needs.
+
+The Couch Replication Protocol lets your data flow seamlessly between server clusters to mobile phones and web browsers, enabling a compelling offline-first user-experience while maintaining high performance and strong reliability. CouchDB comes with a developer-friendly query language, and optionally MapReduce for simple, efficient, and comprehensive data retrieval.
+
+ https://couchdb.apache.org/#download
+
+Pre-built packages for Windows, macOS, Debian/Ubuntu and RHEL/CentOS are available.
+
+CouchDB %VERSION% is a {feature|maintenance} release, and was originally published on YYYY-MM-DD.
+
+The community would like to thank all contributors for their part in making this release, from the smallest bug report or patch to major contributions in code, design, or marketing, we couldn’t have done it without you!
+
+See the official release notes document for an exhaustive list of all changes:
+
+ http://docs.couchdb.org/en/stable/whatsnew/%SHORTVERSION%.html
+
+Release Notes highlights:
+
+ - Point 1
+
+ - Point 2
+
+ - Point 3
+
+On behalf of the CouchDB PMC,
diff --git a/email/request_promotion.txt b/email/release_6_promote.txt
similarity index 100%
rename from email/request_promotion.txt
rename to email/release_6_promote.txt
diff --git a/email/request_merge.txt b/email/request_merge.txt
deleted file mode 100644
index a1c6011..0000000
--- a/email/request_merge.txt
+++ /dev/null
@@ -1 +0,0 @@
-# See recent emails. Need more feedback before I can create a template.
diff --git a/email/request_notes.txt b/email/request_notes.txt
deleted file mode 100644
index d92d1cc..0000000
--- a/email/request_notes.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-From: %YOU%
-To: dev@couchdb.apache.org
-Subject: [REQUEST] Release notes for %VERSION%-rc.%CANDIDATE%
-================================================================================
-
-Dear community,
-
-This is a request to help with the release notes for the %VERSION%-rc.%CANDIDATE% release.
-
-You can view my initial draft here:
-
- https://dist.apache.org/repos/dist/dev/couchdb/notes/VERSION/rc.CANDIDATE
-
-Please read through this and suggest any changes. The summaries were taken from the CHANGES file. But we aim to be more descriptive in the release notes. A paragraph or two explaining the change, or what it means for the user, for example.
-
-This file is kept in Subversion, and if you are a committer, you can just check out the directory, make your changes, and check them in. Otherwise, please just comment in reply to this email and I will take care of it.
-
-Thanks,
diff --git a/email/request_report.txt b/email/request_report.txt
deleted file mode 100644
index 496fed9..0000000
--- a/email/request_report.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-From: %YOU%
-To: dev@couchdb.apache.org
-Subject: [REQUEST] Board report for %MONTH% %YEAR%
-================================================================================
-
-Dear community,
-
-This is a request to help with the board report for %MONTH% %YEAR%.
-
-You can view my initial draft here:
-
- https://wiki.apache.org/couchdb/Board_Report/%YYYY%_%MM%
-
-Please read through this and suggest any changes.
-
-This is just a start. Any information you can add will help. We aim to blog about the report, so this is a good opportunity to communicate our progress to the wider community.
-
-Feel free to edit the wiki directly. Or just reply to this email and I will take care of it.
-
-Our deadline to complete this is %DATE%.
-
-Thanks,
diff --git a/email/schedule_release.txt b/email/schedule_release.txt
deleted file mode 100644
index 1042f1c..0000000
--- a/email/schedule_release.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-From: %YOU%
-To: dev@couchdb.apache.org
-Subject: [SCHEDULE] Apache CouchDB VERSION release
-================================================================================
-
-@@ should be "NOTICE"
-
-Dear community,
-
-The Apache CouchDB VERSION release is ready to go.
-
-I plan to make the announcement at:
-
- %DATE% %TIME%
-
-I will use these release notes:
-
- http://www.apache.org/dist/couchdb/notes/VERSION/
-
-Please make any necessary preparations.
-
-Thanks,
diff --git a/email/invite_translator.txt b/email/translator_1_invite.txt
similarity index 100%
rename from email/invite_translator.txt
rename to email/translator_1_invite.txt
diff --git a/email/confirm_translator.txt b/email/translator_2_confirm.txt
similarity index 94%
rename from email/confirm_translator.txt
rename to email/translator_2_confirm.txt
index 488c515..6a7f464 100644
--- a/email/confirm_translator.txt
+++ b/email/translator_2_confirm.txt
@@ -6,7 +6,7 @@
Dear %NAME%,
-we are pleased to welcome you at the CouchDB translation team.
+We are pleased to welcome you at the CouchDB translation team.
The translations for CouchDB are being made with the help of the ASF translation service. Please find the service here:
@@ -32,5 +32,4 @@
If you have any questions, please don't wait to ask on the l10n@couchdb.apache.org mailing-list.
-
-On behalf of the CouchDB translation Team,
\ No newline at end of file
+On behalf of the CouchDB translation Team,
diff --git a/email/announce_translator.txt b/email/translator_3_announce.txt
similarity index 100%
rename from email/announce_translator.txt
rename to email/translator_3_announce.txt
diff --git a/email/vote_release.txt b/email/vote_release.txt
deleted file mode 100644
index 17ae71c..0000000
--- a/email/vote_release.txt
+++ /dev/null
@@ -1,32 +0,0 @@
-From: %YOU%
-To: dev@couchdb.apache.org
-Subject: [VOTE] Release Apache CouchDB %VERSION%-rc.%CANDIDATE%
-================================================================================
-
-Dear community,
-
-I would like to release Apache CouchDB %VERSION%-rc.%CANDIDATE%.
-
-Changes since last round:
-
- * https://git-wip-us.apache.org/repos/asf?p=couchdb.git;a=shortlog;h=refs/heads/%BRANCH%
-
-We encourage the whole community to download and test these release artefacts so that any critical issues can be resolved before the release is made. Everyone is free to vote on this release, so get stuck in!
-
-The release artefacts we are voting on are available here:
-
- wget %CANDIDATE_URL%/%PACKAGE%.tar.gz
- wget %CANDIDATE_URL%/%PACKAGE%.tar.gz.asc
- wget %CANDIDATE_URL%/%PACKAGE%.tar.gz.ish
- wget %CANDIDATE_URL%/%PACKAGE%.tar.gz.md5
- wget %CANDIDATE_URL%/%PACKAGE%.tar.gz.sha
-
-Please follow the test procedure here:
-
- https://cwiki.apache.org/confluence/display/COUCHDB/Testing+a+Source+Release
-
-Please remember that "rc.%CANDIDATE%" is an annotation. If the vote passes, these artefacts will be released as Apache CouchDB %VERSION%.
-
-Please cast your votes now.
-
-Thanks,
