Commit Graph

37 Commits

Author SHA1 Message Date
David Scott c9f8d88959
Improve Toolbox to Desktop migration (#11297)
* Improve Toolbox to Desktop migration

Previously we recommended converting the disk at the block level.
This is a bit risky as any on-disk format change could prevent it
from working.

It's safer to explicitly `docker commit`, then `docker save` and
`docker load` containers and images.

Signed-off-by: David Scott <dave.scott@docker.com>

* Minor style updates

* Minor style updates

Co-authored-by: Usha Mandya <47779042+usha-mandya@users.noreply.github.com>
2020-08-27 10:54:02 +01:00
Sebastiaan van Stijn 2b4833a355
Remove some references to enterprise products
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-07-02 23:36:48 +02:00
Sebastiaan van Stijn 087e391397
desktop: use relative markdown links
Unfortunately, the only reliable way to create internal links
is to use relative links to other Markdown files. This does
match the way links on GitHub work, but makes it harder to
create these links.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-04-23 13:03:21 +02:00
Sebastiaan van Stijn 331554f4b3
Fix various links that were generating URLs with `.md` (#10548)
* Fix incorrect links in compose section

there's a bug causing wrapped links to not work, and replacing
some links to point to the .md file, so that IDE's can check
if the anchors are valid. Also replaced some links to point
to their new location.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

* engine/swarm: update links

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

* Fix various broken links

There's a bug in the "jekyll-relative-links" plugin that causes wrapped links to not work.
Also replacing some links to point to the .md file, so that IDE's can check if the anchors
are valid. Finally, replaced some links to point to their new locations, so that users don't
get redirected..

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-04-01 12:05:50 +01:00
Usha Mandya a74585cef8
ENGDOCS-76: Update Mac documentation (#9345)
ENGDOCS-76: update mac get started
2019-09-20 16:43:22 +01:00
paigehargrave af3a5a96d5
Update docker-toolbox.md 2019-01-11 15:19:34 -05:00
Trevor Allen 0d8a5a46df
Add network-routing clarification to comparison
Add a line to comparison mentioning that docker-for-mac doesn't support routing traffic to containers.
2018-11-26 08:50:38 -05:00
Maria Bermudez 60a3b22611
Fixes 7640 2018-11-08 17:26:18 -08:00
Maria Bermudez aaca9b83b5 Revert "Revert "Merge branch 'master' of github.com:docker/docs-private into test-branch-2""
This reverts commit 4c95d161ca.
2018-08-29 19:01:03 -07:00
Maria Bermudez 4c95d161ca Revert "Merge branch 'master' of github.com:docker/docs-private into test-branch-2"
This reverts commit af5f2fcc38, reversing
changes made to 338b690d26.
2018-08-29 18:37:44 -07:00
Maria Bermudez 840c167055 Revert "Revert "Merge branch 'master' of github.com:docker/docs-private into test-branch-2""
This reverts commit 14080c18bd.
2018-08-29 18:36:03 -07:00
Maria Bermudez 14080c18bd Revert "Merge branch 'master' of github.com:docker/docs-private into test-branch-2"
This reverts commit af5f2fcc38, reversing
changes made to 338b690d26.
2018-08-29 14:47:31 -07:00
Gwendolynne Barr c9e06d476f
Depersonalize docs (#6760) 2018-05-24 15:05:27 -07:00
Akim Demaille 062d5e8aef Mac: phase out the Data/com.docker.driver.amd64-linux directory (#6705) 2018-05-17 07:43:23 -07:00
Akim Demaille 529960d5ef Docker for Machine: update (#6364) 2018-04-03 11:25:39 -07:00
Akim Demaille c8ad204ddc Toolbox migration (#5823)
* Mac: teach how to migrate from toolbox by hand

We have removed the Toolbox migration tools from Docker for Mac (and
soon for Windows too) because they add a lot of pressure on the code
for a feature which is almost never used today by our users.

Signed-off-by: Akim Demaille <akim.demaille@docker.com>
2018-01-26 13:57:26 -08:00
Misty Stanley-Jones a4f5e30249
Various copyedits to reduce future tense, wordiness, and use of 'please' (#5788)
* Reword lots of instances of 'will'

* Reword lots of instances of won't

* Reword lots of instances of we'll

* Eradicate you'll

* Eradicate 'be able to' type of phrases

* Eradicate 'unable to' type of phrases

* Eradicate 'has / have to' type of phrases

* Eradicate 'note that' type of phrases

* Eradicate 'in order to' type of phrases

* Redirect to official Chef and Puppet docs

* Eradicate gratuitous 'please'

* Reduce use of e.g.

* Reduce use of i.e.

* Reduce use of N.B.

* Get rid of 'sexagesimal' and correct some errors
2018-01-25 17:37:23 -08:00
Nathan Handler b6431416b2 Fix broken markdown link (#3385)
The HyperKit link was missing a closing `)` causing the link to break.
2017-05-24 16:46:06 -07:00
Wang Jie fc7d514a9c Update docker-toolbox.md (#3232) 2017-05-19 15:14:43 -07:00
Victoria Bialas ab47785dc7 Machine unset env var, Cloud updates (#3146)
* added unset env instructions

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>

* machine env details, cloud swarm updates, copyedits

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>

* fix per review, add Azure to note

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-05-03 12:01:33 -07:00
Lenny Linux 9a1f99cd11 add warning class and a linebreake to the warning blogquote (#2937)
* Update fedora.md

add warning class to blogquote

* Update linux-postinstall.md

add warning class to blogquote

* Update ubuntu.md

add warning class to blogquote

* Update https.md

add warning class to blogquote

* Update swarm_manager_locking.md

add warning class to blogquote

* Update dockerlinks.md

add warning class to blogquote

* Update deploying.md

add warning class to blogquote

* Update deploying.md

add warning class to blogquote

* Update insecure.md

add warning class to blogquote

* Update discovery.md

add warning class to blogquote

* Update dockerd.yaml

add warning class to blogquote

* Update docker_secret_rm.yaml

add warning class to blogquote

* Update docker_service_rm.yaml

add warning class to blogquote

* Update docker_secret_rm.yaml

add warning class to blogquote

* Update scale-your-cluster.md

add warning class to blogquote

* Update resource_constraints.md

add warning class to blogquote

* Update binaries.md

add warning class to blogquote

* Update content_trust.md

add warning class to blogquote

* Update secrets.md

add warning class to blogquote

* Update index.md

add warning class to blogquote

* Update install-sandbox-2.md

add warning class to blogquote

* Update docker-toolbox.md

add warning class to blogquote

* Update index.md

add warning class to blogquote

* Update centos.md

add warning class to blogquote

* Update debian.md

add warning class to blogquote

* Update faqs.md

add linebreak after Looking for popular FAQs on Docker for Windows?

* Update install.md

add linebreake after **Already have Docker for Windows?**

* Revert "Update dockerd.yaml"

This reverts commit 3a98eb86f700ade8941483546c33f69a9dab8ac3.

* Revert "Update docker_secret_rm.yaml"

This reverts commit 5dc1e75f37033932486c11287052b7d64bf83e55.

* Revert "Update docker_service_rm.yaml"

This reverts commit a983380a5625b471f1a03f8ed2301ead72f98f1b.

* Revert "Update docker_secret_rm.yaml"

This reverts commit 4c454b883c300e26fbb056b954bb49ec2933b172.
2017-04-25 11:33:27 -07:00
Misty Stanley-Jones 55be185ad2 Merge pull request #878 from ceharris/patch-1
use correct default socket path
2016-12-19 14:21:37 -08:00
Kazuhiro NISHIYAMA 4938b0aa81 Remove needless dot (#881) 2016-12-14 14:11:17 -08:00
Adrien Duermael 94c80bece5 fixed absolute links (#883)
* fixed absolute links

Signed-off-by: Adrien Duermael <adrien@duermael.com>

* forgot one link in opensource/kitematic/set_up_dev

Signed-off-by: Adrien Duermael <adrien@duermael.com>
2016-12-14 14:10:46 -08:00
Carl Harris b1f728062c use correct default socket path
Document previously specified the default location of the Docker socket as `/var/tmp/docker.sock`; the correct location seems to be `/var/run/docker.sock`.
2016-12-14 05:02:03 -05:00
Gaetan 3544131970 fix type of keywords entry in frontmatter (in /docker-for-mac/ dir) (#496)
keywords should be a string, not an array containing one string

Signed-off-by: Gaetan de Villele <gdevillele@gmail.com>
2016-11-09 16:38:09 -08:00
Misty Stanley-Jones eb5c8670bc Change instances of alias: to redirect_from:
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
2016-11-04 17:07:02 -07: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 1a193d749b Revert "Merge pull request #437 from gdevillele/fix_keywords_format"
This reverts commit 13ddc1350e, reversing
changes made to 7a11f05943.
2016-11-04 13:33:29 -07:00
Gaetan 8bb4d6226a fix more frontmatter keywords values (#439)
* fix format of frontmatter keyword entry in some .md files

Signed-off-by: Gaetan de Villele <gdevillele@gmail.com>
2016-11-04 10:48:38 -07:00
Adrien Duermael 8fa5f3a5de absolute links to docs.docker.com are now relative links
Signed-off-by: Adrien Duermael <adrien@duermael.com>
2016-11-01 17:01:41 -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
John Mulhausen 066b78bf86 Content rendering fixes 2016-09-30 01:51:56 -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 5f5eb93dfa Moved pinata imported docs to top level subdirectory 2016-09-29 12:11:53 -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 52a1ad7609 Initial import of https://github.com/docker/pinata 2016-09-28 20:40:01 -07:00