diff --git a/docs/faq/usage.txt b/docs/faq/usage.txt
index 340c737518..bd1c250896 100644
--- a/docs/faq/usage.txt
+++ b/docs/faq/usage.txt
@@ -19,7 +19,7 @@ I can't stand your template language. Do I have to use it?
 We happen to think our template engine is the best thing since chunky bacon,
 but we recognize that choosing a template language runs close to religion.
 There's nothing about Django that requires using the template language, so
-if you're attached to Jinja2, Cheetah, or whatever, feel free to use those.
+if you're attached to Jinja2, Mako, or whatever, feel free to use those.
 
 Do I have to use your model/database layer?
 -------------------------------------------
diff --git a/docs/ref/contrib/csrf.txt b/docs/ref/contrib/csrf.txt
index be0c7ddcd1..ac6c55a74c 100644
--- a/docs/ref/contrib/csrf.txt
+++ b/docs/ref/contrib/csrf.txt
@@ -164,13 +164,13 @@ When using a different template engine than Django's built-in engine, you can
 set the token in your forms manually after making sure it's available in the
 template context.
 
-For example, in the Cheetah template language, your form could contain the
+For example, in the Jinja2 template language, your form could contain the
 following:
 
 .. code-block:: html
 
     <div style="display:none">
-        <input type="hidden" name="csrfmiddlewaretoken" value="$csrf_token"/>
+        <input type="hidden" name="csrfmiddlewaretoken" value="{{ csrf_token }}">
     </div>
 
 You can use JavaScript similar to the :ref:`AJAX code <csrf-ajax>` above to get
diff --git a/docs/ref/templates/api.txt b/docs/ref/templates/api.txt
index a58b3d5060..6e48611f4a 100644
--- a/docs/ref/templates/api.txt
+++ b/docs/ref/templates/api.txt
@@ -953,7 +953,7 @@ Using an alternative template language
 The Django ``Template`` and ``Loader`` classes implement a simple API for
 loading and rendering templates. By providing some simple wrapper classes that
 implement this API we can use third party template systems like `Jinja2
-<http://jinja.pocoo.org/docs/>`_ or `Cheetah <http://www.cheetahtemplate.org/>`_. This
+<http://jinja.pocoo.org/docs/>`_. This
 allows us to use third-party template libraries without giving up useful Django
 features like the Django ``Context`` object and handy shortcuts like
 :func:`~django.shortcuts.render_to_response()`.
diff --git a/docs/topics/templates.txt b/docs/topics/templates.txt
index f358a97d35..bd59c1a33e 100644
--- a/docs/topics/templates.txt
+++ b/docs/topics/templates.txt
@@ -11,7 +11,7 @@ The Django template language
 Django's template language is designed to strike a balance between power and
 ease. It's designed to feel comfortable to those used to working with HTML. If
 you have any exposure to other text-based template languages, such as Smarty_
-or CheetahTemplate_, you should feel right at home with Django's templates.
+or Jinja2_, you should feel right at home with Django's templates.
 
 .. admonition:: Philosophy
 
@@ -31,7 +31,7 @@ or CheetahTemplate_, you should feel right at home with Django's templates.
 
 .. _`The Django template language: For Python programmers`: ../templates_python/
 .. _Smarty: http://www.smarty.net/
-.. _CheetahTemplate: http://www.cheetahtemplate.org/
+.. _Jinja2: http://jinja.pocoo.org/
 
 Templates
 =========