Merged in techtonik/scons (pull request #147).

Fix mailing list addrs and bug tracker references, and a few other
doc fixes.

37 files changed, 69 insertions, 48 deletions

diff --git a/HOWTO/subrelease.txt b/HOWTO/subrelease.txt
index ecfaa1f..06b757a 100644
--- a/HOWTO/subrelease.txt
+++ b/HOWTO/subrelease.txt
@@ -111,4 +111,4 @@ Things to do to release a new X.Y.Z version of SCons:
 
 
 
-    Announce to dev@scons.tigris.org.
+    Announce to scons-dev@scons.org
diff --git a/QMTest/TestSCons.py b/QMTest/TestSCons.py
index 57b97f9..4b2b5a4 100644
--- a/QMTest/TestSCons.py
+++ b/QMTest/TestSCons.py
@@ -150,7 +150,7 @@ def deprecated_python_version(version=sys.version_info):
 if deprecated_python_version():
     msg = r"""
 scons: warning: Support for pre-2.7.0 Python version (%s) is deprecated.
-    If this will cause hardship, contact dev@scons.tigris.org.
+    If this will cause hardship, contact scons-dev@scons.org
 """
 
     deprecated_python_expr = re_escape(msg % python_version_string()) + file_expr
diff --git a/README.rst b/README.rst
index b9e7d3b..16a7123 100644
--- a/README.rst
+++ b/README.rst
@@ -676,7 +676,7 @@ Submission page:
 
 You can also send mail to the SCons developers' mailing list:
 
-        dev@scons.tigris.org
+        scons-dev@scons.org
 
 But even if you send email to the mailing list please make sure that you ALSO
 submit a bug report to the project page bug tracker, because bug reports in
@@ -689,12 +689,11 @@ Mailing Lists
 An active mailing list for developers of SCons is available.  You may
 send questions or comments to the list at:
 
-        dev@scons.tigris.org
+        scons-dev@scons.org
 
-You may request a subscription to the developer's mailing list by sending
-email to:
+You may subscribe to the developer's mailing list using form on this page:
 
-        dev-subscribe@scons.tigris.org
+        http://two.pairlist.net/mailman/listinfo/scons-dev
 
 Subscription to the developer's mailing list is by approval.  In practice, no
 one is refused list membership, but we reserve the right to limit membership
diff --git a/doc/scons.mod b/doc/scons.mod
index 01e9a6d..be2dc24 100644
--- a/doc/scons.mod
+++ b/doc/scons.mod
@@ -525,8 +525,8 @@
 -->
 
 <!ENTITY scons-announce "<literal xmlns='http://www.scons.org/dbxsd/v1.0'>announce@scons.tigris.org</literal>">
-<!ENTITY scons-devel "<literal xmlns='http://www.scons.org/dbxsd/v1.0'>dev@scons.tigris.org</literal>">
-<!ENTITY scons-users "<literal xmlns='http://www.scons.org/dbxsd/v1.0'>users@scons.tigris.org</literal>">
+<!ENTITY scons-devel "<literal xmlns='http://www.scons.org/dbxsd/v1.0'>scons-dev@scons.org</literal>">
+<!ENTITY scons-users "<literal xmlns='http://www.scons.org/dbxsd/v1.0'>scons-users@scons.org</literal>">
 
 <!--
 
diff --git a/review.py b/review.py
index 23e4b10..6416c62 100644
--- a/review.py
+++ b/review.py
@@ -508,7 +508,7 @@ group.add_option("-r", "--reviewers", action="store", dest="reviewers",
                  metavar="REVIEWERS", default=None,

                  help="Add reviewers (comma separated email addresses).")

 group.add_option("--cc", action="store", dest="cc",

-                 metavar="CC", default="dev@scons.tigris.org",

+                 metavar="CC", default="scons-dev@scons.org",

                  help="Add CC (comma separated email addresses).")

 group.add_option("--private", action="store_true", dest="private",

                  default=False,

diff --git a/src/Announce.txt b/src/Announce.txt
index cccf6c9..96aaf03 100644
--- a/src/Announce.txt
+++ b/src/Announce.txt
@@ -319,7 +319,7 @@ RELEASE 2.3.1.alpha.yyyymmdd - NEW DATE WILL BE INSERTED HERE
         Python 1.5, 2.0 or 2.1 release or sub-release:
 
             scons: warning: Support for pre-2.2 Python (VERSION) is deprecated.
-                If this will cause hardship, contact dev@scons.tigris.org.
+                If this will cause hardship, contact scons-dev@scons.org
 
         You may disable all warnings about deprecated features by adding
         the option "--warn=no-deprecated" to the command line or to the
diff --git a/src/README.txt b/src/README.txt
index ebc68fc..5d880c2 100644
--- a/src/README.txt
+++ b/src/README.txt
@@ -174,7 +174,7 @@ Submission page:
 
 You can also send mail to the SCons developers' mailing list:
 
-        dev@scons.tigris.org
+        scons-dev@scons.org
 
 But even if you send email to the mailing list please make sure that you
 ALSO submit a bug report to the project page bug tracker, because bug
@@ -187,11 +187,11 @@ MAILING LISTS
 An active mailing list for users of SCons is available.  You may send
 questions or comments to the list at:
 
-        users@scons.tigris.org
+        scons-users@scons.org
 
 You may subscribe to the mailing list by sending email to:
 
-        users-subscribe@scons.tigris.org
+        scons-users-join@scons.org
 
 There is also a low-volume mailing list available for announcements
 about SCons.  Subscribe by sending email to:
diff --git a/src/engine/SCons/Environment.py b/src/engine/SCons/Environment.py
index 45c40c3..d178f49 100644
--- a/src/engine/SCons/Environment.py
+++ b/src/engine/SCons/Environment.py
@@ -2149,7 +2149,7 @@ class Base(SubstitutionEnvironment):
     def SourceCode(self, entry, builder):
         """Arrange for a source code builder for (part of) a tree."""
         msg = """SourceCode() has been deprecated and there is no replacement.
-\tIf you need this function, please contact dev@scons.tigris.org."""
+\tIf you need this function, please contact scons-dev@scons.org"""
         SCons.Warnings.warn(SCons.Warnings.DeprecatedSourceCodeWarning, msg)
         entries = self.arg2nodes(entry, self.fs.Entry)
         for entry in entries:
diff --git a/src/engine/SCons/SConf.py b/src/engine/SCons/SConf.py
index 068af3a..dd93269 100644
--- a/src/engine/SCons/SConf.py
+++ b/src/engine/SCons/SConf.py
@@ -1,6 +1,15 @@
 """SCons.SConf
 
 Autoconf-like configuration support.
+
+In other words, this package allows to run series of tests to detect
+capabilities of current system and generate config files (header files
+in C/C++) that turn on system-specific options and optimizations.
+
+For example, it is possible to detect if optional libraries are present
+on current system and generate config that makes compiler include them.
+C compilers do not have ability to catch ImportError if some library is
+not found, so these checks should be done externally.
 """
 
 #
@@ -110,16 +119,22 @@ def _createConfigH(target, source, env):
 def _stringConfigH(target, source, env):
     return "scons: Configure: creating " + str(target[0])
 
-def CreateConfigHBuilder(env):
-    """Called just before the building targets phase begins."""
+
+def NeedConfigHBuilder():
     if len(_ac_config_hs) == 0:
-        return
+       return False
+    else:
+       return True
+
+def CreateConfigHBuilder(env):
+    """Called if necessary just before the building targets phase begins."""
     action = SCons.Action.Action(_createConfigH,
                                  _stringConfigH)
     sconfigHBld = SCons.Builder.Builder(action=action)
     env.Append( BUILDERS={'SConfigHBuilder':sconfigHBld} )
     for k in _ac_config_hs.keys():
         env.SConfigHBuilder(k, env.Value(_ac_config_hs[k]))
+
     
 class SConfWarning(SCons.Warnings.Warning):
     pass
diff --git a/src/engine/SCons/Script/Main.py b/src/engine/SCons/Script/Main.py
index fb58e9b..439b869 100644
--- a/src/engine/SCons/Script/Main.py
+++ b/src/engine/SCons/Script/Main.py
@@ -1025,13 +1025,17 @@ def _main(parser):
     # in case they disabled the warning in the SConscript files.
     if python_version_deprecated():
         msg = "Support for pre-%s Python version (%s) is deprecated.\n" + \
-              "    If this will cause hardship, contact dev@scons.tigris.org."
+              "    If this will cause hardship, contact scons-dev@scons.org"
         deprecated_version_string = ".".join(map(str, deprecated_python_version))
         SCons.Warnings.warn(SCons.Warnings.PythonVersionWarning,
                             msg % (deprecated_version_string, python_version_string()))
 
     if not options.help:
-        SCons.SConf.CreateConfigHBuilder(SCons.Defaults.DefaultEnvironment())
+        # [ ] Clarify why we need to create Builder here at all, and
+        #     why it is created in DefaultEnvironment
+        # https://bitbucket.org/scons/scons/commits/d27a548aeee8ad5e67ea75c2d19a7d305f784e30
+        if SCons.SConf.NeedConfigHBuilder():
+            SCons.SConf.CreateConfigHBuilder(SCons.Defaults.DefaultEnvironment())
 
     # Now re-parse the command-line options (any to the left of a '--'
     # argument, that is) with any user-defined command-line options that
diff --git a/src/engine/SCons/Tool/JavaCommon.py b/src/engine/SCons/Tool/JavaCommon.py
index 156ef97..6dd6051 100644
--- a/src/engine/SCons/Tool/JavaCommon.py
+++ b/src/engine/SCons/Tool/JavaCommon.py
@@ -244,7 +244,8 @@ if java_parsing:
                 return self
             # If that's an inner class which is declared in a method, it
             # requires an index prepended to the class-name, e.g.
-            # 'Foo$1Inner' (Tigris Issue 2087)
+            # 'Foo$1Inner'
+            # http://scons.tigris.org/issues/show_bug.cgi?id=2087
             if self.outer_state.localClasses and \
                 self.outer_state.stackBrackets[-1] > \
                 self.outer_state.stackBrackets[-2]+1:
diff --git a/src/engine/SCons/Tool/docbook/docs/manual.xml b/src/engine/SCons/Tool/docbook/docs/manual.xml
index e232c6a..60e94bc 100644
--- a/src/engine/SCons/Tool/docbook/docs/manual.xml
+++ b/src/engine/SCons/Tool/docbook/docs/manual.xml
@@ -263,7 +263,7 @@ with large input files may occur. There will definitely arise the need for
 adding features, or a variable. Let us know if you can think of a nice
 improvement or have worked on a bugfix/patch with success. Enter your issues at the
 Launchpad bug tracker for the Docbook Tool, or write to the User General Discussion
-list of SCons at <literal>users@scons.tigris.org</literal>.
+list of SCons at <literal>scons-users@tigris.org</literal>.
 </para>
 </section>
 
diff --git a/test/Depends/no-Builder.py b/test/Depends/no-Builder.py
index 2d49756..48ab724 100644
--- a/test/Depends/no-Builder.py
+++ b/test/Depends/no-Builder.py
@@ -40,7 +40,7 @@ file2 = File('file2')
 env.Depends(file1, [[file2, 'file3']])
 # Verify that a "hidden" file created by another action causes the
 # action to run when an explicit Dependency is specified.
-# See tigris.org issue 2647.
+# See http://scons.tigris.org/issues/show_bug.cgi?id=2647
 env.Depends('hidden', 'file4.out')
 env.Command('file4.out', 'file4.in',
             [Copy('$TARGET', '$SOURCE'), Touch('hidden')])
diff --git a/test/Deprecated/SourceCode/BitKeeper/BITKEEPERCOM.py b/test/Deprecated/SourceCode/BitKeeper/BITKEEPERCOM.py
index eb75a8f..d5af0ea 100644
--- a/test/Deprecated/SourceCode/BitKeeper/BITKEEPERCOM.py
+++ b/test/Deprecated/SourceCode/BitKeeper/BITKEEPERCOM.py
@@ -42,7 +42,7 @@ Environment(tools = ['BitKeeper']).BitKeeper()
 msg_bk = """The BitKeeper() factory is deprecated and there is no replacement."""
 warn_bk = test.deprecated_fatal('deprecated-build-dir', msg_bk)
 msg_sc = """SourceCode() has been deprecated and there is no replacement.
-\tIf you need this function, please contact dev@scons.tigris.org."""
+\tIf you need this function, please contact scons-dev@scons.org"""
 warn_sc = test.deprecated_wrap(msg_sc)
 
 test.subdir('BitKeeper', ['BitKeeper', 'sub'], 'sub')
diff --git a/test/Deprecated/SourceCode/BitKeeper/BITKEEPERCOMSTR.py b/test/Deprecated/SourceCode/BitKeeper/BITKEEPERCOMSTR.py
index ca58b83..ef70cb8 100644
--- a/test/Deprecated/SourceCode/BitKeeper/BITKEEPERCOMSTR.py
+++ b/test/Deprecated/SourceCode/BitKeeper/BITKEEPERCOMSTR.py
@@ -42,7 +42,7 @@ Environment(tools = ['BitKeeper']).BitKeeper()
 msg_bk = """The BitKeeper() factory is deprecated and there is no replacement."""
 warn_bk = test.deprecated_fatal('deprecated-build-dir', msg_bk)
 msg_sc = """SourceCode() has been deprecated and there is no replacement.
-\tIf you need this function, please contact dev@scons.tigris.org."""
+\tIf you need this function, please contact scons-dev@scons.org"""
 warn_sc = test.deprecated_wrap(msg_sc)
 
 test.subdir('BitKeeper', ['BitKeeper', 'sub'], 'sub')
diff --git a/test/Deprecated/SourceCode/BitKeeper/BitKeeper.py b/test/Deprecated/SourceCode/BitKeeper/BitKeeper.py
index 28b8761..3f0ffdd 100644
--- a/test/Deprecated/SourceCode/BitKeeper/BitKeeper.py
+++ b/test/Deprecated/SourceCode/BitKeeper/BitKeeper.py
@@ -41,7 +41,7 @@ Environment(tools = ['BitKeeper']).BitKeeper()
 msg_bk = """The BitKeeper() factory is deprecated and there is no replacement."""
 warn_bk = test.deprecated_fatal('deprecated-build-dir', msg_bk)
 msg_sc = """SourceCode() has been deprecated and there is no replacement.
-\tIf you need this function, please contact dev@scons.tigris.org."""
+\tIf you need this function, please contact scons-dev@scons.org"""
 warn_sc = test.deprecated_wrap(msg_sc)
 
 test.skip_test("Need BitKeeper to debug these tests.\n")
diff --git a/test/Deprecated/SourceCode/CVS/CVS.py b/test/Deprecated/SourceCode/CVS/CVS.py
index b5b51bc..a1276fe 100644
--- a/test/Deprecated/SourceCode/CVS/CVS.py
+++ b/test/Deprecated/SourceCode/CVS/CVS.py
@@ -40,7 +40,7 @@ Environment(tools = ['CVS']).CVS('')
 msg_cvs = """The CVS() factory is deprecated and there is no replacement."""
 warn_cvs = test.deprecated_fatal('deprecated-build-dir', msg_cvs)
 msg_sc = """SourceCode() has been deprecated and there is no replacement.
-\tIf you need this function, please contact dev@scons.tigris.org."""
+\tIf you need this function, please contact scons-dev@scons.org"""
 warn_sc = test.deprecated_wrap(msg_sc)
 
 cvs = test.where_is('cvs')
diff --git a/test/Deprecated/SourceCode/CVS/CVSCOM.py b/test/Deprecated/SourceCode/CVS/CVSCOM.py
index b9d9c76..a0f8400 100644
--- a/test/Deprecated/SourceCode/CVS/CVSCOM.py
+++ b/test/Deprecated/SourceCode/CVS/CVSCOM.py
@@ -42,7 +42,7 @@ Environment(tools = ['CVS']).CVS('')
 msg_cvs = """The CVS() factory is deprecated and there is no replacement."""
 warn_cvs = test.deprecated_fatal('deprecated-build-dir', msg_cvs)
 msg_sc = """SourceCode() has been deprecated and there is no replacement.
-\tIf you need this function, please contact dev@scons.tigris.org."""
+\tIf you need this function, please contact scons-dev@scons.org"""
 warn_sc = test.deprecated_wrap(msg_sc)
 
 test.subdir('CVS', ['CVS', 'sub'], 'sub')
diff --git a/test/Deprecated/SourceCode/CVS/CVSCOMSTR.py b/test/Deprecated/SourceCode/CVS/CVSCOMSTR.py
index 9a6cf64..f793d66 100644
--- a/test/Deprecated/SourceCode/CVS/CVSCOMSTR.py
+++ b/test/Deprecated/SourceCode/CVS/CVSCOMSTR.py
@@ -42,7 +42,7 @@ Environment(tools = ['CVS']).CVS('')
 msg_cvs = """The CVS() factory is deprecated and there is no replacement."""
 warn_cvs = test.deprecated_fatal('deprecated-build-dir', msg_cvs)
 msg_sc = """SourceCode() has been deprecated and there is no replacement.
-\tIf you need this function, please contact dev@scons.tigris.org."""
+\tIf you need this function, please contact scons-dev@scons.org"""
 warn_sc = test.deprecated_wrap(msg_sc)
 
 test.subdir('CVS', ['CVS', 'sub'], 'sub')
diff --git a/test/Deprecated/SourceCode/Perforce/P4COM.py b/test/Deprecated/SourceCode/Perforce/P4COM.py
index 92ae547..9b9bab1 100644
--- a/test/Deprecated/SourceCode/Perforce/P4COM.py
+++ b/test/Deprecated/SourceCode/Perforce/P4COM.py
@@ -42,7 +42,7 @@ Environment(tools = ['Perforce']).Perforce()
 msg_p4 = """The Perforce() factory is deprecated and there is no replacement."""
 warn_p4 = test.deprecated_fatal('deprecated-build-dir', msg_p4)
 msg_sc = """SourceCode() has been deprecated and there is no replacement.
-\tIf you need this function, please contact dev@scons.tigris.org."""
+\tIf you need this function, please contact scons-dev@scons.org"""
 warn_sc = test.deprecated_wrap(msg_sc)
 
 test.subdir('Perforce', ['Perforce', 'sub'], 'sub')
diff --git a/test/Deprecated/SourceCode/Perforce/P4COMSTR.py b/test/Deprecated/SourceCode/Perforce/P4COMSTR.py
index d022824..7a24021 100644
--- a/test/Deprecated/SourceCode/Perforce/P4COMSTR.py
+++ b/test/Deprecated/SourceCode/Perforce/P4COMSTR.py
@@ -43,7 +43,7 @@ Environment(tools = ['Perforce']).Perforce()
 msg_p4 = """The Perforce() factory is deprecated and there is no replacement."""
 warn_p4 = test.deprecated_fatal('deprecated-build-dir', msg_p4)
 msg_sc = """SourceCode() has been deprecated and there is no replacement.
-\tIf you need this function, please contact dev@scons.tigris.org."""
+\tIf you need this function, please contact scons-dev@scons.org"""
 warn_sc = test.deprecated_wrap(msg_sc)
 
 test.subdir('Perforce', ['Perforce', 'sub'], 'sub')
diff --git a/test/Deprecated/SourceCode/Perforce/Perforce.py b/test/Deprecated/SourceCode/Perforce/Perforce.py
index ebf9cfb..3be22d8 100644
--- a/test/Deprecated/SourceCode/Perforce/Perforce.py
+++ b/test/Deprecated/SourceCode/Perforce/Perforce.py
@@ -43,7 +43,7 @@ Environment(tools = ['Perforce']).Perforce()
 msg_p4 = """The Perforce() factory is deprecated and there is no replacement."""
 warn_p4 = test.deprecated_fatal('deprecated-build-dir', msg_p4)
 msg_sc = """SourceCode() has been deprecated and there is no replacement.
-\tIf you need this function, please contact dev@scons.tigris.org."""
+\tIf you need this function, please contact scons-dev@scons.org"""
 warn_sc = test.deprecated_wrap(msg_sc)
 
 class TestPerforce(TestSCons.TestSCons):
diff --git a/test/Deprecated/SourceCode/RCS/RCS_COCOM.py b/test/Deprecated/SourceCode/RCS/RCS_COCOM.py
index 20f0da6..765c88c 100644
--- a/test/Deprecated/SourceCode/RCS/RCS_COCOM.py
+++ b/test/Deprecated/SourceCode/RCS/RCS_COCOM.py
@@ -42,7 +42,7 @@ Environment(tools = ['RCS']).RCS()
 msg_rcs = """The RCS() factory is deprecated and there is no replacement."""
 warn_rcs = test.deprecated_fatal('deprecated-build-dir', msg_rcs)
 msg_sc = """SourceCode() has been deprecated and there is no replacement.
-\tIf you need this function, please contact dev@scons.tigris.org."""
+\tIf you need this function, please contact scons-dev@scons.org"""
 warn_sc = test.deprecated_wrap(msg_sc)
 
 test.subdir('RCS', ['RCS', 'sub'], 'sub')
diff --git a/test/Deprecated/SourceCode/RCS/RCS_COCOMSTR.py b/test/Deprecated/SourceCode/RCS/RCS_COCOMSTR.py
index 3626376..57088fa 100644
--- a/test/Deprecated/SourceCode/RCS/RCS_COCOMSTR.py
+++ b/test/Deprecated/SourceCode/RCS/RCS_COCOMSTR.py
@@ -42,7 +42,7 @@ Environment(tools = ['RCS']).RCS()
 msg_rcs = """The RCS() factory is deprecated and there is no replacement."""
 warn_rcs = test.deprecated_fatal('deprecated-build-dir', msg_rcs)
 msg_sc = """SourceCode() has been deprecated and there is no replacement.
-\tIf you need this function, please contact dev@scons.tigris.org."""
+\tIf you need this function, please contact scons-dev@scons.org"""
 warn_sc = test.deprecated_wrap(msg_sc)
 
 test.subdir('RCS', ['RCS', 'sub'], 'sub')
diff --git a/test/Deprecated/SourceCode/RCS/changed.py b/test/Deprecated/SourceCode/RCS/changed.py
index 14c80bd..fec1ba3 100644
--- a/test/Deprecated/SourceCode/RCS/changed.py
+++ b/test/Deprecated/SourceCode/RCS/changed.py
@@ -38,7 +38,7 @@ Environment(tools = ['RCS']).RCS()
 msg_rcs = """The RCS() factory is deprecated and there is no replacement."""
 warn_rcs = test.deprecated_fatal('deprecated-build-dir', msg_rcs)
 msg_sc = """SourceCode() has been deprecated and there is no replacement.
-\tIf you need this function, please contact dev@scons.tigris.org."""
+\tIf you need this function, please contact scons-dev@scons.org"""
 warn_sc = test.deprecated_wrap(msg_sc)
 
 rcs = test.where_is('rcs')
diff --git a/test/Deprecated/SourceCode/RCS/explicit.py b/test/Deprecated/SourceCode/RCS/explicit.py
index 53c336a..96ce02f 100644
--- a/test/Deprecated/SourceCode/RCS/explicit.py
+++ b/test/Deprecated/SourceCode/RCS/explicit.py
@@ -40,7 +40,7 @@ Environment(tools = ['RCS']).RCS()
 msg_rcs = """The RCS() factory is deprecated and there is no replacement."""
 warn_rcs = test.deprecated_fatal('deprecated-build-dir', msg_rcs)
 msg_sc = """SourceCode() has been deprecated and there is no replacement.
-\tIf you need this function, please contact dev@scons.tigris.org."""
+\tIf you need this function, please contact scons-dev@scons.org"""
 warn_sc = test.deprecated_wrap(msg_sc)
 
 rcs = test.where_is('rcs')
diff --git a/test/Deprecated/SourceCode/SCCS/SCCSCOM.py b/test/Deprecated/SourceCode/SCCS/SCCSCOM.py
index a08241f..6ad02ac 100644
--- a/test/Deprecated/SourceCode/SCCS/SCCSCOM.py
+++ b/test/Deprecated/SourceCode/SCCS/SCCSCOM.py
@@ -42,7 +42,7 @@ Environment(tools = ['SCCS']).SCCS()
 msg_sccs = """The SCCS() factory is deprecated and there is no replacement."""
 warn_sccs = test.deprecated_fatal('deprecated-build-dir', msg_sccs)
 msg_sc = """SourceCode() has been deprecated and there is no replacement.
-\tIf you need this function, please contact dev@scons.tigris.org."""
+\tIf you need this function, please contact scons-dev@scons.org"""
 warn_sc = test.deprecated_wrap(msg_sc)
 
 test.subdir('SCCS', ['SCCS', 'sub'], 'sub')
diff --git a/test/Deprecated/SourceCode/SCCS/SCCSCOMSTR.py b/test/Deprecated/SourceCode/SCCS/SCCSCOMSTR.py
index 5204ee3..a757495 100644
--- a/test/Deprecated/SourceCode/SCCS/SCCSCOMSTR.py
+++ b/test/Deprecated/SourceCode/SCCS/SCCSCOMSTR.py
@@ -42,7 +42,7 @@ Environment(tools = ['SCCS']).SCCS()
 msg_sccs = """The SCCS() factory is deprecated and there is no replacement."""
 warn_sccs = test.deprecated_fatal('deprecated-build-dir', msg_sccs)
 msg_sc = """SourceCode() has been deprecated and there is no replacement.
-\tIf you need this function, please contact dev@scons.tigris.org."""
+\tIf you need this function, please contact scons-dev@scons.org"""
 warn_sc = test.deprecated_wrap(msg_sc)
 
 test.subdir('SCCS', ['SCCS', 'sub'], 'sub')
diff --git a/test/Deprecated/SourceCode/SCCS/diskcheck.py b/test/Deprecated/SourceCode/SCCS/diskcheck.py
index d2364b6..060c7a2 100644
--- a/test/Deprecated/SourceCode/SCCS/diskcheck.py
+++ b/test/Deprecated/SourceCode/SCCS/diskcheck.py
@@ -40,7 +40,7 @@ Environment(tools = ['SCCS']).SCCS()
 msg_sccs = """The SCCS() factory is deprecated and there is no replacement."""
 warn_sccs = test.deprecated_fatal('deprecated-build-dir', msg_sccs)
 msg_sc = """SourceCode() has been deprecated and there is no replacement.
-\tIf you need this function, please contact dev@scons.tigris.org."""
+\tIf you need this function, please contact scons-dev@scons.org"""
 warn_sc = test.deprecated_wrap(msg_sc)
 
 sccs = test.where_is('sccs')
diff --git a/test/Deprecated/SourceCode/SourceCode.py b/test/Deprecated/SourceCode/SourceCode.py
index d440581..2bf990f 100644
--- a/test/Deprecated/SourceCode/SourceCode.py
+++ b/test/Deprecated/SourceCode/SourceCode.py
@@ -38,7 +38,7 @@ SourceCode('.', None)
 """)
 
 msg = """SourceCode() has been deprecated and there is no replacement.
-\tIf you need this function, please contact dev@scons.tigris.org."""
+\tIf you need this function, please contact scons-dev@tigris.org"""
 warning = test.deprecated_warning('deprecated-source-code', msg)
 
 test.subdir('sub', 'sub2')
diff --git a/test/Deprecated/SourceCode/Subversion.py b/test/Deprecated/SourceCode/Subversion.py
index a97c86f..1e7c562 100644
--- a/test/Deprecated/SourceCode/Subversion.py
+++ b/test/Deprecated/SourceCode/Subversion.py
@@ -39,7 +39,7 @@ Environment(tools = ['Subversion']).Subversion('')
 msg_svn = """The Subversion() factory is deprecated and there is no replacement."""
 warn_svn = test.deprecated_fatal('deprecated-build-dir', msg_svn)
 msg_sc = """SourceCode() has been deprecated and there is no replacement.
-\tIf you need this function, please contact dev@scons.tigris.org."""
+\tIf you need this function, please contact scons-dev@scons.org"""
 warn_sc = test.deprecated_wrap(msg_sc)
 
 svn = test.where_is('svn')
diff --git a/test/ExecuteInvalidateCache.py b/test/ExecuteInvalidateCache.py
index 88ae393..a22c5ea 100644
--- a/test/ExecuteInvalidateCache.py
+++ b/test/ExecuteInvalidateCache.py
@@ -26,7 +26,8 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 """
 Test the Execute() functions clears the memoized values of affected target Nodes
-when used with Delete(). Derived from Tigris issue 1307.
+when used with Delete(). Derived from
+http://scons.tigris.org/issues/show_bug.cgi?id=1307
 """
 
 import TestSCons
diff --git a/test/Fortran/USE-MODULE-CASEINSENS.py b/test/Fortran/USE-MODULE-CASEINSENS.py
index 79d5125..44c03fe 100644
--- a/test/Fortran/USE-MODULE-CASEINSENS.py
+++ b/test/Fortran/USE-MODULE-CASEINSENS.py
@@ -26,7 +26,8 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 # This test tests whether a file that defines a module "a" and
 # then uses it with a different case ("A") works.  Pre-2.0, this
-# gave a spurious dependency cycle error.  See Tigris issue #2574.
+# gave a spurious dependency cycle error.
+# See http://scons.tigris.org/issues/show_bug.cgi?id=2574
 
 import TestSCons
 
diff --git a/test/Libs/SharedLibrary-update-deps.py b/test/Libs/SharedLibrary-update-deps.py
index 5394bc7..076e3ad 100644
--- a/test/Libs/SharedLibrary-update-deps.py
+++ b/test/Libs/SharedLibrary-update-deps.py
@@ -26,7 +26,7 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 """
 Test that SharedLibrary() updates when a different lib is linked, even if it has the same md5.
-This is Tigris bug #2903.
+This is http://scons.tigris.org/issues/show_bug.cgi?id=2903
 """
 
 import sys
diff --git a/test/Scanner/Dir.py b/test/Scanner/Dir.py
index 120e08f..86b80e9 100644
--- a/test/Scanner/Dir.py
+++ b/test/Scanner/Dir.py
@@ -27,7 +27,7 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 """
 Verify that a simple scanner that returns Dir nodes works correctly.
 
-Submitted as tigris.org issue #2534.
+Submitted as http://scons.tigris.org/issues/show_bug.cgi?id=2534
 """
 
 import TestSCons
diff --git a/test/VariantDir/include-subdir.py b/test/VariantDir/include-subdir.py
index 5ddd623..d616bba 100644
--- a/test/VariantDir/include-subdir.py
+++ b/test/VariantDir/include-subdir.py
@@ -32,7 +32,7 @@ we have to make sure that the file gets copied to the variant dir. (This
 was not the case for 0.98.5 and earlier)
 
 Test case supplied by Jared Grubb, based on a minimal example supplied
-by Ali Tofigh, filed as issue #2121 at tigris.org.
+by Ali Tofigh, filed as http://scons.tigris.org/issues/show_bug.cgi?id=2121
 """
 
 import TestSCons
diff --git a/www/patch-submission.html b/www/patch-submission.html
index c2b5d22..a2d9b95 100644
--- a/www/patch-submission.html
+++ b/www/patch-submission.html
@@ -64,7 +64,7 @@ due to spambot abuse of the open-door policy.
 
 <li>
 <strong>If your patch is extensive, discuss it first on the
-<a href="mailto:dev@scons.tigris.org">dev@scons.tigris.org</a>
+<a href="mailto:scons-dev@scons.org">scons-dev@scons.org</a>
 mailing list
 </strong>
 <p>
@@ -211,7 +211,7 @@ against the regression tests and fixing any problems
 If you run your patch against against the regression tests
 but can't figure out how to fix all the cases,
 the best bet would be to ask the
-<a href="mailto:dev@scons.tigris.org">dev@scons.tigris.org</a>
+<a href="mailto:scons-dev@scons.org">scons-dev@scons.org</a>
 mailing list.
 </p>
 </li>