summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Smith <tsmith@chef.io>2018-01-02 15:54:44 -0800
committerGitHub <noreply@github.com>2018-01-02 15:54:44 -0800
commitc9caed52eeaec28b2e3bc52585dd80b8d2a71a48 (patch)
tree7946344fd3c7bf932380fe4954c43acfde56f009
parent19ea1bd1e6f01d28b29d3cccbfb7388ea5aff030 (diff)
parent476013cbede26aa4bfe5c0ec373bd80b306e4540 (diff)
downloadchef-c9caed52eeaec28b2e3bc52585dd80b8d2a71a48.tar.gz
Merge pull request #6726 from chef/new_knife_doc
Update the knife editor error message to point to the correct document
-rw-r--r--lib/chef/knife/core/ui.rb2
-rw-r--r--lib/chef/knife/edit.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/chef/knife/core/ui.rb b/lib/chef/knife/core/ui.rb
index 484c3ab3de..b2efbd8b8f 100644
--- a/lib/chef/knife/core/ui.rb
+++ b/lib/chef/knife/core/ui.rb
@@ -172,7 +172,7 @@ class Chef
tf.sync = true
tf.puts output
tf.close
- raise "Please set EDITOR environment variable. See https://docs.chef.io/knife_using.html for details." unless system("#{config[:editor]} #{tf.path}")
+ raise "Please set EDITOR environment variable. See https://docs.chef.io/knife_setup.html for details." unless system("#{config[:editor]} #{tf.path}")
output = IO.read(tf.path)
end
diff --git a/lib/chef/knife/edit.rb b/lib/chef/knife/edit.rb
index 46903e7420..4d7338f9f6 100644
--- a/lib/chef/knife/edit.rb
+++ b/lib/chef/knife/edit.rb
@@ -58,7 +58,7 @@ class Chef
# Let the user edit the temporary file
if !system("#{config[:editor]} #{file.path}")
- raise "Please set EDITOR environment variable. See https://docs.chef.io/knife_using.html for details."
+ raise "Please set EDITOR environment variable. See https://docs.chef.io/knife_setup.html for details."
end
result_text = IO.read(file.path)