From: Martin Ågren Date: Wed, 17 Feb 2021 19:56:06 GMT Subject: [PATCH 3/3] gitmailmap.txt: fix rendering of e-mail addresses Message-ID: In-Reply-To: Both AsciiDoc and Asciidoctor are eager to pick up the e-mail addresses in this document and turn them into references at the bottom of the manpage / clickable links. We don't really need that for these dummy addresses. Spell "@" as "@" to make them not do this. In the open block, we can instead avoid this by indenting the contents, similar to the earlier blocks. Fix a backtick which should have been a single quote mark. With all the quoting that is going on around here, this mistake trips up the parsing and rendering quite a bit. Before this commit, we have the same failure mode with AsciiDoc 8.6.10 and Asciidoctor 1.5.5, and this change makes both of them happy. Signed-off-by: Martin Ågren --- doc-diff: --- a/97c686dd7ba1bbd1c0be6f7f61a3a033adf8adb6-asciidoctor-cut-footer/home/martin/share/man/man5/gitmailmap.5 +++ b/ee0422ac399daf43a7adcc2b662b50312da04631-asciidoctor-cut-footer/home/martin/share/man/man5/gitmailmap.5 @@ -40,9 +40,9 @@ SYNTAX matching both the specified commit name and email address. Both E-Mails and names are matched case-insensitively. For example this - would also match the Commit Name above: + would also match the Commit Name above: - Proper Name CoMmIt NaMe + Proper Name CoMmIt NaMe EXAMPLES Your history contains commits by two authors, Jane and Joe, whose names @@ -62,11 +62,10 @@ EXAMPLES Jane Doe Jane Doe - Note that there’s no need to map the name for jane@laptop.(none) to + Note that there’s no need to map the name for to only correct the names. However, leaving the obviously broken - ' and '' E-Mails as-is is - usually not what you want. A `.mailmap file which also corrects those - is: + and E-Mails as-is is usually + not what you want. A .mailmap file which also corrects those is: Joe R. Developer Jane Doe @@ -93,13 +92,3 @@ SEE ALSO GIT Part of the git(1) suite - -NOTES - 1. commit@email.xx - mailto:commit@email.xx - - 2. proper@email.xx - mailto:proper@email.xx - - 3. CoMmIt@EmAiL.xX - mailto:CoMmIt@EmAiL.xX Documentation/gitmailmap.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Documentation/gitmailmap.txt b/Documentation/gitmailmap.txt index 052209b33b..3fb39f801f 100644 --- a/Documentation/gitmailmap.txt +++ b/Documentation/gitmailmap.txt @@ -50,9 +50,9 @@ which allows mailmap to replace both the name and the email of a commit matching both the specified commit name and email address. Both E-Mails and names are matched case-insensitively. For example -this would also match the 'Commit Name ' above: +this would also match the 'Commit Name ' above: -- -Proper Name CoMmIt NaMe + Proper Name CoMmIt NaMe -- EXAMPLES @@ -79,9 +79,9 @@ Jane Doe Jane Doe ------------ -Note that there's no need to map the name for 'jane@laptop.(none)' to +Note that there's no need to map the name for '' to only correct the names. However, leaving the obviously broken -`' and '' E-Mails as-is is +'' and '' E-Mails as-is is usually not what you want. A `.mailmap` file which also corrects those is: -- 2.30.0.284.gd98b1dd5ea