summaryrefslogtreecommitdiff
path: root/docs/internals/contributing/committing-code.txt
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/internals/contributing/committing-code.txt
parent5234c9937c26b420f470f555fbe62f4969cea645 (diff)
[1.9.x] Fixed #25755 -- Unified spelling of "website".
Backport of 1f8dad69158a96d0649d321ce08ecc9c0465f962 from master
Diffstat (limited to 'docs/internals/contributing/committing-code.txt')
-rw-r--r--docs/internals/contributing/committing-code.txt2
1 files changed, 1 insertions, 1 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