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 2016/05/04 20:38:14 UTC
[2/3] incubator-guacamole-website git commit: Remove project
references to Glyptodon.
Remove project references to Glyptodon.
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/daa87d3d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-website/tree/daa87d3d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-website/diff/daa87d3d
Branch: refs/heads/master
Commit: daa87d3de88d771066d111442f2f05b1f6671ccb
Parents: 36cf116
Author: Michael Jumper <mj...@apache.org>
Authored: Tue May 3 15:54:21 2016 -0700
Committer: Michael Jumper <mj...@apache.org>
Committed: Tue May 3 17:43:44 2016 -0700
----------------------------------------------------------------------
_links/github.md | 2 +-
_links/jira.md | 2 +-
images/book-pages.png | Bin 162 -> 0 bytes
images/donate.png | Bin 4969 -> 0 bytes
images/envelope.png | Bin 2769 -> 0 bytes
images/glyptodon.png | Bin 5282 -> 0 bytes
images/guac-sponsors.png | Bin 2306 -> 0 bytes
images/no-guac-here.png | Bin 12910 -> 0 bytes
images/official-glyptodon-logo.png | Bin 33993 -> 0 bytes
index.md | 2 +-
not-found.md | 12 --
open-source.md | 122 ++++++++--------
releases.md | 2 +-
styles/main.css | 243 ++------------------------------
support.md | 71 ++++++++--
15 files changed, 133 insertions(+), 323 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-website/blob/daa87d3d/_links/github.md
----------------------------------------------------------------------
diff --git a/_links/github.md b/_links/github.md
index 4679771..5e000a2 100644
--- a/_links/github.md
+++ b/_links/github.md
@@ -2,5 +2,5 @@
menu-title: GitHub
menu-class: github
menu-weight: 1
-location: https://github.com/glyptodon/
+location: https://github.com/search?utf8=%E2%9C%93&q=repo%3Aapache%2Fincubator-guacamole-server+repo%3Aapache%2Fincubator-guacamole-client+repo%3Aapache%2Fincubator-guacamole-website&type=Repositories&ref=searchresults
---
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-website/blob/daa87d3d/_links/jira.md
----------------------------------------------------------------------
diff --git a/_links/jira.md b/_links/jira.md
index d16d9c9..d86097e 100644
--- a/_links/jira.md
+++ b/_links/jira.md
@@ -1,5 +1,5 @@
---
menu-title: JIRA
menu-weight: 4
-location: http://glyptodon.org/jira/
+location: https://issues.apache.org/jira/browse/GUACAMOLE/
---
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-website/blob/daa87d3d/images/book-pages.png
----------------------------------------------------------------------
diff --git a/images/book-pages.png b/images/book-pages.png
deleted file mode 100644
index 082eb84..0000000
Binary files a/images/book-pages.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-website/blob/daa87d3d/images/donate.png
----------------------------------------------------------------------
diff --git a/images/donate.png b/images/donate.png
deleted file mode 100644
index ef1497d..0000000
Binary files a/images/donate.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-website/blob/daa87d3d/images/envelope.png
----------------------------------------------------------------------
diff --git a/images/envelope.png b/images/envelope.png
deleted file mode 100644
index 513bccc..0000000
Binary files a/images/envelope.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-website/blob/daa87d3d/images/glyptodon.png
----------------------------------------------------------------------
diff --git a/images/glyptodon.png b/images/glyptodon.png
deleted file mode 100644
index 47801f9..0000000
Binary files a/images/glyptodon.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-website/blob/daa87d3d/images/guac-sponsors.png
----------------------------------------------------------------------
diff --git a/images/guac-sponsors.png b/images/guac-sponsors.png
deleted file mode 100644
index dfa299d..0000000
Binary files a/images/guac-sponsors.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-website/blob/daa87d3d/images/no-guac-here.png
----------------------------------------------------------------------
diff --git a/images/no-guac-here.png b/images/no-guac-here.png
deleted file mode 100644
index ab5da23..0000000
Binary files a/images/no-guac-here.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-website/blob/daa87d3d/images/official-glyptodon-logo.png
----------------------------------------------------------------------
diff --git a/images/official-glyptodon-logo.png b/images/official-glyptodon-logo.png
deleted file mode 100644
index 16f0ddd..0000000
Binary files a/images/official-glyptodon-logo.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-website/blob/daa87d3d/index.md
----------------------------------------------------------------------
diff --git a/index.md b/index.md
index 8ad909f..ef345d5 100644
--- a/index.md
+++ b/index.md
@@ -41,7 +41,7 @@ access your desktops is a web browser.
</li>
<li class="commercially-supported">
<h2>Commercially supported</h2>
- <p>For enterprises, dedicated commercial support is also available through <a href="/support/#commercial">third party companies</a>.</p>
+ <p>For enterprises, dedicated commercial support is also available through <a href="/support/#commercial-support">third party companies</a>.</p>
</li>
</li>
</ul>
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-website/blob/daa87d3d/not-found.md
----------------------------------------------------------------------
diff --git a/not-found.md b/not-found.md
deleted file mode 100644
index bbcc369..0000000
--- a/not-found.md
+++ /dev/null
@@ -1,12 +0,0 @@
-<div class="not-found">
- <div class="error-icon">
- <img src="/sites/all/themes/guac/images/no-guac-here.png" alt="Not Found"/>
- </div>
-
- <div class="error-description" markdown="1">
-Sorry ... but that page does not exist.
-----------------------------------------------
-
-Please try searching in the [forums](http://sourceforge.net/p/guacamole/discussion/) or browsing through the [manual](http://guac-dev.org/doc/gug/). If you can't find what you're looking for, please feel free to [open an issue in JIRA](https://glyptodon.org/jira/browse/GUAC/).
- </div>
-</div>
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-website/blob/daa87d3d/open-source.md
----------------------------------------------------------------------
diff --git a/open-source.md b/open-source.md
index 358af28..fa06cb6 100644
--- a/open-source.md
+++ b/open-source.md
@@ -7,72 +7,66 @@ menu-title: Contributing
menu-weight: 6
---
-Guacamole is an open source project. It is entirely free in every sense (under the [MIT license](http://opensource.org/licenses/MIT)), and will always be so. It is supported by [Glyptodon LLC](http://glyptodon.org/), the company that formed out of Guacamole's creation, through donations to the project from the community, and by corporate sponsors that fund changes for the benefit of the community.
-
-We believe this gives Guacamole distinct advantages over purely-commercial alternatives. It's open source nature means that the codebase is readily modifiable and extendable. It can be embedded in whole or in part in other projects. Because the source is publicly viewable, effort is made by the Guacamole team to keep the codebase clean and readable. As such, Guacamole is not a "black box"; you can read through the codebase and see exactly what it does and why. Commercial support is available, but because the source is open, there is no aspect of vendor lock-in to this support.
-
-The MIT License
-------------------------
-
-The MIT license is exceedingly simple, and only three paragraphs long:
-
- Copyright (c) <year> <copyright holders>
-
- Permission is hereby granted, free of charge, to any person obtaining a copy
- of this software and associated documentation files (the "Software"), to deal
- in the Software without restriction, including without limitation the rights
- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the Software is
- furnished to do so, subject to the following conditions:
-
- The above copyright notice and this permission notice shall be included in
- all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- THE SOFTWARE.
-
-Guacamole is not public domain, but the MIT license is very permissive, and as long as you follow it's simple conditions ("The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software"), you can modify and include Guacamole in other projects to your heart's content, including commercial or proprietary projects.
+Guacamole is an open source project. It is entirely free in every sense (under
+the [Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0)),
+and will always be so.
+
+We believe that being open source gives Guacamole distinct advantages over
+purely-commercial alternatives. The public availability of the source means
+that the codebase is readily modifiable and extendable. It can be embedded in
+whole or in part in other projects. For the sake of the project and its
+community, significant effort is made by the Guacamole team to keep the
+codebase clean and readable. Guacamole is not a "black box"; you can read
+through the codebase and see exactly what it does and why. Commercial support
+is available, but because the software itself is free and open, there is no
+aspect of vendor lock-in.
+
+Guacamole is not public domain, but the Apache license is very permissive, and
+as long as you follow it's simple conditions, you can modify and include
+Guacamole in other projects to your heart's content, including commercial or
+proprietary projects.
Contributing {#contribute}
-----------------
-If you believe you have a feature or bug fix that would benefit the project, feel free to contact us via IRC or email, or open a new ticket on [JIRA](https://glyptodon.org/jira/) with your patch attached. Code contributions are also always welcome, but do have to go through a review process. The code will more than likely be discussed and sent back a few times in order to bring the style and implementation in line with the rest of the Guacamole codebase. Alternatively, if you want to prioritize and fund specific changes to Guacamole, this is one of the main reasons [Glyptodon LLC](http://glyptodon.org/) was founded.
-
-If you are planning to contribute code to the upstream project, you absolutely __must__ develop against the code from our [git repositories](https://github.com/glyptodon/). Patches against releases and copies of entire files will not be accepted, and we will need a [signed CLA](http://glyptodon.org/cla.html) on file, to ensure we have the legal right to include your code. Our full contribution guidelines can be found in the "CONTRIBUTING" file of either the guacamole-server or guacamole-client git repositories.
-
-Another great way to pitch in is to actively help other users on [JIRA](https://glyptodon.org/jira/), in [the Guacamole forums](https://sourceforge.net/p/guacamole/discussion/), or on IRC. We have two IRC channels on irc.freenode.net: #guacamole-dev, which is development specific, and #guacamole-help, which is dedicated to generic help and support.
-
-Finally, if you would like to simply donate money to the project, thank you! Such donations show appreciation and help fund further development.
-
-<form class="standalone"
- action="https://www.paypal.com/cgi-bin/webscr"
- method="post" target="_top">
-
- <!-- PayPal parameters -->
- <input type="hidden" name="cmd" value="_s-xclick">
- <input type="hidden" name="item_name" value="Donation to Guacamole">
- <input type="hidden" name="hosted_button_id" value="53Z55SN74N9SS">
-
- <!-- Donate button -->
- <input type="submit" class="donate"
- value="Donate with PayPal"
- onclick="piwikTracker.trackGoal(6)">
-
-</form>
-
-Development {#develop}
--------------------
-
-Public discussion of development efforts is done over IRC at freenode.net on the #guacamole-dev channel. If you wish to develop a Guacamole-based web application, or to develop new protocol support plugins for guacd, please consult the [API documentation](/api-documentation).
-
-If you need help getting started, the manual contains several tutorials:
-
-* [Adding protocol support](/doc/gug/custom-protocols.html)
-* [Custom authentication](/doc/gug/custom-authentication.html)
-* [Writing your own Guacamole-based application](/doc/gug/writing-you-own-guacamole-app.html)
+If you believe you have a feature or bug fix that would benefit the project, or
+simply wish to help other users, please feel free to subscribe to and use the
+[project mailing lists](/support/#mailing-lists). To ensure issues are properly
+tracked and development effort is not duplicated, all bugs or proposed
+development should be reported by opening a new ticket in our
+[JIRA](https://issues.apache.org/jira/browse/GUACAMOLE/).
+
+Code contributions are also always welcome, but do have to go through a review
+process. The code will more than likely be discussed and sent back a few times
+in order to bring the style and implementation in line with the rest of the
+Guacamole codebase.
+
+If you are planning to contribute code, please keep in mind that the point of
+contributing is to collaborate for the benefit of the project and its
+community; it is a service you are choosing to provide because you believe, as
+the members of the Guacamole project believe, that doing so works toward the
+greater good. It is thus important to remember:
+
+1. Expect honest and constructive criticism. It is a good thing.
+2. A project's processes exist for a reason. The goal of contributing is to
+ work with the project for the common good, not fight against it.
+3. Develop against the most recent code on git. Patches against releases and
+ naiive copies of entire files cannot be accepted as they lack context and
+ are likely out of date.
+4. You will need a [signed CLA](https://www.apache.org/licenses/icla.txt) on
+ file with the Apache Software Foudation, to ensure we have the legal right
+ to include your code. If the contribution was created for your employer or
+ using your employer's resources, the ASF will also need to sign the
+ [corporate CLA](https://www.apache.org/licenses/cla-corporate.txt). For more
+ information, please see
+ [the ASF's documentation regarding CLAs](https://www.apache.org/licenses/#clas).
+5. Code must follow consistent style or it will become unreadable and
+ unmaintainable. Please read through our [style guidelines](/guac-style/) and,
+ when in doubt, follow the style of the code you are modifying.
+
+Our full contribution guidelines can be found in the `CONTRIBUTING` file in any
+of our git repositories. If you need help getting started, the [API
+documentation](/api-documentation) is an excellent resource, as are the
+[mailing lists](/support/#mailing-lists) and the tutorials in [the
+manual](/doc/gug/).
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-website/blob/daa87d3d/releases.md
----------------------------------------------------------------------
diff --git a/releases.md b/releases.md
index 9892604..fce6912 100644
--- a/releases.md
+++ b/releases.md
@@ -12,7 +12,7 @@ All recent Guacamole releases are listed here, along with several historical rel
Please be sure to read the [installation instructions](/doc/gug/installing-guacamole.html) in the [manual](/doc/gug/) thoroughly. If you do not wish to build things from source, you can also [install Guacamole using Docker](/doc/gug/guacamole-docker.html).
-If you are looking for the absolute latest unreleased code (or extremely old code not archived here), please check our git repositories on [GitHub](https://github.com/glyptodon/).
+If you are looking for the absolute latest unreleased code (or extremely old code not archived here), please check our git repositories on GitHub.
Which version should I download?
------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-website/blob/daa87d3d/styles/main.css
----------------------------------------------------------------------
diff --git a/styles/main.css b/styles/main.css
index 698e150..fecb140 100644
--- a/styles/main.css
+++ b/styles/main.css
@@ -138,22 +138,6 @@ ul.features li.commercially-supported::before {
font-style: italic;
}
-.promotion #book-pic {
- margin: 0.5em;
- text-align: center;
-}
-
-img.book-pic {
-
- box-shadow: 0.25em 0.25em 0.5em rgba(0, 0, 0, 0.5);
- max-width: 1in;
- float: right;
- margin: 1em;
-
- padding-right: 0.03in;
- background: url('/images/book-pages.png');
-}
-
h1 {
margin-top: 0.25in;
margin-bottom: 0.25in;
@@ -211,8 +195,7 @@ ul#navigation {
}
#navigation a.download,
-#navigation a.github,
-#navigation a.sponsors {
+#navigation a.github {
padding-left: 2em;
font-weight: bold;
@@ -233,10 +216,6 @@ ul#navigation {
background-image: url('/images/github-mark.png');
}
-#navigation a.sponsors {
- background-image: url('/images/guac-sponsors.png');
-}
-
p {
line-height: 1.5;
text-align: justify;
@@ -257,6 +236,10 @@ p {
width: 100%;
}
+#content table {
+ width: auto;
+}
+
#content ol,
#content ul {
padding-left: 0.5in;
@@ -407,9 +390,9 @@ div#links {
float: right;
border: 1px solid rgba(0, 0, 0, 0.25);
background: #FFFFFA;
- margin-left: 2em;
- margin-bottom: 2em;
- margin-top: 2em;
+ margin: 2em;
+ width: auto;
+ padding: 0;
}
div#links h2 {
@@ -420,14 +403,13 @@ div#links h2 {
padding-right: 1em;
font-size: 1em;
font-style: oblique;
- background: black;
+ background: #304730;
color: white;
- opacity: 0.5;
}
div#links ul {
margin: 0;
- padding: 1em;
+ padding: 0 1em;
list-style: none;
}
@@ -450,9 +432,8 @@ table.releases th {
font-size: 1em;
font-weight: normal;
font-style: oblique;
- background: black;
+ background: #304730;
color: white;
- opacity: 0.5;
}
table.releases tr:nth-child(even) {
@@ -467,201 +448,6 @@ table.releases td {
padding-right: 1em;
}
-.not-found {
-
- min-height: 500px;
- text-align: center;
- text-shadow: 1px 1px white;
-
- margin-left: auto;
- margin-right: auto;
-
-}
-
-.not-found .error-icon, .not-found .error-description {
- display: inline-block;
- vertical-align: top;
-}
-
-.not-found .error-description {
- text-align: left;
- max-width: 50%;
- width: 800px;
- margin-left: 1em;
-}
-
-.not-found .error-icon {
- max-width: 30%;
- width: 250px;
-}
-
-.not-found .error-icon img {
- width: 100%;
-}
-
-.not-found .error-description h2 {
- margin-top: 0;
-}
-
-/* Drupal system management */
-
-#user-login {
- border: 1px solid rgba(0, 0, 0, 0.5);
- border-radius: 3px;
- background: #FFD;
- width: 10cm;
- max-width: 100%;
- text-align: left;
- font-size: 0.8em;
- margin-left: auto;
- margin-right: auto;
-}
-
-#user-login label {
- font-weight: bold;
-}
-
-#user-login input[type='text'],
-#user-login input[type='password'] {
- width: 100%;
-}
-
-#user-login .form-item,
-#user-login .form-actions {
- margin: 1em;
-}
-
-#user-login .description {
- font-style: italic;
-}
-
-.profile {
- max-width: 100%;
- margin: 0 auto;
- font-size: 0.8em;
- border: 1px solid rgba(0, 0, 0, 0.5);
- background: #EFE;
- padding: 1em;
- border-radius: 3px;
- width: 16cm;
-}
-
-/* Donation section */
-
-form.standalone {
- display: block;
- margin: 2em;
- text-align: center;
-}
-
-#donate {
- border: 1px solid rgba(0, 0, 0, 0.125);
- text-align: center;
- padding: 1em;
- background: #FFFAE2;
- margin-top: 2em;
- position: relative;
- padding-left: 10em;
-}
-
-#donate::after {
- content: ' ';
- display: block;
- width: 10em;
- position: absolute;
- top: 0;
- bottom: 0;
- left: 0;
- background-image: url('/images/guac-sponsors.png');
- background-repeat: no-repeat;
- -webkit-background-size: 50%;
- -moz-background-size: 50%;
- background-size: 50%;
- -webkit-background-position: center;
- -moz-background-position: center;
- background-position: center;
- opacity: 0.25;
-}
-
-#donate h2 {
- margin-top: 0;
- font-weight: bold;
-}
-
-input.donate {
-
- display: inline-block;
- padding: 0.5em 1em;
-
- cursor: pointer;
- border: 1px solid rgba(0, 0, 0, 0.25);
- border-radius: 0.25em;
-
- color: white;
- font-weight: bold;
- font-size: 1.1em;
- text-decoration: none;
- text-shadow: 1px 1px 0 rgba(0, 0, 0, 0.25);
-
- box-shadow: inset 1px 1px 0 rgba(255, 255, 255, 0.5),
- inset -1px -1px 1px rgba(0, 0, 0, 0.125);
-
- background: rgb(84, 140, 226);
- background-image: -webkit-linear-gradient(rgba(255, 255, 255, 0.1), rgba(0, 0, 0, 0.15)), url('/images/donate.png');
- background-image: -moz-linear-gradient(rgba(255, 255, 255, 0.1), rgba(0, 0, 0, 0.15)), url('/images/donate.png');
- background-image: linear-gradient(rgba(255, 255, 255, 0.1), rgba(0, 0, 0, 0.15)), url('/images/donate.png');
- background-repeat: repeat, no-repeat;
- -webkit-background-position: 0%, 0.55em center;
- -moz-background-position: 0%, 0.55em center;
- background-position: 0%, 0.55em center;
- -webkit-background-size: auto, 1.1em;
- -moz-background-size: auto, 1.1em;
- background-size: auto, 1.1em;
-
- position: relative;
- padding-left: 2em;
-
-}
-
-/* Quote button */
-
-#contact-us {
- text-align: center;
-}
-
-#contact-us a {
-
- display: inline-block;
- padding: 0.5em 1em;
-
- border: 1px solid rgba(0, 0, 0, 0.25);
- border-radius: 0.25em;
-
- color: white;
- font-weight: bold;
- text-decoration: none;
- text-shadow: 1px 1px 0 rgba(0, 0, 0, 0.25);
-
- box-shadow: inset 1px 1px 0 rgba(255, 255, 255, 0.5),
- inset -1px -1px 1px rgba(0, 0, 0, 0.125);
-
- background: rgb(84, 140, 226);
- background-image: -webkit-linear-gradient(rgba(255, 255, 255, 0.1), rgba(0, 0, 0, 0.15)), url('/images/envelope.png');
- background-image: -moz-linear-gradient(rgba(255, 255, 255, 0.1), rgba(0, 0, 0, 0.15)), url('/images/envelope.png');
- background-image: linear-gradient(rgba(255, 255, 255, 0.1), rgba(0, 0, 0, 0.15)), url('/images/envelope.png');
- background-repeat: repeat, no-repeat;
- -webkit-background-position: 0%, 0.55em center;
- -moz-background-position: 0%, 0.55em center;
- background-position: 0%, 0.55em center;
- -webkit-background-size: auto, 1.1em;
- -moz-background-size: auto, 1.1em;
- background-size: auto, 1.1em;
-
- position: relative;
- padding-left: 2em;
-
-}
-
/* Style appropriately for printing */
@media print {
@@ -679,7 +465,7 @@ input.donate {
text-decoration: underline;
}
- #donate, #links {
+ #links {
display: none;
}
@@ -710,8 +496,3 @@ input.donate {
}
-@media screen and (max-width: 18cm) {
- .not-found .error-icon { float: right; }
- .not-found .error-description { max-width: 80%; display: block; }
-}
-
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-website/blob/daa87d3d/support.md
----------------------------------------------------------------------
diff --git a/support.md b/support.md
index 1c38c0a..04ed6b0 100644
--- a/support.md
+++ b/support.md
@@ -7,26 +7,73 @@ menu-title: Help / Support
menu-weight: 7
---
-If you need (or wish to provide) help with Guacamole, there are [forums](https://sourceforge.net/p/guacamole/discussion/) on the [SourceForge project page](http://sourceforge.net/projects/guacamole/). You will need to register a username with SourceForge to use the forums. There is also an IRC channel on freenode.net dedicated to Guacamole support: #guacamole-help.
+If you need (or wish to provide) help with Guacamole, the primary means for
+doing so are the project [mailing lists](#mailing-lists). All project members
+subscribe to these lists, and members of the community are encouraged to do the
+same.
-The central body of documentation is the [Guacamole manual](/doc/gug/). It is kept up-to-date with each release, and provides a massive amount of information in one place. The manual contains installation and configuration instructions, as well as instructions for using the application itself. There is also a large section devoted entirely to development tutorials and descriptions of the architecture and APIs of the Guacamole core.
+We consider the availability of commercial support to be crucial to the
+success of Apache Guacamole, and maintain a list of [third party
+companies](#commercial-support) providing commercial support. If you provide
+commercial support and would like your company to be listed, please send us an
+email, and we will work with you to do so.
-The Guacamole team monitors the IRC channels and SourceForge forums daily and responds whenever time permits.
+The Guacamole project historically used the [SourceForge
+forums](https://sourceforge.net/p/guacamole/discussion/), so it is worth
+searching through past threads there to see if your question has been asked and
+answered, but **please do not uses these forums for new posts**. New questions
+should use the mailing lists. Any further posts to the forums will be asked to
+use the mailing instead.
+
+Mailing Lists
+-------------
+
+If you would like help with Apache Guacamole, or wish to help others, we highly
+recommend sending an email to the one of the project's mailing lists. **You
+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))
+
+The general/users list is indended 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/)
-Reporting Problems
------------------------------
+### Development ([dev@guacamole.incubator.apache.org](mailto:dev@guacamole.incubator.apache.org))
-If you think you've encountered a bug in Guacamole or any of its components, or you wish to request a feature, please create a new issue in [JIRA](https://glyptodon.org/jira/). This JIRA instance is hosted by [Glyptodon LLC](http://glyptodon.org/), which is the open source company formed by the Guacamole team.
+The development list is for development-related discussion involving people who
+are contributors to the Apache Guacamole project (or who wish to become
+contributors).
-New issues enter the backlog and are prioritized along with all other reported issues, whether those issues were reported internally or by members of the wider open source community. Depending on the issue, work may not begin until higher-priority issues are taken care of, so please be patient. If you absolutely need something fixed or implemented immediately, and it is not otherwise an upstream priority, you are welcome to [contribute to the Guacamole project](/open-source#contribute), or to fund the change through Glyptodon LLC. This is one of the major benefits of Guacamole being open source.
+* [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/)
+
+[The Guacamole Manual](/doc/gug/)
+---------------------------------
+
+The central body of documentation is the [Guacamole manual](/doc/gug/). It is kept up-to-date with each release, and provides a massive amount of information in one place. The manual contains installation and configuration instructions, as well as instructions for using the application itself. There is also a large section devoted entirely to development tutorials and descriptions of the architecture and APIs of the Guacamole core.
+
+The Guacamole team monitors the IRC channels and SourceForge forums daily and responds whenever time permits.
Commercial Support
------------------------------
-One of the main target audiences for Guacamole are enterprises and companies that need to provide access to many computers, hence Guacamole's design as a gateway. If you are a commercial company, and want dedicated support, there are two main options available: leveraging the community, which provides support when time is available purely for the sake of the greater good, and [Glyptodon LLC](http://glyptodon.org/), which is the company founded as a result of Guacamole's growth.
-
-Both the Guacamole team and the rest of the open source community tend to be very responsive to questions from others, regardless of whether those questions are from commercial companies.
+As some of the main target audiences for Apache Guacamole are enterprises and
+companies that need to provide access to many computers (hence its design as a
+gateway), we consider the availability of commercial support crucial to
+Guacamole's success. If you provide commercial support and would like your
+company to be listed, please send us an email, and we will work with you to do
+so.
-Support provided to commercial companies, particularly support which results in implementation of new features, is one of the main driving forces behind Guacamole's development. It leads to new and useful features being prioritized and brought to the community, and helps keep Guacamole development active and focused.
+Companies providing support for Apache Guacamole are not endorsed by the Apache
+Software Foundation, though some such companies do employ committers of the
+Apache Guacamole project.
-<div id="contact-us"><a href="mailto:contact@glyptodon.org" class="piwik_link" onclick="piwikTracker.trackGoal(8)">Contact us for a quote</a></div>
+(PLACEHOLDER)