Changeset 7979 for django/branches/gis/django/conf

Timestamp:

07/19/08 08:30:47 (6 months ago)

Author:

jbronn

Message:

gis: Merged revisions 7921,7926-7928,7938-7941,7945-7947,7949-7950,7952,7955-7956,7961,7964-7968,7970-7978 via svnmerge from trunk.

This includes the newforms-admin branch, and thus is backwards-incompatible. The geographic admin is _not_ in this changeset, and is forthcoming.

Files:

• django/branches/gis (modified) (1 prop)
• django/branches/gis/django/conf/project_template/urls.py (modified) (2 diffs)

django/branches/gis/django/conf/project_template/urls.py

@@ -1 +1 @@
-from django.conf.urls.defaults import *
+
+# Uncomment this for admin:
+#from django.contrib import admin
-
-urlpatterns = patterns('',
@@ -5 +8 @@
-    # (r'^{{ project_name }}/', include('{{ project_name }}.foo.urls')),
-
+    # Uncomment this for admin docs:
+    #(r'^admin/doc/', include('django.contrib.admindocs.urls')),
+
-    # Uncomment this for admin:
-#     (r'^admin/', include('django.contrib.admin.urls')
+    #('^admin/(.*)', admin.site.root
-)