Merge branch 'stable'

doc/_templates/index.html

@@ -5,8 +5,8 @@
 
   <div class="quotebar">
     <p><em>{%trans%}What users say:{%endtrans%}</em></p>
-    <p>{%trans%}&ldquo;Cheers for a great tool that actually makes programmers <b>want</b>
-      to write documentation!&rdquo;{%endtrans%}</p>
+    <p>{%trans%}&#8220;Cheers for a great tool that actually makes programmers <b>want</b>
+      to write documentation!&#8220;{%endtrans%}</p>
   </div>
 
   <p>{%trans%}

doc/_themes/sphinx13/layout.html

@@ -57,8 +57,8 @@
 {% endblock %}
 
 {% block rootrellink %}
-        <li><a href="{{ pathto('index') }}">Sphinx home</a>&nbsp;|</li>
-        <li><a href="{{ pathto('contents') }}">Documentation</a> &raquo;</li>
+        <li><a href="{{ pathto('index') }}">Sphinx home</a>&#160;|</li>
+        <li><a href="{{ pathto('contents') }}">Documentation</a> &#187;</li>
 {% endblock %}
 
 {% block header %}

doc/conf.py

@@ -36,9 +36,9 @@ epub_author = 'Georg Brandl'
 epub_publisher = 'http://sphinx-doc.org/'
 epub_scheme = 'url'
 epub_identifier = epub_publisher
-epub_pre_files = [('index.html', 'Welcome')]
-epub_post_files = [('install.html', 'Installing Sphinx'),
-                   ('develop.html', 'Sphinx development')]
+epub_pre_files = [('index.xhtml', 'Welcome')]
+epub_post_files = [('install.xhtml', 'Installing Sphinx'),
+                   ('develop.xhtml', 'Sphinx development')]
 epub_exclude_files = ['_static/opensearch.xml', '_static/doctools.js',
                       '_static/jquery.js', '_static/searchtools.js',
                       '_static/underscore.js', '_static/basic.css',
@@ -48,6 +48,7 @@ epub_max_image_width = 0
 epub_show_urls = 'inline'
 epub_use_index = False
 epub_guide = (('toc', 'contents.xhtml', u'Table of Contents'),)
+epub3_description = 'Sphinx documentation generator system manual'
 
 latex_documents = [('contents', 'sphinx.tex', 'Sphinx Documentation',
                     'Georg Brandl', 'manual', 1)]

doc/config.rst

@@ -1398,6 +1398,10 @@ the `Dublin Core metadata <http://dublincore.org/>`_.
    a chapter, but can be confusing because it mixes entries of different
    depth in one list.  The default value is ``True``.
 
+   .. note::
+
+      ``epub3`` builder ignores ``epub_tocdup`` option(always ``False``)
+
 .. confval:: epub_tocscope
 
    This setting control the scope of the epub table of contents.  The setting