Issue #11855: merge from 3.1

eliben · eliben · commit 3384e54c2329 · 2011-04-16T15:34:29.000+03:00
diff --git a/Doc/library/urllib.request.rst b/Doc/library/urllib.request.rst
@@ -1113,15 +1113,15 @@ some point in the future.
    the  download is interrupted.
 
    The *Content-Length* is treated as a lower bound: if there's more data  to read,
-   urlretrieve reads more data, but if less data is available,  it raises the
-   exception.
+   :func:`urlretrieve` reads more data, but if less data is available,  it raises
+   the exception.
 
    You can still retrieve the downloaded data in this case, it is stored  in the
    :attr:`content` attribute of the exception instance.
 
-   If no *Content-Length* header was supplied, urlretrieve can not check the size
-   of the data it has downloaded, and just returns it.  In this case you just have
-   to assume that the download was successful.
+   If no *Content-Length* header was supplied, :func:`urlretrieve` can not check
+   the size of the data it has downloaded, and just returns it.  In this case
+   you just have to assume that the download was successful.
 
 .. function:: urlcleanup()
 
