diff options
| author | Benjamin Kaduk <bjk@FreeBSD.org> | 2022-11-06 23:01:30 +0000 |
|---|---|---|
| committer | Benjamin Kaduk <bjk@FreeBSD.org> | 2022-11-06 23:01:30 +0000 |
| commit | 51b500976a261b1965d19a3446dd758d0811f9fd (patch) | |
| tree | 2bf3f0578bb1c3f8e4d0c700a8002c5670189b29 /documentation/content/en/books/handbook/cutting-edge/_index.adoc | |
| parent | 313c8a75f1c13995dfa1dee6fe6225c32f564c5a (diff) | |
| download | doc-51b500976a261b1965d19a3446dd758d0811f9fd.tar.gz doc-51b500976a261b1965d19a3446dd758d0811f9fd.zip | |
Fix typo in 313c8a75f1
s/onflicts/conflicts/
Diffstat (limited to 'documentation/content/en/books/handbook/cutting-edge/_index.adoc')
| -rw-r--r-- | documentation/content/en/books/handbook/cutting-edge/_index.adoc | 2 |
1 files changed, 1 insertions, 1 deletions
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] |