summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorTim Golden <mail@timgolden.me.uk>2015-04-08 15:53:21 (GMT)
committerTim Golden <mail@timgolden.me.uk>2015-04-08 15:53:21 (GMT)
commitda5cbe65ae2cf43164ce4ba8e3b47d7b8c15c013 (patch)
tree0f049539fc6918bd83e0d0bccc90e3b40f1e4a81 /Doc
parentf1c5dea3c29d398ab58b45dd152a032489eddf58 (diff)
parentfe5ac52c2bc1489c16652795bbdf2b21ae9a10f2 (diff)
downloadcpython-da5cbe65ae2cf43164ce4ba8e3b47d7b8c15c013.zip
cpython-da5cbe65ae2cf43164ce4ba8e3b47d7b8c15c013.tar.gz
cpython-da5cbe65ae2cf43164ce4ba8e3b47d7b8c15c013.tar.bz2
Merge from 3.4
Diffstat (limited to 'Doc')
-rw-r--r--Doc/library/telnetlib.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/Doc/library/telnetlib.rst b/Doc/library/telnetlib.rst
index 31e5dbb..4040f72 100644
--- a/Doc/library/telnetlib.rst
+++ b/Doc/library/telnetlib.rst
@@ -31,7 +31,7 @@ Character), EL (Erase Line), GA (Go Ahead), SB (Subnegotiation Begin).
: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