GUACAMOLE-107: Update old references to guac-dev.org to point to the new site and resources.
diff --git a/src/appendices/faq.xml b/src/appendices/faq.xml
index d36afc1..b69eb65 100644
--- a/src/appendices/faq.xml
+++ b/src/appendices/faq.xml
@@ -203,13 +203,15 @@
</question>
<answer>
- <para>The project hosts a bug tracking tool called Trac at
- http://guac-dev.org/trac/. All bugs should be reported there as new tickets.
- This is also where you would request a new feature. </para>
-
- <para>If the bug you found is security-related, we would prefer to be contacted
- personally via email, such that the bug can be fixed before becoming dangerously
- widely known. </para>
+ <para>The project tracks in-progress tasks and bugs via the JIRA instance hosted by
+ the Apache Software Foundation:</para>
+ <para><link xmlns:xlink="http://www.w3.org/1999/xlink"
+ xlink:href="https://issues.apache.org/jira/browse/GUACAMOLE/"
+ ><uri>https://issues.apache.org/jira/browse/GUACAMOLE/</uri></link></para>
+ <para>All bugs should be reported there as new issues. This is also where you would
+ request a new feature. If the bug you found is security-related, we would prefer
+ to be contacted personally via email, such that the bug can be fixed before
+ becoming dangerously widely known. </para>
</answer>
</qandaentry>
@@ -222,15 +224,41 @@
</question>
<answer>
- <para>The project hosts forums at http://sourceforge.net/projects/guacamole/forums.
- If you have a SourceForge username (or don't mind registering one), this is a
- good place to start. </para>
-
- <para>Otherwise, there are Guacamole-specific official IRC channels on freenode.net:
- #guacamole, #guacamole-dev, and #guacamole-help. </para>
-
- <para>If none of those options suffice, you can always email any of the project
- members directly. You will usually get a personal response, time permitting. </para>
+ <para>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 <link
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xlink:href="http://guacamole.incubator.apache.org/support/#mailing-lists"
+ >mailing lists</link>. <emphasis>You will need to subscribe prior to sending
+ email to any list.</emphasis> All mailing lists are actively filtered for
+ spam, and any email not originating from a subscriber will bounce.</para>
+ <para>There are two primary mailing lists:</para>
+ <variablelist>
+ <varlistentry>
+ <term><link xmlns:xlink="http://www.w3.org/1999/xlink"
+ xlink:href="http://mail-archives.apache.org/mod_mbox/incubator-guacamole-user/"
+ ><email>user@guacamole.incubator.apache.org</email></link></term>
+ <listitem>
+ <para>The user list is intended for general questions and discussions
+ which do not necessarily pertain to development. This list replaces
+ the old <link xmlns:xlink="http://www.w3.org/1999/xlink"
+ xlink:href="https://sourceforge.net/p/guacamole/discussion/"
+ >SourceForge forums</link> used by Guacamole prior to its
+ acceptance into the Apache Incubator.</para>
+ <para><emphasis>If you're not sure which mailing list to use, the user
+ list is probably the correct choice.</emphasis></para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><link xmlns:xlink="http://www.w3.org/1999/xlink"
+ xlink:href="http://mail-archives.apache.org/mod_mbox/incubator-guacamole-dev/"
+ ><email>dev@guacamole.incubator.apache.org</email></link></term>
+ <listitem>
+ <para>The development list is for development-related discussion
+ involving people who are contributors to the Apache Guacamole
+ project (or who wish to become contributors).</para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
</answer>
</qandaentry>
diff --git a/src/chapters/adding-protocol.xml b/src/chapters/adding-protocol.xml
index cfe115d..3c92eef 100644
--- a/src/chapters/adding-protocol.xml
+++ b/src/chapters/adding-protocol.xml
@@ -205,7 +205,7 @@
AC_PROG_CC_C99
AC_PROG_LIBTOOL
-# Check for libguac (http://guac-dev.org/)
+# Check for libguac
AC_CHECK_LIB([guac], [guac_client_stream_png],,
AC_MSG_ERROR("libguac is required for communication via "
"the Guacamole protocol"))
diff --git a/src/chapters/jdbc-auth.xml b/src/chapters/jdbc-auth.xml
index 05736b6..907d3b6 100644
--- a/src/chapters/jdbc-auth.xml
+++ b/src/chapters/jdbc-auth.xml
@@ -51,8 +51,9 @@
<filename>guacamole.war</filename>. The link for this and all other
officially-supported and compatible extensions for a particular version of Guacamole are
provided on the release notes for that version. You can find the release notes for
- current versions of Guacamole here: <link xlink:href="http://guac-dev.org/releases/"
- >http://guac-dev.org/releases/</link>.</para>
+ current versions of Guacamole here: <link
+ xlink:href="http://guacamole.incubator.apache.org/releases/"
+ >http://guacamole.incubator.apache.org/releases/</link>.</para>
<para>The database authentication extension is packaged as a <filename>.tar.gz</filename>
file containing:</para>
<variablelist>
diff --git a/src/chapters/ldap-auth.xml b/src/chapters/ldap-auth.xml
index 35c1415..8c5d379 100644
--- a/src/chapters/ldap-auth.xml
+++ b/src/chapters/ldap-auth.xml
@@ -76,8 +76,9 @@
<filename>guacamole.war</filename>. The link for this and all other
officially-supported and compatible extensions for a particular version of Guacamole are
provided on the release notes for that version. You can find the release notes for
- current versions of Guacamole here: <link xlink:href="http://guac-dev.org/releases/"
- >http://guac-dev.org/releases/</link>.</para>
+ current versions of Guacamole here: <link
+ xlink:href="http://guacamole.incubator.apache.org/releases/"
+ >http://guacamole.incubator.apache.org/releases/</link>.</para>
<para>The LDAP authentication extension is packaged as a <filename>.tar.gz</filename> file
containing:</para>
<variablelist>
diff --git a/src/chapters/noauth.xml b/src/chapters/noauth.xml
index e795258..be82b27 100644
--- a/src/chapters/noauth.xml
+++ b/src/chapters/noauth.xml
@@ -29,8 +29,8 @@
and all other officially-supported and compatible extensions for a particular version of
Guacamole are provided on the release notes for that version. You can find the release
notes for current versions of Guacamole here: <link
- xlink:href="http://guac-dev.org/releases/"
- >http://guac-dev.org/releases/</link>.</para>
+ xlink:href="http://guacamole.incubator.apache.org/releases/"
+ >http://guacamole.incubator.apache.org/releases/</link>.</para>
<para xmlns:xlink="http://www.w3.org/1999/xlink">The NoAuth authentication extension is
packaged as a <filename>.tar.gz</filename> file containing:</para>
<variablelist>
diff --git a/src/gug.xml b/src/gug.xml
index 3957d00..f798c67 100644
--- a/src/gug.xml
+++ b/src/gug.xml
@@ -4,13 +4,6 @@
<info>
<title>Guacamole Manual</title>
<edition>0.9.10-incubating</edition>
- <authorgroup>
- <author>
- <personname><firstname>Michael</firstname>
- <surname>Jumper</surname></personname>
- <email>mjumper@apache.org</email>
- </author>
- </authorgroup>
<legalnotice>
<para>Licensed to the Apache Software Foundation (ASF) under one or more contributor
license agreements. See the <filename>NOTICE</filename> file distributed with this
@@ -27,11 +20,11 @@
</info>
<preface xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="preface">
<title>Introduction</title>
- <para>This book is the official Guacamole manual, written by the upstream developers of the
- Guacamole project. It is also the official general documentation, and an online version
- at <link xlink:href="http://guac-dev.org/">http://guac-dev.org/</link>. It is a work in
- progress which will be continuously updated as Guacamole changes with each
- release.</para>
+ <para>This book is the official Apache Guacamole manual, written by the upstream developers
+ of the Guacamole project. It is also the official general documentation, and an online
+ version at <link xlink:href="http://guacamole.incubator.apache.org/"
+ >http://guacamole.incubator.apache.org/</link>. It is a work in progress which will
+ be continuously updated as Guacamole changes with each release.</para>
<para>We decided to maintain the documentation for Guacamole as a book, as there is an awful
lot that can be done with the Guacamole web application, and even more that can be done
with the API. This book is intended to explore the possibilities of Guacamole as an
diff --git a/src/references/instructions/server/drawing/transfer.xml b/src/references/instructions/server/drawing/transfer.xml
index 7648f79..735b32f 100644
--- a/src/references/instructions/server/drawing/transfer.xml
+++ b/src/references/instructions/server/drawing/transfer.xml
@@ -8,11 +8,15 @@
<indexterm>
<primary>transfer</primary>
</indexterm>
- <para>Transfers image data from the specified rectangle of the specified
- layer or buffer to a different location of another specified layer or
- buffer, using the specified transfer function. For a list of available
- functions, see
- [[http://guac-dev.org/trac/browser/libguac/include/protocol.h|guacamole/protocol.h.</para>
+ <para>Transfers image data from the specified rectangle of the specified layer or buffer to a
+ different location of another specified layer or buffer, using the specified transfer
+ function. </para>
+ <para>For a list of available functions, see the definition of
+ <classname>guac_transfer_function</classname> within the <link
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xlink:href="https://github.com/apache/incubator-guacamole-server/blob/master/src/libguac/guacamole/protocol-types.h"
+ ><filename>guacamole/protocol-types.h</filename></link> header included with
+ libguac.</para>
<variablelist>
<varlistentry>
<term><parameter>srclayer</parameter></term>
@@ -51,9 +55,13 @@
<varlistentry>
<term><parameter>function</parameter></term>
<listitem>
- <para>The index of the transfer function to use. For a list of
- available functions, see
- [[http://guac-dev.org/trac/browser/libguac/include/protocol.h|guacamole/protocol.h.</para>
+ <para>The index of the transfer function to use.</para>
+ <para>For a list of available functions, see the definition of
+ <classname>guac_transfer_function</classname> within the <link
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xlink:href="https://github.com/apache/incubator-guacamole-server/blob/master/src/libguac/guacamole/protocol-types.h"
+ ><filename>guacamole/protocol-types.h</filename></link> header included
+ with libguac.</para>
</listitem>
</varlistentry>
<varlistentry>
diff --git a/tutorials/libguac-client-ball/configure.ac b/tutorials/libguac-client-ball/configure.ac
index 4516041..a0bc976 100644
--- a/tutorials/libguac-client-ball/configure.ac
+++ b/tutorials/libguac-client-ball/configure.ac
@@ -11,7 +11,7 @@
AC_PROG_CC_C99
AC_PROG_LIBTOOL
-# Check for libguac (http://guac-dev.org/)
+# Check for libguac
AC_CHECK_LIB([guac], [guac_client_stream_png],,
AC_MSG_ERROR("libguac is required for communication via "
"the Guacamole protocol"))
