diff options
| author | Adrian Holovaty <adrian@holovaty.com> | 2012-02-17 20:04:11 +0000 |
|---|---|---|
| committer | Adrian Holovaty <adrian@holovaty.com> | 2012-02-17 20:04:11 +0000 |
| commit | 7981efe04fbdcd7d6d434e2306d4e3ed17a9f0e0 (patch) | |
| tree | 15ea2471bf7b2e27ed91f54519e132231aa0317e /docs/topics/http | |
| parent | 9fa536dc4f1b4c815ad21a28290bc5142d339cc1 (diff) | |
Documentation (and some small source code) edits from [17432] - [17537]
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17540 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs/topics/http')
| -rw-r--r-- | docs/topics/http/urls.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/docs/topics/http/urls.txt b/docs/topics/http/urls.txt index e0fc2cc930..f3e27ae1f0 100644 --- a/docs/topics/http/urls.txt +++ b/docs/topics/http/urls.txt @@ -440,7 +440,7 @@ Including other URLconfs At any point, your ``urlpatterns`` can "include" other URLconf modules. This essentially "roots" a set of URLs below other ones. -For example, here's an except of the URLconf for the `Django Web site`_ +For example, here's an excerpt of the URLconf for the `Django Web site`_ itself. It includes a number of other URLconfs:: from django.conf.urls import patterns, url, include @@ -849,7 +849,7 @@ This ``current_app`` argument is used as a hint to resolve application namespaces into URLs on specific application instances, according to the :ref:`namespaced URL resolution strategy <topics-http-reversing-url-namespaces>`. -You can use ``kwargs`` instead of ``args``, for example:: +You can use ``kwargs`` instead of ``args``. For example:: >>> reverse('admin:app_list', kwargs={'app_label': 'auth'}) '/admin/auth/' @@ -976,7 +976,7 @@ A :class:`ResolverMatch` object can also be assigned to a triple:: information it provides) is not available in earlier Django releases. One possible use of :func:`~django.core.urlresolvers.resolve` would be to test -if a view would raise a ``Http404`` error before redirecting to it:: +whether a view would raise a ``Http404`` error before redirecting to it:: from urlparse import urlparse from django.core.urlresolvers import resolve |
