diff options
author | Eric Smith <eric@trueblade.com> | 2008-07-17 19:49:47 +0000 |
---|---|---|
committer | Eric Smith <eric@trueblade.com> | 2008-07-17 19:49:47 +0000 |
commit | ffddd998552ba2a7f802f80938cf2c5a68898719 (patch) | |
tree | 4ebe7857f7493f1e3822c01442be69ea42b1c272 /Doc | |
parent | bfc165c962faa336e48e0dc291a2f2a13fe1fdc1 (diff) | |
download | cpython-ffddd998552ba2a7f802f80938cf2c5a68898719.tar.gz |
Backed out r65069, pending fixing it in Windows.
Diffstat (limited to 'Doc')
-rw-r--r-- | Doc/library/stdtypes.rst | 4 | ||||
-rw-r--r-- | Doc/library/string.rst | 7 |
2 files changed, 5 insertions, 6 deletions
diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst index 3c0aa189f7..e857154b30 100644 --- a/Doc/library/stdtypes.rst +++ b/Doc/library/stdtypes.rst @@ -1296,9 +1296,9 @@ The conversion types are: +------------+-----------------------------------------------------+-------+ | ``'E'`` | Floating point exponential format (uppercase). | \(3) | +------------+-----------------------------------------------------+-------+ -| ``'f'`` | Floating point decimal format (lowercase). | \(3) | +| ``'f'`` | Floating point decimal format. | \(3) | +------------+-----------------------------------------------------+-------+ -| ``'F'`` | Floating point decimal format (uppercase). | \(3) | +| ``'F'`` | Floating point decimal format. | \(3) | +------------+-----------------------------------------------------+-------+ | ``'g'`` | Floating point format. Uses lowercase exponential | \(4) | | | format if exponent is less than -4 or not less than | | diff --git a/Doc/library/string.rst b/Doc/library/string.rst index cb9cf93b66..0e345e38de 100644 --- a/Doc/library/string.rst +++ b/Doc/library/string.rst @@ -429,14 +429,13 @@ The available presentation types for floating point and decimal values are: | ``'e'`` | Exponent notation. Prints the number in scientific | | | notation using the letter 'e' to indicate the exponent. | +---------+----------------------------------------------------------+ - | ``'E'`` | Exponent notation. Same as ``'e'`` except it converts | - | | the number to upper case. | + | ``'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. | +---------+----------------------------------------------------------+ - | ``'F'`` | Fixed point. Same as ``'f'`` except it converts the | - | | number to upper case. | + | ``'F'`` | Fixed point. Same as ``'f'``. | +---------+----------------------------------------------------------+ | ``'g'`` | General format. This prints the number as a fixed-point | | | number, unless the number is too large, in which case | |