Merged revisions 74405 via svnmerge from

svn+ssh://svn.python.org/python/branches/py3k

................
  r74405 | georg.brandl | 2009-08-13 14:06:43 +0200 (Do, 13 Aug 2009) | 9 lines

  Merged revisions 74404 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r74404 | georg.brandl | 2009-08-13 14:05:52 +0200 (Do, 13 Aug 2009) | 1 line

    Use locale.format_string() for more than one specifier.
  ........
................

Doc/tutorial/stdlib2.rst

@@ -61,8 +61,8 @@ formatting numbers with group separators::
    >>> x = 1234567.8
    >>> locale.format("%d", x, grouping=True)
    '1,234,567'
-   >>> locale.format("%s%.*f", (conv['currency_symbol'],
-   ...               conv['frac_digits'], x), grouping=True)
+   >>> locale.format_string("%s%.*f", (conv['currency_symbol'],
+   ...                      conv['frac_digits'], x), grouping=True)
    '$1,234,567.80'