diff --git a/CHANGELOG.txt b/CHANGELOG.txt index ca4590ffa..bb3cc6051 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -25,6 +25,7 @@ Changelog * Allow `register_page_action_menu_item` and `construct_page_action_menu` hooks to override the default menu action (Rahmi Pruitt, Matt Westcott) * Add docs table template rendering example (Matt Westcott) * Add blog about image uploads in Wagtail forms to third party tutorial documentation (a-mere-peasant) + * Fix multiple minor documentation issues (David T Thompson, ryanomor, kailwallin) * Fix: Added line breaks to long filenames on multiple image / document uploader (Kevin Howbrook) * Fix: Added https support for Scribd oEmbed provider (Rodrigo) * Fix: Changed StreamField group labels color so labels are visible (Catherine Farman) diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst index 3ba60f196..07002fd0d 100644 --- a/CONTRIBUTORS.rst +++ b/CONTRIBUTORS.rst @@ -413,6 +413,9 @@ Contributors * Prithvi MK * pySilver * a-mere-peasant +* David T Thompson +* kailwallin +* ryanomor Translators =========== diff --git a/README.md b/README.md index d875c37ae..a740a77fc 100644 --- a/README.md +++ b/README.md @@ -101,7 +101,7 @@ We also welcome translations for Wagtail's interface. Translation work should be ### Thanks -We thank [BrowserStack](https://www.browserstack.com/), who provide the project with free access to their live web-based browser testing tool, and automated Selenium cloud testing. +We thank [BrowserStack](https://www.browserstack.com/), who provides the project with free access to their live web-based browser testing tool, and automated Selenium cloud testing. [![Browserstack](https://cdn.rawgit.com/wagtail/wagtail/master/.github/browserstack-logo.svg)](https://www.browserstack.com/) diff --git a/docs/getting_started/integrating_into_django.rst b/docs/getting_started/integrating_into_django.rst index 66cb517b1..e58e6748f 100644 --- a/docs/getting_started/integrating_into_django.rst +++ b/docs/getting_started/integrating_into_django.rst @@ -76,8 +76,8 @@ Now make the following additions to your ``urls.py`` file: from django.urls import path, re_path, include from wagtail.admin import urls as wagtailadmin_urls - from wagtail.documents import urls as wagtaildocs_urls from wagtail.core import urls as wagtail_urls + from wagtail.documents import urls as wagtaildocs_urls urlpatterns = [ ... diff --git a/docs/releases/2.7.rst b/docs/releases/2.7.rst index e73a6acdf..d7e841027 100644 --- a/docs/releases/2.7.rst +++ b/docs/releases/2.7.rst @@ -44,6 +44,7 @@ Other features * Allow ``register_page_action_menu_item`` and ``construct_page_action_menu`` hooks to override the default menu action (Rahmi Pruitt, Matt Westcott) - thanks to `The Motley Fool `_ for sponsoring review of this feature * Add docs table template rendering example (Matt Westcott) * Add blog about image uploads in Wagtail forms to third party tutorial documentation (a-mere-peasant) + * Fix multiple minor documentation issues (David T Thompson, ryanomor, kailwallin) Bug fixes diff --git a/docs/topics/pages.rst b/docs/topics/pages.rst index b58b60564..50ce7669a 100644 --- a/docs/topics/pages.rst +++ b/docs/topics/pages.rst @@ -226,7 +226,7 @@ For more information, please see :meth:`wagtail.core.models.Page.get_url_parts`. 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. +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 the 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 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.