Fix wiki references to point to gihub wiki

Signed-off-by: Mats Wichmann <mats@linux.com>

14 files changed, 18 insertions, 17 deletions

diff --git a/QMTest/test-framework.rst b/QMTest/test-framework.rst
index 844d99b..d51e5f0 100644
--- a/QMTest/test-framework.rst
+++ b/QMTest/test-framework.rst
@@ -346,7 +346,7 @@ SCons, it is ``test/packaging/sandbox-test/sandbox-test.py``.
 
 For even more examples you should check out one of the external Tools, e.g. the
 *Qt4* Tool at https://bitbucket.org/dirkbaechle/scons_qt4. Also visit the SCons
-Tools Index at http://www.scons.org/wiki/ToolsIndex for a complete
+Tools Index at https://github.com/SCons/scons/wiki/ToolsIndex for a complete
 list of available Tools, though not all may have tests yet.
 
 How to convert old tests
diff --git a/bin/xmlagenda.py b/bin/xmlagenda.py
index fcfe53e..7091ee5 100755
--- a/bin/xmlagenda.py
+++ b/bin/xmlagenda.py
@@ -1,7 +1,9 @@
 #!/usr/bin/env python
 
-# Query the scons.tigris.org database for the issues of interest.
-# The typical triage query is found on http://www.scons.org/wiki/BugParty
+# Query gihub issue tracker for the issues of interest.
+# The typical triage query is found on
+# https://github.com/scons/scons/wiki/BugParty
+# FIXME: this needs reworking for github, and wiki needs updating
 
 # Download the issues from Issuezilla as XML; this creates a file
 # named 'issues.xml'.  Run this script in the dir containing
diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index 4c05773..119d122 100644
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -7,9 +7,6 @@
 
 RELEASE 3.1.0.alpha.yyyymmdd - NEW DATE WILL BE INSERTED HERE
 
-  From Mats Wichmann:
-    - xml validity fixes from SConstruct.py change
-
   From Richard West:
     - Add SConstruct.py, Sconstruct.py, sconstruct.py to the search path for the root SConstruct file.
       Allows easier debugging within Visual Studio
@@ -54,6 +51,8 @@ RELEASE 3.1.0.alpha.yyyymmdd - NEW DATE WILL BE INSERTED HERE
   From Mats Wichmann:
     - Updated manpage scons.xml to fix a nested list problem
     - Updated doc terminiology: use prepend instead of append as appropriate
+    - xml validity fixes from SConstruct.py change
+    - update wiki links to new github location
 
   From Jonathon Reinhart:
     - Replace all instances of `int main()` in C code with `int main(void)`.
diff --git a/src/engine/SCons/Tool/docbook/docs/manual.xml b/src/engine/SCons/Tool/docbook/docs/manual.xml
index c129753..64ee925 100644
--- a/src/engine/SCons/Tool/docbook/docs/manual.xml
+++ b/src/engine/SCons/Tool/docbook/docs/manual.xml
@@ -67,7 +67,7 @@ package's <literal>docbook</literal> folder to
 <itemizedlist><listitem><para>the SCons User's Guide, chap. 19.7 "Where to put your custom Builders and Tools" and
 </para>
 </listitem>
-<listitem><para>the SCons Tools Wiki page at <ulink url="http://scons.org/wiki/ToolsIndex">http://scons.org/wiki/ToolsIndex</ulink>.
+<listitem><para>the SCons Tools Wiki page at <ulink url="https://github.com/SCons/scons/wiki/ToolsIndex">http://github.com/SCons/scons/wiki/ToolsIndex</ulink>.
 </para>
 </listitem>
 </itemizedlist>
diff --git a/test/Docbook/basedir/htmlchunked/image/manual.xml b/test/Docbook/basedir/htmlchunked/image/manual.xml
index ca12e0e..067c76e 100644
--- a/test/Docbook/basedir/htmlchunked/image/manual.xml
+++ b/test/Docbook/basedir/htmlchunked/image/manual.xml
@@ -72,7 +72,7 @@
 
         <listitem>
           <para>the SCons Tools Wiki page at <ulink
-          url="http://scons.org/wiki/ToolsIndex">http://scons.org/wiki/ToolsIndex</ulink>.</para>
+          url="https://github.com/SCons/scons/wiki/ToolsIndex">https://github.com/SCons/scons/wiki/ToolsIndex</ulink>.</para>
         </listitem>
       </itemizedlist>
     </section>
diff --git a/test/Docbook/basedir/htmlhelp/image/manual.xml b/test/Docbook/basedir/htmlhelp/image/manual.xml
index ca12e0e..067c76e 100644
--- a/test/Docbook/basedir/htmlhelp/image/manual.xml
+++ b/test/Docbook/basedir/htmlhelp/image/manual.xml
@@ -72,7 +72,7 @@
 
         <listitem>
           <para>the SCons Tools Wiki page at <ulink
-          url="http://scons.org/wiki/ToolsIndex">http://scons.org/wiki/ToolsIndex</ulink>.</para>
+          url="https://github.com/SCons/scons/wiki/ToolsIndex">https://github.com/SCons/scons/wiki/ToolsIndex</ulink>.</para>
         </listitem>
       </itemizedlist>
     </section>
diff --git a/test/Docbook/basic/epub/image/manual.xml b/test/Docbook/basic/epub/image/manual.xml
index ca12e0e..067c76e 100644
--- a/test/Docbook/basic/epub/image/manual.xml
+++ b/test/Docbook/basic/epub/image/manual.xml
@@ -72,7 +72,7 @@
 
         <listitem>
           <para>the SCons Tools Wiki page at <ulink
-          url="http://scons.org/wiki/ToolsIndex">http://scons.org/wiki/ToolsIndex</ulink>.</para>
+          url="https://github.com/SCons/scons/wiki/ToolsIndex">https://github.com/SCons/scons/wiki/ToolsIndex</ulink>.</para>
         </listitem>
       </itemizedlist>
     </section>
diff --git a/test/Docbook/basic/html/image/manual.xml b/test/Docbook/basic/html/image/manual.xml
index ca12e0e..067c76e 100644
--- a/test/Docbook/basic/html/image/manual.xml
+++ b/test/Docbook/basic/html/image/manual.xml
@@ -72,7 +72,7 @@
 
         <listitem>
           <para>the SCons Tools Wiki page at <ulink
-          url="http://scons.org/wiki/ToolsIndex">http://scons.org/wiki/ToolsIndex</ulink>.</para>
+          url="https://github.com/SCons/scons/wiki/ToolsIndex">https://github.com/SCons/scons/wiki/ToolsIndex</ulink>.</para>
         </listitem>
       </itemizedlist>
     </section>
diff --git a/test/Docbook/basic/htmlchunked/image/manual.xml b/test/Docbook/basic/htmlchunked/image/manual.xml
index ca12e0e..067c76e 100644
--- a/test/Docbook/basic/htmlchunked/image/manual.xml
+++ b/test/Docbook/basic/htmlchunked/image/manual.xml
@@ -72,7 +72,7 @@
 
         <listitem>
           <para>the SCons Tools Wiki page at <ulink
-          url="http://scons.org/wiki/ToolsIndex">http://scons.org/wiki/ToolsIndex</ulink>.</para>
+          url="https://github.com/SCons/scons/wiki/ToolsIndex">https://github.com/SCons/scons/wiki/ToolsIndex</ulink>.</para>
         </listitem>
       </itemizedlist>
     </section>
diff --git a/test/Docbook/basic/htmlhelp/image/manual.xml b/test/Docbook/basic/htmlhelp/image/manual.xml
index ca12e0e..067c76e 100644
--- a/test/Docbook/basic/htmlhelp/image/manual.xml
+++ b/test/Docbook/basic/htmlhelp/image/manual.xml
@@ -72,7 +72,7 @@
 
         <listitem>
           <para>the SCons Tools Wiki page at <ulink
-          url="http://scons.org/wiki/ToolsIndex">http://scons.org/wiki/ToolsIndex</ulink>.</para>
+          url="https://github.com/SCons/scons/wiki/ToolsIndex">https://github.com/SCons/scons/wiki/ToolsIndex</ulink>.</para>
         </listitem>
       </itemizedlist>
     </section>
diff --git a/test/Docbook/rootname/htmlchunked/image/manual.xml b/test/Docbook/rootname/htmlchunked/image/manual.xml
index ca12e0e..067c76e 100644
--- a/test/Docbook/rootname/htmlchunked/image/manual.xml
+++ b/test/Docbook/rootname/htmlchunked/image/manual.xml
@@ -72,7 +72,7 @@
 
         <listitem>
           <para>the SCons Tools Wiki page at <ulink
-          url="http://scons.org/wiki/ToolsIndex">http://scons.org/wiki/ToolsIndex</ulink>.</para>
+          url="https://github.com/SCons/scons/wiki/ToolsIndex">https://github.com/SCons/scons/wiki/ToolsIndex</ulink>.</para>
         </listitem>
       </itemizedlist>
     </section>
diff --git a/test/Docbook/rootname/htmlhelp/image/manual.xml b/test/Docbook/rootname/htmlhelp/image/manual.xml
index ca12e0e..067c76e 100644
--- a/test/Docbook/rootname/htmlhelp/image/manual.xml
+++ b/test/Docbook/rootname/htmlhelp/image/manual.xml
@@ -72,7 +72,7 @@
 
         <listitem>
           <para>the SCons Tools Wiki page at <ulink
-          url="http://scons.org/wiki/ToolsIndex">http://scons.org/wiki/ToolsIndex</ulink>.</para>
+          url="https://github.com/SCons/scons/wiki/ToolsIndex">https://github.com/SCons/scons/wiki/ToolsIndex</ulink>.</para>
         </listitem>
       </itemizedlist>
     </section>
diff --git a/testing/buildbot.yml b/testing/buildbot.yml
index 81c2143..7e6bb1a 100644
--- a/testing/buildbot.yml
+++ b/testing/buildbot.yml
@@ -9,7 +9,7 @@
 #   ansible-playbook -i hosts buildbot.yml -e 'botuser=sconsy'
 #
 # Tested with Ansible 1.5.0, based on
-# http://scons.org/wiki/InstallingBuildbotSlaves
+# https://github.com/SCons/scons/wiki/InstallingBuildbotSlaves
 # Send questions to:
 #
 #   anatoly techtonik <techtonik@gmail.com>
diff --git a/www/project_tools.html b/www/project_tools.html
index ee731a4..cf80234 100644
--- a/www/project_tools.html
+++ b/www/project_tools.html
@@ -12,7 +12,7 @@ The main changes are:
 * Link to our Roadmap page.
 -->
 <li><a href="http://scons.org/">SCons Home Page</a></li>
-<li><a href="http://scons.org/wiki/">SCons Wiki</a></li>
+<li><a href="https://github.com/SCons/scons/wiki/">SCons Wiki</a></li>
 </dd>
 
 <dd>