diff --git a/.gitignore b/.gitignore index 405017d587..5530f593d6 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,7 @@ *.o *.a *.so +Thumbs.db # Folders _obj diff --git a/website/source/intro/vs/chef-puppet.html.markdown b/website/source/intro/vs/chef-puppet.html.markdown index b0dc6ddbcc..4f007eb681 100644 --- a/website/source/intro/vs/chef-puppet.html.markdown +++ b/website/source/intro/vs/chef-puppet.html.markdown @@ -32,7 +32,7 @@ without a slow convergence run. Lastly, because each datacenter runs indepedentl supporting multiple datacenters is no different than a single datacenter. That said, Consul is not a replacement for configuration management tools. -These tools are still critical to setup setup applications and even to +These tools are still critical to setup applications and even to configure Consul itself. Static provisioning is best managed by existing tools, while dynamic state and discovery is better managed by Consul. The separation of configuration management and cluster management diff --git a/website/source/intro/vs/skydns.html.markdown b/website/source/intro/vs/skydns.html.markdown index 125f9e3b01..aeb0ca9685 100644 --- a/website/source/intro/vs/skydns.html.markdown +++ b/website/source/intro/vs/skydns.html.markdown @@ -20,7 +20,8 @@ However, the systems differ in many ways. Consul provides a much richer health checking framework, with support for arbitrary checks and a highly scalable failure detection scheme. SkyDNS relies on naive heartbeating and TTLs, which have known scalability issues. Additionally, -the heartbeat only provides a limited liveness check. +the heartbeat only provides a limited liveness check, versus the rich +health checks that Consul is capable of. Multiple datacenters can be supported by using "regions" in SkyDNS, however the data is managed and queried from a single cluster. If servers @@ -35,5 +36,6 @@ scopes the managed data to be per-datacenter. This means each datacenter runs an independent cluster of servers. Requests are forwarded to remote datacenters if necessary. This means requests for services within a datacenter never go over the WAN, and connectivity issues between datacenters do not -affect availability within a datacenter. - +affect availability within a datacenter. Additionally, the unavailability +of one datacenter does not affect the service discovery of services +in any other datacenter.