[Python-checkins] cpython (merge 3.2 -> default): #16017: merge with 3.2.

[ezio.melotti]

http://hg.python.org/cpython/rev/d6e4080960a3
changeset:   79145:d6e4080960a3
parent:      79142:6db739d611fd
parent:      79144:d7455cceb917
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Mon Sep 24 17:08:05 2012 +0300
summary:
  #16017: merge with 3.2.

files:
  Doc/tutorial/stdlib.rst |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Doc/tutorial/stdlib.rst b/Doc/tutorial/stdlib.rst
--- a/Doc/tutorial/stdlib.rst
+++ b/Doc/tutorial/stdlib.rst
@@ -148,7 +148,7 @@
 
 There are a number of modules for accessing the internet and processing internet
 protocols. Two of the simplest are :mod:`urllib.request` for retrieving data
-from urls and :mod:`smtplib` for sending mail::
+from URLs and :mod:`smtplib` for sending mail::
 
    >>> from urllib.request import urlopen
    >>> for line in urlopen('http://tycho.usno.navy.mil/cgi-bin/timer.pl'):

-- 
Repository URL: http://hg.python.org/cpython