From 9afcd1a8be0d1538dfdcfdf5af277c50d57d7044 Mon Sep 17 00:00:00 2001 From: Matt Westcott Date: Thu, 18 Oct 2018 09:01:32 +0100 Subject: [PATCH] Remove notes about URL confs for Django<2.0 --- docs/advanced_topics/i18n/index.rst | 5 ----- docs/advanced_topics/settings.rst | 5 ----- docs/getting_started/integrating_into_django.rst | 5 ----- 3 files changed, 15 deletions(-) diff --git a/docs/advanced_topics/i18n/index.rst b/docs/advanced_topics/i18n/index.rst index 6b2758ea5..2b2ec0a5b 100644 --- a/docs/advanced_topics/i18n/index.rst +++ b/docs/advanced_topics/i18n/index.rst @@ -108,11 +108,6 @@ This feature is enabled through the project's root URL configuration. Just put t re_path(r'', include(wagtail_urls)), ) -.. important:: - - The example above assumes you are using Django version 2.0 or later. If you are using a Django version earlier than 2.0, you should rename all occurrences of re_path() to url(). For example: ``from django.conf.urls import include, url`` instead of ``from django.conf.urls import include, re_path`` and ``url(r'^django-admin/', include(admin.site.urls)),`` instead of ``re_path(r'^django-admin/', include(admin.site.urls)),``. - (`read more `_). - You can implement switching between languages by changing the part at the beginning of the URL. As each language has its own URL, it also works well with just about any caching setup. diff --git a/docs/advanced_topics/settings.rst b/docs/advanced_topics/settings.rst index e129426d9..3f21e7ca6 100644 --- a/docs/advanced_topics/settings.rst +++ b/docs/advanced_topics/settings.rst @@ -609,11 +609,6 @@ URL Patterns re_path(r'', include(wagtail_urls)), ] -.. important:: - - The example above assumes you are using Django version 2.0 or later. If you are using a Django version earlier than 2.0, you should rename all occurrences of re_path() to url(). For example: ``url(r'^django-admin/', include(admin.site.urls)),`` instead of ``re_path(r'^django-admin/', include(admin.site.urls)),``. - (`read more `_). - This block of code for your project's ``urls.py`` does a few things: * Load the vanilla Django admin interface to ``/django-admin/`` diff --git a/docs/getting_started/integrating_into_django.rst b/docs/getting_started/integrating_into_django.rst index 5743ca16b..047c0223c 100644 --- a/docs/getting_started/integrating_into_django.rst +++ b/docs/getting_started/integrating_into_django.rst @@ -77,11 +77,6 @@ Now make the following additions to your ``urls.py`` file: ... ] -.. important:: - - The example above assumes you are using Django version 2.0 or later. If you are using a Django version earlier than 2.0, you should rename all occurrences of re_path() to url(). For example: ``from django.urls import path, url, include`` instead of ``from django.urls import path, re_path, include`` and ``url(r'^cms/', include(wagtailadmin_urls)),`` instead of ``re_path(r'^cms/', include(wagtailadmin_urls)),``. - (`read more `_). - The URL paths here can be altered as necessary to fit your project's URL scheme. ``wagtailadmin_urls`` provides the admin interface for Wagtail. This is separate from the Django admin interface (``django.contrib.admin``); Wagtail-only projects typically host the Wagtail admin at ``/admin/``, but if this would clash with your project's existing admin backend then an alternative path can be used, such as ``/cms/`` here.