diff --git a/demo/vagrant-cluster/README.md b/demo/vagrant-cluster/README.md index 4ad9c48e69..6b5405861b 100644 --- a/demo/vagrant-cluster/README.md +++ b/demo/vagrant-cluster/README.md @@ -46,7 +46,7 @@ exit ``` > NOTE: This demo will query the HashiCorp Checkpoint service to determine -> the the latest Consul release version and install that version by default, +> the latest Consul release version and install that version by default, > but if you need a different Consul version, set the `CONSUL_DEMO_VERSION` > environment variable before `vagrant up` like this: > `CONSUL_DEMO_VERSION=0.6.4 vagrant up` diff --git a/website/source/docs/commands/index.html.md b/website/source/docs/commands/index.html.md index 3dab52d271..cd21a2db8d 100644 --- a/website/source/docs/commands/index.html.md +++ b/website/source/docs/commands/index.html.md @@ -13,7 +13,7 @@ Consul is only a single command-line application: `consul`. This application then takes a subcommand such as "agent" or "members". The complete list of subcommands is in the navigation to the left. -The `Consul` CLI is a well-behaved command line application. In erroneous +The `consul` CLI is a well-behaved command line application. In erroneous cases, a non-zero exit status will be returned. It also responds to `-h` and `--help` as you'd most likely expect. And some commands that expect input accept "-" as a parameter to tell Consul to read the input from stdin. @@ -195,4 +195,4 @@ The server name to use as the SNI host when connecting via TLS. ``` CONSUL_TLS_SERVER_NAME=consulserver.domain -``` \ No newline at end of file +``` diff --git a/website/source/docs/internals/anti-entropy.html.md b/website/source/docs/internals/anti-entropy.html.md index ed782192f2..80bd10504e 100644 --- a/website/source/docs/internals/anti-entropy.html.md +++ b/website/source/docs/internals/anti-entropy.html.md @@ -61,7 +61,7 @@ Entropy is the tendency of systems to become increasingly disordered. Consul's anti-entropy mechanisms are designed to counter this tendency, to keep the state of the cluster ordered even through failures of its components. -Consul has a clear separation between the global service catalog and the agent +Consul has a clear separation between the global service catalog and the agent's local state as discussed above. The anti-entropy mechanism reconciles these two views of the world: anti-entropy is a synchronization of the local agent state and the catalog. For example, when a user registers a new service or check with the @@ -80,7 +80,7 @@ any services or checks exist in the catalog that the agent is not aware of, they will be automatically removed to make the catalog reflect the proper set of services and health information for that agent. Consul treats the state of the agent as authoritative; if there are any differences between the agent -and catalog view, the agent local view will always be used. +and catalog view, the agent-local view will always be used. ### Periodic Synchronization diff --git a/website/source/docs/internals/architecture.html.md b/website/source/docs/internals/architecture.html.md index 21fcbfbc2d..cea70121cd 100644 --- a/website/source/docs/internals/architecture.html.md +++ b/website/source/docs/internals/architecture.html.md @@ -107,7 +107,7 @@ The server nodes also operate as part of a WAN gossip pool. This pool is differe as it is optimized for the higher latency of the internet and is expected to contain only other Consul server nodes. The purpose of this pool is to allow datacenters to discover each other in a low-touch manner. Bringing a new datacenter online is as easy as joining the existing -WAN gossip. Because the servers are all operating in this pool, it also enables cross-datacenter +WAN gossip pool. Because the servers are all operating in this pool, it also enables cross-datacenter requests. When a server receives a request for a different datacenter, it forwards it to a random server in the correct datacenter. That server may then forward to the local leader. diff --git a/website/source/docs/internals/consensus.html.md b/website/source/docs/internals/consensus.html.md index ac776c69c2..229db5b8c9 100644 --- a/website/source/docs/internals/consensus.html.md +++ b/website/source/docs/internals/consensus.html.md @@ -86,7 +86,7 @@ result in the same state as a replay of old logs. This allows Raft to capture th state at a point in time and then remove all the logs that were used to reach that state. This is performed automatically without user intervention and prevents unbounded disk usage while also minimizing time spent replaying logs. One of the advantages of -using BoltDB is that it allows Consul to continue accepting new transactions even while +using MemDB is that it allows Consul to continue accepting new transactions even while old state is being snapshotted, preventing any availability issues. Consensus is fault-tolerant up to the point where quorum is available. @@ -165,7 +165,7 @@ The three read modes are: introduces an additional round-trip to all server nodes. The trade-off is always consistent reads but increased latency due to the extra round trip. -* `stale` - This mode allows any server to service the read regardless of if +* `stale` - This mode allows any server to service the read regardless of whether it is the leader. This means reads can be arbitrarily stale but are generally within 50 milliseconds of the leader. The trade-off is very fast and scalable reads but with stale values. This mode allows reads without a leader meaning diff --git a/website/source/docs/internals/sessions.html.md b/website/source/docs/internals/sessions.html.md index 2f7049423b..7b97083cde 100644 --- a/website/source/docs/internals/sessions.html.md +++ b/website/source/docs/internals/sessions.html.md @@ -120,10 +120,10 @@ lets the current lock holder update the key contents without having to give up the lock and reacquire it. Once held, the lock can be released using a corresponding `release` operation, -providing the same session. Again, this acts like a Check-And-Set operations +providing the same session. Again, this acts like a Check-And-Set operation since the request will fail if given an invalid session. A critical note is that the lock can be released without being the creator of the session. -This is by design as it allows operators to intervene and force terminate +This is by design as it allows operators to intervene and force-terminate a session if necessary. As mentioned above, a session invalidation will also cause all held locks to be released or deleted. When a lock is released, the `LockIndex` does not change; however, the `Session` is cleared and the `ModifyIndex` increments. diff --git a/website/source/intro/vs/custom.html.md b/website/source/intro/vs/custom.html.md index 6acf5801b6..44cd14bc3a 100644 --- a/website/source/intro/vs/custom.html.md +++ b/website/source/intro/vs/custom.html.md @@ -18,7 +18,7 @@ state. These solutions may work in the short term, but they are rarely fault tolerant or scalable. Besides these limitations, they require time and resources to build and maintain. -Consul provides the core set of features needed by a SOA out of the box. By +Consul provides the core set of features needed by an SOA out of the box. By using Consul, organizations can leverage open source work to reduce the time and effort spent re-inventing the wheel and can focus instead on their business applications. diff --git a/website/source/intro/vs/skydns.html.md b/website/source/intro/vs/skydns.html.md index c14ab7d2c4..dc7c74308c 100644 --- a/website/source/intro/vs/skydns.html.md +++ b/website/source/intro/vs/skydns.html.md @@ -39,5 +39,5 @@ runs an independent cluster of servers. Requests are forwarded to remote datacenters if necessary; requests for services within a datacenter never go over the WAN, and connectivity issues between datacenters do not affect availability within a datacenter. Additionally, the unavailability -of one datacenter does not affect the service discovery of services +of one datacenter does not affect the discovery of services in any other datacenter.