From d7c58e6ca81b4d8899fc64f3d9dfa5a67985204e Mon Sep 17 00:00:00 2001
From: Dirk Baechle <dl9obn@darc.de>
Date: Mon, 6 May 2013 00:27:42 +0200
Subject: - fixed spelling errors in MAN pages (#2897)

---
 doc/man/scons-time.xml | 6 +++---
 doc/man/scons.xml      | 2 +-
 src/CHANGES.txt        | 3 +++
 3 files changed, 7 insertions(+), 4 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..58d4327 100644
--- a/doc/man/scons.xml
+++ b/doc/man/scons.xml
@@ -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 3494cfd..3a7c687 100644
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -26,6 +26,9 @@ 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).
+      
 RELEASE 2.3.0 - Mon, 02 Mar 2013 13:22:29 -0400
 
   From Anatoly Techtonik:
-- 
cgit v0.12


From 2cefdd78b64bdf908af28d408f715ac2f2a67116 Mon Sep 17 00:00:00 2001
From: Dirk Baechle <dl9obn@darc.de>
Date: Tue, 7 May 2013 18:05:14 +0200
Subject: - added a fix for bug #2774 (typo in MAN page for EnumVariable,
 reported by Michael McDougall)

---
 doc/man/scons.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/man/scons.xml b/doc/man/scons.xml
index 58d4327..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
-- 
cgit v0.12


From cc55cd2aeec22880a6844a873edd721839defcd6 Mon Sep 17 00:00:00 2001
From: Dirk Baechle <dl9obn@darc.de>
Date: Tue, 7 May 2013 18:15:26 +0200
Subject: - added bug #2774 to CHANGES.txt

---
 src/CHANGES.txt | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index 3a7c687..8b3601e 100644
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -29,6 +29,10 @@ RELEASE 2.3.1.alpha.yyyymmdd - NEW DATE WILL BE INSERTED HERE
   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:
-- 
cgit v0.12