Merge branch 'master' into blender2.8

4 files changed, 11 insertions, 25 deletions

diff --git a/doc/python_api/rst/bge.app.rst b/doc/python_api/rst/bge.app.rst
index 326d9651a54..e8b91ffbcaf 100644
--- a/doc/python_api/rst/bge.app.rst
+++ b/doc/python_api/rst/bge.app.rst
@@ -4,15 +4,6 @@ Application Data (bge.app)
 
 Module to access application values that remain unchanged during runtime.
 
-Submodules:
-
-.. toctree::
-   :maxdepth: 1
-
-   bpy.app.handlers.rst
-   bpy.app.translations.rst
-
-
 .. module:: bge.app
 
 .. data:: version
@@ -56,4 +47,3 @@ Submodules:
    True if the BGE has been built with physics support.
 
    :type: bool
-
diff --git a/doc/python_api/rst/gpu.rst b/doc/python_api/rst/gpu.rst
index 6c38122a573..cf639357a31 100644
--- a/doc/python_api/rst/gpu.rst
+++ b/doc/python_api/rst/gpu.rst
@@ -6,6 +6,13 @@ GPU functions (gpu)
 
 This module provides access to materials GLSL shaders.
 
+Submodules:
+
+.. toctree::
+   :maxdepth: 1
+
+   gpu.offscreen.rst
+
 
 Intro
 =====
@@ -24,7 +31,6 @@ and in the game engine.
 Constants
 =========
 
-
 GLSL Data Type
 --------------
 
diff --git a/doc/python_api/rst_from_bmesh_opdefines.py b/doc/python_api/rst_from_bmesh_opdefines.py
index cdbed88cc88..d3e4b2a0cfd 100644
--- a/doc/python_api/rst_from_bmesh_opdefines.py
+++ b/doc/python_api/rst_from_bmesh_opdefines.py
@@ -22,7 +22,7 @@
 # 'bmesh_opdefines.c' in order to avoid having to add a lot of introspection
 # data access into the api.
 #
-# The script is stupid becase it makes assumptions about formatting...
+# The script is stupid because it makes assumptions about formatting...
 # that each arg has its own line, that comments above or directly after will be __doc__ etc...
 #
 # We may want to replace this script with something else one day but for now its good enough.
diff --git a/doc/python_api/sphinx_doc_gen.py b/doc/python_api/sphinx_doc_gen.py
index f9f6f1eb109..629ec6c8e9c 100644
--- a/doc/python_api/sphinx_doc_gen.py
+++ b/doc/python_api/sphinx_doc_gen.py
@@ -1731,19 +1731,9 @@ def write_rst_contents(basepath):
     fw("   :maxdepth: 1\n\n")
 
     standalone_modules = (
-        # mathutils
-        "mathutils",
-        "mathutils.geometry",
-        "mathutils.bvhtree", "mathutils.kdtree",
-        "mathutils.interpolate",
-        "mathutils.noise",
-        # misc
-        "freestyle", "bgl", "blf",
-        "gpu", "gpu.offscreen",
-        "aud", "bpy_extras",
-        "idprop.types",
-        # bmesh, submodules are in own page
-        "bmesh",
+        # submodules are added in parent page
+        "mathutils", "freestyle", "bgl", "blf", "gpu",
+        "aud", "bpy_extras", "idprop.types", "bmesh",
     )
 
     for mod in standalone_modules: