summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorEric Smith <eric@trueblade.com>2008-07-17 19:49:47 (GMT)
committerEric Smith <eric@trueblade.com>2008-07-17 19:49:47 (GMT)
commitd6c393ab2bf239d9f25ceab6f9b3b83e44848343 (patch)
treee6e475fbc042276a08a4bd9be1f9c3b6217fdcbd /Doc
parent0c1dbf8792cd1d4a8f97070852a16f4afcd7f466 (diff)
downloadcpython-d6c393ab2bf239d9f25ceab6f9b3b83e44848343.zip
cpython-d6c393ab2bf239d9f25ceab6f9b3b83e44848343.tar.gz
cpython-d6c393ab2bf239d9f25ceab6f9b3b83e44848343.tar.bz2
Backed out r65069, pending fixing it in Windows.
Diffstat (limited to 'Doc')
-rw-r--r--Doc/library/stdtypes.rst4
-rw-r--r--Doc/library/string.rst7
2 files changed, 5 insertions, 6 deletions
diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst
index 3c0aa18..e857154 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 cb9cf93..0e345e3 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 |