Fix spelling errors in error messages, man page typos.

2 files changed, 8 insertions, 3 deletions

diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index 391d11b..52dbafc 100644
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -84,6 +84,11 @@ RELEASE 0.95 - XXX
   - Allow the LIBS construction variable to be a single string or File
     node, not a list, when only one library is needed.
 
+  - Fix typos in the man page:  JAVACHDIR => JARCHDIR; add "for_signature"
+    to the __call__() example in the "Variable Substitution" section.
+
+  - Correct error message spellings of "non-existant" to "non-existent."
+
   From Vincent Risi:
 
   - Add support for the bcc32, ilink32 and tlib Borland tools.
diff --git a/src/engine/SCons/Script/SConscript.py b/src/engine/SCons/Script/SConscript.py
index bd122d8..0c9b22f 100644
--- a/src/engine/SCons/Script/SConscript.py
+++ b/src/engine/SCons/Script/SConscript.py
@@ -124,7 +124,7 @@ def compute_exports(exports):
                 except KeyError:
                     retval[export] = glob[export]
     except KeyError, x:
-        raise SCons.Errors.UserError, "Export of non-existant variable '%s'"%x
+        raise SCons.Errors.UserError, "Export of non-existent variable '%s'"%x
 
     return retval
     
@@ -154,7 +154,7 @@ def Return(*vars):
             for v in string.split(var):
                 retval.append(stack[-1].globals[v])
     except KeyError, x:
-        raise SCons.Errors.UserError, "Return of non-existant variable '%s'"%x
+        raise SCons.Errors.UserError, "Return of non-existent variable '%s'"%x
         
     if len(retval) == 1:
         stack[-1].retval = retval[0]
@@ -477,7 +477,7 @@ class SConsEnvironment(SCons.Environment.Base):
                         else:
                             stack[-1].globals[v] = global_exports[v]
         except KeyError,x:
-            raise SCons.Errors.UserError, "Import of non-existant variable '%s'"%x
+            raise SCons.Errors.UserError, "Import of non-existent variable '%s'"%x
 
     def SConscript(self, *ls, **kw):
         ls = map(lambda l, self=self: self.subst(l), ls)