diff options
| author | Agnieszka Lasyk <agnieszkalasyk@agalasyk.local> | 2015-11-15 13:05:15 +0100 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2015-11-16 06:44:46 -0500 |
| commit | b3389956c9cbc31e82137e787cfd339a3d1dab6f (patch) | |
| tree | d97aacc386fd76cb72bf90f15d07be4960c844df /docs/internals | |
| parent | 5234c9937c26b420f470f555fbe62f4969cea645 (diff) | |
[1.9.x] Fixed #25755 -- Unified spelling of "website".
Backport of 1f8dad69158a96d0649d321ce08ecc9c0465f962 from master
Diffstat (limited to 'docs/internals')
| -rw-r--r-- | docs/internals/contributing/committing-code.txt | 2 | ||||
| -rw-r--r-- | docs/internals/contributing/writing-documentation.txt | 2 | ||||
| -rw-r--r-- | docs/internals/git.txt | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/docs/internals/contributing/committing-code.txt b/docs/internals/contributing/committing-code.txt index 0b07eaa6de..e5ede3d1df 100644 --- a/docs/internals/contributing/committing-code.txt +++ b/docs/internals/contributing/committing-code.txt @@ -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 diff --git a/docs/internals/contributing/writing-documentation.txt b/docs/internals/contributing/writing-documentation.txt index b203d11e4a..f8e5b4f1a8 100644 --- a/docs/internals/contributing/writing-documentation.txt +++ b/docs/internals/contributing/writing-documentation.txt @@ -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 --------------------------- diff --git a/docs/internals/git.txt b/docs/internals/git.txt index 043f2ac233..21d110303a 100644 --- a/docs/internals/git.txt +++ b/docs/internals/git.txt @@ -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 |