diff options
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/internals/contributing/writing-documentation.txt | 3 | ||||
| -rw-r--r-- | docs/ref/class-based-views/base.txt | 4 | ||||
| -rw-r--r-- | docs/ref/exceptions.txt | 2 | ||||
| -rw-r--r-- | docs/ref/settings.txt | 2 | ||||
| -rw-r--r-- | docs/releases/1.3.txt | 2 | ||||
| -rw-r--r-- | docs/topics/class-based-views/mixins.txt | 2 | ||||
| -rw-r--r-- | docs/topics/testing/tools.txt | 2 |
7 files changed, 10 insertions, 7 deletions
diff --git a/docs/internals/contributing/writing-documentation.txt b/docs/internals/contributing/writing-documentation.txt index e409b7fcc7..9ea20d0095 100644 --- a/docs/internals/contributing/writing-documentation.txt +++ b/docs/internals/contributing/writing-documentation.txt @@ -146,6 +146,9 @@ documentation: * **email** -- no hyphen. +* **HTTP** -- the expected pronunciation is "Aitch Tee Tee Pee" and therefore + should be preceded by "an" and not "a". + * **MySQL**, **PostgreSQL**, **SQLite** * **SQL** -- when referring to SQL, the expected pronunciation should be diff --git a/docs/ref/class-based-views/base.txt b/docs/ref/class-based-views/base.txt index e64fc03555..324a28fcd3 100644 --- a/docs/ref/class-based-views/base.txt +++ b/docs/ref/class-based-views/base.txt @@ -86,7 +86,7 @@ MRO is an acronym for Method Resolution Order. .. method:: dispatch(request, *args, **kwargs) The ``view`` part of the view -- the method that accepts a ``request`` - argument plus arguments, and returns a HTTP response. + argument plus arguments, and returns an HTTP response. The default implementation will inspect the HTTP method and attempt to delegate to a method that matches the HTTP method; a ``GET`` will be @@ -99,7 +99,7 @@ MRO is an acronym for Method Resolution Order. .. method:: http_method_not_allowed(request, *args, **kwargs) - If the view was called with a HTTP method it doesn't support, this + If the view was called with an HTTP method it doesn't support, this method is called instead. The default implementation returns ``HttpResponseNotAllowed`` with a diff --git a/docs/ref/exceptions.txt b/docs/ref/exceptions.txt index 2f5aa64b9d..1b22368e77 100644 --- a/docs/ref/exceptions.txt +++ b/docs/ref/exceptions.txt @@ -179,7 +179,7 @@ list of errors. .. exception:: RequestAborted - The :exc:`RequestAborted` exception is raised when a HTTP body being read + The :exc:`RequestAborted` exception is raised when an HTTP body being read in by the handler is cut off midstream and the client connection closes, or when the client does not send data and hits a timeout where the server closes the connection. diff --git a/docs/ref/settings.txt b/docs/ref/settings.txt index a272bdbcb3..66798b6b96 100644 --- a/docs/ref/settings.txt +++ b/docs/ref/settings.txt @@ -2349,7 +2349,7 @@ already have it. Default: ``None`` -A tuple representing a HTTP header/value combination that signifies a request +A tuple representing an HTTP header/value combination that signifies a request is secure. This controls the behavior of the request object's ``is_secure()`` method. diff --git a/docs/releases/1.3.txt b/docs/releases/1.3.txt index 3d381ca8ac..6bc723ec02 100644 --- a/docs/releases/1.3.txt +++ b/docs/releases/1.3.txt @@ -81,7 +81,7 @@ Django 1.3 adds framework-level support for Python's ``logging`` module. This means you can now easily configure and control logging as part of your Django project. A number of logging handlers and logging calls have been added to Django's own code as well -- most -notably, the error emails sent on a HTTP 500 server error are now +notably, the error emails sent on an HTTP 500 server error are now handled as a logging activity. See :doc:`the documentation on Django's logging interface </topics/logging>` for more details. diff --git a/docs/topics/class-based-views/mixins.txt b/docs/topics/class-based-views/mixins.txt index 7b193ea7f0..08a1ec1af9 100644 --- a/docs/topics/class-based-views/mixins.txt +++ b/docs/topics/class-based-views/mixins.txt @@ -653,7 +653,7 @@ same behavior -- except for the format of the response. If you want to be really adventurous, you could even mix a :class:`~django.views.generic.detail.DetailView` subclass that is able to return *both* HTML and JSON content, depending on some property of -the HTTP request, such as a query argument or a HTTP header. Mix in both the +the HTTP request, such as a query argument or an HTTP header. Mix in both the ``JSONResponseMixin`` and a :class:`~django.views.generic.detail.SingleObjectTemplateResponseMixin`, and override the implementation of diff --git a/docs/topics/testing/tools.txt b/docs/topics/testing/tools.txt index 25dcf4ad54..b06fabcc66 100644 --- a/docs/topics/testing/tools.txt +++ b/docs/topics/testing/tools.txt @@ -717,7 +717,7 @@ A subclass of :class:`unittest.TestCase` that adds this functionality: * Verifying that a template :meth:`has/hasn't been used to generate a given response content <SimpleTestCase.assertTemplateUsed>`. * Verifying that two :meth:`URLs <SimpleTestCase.assertURLEqual>` are equal. - * Verifying a HTTP :meth:`redirect <SimpleTestCase.assertRedirects>` is + * Verifying an HTTP :meth:`redirect <SimpleTestCase.assertRedirects>` is performed by the app. * Robustly testing two :meth:`HTML fragments <SimpleTestCase.assertHTMLEqual>` for equality/inequality or :meth:`containment <SimpleTestCase.assertInHTML>`. |