diff options
| author | William Deegan <bill@baddogconsulting.com> | 2018-04-23 21:29:20 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-23 21:29:20 (GMT) |
| commit | f1deff31fde204b4201047b10bf9430adfb39118 (patch) | |
| tree | 676b4f5d76cc76d1a79ff965dccdd8f702e3f83b | |
| parent | 832e79a956fdb87f863968f670185b1fa75b6509 (diff) | |
| parent | 617cf7099997ada8986a4811d6dda09aeb86b16a (diff) | |
| download | SCons-f1deff31fde204b4201047b10bf9430adfb39118.zip SCons-f1deff31fde204b4201047b10bf9430adfb39118.tar.gz SCons-f1deff31fde204b4201047b10bf9430adfb39118.tar.bz2 | |
Merge pull request #3117 from mwichmann/wip-xmlify
minor xml fixes
| -rw-r--r-- | doc/design/native.xml | 2 | ||||
| -rw-r--r-- | src/CHANGES.txt | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/doc/design/native.xml b/doc/design/native.xml index 97d5831..0ea4074 100644 --- 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 index d13fdec..4c05773 100644 --- 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)`. |