[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

16 files changed, 25 insertions, 25 deletions

diff --git a/docs/ref/contrib/comments/moderation.txt b/docs/ref/contrib/comments/moderation.txt
index 198f78fa89..519bc5edd1 100644
--- a/docs/ref/contrib/comments/moderation.txt
+++ b/docs/ref/contrib/comments/moderation.txt
@@ -29,7 +29,7 @@ and uses a two-step process to enable moderation for any given model:
    model class and the class which specifies its moderation options.
 
 A simple example is the best illustration of this. Suppose we have the
-following model, which would represent entries in a weblog::
+following model, which would represent entries in a Weblog::
 
     from django.db import models
     
diff --git a/docs/ref/contrib/gis/deployment.txt b/docs/ref/contrib/gis/deployment.txt
index c8dde3e540..035b23fc8e 100644
--- a/docs/ref/contrib/gis/deployment.txt
+++ b/docs/ref/contrib/gis/deployment.txt
@@ -8,7 +8,7 @@ Deploying GeoDjango
     not thread safe at this time.  Thus, it is *highly* recommended
     to not use threading when deploying -- in other words, use a 
     an appropriate configuration of Apache or the prefork method
-    when using FastCGI through another web server.
+    when using FastCGI through another Web server.
 
 Apache
 ======
diff --git a/docs/ref/contrib/gis/index.txt b/docs/ref/contrib/gis/index.txt
index 074fa3a7b6..c4959e0f84 100644
--- a/docs/ref/contrib/gis/index.txt
+++ b/docs/ref/contrib/gis/index.txt
@@ -9,8 +9,8 @@ GeoDjango
 .. module:: django.contrib.gis
    :synopsis: Geographic Information System (GIS) extensions for Django
 
-GeoDjango intends to be a world-class geographic web framework. Its goal is to
-make it as easy as possible to build GIS web applications and harness the power
+GeoDjango intends to be a world-class geographic Web framework. Its goal is to
+make it as easy as possible to build GIS Web applications and harness the power
 of spatially enabled data.
 
 .. toctree::
diff --git a/docs/ref/contrib/gis/install.txt b/docs/ref/contrib/gis/install.txt
index ae36e167ae..90191dcec6 100644
--- a/docs/ref/contrib/gis/install.txt
+++ b/docs/ref/contrib/gis/install.txt
@@ -147,7 +147,7 @@ internal geometry representation used by GeoDjango (it's behind the "lazy"
 geometries).  Specifically, the C API library is called (e.g., ``libgeos_c.so``)
 directly from Python using ctypes.
 
-First, download GEOS 3.2 from the refractions website and untar the source
+First, download GEOS 3.2 from the refractions Web site and untar the source
 archive::
 
     $ wget http://download.osgeo.org/geos/geos-3.2.2.tar.bz2
@@ -640,7 +640,7 @@ If you can't find the solution to your problem here then participate in the
 community!  You can:
 
 * Join the ``#geodjango`` IRC channel on FreeNode (may be accessed on the
-  web via `Mibbit`__).  Please be patient and polite -- while you may not
+  Web via `Mibbit`__).  Please be patient and polite -- while you may not
   get an immediate response, someone will attempt to answer your question
   as soon as they see it.
 * Ask your question on the `GeoDjango`__ mailing list.
@@ -1085,7 +1085,7 @@ Windows XP
 Python
 ^^^^^^
 
-First, download the `Python 2.6 installer`__ from the Python website.  Next,
+First, download the `Python 2.6 installer`__ from the Python Web site.  Next,
 execute the installer and use defaults, e.g., keep 'Install for all users'
 checked and the installation path set as ``C:\Python26``.
 
@@ -1101,7 +1101,7 @@ PostgreSQL
 ^^^^^^^^^^
 
 First, select a mirror and download the latest `PostgreSQL 8.3 installer`__ from
-the EnterpriseDB website.
+the EnterpriseDB Web site.
 
 .. note::
 
diff --git a/docs/ref/contrib/gis/model-api.txt b/docs/ref/contrib/gis/model-api.txt
index cf73747463..b6d92dd24c 100644
--- a/docs/ref/contrib/gis/model-api.txt
+++ b/docs/ref/contrib/gis/model-api.txt
@@ -97,7 +97,7 @@ corresponds to the projection system that will be used to interpret the data
 in the spatial database. [#fnsrid]_  Projection systems give the context to the
 coordinates that specify a location.  Although the details of `geodesy`__ are
 beyond the scope of this documentation, the general problem is that the earth
-is spherical and representations of the earth (e.g., paper maps, web maps)
+is spherical and representations of the earth (e.g., paper maps, Web maps)
 are not.
 
 Most people are familiar with using latitude and longitude to reference a
@@ -133,7 +133,7 @@ Additional Resources:
 
 * `spatialreference.org`__: A Django-powered database of spatial reference
   systems.
-* `The State Plane Coordinate System`__: A website covering the various
+* `The State Plane Coordinate System`__: A Web site covering the various
   projection systems used in the United States.  Much of the U.S. spatial
   data encountered will be in one of these coordinate systems rather than
   in a geographic coordinate system such as WGS84.
diff --git a/docs/ref/contrib/gis/tutorial.txt b/docs/ref/contrib/gis/tutorial.txt
index e9599866ff..9deeb78873 100644
--- a/docs/ref/contrib/gis/tutorial.txt
+++ b/docs/ref/contrib/gis/tutorial.txt
@@ -6,8 +6,8 @@ Introduction
 ============
 
 GeoDjango is an add-on for Django that turns it into a world-class geographic
-web framework.  GeoDjango strives to make at as simple as possible to create
-geographic web applications, like location-based services.  Some features include:
+Web framework.  GeoDjango strives to make at as simple as possible to create
+geographic Web applications, like location-based services.  Some features include:
 
 * Django model fields for `OGC`_ geometries.
 * Extensions to Django's ORM for the querying and manipulation of spatial data.
@@ -25,7 +25,7 @@ yourself with basic Django concepts.
     please consult the :ref:`installation documentation <ref-gis-install>`
     for more details.
 
-This tutorial will guide you through the creation of a geographic web
+This tutorial will guide you through the creation of a geographic Web
 application for viewing the `world borders`_. [#]_ Some of the code
 used in this tutorial is taken from and/or inspired by the `GeoDjango
 basic apps`_ project. [#]_
@@ -197,7 +197,7 @@ as well as detailed information for each attribute field.  For example,
 ``FIPS: String (2.0)`` indicates that there's a ``FIPS`` character field
 with a maximum length of 2; similarly, ``LON: Real (8.3)`` is a floating-point
 field that holds a maximum of 8 digits up to three decimal places.  Although
-this information may be found right on the `world borders`_ website, this shows
+this information may be found right on the `world borders`_ Web site, this shows
 you how to determine this information yourself when such metadata is not
 provided.
 
diff --git a/docs/ref/contrib/gis/utils.txt b/docs/ref/contrib/gis/utils.txt
index 8b14802831..9f8e518d09 100644
--- a/docs/ref/contrib/gis/utils.txt
+++ b/docs/ref/contrib/gis/utils.txt
@@ -8,7 +8,7 @@ GeoDjango Utilities
    :synopsis: GeoDjango's collection of utilities.
 
 The :mod:`django.contrib.gis.utils` module contains various utilities that are
-useful in creating geospatial web applications.
+useful in creating geospatial Web applications.
 
 .. toctree::
    :maxdepth: 2
diff --git a/docs/ref/contrib/sitemaps.txt b/docs/ref/contrib/sitemaps.txt
index 7a66cbe9a9..e8bfcbc60b 100644
--- a/docs/ref/contrib/sitemaps.txt
+++ b/docs/ref/contrib/sitemaps.txt
@@ -76,7 +76,7 @@ Sitemap classes
 A :class:`~django.contrib.sitemaps.Sitemap` class is a simple Python
 class that represents a "section" of entries in your sitemap. For example,
 one :class:`~django.contrib.sitemaps.Sitemap` class could represent
-all the entries of your weblog, while another could represent all of the
+all the entries of your Weblog, while another could represent all of the
 events in your events calendar.
 
 In the simplest case, all these sections get lumped together into one
diff --git a/docs/ref/contrib/sites.txt b/docs/ref/contrib/sites.txt
index 54ca668300..6d795d056c 100644
--- a/docs/ref/contrib/sites.txt
+++ b/docs/ref/contrib/sites.txt
@@ -3,7 +3,7 @@ The "sites" framework
 =====================
 
 .. module:: django.contrib.sites
-   :synopsis: Lets you operate multiple web sites from the same database and
+   :synopsis: Lets you operate multiple Web sites from the same database and
               Django project
 
 Django comes with an optional "sites" framework. It's a hook for associating
diff --git a/docs/ref/forms/widgets.txt b/docs/ref/forms/widgets.txt
index 5984750943..9d78b8438e 100644
--- a/docs/ref/forms/widgets.txt
+++ b/docs/ref/forms/widgets.txt
@@ -197,7 +197,7 @@ Customizing widget instances
 When Django renders a widget as HTML, it only renders the bare minimum
 HTML - Django doesn't add a class definition, or any other widget-specific
 attributes. This means that all 'TextInput' widgets will appear the same
-on your web page.
+on your Web page.
 
 If you want to make one widget look different to another, you need to
 specify additional attributes for each widget. When you specify a
@@ -222,7 +222,7 @@ each widget will be rendered exactly the same::
     <tr><th>Comment:</th><td><input type="text" name="comment" /></td></tr>
 
 
-On a real web page, you probably don't want every widget to look the same. You
+On a real Web page, you probably don't want every widget to look the same. You
 might want a larger input element for the comment, and you might want the 'name'
 widget to have some special CSS class. To do this, you use the ``attrs``
 argument when creating the widget:
diff --git a/docs/ref/middleware.txt b/docs/ref/middleware.txt
index 290ea2736d..de2a99f902 100644
--- a/docs/ref/middleware.txt
+++ b/docs/ref/middleware.txt
@@ -193,7 +193,7 @@ Transaction middleware
 ----------------------
 
 .. module:: django.middleware.transaction
-   :synopsis: Middleware binding a database transaction to each web request.
+   :synopsis: Middleware binding a database transaction to each Web request.
 
 .. class:: django.middleware.transaction.TransactionMiddleware
 
diff --git a/docs/ref/models/instances.txt b/docs/ref/models/instances.txt
index 8bb6cf9cc5..b11a7e193d 100644
--- a/docs/ref/models/instances.txt
+++ b/docs/ref/models/instances.txt
@@ -9,7 +9,7 @@ material presented in the :doc:`model </topics/db/models>` and :doc:`database
 query </topics/db/queries>` guides, so you'll probably want to read and
 understand those documents before reading this one.
 
-Throughout this reference we'll use the :ref:`example weblog models
+Throughout this reference we'll use the :ref:`example Weblog models
 <queryset-model-example>` presented in the :doc:`database query guide
 </topics/db/queries>`.
 
diff --git a/docs/ref/models/querysets.txt b/docs/ref/models/querysets.txt
index c1c586aada..b366ef33a1 100644
--- a/docs/ref/models/querysets.txt
+++ b/docs/ref/models/querysets.txt
@@ -9,7 +9,7 @@ material presented in the :doc:`model </topics/db/models>` and :doc:`database
 query </topics/db/queries>` guides, so you'll probably want to read and
 understand those documents before reading this one.
 
-Throughout this reference we'll use the :ref:`example weblog models
+Throughout this reference we'll use the :ref:`example Weblog models
 <queryset-model-example>` presented in the :doc:`database query guide
 </topics/db/queries>`.
 
diff --git a/docs/ref/request-response.txt b/docs/ref/request-response.txt
index a944abeddc..0eaa4b6e22 100644
--- a/docs/ref/request-response.txt
+++ b/docs/ref/request-response.txt
@@ -137,7 +137,7 @@ All attributes except ``session`` should be considered read-only.
         * ``QUERY_STRING`` -- The query string, as a single (unparsed) string.
         * ``REMOTE_ADDR`` -- The IP address of the client.
         * ``REMOTE_HOST`` -- The hostname of the client.
-        * ``REMOTE_USER`` -- The user authenticated by the web server, if any.
+        * ``REMOTE_USER`` -- The user authenticated by the Web server, if any.
         * ``REQUEST_METHOD`` -- A string such as ``"GET"`` or ``"POST"``.
         * ``SERVER_NAME`` -- The hostname of the server.
         * ``SERVER_PORT`` -- The port of the server.
diff --git a/docs/ref/templates/builtins.txt b/docs/ref/templates/builtins.txt
index 01f39e7b89..c0ae8cf36d 100644
--- a/docs/ref/templates/builtins.txt
+++ b/docs/ref/templates/builtins.txt
@@ -2102,7 +2102,7 @@ See the :doc:`markup documentation </ref/contrib/markup>`.
 django.contrib.webdesign
 ~~~~~~~~~~~~~~~~~~~~~~~~
 
-A collection of template tags that can be useful while designing a website,
+A collection of template tags that can be useful while designing a Web site,
 such as a generator of Lorem Ipsum text. See :doc:`/ref/contrib/webdesign`.
 
 i18n
diff --git a/docs/ref/utils.txt b/docs/ref/utils.txt
index 39b01df0be..e4ce7c4f86 100644
--- a/docs/ref/utils.txt
+++ b/docs/ref/utils.txt
@@ -193,7 +193,7 @@ Sample usage::
     >>> feed = feedgenerator.Rss201rev2Feed(
     ...     title=u"Poynter E-Media Tidbits",
     ...     link=u"http://www.poynter.org/column.asp?id=31",
-    ...     description=u"A group weblog by the sharpest minds in online media/journalism/publishing.",
+    ...     description=u"A group Weblog by the sharpest minds in online media/journalism/publishing.",
     ...     language=u"en",
     ... )
     >>> feed.add_item(