Fixed a mistaken link at the top of both class-based-views docs, and a "content" vs. "context" typo in the topic guide. Thanks to SmileyChris and robhudson for the reports.

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

2 files changed, 3 insertions, 3 deletions

diff --git a/docs/ref/class-based-views.txt b/docs/ref/class-based-views.txt
index 7e7c82cb5c..ff0d49b013 100644
--- a/docs/ref/class-based-views.txt
+++ b/docs/ref/class-based-views.txt
@@ -11,7 +11,7 @@ Class-based generic views
 
     For details on the previous generic views implementation,
     see the :doc:`topic guide </topics/generic-views>` and
-    :doc:`detailed reference </topics/generic-views>`.
+    :doc:`detailed reference </ref/generic-views>`.
 
 Writing Web applications can be monotonous, because we repeat certain patterns
 again and again. Django tries to take away some of that monotony at the model
diff --git a/docs/topics/class-based-views.txt b/docs/topics/class-based-views.txt
index 005cd4487a..f0c840f694 100644
--- a/docs/topics/class-based-views.txt
+++ b/docs/topics/class-based-views.txt
@@ -11,7 +11,7 @@ Class-based generic views
 
     For details on the previous generic views implementation,
     see the :doc:`topic guide </topics/generic-views>` and
-    :doc:`detailed reference </topics/generic-views>`.
+    :doc:`detailed reference </ref/generic-views>`.
 
 Writing Web applications can be monotonous, because we repeat certain patterns
 again and again. Django tries to take away some of that monotony at the model
@@ -499,7 +499,7 @@ For example, a simple JSON mixin might look something like this::
             # to do much more complex handling to ensure that arbitrary
             # objects -- such as Django model instances or querysets
             # -- can be serialized as JSON.
-            return json.dumps(content)
+            return json.dumps(context)
 
 Then, you could build a JSON-returning
 :class:`~django.views.generic.detail.DetailView` by mixing your