diff options
| author | Jonathan Corbet <corbet@lwn.net> | 2016-08-14 21:57:55 +0200 |
|---|---|---|
| committer | Jonathan Corbet <corbet@lwn.net> | 2016-08-14 21:57:55 +0200 |
| commit | cc935bb5969ae16502a940809b4962e948a7aa9c (patch) | |
| tree | 4629f1d7cf499362130f2aa561f92da1c1dfbedb /Documentation/conf.py | |
| parent | Merge branch 'doc/4.8-fixes' into docs-next (diff) | |
| parent | CodingStyle: Remove "Don't use C99-style comments" (diff) | |
| download | linux-cc935bb5969ae16502a940809b4962e948a7aa9c.tar.xz linux-cc935bb5969ae16502a940809b4962e948a7aa9c.zip | |
Merge branch 'doc/4.9' into docs-next
Diffstat (limited to 'Documentation/conf.py')
| -rw-r--r-- | Documentation/conf.py | 7 |
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()) |