Skip to content

Commit

Permalink
Rolled a number of comments into documentation; thanks to all those w…
Browse files Browse the repository at this point in the history
…ho contributed.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@283 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information
jacobian committed Jul 21, 2005
1 parent 96d69c5 commit 18749c0
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 3 deletions.
3 changes: 2 additions & 1 deletion docs/cache.txt
Expand Up @@ -20,7 +20,8 @@ far the fastest option if you've got the RAM).
Before using the cache, you'll need to tell Django which cache backend you'd
like to use. Do this by setting the ``CACHE_BACKEND`` in your settings file.

The CACHE_BACKEND setting is a quasi-URI. Examples::
The CACHE_BACKEND setting is a "fake" URI (really an unregistered scheme).
Examples:

============================== ===========================================
CACHE_BACKEND Explanation
Expand Down
2 changes: 1 addition & 1 deletion docs/model-api.txt
Expand Up @@ -278,7 +278,7 @@ Field Types
.. _`strftime formatting`: http://docs.python.org/lib/module-time.html#l2h-1941

``FloatField``
A floating-point number. Has two required arguments:
A floating-point number. Has two **required** arguments:

====================== ===================================================
Argument Description
Expand Down
10 changes: 9 additions & 1 deletion docs/templates.txt
Expand Up @@ -40,6 +40,14 @@ template. Each element will be explained later in this document.::
<p>{{ story.tease|truncatewords:"100" }}</p>
{% endfor %}
{% endblock %}

.. admonition:: Philosophy

Why use a text-based template instead of an XML-based one (like Zope's
TAL)? We wanted Django's template language to be usable for more than
just XML/HTML templates -- at the Journal-World we use it for emails,
Javascript, CSV -- you can use the template language for any text-based
format.

What's a variable?
==================
Expand Down Expand Up @@ -198,7 +206,7 @@ Here are some tips for working with inheritance:

* We often prefer to use three-level inheritance: a single base template
for the entire site, a set of mid-level templates for each section of
the site, and then the individual templates for each page. This
the site, and then the individual templates for each view. This
maximizes code reuse, and makes it easier to add items to shared
content areas (like section-wide navigation).

Expand Down

0 comments on commit 18749c0

Please sign in to comment.