[Python-checkins] cpython (merge 3.2 -> default): merge with 3.2

[sandro.tosi]

http://hg.python.org/cpython/rev/54b8337c306a
changeset:   76888:54b8337c306a
parent:      76885:8f22e5be18c8
parent:      76887:04e7264e8fcf
user:        Sandro Tosi <sandro.tosi at gmail.com>
date:        Sat May 12 23:30:05 2012 +0200
summary:
  merge with 3.2

files:
  Doc/library/string.rst |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Doc/library/string.rst b/Doc/library/string.rst
--- a/Doc/library/string.rst
+++ b/Doc/library/string.rst
@@ -292,7 +292,7 @@
 
 .. 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`

-- 
Repository URL: http://hg.python.org/cpython