diff --git a/docs/ref/contrib/staticfiles.txt b/docs/ref/contrib/staticfiles.txt
index 7b9a2048b5..f96c2e8a1b 100644
--- a/docs/ref/contrib/staticfiles.txt
+++ b/docs/ref/contrib/staticfiles.txt
@@ -352,9 +352,9 @@ This view function serves static files in development.
 
 .. versionchanged:: 1.7
 
-    Will now raise an :exc:`~django.http.Http404` exception instead of
-    :exc:`~from django.core.exceptions.ImproperlyConfigured` when
-    :setting:`DEBUG` is ``True``.
+    This view will now raise an :exc:`~django.http.Http404` exception instead
+    of :exc:`~django.core.exceptions.ImproperlyConfigured` when
+    :setting:`DEBUG` is ``False``.
 
 .. note::
 
diff --git a/docs/releases/1.7.txt b/docs/releases/1.7.txt
index 0d6a3fefdc..f0efe4f559 100644
--- a/docs/releases/1.7.txt
+++ b/docs/releases/1.7.txt
@@ -122,10 +122,10 @@ Miscellaneous
 * Loading empty fixtures emits a ``RuntimeWarning`` rather than raising
   :class:`~django.core.management.CommandError`.
 
-* :view:`~django.contrib.staticfiles.views.serve` will now raise an
+* :func:`django.contrib.staticfiles.views.serve` will now raise an
   :exc:`~django.http.Http404` exception instead of
-  :exc:`~from django.core.exceptions.ImproperlyConfigured` when :setting:`DEBUG`
-  is ``True``. This change removes the need to conditionally add the view to
+  :exc:`~django.core.exceptions.ImproperlyConfigured` when :setting:`DEBUG`
+  is ``False``. This change removes the need to conditionally add the view to
   your root URLconf, which in turn makes it safe to reverse by name. It also
   removes the ability for visitors to generate spurious HTTP 500 errors by
   requesting static files that don't exist or haven't been collected yet.