Fixed #15233 -- reST/Sphinx markup corrections in numerous areas, mostly centering around bad crossref targets. Thanks to Aryeh Leib Taurog for the draft patch.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@15549 bcc190cf-cafb-0310-a4f2-bffc1f526a37

docs/ref/contrib/admin/index.txt

@@ -1110,6 +1110,8 @@ information.
 ============================
 
 .. class:: InlineModelAdmin
+.. class:: TabularInline
+.. class:: StackedInline
 
     The admin interface has the ability to edit models on the same page as a
     parent model. These are called inlines. Suppose you have these two models::
@@ -1134,8 +1136,8 @@ information.
 
     Django provides two subclasses of ``InlineModelAdmin`` and they are:
 
-        * ``TabularInline``
+        * :class:`~django.contrib.admin.TabularInline`
-        * ``StackedInline``
+        * :class:`~django.contrib.admin.StackedInline`
 
     The difference between these two is merely the template used to render
     them.

docs/ref/contrib/formtools/form-preview.txt

@@ -2,7 +2,7 @@
 Form preview
 ============
 
-.. module:: django.contrib.formtools
+.. module:: django.contrib.formtools.preview
     :synopsis: Displays an HTML form, forces a preview, then does something
                with the submission.
 
@@ -26,7 +26,7 @@ application takes care of the following workflow:
       b. If it's not valid, redisplays the form with error messages.
    3. When the "confirmation" form is submitted from the preview page, calls
       a hook that you define -- a
-      :meth:`~django.contrib.formtools.FormPreview.done()` method that gets
+      :meth:`~django.contrib.formtools.preview.FormPreview.done()` method that gets
       passed the valid data.
 
 The framework enforces the required preview by passing a shared-secret hash to
@@ -50,8 +50,8 @@ How to use ``FormPreview``
               :file:`django/contrib/formtools/templates` directory, and add that
               directory to your :setting:`TEMPLATE_DIRS` setting.
 
-    2. Create a :class:`~django.contrib.formtools.FormPreview` subclass that
+    2. Create a :class:`~django.contrib.formtools.preview.FormPreview` subclass that
-       overrides the :meth:`~django.contrib.formtools.FormPreview.done()`
+       overrides the :meth:`~django.contrib.formtools.preview.FormPreview.done()`
        method::
 
            from django.contrib.formtools.preview import FormPreview
@@ -70,7 +70,7 @@ How to use ``FormPreview``
        is the end result of the form being submitted.
 
     3. Change your URLconf to point to an instance of your
-       :class:`~django.contrib.formtools.FormPreview` subclass::
+       :class:`~django.contrib.formtools.preview.FormPreview` subclass::
 
            from myapp.preview import SomeModelFormPreview
            from myapp.forms import SomeModelForm
@@ -89,11 +89,11 @@ How to use ``FormPreview``
 
 .. class:: FormPreview
 
-A :class:`~django.contrib.formtools.FormPreview` class is a simple Python class
+A :class:`~django.contrib.formtools.preview.FormPreview` class is a simple Python class
 that represents the preview workflow.
-:class:`~django.contrib.formtools.FormPreview` classes must subclass
+:class:`~django.contrib.formtools.preview.FormPreview` classes must subclass
 ``django.contrib.formtools.preview.FormPreview`` and override the
-:meth:`~django.contrib.formtools.FormPreview.done()` method. They can live
+:meth:`~django.contrib.formtools.preview.FormPreview.done()` method. They can live
 anywhere in your codebase.
 
 ``FormPreview`` templates
@@ -102,8 +102,8 @@ anywhere in your codebase.
 By default, the form is rendered via the template :file:`formtools/form.html`,
 and the preview page is rendered via the template :file:`formtools/preview.html`.
 These values can be overridden for a particular form preview by setting
-:attr:`~django.contrib.formtools.FormPreview.preview_template` and
+:attr:`~django.contrib.formtools.preview.FormPreview.preview_template` and
-:attr:`~django.contrib.formtools.FormPreview.form_template` attributes on the
+:attr:`~django.contrib.formtools.preview.FormPreview.form_template` attributes on the
 FormPreview subclass. See :file:`django/contrib/formtools/templates` for the
 default templates.
 

docs/ref/forms/widgets.txt

@@ -160,6 +160,8 @@ commonly used groups of widgets:
     Takes two optional arguments, ``date_format`` and ``time_format``, which
     work just like the ``format`` argument for ``DateInput`` and ``TimeInput``.
 
+.. currentmodule:: django.forms.extras.widgets
+
 .. class:: SelectDateWidget
 
     Wrapper around three select widgets: one each for month, day, and year.
@@ -180,6 +182,7 @@ commonly used groups of widgets:
 
 Specifying widgets
 ------------------
+.. currentmodule:: django.forms
 
 .. attribute:: Form.widget
 

docs/ref/models/querysets.txt

@@ -1749,6 +1749,8 @@ SQL equivalents::
 Aggregation functions
 ---------------------
 
+.. currentmodule:: django.db.models
+
 Django provides the following aggregation functions in the
 ``django.db.models`` module. For details on how to use these
 aggregate functions, see

docs/ref/utils.txt

@@ -47,8 +47,8 @@ arguments to it. The transformation is as follows:
 
 .. function:: get_max_age(response)
 
-Returns the max-age from the response Cache-Control header as an integer (or
+    Returns the max-age from the response Cache-Control header as an integer
-``None`` if it wasn't found or wasn't an integer).
+    (or ``None`` if it wasn't found or wasn't an integer).
 
 .. function:: patch_response_headers(response, cache_timeout=None)
 
@@ -61,8 +61,8 @@ Adds some useful headers to the given ``HttpResponse`` object:
 
     Each header is only added if it isn't already set.
 
-``cache_timeout`` is in seconds. The ``CACHE_MIDDLEWARE_SECONDS`` setting is
+    ``cache_timeout`` is in seconds. The ``CACHE_MIDDLEWARE_SECONDS`` setting
-used by default.
+    is used by default.
 
 .. function:: add_never_cache_headers(response)
 
@@ -71,14 +71,15 @@ Adds headers to a response to indicate that a page should never be cached.
 .. function:: patch_vary_headers(response, newheaders)
 
     Adds (or updates) the ``Vary`` header in the given ``HttpResponse`` object.
-``newheaders`` is a list of header names that should be in ``Vary``. Existing
+    ``newheaders`` is a list of header names that should be in ``Vary``.
-headers in ``Vary`` aren't removed.
+    Existing headers in ``Vary`` aren't removed.
 
 .. function:: get_cache_key(request, key_prefix=None)
 
-Returns a cache key based on the request path. It can be used in the request
+    Returns a cache key based on the request path. It can be used in the
-phase because it pulls the list of headers to take into account from the
+    request phase because it pulls the list of headers to take into account
-global path registry and uses those to build a cache key to check against.
+    from the global path registry and uses those to build a cache key to
+    check against.
 
     If there is no headerlist stored, the page needs to be rebuilt, so this
     function returns ``None``.
@@ -87,14 +88,15 @@ function returns ``None``.
 
     Learns what headers to take into account for some request path from the
     response object. It stores those headers in a global path registry so that
-later access to that path will know what headers to take into account without
+    later access to that path will know what headers to take into account
-building the response object itself. The headers are named in the ``Vary``
+    without building the response object itself. The headers are named in
-header of the response, but we want to prevent response generation.
+    the ``Vary`` header of the response, but we want to prevent response
+    generation.
 
-The list of headers to use for cache key generation is stored in the same cache
+    The list of headers to use for cache key generation is stored in the same
-as the pages themselves. If the cache ages some data out of the cache, this
+    cache as the pages themselves. If the cache ages some data out of the
-just means that we have to build the response once to get at the Vary header
+    cache, this just means that we have to build the response once to get at
-and so at the list of headers to use for the cache key.
+    the Vary header and so at the list of headers to use for the cache key.
 
 SortedDict
 ==========
@@ -102,12 +104,12 @@ SortedDict
 .. module:: django.utils.datastructures
    :synopsis: A dictionary that keeps its keys in the order in which they're inserted.
 
-.. class:: django.utils.datastructures.SortedDict
+.. class:: SortedDict
 
-Methods
+    The :class:`django.utils.datastructures.SortedDict` class is a dictionary
--------
+    that keeps its keys in the order in which they're inserted.
-
+    ``SortedDict`` adds two additional methods to the standard Python ``dict``
-Extra methods that ``SortedDict`` adds to the standard Python ``dict`` class.
+    class:
 
     .. method:: insert(index, key, value)
 
@@ -117,8 +119,8 @@ Inserts the key, value pair before the item with the given index.
 
         Returns the value of the item at the given zero-based index.
 
-Creating new SortedDict
+Creating a new SortedDict
------------------------
+-------------------------
 
 Creating a new ``SortedDict`` must be done in a way where ordering is
 guaranteed. For example::
@@ -138,15 +140,16 @@ results. Instead do::
 
 .. class:: StrAndUnicode
 
-A class whose ``__str__`` returns its ``__unicode__`` as a UTF-8 bytestring.
+    A class whose ``__str__`` returns its ``__unicode__`` as a UTF-8
-Useful as a mix-in.
+    bytestring. Useful as a mix-in.
 
 .. function:: smart_unicode(s, encoding='utf-8', strings_only=False, errors='strict')
 
-Returns a ``unicode`` object representing ``s``. Treats bytestrings using the
+    Returns a ``unicode`` object representing ``s``. Treats bytestrings using
-'encoding' codec.
+    the 'encoding' codec.
 
-If ``strings_only`` is ``True``, don't convert (some) non-string-like objects.
+    If ``strings_only`` is ``True``, don't convert (some) non-string-like
+    objects.
 
 .. function:: is_protected_type(obj)
 
@@ -157,25 +160,28 @@ Objects of protected types are preserved as-is when passed to
 
 .. function:: force_unicode(s, encoding='utf-8', strings_only=False, errors='strict')
 
-Similar to ``smart_unicode``, except that lazy instances are resolved to strings,
+    Similar to ``smart_unicode``, except that lazy instances are resolved to
-rather than kept as lazy objects.
+    strings, rather than kept as lazy objects.
 
-If ``strings_only`` is ``True``, don't convert (some) non-string-like objects.
+    If ``strings_only`` is ``True``, don't convert (some) non-string-like
+    objects.
 
 .. function:: smart_str(s, encoding='utf-8', strings_only=False, errors='strict')
 
-Returns a bytestring version of ``s``, encoded as specified in ``encoding``.
+    Returns a bytestring version of ``s``, encoded as specified in
+    ``encoding``.
 
-If ``strings_only`` is ``True``, don't convert (some) non-string-like objects.
+    If ``strings_only`` is ``True``, don't convert (some) non-string-like
+    objects.
 
 .. function:: iri_to_uri(iri)
 
-Convert an Internationalized Resource Identifier (IRI) portion to a URI portion
+    Convert an Internationalized Resource Identifier (IRI) portion to a URI
-that is suitable for inclusion in a URL.
+    portion that is suitable for inclusion in a URL.
 
-This is the algorithm from section 3.1 of `RFC 3987`_.  However, since we are
+    This is the algorithm from section 3.1 of `RFC 3987`_.  However, since we
-assuming input is either UTF-8 or unicode already, we can simplify things a
+    are assuming input is either UTF-8 or unicode already, we can simplify
-little from the full method.
+    things a little from the full method.
 
     .. _RFC 3987: http://www.ietf.org/rfc/rfc3987.txt
 
@@ -224,9 +230,6 @@ SyndicationFeed
 
     Base class for all syndication feeds. Subclasses should provide write().
 
-Methods
-~~~~~~~
-
     .. method:: add_item(title, link, description, [author_email=None, author_name=None, author_link=None, pubdate=None, comments=None, unique_id=None, enclosure=None, categories=(), item_copyright=None, ttl=None, **kwargs])
 
         Adds an item to the feed. All args are expected to be Python ``unicode``
@@ -237,16 +240,18 @@ objects except ``pubdate``, which is a ``datetime.datetime`` object, and
 
     .. method:: root_attributes()
 
-Return extra attributes to place on the root (i.e. feed/channel) element.
+        Return extra attributes to place on the root (i.e. feed/channel)
-Called from write().
+        element. Called from write().
 
     .. method:: add_root_elements(handler)
 
-Add elements in the root (i.e. feed/channel) element. Called from write().
+        Add elements in the root (i.e. feed/channel) element.
+        Called from write().
 
     .. method:: item_attributes(item)
 
-Return extra attributes to place on each item (i.e. item/entry) element.
+        Return extra attributes to place on each item (i.e. item/entry)
+        element.
 
     .. method:: add_item_elements(handler, item)
 
@@ -254,8 +259,8 @@ Add elements on each item (i.e. item/entry) element.
 
     .. method:: write(outfile, encoding)
 
-Outputs the feed in the given encoding to ``outfile``, which is a file-like
+        Outputs the feed in the given encoding to ``outfile``, which is a
-object. Subclasses should override this.
+        file-like object. Subclasses should override this.
 
     .. method:: writeString(encoding)
 
@@ -263,8 +268,8 @@ Returns the feed in the given encoding as a string.
 
     .. method:: latest_post_date()
 
-Returns the latest item's ``pubdate``. If none of them have a ``pubdate``,
+        Returns the latest item's ``pubdate``. If none of them have a
-this returns the current date/time.
+        ``pubdate``, this returns the current date/time.
 
 Enclosure
 ---------
@@ -300,31 +305,33 @@ Spec: http://atompub.org/2005/07/11/draft-ietf-atompub-format-10.html
 
 .. function:: urlquote(url, safe='/')
 
-A version of Python's ``urllib.quote()`` function that can operate on unicode
+    A version of Python's ``urllib.quote()`` function that can operate on
-strings. The url is first UTF-8 encoded before quoting. The returned string
+    unicode strings. The url is first UTF-8 encoded before quoting. The
-can safely be used as part of an argument to a subsequent ``iri_to_uri()``
+    returned string can safely be used as part of an argument to a subsequent
-call without double-quoting occurring. Employs lazy execution.
+    ``iri_to_uri()`` call without double-quoting occurring. Employs lazy
+    execution.
 
 .. function:: urlquote_plus(url, safe='')
 
-A version of Python's urllib.quote_plus() function that can operate on unicode
+    A version of Python's urllib.quote_plus() function that can operate on
-strings. The url is first UTF-8 encoded before quoting. The returned string can
+    unicode strings. The url is first UTF-8 encoded before quoting. The
-safely be used as part of an argument to a subsequent iri_to_uri() call without
+    returned string can safely be used as part of an argument to a subsequent
-double-quoting occurring. Employs lazy execution.
+    ``iri_to_uri()`` call without double-quoting occurring. Employs lazy
+    execution.
 
 .. function:: urlencode(query, doseq=0)
 
-A version of Python's urllib.urlencode() function that can operate on unicode
+    A version of Python's urllib.urlencode() function that can operate on
-strings. The parameters are first case to UTF-8 encoded strings and then
+    unicode strings. The parameters are first case to UTF-8 encoded strings
-encoded as per normal.
+    and then encoded as per normal.
 
 .. function:: cookie_date(epoch_seconds=None)
 
     Formats the time to ensure compatibility with Netscape's cookie standard.
 
-Accepts a floating point number expressed in seconds since the epoch, in UTC -
+    Accepts a floating point number expressed in seconds since the epoch in
-such as that outputted by ``time.time()``. If set to ``None``, defaults to the current
+    UTC--such as that outputted by ``time.time()``. If set to ``None``,
-time.
+    defaults to the current time.
 
     Outputs a string in the format ``Wdy, DD-Mon-YYYY HH:MM:SS GMT``.
 
@@ -335,19 +342,19 @@ Formats the time to match the RFC 1123 date format as specified by HTTP
 
     .. _RFC 2616: http://www.w3.org/Protocols/rfc2616/rfc2616.txt
 
-Accepts a floating point number expressed in seconds since the epoch, in UTC -
+    Accepts a floating point number expressed in seconds since the epoch in
-such as that outputted by ``time.time()``. If set to ``None``, defaults to the current
+    UTC--such as that outputted by ``time.time()``. If set to ``None``,
-time.
+    defaults to the current time.
 
     Outputs a string in the format ``Wdy, DD Mon YYYY HH:MM:SS GMT``.
 
 .. function:: base36_to_int(s)
 
-Converted a base 36 string to an integer
+    Converts a base 36 string to an integer.
 
 .. function:: int_to_base36(i)
 
-Converts an integer to a base36 string
+    Converts an integer to a base 36 string.
 
 ``django.utils.safestring``
 ===========================
@@ -368,8 +375,8 @@ further escaping) for HTML output purposes.
 
 .. class:: SafeUnicode
 
-A unicode subclass that has been specifically marked as "safe" for HTML output
+    A unicode subclass that has been specifically marked as "safe" for HTML
-purposes.
+    output purposes.
 
 .. function:: mark_safe(s)
 
@@ -380,11 +387,11 @@ Can be called multiple times on a single string.
 
 .. function:: mark_for_escaping(s)
 
-Explicitly mark a string as requiring HTML escaping upon output. Has no effect
+    Explicitly mark a string as requiring HTML escaping upon output. Has no
-on ``SafeData`` subclasses.
+    effect on ``SafeData`` subclasses.
 
-Can be called multiple times on a single string (the resulting escaping is only
+    Can be called multiple times on a single string (the resulting escaping is
-applied once).
+    only applied once).
 
 ``django.utils.translation``
 ============================
@@ -412,19 +419,20 @@ See :ref:`lazy translations documentation <lazy-translations>`.
 
 .. function:: gettext_noop(message)
 
-Marks strings for translation but doesn't translate them now. This can be used
+    Marks strings for translation but doesn't translate them now. This can be
-to store strings in global variables that should stay in the base language
+    used to store strings in global variables that should stay in the base
-(because they might be used externally) and will be translated later.
+    language (because they might be used externally) and will be translated
+    later.
 
 .. function:: ngettext(singular, plural, number)
 
     Translates ``singular`` and ``plural`` and returns the appropriate string
-based on ``number`` in a UTF-8 bytestring
+    based on ``number`` in a UTF-8 bytestring.
 
 .. function:: ungettext(singular, plural, number)
 
-Translates ``singular`` and ``plural`` and returns the appropriate string based
+    Translates ``singular`` and ``plural`` and returns the appropriate string
-on ``number`` in a unicode string
+    based on ``number`` in a unicode string.
 
 .. function:: ngettext_lazy(singular, plural, number)
 .. function:: ungettext_lazy(singular, plural, number)
@@ -446,14 +454,14 @@ thread.
 
 .. function:: deactivate()
 
-De-installs the currently active translation object so that further _ calls will
+    De-installs the currently active translation object so that further _ calls
-resolve against the default translation object, again.
+    will resolve against the default translation object, again.
 
 .. function:: deactivate_all()
 
     Makes the active translation object a NullTranslations() instance. This is
-useful when we want delayed translations to appear as the original string for
+    useful when we want delayed translations to appear as the original string
-some reason.
+    for some reason.
 
 .. function:: get_language()
 

docs/topics/auth.txt

@@ -615,6 +615,8 @@ Django provides two functions in :mod:`django.contrib.auth`:
 Manually checking a user's password
 -----------------------------------
 
+.. currentmodule:: django.contrib.auth.models
+
 .. function:: check_password()
 
     If you'd like to manually authenticate a user by comparing a plain-text
@@ -627,6 +629,8 @@ Manually checking a user's password
 How to log a user out
 ---------------------
 
+.. currentmodule:: django.contrib.auth
+
 .. function:: logout()
 
     To log out a user who has been logged in via
@@ -871,11 +875,13 @@ The login_required decorator
 Other built-in views
 --------------------
 
+.. module:: django.contrib.auth.views
+
 In addition to the :func:`~views.login` view, the authentication system
 includes a few other useful built-in views located in
 :mod:`django.contrib.auth.views`:
 
-.. function:: views.logout(request, [next_page, template_name, redirect_field_name])
+.. function:: logout(request, [next_page, template_name, redirect_field_name])
 
     Logs a user out.
 
@@ -895,7 +901,7 @@ includes a few other useful built-in views located in
 
         * ``title``: The string "Logged out", localized.
 
-.. function:: views.logout_then_login(request[, login_url])
+.. function:: logout_then_login(request[, login_url])
 
     Logs a user out, then redirects to the login page.
 
@@ -904,7 +910,7 @@ includes a few other useful built-in views located in
         * ``login_url``: The URL of the login page to redirect to. This will
           default to :setting:`settings.LOGIN_URL <LOGIN_URL>` if not supplied.
 
-.. function:: views.password_change(request[, template_name, post_change_redirect, password_change_form])
+.. function:: password_change(request[, template_name, post_change_redirect, password_change_form])
 
     Allows a user to change their password.
 
@@ -928,7 +934,7 @@ includes a few other useful built-in views located in
 
         * ``form``: The password change form.
 
-.. function:: views.password_change_done(request[, template_name])
+.. function:: password_change_done(request[, template_name])
 
     The page shown after a user has changed their password.
 
@@ -938,12 +944,15 @@ includes a few other useful built-in views located in
           default to :file:`registration/password_change_done.html` if not
           supplied.
 
-.. function:: views.password_reset(request[, is_admin_site, template_name, email_template_name, password_reset_form, token_generator, post_reset_redirect, from_email])
+.. function:: password_reset(request[, is_admin_site, template_name, email_template_name, password_reset_form, token_generator, post_reset_redirect, from_email])
 
     Allows a user to reset their password by generating a one-time use link
     that can be used to reset the password, and sending that link to the
     user's registered e-mail address.
     
+    .. versionchanged:: 1.3
+        The ``from_email`` argument was added.
+
     **Optional arguments:**
 
         * ``template_name``: The full name of a template to use for
@@ -964,8 +973,6 @@ includes a few other useful built-in views located in
         * ``post_reset_redirect``: The URL to redirect to after a successful
           password change.
 
-        .. versionchanged:: 1.3
-
         * ``from_email``: A valid e-mail address. By default Django uses
           the :setting:`DEFAULT_FROM_EMAIL`.
 
@@ -973,7 +980,7 @@ includes a few other useful built-in views located in
 
         * ``form``: The form for resetting the user's password.
 
-.. function:: views.password_reset_done(request[, template_name])
+.. function:: password_reset_done(request[, template_name])
 
     The page shown after a user has reset their password.
 
@@ -983,7 +990,7 @@ includes a few other useful built-in views located in
           default to :file:`registration/password_reset_done.html` if not
           supplied.
 
-.. function:: views.redirect_to_login(next[, login_url, redirect_field_name])
+.. function:: redirect_to_login(next[, login_url, redirect_field_name])
 
     Redirects to the login page, and then back to another URL after a
     successful login.
@@ -1001,6 +1008,7 @@ includes a few other useful built-in views located in
           URL to redirect to after log out. Overrides ``next`` if the given
           ``GET`` parameter is passed.
 
+
 .. function:: password_reset_confirm(request[, uidb36, token, template_name, token_generator, set_password_form, post_reset_redirect])
 
     Presents a form for entering a new password.
@@ -1073,7 +1081,7 @@ provides several built-in forms located in :mod:`django.contrib.auth.forms`:
 Limiting access to logged-in users that pass a test
 ---------------------------------------------------
 
-.. currentmodule:: django.contrib.auth
+.. currentmodule:: django.contrib.auth.decorators
 
 To limit access based on certain permissions or some other test, you'd do
 essentially the same thing as described in the previous section.
@@ -1088,7 +1096,7 @@ checks to make sure the user is logged in and has the permission
             return HttpResponse("You can't vote in this poll.")
         # ...
 
-.. function:: decorators.user_passes_test()
+.. function:: user_passes_test()
 
     As a shortcut, you can use the convenient ``user_passes_test`` decorator::
 
@@ -1126,7 +1134,7 @@ checks to make sure the user is logged in and has the permission
 The permission_required decorator
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-.. function:: decorators.permission_required()
+.. function:: permission_required()
 
     It's a relatively common task to check whether a user has a particular
     permission. For that reason, Django provides a shortcut for that case: the
@@ -1155,6 +1163,8 @@ The permission_required decorator
     As in the :func:`~decorators.login_required` decorator, ``login_url``
     defaults to :setting:`settings.LOGIN_URL <LOGIN_URL>`.
 
+.. currentmodule:: django.contrib.auth
+
 Limiting access to generic views
 --------------------------------
 
@@ -1249,7 +1259,9 @@ closing tasks.)
 API reference
 -------------
 
-.. class:: models.Permission
+.. currentmodule:: django.contrib.auth.models
+
+.. class:: Permission
 
     Just like users, permissions are implemented in a Django model that lives
     in `django/contrib/auth/models.py`_.
@@ -1262,16 +1274,16 @@ Fields
 :class:`~django.contrib.auth.models.Permission` objects have the following
 fields:
 
-.. attribute:: models.Permission.name
+.. attribute:: Permission.name
 
     Required. 50 characters or fewer. Example: ``'Can vote'``.
 
-.. attribute:: models.Permission.content_type
+.. attribute:: Permission.content_type
 
     Required. A reference to the ``django_content_type`` database table, which
     contains a record for each installed Django model.
 
-.. attribute:: models.Permission.codename
+.. attribute:: Permission.codename
 
     Required. 100 characters or fewer. Example: ``'can_vote'``.
 
@@ -1281,6 +1293,8 @@ Methods
 :class:`~django.contrib.auth.models.Permission` objects have the standard
 data-access methods like any other :doc:`Django model </ref/models/instances>`.
 
+.. currentmodule:: django.contrib.auth
+
 Authentication data in templates
 ================================
 

docs/topics/http/decorators.txt

@@ -45,7 +45,7 @@ These decorators can be used to generate ``ETag`` and ``Last-Modified``
 headers; see
 :doc:`conditional view processing </topics/conditional-view-processing>`.
 
-.. currentmodule:: django.views.decorators.http
+.. currentmodule:: django.views.decorators.gzip
 
 GZip compression
 ================

docs/topics/http/file-uploads.txt

@@ -2,7 +2,7 @@
 File Uploads
 ============
 
-.. currentmodule:: django.core.files
+.. currentmodule:: django.core.files.uploadedfile
 
 When Django handles a file upload, the file data ends up placed in
 :attr:`request.FILES <django.http.HttpRequest.FILES>` (for more on the
@@ -59,33 +59,40 @@ into the form's constructor; this is how file data gets bound into a form.
 Handling uploaded files
 -----------------------
 
+.. class:: UploadedFile
+
     The final piece of the puzzle is handling the actual file data from
     :attr:`request.FILES <django.http.HttpRequest.FILES>`. Each entry in this
     dictionary is an ``UploadedFile`` object -- a simple wrapper around an uploaded
     file. You'll usually use one of these methods to access the uploaded content:
 
-    ``UploadedFile.read()``
+    .. method:: read()
+
         Read the entire uploaded data from the file. Be careful with this
         method: if the uploaded file is huge it can overwhelm your system if you
         try to read it into memory. You'll probably want to use ``chunks()``
         instead; see below.
 
-    ``UploadedFile.multiple_chunks()``
+    .. method:: multiple_chunks()
+
         Returns ``True`` if the uploaded file is big enough to require
         reading in multiple chunks. By default this will be any file
         larger than 2.5 megabytes, but that's configurable; see below.
 
-    ``UploadedFile.chunks()``
+    .. method:: chunks()
+
         A generator returning chunks of the file. If ``multiple_chunks()`` is
         ``True``, you should use this method in a loop instead of ``read()``.
 
         In practice, it's often easiest simply to use ``chunks()`` all the time;
         see the example below.
 
-    ``UploadedFile.name``
+    .. attribute:: name
+
         The name of the uploaded file (e.g. ``my_file.txt``).
 
-    ``UploadedFile.size``
+    .. attribute:: size
+
         The size, in bytes, of the uploaded file.
 
 There are a few other methods and attributes available on ``UploadedFile``
@@ -177,23 +184,24 @@ Three settings control Django's file upload behavior:
 ``UploadedFile`` objects
 ========================
 
-.. class:: UploadedFile
-
 In addition to those inherited from :class:`File`, all ``UploadedFile`` objects
 define the following methods/attributes:
 
-    ``UploadedFile.content_type``
+.. attribute:: UploadedFile.content_type
+
     The content-type header uploaded with the file (e.g. ``text/plain`` or
     ``application/pdf``). Like any data supplied by the user, you shouldn't
     trust that the uploaded file is actually this type. You'll still need to
     validate that the file contains the content that the content-type header
     claims -- "trust but verify."
 
-    ``UploadedFile.charset``
+.. attribute:: UploadedFile.charset
+
     For ``text/*`` content-types, the character set (i.e. ``utf8``) supplied
     by the browser. Again, "trust but verify" is the best policy here.
 
-    ``UploadedFile.temporary_file_path()``
+.. attribute:: UploadedFile.temporary_file_path()
+
     Only files uploaded onto disk will have this method; it returns the full
     path to the temporary uploaded file.
 

docs/topics/http/urls.txt

@@ -765,6 +765,8 @@ following would happen:
 Utility methods
 ===============
 
+.. module:: django.core.urlresolvers
+
 reverse()
 ---------