[Python-checkins] cpython (merge 3.4 -> default): Merge with 3.4

Mon Oct 6 08:05:08 CEST 2014

https://hg.python.org/cpython/rev/f73f98a72684
changeset: 92836:f73f98a72684
parent: 92832:ec3077e23b7d
parent: 92835:041d0752171a
user: Terry Jan Reedy <tjreedy at udel.edu>
date: Mon Oct 06 02:04:48 2014 -0400
summary:
 Merge with 3.4
files:
 Doc/library/string.rst | 10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/Doc/library/string.rst b/Doc/library/string.rst
--- a/Doc/library/string.rst
+++ b/Doc/library/string.rst
@@ -478,10 +478,12 @@
 | ``'%'`` | Percentage. Multiplies the number by 100 and displays |
 | | in fixed (``'f'``) format, followed by a percent sign. |
 +---------+----------------------------------------------------------+
- | None | Similar to ``'g'``, except with at least one digit past |
- | | the decimal point and a default precision of 12. This is |
- | | intended to match :func:`str`, except you can add the |
- | | other format modifiers. |
+ | None | Similar to ``'g'``, except that fixed-point notation, |
+ | | when used, has at least one digit past the decimal point.|
+ | | The default precision is as high as needed to represent |
+ | | the particular value. The overall effect is to match the |
+ | | output of :func:`str` as altered by the other format |
+ | | modifiers. |
 +---------+----------------------------------------------------------+
 
 
-- 
Repository URL: https://hg.python.org/cpython
