Merged change 7392e41f-22a9-4e4f-830e-d128be0a70c3

Delivery Server · Delivery Server · commit 9ba9259c1e85 · 2016-01-29T00:18:41.000Z
From review branch _reviews/master/jscott/fixpathinmanageconfig/2 into master

Signed-off-by: jscott &lt;jamescott@getchef.com&gt;
diff --git a/includes_config/includes_config_rb_manage.rst b/includes_config/includes_config_rb_manage.rst
@@ -4,4 +4,4 @@
 
 The |manage rb| file is the default configuration file used by |chef manage|. These settings are applied every time ``opscode-manage-ctl reconfigure`` is run.
 
-The configuration file is located at: ``/etc/opscode-manage/manage.rb``.
+The configuration file is located at: ``/etc/chef-manage/manage.rb``.
diff --git a/release_chef_12-4/source/index.rst b/release_chef_12-4/source/index.rst
@@ -101,7 +101,6 @@ This section contains links to topics about configuration files, command-line to
 .. toctree::
    :hidden:
 
-   api_chef_server
    auth
    chef_overview
    chef_search

Original file line number	Diff line number	Diff line change
`@@ -4,4 +4,4 @@`
`4`	`4`
`5`	`5`	The \|manage rb\| file is the default configuration file used by \|chef manage\|. These settings are applied every time ``opscode-manage-ctl reconfigure`` is run.
`6`	`6`
`7`		-The configuration file is located at: ``/etc/opscode-manage/manage.rb``.
	`7`	+The configuration file is located at: ``/etc/chef-manage/manage.rb``.