Merge 0.9.14 changes back to master.

This commit is contained in:
Nick Couchman 2017-12-06 10:04:34 -05:00
commit e3d8c3fa12
6 changed files with 9 additions and 35 deletions

View File

@ -24,10 +24,10 @@ the review process.
The Guacamole source is maintained in git repositories hosted on GitHub:
https://github.com/apache/incubator-guacamole-client
https://github.com/apache/incubator-guacamole-manual
https://github.com/apache/incubator-guacamole-server
https://github.com/apache/incubator-guacamole-website
https://github.com/apache/guacamole-client
https://github.com/apache/guacamole-manual
https://github.com/apache/guacamole-server
https://github.com/apache/guacamole-website
To make your changes, fork the applicable repositories and make commits
to a topic branch in your fork. Commits should be made in logical units

View File

@ -1,18 +0,0 @@
2013-08-26 Michael Jumper <mike.jumper@guac-dev.org>
* Experimental sound support for VNC (ticket #369)
* Improved handling of frame flush (ticket #380)
* SSL transport for guacd (ticket #371)
* Fix segfault in RDP disconnect (ticket #385)
* Add security options to RDP (ticket #190)
2013-07-02 Michael Jumper <mike.jumper@guac-dev.org>
* Optional threadsafety in guac_socket
* Printing support in for RDP (ticket #110)
* Fix ENABLE_OGG bug (ticket #355)
2013-06-06 Michael Jumper <mike.jumper@guac-dev.org>
* Created new repository layout

View File

@ -1,7 +0,0 @@
Apache Guacamole is an effort undergoing incubation at The Apache Software
Foundation (ASF). 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.

View File

@ -78,7 +78,6 @@ endif
EXTRA_DIST = \
.dockerignore \
CONTRIBUTING \
DISCLAIMER \
Dockerfile \
LICENSE \
NOTICE \

4
README
View File

@ -8,11 +8,11 @@ technical users intending to compile parts of Apache Guacamole themselves.
Source archives are available from the downloads section of the project website:
http://guacamole.incubator.apache.org/
http://guacamole.apache.org/
A full manual is available as well:
http://guacamole.incubator.apache.org/doc/gug/
http://guacamole.apache.org/doc/gug/
------------------------------------------------------------

View File

@ -1,11 +1,11 @@
What is guacd?
==============
[guacd](https://github.com/apache/incubator/guacamole-server/) is the native
[guacd](https://github.com/apache/guacamole-server/) is the native
server-side proxy used by the [Apache Guacamole web
application](http://guacamole.incubator.apache.org/). If you wish to deploy
application](http://guacamole.apache.org/). If you wish to deploy
Guacamole, or an application using the [Guacamole core
APIs](http://guacamole.incubator.apache.org/api-documentation), you will need a
APIs](http://guacamole.apache.org/api-documentation), you will need a
copy of guacd running.
How to use this image