Merge with stable

Conflicts:
	sphinx/environment.py
	sphinx/ext/autodoc.py
	sphinx/writers/latex.py
This commit is contained in:
shimizukawa
2016-02-09 22:17:05 +09:00
13 changed files with 297 additions and 150 deletions

View File

@@ -106,17 +106,23 @@ This section describe a easy way to translate with sphinx-intl.
#. Translate your po files under `./locale/<lang>/LC_MESSAGES/`.
#. Build mo files and make translated document.
#. make translated document.
You need a :confval:`language` parameter in ``conf.py`` or you may also
specify the parameter on the command line::
$ sphinx-intl build
$ make -e SPHINXOPTS="-D language='de'" html
Congratulations! You got the translated documentation in the ``_build/html``
directory.
.. versionadded:: 1.3
sphinx-build that is invoked by make command will build po files into mo files.
If you are using 1.2.x or earlier, please invoke ``sphinx-intl build`` command
before make command.
Translating
^^^^^^^^^^^
@@ -251,9 +257,8 @@ easy to fetch and push translations.
...
Done.
Build po files into mo and make html::
Invoke make html::
$ sphinx-intl build
$ make -e SPHINXOPTS="-D language='de'" html