6 commits

Author	SHA1	Message	Date
Sebastiaan van Stijn	9aabd9c3f4	Merge pull request #24736 from johnharris85/fix-sinatra-tutorial ... Fix broken gem instructions. (cherry picked from commit 29648795cd) Signed-off-by: Tibor Vass <tibor@docker.com>	2016-08-11 16:32:18 -07:00
Arnaud Porterie (icecrime)	c61fa33c23	Rename --net to --network ... Add a `--network` flag which replaces `--net` without deprecating it yet. The `--net` flag remains hidden and supported. Add a `--network-alias` flag which replaces `--net-alias` without deprecating it yet. The `--net-alias` flag remains hidden and supported. Signed-off-by: Arnaud Porterie (icecrime) <arnaud.porterie@docker.com> (cherry picked from commit c0c7d5e715) Signed-off-by: Tibor Vass <tibor@docker.com>	2016-07-12 15:50:38 -07:00
Kara Alexandra	e0960bd8e7	Add blanks lines in docs for clarity ... Signed-off-by: Kara Alexandra <kalexandra@us.ibm.com> (cherry picked from commit d0737e9ac0) Signed-off-by: Tibor Vass <tibor@docker.com>	2016-07-12 15:43:39 -07:00
Lucas Chi	f17d02c992	Fix grammar in docker volumes tutorial ... Signed-off-by: Lucas Chi <lucas@teacherspayteachers.com> (cherry picked from commit 7b3ac47fa4) Signed-off-by: Tibor Vass <tibor@docker.com>	2016-07-12 15:43:39 -07:00
Victoria Bialas	d1c91b41e1	install mac and win pared down, link to d4mac, d4win, getting started improved, added menu.md's ... fixing links to d4mac and d4win updates per @Sven and @theJeztah, fixing links, typos, menu definitions, etc. updates per Sven's comments in the PR removed duplicate line in tutorials menu.md Signed-off-by: Victoria Bialas <victoria.bialas@docker.com> (cherry picked from commit 5bc730eda7)	2016-06-18 20:58:23 -07:00
Victoria Bialas	8eca8089fa	surfacing Learn by example topics to top level of Docker Engine docs ... fixing links after moving surfacing tutorials fixing more links for the newly located tutorials Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>	2016-06-13 13:32:30 -07:00