From 9be514e747e1015c16eb98984a5cfaed1f8b6fee Mon Sep 17 00:00:00 2001 From: Emil Hessman Date: Fri, 23 Jan 2015 22:11:15 +0100 Subject: [PATCH] website: fix minor typos in docs --- website/source/docs/agent/http/agent.html.markdown | 2 +- website/source/docs/commands/lock.html.markdown | 2 +- website/source/docs/guides/semaphore.html.markdown | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/website/source/docs/agent/http/agent.html.markdown b/website/source/docs/agent/http/agent.html.markdown index 1fa3f5a5c..f53c14b4b 100644 --- a/website/source/docs/agent/http/agent.html.markdown +++ b/website/source/docs/agent/http/agent.html.markdown @@ -250,7 +250,7 @@ field is not used by Consul, and is meant to be human readable. If a `Script` is provided, the check type is a script, and Consul will evaluate the script every `Interval` to update the status. -An `HTTP` check will preform an HTTP GET request to the value of `HTTP` (expected to be a URL) every `Interval`. If the response is any `2xx` code the check is passing, if the response is `429 Too Many Requests` the check is warning, otherwise the check is critical. +An `HTTP` check will perform an HTTP GET request to the value of `HTTP` (expected to be a URL) every `Interval`. If the response is any `2xx` code the check is passing, if the response is `429 Too Many Requests` the check is warning, otherwise the check is critical. If a `TTL` type is used, then the TTL update APIs must be used to periodically update the state of the check. diff --git a/website/source/docs/commands/lock.html.markdown b/website/source/docs/commands/lock.html.markdown index c4402b060..d30e15f69 100644 --- a/website/source/docs/commands/lock.html.markdown +++ b/website/source/docs/commands/lock.html.markdown @@ -23,7 +23,7 @@ If the lock holder count is more than one, then a semaphore is used instead. A semaphore allows more than a single holder, but the is less efficient than a simple lock. This follows the [semaphore algorithm](/docs/guides/semaphore.html). -All locks using the same prefix must agree on the value of `-n`. If conflictling +All locks using the same prefix must agree on the value of `-n`. If conflicting values of `-n` are provided, an error will be returned. An example use case is for highly-available N+1 deployments. In these diff --git a/website/source/docs/guides/semaphore.html.markdown b/website/source/docs/guides/semaphore.html.markdown index bb56cffc6..27305ab8c 100644 --- a/website/source/docs/guides/semaphore.html.markdown +++ b/website/source/docs/guides/semaphore.html.markdown @@ -113,7 +113,7 @@ This is done by: curl -X PUT -d http://localhost:8500/v1/kv/?cas= ``` -If this suceeds with `true` the condenter now holds a slot in the semaphore. If this fails +If this suceeds with `true` the contender now holds a slot in the semaphore. If this fails with `false`, then likely there was a race with another contender to acquire the slot. Both code paths now go into an idle waiting state. In this state, we watch for changes on ``. This is because a slot may be released, a node may fail, etc.