summaryrefslogtreecommitdiff
path: root/django/views/decorators/http.py
diff options
context:
space:
mode:
Diffstat (limited to 'django/views/decorators/http.py')
-rw-r--r--django/views/decorators/http.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/django/views/decorators/http.py b/django/views/decorators/http.py
index 15e89176fd..bef9ea61a9 100644
--- a/django/views/decorators/http.py
+++ b/django/views/decorators/http.py
@@ -61,7 +61,7 @@ def condition(etag_func=None, last_modified_func=None):
The parameters are callables to compute the ETag and last modified time for
the requested resource, respectively. The callables are passed the same
parameters as the view itself. The Etag function should return a string (or
- None if the resource doesn't exist), whilst the last_modified function
+ None if the resource doesn't exist), while the last_modified function
should return a datetime object (or None if the resource doesn't exist).
If both parameters are provided, all the preconditions must be met before