[1.9.x] Fixed #25755 -- Unified spelling of "website".

Backport of 1f8dad69158a96d0649d321ce08ecc9c0465f962 from master

11 files changed, 18 insertions, 18 deletions

diff --git a/docs/ref/contrib/admin/index.txt b/docs/ref/contrib/admin/index.txt
index 6fa34228f9..ef1b032045 100644
--- a/docs/ref/contrib/admin/index.txt
+++ b/docs/ref/contrib/admin/index.txt
@@ -2715,7 +2715,7 @@ Multiple admin sites in the same URLconf
 ----------------------------------------
 
 It's easy to create multiple instances of the admin site on the same
-Django-powered Web site. Just create multiple instances of ``AdminSite`` and
+Django-powered website. Just create multiple instances of ``AdminSite`` and
 root each one at a different URL.
 
 In this example, the URLs ``/basic-admin/`` and ``/advanced-admin/`` feature
diff --git a/docs/ref/contrib/gis/forms-api.txt b/docs/ref/contrib/gis/forms-api.txt
index a2ea314d7c..b9c0c1dbe4 100644
--- a/docs/ref/contrib/gis/forms-api.txt
+++ b/docs/ref/contrib/gis/forms-api.txt
@@ -153,7 +153,7 @@ Widget classes
     ``template_name`` is ``gis/openlayers.html``.
 
     ``OpenLayersWidget`` and :class:`OSMWidget` use the ``openlayers.js`` file
-    hosted on the ``openlayers.org`` Web site. This works for basic usage
+    hosted on the ``openlayers.org`` website. This works for basic usage
     during development, but isn't appropriate for a production deployment as
     ``openlayers.org/api/`` has no guaranteed uptime and runs on a slow server.
     You are therefore advised to subclass these widgets in order to specify
diff --git a/docs/ref/contrib/gis/install/geolibs.txt b/docs/ref/contrib/gis/install/geolibs.txt
index 1497a53adb..9174c3e0bb 100644
--- a/docs/ref/contrib/gis/install/geolibs.txt
+++ b/docs/ref/contrib/gis/install/geolibs.txt
@@ -106,7 +106,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.4.2 from the GEOS Web site and untar the source
+First, download GEOS 3.4.2 from the GEOS website and untar the source
 archive::
 
     $ wget http://download.osgeo.org/geos/geos-3.4.2.tar.bz2
diff --git a/docs/ref/contrib/gis/install/index.txt b/docs/ref/contrib/gis/install/index.txt
index 95f1f92d41..821372dd31 100644
--- a/docs/ref/contrib/gis/install/index.txt
+++ b/docs/ref/contrib/gis/install/index.txt
@@ -381,7 +381,7 @@ GeoDjango on Windows.
 Python
 ^^^^^^
 
-First, download the latest `Python 2.7 installer`__ from the Python Web site.
+First, download the latest `Python 2.7 installer`__ from the Python website.
 Next, run the installer and keep the defaults -- for example, keep
 'Install for all users' checked and the installation path set as
 ``C:\Python27``.
@@ -398,7 +398,7 @@ PostgreSQL
 ^^^^^^^^^^
 
 First, download the latest `PostgreSQL 9.x installer`__ from the
-`EnterpriseDB`__ Web site.  After downloading, simply run the installer,
+`EnterpriseDB`__ website.  After downloading, simply run the installer,
 follow the on-screen directions, and keep the default options unless
 you know the consequences of changing them.
 
diff --git a/docs/ref/contrib/gis/model-api.txt b/docs/ref/contrib/gis/model-api.txt
index fb44a5c41c..ee96f3f0ab 100644
--- a/docs/ref/contrib/gis/model-api.txt
+++ b/docs/ref/contrib/gis/model-api.txt
@@ -147,7 +147,7 @@ Additional Resources:
 
 * `spatialreference.org`__: A Django-powered database of spatial reference
   systems.
-* `The State Plane Coordinate System`__: A Web site covering the various
+* `The State Plane Coordinate System`__: A website 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/index.txt b/docs/ref/contrib/index.txt
index b2b331476e..d4e0e1cad6 100644
--- a/docs/ref/contrib/index.txt
+++ b/docs/ref/contrib/index.txt
@@ -117,7 +117,7 @@ See the :doc:`sessions documentation </topics/http/sessions>`.
 sites
 =====
 
-A light framework that lets you operate multiple Web sites off of the same
+A light framework that lets you operate multiple websites off of the same
 database and Django installation. It gives you hooks for associating objects to
 one or more sites.
 
diff --git a/docs/ref/contrib/sitemaps.txt b/docs/ref/contrib/sitemaps.txt
index 004dffc76a..2703c1627a 100644
--- a/docs/ref/contrib/sitemaps.txt
+++ b/docs/ref/contrib/sitemaps.txt
@@ -13,7 +13,7 @@ creating sitemap_ XML files easy.
 Overview
 ========
 
-A sitemap is an XML file on your Web site that tells search-engine indexers how
+A sitemap is an XML file on your website that tells search-engine indexers how
 frequently your pages change and how "important" certain pages are in relation
 to other pages on your site. This information helps search engines index your
 site.
diff --git a/docs/ref/contrib/sites.txt b/docs/ref/contrib/sites.txt
index defa808207..baf373d529 100644
--- a/docs/ref/contrib/sites.txt
+++ b/docs/ref/contrib/sites.txt
@@ -3,11 +3,11 @@ The "sites" framework
 =====================
 
 .. module:: django.contrib.sites
-   :synopsis: Lets you operate multiple Web sites from the same database and
+   :synopsis: Lets you operate multiple websites from the same database and
               Django project
 
 Django comes with an optional "sites" framework. It's a hook for associating
-objects and functionality to particular Web sites, and it's a holding place for
+objects and functionality to particular websites, and it's a holding place for
 the domain names and "verbose" names of your Django-powered sites.
 
 Use it if your single Django installation powers more than one site and you
@@ -17,11 +17,11 @@ The sites framework is mainly based on a simple model:
 
 .. class:: models.Site
 
-    A model for storing the ``domain`` and ``name`` attributes of a Web site.
+    A model for storing the ``domain`` and ``name`` attributes of a website.
 
     .. attribute:: domain
 
-        The fully qualified domain name associated with the Web site.
+        The fully qualified domain name associated with the website.
         For example, ``www.example.com``.
 
         .. versionchanged:: 1.9
@@ -31,7 +31,7 @@ The sites framework is mainly based on a simple model:
 
     .. attribute:: name
 
-        A human-readable "verbose" name for the Web site.
+        A human-readable "verbose" name for the website.
 
 The :setting:`SITE_ID` setting specifies the database ID of the
 :class:`~django.contrib.sites.models.Site` object associated with that
diff --git a/docs/ref/csrf.txt b/docs/ref/csrf.txt
index 77b176455c..f0c7b5b75f 100644
--- a/docs/ref/csrf.txt
+++ b/docs/ref/csrf.txt
@@ -7,8 +7,8 @@ Cross Site Request Forgery protection
 
 The CSRF middleware and template tag provides easy-to-use protection against
 `Cross Site Request Forgeries`_.  This type of attack occurs when a malicious
-Web site contains a link, a form button or some JavaScript that is intended to
-perform some action on your Web site, using the credentials of a logged-in user
+website contains a link, a form button or some JavaScript that is intended to
+perform some action on your website, using the credentials of a logged-in user
 who visits the malicious site in their browser.  A related type of attack,
 'login CSRF', where an attacking site tricks a user's browser into logging into
 a site with someone else's credentials, is also covered.
diff --git a/docs/ref/forms/fields.txt b/docs/ref/forms/fields.txt
index 8cdd249005..4f978ebe30 100644
--- a/docs/ref/forms/fields.txt
+++ b/docs/ref/forms/fields.txt
@@ -111,12 +111,12 @@ We've specified ``auto_id=False`` to simplify the output::
     >>> from django import forms
     >>> class CommentForm(forms.Form):
     ...     name = forms.CharField(label='Your name')
-    ...     url = forms.URLField(label='Your Web site', required=False)
+    ...     url = forms.URLField(label='Your website', required=False)
     ...     comment = forms.CharField()
     >>> f = CommentForm(auto_id=False)
     >>> print(f)
     <tr><th>Your name:</th><td><input type="text" name="name" /></td></tr>
-    <tr><th>Your Web site:</th><td><input type="url" name="url" /></td></tr>
+    <tr><th>Your website:</th><td><input type="url" name="url" /></td></tr>
     <tr><th>Comment:</th><td><input type="text" name="comment" /></td></tr>
 
 ``label_suffix``
diff --git a/docs/ref/validators.txt b/docs/ref/validators.txt
index 9bbcf9bcbc..dcb68a6791 100644
--- a/docs/ref/validators.txt
+++ b/docs/ref/validators.txt
@@ -159,7 +159,7 @@ to, or in lieu of custom ``field.clean()`` methods.
 
         URL/URI scheme list to validate against. If not provided, the default
         list is ``['http', 'https', 'ftp', 'ftps']``. As a reference, the IANA
-        Web site provides a full list of `valid URI schemes`_.
+        website provides a full list of `valid URI schemes`_.
 
         .. _valid URI schemes: https://www.iana.org/assignments/uri-schemes/uri-schemes.xhtml