[Python-checkins] cpython (merge 3.3 -> default): Issue #17728: Merge with 3.3.

[eric.smith]

http://hg.python.org/cpython/rev/413c0b0a105f
changeset:   83394:413c0b0a105f
parent:      83391:5d4001e32a31
parent:      83393:ad481c95a1d4
user:        Eric V. Smith <eric at trueblade.com>
date:        Mon Apr 15 09:53:49 2013 -0400
summary:
  Issue #17728: Merge with 3.3.

files:
  Doc/library/string.rst |  5 +++--
  1 files changed, 3 insertions(+), 2 deletions(-)


diff --git a/Doc/library/string.rst b/Doc/library/string.rst
--- a/Doc/library/string.rst
+++ b/Doc/library/string.rst
@@ -432,12 +432,13 @@
    +=========+==========================================================+
    | ``'e'`` | Exponent notation. Prints the number in scientific       |
    |         | notation using the letter 'e' to indicate the exponent.  |
+   |         | The default precision is ``6``.                          |
    +---------+----------------------------------------------------------+
    | ``'E'`` | Exponent notation. Same as ``'e'`` except it uses an     |
    |         | upper case 'E' as the separator character.               |
    +---------+----------------------------------------------------------+
    | ``'f'`` | Fixed point. Displays the number as a fixed-point        |
-   |         | number.                                                  |
+   |         | number.  The default precision is ``6``.                 |
    +---------+----------------------------------------------------------+
    | ``'F'`` | Fixed point. Same as ``'f'``, but converts ``nan`` to    |
    |         | ``NAN`` and ``inf`` to ``INF``.                          |
@@ -464,7 +465,7 @@
    |         | the precision.                                           |
    |         |                                                          |
    |         | A precision of ``0`` is treated as equivalent to a       |
-   |         | precision of ``1``.                                      |
+   |         | precision of ``1``.  The default precision is ``6``.     |
    +---------+----------------------------------------------------------+
    | ``'G'`` | General format. Same as ``'g'`` except switches to       |
    |         | ``'E'`` if the number gets too large. The                |

-- 
Repository URL: http://hg.python.org/cpython