Changeset 391 for python/trunk/Doc/library/telnetlib.rst

Timestamp:

Mar 19, 2014, 11:31:01 PM (11 years ago)

Author:

dmik

Message:

python: Merge vendor 2.7.6 to trunk.

Location:

python/trunk

Files:

• . (modified) (1 prop)
• Doc/library/telnetlib.rst (modified) (5 diffs)

python/trunk/Doc/library/telnetlib.rst

@@ -1 @@
-
 :mod:`telnetlib` --- Telnet client
 ==================================
@@ -9 +8 @@
 
 .. index:: single: protocol; Telnet
+
+**Source code:** :source:`Lib/telnetlib.py`
+
+--------------
 
 The :mod:`telnetlib` module provides a :class:`Telnet` class that implements the
@@ -29 +32 @@
    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
+   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
-   *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
    *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.
@@ -192 +190 @@
 
    The first argument is a list of regular expressions, either compiled
-   (:class:`re.RegexObject` instances) or uncompiled (strings). The optional second
+   (:class:`regex objects <re-objects>`) or uncompiled (strings). The optional second
    argument is a timeout, in seconds; the default is to block indefinitely.
 
@@ -204 +202 @@
 
    If a regular expression ends with a greedy match (such as ``.*``) or if more
-   than one expression can match the same input, the results are indeterministic,
-   and may depend on the I/O timing.
+   than one expression can match the same input, the results are
+   non-deterministic, and may depend on the I/O timing.