Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Fixed #19516 - Fixed remaining broken links.

Added -n to sphinx builds to catch issues going forward.
  • Loading branch information...
commit 9b5f64cc6ed5f1e904093fe4e6ff0f681b8e545f 1 parent 3f890f8
Tim Graham authored January 01, 2013

Showing 83 changed files with 729 additions and 613 deletions. Show diff stats Hide diff stats

  1. 2  docs/Makefile
  2. 9  docs/faq/usage.txt
  3. 18  docs/howto/custom-model-fields.txt
  4. 6  docs/howto/custom-template-tags.txt
  5. 6  docs/internals/contributing/writing-code/coding-style.txt
  6. 20  docs/internals/deprecation.txt
  7. 4  docs/intro/tutorial01.txt
  8. 8  docs/intro/tutorial04.txt
  9. 2  docs/make.bat
  10. 34  docs/ref/class-based-views/base.txt
  11. 78  docs/ref/class-based-views/flattened-index.txt
  12. 2  docs/ref/class-based-views/generic-date-based.txt
  13. 40  docs/ref/class-based-views/generic-display.txt
  14. 10  docs/ref/class-based-views/generic-editing.txt
  15. 9  docs/ref/class-based-views/mixins-date-based.txt
  16. 43  docs/ref/class-based-views/mixins-editing.txt
  17. 22  docs/ref/class-based-views/mixins-multiple-object.txt
  18. 12  docs/ref/class-based-views/mixins-simple.txt
  19. 41  docs/ref/class-based-views/mixins-single-object.txt
  20. 8  docs/ref/clickjacking.txt
  21. 2  docs/ref/contrib/admin/admindocs.txt
  22. 26  docs/ref/contrib/admin/index.txt
  23. 26  docs/ref/contrib/comments/custom.txt
  24. 4  docs/ref/contrib/comments/example.txt
  25. 9  docs/ref/contrib/comments/moderation.txt
  26. 4  docs/ref/contrib/comments/signals.txt
  27. 8  docs/ref/contrib/contenttypes.txt
  28. 4  docs/ref/contrib/flatpages.txt
  29. 16  docs/ref/contrib/formtools/form-preview.txt
  30. 32  docs/ref/contrib/formtools/form-wizard.txt
  31. 2  docs/ref/contrib/formtools/index.txt
  32. 17  docs/ref/contrib/gis/db-api.txt
  33. 10  docs/ref/contrib/gis/feeds.txt
  34. 4  docs/ref/contrib/gis/geoquerysets.txt
  35. 14  docs/ref/contrib/gis/geos.txt
  36. 2  docs/ref/contrib/gis/install/index.txt
  37. 14  docs/ref/contrib/gis/tutorial.txt
  38. 29  docs/ref/contrib/sitemaps.txt
  39. 10  docs/ref/contrib/staticfiles.txt
  40. 2  docs/ref/contrib/syndication.txt
  41. 4  docs/ref/databases.txt
  42. 2  docs/ref/django-admin.txt
  43. 15  docs/ref/exceptions.txt
  44. 4  docs/ref/files/file.txt
  45. 2  docs/ref/files/storage.txt
  46. 41  docs/ref/forms/api.txt
  47. 12  docs/ref/forms/widgets.txt
  48. 4  docs/ref/middleware.txt
  49. 93  docs/ref/models/fields.txt
  50. 2  docs/ref/models/options.txt
  51. 2  docs/ref/request-response.txt
  52. 2  docs/ref/settings.txt
  53. 11  docs/ref/signals.txt
  54. 24  docs/ref/template-response.txt
  55. 22  docs/ref/templates/api.txt
  56. 2  docs/ref/templates/builtins.txt
  57. 2  docs/ref/urls.txt
  58. 19  docs/ref/utils.txt
  59. 2  docs/ref/validators.txt
  60. 2  docs/releases/1.2-beta-1.txt
  61. 10  docs/releases/1.2.txt
  62. 2  docs/releases/1.3-alpha-1.txt
  63. 6  docs/releases/1.3-beta-1.txt
  64. 5  docs/releases/1.3.txt
  65. 2  docs/releases/1.4-alpha-1.txt
  66. 2  docs/releases/1.4-beta-1.txt
  67. 4  docs/releases/1.4.txt
  68. 18  docs/topics/auth/passwords.txt
  69. 8  docs/topics/cache.txt
  70. 12  docs/topics/class-based-views/generic-display.txt
  71. 81  docs/topics/class-based-views/generic-editing.txt
  72. 192  docs/topics/class-based-views/mixins.txt
  73. 5  docs/topics/db/sql.txt
  74. 7  docs/topics/db/transactions.txt
  75. 2  docs/topics/forms/formsets.txt
  76. 4  docs/topics/http/file-uploads.txt
  77. 2  docs/topics/http/views.txt
  78. 4  docs/topics/i18n/timezones.txt
  79. 12  docs/topics/logging.txt
  80. 73  docs/topics/python3.txt
  81. 4  docs/topics/serialization.txt
  82. 3  docs/topics/settings.txt
  83. 8  docs/topics/testing/overview.txt
2  docs/Makefile
@@ -10,7 +10,7 @@ BUILDDIR      = _build
10 10
 # Internal variables.
11 11
 PAPEROPT_a4     = -D latex_paper_size=a4
12 12
 PAPEROPT_letter = -D latex_paper_size=letter
13  
-ALLSPHINXOPTS   = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
  13
+ALLSPHINXOPTS   = -n -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
14 14
 # the i18n builder cannot share the environment and doctrees with the others
15 15
 I18NSPHINXOPTS  = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
16 16
 
9  docs/faq/usage.txt
@@ -52,10 +52,11 @@ Using a :class:`~django.db.models.FileField` or an
52 52
 
53 53
 #. All that will be stored in your database is a path to the file
54 54
    (relative to :setting:`MEDIA_ROOT`). You'll most likely want to use the
55  
-   convenience :attr:`~django.core.files.File.url` attribute provided by
56  
-   Django. For example, if your :class:`~django.db.models.ImageField` is
57  
-   called ``mug_shot``, you can get the absolute path to your image in a
58  
-   template with ``{{ object.mug_shot.url }}``.
  55
+   convenience :attr:`~django.db.models.fields.files.FieldFile.url` attribute
  56
+   provided by Django. For example, if your
  57
+   :class:`~django.db.models.ImageField` is called ``mug_shot``, you can get
  58
+   the absolute path to your image in a template with
  59
+   ``{{ object.mug_shot.url }}``.
59 60
 
60 61
 How do I make a variable available to all my templates?
61 62
 -------------------------------------------------------
18  docs/howto/custom-model-fields.txt
@@ -199,20 +199,20 @@ The :meth:`~django.db.models.Field.__init__` method takes the following
199 199
 parameters:
200 200
 
201 201
 * :attr:`~django.db.models.Field.verbose_name`
202  
-* :attr:`~django.db.models.Field.name`
  202
+* ``name``
203 203
 * :attr:`~django.db.models.Field.primary_key`
204  
-* :attr:`~django.db.models.Field.max_length`
  204
+* :attr:`~django.db.models.CharField.max_length`
205 205
 * :attr:`~django.db.models.Field.unique`
206 206
 * :attr:`~django.db.models.Field.blank`
207 207
 * :attr:`~django.db.models.Field.null`
208 208
 * :attr:`~django.db.models.Field.db_index`
209  
-* :attr:`~django.db.models.Field.rel`: Used for related fields (like
210  
-  :class:`ForeignKey`). For advanced use only.
  209
+* ``rel``: Used for related fields (like :class:`ForeignKey`). For advanced
  210
+  use only.
211 211
 * :attr:`~django.db.models.Field.default`
212 212
 * :attr:`~django.db.models.Field.editable`
213  
-* :attr:`~django.db.models.Field.serialize`: If ``False``, the field will
214  
-  not be serialized when the model is passed to Django's :doc:`serializers
215  
-  </topics/serialization>`. Defaults to ``True``.
  213
+* ``serialize``: If ``False``, the field will not be serialized when the model
  214
+  is passed to Django's :doc:`serializers </topics/serialization>`. Defaults to
  215
+  ``True``.
216 216
 * :attr:`~django.db.models.Field.unique_for_date`
217 217
 * :attr:`~django.db.models.Field.unique_for_month`
218 218
 * :attr:`~django.db.models.Field.unique_for_year`
@@ -222,7 +222,7 @@ parameters:
222 222
 * :attr:`~django.db.models.Field.db_tablespace`: Only for index creation, if the
223 223
   backend supports :doc:`tablespaces </topics/db/tablespaces>`. You can usually
224 224
   ignore this option.
225  
-* :attr:`~django.db.models.Field.auto_created`: True if the field was
  225
+* ``auto_created``: True if the field was
226 226
   automatically created, as for the `OneToOneField` used by model
227 227
   inheritance. For advanced use only.
228 228
 
@@ -443,7 +443,7 @@ Python object type we want to store in the model's attribute. If anything is
443 443
 going wrong during value conversion, you should raise a
444 444
 :exc:`~django.core.exceptions.ValidationError` exception.
445 445
 
446  
-**Remember:** If your custom field needs the :meth:`to_python` method to be
  446
+**Remember:** If your custom field needs the :meth:`.to_python` method to be
447 447
 called when it is created, you should be using `The SubfieldBase metaclass`_
448 448
 mentioned earlier. Otherwise :meth:`.to_python` won't be called
449 449
 automatically.
6  docs/howto/custom-template-tags.txt
@@ -114,6 +114,8 @@ your function. Example:
114 114
 Registering custom filters
115 115
 ~~~~~~~~~~~~~~~~~~~~~~~~~~
116 116
 
  117
+.. method:: django.template.Library.filter
  118
+
117 119
 Once you've written your filter definition, you need to register it with
118 120
 your ``Library`` instance, to make it available to Django's template language:
119 121
 
@@ -151,6 +153,8 @@ are described in :ref:`filters and auto-escaping <filters-auto-escaping>` and
151 153
 Template filters that expect strings
152 154
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
153 155
 
  156
+.. method:: django.template.defaultfilters.stringfilter
  157
+
154 158
 If you're writing a template filter that only expects a string as the first
155 159
 argument, you should use the decorator ``stringfilter``. This will
156 160
 convert an object to its string value before being passed to your function:
@@ -700,6 +704,8 @@ cannot resolve the string passed to it in the current context of the page.
700 704
 Simple tags
701 705
 ~~~~~~~~~~~
702 706
 
  707
+.. method:: django.template.Library.simple_tag
  708
+
703 709
 Many template tags take a number of arguments -- strings or template variables
704 710
 -- and return a string after doing some processing based solely on
705 711
 the input arguments and some external information. For example, the
6  docs/internals/contributing/writing-code/coding-style.txt
@@ -177,9 +177,9 @@ That means that the ability for third parties to import the module at the top
177 177
 level is incompatible with the ability to configure the settings object
178 178
 manually, or makes it very difficult in some circumstances.
179 179
 
180  
-Instead of the above code, a level of laziness or indirection must be used, such
181  
-as :class:`django.utils.functional.LazyObject`,
182  
-:func:`django.utils.functional.lazy` or ``lambda``.
  180
+Instead of the above code, a level of laziness or indirection must be used,
  181
+such as ``django.utils.functional.LazyObject``,
  182
+``django.utils.functional.lazy()`` or ``lambda``.
183 183
 
184 184
 Miscellaneous
185 185
 -------------
20  docs/internals/deprecation.txt
@@ -167,9 +167,8 @@ these changes.
167 167
 * ``django.core.context_processors.PermWrapper`` and
168 168
   ``django.core.context_processors.PermLookupDict`` will be removed in
169 169
   favor of the corresponding
170  
-  :class:`django.contrib.auth.context_processors.PermWrapper` and
171  
-  :class:`django.contrib.auth.context_processors.PermLookupDict`,
172  
-  respectively.
  170
+  ``django.contrib.auth.context_processors.PermWrapper`` and
  171
+  ``django.contrib.auth.context_processors.PermLookupDict``, respectively.
173 172
 
174 173
 * The :setting:`MEDIA_URL` or :setting:`STATIC_URL` settings will be
175 174
   required to end with a trailing slash to ensure there is a consistent
@@ -218,10 +217,10 @@ these changes.
218 217
   synonym for ``django.views.decorators.csrf.csrf_exempt``, which should
219 218
   be used to replace it.
220 219
 
221  
-* The :class:`~django.core.cache.backends.memcached.CacheClass` backend
  220
+* The ``django.core.cache.backends.memcached.CacheClass`` backend
222 221
   was split into two in Django 1.3 in order to introduce support for
223  
-  PyLibMC. The historical :class:`~django.core.cache.backends.memcached.CacheClass`
224  
-  will be removed in favor of :class:`~django.core.cache.backends.memcached.MemcachedCache`.
  222
+  PyLibMC. The historical ``CacheClass`` will be removed in favor of
  223
+  ``django.core.cache.backends.memcached.MemcachedCache``.
225 224
 
226 225
 * The UK-prefixed objects of ``django.contrib.localflavor.uk`` will only
227 226
   be accessible through their GB-prefixed names (GB is the correct
@@ -243,8 +242,8 @@ these changes.
243 242
   :setting:`LOGGING` setting should include this filter explicitly if
244 243
   it is desired.
245 244
 
246  
-* The builtin truncation functions :func:`django.utils.text.truncate_words`
247  
-  and :func:`django.utils.text.truncate_html_words` will be removed in
  245
+* The builtin truncation functions ``django.utils.text.truncate_words()``
  246
+  and ``django.utils.text.truncate_html_words()`` will be removed in
248 247
   favor of the ``django.utils.text.Truncator`` class.
249 248
 
250 249
 * The :class:`~django.contrib.gis.geoip.GeoIP` class was moved to
@@ -257,9 +256,8 @@ these changes.
257 256
   :data:`~django.conf.urls.handler500`, are now available through
258 257
   :mod:`django.conf.urls` .
259 258
 
260  
-* The functions :func:`~django.core.management.setup_environ` and
261  
-  :func:`~django.core.management.execute_manager` will be removed from
262  
-  :mod:`django.core.management`. This also means that the old (pre-1.4)
  259
+* The functions ``setup_environ()`` and ``execute_manager()`` will be removed
  260
+  from :mod:`django.core.management`. This also means that the old (pre-1.4)
263 261
   style of :file:`manage.py` file will no longer work.
264 262
 
265 263
 * Setting the ``is_safe`` and ``needs_autoescape`` flags as attributes of
4  docs/intro/tutorial01.txt
@@ -369,8 +369,8 @@ its human-readable name.
369 369
 
370 370
 Some :class:`~django.db.models.Field` classes have required elements.
371 371
 :class:`~django.db.models.CharField`, for example, requires that you give it a
372  
-:attr:`~django.db.models.Field.max_length`. That's used not only in the database
373  
-schema, but in validation, as we'll soon see.
  372
+:attr:`~django.db.models.CharField.max_length`. That's used not only in the
  373
+database schema, but in validation, as we'll soon see.
374 374
 
375 375
 Finally, note a relationship is defined, using
376 376
 :class:`~django.db.models.ForeignKey`. That tells Django each ``Choice`` is related
8  docs/intro/tutorial04.txt
@@ -234,12 +234,12 @@ two views abstract the concepts of "display a list of objects" and
234 234
 * Each generic view needs to know what model it will be acting
235 235
   upon. This is provided using the ``model`` parameter.
236 236
 
237  
-* The :class:`~django.views.generic.list.DetailView` generic view
  237
+* The :class:`~django.views.generic.detail.DetailView` generic view
238 238
   expects the primary key value captured from the URL to be called
239 239
   ``"pk"``, so we've changed ``poll_id`` to ``pk`` for the generic
240 240
   views.
241 241
 
242  
-By default, the :class:`~django.views.generic.list.DetailView` generic
  242
+By default, the :class:`~django.views.generic.detail.DetailView` generic
243 243
 view uses a template called ``<app name>/<model name>_detail.html``.
244 244
 In our case, it'll use the template ``"polls/poll_detail.html"``. The
245 245
 ``template_name`` argument is used to tell Django to use a specific
@@ -247,7 +247,7 @@ template name instead of the autogenerated default template name. We
247 247
 also specify the ``template_name`` for the ``results`` list view --
248 248
 this ensures that the results view and the detail view have a
249 249
 different appearance when rendered, even though they're both a
250  
-:class:`~django.views.generic.list.DetailView` behind the scenes.
  250
+:class:`~django.views.generic.detail.DetailView` behind the scenes.
251 251
 
252 252
 Similarly, the :class:`~django.views.generic.list.ListView` generic
253 253
 view uses a default template called ``<app name>/<model
@@ -257,7 +257,7 @@ name>_list.html``; we use ``template_name`` to tell
257 257
 
258 258
 In previous parts of the tutorial, the templates have been provided
259 259
 with a context that contains the ``poll`` and ``latest_poll_list``
260  
-context variables. For DetailView the ``poll`` variable is provided
  260
+context variables. For ``DetailView`` the ``poll`` variable is provided
261 261
 automatically -- since we're using a Django model (``Poll``), Django
262 262
 is able to determine an appropriate name for the context variable.
263 263
 However, for ListView, the automatically generated context variable is
2  docs/make.bat
@@ -6,7 +6,7 @@ if "%SPHINXBUILD%" == "" (
6 6
 	set SPHINXBUILD=sphinx-build
7 7
 )
8 8
 set BUILDDIR=_build
9  
-set ALLSPHINXOPTS=-d %BUILDDIR%/doctrees %SPHINXOPTS% .
  9
+set ALLSPHINXOPTS=-n -d %BUILDDIR%/doctrees %SPHINXOPTS% .
10 10
 if NOT "%PAPER%" == "" (
11 11
 	set ALLSPHINXOPTS=-D latex_paper_size=%PAPER% %ALLSPHINXOPTS%
12 12
 	set I18NSPHINXOPTS=-D latex_paper_size=%PAPER% %I18NSPHINXOPTS%
34  docs/ref/class-based-views/base.txt
@@ -49,9 +49,13 @@ View
49 49
 
50 50
     **Attributes**
51 51
 
52  
-    .. attribute:: http_method_names = ['get', 'post', 'put', 'delete', 'head', 'options', 'trace']
  52
+    .. attribute:: http_method_names
53 53
 
54  
-        The default list of HTTP method names that this view will accept.
  54
+        The list of HTTP method names that this view will accept.
  55
+
  56
+        Default::
  57
+
  58
+            ['get', 'post', 'put', 'delete', 'head', 'options', 'trace']
55 59
 
56 60
     **Methods**
57 61
 
@@ -68,12 +72,11 @@ View
68 72
 
69 73
         The default implementation will inspect the HTTP method and attempt to
70 74
         delegate to a method that matches the HTTP method; a ``GET`` will be
71  
-        delegated to :meth:`~View.get()`, a ``POST`` to :meth:`~View.post()`,
72  
-        and so on.
  75
+        delegated to ``get()``, a ``POST`` to ``post()``, and so on.
73 76
 
74  
-        By default, a ``HEAD`` request will be delegated to :meth:`~View.get()`.
  77
+        By default, a ``HEAD`` request will be delegated to ``get()``.
75 78
         If you need to handle ``HEAD`` requests in a different way than ``GET``,
76  
-        you can override the :meth:`~View.head()` method. See
  79
+        you can override the ``head()`` method. See
77 80
         :ref:`supporting-other-http-methods` for an example.
78 81
 
79 82
         The default implementation also sets ``request``, ``args`` and
@@ -111,9 +114,9 @@ TemplateView
111 114
 
112 115
     **Method Flowchart**
113 116
 
114  
-    1. :meth:`dispatch()`
115  
-    2. :meth:`http_method_not_allowed()`
116  
-    3. :meth:`get_context_data()`
  117
+    1. :meth:`~django.views.generic.base.View.dispatch()`
  118
+    2. :meth:`~django.views.generic.base.View.http_method_not_allowed()`
  119
+    3. :meth:`~django.views.generic.base.ContextMixin.get_context_data()`
117 120
 
118 121
     **Example views.py**::
119 122
 
@@ -169,8 +172,8 @@ RedirectView
169 172
 
170 173
     **Method Flowchart**
171 174
 
172  
-    1. :meth:`dispatch()`
173  
-    2. :meth:`http_method_not_allowed()`
  175
+    1. :meth:`~django.views.generic.base.View.dispatch()`
  176
+    2. :meth:`~django.views.generic.base.View.http_method_not_allowed()`
174 177
     3. :meth:`get_redirect_url()`
175 178
 
176 179
     **Example views.py**::
@@ -230,9 +233,8 @@ RedirectView
230 233
 
231 234
         Constructs the target URL for redirection.
232 235
 
233  
-        The default implementation uses :attr:`~RedirectView.url` as a starting
  236
+        The default implementation uses :attr:`url` as a starting
234 237
         string, performs expansion of ``%`` parameters in that string, as well
235  
-        as the appending of query string if requested by
236  
-        :attr:`~RedirectView.query_string`. Subclasses may implement any
237  
-        behavior they wish, as long as the method returns a redirect-ready URL
238  
-        string.
  238
+        as the appending of query string if requested by :attr:`query_string`.
  239
+        Subclasses may implement any behavior they wish, as long as the method
  240
+        returns a redirect-ready URL string.
78  docs/ref/class-based-views/flattened-index.txt
@@ -23,7 +23,7 @@ View
23 23
 
24 24
 * :meth:`~django.views.generic.base.View.as_view`
25 25
 * :meth:`~django.views.generic.base.View.dispatch`
26  
-* :meth:`~django.views.generic.base.View.head`
  26
+* ``head()``
27 27
 * :meth:`~django.views.generic.base.View.http_method_not_allowed`
28 28
 
29 29
 TemplateView
@@ -40,9 +40,9 @@ TemplateView
40 40
 
41 41
 * :meth:`~django.views.generic.base.View.as_view`
42 42
 * :meth:`~django.views.generic.base.View.dispatch`
43  
-* :meth:`~django.views.generic.base.TemplateView.get`
44  
-* :meth:`~django.views.generic.base.TemplateView.get_context_data`
45  
-* :meth:`~django.views.generic.base.View.head`
  43
+* ``get()``
  44
+* :meth:`~django.views.generic.base.ContextMixin.get_context_data`
  45
+* ``head()``
46 46
 * :meth:`~django.views.generic.base.View.http_method_not_allowed`
47 47
 * :meth:`~django.views.generic.base.TemplateResponseMixin.render_to_response`
48 48
 
@@ -60,15 +60,15 @@ RedirectView
60 60
 **Methods**
61 61
 
62 62
 * :meth:`~django.views.generic.base.View.as_view`
63  
-* :meth:`~django.views.generic.base.RedirectView.delete`
  63
+* ``delete()``
64 64
 * :meth:`~django.views.generic.base.View.dispatch`
65  
-* :meth:`~django.views.generic.base.RedirectView.get`
  65
+* ``get()``
66 66
 * :meth:`~django.views.generic.base.RedirectView.get_redirect_url`
67  
-* :meth:`~django.views.generic.base.View.head`
  67
+* ``head()``
68 68
 * :meth:`~django.views.generic.base.View.http_method_not_allowed`
69  
-* :meth:`~django.views.generic.base.RedirectView.options`
70  
-* :meth:`~django.views.generic.base.RedirectView.post`
71  
-* :meth:`~django.views.generic.base.RedirectView.put`
  69
+* ``options()``
  70
+* ``post()``
  71
+* ``put()``
72 72
 
73 73
 Detail Views
74 74
 ------------
@@ -95,10 +95,10 @@ DetailView
95 95
 
96 96
 * :meth:`~django.views.generic.base.View.as_view`
97 97
 * :meth:`~django.views.generic.base.View.dispatch`
98  
-* :meth:`~django.views.generic.detail.BaseDetailView.get`
  98
+* ``get()``
99 99
 * :meth:`~django.views.generic.detail.SingleObjectMixin.get_context_data`
100 100
 * :meth:`~django.views.generic.detail.SingleObjectMixin.get_object`
101  
-* :meth:`~django.views.generic.base.View.head`
  101
+* ``head()``
102 102
 * :meth:`~django.views.generic.base.View.http_method_not_allowed`
103 103
 * :meth:`~django.views.generic.base.TemplateResponseMixin.render_to_response`
104 104
 
@@ -130,7 +130,7 @@ ListView
130 130
 * :meth:`~django.views.generic.list.BaseListView.get`
131 131
 * :meth:`~django.views.generic.list.MultipleObjectMixin.get_context_data`
132 132
 * :meth:`~django.views.generic.list.MultipleObjectMixin.get_paginator`
133  
-* :meth:`~django.views.generic.base.View.head`
  133
+* ``head()``
134 134
 * :meth:`~django.views.generic.base.View.http_method_not_allowed`
135 135
 * :meth:`~django.views.generic.list.MultipleObjectMixin.paginate_queryset`
136 136
 * :meth:`~django.views.generic.base.TemplateResponseMixin.render_to_response`
@@ -161,10 +161,10 @@ FormView
161 161
 * :meth:`~django.views.generic.edit.FormMixin.get_context_data`
162 162
 * :meth:`~django.views.generic.edit.FormMixin.get_form`
163 163
 * :meth:`~django.views.generic.edit.FormMixin.get_form_kwargs`
164  
-* :meth:`~django.views.generic.base.View.head`
  164
+* ``head()``
165 165
 * :meth:`~django.views.generic.base.View.http_method_not_allowed`
166  
-* :meth:`~django.views.generic.edit.ProcessFormView.post`
167  
-* :meth:`~django.views.generic.edit.ProcessFormView.put`
  166
+* ``post()``
  167
+* ``put()``
168 168
 * :meth:`~django.views.generic.base.TemplateResponseMixin.render_to_response`
169 169
 
170 170
 CreateView
@@ -199,10 +199,10 @@ CreateView
199 199
 * :meth:`~django.views.generic.edit.FormMixin.get_form`
200 200
 * :meth:`~django.views.generic.edit.FormMixin.get_form_kwargs`
201 201
 * :meth:`~django.views.generic.detail.SingleObjectMixin.get_object`
202  
-* :meth:`~django.views.generic.base.View.head`
  202
+* ``head()``
203 203
 * :meth:`~django.views.generic.base.View.http_method_not_allowed`
204 204
 * :meth:`~django.views.generic.edit.ProcessFormView.post`
205  
-* :meth:`~django.views.generic.edit.ProcessFormView.put`
  205
+* ``put()``
206 206
 * :meth:`~django.views.generic.base.TemplateResponseMixin.render_to_response`
207 207
 
208 208
 UpdateView
@@ -237,10 +237,10 @@ UpdateView
237 237
 * :meth:`~django.views.generic.edit.FormMixin.get_form`
238 238
 * :meth:`~django.views.generic.edit.FormMixin.get_form_kwargs`
239 239
 * :meth:`~django.views.generic.detail.SingleObjectMixin.get_object`
240  
-* :meth:`~django.views.generic.base.View.head`
  240
+* ``head()``
241 241
 * :meth:`~django.views.generic.base.View.http_method_not_allowed`
242 242
 * :meth:`~django.views.generic.edit.ProcessFormView.post`
243  
-* :meth:`~django.views.generic.edit.ProcessFormView.put`
  243
+* ``put()``
244 244
 * :meth:`~django.views.generic.base.TemplateResponseMixin.render_to_response`
245 245
 
246 246
 DeleteView
@@ -265,14 +265,14 @@ DeleteView
265 265
 **Methods**
266 266
 
267 267
 * :meth:`~django.views.generic.base.View.as_view`
268  
-* :meth:`~django.views.generic.edit.DeletionMixin.delete`
  268
+* ``delete()``
269 269
 * :meth:`~django.views.generic.base.View.dispatch`
270  
-* :meth:`~django.views.generic.detail.BaseDetailView.get`
  270
+* ``get()``
271 271
 * :meth:`~django.views.generic.detail.SingleObjectMixin.get_context_data`
272 272
 * :meth:`~django.views.generic.detail.SingleObjectMixin.get_object`
273  
-* :meth:`~django.views.generic.base.View.head`
  273
+* ``head()``
274 274
 * :meth:`~django.views.generic.base.View.http_method_not_allowed`
275  
-* :meth:`~django.views.generic.edit.DeletionMixin.post`
  275
+* ``post()``
276 276
 * :meth:`~django.views.generic.base.TemplateResponseMixin.render_to_response`
277 277
 
278 278
 Date-based views
@@ -302,13 +302,13 @@ ArchiveIndexView
302 302
 
303 303
 * :meth:`~django.views.generic.base.View.as_view`
304 304
 * :meth:`~django.views.generic.base.View.dispatch`
305  
-* :meth:`~django.views.generic.dates.BaseDateListView.get`
  305
+* ``get()``
306 306
 * :meth:`~django.views.generic.list.MultipleObjectMixin.get_context_data`
307 307
 * :meth:`~django.views.generic.dates.BaseDateListView.get_date_list`
308 308
 * :meth:`~django.views.generic.dates.BaseDateListView.get_dated_items`
309 309
 * :meth:`~django.views.generic.dates.BaseDateListView.get_dated_queryset`
310 310
 * :meth:`~django.views.generic.list.MultipleObjectMixin.get_paginator`
311  
-* :meth:`~django.views.generic.base.View.head`
  311
+* ``head()``
312 312
 * :meth:`~django.views.generic.base.View.http_method_not_allowed`
313 313
 * :meth:`~django.views.generic.list.MultipleObjectMixin.paginate_queryset`
314 314
 * :meth:`~django.views.generic.base.TemplateResponseMixin.render_to_response`
@@ -324,7 +324,7 @@ YearArchiveView
324 324
 * :attr:`~django.views.generic.list.MultipleObjectMixin.context_object_name` [:meth:`~django.views.generic.list.MultipleObjectMixin.get_context_object_name`]
325 325
 * :attr:`~django.views.generic.dates.DateMixin.date_field` [:meth:`~django.views.generic.dates.DateMixin.get_date_field`]
326 326
 * :attr:`~django.views.generic.base.View.http_method_names`
327  
-* :attr:`~django.views.generic.dates.BaseYearArchiveView.make_object_list` [:meth:`~django.views.generic.dates.BaseYearArchiveView.get_make_object_list`]
  327
+* :attr:`~django.views.generic.dates.YearArchiveView.make_object_list` [:meth:`~django.views.generic.dates.YearArchiveView.get_make_object_list`]
328 328
 * :attr:`~django.views.generic.list.MultipleObjectMixin.model`
329 329
 * :attr:`~django.views.generic.list.MultipleObjectMixin.paginate_by` [:meth:`~django.views.generic.list.MultipleObjectMixin.get_paginate_by`]
330 330
 * :attr:`~django.views.generic.list.MultipleObjectMixin.paginate_orphans` [:meth:`~django.views.generic.list.MultipleObjectMixin.get_paginate_orphans`]
@@ -340,13 +340,13 @@ YearArchiveView
340 340
 
341 341
 * :meth:`~django.views.generic.base.View.as_view`
342 342
 * :meth:`~django.views.generic.base.View.dispatch`
343  
-* :meth:`~django.views.generic.dates.BaseDateListView.get`
  343
+* ``get()``
344 344
 * :meth:`~django.views.generic.list.MultipleObjectMixin.get_context_data`
345 345
 * :meth:`~django.views.generic.dates.BaseDateListView.get_date_list`
346 346
 * :meth:`~django.views.generic.dates.BaseDateListView.get_dated_items`
347 347
 * :meth:`~django.views.generic.dates.BaseDateListView.get_dated_queryset`
348 348
 * :meth:`~django.views.generic.list.MultipleObjectMixin.get_paginator`
349  
-* :meth:`~django.views.generic.base.View.head`
  349
+* ``head()``
350 350
 * :meth:`~django.views.generic.base.View.http_method_not_allowed`
351 351
 * :meth:`~django.views.generic.list.MultipleObjectMixin.paginate_queryset`
352 352
 * :meth:`~django.views.generic.base.TemplateResponseMixin.render_to_response`
@@ -379,7 +379,7 @@ MonthArchiveView
379 379
 
380 380
 * :meth:`~django.views.generic.base.View.as_view`
381 381
 * :meth:`~django.views.generic.base.View.dispatch`
382  
-* :meth:`~django.views.generic.dates.BaseDateListView.get`
  382
+* ``get()``
383 383
 * :meth:`~django.views.generic.list.MultipleObjectMixin.get_context_data`
384 384
 * :meth:`~django.views.generic.dates.BaseDateListView.get_date_list`
385 385
 * :meth:`~django.views.generic.dates.BaseDateListView.get_dated_items`
@@ -387,7 +387,7 @@ MonthArchiveView
387 387
 * :meth:`~django.views.generic.dates.MonthMixin.get_next_month`
388 388
 * :meth:`~django.views.generic.list.MultipleObjectMixin.get_paginator`
389 389
 * :meth:`~django.views.generic.dates.MonthMixin.get_previous_month`
390  
-* :meth:`~django.views.generic.base.View.head`
  390
+* ``head()``
391 391
 * :meth:`~django.views.generic.base.View.http_method_not_allowed`
392 392
 * :meth:`~django.views.generic.list.MultipleObjectMixin.paginate_queryset`
393 393
 * :meth:`~django.views.generic.base.TemplateResponseMixin.render_to_response`
@@ -420,13 +420,13 @@ WeekArchiveView
420 420
 
421 421
 * :meth:`~django.views.generic.base.View.as_view`
422 422
 * :meth:`~django.views.generic.base.View.dispatch`
423  
-* :meth:`~django.views.generic.dates.BaseDateListView.get`
  423
+* ``get()``
424 424
 * :meth:`~django.views.generic.list.MultipleObjectMixin.get_context_data`
425 425
 * :meth:`~django.views.generic.dates.BaseDateListView.get_date_list`
426 426
 * :meth:`~django.views.generic.dates.BaseDateListView.get_dated_items`
427 427
 * :meth:`~django.views.generic.dates.BaseDateListView.get_dated_queryset`
428 428
 * :meth:`~django.views.generic.list.MultipleObjectMixin.get_paginator`
429  
-* :meth:`~django.views.generic.base.View.head`
  429
+* ``head()``
430 430
 * :meth:`~django.views.generic.base.View.http_method_not_allowed`
431 431
 * :meth:`~django.views.generic.list.MultipleObjectMixin.paginate_queryset`
432 432
 * :meth:`~django.views.generic.base.TemplateResponseMixin.render_to_response`
@@ -461,7 +461,7 @@ DayArchiveView
461 461
 
462 462
 * :meth:`~django.views.generic.base.View.as_view`
463 463
 * :meth:`~django.views.generic.base.View.dispatch`
464  
-* :meth:`~django.views.generic.dates.BaseDateListView.get`
  464
+* ``get()``
465 465
 * :meth:`~django.views.generic.list.MultipleObjectMixin.get_context_data`
466 466
 * :meth:`~django.views.generic.dates.BaseDateListView.get_date_list`
467 467
 * :meth:`~django.views.generic.dates.BaseDateListView.get_dated_items`
@@ -471,7 +471,7 @@ DayArchiveView
471 471
 * :meth:`~django.views.generic.list.MultipleObjectMixin.get_paginator`
472 472
 * :meth:`~django.views.generic.dates.DayMixin.get_previous_day`
473 473
 * :meth:`~django.views.generic.dates.MonthMixin.get_previous_month`
474  
-* :meth:`~django.views.generic.base.View.head`
  474
+* ``head()``
475 475
 * :meth:`~django.views.generic.base.View.http_method_not_allowed`
476 476
 * :meth:`~django.views.generic.list.MultipleObjectMixin.paginate_queryset`
477 477
 * :meth:`~django.views.generic.base.TemplateResponseMixin.render_to_response`
@@ -506,7 +506,7 @@ TodayArchiveView
506 506
 
507 507
 * :meth:`~django.views.generic.base.View.as_view`
508 508
 * :meth:`~django.views.generic.base.View.dispatch`
509  
-* :meth:`~django.views.generic.dates.BaseDateListView.get`
  509
+* ``get()``
510 510
 * :meth:`~django.views.generic.list.MultipleObjectMixin.get_context_data`
511 511
 * :meth:`~django.views.generic.dates.BaseDateListView.get_date_list`
512 512
 * :meth:`~django.views.generic.dates.BaseDateListView.get_dated_items`
@@ -516,7 +516,7 @@ TodayArchiveView
516 516
 * :meth:`~django.views.generic.list.MultipleObjectMixin.get_paginator`
517 517
 * :meth:`~django.views.generic.dates.DayMixin.get_previous_day`
518 518
 * :meth:`~django.views.generic.dates.MonthMixin.get_previous_month`
519  
-* :meth:`~django.views.generic.base.View.head`
  519
+* ``head()``
520 520
 * :meth:`~django.views.generic.base.View.http_method_not_allowed`
521 521
 * :meth:`~django.views.generic.list.MultipleObjectMixin.paginate_queryset`
522 522
 * :meth:`~django.views.generic.base.TemplateResponseMixin.render_to_response`
@@ -551,13 +551,13 @@ DateDetailView
551 551
 
552 552
 * :meth:`~django.views.generic.base.View.as_view`
553 553
 * :meth:`~django.views.generic.base.View.dispatch`
554  
-* :meth:`~django.views.generic.detail.BaseDetailView.get`
  554
+* ``get()``
555 555
 * :meth:`~django.views.generic.detail.SingleObjectMixin.get_context_data`
556 556
 * :meth:`~django.views.generic.dates.DayMixin.get_next_day`
557 557
 * :meth:`~django.views.generic.dates.MonthMixin.get_next_month`
558 558
 * :meth:`~django.views.generic.detail.SingleObjectMixin.get_object`
559 559
 * :meth:`~django.views.generic.dates.DayMixin.get_previous_day`
560 560
 * :meth:`~django.views.generic.dates.MonthMixin.get_previous_month`
561  
-* :meth:`~django.views.generic.base.View.head`
  561
+* ``head()``
562 562
 * :meth:`~django.views.generic.base.View.http_method_not_allowed`
563 563
 * :meth:`~django.views.generic.base.TemplateResponseMixin.render_to_response`
2  docs/ref/class-based-views/generic-date-based.txt
@@ -580,7 +580,7 @@ DateDetailView
580 580
     * :class:`django.views.generic.dates.MonthMixin`
581 581
     * :class:`django.views.generic.dates.DayMixin`
582 582
     * :class:`django.views.generic.dates.DateMixin`
583  
-    * :class:`django.views.generic.detail.BaseDetailView`
  583
+    * ``django.views.generic.detail.BaseDetailView``
584 584
     * :class:`django.views.generic.detail.SingleObjectMixin`
585 585
     * :class:`django.views.generic.base.View`
586 586
 
40  docs/ref/class-based-views/generic-display.txt
@@ -19,22 +19,22 @@ DetailView
19 19
 
20 20
     * :class:`django.views.generic.detail.SingleObjectTemplateResponseMixin`
21 21
     * :class:`django.views.generic.base.TemplateResponseMixin`
22  
-    * :class:`django.views.generic.detail.BaseDetailView`
  22
+    * ``django.views.generic.detail.BaseDetailView``
23 23
     * :class:`django.views.generic.detail.SingleObjectMixin`
24 24
     * :class:`django.views.generic.base.View`
25 25
 
26 26
     **Method Flowchart**
27 27
 
28  
-    1. :meth:`dispatch()`
29  
-    2. :meth:`http_method_not_allowed()`
30  
-    3. :meth:`get_template_names()`
31  
-    4. :meth:`get_slug_field()`
32  
-    5. :meth:`get_queryset()`
33  
-    6. :meth:`get_object()`
34  
-    7. :meth:`get_context_object_name()`
35  
-    8. :meth:`get_context_data()`
36  
-    9. :meth:`get()`
37  
-    10. :meth:`render_to_response()`
  28
+    1. :meth:`~django.views.generic.base.View.dispatch()`
  29
+    2. :meth:`~django.views.generic.base.View.http_method_not_allowed()`
  30
+    3. :meth:`~django.views.generic.base.TemplateResponseMixin.get_template_names()`
  31
+    4. :meth:`~django.views.generic.detail.SingleObjectMixin.get_slug_field()`
  32
+    5. :meth:`~django.views.generic.detail.SingleObjectMixin.get_queryset()`
  33
+    6. :meth:`~django.views.generic.detail.SingleObjectMixin.get_object()`
  34
+    7. :meth:`~django.views.generic.detail.SingleObjectMixin.get_context_object_name()`
  35
+    8. :meth:`~django.views.generic.detail.SingleObjectMixin.get_context_data()`
  36
+    9. ``get()``
  37
+    10. :meth:`~django.views.generic.base.TemplateResponseMixin.render_to_response()`
38 38
 
39 39
     **Example views.py**::
40 40
 
@@ -86,14 +86,14 @@ ListView
86 86
 
87 87
     **Method Flowchart**
88 88
 
89  
-    1. :meth:`dispatch()`
90  
-    2. :meth:`http_method_not_allowed()`
91  
-    3. :meth:`get_template_names()`
92  
-    4. :meth:`get_queryset()`
93  
-    5. :meth:`get_objects()`
94  
-    6. :meth:`get_context_data()`
95  
-    7. :meth:`get()`
96  
-    8. :meth:`render_to_response()`
  89
+    1. :meth:`~django.views.generic.base.View.dispatch()`
  90
+    2. :meth:`~django.views.generic.base.View.http_method_not_allowed()`
  91
+    3. :meth:`~django.views.generic.base.TemplateResponseMixin.get_template_names()`
  92
+    4. :meth:`~django.views.generic.list.MultipleObjectMixin.get_queryset()`
  93
+    5. :meth:`~django.views.generic.list.MultipleObjectMixin.get_context_object_name()`
  94
+    6. :meth:`~django.views.generic.list.MultipleObjectMixin.get_context_data()`
  95
+    7. ``get()``
  96
+    8. :meth:`~django.views.generic.base.TemplateResponseMixin.render_to_response()`
97 97
 
98 98
 
99 99
     **Example views.py**::
@@ -140,7 +140,7 @@ ListView
140 140
 
141 141
     .. method:: get(request, *args, **kwargs)
142 142
 
143  
-        Adds :attr:`object_list` to the context. If
  143
+        Adds ``object_list`` to the context. If
144 144
         :attr:`~django.views.generic.list.MultipleObjectMixin.allow_empty`
145 145
         is True then display an empty list. If
146 146
         :attr:`~django.views.generic.list.MultipleObjectMixin.allow_empty` is
10  docs/ref/class-based-views/generic-editing.txt
@@ -38,7 +38,7 @@ FormView
38 38
 
39 39
     * :class:`django.views.generic.edit.FormView`
40 40
     * :class:`django.views.generic.base.TemplateResponseMixin`
41  
-    * :class:`django.views.generic.edit.BaseFormView`
  41
+    * ``django.views.generic.edit.BaseFormView``
42 42
     * :class:`django.views.generic.edit.FormMixin`
43 43
     * :class:`django.views.generic.edit.ProcessFormView`
44 44
     * :class:`django.views.generic.base.View`
@@ -86,7 +86,7 @@ CreateView
86 86
     * :class:`django.views.generic.edit.CreateView`
87 87
     * :class:`django.views.generic.detail.SingleObjectTemplateResponseMixin`
88 88
     * :class:`django.views.generic.base.TemplateResponseMixin`
89  
-    * :class:`django.views.generic.edit.BaseCreateView`
  89
+    * ``django.views.generic.edit.BaseCreateView``
90 90
     * :class:`django.views.generic.edit.ModelFormMixin`
91 91
     * :class:`django.views.generic.edit.FormMixin`
92 92
     * :class:`django.views.generic.detail.SingleObjectMixin`
@@ -128,7 +128,7 @@ UpdateView
128 128
     * :class:`django.views.generic.edit.UpdateView`
129 129
     * :class:`django.views.generic.detail.SingleObjectTemplateResponseMixin`
130 130
     * :class:`django.views.generic.base.TemplateResponseMixin`
131  
-    * :class:`django.views.generic.edit.BaseUpdateView`
  131
+    * ``django.views.generic.edit.BaseUpdateView``
132 132
     * :class:`django.views.generic.edit.ModelFormMixin`
133 133
     * :class:`django.views.generic.edit.FormMixin`
134 134
     * :class:`django.views.generic.detail.SingleObjectMixin`
@@ -170,9 +170,9 @@ DeleteView
170 170
     * :class:`django.views.generic.edit.DeleteView`
171 171
     * :class:`django.views.generic.detail.SingleObjectTemplateResponseMixin`
172 172
     * :class:`django.views.generic.base.TemplateResponseMixin`
173  
-    * :class:`django.views.generic.edit.BaseDeleteView`
  173
+    * ``django.views.generic.edit.BaseDeleteView``
174 174
     * :class:`django.views.generic.edit.DeletionMixin`
175  
-    * :class:`django.views.generic.detail.BaseDetailView`
  175
+    * ``django.views.generic.detail.BaseDetailView``
176 176
     * :class:`django.views.generic.detail.SingleObjectMixin`
177 177
     * :class:`django.views.generic.base.View`
178 178
 
9  docs/ref/class-based-views/mixins-date-based.txt
@@ -100,7 +100,7 @@ MonthMixin
100 100
         :attr:`~BaseDateListView.allow_empty` and
101 101
         :attr:`~DateMixin.allow_future`.
102 102
 
103  
-    .. method:: get_prev_month(date)
  103
+    .. method:: get_previous_month(date)
104 104
 
105 105
         Returns a date object containing the first day of the month before the
106 106
         date provided. This function can also return ``None`` or raise an
@@ -152,7 +152,7 @@ DayMixin
152 152
         :attr:`~BaseDateListView.allow_empty` and
153 153
         :attr:`~DateMixin.allow_future`.
154 154
 
155  
-    .. method:: get_prev_day(date)
  155
+    .. method:: get_previous_day(date)
156 156
 
157 157
         Returns a date object containing the previous valid day. This function
158 158
         can also return ``None`` or raise an :class:`~django.http.Http404`
@@ -287,8 +287,9 @@ BaseDateListView
287 287
         available. If this is ``True`` and no objects are available, the view
288 288
         will display an empty page instead of raising a 404.
289 289
 
290  
-        This is identical to :attr:`MultipleObjectMixin.allow_empty`, except
291  
-        for the default value, which is ``False``.
  290
+        This is identical to
  291
+        :attr:`django.views.generic.list.MultipleObjectMixin.allow_empty`,
  292
+        except for the default value, which is ``False``.
292 293
 
293 294
     .. attribute:: date_list_period
294 295
 
43  docs/ref/class-based-views/mixins-editing.txt
@@ -83,9 +83,8 @@ FormMixin
83 83
 
84 84
     .. note::
85 85
 
86  
-        Views mixing :class:`FormMixin` must provide an implementation of
87  
-        :meth:`~django.views.generic.FormMixin.form_valid` and
88  
-        :meth:`~django.views.generic.FormMixin.form_invalid`.
  86
+        Views mixing ``FormMixin`` must provide an implementation of
  87
+        :meth:`form_valid` and :meth:`form_invalid`.
89 88
 
90 89
 
91 90
 ModelFormMixin
@@ -93,15 +92,16 @@ ModelFormMixin
93 92
 
94 93
 .. class:: django.views.generic.edit.ModelFormMixin
95 94
 
96  
-    A form mixin that works on ModelForms, rather than a standalone form.
  95
+    A form mixin that works on ``ModelForms``, rather than a standalone form.
97 96
 
98 97
     Since this is a subclass of
99 98
     :class:`~django.views.generic.detail.SingleObjectMixin`, instances of this
100  
-    mixin have access to the :attr:`~SingleObjectMixin.model` and
101  
-    :attr:`~SingleObjectMixin.queryset` attributes, describing the type of
102  
-    object that the ModelForm is manipulating. The view also provides
103  
-    ``self.object``, the instance being manipulated. If the instance is being
104  
-    created, ``self.object`` will be ``None``.
  99
+    mixin have access to the
  100
+    :attr:`~django.views.generic.detail.SingleObjectMixin.model` and
  101
+    :attr:`~django.views.generic.detail.SingleObjectMixin.queryset` attributes,
  102
+    describing the type of object that the ``ModelForm`` is manipulating. The
  103
+    view also provides ``self.object``, the instance being manipulated. If the
  104
+    instance is being created, ``self.object`` will be ``None``.
105 105
 
106 106
     **Mixins**
107 107
 
@@ -110,6 +110,12 @@ ModelFormMixin
110 110
 
111 111
     **Methods and Attributes**
112 112
 
  113
+    .. attribute:: model
  114
+
  115
+        A model class. Can be explicitly provided, otherwise will be determined
  116
+        by examining ``self.object`` or
  117
+        :attr:`~django.views.generic.detail.SingleObjectMixin.queryset`.
  118
+
113 119
     .. attribute:: success_url
114 120
 
115 121
         The URL to redirect to when the form is successfully processed.
@@ -122,22 +128,25 @@ ModelFormMixin
122 128
     .. method:: get_form_class()
123 129
 
124 130
         Retrieve the form class to instantiate. If
125  
-        :attr:`FormMixin.form_class` is provided, that class will be used.
126  
-        Otherwise, a ModelForm will be instantiated using the model associated
127  
-        with the :attr:`~SingleObjectMixin.queryset`, or with the
128  
-        :attr:`~SingleObjectMixin.model`, depending on which attribute is
129  
-        provided.
  131
+        :attr:`~django.views.generic.edit.FormMixin.form_class` is provided,
  132
+        that class will be used. Otherwise, a ``ModelForm`` will be
  133
+        instantiated using the model associated with the
  134
+        :attr:`~django.views.generic.detail.SingleObjectMixin.queryset`, or
  135
+        with the :attr:`~django.views.generic.detail.SingleObjectMixin.model`,
  136
+        depending on which attribute is provided.
130 137
 
131 138
     .. method:: get_form_kwargs()
132 139
 
133 140
         Add the current instance (``self.object``) to the standard
134  
-        :meth:`FormMixin.get_form_kwargs`.
  141
+        :meth:`~django.views.generic.edit.FormMixin.get_form_kwargs`.
135 142
 
136 143
     .. method:: get_success_url()
137 144
 
138 145
         Determine the URL to redirect to when the form is successfully
139  
-        validated. Returns :attr:`ModelFormMixin.success_url` if it is provided;
140  
-        otherwise, attempts to use the ``get_absolute_url()`` of the object.
  146
+        validated. Returns
  147
+        :attr:`django.views.generic.edit.ModelFormMixin.success_url` if it is
  148
+        provided; otherwise, attempts to use the ``get_absolute_url()`` of the
  149
+        object.
141 150
 
142 151
     .. method:: form_valid(form)
143 152
 
22  docs/ref/class-based-views/mixins-multiple-object.txt
@@ -61,14 +61,13 @@ MultipleObjectMixin
61 61
     .. attribute:: queryset
62 62
 
63 63
         A ``QuerySet`` that represents the objects. If provided, the value of
64  
-        :attr:`MultipleObjectMixin.queryset` supersedes the value provided for
65  
-        :attr:`MultipleObjectMixin.model`.
  64
+        ``queryset`` supersedes the value provided for :attr:`model`.
66 65
 
67 66
     .. attribute:: paginate_by
68 67
 
69 68
         An integer specifying how many objects should be displayed per page. If
70 69
         this is given, the view will paginate objects with
71  
-        :attr:`MultipleObjectMixin.paginate_by` objects per page. The view will
  70
+        ``paginate_by`` objects per page. The view will
72 71
         expect either a ``page`` query string parameter (via ``request.GET``)
73 72
         or a ``page`` variable specified in the URLconf.
74 73
 
@@ -77,10 +76,9 @@ MultipleObjectMixin
77 76
         .. versionadded:: 1.6
78 77
 
79 78
         An integer specifying the number of "overflow" objects the last page
80  
-        can contain. This extends the :attr:`MultipleObjectMixin.paginate_by`
81  
-        limit on the last page by up to
82  
-        :attr:`MultipleObjectMixin.paginate_orphans`, in order to keep the last
83  
-        page from having a very small number of objects.
  79
+        can contain. This extends the :attr:`paginate_by` limit on the last
  80
+        page by up to ``paginate_orphans``, in order to keep the last page from
  81
+        having a very small number of objects.
84 82
 
85 83
     .. attribute:: page_kwarg
86 84
 
@@ -97,7 +95,7 @@ MultipleObjectMixin
97 95
        :class:`django.core.paginator.Paginator` is used. If the custom paginator
98 96
        class doesn't have the same constructor interface as
99 97
        :class:`django.core.paginator.Paginator`, you will also need to
100  
-       provide an implementation for :meth:`MultipleObjectMixin.get_paginator`.
  98
+       provide an implementation for :meth:`get_paginator`.
101 99
 
102 100
     .. attribute:: context_object_name
103 101
 
@@ -122,20 +120,20 @@ MultipleObjectMixin
122 120
 
123 121
         Returns the number of items to paginate by, or ``None`` for no
124 122
         pagination. By default this simply returns the value of
125  
-        :attr:`MultipleObjectMixin.paginate_by`.
  123
+        :attr:`paginate_by`.
126 124
 
127 125
     .. method:: get_paginator(queryset, per_page, orphans=0, allow_empty_first_page=True)
128 126
 
129 127
         Returns an instance of the paginator to use for this view. By default,
130 128
         instantiates an instance of :attr:`paginator_class`.
131 129
 
132  
-    .. method:: get_paginate_by()
  130
+    .. method:: get_paginate_orphans()
133 131
 
134 132
         .. versionadded:: 1.6
135 133
 
136 134
         An integer specifying the number of "overflow" objects the last page
137 135
         can contain. By default this simply returns the value of
138  
-        :attr:`MultipleObjectMixin.paginate_orphans`.
  136
+        :attr:`paginate_orphans`.
139 137
 
140 138
     .. method:: get_allow_empty()
141 139
 
@@ -149,7 +147,7 @@ MultipleObjectMixin
149 147
         Return the context variable name that will be used to contain
150 148
         the list of data that this view is manipulating. If
151 149
         ``object_list`` is a queryset of Django objects and
152  
-        :attr:`~MultipleObjectMixin.context_object_name` is not set,
  150
+        :attr:`context_object_name` is not set,
153 151
         the context name will be the ``object_name`` of the model that
154 152
         the queryset is composed from, with postfix ``'_list'``
155 153
         appended. For example, the model ``Article`` would have a
12  docs/ref/class-based-views/mixins-simple.txt
@@ -48,7 +48,7 @@ TemplateResponseMixin
48 48
     .. attribute:: template_name
49 49
 
50 50
         The full name of a template to use as defined by a string. Not defining
51  
-        a template_name will raise a
  51
+        a ``template_name`` will raise a
52 52
         :class:`django.core.exceptions.ImproperlyConfigured` exception.
53 53
 
54 54
     .. attribute:: response_class
@@ -73,15 +73,13 @@ TemplateResponseMixin
73 73
         If any keyword arguments are provided, they will be passed to the
74 74
         constructor of the response class.
75 75
 
76  
-        Calls :meth:`~TemplateResponseMixin.get_template_names()` to obtain the
77  
-        list of template names that will be searched looking for an existent
78  
-        template.
  76
+        Calls :meth:`get_template_names()` to obtain the list of template names
  77
+        that will be searched looking for an existent template.
79 78
 
80 79
     .. method:: get_template_names()
81 80
 
82 81
         Returns a list of template names to search for when rendering the
83 82
         template.
84 83
 
85  
-        If :attr:`TemplateResponseMixin.template_name` is specified, the
86  
-        default implementation will return a list containing
87  
-        :attr:`TemplateResponseMixin.template_name` (if it is specified).
  84
+        If :attr:`template_name` is specified, the default implementation will
  85
+        return a list containing :attr:`template_name` (if it is specified).
41  docs/ref/class-based-views/mixins-single-object.txt
@@ -21,8 +21,7 @@ SingleObjectMixin
21 21
     .. attribute:: queryset
22 22
 
23 23
         A ``QuerySet`` that represents the objects. If provided, the value of
24  
-        :attr:`SingleObjectMixin.queryset` supersedes the value provided for
25  
-        :attr:`SingleObjectMixin.model`.
  24
+        ``queryset`` supersedes the value provided for :attr:`model`.
26 25
 
27 26
     .. attribute:: slug_field
28 27
 
@@ -47,38 +46,38 @@ SingleObjectMixin
47 46
 
48 47
         Returns the single object that this view will display. If
49 48
         ``queryset`` is provided, that queryset will be used as the
50  
-        source of objects; otherwise,
51  
-        :meth:`~SingleObjectMixin.get_queryset` will be used.
52  
-        ``get_object()`` looks for a
53  
-        :attr:`SingleObjectMixin.pk_url_kwarg` argument in the arguments
54  
-        to the view; if this argument is found, this method performs a
55  
-        primary-key based lookup using that value. If this argument is not
56  
-        found, it looks for a :attr:`SingleObjectMixin.slug_url_kwarg`
57  
-        argument, and performs a slug lookup using the
58  
-        :attr:`SingleObjectMixin.slug_field`.
  49
+        source of objects; otherwise, :meth:`get_queryset` will be used.
  50
+        ``get_object()`` looks for a :attr:`pk_url_kwarg` argument in the
  51
+        arguments to the view; if this argument is found, this method performs
  52
+        a primary-key based lookup using that value. If this argument is not
  53
+        found, it looks for a :attr:`slug_url_kwarg` argument, and performs a
  54
+        slug lookup using the :attr:`slug_field`.
59 55
 
60 56
     .. method:: get_queryset()
61 57
 
62 58
         Returns the queryset that will be used to retrieve the object that
63  
-        this view will display. By default,
64  
-        :meth:`~SingleObjectMixin.get_queryset` returns the value of the
65  
-        :attr:`~SingleObjectMixin.queryset` attribute if it is set, otherwise
66  
-        it constructs a :class:`QuerySet` by calling the `all()` method on the
67  
-        :attr:`~SingleObjectMixin.model` attribute's default manager.
  59
+        this view will display. By default, :meth:`get_queryset` returns the
  60
+        value of the :attr:`queryset` attribute if it is set, otherwise
  61
+        it constructs a :class:`~django.db.models.query.QuerySet` by calling
  62
+        the `all()` method on the :attr:`model` attribute's default manager.
68 63
 
69 64
     .. method:: get_context_object_name(obj)
70 65
 
71 66
         Return the context variable name that will be used to contain the
72  
-        data that this view is manipulating. If
73  
-        :attr:`~SingleObjectMixin.context_object_name` is not set, the context
74  
-        name will be constructed from the ``object_name`` of the model that
75  
-        the queryset is composed from. For example, the model ``Article``
76  
-        would have context object named ``'article'``.
  67
+        data that this view is manipulating. If :attr:`context_object_name` is
  68
+        not set, the context name will be constructed from the ``object_name``
  69
+        of the model that the queryset is composed from. For example, the model
  70
+        ``Article`` would have context object named ``'article'``.
77 71
 
78 72
     .. method:: get_context_data(**kwargs)
79 73
 
80 74
         Returns context data for displaying the list of objects.
81 75
 
  76
+    .. method:: get_slug_field()
  77
+
  78
+        Returns the name of a slug field to be used to look up by slug. By
  79
+        default this simply returns the value of :attr:`slug_field`.
  80
+
82 81
     **Context**
83 82
 
84 83
     * ``object``: The object that this view is displaying. If
8  docs/ref/clickjacking.txt
@@ -111,10 +111,10 @@ Browsers that support X-Frame-Options
111 111
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
112 112
 
113 113
 * Internet Explorer 8+
114  
-* Firefox	3.6.9+
115  
-* Opera	10.5+
116  
-* Safari	4+
117  
-* Chrome	4.1+
  114
+* Firefox 3.6.9+
  115
+* Opera 10.5+
  116
+* Safari 4+
  117
+* Chrome 4.1+
118 118
 
119 119
 See also
120 120
 ~~~~~~~~
2  docs/ref/contrib/admin/admindocs.txt
@@ -24,7 +24,7 @@ the following:
24 24
 
25 25
 * Add :mod:`django.contrib.admindocs` to your :setting:`INSTALLED_APPS`.
26 26
 * Add ``(r'^admin/doc/', include('django.contrib.admindocs.urls'))`` to
27  
-  your :data:`urlpatterns`. Make sure it's included *before* the
  27
+  your ``urlpatterns``. Make sure it's included *before* the
28 28
   ``r'^admin/'`` entry, so that requests to ``/admin/doc/`` don't get
29 29
   handled by the latter entry.
30 30
 * Install the docutils Python module (http://docutils.sf.net/).
26  docs/ref/contrib/admin/index.txt
@@ -170,7 +170,7 @@ subclass::
170 170
     ``fields`` option (for more complex layout needs see the
171 171
     :attr:`~ModelAdmin.fieldsets` option described in the next section). For
172 172
     example, you could define a simpler version of the admin form for the
173  
-    ``django.contrib.flatpages.FlatPage`` model as follows::
  173
+    :class:`django.contrib.flatpages.models.FlatPage` model as follows::