Commit Graph

10 Commits

Author SHA1 Message Date
Kai Qiang Wu(Kennan) b1af9c7987 Remove wrong lxc support
Docker master branch not support lxc, so it seems not proper to
say that anymore.

Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
Upstream-commit: 0e8d41272c7e5979d8a3f8676c94320f6c2ff691
Component: engine
2016-01-14 07:23:04 +00:00
Jeff Anderson e1e5d41283 Change "virtualization" to "containerization"
* Wording around what docker-machine does since the phrase "Docker virtual machine" can cause some confusion.
* Docker Machine isn't a distro in and of itself. It still uses boot2docker as the distro.
* Remove "virtualization" keywords.

Signed-off-by: Jeff Anderson <jeff@docker.com>
Upstream-commit: 0d1c5193b389052f11d77ca576f7dbb49b601135
Component: engine
2015-12-08 15:08:27 -07:00
Sebastiaan van Stijn 824d689a06 Merge pull request #18137 from vanpire110/master
Update understanding-docker.md again 
Upstream-commit: 1d1de645fd52dd2f886ca650b645c960f2cb219c
Component: engine
2015-11-23 09:31:13 +01:00
Sven Dowideit 6df421c14f Fixes found by docs validation tool
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: 043f447e2e9ecb9d6f34bcee6c11f20f263baf66
Component: engine
2015-11-23 11:19:38 +10:00
Jeremy Qian add6b1169c update docs/introduction/understanding-docker.md
Signed-off-by: Jeremy Qian <vanpire110@163.com>
Upstream-commit: f5343a039bc28b5c290c72b5305436f526e81eba
Component: engine
2015-11-21 10:43:25 +08:00
Mary Anthony 6b6c7cc2b6 Enabled GitHub Flavored Markdown
GitHub flavored markdown is now supported for links and images. Also, ran LinkChecker and FileResolver. Yay!
Fixes from Spider check
Output for docker/docker now goes into engine directory

Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: 8fee1c2020186ac100b45e64864b94ae3a169ad5
Component: engine
2015-10-11 07:49:54 -07:00
John Howard 77030d2282 Windows: Minor doc clarification
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 759ed647fbdb026ec91ba8ef84e0fac67b1c73bb
Component: engine
2015-08-25 09:36:51 -07:00
Mary Anthony ad80c7d292 Initial work
Removing references to regsitry 1.0, pointing to distribution
Updating links and title
Adding in comments

Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: d550d729e14d1a18d00b66a941da5b23b9a61bd3
Component: engine
2015-08-10 17:43:41 -07:00
Mary Anthony 1547f31ef8 Fixes #14117
Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: 960cbd2c8dd7dfa794c11087babed46bea5d792e
Component: engine
2015-06-23 05:17:20 -07:00
Mary Anthony 9a276424db retooling for hugo
Tweaking for Hugo
Updating the Dockerfile with new sed; fix broken link on Kitematic
Fixing image pull for Dockerfile
Removing docs targets

Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: f93fee5f48cc92df8668380e4edc2b7bbd6c62c6
Component: engine
2015-06-15 13:19:38 -07:00