diff --git a/docs/sphinx/Build.rst b/docs/sphinx/Build.rst
index 10de1541..ec00c6e3 100644
--- a/docs/sphinx/Build.rst
+++ b/docs/sphinx/Build.rst
@@ -2,4 +2,5 @@ Build
 -----
 
 .. automodule:: waflib.Build
+   :members:
 
diff --git a/docs/sphinx/ConfigSet.rst b/docs/sphinx/ConfigSet.rst
index 36a2f278..3e5ec9f4 100644
--- a/docs/sphinx/ConfigSet.rst
+++ b/docs/sphinx/ConfigSet.rst
@@ -2,4 +2,5 @@ ConfigSet
 ---------
 
 .. automodule:: waflib.ConfigSet
+   :members:
 
diff --git a/docs/sphinx/Configure.rst b/docs/sphinx/Configure.rst
index 46b423ba..3e635161 100644
--- a/docs/sphinx/Configure.rst
+++ b/docs/sphinx/Configure.rst
@@ -2,4 +2,5 @@ Configure
 ---------
 
 .. automodule:: waflib.Configure
+   :members:
 
diff --git a/docs/sphinx/Context.rst b/docs/sphinx/Context.rst
index b1f90747..fb1556bb 100644
--- a/docs/sphinx/Context.rst
+++ b/docs/sphinx/Context.rst
@@ -2,4 +2,5 @@ Context
 ---------
 
 .. automodule:: waflib.Context
+   :members:
 
diff --git a/docs/sphinx/Errors.rst b/docs/sphinx/Errors.rst
index 03d49dfd..da10d06a 100644
--- a/docs/sphinx/Errors.rst
+++ b/docs/sphinx/Errors.rst
@@ -2,4 +2,5 @@ Errors
 ------
 
 .. automodule:: waflib.Errors
+   :members:
 
diff --git a/docs/sphinx/Logs.rst b/docs/sphinx/Logs.rst
index 37ce2b8b..d71427d9 100644
--- a/docs/sphinx/Logs.rst
+++ b/docs/sphinx/Logs.rst
@@ -2,4 +2,5 @@ Logs
 ----
 
 .. automodule:: waflib.Logs
+   :members:
 
diff --git a/docs/sphinx/Node.rst b/docs/sphinx/Node.rst
index 6fd9bc85..b40a709b 100644
--- a/docs/sphinx/Node.rst
+++ b/docs/sphinx/Node.rst
@@ -2,4 +2,5 @@ Node
 ----
 
 .. automodule:: waflib.Node
+   :members:
 
diff --git a/docs/sphinx/Options.rst b/docs/sphinx/Options.rst
index b7a2e917..142dd976 100644
--- a/docs/sphinx/Options.rst
+++ b/docs/sphinx/Options.rst
@@ -2,4 +2,5 @@ Options
 -------
 
 .. automodule:: waflib.Options
+   :members:
 
diff --git a/docs/sphinx/Runner.rst b/docs/sphinx/Runner.rst
index fb255429..aaccdabf 100644
--- a/docs/sphinx/Runner.rst
+++ b/docs/sphinx/Runner.rst
@@ -2,4 +2,5 @@ Runner
 ------
 
 .. automodule:: waflib.Runner
+   :members:
 
diff --git a/docs/sphinx/Scripting.rst b/docs/sphinx/Scripting.rst
index d0f134cf..395954cd 100644
--- a/docs/sphinx/Scripting.rst
+++ b/docs/sphinx/Scripting.rst
@@ -2,4 +2,5 @@ Scripting
 ---------
 
 .. automodule:: waflib.Scripting
+   :members:
 
diff --git a/docs/sphinx/Task.rst b/docs/sphinx/Task.rst
index 222a9a39..a622f818 100644
--- a/docs/sphinx/Task.rst
+++ b/docs/sphinx/Task.rst
@@ -2,4 +2,5 @@ Task
 ----
 
 .. automodule:: waflib.Task
+   :members:
 
diff --git a/docs/sphinx/TaskGen.rst b/docs/sphinx/TaskGen.rst
index 55e43406..05f1d831 100644
--- a/docs/sphinx/TaskGen.rst
+++ b/docs/sphinx/TaskGen.rst
@@ -2,4 +2,5 @@ TaskGen
 -------
 
 .. automodule:: waflib.TaskGen
+   :members:
 
diff --git a/docs/sphinx/Utils.rst b/docs/sphinx/Utils.rst
index d3ec33d4..69f94c63 100644
--- a/docs/sphinx/Utils.rst
+++ b/docs/sphinx/Utils.rst
@@ -2,4 +2,5 @@ Utils
 -----
 
 .. automodule:: waflib.Utils
+   :members:
 
diff --git a/docs/sphinx/about.rst b/docs/sphinx/about.rst
index d35ddd61..b58e86dd 100644
--- a/docs/sphinx/about.rst
+++ b/docs/sphinx/about.rst
@@ -3,9 +3,5 @@
 About this documentation
 ------------------------
 
-These documents are generated from `reStructuredText`_ sources by `Sphinx`_, a
-document processor specifically written for the Python documentation.
-
-.. _reStructuredText: http://docutils.sf.net/rst.html
-.. _Sphinx: http://sphinx.pocoo.org/
+This is the automatically generated documentation for the Waf project.
 
diff --git a/docs/sphinx/conf.py b/docs/sphinx/conf.py
index 87cf040d..5e66cf37 100644
--- a/docs/sphinx/conf.py
+++ b/docs/sphinx/conf.py
@@ -21,6 +21,11 @@ sys.path.append(os.path.abspath('.'))
 
 graphviz_output_format = 'svg'
 
+html_theme_options = {
+	"body_min_width": "none",
+	"body_max_width": "none",
+}
+
 # monkey patch a few waf classes for documentation purposes!
 #-----------------------------------------------------------
 
@@ -207,7 +212,7 @@ for x in lst:
 				tool_to_features[x].append(feat)
 
 	txt = ""
-	txt += "%s\n%s\n\n.. automodule:: waflib.Tools.%s\n\n" % (x, "="*len(x), x)
+	txt += "%s\n%s\n\n.. automodule:: waflib.Tools.%s\n  :members:\n\n" % (x, "="*len(x), x)
 	if x in tool_to_features:
 		txt += "Features defined in this module:"
 		for feat in sorted(list(set(tool_to_features[x]))):
@@ -348,7 +353,7 @@ master_doc = 'index'
 
 # General information about the project.
 project = u'Waf'
-copyright = u'2005-2018, Thomas Nagy'
+copyright = u'2005-2022, Thomas Nagy'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the