From 5a345164c7e8e065b57d8ffb551d06ef4ccd7c32 Mon Sep 17 00:00:00 2001 From: Phillip Markert Date: Tue, 17 Jun 2014 08:19:45 -0400 Subject: [PATCH 1/2] website: Fixing small typos in guides section --- website/source/docs/guides/dns-cache.html.markdown | 4 ++-- website/source/docs/guides/forwarding.html.markdown | 2 +- website/source/docs/guides/index.html.markdown | 2 +- website/source/docs/guides/servers.html.markdown | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/website/source/docs/guides/dns-cache.html.markdown b/website/source/docs/guides/dns-cache.html.markdown index 37d79fc47..0d66858fc 100644 --- a/website/source/docs/guides/dns-cache.html.markdown +++ b/website/source/docs/guides/dns-cache.html.markdown @@ -35,14 +35,14 @@ and `dns_config.max_stale` which limits how stale results are allowed to be. By default, `allow_stale` is disabled meaning no stale results may be served. -The default for `max_stale` is 5 seconds. This means that is `allow_stale` is +The default for `max_stale` is 5 seconds. This means that if `allow_stale` is enabled, we will use data from any Consul server that is within 5 seconds of the leader. ## TTL Values TTL values can be set to allow DNS results to be cached upstream -of Consul which can be reduce the number of lookups and to amortize +of Consul which can be used to reduce the number of lookups and to amortize the latency of doing a DNS lookup. By default, all TTLs are zero, preventing any caching. diff --git a/website/source/docs/guides/forwarding.html.markdown b/website/source/docs/guides/forwarding.html.markdown index 17f6b20b0..9e20ed4ff 100644 --- a/website/source/docs/guides/forwarding.html.markdown +++ b/website/source/docs/guides/forwarding.html.markdown @@ -6,7 +6,7 @@ sidebar_current: "docs-guides-forwarding" # Forwarding DNS -By default DNS is served from port 53 which requires root privileges. +By default, DNS is served from port 53 which requires root privileges. Instead of running Consul as root, it is possible to instead run Bind and forward queries to Consul as appropriate. diff --git a/website/source/docs/guides/index.html.markdown b/website/source/docs/guides/index.html.markdown index a3851c7d5..9744f4a80 100644 --- a/website/source/docs/guides/index.html.markdown +++ b/website/source/docs/guides/index.html.markdown @@ -8,7 +8,7 @@ sidebar_current: "docs-guides" This section provides various guides for common actions. Due to the nature of Consul, some of these procedures can be complex, so our goal is to provide -guidance do doing them safely. +guidance to do them safely. The following guides are available: diff --git a/website/source/docs/guides/servers.html.markdown b/website/source/docs/guides/servers.html.markdown index ba0a7e280..64b4583f0 100644 --- a/website/source/docs/guides/servers.html.markdown +++ b/website/source/docs/guides/servers.html.markdown @@ -72,7 +72,7 @@ the new servers up-to-date. Removing servers must be done carefully to avoid causing an availability outage. For a cluster of N servers, at least (N/2)+1 must be available for the cluster -to functions. See this [deployment table](/docs/internals/consensus.html#toc_3). +to function. See this [deployment table](/docs/internals/consensus.html#toc_3). If you have 3 servers, and 1 of them is currently failed, removing any servers will cause the cluster to become unavailable. From fd2380bfc0afcdc0c8dd07810fcdbf344dd5354f Mon Sep 17 00:00:00 2001 From: Phillip Markert Date: Tue, 17 Jun 2014 09:52:14 -0400 Subject: [PATCH 2/2] website: Format hyperlink inside HTML literal --- website/source/docs/guides/outage.html.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/source/docs/guides/outage.html.markdown b/website/source/docs/guides/outage.html.markdown index dc4c1fcd5..13f437917 100644 --- a/website/source/docs/guides/outage.html.markdown +++ b/website/source/docs/guides/outage.html.markdown @@ -14,7 +14,7 @@ requires an operator to intervene, but is straightforward.
This page covers recovery from Consul becoming unavailable due to a majority of server nodes in a datacenter being lost. If you are just looking to -add or remove a server [see this page](/docs/guides/servers.html). +add or remove a server see this page.
If you had only a single server and it has failed, simply restart it.