From nobody Sat Aug 12 08:03:14 2023 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 4RNCpB4Qb5z4m71L for ; Sat, 12 Aug 2023 08:03:14 +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 4RNCpB3nq4z4HVS; Sat, 12 Aug 2023 08:03:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691827394; 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=hbpzgHT3UXPxlYlW/EJaOzh+kGKBrVt6k2ipy2bx8dA=; b=STe+GdCTsw8xTrICYkFfn24jOx3NJad7XP/JWFjnjZvgGxb0X62dzXCmKPEmhdO5qEEaTA jptD73oEHpUolkAMSAQjAKFKk+xONbhmvEuy1D7H4N3TflrP5Ktz9e46diJ2482fISZLGG IdBxtUM3bFSitt7SJC5Vo8OGSCXkbmewsGT3/NjImyJ+iyqquyV58zTExU9CxUXtOoLcc/ OcZ0DFgjqSg7JEMkBEx0G+JB230PyNCAU6DqABOh/1Djf9zQ9kXT9ujxuohMwWJnSyQZ5p wDXbVi3Mm9CwFNdcqMAtkKO5fcIh5b9DDuqYJD5yNQXWOfRVnNauYeWQrR+Ycg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691827394; 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=hbpzgHT3UXPxlYlW/EJaOzh+kGKBrVt6k2ipy2bx8dA=; b=HDm0rlXo08Bbw1x3JIkJyPt2/xV35SNQ7tZe9MNyQjPt3XsAwEehMhE+nWKEz4OITN6Lcb YQ1xCDijL7Jo08AKHqF2OAVauuFcVMxMJxYvWZjIy9ZtWLTvQPaUEAeYawfcakqxAdbUVB aVP4YcCqw4QvNyWFIeaNGrfitVoAcRR8YynTr0RvUTjn1DC9SVKOgXBPTf4p397NN2MViW siJG43yCry8DMhbEqV6LbYqhvj77dDRfbcMvLjaIxNY+QU9JvS+nSt36Vo/NEyhYDLs6rM 5+HRUejTsL/uJqHLNTzF4xA6IEqYNtxpf7IYDSaIS9wXJ7NdxwOaJCEGbgNJmQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691827394; a=rsa-sha256; cv=none; b=EGgyiKVSnIxaHImq8JA/0FfpbFoUfLKZ9yePMOOU6WenxBVbRzQbNkskwNr7nJGq0OfspM Q1UueOUPZgSKQUNxP02NEmrHBoNG2+ThXcoIieG8EScSwkfo0l5D/kqP+Hn6vXjMxYL6z4 ZD4pc+M3rlXqpg4XEL8Xm2Hul1JUHQXGz145LT+Nga8U5WjyLiVg7BvKdSAGc57kurftJE ZBTA3LkFE9dESDCmhUeAXCMBNmlZUjvmRu61zcBCgvoJ39n06Q00kEbaXY3Q86V4YV4j6w Jxu6HpExmWuLcQMuDu1pggb7JtSkWitx9ZYFkNMLrmbeVIN5+gpbj0rMIVgjKg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4RNCpB2rMGz1C6T; Sat, 12 Aug 2023 08:03:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37C83Ers092347; Sat, 12 Aug 2023 08:03:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37C83EDD092344; Sat, 12 Aug 2023 08:03:14 GMT (envelope-from git) Date: Sat, 12 Aug 2023 08:03:14 GMT Message-Id: <202308120803.37C83EDD092344@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Sergio Carlavilla Delgado Subject: git: 423fb87ca0 - main - Handbook - Cutting Edge: Expand information about mergemaster 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: carlavilla X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 423fb87ca0ba28d019541a29ae3a971942179967 Auto-Submitted: auto-generated The branch main has been updated by carlavilla: URL: https://cgit.FreeBSD.org/doc/commit/?id=423fb87ca0ba28d019541a29ae3a971942179967 commit 423fb87ca0ba28d019541a29ae3a971942179967 Author: Mark Linimon AuthorDate: 2023-08-12 08:02:18 +0000 Commit: Sergio Carlavilla Delgado CommitDate: 2023-08-12 08:02:18 +0000 Handbook - Cutting Edge: Expand information about mergemaster Approved by: bcr@, ygy@ Differential Revision: https://reviews.freebsd.org/D21559 --- documentation/content/en/books/handbook/cutting-edge/_index.adoc | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/documentation/content/en/books/handbook/cutting-edge/_index.adoc b/documentation/content/en/books/handbook/cutting-edge/_index.adoc index c4505f0dd5..6b11ddc80d 100644 --- a/documentation/content/en/books/handbook/cutting-edge/_index.adoc +++ b/documentation/content/en/books/handbook/cutting-edge/_index.adoc @@ -1030,6 +1030,13 @@ With `-Ui`, man:mergemaster[8] automatically updates files that have not been us If a file must be manually merged, an interactive display allows the user to choose which portions of the files are kept. See man:mergemaster[8] for more information. +If the standard [.filename]#/usr/src# was not used, another parameter must be passed to man:mergemaster[8]: + +[source,shell] +.... +# mergemaster -Ui PATH_TO_SRC +.... + [[updating-src-completing-check-old]] ==== Checking for Outdated Files and Libraries