Merge branch 'dn/gpg-doc' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 6 Jul 2016 20:06:36 +0000 (13:06 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 6 Jul 2016 20:06:36 +0000 (13:06 -0700)
The documentation tries to consistently spell "GPG"; when
referring to the specific program name, "gpg" is used.

* dn/gpg-doc:
Documentation: GPG capitalization

Documentation/git-tag.txt
Documentation/git-verify-commit.txt
index 4b1c1b8e5ca0be18e5571c6e967a0723e7631397..6b89393746af6a4fb21011ea0f4cc758ce2db403 100644 (file)
@@ -78,7 +78,7 @@ OPTIONS
 
 -v::
 --verify::
-       Verify the gpg signature of the given tag names.
+       Verify the GPG signature of the given tag names.
 
 -n<num>::
        <num> specifies how many lines from the annotation, if any,
index ecf4da16cf0a270cda7916777524ac129b4bead1..92097f6673d8e72229b42c33227353ad5226f17e 100644 (file)
@@ -12,7 +12,7 @@ SYNOPSIS
 
 DESCRIPTION
 -----------
-Validates the gpg signature created by 'git commit -S'.
+Validates the GPG signature created by 'git commit -S'.
 
 OPTIONS
 -------