Fix spelling errors in error messages, man page typos.

git-svn-id: http://scons.tigris.org/svn/scons/trunk@860 fdb21ef1-2011-0410-befe-b5e4ea1792b1

diff --git a/doc/man/scons.1 b/doc/man/scons.1
index 034c920b8430b40d1dc3b354ce832ef2054241eb..a657565ab55aeaa3e64e764d2176edf1cdb7eac6 100644 (file)
--- a/doc/man/scons.1
+++ b/doc/man/scons.1
@@ -1199,7 +1199,7 @@ env.DVI(target = 'ccc.dvi', source = 'ccc.latex')
 .IP env.Jar()
 Builds a Java archive (.jar) file
 from a source tree of .class files.
-If the $JAVACHDIR value is set, the
+If the $JARCHDIR value is set, the
 .B jar
 command will change to the specified directory using the
 .B \-C
@@ -6484,7 +6484,7 @@ class foo:
     def __init__(self, arg):
         self.arg = arg
 
-    def __call__(self, target, source, env):
+    def __call__(self, target, source, env, for_signature):
         return arg + " bar"
 
 # Will expand $BAR to "my argument bar baz"

diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index 391d11b6c0d26ee13ffa3820615b86111b3fa8be..52dbafc265e8e60c984d04080646a110640560c8 100644 (file)
--- 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 bd122d8d43dd5b7c4cd646909900ecc7f4d4bf01..0c9b22f978f6e5e3702aa3576387379200e49df8 100644 (file)
--- 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)