mirror of
https://github.com/django/django.git
synced 2025-10-28 16:16:12 +00:00
[4.0.x] Refs #32956 -- Changed docs to treat the acronym HTTP phonetically.
Backport of 69b0736fad from main
This commit is contained in:
committed by
Mariusz Felisiak
parent
c067a2b68f
commit
6aa917383f
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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.
|
||||
|
||||
@@ -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.
|
||||
|
||||
|
||||
@@ -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.
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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>`.
|
||||
|
||||
Reference in New Issue
Block a user