10 Commits

Author	SHA1	Message	Date
Joao Fernandes	f1102790e2	Remove merge conflict metadata from UCP docs	2016-11-02 11:41:48 -07:00
Joao Fernandes	0ba114c2a9	Merge branch '1.1-docs' of ../orca/ into ucp-1.1	2016-11-01 18:38:19 -07:00
Joao Fernandes	e53bc30bf9	Move docs to ucp/	2016-11-01 17:18:37 -07:00
Joao Fernandes	9e5f9d7be2	Fix table formatting in ucp/reference	2016-10-25 12:00:09 -07:00
Joao Fernandes	2da3e4ec97	Fix syntax highlighting ucp/reference	2016-10-25 11:57:09 -07:00
Ryan Zhang	d3bd3c8858	Fix in backup.md ... Signed-off-by: Ryan Zhang <ryan.zhang@docker.com>	2016-10-17 10:29:52 -07:00
John Mulhausen	c4f548e8e1	Update install.md	2016-10-04 17:02:58 -07:00
Pascal Borreli	6cd3fe8bd2	Fixed typos	2016-09-30 01:52:12 +01:00
Misty Stanley-Jones	d53c6798c9	Convert TOML to YAML, tweaks to work with Jekyll	2016-09-29 17:16:03 -07:00
Misty Stanley-Jones	9224c67d2e	Moved imported orca docs into ucp directory	2016-09-28 14:35:02 -07:00