GUACAMOLE-436: We have a PMC now, not a PPMC.
diff --git a/open-source.md b/open-source.md
index e3cd622..9849467 100644
--- a/open-source.md
+++ b/open-source.md
@@ -36,7 +36,7 @@
Contributors who show merit through the quality of their continuing activity in
the community and their contributions to the project will be invited to become
-[committers](#committers) or [members of the PPMC](#ppmc-members).
+[committers](#committers) or [members of the PMC](#pmc-members).
Contributing {#contribute}
-----------------
@@ -81,8 +81,7 @@
Committers actively maintain and contribute to the Apache Guacamole project,
produce releases, review the code of contributors and fellow committers, and
identify contributors who have shown [merit](#meritocracy) and should be
-offered committership. Apache Guacamole committers are also implicitly members
-of the [Apache Guacamole PPMC](#ppmc-members).
+offered committership.
Committers have write access to Apache Guacamole's git repositories, but do not
make direct changes on their own behalf. Code changes are made only through
@@ -104,19 +103,19 @@
* [Promoting a release candidate to release](/release-procedures-part3/)
* [Announcing the release](/release-procedures-part4/)
-PPMC members
-------------
+PMC members
+-----------
-The Apache Guacamole PPMC is responsible for project oversight. PPMC members
-participate in discussions on the [mailing lists](/support/#mailing-lists) and
-vote on release candidates, new committers, and new PPMC members. Like
-[committers](#committers) (who are implicitly PPMC members), the PPMC is
-responsible for identifying members of the community who have shown
-[merit](#meritocracy) warranting committership or PPMC membership.
+The Apache Guacamole PMC is made up of committers and is responsible for
+project oversight. PMC members participate in discussions on the [mailing
+lists](/support/#mailing-lists) and vote on release candidates, new committers,
+and new PMC members. The PMC is responsible for identifying members of the
+community who have shown [merit](#meritocracy) warranting committership and/or
+PMC membership.
-### Resources for PPMC members:
+### Resources for PMC members:
* [Apache Guacamole mailing lists](/support/#mailing-lists)
-* [Apache Incubator: PPMC guide](http://incubator.apache.org/guides/ppmc.html)
+* [Project Management Committee Guide](http://www.apache.org/dev/pmc.html)
* [Apache voting process](http://apache.org/foundation/voting.html)
diff --git a/release-procedure-part2.md b/release-procedure-part2.md
index 9accf03..a55f051 100644
--- a/release-procedure-part2.md
+++ b/release-procedure-part2.md
@@ -147,7 +147,7 @@
https://repository.apache.org/, locate the staging repository which was
automatically created, and verify things look as expected. Assuming everything
looks good, select close staging repository to make it publicly available; the
-URL of the repository will need to be provided in the various VOTE emails.
+URL of the repository will need to be provided in the VOTE email.
### Docker images
@@ -181,7 +181,7 @@
-----------------------------------------------------
The draft release notes and updated documentation both need to be uploaded to
-the website prior to [calling the PPMC vote](#ppmc-vote). These changes should
+the website prior to [calling the PMC vote](#pmc-vote). These changes should
be handled like any other website changes - via pull requests against the
`incubator-guacamole-website` repository. **DO NOT UPDATE THE TOP-LEVEL
DOCUMENTATION SYMBOLIC LINKS!** The top-level symbolic links in the `doc/`
@@ -207,8 +207,8 @@
release notes for 0.9.10-incubating-RC3](https://github.com/apache/incubator-guacamole-website/blob/67adf0802701d696f9dc1a90229da694f4cebbaa/_releases/0.9.10-incubating.md)
* [The updated documentation for 0.9.10-incubating](https://github.com/apache/incubator-guacamole-website/tree/master/doc/0.9.10-incubating)
-Create the PPMC `[VOTE]` thread {#ppmc-vote}
---------------------------------------------
+Create the PMC `[VOTE]` thread {#ppmc-vote}
+-------------------------------------------
Once the above has been completed, request a vote with an email to
<dev@guacamole.apache.org> titled `[VOTE] Release Apache Guacamole [VERSION]
@@ -269,7 +269,7 @@
your name. Obviously, alter the email as necessary if the scope of the release
is different.
-Please note that, though community input is welcome, *only PPMC votes count
+Please note that, though community input is welcome, *only PMC votes count
toward the required three "+1" votes*.
Example: [the 0.9.10-incubating-RC3 PPMC VOTE email](http://mail-archives.apache.org/mod_mbox/incubator-guacamole-dev/201612.mbox/%3CCALKeL-PKQxOYqZCvhH6_ZF33Zo_LUZjLVZzTh%2B0VRipgsNxQ1g%40mail.gmail.com%3E)
@@ -278,73 +278,3 @@
development must resume, followed by another release candidate (prepared as
above) intended to address those issues.
-
-Create the IPMC `[VOTE]` thread {#ipmc-vote}
---------------------------------------------
-
-If/when the PPMC vote passes, another vote must be started for the IPMC. Only
-IPMC votes are binding here. Send an email to <general@incubator.apache.org>
-titled `[VOTE] Release Apache Guacamole [VERSION] (RC[N])` containing the
-following:
-
-```
-Hello Incubator PMC,
-
-The Apache Guacamole community has voted on and approved a proposal to
-release Apache Guacamole [VERSION].
-
-We now kindly request that the Incubator PMC members review and vote
-on this incubator release.
-
-The VOTE RESULT is here:
-
-[LINK TO VOTE RESULT]
-
-The draft release notes (along with links to artifacts,
-signatures/checksums, and updated documentation) can be found here:
-
-http://guacamole.apache.org/releases/[VERSION]/
-
-The git tag for all relevant repositories is "[VERSION]-RC[N]":
-
-https://github.com/apache/incubator-guacamole-client/tree/[VERSION]-RC[N]
-https://github.com/apache/incubator-guacamole-server/tree/[VERSION]-RC[N]
-https://github.com/apache/incubator-guacamole-manual/tree/[VERSION]-RC[N]
-
-Build instructions are included in the manual, which is part of the
-updated documentation referenced above. For convenience:
-
-http://guacamole.apache.org/doc/[VERSION]/gug/installing-guacamole.html
-
-Maven artifacts for guacamole-common, guacamole-common-js, and
-guacamole-ext can be found in the following staging repository:
-
-[STAGING REPOSITORY URL]
-
-Source and binary distributions (also linked within the release notes):
-
-https://dist.apache.org/repos/dist/dev/incubator/guacamole/[VERSION-RC[N]/
-
-Artifacts have been signed with the "[EMAIL]" key listed in:
-
-https://dist.apache.org/repos/dist/dev/incubator/guacamole/KEYS
-
-Please review and vote:
-
-[ ] +1 Approve the release
-[ ] -1 Don't approve the release (please provide specific comments)
-
-This vote will be open for at least 72 hours.
-
-Thanks,
-
-[YOU]
-```
-
-Where `[LINK TO VOTE RESULT]` the permalink to the specific email calling the
-result of [the PPMC vote](#ppmc-vote) on the [public archive of
-dev@guacamole.incubator.org](http://mail-archives.apache.org/mod_mbox/incubator-guacamole-dev/),
-and all other fields are as described for [the PPMC vote email](#ppmc-vote).
-
-Example: [the 0.9.10-incubating-RC3 IPMC VOTE email](http://mail-archives.apache.org/mod_mbox/incubator-general/201612.mbox/%3CCALKeL-MQmTi1fW%2BGsvFvN21D-ECfHEpf7hwQN5rB-U1JmfAXtQ%40mail.gmail.com%3E)
-
diff --git a/release-procedure-part3.md b/release-procedure-part3.md
index f9e233b..6f86dcf 100644
--- a/release-procedure-part3.md
+++ b/release-procedure-part3.md
@@ -10,9 +10,8 @@
Delete the release branch {#delete-branch}
------------------------------------------
-Once [the PPMC vote](/release-procedures-part2/#ppmc-vote) and [IPMC
-vote](/release-procedures-part2/#ipmc-vote) for the release have passed, the
-release branches [which were created
+Once [the PMC vote](/release-procedures-part2/#pmc-vote) for the release has
+passed, the release branches [which were created
previously](/release-procedures-part1/#release-branch) must be deleted.
Assuming they were properly merged back to `master` as release-specific changes
were made, deleting these branches with `git branch -d` will succeed without
@@ -50,10 +49,10 @@
### Artifacts in dist SVN
The release artifacts and their signatures come from the release candidate
-which was approved via the various VOTEs. These artifacts are already present
-in the SVN dist area under `dev/`, and need to be moved to the analogous area
-under `release/`. *This must be done using `svn mv`*, with the directory
-containing the artifacts and signatures being renamed from `[VERSION]-RC[N]` to
+which was approved via the VOTE. These artifacts are already present in the SVN
+dist area under `dev/`, and need to be moved to the analogous area under
+`release/`. *This must be done using `svn mv`*, with the directory containing
+the artifacts and signatures being renamed from `[VERSION]-RC[N]` to
`[VERSION`] in the process.
$ svn mv dev/guacamole/0.9.11-RC1 release/guacamole/0.9.11
diff --git a/release-procedure-part4.md b/release-procedure-part4.md
index aeac8db..8fa0143 100644
--- a/release-procedure-part4.md
+++ b/release-procedure-part4.md
@@ -44,19 +44,18 @@
------------------------------------
Finally, send an email with the subject `[ANNOUNCE] Apache Guacamole [VERSION]
-released` to <announce@apache.org>, <general@incubator.apache.org>,
-<dev@guacamole.apache.org>, and <user@guacamole.apache.org>. **This email MUST
-be sent from an apache.org email address**, and should contain an announcement
-like the following:
+released` to <announce@apache.org>, <dev@guacamole.apache.org>, and
+<user@guacamole.apache.org>. **This email MUST be sent from an apache.org
+email address**, and should contain an announcement like the following:
```
The Apache Guacamole community is proud to announce the release of Apache
Guacamole [VERSION].
-Apache Guacamole is a clientless remote desktop gateway which supports
-standard protocols like VNC, RDP, and SSH. We call it "clientless" because no
-plugins or client software are required; once Guacamole is installed on a
-server, all you need to access your desktops is a web browser.
+Apache Guacamole is a clientless remote desktop gateway which supports standard
+protocols like VNC, RDP, and SSH. We call it "clientless" because no plugins or
+client software are required; once Guacamole is installed on a server, all you
+need to access your desktops is a web browser.
[VERSION] features [RELEASE HIGHLIGHTS].
