Merge branch 'esplinr-patch-1' into develop

Fantomas42 · Feb 26, 2017 · df6d469 · df6d469
2 parents 77038e7 + 3815f8e
commit df6d469
Showing 1 changed file with 24 additions and 16 deletions.
diff --git a/docs/getting-started/configuration.rst b/docs/getting-started/configuration.rst
@@ -16,22 +16,30 @@ these steps.
 * Register :mod:`django.contrib.sitemaps` in the :setting:`INSTALLED_APPS` section.
 * Edit your project's URLs and add this code: ::
 
-   from zinnia.sitemaps import TagSitemap
-   from zinnia.sitemaps import EntrySitemap
-   from zinnia.sitemaps import CategorySitemap
-   from zinnia.sitemaps import AuthorSitemap
-
-   sitemaps = {'tags': TagSitemap,
-               'blog': EntrySitemap,
-               'authors': AuthorSitemap,
-               'categories': CategorySitemap,}
-
-   urlpatterns += patterns(
-       'django.contrib.sitemaps.views',
-       url(r'^sitemap.xml$', 'index',
-           {'sitemaps': sitemaps}),
-       url(r'^sitemap-(?P<section>.+)\.xml$', 'sitemap',
-           {'sitemaps': sitemaps}),)
+  from django.contrib.sitemaps.views import index
+  from django.contrib.sitemaps.views import sitemap
+
+  from zinnia.sitemaps import AuthorSitemap
+  from zinnia.sitemaps import CategorySitemap
+  from zinnia.sitemaps import EntrySitemap
+  from zinnia.sitemaps import TagSitemap
+
+  sitemaps = {
+      'tags': TagSitemap,
+      'blog': EntrySitemap,
+      'authors': AuthorSitemap,
+      'categories': CategorySitemap
+  }
+
+  urlpatterns += [
+      url(r'^sitemap.xml$',
+          index,
+          {'sitemaps': sitemaps}),
+      url(r'^sitemap-(?P<section>.+)\.xml$',
+          sitemap,
+          {'sitemaps': sitemaps},
+          name='django.contrib.sitemaps.views.sitemap'),
+  ]
 
 .. _zinnia-templates: