summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorGary Wilson Jr <gary.wilson@gmail.com>2007-09-08 19:30:16 +0000
committerGary Wilson Jr <gary.wilson@gmail.com>2007-09-08 19:30:16 +0000
commita047f6a8fe5e2686aaac226ae535682591896d9c (patch)
treed9e09ee95bfde6e50585e1a2a8bc6ae8572e563e /docs
parentb0e173ae3ff466f980846691a4be9f7c55a7405b (diff)
Fixed #5346 -- Fixed a couple typos in the model-api docs. Thanks, David Paccoud.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@6069 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs')
-rw-r--r--docs/model-api.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/model-api.txt b/docs/model-api.txt
index 7dac54992f..efe62baf16 100644
--- a/docs/model-api.txt
+++ b/docs/model-api.txt
@@ -308,7 +308,7 @@ on the filesystem. Has three special arguments, of which the first is
``FilePathField`` will use to filter filenames.
Note that the regex will be applied to the
base filename, not the full path. Example:
- ``"foo.*\.txt^"``, which will match a file called
+ ``"foo.*\.txt$"``, which will match a file called
``foo23.txt`` but not ``bar.txt`` or ``foo23.gif``.
``recursive`` Optional. Either ``True`` or ``False``. Default is
@@ -1903,7 +1903,7 @@ as the value displayed to render an object in the Django admin site and as the
value inserted into a template when it displays an object. Thus, you should
always return a nice, human-readable string for the object's ``__str__``.
Although this isn't required, it's strongly encouraged (see the description of
-``__unicode__``, below, before putting ``_str__`` methods everywhere).
+``__unicode__``, below, before putting ``__str__`` methods everywhere).
For example::