From nobody Fri Dec 29 12:29:06 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 4T1l6p52R8z561Zg for ; Fri, 29 Dec 2023 12:29:06 +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 4T1l6p4YXRz3Sp2; Fri, 29 Dec 2023 12:29:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703852946; 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=nUlm9bppeqGuzKhwlAelqK09QqP7k96mNBxsxDls0Z0=; b=lzZgoGd+6LtkfO36epI28bihtH6Mpht9B8B9Qow9ml6NTox1vKJRVR8Id4ObR0KZkAR6/8 TxIOefOt2Y+icw3zo2y20mvZkDRw3P8DX8aNAmFNxhOtKuo6BBNMVCLfIG1LqSmMvtsGq3 SKa763e7Ewni3QxvJ0i+sE2NNjbf0xGDj+yFnnX75WhMT+JvsiPjxkIvwa95VM+Kc5LcHS WWiEbBGuQec5j0hcJ3SyXaU49k6X5FPX+mQQ/P1b4ZLpugkk86EedGJm3H1dQ4C5tgQwid GfziXJVtS95pvCVCPkeyW6AmJLxYlJMZF2d1Ir2QP2AM0soeKNSmSzuFQXlvnA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703852946; a=rsa-sha256; cv=none; b=Koa4VYSjqKCCdsa+/ow30NfN3GvSCVuxfYWRBBmPgxnWdRmMmf6cwvWZTSNFnwZW935XOB 3G2Dio6gCj9U6zvxXOtk3Fn5bZPQjRjvKz1nzpIw/+pIrnwI5eYmbXYf0a8hPRit8CVOvn J0szQ5qsHAXYm5DCClVUaIsdsP+7hWMG75kDgI7kippvhtrlsPST/tPB5sO7/nzcGe9OL2 587Vn2foMHrXIACCcrVe7h34JU0p+ombNeQVSo+2SdvFH7WB+d3I+o06GZ6c5V5ocman6i mSTH54ofJXvhqDS94/FrKKhW/HeKqybHazkI4B1R652B5EbjJSJkNVEOn/Jpng== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703852946; 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=nUlm9bppeqGuzKhwlAelqK09QqP7k96mNBxsxDls0Z0=; b=HT6nzVXDmaHqgffXEFzfd42PYow8qp9EQbSH78xnijpy0vSnE4R1B2hN5jMCNAK1uYeozN 66vkEtzVhOVQ+pvtyRTkuShKHP59HDQ27C8Cn6mx1eY6NJjB4Vedaaspg657kOhPnbPigN Y24lQ6AiJaS98aDV83UD6MbvF1kHDzTz7eEOzrM3xJOMFg44Aj6WYr9oueMISjrMY5g5+d gRcUtFm9caoO75KtlasMrHzMhhZRkn7Zxyp7LutGzQKaQvpwGgrhgQyVjEFjRPrkxHo6p3 zZiEm6mUMQOyVLvYS2rR6odzmkEnZdsQiAZwK5DPX956CjcSUqAQ3eYD+cGQVA== 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 4T1l6p3cbnz15k9; Fri, 29 Dec 2023 12:29:06 +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 3BTCT6qK000361; Fri, 29 Dec 2023 12:29:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BTCT6fY000358; Fri, 29 Dec 2023 12:29:06 GMT (envelope-from git) Date: Fri, 29 Dec 2023 12:29:06 GMT Message-Id: <202312291229.3BTCT6fY000358@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Benedict Reuschling Subject: git: 019719eb08 - main - Remove redundancy: more complete -> complete 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: bcr X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 019719eb085172ae2dcf150b50fc467c66331347 Auto-Submitted: auto-generated The branch main has been updated by bcr: URL: https://cgit.FreeBSD.org/doc/commit/?id=019719eb085172ae2dcf150b50fc467c66331347 commit 019719eb085172ae2dcf150b50fc467c66331347 Author: Benedict Reuschling AuthorDate: 2023-12-29 12:28:20 +0000 Commit: Benedict Reuschling CommitDate: 2023-12-29 12:28:20 +0000 Remove redundancy: more complete -> complete --- documentation/content/en/articles/committers-guide/_index.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/documentation/content/en/articles/committers-guide/_index.adoc b/documentation/content/en/articles/committers-guide/_index.adoc index 6caa7d6bf4..9204c649a9 100644 --- a/documentation/content/en/articles/committers-guide/_index.adoc +++ b/documentation/content/en/articles/committers-guide/_index.adoc @@ -816,7 +816,7 @@ That is OK. Do not panic. Instead, handle them the same as any other merge conflicts. To keep it simple, I will just describe a common issue that may arise. -A pointer to a more complete treatment can be found at the end of this section. +A pointer to a complete treatment can be found at the end of this section. Let's say the includes changes upstream in a radical shift to terminfo as well as a name change for the option. When you updated, you might see something like this: