Merge branch 'jk/avoid-mailto-invalid-in-doc' into maint

* jk/avoid-mailto-invalid-in-doc: Documentation: don't link to example mail addresses
bdotdub · Dec 27, 2012 · 0a1b59e · 0a1b59e
2 parents 4f96f1f + f430ed8
commit 0a1b59e
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/Documentation/git-fast-import.txt b/Documentation/git-fast-import.txt
@@ -427,7 +427,7 @@ they made it.
 
 Here `<name>` is the person's display name (for example
 ``Com M Itter'') and `<email>` is the person's email address
-(``[email protected]'').  `LT` and `GT` are the literal less-than (\x3c)
+(``\[email protected]'').  `LT` and `GT` are the literal less-than (\x3c)
 and greater-than (\x3e) symbols.  These are required to delimit
 the email address from the other fields in the line.  Note that
 `<name>` and `<email>` are free-form and may contain any sequence

diff --git a/Documentation/git-tag.txt b/Documentation/git-tag.txt
@@ -129,7 +129,7 @@ This option is only applicable when listing tags without annotation lines.
 CONFIGURATION
 -------------
 By default, 'git tag' in sign-with-default mode (-s) will use your
-committer identity (of the form "Your Name <[email protected]>") to
+committer identity (of the form "Your Name <\[email protected]>") to
 find a key.  If you want to use a different default key, you can specify
 it in the repository configuration as follows:
 

diff --git a/Documentation/mailmap.txt b/Documentation/mailmap.txt
@@ -46,7 +46,7 @@ Jane Doe         <jane@desktop.(none)>
 Joe R. Developer <[email protected]>
 ------------
 
-Note how there is no need for an entry for <jane@laptop.(none)>, because the
+Note how there is no need for an entry for `<jane@laptop.(none)>`, because the
 real name of that author is already correct.
 
 Example 2: Your repository contains commits from the following