Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Fixed #2929 -- Replaced a few occurrences of DEFAULT_MIME_TYPE with t…

…he correct

DEFAULT_CONTENT_TYPE setting variable.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@3913 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 86404743d53bb6c53779879e10dc95e6e41f06fa 1 parent 31ff83e
Malcolm Tredinnick authored October 23, 2006
16  docs/generic_views.txt
@@ -184,7 +184,7 @@ a date in the *future* are not included unless you set ``allow_future`` to
184 184
       the view's template. See the `RequestContext docs`_.
185 185
 
186 186
     * ``mimetype``: The MIME type to use for the resulting document. Defaults
187  
-      to the value of the ``DEFAULT_MIME_TYPE`` setting.
  187
+      to the value of the ``DEFAULT_CONTENT_TYPE`` setting.
188 188
 
189 189
     * ``allow_future``: A boolean specifying whether to include "future"
190 190
       objects on this page, where "future" means objects in which the field
@@ -270,7 +270,7 @@ to ``True``.
270 270
       this is ``False``.
271 271
 
272 272
     * ``mimetype``: The MIME type to use for the resulting document. Defaults
273  
-      to the value of the ``DEFAULT_MIME_TYPE`` setting.
  273
+      to the value of the ``DEFAULT_CONTENT_TYPE`` setting.
274 274
 
275 275
     * ``allow_future``: A boolean specifying whether to include "future"
276 276
       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
357 357
        determining the variable's name.
358 358
 
359 359
     * ``mimetype``: The MIME type to use for the resulting document. Defaults
360  
-      to the value of the ``DEFAULT_MIME_TYPE`` setting.
  360
+      to the value of the ``DEFAULT_CONTENT_TYPE`` setting.
361 361
 
362 362
     * ``allow_future``: A boolean specifying whether to include "future"
363 363
       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``.
438 438
        determining the variable's name.
439 439
 
440 440
     * ``mimetype``: The MIME type to use for the resulting document. Defaults
441  
-      to the value of the ``DEFAULT_MIME_TYPE`` setting.
  441
+      to the value of the ``DEFAULT_CONTENT_TYPE`` setting.
442 442
 
443 443
     * ``allow_future``: A boolean specifying whether to include "future"
444 444
       objects on this page, where "future" means objects in which the field
@@ -523,7 +523,7 @@ you set ``allow_future`` to ``True``.
523 523
        determining the variable's name.
524 524
 
525 525
     * ``mimetype``: The MIME type to use for the resulting document. Defaults
526  
-      to the value of the ``DEFAULT_MIME_TYPE`` setting.
  526
+      to the value of the ``DEFAULT_CONTENT_TYPE`` setting.
527 527
 
528 528
     * ``allow_future``: A boolean specifying whether to include "future"
529 529
       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
633 633
        to use in the template context. By default, this is ``'object'``.
634 634
 
635 635
     * ``mimetype``: The MIME type to use for the resulting document. Defaults
636  
-      to the value of the ``DEFAULT_MIME_TYPE`` setting.
  636
+      to the value of the ``DEFAULT_CONTENT_TYPE`` setting.
637 637
 
638 638
     * ``allow_future``: A boolean specifying whether to include "future"
639 639
       objects on this page, where "future" means objects in which the field
@@ -707,7 +707,7 @@ A page representing a list of objects.
707 707
        determining the variable's name.
708 708
 
709 709
     * ``mimetype``: The MIME type to use for the resulting document. Defaults
710  
-      to the value of the ``DEFAULT_MIME_TYPE`` setting.
  710
+      to the value of the ``DEFAULT_CONTENT_TYPE`` setting.
711 711
 
712 712
 **Template name:**
713 713
 
@@ -819,7 +819,7 @@ A page representing an individual object.
819 819
        to use in the template context. By default, this is ``'object'``.
820 820
 
821 821
     * ``mimetype``: The MIME type to use for the resulting document. Defaults
822  
-      to the value of the ``DEFAULT_MIME_TYPE`` setting.
  822
+      to the value of the ``DEFAULT_CONTENT_TYPE`` setting.
823 823
 
824 824
 **Template name:**
825 825
 
4  docs/request_response.txt
@@ -341,9 +341,9 @@ hard-coded strings. If you use this technique, follow these guidelines:
341 341
 Methods
342 342
 -------
343 343
 
344  
-``__init__(content='', mimetype=DEFAULT_MIME_TYPE)``
  344
+``__init__(content='', mimetype=DEFAULT_CONTENT_TYPE)``
345 345
     Instantiates an ``HttpResponse`` object with the given page content (a
346  
-    string) and MIME type. The ``DEFAULT_MIME_TYPE`` is ``'text/html'``.
  346
+    string) and MIME type. The ``DEFAULT_CONTENT_TYPE`` is ``'text/html'``.
347 347
 
348 348
     ``content`` can be an iterator or a string. If it's an iterator, it should
349 349
     return strings, and those strings will be joined together to form the

0 notes on commit 8640474

Please sign in to comment.
Something went wrong with that request. Please try again.