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 'stable'

Browse Source
This commit is contained in:
Takeshi KOMIYA 2016-11-06 20:40:14 +09:00
commit 6bbca6ba3c
5 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES
View File

@ -253,6 +253,8 @@ Bugs fixed
* #2936: Fix doc/Makefile that can't build man because doc/man exists * #2936: Fix doc/Makefile that can't build man because doc/man exists
* #3058: Using the same 'caption' attribute in multiple 'toctree' directives * #3058: Using the same 'caption' attribute in multiple 'toctree' directives
results in warning / error results in warning / error
* #3068: Allow the '=' character in the -D option of sphinx-build.py
* #3074: ``add_source_parser()`` crashes in debug mode
Release 1.4.8 (released Oct 1, 2016) Release 1.4.8 (released Oct 1, 2016)
==================================== ====================================

2
doc/faq.rst
View File

@ -282,7 +282,7 @@ The following notes may be helpful if you want to create Texinfo files:
info:Texinfo#makeinfo_options info:Texinfo#makeinfo_options
which produces: which produces::
info:Texinfo#makeinfo_options info:Texinfo#makeinfo_options

1
doc/templating.rst
View File

@ -377,6 +377,7 @@ are in HTML form), these variables are also available:
The name of the copied source file for the current document. This is only The name of the copied source file for the current document. This is only
nonempty if the :confval:`html_copy_source` value is ``True``. nonempty if the :confval:`html_copy_source` value is ``True``.
This has empty value on creating automatically-generated files.
.. data:: toc .. data:: toc

2
sphinx/application.py
View File

@ -831,7 +831,7 @@ class Sphinx(object):
languages[cls.lang] = cls languages[cls.lang] = cls
def add_source_parser(self, suffix, parser): def add_source_parser(self, suffix, parser):
self.debug('[app] adding search source_parser: %r, %r', (suffix, parser)) self.debug('[app] adding search source_parser: %r, %r', suffix, parser)
if suffix in self._additional_source_parsers: if suffix in self._additional_source_parsers:
self.warn('while setting up extension %s: source_parser for %r is ' self.warn('while setting up extension %s: source_parser for %r is '
'already registered, it will be overridden' % 'already registered, it will be overridden' %

2
sphinx/cmdline.py
View File

@ -255,7 +255,7 @@ def main(argv):
confoverrides = {} confoverrides = {}
for val in opts.define: for val in opts.define:
try: try:
key, val = val.split('=') key, val = val.split('=', 1)
except ValueError: except ValueError:
print('Error: -D option argument must be in the form name=value.', print('Error: -D option argument must be in the form name=value.',
file=sys.stderr) file=sys.stderr)