Merged in dirkbaechle/scons (pull request #78)

Fixed spelling errors in MAN pages (#2897)

3 files changed, 12 insertions, 5 deletions

diff --git a/doc/man/scons-time.xml b/doc/man/scons-time.xml
index b202d06..1e35c17 100644
--- a/doc/man/scons-time.xml
+++ b/doc/man/scons-time.xml
@@ -199,7 +199,7 @@ for every revision listed with the
 <option>--number=</option>
 option,
 and can be used to look at the
-impact of commited changes to the
+impact of committed changes to the
 SCons code base on a particular
 configuration over time.</para>
 
@@ -802,7 +802,7 @@ the log files and profile outputs generated by this run.</para>
   </varlistentry>
 </variablelist>
 
-<para>When used in conjuction with the
+<para>When used in conjunction with the
 <option>--aegis=</option><replaceable>PROJECT</replaceable>
 option,
 <emphasis>NUMBER</emphasis>
@@ -810,7 +810,7 @@ specifies one or more comma-separated Aegis delta numbers
 that will be retrieved automatically from the specified Aegis
 <emphasis>PROJECT</emphasis>.</para>
 
-<para>When used in conjuction with the
+<para>When used in conjunction with the
 <option>--svn=</option><replaceable>URL</replaceable>
 option,
 <emphasis>NUMBER</emphasis>
diff --git a/doc/man/scons.xml b/doc/man/scons.xml
index 7d8a53f..602bdbe 100644
--- a/doc/man/scons.xml
+++ b/doc/man/scons.xml
@@ -4126,7 +4126,7 @@ case-insensitive.
 If the value of
 <emphasis>ignore_case</emphasis>
 is
-<literal>1</literal>,
+<literal>2</literal>,
 then values will be matched
 case-insensitive,
 and all input values will be
@@ -6533,7 +6533,7 @@ Python interpreter, SCons will prefer the MinGW tools over the Cygwin
 tools, if they are both installed, regardless of the order of the bin
 directories in the PATH variable. If you have both MSVC and MinGW
 installed and you want to use MinGW instead of MSVC,
-then you must explictly tell SCons to use MinGW by passing</para>
+then you must explicitly tell SCons to use MinGW by passing</para>
 
 <literallayout class="monospaced">
 tools=['mingw']
diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index 0b5368b..e80a161 100644
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -38,6 +38,13 @@ RELEASE 2.3.1.alpha.yyyymmdd - NEW DATE WILL BE INSERTED HERE
       Python packages). Added a customized Docbook XSD for strict validation of
       all input XML files.
       
+  From Luca Falavigna:
+    - Fixed spelling errors in MAN pages (#2897).
+      
+  From Michael McDougall:
+    - Fixed description of ignore_case for EnumVariable in the
+      MAN page (#2774).
+      
 RELEASE 2.3.0 - Mon, 02 Mar 2013 13:22:29 -0400
 
   From Anatoly Techtonik: