From 1d03c364215d3936b63d227572ae269ac92d3868 Mon Sep 17 00:00:00 2001 From: Nick Smith Date: Mon, 12 Jul 2021 16:25:53 +0100 Subject: [PATCH] Change some word choices in the docs This replaces several US English dialectical uses of _regular_ with British English equivalents _normal_ or _standard_. This is the result of a search of the docs for the string 'regular', rather than due to any US English seen in the user interface. This search also found one use of _regularly_ where _often_ was closer to the intended meaning, a change which is less about dialect than about word choice. --- docs/advanced_topics/amp.rst | 2 +- docs/reference/contrib/forms/index.rst | 2 +- docs/reference/contrib/routablepage.rst | 2 +- docs/reference/contrib/settings.rst | 2 +- docs/reference/jinja2.rst | 2 +- docs/topics/writing_templates.rst | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/advanced_topics/amp.rst b/docs/advanced_topics/amp.rst index 8a45dd9abb..b6f3326167 100644 --- a/docs/advanced_topics/amp.rst +++ b/docs/advanced_topics/amp.rst @@ -223,7 +223,7 @@ Using a different page template when AMP mode is active ------------------------------------------------------- You're probably not going to want to use the same templates on the AMP site as -you do on the regular web site. Let's add some logic in to make Wagtail use a +you do on the normal web site. Let's add some logic in to make Wagtail use a separate template whenever a page is served with AMP enabled. We can use a mixin, which allows us to re-use the logic on different page types. diff --git a/docs/reference/contrib/forms/index.rst b/docs/reference/contrib/forms/index.rst index af88a25fc7..07d0b479af 100644 --- a/docs/reference/contrib/forms/index.rst +++ b/docs/reference/contrib/forms/index.rst @@ -85,7 +85,7 @@ You now need to create two templates named ``form_page.html`` and ``form_page_la -``form_page_landing.html`` is a regular Wagtail template, displayed after the user makes a successful form submission, `form_submission` will available in this template. If you want to dynamically override the landing page template, you can do so with the ``get_landing_page_template`` method (in the same way that you would with ``get_template``). +``form_page_landing.html`` is a standard Wagtail template, displayed after the user makes a successful form submission, `form_submission` will available in this template. If you want to dynamically override the landing page template, you can do so with the ``get_landing_page_template`` method (in the same way that you would with ``get_template``). .. _wagtailforms_formsubmissionpanel: diff --git a/docs/reference/contrib/routablepage.rst b/docs/reference/contrib/routablepage.rst index 71ce46fe46..3f0fac87fd 100644 --- a/docs/reference/contrib/routablepage.rst +++ b/docs/reference/contrib/routablepage.rst @@ -10,7 +10,7 @@ The ``RoutablePageMixin`` mixin provides a convenient way for a page to respond A ``Page`` using ``RoutablePageMixin`` exists within the page tree like any other page, but URL paths underneath it are checked against a list of patterns. If none of the patterns match, control is passed to subpages as usual (or failing that, a 404 error is thrown). -By default a route for ``r'^$'`` exists, which serves the content exactly like a regular ``Page`` would. It can be overridden by using ``@route(r'^$')`` on any other method of the inheriting class. +By default a route for ``r'^$'`` exists, which serves the content exactly like a normal ``Page`` would. It can be overridden by using ``@route(r'^$')`` on any other method of the inheriting class. Installation diff --git a/docs/reference/contrib/settings.rst b/docs/reference/contrib/settings.rst index 3b69c59af1..53418b715e 100644 --- a/docs/reference/contrib/settings.rst +++ b/docs/reference/contrib/settings.rst @@ -282,7 +282,7 @@ Utilising the ``page_url`` setting shortcut ------------------------------------------- If, like in the previous section, your settings model references pages, -and you regularly need to output the URLs of those pages in your project, +and you often need to output the URLs of those pages in your project, you can likely use the setting model's ``page_url`` shortcut to do that more cleanly. For example, instead of doing the following: diff --git a/docs/reference/jinja2.rst b/docs/reference/jinja2.rst index 8f7aa16f59..0d5cbc1223 100644 --- a/docs/reference/jinja2.rst +++ b/docs/reference/jinja2.rst @@ -9,7 +9,7 @@ Wagtail supports Jinja2 templating for all front end features. More information Configuring Django ================== -Django needs to be configured to support Jinja2 templates. As the Wagtail admin is written using regular Django templates, Django has to be configured to use both templating engines. Add the following configuration to the ``TEMPLATES`` setting for your app: +Django needs to be configured to support Jinja2 templates. As the Wagtail admin is written using standard Django templates, Django has to be configured to use both templating engines. Add the following configuration to the ``TEMPLATES`` setting for your app: .. code-block:: python diff --git a/docs/topics/writing_templates.rst b/docs/topics/writing_templates.rst index ea0d59e756..1fd470d080 100644 --- a/docs/topics/writing_templates.rst +++ b/docs/topics/writing_templates.rst @@ -244,7 +244,7 @@ Wagtail User Bar This tag provides a contextual flyout menu for logged-in users. The menu gives editors the ability to edit the current page or add a child page, besides the options to show the page in the Wagtail page explorer or jump to the Wagtail admin dashboard. Moderators are also given the ability to accept or reject a page being previewed as part of content moderation. -This tag may be used on regular Django views, without page object. The user bar will contain one item pointing to the admin. +This tag may be used on standard Django views, without page object. The user bar will contain one item pointing to the admin. We recommend putting the tag near the top of the ```` element so keyboard users can reach it. You should consider putting the tag after any `skip links `_ but before the navigation and main content of your page.