Merge branch 'stable'

.travis.yml

@@ -15,8 +15,8 @@ env:
     - PYTHONFAULTHANDLER=x
     - PYTHONWARNINGS=all
   matrix:
-    - DOCUTILS=0.11
     - DOCUTILS=0.12
+    - DOCUTILS=0.13.1
 addons:
   apt:
     packages:

CHANGES

@@ -12,6 +12,30 @@ Features added
 Bugs fixed
 ----------
 
+Release 1.5.1 (in development)
+==============================
+
+Features added
+--------------
+
+* #3214: Allow to suppress "unknown mimetype" warnings from epub builder using
+  :confval:`suppress_warnings`.
+
+Bugs fixed
+----------
+
+* #3195: Can not build in parallel
+* #3198: AttributeError is raised when toctree has 'self'
+* #3211: Remove untranslated sphinx locale catalogs (it was covered by
+  untranslated it_IT)
+* #3212: HTML Builders crashes with docutils-0.13
+* #3207: more latex problems with references inside parsed-literal directive
+  (``\DUrole``)
+* #3205: sphinx.util.requests crashes with old pyOpenSSL (< 0.14)
+* #3220: KeyError when having a duplicate citation
+* #3200: LaTeX: xref inside desc_name not allowed
+* #3228: ``build_sphinx`` command crashes when missing dependency
+
 Release 1.5 (released Dec 5, 2016)
 ==================================
 

doc/config.rst

@@ -233,6 +233,7 @@ General configuration
    * ref.citation
    * ref.doc
    * misc.highlighting_failure
+   * epub.unknown_project_files
 
    You can choose from these types.
 
@@ -244,6 +245,10 @@ General configuration
 
       Added ``misc.highlighting_failure``
 
+   .. versionchanged:: 1.5.1
+
+      Added ``epub.unknown_project_files``
+
 .. confval:: needs_sphinx
 
    If set to a ``major.minor`` version string like ``'1.1'``, Sphinx will

sphinx/application.py

@@ -559,6 +559,12 @@ def setup_extension(self, extension):
             # special-case for compatibility
             if extension == 'rst2pdf.pdfbuilder':
                 ext_meta = {'parallel_read_safe': True}
+            elif extension in builtin_extensions:
+                ext_meta = {
+                    'version': 'builtin',
+                    'parallel_read_safe': True,
+                    'parallel_write_safe': True,
+                }
         try:
             if not ext_meta.get('version'):
                 ext_meta['version'] = 'unknown version'

sphinx/builders/epub.py

@@ -614,7 +614,8 @@ def build_content(self, outdir, outname):
                     # we always have JS and potentially OpenSearch files, don't
                     # always warn about them
                     if ext not in ('.js', '.xml'):
-                        self.warn('unknown mimetype for %s, ignoring' % filename)
+                        self.warn('unknown mimetype for %s, ignoring' % filename,
+                                  type='epub', subtype='unknown_project_files')
                     continue
                 filename = filename.replace(os.sep, '/')
                 projectfiles.append(self.file_template % {

sphinx/builders/latex.py

@@ -250,7 +250,7 @@ def validate_config_values(app):
             app.config.latex_toplevel_sectioning = 'parts'  # type: ignore
 
     if app.config.latex_use_modindex is not True:  # changed by user
-        app.warn('latex_use_modeindex is deprecated. Use latex_domain_indices instead.')
+        app.warn('latex_use_modindex is deprecated. Use latex_domain_indices instead.')
 
     if app.config.latex_preamble:
         if app.config.latex_elements.get('preamble'):

sphinx/domains/std.py

@@ -573,7 +573,7 @@ def note_citations(self, env, docname, document):
         for node in document.traverse(nodes.citation):
             label = node[0].astext()
             if label in self.data['citations']:
-                path = env.doc2path(self.data['citations'][0])
+                path = env.doc2path(self.data['citations'][label][0])
                 env.warn_node('duplicate citation %s, other instance in %s' %
                               (label, path), node)
             self.data['citations'][label] = (docname, node['ids'][0])

sphinx/environment/managers/toctree.py

@@ -285,7 +285,7 @@ def _entries_from_toctree(toctreenode, parents,
                         # toctree originates
                         ref = toctreenode['parent']
                         if not title:
-                            title = clean_astext(self.titles[ref])
+                            title = clean_astext(self.env.titles[ref])
                         reference = nodes.reference('', '', internal=True,
                                                     refuri=ref,
                                                     anchorname='',