Merged revisions 83106 via svnmerge from

svn+ssh://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.
........

diff --git a/Doc/library/urllib.request.rst b/Doc/library/urllib.request.rst
index 64e0c2a2bdd374891dc9ca577fa1f9eb170e086f..75ff857d458a6e5ad8114756bb04828ea0c76dd1 100644 (file)
--- a/Doc/library/urllib.request.rst
+++ b/Doc/library/urllib.request.rst
@@ -638,7 +638,8 @@ sorting the handler instances.
    :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 :meth:`protocol_response` has that
    method called to post-process the response.

diff --git a/Doc/whatsnew/2.0.rst b/Doc/whatsnew/2.0.rst
index 5fd53d165e302440a5bd5aeb826ea8d7dd6b80e6..3bb12b666c78680a88558bf42ca3430e661a334c 100644 (file)
--- a/Doc/whatsnew/2.0.rst
+++ b/Doc/whatsnew/2.0.rst
@@ -656,7 +656,7 @@ break.
 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

diff --git a/Doc/whatsnew/2.5.rst b/Doc/whatsnew/2.5.rst
index ca87dbb1ee8635c694ababc134b634a503fd0f87..c7f7d586ab50205f424538a0e025f3f8572e293c 100644 (file)
--- a/Doc/whatsnew/2.5.rst
+++ b/Doc/whatsnew/2.5.rst
@@ -1765,7 +1765,7 @@ Full documentation for ElementTree is available at
 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`.)