os/doc
3
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Two more typos I made while fixing the last typos.

Browse source 
Noticed by: Pau Amma
This commit is contained in:
Warner Losh 2021-03-16 19:03:56 -06:00
parent 86836673be
commit 3a52e436d3
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
documentation/content/en/articles/committers-guide/_index.adoc
View file

@ -263,7 +263,7 @@ The vendor branch for this is `vendor/NetBSD/mtree`.
==== Updating an old vendor import ==== Updating an old vendor import
The vendor trees usually have only the subset of the third-party software that is appropriate to FreeBSD. 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. 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. Make sure that whatever directory you choose below (the `../mtree`) does not currently exist.
[source,shell] [source,shell]
.... ....
@ -360,7 +360,7 @@ Examine the tree against `merge_result` to make sure that you haven't missed del
.... ....
==== Pushing the changes ==== 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 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. 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: After review, when you are sure it is a good change, you can push it to the FreeBSD repo: