summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorJacob Kaplan-Moss <jacob@jacobian.org>2005-07-21 19:05:10 +0000
committerJacob Kaplan-Moss <jacob@jacobian.org>2005-07-21 19:05:10 +0000
commit18749c00602edeafd0b10da807ec55767fd6a6c8 (patch)
tree439ca4cef7fea496f0208d45ee77a74575c7df71 /docs
parent96d69c5b5faa07c3be471b9a9c849b40a305e5f4 (diff)
Rolled a number of comments into documentation; thanks to all those who contributed.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@283 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs')
-rw-r--r--docs/cache.txt3
-rw-r--r--docs/model-api.txt2
-rw-r--r--docs/templates.txt10
3 files changed, 12 insertions, 3 deletions
diff --git a/docs/cache.txt b/docs/cache.txt
index 458723d0b7..a14e1e2b62 100644
--- a/docs/cache.txt
+++ b/docs/cache.txt
@@ -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
diff --git a/docs/model-api.txt b/docs/model-api.txt
index a2cfade854..a38e248dd8 100644
--- a/docs/model-api.txt
+++ b/docs/model-api.txt
@@ -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
diff --git a/docs/templates.txt b/docs/templates.txt
index 5acd82f096..96990b829f 100644
--- a/docs/templates.txt
+++ b/docs/templates.txt
@@ -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?
==================
@@ -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).