wording formatting

This commit is contained in:
abuehrle committed 2016-08-02 16:38:41 -05:00
1 parent 14350ff463
commit 5fdbbf3722
1 file changed
+2 -4
+2 -4
View File
@@ -9,7 +9,6 @@ network when they are started using the ordinary Docker
or the [remote API](https://docs.docker.com/reference/api/docker_remote_api/),
instead of `weave run`.
###<a name="attaching-containers"></a>Attaching Containers to a Weave Network
There are three ways to attach containers to a Weave network (which method to use is
@@ -24,18 +23,17 @@ Docker containers are started with the --net flag, for example:
**Where,**
* <docker-run-options> are the [docker run options](https://docs.docker.com/engine/reference/run/)
* `<docker-run-options>` are the [docker run options](https://docs.docker.com/engine/reference/run/)
you give to your container on start
Note that if a Docker container is started with the --net flag, then the Weave Docker API Proxy
is automatically disabled and is not used to attach containers.
See [Integrating Docker via the Network Plugin](plugin.md).
* Containers can also be attached to the Weave network by using `weave run` commands. This method also
* Containers can also be attached to the Weave network with `weave run` commands. This method also
does not use the Weave Docker API Proxy.
See [Launching Containers With Weave Run (without the Proxy)](/site/weave-docker-api/launching-without-proxy.md).
###<a name="weave-api-proxy"></a>Setting Up The Weave Net Docker API Proxy
The proxy sits between the Docker client (command line or API) and the