From f1fb2722a1f40ac436c3f529dc2614f9f83e5fad Mon Sep 17 00:00:00 2001 From: Mary Anthony Date: Sat, 12 Dec 2015 21:22:17 -0800 Subject: [PATCH] Chaning User guide to overview close #1483 Signed-off-by: Mary Anthony --- docs/api/swarm-api.md | 2 +- docs/discovery.md | 3 ++- docs/index.md | 2 +- docs/networking.md | 4 ++-- docs/scheduler/filter.md | 6 +++--- docs/scheduler/strategy.md | 2 +- 6 files changed, 10 insertions(+), 9 deletions(-) diff --git a/docs/api/swarm-api.md b/docs/api/swarm-api.md index 4c54e5908e..aeeec1e2a9 100644 --- a/docs/api/swarm-api.md +++ b/docs/api/swarm-api.md @@ -47,7 +47,7 @@ POST "/images/create" : "docker import" flow not implement ## Docker Swarm documentation index -- [User guide](https://docs.docker.com/swarm/) +- [Docker Swarm overview](https://docs.docker.com/swarm/) - [Discovery options](https://docs.docker.com/swarm/discovery/) - [Scheduler strategies](https://docs.docker.com/swarm/scheduler/strategy/) - [Scheduler filters](https://docs.docker.com/swarm/scheduler/filter/) diff --git a/docs/discovery.md b/docs/discovery.md index 1def33735a..4ed4c85f7a 100644 --- a/docs/discovery.md +++ b/docs/discovery.md @@ -214,7 +214,8 @@ discovery README in the Docker Swarm repository. ## Docker Swarm documentation index -- [Overview](index.md) +- [Docker Swarm overview](index.md) - [Scheduler strategies](scheduler/strategy.md) - [Scheduler filters](scheduler/filter.md) - [Swarm API](api/swarm-api.md) +- [Docker Swarm overview](index.md) diff --git a/docs/index.md b/docs/index.md index c218f21153..ad9ae6159c 100644 --- a/docs/index.md +++ b/docs/index.md @@ -8,7 +8,7 @@ parent="smn_workw_swarm" +++ -# Docker Swarm +# Docker Swarm overview Docker Swarm is native clustering for Docker. It turns a pool of Docker hosts into a single, virtual Docker host. Because Docker Swarm serves the standard diff --git a/docs/networking.md b/docs/networking.md index cbb3abebc0..4a46d94ec4 100644 --- a/docs/networking.md +++ b/docs/networking.md @@ -94,13 +94,13 @@ If two different networks have the same name, you may use `/`. 8926accb25fd node-1/bridge bridge 6382abccd23d node-1/none null 5262bbfe5616 node-1/bridge2 bridge - + `swarm_network` was removed from every node, `bridge2` was removed only from `node-0`. ## Docker Swarm documentation index -- [User guide](index.md) +- [Docker Swarm overview](index.md) - [Scheduler strategies](scheduler/strategy.md) - [Scheduler filters](scheduler/filter.md) - [Swarm API](api/swarm-api.md) diff --git a/docs/scheduler/filter.md b/docs/scheduler/filter.md index 56afc803e3..9a0028ed24 100644 --- a/docs/scheduler/filter.md +++ b/docs/scheduler/filter.md @@ -184,7 +184,7 @@ example, you can run a container and instruct Swarm to schedule it next to another container based on these affinities: * container name or id -* an image on the host +* an image on the host * a custom label applied to the container These affinities ensure that containers run on the same network node @@ -328,7 +328,7 @@ containers are running on different nodes, Swarm does not schedule the container ### Use a port filter When the `port` filter is enabled, a container's port configuration is used as a -unique constraint. Docker Swarm selects a node where a particular port is +unique constraint. Docker Swarm selects a node where a particular port is available and unoccupied by another container or process. Required ports may be specified by mapping a host port, or using the host networking an exposing a port using the container configuration. @@ -494,7 +494,7 @@ without a container that satisfies `redis*` ## Related information -- [User guide](../index.md) +- [Docker Swarm overview](../index.md) - [Discovery options](../discovery.md) - [Scheduler strategies](strategy.md) - [Swarm API](../api/swarm-api.md) diff --git a/docs/scheduler/strategy.md b/docs/scheduler/strategy.md index 6f369cd03e..25c2bf0c24 100644 --- a/docs/scheduler/strategy.md +++ b/docs/scheduler/strategy.md @@ -116,7 +116,7 @@ strategy prefers the node with most containers running. ## Docker Swarm documentation index -- [User guide](../index.md) +- [Docker Swarm overview](../index.md) - [Discovery options](../discovery.md) - [Scheduler filters](filter.md) - [Swarm API](../api/swarm-api.md)