From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Thu, 20 Sep 2012 06:09:24 +0000 (+0300)
Subject: Merge markup fixes in smtpd.rst with 3.2.
X-Git-Tag: v3.3.1rc1~818^2^2~68^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a58d8b05dff849101cec118cc2a4517cf3ffe001;p=python

Merge markup fixes in smtpd.rst with 3.2.
---

a58d8b05dff849101cec118cc2a4517cf3ffe001
diff --cc Doc/library/smtpd.rst
index 6dd477ad06,bfdc7271f7..2ca71ffc3c
--- a/Doc/library/smtpd.rst
+++ b/Doc/library/smtpd.rst
@@@ -168,17 -160,12 +169,17 @@@ SMTPChannel Object
     NOOP     Takes no action.
     QUIT     Closes the connection cleanly.
     MAIL     Accepts the "MAIL FROM:" syntax and stores the supplied address as
 -            :attr:`mailfrom`.
 +            :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.
     ======== ===================================================================