Merge with birkenfeld/sphinx

doc/config.rst

@@ -277,7 +277,7 @@ Project information
      the format given in :confval:`today_fmt`.
 
    The default is no :confval:`today` and a :confval:`today_fmt` of ``'%B %d,
-   %Y'`` (or, if translation is enabled with :confval:`language`, am equivalent
+   %Y'`` (or, if translation is enabled with :confval:`language`, an equivalent
    %format for the selected locale).
 
 .. confval:: highlight_language
@@ -791,6 +791,8 @@ the `Dublin Core metadata <http://dublincore.org/>`_.
    theme.  These are theme-specific.  For the options understood by the builtin
    themes, see :ref:`this section <builtin-themes>`.
 
+   .. versionadded:: 1.2
+
 .. confval:: epub_title
 
    The title of the document.  It defaults to the :confval:`html_title` option
@@ -912,6 +914,8 @@ the `Dublin Core metadata <http://dublincore.org/>`_.
    to use this option.  The default value is ``False`` because the automatic
    conversion may lose information.
 
+   .. versionadded:: 1.2
+
 .. confval:: epub_max_image_width
 
    This option specifies the maximum width of images.  If it is set to a value
@@ -920,6 +924,8 @@ the `Dublin Core metadata <http://dublincore.org/>`_.
    value is ``0``.  You need the Python Image Library (PIL) installed to use
    this option.
 
+   .. versionadded:: 1.2
+
 
 .. _latex-options:
 

doc/ext/math.rst

@@ -24,6 +24,10 @@ The input language for mathematics is LaTeX markup.  This is the de-facto
 standard for plain-text math notation and has the added advantage that no
 further translation is necessary when building LaTeX output.
 
+Keep in mind that when you put math markup in **Python docstrings** read by
+:mod:`autodoc <sphinx.ext.autodoc>`, you either have to double all backslashes,
+or use Python raw strings (``r"raw"``).
+
 :mod:`.mathbase` defines these new markup elements:
 
 .. rst:role:: math