From owner-dev-commits-doc-all@freebsd.org Mon Jun 21 02:00:31 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 E22BC65D63A for ; Mon, 21 Jun 2021 02:00:31 +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 4G7Xmb5w6qz3hQh; Mon, 21 Jun 2021 02:00:31 +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 B398714B91; Mon, 21 Jun 2021 02:00:31 +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 15L20VCe064041; Mon, 21 Jun 2021 02:00:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 15L20VlQ064040; Mon, 21 Jun 2021 02:00:31 GMT (envelope-from git) Date: Mon, 21 Jun 2021 02:00:31 GMT Message-Id: <202106210200.15L20VlQ064040@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Warner Losh Subject: git: e73b64ca49 - main - committers-guide: fix 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: e73b64ca491b9df3a48491d7afd70ae93645d3d9 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: Mon, 21 Jun 2021 02:00:31 -0000 The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/doc/commit/?id=e73b64ca491b9df3a48491d7afd70ae93645d3d9 commit e73b64ca491b9df3a48491d7afd70ae93645d3d9 Author: Warner Losh AuthorDate: 2021-06-21 01:59:08 +0000 Commit: Warner Losh CommitDate: 2021-06-21 01:59:08 +0000 committers-guide: fix typos Noticed by: Pau Amma Sponsored by: Netflix --- 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 444aec401b..d97d4edc2f 100644 --- a/documentation/content/en/articles/committers-guide/_index.adoc +++ b/documentation/content/en/articles/committers-guide/_index.adoc @@ -1730,7 +1730,7 @@ on freefall.freebsd.org to get a recipe that you can use directly, assuming /usr The below command merges the `working` branch into the upstream main line. It's important that you curate your changes to be just like you want them in the FreeBSD source repo before doing this. This syntax pushes the `working` branch to main, moving the `main` branch forward. -You will only be able to do this if this results in a linear change to `main1 (eg no merges). +You will only be able to do this if this results in a linear change to `main` (eg no merges). [source,shell] .... @@ -1766,7 +1766,7 @@ If you lose the race, then try again with % git pull --rebase % git push freebsd .... -These commands will fetch the most recent `freebse/main` and then rebase the local `main` changes on top of that, which is what you want when you lose the commit race. +These commands will fetch the most recent `freebsd/main` and then rebase the local `main` changes on top of that, which is what you want when you lose the commit race. Note: merging vendor branch commits will not work with this technique. ===== Finding the Subversion Revision