Merge branch 'docs/gpg-clarify' into 'master'

Add note about using the term GPG for all related implementations Closes #36970 See merge request gitlab-org/gitlab-ce!14887

Merge branch 'docs/gpg-clarify' into 'master'
46be07d2 · Marcia Ramos · 255e64ef · 21c0031f · 46be07d2
Commit 46be07d2 authored Dec 22, 2017 by Marcia Ramos
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletion

index.md doc/user/project/repository/gpg_signed_commits/index.md +6 -1

No files found.
--- a/doc/user/project/repository/gpg_signed_commits/index.md
+++ b/doc/user/project/repository/gpg_signed_commits/index.md
 # Signing commits with GPG

-> [Introduced][ce-9546] in GitLab 9.5.
+NOTE: **Note:**
+The term GPG is used for all OpenPGP/PGP/GPG related material and
+implementations.
+
+> - [Introduced][ce-9546] in GitLab 9.5.
+> - Subkeys support was added in GitLab 10.1.

 GitLab can show whether a commit is verified or not when signed with a GPG key.
 All you need to do is upload the public GPG key in your profile settings.