Fix typos in the User's Guide. (Zia Sobhani)

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

diff --git a/doc/user/builders-writing.in b/doc/user/builders-writing.in
index 2460b372a6e0703af7696120c1db36e38c438263..8f2d6931924fa3388ca5eaf255ecddf0bcbcc1a2 100644 (file)
--- a/doc/user/builders-writing.in
+++ b/doc/user/builders-writing.in
@@ -773,7 +773,7 @@ This functionality could be invoked as in the following example:
 
     <para>
 
-    One very flexible thing that you can is specify
+    One very flexible thing that you can do is
     use a construction variable to specify
     different emitter functions for different
     construction variable.

diff --git a/doc/user/builders-writing.xml b/doc/user/builders-writing.xml
index 2c0f6974858f8ad4c2d63cc66efb7f8986158322..a44b67859839b002d1ae707fc9f0df6b393d4f27 100644 (file)
--- a/doc/user/builders-writing.xml
+++ b/doc/user/builders-writing.xml
@@ -102,7 +102,7 @@ This functionality could be invoked as in the following example:
   programs, libraries, documents.
   you frequently want to be
   able to build some other type of file
-  not supported directly by &SCons;
+  not supported directly by &SCons;.
   Fortunately, &SCons; makes it very easy
   to define your own &Builder; objects
   for any custom file types you want to build.
@@ -172,7 +172,8 @@ This functionality could be invoked as in the following example:
 
     <para>
 
-    With the &Builder; so attached to our &consenv;
+    With the &Builder; attached to our &consenv;
+    with the name &Foo;,
     we can now actually call it like so:
 
     </para>
@@ -670,7 +671,7 @@ This functionality could be invoked as in the following example:
 
     <para>
 
-    One very flexible thing that you can is specify
+    One very flexible thing that you can do is
     use a construction variable to specify
     different emitter functions for different
     construction variable.

diff --git a/doc/user/command-line.in b/doc/user/command-line.in
index 70d19416f01deeba23c676de62a3fcd35890951e..6834d2a870ec8cdc2295b5e870d0a2583e138243 100644 (file)
--- a/doc/user/command-line.in
+++ b/doc/user/command-line.in
@@ -44,7 +44,7 @@
 
     Command-line options always begin with
     one or two <literal>-</literal> (hyphen) characters.
-    &SCons; provides ways for you to examind
+    &SCons; provides ways for you to examine
     and set options values from within your &SConscript; files,
     as well as the ability to define your own
     custom options.
@@ -814,7 +814,7 @@
 
     <para>
 
-    Yields the followig output:
+    Yields the following output:
 
     </para>
 
@@ -1859,7 +1859,7 @@
 
       Of course, you can process the items in the
       dictionary returned by the &UnknownVariables; function
-      in any way appropriate to your bulid configuration,
+      in any way appropriate to your build configuration,
       including just printing a warning message
       but not exiting,
       logging an error somewhere,

diff --git a/doc/user/command-line.xml b/doc/user/command-line.xml
index 175dd5cebb124e6999542bf75b2d4853dd21e8aa..148922eb4967a0b3fb8b7926dd682127cdae15cf 100644 (file)
--- a/doc/user/command-line.xml
+++ b/doc/user/command-line.xml
@@ -44,7 +44,7 @@
 
     Command-line options always begin with
     one or two <literal>-</literal> (hyphen) characters.
-    &SCons; provides ways for you to examind
+    &SCons; provides ways for you to examine
     and set options values from within your &SConscript; files,
     as well as the ability to define your own
     custom options.
@@ -800,7 +800,7 @@
 
     <para>
 
-    Yields the followig output:
+    Yields the following output:
 
     </para>
 
@@ -1788,7 +1788,7 @@
 
       Of course, you can process the items in the
       dictionary returned by the &UnknownVariables; function
-      in any way appropriate to your bulid configuration,
+      in any way appropriate to your build configuration,
       including just printing a warning message
       but not exiting,
       logging an error somewhere,

diff --git a/doc/user/environments.in b/doc/user/environments.in
index 1181e55df8fa7c33249766d22fa482afb71118fb..0c0438214963a7b0eb66d353cec456e8ad962b15 100644 (file)
--- a/doc/user/environments.in
+++ b/doc/user/environments.in
@@ -415,7 +415,7 @@ environment, of directory names, suffixes, etc.
   This avoids a whole class of problems with builds
   where a developer's local build works
   because a custom variable setting
-  causes a different comiler or build option to be used,
+  causes a different compiler or build option to be used,
   but the checked-in change breaks the official build
   because it uses different environment variable settings.
 
@@ -459,7 +459,7 @@ environment, of directory names, suffixes, etc.
   <envar>os.environ</envar>
   dictionary.
   This means that you must add an
-  <literal>import os</literal> statuement
+  <literal>import os</literal> statement
   to any &SConscript; file
   in which you want to use
   values from the user's external environment.

diff --git a/doc/user/environments.xml b/doc/user/environments.xml
index 0aac0d81257f7005e5194044770b568ec251fb60..0746793bbdc2f7749a6d3873791d7dc4df3f18e7 100644 (file)
--- a/doc/user/environments.xml
+++ b/doc/user/environments.xml
@@ -415,7 +415,7 @@ environment, of directory names, suffixes, etc.
   This avoids a whole class of problems with builds
   where a developer's local build works
   because a custom variable setting
-  causes a different comiler or build option to be used,
+  causes a different compiler or build option to be used,
   but the checked-in change breaks the official build
   because it uses different environment variable settings.
 
@@ -459,7 +459,7 @@ environment, of directory names, suffixes, etc.
   <envar>os.environ</envar>
   dictionary.
   This means that you must add an
-  <literal>import os</literal> statuement
+  <literal>import os</literal> statement
   to any &SConscript; file
   in which you want to use
   values from the user's external environment.

diff --git a/doc/user/factories.in b/doc/user/factories.in
index 34973f170ba6cc4804cd5f9c89c6122b1305ff78..44518074967c7cb274f8c93516515390a90913ed 100644 (file)
--- a/doc/user/factories.in
+++ b/doc/user/factories.in
@@ -198,7 +198,7 @@
 
     <para>
 
-    When then executes as follows:
+    Which then executes as follows:
 
     </para>
 

diff --git a/doc/user/factories.xml b/doc/user/factories.xml
index 9599930404c9225aaa52bed2eeb1178c5ba9710e..6424207521d70285ef6c2626d0a8b145e13f99e5 100644 (file)
--- a/doc/user/factories.xml
+++ b/doc/user/factories.xml
@@ -173,7 +173,7 @@
 
     <para>
 
-    When then executes as follows:
+    Which then executes as follows:
 
     </para>
 

diff --git a/doc/user/output.in b/doc/user/output.in
index 02d74844fed8afec9f1fa871e23b52536fea38b6..ca2034a67f29afc2c6677f9f4e9d68ca1d4f94e0 100644 (file)
--- a/doc/user/output.in
+++ b/doc/user/output.in
@@ -244,7 +244,7 @@
     that &SCons; is configured to supply
     the right options to the compiler,
     or a developer may want to
-    cut-and-paste a comiloe command
+    cut-and-paste a compile command
     to add a few options
     for a custom test.
 

diff --git a/doc/user/output.xml b/doc/user/output.xml
index 08d28d118622f200fe5bb55a80bc94001de9eb56..ff39fca0008b6de8a56b8113f07acbb3b48a22be 100644 (file)
--- a/doc/user/output.xml
+++ b/doc/user/output.xml
@@ -256,7 +256,7 @@
     that &SCons; is configured to supply
     the right options to the compiler,
     or a developer may want to
-    cut-and-paste a comiloe command
+    cut-and-paste a compile command
     to add a few options
     for a custom test.
 

diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index 97ae2294078fbab42fc0d98f811f3b6a98ba9127..ae9070bddeb561f8be1e99a51c75f1190553d411 100644 (file)
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -59,6 +59,10 @@ RELEASE 1.X - XXX
     - Allow WINDOWS_INSERT_DEF=0 to disable --output-def when linking
       under MinGW.
 
+  From Zia Sobhani:
+
+    - Fix typos in the User's Guide.
+
   From Greg Spencer:
 
     - Support implicit dependency scanning of files encoded in utf-8