You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@guacamole.apache.org by mj...@apache.org on 2017/11/17 19:38:39 UTC
[2/2] incubator-guacamole-website git commit: GUACAMOLE-436: Deploy
post-graduation updates to website (removal of "incubating" and disclaimer),
excluding repository rename (which has not yet occurred).
GUACAMOLE-436: Deploy post-graduation updates to website (removal of "incubating" and disclaimer), excluding repository rename (which has not yet occurred).
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/1727f228
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-website/tree/1727f228
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-website/diff/1727f228
Branch: refs/heads/asf-site
Commit: 1727f228d69800e20bd05978a2b699825cd19ce2
Parents: e503a09
Author: Michael Jumper <mj...@apache.org>
Authored: Fri Nov 17 11:38:21 2017 -0800
Committer: Michael Jumper <mj...@apache.org>
Committed: Fri Nov 17 11:38:21 2017 -0800
----------------------------------------------------------------------
content/api-documentation/index.html | 21 +--
content/guac-style/index.html | 36 ++---
content/index.html | 21 +--
content/maturity-evaluation/index.html | 21 +--
content/open-source/index.html | 44 ++----
content/pull-requests/index.html | 57 +++----
content/release-procedures-part1/index.html | 26 +---
content/release-procedures-part2/index.html | 168 +++++----------------
content/release-procedures-part3/index.html | 69 ++++-----
content/release-procedures-part4/index.html | 62 +++-----
content/releases/0.8.3/index.html | 21 +--
content/releases/0.8.4/index.html | 21 +--
content/releases/0.9.0/index.html | 21 +--
content/releases/0.9.1/index.html | 21 +--
content/releases/0.9.10-incubating/index.html | 21 +--
content/releases/0.9.11-incubating/index.html | 21 +--
content/releases/0.9.12-incubating/index.html | 21 +--
content/releases/0.9.13-incubating/index.html | 26 +---
content/releases/0.9.2/index.html | 21 +--
content/releases/0.9.3/index.html | 21 +--
content/releases/0.9.4/index.html | 21 +--
content/releases/0.9.5/index.html | 21 +--
content/releases/0.9.6/index.html | 21 +--
content/releases/0.9.7/index.html | 21 +--
content/releases/0.9.8/index.html | 21 +--
content/releases/0.9.9/index.html | 21 +--
content/releases/index.html | 21 +--
content/support/index.html | 37 ++---
28 files changed, 252 insertions(+), 672 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-website/blob/1727f228/content/api-documentation/index.html
----------------------------------------------------------------------
diff --git a/content/api-documentation/index.html b/content/api-documentation/index.html
index 07ffeb5..d41df3f 100644
--- a/content/api-documentation/index.html
+++ b/content/api-documentation/index.html
@@ -6,7 +6,7 @@
<link rel="icon" type="image/png" href="/images/guacamole-logo-64.png"/>
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no, target-densitydpi=device-dpi"/>
<meta charset="UTF-8"/>
- <title>Apache Guacamole (incubating): API Documentation</title>
+ <title>Apache Guacamole™: API Documentation</title>
</head>
@@ -14,7 +14,7 @@
<!-- Header -->
<div id="header">
- <h1><a href="/">Apache Guacamole (incubating)</a></h1>
+ <h1><a href="/">Apache Guacamole™</a></h1>
<ul id="navigation" class="menu">
@@ -441,20 +441,9 @@
<!-- Trademarks -->
<p class="trademarks">
- Apache and the Apache feather logo are trademarks of The Apache
- 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.
+ Apache Guacamole, Guacamole, Apache, the Apache feather logo, and the
+ Apache Guacamole project logo are trademarks of The Apache Software
+ Foundation.
</p>
</div>
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-website/blob/1727f228/content/guac-style/index.html
----------------------------------------------------------------------
diff --git a/content/guac-style/index.html b/content/guac-style/index.html
index 0f25eca..4fdc6dd 100644
--- a/content/guac-style/index.html
+++ b/content/guac-style/index.html
@@ -6,7 +6,7 @@
<link rel="icon" type="image/png" href="/images/guacamole-logo-64.png"/>
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no, target-densitydpi=device-dpi"/>
<meta charset="UTF-8"/>
- <title>Apache Guacamole (incubating): Guacamole Style Guidelines</title>
+ <title>Apache Guacamole™: Guacamole Style Guidelines</title>
</head>
@@ -14,7 +14,7 @@
<!-- Header -->
<div id="header">
- <h1><a href="/">Apache Guacamole (incubating)</a></h1>
+ <h1><a href="/">Apache Guacamole™</a></h1>
<ul id="navigation" class="menu">
@@ -447,7 +447,7 @@ logical blocks. Yes, HTML should be commented, too.</li>
members must be documented with JavaDoc/Doxygen, wrapping lines as necessary
to fit the 80 column maximum:</p>
- <div class="highlighter-rouge"><pre class="highlight"><code> /**
+ <div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code> /**
* High-level function description. Implementation details if
* appropriate (it's usually not).
*
@@ -463,8 +463,7 @@ to fit the 80 column maximum:</p>
* Description of return value.
*/
int fun(int var1, int var2);
-</code></pre>
- </div>
+</code></pre></div> </div>
</li>
<li>Do not use the <code class="highlighter-rouge">@author</code> tag (or similar). The authors of various parts of
the codebase should be tracked by git, not by the code itself.</li>
@@ -486,7 +485,7 @@ your own best judgment.</li>
<li>
<p>Do not cuddle the <code class="highlighter-rouge">else</code>, etc.</p>
- <div class="highlighter-rouge"><pre class="highlight"><code> /* Do this */
+ <div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code> /* Do this */
if (thing) {
}
else {
@@ -496,15 +495,13 @@ your own best judgment.</li>
if (thing) {
} else {
}
-</code></pre>
- </div>
+</code></pre></div> </div>
<p>The only exception here is <code class="highlighter-rouge">do</code>/<code class="highlighter-rouge">while</code>:</p>
- <div class="highlighter-rouge"><pre class="highlight"><code> do {
+ <div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code> do {
} while (thing);
-</code></pre>
- </div>
+</code></pre></div> </div>
</li>
</ol>
@@ -558,20 +555,9 @@ non-debug log levels with stack traces!</strong></li>
<!-- Trademarks -->
<p class="trademarks">
- Apache and the Apache feather logo are trademarks of The Apache
- 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.
+ Apache Guacamole, Guacamole, Apache, the Apache feather logo, and the
+ Apache Guacamole project logo are trademarks of The Apache Software
+ Foundation.
</p>
</div>
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-website/blob/1727f228/content/index.html
----------------------------------------------------------------------
diff --git a/content/index.html b/content/index.html
index 03ef632..f3beaaa 100644
--- a/content/index.html
+++ b/content/index.html
@@ -6,7 +6,7 @@
<link rel="icon" type="image/png" href="/images/guacamole-logo-64.png"/>
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no, target-densitydpi=device-dpi"/>
<meta charset="UTF-8"/>
- <title>Apache Guacamole (incubating)</title>
+ <title>Apache Guacamole™</title>
</head>
@@ -14,7 +14,7 @@
<!-- Header -->
<div id="header">
- <h1><a href="/">Apache Guacamole (incubating)</a></h1>
+ <h1><a href="/">Apache Guacamole™</a></h1>
<ul id="navigation" class="menu">
@@ -464,20 +464,9 @@
<!-- Trademarks -->
<p class="trademarks">
- Apache and the Apache feather logo are trademarks of The Apache
- 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.
+ Apache Guacamole, Guacamole, Apache, the Apache feather logo, and the
+ Apache Guacamole project logo are trademarks of The Apache Software
+ Foundation.
</p>
</div>
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-website/blob/1727f228/content/maturity-evaluation/index.html
----------------------------------------------------------------------
diff --git a/content/maturity-evaluation/index.html b/content/maturity-evaluation/index.html
index bdb7f25..81e6cac 100644
--- a/content/maturity-evaluation/index.html
+++ b/content/maturity-evaluation/index.html
@@ -6,7 +6,7 @@
<link rel="icon" type="image/png" href="/images/guacamole-logo-64.png"/>
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no, target-densitydpi=device-dpi"/>
<meta charset="UTF-8"/>
- <title>Apache Guacamole (incubating): Podling Maturity Evaluation</title>
+ <title>Apache Guacamole™: Podling Maturity Evaluation</title>
</head>
@@ -14,7 +14,7 @@
<!-- Header -->
<div id="header">
- <h1><a href="/">Apache Guacamole (incubating)</a></h1>
+ <h1><a href="/">Apache Guacamole™</a></h1>
<ul id="navigation" class="menu">
@@ -759,20 +759,9 @@ or organization.
<!-- Trademarks -->
<p class="trademarks">
- Apache and the Apache feather logo are trademarks of The Apache
- 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.
+ Apache Guacamole, Guacamole, Apache, the Apache feather logo, and the
+ Apache Guacamole project logo are trademarks of The Apache Software
+ Foundation.
</p>
</div>
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-website/blob/1727f228/content/open-source/index.html
----------------------------------------------------------------------
diff --git a/content/open-source/index.html b/content/open-source/index.html
index 5c33fa8..a7e03ab 100644
--- a/content/open-source/index.html
+++ b/content/open-source/index.html
@@ -6,7 +6,7 @@
<link rel="icon" type="image/png" href="/images/guacamole-logo-64.png"/>
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no, target-densitydpi=device-dpi"/>
<meta charset="UTF-8"/>
- <title>Apache Guacamole (incubating): Open Source</title>
+ <title>Apache Guacamole™: Open Source</title>
</head>
@@ -14,7 +14,7 @@
<!-- Header -->
<div id="header">
- <h1><a href="/">Apache Guacamole (incubating)</a></h1>
+ <h1><a href="/">Apache Guacamole™</a></h1>
<ul id="navigation" class="menu">
@@ -415,7 +415,7 @@ project, the first step is to be active in the community as a
<p>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
-<a href="#committers">committers</a> or <a href="#ppmc-members">members of the PPMC</a>.</p>
+<a href="#committers">committers</a> or <a href="#pmc-members">members of the PMC</a>.</p>
<h2 id="contribute">Contributing</h2>
@@ -460,8 +460,7 @@ manual</a>.</p>
<p>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 <a href="#meritocracy">merit</a> and should be
-offered committership. Apache Guacamole committers are also implicitly members
-of the <a href="#ppmc-members">Apache Guacamole PPMC</a>.</p>
+offered committership.</p>
<p>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
@@ -487,20 +486,20 @@ a committer not otherwise directly involved in those changes.</p>
<li><a href="/release-procedures-part4/">Announcing the release</a></li>
</ul>
-<h2 id="ppmc-members">PPMC members</h2>
+<h2 id="pmc-members">PMC members</h2>
-<p>The Apache Guacamole PPMC is responsible for project oversight. PPMC members
-participate in discussions on the <a href="/support/#mailing-lists">mailing lists</a> and
-vote on release candidates, new committers, and new PPMC members. Like
-<a href="#committers">committers</a> (who are implicitly PPMC members), the PPMC is
-responsible for identifying members of the community who have shown
-<a href="#meritocracy">merit</a> warranting committership or PPMC membership.</p>
+<p>The Apache Guacamole PMC is made up of committers and is responsible for
+project oversight. PMC members participate in discussions on the <a href="/support/#mailing-lists">mailing
+lists</a> and vote on release candidates, new committers,
+and new PMC members. The PMC is responsible for identifying members of the
+community who have shown <a href="#meritocracy">merit</a> warranting committership and/or
+PMC membership.</p>
-<h3 id="resources-for-ppmc-members">Resources for PPMC members:</h3>
+<h3 id="resources-for-pmc-members">Resources for PMC members:</h3>
<ul>
<li><a href="/support/#mailing-lists">Apache Guacamole mailing lists</a></li>
- <li><a href="http://incubator.apache.org/guides/ppmc.html">Apache Incubator: PPMC guide</a></li>
+ <li><a href="http://www.apache.org/dev/pmc.html">Project Management Committee Guide</a></li>
<li><a href="http://apache.org/foundation/voting.html">Apache voting process</a></li>
</ul>
@@ -528,20 +527,9 @@ responsible for identifying members of the community who have shown
<!-- Trademarks -->
<p class="trademarks">
- Apache and the Apache feather logo are trademarks of The Apache
- 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.
+ Apache Guacamole, Guacamole, Apache, the Apache feather logo, and the
+ Apache Guacamole project logo are trademarks of The Apache Software
+ Foundation.
</p>
</div>
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-website/blob/1727f228/content/pull-requests/index.html
----------------------------------------------------------------------
diff --git a/content/pull-requests/index.html b/content/pull-requests/index.html
index 2021f7d..e44bdc1 100644
--- a/content/pull-requests/index.html
+++ b/content/pull-requests/index.html
@@ -6,7 +6,7 @@
<link rel="icon" type="image/png" href="/images/guacamole-logo-64.png"/>
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no, target-densitydpi=device-dpi"/>
<meta charset="UTF-8"/>
- <title>Apache Guacamole (incubating): Managing Pull Requests</title>
+ <title>Apache Guacamole™: Managing Pull Requests</title>
</head>
@@ -14,7 +14,7 @@
<!-- Header -->
<div id="header">
- <h1><a href="/">Apache Guacamole (incubating)</a></h1>
+ <h1><a href="/">Apache Guacamole™</a></h1>
<ul id="navigation" class="menu">
@@ -406,13 +406,12 @@ the pull request as merged.</p>
<code class="highlighter-rouge">mirror</code>, and <code class="highlighter-rouge">origin</code>, respectively. For example, the recommended
configuration for <code class="highlighter-rouge">incubator-guacamole-server</code> would be:</p>
-<div class="highlighter-rouge"><pre class="highlight"><code>$ git remote -v
+<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>$ git remote -v
mirror git@github.com:apache/incubator-guacamole-server.git
origin git@github.com:mike-jumper/incubator-guacamole-server.git
upstream https://git-wip-us.apache.org/repos/asf/incubator-guacamole-server.git
$
-</code></pre>
-</div>
+</code></pre></div></div>
<p>After reviewing and approving code submitted via a pull request, you will need
to:</p>
@@ -422,9 +421,8 @@ to:</p>
<p>Manually fetch the contents of the pull request to a new branch via the
command line:</p>
- <div class="highlighter-rouge"><pre class="highlight"><code>$ git fetch mirror pull/NUMBER/head:some-branch
-</code></pre>
- </div>
+ <div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>$ git fetch mirror pull/NUMBER/head:some-branch
+</code></pre></div> </div>
<p>where <code class="highlighter-rouge">NUMBER</code> is the pull request number and <code class="highlighter-rouge">some-branch</code> is a sensible
branch name of your choice.</p>
@@ -433,19 +431,17 @@ branch name of your choice.</p>
<p>Ensure your copy of the base branch is up to date, whether that be <code class="highlighter-rouge">master</code>
or the staging branch for an upcoming release:</p>
- <div class="highlighter-rouge"><pre class="highlight"><code>$ git fetch upstream
+ <div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>$ git fetch upstream
$ git checkout master
$ git merge --ff-only upstream/master
$ git push origin
-</code></pre>
- </div>
+</code></pre></div> </div>
</li>
<li>
<p>Merge the branch containing the changes from the pull request:</p>
- <div class="highlighter-rouge"><pre class="highlight"><code>$ git merge --no-ff some-branch
-</code></pre>
- </div>
+ <div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>$ git merge --no-ff some-branch
+</code></pre></div> </div>
<p><strong>Be sure to specify <code class="highlighter-rouge">--no-ff</code>!</strong> Merges of pull requests must have
corresponding merge commits, and the messages of those merge commits must
@@ -454,16 +450,14 @@ properly tag the associated JIRA issue (just like all other commits).</p>
<li>
<p>Confirm that the changes look as expected:</p>
- <div class="highlighter-rouge"><pre class="highlight"><code>$ git diff upstream/master
-</code></pre>
- </div>
+ <div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>$ git diff upstream/master
+</code></pre></div> </div>
</li>
<li>
<p>Push the merge result to the ASF repository:</p>
- <div class="highlighter-rouge"><pre class="highlight"><code>$ git push upstream master
-</code></pre>
- </div>
+ <div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>$ git push upstream master
+</code></pre></div> </div>
<p>You will be prompted for your username (Apache ID) and password. It is
highly recommended that you not save/cache your credentials for this step,
@@ -473,7 +467,7 @@ the main repository.</p>
</ol>
<p>Once this is done, the ASF git bot should kick in, and emails should go out
-across the <a href="mailto:commits@guacamole.incubator.apache.org">commits@guacamole.incubator.apache.org</a> list noting each commit
+across the <a href="mailto:commits@guacamole.apache.org">commits@guacamole.apache.org</a> 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
<a href="https://www.apache.org/dev/infrastructure.html">Infra</a> by opening an issue
@@ -502,8 +496,8 @@ are exactly as described above, except you will need to specify
<li>
<p>Merging the <strong>staging branch</strong> to <strong><code class="highlighter-rouge">master</code></strong>. 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.</p>
+tag in the commit message. A message like “Merging 0.9.10 changes back to
+master.” is pretty sensible.</p>
<p><strong>DO NOT MERGE THE PULL REQUEST TO MASTER DIRECTLY!</strong> The point of merging
the staging branch to master rather than the pull request is to ensure that
@@ -539,20 +533,9 @@ branch will fail.</p>
<!-- Trademarks -->
<p class="trademarks">
- Apache and the Apache feather logo are trademarks of The Apache
- 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.
+ Apache Guacamole, Guacamole, Apache, the Apache feather logo, and the
+ Apache Guacamole project logo are trademarks of The Apache Software
+ Foundation.
</p>
</div>
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-website/blob/1727f228/content/release-procedures-part1/index.html
----------------------------------------------------------------------
diff --git a/content/release-procedures-part1/index.html b/content/release-procedures-part1/index.html
index 6919694..d0157e9 100644
--- a/content/release-procedures-part1/index.html
+++ b/content/release-procedures-part1/index.html
@@ -6,7 +6,7 @@
<link rel="icon" type="image/png" href="/images/guacamole-logo-64.png"/>
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no, target-densitydpi=device-dpi"/>
<meta charset="UTF-8"/>
- <title>Apache Guacamole (incubating): Beginning the release process</title>
+ <title>Apache Guacamole™: Beginning the release process</title>
</head>
@@ -14,7 +14,7 @@
<!-- Header -->
<div id="header">
- <h1><a href="/">Apache Guacamole (incubating)</a></h1>
+ <h1><a href="/">Apache Guacamole™</a></h1>
<ul id="navigation" class="menu">
@@ -400,8 +400,7 @@
<p>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 <code class="highlighter-rouge">[DISCUSS]</code> thread on
-<a href="mailto:dev@guacamole.incubator.apache.org">dev@guacamole.incubator.apache.org</a> to gauge whether the time is right for a
-release.</p>
+<a href="mailto:dev@guacamole.apache.org">dev@guacamole.apache.org</a> to gauge whether the time is right for a release.</p>
<p>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
@@ -429,7 +428,7 @@ contents of the release to remain within the agreed scope.</p>
<p>Create a new <code class="highlighter-rouge">staging/[VERSION]</code> branch for each of the following repositories,
where <code class="highlighter-rouge">[VERSION]</code> is the version of the upcoming release, such as
-“0.9.11-incubating”:</p>
+“0.9.11”:</p>
<ul>
<li><a href="https://github.com/apache/incubator-guacamole-client"><code class="highlighter-rouge">incubator-guacamole-client</code></a></li>
@@ -539,20 +538,9 @@ tutorials.</li>
<!-- Trademarks -->
<p class="trademarks">
- Apache and the Apache feather logo are trademarks of The Apache
- 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.
+ Apache Guacamole, Guacamole, Apache, the Apache feather logo, and the
+ Apache Guacamole project logo are trademarks of The Apache Software
+ Foundation.
</p>
</div>
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-website/blob/1727f228/content/release-procedures-part2/index.html
----------------------------------------------------------------------
diff --git a/content/release-procedures-part2/index.html b/content/release-procedures-part2/index.html
index 3e14b66..8ac6c5f 100644
--- a/content/release-procedures-part2/index.html
+++ b/content/release-procedures-part2/index.html
@@ -6,7 +6,7 @@
<link rel="icon" type="image/png" href="/images/guacamole-logo-64.png"/>
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no, target-densitydpi=device-dpi"/>
<meta charset="UTF-8"/>
- <title>Apache Guacamole (incubating): Producing a release candidate</title>
+ <title>Apache Guacamole™: Producing a release candidate</title>
</head>
@@ -14,7 +14,7 @@
<!-- Header -->
<div id="header">
- <h1><a href="/">Apache Guacamole (incubating)</a></h1>
+ <h1><a href="/">Apache Guacamole™</a></h1>
<ul id="navigation" class="menu">
@@ -393,8 +393,7 @@
</ul>
</li>
<li><a href="#upload-docs" id="markdown-toc-upload-docs">Upload documentation and release notes</a></li>
- <li><a href="#ppmc-vote" id="markdown-toc-ppmc-vote">Create the PPMC <code class="highlighter-rouge">[VOTE]</code> thread</a></li>
- <li><a href="#ipmc-vote" id="markdown-toc-ipmc-vote">Create the IPMC <code class="highlighter-rouge">[VOTE]</code> thread</a></li>
+ <li><a href="#ppmc-vote" id="markdown-toc-ppmc-vote">Create the PMC <code class="highlighter-rouge">[VOTE]</code> thread</a></li>
</ul>
<h2 id="tag-rc">Tag the release candidate</h2>
@@ -406,10 +405,9 @@ a new release candidate. These tags are made off the release branch (<em>not</em
version of the upcoming release and <code class="highlighter-rouge">[N]</code> is the number of the release
candidate:</p>
-<div class="highlighter-rouge"><pre class="highlight"><code>$ git tag -m "Release 0.9.11-incubating - RC1." 0.9.11-incubating-RC1
-$ git push upstream 0.9.11-incubating-RC1
-</code></pre>
-</div>
+<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>$ git tag -m "Release 0.9.11 - RC1." 0.9.11-RC1
+$ git push upstream 0.9.11-RC1
+</code></pre></div></div>
<p>Each repository relevant to the release must be tagged. At this point, this
will be every repository that has a release branch. This <em>never</em> includes
@@ -469,17 +467,15 @@ tree once it has been built with <code class="highlighter-rouge">mvn clean insta
<p>Producing the required MD5 and SHA256 checksums for a given artifact is very
straightforward:</p>
-<div class="highlighter-rouge"><pre class="highlight"><code>$ md5sum FILENAME > FILENAME.md5
+<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>$ md5sum FILENAME > FILENAME.md5
$ sha256sum FILENAME > FILENAME.sha
-</code></pre>
-</div>
+</code></pre></div></div>
<p>To produce the PGP signature for a given artifact, use <code class="highlighter-rouge">gpg</code>, as documented in
Apache’s own <a href="https://www.apache.org/dev/release-signing.html#openpgp-ascii-detach-sig">release signing documentation</a>:</p>
-<div class="highlighter-rouge"><pre class="highlight"><code>$ gpg --armor --output FILENAME.asc --detach-sig FILENAME
-</code></pre>
-</div>
+<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>$ gpg --armor --output FILENAME.asc --detach-sig FILENAME
+</code></pre></div></div>
<p>Example: <a href="https://dist.apache.org/repos/dist/dev/incubator/guacamole/?p=17053">the SVN commit uploading RC1 of 0.9.10-incubating (r17053)</a></p>
@@ -498,7 +494,7 @@ uploaded to Apache’s Nexus:</p>
requires that your username and password be stored within your Maven
<code class="highlighter-rouge">~/.m2/settings.xml</code>:</p>
-<div class="highlighter-rouge"><pre class="highlight"><code><settings>
+<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code><settings>
<servers>
<server>
<id>apache</id>
@@ -507,59 +503,56 @@ requires that your username and password be stored within your Maven
</server>
</servers>
</settings>
-</code></pre>
-</div>
+</code></pre></div></div>
<p>The ID of the server is arbitrary but must match the <code class="highlighter-rouge">repositoryId</code> value given
to Maven. The examples here use <code class="highlighter-rouge">apache</code>. Most artifacts are Java <code class="highlighter-rouge">.jar</code> files
with corresponding JavaDoc and source jars. Each of these must be signed and
uploaded individually using the <code class="highlighter-rouge">gpg:sign-and-deploy-file</code> mojo:</p>
-<div class="highlighter-rouge"><pre class="highlight"><code>$ mvn gpg:sign-and-deploy-file \
+<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>$ 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
-</code></pre>
-</div>
+</code></pre></div></div>
<p>The above will need to be done for both <code class="highlighter-rouge">guacamole-common</code> and <code class="highlighter-rouge">guacamole-ext</code>,
assuming both have been modified for the release. For JavaScript artifacts like
<code class="highlighter-rouge">guacamole-common-js</code> which produce a single <code class="highlighter-rouge">.zip</code> file, only the <code class="highlighter-rouge">.zip</code> file
needs to be uploaded. The command for this is slightly different:</p>
-<div class="highlighter-rouge"><pre class="highlight"><code>$ mvn gpg:sign-and-deploy-file \
+<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>$ mvn gpg:sign-and-deploy-file \
-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
-</code></pre>
-</div>
+</code></pre></div></div>
<p>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.</p>
+URL of the repository will need to be provided in the VOTE email.</p>
<h3 id="docker-images">Docker images</h3>
<p>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 <code class="highlighter-rouge">guacamole/guacamole</code> and <code class="highlighter-rouge">guacamole/guacd</code> respectively, both
-hosted under the Apache Guacamole project’s <a href="http://guacamole.incubator.apache.org/releases/">Docker Hub
+hosted under the Apache Guacamole project’s <a href="https://hub.docker.com/u/guacamole/">Docker Hub
account</a>.</p>
<p>When building the Docker images, keep in mind:</p>
@@ -579,16 +572,15 @@ the Docker image must be built with that tag.</li>
release candidate, from within the top-level <code class="highlighter-rouge">incubator-guacamole-client</code>
directory:</p>
-<div class="highlighter-rouge"><pre class="highlight"><code>$ git clean -xfd .
-$ sudo docker build -t guacamole/guacamole:0.9.11-incubating-RC1 .
-$ sudo docker push guacamole/guacamole:0.9.11-incubating-RC1
-</code></pre>
-</div>
+<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>$ git clean -xfd .
+$ sudo docker build -t guacamole/guacamole:0.9.11-RC1 .
+$ sudo docker push guacamole/guacamole:0.9.11-RC1
+</code></pre></div></div>
<h2 id="upload-docs">Upload documentation and release notes</h2>
<p>The draft release notes and updated documentation both need to be uploaded to
-the website prior to <a href="#ppmc-vote">calling the PPMC vote</a>. These changes should
+the website prior to <a href="#pmc-vote">calling the PMC vote</a>. These changes should
be handled like any other website changes - via pull requests against the
<code class="highlighter-rouge">incubator-guacamole-website</code> repository. <strong>DO NOT UPDATE THE TOP-LEVEL
DOCUMENTATION SYMBOLIC LINKS!</strong> The top-level symbolic links in the <code class="highlighter-rouge">doc/</code>
@@ -616,20 +608,20 @@ release notes for 0.9.10-incubating-RC3</a></li>
<li><a href="https://github.com/apache/incubator-guacamole-website/tree/master/doc/0.9.10-incubating">The updated documentation for 0.9.10-incubating</a></li>
</ul>
-<h2 id="ppmc-vote">Create the PPMC <code class="highlighter-rouge">[VOTE]</code> thread</h2>
+<h2 id="ppmc-vote">Create the PMC <code class="highlighter-rouge">[VOTE]</code> thread</h2>
<p>Once the above has been completed, request a vote with an email to
-<a href="mailto:dev@guacamole.incubator.apache.org">dev@guacamole.incubator.apache.org</a> titled <code class="highlighter-rouge">[VOTE] Release Apache Guacamole
-[VERSION] (RC[N])</code>, containing the following:</p>
+<a href="mailto:dev@guacamole.apache.org">dev@guacamole.apache.org</a> titled <code class="highlighter-rouge">[VOTE] Release Apache Guacamole [VERSION]
+(RC[N])</code>, containing the following:</p>
-<div class="highlighter-rouge"><pre class="highlight"><code>Hello all,
+<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>Hello all,
The [NTH] release candidate for Apache Guacamole [VERSION] has been
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]":
@@ -640,7 +632,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:
@@ -649,11 +641,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:
@@ -667,8 +659,7 @@ Here is my +1.
Thanks,
[YOU]
-</code></pre>
-</div>
+</code></pre></div></div>
<p>Where <code class="highlighter-rouge">[VERSION]</code> is the release version, <code class="highlighter-rouge">[N]</code> and <code class="highlighter-rouge">[NTH]</code> are the number of
the release candidate, <code class="highlighter-rouge">[STAGING REPOSITORY URL]</code> is the URL of <a href="#staging-maven">the staging
@@ -677,7 +668,7 @@ associated with the PGP key used to sign the release artifacts, and <code class=
your name. Obviously, alter the email as necessary if the scope of the release
is different.</p>
-<p>Please note that, though community input is welcome, <em>only PPMC votes count
+<p>Please note that, though community input is welcome, <em>only PMC votes count
toward the required three “+1” votes</em>.</p>
<p>Example: <a href="http://mail-archives.apache.org/mod_mbox/incubator-guacamole-dev/201612.mbox/%3CCALKeL-PKQxOYqZCvhH6_ZF33Zo_LUZjLVZzTh%2B0VRipgsNxQ1g%40mail.gmail.com%3E">the 0.9.10-incubating-RC3 PPMC VOTE email</a></p>
@@ -686,74 +677,6 @@ toward the required three “+1” votes</em>.</p>
development must resume, followed by another release candidate (prepared as
above) intended to address those issues.</p>
-<h2 id="ipmc-vote">Create the IPMC <code class="highlighter-rouge">[VOTE]</code> thread</h2>
-
-<p>If/when the PPMC vote passes, another vote must be started for the IPMC. Only
-IPMC votes are binding here. Send an email to <a href="mailto:general@incubator.apache.org">general@incubator.apache.org</a>
-titled <code class="highlighter-rouge">[VOTE] Release Apache Guacamole [VERSION] (RC[N])</code> containing the
-following:</p>
-
-<div class="highlighter-rouge"><pre class="highlight"><code>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.incubator.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.incubator.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]
-</code></pre>
-</div>
-
-<p>Where <code class="highlighter-rouge">[LINK TO VOTE RESULT]</code> the permalink to the specific email calling the
-result of <a href="#ppmc-vote">the PPMC vote</a> on the <a href="http://mail-archives.apache.org/mod_mbox/incubator-guacamole-dev/">public archive of
-dev@guacamole.incubator.org</a>,
-and all other fields are as described for <a href="#ppmc-vote">the PPMC vote email</a>.</p>
-
-<p>Example: <a href="http://mail-archives.apache.org/mod_mbox/incubator-general/201612.mbox/%3CCALKeL-MQmTi1fW%2BGsvFvN21D-ECfHEpf7hwQN5rB-U1JmfAXtQ%40mail.gmail.com%3E">the 0.9.10-incubating-RC3 IPMC VOTE email</a></p>
-
@@ -778,20 +701,9 @@ and all other fields are as described for <a href="#ppmc-vote">the PPMC vote ema
<!-- Trademarks -->
<p class="trademarks">
- Apache and the Apache feather logo are trademarks of The Apache
- 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.
+ Apache Guacamole, Guacamole, Apache, the Apache feather logo, and the
+ Apache Guacamole project logo are trademarks of The Apache Software
+ Foundation.
</p>
</div>
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-website/blob/1727f228/content/release-procedures-part3/index.html
----------------------------------------------------------------------
diff --git a/content/release-procedures-part3/index.html b/content/release-procedures-part3/index.html
index beedf58..3acb342 100644
--- a/content/release-procedures-part3/index.html
+++ b/content/release-procedures-part3/index.html
@@ -6,7 +6,7 @@
<link rel="icon" type="image/png" href="/images/guacamole-logo-64.png"/>
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no, target-densitydpi=device-dpi"/>
<meta charset="UTF-8"/>
- <title>Apache Guacamole (incubating): Promoting a release candidate to release</title>
+ <title>Apache Guacamole™: Promoting a release candidate to release</title>
</head>
@@ -14,7 +14,7 @@
<!-- Header -->
<div id="header">
- <h1><a href="/">Apache Guacamole (incubating)</a></h1>
+ <h1><a href="/">Apache Guacamole™</a></h1>
<ul id="navigation" class="menu">
@@ -397,9 +397,8 @@
<h2 id="delete-branch">Delete the release branch</h2>
-<p>Once <a href="/release-procedures-part2/#ppmc-vote">the PPMC vote</a> and <a href="/release-procedures-part2/#ipmc-vote">IPMC
-vote</a> for the release have passed, the
-release branches <a href="/release-procedures-part1/#release-branch">which were created
+<p>Once <a href="/release-procedures-part2/#pmc-vote">the PMC vote</a> for the release has
+passed, the release branches <a href="/release-procedures-part1/#release-branch">which were created
previously</a> must be deleted.
Assuming they were properly merged back to <code class="highlighter-rouge">master</code> as release-specific changes
were made, deleting these branches with <code class="highlighter-rouge">git branch -d</code> will succeed without
@@ -407,11 +406,10 @@ warnings. If git refuses to delete the branches because commits are missing
from <code class="highlighter-rouge">master</code>, <strong>something is horribly wrong, and the release needs to be
rechecked</strong>.</p>
-<div class="highlighter-rouge"><pre class="highlight"><code>$ git checkout master
-$ git branch -d staging/0.9.11-incubating
-$ git push upstream :staging/0.9.11-incubating
-</code></pre>
-</div>
+<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>$ git checkout master
+$ git branch -d staging/0.9.11
+$ git push upstream :staging/0.9.11
+</code></pre></div></div>
<h2 id="final-tag">Tag the final version of the release</h2>
@@ -420,10 +418,9 @@ with a new tag, pointing to the exact same commit as the last <a href="/release-
candidate</a>. This tag must be made in the
format <code class="highlighter-rouge">[VERSION]</code>, where <code class="highlighter-rouge">[VERSION]</code> is the version of the release:</p>
-<div class="highlighter-rouge"><pre class="highlight"><code>$ git tag -m "Release 0.9.11-incubating." 0.9.11-incubating
-$ git push upstream 0.9.11-incubating
-</code></pre>
-</div>
+<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>$ git tag -m "Release 0.9.11." 0.9.11
+$ git push upstream 0.9.11
+</code></pre></div></div>
<p>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
@@ -438,16 +435,15 @@ incubator-guacamole-server</a></p>
<h3 id="artifacts-in-dist-svn">Artifacts in dist SVN</h3>
<p>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 <code class="highlighter-rouge">dev/</code>, and need to be moved to the analogous area
-under <code class="highlighter-rouge">release/</code>. <em>This must be done using <code class="highlighter-rouge">svn mv</code></em>, with the directory
-containing the artifacts and signatures being renamed from <code class="highlighter-rouge">[VERSION]-RC[N]</code> to
+which was approved via the VOTE. These artifacts are already present in the SVN
+dist area under <code class="highlighter-rouge">dev/</code>, and need to be moved to the analogous area under
+<code class="highlighter-rouge">release/</code>. <em>This must be done using <code class="highlighter-rouge">svn mv</code></em>, with the directory containing
+the artifacts and signatures being renamed from <code class="highlighter-rouge">[VERSION]-RC[N]</code> to
<code class="highlighter-rouge">[VERSION</code>] in the process.</p>
-<div class="highlighter-rouge"><pre class="highlight"><code>$ 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."
-</code></pre>
-</div>
+<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>$ 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."
+</code></pre></div></div>
<p>Note that, once this has finished, <strong>YOU MUST STILL WAIT AT LEAST 24 HOURS TO
ALLOW THE <a href="https://www.apache.org/mirrors/">MIRRORS</a> TIME TO SYNC</strong> before
@@ -482,20 +478,18 @@ in the absence of an RC.</p>
release candidate, from within the top-level <code class="highlighter-rouge">incubator-guacamole-client</code>
directory:</p>
-<div class="highlighter-rouge"><pre class="highlight"><code>$ git clean -xfd .
-$ sudo docker build -t guacamole/guacamole:0.9.11-incubating .
+<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>$ git clean -xfd .
+$ sudo docker build -t guacamole/guacamole:0.9.11 .
$ sudo docker build -t guacamole/guacamole:latest .
-</code></pre>
-</div>
+</code></pre></div></div>
<p>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:</p>
-<div class="highlighter-rouge"><pre class="highlight"><code>$ sudo docker push guacamole/guacamole:0.9.11-incubating
+<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>$ sudo docker push guacamole/guacamole:0.9.11
$ sudo docker push guacamole/guacamole:latest
-</code></pre>
-</div>
+</code></pre></div></div>
<p>Again, this should finish virtually instantaneously, as no new data will need
to be pushed. Docker Hub already has the images/layers from the previous RC
@@ -525,20 +519,9 @@ builds.</p>
<!-- Trademarks -->
<p class="trademarks">
- Apache and the Apache feather logo are trademarks of The Apache
- 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.
+ Apache Guacamole, Guacamole, Apache, the Apache feather logo, and the
+ Apache Guacamole project logo are trademarks of The Apache Software
+ Foundation.
</p>
</div>
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-website/blob/1727f228/content/release-procedures-part4/index.html
----------------------------------------------------------------------
diff --git a/content/release-procedures-part4/index.html b/content/release-procedures-part4/index.html
index 4f1705c..d065615 100644
--- a/content/release-procedures-part4/index.html
+++ b/content/release-procedures-part4/index.html
@@ -6,7 +6,7 @@
<link rel="icon" type="image/png" href="/images/guacamole-logo-64.png"/>
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no, target-densitydpi=device-dpi"/>
<meta charset="UTF-8"/>
- <title>Apache Guacamole (incubating): Announcing the release</title>
+ <title>Apache Guacamole™: Announcing the release</title>
</head>
@@ -14,7 +14,7 @@
<!-- Header -->
<div id="header">
- <h1><a href="/">Apache Guacamole (incubating)</a></h1>
+ <h1><a href="/">Apache Guacamole™</a></h1>
<ul id="navigation" class="menu">
@@ -430,50 +430,33 @@ as a placeholder:</p>
<h2 id="email-announce">Email announcement</h2>
<p>Finally, send an email with the subject <code class="highlighter-rouge">[ANNOUNCE] Apache Guacamole [VERSION]
-released</code> to <a href="mailto:announce@apache.org">announce@apache.org</a>, <a href="mailto:general@incubator.apache.org">general@incubator.apache.org</a>,
-<a href="mailto:dev@guacamole.incubator.apache.org">dev@guacamole.incubator.apache.org</a>, and
-<a href="mailto:user@guacamole.incubator.apache.org">user@guacamole.incubator.apache.org</a>. <strong>This email MUST be sent from an
-apache.org email address</strong>, and should contain an announcement like the
-following:</p>
+released</code> to <a href="mailto:announce@apache.org">announce@apache.org</a>, <a href="mailto:dev@guacamole.apache.org">dev@guacamole.apache.org</a>, and
+<a href="mailto:user@guacamole.apache.org">user@guacamole.apache.org</a>. <strong>This email MUST be sent from an apache.org
+email address</strong>, and should contain an announcement like the following:</p>
-<div class="highlighter-rouge"><pre class="highlight"><code>The Apache Guacamole community is proud to announce the release of Apache
+<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>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].
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!
-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.
-</code></pre>
-</div>
+The Apache Guacamole Community
+</code></pre></div></div>
<p>Where <code class="highlighter-rouge">[VERSION]</code> is the version that was just released and <code class="highlighter-rouge">[RELEASE
HIGHLIGHTS]</code> is a brief description of the key features, improvements, and bug
@@ -505,20 +488,9 @@ fixes of the release.</p>
<!-- Trademarks -->
<p class="trademarks">
- Apache and the Apache feather logo are trademarks of The Apache
- 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.
+ Apache Guacamole, Guacamole, Apache, the Apache feather logo, and the
+ Apache Guacamole project logo are trademarks of The Apache Software
+ Foundation.
</p>
</div>
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-website/blob/1727f228/content/releases/0.8.3/index.html
----------------------------------------------------------------------
diff --git a/content/releases/0.8.3/index.html b/content/releases/0.8.3/index.html
index 9374a8a..1c98155 100644
--- a/content/releases/0.8.3/index.html
+++ b/content/releases/0.8.3/index.html
@@ -6,7 +6,7 @@
<link rel="icon" type="image/png" href="/images/guacamole-logo-64.png"/>
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no, target-densitydpi=device-dpi"/>
<meta charset="UTF-8"/>
- <title>Apache Guacamole (incubating): 0.8.3</title>
+ <title>Apache Guacamole™: 0.8.3</title>
</head>
@@ -14,7 +14,7 @@
<!-- Header -->
<div id="header">
- <h1><a href="/">Apache Guacamole (incubating)</a></h1>
+ <h1><a href="/">Apache Guacamole™</a></h1>
<ul id="navigation" class="menu">
@@ -586,20 +586,9 @@
<!-- Trademarks -->
<p class="trademarks">
- Apache and the Apache feather logo are trademarks of The Apache
- 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.
+ Apache Guacamole, Guacamole, Apache, the Apache feather logo, and the
+ Apache Guacamole project logo are trademarks of The Apache Software
+ Foundation.
</p>
</div>
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-website/blob/1727f228/content/releases/0.8.4/index.html
----------------------------------------------------------------------
diff --git a/content/releases/0.8.4/index.html b/content/releases/0.8.4/index.html
index 2c80a22..0f5011f 100644
--- a/content/releases/0.8.4/index.html
+++ b/content/releases/0.8.4/index.html
@@ -6,7 +6,7 @@
<link rel="icon" type="image/png" href="/images/guacamole-logo-64.png"/>
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no, target-densitydpi=device-dpi"/>
<meta charset="UTF-8"/>
- <title>Apache Guacamole (incubating): 0.8.4</title>
+ <title>Apache Guacamole™: 0.8.4</title>
</head>
@@ -14,7 +14,7 @@
<!-- Header -->
<div id="header">
- <h1><a href="/">Apache Guacamole (incubating)</a></h1>
+ <h1><a href="/">Apache Guacamole™</a></h1>
<ul id="navigation" class="menu">
@@ -551,20 +551,9 @@
<!-- Trademarks -->
<p class="trademarks">
- Apache and the Apache feather logo are trademarks of The Apache
- 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.
+ Apache Guacamole, Guacamole, Apache, the Apache feather logo, and the
+ Apache Guacamole project logo are trademarks of The Apache Software
+ Foundation.
</p>
</div>
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-website/blob/1727f228/content/releases/0.9.0/index.html
----------------------------------------------------------------------
diff --git a/content/releases/0.9.0/index.html b/content/releases/0.9.0/index.html
index fce2593..0e6e439 100644
--- a/content/releases/0.9.0/index.html
+++ b/content/releases/0.9.0/index.html
@@ -6,7 +6,7 @@
<link rel="icon" type="image/png" href="/images/guacamole-logo-64.png"/>
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no, target-densitydpi=device-dpi"/>
<meta charset="UTF-8"/>
- <title>Apache Guacamole (incubating): 0.9.0</title>
+ <title>Apache Guacamole™: 0.9.0</title>
</head>
@@ -14,7 +14,7 @@
<!-- Header -->
<div id="header">
- <h1><a href="/">Apache Guacamole (incubating)</a></h1>
+ <h1><a href="/">Apache Guacamole™</a></h1>
<ul id="navigation" class="menu">
@@ -554,20 +554,9 @@
<!-- Trademarks -->
<p class="trademarks">
- Apache and the Apache feather logo are trademarks of The Apache
- 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.
+ Apache Guacamole, Guacamole, Apache, the Apache feather logo, and the
+ Apache Guacamole project logo are trademarks of The Apache Software
+ Foundation.
</p>
</div>
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-website/blob/1727f228/content/releases/0.9.1/index.html
----------------------------------------------------------------------
diff --git a/content/releases/0.9.1/index.html b/content/releases/0.9.1/index.html
index 9dc75a1..8fe96ca 100644
--- a/content/releases/0.9.1/index.html
+++ b/content/releases/0.9.1/index.html
@@ -6,7 +6,7 @@
<link rel="icon" type="image/png" href="/images/guacamole-logo-64.png"/>
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no, target-densitydpi=device-dpi"/>
<meta charset="UTF-8"/>
- <title>Apache Guacamole (incubating): 0.9.1</title>
+ <title>Apache Guacamole™: 0.9.1</title>
</head>
@@ -14,7 +14,7 @@
<!-- Header -->
<div id="header">
- <h1><a href="/">Apache Guacamole (incubating)</a></h1>
+ <h1><a href="/">Apache Guacamole™</a></h1>
<ul id="navigation" class="menu">
@@ -594,20 +594,9 @@
<!-- Trademarks -->
<p class="trademarks">
- Apache and the Apache feather logo are trademarks of The Apache
- 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.
+ Apache Guacamole, Guacamole, Apache, the Apache feather logo, and the
+ Apache Guacamole project logo are trademarks of The Apache Software
+ Foundation.
</p>
</div>
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-website/blob/1727f228/content/releases/0.9.10-incubating/index.html
----------------------------------------------------------------------
diff --git a/content/releases/0.9.10-incubating/index.html b/content/releases/0.9.10-incubating/index.html
index b12ed47..7f6359d 100644
--- a/content/releases/0.9.10-incubating/index.html
+++ b/content/releases/0.9.10-incubating/index.html
@@ -6,7 +6,7 @@
<link rel="icon" type="image/png" href="/images/guacamole-logo-64.png"/>
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no, target-densitydpi=device-dpi"/>
<meta charset="UTF-8"/>
- <title>Apache Guacamole (incubating): 0.9.10-incubating</title>
+ <title>Apache Guacamole™: 0.9.10-incubating</title>
</head>
@@ -14,7 +14,7 @@
<!-- Header -->
<div id="header">
- <h1><a href="/">Apache Guacamole (incubating)</a></h1>
+ <h1><a href="/">Apache Guacamole™</a></h1>
<ul id="navigation" class="menu">
@@ -878,20 +878,9 @@ overview</a> within the manual.</p>
<!-- Trademarks -->
<p class="trademarks">
- Apache and the Apache feather logo are trademarks of The Apache
- 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.
+ Apache Guacamole, Guacamole, Apache, the Apache feather logo, and the
+ Apache Guacamole project logo are trademarks of The Apache Software
+ Foundation.
</p>
</div>
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-website/blob/1727f228/content/releases/0.9.11-incubating/index.html
----------------------------------------------------------------------
diff --git a/content/releases/0.9.11-incubating/index.html b/content/releases/0.9.11-incubating/index.html
index 1b18a5f..930c316 100644
--- a/content/releases/0.9.11-incubating/index.html
+++ b/content/releases/0.9.11-incubating/index.html
@@ -6,7 +6,7 @@
<link rel="icon" type="image/png" href="/images/guacamole-logo-64.png"/>
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no, target-densitydpi=device-dpi"/>
<meta charset="UTF-8"/>
- <title>Apache Guacamole (incubating): 0.9.11-incubating</title>
+ <title>Apache Guacamole™: 0.9.11-incubating</title>
</head>
@@ -14,7 +14,7 @@
<!-- Header -->
<div id="header">
- <h1><a href="/">Apache Guacamole (incubating)</a></h1>
+ <h1><a href="/">Apache Guacamole™</a></h1>
<ul id="navigation" class="menu">
@@ -708,20 +708,9 @@ password policies. Users of the database authentication will need to run the
<!-- Trademarks -->
<p class="trademarks">
- Apache and the Apache feather logo are trademarks of The Apache
- 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.
+ Apache Guacamole, Guacamole, Apache, the Apache feather logo, and the
+ Apache Guacamole project logo are trademarks of The Apache Software
+ Foundation.
</p>
</div>
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-website/blob/1727f228/content/releases/0.9.12-incubating/index.html
----------------------------------------------------------------------
diff --git a/content/releases/0.9.12-incubating/index.html b/content/releases/0.9.12-incubating/index.html
index f844d05..f31f506 100644
--- a/content/releases/0.9.12-incubating/index.html
+++ b/content/releases/0.9.12-incubating/index.html
@@ -6,7 +6,7 @@
<link rel="icon" type="image/png" href="/images/guacamole-logo-64.png"/>
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no, target-densitydpi=device-dpi"/>
<meta charset="UTF-8"/>
- <title>Apache Guacamole (incubating): 0.9.12-incubating</title>
+ <title>Apache Guacamole™: 0.9.12-incubating</title>
</head>
@@ -14,7 +14,7 @@
<!-- Header -->
<div id="header">
- <h1><a href="/">Apache Guacamole (incubating)</a></h1>
+ <h1><a href="/">Apache Guacamole™</a></h1>
<ul id="navigation" class="menu">
@@ -768,20 +768,9 @@ guacamole-server for the sake of cleanliness and maintainability.</p>
<!-- Trademarks -->
<p class="trademarks">
- Apache and the Apache feather logo are trademarks of The Apache
- 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.
+ Apache Guacamole, Guacamole, Apache, the Apache feather logo, and the
+ Apache Guacamole project logo are trademarks of The Apache Software
+ Foundation.
</p>
</div>
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-website/blob/1727f228/content/releases/0.9.13-incubating/index.html
----------------------------------------------------------------------
diff --git a/content/releases/0.9.13-incubating/index.html b/content/releases/0.9.13-incubating/index.html
index d88dc7e..08c22e9 100644
--- a/content/releases/0.9.13-incubating/index.html
+++ b/content/releases/0.9.13-incubating/index.html
@@ -6,7 +6,7 @@
<link rel="icon" type="image/png" href="/images/guacamole-logo-64.png"/>
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no, target-densitydpi=device-dpi"/>
<meta charset="UTF-8"/>
- <title>Apache Guacamole (incubating): 0.9.13-incubating</title>
+ <title>Apache Guacamole™: 0.9.13-incubating</title>
</head>
@@ -14,7 +14,7 @@
<!-- Header -->
<div id="header">
- <h1><a href="/">Apache Guacamole (incubating)</a></h1>
+ <h1><a href="/">Apache Guacamole™</a></h1>
<ul id="navigation" class="menu">
@@ -873,15 +873,14 @@ function:</p>
<p>If your extension does not need to expose its own REST resources, the function
can simply return <code class="highlighter-rouge">null</code>, and no such resources will be exposed:</p>
-<div class="highlighter-rouge"><pre class="highlight"><code>@Override
+<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>@Override
public Object getResource() {
// No associated REST resource
return null;
}
-</code></pre>
-</div>
+</code></pre></div></div>
</div>
@@ -908,20 +907,9 @@ public Object getResource() {
<!-- Trademarks -->
<p class="trademarks">
- Apache and the Apache feather logo are trademarks of The Apache
- 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.
+ Apache Guacamole, Guacamole, Apache, the Apache feather logo, and the
+ Apache Guacamole project logo are trademarks of The Apache Software
+ Foundation.
</p>
</div>
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-website/blob/1727f228/content/releases/0.9.2/index.html
----------------------------------------------------------------------
diff --git a/content/releases/0.9.2/index.html b/content/releases/0.9.2/index.html
index 354b3a6..54b1e3c 100644
--- a/content/releases/0.9.2/index.html
+++ b/content/releases/0.9.2/index.html
@@ -6,7 +6,7 @@
<link rel="icon" type="image/png" href="/images/guacamole-logo-64.png"/>
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no, target-densitydpi=device-dpi"/>
<meta charset="UTF-8"/>
- <title>Apache Guacamole (incubating): 0.9.2</title>
+ <title>Apache Guacamole™: 0.9.2</title>
</head>
@@ -14,7 +14,7 @@
<!-- Header -->
<div id="header">
- <h1><a href="/">Apache Guacamole (incubating)</a></h1>
+ <h1><a href="/">Apache Guacamole™</a></h1>
<ul id="navigation" class="menu">
@@ -605,20 +605,9 @@
<!-- Trademarks -->
<p class="trademarks">
- Apache and the Apache feather logo are trademarks of The Apache
- 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.
+ Apache Guacamole, Guacamole, Apache, the Apache feather logo, and the
+ Apache Guacamole project logo are trademarks of The Apache Software
+ Foundation.
</p>
</div>
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-website/blob/1727f228/content/releases/0.9.3/index.html
----------------------------------------------------------------------
diff --git a/content/releases/0.9.3/index.html b/content/releases/0.9.3/index.html
index 32e68fa..a336467 100644
--- a/content/releases/0.9.3/index.html
+++ b/content/releases/0.9.3/index.html
@@ -6,7 +6,7 @@
<link rel="icon" type="image/png" href="/images/guacamole-logo-64.png"/>
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no, target-densitydpi=device-dpi"/>
<meta charset="UTF-8"/>
- <title>Apache Guacamole (incubating): 0.9.3</title>
+ <title>Apache Guacamole™: 0.9.3</title>
</head>
@@ -14,7 +14,7 @@
<!-- Header -->
<div id="header">
- <h1><a href="/">Apache Guacamole (incubating)</a></h1>
+ <h1><a href="/">Apache Guacamole™</a></h1>
<ul id="navigation" class="menu">
@@ -590,20 +590,9 @@
<!-- Trademarks -->
<p class="trademarks">
- Apache and the Apache feather logo are trademarks of The Apache
- 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.
+ Apache Guacamole, Guacamole, Apache, the Apache feather logo, and the
+ Apache Guacamole project logo are trademarks of The Apache Software
+ Foundation.
</p>
</div>
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-website/blob/1727f228/content/releases/0.9.4/index.html
----------------------------------------------------------------------
diff --git a/content/releases/0.9.4/index.html b/content/releases/0.9.4/index.html
index d2304c1..0e4cccc 100644
--- a/content/releases/0.9.4/index.html
+++ b/content/releases/0.9.4/index.html
@@ -6,7 +6,7 @@
<link rel="icon" type="image/png" href="/images/guacamole-logo-64.png"/>
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no, target-densitydpi=device-dpi"/>
<meta charset="UTF-8"/>
- <title>Apache Guacamole (incubating): 0.9.4</title>
+ <title>Apache Guacamole™: 0.9.4</title>
</head>
@@ -14,7 +14,7 @@
<!-- Header -->
<div id="header">
- <h1><a href="/">Apache Guacamole (incubating)</a></h1>
+ <h1><a href="/">Apache Guacamole™</a></h1>
<ul id="navigation" class="menu">
@@ -612,20 +612,9 @@
<!-- Trademarks -->
<p class="trademarks">
- Apache and the Apache feather logo are trademarks of The Apache
- 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.
+ Apache Guacamole, Guacamole, Apache, the Apache feather logo, and the
+ Apache Guacamole project logo are trademarks of The Apache Software
+ Foundation.
</p>
</div>
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-website/blob/1727f228/content/releases/0.9.5/index.html
----------------------------------------------------------------------
diff --git a/content/releases/0.9.5/index.html b/content/releases/0.9.5/index.html
index 9860469..cdf7480 100644
--- a/content/releases/0.9.5/index.html
+++ b/content/releases/0.9.5/index.html
@@ -6,7 +6,7 @@
<link rel="icon" type="image/png" href="/images/guacamole-logo-64.png"/>
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no, target-densitydpi=device-dpi"/>
<meta charset="UTF-8"/>
- <title>Apache Guacamole (incubating): 0.9.5</title>
+ <title>Apache Guacamole™: 0.9.5</title>
</head>
@@ -14,7 +14,7 @@
<!-- Header -->
<div id="header">
- <h1><a href="/">Apache Guacamole (incubating)</a></h1>
+ <h1><a href="/">Apache Guacamole™</a></h1>
<ul id="navigation" class="menu">
@@ -593,20 +593,9 @@
<!-- Trademarks -->
<p class="trademarks">
- Apache and the Apache feather logo are trademarks of The Apache
- 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.
+ Apache Guacamole, Guacamole, Apache, the Apache feather logo, and the
+ Apache Guacamole project logo are trademarks of The Apache Software
+ Foundation.
</p>
</div>
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-website/blob/1727f228/content/releases/0.9.6/index.html
----------------------------------------------------------------------
diff --git a/content/releases/0.9.6/index.html b/content/releases/0.9.6/index.html
index 1919c8b..c8b5b90 100644
--- a/content/releases/0.9.6/index.html
+++ b/content/releases/0.9.6/index.html
@@ -6,7 +6,7 @@
<link rel="icon" type="image/png" href="/images/guacamole-logo-64.png"/>
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no, target-densitydpi=device-dpi"/>
<meta charset="UTF-8"/>
- <title>Apache Guacamole (incubating): 0.9.6</title>
+ <title>Apache Guacamole™: 0.9.6</title>
</head>
@@ -14,7 +14,7 @@
<!-- Header -->
<div id="header">
- <h1><a href="/">Apache Guacamole (incubating)</a></h1>
+ <h1><a href="/">Apache Guacamole™</a></h1>
<ul id="navigation" class="menu">
@@ -592,20 +592,9 @@
<!-- Trademarks -->
<p class="trademarks">
- Apache and the Apache feather logo are trademarks of The Apache
- 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.
+ Apache Guacamole, Guacamole, Apache, the Apache feather logo, and the
+ Apache Guacamole project logo are trademarks of The Apache Software
+ Foundation.
</p>
</div>
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-website/blob/1727f228/content/releases/0.9.7/index.html
----------------------------------------------------------------------
diff --git a/content/releases/0.9.7/index.html b/content/releases/0.9.7/index.html
index 001ed70..3314a9b 100644
--- a/content/releases/0.9.7/index.html
+++ b/content/releases/0.9.7/index.html
@@ -6,7 +6,7 @@
<link rel="icon" type="image/png" href="/images/guacamole-logo-64.png"/>
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no, target-densitydpi=device-dpi"/>
<meta charset="UTF-8"/>
- <title>Apache Guacamole (incubating): 0.9.7</title>
+ <title>Apache Guacamole™: 0.9.7</title>
</head>
@@ -14,7 +14,7 @@
<!-- Header -->
<div id="header">
- <h1><a href="/">Apache Guacamole (incubating)</a></h1>
+ <h1><a href="/">Apache Guacamole™</a></h1>
<ul id="navigation" class="menu">
@@ -644,20 +644,9 @@
<!-- Trademarks -->
<p class="trademarks">
- Apache and the Apache feather logo are trademarks of The Apache
- 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.
+ Apache Guacamole, Guacamole, Apache, the Apache feather logo, and the
+ Apache Guacamole project logo are trademarks of The Apache Software
+ Foundation.
</p>
</div>