diff options
| author | Warner Losh <imp@FreeBSD.org> | 2021-03-17 01:03:56 +0000 |
|---|---|---|
| committer | Warner Losh <imp@FreeBSD.org> | 2021-03-17 01:03:56 +0000 |
| commit | 3a52e436d37bb08fa1371b0bc7ba0280d4fd579a (patch) | |
| tree | b405dacd27f723804e4697f8b3ea2f3668da656a | |
| parent | 86836673be10d5e844953ef89aaebfd341700148 (diff) | |
| download | doc-3a52e436d37bb08fa1371b0bc7ba0280d4fd579a.tar.gz doc-3a52e436d37bb08fa1371b0bc7ba0280d4fd579a.zip | |
Two more typos I made while fixing the last typos.
Noticed by: Pau Amma
| -rw-r--r-- | documentation/content/en/articles/committers-guide/_index.adoc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/documentation/content/en/articles/committers-guide/_index.adoc b/documentation/content/en/articles/committers-guide/_index.adoc index 5ae3aef191..10ac725642 100644 --- a/documentation/content/en/articles/committers-guide/_index.adoc +++ b/documentation/content/en/articles/committers-guide/_index.adoc @@ -263,7 +263,7 @@ The vendor branch for this is `vendor/NetBSD/mtree`. ==== Updating an old vendor import The vendor trees usually have only the subset of the third-party software that is appropriate to FreeBSD. These trees are usually tiny in comparison to the FreeBSD tree. -Git workrees are thus quite small and fast and the preferred method to use. +Git worktrees are thus quite small and fast and the preferred method to use. Make sure that whatever directory you choose below (the `../mtree`) does not currently exist. [source,shell] .... @@ -360,7 +360,7 @@ Examine the tree against `merge_result` to make sure that you haven't missed del .... ==== Pushing the changes Once you are sure that you have a set of deltas you think is good, you can push it to a fork off github or gitlab for others to review. -Once nice thing about Git is that it allows you to publish rough drafts of your work for others to review. +One nice thing about Git is that it allows you to publish rough drafts of your work for others to review. While phabricator is good for content review, publishing the updated vendor branch and merge commits lets others check the details as they will eventually appear in the repository. After review, when you are sure it is a good change, you can push it to the FreeBSD repo: |