Merge markup fixes in smtpd.rst with 3.2.