GUACAMOLE-436: Rename mailing list domains.
diff --git a/pull-requests.md b/pull-requests.md
index 4d356ea..f7aaa1e 100644
--- a/pull-requests.md
+++ b/pull-requests.md
@@ -71,7 +71,7 @@
the main repository.
Once this is done, the ASF git bot should kick in, and emails should go out
-across the <commits@guacamole.incubator.apache.org> list noting each commit
+across the <commits@guacamole.apache.org> list noting each commit
pushed. If this does not happen, or the commits show up only within the ASF
repositories and not the GitHub mirrors, it may be necessary to reach out to
[Infra](https://www.apache.org/dev/infrastructure.html) by opening an issue
diff --git a/release-procedure-part1.md b/release-procedure-part1.md
index cb75bb8..f0e238b 100644
--- a/release-procedure-part1.md
+++ b/release-procedure-part1.md
@@ -13,8 +13,7 @@
Beginning a new release candidate should not be a unilateral decision. There is
no requirement that an official vote be held prior to starting a release
candidate, but there needs to be some discussion via a `[DISCUSS]` thread on
-<dev@guacamole.incubator.apache.org> to gauge whether the time is right for a
-release.
+<dev@guacamole.apache.org> to gauge whether the time is right for a release.
Development of Apache Guacamole is not halted when a release is being prepared,
but the main development tree is forked. With this in mind, it is best to only
diff --git a/release-procedure-part2.md b/release-procedure-part2.md
index abe2997..9accf03 100644
--- a/release-procedure-part2.md
+++ b/release-procedure-part2.md
@@ -155,7 +155,7 @@
are produced along with releases as a form of convenience binaries. These
images are `guacamole/guacamole` and `guacamole/guacd` respectively, both
hosted under the Apache Guacamole project's [Docker Hub
-account](http://guacamole.incubator.apache.org/releases/).
+account](https://hub.docker.com/u/guacamole/).
When building the Docker images, keep in mind:
@@ -211,8 +211,8 @@
--------------------------------------------
Once the above has been completed, request a vote with an email to
-<dev@guacamole.incubator.apache.org> titled `[VOTE] Release Apache Guacamole
-[VERSION] (RC[N])`, containing the following:
+<dev@guacamole.apache.org> titled `[VOTE] Release Apache Guacamole [VERSION]
+(RC[N])`, containing the following:
```
Hello all,
@@ -222,7 +222,7 @@
to artifacts, signatures/checksums, and updated documentation) can be found
here:
-http://guacamole.incubator.apache.org/releases/[VERSION]/
+http://guacamole.apache.org/releases/[VERSION]/
The git tag for all relevant repositories is "[VERSION]-RC[N]":
@@ -233,7 +233,7 @@
Build instructions are included in the manual, which is part of the updated
documentation referenced above. For convenience:
-http://guacamole.incubator.apache.org/doc/[VERSION]/gug/installing-guacamole.html
+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:
@@ -303,7 +303,7 @@
The draft release notes (along with links to artifacts,
signatures/checksums, and updated documentation) can be found here:
-http://guacamole.incubator.apache.org/releases/[VERSION]/
+http://guacamole.apache.org/releases/[VERSION]/
The git tag for all relevant repositories is "[VERSION]-RC[N]":
@@ -314,7 +314,7 @@
Build instructions are included in the manual, which is part of the
updated documentation referenced above. For convenience:
-http://guacamole.incubator.apache.org/doc/[VERSION]/gug/installing-guacamole.html
+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:
diff --git a/release-procedure-part4.md b/release-procedure-part4.md
index a6766e6..aeac8db 100644
--- a/release-procedure-part4.md
+++ b/release-procedure-part4.md
@@ -45,10 +45,9 @@
Finally, send an email with the subject `[ANNOUNCE] Apache Guacamole [VERSION]
released` to <announce@apache.org>, <general@incubator.apache.org>,
-<dev@guacamole.incubator.apache.org>, and
-<user@guacamole.incubator.apache.org>. **This email MUST be sent from an
-apache.org email address**, and should contain an announcement like the
-following:
+<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
@@ -64,11 +63,11 @@
A full list of the changes in this release, along with links to downloads
and updated documentation, can be found in the release notes:
-http://guacamole.incubator.apache.org/releases/[VERSION]/
+http://guacamole.apache.org/releases/[VERSION]/
For more information on Apache Guacamole, please see:
-http://guacamole.incubator.apache.org/
+http://guacamole.apache.org/
Thanks!
diff --git a/support.md b/support.md
index cf0efb3..49affaa 100644
--- a/support.md
+++ b/support.md
@@ -45,30 +45,30 @@
are actively filtered for spam, and any email not originating from a subscriber
will bounce.
-### General Discussion / Questions ([user@guacamole.incubator.apache.org](mailto:user@guacamole.incubator.apache.org))
+### General Discussion / Questions ([user@guacamole.apache.org](mailto:user@guacamole.apache.org))
The general/users list is intended for general questions and discussions which
do not necessarily pertain to development. This list replaces the old
[SourceForge forums](https://sourceforge.net/p/guacamole/discussion/) used by
Guacamole prior to its acceptance into the Apache Incubator.
-* [Subscribe](mailto:user-subscribe@guacamole.incubator.apache.org)
-* [Unsubscribe](mailto:user-unsubscribe@guacamole.incubator.apache.org)
-* [Archives](http://mail-archives.apache.org/mod_mbox/incubator-guacamole-user/)
+* [Subscribe](mailto:user-subscribe@guacamole.apache.org)
+* [Unsubscribe](mailto:user-unsubscribe@guacamole.apache.org)
+* [Archives](http://mail-archives.apache.org/mod_mbox/guacamole-user/)
Alternatively, the general/users list can also be used via the [forum hosted
on Nabble](http://apache-guacamole-incubating-users.2363388.n4.nabble.com/),
as described above.
-### Development ([dev@guacamole.incubator.apache.org](mailto:dev@guacamole.incubator.apache.org))
+### Development ([dev@guacamole.apache.org](mailto:dev@guacamole.apache.org))
The development list is for development-related discussion involving people who
are contributors to the Apache Guacamole project (or who wish to become
contributors).
-* [Subscribe](mailto:dev-subscribe@guacamole.incubator.apache.org)
-* [Unsubscribe](mailto:dev-unsubscribe@guacamole.incubator.apache.org)
-* [Archives](http://mail-archives.apache.org/mod_mbox/incubator-guacamole-dev/)
+* [Subscribe](mailto:dev-subscribe@guacamole.apache.org)
+* [Unsubscribe](mailto:dev-unsubscribe@guacamole.apache.org)
+* [Archives](http://mail-archives.apache.org/mod_mbox/guacamole-dev/)
[The Guacamole Manual](/doc/gug/)
---------------------------------
