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

[ezio.melotti]

Author: ezio.melotti
Date: Wed Jan 13 01:30:00 2010
New Revision: 77458

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

................
  r77457 | ezio.melotti | 2010-01-13 02:28:37 +0200 (Wed, 13 Jan 2010) | 9 lines
  
  Merged revisions 77455 via svnmerge from 
  svn+ssh://pythondev@svn.python.org/python/trunk
  
  ........
    r77455 | ezio.melotti | 2010-01-13 02:25:03 +0200 (Wed, 13 Jan 2010) | 1 line
    
    #7685: typo
  ........
................


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

Modified: python/branches/release31-maint/Doc/library/re.rst
==============================================================================
--- python/branches/release31-maint/Doc/library/re.rst	(original)
+++ python/branches/release31-maint/Doc/library/re.rst	Wed Jan 13 01:30:00 2010
@@ -849,16 +849,16 @@
 
    A moderately complicated example:
 
-      >>> m = re.match(r"(?P<first_name>\w+) (?P<last_name>\w+)", "Malcom Reynolds")
+      >>> m = re.match(r"(?P<first_name>\w+) (?P<last_name>\w+)", "Malcolm Reynolds")
       >>> m.group('first_name')
-      'Malcom'
+      'Malcolm'
       >>> m.group('last_name')
       'Reynolds'
 
    Named groups can also be referred to by their index:
 
       >>> m.group(1)
-      'Malcom'
+      'Malcolm'
       >>> m.group(2)
       'Reynolds'
 
@@ -898,9 +898,9 @@
    the subgroup name.  The *default* argument is used for groups that did not
    participate in the match; it defaults to ``None``.  For example:
 
-      >>> m = re.match(r"(?P<first_name>\w+) (?P<last_name>\w+)", "Malcom Reynolds")
+      >>> m = re.match(r"(?P<first_name>\w+) (?P<last_name>\w+)", "Malcolm Reynolds")
       >>> m.groupdict()
-      {'first_name': 'Malcom', 'last_name': 'Reynolds'}
+      {'first_name': 'Malcolm', 'last_name': 'Reynolds'}
 
 
 .. method:: MatchObject.start([group])