diff --git a/docs/howto/custom-model-fields.txt b/docs/howto/custom-model-fields.txt
index d67396d..7dbbf93 100644
|
a
|
b
|
custom form field, and/or implementing the :meth:`formfield` method on
|
| 281 | 281 | your field to return a form field class whose `to_python()` returns the |
| 282 | 282 | correct datatype. |
| 283 | 283 | |
| 284 | | Documenting your Custom Field |
| | 284 | Documenting your custom field |
| 285 | 285 | ----------------------------- |
| 286 | 286 | |
| 287 | 287 | .. class:: django.db.models.Field |
diff --git a/docs/howto/deployment/modwsgi.txt b/docs/howto/deployment/modwsgi.txt
index e37c7e6..0a24db9 100644
|
a
|
b
|
the details about how to use mod_wsgi. You'll probably want to start with the
|
| 21 | 21 | .. _official mod_wsgi documentation: http://code.google.com/p/modwsgi/ |
| 22 | 22 | .. _installation and configuration documentation: http://code.google.com/p/modwsgi/wiki/InstallationInstructions |
| 23 | 23 | |
| 24 | | Basic Configuration |
| | 24 | Basic configuration |
| 25 | 25 | =================== |
| 26 | 26 | |
| 27 | 27 | Once you've got mod_wsgi installed and activated, edit your ``httpd.conf`` file |
diff --git a/docs/ref/models/querysets.txt b/docs/ref/models/querysets.txt
index 4428d0a..973ddff 100644
|
a
|
b
|
SQL equivalents::
|
| 1746 | 1746 | |
| 1747 | 1747 | .. _aggregation-functions: |
| 1748 | 1748 | |
| 1749 | | Aggregation Functions |
| | 1749 | Aggregation functions |
| 1750 | 1750 | --------------------- |
| 1751 | 1751 | |
| 1752 | 1752 | Django provides the following aggregation functions in the |
diff --git a/docs/topics/db/managers.txt b/docs/topics/db/managers.txt
index 5ebe0b1..9c5ed62 100644
|
a
|
b
|
it into the inheritance hierarchy *after* the defaults::
|
| 276 | 276 | |
| 277 | 277 | .. _manager-types: |
| 278 | 278 | |
| 279 | | Controlling Automatic Manager Types |
| | 279 | Controlling automatic Manager types |
| 280 | 280 | =================================== |
| 281 | 281 | |
| 282 | 282 | This document has already mentioned a couple of places where Django creates a |
| … |
… |
it will use :class:`django.db.models.Manager`.
|
| 326 | 326 | so that existing code will :doc:`continue to work </misc/api-stability>` in |
| 327 | 327 | future Django versions. |
| 328 | 328 | |
| 329 | | Writing Correct Managers For Use In Automatic Manager Instances |
| | 329 | Writing correct Managers for use in automatic Manager instances |
| 330 | 330 | --------------------------------------------------------------- |
| 331 | 331 | |
| 332 | 332 | As already suggested by the `django.contrib.gis` example, above, the |
diff --git a/docs/topics/http/decorators.txt b/docs/topics/http/decorators.txt
index 7bb62ae..30883a4 100644
|
a
|
b
|
|
| 1 | 1 | =============== |
| 2 | | View Decorators |
| | 2 | View decorators |
| 3 | 3 | =============== |
| 4 | 4 | |
| 5 | 5 | .. currentmodule:: django.views.decorators.http |
| … |
… |
View Decorators
|
| 7 | 7 | Django provides several decorators that can be applied to views to support |
| 8 | 8 | various HTTP features. |
| 9 | 9 | |
| 10 | | Allowed HTTP Methods |
| | 10 | Allowed HTTP methods |
| 11 | 11 | ==================== |
| 12 | 12 | |
| 13 | 13 | .. function:: require_http_methods(request_method_list) |
| … |
… |
headers; see
|
| 47 | 47 | |
| 48 | 48 | .. currentmodule:: django.views.decorators.http |
| 49 | 49 | |
| 50 | | GZip Compression |
| | 50 | GZip compression |
| 51 | 51 | ================ |
| 52 | 52 | |
| 53 | 53 | .. function:: gzip_page() |
| … |
… |
storage on the ``Accept-Encoding`` header.
|
| 58 | 58 | |
| 59 | 59 | .. currentmodule:: django.views.decorators.vary |
| 60 | 60 | |
| 61 | | Vary Headers |
| | 61 | Vary headers |
| 62 | 62 | ============ |
| 63 | 63 | |
| 64 | 64 | The ``Vary`` header defines which request headers a cache mechanism should take |
diff --git a/docs/topics/http/urls.txt b/docs/topics/http/urls.txt
index cb37488..1ff1c66 100644
|
a
|
b
|
included URLconf, as expected.
|
| 462 | 462 | |
| 463 | 463 | .. _topics-http-defining-url-namespaces: |
| 464 | 464 | |
| 465 | | Defining URL Namespaces |
| | 465 | Defining URL namespaces |
| 466 | 466 | ----------------------- |
| 467 | 467 | |
| 468 | 468 | When you need to deploy multiple instances of a single application, it can be |
diff --git a/docs/topics/http/views.txt b/docs/topics/http/views.txt
index 2818f42..562be53 100644
|
a
|
b
|
|
| 1 | 1 | ============= |
| 2 | | Writing Views |
| | 2 | Writing views |
| 3 | 3 | ============= |
| 4 | 4 | |
| 5 | 5 | A view function, or *view* for short, is simply a Python function that takes a |
| … |
… |
Let's step through this code one line at a time:
|
| 52 | 52 | ``America/Chicago``. This probably isn't where you live, so you might want |
| 53 | 53 | to change it in your settings file. |
| 54 | 54 | |
| 55 | | Mapping URLs to Views |
| | 55 | Mapping URLs to views |
| 56 | 56 | ===================== |
| 57 | 57 | |
| 58 | 58 | So, to recap, this view function returns an HTML page that includes the current |