From dd48a53b6594052b337a89bcecb11494207300a1 Mon Sep 17 00:00:00 2001 From: Ikko Eltociear Ashimine Date: Mon, 25 Dec 2023 16:05:37 +0900 Subject: [PATCH] various: fix capitalization of 'GitHub' --- DOCS/contribute.md | 8 ++++---- README.md | 2 +- osdep/macosx_menubar.m | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/DOCS/contribute.md b/DOCS/contribute.md index 91422a7289..8323309307 100644 --- a/DOCS/contribute.md +++ b/DOCS/contribute.md @@ -5,13 +5,13 @@ General ------- The main contact for mpv development is IRC, specifically #mpv -and #mpv-devel on Libera.chat. Github is used for code review and +and #mpv-devel on Libera.chat. GitHub is used for code review and long term discussions. Sending patches --------------- -- Make a github pull request, or send a link to a plaintext patch created with +- Make a GitHub pull request, or send a link to a plaintext patch created with ``git format-patch``. - Plain diffs posted as pastebins are not acceptable! (Especially if the http link returns HTML.) They only cause extra work for everyone, because they lack @@ -111,13 +111,13 @@ Always squash fixup commits when making changes to pull requests - If you make fixup commits to your pull request, you should generally squash them with "git rebase -i". We prefer to have pull requests in a merge ready state. -- We don't squash-merge (nor do we use github's feature that does this) because +- We don't squash-merge (nor do we use GitHub's feature that does this) because pull requests with multiple commits are perfectly legitimate, and the only thing that makes sense in non-trivial cases. - With complex pull requests, it *may* make sense to keep them separate, but they should be clearly marked as such. Reviewing commits is generally easier with fixups squashed. -- Reviewers are encouraged to look at individual commits instead of github's +- Reviewers are encouraged to look at individual commits instead of GitHub's "changes from all commits" view (which just encourages bad git and review practices). diff --git a/README.md b/README.md index 4a454d4074..f26ea1289b 100644 --- a/README.md +++ b/README.md @@ -190,7 +190,7 @@ see the [FAQ][FAQ]. ## Contact -Most activity happens on the IRC channel and the github issue tracker. +Most activity happens on the IRC channel and the GitHub issue tracker. - **GitHub issue tracker**: [issue tracker][issue-tracker] (report bugs here) - **User IRC Channel**: `#mpv` on `irc.libera.chat` diff --git a/osdep/macosx_menubar.m b/osdep/macosx_menubar.m index 5c6cd4707e..8aaf5aae41 100644 --- a/osdep/macosx_menubar.m +++ b/osdep/macosx_menubar.m @@ -578,7 +578,7 @@ @"url" : @"https://mpv.io" }], [NSMutableDictionary dictionaryWithDictionary:@{ - @"name" : @"mpv on github…", + @"name" : @"mpv on GitHub…", @"action" : @"url:", @"key" : @"", @"target" : self,