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

[ezio.melotti]

Author: ezio.melotti
Date: Thu Dec 31 13:26:02 2009
New Revision: 77177

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

........
  r77176 | ezio.melotti | 2009-12-31 14:24:38 +0200 (Thu, 31 Dec 2009) | 1 line
  
  #7612: typo in stdtypes.rst
........


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

Modified: python/branches/release31-maint/Doc/library/stdtypes.rst
==============================================================================
--- python/branches/release31-maint/Doc/library/stdtypes.rst	(original)
+++ python/branches/release31-maint/Doc/library/stdtypes.rst	Thu Dec 31 13:26:02 2009
@@ -650,7 +650,7 @@
    Also, while in previous Python versions, byte strings and Unicode strings
    could be exchanged for each other rather freely (barring encoding issues),
    strings and bytes are now completely separate concepts.  There's no implicit
-   en-/decoding if you pass and object of the wrong type.  A string always
+   en-/decoding if you pass an object of the wrong type.  A string always
    compares unequal to a bytes or bytearray object.
 
 Lists are constructed with square brackets, separating items with commas: ``[a,