Commit Graph

96 Commits

Author SHA1 Message Date
Wang Jie cbb785bdf0 Update configure-dns.md (#4201) 2017-08-15 16:30:40 -07:00
Wang Jie c7211ae58c Update get-started-macvlan.md (#4191) 2017-08-14 12:58:07 -07:00
Misty Stanley-Jones c9df105184 Add the -d flag to networking example (#3820) 2017-07-05 11:05:24 -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
Misty Stanley-Jones 7df267c9e3 Document new DOCKER-USER iptables chain (#3554)
* Document new DOCKER-USER iptables chain

* Rewording
2017-06-28 08:31:29 -07:00
Misty Stanley-Jones 387c4f5025 remove extra -o flag (#3712) 2017-06-26 16:19:53 -07:00
Sergey Sarbash a145f69b6c Create index.md (#3611) 2017-06-20 11:46:01 -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
Misty Stanley-Jones 415a358d7e Recommend using swarm services instead of network aliases for load balancing (#3087) 2017-05-10 11:10:31 -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
Misty Stanley-Jones e7d06e2d65 Update several aspects of the networking intro (#2882) 2017-04-18 19:29:43 -05:00
Shubheksha Jalan 6075f7115d add note about DNS server IP (#2822) 2017-04-18 13:19:31 -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
John Mulhausen add2f680e8 Default highlight.js off, dockerfile > conf highlighting, pygments (#2757)
* Default highlight.js off, dockerfile > conf highlighting, pygments

* Address feedback, style changes, markdownify reductions

* Getting rid of more markdownify

* Fix for right-hand nav spacing
2017-04-13 17:10:29 -07:00
Philip Vrieni S. Arguelles ffb954c931 Update container-communication.md (#2740)
remove 'else' for clarity
2017-04-12 10:35:54 -07:00
tiilikainen fb4ff10d9d Update work-with-networks.md (#2680)
Corrected a small formatting error.
2017-04-07 13:11:11 -07:00
Misty Stanley-Jones a75280f77b Use a real image in network example (#2570) 2017-03-30 16:03:00 -07:00
Jim Galasyn 9f8b9d78d5 Fix bridge image (#2502) 2017-03-27 16:53:27 -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
Alan Thompson 5ce24b0587 Update work-with-networks.md (#2236)
Clarify what is being connected to the network.
2017-03-09 17:10:04 -08:00
Alan Thompson dfd33195bd Update work-with-networks.md (#2235)
Fix typo 3 -> 4.  Add clarification that we are using container4 to ping container4.
2017-03-09 16:46:28 -08:00
Misty Stanley-Jones c9ac1eedeb Merge pull request #2215 from cloojure/patch-2
Update work-with-networks.md
2017-03-09 15:50:35 -08:00
Misty Stanley-Jones 7a61d77d70 Merge pull request #2214 from cloojure/patch-1
Update work-with-networks.md
2017-03-09 15:49:06 -08:00
Alan Thompson 317a695a03 Update work-with-networks.md
grammer error
2017-03-08 19:09:27 -08:00
Alan Thompson 1dbafefda6 Update work-with-networks.md
small typo
2017-03-08 18:57:25 -08: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
Wang Jie de9a0b0fc0 Update index.md (#1965)
Is a "delete" missing here? Or, shall we change this to "connect containers to and disconnect from it"?
2017-02-27 22:39:26 -08:00
Misty Stanley-Jones de2d6f8191 Fix grammar
Fixes #1911
2017-02-22 13:37:22 -08:00
scjane 41e15067ca Update work-with-networks.md (#1810) 2017-02-17 18:19:04 -08:00
scjane 18a5047bfa Update index.md (#1739) 2017-02-16 01:10:04 -08:00
scjane 4284e25bb2 Update index.md (#1735) 2017-02-16 01:09:41 -08:00
Jay Linski 01f332f45c Fix missing closing tags (#1401) 2017-01-26 14:12:02 -08:00
Misty Stanley-Jones 7d5a0f1011 Merge pull request #1337 from trapier/macvlan_intro
Remove experimental intro from macvlan (#1335)
2017-01-25 12:19:30 -08:00
Misty Stanley-Jones ef95a915eb Fixing broken links
Formatting improvements along the way
2017-01-25 11:51:14 -08:00
Trapier Marshall 534bc0e0c2 Remove experimental intro from macvlan (#1335)
Opening sentence does not read after this sentence was migrated from
experimental.

Signed-off-by: Trapier Marshall <trapier.marshall@docker.com>
2017-01-23 16:16:01 -05: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 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