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

* jk/avoid-mailto-invalid-in-doc:
  Documentation: don't link to example mail addresses
This commit is contained in:
Junio C Hamano 2012-12-27 15:27:46 -08:00
commit 0a1b59eb86
3 changed files with 3 additions and 3 deletions

View File

@ -427,7 +427,7 @@ they made it.
Here `<name>` is the person's display name (for example Here `<name>` is the person's display name (for example
``Com M Itter'') and `<email>` is the person's email address ``Com M Itter'') and `<email>` is the person's email address
(``cm@example.com''). `LT` and `GT` are the literal less-than (\x3c) (``\cm@example.com''). `LT` and `GT` are the literal less-than (\x3c)
and greater-than (\x3e) symbols. These are required to delimit and greater-than (\x3e) symbols. These are required to delimit
the email address from the other fields in the line. Note that the email address from the other fields in the line. Note that
`<name>` and `<email>` are free-form and may contain any sequence `<name>` and `<email>` are free-form and may contain any sequence

View File

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

View File

@ -46,7 +46,7 @@ Jane Doe <jane@desktop.(none)>
Joe R. Developer <joe@example.com> Joe R. Developer <joe@example.com>
------------ ------------
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. real name of that author is already correct.
Example 2: Your repository contains commits from the following Example 2: Your repository contains commits from the following