From 732b122d05d49989e4d80a7b03dde33b8528bc75 Mon Sep 17 00:00:00 2001 From: Seth Vargo Date: Wed, 13 Jan 2016 22:10:08 -0500 Subject: [PATCH] Always use HTTPS + www. --- website/README.md | 2 +- website/source/docs/agent/index.html.md | 2 +- website/source/docs/faq.html.md | 3 +-- website/source/docs/jobspec/servicediscovery.html.md | 2 +- website/source/downloads.html.erb | 2 +- website/source/index.html.erb | 2 +- website/source/intro/index.html.markdown | 2 +- website/source/intro/vs/kubernetes.html.md | 2 +- website/source/intro/vs/terraform.html.md | 2 +- website/source/layouts/_header.erb | 2 +- 10 files changed, 10 insertions(+), 11 deletions(-) diff --git a/website/README.md b/website/README.md index a539e225e..8722fb9ca 100644 --- a/website/README.md +++ b/website/README.md @@ -1,6 +1,6 @@ # Nomad Website -This subdirectory contains the entire source for the [Nomad Website](https://nomadproject.io/). +This subdirectory contains the entire source for the [Nomad Website](https://www.nomadproject.io/). This is a [Middleman](http://middlemanapp.com) project, which builds a static site from these source files. diff --git a/website/source/docs/agent/index.html.md b/website/source/docs/agent/index.html.md index a58b67132..30859320d 100644 --- a/website/source/docs/agent/index.html.md +++ b/website/source/docs/agent/index.html.md @@ -110,7 +110,7 @@ When a client agent is first started, it fingerprints the host machine to identify its attributes, capabilities, and [task drivers](/docs/drivers/index.html). These are reported to the servers during an initial registration. The addresses of known servers are provided to the agent via configuration, potentially using -DNS for resolution. Using [Consul](https://consul.io) provides a way to avoid hard +DNS for resolution. Using [Consul](https://www.consul.io) provides a way to avoid hard coding addresses and resolving them on demand. While a client is running, it is performing heartbeating with servers to diff --git a/website/source/docs/faq.html.md b/website/source/docs/faq.html.md index 202982e2e..539dab334 100644 --- a/website/source/docs/faq.html.md +++ b/website/source/docs/faq.html.md @@ -10,7 +10,7 @@ description: |- ## Q: What is Checkpoint? / Does Nomad call home? -Nomad makes use of a HashiCorp service called [Checkpoint](http://checkpoint.hashicorp.com) +Nomad makes use of a HashiCorp service called [Checkpoint](https://checkpoint.hashicorp.com) which is used to check for updates and critical security bulletins. Only anonymous information, which cannot be used to identify the user or host, is sent to Checkpoint. An anonymous ID is sent which helps de-duplicate warning messages. @@ -35,4 +35,3 @@ a [gossip protocol](/docs/internals/gossip.html). The consensus protocol is stro consistent, and is used for all state replication and scheduling. The gossip protocol is used to manage the addresses of servers for automatic clustering and multi-region federation. This means all data that managed by Nomad is strongly consistent. - diff --git a/website/source/docs/jobspec/servicediscovery.html.md b/website/source/docs/jobspec/servicediscovery.html.md index b4dc19718..e68a2cbe5 100644 --- a/website/source/docs/jobspec/servicediscovery.html.md +++ b/website/source/docs/jobspec/servicediscovery.html.md @@ -11,7 +11,7 @@ description: |- Nomad schedules workloads of various types across a cluster of generic hosts. Because of this, placement is not known in advance and you will need to use service discovery to connect tasks to other services deployed across your -cluster. Nomad integrates with [Consul](https://consul.io) to provide service +cluster. Nomad integrates with [Consul](https://www.consul.io) to provide service discovery and monitoring. Note that in order to use Consul with Nomad, you will need to configure and diff --git a/website/source/downloads.html.erb b/website/source/downloads.html.erb index ba3fe55a7..e5e219a58 100644 --- a/website/source/downloads.html.erb +++ b/website/source/downloads.html.erb @@ -25,7 +25,7 @@ description: |- verify the checksums signature file - which has been signed using HashiCorp's GPG key. + which has been signed using HashiCorp's GPG key. You can also download older versions of Nomad from the releases service.

diff --git a/website/source/index.html.erb b/website/source/index.html.erb index 848207deb..bb9b2088c 100644 --- a/website/source/index.html.erb +++ b/website/source/index.html.erb @@ -33,7 +33,7 @@

Read about the release of Nomad on the HashiCorp blog

- Blog + Blog
diff --git a/website/source/intro/index.html.markdown b/website/source/intro/index.html.markdown index 1b6562185..c612b8537 100644 --- a/website/source/intro/index.html.markdown +++ b/website/source/intro/index.html.markdown @@ -37,7 +37,7 @@ The key features of Nomad are: and requires no external services for coordination or storage. Nomad combines features of both resource managers and schedulers into a single system. Nomad builds on the strength of [Serf](https://www.serfdom.io) and [Consul](https://www.consul.io), distributed management - tools by [HashiCorp](https://hashicorp.com). + tools by [HashiCorp](https://www.hashicorp.com). * **Multi-Datacenter and Multi-Region Aware**: Nomad models infrastructure as groups of datacenters which form a larger region. Scheduling operates at the region diff --git a/website/source/intro/vs/kubernetes.html.md b/website/source/intro/vs/kubernetes.html.md index 9da604168..7c04f272c 100644 --- a/website/source/intro/vs/kubernetes.html.md +++ b/website/source/intro/vs/kubernetes.html.md @@ -14,7 +14,7 @@ needed to run Docker based applications including cluster management, scheduling, service discovery, monitoring, secrets management and more. Nomad only aims to provide cluster management and scheduling and is designed -with the Unix philosophy of having a small scope while composing with tools like [Consul](https://consul.io) +with the Unix philosophy of having a small scope while composing with tools like [Consul](https://www.consul.io) for service discovery and [Vault](https://www.vaultproject.io) for secret management. While Kubernetes is specifically focused on Docker, Nomad is more general purpose. diff --git a/website/source/intro/vs/terraform.html.md b/website/source/intro/vs/terraform.html.md index 66ac4328b..41ffc04d8 100644 --- a/website/source/intro/vs/terraform.html.md +++ b/website/source/intro/vs/terraform.html.md @@ -8,7 +8,7 @@ description: |- # Nomad vs. Terraform -[Terraform](https://terraform.io) is a tool for building, changing, and versioning +[Terraform](https://www.terraform.io) is a tool for building, changing, and versioning infrastructure safely and efficiently. Configuration files describe to Terraform the components needed to run a single application or your entire datacenter. Terraform generates an execution plan describing what it will do to reach the desired state, diff --git a/website/source/layouts/_header.erb b/website/source/layouts/_header.erb index 5a9f33172..4820423a3 100644 --- a/website/source/layouts/_header.erb +++ b/website/source/layouts/_header.erb @@ -5,7 +5,7 @@
- by<%= partial "layouts/svg/svg-by-hashicorp" %><%= partial "layouts/svg/svg-hashicorp-logo" %>Hashicorp + by<%= partial "layouts/svg/svg-by-hashicorp" %><%= partial "layouts/svg/svg-hashicorp-logo" %>Hashicorp