From owner-dev-commits-doc-all@freebsd.org Wed Mar 17 01:04:26 2021 Return-Path: Delivered-To: dev-commits-doc-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 91D23575008 for ; Wed, 17 Mar 2021 01:04:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4F0X4B3j1zz4Rwt; Wed, 17 Mar 2021 01:04:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 71F522D77D; Wed, 17 Mar 2021 01:04:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 12H14QAd054106; Wed, 17 Mar 2021 01:04:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 12H14Q0K054105; Wed, 17 Mar 2021 01:04:26 GMT (envelope-from git) Date: Wed, 17 Mar 2021 01:04:26 GMT Message-Id: <202103170104.12H14Q0K054105@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Warner Losh Subject: git: 3a52e436d3 - main - Two more typos I made while fixing the last typos. MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3a52e436d37bb08fa1371b0bc7ba0280d4fd579a Auto-Submitted: auto-generated X-BeenThere: dev-commits-doc-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the doc repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 17 Mar 2021 01:04:26 -0000 The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/doc/commit/?id=3a52e436d37bb08fa1371b0bc7ba0280d4fd579a commit 3a52e436d37bb08fa1371b0bc7ba0280d4fd579a Author: Warner Losh AuthorDate: 2021-03-17 01:03:56 +0000 Commit: Warner Losh CommitDate: 2021-03-17 01:03:56 +0000 Two more typos I made while fixing the last typos. Noticed by: Pau Amma --- documentation/content/en/articles/committers-guide/_index.adoc | 4 ++-- 1 file 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: