merge with 3.2

36c4e38f · Sandro Tosi · 094d0e00 · 38b86b4c · 36c4e38f
Commit 36c4e38f authored May 12, 2012 by Sandro Tosi
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

Doc/library/string.rst Doc/library/string.rst +1 -1

No files found.
--- 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`