Fixed "URLconf" spelling in code comments.

3 files changed, 5 insertions, 5 deletions

diff --git a/django/core/handlers/base.py b/django/core/handlers/base.py
index 5d25b89448..ca163f7232 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 303901048a..d37a40157d 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 5bc610355a..8f77fbfcb1 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)