[Python-checkins] cpython (merge 3.2 -> default): Merge markup fixes in smtpd.rst with 3.2.
ezio.melotti
python-checkins at python.org
Thu Sep 20 08:09:43 CEST 2012
http://hg.python.org/cpython/rev/2ac0ac77390f
changeset: 79059:2ac0ac77390f
parent: 79057:3ce8b2700de4
parent: 79058:c74203b33c4e
user: Ezio Melotti <ezio.melotti at gmail.com>
date: Thu Sep 20 09:09:24 2012 +0300
summary:
Merge markup fixes in smtpd.rst with 3.2.
files:
Doc/library/smtpd.rst | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/Doc/library/smtpd.rst b/Doc/library/smtpd.rst
--- a/Doc/library/smtpd.rst
+++ b/Doc/library/smtpd.rst
@@ -111,12 +111,13 @@
.. attribute:: addr
Holds the address of the client, the second value returned by
- socket.accept()
+ :func:`socket.accept <socket.socket.accept>`
.. attribute:: received_lines
Holds a list of the line strings (decoded using UTF-8) received from
- the client. The lines have their "\\r\\n" line ending translated to "\\n".
+ the client. The lines have their ``"\r\n"`` line ending translated to
+ ``"\n"``.
.. attribute:: smtp_state
@@ -141,12 +142,12 @@
.. attribute:: received_data
Holds a string containing all of the data sent by the client during the
- DATA state, up to but not including the terminating "\r\n.\r\n".
+ DATA state, up to but not including the terminating ``"\r\n.\r\n"``.
.. attribute:: fqdn
Holds the fully-qualified domain name of the server as returned by
- ``socket.getfqdn()``.
+ :func:`socket.getfqdn`.
.. attribute:: peer
@@ -170,14 +171,14 @@
MAIL Accepts the "MAIL FROM:" syntax and stores the supplied address as
:attr:`mailfrom`. In extended command mode, accepts the
:rfc:`1870` SIZE attribute and responds appropriately based on the
- value of ``data_size_limit``.
+ value of *data_size_limit*.
RCPT Accepts the "RCPT TO:" syntax and stores the supplied addresses in
the :attr:`rcpttos` list.
RSET Resets the :attr:`mailfrom`, :attr:`rcpttos`, and
:attr:`received_data`, but not the greeting.
DATA Sets the internal state to :attr:`DATA` and stores remaining lines
from the client in :attr:`received_data` until the terminator
- "\r\n.\r\n" is received.
+ ``"\r\n.\r\n"`` is received.
HELP Returns minimal information on command syntax
VRFY Returns code 252 (the server doesn't know if the address is valid)
EXPN Reports that the command is not implemented.
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list