Commit Graph

48 Commits

Author SHA1 Message Date
Misty Stanley-Jones b73e47a96d Fix a typo (#4528) 2017-09-06 16:31:39 -07:00
Misty Stanley-Jones 572f174e23 Improvements to IPv6 topic (#4071) 2017-08-29 15:10:56 -07:00
Stuart Chaney c4729640f9 removed quotes from --fixed-cidr-v6 assignment (#4246) 2017-08-17 15:00:15 -07:00
Wang Jie 53ef7cf571 Update ipv6.md (#4233) 2017-08-17 14:47:39 -07:00
Wang Jie 5fd7f0475e Update custom-docker0.md (#4215) 2017-08-17 14:47:11 -07:00
Wang Jie de023229c2 Update binding.md (#4210) 2017-08-17 14:46:15 -07:00
Wang Jie 2b259e0047 Update dockerlinks.md (#4209) 2017-08-17 14:44:25 -07:00
Trapier Marshall 1a54ee3773 clarify route ownership in ipv6 user guide (#3765)
Make it clear which host owns which route by replacing references to "the
host" and "it" with the hostname that owns the route.

Signed-off-by: Trapier Marshall <trapier.marshall@docker.com>
2017-06-30 16:45:17 -07:00
Taio Jia a22db0902b Fix unmarshal issue (#3545)
If set to `"mtu": "1500"` will got an error:
```
unable to configure the Docker daemon with file /etc/docker/daemon.json: json: cannot unmarshal string into Go value of type int
```
That code can not unmarshal string into Go value of type int, I changed the type from string to int.
2017-06-12 17:02:40 -07:00
Misty Stanley-Jones 968f76eced Use daemon.json everywhere possible (#3252) 2017-05-15 10:44:40 -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
Shubheksha Jalan 8cce48c9bf Fix ipv6 netmask (#2957)
* fix ipv6 netmask

* fix ipv6 netmask in image

* fix range

* fix range

* fix range
2017-04-22 19:24:31 -05:00
Steven Hanna 9caf13ef87 spelling fixes without yaml (#3006) 2017-04-22 10:39:57 -07:00
Steven Hanna 9a3c20b74a Explaining the default iptables FORWARD DROP policy (#2941)
* Explaining the default iptables FORWARD DROP policy

* Copy edits
2017-04-21 13:03:42 -05:00
ashishkamat2791 db000dc33f Add custom docker0 configuration examples (#2894) 2017-04-21 12:26:17 -05:00
Shubheksha Jalan cffdc1e574 fix ipv6 netmask (#2968) 2017-04-21 11:00:20 -05:00
Shubheksha Jalan 6afa8b7879 fix ipv6 netmask (#2958) 2017-04-20 11:36:22 -05:00
John Mulhausen 8820cfa6ff New 6-page "Get Started" (#2296)
* Create index.md

* Create part2.md

* Create part3.md

* Create part4.md

* Create part5.md

* Rewrite step 2

* Update part2.md

* Update part2.md

* Update part2.md

* Update part2.md

* Update part2.md

* Update part2.md

* Update index.md

* Rewrite of part 3

* Tabs-based swarm instructions, pass 1

* Rewrite of parts 3 and 4, tabs implementation

* Navigation, rewrites, part 4 completion

* Part 5 w/Redis

* Part 5, compelte Redis, rename part 6

* TOC/redirect implementation

* Update part6.md

* Changing links to point to new tutorial

* Rewrites and asciinemas

* Fix overview

* Label diagrams

* Fix button

* Fix link to where Stacks are covered

* Fix typo

* s/file/directory

* Reformat paragraph

* Shorten tabs

* Typos

* Release DTR 2.2.4, 2.1.6

* Go back to small /edge (#2736)

* Go back to small /edge

* Update site front page

Add info about Editions
Reorganize components
Update headings

* Move logic of fetching content to a script

* Add v1.28 API

* Add info about versioned API

* Fix a few 404s (#2785)

* Fix typo

* Propose use of another word (#2791)

I think that interested is better than invested, in this case.

* Update secrets.md (#2780)

remove correct secret

* Change mount syntax on windows from //c/ to c:\ (#2761)

LGTM

* Update hackathon.md (#2773)

* nodes.md grammar correction (#2802)

* Grammar and formatting check (#2797)

* Wrong article

If the first word starts with a vowel sound you use an. If the first word has a consonant sound use a.

* Making the text bold

Removing backticks because probably the text needs to be bold and not marked as code.

* Update overview.md (#2805)

It should say 'predecessors', not 'successors'. Otherwise the sentence and the subsequent example don't make sense.

* shrink some big images (#2798)

Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>

* #2627 (#2804)

- Fix right sidebar overflow on rescale

* Update hackathon.md

* change pre-build to pre_build to remove confusion (#2813)

* change pre-build to pre_build to remove confusion

* clarify that pre_build hook refers to a file

* Update TOC to sentence case (#2790)

* add more info about DTR on the overview page (#2794)

fix #1904

* Update glossary.yaml (#2807)

Fix #2575.

* fix imports since docker api pkg migration, fix example repository name to be canonical (#2806)

* tweak: code format for filename (#2829)

* tweak: code format for filename

slight reword, so as to avoid confusion w/filename

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

* small changes just to kick build again

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

* Update hackathon.md

* fix broken links (#2808)

* fix broken link (#2809)

* [CONTRIBUTING] update broken link (#2826)

* [Debian] add gnupg2 requirement for stretch (#2823)

* TOC/redirect implementation

* Changing links to point to new tutorial

* Rewrites and asciinemas

* Fix bad merge

* Metadata, formatting

* Front page formatting, link instrumentation
2017-04-18 03:32:37 -05:00
Philip Vrieni S. Arguelles ffb954c931 Update container-communication.md (#2740)
remove 'else' for clarity
2017-04-12 10:35:54 -07:00
Misty Stanley-Jones a75280f77b Use a real image in network example (#2570) 2017-03-30 16:03:00 -07:00
David Greaves 66996126eb bridge option syntax (#2342)
It seems that the syntax is either:
-b <bridge>
or
--bridge=<bridge>
2017-03-16 20:04:09 -07:00
Misty Stanley-Jones fb7c73908b Update the styleguide (#2332)
* Update the styleguide

Also normalize admonition titles with the colon outside the bold.
2017-03-15 09:46:30 -07:00
Jason Levine ee05ddfb21 Remove incorrect iptables-related information
At the current time, Docker flushes any pre-existing DOCKER and DOCKER-ISOLATION chains, meaning that the previous advice was misleading and led users in the wrong direction regarding restricting access to containers via iptables.
2017-03-04 19:17:01 -05:00
David Xia 142e4a95bb
Fix typo in networking docs
should be "nameserver" instead of "server."
2017-03-02 13:23:27 -05:00
Misty Stanley-Jones ef95a915eb Fixing broken links
Formatting improvements along the way
2017-01-25 11:51:14 -08:00
snesneros fa1b47d5d1 Close 'code' html elements (#1292)
There were missing slashes in the closing tags, causing the page to display incorrectly.
2017-01-20 11:26:37 -08:00
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 e6134824f9 Fix image in ipv6 file
Fixes #738
2016-12-09 14:10:00 -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
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
John Mulhausen bd630e9e3b Update dockerlinks.md 2016-10-19 22:53:52 -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
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
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
Misty Stanley-Jones 9d5e59d503 Moved engine imported docs to the engine subdirectory 2016-09-29 11:19:31 -07:00