Date: Sun, 6 Nov 2022 23:01:53 GMT From: Benjamin Kaduk <bjk@FreeBSD.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org Subject: git: 51b500976a - main - Fix typo in 313c8a75f1 Message-ID: <202211062301.2A6N1rsf019638@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by bjk: URL: https://cgit.FreeBSD.org/doc/commit/?id=51b500976a261b1965d19a3446dd758d0811f9fd commit 51b500976a261b1965d19a3446dd758d0811f9fd Author: Benjamin Kaduk <bjk@FreeBSD.org> AuthorDate: 2022-11-06 23:01:30 +0000 Commit: Benjamin Kaduk <bjk@FreeBSD.org> CommitDate: 2022-11-06 23:01:30 +0000 Fix typo in 313c8a75f1 s/onflicts/conflicts/ --- documentation/content/en/books/handbook/cutting-edge/_index.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/documentation/content/en/books/handbook/cutting-edge/_index.adoc b/documentation/content/en/books/handbook/cutting-edge/_index.adoc index 8e5bed211b..8252cb85df 100644 --- a/documentation/content/en/books/handbook/cutting-edge/_index.adoc +++ b/documentation/content/en/books/handbook/cutting-edge/_index.adoc @@ -668,7 +668,7 @@ Later sections describe the process in more detail. [WARNING] ==== -When switching from man:mergemaster[8] to man:etcupdate[8], the first run might merge changes incorrectly generating spurious onflicts. +When switching from man:mergemaster[8] to man:etcupdate[8], the first run might merge changes incorrectly generating spurious conflicts. To prevent this, perform the following steps *before* updating sources and building the new world: [source,shell]
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202211062301.2A6N1rsf019638>