Merge branch 'stable'

CHANGES

@@ -253,6 +253,8 @@ Bugs fixed
 * #2936: Fix doc/Makefile that can't build man because doc/man exists
 * #3058: Using the same 'caption' attribute in multiple 'toctree' directives
   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)
 ====================================

doc/faq.rst

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

doc/templating.rst

@@ -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
    nonempty if the :confval:`html_copy_source` value is ``True``.
+   This has empty value on creating automatically-generated files.
 
 .. data:: toc
 

sphinx/application.py

@@ -831,7 +831,7 @@ class Sphinx(object):
         languages[cls.lang] = cls
 
     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:
             self.warn('while setting up extension %s: source_parser for %r is '
                       'already registered, it will be overridden' %

sphinx/cmdline.py

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