threads / patch / 42479

patchDocumentation: GPG capitalization

Subject: [PATCH] Documentation: GPG capitalization

## tl;dr

6 messages between May 29, 2016 and Jun 16, 2016. Diffs are folded; open one to read it.

replies: 5people: 2as markdown or json

Dave Nicolson· May 29, 2016, 17:44 UTC · lore
When "GPG" is used in a sentence it is now consistently capitalized. When referring to the binary it is left as "gpg".
Signed-off-by: David Nicolson <david.nicolson@gmail.com>
---
 Documentation/git-mktag.txt         | 2 +-
 Documentation/git-tag.txt           | 2 +-
 Documentation/git-verify-commit.txt | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)
Show changes to 3 files +4 −5

Documentation/git-mktag.txt, Documentation/git-tag.txt, Documentation/git-verify-commit.txt

diff --git a/Documentation/git-mktag.txt b/Documentation/git-mktag.txt
index fa6a756..724408d 100644
--- a/Documentation/git-mktag.txt
+++ b/Documentation/git-mktag.txt
@@ -32,7 +32,7 @@ followed by some 'optional' free-form message (some tags created
 by older Git may not have `tagger` line).  The message, when
 exists, is separated by a blank line from the header.  The
 message part may contain a signature that Git itself doesn't
-care about, but that can be verified with gpg.
+care about, but that can be verified with GPG.
 
 GIT
 ---
diff --git a/Documentation/git-tag.txt b/Documentation/git-tag.txt
index abab481..32bc4aa 100644
--- a/Documentation/git-tag.txt
+++ b/Documentation/git-tag.txt
@@ -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,
diff --git a/Documentation/git-verify-commit.txt b/Documentation/git-verify-commit.txt
index ecf4da1..0101f0f 100644
--- a/Documentation/git-verify-commit.txt
+++ b/Documentation/git-verify-commit.txt
@@ -12,12 +12,12 @@ SYNOPSIS
 
 DESCRIPTION
 -----------
-Validates the gpg signature created by 'git commit -S'.
+Validates the GPG signature created by 'git commit -S'.
 
 OPTIONS
 -------
 --raw::
-	Print the raw gpg status output to standard error instead of the normal
+	Print the raw GPG status output to standard error instead of the normal
 	human-readable output.
 
 -v::

--
https://github.com/git/git/pull/246
Junio C Hamano· May 30, 2016, 18:02 UTC · re: Dave Nicolson · lore

Re: [PATCH] Documentation: GPG capitalization

Dave Nicolson <david.nicolson@gmail.com> writes:
Show 19 quoted lines
> When "GPG" is used in a sentence it is now consistently capitalized. When referring to the binary it is left as "gpg".
>
> Signed-off-by: David Nicolson <david.nicolson@gmail.com>
> ---
>  Documentation/git-mktag.txt         | 2 +-
>  Documentation/git-tag.txt           | 2 +-
>  Documentation/git-verify-commit.txt | 4 ++--
>  3 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/Documentation/git-mktag.txt b/Documentation/git-mktag.txt
> index fa6a756..724408d 100644
> --- a/Documentation/git-mktag.txt
> +++ b/Documentation/git-mktag.txt
> @@ -32,7 +32,7 @@ followed by some 'optional' free-form message (some tags created
>  by older Git may not have `tagger` line).  The message, when
>  exists, is separated by a blank line from the header.  The
>  message part may contain a signature that Git itself doesn't
> -care about, but that can be verified with gpg.
> +care about, but that can be verified with GPG.

Isn't this a name of the program, though? Other two hunks in your patch clearly refer to the concept and not to a particular program, and they are good changes, I think.

Show 38 quoted lines
>  
>  GIT
>  ---
> diff --git a/Documentation/git-tag.txt b/Documentation/git-tag.txt
> index abab481..32bc4aa 100644
> --- a/Documentation/git-tag.txt
> +++ b/Documentation/git-tag.txt
> @@ -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,
> diff --git a/Documentation/git-verify-commit.txt b/Documentation/git-verify-commit.txt
> index ecf4da1..0101f0f 100644
> --- a/Documentation/git-verify-commit.txt
> +++ b/Documentation/git-verify-commit.txt
> @@ -12,12 +12,12 @@ SYNOPSIS
>  
>  DESCRIPTION
>  -----------
> -Validates the gpg signature created by 'git commit -S'.
> +Validates the GPG signature created by 'git commit -S'.
>  
>  OPTIONS
>  -------
>  --raw::
> -	Print the raw gpg status output to standard error instead of the normal
> +	Print the raw GPG status output to standard error instead of the normal
>  	human-readable output.
>  
>  -v::
>
> --
> https://github.com/git/git/pull/246
David Nicolson· May 30, 2016, 21:43 UTC · re: Junio C Hamano · lore

Re: [PATCH] Documentation: GPG capitalization

On Mon, May 30, 2016 at 8:02 PM, Junio C Hamano <gitster@pobox.com> wrote:
Show 25 quoted lines
> Dave Nicolson <david.nicolson@gmail.com> writes:
>
>> When "GPG" is used in a sentence it is now consistently capitalized. When referring to the binary it is left as "gpg".
>>
>> Signed-off-by: David Nicolson <david.nicolson@gmail.com>
>> ---
>>  Documentation/git-mktag.txt         | 2 +-
>>  Documentation/git-tag.txt           | 2 +-
>>  Documentation/git-verify-commit.txt | 4 ++--
>>  3 files changed, 4 insertions(+), 4 deletions(-)
>>
>> diff --git a/Documentation/git-mktag.txt b/Documentation/git-mktag.txt
>> index fa6a756..724408d 100644
>> --- a/Documentation/git-mktag.txt
>> +++ b/Documentation/git-mktag.txt
>> @@ -32,7 +32,7 @@ followed by some 'optional' free-form message (some tags created
>>  by older Git may not have `tagger` line).  The message, when
>>  exists, is separated by a blank line from the header.  The
>>  message part may contain a signature that Git itself doesn't
>> -care about, but that can be verified with gpg.
>> +care about, but that can be verified with GPG.
>
> Isn't this a name of the program, though?  Other two hunks in your
> patch clearly refer to the concept and not to a particular program,
> and they are good changes, I think.

This one was not as clear as the other hunks. Git is referred to as "Git" in the preceding line, which in itself could be referring to the concept or the particular program I guess?

Junio C Hamano· May 30, 2016, 22:07 UTC · re: David Nicolson · lore

Re: [PATCH] Documentation: GPG capitalization

David Nicolson <david.nicolson@gmail.com> writes:
Show 11 quoted lines
>>>  message part may contain a signature that Git itself doesn't
>>> -care about, but that can be verified with gpg.
>>> +care about, but that can be verified with GPG.
>>
>> Isn't this a name of the program, though?  Other two hunks in your
>> patch clearly refer to the concept and not to a particular program,
>> and they are good changes, I think.
>
> This one was not as clear as the other hunks. Git is referred to as
> "Git" in the preceding line, which in itself could be referring to the
> concept or the particular program I guess?

I think the "Git" you see above is clearly the "stupid content tracker Git", not a particular implementation. It is more about the data model of Git than our particular implementation of it. jgit, a Java implementation of Git, does not care about the gibberish in the "--BEGIN PGP..." block the same way we don't care.

Dave Nicolson· Jun 16, 2016, 22:15 UTC · re: Dave Nicolson · lore

[PATCH v2] Documentation: GPG capitalization

When "GPG" is used in a sentence it is now consistently capitalized. When referring to the binary it is left as "gpg".
Signed-off-by: David Nicolson <david.nicolson@gmail.com>
---
 Documentation/git-tag.txt           | 2 +-
 Documentation/git-verify-commit.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
Show changes to 2 files +2 −3

Documentation/git-tag.txt, Documentation/git-verify-commit.txt

diff --git a/Documentation/git-tag.txt b/Documentation/git-tag.txt
index abab481..32bc4aa 100644
--- a/Documentation/git-tag.txt
+++ b/Documentation/git-tag.txt
@@ -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,
diff --git a/Documentation/git-verify-commit.txt b/Documentation/git-verify-commit.txt
index ecf4da1..92097f6 100644
--- a/Documentation/git-verify-commit.txt
+++ b/Documentation/git-verify-commit.txt
@@ -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
 -------

--
https://github.com/git/git/pull/246

← back to recent threads