Merge pull request #26720 from hashicorp/v0.13-registry-docs-fixes

Backport some docs commits that are on master and 0.14
hashicorp · Oct 27, 2020 · d525dc3 · d525dc3
2 parents 931f094 + df008f9
commit d525dc3
Showing 1 changed file with 5 additions and 10 deletions.
diff --git a/website/docs/registry/providers/publishing.html.md b/website/docs/registry/providers/publishing.html.md
@@ -107,17 +107,8 @@ All provider releases are required to be signed, thus you must provide HashiCorp
 $ gpg --armor --export "{Key ID or email address}"
 ```
 
-#### Individuals
+The ASCII-armored public key to the Terraform Registry by going to [User Settings > Signing Keys](https://registry.terraform.io/settings/gpg-keys). You can add keys for your personal namespace, or any organization which you are an admin of.
 
-If you would like to publish a provider under your GitHub username (not a GitHub organization), you may add your GPG key directly to the Terraform Registry by going to [User Settings > Signing Keys](https://registry.terraform.io/settings/gpg-keys).
-
-#### Organizations
-
-In order to publish a provider under a GitHub organization, your public key must be added to the Terraform Registry by a HashiCorp employee. Please send us an email to [email protected], including the information below, and one of us will get back to you shortly. For convenience, you may also use this <a href="mailto:[email protected]?subject=Request%20to%20add%20GPG%20Key%20for%20%3CProvider%20Name%3E&body=Hello%2C%0D%0A%0D%0APlease%20add%20the%20following%20GPG%20key%20for%20my%20Terraform%20Provider%3A%0D%0A-%20GitHub%20organization%20(namespace)%3A%0D%0A-%20Link%20to%20provider%20repository%3A%20%0D%0A-%20GPG%20Key%3A%20(paste%20here%20or%20attach)">email template</a>.
-
-- GitHub organization (namespace):
-- Link to provider repository: 
-- GPG Key: (paste here or attach)
 
 ### Publishing Your Provider
 
@@ -126,3 +117,7 @@ In the top-right navigation, select [Publish > Provider](https://registry.terraf
 #### Terms of Use
 
 Anything published to the Terraform Registry is subject to our terms of use. A copy of the terms are available for viewing at https://registry.terraform.io/terms
+
+### Support
+
+If you experience issues publishing your provider to the Terraform Registry, please contact us at [[email protected]](mailto:[email protected]).