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
Tammy Fox	3bc455cedc	clarify --external-server-cert description, fix syntax highlighting	2018-08-17 18:08:56 -04:00
Tammy Fox	20c4e3808f	remove extra word	2018-07-25 15:57:50 -04:00
Alex Seymour	e616be2fbb	Correct minor typo in --pod-cidr description	2018-07-25 17:02:10 +02:00
Joao Fernandes	653116fb8d	Update UCP cli docs	2018-06-04 16:23:34 -04:00
Xinfeng Liu	5fd9b8c08f	Add '--pod-cidr' and '--cloud-provider' in ucp install options ... To match with the output of "ucp install --help". The "--pod-cidr" is important to let the user choose CIDR when the default pod IP range 192.168.0.0/16 has conflicts to the nodes' network.	2018-05-03 17:01:10 -07:00
Kyle Squizzato	d002c576f7	Clarify that --existing-config uses latest config ... --existing-config is a flag that uses the latest UCP config found in the environment and does not accept a config as a flag variable. This should help clarify that. Signed-off-by: Kyle Squizzato <kyle.squizzato@docker.com>	2018-05-03 16:36:30 -07:00
Jim Galasyn	1893c861fe	Update UCP CLI reference (#413)	2018-04-16 13:31:24 -07:00
Joao Fernandes	08b4b9ecbf	Move UCP reference to /reference	2018-04-16 13:31:24 -07:00