git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Jeff King <peff@peff.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: "Martin Ågren" <martin.agren@gmail.com>,
	"Jacob Keller" <jacob.keller@gmail.com>,
	git@vger.kernel.org
Subject: [PATCH] doc: fix typo in sendemail.identity
Date: Sun, 20 Aug 2017 05:46:57 -0400	[thread overview]
Message-ID: <20170820094657.3uafp723ljg6o25p@sigill.intra.peff.net> (raw)
In-Reply-To: <20170820094009.z23wclpku35txflg@sigill.intra.peff.net>

On Sun, Aug 20, 2017 at 05:40:09AM -0400, Jeff King wrote:

> Subject: [PATCH] doc/interpret-trailers: fix "the this" typo

Looks like this is a not-uncommon error. Here's another one (not part of
the same patch since the interpret-trailers one isn't even in 'master'
yet).

-- >8 --
Subject: [PATCH] doc: fix typo in sendemail.identity

Saying "the this" is an obvious typo. But while we're here,
let's polish the English on the second half of the sentence,
too.

Signed-off-by: Jeff King <peff@peff.net>
---
 Documentation/config.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Documentation/config.txt b/Documentation/config.txt
index a6a589a735..012919938f 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -2895,8 +2895,8 @@ sendemail.smtpsslcertpath::
 
 sendemail.<identity>.*::
 	Identity-specific versions of the 'sendemail.*' parameters
-	found below, taking precedence over those when the this
-	identity is selected, through command-line or
+	found below, taking precedence over those when this
+	identity is selected, through either the command-line or
 	`sendemail.identity`.
 
 sendemail.aliasesFile::
-- 
2.14.1.495.ged40d10435


  reply	other threads:[~2017-08-20  9:47 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-08-18 21:26 What's cooking in git.git (Aug 2017, #04; Fri, 18) Junio C Hamano
2017-08-19 11:26 ` Torsten Bögershausen
2017-08-19 16:32   ` Junio C Hamano
2017-08-20  9:29 ` Jeff King
2017-08-20  9:40 ` Jeff King
2017-08-20  9:46   ` Jeff King [this message]
2017-08-20 10:46   ` Martin Ågren
2017-08-20 17:04   ` Junio C Hamano
2017-08-22  8:49 ` Duy Nguyen
2017-08-22 15:58   ` Junio C Hamano

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20170820094657.3uafp723ljg6o25p@sigill.intra.peff.net \
    --to=peff@peff.net \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=jacob.keller@gmail.com \
    --cc=martin.agren@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).