From nobody Sun Nov 06 23:01:53 2022 X-Original-To: dev-commits-doc-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4N58xs6FsTz4hPbq for ; Sun, 6 Nov 2022 23:01:53 +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 4N58xs5rS6z3rM4; Sun, 6 Nov 2022 23:01:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667775713; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9ApGO5XgOP2tef8LpnBPiIsW1DEhs5HRJ0jdSFKCTEQ=; b=a6b7xdQylnZd/HVX3oex+gWyHOag+VfV5/+TcHigVOpqaq117h/4nbQ7Fls+ls+Fd5/dzg p8b0oelVzxqlwfMwZkMpwCROncE1uWZyXAukbchB/90XRNoV9yfz5BpKxcVnEVxAcrbouZ uUPSXxsM40aBstDImy4z9jcr71AAiG1n3PGp19nCt4lbF/VWdbXPl5U0txcUXmuV4cS7wh txmk+E0dMZ+Gk012z1KjJDzU+8b2EKvwMUesd9F4B0DK07AM0c7NkLYQdnM6IYDplob618 TRyEgu1yFxaxWfHc1hmcwSFoRtZGODhCw10zX8+LdcRW4j07tCz1DlLxEKnccw== 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 4N58xs4v2Mzf3n; Sun, 6 Nov 2022 23:01:53 +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 2A6N1rtG019650; Sun, 6 Nov 2022 23:01:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2A6N1rsf019638; Sun, 6 Nov 2022 23:01:53 GMT (envelope-from git) Date: Sun, 6 Nov 2022 23:01:53 GMT Message-Id: <202211062301.2A6N1rsf019638@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Benjamin Kaduk Subject: git: 51b500976a - main - Fix typo in 313c8a75f1 List-Id: Commit messages for all branches of the doc repository List-Archive: https://lists.freebsd.org/archives/dev-commits-doc-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-doc-all@freebsd.org X-BeenThere: dev-commits-doc-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bjk X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 51b500976a261b1965d19a3446dd758d0811f9fd Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667775713; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9ApGO5XgOP2tef8LpnBPiIsW1DEhs5HRJ0jdSFKCTEQ=; b=oF5JFsUOJlrk3qk34/6Nyill3uszXCJ8whfu6DTzZyHKdj4C/k6IDwQnusNEfEFRFmCzPL 6V62LXQZ1D4lQjdY5MWBdVy4YoQ0RjDbTZOp8iZ26GxgDnFFoQS47+imnNO0p4OLzKIPmH oQfSlnx2SNAgB5v9p+vJCknHBAEB+z73hso77mpVlSEWOwd70V64bPIT5raZpSZhMzVWy2 U2cRrkgFfHFKmzoLbttFVaprqJsyLGT1gEn6fHPoKKyALWyH5sEIVMPrhQYxA1T81OhsWh W3Rus/ud16NBQDgZDacFNR1G/1YjzKJ5/hIVpFMpuUk57wZeNJZJNQ3iQ1jC7w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1667775713; a=rsa-sha256; cv=none; b=rhgDBzBSyr5hnc7DfEblb8k4P2amYtg0KSRXK8ngVCKTkP3pNP1ZV3pm2klixaXaTWd7m6 xYXgjC9wM9vQQvhJmc8kw4xuGMrycMO+5qaBtC7+9iMEoEgOozmzRIRG9eqKh/3gAzN6u/ V9n5Shz/qtMW9/l07lg43Nt0vKAdiipnVz0cFZNssQpHWymVAbhSGZ3r8e8Fl8JH7nA5uz uzg4rhPzA8zG3FnlwHs2o+JR/ylivU41w1a8z35Y+lnIBZOPoO6ffVdmTz5+5YC5knBCa+ BPOruEVN4DPKsX2o0QUuS4bCzcAvR3IJlSh96SqBWqwePSpUdygFt2sVc4JKjw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bjk: URL: https://cgit.FreeBSD.org/doc/commit/?id=51b500976a261b1965d19a3446dd758d0811f9fd commit 51b500976a261b1965d19a3446dd758d0811f9fd Author: Benjamin Kaduk AuthorDate: 2022-11-06 23:01:30 +0000 Commit: Benjamin Kaduk 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]