Updates to Changes, Release, Announce

1 files changed, 33 insertions, 37 deletions

diff --git a/src/Announce.txt b/src/Announce.txt
index 0b589582..266988f2 100644
--- a/src/Announce.txt
+++ b/src/Announce.txt
@@ -18,42 +18,6 @@ So that everyone using SCons can help each other learn how to use it more
 effectively, please go to http://scons.org/lists.php#users to sign up for
 the scons-users mailing list.
 
-==============IMPORTANT NOTICE FOR NEXT VERSION V2.5.0==========
-PLEASE READ. CHANGES COMING IN NEXT MAJOR RELEASE V2.5.0
-
-We're enhancing implicit language scanning functionality to improve
-correctness.  SCons now honors scanner keys for implicit dependencies
-and correctly changes scanner type (if necessary) when traversing 
-implicit dependency trees.  
-
-This enhancement resolves missing dependencies
-with built-in scanners including SWIG (#2264) and QT:
-* http://scons.tigris.org/issues/show_bug.cgi?id=2264
-
-This enhancement broadens the horizon for handling heterogeneous
-data flow environments (E.G. software builds):
-* http://article.gmane.org/gmane.comp.programming.tools.scons.user/26596
-Notes:
-
-* SCons may find new (and correct) dependencies in cross-langauge contexts.
-** Update may cause rebuilds, especially in heterogeneous data environments.
-** Update may find previously missed dependencies errors (E.G. cycles).
-*** Discovered in some QT test cases.
-* SCons handles the SCANNERS variable differently.
-** Previously, the Install builder would scan implicit dependencies for
-   a scanner found in SCANNERS (but not for built-in scanners), but now
-   the Install builder will not scan recursively regardless in order
-   to optimize Install behaviour and bring orthogonality to previous behaviour.
-* SCons handles cache directories a bit differently/
-** Cache files are now stored in 256 subdirectories in the cache directory by 
-   default (this stresses NFS less). Existing cache directories will remain as
-   current, but SCons will prompt you to run scons-configure-cache which will
-   allow you to migrate to the new layout, or confirm you want to use the
-   existing layout.
-
-+=================================================================
-
-
 RELEASE VERSION/DATE TO BE FILLED IN LATER
 
   Please consult the RELEASE.txt file for a summary of changes since the last
@@ -61,9 +25,41 @@ RELEASE VERSION/DATE TO BE FILLED IN LATER
   since last release.  This announcement highlights only the important
   changes.
 
-  Please note the following important changes since release 2.4.0:
+    -  Please note the following important changes since release 2.4.1:
+       We're enhancing implicit language scanning functionality to improve
+       correctness.  SCons now honors scanner keys for implicit dependencies
+       and correctly changes scanner type (if necessary) when traversing 
+       implicit dependency trees.  
+
+       This enhancement resolves missing dependencies
+       with built-in scanners including SWIG (#2264) and QT:
+       * http://scons.tigris.org/issues/show_bug.cgi?id=2264
+
+       -  This enhancement broadens the horizon for handling heterogeneous
+          data flow environments (E.G. software builds):
+          - http://article.gmane.org/gmane.comp.programming.tools.scons.user/26596
+
+       - SCons may find new (and correct) dependencies in cross-langauge contexts.
+         - Update may cause rebuilds, especially in heterogeneous data environments.
+         - Update may find previously missed dependencies errors (E.G. cycles).
+           - Discovered in some QT test cases.
+       - SCons handles the SCANNERS variable differently.
+         -  Previously, the Install builder would scan implicit dependencies for
+            a scanner found in SCANNERS (but not for built-in scanners), but now
+            the Install builder will not scan recursively regardless in order
+            to optimize Install behaviour and bring orthogonality to previous behaviour.
+
+    - SCons handles cache directories a bit differently/
+      - Cache files are now stored in 256 subdirectories in the cache directory by 
+        default (this stresses NFS less). Existing cache directories will remain as
+        current, but SCons will prompt you to run scons-configure-cache which will
+        allow you to migrate to the new layout, or confirm you want to use the
+        existing layout.
+
     - New external tool scons-configurecache which allows some configuration of
       how files in the cache are controlled.
+
+  Please note the following important changes since release 2.4.0:
     - Fix to swig tool - pick-up 'swig', 'swig3.0' and 'swig2.0' (in order).
     - Fix to swig tool - respect env['SWIG'] provided by user.
     - Fix for Bug # 2791 - Setup.py fails unnecessarily under Jython.