From 152c385f4de37558fe4e522abad5b97f0cf7ddce Mon Sep 17 00:00:00 2001
From: Sébastien Piquemal
Date: Wed, 25 Jan 2012 00:11:54 +0200
Subject: enhanced request how-to + example

---
 examples/urls.py | 1 +
 1 file changed, 1 insertion(+)

(limited to 'examples/urls.py')

diff --git a/examples/urls.py b/examples/urls.py
index 08d97a14..b71c0a20 100644
--- a/examples/urls.py
+++ b/examples/urls.py
@@ -11,6 +11,7 @@ urlpatterns = patterns('',
     (r'^pygments/', include('pygments_api.urls')),
     (r'^blog-post/', include('blogpost.urls')),
     (r'^permissions-example/', include('permissionsexample.urls')),
+    (r'^request-example/', include('requestexample.urls')),
 
     (r'^', include('djangorestframework.urls')),
 )
-- 
cgit v1.2.3


From 1cde31c86d9423e9b7a7409c2ef2ba7c0500e47f Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Sat, 25 Feb 2012 18:45:17 +0000
Subject: Massive merge

---
 examples/urls.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'examples/urls.py')

diff --git a/examples/urls.py b/examples/urls.py
index f246828a..fda7942f 100644
--- a/examples/urls.py
+++ b/examples/urls.py
@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import patterns, include
+from django.conf.urls.defaults import patterns, include, url
 from sandbox.views import Sandbox
 try:
     from django.contrib.staticfiles.urls import staticfiles_urlpatterns
@@ -15,9 +15,7 @@ urlpatterns = patterns('',
     (r'^pygments/', include('pygments_api.urls')),
     (r'^blog-post/', include('blogpost.urls')),
     (r'^permissions-example/', include('permissionsexample.urls')),
-    (r'^request-example/', include('requestexample.urls')),
-
-    (r'^', include('djangorestframework.urls')),
+    url(r'^restframework/', include('djangorestframework.urls', namespace='djangorestframework')),
 )
 
 urlpatterns += staticfiles_urlpatterns()
-- 
cgit v1.2.3


From eea2aa04378d27d79e7aba12ce95c697148bd57e Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Wed, 29 Aug 2012 19:54:38 +0100
Subject: Remove examples (to be moved to a seperate project)

---
 examples/urls.py | 21 ---------------------
 1 file changed, 21 deletions(-)
 delete mode 100644 examples/urls.py

(limited to 'examples/urls.py')

diff --git a/examples/urls.py b/examples/urls.py
deleted file mode 100644
index fda7942f..00000000
--- a/examples/urls.py
+++ /dev/null
@@ -1,21 +0,0 @@
-from django.conf.urls.defaults import patterns, include, url
-from sandbox.views import Sandbox
-try:
-    from django.contrib.staticfiles.urls import staticfiles_urlpatterns
-except ImportError:  # Django <= 1.2
-    from staticfiles.urls import staticfiles_urlpatterns
-
-
-urlpatterns = patterns('',
-    (r'^$', Sandbox.as_view()),
-    (r'^resource-example/', include('resourceexample.urls')),
-    (r'^model-resource-example/', include('modelresourceexample.urls')),
-    (r'^mixin/', include('mixin.urls')),
-    (r'^object-store/', include('objectstore.urls')),
-    (r'^pygments/', include('pygments_api.urls')),
-    (r'^blog-post/', include('blogpost.urls')),
-    (r'^permissions-example/', include('permissionsexample.urls')),
-    url(r'^restframework/', include('djangorestframework.urls', namespace='djangorestframework')),
-)
-
-urlpatterns += staticfiles_urlpatterns()
-- 
cgit v1.2.3