summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--HOWTO/subrelease.txt2
-rw-r--r--QMTest/TestSCons.py2
-rw-r--r--README.rst9
-rw-r--r--doc/scons.mod4
-rw-r--r--review.py2
-rw-r--r--src/Announce.txt2
-rw-r--r--src/README.txt6
-rw-r--r--src/engine/SCons/Environment.py2
-rw-r--r--src/engine/SCons/Script/Main.py2
-rw-r--r--src/engine/SCons/Tool/docbook/docs/manual.xml2
-rw-r--r--test/Deprecated/SourceCode/BitKeeper/BITKEEPERCOM.py2
-rw-r--r--test/Deprecated/SourceCode/BitKeeper/BITKEEPERCOMSTR.py2
-rw-r--r--test/Deprecated/SourceCode/BitKeeper/BitKeeper.py2
-rw-r--r--test/Deprecated/SourceCode/CVS/CVS.py2
-rw-r--r--test/Deprecated/SourceCode/CVS/CVSCOM.py2
-rw-r--r--test/Deprecated/SourceCode/CVS/CVSCOMSTR.py2
-rw-r--r--test/Deprecated/SourceCode/Perforce/P4COM.py2
-rw-r--r--test/Deprecated/SourceCode/Perforce/P4COMSTR.py2
-rw-r--r--test/Deprecated/SourceCode/Perforce/Perforce.py2
-rw-r--r--test/Deprecated/SourceCode/RCS/RCS_COCOM.py2
-rw-r--r--test/Deprecated/SourceCode/RCS/RCS_COCOMSTR.py2
-rw-r--r--test/Deprecated/SourceCode/RCS/changed.py2
-rw-r--r--test/Deprecated/SourceCode/RCS/explicit.py2
-rw-r--r--test/Deprecated/SourceCode/SCCS/SCCSCOM.py2
-rw-r--r--test/Deprecated/SourceCode/SCCS/SCCSCOMSTR.py2
-rw-r--r--test/Deprecated/SourceCode/SCCS/diskcheck.py2
-rw-r--r--test/Deprecated/SourceCode/SourceCode.py2
-rw-r--r--test/Deprecated/SourceCode/Subversion.py2
-rw-r--r--www/patch-submission.html4
29 files changed, 36 insertions, 37 deletions
diff --git a/HOWTO/subrelease.txt b/HOWTO/subrelease.txt
index ecfaa1f6..06b757a1 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 57b97f99..4b2b5a42 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 b9e7d3b7..16a71234 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 01e9a6da..be2dc242 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 23e4b10d..6416c620 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 cccf6c9d..96aaf03a 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 ebc68fcf..5d880c20 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 45c40c39..d178f490 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/Script/Main.py b/src/engine/SCons/Script/Main.py
index fb58e9b5..d4dd2294 100644
--- a/src/engine/SCons/Script/Main.py
+++ b/src/engine/SCons/Script/Main.py
@@ -1025,7 +1025,7 @@ 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()))
diff --git a/src/engine/SCons/Tool/docbook/docs/manual.xml b/src/engine/SCons/Tool/docbook/docs/manual.xml
index e232c6a7..60e94bc7 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/Deprecated/SourceCode/BitKeeper/BITKEEPERCOM.py b/test/Deprecated/SourceCode/BitKeeper/BITKEEPERCOM.py
index eb75a8f0..d5af0ea0 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 ca58b831..ef70cb82 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 28b87616..3f0ffdd9 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 b5b51bcf..a1276fe7 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 b9d9c769..a0f84000 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 9a6cf647..f793d662 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 92ae5478..9b9bab1e 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 d0228244..7a240210 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 ebf9cfb1..3be22d8d 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 20f0da69..765c88cb 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 3626376c..57088fa6 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 14c80bd7..fec1ba36 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 53c336af..96ce02f8 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 a08241f1..6ad02ac1 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 5204ee3e..a7574955 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 d2364b6d..060c7a28 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 d440581a..2bf990fc 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 a97c86f2..1e7c5620 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/www/patch-submission.html b/www/patch-submission.html
index c2b5d22a..a2d9b956 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>