[1.2.X] Fixed #11509 -- Modified usage of "Web" to match our style guide in various documentation, comments and code. Thanks to timo and Simon Meers for the work on the patch

Backport of r14069 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14072 bcc190cf-cafb-0310-a4f2-bffc1f526a37

8 files changed, 10 insertions, 10 deletions

diff --git a/docs/topics/auth.txt b/docs/topics/auth.txt
index 4a6e30fc00..5d1cc189f4 100644
--- a/docs/topics/auth.txt
+++ b/docs/topics/auth.txt
@@ -658,7 +658,7 @@ How to log a user out
 
     When you call :func:`~django.contrib.auth.logout()`, the session data for
     the current request is completely cleaned out. All existing data is
-    removed. This is to prevent another person from using the same web browser
+    removed. This is to prevent another person from using the same Web browser
     to log in and have access to the previous user's session data. If you want
     to put anything into the session that will be available to the user
     immediately after logging out, do that *after* calling
diff --git a/docs/topics/conditional-view-processing.txt b/docs/topics/conditional-view-processing.txt
index b5da140827..c631a136b4 100644
--- a/docs/topics/conditional-view-processing.txt
+++ b/docs/topics/conditional-view-processing.txt
@@ -6,7 +6,7 @@ Conditional View Processing
 
 HTTP clients can send a number of headers to tell the server about copies of a
 resource that they have already seen. This is commonly used when retrieving a
-web page (using an HTTP ``GET`` request) to avoid sending all the data for
+Web page (using an HTTP ``GET`` request) to avoid sending all the data for
 something the client has already retrieved. However, the same headers can be
 used for all HTTP methods (``POST``, ``PUT``, ``DELETE``, etc).
 
diff --git a/docs/topics/db/optimization.txt b/docs/topics/db/optimization.txt
index baf8cfa268..6700e1c6e7 100644
--- a/docs/topics/db/optimization.txt
+++ b/docs/topics/db/optimization.txt
@@ -68,7 +68,7 @@ Understand cached attributes
 
 As well as caching of the whole ``QuerySet``, there is caching of the result of
 attributes on ORM objects. In general, attributes that are not callable will be
-cached. For example, assuming the :ref:`example weblog models
+cached. For example, assuming the :ref:`example Weblog models
 <queryset-model-example>`:
 
   >>> entry = Entry.objects.get(id=1)
diff --git a/docs/topics/db/queries.txt b/docs/topics/db/queries.txt
index 5c4941fbf2..3d598f87a1 100644
--- a/docs/topics/db/queries.txt
+++ b/docs/topics/db/queries.txt
@@ -11,7 +11,7 @@ API. Refer to the :doc:`data model reference </ref/models/index>` for full
 details of all the various model lookup options.
 
 Throughout this guide (and in the reference), we'll refer to the following
-models, which comprise a weblog application:
+models, which comprise a Weblog application:
 
 .. _queryset-model-example:
 
diff --git a/docs/topics/email.txt b/docs/topics/email.txt
index 31092b0aaa..33564b6f19 100644
--- a/docs/topics/email.txt
+++ b/docs/topics/email.txt
@@ -574,7 +574,7 @@ Testing e-mail sending
 ======================
 
 There are times when you do not want Django to send e-mails at
-all. For example, while developing a website, you probably don't want
+all. For example, while developing a Web site, you probably don't want
 to send out thousands of e-mails -- but you may want to validate that
 e-mails will be sent to the right people under the right conditions,
 and that those e-mails will contain the correct content.
diff --git a/docs/topics/forms/media.txt b/docs/topics/forms/media.txt
index 64cf50743d..548095d83b 100644
--- a/docs/topics/forms/media.txt
+++ b/docs/topics/forms/media.txt
@@ -1,7 +1,7 @@
 Form Media
 ==========
 
-Rendering an attractive and easy-to-use web form requires more than just
+Rendering an attractive and easy-to-use Web form requires more than just
 HTML - it also requires CSS stylesheets, and if you want to use fancy
 "Web2.0" widgets, you may also need to include some JavaScript on each
 page. The exact combination of CSS and JavaScript that is required for
@@ -14,7 +14,7 @@ you can define a custom Calendar widget. This widget can then be associated
 with the CSS and JavaScript that is required to render the calendar. When
 the Calendar widget is used on a form, Django is able to identify the CSS and
 JavaScript files that are required, and provide the list of file names
-in a form suitable for easy inclusion on your web page.
+in a form suitable for easy inclusion on your Web page.
 
 .. admonition:: Media and Django Admin
 
diff --git a/docs/topics/http/middleware.txt b/docs/topics/http/middleware.txt
index eee398a3dc..24d2a8ef7d 100644
--- a/docs/topics/http/middleware.txt
+++ b/docs/topics/http/middleware.txt
@@ -152,7 +152,7 @@ of caveats:
       define ``__init__`` as requiring any arguments.
 
     * Unlike the ``process_*`` methods which get called once per request,
-      ``__init__`` gets called only *once*, when the web server starts up.
+      ``__init__`` gets called only *once*, when the Web server starts up.
 
 Marking middleware as unused
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/docs/topics/install.txt b/docs/topics/install.txt
index cb6c29f5f8..ad99b33890 100644
--- a/docs/topics/install.txt
+++ b/docs/topics/install.txt
@@ -28,7 +28,7 @@ Install Apache and mod_wsgi
 =============================
 
 If you just want to experiment with Django, skip ahead to the next section;
-Django includes a lightweight web server you can use for testing, so you won't
+Django includes a lightweight Web server you can use for testing, so you won't
 need to set up Apache until you're ready to deploy Django in production.
 
 If you want to use Django on a production site, use Apache with `mod_wsgi`_.
@@ -274,7 +274,7 @@ latest bug fixes and improvements, follow these instructions:
    .. code-block:: bash
 
        ln -s WORKING-DIR/django-trunk/django/bin/django-admin.py /usr/local/bin
-       
+
    (In the above line, change WORKING-DIR to match the full path to your new
    ``django-trunk`` directory.)