From 1799853b55f1cc3ceef22d3db08367528525bee3 Mon Sep 17 00:00:00 2001 From: Matt Westcott <matt@west.co.tt> Date: Wed, 14 Feb 2018 14:06:08 +0000 Subject: [PATCH] Fix 'email notifications' link --- docs/advanced_topics/settings.rst | 4 ++-- docs/releases/1.4.rst | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/advanced_topics/settings.rst b/docs/advanced_topics/settings.rst index 32b07310a6..f9dd281358 100644 --- a/docs/advanced_topics/settings.rst +++ b/docs/advanced_topics/settings.rst @@ -279,6 +279,8 @@ This specifies whether password fields are shown when creating or editing users This specifies whether password is a required field when creating a new user. True by default; ignored if ``WAGTAILUSERS_PASSWORD_ENABLED`` is false. If this is set to False, and the password field is left blank when creating a user, then that user will have no usable password, and will not be able to log in unless an alternative authentication system such as LDAP is set up. +.. _email_notifications: + Email Notifications ------------------- @@ -288,8 +290,6 @@ Email Notifications Wagtail sends email notifications when content is submitted for moderation, and when the content is accepted or rejected. This setting lets you pick which email address these automatic notifications will come from. If omitted, Django will fall back to using the ``DEFAULT_FROM_EMAIL`` variable if set, and ``webmaster@localhost`` if not. -.. _email_notifications_format: - .. code-block:: python WAGTAILADMIN_NOTIFICATION_USE_HTML = True diff --git a/docs/releases/1.4.rst b/docs/releases/1.4.rst index 20169f1a24..3090f196ac 100644 --- a/docs/releases/1.4.rst +++ b/docs/releases/1.4.rst @@ -77,7 +77,7 @@ Minor features * The ``Page`` model now has two new methods ``get_site()`` and ``get_url_parts()`` to aid with customising the page URL generation logic * Upgraded jQuery to 2.2.1 (Charlie Choiniere) * Multiple homepage summary items (``construct_homepage_summary_items`` hook) now better vertically spaced (Nicolas Kuttler) - * Email notifications can now be sent in HTML format. See :ref:`email_notifications_format` (Mike Dingjan) + * Email notifications can now be sent in HTML format. See :ref:`email_notifications` (Mike Dingjan) * ``StreamBlock`` now has provision for throwing non-field-specific validation errors * Wagtail now works with Willow 0.3, which supports auto-correcting the orientation of images based on EXIF data * New translations for Hungarian, Swedish (Sweden) and Turkish