Commit Graph

20 Commits

Author SHA1 Message Date
45541eb90b Fix a typos in docs of networking guide
This fix fixes a typo in the documentation (`dockernetworks.md`)
of networking user guide.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 55b172401851a6338a325ef7930d50ace9efb067
Component: engine
2016-05-21 13:19:05 -07:00
8c00bd5332 optimise docs
Signed-off-by: 搏通 <yufeng.pyf@alibaba-inc.com>
Upstream-commit: 9abf304c255cb3194b932e92f2b87bfabaab88c9
Component: engine
2016-04-21 09:34:28 +08:00
53859297b1 Merge pull request #22086 from aboch/doc
Clarify container external connectivity in multi-network scenario
Upstream-commit: e764e0215e11da40a1e2148efc9867be362bd2d4
Component: engine
2016-04-18 18:16:51 +02:00
27c9033293 doc: fix typo
Signed-off-by: yorkie <yorkiefixer@gmail.com>
Upstream-commit: d2c5bf23f16a98ca6f603f7fe2b5a31c70d4c8db
Component: engine
2016-04-18 23:42:33 +08:00
74a010ee39 Clarify container external connectivity in multi-network scenario
Signed-off-by: Alessandro Boch <aboch@docker.com>
Upstream-commit: c2e088e13488904a6747809a689eac5d72a4618e
Component: engine
2016-04-18 08:39:40 -07:00
6a82bd334a Update dockernetworks.md
Make command line prompts consistent for both host and container shells.

Signed-off-by: Alan Thompson <cloojure@gmail.com>
Upstream-commit: 65a381ae32d86c4cfe3ae5157e53d16b97b4d64f
Component: engine
2016-03-03 16:32:24 -08:00
a4f9e19fdf Update dockernetworks.md
Fix truncated sentence

Signed-off-by: Alan Thompson <cloojure@gmail.com>
Upstream-commit: 549fa67dae346e8f9fe5590f914a97b1a18e46d6
Component: engine
2016-02-19 16:57:13 -08:00
59be9aceed Fix typo error of dockernetworks.md
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
Upstream-commit: f03050cc4c4512f28b74ec2e8fc4bee81b72b4e0
Component: engine
2016-02-19 17:18:52 +08:00
0f9dad85b1 Fix an erratum; s/two/three/
There are three options because the new one was added at 6f863cf.

Signed-off-by: Yi EungJun <eungjun.yi@navercorp.com>
Upstream-commit: 8c93958fcb1b1fc838c76b08cc4dde4ce37691bb
Component: engine
2016-02-13 00:14:35 +09:00
01f2954590 Docs cleanup for networking features added in v1.10
Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: 6f863cfa18f30d1df2f1f81b2b4f456dee2a73b8
Component: engine
2016-02-02 06:10:41 -08:00
e734434f58 Creating Engine specific menu
Fixing the links
Updating with Seb's comments
Adding weight
Fixing the engine aliases
Updating after Arun pushed
Removing empty file

Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: e310d070f498a2ac494c6d3fde0ec5d6e4479e14
Component: engine
2016-01-26 15:58:53 -08:00
819b85bb3a Add Subnets info for user-defined network
* If user doesn't specify the subnets to create a network, it will pick
  subnets from inside preferred pool. This PR aims to inspect these subnets info

* Add integration tests for docker inspect the subnets.

* docker-py project is already synchronized.

* jenkins checks depend on https://github.com/docker/docker-py/pull/888

Fixes issue #18626

Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
Upstream-commit: 5cc672b0061f3df41073cb7b4ff962998a13a09c
Component: engine
2016-01-15 10:03:29 +08:00
b6343dc716 Update dockernetworks.md
fix typo

Signed-off-by: mqliang <mqliang.zju@gmail.com>
Upstream-commit: f480b7c1f576f033ee276a026a790de415b9bf9c
Component: engine
2015-12-16 15:25:06 +08:00
7073afc49a Fix markup for markdown table
Our tooling used to convert Markdown to HTML doesn't
properly handle '|' symbols embeded in code blocks
inside a table.

Changed the table to a plain HTML table as a workaround.

Also fixed indentation levels of two code examples.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: bfdd94b0a8f0641f7bced9d3089a78e9550a7b04
Component: engine
2015-11-25 12:38:15 +01:00
d1c20a52eb Correct some typos for docs
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
Upstream-commit: 4d66f18be07b13cf41c48190d813fc045bb46678
Component: engine
2015-11-24 15:14:32 +08:00
6df421c14f Fixes found by docs validation tool
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: 043f447e2e9ecb9d6f34bcee6c11f20f263baf66
Component: engine
2015-11-23 11:19:38 +10:00
f5f4be1acc Add required ports for Overlay to docs
Fixes #17709

Signed-off-by: Dave Tucker <dt@docker.com>
Upstream-commit: 44a527d877faf0ef62bc9b0221f656041833ae66
Component: engine
2015-11-11 18:04:07 +00:00
d7b81a07c8 fix typo
Signed-off-by: Anton Polonskiy <anton.polonskiy@gmail.com>
Upstream-commit: 3f331eaa4092ff3a612a275351b82b44c778d9fa
Component: engine
2015-11-05 18:33:16 +02:00
f259c60206 Fixing ZooKeeper and some other nits Nathan found
Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: 0f1083c8dacb2ad189ccc4e4779c7e2dd054cb6b
Component: engine
2015-11-03 05:34:54 -08:00
ecd671294f First pass at consolidating
Removing old networking.md
Updating dockernetworks.md with images
Adding information on network plugins
Adding blurb about links to docker networking
Updating the working documentation
Adding Overlay Getting Started
Downplaying links by removing refs/examples, adding refs/examples for network.
Updating getting started to reflect networks not links
Pulling out old network material
Updating per discussion with Madhu to add Default docs section
Updating with bridge default
Fix bad merge
Updating with new cluster-advertise behavior
Update working and NetworkSettings examples
Correcting example for default bridge discovery behavior
Entering comments
Fixing broken Markdown Syntax
Updating with comments
Updating all the links

Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: 9ef855f9e5fa8077468bda5ce43155318c58e60e
Component: engine
2015-11-02 21:14:55 -08:00