12 Commits

Author	SHA1	Message	Date
Misty Stanley-Jones	756f4d974c	Fix some doubled words ... Signed-off-by: Misty Stanley-Jones <misty@docker.com>	2016-11-28 11:32:17 -08:00
Victoria Bialas	b2eb693d00	Merge remote-tracking branch 'upstream/master' into vnext-compose-1.9.0-merge	2016-11-16 12:03:45 -08:00
Gaetan	2ea564166d	fix type of keywords entry in frontmatter (in /compose/ dir) (#481) ... keywords should be a string, not an array containing one string Signed-off-by: Gaetan de Villele <gdevillele@gmail.com>	2016-11-07 13:18:56 -08:00
John Mulhausen	558314bf56	Converges titles to imperative-form, front-matter based, and sentence-case (#438) ... Multiple title fixes, consistency fixes, convergence into metadata-based titles.	2016-11-04 15:38:40 -07:00
Misty Stanley-Jones	ac0cef5d0f	Merging master into vnext-compose ... includes conflict resolution Signed-off-by: Misty Stanley-Jones <misty@docker.com>	2016-11-04 15:25:34 -07:00
Misty Stanley-Jones	0827ba283c	Revert "fix frontmatter keywords values in compose/reference/ files"	2016-11-04 13:28:43 -07:00
Joffrey F	4c3cf8e7fd	Update docs to mention new additions in Compose 1.9.0 ... Signed-off-by: Joffrey F <joffrey@docker.com>	2016-11-03 15:05:24 -07:00
Gaetan de Villele	bb4f3be02e	fix frontmatter keywords values in compose/reference/ files ... Signed-off-by: Gaetan de Villele <gdevillele@gmail.com>	2016-11-03 10:13:21 -07:00
Misty Stanley-Jones	01910ab6d9	Update branding for macOS ... Apple has changed their branding guidelines from 'OS X' to 'macOS' so we should update ours to be within trademark / branding guidelines. See http://www.apple.com/macos/sierra/ Signed-off-by: Misty Stanley-Jones <misty@docker.com>	2016-10-18 09:21:09 -07: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	701f170a21	Move docker-hub docs to docker-hub subdirectory	2016-09-29 10:38:52 -07:00
Misty Stanley-Jones	7629f462d5	Moved compose docs to compose subdirectory	2016-09-28 14:52:24 -07:00