From f28ae817415a57f990ac045c421e63de4d91d9d5 Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Fri, 21 May 2010 21:33:16 +0000
Subject: [PATCH] Merged revisions 81431 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r81431 | georg.brandl | 2010-05-21 23:30:47 +0200 (Fr, 21 Mai 2010) | 1 line
#8707: remove duplicate paragraph part.
........
---
Doc/library/telnetlib.rst | 11 +++--------
1 file changed, 3 insertions(+), 8 deletions(-)
diff --git a/Doc/library/telnetlib.rst b/Doc/library/telnetlib.rst
index b326da9826..b1528bdac0 100644
--- a/Doc/library/telnetlib.rst
+++ b/Doc/library/telnetlib.rst
@@ -28,16 +28,11 @@ 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
- and timeout can be passed to the constructor, 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 the connection attempt (if
- not specified, the global default timeout setting will be used).
-
number can be passed to the constructor, to, in which case the connection to
- the server will be established before the constructor returns. The optional
+ 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, or passed as None, the global
- default timeout setting will be used).
+ like the connection attempt (if not specified, the global default timeout
+ setting will be used).
Do not reopen an already connected instance.
--
2.40.0