1
0
mirror of https://github.com/django/django.git synced 2025-10-24 14:16:09 +00:00

Merge pull request #1255 from camilonova/patch-2

Made URL patterns consistent in docs/ref/contrib/flatpages.txt
This commit is contained in:
Tim Graham
2013-06-10 06:47:15 -07:00

View File

@@ -47,7 +47,7 @@ Then either:
3. Add an entry in your URLconf. For example::
urlpatterns = patterns('',
('^pages/', include('django.contrib.flatpages.urls')),
(r'^pages/', include('django.contrib.flatpages.urls')),
)
or:
@@ -74,7 +74,7 @@ There are several ways to include the flat pages in your URLconf. You can
dedicate a particular path to flat pages::
urlpatterns = patterns('',
('^pages/', include('django.contrib.flatpages.urls')),
(r'^pages/', include('django.contrib.flatpages.urls')),
)
You can also set it up as a "catchall" pattern. In this case, it is important