Merge pull request #3117 from mwichmann/wip-xmlify

minor xml fixes
SCons · Apr 23, 2018 · f1deff3 · f1deff3
2 parents 832e79a + 617cf70
commit f1deff3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/doc/design/native.xml b/doc/design/native.xml
@@ -64,7 +64,7 @@
  <para>
 
   By default, the &SCons; utility searches for a file named
-  &SConstruct;, &Sconstruct;, &sconstruct;, &SConstruct.py, &Sconstruct.py
+  &SConstruct;, &Sconstruct;, &sconstruct;, &SConstruct.py;, &Sconstruct.py;
   or &sconstruct.py; (in that order) in the current directory,
   and reads its configuration from the first file
   found.  A <option>-f</option> command-line option exists to read a

diff --git a/src/CHANGES.txt b/src/CHANGES.txt
@@ -7,6 +7,9 @@
 
 RELEASE 3.1.0.alpha.yyyymmdd - NEW DATE WILL BE INSERTED HERE
 
+  From Mats Wichmann:
+    - xml validity fixes from SConstruct.py change
+
   From Richard West:
     - Add SConstruct.py, Sconstruct.py, sconstruct.py to the search path for the root SConstruct file.
       Allows easier debugging within Visual Studio
@@ -50,7 +53,7 @@ RELEASE 3.1.0.alpha.yyyymmdd - NEW DATE WILL BE INSERTED HERE
 
   From Mats Wichmann:
     - Updated manpage scons.xml to fix a nested list problem
-    - Updated doc terminionly: use prepend instead of append as appropriate
+    - Updated doc terminiology: use prepend instead of append as appropriate
 
   From Jonathon Reinhart:
     - Replace all instances of `int main()` in C code with `int main(void)`.