diff options
| -rw-r--r-- | doc/user/builders-writing.in | 2 | ||||
| -rw-r--r-- | doc/user/builders-writing.xml | 7 | ||||
| -rw-r--r-- | doc/user/command-line.in | 6 | ||||
| -rw-r--r-- | doc/user/command-line.xml | 6 | ||||
| -rw-r--r-- | doc/user/environments.in | 4 | ||||
| -rw-r--r-- | doc/user/environments.xml | 4 | ||||
| -rw-r--r-- | doc/user/factories.in | 2 | ||||
| -rw-r--r-- | doc/user/factories.xml | 2 | ||||
| -rw-r--r-- | doc/user/output.in | 2 | ||||
| -rw-r--r-- | doc/user/output.xml | 2 | ||||
| -rw-r--r-- | src/CHANGES.txt | 4 |
11 files changed, 23 insertions, 18 deletions
diff --git a/doc/user/builders-writing.in b/doc/user/builders-writing.in index 2460b37..8f2d693 100644 --- 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 2c0f697..a44b678 100644 --- 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 70d1941..6834d2a 100644 --- 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 175dd5c..148922e 100644 --- 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 1181e55..0c04382 100644 --- 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 0aac0d8..0746793 100644 --- 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 34973f1..4451807 100644 --- 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 9599930..6424207 100644 --- 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 02d7484..ca2034a 100644 --- 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 08d28d1..ff39fca 100644 --- 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 97ae229..ae9070b 100644 --- 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 |