Commit Graph

26 Commits

Author SHA1 Message Date
d37f26ec66 Now that the Docker4 links are online, we can use them
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: 587d2f9d8132c4ba8cfa74e5f0f2ec3328fdf9b9
Component: engine
2016-06-21 12:55:41 +00:00
9b853ff739 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>
Upstream-commit: 5bc730eda76351ab669a60a5fc95fd273e399d88
Component: engine
2016-06-17 14:46:35 -07:00
35c5774373 fix typos
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: c1be45fa38e82054dcad606d71446a662524f2d5
Component: engine
2016-06-02 17:17:22 +08:00
9c67867382 Changed Docker references to Docker Engine in docs
Signed-off-by: Lynda O'Leary <lyndaoleary29@gmail.com>
Upstream-commit: 0b882cc0140bc03dfe79462c5cdf77b972c94067
Component: engine
2016-03-01 00:57:23 +00:00
e61c546929 fixing the path of the key pair
Signed-off-by: Ryan McLaughlin <ryanmclaughlin@gmail.com>

Fixed a bit of grammar

Signed-off-by: Ryan McLaughlin <ryanmclaughlin@gmail.com>
Upstream-commit: d14cef441d05f01e8f253c67ff11f954aa24a142
Component: engine
2016-02-23 11:32:28 -07:00
5934d3cb06 Fix typo in Docker Toolbox upgrade section
Signed-off-by: Chad Swenson <chadswen@gmail.com>
Upstream-commit: 1435c9ea21d6c76a923c2501abb840e899b5ed1e
Component: engine
2016-02-09 11:36:45 -06:00
1f7a83c1d4 Fix typo in Chocolatey
Signed-off-by: Stefan Scherer <scherer_stefan@icloud.com>
Upstream-commit: 4688efc3eddf5aead4bd59ec13e2ca419ef96b28
Component: engine
2016-02-05 16:15:20 +01:00
c22fe80e6f docs: point out known issue with nginx/vboxfs
see https://github.com/docker/docker/issues/18666

Signed-off-by: Felix Geisendörfer <felix@debuggable.com>
Upstream-commit: 9afdd436cdb0d13eff8f34026a7f7e4d40cfda53
Component: engine
2016-02-03 15:02:48 +01:00
e734434f58 Creating Engine specific menu
Fixing the links
Updating with Seb's comments
Adding weight
Fixing the engine aliases
Updating after Arun pushed
Removing empty file

Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: e310d070f498a2ac494c6d3fde0ec5d6e4479e14
Component: engine
2016-01-26 15:58:53 -08:00
6a84e60720 Specify that Docker requires x64
Adds this requirement to docker/docker. Already replicated in docker/tutorials

Resolves: #18401

Signed-off-by: Aditi Rajagopal <arajagopal@us.ibm.com>
Upstream-commit: 8134a562c603679a02bc7841f10676ddba6e4001
Component: engine
2015-12-26 19:02:20 -05:00
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
a42c84fec2 Merge pull request #18155 from SvenDowideit/docs-validation-fixes
Fixes found by docs validation tool
Upstream-commit: 0f584219017d0fa9d224f1ca582f281a54e6db2b
Component: engine
2015-11-22 19:39:09 -08:00
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
e029cc86e6 Mark Windows 10 as supported in install docs
Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com>
Upstream-commit: 414c8565be6c7edf02880ab1d64f7da4515ce593
Component: engine
2015-11-21 13:42:32 -05:00
f625d79ed0 updated instruction to correct file path
Signed-off-by: Poul Kjeldager Sørensen <pks@ascend.xyz>
Signed-off-by: Poul Kjeldager Sørensen <pks@s-innovations.net>
Upstream-commit: 593586721341c9e0acb00b55d1c3f283ac162697
Component: engine
2015-11-12 16:15:29 +01:00
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
a1b4b00b8e fix typo and cleanup docs for installation.
Signed-off-by: Jackson Geller <jacksongeller@gmail.com>
Upstream-commit: 9746021f1a36222111dff1ef95904ba39cc81db5
Component: engine
2015-09-11 13:06:54 -04:00
cb83c53d63 Copy edits for typos
Signed-off-by: Ed Costello <epc@epcostello.com>
Upstream-commit: cefb72080d8d30a2f53ac6c7ae91d58e42210661
Component: engine
2015-08-24 23:02:44 -04:00
7f28a26384 Revise Windows Docker instructions
* Fix Windows 7 (not 7.1 ;p)
* Clarify virtualization technology section, add link to wiki
* Fix heading level for various ways of starting Docker container
* Clarify `default` VM
* Various minor changes

Signed-off-by: Charles Chan <charleswhchan@users.noreply.github.com>
Upstream-commit: 3faba5fbe264425ac6d15bdfdf3c5a72e25643cb
Component: engine
2015-08-22 07:26:26 -07:00
1d21d4d6c1 Fix a windows doc issue
Signed-off-by: evalle <shmarnev@gmail.com>
Upstream-commit: 3c61ede074000933f2290f8765bc4cface18c0ea
Component: engine
2015-08-20 14:14:48 +02:00
2a0dec8002 Updating new vm and with migrate
Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: e5c160e1d68fa7ed485827a88a577b9fff2077c7
Component: engine
2015-08-10 13:29:08 -07:00
26a62f2497 - Remove references to sudo in basics.md; see sudo instructions top of file
- Removing references to Boot2Docker replacing with Docker Machine
- Removing sudo warnings in instances where appropriate (no sudo in file)
- Updating with comments

Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: cc375a1e48d0f4b3855e7f14b09ead244bbbadfb
Component: engine
2015-08-05 19:45:43 -07:00
31bfebec11 Docker Toolbox Updates fixes #14561
- Tested Mac/iterated with Jeff on fixes
- Waiting on formal uninstall;manual now
- 4 hour work
- Fixe #14562 converting Windows to Mac
- Found errors in installer need fixes/another iteration
- Updated as far as possible with limited installation
- 3 Hours work
- Entering comments from PR review
- New screen captures and migration material
- Entering Sven's comment
- Testing with powershell, Seb's comments
- Fix link in upgrade
- Minor tweaks to http and typos
- Adding deprecation note

Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: 6ca22add1845ca87ba9a3ec0c319a70f981545b2
Component: engine
2015-07-28 18:17:24 -07:00
d1a21ef136 Update windows.md
With apologies (it wasn't clear from the contributing guidelines how this project feels about PRs for one or two word doc fixes).

Signed-off-by: Erik M. Bray <erik.m.bray@gmail.com>
Upstream-commit: 12c85f3671e2bc981eb246e73daa7ecf37fb274f
Component: engine
2015-07-07 13:51:17 -04:00
c6caf278a1 Fixing seds, deleting old stuff
Signed-off-by: Mary Anthony <mary@docker.com>

Upding sed, adding script to avoid redirects, remove mkdos

Signed-off-by: Mary Anthony <mary@docker.com>

Ignoring graphics with sed

Signed-off-by: Mary Anthony <mary@docker.com>

Fixing kitematic image

Signed-off-by: Mary Anthony <mary@docker.com>

Removing draft

Signed-off-by: Mary Anthony <mary@docker.com>

Fixing link

Signed-off-by: Mary Anthony <mary@docker.com>

removing from the menu

Signed-off-by: Mary Anthony <mary@docker.com>

Updatiing order of project material

Signed-off-by: Mary Anthony <mary@docker.com>

Removing from Regsitry v2 content per Olivier

Signed-off-by: Mary Anthony <mary@docker.com>

tweaking the touchup

Signed-off-by: Mary Anthony <mary@docker.com>

Removing include; only used four places; hugo global var replace

Signed-off-by: Mary Anthony <mary@docker.com>

Entering fixes from page-by-page

Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: 328dbd0aa2a5aca656b45c4148cb09f715fbe677
Component: engine
2015-06-17 21:05:37 -07:00
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