summaryrefslogtreecommitdiff
path: root/docs/topics
diff options
context:
space:
mode:
authorNick Pope <nick.pope@flightdataservices.com>2020-04-30 10:33:04 +0100
committerMariusz Felisiak <felisiak.mariusz@gmail.com>2020-05-13 09:14:04 +0200
commitfeb91dbda13974f84eac52dccdc0de1ddb636616 (patch)
treea05ef9071d8201a4218509e7293864ad6d2965df /docs/topics
parenta9337b4add01e50ed8ff8d3ef44099a08cba475c (diff)
Used :mimetype: role in various docs.
Diffstat (limited to 'docs/topics')
-rw-r--r--docs/topics/auth/default.txt4
-rw-r--r--docs/topics/email.txt17
2 files changed, 11 insertions, 10 deletions
diff --git a/docs/topics/auth/default.txt b/docs/topics/auth/default.txt
index be45723bde..343c44084e 100644
--- a/docs/topics/auth/default.txt
+++ b/docs/topics/auth/default.txt
@@ -1287,8 +1287,8 @@ implementation details see :ref:`using-the-views`.
default context data passed to the template.
* ``html_email_template_name``: The full name of a template to use
- for generating a ``text/html`` multipart email with the password reset
- link. By default, HTML email is not sent.
+ for generating a :mimetype:`text/html` multipart email with the password
+ reset link. By default, HTML email is not sent.
* ``extra_email_context``: A dictionary of context data that will be
available in the email template. It can be used to override default
diff --git a/docs/topics/email.txt b/docs/topics/email.txt
index 46b1bb3ad5..6ea80e44ca 100644
--- a/docs/topics/email.txt
+++ b/docs/topics/email.txt
@@ -341,15 +341,16 @@ The class has the following methods:
message.attach('design.png', img_data, 'image/png')
- If you specify a ``mimetype`` of ``message/rfc822``, it will also accept
- :class:`django.core.mail.EmailMessage` and :py:class:`email.message.Message`.
+ If you specify a ``mimetype`` of :mimetype:`message/rfc822`, it will also
+ accept :class:`django.core.mail.EmailMessage` and
+ :py:class:`email.message.Message`.
- For a ``mimetype`` starting with ``text/``, content is expected to be a
- string. Binary data will be decoded using UTF-8, and if that fails, the
- MIME type will be changed to ``application/octet-stream`` and the data will
- be attached unchanged.
+ For a ``mimetype`` starting with :mimetype:`text/`, content is expected to
+ be a string. Binary data will be decoded using UTF-8, and if that fails,
+ the MIME type will be changed to :mimetype:`application/octet-stream` and
+ the data will be attached unchanged.
- In addition, ``message/rfc822`` attachments will no longer be
+ In addition, :mimetype:`message/rfc822` attachments will no longer be
base64-encoded in violation of :rfc:`2046#section-5.2.1`, which can cause
issues with displaying the attachments in `Evolution`__ and `Thunderbird`__.
@@ -363,7 +364,7 @@ The class has the following methods:
message.attach_file('/images/weather_map.png')
- For MIME types starting with ``text/``, binary data is handled as in
+ For MIME types starting with :mimetype:`text/`, binary data is handled as in
``attach()``.
Sending alternative content types