jfbu 32d57b8637 Merge branch '1.8' ...

resolved Conflicts:
	doc/development/tutorials/todo.rst
	sphinx/locale/__init__.py
	sphinx/search/zh.py

2018-12-28 12:50:20 +01:00

..

autodoc.rst

Merge branch '1.8'

2018-12-28 12:50:20 +01:00

autosectionlabel.rst

doc: Add "extensions" to usage guide

2018-06-20 09:30:47 +01:00

autosummary.rst

doc: Add versionadded label (refs: #5029)

2018-09-03 10:46:38 +09:00

coverage.rst

doc: Add "extensions" to usage guide

2018-06-20 09:30:47 +01:00

doctest.rst

Fix various spelling typos

2018-12-27 13:06:33 +01:00

example_google.py

Remove unnecessary encoding cookie from Python source files

2018-12-16 12:22:12 -08:00

example_google.rst

doc: Add "extensions" to usage guide

2018-06-20 09:30:47 +01:00

example_numpy.py

Remove unnecessary encoding cookie from Python source files

2018-12-16 12:22:12 -08:00

example_numpy.rst

doc: Add "extensions" to usage guide

2018-06-20 09:30:47 +01:00

extlinks.rst

doc: Add "extensions" to usage guide

2018-06-20 09:30:47 +01:00

githubpages.rst

doc: Add "extensions" to usage guide

2018-06-20 09:30:47 +01:00

graphviz.rst

doc: Add "extensions" to usage guide

2018-06-20 09:30:47 +01:00

ifconfig.rst

doc: Add "extensions" to usage guide

2018-06-20 09:30:47 +01:00

imgconverter.rst

doc: Add "extensions" to usage guide

2018-06-20 09:30:47 +01:00

index.rst

doc: Add "extensions" to usage guide

2018-06-20 09:30:47 +01:00

inheritance.rst

Remove unnecessary object from class definitions

2018-09-11 07:07:01 -07:00

intersphinx.rst

doc: Add "extensions" to usage guide

2018-06-20 09:30:47 +01:00

linkcode.rst

doc: Add "extensions" to usage guide

2018-06-20 09:30:47 +01:00

math.rst

Prefer https:// links where available

2018-09-23 11:50:42 -07:00

napoleon.rst

Merge branch '1.8'

2018-12-28 12:50:20 +01:00

todo.rst

doc: Add "extensions" to usage guide

2018-06-20 09:30:47 +01:00

viewcode.rst

doc: Fix description for viewcode_follow_imported_members

2018-12-23 22:13:33 +09:00