[Python-checkins] cpython (merge 3.4 -> default): Merge from 3.4

[tim.golden]

https://hg.python.org/cpython/rev/0ca028765488
changeset:   95493:0ca028765488
parent:      95490:c7dbb5e7423d
parent:      95492:283036fe48e2
user:        Tim Golden <mail at timgolden.me.uk>
date:        Wed Apr 08 16:53:21 2015 +0100
summary:
  Merge from 3.4

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


diff --git a/Doc/library/telnetlib.rst b/Doc/library/telnetlib.rst
--- a/Doc/library/telnetlib.rst
+++ b/Doc/library/telnetlib.rst
@@ -31,7 +31,7 @@
    :class:`Telnet` represents a connection to a Telnet server. The instance is
    initially not connected by default; the :meth:`open` method must be used to
    establish a connection.  Alternatively, the host name and optional port
-   number can be passed to the constructor, to, in which case the connection to
+   number can be passed to the constructor too, in which case the connection to
    the server will be established before the constructor returns.  The optional
    *timeout* parameter specifies a timeout in seconds for blocking operations
    like the connection attempt (if not specified, the global default timeout

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