Merge branch 'stable'

This commit is contained in:
shimizukawa
2015-11-22 00:25:26 +09:00
7 changed files with 35 additions and 4 deletions

View File

@@ -82,6 +82,8 @@ Bugs fixed
using `any` role and `sphinx.ext.intersphinx` in same time.
* #2121: multiple words search doesn't find pages when words across on the page title and
the page content.
* #1884, #1885: plug-in html themes cannot inherit another plug-in theme. Thanks to
Suzumizaki.
Documentation
-------------