Reset to development post merge from release branch

3 files changed, 70 insertions, 33 deletions

diff --git a/src/Announce.txt b/src/Announce.txt
index 324b9fc..1359696 100755
--- a/src/Announce.txt
+++ b/src/Announce.txt
@@ -18,7 +18,7 @@ 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.5 - Mon, 26 Mar 2019 15:04:42 -0700
+RELEASE VERSION/DATE TO BE FILLED IN LATER
 
   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
diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index c46a804..fb65386 100755
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -5,6 +5,13 @@
                             Change Log
 
 
+RELEASE  VERSION/DATE TO BE FILLED IN LATER
+
+  From John Doe:
+
+    - Whatever John Doe did.
+
+
 RELEASE 3.0.5 - Mon, 26 Mar 2019 15:04:42 -0700
 
   From William Deegan:
diff --git a/src/RELEASE.txt b/src/RELEASE.txt
index 90cc745..076e4bb 100755
--- a/src/RELEASE.txt
+++ b/src/RELEASE.txt
@@ -1,43 +1,73 @@
-A new SCons release, 3.0.5, is now available on the SCons download page:
+  A new SCons checkpoint release, 3.0.6.alpha.yyyymmdd, is now available
+  on the SCons download page:
 
-        https://scons.org/pages/download.html
+          https://scons.org/pages/download.html
 
+  XXX The primary purpose of this release ... XXX
 
-Here is a summary of the changes since 3.0.4:
+  A SCons "checkpoint release" is intended to provide early access to
+  new features so they can be tested in the field before being released
+  for adoption by other software distributions.
 
-CHANGED/ENHANCED EXISTING FUNCTIONALITY
+  Note that a checkpoint release is developed using the same test-driven
+  development methodology as all SCons releases.  Existing SCons
+  functionality should all work as it does in previous releases (except
+  for any changes identified in the release notes) and early adopters
+  should be able to use a checkpoint release safely for production work
+  with existing SConscript files.  If not, it represents not only a bug
+  in SCons but also a hole in the regression test suite, and we want to
+  hear about it.
 
-  - Change the default for AppendENVPath to delete_existing=0, so path
-    order will not be changed, unless explicitly set (Issue #3276)
-  - Add lex construction variable LEXUNISTD for turning off unix headers on windows
-  - Update lex tool to use win_flex on windows if available
-  - Add the textfile tool to the default tool list
+  New features may be more lightly tested than in past releases,
+  especially as concerns their interaction with all of the other
+  functionality in SCons.  We are especially interested in hearing bug
+  reports about new functionality.
 
-FIXES
+  We do not recommend that downstream distributions (Debian, Fedora,
+  etc.) package a checkpoint release, mainly to avoid confusing the
+  "public" release numbering with the long checkpoint release names.
 
-  - Fix Issue #3283 - Handle using --config=force in combination with Decider('MD5-timestamp').
-    3.0.2 in fix for issue #2980 added that deciders can throw DeciderNeedsNode exception.
-    The Configure logic directly calls the decider when using --config=force but wasn't handling
-    that exception.  This would yield minimally configure tests using TryLink() not running and
-    leaving TypeError Nonetype exception in config.log
-  - Fix Issue #3303 - Handle --config=force overwriting the Environment passed into Configure()'s
-    Decider and not clearing it when the configure context is completed.
-  - Add default paths for yacc tool on windows to include cygwin, mingw, and chocolatey
-  - Fix issue #2799 - Fix mingw tool to respect SHCCCOMSTR, SHLINKCOMSTR and LDMODULECOMSTR
-  - Fix Issue #3329 - Add support for MS SDK V10.0A (which is commonly installed with VS2017)
-  - Fix Issue #3333 - Add support for finding vswhere under 32 bit windows installs.
-  - Update the MSVC tool to include the nologo flag by default in RCFLAGS
-  - Fixed bug which threw error when running SCons on windows system with no MSVC installed.
+  Here is a summary of the changes since 1.3.0:
 
+  NEW FUNCTIONALITY
 
-IMPROVEMENTS
-  - Do not store build host+user name if reproducible builds are wanted
+    - List new features (presumably why a checkpoint is being released)
 
+  DEPRECATED FUNCTIONALITY
 
-git shortlog --no-merges -ns 3.0.4..HEAD
-    34  William Deegan
-    33  Mats Wichmann
-    18  Daniel
-     4  Daniel Moody
-     3  Bernhard M. Wiedemann
-     2  Maciej Kumorek
+    - List anything that's been deprecated since the last release
+
+  CHANGED/ENHANCED EXISTING FUNCTIONALITY
+
+    - List modifications to existing features, where the previous behavior
+      wouldn't actually be considered a bug
+
+  FIXES
+
+    - List fixes of outright bugs
+
+  IMPROVEMENTS
+
+    - List improvements that wouldn't be visible to the user in the
+      documentation:  performance improvements (describe the circumstances
+      under which they would be observed), or major code cleanups
+
+  PACKAGING
+
+    - List changes in the way SCons is packaged and/or released
+
+  DOCUMENTATION
+
+    - List any significant changes to the documentation (not individual
+      typo fixes, even if they're mentioned in src/CHANGES.txt to give
+      the contributor credit)
+
+  DEVELOPMENT
+
+    - List visible changes in the way SCons is developed
+
+  Thanks to CURLY, LARRY, and MOE for their contributions to this release.
+  Contributors are listed alphabetically by their last name.
+
+__COPYRIGHT__
+__FILE__ __REVISION__ __DATE__ __DEVELOPER__