From 7f9b4aa1fa7441d33186d8177f1b975ffe26781c Mon Sep 17 00:00:00 2001 From: Ryan Ernst Date: Tue, 13 Jun 2017 19:36:52 -0700 Subject: [PATCH 1/2] Docs: Add note about which secure settings are valid This commit adds a note to the docs to clarify that only some settings can be used with the keystore. --- docs/reference/setup/secure-settings.asciidoc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docs/reference/setup/secure-settings.asciidoc b/docs/reference/setup/secure-settings.asciidoc index f8631c4fa53fd..aacf72afbaf47 100644 --- a/docs/reference/setup/secure-settings.asciidoc +++ b/docs/reference/setup/secure-settings.asciidoc @@ -8,6 +8,9 @@ tool to manage the settings in the keystore. NOTE: All commands here should be run as the user which will run elasticsearch. +NOTE: Only some settings are designed to be read from the keystore. See + documentation for each setting to see if it is supported as part of the keystore. + [float] [[creating-keystore]] === Creating the keystore From 9398d79dcbbffb2525d81312294acabc120e3b5e Mon Sep 17 00:00:00 2001 From: Ryan Ernst Date: Tue, 13 Jun 2017 21:00:47 -0700 Subject: [PATCH 2/2] Update secure-settings.asciidoc --- docs/reference/setup/secure-settings.asciidoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/reference/setup/secure-settings.asciidoc b/docs/reference/setup/secure-settings.asciidoc index aacf72afbaf47..e3337c86c3686 100644 --- a/docs/reference/setup/secure-settings.asciidoc +++ b/docs/reference/setup/secure-settings.asciidoc @@ -9,7 +9,7 @@ tool to manage the settings in the keystore. NOTE: All commands here should be run as the user which will run elasticsearch. NOTE: Only some settings are designed to be read from the keystore. See - documentation for each setting to see if it is supported as part of the keystore. +documentation for each setting to see if it is supported as part of the keystore. [float] [[creating-keystore]]