diff options
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/howto/deployment/modpython.txt | 8 | ||||
| -rw-r--r-- | docs/ref/models/instances.txt | 2 | ||||
| -rw-r--r-- | docs/releases/1.1-alpha-1.txt | 2 | ||||
| -rw-r--r-- | docs/topics/http/urls.txt | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/docs/howto/deployment/modpython.txt b/docs/howto/deployment/modpython.txt index 70f1e37749..14f0219421 100644 --- a/docs/howto/deployment/modpython.txt +++ b/docs/howto/deployment/modpython.txt @@ -58,12 +58,12 @@ be passed through to the mod_python handler in Django, via the ``PythonOption django.root ...`` line. The value set on that line (the last item) should match the string given in the ``<Location ...>`` directive. The effect of this is that Django will automatically strip the ``/mysite`` string from the front -of any URLs before matching them against your ``URLConf`` patterns. If you -later move your site to live under ``/mysite2``, you will not have to change -anything except the ``django.root`` option in the config file. +of any URLs before matching them against your URLconf patterns. If you later +move your site to live under ``/mysite2``, you will not have to change anything +except the ``django.root`` option in the config file. When using ``django.root`` you should make sure that what's left, after the -prefix has been removed, begins with a slash. Your URLConf patterns that are +prefix has been removed, begins with a slash. Your URLconf patterns that are expecting an initial slash will then work correctly. In the above example, since we want to send things like ``/mysite/admin/`` to ``/admin/``, we need to remove the string ``/mysite`` from the beginning, so that is the diff --git a/docs/ref/models/instances.txt b/docs/ref/models/instances.txt index 5e7151a89c..b2b04e04d5 100644 --- a/docs/ref/models/instances.txt +++ b/docs/ref/models/instances.txt @@ -290,7 +290,7 @@ The ``permalink`` decorator The problem with the way we wrote ``get_absolute_url()`` above is that it slightly violates the DRY principle: the URL for this object is defined both -in the URLConf file and in the model. +in the URLconf file and in the model. You can further decouple your models from the URLconf using the ``permalink`` decorator: diff --git a/docs/releases/1.1-alpha-1.txt b/docs/releases/1.1-alpha-1.txt index fa6f494a48..8cd695ef2d 100644 --- a/docs/releases/1.1-alpha-1.txt +++ b/docs/releases/1.1-alpha-1.txt @@ -82,7 +82,7 @@ Other new features and changes introduced since Django 1.0 include: (sending admin requests to the ``admin.site.root`` view still works, but URLs in the admin will not be "reversible" when configured this way). -* The ``include()`` function in Django URLConf modules can now accept sequences +* The ``include()`` function in Django URLconf modules can now accept sequences of URL patterns (generated by ``patterns()``) in addition to module names. * Instances of Django forms (see `the forms overview <topics-forms-index>`_ now diff --git a/docs/topics/http/urls.txt b/docs/topics/http/urls.txt index 4f94b82e47..0d0f9ac889 100644 --- a/docs/topics/http/urls.txt +++ b/docs/topics/http/urls.txt @@ -623,13 +623,13 @@ reverse such patterns. .. admonition:: Make sure your views are all correct As part of working out which URL names map to which patterns, the - ``reverse()`` function has to import all of your URLConf files and examine + ``reverse()`` function has to import all of your URLconf files and examine the name of each view. This involves importing each view function. If there are *any* errors whilst importing any of your view functions, it will cause ``reverse()`` to raise an error, even if that view function is not the one you are trying to reverse. - Make sure that any views you reference in your URLConf files exist and can + Make sure that any views you reference in your URLconf files exist and can be imported correctly. Do not include lines that reference views you haven't written yet, because those views will not be importable. |