summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorJacob Kaplan-Moss <jacob@jacobian.org>2005-07-15 00:53:18 +0000
committerJacob Kaplan-Moss <jacob@jacobian.org>2005-07-15 00:53:18 +0000
commit35d41699a93811efde5e450c75c51402934135f3 (patch)
tree18dc6728bf154ef1de1a1959cfb241b3c077c37d /docs
parent0bbb48ccc57529fd5b8f0ec6c904f2562da90b12 (diff)
Fixed another few small bugs in docs
git-svn-id: http://code.djangoproject.com/svn/django/trunk@44 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs')
-rw-r--r--docs/model-api.txt8
-rw-r--r--docs/templates.txt4
2 files changed, 6 insertions, 6 deletions
diff --git a/docs/model-api.txt b/docs/model-api.txt
index 080c0fe433..a65d99dc2c 100644
--- a/docs/model-api.txt
+++ b/docs/model-api.txt
@@ -133,9 +133,9 @@ General field options
Each type of field takes a different set of options, but there are some
options that are common to all field types. These options are:
- ====================== ==================================================================
+ ====================== ===================================================
Option Description
- ====================== ==================================================================
+ ====================== ===================================================
``blank`` If ``True``, the field is allowed to be blank.
Note that this is different from ``null`` in that
string fields will store the empty string instead of
@@ -217,7 +217,7 @@ options that are common to all field types. These options are:
``validator_list`` A list of extra validators to apply to the field.
See the `Form fields guide`_ for information about
validators.
- ====================== ==================================================================
+ ====================== ===================================================
.. _`Form fields guide`: http://www.djangoproject.com/FIXME/
@@ -415,7 +415,7 @@ Field Types
is to. This is almost always ``id``, but if the
PK on the other object is named something
different, this is how to indicate that.
- ======================= ==================================================
+ ====================== ===================================================
.. _`Database API reference`: http://www.djangoproject.com/documentation/db_api/
diff --git a/docs/templates.txt b/docs/templates.txt
index 3f680ca929..2239190086 100644
--- a/docs/templates.txt
+++ b/docs/templates.txt
@@ -543,7 +543,7 @@ Built-in filter reference
Removes all values of arg from the given string
``date``
- Formats a date according to the given format (same as the now_ tag)
+ Formats a date according to the given format (same as the ``now`` tag)
``default``
If value is unavailable, use given default
@@ -654,7 +654,7 @@ Built-in filter reference
Strips all [X]HTML tags
``time``
- Formats a time according to the given format (same as the now_ tag).
+ Formats a time according to the given format (same as the ``now`` tag).
``timesince``
Formats a date as the time since that date (i.e. "4 days, 6 hours")