From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 24 Aug 2017 17:20:03 +0000 (-0700)
Subject: Merge branch 'jk/doc-the-this'
X-Git-Tag: v2.15.0-rc0~132
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/16e842bcf5fe8fa409c50f58e03e261938ba1ef9?hp=985b2cfc7b71cdaf842832afe3914e25a80dde25

Merge branch 'jk/doc-the-this'

Doc clean-up.

* jk/doc-the-this:
doc: fix typo in sendemail.identity
---

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 478b9431e0..2271809d90 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -2912,8 +2912,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::