浏览代码

Fixed #23527 -- Removed Cheetah references in docs

Thanks to @aaugustin for submitting the ticket.
Ola Sitarska 10 年之前
父节点
当前提交
b9b8895acb
共有 4 个文件被更改,包括 6 次插入6 次删除
  1. 1 1
      docs/faq/usage.txt
  2. 2 2
      docs/ref/contrib/csrf.txt
  3. 1 1
      docs/ref/templates/api.txt
  4. 2 2
      docs/topics/templates.txt

+ 1 - 1
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,
 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.
 but we recognize that choosing a template language runs close to religion.
 There's nothing about Django that requires using the template language, so
 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?
 Do I have to use your model/database layer?
 -------------------------------------------
 -------------------------------------------

+ 2 - 2
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
 set the token in your forms manually after making sure it's available in the
 template context.
 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:
 following:
 
 
 .. code-block:: html
 .. code-block:: html
 
 
     <div style="display:none">
     <div style="display:none">
-        <input type="hidden" name="csrfmiddlewaretoken" value="$csrf_token"/>
+        <input type="hidden" name="csrfmiddlewaretoken" value="{{ csrf_token }}">
     </div>
     </div>
 
 
 You can use JavaScript similar to the :ref:`AJAX code <csrf-ajax>` above to get
 You can use JavaScript similar to the :ref:`AJAX code <csrf-ajax>` above to get

+ 1 - 1
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
 The Django ``Template`` and ``Loader`` classes implement a simple API for
 loading and rendering templates. By providing some simple wrapper classes that
 loading and rendering templates. By providing some simple wrapper classes that
 implement this API we can use third party template systems like `Jinja2
 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
 allows us to use third-party template libraries without giving up useful Django
 features like the Django ``Context`` object and handy shortcuts like
 features like the Django ``Context`` object and handy shortcuts like
 :func:`~django.shortcuts.render_to_response()`.
 :func:`~django.shortcuts.render_to_response()`.

+ 2 - 2
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
 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
 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_
 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
 .. 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/
 .. _`The Django template language: For Python programmers`: ../templates_python/
 .. _Smarty: http://www.smarty.net/
 .. _Smarty: http://www.smarty.net/
-.. _CheetahTemplate: http://www.cheetahtemplate.org/
+.. _Jinja2: http://jinja.pocoo.org/
 
 
 Templates
 Templates
 =========
 =========