[Python-checkins] cpython (merge 2.7 -> 2.7): Merge heads

[serhiy.storchaka]

http://hg.python.org/cpython/rev/436f7e55be77
changeset:   87189:436f7e55be77
branch:      2.7
parent:      87184:f7d8c7a176fb
parent:      87163:2b0690c9a026
user:        Serhiy Storchaka <storchaka at gmail.com>
date:        Sun Nov 17 12:31:29 2013 +0200
summary:
  Merge heads

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
@@ -330,7 +330,7 @@
    precision: `integer`
    type: "b" | "c" | "d" | "e" | "E" | "f" | "F" | "g" | "G" | "n" | "o" | "s" | "x" | "X" | "%"
 
-If a valid *align* value is specified, it can be preceeded by a *fill*
+If a valid *align* value is specified, it can be preceded by a *fill*
 character that can be any character and defaults to a space if omitted.
 Note that it is not possible to use ``{`` and ``}`` as *fill* char while
 using the :meth:`str.format` method; this limitation however doesn't

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