update from release branch

23 files changed, 266 insertions, 68 deletions

diff --git a/QMTest/TestSCons.py b/QMTest/TestSCons.py
index 61e5012..b5f2953 100644
--- a/QMTest/TestSCons.py
+++ b/QMTest/TestSCons.py
@@ -35,7 +35,7 @@ from TestCmd import PIPE
 # here provides some independent verification that what we packaged
 # conforms to what we expect.
 
-default_version = '3.0.0.alpha.20170821'
+default_version = '3.0.0'
 
 python_version_unsupported = (2, 6, 0)
 python_version_deprecated = (2, 7, 0)
diff --git a/README.rst b/README.rst
index faf8b10..258d6a1 100644
--- a/README.rst
+++ b/README.rst
@@ -168,7 +168,7 @@ Or on Windows::
 
 By default, the above commands will do the following:
 
-- Install the version-numbered "scons-2.5.0" and "sconsign-2.5.0" scripts in
+- Install the version-numbered "scons-3.0.0" and "sconsign-3.0.0" scripts in
   the default system script directory (/usr/bin or C:\\Python\*\\Scripts, for
   example).  This can be disabled by specifying the "--no-version-script"
   option on the command line.
@@ -180,23 +180,23 @@ By default, the above commands will do the following:
   before making it the default on your system.
 
   On UNIX or Linux systems, you can have the "scons" and "sconsign" scripts be
-  hard links or symbolic links to the "scons-2.5.0" and "sconsign-2.5.0"
+  hard links or symbolic links to the "scons-3.0.0" and "sconsign-3.0.0"
   scripts by specifying the "--hardlink-scons" or "--symlink-scons" options on
   the command line.
 
-- Install "scons-2.5.0.bat" and "scons.bat" wrapper scripts in the Python
+- Install "scons-3.0.0.bat" and "scons.bat" wrapper scripts in the Python
   prefix directory on Windows (C:\\Python\*, for example).  This can be disabled
   by specifying the "--no-install-bat" option on the command line.
 
   On UNIX or Linux systems, the "--install-bat" option may be specified to
-  have "scons-2.5.0.bat" and "scons.bat" files installed in the default system
+  have "scons-3.0.0.bat" and "scons.bat" files installed in the default system
   script directory, which is useful if you want to install SCons in a shared
   file system directory that can be used to execute SCons from both UNIX/Linux
   and Windows systems.
 
 - Install the SCons build engine (a Python module) in an appropriate
-  version-numbered SCons library directory (/usr/lib/scons-2.5.0 or
-  C:\\Python\*\\scons-2.5.0, for example).  See below for more options related to
+  version-numbered SCons library directory (/usr/lib/scons-3.0.0 or
+  C:\\Python\*\\scons-3.0.0, for example).  See below for more options related to
   installing the build engine library.
 
 - Install the troff-format man pages in an appropriate directory on UNIX or
@@ -474,7 +474,7 @@ running all of "runtest.py -a".
 Building Packages
 =================
 
-We use SCons (version 2.5.0 or later) to build its own packages.  If you
+We use SCons (version 3.0.0 or later) to build its own packages.  If you
 already have an appropriate version of SCons installed on your system, you can
 build everything by simply running it::
 
@@ -489,18 +489,18 @@ about `Executing SCons Without Installing`_)::
 Depending on the utilities installed on your system, any or all of the
 following packages will be built::
 
-        build/dist/scons-2.5.0-1.noarch.rpm
-        build/dist/scons-2.5.0-1.src.rpm
-        build/dist/scons-2.5.0.linux-i686.tar.gz
-        build/dist/scons-3.0.0.alpha.20170821.tar.gz
-        build/dist/scons-3.0.0.alpha.20170821.win32.exe
-        build/dist/scons-3.0.0.alpha.20170821.zip
-        build/dist/scons-doc-3.0.0.alpha.20170821.tar.gz
-        build/dist/scons-local-3.0.0.alpha.20170821.tar.gz
-        build/dist/scons-local-3.0.0.alpha.20170821.zip
-        build/dist/scons-src-3.0.0.alpha.20170821.tar.gz
-        build/dist/scons-src-3.0.0.alpha.20170821.zip
-        build/dist/scons_3.0.0.alpha.20170614-1_all.deb
+        build/dist/scons-3.0.0-1.noarch.rpm
+        build/dist/scons-3.0.0-1.src.rpm
+        build/dist/scons-3.0.0.linux-i686.tar.gz
+        build/dist/scons-3.0.0.tar.gz
+        build/dist/scons-3.0.0.win32.exe
+        build/dist/scons-3.0.0.zip
+        build/dist/scons-doc-3.0.0.tar.gz
+        build/dist/scons-local-3.0.0.tar.gz
+        build/dist/scons-local-3.0.0.zip
+        build/dist/scons-src-3.0.0.tar.gz
+        build/dist/scons-src-3.0.0.zip
+        build/dist/scons_3.0.0-1_all.deb
 
 The SConstruct file is supposed to be smart enough to avoid trying to build
 packages for which you don't have the proper utilities installed.  For
@@ -664,7 +664,7 @@ section of small examples for getting started using SCons.
 
 Additional documentation for SCons is available at:
 
-        http://www.scons.org/documentation.php
+        http://www.scons.org/documentation
 
 
 Licensing
@@ -724,7 +724,7 @@ If you find SCons helpful, please consider making a donation (of cash,
 software, or hardware) to support continued work on the project.  Information
 is available at:
 
-        http://www.scons.org/donate.php
+        http://www.scons.org/donate.html
 
 
 For More Information
@@ -760,5 +760,5 @@ many contributors, including but not at all limited to:
 
 \... and many others.
 
-Copyright (c) 2001 - 2015 The SCons Foundation
+Copyright (c) 2001 - 2017 The SCons Foundation
 
diff --git a/ReleaseConfig b/ReleaseConfig
index 331380a..c8473f1 100644
--- a/ReleaseConfig
+++ b/ReleaseConfig
@@ -32,7 +32,7 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 # 'final', the patchlevel is set to the release date.  This value is
 # mandatory and must be present in this file.
 #version_tuple = (2, 2, 0, 'final', 0)
-version_tuple = (3, 0, 0, 'alpha', 0)
+version_tuple = (3, 0, 0)
 
 # Python versions prior to unsupported_python_version cause a fatal error
 # when that version is used.  Python versions prior to deprecate_python_version
diff --git a/SConstruct b/SConstruct
index 2e17382..4ec3545 100644
--- a/SConstruct
+++ b/SConstruct
@@ -8,7 +8,7 @@ from __future__ import print_function
 copyright_years = '2001 - 2017'
 
 # This gets inserted into the man pages to reflect the month of release.
-month_year = 'MONTH YEAR'
+month_year = 'September 2017'
 
 #
 # __COPYRIGHT__
@@ -46,7 +46,7 @@ import time
 import bootstrap
 
 project = 'scons'
-default_version = '3.0.0.alpha.20170821'
+default_version = '3.0.0'
 copyright = "Copyright (c) %s The SCons Foundation" % copyright_years
 
 platform = distutils.util.get_platform()
@@ -776,11 +776,16 @@ for p in [ scons ]:
         for sp in p['subpkgs']:
             ssubdir = sp['src_subdir']
             isubdir = p['subinst_dirs'][sp['pkg']]
+
+            
             MANIFEST_in = File(os.path.join(src, ssubdir, 'MANIFEST.in')).rstr()
             MANIFEST_in_list.append(MANIFEST_in)
             files = bootstrap.parseManifestLines(os.path.join(src, ssubdir), open(MANIFEST_in).readlines())
+
             raw_files.extend(files)
             src_files.extend([os.path.join(ssubdir, x) for x in files])
+
+               
             for f in files:
                 r = os.path.join(sp['rpm_dir'], f)
                 rpm_files.append(r)
diff --git a/bootstrap.py b/bootstrap.py
index 08df11d..086270c 100755
--- a/bootstrap.py
+++ b/bootstrap.py
@@ -184,9 +184,15 @@ def main():
     scons_py = os.path.join('src', 'script', 'scons.py')
     src_engine = os.path.join('src', 'engine')
     MANIFEST_in = find(os.path.join(src_engine, 'MANIFEST.in'))
-    
-    files = [ scons_py ] + [os.path.join(src_engine, x)
-                            for x in parseManifestLines(os.path.join(script_dir, src_engine), open(MANIFEST_in).readlines())]
+    MANIFEST_xml_in = find(os.path.join(src_engine, 'MANIFEST-xml.in'))
+    manifest_files = [os.path.join(src_engine, x)
+                            for x in parseManifestLines(os.path.join(script_dir, src_engine),
+                                                        open(MANIFEST_in).readlines())]
+
+    manifest_xml_files = [os.path.join(src_engine, x)
+                            for x in parseManifestLines(os.path.join(script_dir, src_engine),
+                                                        open(MANIFEST_xml_in).readlines())]
+    files = [ scons_py ] + manifest_files + manifest_xml_files
     
     for file in files:
         src = find(file)
diff --git a/debian/changelog b/debian/changelog
index 4e7470d..4f8dc79 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-scons (__VERSION__) unstable; urgency=low
+scons (3.0.0) unstable; urgency=low
 
   * Maintenance Release
 
- -- __DEVELOPER__ <bill@baddogconsulting.com>  __DATE__
+ -- William Deegan <bill@baddogconsulting.com>  Mon, 18 Sep 2017 08:32:04 -0700
 
 scons (2.5.1) unstable; urgency=low
 
diff --git a/doc/generated/examples/caching_ex-random_1.xml b/doc/generated/examples/caching_ex-random_1.xml
index 3798ec9..6f64f8f 100644
--- a/doc/generated/examples/caching_ex-random_1.xml
+++ b/doc/generated/examples/caching_ex-random_1.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <screen xmlns="http://www.scons.org/dbxsd/v1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
+cc -o f2.o -c f2.c
+cc -o f4.o -c f4.c
 cc -o f3.o -c f3.c
 cc -o f5.o -c f5.c
 cc -o f1.o -c f1.c
-cc -o f2.o -c f2.c
-cc -o f4.o -c f4.c
 cc -o prog f1.o f2.o f3.o f4.o f5.o
 </screen>
diff --git a/doc/generated/examples/environments_ex3_1.xml b/doc/generated/examples/environments_ex3_1.xml
index 4de56be..5071c6e 100644
--- a/doc/generated/examples/environments_ex3_1.xml
+++ b/doc/generated/examples/environments_ex3_1.xml
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <screen xmlns="http://www.scons.org/dbxsd/v1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
-UnicodeDecodeError: 'utf8' codec can't decode byte 0xc2 in position 249: invalid continuation byte:
+UnicodeDecodeError: 'utf8' codec can't decode byte 0xc2 in position 547: invalid continuation byte:
   File "/home/my/project/SConstruct", line 6:
     dbg.Program('foo', 'foo.c')
   File "bootstrap/src/engine/SCons/Environment.py", line 260:
     return MethodWrapper.__call__(self, target, source, *args, **kw)
   File "bootstrap/src/engine/SCons/Environment.py", line 224:
     return self.method(*nargs, **kwargs)
-  File "bootstrap/src/engine/SCons/Builder.py", line 634:
+  File "bootstrap/src/engine/SCons/Builder.py", line 635:
     return self._execute(env, target, source, OverrideWarner(kw), ekw)
-  File "bootstrap/src/engine/SCons/Builder.py", line 540:
+  File "bootstrap/src/engine/SCons/Builder.py", line 541:
     source = self.src_builder_sources(env, source, overwarn)
-  File "bootstrap/src/engine/SCons/Builder.py", line 747:
+  File "bootstrap/src/engine/SCons/Builder.py", line 748:
     tlist = bld._execute(env, None, [s], overwarn)
-  File "bootstrap/src/engine/SCons/Builder.py", line 556:
+  File "bootstrap/src/engine/SCons/Builder.py", line 557:
     _node_errors(self, env, tlist, slist)
-  File "bootstrap/src/engine/SCons/Builder.py", line 302:
+  File "bootstrap/src/engine/SCons/Builder.py", line 303:
     msg = "Two environments with different actions were specified for the same target: %s\n(action 1: %s)\n(action 2: %s)" % (t,t_contents.decode('utf-8'),contents.decode('utf-8'))
   File "/usr/lib/python2.7/encodings/utf_8.py", line 16:
     return codecs.utf_8_decode(input, errors, True)
diff --git a/doc/generated/examples/java_jar1_1.xml b/doc/generated/examples/java_jar1_1.xml
index de93227..daa3d1a 100644
--- a/doc/generated/examples/java_jar1_1.xml
+++ b/doc/generated/examples/java_jar1_1.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <screen xmlns="http://www.scons.org/dbxsd/v1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
 javac -d classes -sourcepath src src/Example1.java src/Example2.java src/Example3.java
-jar cf test.jar classes
+scons: *** [test.jar] Source `classes.class' not found, needed by target `test.jar'.
 </screen>
diff --git a/doc/generated/examples/sourcecode_bitkeeper_1.xml b/doc/generated/examples/sourcecode_bitkeeper_1.xml
index a070ada..41af3a2 100644
--- a/doc/generated/examples/sourcecode_bitkeeper_1.xml
+++ b/doc/generated/examples/sourcecode_bitkeeper_1.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <screen xmlns="http://www.scons.org/dbxsd/v1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
-bk get hello.c
-cc -o hello.o -c hello.c
-cc -o hello hello.o
+AttributeError: 'SConsEnvironment' object has no attribute 'BitKeeper':
+  File "/home/my/project/SConstruct", line 2:
+    env.SourceCode('.', env.BitKeeper())
 </screen>
diff --git a/doc/generated/examples/sourcecode_cvs_1.xml b/doc/generated/examples/sourcecode_cvs_1.xml
index 9ec7cd4..01ddb6b 100644
--- a/doc/generated/examples/sourcecode_cvs_1.xml
+++ b/doc/generated/examples/sourcecode_cvs_1.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <screen xmlns="http://www.scons.org/dbxsd/v1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
-cvs -d /usr/local/CVS co hello.c
-cc -o hello.o -c hello.c
-cc -o hello hello.o
+AttributeError: 'SConsEnvironment' object has no attribute 'CVS':
+  File "/home/my/project/SConstruct", line 2:
+    env.SourceCode('.', env.CVS('/usr/local/CVS'))
 </screen>
diff --git a/doc/generated/examples/sourcecode_rcs_1.xml b/doc/generated/examples/sourcecode_rcs_1.xml
index 5e120eb..e6b36dd 100644
--- a/doc/generated/examples/sourcecode_rcs_1.xml
+++ b/doc/generated/examples/sourcecode_rcs_1.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <screen xmlns="http://www.scons.org/dbxsd/v1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
-co hello.c
-cc -o hello.o -c hello.c
-cc -o hello hello.o
+AttributeError: 'SConsEnvironment' object has no attribute 'RCS':
+  File "/home/my/project/SConstruct", line 2:
+    env.SourceCode('.', env.RCS())
 </screen>
diff --git a/doc/generated/examples/sourcecode_sccs_1.xml b/doc/generated/examples/sourcecode_sccs_1.xml
index 354b680..e0699d1 100644
--- a/doc/generated/examples/sourcecode_sccs_1.xml
+++ b/doc/generated/examples/sourcecode_sccs_1.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <screen xmlns="http://www.scons.org/dbxsd/v1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
-sccs get hello.c
-cc -o hello.o -c hello.c
-cc -o hello hello.o
+AttributeError: 'SConsEnvironment' object has no attribute 'SCCS':
+  File "/home/my/project/SConstruct", line 2:
+    env.SourceCode('.', env.SCCS())
 </screen>
diff --git a/doc/generated/examples/troubleshoot_explain1_3.xml b/doc/generated/examples/troubleshoot_explain1_3.xml
index 36d9139..0ee52a9 100644
--- a/doc/generated/examples/troubleshoot_explain1_3.xml
+++ b/doc/generated/examples/troubleshoot_explain1_3.xml
@@ -3,5 +3,5 @@
 cp file.in file.oout
 
 scons: warning: Cannot find target file.out after building
-File "/home/bdbaddog/devel/scons/scons/src/script/scons.py", line 201, in &lt;module&gt;
+File "/home/bdbaddog/devel/scons/as_scons/src/script/scons.py", line 201, in &lt;module&gt;
 </screen>
diff --git a/doc/generated/examples/troubleshoot_stacktrace_2.xml b/doc/generated/examples/troubleshoot_stacktrace_2.xml
index dc1292e..4b55f0d 100644
--- a/doc/generated/examples/troubleshoot_stacktrace_2.xml
+++ b/doc/generated/examples/troubleshoot_stacktrace_2.xml
@@ -6,7 +6,7 @@ scons: internal stack trace:
     task.prepare()
   File "bootstrap/src/engine/SCons/Script/Main.py", line 175, in prepare
     return SCons.Taskmaster.OutOfDateTask.prepare(self)
-  File "bootstrap/src/engine/SCons/Taskmaster.py", line 195, in prepare
+  File "bootstrap/src/engine/SCons/Taskmaster.py", line 198, in prepare
     executor.prepare()
   File "bootstrap/src/engine/SCons/Executor.py", line 430, in prepare
     raise SCons.Errors.StopError(msg % (s, self.batches[0].targets[0]))
diff --git a/doc/generated/tools.gen b/doc/generated/tools.gen
index e3bc27f..f858aa4 100644
--- a/doc/generated/tools.gen
+++ b/doc/generated/tools.gen
@@ -150,7 +150,7 @@ for the platform on which SCons is running.
 <para xmlns="http://www.scons.org/dbxsd/v1.0">
 Sets construction variables for D language compiler DMD.
 </para>
-<para>Sets:  &cv-link-DC;, &cv-link-DCOM;, &cv-link-DDEBUG;, &cv-link-DDEBUGPREFIX;, &cv-link-DDEBUGSUFFIX;, &cv-link-DFILESUFFIX;, &cv-link-DFLAGPREFIX;, &cv-link-DFLAGS;, &cv-link-DFLAGSUFFIX;, &cv-link-DINCPREFIX;, &cv-link-DINCSUFFIX;, &cv-link-DLIB;, &cv-link-DLIBCOM;, &cv-link-DLIBDIRPREFIX;, &cv-link-DLIBDIRSUFFIX;, &cv-link-DLIBFLAGPREFIX;, &cv-link-DLIBFLAGSUFFIX;, &cv-link-DLIBLINKPREFIX;, &cv-link-DLIBLINKSUFFIX;, &cv-link-DLINK;, &cv-link-DLINKCOM;, &cv-link-DLINKFLAGPREFIX;, &cv-link-DLINKFLAGS;, &cv-link-DLINKFLAGSUFFIX;, &cv-link-DPATH;, &cv-link-DVERPREFIX;, &cv-link-DVERSIONS;, &cv-link-DVERSUFFIX;, &cv-link-RPATHPREFIX;, &cv-link-RPATHSUFFIX;, &cv-link-SHDC;, &cv-link-SHDCOM;, &cv-link-SHDLINK;, &cv-link-SHDLINKCOM;, &cv-link-SHDLINKFLAGS;.</para></listitem>
+<para>Sets:  &cv-link-DC;, &cv-link-DCOM;, &cv-link-DDEBUG;, &cv-link-DDEBUGPREFIX;, &cv-link-DDEBUGSUFFIX;, &cv-link-DFILESUFFIX;, &cv-link-DFLAGPREFIX;, &cv-link-DFLAGS;, &cv-link-DFLAGSUFFIX;, &cv-link-DINCPREFIX;, &cv-link-DINCSUFFIX;, &cv-link-DLIB;, &cv-link-DLIBCOM;, &cv-link-DLIBDIRPREFIX;, &cv-link-DLIBDIRSUFFIX;, &cv-link-DLIBFLAGPREFIX;, &cv-link-DLIBFLAGSUFFIX;, &cv-link-DLIBLINKPREFIX;, &cv-link-DLIBLINKSUFFIX;, &cv-link-DLINK;, &cv-link-DLINKCOM;, &cv-link-DLINKFLAGPREFIX;, &cv-link-DLINKFLAGS;, &cv-link-DLINKFLAGSUFFIX;, &cv-link-DPATH;, &cv-link-DRPATHPREFIX;, &cv-link-DRPATHSUFFIX;, &cv-link-DShLibSonameGenerator;, &cv-link-DVERPREFIX;, &cv-link-DVERSIONS;, &cv-link-DVERSUFFIX;, &cv-link-SHDC;, &cv-link-SHDCOM;, &cv-link-SHDLIBVERSION;, &cv-link-SHDLIBVERSIONFLAGS;, &cv-link-SHDLINK;, &cv-link-SHDLINKCOM;, &cv-link-SHDLINKFLAGS;.</para></listitem>
   </varlistentry>
   <varlistentry id="t-docbook">
     <term>docbook</term>
@@ -394,7 +394,7 @@ Set construction variables for the <application xmlns="http://www.scons.org/dbxs
 <para xmlns="http://www.scons.org/dbxsd/v1.0">
 Sets construction variables for the D language compiler GDC.
 </para>
-<para>Sets:  &cv-link-DC;, &cv-link-DCOM;, &cv-link-DDEBUG;, &cv-link-DDEBUGPREFIX;, &cv-link-DDEBUGSUFFIX;, &cv-link-DFILESUFFIX;, &cv-link-DFLAGPREFIX;, &cv-link-DFLAGS;, &cv-link-DFLAGSUFFIX;, &cv-link-DINCPREFIX;, &cv-link-DINCSUFFIX;, &cv-link-DLIB;, &cv-link-DLIBCOM;, &cv-link-DLIBDIRPREFIX;, &cv-link-DLIBDIRSUFFIX;, &cv-link-DLIBFLAGPREFIX;, &cv-link-DLIBFLAGSUFFIX;, &cv-link-DLIBLINKPREFIX;, &cv-link-DLIBLINKSUFFIX;, &cv-link-DLINK;, &cv-link-DLINKCOM;, &cv-link-DLINKFLAGPREFIX;, &cv-link-DLINKFLAGS;, &cv-link-DLINKFLAGSUFFIX;, &cv-link-DPATH;, &cv-link-DVERPREFIX;, &cv-link-DVERSIONS;, &cv-link-DVERSUFFIX;, &cv-link-RPATHPREFIX;, &cv-link-RPATHSUFFIX;, &cv-link-SHDC;, &cv-link-SHDCOM;, &cv-link-SHDLINK;, &cv-link-SHDLINKCOM;, &cv-link-SHDLINKFLAGS;.</para></listitem>
+<para>Sets:  &cv-link-DC;, &cv-link-DCOM;, &cv-link-DDEBUG;, &cv-link-DDEBUGPREFIX;, &cv-link-DDEBUGSUFFIX;, &cv-link-DFILESUFFIX;, &cv-link-DFLAGPREFIX;, &cv-link-DFLAGS;, &cv-link-DFLAGSUFFIX;, &cv-link-DINCPREFIX;, &cv-link-DINCSUFFIX;, &cv-link-DLIB;, &cv-link-DLIBCOM;, &cv-link-DLIBDIRPREFIX;, &cv-link-DLIBDIRSUFFIX;, &cv-link-DLIBFLAGPREFIX;, &cv-link-DLIBFLAGSUFFIX;, &cv-link-DLIBLINKPREFIX;, &cv-link-DLIBLINKSUFFIX;, &cv-link-DLINK;, &cv-link-DLINKCOM;, &cv-link-DLINKFLAGPREFIX;, &cv-link-DLINKFLAGS;, &cv-link-DLINKFLAGSUFFIX;, &cv-link-DPATH;, &cv-link-DRPATHPREFIX;, &cv-link-DRPATHSUFFIX;, &cv-link-DShLibSonameGenerator;, &cv-link-DVERPREFIX;, &cv-link-DVERSIONS;, &cv-link-DVERSUFFIX;, &cv-link-SHDC;, &cv-link-SHDCOM;, &cv-link-SHDLIBVERSION;, &cv-link-SHDLIBVERSIONFLAGS;, &cv-link-SHDLINK;, &cv-link-SHDLINKCOM;, &cv-link-SHDLINKFLAGS;.</para></listitem>
   </varlistentry>
   <varlistentry id="t-gettext">
     <term>gettext</term>
@@ -613,7 +613,7 @@ Sets construction variables for the <application xmlns="http://www.scons.org/dbx
 <para xmlns="http://www.scons.org/dbxsd/v1.0">
 Sets construction variables for the D language compiler LDC2.
 </para>
-<para>Sets:  &cv-link-DC;, &cv-link-DCOM;, &cv-link-DDEBUG;, &cv-link-DDEBUGPREFIX;, &cv-link-DDEBUGSUFFIX;, &cv-link-DFILESUFFIX;, &cv-link-DFLAGPREFIX;, &cv-link-DFLAGS;, &cv-link-DFLAGSUFFIX;, &cv-link-DINCPREFIX;, &cv-link-DINCSUFFIX;, &cv-link-DLIB;, &cv-link-DLIBCOM;, &cv-link-DLIBDIRPREFIX;, &cv-link-DLIBDIRSUFFIX;, &cv-link-DLIBFLAGPREFIX;, &cv-link-DLIBFLAGSUFFIX;, &cv-link-DLIBLINKPREFIX;, &cv-link-DLIBLINKSUFFIX;, &cv-link-DLINK;, &cv-link-DLINKCOM;, &cv-link-DLINKFLAGPREFIX;, &cv-link-DLINKFLAGS;, &cv-link-DLINKFLAGSUFFIX;, &cv-link-DPATH;, &cv-link-DVERPREFIX;, &cv-link-DVERSIONS;, &cv-link-DVERSUFFIX;, &cv-link-RPATHPREFIX;, &cv-link-RPATHSUFFIX;, &cv-link-SHDC;, &cv-link-SHDCOM;, &cv-link-SHDLINK;, &cv-link-SHDLINKCOM;, &cv-link-SHDLINKFLAGS;.</para></listitem>
+<para>Sets:  &cv-link-DC;, &cv-link-DCOM;, &cv-link-DDEBUG;, &cv-link-DDEBUGPREFIX;, &cv-link-DDEBUGSUFFIX;, &cv-link-DFILESUFFIX;, &cv-link-DFLAGPREFIX;, &cv-link-DFLAGS;, &cv-link-DFLAGSUFFIX;, &cv-link-DINCPREFIX;, &cv-link-DINCSUFFIX;, &cv-link-DLIB;, &cv-link-DLIBCOM;, &cv-link-DLIBDIRPREFIX;, &cv-link-DLIBDIRSUFFIX;, &cv-link-DLIBFLAGPREFIX;, &cv-link-DLIBFLAGSUFFIX;, &cv-link-DLIBLINKPREFIX;, &cv-link-DLIBLINKSUFFIX;, &cv-link-DLINK;, &cv-link-DLINKCOM;, &cv-link-DLINKFLAGPREFIX;, &cv-link-DLINKFLAGS;, &cv-link-DLINKFLAGSUFFIX;, &cv-link-DPATH;, &cv-link-DRPATHPREFIX;, &cv-link-DRPATHSUFFIX;, &cv-link-DShLibSonameGenerator;, &cv-link-DVERPREFIX;, &cv-link-DVERSIONS;, &cv-link-DVERSUFFIX;, &cv-link-SHDC;, &cv-link-SHDCOM;, &cv-link-SHDLIBVERSION;, &cv-link-SHDLIBVERSIONFLAGS;, &cv-link-SHDLINK;, &cv-link-SHDLINKCOM;, &cv-link-SHDLINKFLAGS;.</para></listitem>
   </varlistentry>
   <varlistentry id="t-lex">
     <term>lex</term>
diff --git a/doc/generated/variables.gen b/doc/generated/variables.gen
index ab70d73..8a8dc99 100644
--- a/doc/generated/variables.gen
+++ b/doc/generated/variables.gen
@@ -837,6 +837,14 @@ The D compiler to use.
     <para xmlns="http://www.scons.org/dbxsd/v1.0">
       DDEBUGPREFIX.
     </para>
+ 
+    <para xmlns="http://www.scons.org/dbxsd/v1.0">
+      DDEBUGPREFIX.
+    </para>
+ 
+    <para xmlns="http://www.scons.org/dbxsd/v1.0">
+      DDEBUGPREFIX.
+    </para>
  </listitem>
   </varlistentry>
   <varlistentry id="cv-DDEBUGSUFFIX">
@@ -845,6 +853,14 @@ The D compiler to use.
     <para xmlns="http://www.scons.org/dbxsd/v1.0">
       DDEBUGSUFFIX.
     </para>
+ 
+    <para xmlns="http://www.scons.org/dbxsd/v1.0">
+      DDEBUGSUFFIX.
+    </para>
+ 
+    <para xmlns="http://www.scons.org/dbxsd/v1.0">
+      DDEBUGSUFFIX.
+    </para>
  </listitem>
   </varlistentry>
   <varlistentry id="cv-DESCRIPTION">
@@ -876,6 +892,14 @@ section of an RPM
     <para xmlns="http://www.scons.org/dbxsd/v1.0">
       DFILESUFFIX.
     </para>
+ 
+    <para xmlns="http://www.scons.org/dbxsd/v1.0">
+      DFILESUFFIX.
+    </para>
+ 
+    <para xmlns="http://www.scons.org/dbxsd/v1.0">
+      DFILESUFFIX.
+    </para>
  </listitem>
   </varlistentry>
   <varlistentry id="cv-DFLAGPREFIX">
@@ -884,6 +908,14 @@ section of an RPM
     <para xmlns="http://www.scons.org/dbxsd/v1.0">
       DFLAGPREFIX.
     </para>
+ 
+    <para xmlns="http://www.scons.org/dbxsd/v1.0">
+      DFLAGPREFIX.
+    </para>
+ 
+    <para xmlns="http://www.scons.org/dbxsd/v1.0">
+      DFLAGPREFIX.
+    </para>
  </listitem>
   </varlistentry>
   <varlistentry id="cv-DFLAGS">
@@ -908,6 +940,14 @@ section of an RPM
     <para xmlns="http://www.scons.org/dbxsd/v1.0">
       DFLAGSUFFIX.
     </para>
+ 
+    <para xmlns="http://www.scons.org/dbxsd/v1.0">
+      DFLAGSUFFIX.
+    </para>
+ 
+    <para xmlns="http://www.scons.org/dbxsd/v1.0">
+      DFLAGSUFFIX.
+    </para>
  </listitem>
   </varlistentry>
   <varlistentry id="cv-DINCPREFIX">
@@ -916,6 +956,14 @@ section of an RPM
     <para xmlns="http://www.scons.org/dbxsd/v1.0">
       DINCPREFIX.
     </para>
+ 
+    <para xmlns="http://www.scons.org/dbxsd/v1.0">
+      DINCPREFIX.
+    </para>
+ 
+    <para xmlns="http://www.scons.org/dbxsd/v1.0">
+      DINCPREFIX.
+    </para>
  </listitem>
   </varlistentry>
   <varlistentry id="cv-DINCSUFFIX">
@@ -924,6 +972,14 @@ section of an RPM
     <para xmlns="http://www.scons.org/dbxsd/v1.0">
       DLIBFLAGSUFFIX.
     </para>
+ 
+    <para xmlns="http://www.scons.org/dbxsd/v1.0">
+      DLIBFLAGSUFFIX.
+    </para>
+ 
+    <para xmlns="http://www.scons.org/dbxsd/v1.0">
+      DLIBFLAGSUFFIX.
+    </para>
  </listitem>
   </varlistentry>
   <varlistentry id="cv-Dir">
@@ -987,6 +1043,14 @@ into a list of Dir instances relative to the target being built.
     <para xmlns="http://www.scons.org/dbxsd/v1.0">
       DLIBLINKPREFIX.
     </para>
+ 
+    <para xmlns="http://www.scons.org/dbxsd/v1.0">
+      DLIBLINKPREFIX.
+    </para>
+ 
+    <para xmlns="http://www.scons.org/dbxsd/v1.0">
+      DLIBLINKPREFIX.
+    </para>
  </listitem>
   </varlistentry>
   <varlistentry id="cv-DLIBDIRSUFFIX">
@@ -995,6 +1059,14 @@ into a list of Dir instances relative to the target being built.
     <para xmlns="http://www.scons.org/dbxsd/v1.0">
       DLIBLINKSUFFIX.
     </para>
+ 
+    <para xmlns="http://www.scons.org/dbxsd/v1.0">
+      DLIBLINKSUFFIX.
+    </para>
+ 
+    <para xmlns="http://www.scons.org/dbxsd/v1.0">
+      DLIBLINKSUFFIX.
+    </para>
  </listitem>
   </varlistentry>
   <varlistentry id="cv-DLIBFLAGPREFIX">
@@ -1003,6 +1075,14 @@ into a list of Dir instances relative to the target being built.
     <para xmlns="http://www.scons.org/dbxsd/v1.0">
       DLIBFLAGPREFIX.
     </para>
+ 
+    <para xmlns="http://www.scons.org/dbxsd/v1.0">
+      DLIBFLAGPREFIX.
+    </para>
+ 
+    <para xmlns="http://www.scons.org/dbxsd/v1.0">
+      DLIBFLAGPREFIX.
+    </para>
  </listitem>
   </varlistentry>
   <varlistentry id="cv-DLIBFLAGSUFFIX">
@@ -1011,6 +1091,14 @@ into a list of Dir instances relative to the target being built.
     <para xmlns="http://www.scons.org/dbxsd/v1.0">
       DLIBFLAGSUFFIX.
     </para>
+ 
+    <para xmlns="http://www.scons.org/dbxsd/v1.0">
+      DLIBFLAGSUFFIX.
+    </para>
+ 
+    <para xmlns="http://www.scons.org/dbxsd/v1.0">
+      DLIBFLAGSUFFIX.
+    </para>
  </listitem>
   </varlistentry>
   <varlistentry id="cv-DLIBLINKPREFIX">
@@ -1019,6 +1107,14 @@ into a list of Dir instances relative to the target being built.
     <para xmlns="http://www.scons.org/dbxsd/v1.0">
       DLIBLINKPREFIX.
     </para>
+ 
+    <para xmlns="http://www.scons.org/dbxsd/v1.0">
+      DLIBLINKPREFIX.
+    </para>
+ 
+    <para xmlns="http://www.scons.org/dbxsd/v1.0">
+      DLIBLINKPREFIX.
+    </para>
  </listitem>
   </varlistentry>
   <varlistentry id="cv-DLIBLINKSUFFIX">
@@ -1027,6 +1123,14 @@ into a list of Dir instances relative to the target being built.
     <para xmlns="http://www.scons.org/dbxsd/v1.0">
       DLIBLINKSUFFIX.
     </para>
+ 
+    <para xmlns="http://www.scons.org/dbxsd/v1.0">
+      DLIBLINKSUFFIX.
+    </para>
+ 
+    <para xmlns="http://www.scons.org/dbxsd/v1.0">
+      DLIBLINKSUFFIX.
+    </para>
  </listitem>
   </varlistentry>
   <varlistentry id="cv-DLINK">
@@ -1067,6 +1171,14 @@ into a list of Dir instances relative to the target being built.
     <para xmlns="http://www.scons.org/dbxsd/v1.0">
       DLINKFLAGPREFIX.
     </para>
+ 
+    <para xmlns="http://www.scons.org/dbxsd/v1.0">
+      DLINKFLAGPREFIX.
+    </para>
+ 
+    <para xmlns="http://www.scons.org/dbxsd/v1.0">
+      DLINKFLAGPREFIX.
+    </para>
  </listitem>
   </varlistentry>
   <varlistentry id="cv-DLINKFLAGS">
@@ -1091,6 +1203,14 @@ List of linker flags.
     <para xmlns="http://www.scons.org/dbxsd/v1.0">
       DLINKFLAGSUFFIX.
     </para>
+ 
+    <para xmlns="http://www.scons.org/dbxsd/v1.0">
+      DLINKFLAGSUFFIX.
+    </para>
+ 
+    <para xmlns="http://www.scons.org/dbxsd/v1.0">
+      DLINKFLAGSUFFIX.
+    </para>
  </listitem>
   </varlistentry>
   <varlistentry id="cv-DOCBOOK_DEFAULT_XSL_EPUB">
@@ -1306,6 +1426,30 @@ for <literal>saxon</literal> and <literal>saxon-xslt</literal>, respectively.
 </para>
 </listitem>
   </varlistentry>
+  <varlistentry id="cv-DRPATHPREFIX">
+    <term>DRPATHPREFIX</term>
+    <listitem>
+            <para xmlns="http://www.scons.org/dbxsd/v1.0">
+                DRPATHPREFIX.
+            </para>
+        </listitem>
+  </varlistentry>
+  <varlistentry id="cv-DRPATHSUFFIX">
+    <term>DRPATHSUFFIX</term>
+    <listitem>
+            <para xmlns="http://www.scons.org/dbxsd/v1.0">
+                DRPATHSUFFIX.
+            </para>
+        </listitem>
+  </varlistentry>
+  <varlistentry id="cv-DShLibSonameGenerator">
+    <term>DShLibSonameGenerator</term>
+    <listitem>
+            <para xmlns="http://www.scons.org/dbxsd/v1.0">
+                DShLibSonameGenerator.
+            </para>
+        </listitem>
+  </varlistentry>
   <varlistentry id="cv-DSUFFIXES">
     <term>DSUFFIXES</term>
     <listitem>
@@ -1326,6 +1470,14 @@ The default list is:
     <para xmlns="http://www.scons.org/dbxsd/v1.0">
       DVERPREFIX.
     </para>
+ 
+    <para xmlns="http://www.scons.org/dbxsd/v1.0">
+      DVERPREFIX.
+    </para>
+ 
+    <para xmlns="http://www.scons.org/dbxsd/v1.0">
+      DVERPREFIX.
+    </para>
  </listitem>
   </varlistentry>
   <varlistentry id="cv-DVERSIONS">
@@ -1350,6 +1502,14 @@ The default list is:
     <para xmlns="http://www.scons.org/dbxsd/v1.0">
       DVERSUFFIX.
     </para>
+ 
+    <para xmlns="http://www.scons.org/dbxsd/v1.0">
+      DVERSUFFIX.
+    </para>
+ 
+    <para xmlns="http://www.scons.org/dbxsd/v1.0">
+      DVERSUFFIX.
+    </para>
  </listitem>
   </varlistentry>
   <varlistentry id="cv-DVIPDF">
@@ -5840,6 +6000,22 @@ to generate shared-library objects.
 </para>
 </listitem>
   </varlistentry>
+  <varlistentry id="cv-SHDLIBVERSION">
+    <term>SHDLIBVERSION</term>
+    <listitem>
+            <para xmlns="http://www.scons.org/dbxsd/v1.0">
+                SHDLIBVERSION.
+            </para>
+        </listitem>
+  </varlistentry>
+  <varlistentry id="cv-SHDLIBVERSIONFLAGS">
+    <term>SHDLIBVERSIONFLAGS</term>
+    <listitem>
+            <para xmlns="http://www.scons.org/dbxsd/v1.0">
+                SHDLIBVERSIONFLAGS.
+            </para>
+        </listitem>
+  </varlistentry>
   <varlistentry id="cv-SHDLINK">
     <term>SHDLINK</term>
     <listitem>
diff --git a/doc/generated/variables.mod b/doc/generated/variables.mod
index 319ac66..6ecf6c9 100644
--- a/doc/generated/variables.mod
+++ b/doc/generated/variables.mod
@@ -107,6 +107,9 @@ THIS IS AN AUTOMATICALLY-GENERATED FILE.  DO NOT EDIT.
 <!ENTITY cv-DOCBOOK_XSLTPROCFLAGS "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$DOCBOOK_XSLTPROCFLAGS</envar>">
 <!ENTITY cv-DOCBOOK_XSLTPROCPARAMS "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$DOCBOOK_XSLTPROCPARAMS</envar>">
 <!ENTITY cv-DPATH "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$DPATH</envar>">
+<!ENTITY cv-DRPATHPREFIX "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$DRPATHPREFIX</envar>">
+<!ENTITY cv-DRPATHSUFFIX "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$DRPATHSUFFIX</envar>">
+<!ENTITY cv-DShLibSonameGenerator "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$DShLibSonameGenerator</envar>">
 <!ENTITY cv-DSUFFIXES "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$DSUFFIXES</envar>">
 <!ENTITY cv-DVERPREFIX "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$DVERPREFIX</envar>">
 <!ENTITY cv-DVERSIONS "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$DVERSIONS</envar>">
@@ -445,6 +448,8 @@ THIS IS AN AUTOMATICALLY-GENERATED FILE.  DO NOT EDIT.
 <!ENTITY cv-SHCXXFLAGS "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$SHCXXFLAGS</envar>">
 <!ENTITY cv-SHDC "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$SHDC</envar>">
 <!ENTITY cv-SHDCOM "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$SHDCOM</envar>">
+<!ENTITY cv-SHDLIBVERSION "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$SHDLIBVERSION</envar>">
+<!ENTITY cv-SHDLIBVERSIONFLAGS "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$SHDLIBVERSIONFLAGS</envar>">
 <!ENTITY cv-SHDLINK "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$SHDLINK</envar>">
 <!ENTITY cv-SHDLINKCOM "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$SHDLINKCOM</envar>">
 <!ENTITY cv-SHDLINKFLAGS "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$SHDLINKFLAGS</envar>">
@@ -731,6 +736,9 @@ THIS IS AN AUTOMATICALLY-GENERATED FILE.  DO NOT EDIT.
 <!ENTITY cv-link-DOCBOOK_XSLTPROCFLAGS "<link linkend='cv-DOCBOOK_XSLTPROCFLAGS' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$DOCBOOK_XSLTPROCFLAGS</envar></link>">
 <!ENTITY cv-link-DOCBOOK_XSLTPROCPARAMS "<link linkend='cv-DOCBOOK_XSLTPROCPARAMS' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$DOCBOOK_XSLTPROCPARAMS</envar></link>">
 <!ENTITY cv-link-DPATH "<link linkend='cv-DPATH' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$DPATH</envar></link>">
+<!ENTITY cv-link-DRPATHPREFIX "<link linkend='cv-DRPATHPREFIX' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$DRPATHPREFIX</envar></link>">
+<!ENTITY cv-link-DRPATHSUFFIX "<link linkend='cv-DRPATHSUFFIX' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$DRPATHSUFFIX</envar></link>">
+<!ENTITY cv-link-DShLibSonameGenerator "<link linkend='cv-DShLibSonameGenerator' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$DShLibSonameGenerator</envar></link>">
 <!ENTITY cv-link-DSUFFIXES "<link linkend='cv-DSUFFIXES' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$DSUFFIXES</envar></link>">
 <!ENTITY cv-link-DVERPREFIX "<link linkend='cv-DVERPREFIX' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$DVERPREFIX</envar></link>">
 <!ENTITY cv-link-DVERSIONS "<link linkend='cv-DVERSIONS' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$DVERSIONS</envar></link>">
@@ -1069,6 +1077,8 @@ THIS IS AN AUTOMATICALLY-GENERATED FILE.  DO NOT EDIT.
 <!ENTITY cv-link-SHCXXFLAGS "<link linkend='cv-SHCXXFLAGS' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$SHCXXFLAGS</envar></link>">
 <!ENTITY cv-link-SHDC "<link linkend='cv-SHDC' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$SHDC</envar></link>">
 <!ENTITY cv-link-SHDCOM "<link linkend='cv-SHDCOM' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$SHDCOM</envar></link>">
+<!ENTITY cv-link-SHDLIBVERSION "<link linkend='cv-SHDLIBVERSION' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$SHDLIBVERSION</envar></link>">
+<!ENTITY cv-link-SHDLIBVERSIONFLAGS "<link linkend='cv-SHDLIBVERSIONFLAGS' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$SHDLIBVERSIONFLAGS</envar></link>">
 <!ENTITY cv-link-SHDLINK "<link linkend='cv-SHDLINK' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$SHDLINK</envar></link>">
 <!ENTITY cv-link-SHDLINKCOM "<link linkend='cv-SHDLINKCOM' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$SHDLINKCOM</envar></link>">
 <!ENTITY cv-link-SHDLINKFLAGS "<link linkend='cv-SHDLINKFLAGS' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$SHDLINKFLAGS</envar></link>">
diff --git a/src/Announce.txt b/src/Announce.txt
index fb7d0ea..d9fb28e 100644
--- a/src/Announce.txt
+++ b/src/Announce.txt
@@ -18,14 +18,13 @@ So that everyone using SCons can help each other learn how to use it more
 effectively, please go to http://scons.org/lists.html#users to sign up for
 the scons-users mailing list.
 
-RELEASE 3.0.0.alpha.20170821 - Mon, 21 Aug 2017 16:15:02 -0700
+RELEASE 3.0.0 - Mon, 18 Sep 2017 08:32:04 -0700
 
   Please consult the RELEASE.txt file for a summary of changes since the last
   release and consult the CHANGES.txt file for complete a list of changes
   since last release.  This announcement highlights only the important
   changes.
     Please note the following important changes since release 2.5.1:
-       *IT IS NOT READY FOR PRODUCTION USE*
 
        This is the initial release supporting both python 3.5+ and 2.7.x and pypy
        There are some important changes:
@@ -35,7 +34,7 @@ RELEASE 3.0.0.alpha.20170821 - Mon, 21 Aug 2017 16:15:02 -0700
          in Python 3 all strings are by default unicode. byte and/or bytearray
          should be used if you construct content for return by a custom node type's
          get_content() method.
-       - This is some (as yet unresolved issue) using Literal()'s in some context with
+       - There are some (as yet unresolved issue) using Literal()'s in some context with
          Python 3
        - pypy should be supported, please report any issues to the user's mailing list.
        - Currently if you switch back and forth between python 2.7.x and 3.5+ you will
diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index 2f04031..7788fdb 100644
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -5,11 +5,11 @@
                             Change Log
 
 
-RELEASE 3.0.0.alpha.20170821 - Mon, 21 Aug 2017 16:15:02 -0700
+RELEASE 3.0.0 - Mon, 18 Sep 2017 08:32:04 -0700
 
 NOTE: This is a major release.  You should expect that some targets may rebuild when upgrading.
-Significant changes in some python action signatures. Also switching between PY 2 and PY 3.5, 3.6
-may cause rebuilds.  In no case should rebuilds not happen.
+Significant changes in some python action signatures. Also switching between PY 2.7 and PY 3.5, 3.6
+will cause rebuilds.
 
 
   From William Blevins:
@@ -79,6 +79,9 @@ may cause rebuilds.  In no case should rebuilds not happen.
       "C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere.exe"
       It can be downloaded separately at     
       https://github.com/Microsoft/vswhere
+ 
+  From Tom Tanner:
+    - Allow nested $( ... $) sections
 
   From Paweł Tomulik:
     - Fixed the issue with LDMODULEVERSIONFLAGS reported by Tim Jenness
@@ -115,9 +118,6 @@ may cause rebuilds.  In no case should rebuilds not happen.
       tools, must now include the ar tool to get this builder as is required for
       other compiler tools.
     - Add clang and clang++ tools based on Paweł Tomulik's work.
- 
-  From Tom Tanner:
-    - Allow nested $( ... $) sections
 
 RELEASE 2.5.1 - Mon, 03 Nov 2016 13:37:42 -0400
 
diff --git a/src/RELEASE.txt b/src/RELEASE.txt
index bbc1e42..ff0673a 100644
--- a/src/RELEASE.txt
+++ b/src/RELEASE.txt
@@ -1,4 +1,4 @@
-  A new SCons checkpoint release, 3.0.0.alpha.20170821, is now available
+  A new SCons checkpoint release, 3.0.0, is now available
   on the SCons download page:
 
           http://www.scons.org/download.php
diff --git a/src/engine/MANIFEST-xml.in b/src/engine/MANIFEST-xml.in
index a657734..cfbfd3a 100644
--- a/src/engine/MANIFEST-xml.in
+++ b/src/engine/MANIFEST-xml.in
@@ -4,4 +4,5 @@ SCons/Scanner/__init__.xml
 SCons/Script/*.xml
 SCons/Tool/*.xml
 SCons/Tool/docbook/__init__.xml
+SCons/Tool/docbook/utils/xmldepend.xsl
 SCons/Tool/packaging/__init__.xml
diff --git a/src/engine/MANIFEST.in b/src/engine/MANIFEST.in
index aecf35e..2df278e 100644
--- a/src/engine/MANIFEST.in
+++ b/src/engine/MANIFEST.in
@@ -74,10 +74,11 @@ SCons/Tool/docbook/__init__.py
 SCons/Tool/dvi.py
 SCons/Tool/dvipdf.py
 SCons/Tool/dvips.py
+SCons/Tool/f03.py
+SCons/Tool/f08.py
 SCons/Tool/f77.py
 SCons/Tool/f90.py
 SCons/Tool/f95.py
-SCons/Tool/f03.py
 SCons/Tool/filesystem.py
 SCons/Tool/fortran.py
 SCons/Tool/FortranCommon.py