GUACAMOLE-436: Update URLs and repository naming with respect to graduation.
Project: http://git-wip-us.apache.org/repos/asf/guacamole-manual/repo Commit: http://git-wip-us.apache.org/repos/asf/guacamole-manual/commit/69c894ef Tree: http://git-wip-us.apache.org/repos/asf/guacamole-manual/tree/69c894ef Diff: http://git-wip-us.apache.org/repos/asf/guacamole-manual/diff/69c894ef Branch: refs/heads/staging/0.9.14 Commit: 69c894eff61ac93700253a4270848241ab7ff1ed Parents: da3aa5e Author: Michael Jumper <mjum...@apache.org> Authored: Fri Dec 29 12:59:04 2017 -0800 Committer: Michael Jumper <mjum...@apache.org> Committed: Fri Dec 29 13:17:22 2017 -0800 ---------------------------------------------------------------------- CONTRIBUTING | 8 ++--- README | 2 +- src/appendices/faq.xml | 12 ++++---- src/chapters/cas-auth.xml | 4 +-- src/chapters/duo-auth.xml | 4 +-- src/chapters/header-auth.xml | 4 +-- src/chapters/installing.xml | 32 ++++++++++---------- src/chapters/jdbc-auth.xml | 4 +-- src/chapters/ldap-auth.xml | 4 +-- src/chapters/using.xml | 2 +- src/gug.xml | 6 ++-- .../instructions/server/drawing/transfer.xml | 4 +-- 12 files changed, 43 insertions(+), 43 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/guacamole-manual/blob/69c894ef/CONTRIBUTING ---------------------------------------------------------------------- diff --git a/CONTRIBUTING b/CONTRIBUTING index 3864b66..9f005cd 100644 --- a/CONTRIBUTING +++ b/CONTRIBUTING @@ -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 http://git-wip-us.apache.org/repos/asf/guacamole-manual/blob/69c894ef/README ---------------------------------------------------------------------- diff --git a/README b/README index 0bac7c1..c021f8d 100644 --- a/README +++ b/README @@ -10,7 +10,7 @@ the manual themselves. The latest version of the manual is provided on the Guacamole web site, and snapshot copies of each release are included in the release archives: - http://guacamole.incubator.apache.org/ + http://guacamole.apache.org/ ------------------------------------------------------------ http://git-wip-us.apache.org/repos/asf/guacamole-manual/blob/69c894ef/src/appendices/faq.xml ---------------------------------------------------------------------- diff --git a/src/appendices/faq.xml b/src/appendices/faq.xml index b69eb65..8216f35 100644 --- a/src/appendices/faq.xml +++ b/src/appendices/faq.xml @@ -227,7 +227,7 @@ <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"; + xlink:href="http://guacamole.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> @@ -235,23 +235,23 @@ <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>u...@guacamole.incubator.apache.org</email></link></term> + xlink:href="http://mail-archives.apache.org/mod_mbox/guacamole-user/"; + ><email>u...@guacamole.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> + acceptance into the Apache Software Foundation.</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>d...@guacamole.incubator.apache.org</email></link></term> + xlink:href="http://mail-archives.apache.org/mod_mbox/guacamole-dev/"; + ><email>d...@guacamole.apache.org</email></link></term> <listitem> <para>The development list is for development-related discussion involving people who are contributors to the Apache Guacamole http://git-wip-us.apache.org/repos/asf/guacamole-manual/blob/69c894ef/src/chapters/cas-auth.xml ---------------------------------------------------------------------- diff --git a/src/chapters/cas-auth.xml b/src/chapters/cas-auth.xml index 178d58f..16fa975 100644 --- a/src/chapters/cas-auth.xml +++ b/src/chapters/cas-auth.xml @@ -19,8 +19,8 @@ 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://guacamole.incubator.apache.org/releases/"; - >http://guacamole.incubator.apache.org/releases/</link>.</para> + xlink:href="http://guacamole.apache.org/releases/"; + >http://guacamole.apache.org/releases/</link>.</para> <para>The CAS authentication extension is packaged as a <filename>.tar.gz</filename> file containing only the extension itself, <filename>guacamole-auth-cas-0.9.13-incubating.jar</filename>, which must http://git-wip-us.apache.org/repos/asf/guacamole-manual/blob/69c894ef/src/chapters/duo-auth.xml ---------------------------------------------------------------------- diff --git a/src/chapters/duo-auth.xml b/src/chapters/duo-auth.xml index cab1730..79fe127 100644 --- a/src/chapters/duo-auth.xml +++ b/src/chapters/duo-auth.xml @@ -51,8 +51,8 @@ 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://guacamole.incubator.apache.org/releases/"; - >http://guacamole.incubator.apache.org/releases/</link>.</para> + xlink:href="http://guacamole.apache.org/releases/"; + >http://guacamole.apache.org/releases/</link>.</para> <para>The Duo authentication extension is packaged as a <filename>.tar.gz</filename> file containing only the extension itself, <filename>guacamole-auth-duo-0.9.13-incubating.jar</filename>, which must ultimately http://git-wip-us.apache.org/repos/asf/guacamole-manual/blob/69c894ef/src/chapters/header-auth.xml ---------------------------------------------------------------------- diff --git a/src/chapters/header-auth.xml b/src/chapters/header-auth.xml index 6b77a6b..fab1287 100644 --- a/src/chapters/header-auth.xml +++ b/src/chapters/header-auth.xml @@ -25,8 +25,8 @@ 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://guacamole.incubator.apache.org/releases/"; - >http://guacamole.incubator.apache.org/releases/</link>.</para> + xlink:href="http://guacamole.apache.org/releases/"; + >http://guacamole.apache.org/releases/</link>.</para> <para>The HTTP header authentication extension is packaged as a <filename>.tar.gz</filename> file containing only the extension itself, <filename>guacamole-auth-header-0.9.13-incubating.jar</filename>, which must http://git-wip-us.apache.org/repos/asf/guacamole-manual/blob/69c894ef/src/chapters/installing.xml ---------------------------------------------------------------------- diff --git a/src/chapters/installing.xml b/src/chapters/installing.xml index ffabde5..0584c25 100644 --- a/src/chapters/installing.xml +++ b/src/chapters/installing.xml @@ -563,8 +563,8 @@ rigorously tested as the code in stable releases, you can also clone the Guacamole team's git repository on GitHub:</para> <informalexample> - <screen><prompt>$</prompt> <userinput>git clone <uri>git://github.com/apache/incubator-guacamole-server.git</uri></userinput> -<computeroutput>Cloning into 'incubator-guacamole-server'... + <screen><prompt>$</prompt> <userinput>git clone <uri>git://github.com/apache/guacamole-server.git</uri></userinput> +<computeroutput>Cloning into 'guacamole-server'... remote: Counting objects: 6769, done. remote: Compressing objects: 100% (2244/2244), done. remote: Total 6769 (delta 3058), reused 6718 (delta 3008) @@ -684,12 +684,12 @@ Type "make" to compile guacamole-server. <informalexample> <screen><prompt>$</prompt> <userinput>make</userinput> <computeroutput>Making all in src/libguac -make[1]: Entering directory `/home/zhz/guacamole/incubator-guacamole-server/src/libguac' +make[1]: Entering directory `/home/zhz/guacamole/guacamole-server/src/libguac' ... -make[1]: Leaving directory `/home/zhz/guacamole/incubator-guacamole-server/src/protocols/vnc' -make[1]: Entering directory `/home/zhz/guacamole/incubator-guacamole-server' +make[1]: Leaving directory `/home/zhz/guacamole/guacamole-server/src/protocols/vnc' +make[1]: Entering directory `/home/zhz/guacamole/guacamole-server' make[1]: Nothing to be done for `all-am'. -make[1]: Leaving directory `/home/zhz/guacamole/incubator-guacamole-server'</computeroutput> +make[1]: Leaving directory `/home/zhz/guacamole/guacamole-server'</computeroutput> <prompt>$</prompt></screen> </informalexample> <para>Quite a bit of output will scroll up the screen as all the components are @@ -704,8 +704,8 @@ make[1]: Leaving directory `/home/zhz/guacamole/incubator-guacamole-server'</com <informalexample> <screen><prompt>#</prompt> <userinput>make install</userinput> <computeroutput>Making install in src/libguac -make[1]: Entering directory `/home/zhz/guacamole/incubator-guacamole-server/src/libguac' -make[2]: Entering directory `/home/zhz/guacamole/incubator-guacamole-server/src/libguac' +make[1]: Entering directory `/home/zhz/guacamole/guacamole-server/src/libguac' +make[2]: Entering directory `/home/zhz/guacamole/guacamole-server/src/libguac' ... ---------------------------------------------------------------------- Libraries have been installed in: @@ -726,14 +726,14 @@ See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- make[2]: Nothing to be done for `install-data-am'. -make[2]: Leaving directory `/home/zhz/guacamole/incubator-guacamole-server/src/protocols/vnc' -make[1]: Leaving directory `/home/zhz/guacamole/incubator-guacamole-server/src/protocols/vnc' -make[1]: Entering directory `/home/zhz/guacamole/incubator-guacamole-server' -make[2]: Entering directory `/home/zhz/guacamole/incubator-guacamole-server' +make[2]: Leaving directory `/home/zhz/guacamole/guacamole-server/src/protocols/vnc' +make[1]: Leaving directory `/home/zhz/guacamole/guacamole-server/src/protocols/vnc' +make[1]: Entering directory `/home/zhz/guacamole/guacamole-server' +make[2]: Entering directory `/home/zhz/guacamole/guacamole-server' make[2]: Nothing to be done for `install-exec-am'. make[2]: Nothing to be done for `install-data-am'. -make[2]: Leaving directory `/home/zhz/guacamole/incubator-guacamole-server' -make[1]: Leaving directory `/home/zhz/guacamole/incubator-guacamole-server'</computeroutput> +make[2]: Leaving directory `/home/zhz/guacamole/guacamole-server' +make[1]: Leaving directory `/home/zhz/guacamole/guacamole-server'</computeroutput> <prompt>#</prompt> <userinput>ldconfig</userinput> <prompt>#</prompt> </screen> </informalexample> @@ -792,8 +792,8 @@ make[1]: Leaving directory `/home/zhz/guacamole/incubator-guacamole-server'</com don't care that the code hasn't been as rigorously tested as the code in stable releases, you can also clone the Guacamole team's git repository on GitHub:</para> <informalexample> - <screen><prompt>$</prompt> <userinput>git clone <uri>git://github.com/apache/incubator-guacamole-client.git</uri></userinput> -<computeroutput>Cloning into 'incubator-guacamole-client'... + <screen><prompt>$</prompt> <userinput>git clone <uri>git://github.com/apache/guacamole-client.git</uri></userinput> +<computeroutput>Cloning into 'guacamole-client'... remote: Counting objects: 12788, done. remote: Compressing objects: 100% (4183/4183), done. remote: Total 12788 (delta 3942), reused 12667 (delta 3822) http://git-wip-us.apache.org/repos/asf/guacamole-manual/blob/69c894ef/src/chapters/jdbc-auth.xml ---------------------------------------------------------------------- diff --git a/src/chapters/jdbc-auth.xml b/src/chapters/jdbc-auth.xml index 6718808..1d2834e 100644 --- a/src/chapters/jdbc-auth.xml +++ b/src/chapters/jdbc-auth.xml @@ -52,8 +52,8 @@ 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://guacamole.incubator.apache.org/releases/"; - >http://guacamole.incubator.apache.org/releases/</link>.</para> + xlink:href="http://guacamole.apache.org/releases/"; + >http://guacamole.apache.org/releases/</link>.</para> <para>The database authentication extension is packaged as a <filename>.tar.gz</filename> file containing:</para> <variablelist> http://git-wip-us.apache.org/repos/asf/guacamole-manual/blob/69c894ef/src/chapters/ldap-auth.xml ---------------------------------------------------------------------- diff --git a/src/chapters/ldap-auth.xml b/src/chapters/ldap-auth.xml index bc3bc5e..0474b1e 100644 --- a/src/chapters/ldap-auth.xml +++ b/src/chapters/ldap-auth.xml @@ -77,8 +77,8 @@ 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://guacamole.incubator.apache.org/releases/"; - >http://guacamole.incubator.apache.org/releases/</link>.</para> + xlink:href="http://guacamole.apache.org/releases/"; + >http://guacamole.apache.org/releases/</link>.</para> <para>The LDAP authentication extension is packaged as a <filename>.tar.gz</filename> file containing:</para> <variablelist> http://git-wip-us.apache.org/repos/asf/guacamole-manual/blob/69c894ef/src/chapters/using.xml ---------------------------------------------------------------------- diff --git a/src/chapters/using.xml b/src/chapters/using.xml index 92053e2..a57181a 100644 --- a/src/chapters/using.xml +++ b/src/chapters/using.xml @@ -308,7 +308,7 @@ Guacamole's SSH support can be used with the <command>guacctl</command> utility. The <command>guacctl</command> utility is a simple shell script <link xmlns:xlink="http://www.w3.org/1999/xlink"; - xlink:href="https://raw.githubusercontent.com/apache/incubator-guacamole-server/master/bin/guacctl"; + xlink:href="https://raw.githubusercontent.com/apache/guacamole-server/master/bin/guacctl"; >included with Guacamole</link> which allows you to use and configure file transfer directly from the command line within the SSH session:</para> <informalexample> http://git-wip-us.apache.org/repos/asf/guacamole-manual/blob/69c894ef/src/gug.xml ---------------------------------------------------------------------- diff --git a/src/gug.xml b/src/gug.xml index 367e9bb..70c4e33 100644 --- a/src/gug.xml +++ b/src/gug.xml @@ -7,7 +7,7 @@ <legalnotice> <para>Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the <link xmlns:xlink="http://www.w3.org/1999/xlink"; - xlink:href="https://raw.githubusercontent.com/apache/incubator-guacamole-manual/master/NOTICE"; + xlink:href="https://raw.githubusercontent.com/apache/guacamole-manual/master/NOTICE"; ><filename>NOTICE</filename></link> file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file @@ -26,8 +26,8 @@ <title>Introduction</title> <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 + version at <link xlink:href="http://guacamole.apache.org/"; + >http://guacamole.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 http://git-wip-us.apache.org/repos/asf/guacamole-manual/blob/69c894ef/src/references/instructions/server/drawing/transfer.xml ---------------------------------------------------------------------- diff --git a/src/references/instructions/server/drawing/transfer.xml b/src/references/instructions/server/drawing/transfer.xml index 735b32f..b81e514 100644 --- a/src/references/instructions/server/drawing/transfer.xml +++ b/src/references/instructions/server/drawing/transfer.xml @@ -14,7 +14,7 @@ <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"; + xlink:href="https://github.com/apache/guacamole-server/blob/master/src/libguac/guacamole/protocol-types.h"; ><filename>guacamole/protocol-types.h</filename></link> header included with libguac.</para> <variablelist> @@ -59,7 +59,7 @@ <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"; + xlink:href="https://github.com/apache/guacamole-server/blob/master/src/libguac/guacamole/protocol-types.h"; ><filename>guacamole/protocol-types.h</filename></link> header included with libguac.</para> </listitem>
