From ea6136c33853d060ce1649a95cc5feac9ace0ce9 Mon Sep 17 00:00:00 2001
From: Benjamin Bach <benjamin@overtag.dk>
Date: Wed, 17 Oct 2018 22:45:17 +0200
Subject: [PATCH] Ensure that instructions for urls and settings are correctly
 understood

---
 docs/installation.rst | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/docs/installation.rst b/docs/installation.rst
index b14f4135..086ec77e 100644
--- a/docs/installation.rst
+++ b/docs/installation.rst
@@ -100,6 +100,7 @@ to see the current default setting for this variable.
     TEMPLATES = [
         {
             'BACKEND': 'django.template.backends.django.DjangoTemplates',
+            'APP_DIRS': True,
             # ...
             'OPTIONS': {
                 'context_processors': [
@@ -154,14 +155,18 @@ point to the root article:
 Include urlpatterns
 ~~~~~~~~~~~~~~~~~~~
 
-To integrate the wiki to your existing application, you should add the
-following lines at the end of your project's ``urls.py``.
+To integrate the wiki in your existing application, you should ensure the
+following lines are included in your project's ``urls.py``.
 
 .. code-block:: python
 
-    urlpatterns += [
-        url(r'^notifications/', include('django_nyt.urls')),
-        url(r'', include('wiki.urls'))
+    from django.contrib import admin
+    from django.urls import path, include
+
+    urlpatterns = [
+        path('admin/', admin.site.urls),
+        path('notifications/', include('django_nyt.urls')),
+        path('', include('wiki.urls'))
     ]
 
 
-- 
2.45.2