Merge pull request #1537 from moxiegirl/fix-1483

Chaning User guide to overview close #1483
This commit is contained in:
Sebastiaan van Stijn 2015-12-14 20:30:26 +01:00
commit 94c0593c0b
6 changed files with 10 additions and 9 deletions

View File

@ -90,7 +90,7 @@ echo HEADER=$HEADER
## Docker Swarm documentation index ## 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/) - [Discovery options](https://docs.docker.com/swarm/discovery/)
- [Scheduler strategies](https://docs.docker.com/swarm/scheduler/strategy/) - [Scheduler strategies](https://docs.docker.com/swarm/scheduler/strategy/)
- [Scheduler filters](https://docs.docker.com/swarm/scheduler/filter/) - [Scheduler filters](https://docs.docker.com/swarm/scheduler/filter/)

View File

@ -214,7 +214,8 @@ discovery README in the Docker Swarm repository</a>.
## Docker Swarm documentation index ## Docker Swarm documentation index
- [Overview](index.md) - [Docker Swarm overview](index.md)
- [Scheduler strategies](scheduler/strategy.md) - [Scheduler strategies](scheduler/strategy.md)
- [Scheduler filters](scheduler/filter.md) - [Scheduler filters](scheduler/filter.md)
- [Swarm API](api/swarm-api.md) - [Swarm API](api/swarm-api.md)
- [Docker Swarm overview](index.md)

View File

@ -8,7 +8,7 @@ parent="smn_workw_swarm"
+++ +++
<![end-metadata]--> <![end-metadata]-->
# Docker Swarm # Docker Swarm overview
Docker Swarm is native clustering for Docker. It turns a pool of Docker hosts 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 into a single, virtual Docker host. Because Docker Swarm serves the standard

View File

@ -94,13 +94,13 @@ If two different networks have the same name, you may use `<node>/<name>`.
8926accb25fd node-1/bridge bridge 8926accb25fd node-1/bridge bridge
6382abccd23d node-1/none null 6382abccd23d node-1/none null
5262bbfe5616 node-1/bridge2 bridge 5262bbfe5616 node-1/bridge2 bridge
`swarm_network` was removed from every node, `bridge2` was removed only `swarm_network` was removed from every node, `bridge2` was removed only
from `node-0`. from `node-0`.
## Docker Swarm documentation index ## Docker Swarm documentation index
- [User guide](index.md) - [Docker Swarm overview](index.md)
- [Scheduler strategies](scheduler/strategy.md) - [Scheduler strategies](scheduler/strategy.md)
- [Scheduler filters](scheduler/filter.md) - [Scheduler filters](scheduler/filter.md)
- [Swarm API](api/swarm-api.md) - [Swarm API](api/swarm-api.md)

View File

@ -184,7 +184,7 @@ example, you can run a container and instruct Swarm to schedule it next to
another container based on these affinities: another container based on these affinities:
* container name or id * container name or id
* an image on the host * an image on the host
* a custom label applied to the container * a custom label applied to the container
These affinities ensure that containers run on the same network node 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 ### Use a port filter
When the `port` filter is enabled, a container's port configuration is used as a 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 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 specified by mapping a host port, or using the host networking an exposing a
port using the container configuration. port using the container configuration.
@ -494,7 +494,7 @@ without a container that satisfies `redis*`
## Related information ## Related information
- [User guide](../index.md) - [Docker Swarm overview](../index.md)
- [Discovery options](../discovery.md) - [Discovery options](../discovery.md)
- [Scheduler strategies](strategy.md) - [Scheduler strategies](strategy.md)
- [Swarm API](../api/swarm-api.md) - [Swarm API](../api/swarm-api.md)

View File

@ -116,7 +116,7 @@ strategy prefers the node with most containers running.
## Docker Swarm documentation index ## Docker Swarm documentation index
- [User guide](../index.md) - [Docker Swarm overview](../index.md)
- [Discovery options](../discovery.md) - [Discovery options](../discovery.md)
- [Scheduler filters](filter.md) - [Scheduler filters](filter.md)
- [Swarm API](../api/swarm-api.md) - [Swarm API](../api/swarm-api.md)