Removing references to traditional clients, Cl.Conf Guide (pt 2). (#2738

)

modules/client-configuration/pages/configuration-management.adoc

@@ -24,59 +24,46 @@ When you have created your configuration channels, you can also perform comparis
 
 Centrally managed configuration files are provided by global configuration channels.
 
-The available configuration management features are different for Salt and traditional clients.
-This table shows the supported features on different client types.
-
-The icons in this table indicate:
+This table shows the supported features, where:
 
 * {check} features are supported by {suse}
 * {cross} features are not supported by {suse}
 * {question} features are under consideration, and may or may not be supported at a later date.
 
 
 .Configuration Management Supported Features
-[cols="1,1,1", options="header"]
+[cols="1,1", options="header"]
 |===
 
 | Feature
-| Salt
-| Traditional
+| Status
 
 | Global Configuration Channels
 | {check}
-| {check}
 
 | Deploying Files
 | {check}
-| {check}
 
 | Comparing Files
 | {question}
-| {check}
 
 | Locally Managed Files
 | {check} (with {salt} features)
-| {check}
 
 | Sandbox Files
 | {cross}
-| {check}
 
 | Applying the Highstate
 | {check}
-| {cross}
 
 | File Import from a Client
 | {cross}
-| {check}
 
 | Jinja Templating
 | {check}
-| {cross}
 
 | Configuration Macros
-| {check} with {salt} features (grains, pillar data, etc.)
-| {check}
+| {check} (with {salt} features: grains, pillar data, etc.)
 
 |===
 
@@ -100,11 +87,11 @@ To create a new central configuration channel:
 
 === Salt State Channel
 
-You can also use a configuration channel to manage Salt states on Salt clients:
+You can also use a configuration channel to manage {salt} states on {salt} clients:
 
 
 
-.Procedure: Creating a Salt State Channel
+.Procedure: Creating a {salt} State Channel
 . In the {productname} {webui}, navigate to menu:Configuration[Channels], and click btn:[Create State Channel].
 . Type a name for the channel.
 . Type a label for the channel.
@@ -198,23 +185,3 @@ dns_conf:
     - name: {{ dns_cfg }}
     - source: salt://dns/files/named.conf
 ----
-
-
-////
-// FIXME: how to use these vars with Salt?
-In addition to variables for custom system information, the following standard macros are supported:
-
-----
-rhn.system.sid
-rhn.system.profile_name
-rhn.system.description
-rhn.system.hostname
-rhn.system.ip_address
-rhn.system.custom_info(key_name)
-rhn.system.net_interface.ip_address(eth_device)
-rhn.system.net_interface.netmask(eth_device)
-rhn.system.net_interface.broadcast(eth_device)
-rhn.system.net_interface.hardware_address(eth_device)
-rhn.system.net_interface.driver_module(eth_device)
-----
-////