[Python-checkins] r83471 - in python/branches/release27-maint: Doc/library/urllib2.rst Doc/whatsnew/2.0.rst Doc/whatsnew/2.5.rst

[georg.brandl]

Author: georg.brandl
Date: Sun Aug  1 23:26:45 2010
New Revision: 83471

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

........
  r83106 | georg.brandl | 2010-07-23 18:55:26 +0200 (Fr, 23 Jul 2010) | 1 line
  
  Fix some markup glitches.
........


Modified:
   python/branches/release27-maint/   (props changed)
   python/branches/release27-maint/Doc/library/urllib2.rst
   python/branches/release27-maint/Doc/whatsnew/2.0.rst
   python/branches/release27-maint/Doc/whatsnew/2.5.rst

Modified: python/branches/release27-maint/Doc/library/urllib2.rst
==============================================================================
--- python/branches/release27-maint/Doc/library/urllib2.rst	(original)
+++ python/branches/release27-maint/Doc/library/urllib2.rst	Sun Aug  1 23:26:45 2010
@@ -464,7 +464,8 @@
    named :meth:`unknown_open`.
 
    Note that the implementation of these methods may involve calls of the parent
-   :class:`OpenerDirector` instance's :meth:`.open` and :meth:`.error` methods.
+   :class:`OpenerDirector` instance's :meth:`~OpenerDirector.open` and
+   :meth:`~OpenerDirector.error` methods.
 
 #. Every handler with a method named like :samp:`{protocol}_response` has that
    method called to post-process the response.

Modified: python/branches/release27-maint/Doc/whatsnew/2.0.rst
==============================================================================
--- python/branches/release27-maint/Doc/whatsnew/2.0.rst	(original)
+++ python/branches/release27-maint/Doc/whatsnew/2.0.rst	Sun Aug  1 23:26:45 2010
@@ -656,7 +656,7 @@
 The change which will probably break the most code is tightening up the
 arguments accepted by some methods.  Some methods would take multiple arguments
 and treat them as a tuple, particularly various list methods such as
-:meth:`.append` and :meth:`.insert`. In earlier versions of Python, if ``L`` is
+:meth:`append` and :meth:`insert`. In earlier versions of Python, if ``L`` is
 a list, ``L.append( 1,2 )`` appends the tuple ``(1,2)`` to the list.  In Python
 2.0 this causes a :exc:`TypeError` exception to be raised, with the message:
 'append requires exactly 1 argument; 2 given'.  The fix is to simply add an

Modified: python/branches/release27-maint/Doc/whatsnew/2.5.rst
==============================================================================
--- python/branches/release27-maint/Doc/whatsnew/2.5.rst	(original)
+++ python/branches/release27-maint/Doc/whatsnew/2.5.rst	Sun Aug  1 23:26:45 2010
@@ -1765,7 +1765,7 @@
 http://effbot.org/zone/element-index.htm.
 
 ElementTree represents an XML document as a tree of element nodes. The text
-content of the document is stored as the :attr:`.text` and :attr:`.tail`
+content of the document is stored as the :attr:`text` and :attr:`tail`
 attributes of  (This is one of the major differences between ElementTree and
 the Document Object Model; in the DOM there are many different types of node,
 including :class:`TextNode`.)