Merge branch '1.8'

weaveworks · Dec 23, 2016 · 1e7afe3 · 1e7afe3
2 parents 0f85a95 + 4850804
commit 1e7afe3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/site/how-it-works/ip-addresses.md b/site/how-it-works/ip-addresses.md
@@ -37,7 +37,7 @@ The most common prefix lengths are 8, 16 and 24, but there is nothing
 stopping you using a /9 network or a /26. For example, `6.250.3.1/9` is on the
 `6.128.0.0/9` network.
 
-Several websites offer calculators to decode this kind of address, see: [IP Address Guide](http://www.ipaddressguide.com/cidr).
+Several websites offer calculators to decode this kind of address, see, for example: [IP Address Guide](http://www.ipaddressguide.com/cidr).
 
 The following is an example route table for a container that is attached to a Weave
 network:

diff --git a/site/ipam.md b/site/ipam.md
@@ -179,7 +179,7 @@ The range parameter is written in
 in this example "/16" means the first 16 bits of the address form the
 network address and the allocator is to allocate container addresses
 that all start 10.2. See [IP
-addresses and routes](/site/using-weave/service-management.md#routing) for more information.
+addresses and routes](/site/how-it-works/ip-addresses.md) for more information.
 
 Weave shares the IP address range across all peers, dynamically
 according to their needs.  If a group of peers becomes isolated from