Commit Graph

54247 Commits

Author SHA1 Message Date
Usha Mandya 17ffe8e050 Add docs for seat-based pricing 2020-05-14 15:30:00 +01:00
Usha Mandya 4e5a8ae816
Merge pull request #10754 from StefanScherer/link-wsl-to-tech-preview
Add redirect until WSL 2 GA
2020-05-04 16:11:48 +00:00
Stefan Scherer c80929b648
Add redirect until Win 10 v2004 GA
Signed-off-by: Stefan Scherer <stefan.scherer@docker.com>
2020-05-04 17:07:59 +02:00
Usha Mandya fd2690c2a8
Merge pull request #10740 from thaJeztah/ee_fix_link
[ee] fix various broken links
2020-05-04 09:21:15 +00:00
Sebastiaan van Stijn 4169b468f4
Merge pull request #10683 from ajay143444/patch-7
added apostrophe s with process in 'on the process` own copy of the page'
2020-05-01 18:33:21 +02:00
ajay143444 aa57de37d3
Few corrections and suggestions in doc (#10728)
* Removed is from line 80

Removed is from line 80 as this is not required

* changed text to link at line 129

changed text to link at line 129 to make it easy for user to navigate

* changed the URL to link

changed the URL to link for easy navigation

* added these before flags in line 186

added these before flags in line 186

Co-Authored-By: Sebastiaan van Stijn <thaJeztah@users.noreply.github.com>
2020-05-01 18:30:28 +02:00
Usha Mandya ba7819fed6
Add Docker Desktop Overview topic (#10718)
* - Added a new Overview topic for Docker Desktop
- Moved Dashboard up one level and removed OS-specific topics and images from the Mac and Windows directories

* Updated the Desktop TOC
- Moved Install topics above Getting started topic
- Moved Open source licensing up one level
- Removed OS-specific topics

* Fix review comments
2020-05-01 08:43:25 +01:00
Sebastiaan van Stijn 56e21c272f
[ee] fix various broken links
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-04-30 23:14:47 +02:00
Sebastiaan van Stijn 391772e158
DD: fix broken links in release notes (#10735)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-04-30 18:59:03 +01:00
Sebastiaan van Stijn 3ce8fd8006
Merge pull request #10724 from ajay143444/patch-10
changed line 56 by adding do before not
2020-04-30 12:15:37 +02:00
Sebastiaan van Stijn 9e5cd6fb2e
Merge pull request #10725 from usha-mandya/relnotes-patch
Update release note URLs
2020-04-30 10:46:23 +02:00
Usha Mandya 96635c4084 Update release note URLs 2020-04-30 08:20:23 +01:00
Sebastiaan van Stijn 5de7f57431
fix link to service create reference docs (#10726)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-04-30 06:36:59 +01:00
Sebastiaan van Stijn 00c2a5a264
engine/swarm: reduce width of service ps output example (#10727)
The docs refer to the `CURRENT STATE` column, which may not
be visible without scrolling, so tweaking the column-widths
a bit so that it better fits.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-04-30 06:35:37 +01:00
Sebastiaan van Stijn 8e1f57f6cc
Merge pull request #10723 from ajay143444/patch-9
removed with from line 41
2020-04-30 00:31:33 +02:00
ajay143444 b37c6506d8
changed line 56 by adding do before not
changed line 56 by adding do before not
2020-04-29 17:55:29 +05:30
ajay143444 10dfe1827d
removed with from line 41
removed with from line 41 as it is not required
2020-04-29 16:26:00 +05:30
Usha Mandya 2290c17e5b
Merge pull request #10714 from thaJeztah/fix_links_with_plugin
Replace JavaScript link fix with  custom plugin
2020-04-28 15:29:22 +00:00
Usha Mandya 127700dec7
Release notes for Desktop Edge 2.3.0.1 (#10712) 2020-04-28 16:28:58 +01:00
Sebastiaan van Stijn 9660a33356
update engine reference with latest changes from 19.03 (#10716)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-04-28 11:44:45 +01:00
Sebastiaan van Stijn 9cab4195c0
Replace JavaScript link fix with custom plugin
This replaces the JavaScript link fix script with a custom plugin,
based on the jekyll-relative-link plugin, and modified so that it
can be used as Liquid "filter".

While it borrows from the jekyll-relative-links plugin, it takes some shortcuts;

- We use the code from jekyll-relative-links plugin to find/extract
  links on the page
- Relative links are converted to absolute links, using the path of
  the markdown source file that's passed as argument
- After conversion to an absolute link, we strip the ".md" extension;
  no attempt is made to resolve the file that's linked to. This is
  different from the jekyll-relative-links plugin, which _does_ resolve
  the linked file. This functionality could be added in future by
  someone who has more experience with Ruby.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-04-28 11:20:51 +02:00
Usha Mandya ecdbded6b2
Merge pull request #10715 from thaJeztah/remove_deploy_stub
engine: remove stub for deprecated top-level "deploy" command
2020-04-28 09:17:41 +00:00
Sebastiaan van Stijn 17ff6ff8fd
engine: remove stub for deprecated top-level "deploy" command
This is a follow-up to d4ead1b120,
which removed the datafile for `docker deploy`, but didn't remove
the stub or removed it from the TOC.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-04-28 10:57:37 +02:00
何锦余 9e5ed34328
fix: fix link url error. (#10702)
If in page https://docs.docker.com/get-started/part2/ or https://docs.docker.com/get-started/part3/, the link url make an error.
2020-04-28 09:18:29 +01:00
Usha Mandya 616a4b7c88
Merge pull request #10698 from thaJeztah/remove_it
remove -it from example, as it's not needed for redis
2020-04-24 12:43:19 +00:00
Sebastiaan van Stijn 48040f57be
Update naming for "Linux Mint", and add note about derivatives (#10696)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-04-24 13:41:06 +01:00
Sebastiaan van Stijn 2ff02c4b2e
remove -it from example, as it's not needed for redis
Adding `-it` on a "detached" (`-d`) container is needed
if the container's main process expects a TTY attached to keep
running.

It's not needed for a redis container, so we can remove it here

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-04-24 14:04:59 +02:00
Sebastiaan van Stijn c7b5373dff
Get Docker: fix broken links and wrap markdown to 80 char (#10691)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-04-24 12:20:18 +01:00
ajay143444 fdc7e5bfd4
replaced based off of with based on (#10684)
replaced based off of with based on
2020-04-24 09:02:50 +01:00
Ivan Cheban a494195c46
Typo: form should be from (#10685) 2020-04-24 09:01:12 +01:00
Usha Mandya 9f8c728bd0
Add support for VirtualBox (#10686) 2020-04-24 08:59:29 +01:00
Usha Mandya 53ca727fcf
Merge pull request #10615 from thaJeztah/relative_links
Use relative markdown links
2020-04-23 15:44:55 +00:00
Sebastiaan van Stijn eb948508c1
various: use relative markdown links
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-04-23 13:03:53 +02:00
Sebastiaan van Stijn 637bf1e066
storage: use relative markdown links
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-04-23 13:03:46 +02:00
Sebastiaan van Stijn c5f3b37ced
registry: use relative markdown links
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-04-23 13:03:43 +02:00
Sebastiaan van Stijn dc1f9f7b4d
network: use relative markdown links
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-04-23 13:03:39 +02:00
Sebastiaan van Stijn b0f9061565
config: use relative markdown links
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-04-23 13:03:36 +02:00
Sebastiaan van Stijn 777c5d23da
engine: use relative markdown links
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-04-23 13:03:32 +02:00
Sebastiaan van Stijn cef68d3fa5
docker-hub: use relative markdown links
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-04-23 13:03:25 +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 9cd60d843e
develop: 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:15 +02:00
Sebastiaan van Stijn 0f3caaca6a
compose: 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:10 +02:00
Usha Mandya 0fffff2ec5
Merge pull request #10549 from thaJeztah/remove_base_href
Template: remove "base href" and fix javascript link-fixing
2020-04-23 11:00:27 +00:00
Sebastiaan van Stijn 342660f7cd
js/anchorlinks.js: remove URL from generated links
Now that we no longer have a baseURL, we can simplify the generated
links to just contain the anchor. This also provents issues if the
visited page already has an anchor set.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-04-23 10:27:59 +02:00
Sebastiaan van Stijn 80c6d185e3
Only fix links on reference pages
The JavaScript "link fix" looks to be only needed for pages
where Markdown is included, and which contain relative links.

Now that we modified all local includes to use absolute links,
the only location where links are not properly generated, is
in the reference documentation.

If broken links are found elsewhere in the website, those links
are legitimately broken, and should be fixed in the markdown
source, not fixed-up afterwards.

This patch moves the javascript to the cli.md include, so that
the script is only run on the reference pages instead of on every
page.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-04-23 10:27:57 +02:00
Sebastiaan van Stijn 75bdec14ee
_layouts/docs.html: remove baseURL and fix link-fixing script
The base href caused browsers to produce incorrect URLs for
anchor links on various pages, for example, pointing to:

    https://docs-test.docker.com/engine/reference/#foreground

Instead of

    https://docs-test.docker.com/engine/reference/run/#foreground

Also cleaning up and fixing the JavaScript workaround for links
in include-files;

- only fix up links in the main content, not in other parts
  of the page
- don't fix up anchor links, absolute links, or links that don't
  contain `.md`: for those we can assume they were generated
  correctly, and if not, those are links that should be fixed in
  the markdown source, not fixed afterwards.
- document the function for future readers.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-04-23 10:27:55 +02:00
Sebastiaan van Stijn 5a26b5f3cd
_layouts/docs.html: use spaces for indentation
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-04-23 10:27:50 +02:00
Sebastiaan van Stijn 8c3ea575e4
_layouts/docs.html: some formatting and minor cleanup
- remove some stray empty lines
- put liquid code that was before the opening HTML inside a HTML
  comment, to prevent IDE's from marking it as invalid HTML
- fix some indentation
- fix some minor linting issues

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-04-23 10:26:23 +02:00
ajay143444 751665478a
added apostrophe s with process
added apostrophe s with process
2020-04-23 13:34:54 +05:30
Sebastiaan van Stijn f39a74da3d
_includes/cli.md: fix generated links to other commands
When generating HTML pages, Jekyll will generate a directory named after the name
of the Markdown file, and generate an index.html file inside that directory. For
example, for a markdown file named /foo/bar/mypage.md, Jekyll generates a HTML
file named  /foo/bar/mypage/index.html.

This means that all links relative to mypage.md, and expect those links to be
relative to the /foo/bar/ directory, will actually end up being relative to
/foo/bar/mypage/.

Unfortunately, Jekyll / Liquid does not have a variable that holds the parent
directory of the _markdown_ file, so we have to generate it by taking `page.path`
(which holds the absolute path of the markdownfile), and remove the filename from
that path.

After generating that path, we prepend that path to URLs linking to related
commands (parent commands and child commands), as all reference files are in the
same path.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-04-23 10:00:48 +02:00