diff options
| author | Justin Bronn <jbronn@gmail.com> | 2008-08-05 17:15:33 +0000 |
|---|---|---|
| committer | Justin Bronn <jbronn@gmail.com> | 2008-08-05 17:15:33 +0000 |
| commit | aa239e3e5405933af6a29dac3cf587b59a099927 (patch) | |
| tree | ea2cbd139c9a8cf84c09e0b2008bff70e05927ef /docs/url_dispatch.txt | |
| parent | 45b73c9a4685809236f84046cc7ffd32a50db958 (diff) | |
gis: Merged revisions 7981-8001,8003-8011,8013-8033,8035-8036,8038-8039,8041-8063,8065-8076,8078-8139,8141-8154,8156-8214 via svnmerge from trunk.archive/attic/gis
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@8215 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs/url_dispatch.txt')
| -rw-r--r-- | docs/url_dispatch.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/url_dispatch.txt b/docs/url_dispatch.txt index 7d67cd5b53..266e4a5799 100644 --- a/docs/url_dispatch.txt +++ b/docs/url_dispatch.txt @@ -373,7 +373,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 the URLconf for the `Django website`_ itself. It includes a +For example, here's the URLconf for the `Django Web site`_ itself. It includes a number of other URLconfs:: from django.conf.urls.defaults import * @@ -390,7 +390,7 @@ Django encounters ``include()``, it chops off whatever part of the URL matched up to that point and sends the remaining string to the included URLconf for further processing. -.. _`Django website`: http://www.djangoproject.com/ +.. _`Django Web site`: http://www.djangoproject.com/ Captured parameters ------------------- |