Commits

Gary Oberbrunner  committed 4170735 Merge

Merged in dirkbaechle/scons (pull request #78)

Fixed spelling errors in MAN pages (#2897)

  • Participants
  • Parent commits ca9eab5, 16a78f0

Comments (0)

Files changed (3)

File doc/man/scons-time.xml

 <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>
 
   </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>
 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>

File doc/man/scons.xml

 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
 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']

File src/CHANGES.txt

       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: