summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJani Nikula <jani.nikula@intel.com>2016-10-19 13:44:37 +0300
committerJonathan Corbet <corbet@lwn.net>2016-10-19 16:02:00 -0600
commit58af04dff742b6b49fae3de585bdea8c77b62ddc (patch)
treedac1d08694368cfa10c1e4ac4fe5ca2ac214ebf4
parent1001354ca34179f3db924eb66672442a173147dc (diff)
downloadlinux-stable-58af04dff742b6b49fae3de585bdea8c77b62ddc.tar.gz
linux-stable-58af04dff742b6b49fae3de585bdea8c77b62ddc.tar.bz2
linux-stable-58af04dff742b6b49fae3de585bdea8c77b62ddc.zip
Documentation/sphinx: rename kernel-doc.py to kerneldoc.py
Python module names should not have hyphens per [PEP 8]. Drop the hyphen from kernel-doc.py. The extension directive remains unchanged. [PEP 8] https://www.python.org/dev/peps/pep-0008/#package-and-module-names Reported-by: Markus Heiser <markus.heiser@darmarit.de> Signed-off-by: Jani Nikula <jani.nikula@intel.com> Signed-off-by: Jonathan Corbet <corbet@lwn.net>
-rw-r--r--Documentation/conf.py2
-rw-r--r--Documentation/sphinx/kerneldoc.py (renamed from Documentation/sphinx/kernel-doc.py)0
2 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/conf.py b/Documentation/conf.py
index bf6f310e5170..4db1993658ea 100644
--- a/Documentation/conf.py
+++ b/Documentation/conf.py
@@ -34,7 +34,7 @@ from load_config import loadConfig
# Add any Sphinx extension module names here, as strings. They can be
# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
# ones.
-extensions = ['kernel-doc', 'rstFlatTable', 'kernel_include', 'cdomain']
+extensions = ['kerneldoc', 'rstFlatTable', 'kernel_include', 'cdomain']
# The name of the math extension changed on Sphinx 1.4
if minor > 3:
diff --git a/Documentation/sphinx/kernel-doc.py b/Documentation/sphinx/kerneldoc.py
index d15e07f36881..d15e07f36881 100644
--- a/Documentation/sphinx/kernel-doc.py
+++ b/Documentation/sphinx/kerneldoc.py