Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/couchdb-admin
diff --git a/email/announce_committer.txt b/email/announce_committer.txt
index 91377ad..19fddf8 100644
--- a/email/announce_committer.txt
+++ b/email/announce_committer.txt
@@ -13,9 +13,9 @@
Twitter: %TWITTER%
-By default, external contributions to the project follow the Review-Then-Commit model. Being a committer means you can follow the Commit-Then-Review model. In other words, %INFORMAL_NAME% can now make changes at will.
+Committers are given a binding vote in certain project decsions, as well as write access to public project infrastructure.
-This election was made in recognition of %INFORMAL_NAME%'s existing contributions and commitment to the project.
+This election was made in recognition of %INFORMAL_NAME%'s commitment to the project. We mean this in the sense of being loyal to the project and its interests.
Please join me in extending a warm welcome to %INFORMAL_NAME%!
diff --git a/email/discuss_committer.txt b/email/discuss_committer.txt
deleted file mode 100644
index 07f2806..0000000
--- a/email/discuss_committer.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-From: %YOU%
-To: private@couchdb.apache.org
-Subject: [DISCUSS] Elect %NAME% as committer
-================================================================================
-
-Dear PMC,
-
-I would like to elect %NAME% as committer.
-
-%REASONS%
-
-Please respond now if you think there is anything to discuss.
-
-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 will start the corresponding [VOTE] thread and complete the rest of process.
-
-Thanks,
diff --git a/email/done_committer.txt b/email/done_committer.txt
index 0a76c84..8b68af0 100644
--- a/email/done_committer.txt
+++ b/email/done_committer.txt
@@ -8,45 +8,27 @@
As you know, %ID% is your new committer account.
-Please log in and configure your account, if you haven't already done so:
+You now have write access to certain parts of the ASF.
- https://id.apache.org/
+A guide for your first steps as a committer can be found here:
-You can use this to set up SSH, GPG, mail forwarding, etc. You should
-consider creating a dedicated release/code signing GPG key bound to
-your ASF id.
-
-Some further reading:
-
- http://www.apache.org/foundation/how-it-works.html
-
- http://www.apache.org/dev/new-committers-guide.html
-
- http://www.apache.org/dev/committers.html
-
-More resources here:
-
- http://www.apache.org/dev/
+ https://cwiki.apache.org/confluence/display/COUCHDB/Committer+First+Steps
The CouchDB community guide can be found here:
- http://wiki.apache.org/couchdb/Community_Guide
-
-You now have commit access to certain parts of the ASF.
-
-CouchDB resources are here:
-
- http://wiki.apache.org/couchdb/SourceCode
-
-A Guide for your first steps as a commiter can be found here:
-
- https://wiki.apache.org/couchdb/Committer_First_Steps
+ https://cwiki.apache.org/confluence/display/COUCHDB/Community+Guide
General committers resources are here:
https://svn.apache.org/repos/private/committers
-One of the first things you should do with your new commit bit is to add yourself to the AUTHORS file on the master branch of the primary CouchDB Git repository. Furthermore, please add yourself to the committers list at https://wiki.apache.org/couchdb/Committers. Though please wait for my public announcement before you do so.
+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
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!
diff --git a/email/notify_pmc.txt b/email/notify_pmc.txt
new file mode 100644
index 0000000..ed223dd
--- /dev/null
+++ b/email/notify_pmc.txt
@@ -0,0 +1,11 @@
+From: %YOU%
+To: board@apache.org
+CC: private@couchdb.apache.org
+Subject: [NOTICE] %NAME% for CouchDB PMC
+================================================================================
+
+Dear Board,
+
+CouchDB proposes to invite %NAME% (%ASF_ID%) to join the PMC.
+
+Thanks,
diff --git a/email/vote_committer.txt b/email/vote_committer.txt
index a26ca2f..b2523a0 100644
--- a/email/vote_committer.txt
+++ b/email/vote_committer.txt
@@ -1,16 +1,22 @@
From: %YOU%
To: private@couchdb.apache.org
-Subject: [VOTE] (Was: Re: [DISCUSS] Elect %NAME% as committer)
+Subject: [VOTE] Elect %NAME% as committer
================================================================================
Dear PMC,
I would like to elect %NAME% as committer.
-I believe we reached consensus on the corresponding [DISCUSS] thread.
+%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.
+
+Required reading:
+
+ http://couchdb.apache.org/bylaws.html#committers
+
+Per the bylaws, this vote uses the lazy majority approval model, meaning that three binding +1 votes and more binding +1 votes than -1 votes are needed.
Please cast your votes now.
Thanks,
-
-%DISCUSS_THREAD%
