Commit Graph

298 Commits

Author SHA1 Message Date
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 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
Sebastiaan van Stijn f48a3adc2d
_includes/cli.md: remove "validation" for include-file
Removing this "check" because it made the template difficult to
read, and duilding the docs won't fail if these values are missing.

If a page is empty, it's probably fast to find why anyway.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-04-23 10:00:46 +02:00
Sebastiaan van Stijn 3ad5c44957
_includes/cli.md: some small changes in template:
- remove some redundant whitespace
- use "remove_first" instead of "replace", because the strings to
  replace should only occur once.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-04-23 10:00:44 +02:00
Sebastiaan van Stijn 66d0e68df6
_includes: use absolute links instead of links to Markdown files
We cannot use relative links in includes, because:

- The jekyll-relative-links, is not called on includes, so
  markdown-links are rendered as-is.
- These files are included in various locations on the website;
  because of that, it's not possible to compose a relative link
  to other Markdown files, so we're falling back to using absolute
  URLs, relative to the root of the website.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-04-23 10:00:42 +02:00
Sebastiaan van Stijn c48c971d93
_includes/cli.md: remove special case for base command
The base command didn't have a description in the YAML file.
Instead of fixing that up in the template, this was fixed upstream.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-04-20 15:38:52 +02:00
Usha Mandya 4d3068792f Add link to CLI experimental features 2020-04-17 17:12:46 +01:00
Sven Dowideit d5e7a26efe
Mention Docker 19.03 and its compose file version - and add max_replicas_per_node
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2020-04-17 08:49:33 +02:00
Sebastiaan van Stijn 9b74d86033
remove unused images
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-04-12 22:35:10 +02:00
Sebastiaan van Stijn f8347be151
Merge pull request #10579 from usha-mandya/docs-footer-patch
Update Docs header and footer
2020-04-08 08:40:20 +02:00
Usha Mandya 7b804135dd Update Docs header and footer
- Updated the footer to remove redundant links and ensured the entries and layout match the footer displayed on the WWW site.
- Removed Sign in and Create Docker ID option from the header
- Removed Get Support from the right-nav
2020-04-08 07:26:52 +01:00
Sebastiaan van Stijn d813acb6e1
Engine: reorganize install topic
- Move getting started overview to /get-started/overview/
- Move engine installation files under /engine/
- Redirect the top-level /install/ to /get-docker/
- Updated titles in left-hand navigation
- Added back some pages to the navigation that were
  currently not included.
- Reduce some steps in the installation pages
- Move devicemapper prerequisites to the devicemapper
  storage driver page.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-04-06 10:50:28 +02:00
Justin Cormack e9a37e9cce
Consistently use docker-desktop for Kube context (#10560)
This changed and both work, but this is the correct form.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2020-04-02 12:15:22 +01: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
Ashwin Maroli 02d087c63a
Stash computed data in a Liquid variable (#10462)
* Stash computed data in a variable

To avoid computing `site.data[include.datafolder][include.datafile]` multiple times for the same context.

* Revert change to hard-tab whitespace
2020-03-20 13:08:19 +00:00
Sebastiaan van Stijn 4cf38f289f
compose-file: reformat and rewrite some tips/notes
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-03-17 13:59:44 +01:00
Sebastiaan van Stijn e6a8b7e5e4
Reference: add anchor-link to examples section
Some commands provide a long list of options, which may
"hide" the examples section. To help discoverability, add
an anchor-link to the examples section (if present).

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-03-16 13:13:51 +01:00
Sebastiaan van Stijn 252db13907
Reference: move "extended description" above "options"
The extended description usually provides a good introduction to
the command, which likely is useful to read before heading to
more detailed information (such as "which options does this command
have")

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-03-16 13:09:27 +01:00
Sebastiaan van Stijn a76cbe68a7
Reference: move "parent", "child", and "related" commands to bottom
For some commands, the list of "related" commands is lenghty, therefore
hiding the extended description and examples below the fold, which is
not ideal.

This patch moves the "parent command", "child commands", and "related
commands" sections to the bottom of the page.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-03-16 13:06:48 +01:00
Sebastiaan van Stijn 73c9649967
Move "Glossary" from top nav to "reference" section
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-03-14 09:10:38 +01:00
Usha Mandya a4ae7f1b7c
Updated Desktop URLs and removed CSP and EE URLs (#10322)
* Updated Desktop URLs and removed CSP and EE URLs

* Added Get started and removed Get docker URLs
2020-02-20 14:37:40 +00:00
Usha Mandya f2c116d7df
update the experimental blurb (#10185) 2020-01-23 17:54:07 +00:00
KoryKessel-Docker 2f1fc8b27e Edited the ee_dropdown.html file (the header for the UCP/DTR previous version note) for clarity. 2020-01-09 16:09:45 +01:00
KoryKessel-Docker 2a909ce470 Fix of indenting (attempt 2). 2019-12-20 14:32:09 +01:00
KoryKessel-Docker 282169ffe3 Fix of indenting (attempt 1). 2019-12-20 14:22:48 +01:00
KoryKessel-Docker 67f49c63d2 Appending of Enterprise Label to all Docker Enterprise md topic files. 2019-12-18 15:53:23 +01:00
Sebastiaan van Stijn 8b53965237 Commandline reference: add note to "enterprise only" subcommands (#10008)
* Update CLI template for "enterprise-only" commands/plugins

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

* reference: mark "assemble" subcommands as enterprise-only

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

* reference: mark "cluster" subcommands as enterprise-only

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

* reference: mark "registry" subcommands as enterprise-only

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

* reference: mark "template" subcommands as enterprise-only

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-12-11 15:48:32 +00:00
Adrian Plata f8eb071cec Get started migration (#9967)
* moving ee install instructions (#1449)

Signed-off-by: Adrian Plata <adrian.plata@docker.com>

* adding additional links

Signed-off-by: Adrian Plata <adrian.plata@docker.com>

* deleting overview page and adding a redirect
2019-12-09 17:22:15 +00:00
Adrian Plata faa3e53933
Adding links to further documentation (#9940)
Signed-off-by: Adrian Plata <adrian.plata@docker.com>
2019-11-25 14:31:24 -08:00
Rupak Ganguly 7f62d13fce
Add the missing instruction to add the repo
This change is only affecting the RHEL 7/8 portion of the doc.
2019-11-19 15:07:02 -05:00
Akihiro Suda 40747fcca7 Add "Run the Docker daemon as a non-root user (Rootless mode)"
Add "Run the Docker daemon as a non-root user (Rootless mode)":
`engine/security/rootless.md`

The content is based on https://github.com/moby/moby/blob/master/docs/rootless.md

`rootless.md` in `moby/moby` will be replaced of the link to
the `docs.docker.com` page compiled from `rootless.md` in this repo.

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2019-11-15 16:02:08 +09:00
Adrian Plata bcc19e3ae8 RHEL 8 instructions for Nov patch
Signed-off-by: Adrian Plata <adrian.plata@docker.com>
2019-11-13 14:32:11 -08:00
lena-larionova 54ca6a523b
Fixing glossary links (#9812)
Signed-off-by: Lena Larionova <lena.larionova@docker.com>
2019-11-06 11:00:13 -08:00
Adrian Plata e7360acc79
Pointing to new experimental information section (#9569)
Signed-off-by: Adrian Plata <adrian.plata@docker.com>
2019-10-03 13:08:12 -07:00
Alastair Smith 2da010d9f8 change global header wording 2019-10-02 14:44:10 -05:00
Alastair Smith bd48da763b re-organize + fix global header 2019-10-01 08:51:34 -05:00
Adrian Plata fc4d3872c4 Emphasizing no production environments for experimental features
Signed-off-by: Adrian Plata <adrian.plata@docker.com>
2019-09-27 10:50:22 -07:00
Usha Mandya a556c61cf7
Merge pull request #9351 from thaJeztah/remove_library_samples
Remove library samples, and link to Docker Hub instead
2019-09-23 16:21:57 +02:00
Adrian Plata 972d1929bd simply the experimental box
Signed-off-by: Adrian Plata <adrian.plata@docker.com>
2019-09-18 14:35:33 -07:00
Adrian Plata f2f0dca20c
Fixing broken sidebar (#9425)
Signed-off-by: Adrian Plata <adrian.plata@docker.com>
2019-09-10 13:24:40 -07:00
Sebastiaan van Stijn 5d85af7501
Change library references navigation to an anchor
Don't generate a TOC

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-09-04 00:25:28 +02:00
Sebastiaan van Stijn b34cf6b8c1
Use canonical URL for library images
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-09-04 00:03:13 +02:00
Sebastiaan van Stijn f9f5f8dacd
Convert library samples to stubs
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-09-03 23:03:51 +02:00
Usha Mandya dabe90cbe8
Updating Docker for Win Community content (#9256)
Docker Desktop (Windows) content updates
2019-08-21 15:58:12 +01:00
usha-mandya 6cd4119eef Adding info on enabling exp features via the UI 2019-07-25 14:25:17 +01:00
Dawn W 6672390680 removed Platform from table heading per feedback from Jim Armstrong (#1224) 2019-06-18 14:36:03 +02:00
paigehargrave 6a6a150262
Minor wording update 2019-06-15 07:41:32 -04:00
David Yu 4bdfc4b29d
Updates from Marketing 2019-06-14 14:31:21 -07:00
Maria Bermudez 01277a66f5
Merge branch 'amberjack' into master 2019-06-13 19:10:41 +01:00
Sebastiaan van Stijn 05d91b90f3
Add Engine API version v1.40
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-06-13 15:05:36 +02:00