diff options
author | Ezio Melotti <ezio.melotti@gmail.com> | 2012-09-20 06:09:24 (GMT) |
---|---|---|
committer | Ezio Melotti <ezio.melotti@gmail.com> | 2012-09-20 06:09:24 (GMT) |
commit | a58d8b05dff849101cec118cc2a4517cf3ffe001 (patch) | |
tree | eee488b20fcb60773d3b5d9a5cce93029f00b7d2 | |
parent | be54d6d2f3a4f2f73caf4980046e53bfc5a6901a (diff) | |
parent | 8bbcb584ddc74e6b2a58ee5bda8387776300d815 (diff) | |
download | cpython-a58d8b05dff849101cec118cc2a4517cf3ffe001.zip cpython-a58d8b05dff849101cec118cc2a4517cf3ffe001.tar.gz cpython-a58d8b05dff849101cec118cc2a4517cf3ffe001.tar.bz2 |
Merge markup fixes in smtpd.rst with 3.2.
-rw-r--r-- | Doc/library/smtpd.rst | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/Doc/library/smtpd.rst b/Doc/library/smtpd.rst index 6dd477a..2ca71ff 100644 --- a/Doc/library/smtpd.rst +++ b/Doc/library/smtpd.rst @@ -111,12 +111,13 @@ SMTPChannel Objects .. 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 @@ SMTPChannel Objects .. 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 @@ SMTPChannel Objects 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. |