8 Commits

Author	SHA1	Message	Date
Maria Bermudez	aaca9b83b5	Revert "Revert "Merge branch 'master' of github.com:docker/docs-private into test-branch-2"" ... This reverts commit 4c95d161ca.	2018-08-29 19:01:03 -07:00
Maria Bermudez	4c95d161ca	Revert "Merge branch 'master' of github.com:docker/docs-private into test-branch-2" ... This reverts commit af5f2fcc38, reversing changes made to 338b690d26.	2018-08-29 18:37:44 -07:00
Maria Bermudez	840c167055	Revert "Revert "Merge branch 'master' of github.com:docker/docs-private into test-branch-2"" ... This reverts commit 14080c18bd.	2018-08-29 18:36:03 -07:00
Maria Bermudez	14080c18bd	Revert "Merge branch 'master' of github.com:docker/docs-private into test-branch-2" ... This reverts commit af5f2fcc38, reversing changes made to 338b690d26.	2018-08-29 14:47:31 -07:00
Trapier Marshall	a1de8bf85f	typo in ucp ldap config (#6821)	2018-06-06 11:12:45 -07:00
Jim Galasyn	3db30648b8	Update UCP screenshots and workflows (#601) ... * Update UCP screenshots and workflows * More UCP screenshot updates	2018-04-16 13:31:24 -07:00
Jim Galasyn	e4f56fe84e	Remove template tags (#589)	2018-04-16 13:31:24 -07:00
Joao Fernandes	9a4fdf9476	/enterprise -> /ee (#415) ... * /enterprise -> /ee * /datacenter/dtr/2.5 -> /ee/dtr/ * /datacenter/ucp/3.0->/ee/ucp * Fix configs * Fix broken images * Remove unused images for DTR * Remove unused images for UCP * Add a few redirects to avoid breaking beta exercises	2018-04-16 13:31:24 -07:00