diff --git a/docs/intro/tutorial01.txt b/docs/intro/tutorial01.txt index 9f9e6b1d72..10738fa91f 100644 --- a/docs/intro/tutorial01.txt +++ b/docs/intro/tutorial01.txt @@ -385,7 +385,7 @@ aren't going to use this feature of Django in the tutorial. Naming your URL lets you refer to it unambiguously from elsewhere in Django, especially from within templates. This powerful feature allows you to make -global changes to the url patterns of your project while only touching a single +global changes to the URL patterns of your project while only touching a single file. When you're comfortable with the basic request and response flow, read diff --git a/docs/ref/urlresolvers.txt b/docs/ref/urlresolvers.txt index b4c05d6075..e048d00c0d 100644 --- a/docs/ref/urlresolvers.txt +++ b/docs/ref/urlresolvers.txt @@ -60,7 +60,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 `. -The ``urlconf`` argument is the URLconf module containing the url patterns to +The ``urlconf`` argument is the URLconf module containing the URL patterns to use for reversing. By default, the root URLconf for the current thread is used. .. deprecated:: 1.8 diff --git a/docs/releases/1.6.txt b/docs/releases/1.6.txt index c17e7dfa3a..c8bd3f86f4 100644 --- a/docs/releases/1.6.txt +++ b/docs/releases/1.6.txt @@ -788,7 +788,7 @@ the ``name`` argument so it doesn't conflict with the new url:: url(r'^reset/(?P[0-9A-Za-z]+)-(?P.+)/$', 'django.contrib.auth.views.password_reset_confirm_uidb36'), -You can remove this url pattern after your app has been deployed with Django +You can remove this URL pattern after your app has been deployed with Django 1.6 for :setting:`PASSWORD_RESET_TIMEOUT_DAYS`. Default session serialization switched to JSON diff --git a/docs/topics/i18n/translation.txt b/docs/topics/i18n/translation.txt index 353ae1d994..b69cae344c 100644 --- a/docs/topics/i18n/translation.txt +++ b/docs/topics/i18n/translation.txt @@ -1347,7 +1347,7 @@ Language prefix in URL patterns :func:`django.conf.urls.url` instances instead. This function can be used in your root URLconf and Django will automatically -prepend the current active language code to all url patterns defined within +prepend the current active language code to all URL patterns defined within :func:`~django.conf.urls.i18n.i18n_patterns`. Example URL patterns:: from django.conf.urls import include, url