summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
Diffstat (limited to 'docs')
-rw-r--r--docs/authentication.txt2
-rw-r--r--docs/generic_views.txt3
-rw-r--r--docs/static_files.txt4
3 files changed, 5 insertions, 4 deletions
diff --git a/docs/authentication.txt b/docs/authentication.txt
index 2a61ec82b5..08565e13e1 100644
--- a/docs/authentication.txt
+++ b/docs/authentication.txt
@@ -745,7 +745,7 @@ messages are made available in the `template context`_ as the template variable
{% if messages %}
<ul>
{% for message in messages %}
- <li>{{ message.message }}</li>
+ <li>{{ message }}</li>
{% endfor %}
</ul>
{% endif %}
diff --git a/docs/generic_views.txt b/docs/generic_views.txt
index f0c3f738f3..1736770a20 100644
--- a/docs/generic_views.txt
+++ b/docs/generic_views.txt
@@ -97,7 +97,8 @@ which is a dictionary of the parameters captured in the URL.
* ``extra_context``: A dictionary of values to add to the template
context. By default, this is an empty dictionary. If a value in the
dictionary is callable, the generic view will call it
- just before rendering the template.
+ just before rendering the template. (**This is new in the
+ Django development version.**)
**Example:**
diff --git a/docs/static_files.txt b/docs/static_files.txt
index d8d90e52d5..55380a659b 100644
--- a/docs/static_files.txt
+++ b/docs/static_files.txt
@@ -31,7 +31,7 @@ How to do it
Just put this in your URLconf_::
- (r'^site_media/(.*)$', 'django.views.static.serve', {'document_root': '/path/to/media'}),
+ (r'^site_media/(?P<path>.*)$', 'django.views.static.serve', {'document_root': '/path/to/media'}),
...where ``site_media`` is the URL where your media will be rooted, and
``/path/to/media`` is the filesystem root for your media.
@@ -60,7 +60,7 @@ listings for directories.
Example::
- (r'^site_media/(.*)$', 'django.views.static.serve', {'document_root': '/path/to/media', 'show_indexes': True}),
+ (r'^site_media/(?P<path>.*)$', 'django.views.static.serve', {'document_root': '/path/to/media', 'show_indexes': True}),
You can customize the index view by creating a template called
``static/directory_index``. That template gets two objects in its context: