diff --git a/django/core/handlers/base.py b/django/core/handlers/base.py
index 5d25b89448d..ca163f72322 100644
--- a/django/core/handlers/base.py
+++ b/django/core/handlers/base.py
@@ -126,7 +126,7 @@ class BaseHandler(object):
if response is None:
if hasattr(request, 'urlconf'):
- # Reset url resolver with a custom urlconf.
+ # Reset url resolver with a custom URLconf.
urlconf = request.urlconf
urlresolvers.set_urlconf(urlconf)
resolver = urlresolvers.get_resolver(urlconf)
diff --git a/django/core/urlresolvers.py b/django/core/urlresolvers.py
index 303901048a9..d37a40157df 100644
--- a/django/core/urlresolvers.py
+++ b/django/core/urlresolvers.py
@@ -135,9 +135,9 @@ def get_resolver(urlconf=None):
@lru_cache.lru_cache(maxsize=None)
def get_ns_resolver(ns_pattern, resolver):
- # Build a namespaced resolver for the given parent urlconf pattern.
+ # Build a namespaced resolver for the given parent URLconf pattern.
# This makes it possible to have captured parameters in the parent
- # urlconf pattern.
+ # URLconf pattern.
ns_resolver = RegexURLResolver(ns_pattern, resolver.url_patterns)
return RegexURLResolver(r'^/', [ns_resolver])
@@ -381,7 +381,7 @@ class RegexURLResolver(LocaleRegexProvider):
iter(patterns)
except TypeError:
msg = (
- "The included urlconf '{name}' does not appear to have any "
+ "The included URLconf '{name}' does not appear to have any "
"patterns in it. If you see valid patterns in the file then "
"the issue is probably caused by a circular import."
)
diff --git a/django/views/generic/base.py b/django/views/generic/base.py
index 5bc610355a5..8f77fbfcb14 100644
--- a/django/views/generic/base.py
+++ b/django/views/generic/base.py
@@ -151,7 +151,7 @@ class TemplateResponseMixin(object):
class TemplateView(TemplateResponseMixin, ContextMixin, View):
"""
A view that renders a template. This view will also pass into the context
- any keyword arguments passed by the url conf.
+ any keyword arguments passed by the URLconf.
"""
def get(self, request, *args, **kwargs):
context = self.get_context_data(**kwargs)
diff --git a/tests/i18n/patterns/tests.py b/tests/i18n/patterns/tests.py
index a5a012be270..1e8bb9d9298 100644
--- a/tests/i18n/patterns/tests.py
+++ b/tests/i18n/patterns/tests.py
@@ -94,7 +94,7 @@ class URLDisabledTests(URLTestCaseBase):
@override_settings(ROOT_URLCONF='i18n.patterns.urls.path_unused')
class PathUnusedTests(URLTestCaseBase):
"""
- Check that if no i18n_patterns is used in root urlconfs, then no
+ Check that if no i18n_patterns is used in root URLconfs, then no
language activation happens based on url prefix.
"""
diff --git a/tests/middleware/tests.py b/tests/middleware/tests.py
index 6e1bbaf7724..328073b8ac2 100644
--- a/tests/middleware/tests.py
+++ b/tests/middleware/tests.py
@@ -151,7 +151,7 @@ class CommonMiddlewareTest(SimpleTestCase):
self.assertEqual(r.url,
'http://www.testserver/slash/')
- # The following tests examine expected behavior given a custom urlconf that
+ # The following tests examine expected behavior given a custom URLconf that
# overrides the default one through the request object.
@override_settings(APPEND_SLASH=True)
diff --git a/tests/urlpatterns_reverse/tests.py b/tests/urlpatterns_reverse/tests.py
index 0fe61bedaa3..799c7c32a22 100644
--- a/tests/urlpatterns_reverse/tests.py
+++ b/tests/urlpatterns_reverse/tests.py
@@ -273,7 +273,7 @@ class NoURLPatternsTests(SimpleTestCase):
self.assertRaisesMessage(
ImproperlyConfigured,
- "The included urlconf 'urlpatterns_reverse.no_urls' does not "
+ "The included URLconf 'urlpatterns_reverse.no_urls' does not "
"appear to have any patterns in it. If you see valid patterns in "
"the file then the issue is probably caused by a circular import.",
getattr, resolver, 'url_patterns'
@@ -364,7 +364,7 @@ class ResolverTests(unittest.TestCase):
Test repr of RegexURLResolver, especially when urlconf_name is a list
(#17892).
"""
- # Pick a resolver from a namespaced urlconf
+ # Pick a resolver from a namespaced URLconf
resolver = get_resolver('urlpatterns_reverse.namespace_urls')
sub_resolver = resolver.namespace_dict['test-ns1'][1]
self.assertIn('<RegexURLPattern list>', repr(sub_resolver))
@@ -923,7 +923,7 @@ class DefaultErrorHandlerTests(SimpleTestCase):
@override_settings(ROOT_URLCONF=None)
class NoRootUrlConfTests(SimpleTestCase):
- """Tests for handler404 and handler500 if urlconf is None"""
+ """Tests for handler404 and handler500 if ROOT_URLCONF is None"""
def test_no_handler_exception(self):
self.assertRaises(ImproperlyConfigured, self.client.get, '/test/me/')
diff --git a/tests/urls.py b/tests/urls.py
index bf9e5dc0fbc..7d3a3a790ae 100644
--- a/tests/urls.py
+++ b/tests/urls.py
@@ -1,4 +1,4 @@
-"""This urlconf exists because Django expects ROOT_URLCONF to exist. URLs
+"""This URLconf exists because Django expects ROOT_URLCONF to exist. URLs
should be added within the test folders, and use TestCase.urls to set them.
This helps the tests remain isolated.
"""
diff --git a/tests/view_tests/tests/test_debug.py b/tests/view_tests/tests/test_debug.py
index 590d75264f7..fc7bd431605 100644
--- a/tests/view_tests/tests/test_debug.py
+++ b/tests/view_tests/tests/test_debug.py
@@ -174,9 +174,9 @@ class DebugViewTests(LoggingCaptureMixin, SimpleTestCase):
@override_settings(ROOT_URLCONF='view_tests.default_urls')
def test_default_urlconf_template(self):
"""
- Make sure that the default urlconf template is shown shown instead
+ Make sure that the default URLconf template is shown shown instead
of the technical 404 page, if the user has not altered their
- url conf yet.
+ URLconf yet.
"""
response = self.client.get('/')
self.assertContains(