[Python-checkins] cpython (merge 3.3 -> default): MERGE: Closes #16789: :meth:`quit` links to constants instead of own module
jesus.cea
python-checkins at python.org
Wed Dec 26 16:49:28 CET 2012
http://hg.python.org/cpython/rev/3f7d5c235d82
changeset: 81072:3f7d5c235d82
parent: 81068:2d1cfbaef9a2
parent: 81071:b6a9f8fd9443
user: Jesus Cea <jcea at jcea.es>
date: Wed Dec 26 16:48:26 2012 +0100
summary:
MERGE: Closes #16789: :meth:`quit` links to constants instead of own module
files:
Doc/library/ftplib.rst | 8 ++++----
Doc/library/poplib.rst | 2 +-
Doc/library/smtplib.rst | 3 ++-
3 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/Doc/library/ftplib.rst b/Doc/library/ftplib.rst
--- a/Doc/library/ftplib.rst
+++ b/Doc/library/ftplib.rst
@@ -406,10 +406,10 @@
.. method:: FTP.close()
Close the connection unilaterally. This should not be applied to an already
- closed connection such as after a successful call to :meth:`quit`. After this
- call the :class:`FTP` instance should not be used any more (after a call to
- :meth:`close` or :meth:`quit` you cannot reopen the connection by issuing
- another :meth:`login` method).
+ closed connection such as after a successful call to :meth:`~FTP.quit`.
+ After this call the :class:`FTP` instance should not be used any more (after
+ a call to :meth:`close` or :meth:`~FTP.quit` you cannot reopen the
+ connection by issuing another :meth:`login` method).
FTP_TLS Objects
diff --git a/Doc/library/poplib.rst b/Doc/library/poplib.rst
--- a/Doc/library/poplib.rst
+++ b/Doc/library/poplib.rst
@@ -116,7 +116,7 @@
.. method:: POP3.pass_(password)
Send password, response includes message count and mailbox size. Note: the
- mailbox on the server is locked until :meth:`quit` is called.
+ mailbox on the server is locked until :meth:`~poplib.quit` is called.
.. method:: POP3.apop(user, secret)
diff --git a/Doc/library/smtplib.rst b/Doc/library/smtplib.rst
--- a/Doc/library/smtplib.rst
+++ b/Doc/library/smtplib.rst
@@ -37,7 +37,8 @@
behavior will be used.
For normal use, you should only require the initialization/connect,
- :meth:`sendmail`, and :meth:`quit` methods. An example is included below.
+ :meth:`sendmail`, and :meth:`~smtplib.quit` methods.
+ An example is included below.
The :class:`SMTP` class supports the :keyword:`with` statement. When used
like this, the SMTP ``QUIT`` command is issued automatically when the
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list