Merge branch 'jk/doc-the-this' into maint

Doc clean-up.

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

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 478b9431e0933cc2031e1be01aeab98faa9f55c0..2271809d90a5855c40de64bf1952c58a48b0d386 100644 (file)
--- 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::