Commit Graph

51 Commits

Author SHA1 Message Date
Misty Stanley-Jones 46e044ec59 Fixing double curly braces 2017-01-19 11:09:49 -08:00
Misty Stanley-Jones e3a3145cd9 Sync vnext-engine branch to docker/docker SHA 2f12d2808464dcfdf45e0920fd508ce0ff12bd29
This branch will contain forward-looking Engine-specific docs
and be the equivalent of docker/docker master for docs
2017-01-19 10:10:15 -08:00
Misty Stanley-Jones fb0aff7371 Merge pull request #1118 from ljing-organizaiton/master
Update get-started-macvlan.md
2017-01-18 15:48:06 -08:00
Tom Hastjarjanto 5fb142c5e9 Fix documentation regarding protocol 50 (ESP) (#1144)
The documentation should clarify that its protocol 50 and not port 50 that should be allowed between nodes.
2017-01-17 12:54:03 -08:00
Elan Ruusamäe 4d93b73784 Update get-started-overlay.md (#1082)
* Update get-started-overlay.md

* Update get-started-overlay.md

perhaps renderer can't do multiline markdown links

* Update get-started-overlay.md
2017-01-13 13:12:50 -08:00
Bingshen Wang c06c398c4a fix typo in get-started-macvlan.md (#1121) 2017-01-13 13:05:44 -08:00
lj8930 3dbad619ff Update get-started-macvlan.md
fix typo
2017-01-13 11:16:40 +08:00
Bingshen Wang 9111c8b52c Update index.md
fix the typo
2016-12-29 09:55:50 +08:00
Peter Dave Hello 5919563eb8 Lossless Image optimization (#959)
* re-compress jpg images losslessly using jpegoptim

* re-compress png images losslessly using zopflipng
2016-12-21 11:12:13 -08:00
Wallace Roque 7f8a0186ac Correcting formatting (#914)
Fixed references to bash code, numbering of lists and some indentations.
2016-12-15 18:05:06 -08:00
Misty Stanley-Jones efd865f13f Merge pull request #235 from mstanleyjones/96_working_with_networks
Rewrites to the 'Working with Networks' topic
2016-12-12 11:09:50 -08:00
Misty Stanley-Jones e6134824f9 Fix image in ipv6 file
Fixes #738
2016-12-09 14:10:00 -08:00
Adrien Duermael 50ee158a65 CI - added test for keywords in markdown frontmatters (#805)
* added test for keywords

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

* fixed keywords in some md files for tests to pass

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

* fixed keywords in /datacenter

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

* tests/Dockerfile: no need to add git

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

* tests/Dockerfile: changed maintainer

Signed-off-by: Adrien Duermael <adrien@duermael.com>
2016-12-06 16:45:11 -08:00
Misty Stanley-Jones d0fb13dc13 Add redirect for /articles/networking/
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
2016-11-23 16:36:35 -08:00
Misty Stanley-Jones 013d8f09fd Merge pull request #631 from mstanleyjones/followup_link_flag
Add a little more clarification about --link
2016-11-23 12:28:04 -08:00
Alessandro Boch d3155b9482 About the docker_gwbridge network (#400)
* About the docker_gwbridge network

Signed-off-by: Alessandro Boch <aboch@docker.com>
2016-11-23 12:21:33 -08:00
Misty Stanley-Jones 0fb5e646a6 Update 'Working with networks' topic
Verify all the steps, make modifications where necessary
Rewrite for grammar and clarity
Add explanation for unclear sections
Adapt some sections to a stepped tutorial style

Signed-off-by: Misty Stanley-Jones <misty@docker.com>
2016-11-23 12:09:13 -08:00
Misty Stanley-Jones d27ac5e970 Add a little more clarification about --link
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
2016-11-17 14:54:22 -08:00
Misty Stanley-Jones 185b5db95d Provide clarification on status of `--link`
Fixes #353
2016-11-15 10:32:58 -08:00
Gaetan a5e01e1844 fix type of keywords entry in frontmatter (in /engine/) (#552)
keywords should be a string, not an array containing one string

Signed-off-by: Gaetan de Villele <gdevillele@gmail.com>
2016-11-11 14:45:24 -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
Misty Stanley-Jones 66a183b254 Merge pull request #451 from aboch/movl
Clarify the mtu option is supported by overlay driver
2016-11-04 16:09:33 -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
Alessandro Boch 932be92012 Clarify the mtu option is supported by overlay driver
Signed-off-by: Alessandro Boch <aboch@docker.com>
2016-11-04 15:00:21 -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
Misty Stanley-Jones 33d3d067d0 Revert "fix some frontmatter keywords values" 2016-11-04 13:30:04 -07:00
Misty Stanley-Jones 13ddc1350e Merge pull request #437 from gdevillele/fix_keywords_format
fix some frontmatter keywords values
2016-11-04 10:50:53 -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
Gaetan de Villele 7a11f05943 fix some frontmatter keywords values
Signed-off-by: Gaetan de Villele <gdevillele@gmail.com>
2016-11-03 10:22:12 -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
Adrien Duermael e7ab7f7d03 removed menu.md files
Signed-off-by: Adrien Duermael <adrien@duermael.com>
2016-10-31 13:45:56 -07:00
lbausch 110d94b9a1 Add missing whitespace 2016-10-27 14:04:36 +02:00
4c74356b41 d24834fceb fixing typo 2016-10-22 12:37:05 +03:00
John Mulhausen bd630e9e3b Update dockerlinks.md 2016-10-19 22:53:52 -07:00
John Mulhausen 60c9df35d9 Merge pull request #282 from mstanleyjones/add_macvlan_to_toc
Add get-started-macvlan.md to TOC
2016-10-19 22:51:38 -07:00
Misty Stanley-Jones d92715537f Merge pull request #230 from afrazkhan/master
Info about IP 50 needing to be open
2016-10-19 14:52:10 -07:00
Misty Stanley-Jones 9c1de966a7 Add get-started-macvlan.md to TOC
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
2016-10-19 13:45:14 -07:00
Ding Fei bab82e94f6 Fix typos and updated a few links, some sentences.
Signed-off-by: Ding Fei <dingfei@stars.org.cn>
2016-10-18 17:04:10 +08:00
Afraz Ahmadzadeh dcfbf407b0 Typo in docs 2016-10-18 07:58:08 +02:00
Afraz Ahmadzadeh 0dcdc43cb1 Info about IP 50 needing to be open 2016-10-17 10:29:28 +02:00
vishesh92 78ff6bf07e fix formatting in container-communication.md
fix formatting in container-communication.md so page is rendered perfectly at https://docs.docker.com/engine/userguide/networking/default_network/container-communication/
2016-10-10 17:58:48 +05:30
John Mulhausen 8bfa1bda07 Merge pull request #114 from benizi/fix/raw-variables-targeted
Prevent Liquid from mangling `{{` in a more targeted way
2016-10-07 13:30:05 -07:00
John Mulhausen dec694d0d3 Update configure-dns.md 2016-10-06 21:59:42 -07:00
Benjamin R. Haskell 362e94b2bc Disable Liquid templating for blocks with `{{`
Instead of disabling templating for entire files, fix instances
individually by wrapping blocks in:

    ```{% raw %}
    ... content ...
    {% endraw %}```

Signed-off-by: Benjamin R. Haskell <docker@benizi.com>
2016-10-07 00:58:08 -04:00
Benjamin R. Haskell 65ec3a3763 Revert pull request #48
Reverts commit b3a620808a in order to
replace it with more-targeted blocks.
2016-10-07 00:56:17 -04:00
John Mulhausen bdc4a3b934 Fix for Embedded DNS server 2016-10-06 17:12:47 -07:00
Benjamin R. Haskell b3a620808a Fix formatting for Markdown files containing `{{`
They're usually examples of Go-style text templates.  But, Liquid templating is treating them as variable substitutions.  E.g., in `engine/reference/commandline/ps.md`:

```bash
$ docker ps --filter volume=remote-volume --format "table {{.ID}}\t{{.Mounts}}"
```

is rendered as:

```bash
$ docker ps --filter volume=remote-volume --format "table \t"
```

Solution is to wrap entire files in `{% raw %} ... {% endraw %}` blocks.
2016-10-05 01:58:24 -04:00
John Mulhausen 066b78bf86 Content rendering fixes 2016-09-30 01:51:56 -07:00
John Mulhausen 42964d8b7d Removing empty front-matter 2016-09-29 22:39:30 -07:00
Misty Stanley-Jones d53c6798c9 Convert TOML to YAML, tweaks to work with Jekyll 2016-09-29 17:16:03 -07:00