Nick Leli fd31a775c6 Updating DC/OS getting started guide with the new integration. (#5547) ...

Resolving merge conflicts

2017-09-25 16:40:49 -05:00

..

admin

Revert "Update links to avoid redirects." (#5617)

2017-09-25 13:43:15 -07:00

api-reference

Revert "Update links to avoid redirects." (#5617)

2017-09-25 13:43:15 -07:00

concepts

Add missing 'a' on line 123. (#5616)

2017-09-25 16:15:46 -05:00

contribute

…

getting-started-guides

Updating DC/OS getting started guide with the new integration. (#5547)

2017-09-25 16:40:49 -05:00

home

Revert "Update links to avoid redirects." (#5617)

2017-09-25 13:43:15 -07:00

reference

Revert "Update links to avoid redirects." (#5617)

2017-09-25 13:43:15 -07:00

resources-reference

Revert "Update links to avoid redirects." (#5617)

2017-09-25 13:43:15 -07:00

setup

Revert "Update links to avoid redirects." (#5617)

2017-09-25 13:43:15 -07:00

tasks

update pageversion and 404 error (#5612)

2017-09-25 15:57:42 -05:00

tools

Revert "Update links to avoid redirects." (#5617)

2017-09-25 13:43:15 -07:00

tutorials

Revert "Update links to avoid redirects." (#5617)

2017-09-25 13:43:15 -07:00

user-guide

Revert "Update links to avoid redirects." (#5617)

2017-09-25 13:43:15 -07:00

search.md

…

sitemap.md

…

tabs-example.md

…

update-user-guide-links.py

…