diff options
| author | Mats Wichmann <mats@linux.com> | 2021-01-21 15:47:38 (GMT) |
|---|---|---|
| committer | Mats Wichmann <mats@linux.com> | 2021-01-21 15:47:38 (GMT) |
| commit | 426885c8929b93944edcf8a0962331d36fbcdc73 (patch) | |
| tree | ac91e4bd13c456b62cdd85438b8a56581a39579c /doc/sphinx | |
| parent | 2d298e47bbff94bded41c54bb76ab865dace5db8 (diff) | |
| download | SCons-426885c8929b93944edcf8a0962331d36fbcdc73.zip SCons-426885c8929b93944edcf8a0962331d36fbcdc73.tar.gz SCons-426885c8929b93944edcf8a0962331d36fbcdc73.tar.bz2 | |
Some small doc fiddles [ci skip]
* Use os.environ.copy() in examples - better not to get the
Python proxy class that is os.environ, and instead a real dict.
* Fix spelling on a python dict method: set_default -> setdefault
* Update some wording on prepending in the user guide (where it
still said "append to the beginning")
* Change the rather oblique note in the recently modified section
on Append of values to CPPDEFINES with something more explicit.
* And, modify the sphinx config to get the version from SCons
rather than hardcoding.
Fixes #3867
Signed-off-by: Mats Wichmann <mats@linux.com>
Diffstat (limited to 'doc/sphinx')
| -rw-r--r-- | doc/sphinx/conf.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/doc/sphinx/conf.py b/doc/sphinx/conf.py index 27e18b7..517af50 100644 --- a/doc/sphinx/conf.py +++ b/doc/sphinx/conf.py @@ -76,11 +76,12 @@ author = 'SCons Project Team' # |version| and |release|, also used in various other places throughout the # built documents. # -# TODO: fill these in externally +from SCons import __version__ +# The full version, including alpha/beta/rc tags: +release = __version__ # The short X.Y version. -version = '4.1' -# The full version, including alpha/beta/rc tags. -release = '4.1.0' +major, minor, _ = __version__.split('.') +version = '.'.join([major, minor]) # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. |