[Python-checkins] r78201 - in python/branches/release31-maint: Doc/library/string.rst

[eric.smith]

Author: eric.smith
Date: Mon Feb 15 12:59:37 2010
New Revision: 78201

Log:
Merged revisions 78200 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r78200 | eric.smith | 2010-02-15 06:57:31 -0500 (Mon, 15 Feb 2010) | 9 lines
  
  Merged revisions 78198 via svnmerge from 
  svn+ssh://pythondev@svn.python.org/python/trunk
  
  ........
    r78198 | eric.smith | 2010-02-15 06:55:38 -0500 (Mon, 15 Feb 2010) | 1 line
    
    Remove incorrect apostrophe.
  ........
................


Modified:
   python/branches/release31-maint/   (props changed)
   python/branches/release31-maint/Doc/library/string.rst

Modified: python/branches/release31-maint/Doc/library/string.rst
==============================================================================
--- python/branches/release31-maint/Doc/library/string.rst	(original)
+++ python/branches/release31-maint/Doc/library/string.rst	Mon Feb 15 12:59:37 2010
@@ -248,7 +248,7 @@
 
 The *format_spec* field contains a specification of how the value should be
 presented, including such details as field width, alignment, padding, decimal
-precision and so on.  Each value type can define it's own "formatting
+precision and so on.  Each value type can define its own "formatting
 mini-language" or interpretation of the *format_spec*.
 
 Most built-in types support a common formatting mini-language, which is