A bit more sphinx docbuild tweaking [ci skip]

Signed-off-by: Mats Wichmann <mats@linux.com>

6 files changed, 15 insertions, 28 deletions

diff --git a/SCons/Environment.py b/SCons/Environment.py
index 7d4db39..28906ea 100644
--- a/SCons/Environment.py
+++ b/SCons/Environment.py
@@ -1500,7 +1500,7 @@ class Base(SubstitutionEnvironment):
 
 
     def Dictionary(self, *args):
-        """Return construction variables from an environment.
+        r"""Return construction variables from an environment.
 
         :param args: (optional) variable names to look up
         :returns: if args omitted, the dictionary of all constr. vars.
diff --git a/SCons/Platform/__init__.py b/SCons/Platform/__init__.py
index b6a7b97..20048ee 100644
--- a/SCons/Platform/__init__.py
+++ b/SCons/Platform/__init__.py
@@ -56,9 +56,9 @@ import SCons.Tool
 
 
 def platform_default():
-    """Return the platform string for our execution environment.
+    r"""Return the platform string for our execution environment.
 
-    The returned value should map to one of the SCons/Platform/\*.py
+    The returned value should map to one of the SCons/Platform/*.py
     files.  Since scons is architecture independent, though, we don't
     care about the machine architecture.
     """
@@ -131,19 +131,19 @@ class PlatformSpec:
 
 
 class TempFileMunge:
-    """A callable class.  You can set an Environment variable to this,
+    """A callable class to enable temp files for long command lines.
+
+    You can set an Environment variable to this,
     then call it with a string argument, then it will perform temporary
     file substitution on it.  This is used to circumvent the long command
-    line limitation.
-
-    Example:
+    line limitation.  Example::
 
         env["TEMPFILE"] = TempFileMunge
         env["LINKCOM"] = "${TEMPFILE('$LINK $TARGET $SOURCES','$LINKCOMSTR')}"
 
     By default, the name of the temporary file used begins with a
     prefix of '@'.  This may be configured for other tool chains by
-    setting '$TEMPFILEPREFIX'. Example:
+    setting '$TEMPFILEPREFIX'. Example::
 
         env["TEMPFILEPREFIX"] = '-@'        # diab compiler
         env["TEMPFILEPREFIX"] = '-via'      # arm tool chain
@@ -151,9 +151,10 @@ class TempFileMunge:
 
     You can configure the extension of the temporary file through the
     TEMPFILESUFFIX variable, which defaults to '.lnk' (see comments
-    in the code below). Example:
+    in the code below). Example::
 
         env["TEMPFILESUFFIX"] = '.lnt'   # PC Lint
+
     """
     def __init__(self, cmd, cmdstr = None):
         self.cmd = cmd
diff --git a/SCons/Script/SConsOptions.py b/SCons/Script/SConsOptions.py
index 5d61e32..9d5fb47 100644
--- a/SCons/Script/SConsOptions.py
+++ b/SCons/Script/SConsOptions.py
@@ -347,8 +347,8 @@ class SConsOptionParser(optparse.OptionParser):
         below. When called from there, we try to reparse the
         command-line arguments that:
 
-          1. haven't been processed so far (self.largs), but
-          2. are possibly not added to the list of options yet.
+        1. haven't been processed so far (self.largs), but
+        2. are possibly not added to the list of options yet.
 
         So, when we only have a value for "--myargument" yet,
         a command-line argument of "--myarg=test" would set it.
diff --git a/SCons/dblite.py b/SCons/dblite.py
index b9269f1..338dcc7 100644
--- a/SCons/dblite.py
+++ b/SCons/dblite.py
@@ -37,6 +37,7 @@ class dblite:
 
     See the discussion at:
       http://mail.python.org/pipermail/python-bugs-list/2003-March/016877.html
+
     """
 
     _open = open
diff --git a/doc/sphinx/SCons.rst b/doc/sphinx/SCons.rst
index c92b957..b9959e3 100644
--- a/doc/sphinx/SCons.rst
+++ b/doc/sphinx/SCons.rst
@@ -81,22 +81,6 @@ SCons.Environment module
     :undoc-members:
     :show-inheritance:
 
-SCons.EnvironmentValues module
-------------------------------
-
-.. automodule:: SCons.EnvironmentValues
-    :members:
-    :undoc-members:
-    :show-inheritance:
-
-SCons.EnvironmentValuesTest module
-----------------------------------
-
-.. automodule:: SCons.EnvironmentValuesTest
-    :members:
-    :undoc-members:
-    :show-inheritance:
-
 SCons.Errors module
 -------------------
 
diff --git a/doc/sphinx/conf.py b/doc/sphinx/conf.py
index 474f765..bfd7057 100644
--- a/doc/sphinx/conf.py
+++ b/doc/sphinx/conf.py
@@ -40,7 +40,8 @@ extensions = [
     'sphinx.ext.viewcode',
 ]
 
-autodoc_default_flags = [":members:", ":undoc-members:", ":show-inheritance:"]
+autosummary_generate = True
+
 autodoc_default_options = {
     "members": True,
     "special-members": True,