[Python-checkins] cpython (merge 3.4 -> 3.5): Issue #25689: Merge ftplib and nntplib docs from 3.4 into 3.5

[martin.panter]

https://hg.python.org/cpython/rev/2fa12e53e8f3
changeset:   99276:2fa12e53e8f3
branch:      3.5
parent:      99270:a70281b5d076
parent:      99275:74111e62a76c
user:        Martin Panter <vadmium+py at gmail.com>
date:        Sat Nov 21 22:48:54 2015 +0000
summary:
  Issue #25689: Merge ftplib and nntplib docs from 3.4 into 3.5

files:
  Doc/library/ftplib.rst  |  3 +--
  Doc/library/nntplib.rst |  4 ++--
  2 files changed, 3 insertions(+), 4 deletions(-)


diff --git a/Doc/library/ftplib.rst b/Doc/library/ftplib.rst
--- a/Doc/library/ftplib.rst
+++ b/Doc/library/ftplib.rst
@@ -52,8 +52,7 @@
    will be used). *source_address* is a 2-tuple ``(host, port)`` for the socket
    to bind to as its source address before connecting.
 
-   :class:`FTP` class supports the :keyword:`with` statement. Here is a sample
-   on how using it:
+   The :class:`FTP` class supports the :keyword:`with` statement, e.g.:
 
     >>> from ftplib import FTP
     >>> with FTP("ftp1.at.proftpd.org") as ftp:
diff --git a/Doc/library/nntplib.rst b/Doc/library/nntplib.rst
--- a/Doc/library/nntplib.rst
+++ b/Doc/library/nntplib.rst
@@ -69,9 +69,9 @@
    connecting to an NNTP server on the local machine and intend to call
    reader-specific commands, such as ``group``.  If you get unexpected
    :exc:`NNTPPermanentError`\ s, you might need to set *readermode*.
-   :class:`NNTP` class supports the :keyword:`with` statement to
+   The :class:`NNTP` class supports the :keyword:`with` statement to
    unconditionally consume :exc:`OSError` exceptions and to close the NNTP
-   connection when done. Here is a sample on how using it:
+   connection when done, e.g.:
 
     >>> from nntplib import NNTP
     >>> with NNTP('news.gmane.org') as n:

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