merge heads

This commit is contained in:
Takayuki Shimizukawa
2013-03-17 10:58:28 +09:00
14 changed files with 137 additions and 43 deletions

View File

@@ -5,6 +5,10 @@ Release 1.2 (in development)
For example: The Sphinx reference documentation in doc directory provides
sphinx.pot file from ``doc/_templates/*.html`` by ``make gettext``.
* PR#124: Fix paragraphs in versionmodified are ignored when it has no
dangling paragraphs. Fix wrong html output (nested <p> tag). Fix
versionmodified is not translatable. Thanks to Nozomu Kaneko.
* PR#123, #1106: Add epub_use_index configuration value.
If provided, it will be used instead of html_use_index for epub builder.