From 2e29b292bffd51c8536a65ecb2a1db8a336f779c Mon Sep 17 00:00:00 2001
From: "Samuel D. Leslie" <sdl@nexiom.net>
Date: Wed, 15 Aug 2018 12:22:16 +1000
Subject: [PATCH] Remove obsolete documentation on external_nodes setting

This setting is no longer used anywhere in the codebase having been
superseded by the master_tops setting many releases ago.
---
 conf/master                      |  6 ------
 conf/suse/master                 |  6 ------
 doc/man/salt.7                   | 25 -------------------------
 doc/ref/configuration/master.rst | 17 -----------------
 4 files changed, 54 deletions(-)

diff --git a/conf/master b/conf/master
index abfc1fa8088..e88aa578c7c 100644
--- a/conf/master
+++ b/conf/master
@@ -529,12 +529,6 @@
 #
 #master_tops: {}
 
-# The external_nodes option allows Salt to gather data that would normally be
-# placed in a top file. The external_nodes option is the executable that will
-# return the ENC data. Remember that Salt will look for external nodes AND top
-# files and combine the results if both are enabled!
-#external_nodes: None
-
 # The renderer to use on the minions to render the state data
 #renderer: yaml_jinja
 
diff --git a/conf/suse/master b/conf/suse/master
index aeaa1d88591..e0a51c000fb 100644
--- a/conf/suse/master
+++ b/conf/suse/master
@@ -528,12 +528,6 @@ syndic_user: salt
 #
 #master_tops: {}
 
-# The external_nodes option allows Salt to gather data that would normally be
-# placed in a top file. The external_nodes option is the executable that will
-# return the ENC data. Remember that Salt will look for external nodes AND top
-# files and combine the results if both are enabled!
-#external_nodes: None
-
 # The renderer to use on the minions to render the state data
 #renderer: yaml_jinja
 
diff --git a/doc/man/salt.7 b/doc/man/salt.7
index aeb69051f38..3dedd13dae2 100644
--- a/doc/man/salt.7
+++ b/doc/man/salt.7
@@ -6885,25 +6885,6 @@ master_tops:
 .fi
 .UNINDENT
 .UNINDENT
-.SS \fBexternal_nodes\fP
-.sp
-Default: None
-.sp
-The external_nodes option allows Salt to gather data that would normally be
-placed in a top file from and external node controller. The external_nodes
-option is the executable that will return the ENC data. Remember that Salt
-will look for external nodes AND top files and combine the results if both
-are enabled and available!
-.INDENT 0.0
-.INDENT 3.5
-.sp
-.nf
-.ft C
-external_nodes: cobbler\-ext\-nodes
-.ft P
-.fi
-.UNINDENT
-.UNINDENT
 .SS \fBrenderer\fP
 .sp
 Default: \fByaml_jinja\fP
@@ -14770,12 +14751,6 @@ and \fBmine_functions\fP\&.
 #
 #master_tops: {}
 
-# The external_nodes option allows Salt to gather data that would normally be
-# placed in a top file. The external_nodes option is the executable that will
-# return the ENC data. Remember that Salt will look for external nodes AND top
-# files and combine the results if both are enabled!
-#external_nodes: None
-
 # The renderer to use on the minions to render the state data
 #renderer: yaml_jinja
 
diff --git a/doc/ref/configuration/master.rst b/doc/ref/configuration/master.rst
index f243ad887bd..5105f954ecc 100644
--- a/doc/ref/configuration/master.rst
+++ b/doc/ref/configuration/master.rst
@@ -1918,23 +1918,6 @@ following configuration:
     master_tops:
       ext_nodes: <Shell command which returns yaml>
 
-.. conf_master:: external_nodes
-
-``external_nodes``
-------------------
-
-Default: None
-
-The external_nodes option allows Salt to gather data that would normally be
-placed in a top file from and external node controller. The external_nodes
-option is the executable that will return the ENC data. Remember that Salt
-will look for external nodes AND top files and combine the results if both
-are enabled and available!
-
-.. code-block:: yaml
-
-    external_nodes: cobbler-ext-nodes
-
 .. conf_master:: renderer
 
 ``renderer``