Merge pull request #1313 from magento/lk_1010_cloud-wings-branches

Update branching notes and formatting for wings

Author: Lori Krell

_includes/cloud/wings-variables.md

@@ -0,0 +1,3 @@
+<div markdown="1">
+
+If you want to add the same variables to your Integration, Staging, and Production environments, we recommend adding all of the variables one at a time to Integration. After you finish adding variables, trigger a deployment to Staging and production. All variables will be inherited from Integration. 

guides/v2.0/cloud/project/project-webint-basic.md

@@ -85,6 +85,10 @@ For an example of variables, we walk you through creating Magento Admin variable
 
 To view or edit environment variables, you must have at minimum the project reader role with [environment admin]({{ page.baseurl }}cloud/project/user-admin.html#cloud-role-env) privileges.
 
+For new Pro projects **created after 10-23-2017**, you can add variables for all environments through the Project Web Interface.
+
+{% include cloud/wings-variables.md %}
+
 ### Environment variable {#env}
 To set environment specific variables in the Project Web Interface:
 

guides/v2.0/cloud/trouble/pro-env-management.md

@@ -15,7 +15,7 @@ For existing Pro plans, you previously had to access Staging and Production envi
 All new projects already include these features.
 
 <div class="bs-callout bs-callout-info" id="info" markdown="1">
-**New projects provisioned October 23, 2017 and later** will already have Staging and Production in their Project Web Interface. Any existing projects created before this date will need to enter a ticket to be converted.
+**New projects provisioned October 23, 2017 and later** will already have Staging and Production in their Project Web Interface. Any existing projects created before this date will need to enter a ticket to be converted. This information will help you understand the changes and enter a ticket.
 </div>
 
 ## New features {#features}
@@ -53,16 +53,16 @@ After the conversion, the three repositories are merged into a single repository
 <table>
 <thead>
 <tr>
-<th>Branch</th>
-<th>Environment</th>
+<th style="width: 100px;">Branch</th>
+<th style="width: 100px;">Environment</th>
 <th>Description</th>
 </tr></thead>
 <tbody>
 <tr>
-<td><code>master</code></td>
-<td>Integration master</td>
-<td><p>The master branch of the single repository. In the Project Web Interface, this is called Integration. You branch from <code>master</code> for your development on your local, generating an environment when you push code.</p>
-<p>When you convert, all active and inactive branches continue as children to the <code>master</code> branch.</p></td>
+<td>(no branch)</td>
+<td>Global Master</td>
+<td>This "branch" captures global project changes including adding user accounts and variables.
+</td>
 </tr>
 <tr>
 <td><code>production</code></td>
@@ -76,9 +76,26 @@ After the conversion, the three repositories are merged into a single repository
 <td><p>This is a branch from <code>master</code> with a deployment target. You cannot branch from this branch. You merge code from <code>master</code> to this branch to go live with updated configurations and code.</p>
 <p>When you convert, the Integration <code>master</code> is branched into a <code>staging</code> branch with the users access and environment variables.</p></td>
 </tr>
+<tr>
+<td><code>master</code></td>
+<td>Integration master</td>
+<td><p>The master branch of the single repository. In the Project Web Interface, this is called Integration. You branch from <code>master</code> for your development on your local, generating an environment when you push code.</p>
+<p>When you convert, all active and inactive branches continue as children to the <code>master</code> branch.</p></td>
+</tr>
 </tbody>
 </table>
 
+In the Project Web Interface, you will see the following environments and branches:
+
+![Pro branch hierarchy]({{ site.baseurl }}common/images/cloud_project-pro.png)
+
+Be aware, the following actions will trigger a redeploy of the environment. This redeploy is much shorter, not pushing code or data changes.
+
+* Add a user to a specific environment
+* Add an environment variable to a specific environment
+
+{% include cloud/wings-variables.md %}
+
 ## Prepare for adding Staging and Production {#prepare}
 When we add Staging and Production access to the Project Web Interface, we will leverage the user accounts, branch user permissions, and environment variables from your Integration `master` environment.