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:14 -0500 |
| commit | 1f8dad69158a96d0649d321ce08ecc9c0465f962 (patch) | |
| tree | 17f36d2f6aa0b212eebb3a5f51e2ba27753f8a00 /docs/internals/contributing | |
| parent | 53326e2c8ab92195be6b65120254be77cbf47c26 (diff) | |
Fixed #25755 -- Unified spelling of "website".
Diffstat (limited to 'docs/internals/contributing')
| -rw-r--r-- | docs/internals/contributing/committing-code.txt | 2 | ||||
| -rw-r--r-- | docs/internals/contributing/writing-documentation.txt | 2 |
2 files changed, 2 insertions, 2 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 --------------------------- |