Date: Sun, 14 May 2023 12:52:51 GMT From: Warner Losh <imp@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: 3aa0cc47eeb0 - main - CONTRIBUTING.md: minor changes Message-ID: <202305141252.34ECqpb3023084@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=3aa0cc47eeb05a8d0e8bc2a29211e3ee6ad2324c commit 3aa0cc47eeb05a8d0e8bc2a29211e3ee6ad2324c Author: Graham Perrin <grahamperrin@gmail.com> AuthorDate: 2023-05-14 12:49:00 +0000 Commit: Warner Losh <imp@FreeBSD.org> CommitDate: 2023-05-14 12:51:56 +0000 CONTRIBUTING.md: minor changes Fix a singular/plural mistake, spelling error, a markup error, and a handful of other minor changes. Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/742 --- CONTRIBUTING.md | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index cc86e096dd18..fab8262070ce 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -23,9 +23,9 @@ changes where the contributor already has a GitHub account. Presently, GitHub 'freebsd-src' repository is one of the publish-only services for the FreeBSD 'src' repository the project uses to promote collaboration and contribution. Pull requests that need little developer time, are generally -small, and have limited scope should be submitted. Do not submit pull request -that are a problem reports, works in progress, changes that are controversial -and need discussion, changes require specialize review, or are security related. +small, and have limited scope should be submitted. Do not submit pull requests +that are security-related, problem reports, works in progress, changes that are controversial +and need discussion, or changes that require specialized review. A pull request will be considered if: @@ -34,15 +34,15 @@ A pull request will be considered if: * You can respond to feedback quickly. * It touches fewer than about 10 files and the changes are less than about 200 lines. Changes larger than this may be OK, or you may be asked to submit multiple pull requests of a more manageable size. * Each logical change is a separate commit within the pull request. Commit messages for each change should follow the [commit log message guide](https://docs.freebsd.org/en/articles/committers-guide/#commit-log-message). -* All commits have your name and valid email address as you would like to see them in the FreeBSD repository as the author. Fake github.com addresses cannot be used. +* All commits have, as the author, your name and valid email address as you would like to see them in the FreeBSD repository. Fake github.com addresses cannot be used. * The scope of the pull request should not change during review. If the review suggests changes that expand the scope, please create an independent pull request. * Fixup commits should be squashed with the commit they are fixing. Each commit in your branch should be suitable for FreeBSD's repository. * Commits should include one or more `Signed-off-by:` lines with full name and email address certifying [Developer Certificate of Origin](https://developercertificate.org/). * The commits follow FreeBSD's style guide. See [Style](#Style). -* Run tools/build/checkstyle9.pl on your git branch and eliminate all errors -* The commits should not introduce trailing white space. -* If the commmit fixes a bug, please add 'PR: <bugnumber>' to the comment message. -* If there's a code review in phabricator, please include a link as a 'Differential Revision: ' line. +* Run tools/build/checkstyle9.pl on your Git branch and eliminate all errors +* The commits do not introduce trailing white space. +* If the commmit fixes a bug, please add 'PR: \<bugnumber>\' to the commit message. +* If there's a code review in Phabricator, please include a link as a 'Differential Revision: ' line. When updating your pull request, please rebase with a forced push rather than a merge commit.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202305141252.34ECqpb3023084>