summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrank Wiles <frank@revsys.com>2016-09-29 11:06:52 -0500
committerTim Graham <timograham@gmail.com>2016-09-29 12:07:56 -0400
commitff7d5e3a0bf3c81ca6289a93efb7e8a48b2460ef (patch)
tree4c7d773523ada389979427355812f289c8d00608
parent818d7ba421ea74975cb38c952a3108232e0d3527 (diff)
[1.10.x] Fixed import typos in the docs.
Backport of a09c058918f85949fd4c003e7ae62869f4559bd3 from master
-rw-r--r--AUTHORS1
-rw-r--r--docs/ref/request-response.txt2
-rw-r--r--docs/topics/i18n/timezones.txt2
3 files changed, 3 insertions, 2 deletions
diff --git a/AUTHORS b/AUTHORS
index 7c1ed70c44..52aa5617a4 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -251,6 +251,7 @@ answer newbie questions, and generally made Django that much better:
Francisco Albarran Cristobal <pahko.xd@gmail.com>
Frank Tegtmeyer <fte@fte.to>
Frank Wierzbicki
+ Frank Wiles <frank@revsys.com>
FrantiĊĦek Malina <fmalina@gmail.com>
Fraser Nevett <mail@nevett.org>
Gabriel Grant <g@briel.ca>
diff --git a/docs/ref/request-response.txt b/docs/ref/request-response.txt
index 7102c877da..cfc794db6d 100644
--- a/docs/ref/request-response.txt
+++ b/docs/ref/request-response.txt
@@ -257,7 +257,7 @@ Methods
behind multiple proxies. One solution is to use middleware to rewrite
the proxy headers, as in the following example::
- from django.django.utils.deprecation import MiddlewareMixin
+ from django.utils.deprecation import MiddlewareMixin
class MultipleProxyMiddleware(MiddlewareMixin):
FORWARDED_FOR_FIELDS = [
diff --git a/docs/topics/i18n/timezones.txt b/docs/topics/i18n/timezones.txt
index 8392d0c09f..be4665f95c 100644
--- a/docs/topics/i18n/timezones.txt
+++ b/docs/topics/i18n/timezones.txt
@@ -178,7 +178,7 @@ Add the following middleware to :setting:`MIDDLEWARE`::
import pytz
from django.utils import timezone
- from django.django.utils.deprecation import MiddlewareMixin
+ from django.utils.deprecation import MiddlewareMixin
class TimezoneMiddleware(MiddlewareMixin):
def process_request(self, request):