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.7' into 4260_kwarg_separator_is_disappeared

Browse Source
This commit is contained in:
Takeshi KOMIYA 2018-02-14 00:38:48 +09:00 committed by GitHub
commit 1d0f7827fc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@ -16,6 +16,7 @@ Features added
Bugs fixed
----------
* #4608: epub: Invalid meta tag is generated
* #4260: autodoc: keyword only argument separator is not disappeared if it is
appeared at top of the argument list

6
README.rst
View File

@ -72,7 +72,7 @@ If you wish to install `Sphinx` for development purposes, refer to `the
contributors guide`__.
__ https://pypi.python.org/pypi/Sphinx
__ CONTRIBUTING.rst
__ http://www.sphinx-doc.org/en/master/devguide.html
Documentation
=============
@ -93,14 +93,14 @@ For information on running tests locally, refer to `the contributors guide`__.
__ https://travis-ci.org/sphinx-doc/sphinx
__ https://ci.appveyor.com/project/sphinxdoc/sphinx
__ https://circleci.com/gh/sphinx-doc/sphinx
__ CONTRIBUTING.rst
__ http://www.sphinx-doc.org/en/master/devguide.html
Contributing
============
Refer to `the contributors guide`__.
__ CONTRIBUTING.rst
__ http://www.sphinx-doc.org/en/master/devguide.html
Release signatures
==================

1
sphinx/builders/epub3.py
View File

@ -143,6 +143,7 @@ class Epub3Builder(_epub_base.EpubBuilder):
self.globalcontext['theme_writing_mode'] = THEME_WRITING_MODES.get(writing_mode)
self.globalcontext['html_tag'] = self.html_tag
self.globalcontext['use_meta_charset'] = self.use_meta_charset
self.globalcontext['skip_ua_compatible'] = True
def build_navlist(self, navnodes):
# type: (List[nodes.Node]) -> List[NavPoint]

4
sphinx/themes/basic/layout.html
View File

@ -111,8 +111,8 @@
<html xmlns="http://www.w3.org/1999/xhtml"{% if language is not none %} lang="{{ language }}"{% endif %}>
{%- endif %}
<head>
{%- if not html5_doctype %}
<meta http-equiv="X-UA-Compatible" content="IE=Edge" />
{%- if not html5_doctype and not skip_ua_compatible %}
<meta http-equiv="X-UA-Compatible" content="IE=Edge" />
{%- endif %}
{%- if use_meta_charset or html5_doctype %}
<meta charset="{{ encoding }}" />