Commit 1f8dad69 authored by Agnieszka Lasyk's avatar Agnieszka Lasyk Committed by Tim Graham
Browse files

Fixed #25755 -- Unified spelling of "website".

parent 53326e2c

docs/faq/general.txt

+2 −2
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ At the same time, the World Online Web developers have consistently been 
perfectionists when it comes to following best practices of Web development.



In fall 2003, the World Online developers (Adrian Holovaty and Simon Willison)

ditched PHP and began using Python to develop its Web sites. As they built

ditched PHP and began using Python to develop its websites. As they built

intensive, richly interactive sites such as Lawrence.com, they began to extract

a generic Web development framework that let them build Web applications more

and more quickly. They tweaked this framework constantly, adding improvements
@@ -148,7 +148,7 @@ Is Django a content-management-system (CMS)? 
--------------------------------------------



No, Django is not a CMS, or any sort of "turnkey product" in and of itself.

It's a Web framework; it's a programming tool that lets you build Web sites.

It's a Web framework; it's a programming tool that lets you build websites.



For example, it doesn't make much sense to compare Django to something like

Drupal_, because Django is something you use to *create* things like Drupal.

docs/howto/jython.txt

+2 −2
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ This document will get you up and running with Django on top of Jython. 
Installing Jython

=================



Django works with Jython versions 2.7b2 and higher. See the Jython_ Web site for

Django works with Jython versions 2.7b2 and higher. See the Jython_ website for

download and installation instructions.



.. _jython: http://www.jython.org/
@@ -48,7 +48,7 @@ on top of Jython. 
.. _`django-jython`: https://github.com/beachmachine/django-jython



To install it, follow the `installation instructions`_ detailed on the project

Web site. Also, read the `database backends`_ documentation there.

website. Also, read the `database backends`_ documentation there.



.. _`installation instructions`: https://pythonhosted.org/django-jython/quickstart.html#install

.. _`database backends`: https://pythonhosted.org/django-jython/database-backends.html

docs/internals/contributing/committing-code.txt

+1 −1
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ pull request "Merged in XXXXXXX" (replacing with the commit hash) after you 
merge it. Trac checks for this message format to indicate on the ticket page

whether or not a pull request is merged.



Avoid using GitHub's "Merge pull request" button on the Web site as its creates

Avoid using GitHub's "Merge pull request" button on the website as it creates

an ugly "merge commit" and makes navigating history more difficult.



When rewriting the commit history of a pull request, the goal is to make

docs/internals/contributing/writing-documentation.txt

+1 −1
Original line number Diff line number Diff line
@@ -106,7 +106,7 @@ documentation: 
* **Web**, **World Wide Web**, **the Web** -- note Web is always

  capitalized when referring to the World Wide Web.



* **Web site** -- use two words, with Web capitalized.

* **website** -- use one word, without capitalization.



Django-specific terminology

---------------------------

docs/intro/overview.txt

+1 −1
Original line number Diff line number Diff line
@@ -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::