Update CHANGES to cover bug fixed as part of another fix

diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index dd92ce1495cacb4776f12383117f7fcdc2069f56..e681f5d9b807ba3ea5f05a42d1843741d6fb68d4 100644 (file)
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -11,6 +11,7 @@ NOTE: This is a major release.  You should expect that some targets may rebuild
 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.
 
+
   From William Blevins:
     - Updated D language scanner support to latest: 2.071.1. (PR #1924)
       https://dlang.org/spec/module.html accessed 11 August 2016
@@ -34,6 +35,7 @@ may cause rebuilds.  In no case should rebuilds not happen.
     - Defined MS SDK 10.0 and Changed VS 2015 to use SDK 10.0
     - Changes to Action Function and Action Class signiture creation.  NOTE: This will cause rebuilds
       for many builds when upgrading to SCons 3.0
+    - Fixed Bug #3027 - "Cross Compiling issue: cannot override ranlib"
 
   From Ibrahim Esmat:
     - Added the capability to build Windows Store Compatible libraries that can be used

diff --git a/src/engine/SCons/Environment.py b/src/engine/SCons/Environment.py
index 4f8e41bcb6188ecee52df3675c581caa774782a4..6a127db5e11be6c4fe78710942280957238f91d7 100644 (file)
--- a/src/engine/SCons/Environment.py
+++ b/src/engine/SCons/Environment.py
@@ -342,7 +342,7 @@ def is_valid_construction_var(varstr):
 class SubstitutionEnvironment(object):
     """Base class for different flavors of construction environments.
 
-    This class contains a minimal set of methods that handle contruction
+    This class contains a minimal set of methods that handle construction
     variable expansion and conversion of strings to Nodes, which may or
     may not be actually useful as a stand-alone class.  Which methods
     ended up in this class is pretty arbitrary right now.  They're