You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@guacamole.apache.org by jm...@apache.org on 2017/11/17 19:10:40 UTC
[1/5] incubator-guacamole-website git commit: GUACAMOLE-436: Remove
disclaimer and "incubating" - we've graduated.
Repository: incubator-guacamole-website
Updated Branches:
refs/heads/master be3709c80 -> be79fdc04
GUACAMOLE-436: Remove disclaimer and "incubating" - we've graduated.
Project: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-website/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-website/commit/809f6c77
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-website/tree/809f6c77
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-website/diff/809f6c77
Branch: refs/heads/master
Commit: 809f6c77375c1324ea79854c7f06fe48403ead64
Parents: be3709c
Author: Michael Jumper <mj...@apache.org>
Authored: Wed Nov 15 23:10:24 2017 -0800
Committer: Michael Jumper <mj...@apache.org>
Committed: Fri Nov 17 00:31:36 2017 -0800
----------------------------------------------------------------------
README.md | 5 ++---
_config.yml | 2 +-
_includes/footer.html | 12 ------------
pull-requests.md | 4 ++--
release-procedure-part1.md | 2 +-
release-procedure-part2.md | 20 ++++++++++----------
release-procedure-part3.md | 16 ++++++++--------
release-procedure-part4.md | 24 +++++-------------------
8 files changed, 29 insertions(+), 56 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-website/blob/809f6c77/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index 8123f89..ea1f048 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,8 @@
The Apache Guacamole website
============================
-This repository contains the source for the website of Apache Guacamole, a
-clientless remote desktop solution currently undergoing incubation at the
-Apache Incubator.
+This repository contains the source for the website of [Apache
+Guacamole](http://guacamole.apache.org/), a clientless remote desktop gateway.
The website itself is completely static, being automatically generated by
[Jekyll](https://jekyllrb.com/) prior to deployment. The content of the website
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-website/blob/809f6c77/_config.yml
----------------------------------------------------------------------
diff --git a/_config.yml b/_config.yml
index dd1d0f1..f319d18 100644
--- a/_config.yml
+++ b/_config.yml
@@ -18,7 +18,7 @@
#
# Site settings
-title: Apache Guacamole (incubating)
+title: Apache Guacamole
# Build settings
markdown: kramdown
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-website/blob/809f6c77/_includes/footer.html
----------------------------------------------------------------------
diff --git a/_includes/footer.html b/_includes/footer.html
index 77f06b9..2c18906 100644
--- a/_includes/footer.html
+++ b/_includes/footer.html
@@ -20,16 +20,4 @@
Software Foundation.
</p>
- <!-- Incubation disclaimer -->
- <p class="disclaimer">
- Apache Guacamole is an effort undergoing Incubation at The Apache
- Software Foundation (ASF), sponsored by the Incubator. Incubation is
- required of all newly accepted projects until a further review
- indicates that the infrastructure, communications, and decision making
- process have stabilized in a manner consistent with other successful
- ASF projects. While incubation status is not necessarily a reflection
- of the completeness or stability of the code, it does indicate that the
- project has yet to be fully endorsed by the ASF.
- </p>
-
</div>
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-website/blob/809f6c77/pull-requests.md
----------------------------------------------------------------------
diff --git a/pull-requests.md b/pull-requests.md
index 2fec30b..4d356ea 100644
--- a/pull-requests.md
+++ b/pull-requests.md
@@ -98,8 +98,8 @@ Merging release-specific changes involves:
2. Merging the **staging branch** to **`master`**. Doing this is largely the
same as described above, except that there is inherently no JIRA issue to
- tag in the commit message. A message like "Merging 0.9.10-incubating
- changes back to master." is pretty sensible.
+ tag in the commit message. A message like "Merging 0.9.10 changes back to
+ master." is pretty sensible.
**DO NOT MERGE THE PULL REQUEST TO MASTER DIRECTLY!** The point of merging
the staging branch to master rather than the pull request is to ensure that
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-website/blob/809f6c77/release-procedure-part1.md
----------------------------------------------------------------------
diff --git a/release-procedure-part1.md b/release-procedure-part1.md
index fee1851..cb75bb8 100644
--- a/release-procedure-part1.md
+++ b/release-procedure-part1.md
@@ -41,7 +41,7 @@ contents of the release to remain within the agreed scope.
Create a new `staging/[VERSION]` branch for each of the following repositories,
where `[VERSION]` is the version of the upcoming release, such as
-"0.9.11-incubating":
+"0.9.11":
* [`incubator-guacamole-client`](https://github.com/apache/incubator-guacamole-client)
* [`incubator-guacamole-server`](https://github.com/apache/incubator-guacamole-server)
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-website/blob/809f6c77/release-procedure-part2.md
----------------------------------------------------------------------
diff --git a/release-procedure-part2.md b/release-procedure-part2.md
index 07e0398..abe2997 100644
--- a/release-procedure-part2.md
+++ b/release-procedure-part2.md
@@ -17,8 +17,8 @@ a new release candidate. These tags are made off the release branch (*not* off
version of the upcoming release and `[N]` is the number of the release
candidate:
- $ git tag -m "Release 0.9.11-incubating - RC1." 0.9.11-incubating-RC1
- $ git push upstream 0.9.11-incubating-RC1
+ $ git tag -m "Release 0.9.11 - RC1." 0.9.11-RC1
+ $ git push upstream 0.9.11-RC1
Each repository relevant to the release must be tagged. At this point, this
will be every repository that has a release branch. This *never* includes
@@ -117,18 +117,18 @@ uploaded individually using the `gpg:sign-and-deploy-file` mojo:
$ mvn gpg:sign-and-deploy-file \
-Durl=https://repository.apache.org/service/local/staging/deploy/maven2 \
-DrepositoryId=apache -DpomFile=guacamole-common/pom.xml \
- -Dfile=guacamole-common/target/guacamole-common-0.9.10-incubating.jar
+ -Dfile=guacamole-common/target/guacamole-common-0.9.10.jar
$ mvn gpg:sign-and-deploy-file \
-Durl=https://repository.apache.org/service/local/staging/deploy/maven2 \
-DrepositoryId=apache -DpomFile=guacamole-common/pom.xml \
- -Dfile=guacamole-common/target/guacamole-common-0.9.10-incubating-javadoc.jar \
+ -Dfile=guacamole-common/target/guacamole-common-0.9.10-javadoc.jar \
-Dclassifier=javadoc
$ mvn gpg:sign-and-deploy-file \
-Durl=https://repository.apache.org/service/local/staging/deploy/maven2 \
-DrepositoryId=apache -DpomFile=guacamole-common/pom.xml \
- -Dfile=guacamole-common/target/guacamole-common-0.9.10-incubating-sources.jar \
+ -Dfile=guacamole-common/target/guacamole-common-0.9.10-sources.jar \
-Dclassifier=sources
The above will need to be done for both `guacamole-common` and `guacamole-ext`,
@@ -140,7 +140,7 @@ needs to be uploaded. The command for this is slightly different:
-Durl=https://repository.apache.org/service/local/staging/deploy/maven2 \
-DrepositoryId=apache \
-DpomFile=guacamole-common-js/pom.xml \
- -Dfile=guacamole-common-js/target/guacamole-common-js-0.9.10-incubating.zip \
+ -Dfile=guacamole-common-js/target/guacamole-common-js-0.9.10.zip \
-Dpackaging=zip
Once everything has been uploaded, log into Apache's Nexus at
@@ -173,8 +173,8 @@ release candidate, from within the top-level `incubator-guacamole-client`
directory:
$ git clean -xfd .
- $ sudo docker build -t guacamole/guacamole:0.9.11-incubating-RC1 .
- $ sudo docker push guacamole/guacamole:0.9.11-incubating-RC1
+ $ sudo docker build -t guacamole/guacamole:0.9.11-RC1 .
+ $ sudo docker push guacamole/guacamole:0.9.11-RC1
Upload documentation and release notes {#upload-docs}
@@ -242,11 +242,11 @@ guacamole-ext can be found in the following staging repository:
Source and binary distributions (also linked within the release notes):
-https://dist.apache.org/repos/dist/dev/incubator/guacamole/[VERSION]-RC[N]/
+https://dist.apache.org/repos/dist/dev/guacamole/[VERSION]-RC[N]/
Artifacts have been signed with the "[EMAIL]" key listed in:
-https://dist.apache.org/repos/dist/dev/incubator/guacamole/KEYS
+https://dist.apache.org/repos/dist/dev/guacamole/KEYS
Please review and vote:
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-website/blob/809f6c77/release-procedure-part3.md
----------------------------------------------------------------------
diff --git a/release-procedure-part3.md b/release-procedure-part3.md
index ecb140c..f9e233b 100644
--- a/release-procedure-part3.md
+++ b/release-procedure-part3.md
@@ -21,8 +21,8 @@ from `master`, **something is horribly wrong, and the release needs to be
rechecked**.
$ git checkout master
- $ git branch -d staging/0.9.11-incubating
- $ git push upstream :staging/0.9.11-incubating
+ $ git branch -d staging/0.9.11
+ $ git push upstream :staging/0.9.11
Tag the final version of the release {#final-tag}
-------------------------------------------------
@@ -32,8 +32,8 @@ with a new tag, pointing to the exact same commit as the last [tagged release
candidate](/release-procedures-part2/#tag-rc). This tag must be made in the
format `[VERSION]`, where `[VERSION]` is the version of the release:
- $ git tag -m "Release 0.9.11-incubating." 0.9.11-incubating
- $ git push upstream 0.9.11-incubating
+ $ git tag -m "Release 0.9.11." 0.9.11
+ $ git push upstream 0.9.11
Just as with release candidates, each repository relevant to the release must
be tagged. This will be every repository that had a release branch (the release
@@ -56,8 +56,8 @@ 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/incubator/guacamole/0.9.11-incubating-RC1 release/incubator/guacamole/0.9.11-incubating
- $ svn commit -m "Promote Apache Guacamole 0.9.11-incubating-RC1 artifacts to 0.9.11-incubating release."
+ $ svn mv dev/guacamole/0.9.11-RC1 release/guacamole/0.9.11
+ $ svn commit -m "Promote Apache Guacamole 0.9.11-RC1 artifacts to 0.9.11 release."
Note that, once this has finished, **YOU MUST STILL WAIT AT LEAST 24 HOURS TO
ALLOW THE [MIRRORS](https://www.apache.org/mirrors/) TIME TO SYNC** before
@@ -93,14 +93,14 @@ release candidate, from within the top-level `incubator-guacamole-client`
directory:
$ git clean -xfd .
- $ sudo docker build -t guacamole/guacamole:0.9.11-incubating .
+ $ sudo docker build -t guacamole/guacamole:0.9.11 .
$ sudo docker build -t guacamole/guacamole:latest .
Each of the above commands should finish virtually instantaneously, and the
hash of the built images should match each other and the previous RC. Assuming
all looks well, it should be safe to push the images:
- $ sudo docker push guacamole/guacamole:0.9.11-incubating
+ $ sudo docker push guacamole/guacamole:0.9.11
$ sudo docker push guacamole/guacamole:latest
Again, this should finish virtually instantaneously, as no new data will need
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-website/blob/809f6c77/release-procedure-part4.md
----------------------------------------------------------------------
diff --git a/release-procedure-part4.md b/release-procedure-part4.md
index cc43c6e..a6766e6 100644
--- a/release-procedure-part4.md
+++ b/release-procedure-part4.md
@@ -54,11 +54,10 @@ following:
The Apache Guacamole community is proud to announce the release of Apache
Guacamole [VERSION].
-Apache Guacamole (incubating) 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].
@@ -73,20 +72,7 @@ http://guacamole.incubator.apache.org/
Thanks!
-The Apache Guacamole (incubating) Community
-
-----
-
-DISCLAIMER:
-
-Apache Guacamole is an effort undergoing Incubation at The Apache Software
-Foundation (ASF), sponsored by the Incubator. Incubation is required of all
-newly accepted projects until a further review indicates that the
-infrastructure, communications, and decision making process have stabilized
-in a manner consistent with other successful ASF projects. While incubation
-status is not necessarily a reflection of the completeness or stability of
-the code, it does indicate that the project has yet to be fully endorsed by
-the ASF.
+The Apache Guacamole Community
```
Where `[VERSION]` is the version that was just released and `[RELEASE
[3/5] incubator-guacamole-website git commit: GUACAMOLE-436: Rename
mailing list domains.
Posted by jm...@apache.org.
GUACAMOLE-436: Rename mailing list domains.
Project: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-website/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-website/commit/8c678483
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-website/tree/8c678483
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-website/diff/8c678483
Branch: refs/heads/master
Commit: 8c678483d3f03b7b8a58831db558d31e52fcf95f
Parents: d23371d
Author: Michael Jumper <mj...@apache.org>
Authored: Fri Nov 17 00:14:43 2017 -0800
Committer: Michael Jumper <mj...@apache.org>
Committed: Fri Nov 17 00:42:51 2017 -0800
----------------------------------------------------------------------
pull-requests.md | 2 +-
release-procedure-part1.md | 3 +--
release-procedure-part2.md | 14 +++++++-------
release-procedure-part4.md | 11 +++++------
support.md | 16 ++++++++--------
5 files changed, 22 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-website/blob/8c678483/pull-requests.md
----------------------------------------------------------------------
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 @@ to:
the main repository.
Once this is done, the ASF git bot should kick in, and emails should go out
-across the <co...@guacamole.incubator.apache.org> list noting each commit
+across the <co...@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
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-website/blob/8c678483/release-procedure-part1.md
----------------------------------------------------------------------
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 @@ Create a discussion thread for the release {#discuss-thread}
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
-<de...@guacamole.incubator.apache.org> to gauge whether the time is right for a
-release.
+<de...@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
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-website/blob/8c678483/release-procedure-part2.md
----------------------------------------------------------------------
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 @@ Both guacamole-client and guacamole-server have associated Docker images which
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 @@ Create the PPMC `[VOTE]` thread {#ppmc-vote}
--------------------------------------------
Once the above has been completed, request a vote with an email to
-<de...@guacamole.incubator.apache.org> titled `[VOTE] Release Apache Guacamole
-[VERSION] (RC[N])`, containing the following:
+<de...@guacamole.apache.org> titled `[VOTE] Release Apache Guacamole [VERSION]
+(RC[N])`, containing the following:
```
Hello all,
@@ -222,7 +222,7 @@ uploaded and is ready for VOTE. 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]":
@@ -233,7 +233,7 @@ 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.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 VOTE RESULT is here:
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 @@ 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.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:
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-website/blob/8c678483/release-procedure-part4.md
----------------------------------------------------------------------
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 @@ Email announcement {#email-announce}
Finally, send an email with the subject `[ANNOUNCE] Apache Guacamole [VERSION]
released` to <an...@apache.org>, <ge...@incubator.apache.org>,
-<de...@guacamole.incubator.apache.org>, and
-<us...@guacamole.incubator.apache.org>. **This email MUST be sent from an
-apache.org email address**, and should contain an announcement like the
-following:
+<de...@guacamole.apache.org>, and <us...@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 @@ server, all you need to access your desktops is a web browser.
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!
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-website/blob/8c678483/support.md
----------------------------------------------------------------------
diff --git a/support.md b/support.md
index cf0efb3..49affaa 100644
--- a/support.md
+++ b/support.md
@@ -45,30 +45,30 @@ will need to subscribe prior to sending email to any list.** All mailing lists
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/)
---------------------------------
[5/5] incubator-guacamole-website git commit: GUACAMOLE-436: Merge
graduation-related website updates.
Posted by jm...@apache.org.
GUACAMOLE-436: Merge graduation-related website updates.
Project: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-website/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-website/commit/be79fdc0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-website/tree/be79fdc0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-website/diff/be79fdc0
Branch: refs/heads/master
Commit: be79fdc045b60078cdc5928f03c5c05643c9f653
Parents: be3709c 5e425b1
Author: James Muehlner <ja...@guac-dev.org>
Authored: Fri Nov 17 11:09:36 2017 -0800
Committer: James Muehlner <ja...@guac-dev.org>
Committed: Fri Nov 17 11:09:36 2017 -0800
----------------------------------------------------------------------
README.md | 5 +-
_config.yml | 2 +-
_includes/footer.html | 17 ++-----
open-source.md | 25 +++++----
pull-requests.md | 6 +--
release-procedure-part1.md | 5 +-
release-procedure-part2.md | 110 ++++++++--------------------------------
release-procedure-part3.md | 29 +++++------
release-procedure-part4.md | 36 ++++---------
support.md | 16 +++---
10 files changed, 75 insertions(+), 176 deletions(-)
----------------------------------------------------------------------
[4/5] incubator-guacamole-website git commit: GUACAMOLE-436: We have
a PMC now, not a PPMC.
Posted by jm...@apache.org.
GUACAMOLE-436: We have a PMC now, not a PPMC.
Project: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-website/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-website/commit/5e425b19
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-website/tree/5e425b19
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-website/diff/5e425b19
Branch: refs/heads/master
Commit: 5e425b19640e0e9fd06ee7cdc227ad457b3ee4c3
Parents: 8c67848
Author: Michael Jumper <mj...@apache.org>
Authored: Wed Nov 15 23:10:39 2017 -0800
Committer: Michael Jumper <mj...@apache.org>
Committed: Fri Nov 17 00:55:42 2017 -0800
----------------------------------------------------------------------
open-source.md | 25 +++++++------
release-procedure-part2.md | 80 +++--------------------------------------
release-procedure-part3.md | 13 ++++---
release-procedure-part4.md | 15 ++++----
4 files changed, 30 insertions(+), 103 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-website/blob/5e425b19/open-source.md
----------------------------------------------------------------------
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 @@ project, the first step is to be active in the community as a
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
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 @@ a committer not otherwise directly involved in those changes.
* [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)
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-website/blob/5e425b19/release-procedure-part2.md
----------------------------------------------------------------------
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 @@ Once everything has been uploaded, log into Apache's Nexus at
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 @@ Upload documentation and release notes {#upload-docs}
-----------------------------------------------------
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 @@ Examples:
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
<de...@guacamole.apache.org> titled `[VOTE] Release Apache Guacamole [VERSION]
@@ -269,7 +269,7 @@ associated with the PGP key used to sign the release artifacts, and `[YOU]` is
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 @@ If any release-blocking issues are discovered, the vote must be canceled and
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 <ge...@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)
-
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-website/blob/5e425b19/release-procedure-part3.md
----------------------------------------------------------------------
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 @@ permalink: /release-procedures-part3/
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 @@ Upload final release artifacts {#final-upload}
### 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
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-website/blob/5e425b19/release-procedure-part4.md
----------------------------------------------------------------------
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 @@ Email announcement {#email-announce}
------------------------------------
Finally, send an email with the subject `[ANNOUNCE] Apache Guacamole [VERSION]
-released` to <an...@apache.org>, <ge...@incubator.apache.org>,
-<de...@guacamole.apache.org>, and <us...@guacamole.apache.org>. **This email MUST
-be sent from an apache.org email address**, and should contain an announcement
-like the following:
+released` to <an...@apache.org>, <de...@guacamole.apache.org>, and
+<us...@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].
[2/5] incubator-guacamole-website git commit: GUACAMOLE-436: Note
that Apache Guacamole, Guacamole,
and the Apache Guacamole logo are ASF trademarks.
Posted by jm...@apache.org.
GUACAMOLE-436: Note that Apache Guacamole, Guacamole, and the Apache Guacamole logo are ASF trademarks.
>From https://www.apache.org/foundation/marks/list/:
>
> The Apache Software Foundation considers the names of all top level
> projects, all downloadable software products, our feather logo, and the
> logos of our projects to be trademarks of the ASF. The ASF owns all
> Apache trademarks on behalf of our volunteer project communities.
>
Project: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-website/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-website/commit/d23371d5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-website/tree/d23371d5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-website/diff/d23371d5
Branch: refs/heads/master
Commit: d23371d591b1119444a39d3f6356702a235fc17e
Parents: 809f6c7
Author: Michael Jumper <mj...@apache.org>
Authored: Thu Nov 16 23:50:53 2017 -0800
Committer: Michael Jumper <mj...@apache.org>
Committed: Fri Nov 17 00:38:58 2017 -0800
----------------------------------------------------------------------
_config.yml | 2 +-
_includes/footer.html | 5 +++--
2 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-website/blob/d23371d5/_config.yml
----------------------------------------------------------------------
diff --git a/_config.yml b/_config.yml
index f319d18..9aff937 100644
--- a/_config.yml
+++ b/_config.yml
@@ -18,7 +18,7 @@
#
# Site settings
-title: Apache Guacamole
+title: Apache Guacamole™
# Build settings
markdown: kramdown
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-website/blob/d23371d5/_includes/footer.html
----------------------------------------------------------------------
diff --git a/_includes/footer.html b/_includes/footer.html
index 2c18906..6afcdeb 100644
--- a/_includes/footer.html
+++ b/_includes/footer.html
@@ -16,8 +16,9 @@
<!-- Trademarks -->
<p class="trademarks">
- Apache and the Apache feather logo are trademarks of The Apache
- Software Foundation.
+ Apache Guacamole, Guacamole, Apache, the Apache feather logo, and the
+ Apache Guacamole project logo are trademarks of The Apache Software
+ Foundation.
</p>
</div>