From d99a1fab86abc29bf20b527882ebc7f034af731b Mon Sep 17 00:00:00 2001 From: Walter Dolce Date: Sun, 12 Jul 2015 00:11:59 +0100 Subject: [PATCH 1/2] Fix other characters in docs displayed incorrectly --- website/source/intro/hashicorp-ecosystem.html.markdown | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/website/source/intro/hashicorp-ecosystem.html.markdown b/website/source/intro/hashicorp-ecosystem.html.markdown index cf98742d4..37c26b9ad 100644 --- a/website/source/intro/hashicorp-ecosystem.html.markdown +++ b/website/source/intro/hashicorp-ecosystem.html.markdown @@ -14,7 +14,7 @@ HashiCorp is the creator of the open source projects Vagrant, Packer, Terraform, If you are using Packer to build machine images and deployable artifacts, it's likely that you need a solution for deploying those artifacts. Terraform is our tool for creating, combining, and modifying infrastructure. -Below are summaries of HashiCorp’s open source projects and a graphic showing how Atlas connects them to create a full application delivery workflow. +Below are summaries of HashiCorp's open source projects and a graphic showing how Atlas connects them to create a full application delivery workflow. # HashiCorp Ecosystem ![Atlas Workflow](docs/atlas-workflow.png) @@ -27,6 +27,6 @@ Below are summaries of HashiCorp’s open source projects and a graphic showing [Consul](https://consul.io/?utm_source=packer&utm_campaign=HashicorpEcosystem) is a HashiCorp tool for service discovery, service registry, and health checks. In the Atlas workflow Consul is configured at the Packer build stage and identifies the service(s) contained in each artifact. Since Consul is configured at the build phase with Packer, when the artifact is deployed with Terraform, it is fully configured with dependencies and service discovery pre-baked. This greatly reduces the risk of an unhealthy node in production due to configuration failure at runtime. -[Serf](https://serfdom.io/?utm_source=packer&utm_campaign=HashicorpEcosystem) is a HashiCorp tool for cluster membership and failure detection. Consul uses Serf’s gossip protocol as the foundation for service discovery. +[Serf](https://serfdom.io/?utm_source=packer&utm_campaign=HashicorpEcosystem) is a HashiCorp tool for cluster membership and failure detection. Consul uses Serf's gossip protocol as the foundation for service discovery. [Vagrant](https://www.vagrantup.com/?utm_source=packer&utm_campaign=HashicorpEcosystem) is a HashiCorp tool for managing development environments that mirror production. Vagrant environments reduce the friction of developing a project and reduce the risk of unexpected behavior appearing after deployment. Vagrant boxes can be built in parallel with production artifacts with Packer to maintain parity between development and production. From 0c0ff5a25bed586adaf7a8a0632b205e189b66c8 Mon Sep 17 00:00:00 2001 From: Walter Dolce Date: Sun, 12 Jul 2015 14:50:04 +0100 Subject: [PATCH 2/2] Remove third 's' from word --- website/source/docs/templates/communicator.html.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/source/docs/templates/communicator.html.md b/website/source/docs/templates/communicator.html.md index 8a450ac50..c944396ee 100644 --- a/website/source/docs/templates/communicator.html.md +++ b/website/source/docs/templates/communicator.html.md @@ -28,7 +28,7 @@ use. For example, the Docker builder has a "docker" communicator that uses ## Using a Communicator By default, the SSH communicator is usually used. Additional configuration -may not even be necesssary, since some builders such as Amazon automatically +may not even be necessary, since some builders such as Amazon automatically configure everything. However, to specify a communicator, you set the `communicator` key within