Made a bunch more edits up until [17418]

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17428 bcc190cf-cafb-0310-a4f2-bffc1f526a37

4 files changed, 17 insertions, 13 deletions

diff --git a/docs/ref/contrib/sitemaps.txt b/docs/ref/contrib/sitemaps.txt
index ac9f8abac4..374fd6c55a 100644
--- a/docs/ref/contrib/sitemaps.txt
+++ b/docs/ref/contrib/sitemaps.txt
@@ -310,7 +310,7 @@ index will reflect that.
 
 .. versionadded:: 1.4
 
-If you are not using the vanilla sitemap view -- for example, if it is wrapped
+If you're not using the vanilla sitemap view -- for example, if it's wrapped
 with a caching decorator -- you must name your sitemap view and pass
 ``sitemap_url_name`` to the index view::
 
diff --git a/docs/ref/django-admin.txt b/docs/ref/django-admin.txt
index 3f5840bfd5..3010cd020c 100644
--- a/docs/ref/django-admin.txt
+++ b/docs/ref/django-admin.txt
@@ -1002,7 +1002,7 @@ For example::
 .. versionadded:: 1.4
 
 As with the :djadmin:`startapp` command, the ``--template`` option lets you
-specify a directory, file path, or URL of a custom project template. See the
+specify a directory, file path or URL of a custom project template. See the
 :djadmin:`startapp` documentation for details of supported project template
 formats.
 
diff --git a/docs/ref/middleware.txt b/docs/ref/middleware.txt
index d57dbc9adc..99e2ae3838 100644
--- a/docs/ref/middleware.txt
+++ b/docs/ref/middleware.txt
@@ -96,17 +96,21 @@ browsers).
 It is suggested to place this first in the middleware list, so that the
 compression of the response content is the last thing that happens.
 
-It will not compress content bodies less than 200 bytes long, when the
-``Content-Encoding`` header is already set, or when the browser does not send
-an ``Accept-Encoding`` header containing ``gzip``.
+It will NOT compress content if any of the following are true:
 
-Content will also not be compressed when the browser is Internet Explorer and
-the ``Content-Type`` header contains ``javascript`` or starts with anything
-other than ``text/``. This is done to overcome a bug present in early versions
-of Internet Explorer which caused decompression not to be performed on certain
-content types.
+* The content body is less than 200 bytes long.
 
-GZip compression can be applied to individual views using the
+* The response has already set the ``Content-Encoding`` header.
+
+* The request (the browser) hasn't sent an ``Accept-Encoding`` header
+  containing ``gzip``.
+
+* The request is from Internet Explorer and the ``Content-Type`` header
+  contains ``javascript`` or starts with anything other than ``text/``.
+  We do this to avoid a bug in early versions of IE that caused decompression
+  not to be performed on certain content types.
+
+You can apply GZip compression to individual views using the
 :func:`~django.views.decorators.http.gzip_page()` decorator.
 
 Conditional GET middleware
diff --git a/docs/ref/templates/builtins.txt b/docs/ref/templates/builtins.txt
index 85d43ceb51..afee499830 100644
--- a/docs/ref/templates/builtins.txt
+++ b/docs/ref/templates/builtins.txt
@@ -2232,7 +2232,7 @@ This template tag works on links prefixed with ``http://``, ``https://``, or
 
 It also supports domain-only links ending in one of the original top level
 domains (``.com``, ``.edu``, ``.gov``, ``.int``, ``.mil``, ``.net``, and
-``.org``). For example, ``djangoproject.com`` gets converted too.
+``.org``). For example, ``djangoproject.com`` gets converted.
 
 .. versionchanged:: 1.4
 
@@ -2240,7 +2240,7 @@ Until Django 1.4, only the ``.com``, ``.net`` and ``.org`` suffixes were
 supported for domain-only links.
 
 Links can have trailing punctuation (periods, commas, close-parens) and leading
-punctuation (opening parens) and ``urlize`` will still do the right thing.
+punctuation (opening parens), and ``urlize`` will still do the right thing.
 
 Links generated by ``urlize`` have a ``rel="nofollow"`` attribute added
 to them.