diff options
| author | William Deegan <bill@baddogconsulting.com> | 2016-02-29 16:36:31 (GMT) |
|---|---|---|
| committer | William Deegan <bill@baddogconsulting.com> | 2016-02-29 16:36:31 (GMT) |
| commit | 7eeca3e4359db02936a2dfc7893abdd371cf17fc (patch) | |
| tree | 07ba50d5e14f04ec6a004a9e10fe304176781d4c | |
| parent | 538146ca65d4fee9ac14011c3c0b0e988b114d37 (diff) | |
| parent | b77d536c21e85818d44b974e3c40a95f9e5e39eb (diff) | |
| download | SCons-7eeca3e4359db02936a2dfc7893abdd371cf17fc.zip SCons-7eeca3e4359db02936a2dfc7893abdd371cf17fc.tar.gz SCons-7eeca3e4359db02936a2dfc7893abdd371cf17fc.tar.bz2 | |
Merged in williamblevins/scons_20150323 (pull request #305)
Issue 2959: Corrected typo in User Guide for Scanner keyword.
| -rw-r--r-- | doc/user/scanners.xml | 2 | ||||
| -rw-r--r-- | src/CHANGES.txt | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/doc/user/scanners.xml b/doc/user/scanners.xml index 14733db..1506254 100644 --- a/doc/user/scanners.xml +++ b/doc/user/scanners.xml @@ -395,7 +395,7 @@ cat <file name="SConstruct" printme="1"> kscan = Scanner(function = kfile_scan, skeys = ['.k'], - path=FindPathDirs('KPATH')) + path_function = FindPathDirs('KPATH')) </file> </scons_example> diff --git a/src/CHANGES.txt b/src/CHANGES.txt index ac264e3..9e704e0 100644 --- a/src/CHANGES.txt +++ b/src/CHANGES.txt @@ -18,6 +18,7 @@ RELEASE VERSION/DATE TO BE FILLED IN LATER SCons now respects scanner keys for implicit dependencies. - Resolved missing cross-language dependencies for SWIG bindings (fixes #2264). + - Corrected typo in User Guide for Scanner keyword. (PR #2959) From William Deegan: - Add better messaging when two environments have |