quintilesims · tlake · Jan 18, 2018 · Jan 15, 2018 · Jan 15, 2018 · Jan 16, 2018
diff --git a/.travis.yml b/.travis.yml
@@ -13,7 +13,3 @@ before_install:
 
 script:
   - make unittest
-  - ./scripts/ci-smoketest.sh
-
-after_script:
-  - make destroy-smoketest
diff --git a/Makefile b/Makefile
@@ -28,23 +28,10 @@ unittest:
 smoketest:
 	$(MAKE) -C tests/smoke test
 
-systemtest:
-	$(MAKE) -C tests/system test
-
 stresstest:
 	$(MAKE) -C tests/stress test
 
-install-smoketest:
-	$(MAKE) -C cli install-smoketest
-	$(MAKE) -C setup install-smoketest
-	$(MAKE) -C api deps
-	$(MAKE) -C api release
-	$(MAKE) -C runner release
-
-apply-smoketest:
-	$(MAKE) -C setup apply-smoketest
-
-destroy-smoketest:
-	$(MAKE) -C setup destroy-smoketest
+systemtest:
+	$(MAKE) -C tests/system test
 
-.PHONY: release unittest smoketest install-smoketest apply-smoketest destroy-smoketest systemtest benchmark
+.PHONY: release unittest smoketest stresstest systemtest
diff --git a/docs-src/docs/guides/walkthrough/deployment-2.md b/docs-src/docs/guides/walkthrough/deployment-2.md
@@ -265,12 +265,10 @@ Your data should still be there!
 
 ### Cleanup
 
-If you're finished with the example and don't want to continue with this walkthrough, you can instruct Layer0 to delete the environment and terminate the application.
+When you're finished with the example, you can instruct Layer0 to delete the environment and terminate the application.
 
 `l0 environment delete demo-env`
 
-However, if you intend to continue through [Deployment 3](deployment-3), you will want to keep the resources you made in this section.
-
 
 ---
 

diff --git a/docs-src/docs/guides/walkthrough/intro.md b/docs-src/docs/guides/walkthrough/intro.md
@@ -1,6 +1,6 @@
 # An Iterative Walkthrough
 
-This guide aims to take you through three increasingly-complex deployment examples using Layer0.
+This guide aims to take you through two increasingly-complex deployment examples using Layer0.
 Successive sections build upon the previous ones, and each deployment can be completed either through the Layer0 CLI directly, or through Terraform using our custom [Layer0 Terraform Provider](/reference/terraform-plugin).
 
 We assume that you're using Layer0 v0.9.0 or later.
@@ -17,7 +17,6 @@ As you do so, we will assume that your working directory matches the part of the
 
 - [Deployment 1](deployment-1): Deploying a web service (Guestbook)
 - [Deployment 2](deployment-2): Deploying Guestbook and a data store service (Redis)
-- [Deployment 3](deployment-3): Deploying Guestbook, Redis, and a service discovery service (Consul)
 
 
 ---

diff --git a/docs-src/docs/reference/cli.md b/docs-src/docs/reference/cli.md
@@ -230,11 +230,11 @@ Add-JobTrigger -Name $jobname -Trigger (New-JobTrigger -AtStartup -RandomDelay 0
 ```
 
 
-!!! note "Windows Environments"
-        Windows containers are still in beta. 
-You can view the documented caveats with ECS [here](http://docs.aws.amazon.com/AmazonECS/latest/developerguide/ECS_Windows.html#windows_caveats).
-When creating Windows environments in Layer0, the root volume sizes for instances are 200GiB to accommodate the large size of the containers.  
-It can take as long as 45 minutes for a new windows container to come online. 
+!!! note "Note: Windows Environments"
+    Windows environments have a few quirks and idiosyncracies to be aware of:
+    - You can view the documented caveats with ECS [here](http://docs.aws.amazon.com/AmazonECS/latest/developerguide/ECS_Windows.html#windows_caveats).
+    - When creating Windows environments in Layer0, the root volume sizes for instances are 200GiB to accommodate the large size of the containers.
+    - It can take as long as 45 minutes for a new windows container to come online. 
 
 ### environment delete
 Use the `delete` subcommand to delete an existing Layer0 environment.

diff --git a/docs-src/docs/reference/consul.md b/docs-src/docs/reference/consul.md
@@ -48,7 +48,7 @@ Layer0 Services that use Consul will need to add the [Registrator](#registrator-
 ## Consul Agent Container Definition
 
 !!!warning
-You must replace `<url>` with your Layer0 Consul Load Balancer's
+    You must replace `<url>` with your Layer0 Consul Load Balancer's URL.
 
 ```
 {

diff --git a/docs-src/docs/reference/task_definition.md b/docs-src/docs/reference/task_definition.md
@@ -31,10 +31,10 @@ The following snippet contains the task definition for the [Guestbook](../guides
 * **Name** The name of the container
 
 !!! warning
-If you wish to update your task definition, the container names **must** remain the same.
-If any container names are changed or removed in an updated task definition,
-ECS will not know how the existing container(s) should be mapped over and you will not be able to deploy the updated task definition.
-If you encounter a scenario where you must change or remove a container's name in a task definition, we recommend re-creating the Layer0 Deploy and Service.
+    If you wish to update your task definition, the container names **must** remain the same.
+    If any container names are changed or removed in an updated task definition,
+    ECS will not know how the existing container(s) should be mapped over and you will not be able to deploy the updated task definition.
+    If you encounter a scenario where you must change or remove a container's name in a task definition, we recommend re-creating the Layer0 Deploy and Service.
 
 
 * **Image** The Docker image used to build the container. The image format is `url/image:tag`

diff --git a/docs-src/docs/reference/terraform-plugin.md b/docs-src/docs/reference/terraform-plugin.md
@@ -48,7 +48,7 @@ provider "layer0" {
 The following arguments are supported:
 
 !!! note
-	The `endpoint` and `token` variables for your layer0 api can be found using the [l0-setup endpoint](setup-cli/#endpoint) command
+	The `endpoint` and `token` variables for your layer0 api can be found using the [l0-setup endpoint](setup-cli/#endpoint) command.
 
 * `endpoint` - (Required) The endpoint of the layer0 api
 * `token` - (Required) The authentication token for the layer0 api

diff --git a/docs/guides/walkthrough/deployment-2/index.html b/docs/guides/walkthrough/deployment-2/index.html
@@ -1105,9 +1105,8 @@ <h3 id="part-7-prove-it">Part 7: Prove It<a class="headerlink" href="#part-7-pro
 Your data should still be there!</p>
 <hr />
 <h3 id="cleanup">Cleanup<a class="headerlink" href="#cleanup" title="Permanent link">#</a></h3>
-<p>If you're finished with the example and don't want to continue with this walkthrough, you can instruct Layer0 to delete the environment and terminate the application.</p>
+<p>When you're finished with the example, you can instruct Layer0 to delete the environment and terminate the application.</p>
 <p><code>l0 environment delete demo-env</code></p>
-<p>However, if you intend to continue through <a href="../deployment-3">Deployment 3</a>, you will want to keep the resources you made in this section.</p>
 <hr />
 <h2 id="deploy-with-terraform">Deploy with Terraform<a class="headerlink" href="#deploy-with-terraform" title="Permanent link">#</a></h2>
 <p>As before, we can complete this deployment using Terraform and the Layer0 provider instead of the Layer0 CLI. As before, we will assume that you've cloned the <a href="https://github.com/quintilesims/guides">guides</a> repo and are working in the <code>walkthrough/deployment-2/</code> directory.</p>

diff --git a/docs/guides/walkthrough/intro/index.html b/docs/guides/walkthrough/intro/index.html
@@ -601,7 +601,7 @@
 
 
                 <h1 id="an-iterative-walkthrough">An Iterative Walkthrough<a class="headerlink" href="#an-iterative-walkthrough" title="Permanent link">#</a></h1>
-<p>This guide aims to take you through three increasingly-complex deployment examples using Layer0.
+<p>This guide aims to take you through two increasingly-complex deployment examples using Layer0.
 Successive sections build upon the previous ones, and each deployment can be completed either through the Layer0 CLI directly, or through Terraform using our custom <a href="../../../reference/terraform-plugin">Layer0 Terraform Provider</a>.</p>
 <p>We assume that you're using Layer0 v0.9.0 or later.
 If you have not already installed and configured Layer0, see the <a href="../../../setup/install">installation guide</a>.
@@ -614,7 +614,6 @@ <h1 id="an-iterative-walkthrough">An Iterative Walkthrough<a class="headerlink"
 <ul>
 <li><a href="../deployment-1">Deployment 1</a>: Deploying a web service (Guestbook)</li>
 <li><a href="../deployment-2">Deployment 2</a>: Deploying Guestbook and a data store service (Redis)</li>
-<li><a href="../deployment-3">Deployment 3</a>: Deploying Guestbook, Redis, and a service discovery service (Consul)</li>
 </ul>
 <hr />
 

diff --git a/docs/reference/cli/index.html b/docs/reference/cli/index.html
@@ -3382,12 +3382,12 @@ <h4 id="optional-arguments">Optional arguments<a class="headerlink" href="#optio
 
 
 <div class="admonition note">
-<p class="admonition-title">Windows Environments<p>Windows containers are still in beta. </p>
-</p>
+<p class="admonition-title">Note: Windows Environments</p>
+<p>Windows environments have a few quirks and idiosyncracies to be aware of:
+- You can view the documented caveats with ECS <a href="http://docs.aws.amazon.com/AmazonECS/latest/developerguide/ECS_Windows.html#windows_caveats">here</a>.
+- When creating Windows environments in Layer0, the root volume sizes for instances are 200GiB to accommodate the large size of the containers.
+- It can take as long as 45 minutes for a new windows container to come online. </p>
 </div>
-<p>You can view the documented caveats with ECS <a href="http://docs.aws.amazon.com/AmazonECS/latest/developerguide/ECS_Windows.html#windows_caveats">here</a>.
-When creating Windows environments in Layer0, the root volume sizes for instances are 200GiB to accommodate the large size of the containers.<br />
-It can take as long as 45 minutes for a new windows container to come online. </p>
 <h3 id="environment-delete">environment delete<a class="headerlink" href="#environment-delete" title="Permanent link">#</a></h3>
 <p>Use the <code>delete</code> subcommand to delete an existing Layer0 environment.</p>
 <h4 id="usage_9">Usage<a class="headerlink" href="#usage_9" title="Permanent link">#</a></h4>

diff --git a/docs/reference/consul/index.html b/docs/reference/consul/index.html
@@ -780,8 +780,8 @@ <h2 id="registrator-container-definition">Registrator Container Definition<a cla
 <h2 id="consul-agent-container-definition">Consul Agent Container Definition<a class="headerlink" href="#consul-agent-container-definition" title="Permanent link">#</a></h2>
 <div class="admonition warning">
 <p class="admonition-title">Warning</p>
+<p>You must replace <code>&lt;url&gt;</code> with your Layer0 Consul Load Balancer's URL.</p>
 </div>
-<p>You must replace <code>&lt;url&gt;</code> with your Layer0 Consul Load Balancer's</p>
 <div class="codehilite"><pre><span></span>{
     &quot;name&quot;: &quot;consul-agent&quot;,
     &quot;image&quot;: &quot;progrium/consul&quot;,

diff --git a/docs/reference/task_definition/index.html b/docs/reference/task_definition/index.html
@@ -675,11 +675,11 @@ <h2 id="sample">Sample<a class="headerlink" href="#sample" title="Permanent link
 </ul>
 <div class="admonition warning">
 <p class="admonition-title">Warning</p>
-</div>
 <p>If you wish to update your task definition, the container names <strong>must</strong> remain the same.
 If any container names are changed or removed in an updated task definition,
 ECS will not know how the existing container(s) should be mapped over and you will not be able to deploy the updated task definition.
 If you encounter a scenario where you must change or remove a container's name in a task definition, we recommend re-creating the Layer0 Deploy and Service.</p>
+</div>
 <ul>
 <li><strong>Image</strong> The Docker image used to build the container. The image format is <code>url/image:tag</code><ul>
 <li>The <code>url</code> specifies which Docker Repo to pull the image from

diff --git a/docs/reference/terraform-plugin/index.html b/docs/reference/terraform-plugin/index.html
@@ -1377,7 +1377,7 @@ <h3 id="argument-reference">Argument Reference<a class="headerlink" href="#argum
 <p>The following arguments are supported:</p>
 <div class="admonition note">
 <p class="admonition-title">Note</p>
-<p>The <code>endpoint</code> and <code>token</code> variables for your layer0 api can be found using the <a href="../setup-cli/#endpoint">l0-setup endpoint</a> command</p>
+<p>The <code>endpoint</code> and <code>token</code> variables for your layer0 api can be found using the <a href="../setup-cli/#endpoint">l0-setup endpoint</a> command.</p>
 </div>
 <ul>
 <li><code>endpoint</code> - (Required) The endpoint of the layer0 api</li>