merge with 0.6

This commit is contained in:
Georg Brandl
2009-05-31 18:59:36 +02:00
7 changed files with 16 additions and 4 deletions

View File

@@ -77,7 +77,7 @@ General configuration
.. confval:: source_encoding
The encoding of all reST source files. The recommended encoding, and the
default value, is ``'utf-8'``.
default value, is ``'utf-8-sig'``.
.. versionadded:: 0.5
Previously, Sphinx accepted only UTF-8 encoded sources.