diff --git a/django/middleware/common.py b/django/middleware/common.py
index 7e520b7061..2a74774654 100644
--- a/django/middleware/common.py
+++ b/django/middleware/common.py
@@ -94,8 +94,6 @@ class CommonMiddleware(MiddlewareMixin):
 
     def process_response(self, request, response):
         """
-        Calculate the ETag, if needed.
-
         When the status code of the response is 404, it may redirect to a path
         with an appended slash if should_redirect_with_slash() returns True.
         """
diff --git a/docs/ref/middleware.txt b/docs/ref/middleware.txt
index f4d5288ed7..cfa6a77665 100644
--- a/docs/ref/middleware.txt
+++ b/docs/ref/middleware.txt
@@ -456,6 +456,14 @@ Here are some hints about the ordering of various Django middleware classes:
 
    After ``UpdateCacheMiddleware``: Modifies ``Vary`` header.
 
+#. :class:`~django.middleware.http.ConditionalGetMiddleware`
+
+   Before any middleware that may change the response (it sets the ``ETag``
+   header).
+
+   After ``GZipMiddleware`` so it won't calculate an ``ETag`` header on gzipped
+   contents.
+
 #. :class:`~django.middleware.locale.LocaleMiddleware`
 
    One of the topmost, after ``SessionMiddleware`` (uses session data) and
@@ -463,11 +471,6 @@ Here are some hints about the ordering of various Django middleware classes:
 
 #. :class:`~django.middleware.common.CommonMiddleware`
 
-   Before any middleware that may change the response (it calculates ``ETags``).
-
-   After ``GZipMiddleware`` so it won't calculate an ``ETag`` header on gzipped
-   contents.
-
    Close to the top: it redirects when :setting:`APPEND_SLASH` or
    :setting:`PREPEND_WWW` are set to ``True``.