From a5dcf6bbd9b9e76fe7b0f58e1730885e1b002d91 Mon Sep 17 00:00:00 2001
From: Michael Schurter <schmichael@hashicorp.com>
Date: Wed, 19 Apr 2017 12:27:07 -0700
Subject: [PATCH] Document `tls_skip_verify`

---
 website/source/docs/http/json-jobs.html.md            | 5 ++++-
 website/source/docs/job-specification/service.html.md | 3 +++
 website/source/docs/service-discovery/index.html.md   | 2 ++
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/website/source/docs/http/json-jobs.html.md b/website/source/docs/http/json-jobs.html.md
index f5f1db24dc92..69c8f34ee412 100644
--- a/website/source/docs/http/json-jobs.html.md
+++ b/website/source/docs/http/json-jobs.html.md
@@ -423,7 +423,7 @@ The `Task` object supports the following keys:
          * `Timeout`: This indicates how long Consul will wait for a health
            check query to succeed.
 
-         * `Path`:The path of the http endpoint which Consul will query to query
+         * `Path`: The path of the http endpoint which Consul will query to query
            the health of a service if the type of the check is `http`. Nomad
            will add the IP of the service and the port, users are only required
            to add the relative URL of the health check endpoint.
@@ -437,6 +437,9 @@ The `Task` object supports the following keys:
          * `Args`: Additional arguments to the `command` for script based health
            checks.
 
+	 * `TLSSkipVerify`: If true, Consul will not attempt to verify the
+	   certificate when performing HTTPS checks. Requires Consul >= 0.7.2.
+
 * `Templates` - Specifies the set of [`Template`](#template) objects to render for the task.
   Templates can be used to inject both static and dynamic configuration with
   data populated from environment variables, Consul and Vault.
diff --git a/website/source/docs/job-specification/service.html.md b/website/source/docs/job-specification/service.html.md
index 2973142da84a..f213ae357429 100644
--- a/website/source/docs/job-specification/service.html.md
+++ b/website/source/docs/job-specification/service.html.md
@@ -143,6 +143,9 @@ does not automatically enable service discovery.
 - `type` `(string: <required>)` - This indicates the check types supported by
   Nomad. Valid options are `script`, `http`, and `tcp`.
 
+- `tls_skip_verify` `(bool: false)` - Skip verifying TLS certificates for HTTPS
+  checks. Requires Consul >= 0.7.2.
+
 
 ## `service` Examples
 
diff --git a/website/source/docs/service-discovery/index.html.md b/website/source/docs/service-discovery/index.html.md
index ce07cc8d35ed..a95cd09dca2c 100644
--- a/website/source/docs/service-discovery/index.html.md
+++ b/website/source/docs/service-discovery/index.html.md
@@ -32,6 +32,8 @@ To configure a job to register with service discovery, please see the
 
 ## Assumptions
 
+- Consul 0.7.2 or later is needed for `tls_skip_verify` in HTTP checks.
+
 - Consul 0.6.4 or later is needed for using the Script checks.
 
 - Consul 0.6.0 or later is needed for using the TCP checks.