diff --git a/aiosmtpd/docs/NEWS.rst b/aiosmtpd/docs/NEWS.rst index 9144b855..ad9090ab 100644 --- a/aiosmtpd/docs/NEWS.rst +++ b/aiosmtpd/docs/NEWS.rst @@ -14,7 +14,7 @@ Added Fixed/Improved -------------- -* All Controllers now have more rationale design, as they are now composited from a Base + a Mixin +* All Controllers now have more rational design, as they are now composited from a Base + a Mixin * A whole bunch of annotations diff --git a/aiosmtpd/docs/concepts.rst b/aiosmtpd/docs/concepts.rst index 863eb5e6..8a1f739d 100644 --- a/aiosmtpd/docs/concepts.rst +++ b/aiosmtpd/docs/concepts.rst @@ -2,6 +2,8 @@ Concepts ========== +This guide assumes familiarity with the SMTP protocol. + There are two general ways you can run the SMTP server, via the :ref:`command line ` or :ref:`programmatically `. diff --git a/aiosmtpd/docs/intro.rst b/aiosmtpd/docs/intro.rst index 808920d6..35f213cf 100644 --- a/aiosmtpd/docs/intro.rst +++ b/aiosmtpd/docs/intro.rst @@ -9,7 +9,10 @@ Simple Mail Transfer Protocol (SMTP) and Local Mail Transfer Protocol (LMTP). It is derived from `Python 3.5's smtpd.py `__ standard library module, and provides both a command line interface and an API -for use in testing applications that send email. +for use in testing applications that send email. Since the `smtpd module was +removed in Python 3.12 +`__, following :pep:`594#smtpd`, aiosmtpd is the recommended +replacement. Inspiration for this library comes from several other packages: