Skip to content

Commit d0b31c3

Browse files
mchehabJonathan Corbet
authored andcommitted
docs: conf.py: don't use doctree with a different meaning
At Sphinx, doctree is a directory where doc build cache is stored. Use a better name. No functional changes. Suggested-by: Jani Nikula <jani.nikula@linux.intel.com> Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> Signed-off-by: Jonathan Corbet <corbet@lwn.net> Message-ID: <bab090bb4b95c735bd570c9c23c6e97851b2bf7b.1768838938.git.mchehab+huawei@kernel.org>
1 parent 7bcdf96 commit d0b31c3

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

Documentation/conf.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
include_patterns = ["**.rst"]
3434

3535
# Location of Documentation/ directory
36-
doctree = os.path.abspath(".")
36+
kern_doc_dir = os.path.abspath(".")
3737

3838
# Exclude of patterns that don't contain directory names, in glob format.
3939
exclude_patterns = []
@@ -73,7 +73,7 @@ def config_init(app, config):
7373
# setup include_patterns dynamically
7474
if has_include_patterns:
7575
for p in dyn_include_patterns:
76-
full = os.path.join(doctree, p)
76+
full = os.path.join(kern_doc_dir, p)
7777

7878
rel_path = os.path.relpath(full, start=app.srcdir)
7979
if rel_path.startswith("../"):
@@ -83,7 +83,7 @@ def config_init(app, config):
8383

8484
# setup exclude_patterns dynamically
8585
for p in dyn_exclude_patterns:
86-
full = os.path.join(doctree, p)
86+
full = os.path.join(kern_doc_dir, p)
8787

8888
rel_path = os.path.relpath(full, start=app.srcdir)
8989
if rel_path.startswith("../"):
@@ -95,7 +95,7 @@ def config_init(app, config):
9595
# of the app.srcdir. Add them here
9696

9797
# Handle the case where SPHINXDIRS is used
98-
if not os.path.samefile(doctree, app.srcdir):
98+
if not os.path.samefile(kern_doc_dir, app.srcdir):
9999
# Add a tag to mark that the build is actually a subproject
100100
tags.add("subproject")
101101

0 commit comments

Comments
 (0)