From 66dea6951aa5b147b6d95cee3b318073a5ec6625 Mon Sep 17 00:00:00 2001 From: Kyle Havlovitz Date: Tue, 22 Nov 2016 19:03:27 -0500 Subject: [PATCH] Fix keyring doc method wording --- api/operator.go | 2 +- website/source/docs/agent/http/operator.html.markdown | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/api/operator.go b/api/operator.go index 502f3704e..a8d04a38e 100644 --- a/api/operator.go +++ b/api/operator.go @@ -45,7 +45,7 @@ type RaftConfiguration struct { // keyringRequest is used for performing Keyring operations type keyringRequest struct { - Key string `json:",omitempty"` + Key string } // KeyringResponse is returned when listing the gossip encryption keys diff --git a/website/source/docs/agent/http/operator.html.markdown b/website/source/docs/agent/http/operator.html.markdown index 31d7d03b2..bc3a5d5e3 100644 --- a/website/source/docs/agent/http/operator.html.markdown +++ b/website/source/docs/agent/http/operator.html.markdown @@ -192,7 +192,7 @@ Using the `POST` method, this endpoint will install a new gossip encryption key into the cluster. There is more information on gossip encryption available [here](/docs/agent/encryption.html#gossip-encryption). -The register endpoint expects a JSON request body to be PUT. The request +The POST method expects a JSON request body to be submitted. The request body must look like: ```javascript @@ -216,7 +216,7 @@ key. The key must already be installed before this operation can succeed. There is more information on gossip encryption available [here](/docs/agent/encryption.html#gossip-encryption). -The register endpoint expects a JSON request body to be PUT. The request +The PUT method expects a JSON request body to be submitted. The request body must look like: ```javascript @@ -240,7 +240,7 @@ the cluster. This operation may only be performed on keys which are not currentl the primary key. There is more information on gossip encryption available [here](/docs/agent/encryption.html#gossip-encryption). -The register endpoint expects a JSON request body to be PUT. The request +The DELETE method expects a JSON request body to be submitted. The request body must look like: ```javascript