Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Cloud link to Azure topics #2713

Merged
merged 16 commits into from
May 2, 2017
+887 −105
Merged

Add Cloud link to Azure topics #2713

Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
697b86d
add Cloud link to Azure topics
Apr 10, 2017
063ce64
screen snaps, updates per latest on staging
Apr 26, 2017
7e45993
added link
Apr 26, 2017
7a4c5cd
resolved conflicts in TOC
Apr 26, 2017
3d545fc
added Azure accept EULA/enable subscription, more steps, snaps
Apr 26, 2017
67e2beb
fixed the comments to not break numbering
Apr 26, 2017
432f222
new snaps and review comments incorporated from Alberto and Ryan
Apr 27, 2017
6d057d1
added screen snaps, review comments, more steps
Apr 27, 2017
a6f9028
added screen snaps, detail to Azure create swarm
Apr 29, 2017
d397f53
new snap showing linked AWS as provider
May 1, 2017
516f12c
AWS screen snaps and detailed steps
May 2, 2017
9149e96
AWS swarm name rules clarification
May 2, 2017
94ea376
added x-refs to edition topics on config per reviews
May 2, 2017
de360fd
added connect screen snap w/production commands, AWS pricing
May 2, 2017
6c6f72a
added more code examples and clarification to swarm connect
May 2, 2017
04a28da
added more code examples for Azure and AWS
May 2, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
resolved conflicts in TOC 
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
  • Loading branch information
Victoria Bialas committed May 2, 2017
commit 7a4c5cde7b5d7cd4e24979931c8d558f7a10e3ce
7 changes: 1 addition & 6 deletions _data/toc.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1276,17 +1276,12 @@ manuals:
- path: /docker-cloud/cloud-swarm/connect-to-swarm/
title: Connect to a swarm through Docker Cloud
- path: /docker-cloud/cloud-swarm/link-aws-swarm/
<<<<<<< HEAD
title: Link to Amazon Web Services to create swarms
- sectiontitle: Manage infrastructure (standard mode)
=======
title: Link Amazon Web Services to Docker Cloud
- path: /docker-cloud/cloud-swarm/link-azure-swarm/
title: Link Microsoft Azure Cloud Services to Docker Cloud
- path: /docker-cloud/cloud-swarm/ssh-key-setup/
title: Set up SSH keys
- sectiontitle: Manage Infrastructure (Standard Mode)
>>>>>>> d5369e015c... add Cloud link to Azure topics
- sectiontitle: Manage Infrastructure (standard mode)
section:
- path: /docker-cloud/infrastructure/
title: Infrastructure overview
Expand Down