merge with 3.2

sandrotosi · sandrotosi · commit 36c4e38f73b6 · 2012-05-12T23:30:05.000+02:00
diff --git 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`
