mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-08-09 19:39:26 +00:00
Code Issues 32 Releases Wiki Activity

Fixed #23527 -- Removed Cheetah references in docs

Browse Source 
Thanks to @aaugustin for submitting the ticket.
This commit is contained in:
Ola Sitarska 2014-09-21 17:30:18 +02:00 committed by Baptiste Mispelon
parent ee442e97da
commit b9b8895acb
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/faq/usage.txt
View File

@ -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?
------------------------------------------- -------------------------------------------

4
docs/ref/contrib/csrf.txt
View File

@ -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

2
docs/ref/templates/api.txt
View File

@ -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()`.

4
docs/topics/templates.txt
View File

@ -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
========= =========