innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Fixed #2929 -- Replaced a few occurrences of DEFAULT_MIME_TYPE with the correct 

DEFAULT_CONTENT_TYPE setting variable.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@3913 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Malcolm Tredinnick 2006-10-23 07:46:22 +00:00
parent 31ff83e3ce
commit 86404743d5
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
docs/generic_views.txt
View File

@ -184,7 +184,7 @@ a date in the *future* are not included unless you set ``allow_future`` to
the view's template. See the `RequestContext docs`_. the view's template. See the `RequestContext docs`_.
* ``mimetype``: The MIME type to use for the resulting document. Defaults * ``mimetype``: The MIME type to use for the resulting document. Defaults
to the value of the ``DEFAULT_MIME_TYPE`` setting. to the value of the ``DEFAULT_CONTENT_TYPE`` setting.
* ``allow_future``: A boolean specifying whether to include "future" * ``allow_future``: A boolean specifying whether to include "future"
objects on this page, where "future" means objects in which the field objects on this page, where "future" means objects in which the field
@ -270,7 +270,7 @@ to ``True``.
this is ``False``. this is ``False``.
* ``mimetype``: The MIME type to use for the resulting document. Defaults * ``mimetype``: The MIME type to use for the resulting document. Defaults
to the value of the ``DEFAULT_MIME_TYPE`` setting. to the value of the ``DEFAULT_CONTENT_TYPE`` setting.
* ``allow_future``: A boolean specifying whether to include "future" * ``allow_future``: A boolean specifying whether to include "future"
objects on this page, where "future" means objects in which the field objects on this page, where "future" means objects in which the field
@ -357,7 +357,7 @@ date in the *future* are not displayed unless you set ``allow_future`` to
determining the variable's name. determining the variable's name.
* ``mimetype``: The MIME type to use for the resulting document. Defaults * ``mimetype``: The MIME type to use for the resulting document. Defaults
to the value of the ``DEFAULT_MIME_TYPE`` setting. to the value of the ``DEFAULT_CONTENT_TYPE`` setting.
* ``allow_future``: A boolean specifying whether to include "future" * ``allow_future``: A boolean specifying whether to include "future"
objects on this page, where "future" means objects in which the field objects on this page, where "future" means objects in which the field
@ -438,7 +438,7 @@ in the *future* are not displayed unless you set ``allow_future`` to ``True``.
determining the variable's name. determining the variable's name.
* ``mimetype``: The MIME type to use for the resulting document. Defaults * ``mimetype``: The MIME type to use for the resulting document. Defaults
to the value of the ``DEFAULT_MIME_TYPE`` setting. to the value of the ``DEFAULT_CONTENT_TYPE`` setting.
* ``allow_future``: A boolean specifying whether to include "future" * ``allow_future``: A boolean specifying whether to include "future"
objects on this page, where "future" means objects in which the field objects on this page, where "future" means objects in which the field
@ -523,7 +523,7 @@ you set ``allow_future`` to ``True``.
determining the variable's name. determining the variable's name.
* ``mimetype``: The MIME type to use for the resulting document. Defaults * ``mimetype``: The MIME type to use for the resulting document. Defaults
to the value of the ``DEFAULT_MIME_TYPE`` setting. to the value of the ``DEFAULT_CONTENT_TYPE`` setting.
* ``allow_future``: A boolean specifying whether to include "future" * ``allow_future``: A boolean specifying whether to include "future"
objects on this page, where "future" means objects in which the field objects on this page, where "future" means objects in which the field
@ -633,7 +633,7 @@ future, the view will throw a 404 error by default, unless you set
to use in the template context. By default, this is ``'object'``. to use in the template context. By default, this is ``'object'``.
* ``mimetype``: The MIME type to use for the resulting document. Defaults * ``mimetype``: The MIME type to use for the resulting document. Defaults
to the value of the ``DEFAULT_MIME_TYPE`` setting. to the value of the ``DEFAULT_CONTENT_TYPE`` setting.
* ``allow_future``: A boolean specifying whether to include "future" * ``allow_future``: A boolean specifying whether to include "future"
objects on this page, where "future" means objects in which the field objects on this page, where "future" means objects in which the field
@ -707,7 +707,7 @@ A page representing a list of objects.
determining the variable's name. determining the variable's name.
* ``mimetype``: The MIME type to use for the resulting document. Defaults * ``mimetype``: The MIME type to use for the resulting document. Defaults
to the value of the ``DEFAULT_MIME_TYPE`` setting. to the value of the ``DEFAULT_CONTENT_TYPE`` setting.
**Template name:** **Template name:**
@ -819,7 +819,7 @@ A page representing an individual object.
to use in the template context. By default, this is ``'object'``. to use in the template context. By default, this is ``'object'``.
* ``mimetype``: The MIME type to use for the resulting document. Defaults * ``mimetype``: The MIME type to use for the resulting document. Defaults
to the value of the ``DEFAULT_MIME_TYPE`` setting. to the value of the ``DEFAULT_CONTENT_TYPE`` setting.
**Template name:** **Template name:**

4
docs/request_response.txt
View File

@ -341,9 +341,9 @@ hard-coded strings. If you use this technique, follow these guidelines:
Methods Methods
------- -------
``__init__(content='', mimetype=DEFAULT_MIME_TYPE)`` ``__init__(content='', mimetype=DEFAULT_CONTENT_TYPE)``
Instantiates an ``HttpResponse`` object with the given page content (a Instantiates an ``HttpResponse`` object with the given page content (a
string) and MIME type. The ``DEFAULT_MIME_TYPE`` is ``'text/html'``. string) and MIME type. The ``DEFAULT_CONTENT_TYPE`` is ``'text/html'``.
``content`` can be an iterator or a string. If it's an iterator, it should ``content`` can be an iterator or a string. If it's an iterator, it should
return strings, and those strings will be joined together to form the return strings, and those strings will be joined together to form the