summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSandro Tosi <sandro.tosi@gmail.com>2012-05-12 21:30:05 (GMT)
committerSandro Tosi <sandro.tosi@gmail.com>2012-05-12 21:30:05 (GMT)
commit36c4e38f73b6fcb26359ec12338e34d9cc1b75b9 (patch)
treef90de0c285db59d1d09cd58d190c1f9f1ad2d559
parent094d0e002c8e21aa5872b37953d7e135df1d3e9c (diff)
parent38b86b4cf555e7054fb0c51cdbb1b76fed0ccf7c (diff)
downloadcpython-36c4e38f73b6fcb26359ec12338e34d9cc1b75b9.zip
cpython-36c4e38f73b6fcb26359ec12338e34d9cc1b75b9.tar.gz
cpython-36c4e38f73b6fcb26359ec12338e34d9cc1b75b9.tar.bz2
merge with 3.2
-rw-r--r--Doc/library/string.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/Doc/library/string.rst b/Doc/library/string.rst
index 1f8e230..fc0bd24 100644
--- a/Doc/library/string.rst
+++ b/Doc/library/string.rst
@@ -292,7 +292,7 @@ The general form of a *standard format specifier* is:
.. productionlist:: sf
format_spec: [[`fill`]`align`][`sign`][#][0][`width`][,][.`precision`][`type`]
- fill: <a character other than '}'>
+ fill: <a character other than '{' or '}'>
align: "<" | ">" | "=" | "^"
sign: "+" | "-" | " "
width: `integer`