From nobody Tue Dec 28 03:02:08 2021 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 607E2190B142 for ; Tue, 28 Dec 2021 03:02:09 +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 4JNK810xNqz3vZ1; Tue, 28 Dec 2021 03:02:09 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 003C01DD6; Tue, 28 Dec 2021 03:02:09 +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 1BS328oP068358; Tue, 28 Dec 2021 03:02:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BS328Xr068350; Tue, 28 Dec 2021 03:02:08 GMT (envelope-from git) Date: Tue, 28 Dec 2021 03:02:08 GMT Message-Id: <202112280302.1BS328Xr068350@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Xin LI Subject: git: d80e24e051 - main - Use "in general" which is a more typical phrasing. 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: delphij X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d80e24e0515d76475a18b5b1c01c4f927c3cd6f5 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1640660529; 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=lWKXtLh+xanR2Aiq0QrPNLI316FP1v02R7rwEEEaGxI=; b=vtkBg1OTmB7NLuzFlC6CTCaSsbC28hFxlw5RdSrpAUCb5i8LciKsRoih7QANNcXNQFPbvS y2WctQ5htEzGAOuwnniCsMIphd3RO5pTnztw4/ayjzJIjtecPPxXT80u9/xgHH0J29wJvg 7PsKYaBWpRZ3QBeXPPMSxwEi/OsLLQa0h/al8IvGZDY1wizuCScqo4lkM9z18qFgmr8P6O h9tnS4vg5P250K+Zyg3UFKJjbwuI2XrSFUCY8lvKOpQiw+LElV+XRlwvYxcp54x+681AW0 5u7PrwJBUbgF3arDah3e4zs9m7BEYTh+objpm6ZkpsSQWtadnbENCDEEuNrIng== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1640660529; a=rsa-sha256; cv=none; b=HbW98eJG84wXDDuLnC5dPDVzryMheio8VD2hQCbIHyOOwMyXua0W/1EGdVMBzUs0VF5sJF 0q7RTg1PbTKt4NHaz5W15cmuXnLUB/N16wEpXIBquQOwILNBMWDlgVFzyOFCEK9FXJknod hXoLSaKPeZ5ypkYj+UrwyVEBcn9V75tSZj3qH/6FsQz5l7pxs5TL2Pcn5Eq/E7QbjZ+dCN 7EstSoKUPROF8vm1jjHZmWxg7HBfv7DcqwXNpogIZHR2C9AvtfG0s7KNcnVoQ4dev5skuj hZLPPX7PoDsxg3P842imrlI32OqSX+urcJ3EQqB2kwSTOL+I3LDcMl3TKMRSUA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by delphij: URL: https://cgit.FreeBSD.org/doc/commit/?id=d80e24e0515d76475a18b5b1c01c4f927c3cd6f5 commit d80e24e0515d76475a18b5b1c01c4f927c3cd6f5 Author: Xin LI AuthorDate: 2021-12-28 03:01:29 +0000 Commit: Xin LI CommitDate: 2021-12-28 03:02:00 +0000 Use "in general" which is a more typical phrasing. Suggested by: emaste --- documentation/content/en/articles/problem-reports/_index.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/documentation/content/en/articles/problem-reports/_index.adoc b/documentation/content/en/articles/problem-reports/_index.adoc index 71c814a258..29bff9e428 100644 --- a/documentation/content/en/articles/problem-reports/_index.adoc +++ b/documentation/content/en/articles/problem-reports/_index.adoc @@ -171,7 +171,7 @@ Finally, if the submission is lengthy, prepare the work offline so that nothing [[pr-writing-attaching-patches]] == Attaching Patches or Files -In principal, we recommend using `git format-patch` to generate one or a series of unified diff against the base +In general, we recommend using `git format-patch` to generate one or a series of unified diff against the base branch (e.g. `origin/main`). Patches generated this way would include the Git hashes and will include your name and email address, making it easier for committers to apply your patch and properly credit you as the author (using `git am`).