From nobody Thu Apr 6 16:43:23 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 4PsnPS34wWz44Z4k for ; Thu, 6 Apr 2023 16:43:24 +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 4PsnPR4KXPz3mKB; Thu, 6 Apr 2023 16:43:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680799403; 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=GnY+N7xSMdGt31HmxribXZ1btD4TDourNeVHMC5QnbM=; b=UFi/eGxkGPsAlWtuIjgAfqRs19N1nhvOQ5E5v99jNhNCbXVOsenPrANk+bzQ9c1/XUYMwK L0xt+KUCXGS0IM77wacYwrI2lYPuhYtVvKBoAe70TfdLErNpRxY0KJuRZ0rR6/Z4P4tkPZ C4E3dqVRO4GEsfGuGUsMiAF1HR2e/+NNHi39xNSDOuX0N2h2RMOizOanNKSzsOqvxZomOe rqvhRYYawCr4kHtdf+wQ3nCH7vnQV3j8DMJKZm3nAqHHPU5P/pPYULr7n86rq56Qs7BZo5 hw0GiyahdhGJWz60zBWrxCaU76nVAHmfp9UQKxU1+MIF8Kx/ffmmYve9vuyPKQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680799403; 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=GnY+N7xSMdGt31HmxribXZ1btD4TDourNeVHMC5QnbM=; b=mGhDq2XxeDmC2sSnywgy3MpFlfvW1umDm7aw5xfQ7Ao2pWcw8zQXNH4SKqk+p5lx8xDGnr E+VFGcTNEiQ0lKzgpR5nEpfGJhFBhZIUPQhlBbA+y25jioRYIQUmxOAxWkR+RyhQBPzOBb LlOfkz6IDydJcjnwj8En12CCfVuO6pVqQ7fZbde+FDQRKI5fHBP5fsP/ctIgjvdTMmUFIn rbssFp3pU4L2IOWx+NI/WHWK/irk+wcTOkhARcrXdx80olpcKmQh2Z8nG2slpwYgcJ1zZr TxcjN+WKkVZkyEgWVKFVZdIPVgKPV5NJ7iVUSA668N5E5VeY9po7qjBYqDqzYA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680799403; a=rsa-sha256; cv=none; b=JMf2KlGnEttQNcTFHCIbgbzhTmU54SkKAaLfxXX2EeSB+yNq7d+JYxFaxV75bB6b/IvDoj uVwn+p9trcay7XAAFKFf7I1xN8RTHahvvvV85gVcIzZt+KktG0NIMBztuaVHrMYBUu7Puz gBCqPmTCYW1jiXi4VzV4JYx3SFUFuIYmRl7NXq5URWPDRqMhInGUoiSERZbYJb5hqO58sb 6sviKVly/Jgy0PIxICrsm3yYekuEVrTYQMJaeYu3aIRcQZKP7dtwXYEznPios1kmSYP/Nr Jo2Yfl4D0QIZXLVGfpsQ7p2RQ6S327NhFbCXFpwWkupGNRzBI1IKJOBClxaSaQ== 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 4PsnPR2424z1B2P; Thu, 6 Apr 2023 16:43:23 +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 336GhNV2078686; Thu, 6 Apr 2023 16:43:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 336GhNq8078685; Thu, 6 Apr 2023 16:43:23 GMT (envelope-from git) Date: Thu, 6 Apr 2023 16:43:23 GMT Message-Id: <202304061643.336GhNq8078685@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Ceri Davies Subject: git: 38e20a6ef2 - main - committers-guide: minor improvements to the English 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: ceri X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 38e20a6ef29e3700100958b422e9f8481977cf9b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by ceri: URL: https://cgit.FreeBSD.org/doc/commit/?id=38e20a6ef29e3700100958b422e9f8481977cf9b commit 38e20a6ef29e3700100958b422e9f8481977cf9b Author: Ceri Davies AuthorDate: 2023-04-06 16:42:30 +0000 Commit: Ceri Davies CommitDate: 2023-04-06 16:42:30 +0000 committers-guide: minor improvements to the English --- documentation/content/en/articles/committers-guide/_index.adoc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/documentation/content/en/articles/committers-guide/_index.adoc b/documentation/content/en/articles/committers-guide/_index.adoc index 151f2d08c6..c0446de944 100644 --- a/documentation/content/en/articles/committers-guide/_index.adoc +++ b/documentation/content/en/articles/committers-guide/_index.adoc @@ -1189,14 +1189,14 @@ The following steps should be taken to easily recreate the merge commit as if `g * Re-do the subtree merge * Instead of resolving any conflicts from the subtree merge, checkout the contents of XXX on top of it. ** The trailing '.' is important, as is being at the top level of the repo. -** Rather than switching branches to XXX, it splats the contents of XXX onto of the repo +** Rather than switching branches to XXX, it splats the contents of XXX on top of the repo * Commit the results with the prior commit message (the example assumes there's only one merge on the XXX branch). * Make sure the branches are the same. * Do whatever review you need, including having others check it out if you think that's needed. * Push the commit, if you 'lost the race' again, just redo these steps again (see below for a recipe) * Delete the branches once the commit is upstream. They are throw-a-way. -The commands one would use, following the above example of mtree, would be like so (the `#` starts a comment help line commands to descriptions above): +The commands one would use, following the above example of mtree, would be like so (the `#` starts a comment to help link commands to descriptions above): [source,shell] .... @@ -1239,7 +1239,7 @@ There is nothing magic about these names. Upstream will not allow you to push them, but never the less, please pay attention to the exact commands above. Some commands use syntax that differs only slightly from typical uses and that different behavior is critical to this recipe working. -==== How to redo the if need be +==== How to redo things if need be If you've tried to do the push in the previous section and it fails, then you should do the following to 'redo' things. This sequence keeps the commit with the commit message always at XXX~1 to make committing easier.