Fixed #18033 -- Removed function-based generic views, as per official deprecation timeline. Rest in peace! Thanks Anssi Kääriäinen for the review.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17937 bcc190cf-cafb-0310-a4f2-bffc1f526a37

2 files changed, 7 insertions, 7 deletions

diff --git a/docs/topics/http/generic-views.txt b/docs/topics/http/generic-views.txt
index 15f895ea78..fdaa27dcd0 100644
--- a/docs/topics/http/generic-views.txt
+++ b/docs/topics/http/generic-views.txt
@@ -2,4 +2,4 @@
 Generic views
 =============
 
-See :doc:`/ref/generic-views`.
+See :doc:`/ref/class-based-views`.
diff --git a/docs/topics/http/urls.txt b/docs/topics/http/urls.txt
index 73c06ca2ae..ee1d4e8616 100644
--- a/docs/topics/http/urls.txt
+++ b/docs/topics/http/urls.txt
@@ -416,8 +416,8 @@ Old::
     from django.conf.urls import patterns, url, include
 
     urlpatterns = patterns('',
-        (r'^$', 'django.views.generic.date_based.archive_index'),
-        (r'^(?P<year>\d{4})/(?P<month>[a-z]{3})/$', 'django.views.generic.date_based.archive_month'),
+        (r'^$', 'myapp.views.app_index'),
+        (r'^(?P<year>\d{4})/(?P<month>[a-z]{3})/$', 'myapp.views.month_display'),
         (r'^tag/(?P<tag>\w+)/$', 'weblog.views.tag'),
     )
 
@@ -425,9 +425,9 @@ New::
 
     from django.conf.urls import patterns, url, include
 
-    urlpatterns = patterns('django.views.generic.date_based',
-        (r'^$', 'archive_index'),
-        (r'^(?P<year>\d{4})/(?P<month>[a-z]{3})/$','archive_month'),
+    urlpatterns = patterns('myapp.views',
+        (r'^$', 'app_index'),
+        (r'^(?P<year>\d{4})/(?P<month>[a-z]{3})/$','month_display'),
     )
 
     urlpatterns += patterns('weblog.views',
@@ -579,7 +579,7 @@ In this example, for a request to ``/blog/2005/``, Django will call the
 
     year='2005', foo='bar'
 
-This technique is used in :doc:`generic views </ref/generic-views>` and in the
+This technique is used in the
 :doc:`syndication framework </ref/contrib/syndication>` to pass metadata and
 options to views.