summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorJacob Kaplan-Moss <jacob@jacobian.org>2007-02-27 20:11:26 +0000
committerJacob Kaplan-Moss <jacob@jacobian.org>2007-02-27 20:11:26 +0000
commit9c2c03a9749abccc80f845ee1ff8cd8b7c28b0bc (patch)
treee3c6494a16e2976ca8a3c98905bb9e427c087e0b /docs
parentb97636944df970ef5d0e6bc0f691ba4011d2af3d (diff)
Fixed #3598: Added a note about the precedence of URL matches versus extra kwargs in URL patterns. Thanks, Ubernostrum.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4638 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs')
-rw-r--r--docs/url_dispatch.txt7
1 files changed, 7 insertions, 0 deletions
diff --git a/docs/url_dispatch.txt b/docs/url_dispatch.txt
index da4be2c746..3f51ce4b91 100644
--- a/docs/url_dispatch.txt
+++ b/docs/url_dispatch.txt
@@ -390,6 +390,13 @@ to pass metadata and options to views.
.. _generic views: ../generic_views/
.. _syndication framework: ../syndication/
+.. admonition:: Dealing with conflicts
+
+ It's possible to have a URL pattern which captures named keyword arguments,
+ and also passes arguments with the same names in its dictionary of extra
+ arguments. When this happens, the arguments in the dictionary will be used
+ instead of the arguments captured in the URL.
+
Passing extra options to ``include()``
--------------------------------------