From 48c2f68edc772c639204d47829860c26e9b0da68 Mon Sep 17 00:00:00 2001 From: Sep Nasiri Date: Tue, 8 Dec 2015 18:42:32 -0800 Subject: [PATCH] Change example filename to use .json instead of .js Since only .json files are loaded using .js as an example here is confusing. --- website/source/docs/agent/options.html.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/source/docs/agent/options.html.markdown b/website/source/docs/agent/options.html.markdown index 043e537453..b59db3210a 100644 --- a/website/source/docs/agent/options.html.markdown +++ b/website/source/docs/agent/options.html.markdown @@ -15,7 +15,7 @@ descriptions. When loading configuration, Consul loads the configuration from files and directories in lexical order. For example, configuration file `basic_config.json` -will be processed before `extra_config.js`. Configuration specified later +will be processed before `extra_config.json`. Configuration specified later will be merged into configuration specified earlier. In most cases, "merge" means that the later version will override the earlier. In some cases, such as event handlers, merging appends the handlers to the