screen snaps, updates per latest on staging

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
docker · londoncalling · May 2, 2017 · Apr 10, 2017 · Apr 26, 2017 · Apr 26, 2017
commit 063ce644ba2c89e68a4e724057de221768b5e5af
diff --git a/docker-cloud/cloud-swarm/create-cloud-swarm-azure.md b/docker-cloud/cloud-swarm/create-cloud-swarm-azure.md
@@ -16,7 +16,7 @@ If you haven't yet linked Docker Cloud to Azure, follow the steps in [Link Micro
 linked, it will show up on the **Swarms -> Create** page as a connected service
 provider.
 
-<font style="color:red;">TBD - ADD SCREEN SNAP HERE</font>
+![](images/azure-creds-cloud.png)
 
 ## Create a swarm
 

diff --git a/docker-cloud/cloud-swarm/images/azure-creds-cloud.png b/docker-cloud/cloud-swarm/images/azure-creds-cloud.png
diff --git a/docker-cloud/cloud-swarm/link-azure-swarm.md b/docker-cloud/cloud-swarm/link-azure-swarm.md
@@ -5,12 +5,14 @@ keywords: Azure, Cloud, link
 title: Link Microsoft Azure Cloud Services to Docker Cloud
 ---
 
-You can link your Microsoft Azure account so that Docker Cloud can provision and
+You can link your [Microsoft Azure Cloud Services](https://portal.azure.com/) account so that Docker Cloud can provision and
 manage swarms on your behalf.
 
-For this, you will need your Azure subscription ID to authenticate Docker to your service provider.
+For this, you will need an SSH key and your Azure subscription ID to authenticate Docker to your service provider.
 
-> **Note**: When you are ready to create and deploy swarms, you must also have an [SSH key](ssh-key-setup.md).
+## Create or locate the SSH key you want to use
+
+When you are ready to create and deploy swarms, you must have an [SSH](`/engine/reference/glossary.md#ssh`) key to authenticate Docker Cloud to your Azure account. See the topic [Set up SSH keys](/docker-cloud/cloud-swarm/ssh-key-setup.md) to learn how to check for existing keys or set up a new one, and copy the public key.
 
 ## Find your Azure subscription ID
 
@@ -27,7 +29,7 @@ You can click a resource from the Dashboard and find the subscription ID under
 When you are ready to add your subscription ID to Docker Cloud,
 copy it from your Azure Dashboard.
 
-## Add you Azure account credentials to Docker Cloud
+## Add your Azure account credentials to Docker Cloud
 
 Go to Docker Cloud to connect the account.
 
@@ -49,16 +51,19 @@ Go to Docker Cloud to connect the account.
 6. Your Microsoft Azure login credentials will automatically populate to
 Docker Cloud under **Service Providers -> Microsoft Azure**.
 
+    ![](images/azure-creds-cloud.png)
+
 7. Click **Save**.
 
 You're now ready to deploy a swarm!
 
 ## Where to go next
 
-You'll need an SSH key to provide to Docker Cloud
-during the swarm create process. See [Setting up SSH keys](ssh-key-setup.md).
-
 **Ready to create swarms on Azure?** See [Create a new swarm in Docker
-Cloud](create-cloud-swarm.md).
+Cloud](create-cloud-swarm-azure.md).
+
+You'll need an SSH key to provide to Docker Cloud during the swarm create
+process. If you haven't done so yet, check out [Set up SSH
+keys](ssh-key-setup.md).
 
 You can get an overivew of topics on [swarms in Docker Cloud](index.md).
diff --git a/docker-cloud/cloud-swarm/ssh-key-setup.md b/docker-cloud/cloud-swarm/ssh-key-setup.md
@@ -20,9 +20,10 @@ want to reuse.
 
 If you find an existing key you want to use, skip to the topic that describes
 how to [copy your public key for use with Docker
-Cloud](copy-your-public-key-for-use-with-docker-cloud).
+Cloud](#copy-your-public-key-for-use-with-docker-cloud).
 
-Otherwise, [create a new SSH key](create-a-new-ssh-key-for-use-by-docker-cloud).
+Otherwise, [create a new SSH
+key](#create-a-new-ssh-key-for-use-by-docker-cloud).
 
 ## Create a new SSH key
 

diff --git a/docker-cloud/infrastructure/link-aws.md b/docker-cloud/infrastructure/link-aws.md
@@ -13,7 +13,11 @@ title: Link an Amazon Web Services account
 
 You can create a role with AWS IAM (Identity and Access Management) so that Docker Cloud can provision and manage **node clusters** and **nodes** on your behalf.
 
+<<<<<<< HEAD
 [Previously](https://docs.docker.com/v1.11/docker-cloud/infrastructure/link-aws/), we recommended that you create a service user that Docker Cloud would use to access your AWS account. If you previously used this method, you can [create a new role](link-aws.md#acreate-a-dockercloud-role-role), attach the policy you created previously, unlink your AWS credentials and relink them using the new ARN method. You can then delete the `dockercloud-user`.
+=======
+Previously, we recommended that you create a service user that Docker Cloud would use to access your AWS account. If you used this method, you can [create a new role](link-aws.md#create-a-dockercloud-role-role), attach the policy you created for this purpose (see <a href="https://console.aws.amazon.com/iam/home#policies" target ="_blank">AWS polices</a>), unlink your AWS credentials and relink them using the new ARN method. You can then delete the `dockercloud-user` on AWS.
+>>>>>>> fca46e538d... screen snaps, updates per latest on staging
 
 ## Create a dockercloud-policy
 
@@ -47,7 +51,7 @@ Create an access control policy that will grant specific privileges to Docker Cl
     `iam:ListInstanceProfiles` allows the user to retrieve instance profiles to apply to your nodes.
 
     > **Note**: You cannot use an instance profile that has more permissions than the IAM user you are using with Docker Cloud. If you do that, you will get an "unauthorized operation" error. You can fix this issue by adding the `"Action":"iam:PassRole"` permission to the policy for the service user. You can read more about this <a href="http://blogs.aws.amazon.com/security/post/Tx3M0IFB5XBOCQX/Granting-Permission-to-Launch-EC2-Instances-with-IAM-Roles-PassRole-Permission" target="_blank">here</a>.
-    
+
 6.  Click **Validate Policy**.
 7.  If the validation is successful click **Create Policy**.