Issue 2349: doc-only change correcting description of text returned from sconf.Result...

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

diff --git a/doc/man/scons.1 b/doc/man/scons.1
index 240972c21c36c6e58b3d515a043cc5211b2a5eaf..facfd9cd99f3a6dce5e58f3103f6fa6564f01055 100644 (file)
--- a/doc/man/scons.1
+++ b/doc/man/scons.1
@@ -7182,8 +7182,8 @@ will be displayed to the user, e.g. 'Checking for library X...'
 
 Usually called after the check is done.
 .I res
-can be either an integer or a string. In the former case, 'ok' (res != 0)
-or 'failed' (res == 0) is displayed to the user, in the latter case the
+can be either an integer or a string. In the former case, 'yes' (res != 0)
+or 'no' (res == 0) is displayed to the user, in the latter case the
 given string is displayed.
 
 .TP

diff --git a/doc/user/sconf.in b/doc/user/sconf.in
index 0ef1d851637f94a485983a1a372feeffe67907a3..8ac4530bd89dad6e15649938bf1210223bb3ff55 100644 (file)
--- a/doc/user/sconf.in
+++ b/doc/user/sconf.in
@@ -306,8 +306,8 @@
     the &Message; call prints the
     specified message (with no trailing newline)
     and the &Result; call prints
-    <literal>ok</literal> if the check succeeds and
-    <literal>failed</literal> if it doesn't.
+    <literal>yes</literal> if the check succeeds and
+    <literal>no</literal> if it doesn't.
     The &TryLink; method
     actually tests for whether the
     specified program text
@@ -435,7 +435,7 @@
 
     <screen>
     % <userinput>scons -Q -c</userinput>
-    Checking for MyLibrary... ok
+    Checking for MyLibrary... yes
     Removed foo.o
     Removed foo
     </screen>

diff --git a/doc/user/sconf.xml b/doc/user/sconf.xml
index d89470db56025c5b0e88b1c6d0094be5a7ad235e..b6e02ebd1ea285252ed044128a562d041e008933 100644 (file)
--- a/doc/user/sconf.xml
+++ b/doc/user/sconf.xml
@@ -306,8 +306,8 @@
     the &Message; call prints the
     specified message (with no trailing newline)
     and the &Result; call prints
-    <literal>ok</literal> if the check succeeds and
-    <literal>failed</literal> if it doesn't.
+    <literal>yes</literal> if the check succeeds and
+    <literal>no</literal> if it doesn't.
     The &TryLink; method
     actually tests for whether the
     specified program text
@@ -435,7 +435,7 @@
 
     <screen>
     % <userinput>scons -Q -c</userinput>
-    Checking for MyLibrary... ok
+    Checking for MyLibrary... yes
     Removed foo.o
     Removed foo
     </screen>

diff --git a/src/engine/SCons/SConf.py b/src/engine/SCons/SConf.py
index 38b3ddb9dbd11d8b1b189323a80a5a901d775b5f..5d671d2fd1ecd49c62a41a91fc6b584edf088b93 100644 (file)
--- a/src/engine/SCons/SConf.py
+++ b/src/engine/SCons/SConf.py
@@ -784,8 +784,7 @@ class CheckContext:
 
     def Result(self, res):
         """Inform about the result of the test. res may be an integer or a
-        string. In case of an integer, the written text will be 'ok' or
-        'failed'.
+        string. In case of an integer, the written text will be 'yes' or 'no'.
         The result is only displayed when self.did_show_result is not set.
         """
         if type(res) in BooleanTypes: