diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 1dfc3f00a..cb7619980 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -22,6 +22,7 @@ Changelog * Fix: Rewrite password change feedback message to be more user-friendly ( Casper Timmers) * Fix: Correct dropdown arrow styling in Firefox, IE11 (Janneke Janssen, Alexs Mathilda) * Fix: Password reset no indicates specific validation errors on certain password restrictions (Lucas Moeskops) + * Fix: Fix a typo within documentation for pages (DanAtShenTech) 2.0.1 (xx.xx.xxxx) - IN DEVELOPMENT diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst index 532327475..a993b54dc 100644 --- a/CONTRIBUTORS.rst +++ b/CONTRIBUTORS.rst @@ -283,6 +283,7 @@ Contributors * Casper Timmers * Kevin Chung * Kim Chee Leong +* Dan Swain Translators =========== diff --git a/docs/releases/2.1.rst b/docs/releases/2.1.rst index 90b29ed20..9d33449ca 100644 --- a/docs/releases/2.1.rst +++ b/docs/releases/2.1.rst @@ -36,6 +36,7 @@ Bug fixes * Rewrite password change feedback message to be more user-friendly ( Casper Timmers) * Correct dropdown arrow styling in Firefox, IE11 (Janneke Janssen, Alexs Mathilda) * Password reset no indicates specific validation errors on certain password restrictions (Lucas Moeskops) + * Fix a typo within documentation for pages (DanAtShenTech) Upgrade considerations diff --git a/docs/topics/pages.rst b/docs/topics/pages.rst index 52e49d83b..5837002fd 100644 --- a/docs/topics/pages.rst +++ b/docs/topics/pages.rst @@ -228,8 +228,7 @@ Obtaining URLs for page instances The ``Page.get_url(request)`` method can be called whenever a page URL is needed. It defaults to returning local URLs (not including the protocol or domain) if it can detect that the page is on current site (via ``request.site``); otherwise, a full URL including the protocol and domain is returned. Whenever possible, the optional ``request`` argument should be included to enable per-request caching of site-level URL information and facilitate the generation of local URLs. -A common use case for ``get_url(request)`` is in any custom template tag your project may include for generating navigation menus. When writing a such a -custom template tag, ensure it includes ``takes_context=True`` and use ``context.get('request')`` to safely pass the +A common use case for ``get_url(request)`` is in any custom template tag your project may include for generating navigation menus. When writing such a custom template tag, ensure that it includes ``takes_context=True`` and use ``context.get('request')`` to safely pass the request or ``None`` if no request exists in the context. For more information, please see :meth:`wagtail.core.models.Page.get_url`.