12 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
Jonathan Lee	73680bc5c4	Fixing typo in Publish ports table. (#6808)	2018-06-03 20:31:39 -07:00
Mike Damm	c0827dd305	Properly escape angle brackets (#6539)	2018-04-25 10:08:55 -07:00
John Hu	b04466a40e	Typo (#6463)	2018-04-18 16:03:42 -07:00
Samuel Coronado	ea0b363e94	fixing typo + clarifying verbiage (#6445)	2018-04-13 09:57:43 -07:00
Akihiro Suda	88eedbf8b2	add sctp docs (#6078)	2018-04-11 14:03:50 -07:00
Julien Maitrehenry	72f9b29cde	Add a note on service discovery on swarm	2018-04-10 10:59:48 -07:00
Gwendolynne Barr	e56b16a5a6	Add redirects (#6008)	2018-02-14 12:28:14 -08:00
Misty Stanley-Jones	a8e84a80e1	Restructure and rewrite network content	2018-02-07 11:31:02 -08:00