summaryrefslogtreecommitdiffstats
path: root/Documentation/conf.py
diff options
context:
space:
mode:
authorJonathan Corbet <corbet@lwn.net>2016-08-14 13:57:55 -0600
committerJonathan Corbet <corbet@lwn.net>2016-08-14 13:57:55 -0600
commitcc935bb5969ae16502a940809b4962e948a7aa9c (patch)
tree4629f1d7cf499362130f2aa561f92da1c1dfbedb /Documentation/conf.py
parentd9bd993640d34ca97b1f4c4bc317399cfe661a9a (diff)
parenta78a136fa9337fdc25fdbaa2d253f9b4dc90ad44 (diff)
downloadlinux-stable-cc935bb5969ae16502a940809b4962e948a7aa9c.tar.gz
linux-stable-cc935bb5969ae16502a940809b4962e948a7aa9c.tar.bz2
linux-stable-cc935bb5969ae16502a940809b4962e948a7aa9c.zip
Merge branch 'doc/4.9' into docs-next
Diffstat (limited to 'Documentation/conf.py')
-rw-r--r--Documentation/conf.py7
1 files changed, 7 insertions, 0 deletions
diff --git a/Documentation/conf.py b/Documentation/conf.py
index b198147b8bc5..5c06b018ad1d 100644
--- a/Documentation/conf.py
+++ b/Documentation/conf.py
@@ -19,6 +19,7 @@ import os
# add these directories to sys.path here. If the directory is relative to the
# documentation root, use os.path.abspath to make it absolute, like shown here.
sys.path.insert(0, os.path.abspath('sphinx'))
+from load_config import loadConfig
# -- General configuration ------------------------------------------------
@@ -421,3 +422,9 @@ pdf_documents = [
# line arguments.
kerneldoc_bin = '../scripts/kernel-doc'
kerneldoc_srctree = '..'
+
+# ------------------------------------------------------------------------------
+# Since loadConfig overwrites settings from the global namespace, it has to be
+# the last statement in the conf.py file
+# ------------------------------------------------------------------------------
+loadConfig(globals())