summaryrefslogtreecommitdiff
path: root/docs/intro
diff options
context:
space:
mode:
authorAgnieszka Lasyk <agnieszkalasyk@agalasyk.local>2015-11-15 13:05:15 +0100
committerTim Graham <timograham@gmail.com>2015-11-16 06:44:46 -0500
commitb3389956c9cbc31e82137e787cfd339a3d1dab6f (patch)
treed97aacc386fd76cb72bf90f15d07be4960c844df /docs/intro
parent5234c9937c26b420f470f555fbe62f4969cea645 (diff)
[1.9.x] Fixed #25755 -- Unified spelling of "website".
Backport of 1f8dad69158a96d0649d321ce08ecc9c0465f962 from master
Diffstat (limited to 'docs/intro')
-rw-r--r--docs/intro/overview.txt2
-rw-r--r--docs/intro/reusable-apps.txt2
-rw-r--r--docs/intro/tutorial01.txt2
-rw-r--r--docs/intro/tutorial03.txt2
-rw-r--r--docs/intro/tutorial04.txt2
-rw-r--r--docs/intro/whatsnext.txt2
6 files changed, 6 insertions, 6 deletions
diff --git a/docs/intro/overview.txt b/docs/intro/overview.txt
index 77316c2662..8b5846f4ed 100644
--- a/docs/intro/overview.txt
+++ b/docs/intro/overview.txt
@@ -142,7 +142,7 @@ A dynamic admin interface: it's not just scaffolding -- it's the whole house
Once your models are defined, Django can automatically create a professional,
production ready :doc:`administrative interface </ref/contrib/admin/index>` --
-a Web site that lets authenticated users add, change and delete objects. It's
+a website that lets authenticated users add, change and delete objects. It's
as easy as registering your model in the admin site:
.. snippet::
diff --git a/docs/intro/reusable-apps.txt b/docs/intro/reusable-apps.txt
index d20bd37210..0c2b87d061 100644
--- a/docs/intro/reusable-apps.txt
+++ b/docs/intro/reusable-apps.txt
@@ -300,7 +300,7 @@ the world! If this wasn't just an example, you could now:
* Email the package to a friend.
-* Upload the package on your Web site.
+* Upload the package on your website.
* Post the package on a public repository, such as `the Python Package Index
(PyPI)`_. `packaging.python.org <https://packaging.python.org>`_ has `a good
diff --git a/docs/intro/tutorial01.txt b/docs/intro/tutorial01.txt
index c7774397af..bde7b800de 100644
--- a/docs/intro/tutorial01.txt
+++ b/docs/intro/tutorial01.txt
@@ -208,7 +208,7 @@ rather than creating directories.
What's the difference between a project and an app? An app is a Web
application that does something -- e.g., a Weblog system, a database of
public records or a simple poll app. A project is a collection of
- configuration and apps for a particular Web site. A project can contain
+ configuration and apps for a particular website. A project can contain
multiple apps. An app can be in multiple projects.
Your apps can live anywhere on your `Python path`_. In this tutorial, we'll
diff --git a/docs/intro/tutorial03.txt b/docs/intro/tutorial03.txt
index ecc80233a5..368c24369b 100644
--- a/docs/intro/tutorial03.txt
+++ b/docs/intro/tutorial03.txt
@@ -103,7 +103,7 @@ method and display whatever ID you provide in the URL. Try
"/polls/34/results/" and "/polls/34/vote/" too -- these will display the
placeholder results and voting pages.
-When somebody requests a page from your Web site -- say, "/polls/34/", Django
+When somebody requests a page from your website -- say, "/polls/34/", Django
will load the ``mysite.urls`` Python module because it's pointed to by the
:setting:`ROOT_URLCONF` setting. It finds the variable named ``urlpatterns``
and traverses the regular expressions in order. The
diff --git a/docs/intro/tutorial04.txt b/docs/intro/tutorial04.txt
index 716ab73a4d..909a87381c 100644
--- a/docs/intro/tutorial04.txt
+++ b/docs/intro/tutorial04.txt
@@ -183,7 +183,7 @@ without having chosen a choice, you should see the error message.
The code for our ``vote()`` view does have a small problem. It first gets
the ``selected_choice`` object from the database, then computes the new
value of ``votes``, and then saves it back to the database. If two users of
- your Web site try to vote at *exactly the same time*, this might go wrong:
+ your website try to vote at *exactly the same time*, this might go wrong:
The same value, let's say 42, will be retrieved for ``votes``. Then, for
both users the new value of 43 is computed and saved, but 44 would be the
expected value.
diff --git a/docs/intro/whatsnext.txt b/docs/intro/whatsnext.txt
index dd89da7ebe..794aaaa9c5 100644
--- a/docs/intro/whatsnext.txt
+++ b/docs/intro/whatsnext.txt
@@ -161,7 +161,7 @@ You can get a local copy of the HTML documentation following a few easy steps:
* Django's documentation uses a system called Sphinx__ to convert from
plain text to HTML. You'll need to install Sphinx by either downloading
- and installing the package from the Sphinx Web site, or with ``pip``:
+ and installing the package from the Sphinx website, or with ``pip``:
.. code-block:: console