Commit a643e4d2 authored by Tim Graham's avatar Tim Graham
Browse files

Merge pull request #1255 from camilonova/patch-2 

Made URL patterns consistent in docs/ref/contrib/flatpages.txt
parents af70dfcf 706eced9

docs/ref/contrib/flatpages.txt

+2 −2
Original line number Diff line number Diff line
@@ -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