website: FAQ cleanup

This commit is contained in:
Armon Dadgar 2015-02-06 16:37:34 -08:00
parent 05ac51ca26
commit 08610b03fe
1 changed files with 2 additions and 4 deletions

View File

@ -28,7 +28,7 @@ and can be disabled.
See [`disable_anonymous_signature`](/docs/agent/options.html#disable_anonymous_signature)
and [`disable_update_check`](/docs/agent/options.html#disable_update_check).
## Q: How does Atlas integration work? / Does Consul call home?
## Q: How does Atlas integration work?
Consul makes use of a HashiCorp service called [SCADA](http://scada.hashicorp.com)
which stands for Supervisory Control And Data Acquisition. The SCADA system allows
@ -37,7 +37,5 @@ to Consul agents for features like the dashboard and auto joining. Standard ACLs
be applied to the SCADA connection, which has no enhanced or elevated privileges.
Using the SCADA service is optional and only enabled by opt-in.
See [`atlas_infrastructure`](/docs/agent/options.html#_atlas)
and [`atlas_acl_token`](/docs/agent/options.html#atlas_acl_token).
See the [Atlas integration guide](/docs/guides/atlas.html).