Merge branch 'master' into doc/manpage

Author: bdbaddog

CHANGES.txt

@@ -102,6 +102,11 @@ RELEASE  VERSION/DATE TO BE FILLED IN LATER
     - More consistent use of &Python; in the manpage.  A few links added.
       A warning about overwriting env['ENV'] and one about Configure
       checks possibly not running in in no-exec mode also added.
+    - Update warnings module: adds docstrings, drop three unused warnings
+      (DeprecatedSourceCodeWarning, TaskmasterNeedsExecuteWarning,
+      DeprecatedMissingSConscriptWarning) add two warnings to manpage
+      (cache-cleanup-error, future-reserved-variable), improve unittest, tweak
+      Sphinx build.
 
 
 RELEASE 4.6.0 -  Sun, 19 Nov 2023 17:22:20 -0700

RELEASE.txt

@@ -34,6 +34,10 @@ CHANGED/ENHANCED EXISTING FUNCTIONALITY
   prototype when including a header file. Fixes GH Issue #4320
 - Now supports pre-release Python 3.13
 - Support for Python versions without support for the `threading` package has been removed
+- Dropped three unused warning classes: DeprecatedSourceCodeWarning,
+  TaskmasterNeedsExecuteWarning, DeprecatedMissingSConscriptWarning.
+* Two warning classes that are actually used were added to manpage section on
+  enabling warnings (cache-cleanup-error, future-reserved-variable).
 
 FIXES
 -----
@@ -90,6 +94,8 @@ DOCUMENTATION
   the Scanner Objects section of the manpage.
 - The manpage entry for Pseudo was clarified.
 - The manpage entry for SharedLibrary was clarified.
+- Update API docs for Warnings framework; add two warns to manpage
+  enable/disable control.
 
 DEVELOPMENT
 -----------

SCons/Script/SConsOptions.py

@@ -875,9 +875,9 @@ def experimental_callback(option, opt, value, parser):
 
     def warn_md5_chunksize_deprecated(option, opt, value, parser) -> None:
         if opt == '--md5-chunksize':
-            SCons.Warnings.warn(SCons.Warnings.DeprecatedWarning,
-                                "Parameter %s is deprecated. Use "
-                                "--hash-chunksize instead." % opt)
+            SCons.Warnings.warn(SCons.Warnings.DeprecatedOptionsWarning,
+                                f"Option {opt} is deprecated. "
+                                "Use --hash-chunksize instead.")
 
         setattr(parser.values, option.dest, value)