diff --git a/django/template/defaulttags.py b/django/template/defaulttags.py index d91e30bbb5..813e5dbed6 100644 --- a/django/template/defaulttags.py +++ b/django/template/defaulttags.py @@ -814,7 +814,7 @@ def ssi(parser, token): Outputs the contents of a given file into the page. Like a simple "include" tag, the ``ssi`` tag includes the contents - of another file -- which must be specified using an absolute page -- + of another file -- which must be specified using an absolute path -- in the current page:: {% ssi /home/html/ljworld.com/includes/right_generic.html %} diff --git a/docs/custom_model_fields.txt b/docs/custom_model_fields.txt index 80c9de7d16..923b331a95 100644 --- a/docs/custom_model_fields.txt +++ b/docs/custom_model_fields.txt @@ -44,8 +44,8 @@ Our class looks something like this:: # ... (other possibly useful methods omitted) ... This is just an ordinary Python class, with nothing Django-specific about it. -We'd like to be able to things like this in our models (we assume the ``hand`` -attribute on the model is an instance of ``Hand``):: +We'd like to be able to do things like this in our models (we assume the +``hand`` attribute on the model is an instance of ``Hand``):: example = MyModel.objects.get(pk=1) print example.hand.north diff --git a/docs/request_response.txt b/docs/request_response.txt index 2445b3e6b9..c8d6423841 100644 --- a/docs/request_response.txt +++ b/docs/request_response.txt @@ -452,7 +452,7 @@ types of HTTP responses. Like ``HttpResponse``, these subclasses live in ``HttpResponseNotModified`` The constructor doesn't take any arguments. Use this to designate that a - page hasn't been modified since the user's last request. + page hasn't been modified since the user's last request (status code 304). ``HttpResponseBadRequest`` **New in Django development version.** diff --git a/docs/templates_python.txt b/docs/templates_python.txt index 4865f65331..014a853a41 100644 --- a/docs/templates_python.txt +++ b/docs/templates_python.txt @@ -691,8 +691,8 @@ This way, you'll be able to pass, say, an integer to this filter, and it won't cause an ``AttributeError`` (because integers don't have ``lower()`` methods). -Registering a custom filters -~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Registering custom filters +~~~~~~~~~~~~~~~~~~~~~~~~~~ Once you've written your filter definition, you need to register it with your ``Library`` instance, to make it available to Django's template language::