Merge branch 'stable'

doc/config.rst

@@ -330,13 +330,12 @@ Project information
    replacement for ``|today|``.
 
    * If you set :confval:`today` to a non-empty value, it is used.
-   * Otherwise, the current time is formatted using `Locale Data Markup Language
-     <http://unicode.org/reports/tr35/tr35-dates.html#Date_Format_Patterns>`_
-     and the format given in :confval:`today_fmt`.
+   * Otherwise, the current time is formatted using :func:`time.strftime` and
+     the format given in :confval:`today_fmt`.
 
-   The default is no :confval:`today` and a :confval:`today_fmt` of ``'MMMM dd,
-   YYYY'`` (or, if translation is enabled with :confval:`language`, an
-   equivalent %format for the selected locale).
+   The default is no :confval:`today` and a :confval:`today_fmt` of ``'%B %d,
+   %Y'`` (or, if translation is enabled with :confval:`language`, an equivalent
+   format for the selected locale).
 
    .. versionchanged:: 1.4
 
@@ -344,6 +343,12 @@ Project information
       Language. strftime format is also supported for backward compatibility
       until Sphinx-1.5.
 
+   .. versionchanged:: 1.4.1
+
+      Format specification was changed again from Locale Data Markup Language
+      to strftime.  LDML format is also supported for backward compatibility
+      until Sphinx-1.5.
+
 .. confval:: highlight_language
 
    The default language to highlight source code in.  The default is
@@ -696,9 +701,8 @@ that use Sphinx's HTMLWriter class.
 .. confval:: html_last_updated_fmt
 
    If this is not None, a 'Last updated on:' timestamp is inserted
-   at every page bottom, using the given `Locale Data Markup Language
-   <http://unicode.org/reports/tr35/tr35-dates.html#Date_Format_Patterns>`_
-   format.  The empty string is equivalent to ``'MMM dd, YYYY'`` (or a
+   at every page bottom, using the given :func:`strftime` format.
+   The empty string is equivalent to ``'%b %d, %Y'`` (or a
    locale-dependent equivalent).
 
    .. versionchanged:: 1.4
@@ -707,6 +711,13 @@ that use Sphinx's HTMLWriter class.
       Language. strftime format is also supported for backward compatibility
       until Sphinx-1.5.
 
+   .. versionchanged:: 1.4.1
+
+      Format specification was changed again from Locale Data Markup Language
+      to strftime.  LDML format is also supported for backward compatibility
+      until Sphinx-1.5.
+
+
 .. confval:: html_use_smartypants
 
    If true, `SmartyPants <http://daringfireball.net/projects/smartypants/>`_

doc/domains.rst

@@ -629,9 +629,26 @@ a visibility statement (``public``, ``private`` or ``protected``).
 
    A type alias can also be templated::
 
-      .. cpp:type:: template<typename T>
+      .. cpp:type:: template<typename T> \
                     MyContainer = std::vector<T>
 
+   The example are rendered as follows.
+
+   .. cpp:type:: std::vector<int> MyList
+
+      A typedef-like declaration of a type.
+
+   .. cpp:type:: MyContainer::const_iterator
+
+      Declaration of a type alias with unspecified type.
+
+   .. cpp:type:: MyType = std::unordered_map<int, std::string>
+
+      Declaration of a type alias.
+
+   .. cpp:type:: template<typename T> \
+                 MyContainer = std::vector<T>
+
 
 .. rst:directive:: .. cpp:enum:: unscoped enum declaration
                    .. cpp:enum-struct:: scoped enum declaration

doc/markup/code.rst

@@ -21,8 +21,8 @@ an "unused" primary prompt; this is an example of what *not* to do::
    2
    >>>
 
-Syntax highlighting is done with `Pygments <http://pygments.org>`_ (if it's
-installed) and handled in a smart way:
+Syntax highlighting is done with `Pygments <http://pygments.org>`_ and handled
+in a smart way:
 
 * There is a "highlighting language" for each source file.  Per default, this is
   ``'python'`` as the majority of files will have to highlight Python snippets,
@@ -77,7 +77,7 @@ installed) and handled in a smart way:
 Line numbers
 ^^^^^^^^^^^^
 
-If installed, Pygments can generate line numbers for code blocks.  For
+Pygments can generate line numbers for code blocks.  For
 automatically-highlighted blocks (those started by ``::``), line numbers must be
 switched on in a :rst:dir:`highlight` directive, with the ``linenothreshold``
 option::