1
0
mirror of https://github.com/django/django.git synced 2025-10-31 09:41:08 +00:00

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

Backport of 1f8dad6915 from master
This commit is contained in:
Agnieszka Lasyk
2015-11-15 13:05:15 +01:00
committed by Tim Graham
parent 5234c9937c
commit b3389956c9
33 changed files with 55 additions and 55 deletions

View File

@@ -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

View File

@@ -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
---------------------------

View File

@@ -22,7 +22,7 @@ over time, so you'll need a copy of the Git client (a program called ``git``)
on your computer, and you'll want to familiarize yourself with the basics of
how Git works.
Git's web site offers downloads for various operating systems. The site also
Git's website offers downloads for various operating systems. The site also
contains vast amounts of `documentation`_.
The Django Git repository is located online at `github.com/django/django