IntenseWebs/sphinx
3
0
Fork 0
mirror of https://github.com/sphinx-doc/sphinx.git synced 2025-02-25 18:55:22 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1.8' into 5421_warning_for_autodoc_default_flags

Browse Source
This commit is contained in:
Takeshi KOMIYA
2018-09-14 02:06:29 +09:00
committed by GitHub
parent 21d92b440a e0570ab10e
commit aa69231bc7
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@@ -16,6 +16,7 @@ Features added
Bugs fixed
----------
* #5418: Incorrect default path for sphinx-build -d/doctrees files
* #5421: autodoc emits deprecation warning for :confval:`autodoc_default_flags`
Testing

2
sphinx/cmd/build.py
View File

@@ -219,7 +219,7 @@ def build_main(argv=sys.argv[1:]): # type: ignore
args.confdir = args.sourcedir
if not args.doctreedir:
args.doctreedir = os.path.join(args.sourcedir, '.doctrees')
args.doctreedir = os.path.join(args.outputdir, '.doctrees')
# handle remaining filename arguments
filenames = args.filenames