Ticket #14743: urls-doc-fixes.diff

docs/topics/http/urls.txt

@@ -37 +37 @@
 algorithm the system follows to determine which Python code to execute:
 
     1. Django determines the root URLconf module to use. Ordinarily,
-       this is the value of the ``ROOT_URLCONF`` setting, but if the incoming
+       this is the value of the :setting:`ROOT_URLCONF` setting, but if the incoming
        ``HttpRequest`` object has an attribute called ``urlconf`` (set by
        middleware :ref:`request processing <request-middleware>`), its value
-       will be used in place of the ``ROOT_URLCONF`` setting.
+       will be used in place of the :setting:`ROOT_URLCONF` setting.
 
     2. Django loads that Python module and looks for the variable
        ``urlpatterns``. This should be a Python list, in the format returned by
-       the function ``django.conf.urls.defaults.patterns()``.
+       the function :func:`django.conf.urls.defaults.patterns`.
 
     3. Django runs through each URL pattern, in order, and stops at the first
        one that matches the requested URL.
@@ -174 +174 @@
 ==================================
 
 ``urlpatterns`` should be a Python list, in the format returned by the function
-``django.conf.urls.defaults.patterns()``. Always use ``patterns()`` to create
+:func:`django.conf.urls.defaults.patterns`. Always use ``patterns()`` to create
 the ``urlpatterns`` variable.
 
 Convention is to use ``from django.conf.urls.defaults import *`` at the top of
 your URLconf. This gives your module access to these objects:
 
+.. module:: django.conf.urls.defaults
+
 patterns
 --------
 
@@ -436 +438 @@
 
 This approach can be seen in use when you deploy an instance of the Django
 Admin application. The Django Admin is deployed as instances of a
-:class:`AdminSite`; each :class:`AdminSite` instance has an attribute
-``urls`` that returns the url patterns available to that instance. It is this
-attribute that you ``include()`` into your projects ``urlpatterns`` when you
-deploy the admin instance.
+:class:`~django.contrib.admin.AdminSite`; each
+:class:`~django.contrib.admin.AdminSite` instance has an attribute ``urls``
+that returns the url patterns available to that instance. It is this attribute
+that you ``include()`` into your projects ``urlpatterns`` when you deploy the
+admin instance.
 
 .. _`Django Web site`: http://www.djangoproject.com/
 
@@ -507 +510 @@
 
 This will include the nominated URL patterns into the given application and
 instance namespace. For example, the ``urls`` attribute of Django's
-:class:`AdminSite` object returns a 3-tuple that contains all the patterns in
-an admin site, plus the name of the admin instance, and the application
-namespace ``admin``.
+:class:`~django.contrib.admin.AdminSite` object returns a 3-tuple that contains
+all the patterns in an admin site, plus the name of the admin instance, and the
+application namespace ``admin``.
 
 Once you have defined namespaced URLs, you can reverse them. For details on
 reversing namespaced urls, see the documentation on :ref:`reversing namespaced
@@ -834 +837 @@
 ``path`` is the URL path you want to resolve. As with
 :func:`~django.core.urlresolvers.reverse`, you don't need to
 worry about the ``urlconf`` parameter. The function returns a
-:class:`django.core.urlresolvers.ResolverMatch` object that allows you
+:class:`ResolverMatch` object that allows you
 to access various meta-data about the resolved URL.
 
 If the URL does not resolve, the function raises an
 :class:`~django.http.Http404` exception.
 
-.. class:: ResolverMatch()
+.. class:: ResolverMatch
 
     .. attribute:: ResolverMatch.func
 
@@ -875 +878 @@
         The list of individual namespace components in the full
         instance namespace for the URL pattern that matches the URL.
         i.e., if the namespace is ``foo:bar``, then namespaces will be
-        ``[`foo`, `bar`]``.
+        ``['foo', 'bar']``.
 
-A :class:`~django.core.urlresolvers.ResolverMatch` object can then be
-interrogated to provide information about the URL pattern that matches
-a URL::
+A :class:`ResolverMatch` object can then be interrogated to provide
+information about the URL pattern that matches a URL::
 
     # Resolve a URL
     match = resolve('/some/path/')
     # Print the URL pattern that matches the URL
     print match.url_name
 
-A :class:`~django.core.urlresolvers.ResolverMatch` object can also be
-assigned to a triple::
+A :class:`ResolverMatch` object can also be assigned to a triple::
 
     func, args, kwargs = resolve('/some/path/')