Merge branch '1.8'

resolved Conflicts:
	doc/development/tutorials/todo.rst
	sphinx/locale/__init__.py
	sphinx/search/zh.py
This commit is contained in:
jfbu committed 2018-12-28 12:50:20 +01:00
commit 32d57b8637
17 files changed
+112 -73

No files matched your search

+1 -1
View File
@@ -57,7 +57,7 @@ Logging API
**color**
The color of logs. By default, info and verbose level logs are not colored,
and deug level ones are colored as ``"darkgray"``.
and debug level ones are colored as ``"darkgray"``.
.. autofunction:: pending_logging()