Merge pull request #2867 from travis-ci/ha-dpl-v2-clarification

Clean up dpl v2 documentation

Author: nrios14

_layouts/en.html

@@ -27,14 +27,26 @@ <h1 class="title">{{ page.title }}</h1>
                 for details. <a href="/user/deployment-v2">dpl v2 documentation can be found here</a>.
               </p>
             </blockquote>
+          {% elsif page.deploy == 'v2_base' %}
+            <blockquote class="alpha">
+              <p>
+                This page documents deployments using the next major version dpl v2, which
+                currently is in a beta release phase. Please see <a href="https://blog.travis-ci.com/2019-08-27-deployment-tooling-dpl-v2-preview-release">our blog post</a>
+                for details. The current default version is dpl v1.
+                Check <a href="/user/deployment">dpl v1 documentation here</a>.
+              </p>
+            </blockquote>
           {% elsif page.deploy == 'v2' %}
             <blockquote class="alpha">
               <p>
-                This page documents deployments using the next major version dpl v2 which
+                This page documents deployments using the next major version dpl v2, which
                 currently is in a beta release phase. Please see <a href="https://blog.travis-ci.com/2019-08-27-deployment-tooling-dpl-v2-preview-release">our blog post</a>
                 for details. The current default version is dpl v1.
                 Check <a href="/user/deployment">dpl v1 documentation here</a>.
               </p>
+              <p>
+                Be sure to read the <a href="/user/deployment-v2">v2 deployment overview</a>.
+              </p>
             </blockquote>
           {% endif %}
 

user/deployment-v2.md

@@ -1,7 +1,7 @@
 ---
 title: Deployment (v2)
 layout: en
-deploy: v2
+deploy: v2_base
 ---
 
 {% include deploy/opt_in.md %}

user/deployment-v2/providers/codedeploy.md

@@ -21,6 +21,7 @@ deploy:
     key: <bucket_key>
     application: <app>
     deployment_group: <deployment_group>
+    edge: true # opt in to dpl v2
 ```
 {: data-file=".travis.yml"}
 

user/deployment-v2/providers/gae.md renamed to user/deployment-v2/providers/google-app-engine.md

@@ -13,6 +13,7 @@ For a minimal configuration, add the following to your `.travis.yml`:
 deploy:
   provider: gae
   keyfile: <keyfile>
+  edge: true # opt in to dpl v2
 ```
 {: data-file=".travis.yml"}
 

user/deployment-v2/providers/releases.md

@@ -14,6 +14,7 @@ deploy:
   provider: releases
   token: <encrypted token>
   file: <file>
+  edge: true # opt in to dpl v2
   on:
     tags: true
 ```