From ec5008c702fae947bc7d8b1a290774e853839ba6 Mon Sep 17 00:00:00 2001 From: Matthias Radestock Date: Tue, 29 Mar 2016 06:41:19 +0100 Subject: [PATCH] remove "quote of quote" --- site/ipam/allocation-multi-ipam.md | 4 ++-- site/using-weave/application-isolation.md | 4 ++-- site/using-weave/dynamically-attach-containers.md | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/site/ipam/allocation-multi-ipam.md b/site/ipam/allocation-multi-ipam.md index 1bb68799..227fd512 100644 --- a/site/ipam/allocation-multi-ipam.md +++ b/site/ipam/allocation-multi-ipam.md @@ -23,7 +23,7 @@ for instance: host1$ docker run -e WEAVE_CIDR="net:10.2.7.0/24 net:10.2.8.0/24 ip:10.3.9.1/24" -ti ubuntu ->>**Note:** The ".0" and ".-1" addresses in a subnet are not used, as required by +>**Note:** The ".0" and ".-1" addresses in a subnet are not used, as required by [RFC 1122](https://tools.ietf.org/html/rfc1122#page-29)). When working with multiple subnets in this way, it is usually @@ -64,4 +64,4 @@ for manual allocation. * [Address Allocation with IP Address Management (IPAM)](/site/ipam/overview-init-ipam.md) * [Isolating Applications on a Weave Network](/site/using-weave/isolating-applications.md) - * [Starting, Stopping and Removing Peers](/site/ipam/stop-remove-peers-ipam.md) \ No newline at end of file + * [Starting, Stopping and Removing Peers](/site/ipam/stop-remove-peers-ipam.md) diff --git a/site/using-weave/application-isolation.md b/site/using-weave/application-isolation.md index 4d746ff9..6be14975 100644 --- a/site/using-weave/application-isolation.md +++ b/site/using-weave/application-isolation.md @@ -58,9 +58,9 @@ If required, a container can also be attached to multiple subnets when it is sta `net:default` is used to request the allocation of an address from the default subnet in addition to one from an explicitly specified range. ->>**Important:** Containers must be prevented from capturing and injecting raw network packets - this can be accomplished by starting them with the `--cap-drop net_raw` option. +>**Important:** Containers must be prevented from capturing and injecting raw network packets - this can be accomplished by starting them with the `--cap-drop net_raw` option. ->>Note: By default docker permits communication between containers on the same host, via their docker-assigned IP addresses. For complete +>Note: By default docker permits communication between containers on the same host, via their docker-assigned IP addresses. For complete isolation between application containers, that feature needs to be disabled by [setting `--icc=false`](https://docs.docker.com/engine/userguide/networking/default_network/container-communication/#communication-between-containers) in the docker daemon configuration. **See Also** diff --git a/site/using-weave/dynamically-attach-containers.md b/site/using-weave/dynamically-attach-containers.md index 944a63a1..fbd66923 100644 --- a/site/using-weave/dynamically-attach-containers.md +++ b/site/using-weave/dynamically-attach-containers.md @@ -18,7 +18,7 @@ where, * `weave attach` – the Weave Net command to attach to the specified container * `10.2.1.3` - the allocated IP address output by `weave attach`, in this case in the default subnet ->>Note If you are using the Weave Docker API proxy, it will have modified `DOCKER_HOST` to point to the proxy and therefore you will have to pass `-e WEAVE_CIDR=none` to start a container that _doesn't_ get automatically attached to the weave network for the purposes of this example. +>Note If you are using the Weave Docker API proxy, it will have modified `DOCKER_HOST` to point to the proxy and therefore you will have to pass `-e WEAVE_CIDR=none` to start a container that _doesn't_ get automatically attached to the weave network for the purposes of this example. ###Dynamically Detaching Containers