Adam Harrison
aa8d9eab53
Merge branch '1.0'
2015-06-23 15:05:32 +01:00
Adam Harrison
17ee829299
Merge branch 'latest_release_doc_updates' into 1.0
2015-06-23 15:05:02 +01:00
Adam Harrison
5db39466e8
Fix broken IPAM link
2015-06-23 15:04:37 +01:00
Matthias Radestock
43b8840dd2
Merge branch '1.0'
2015-06-23 14:58:55 +01:00
Matthias Radestock
cc4ab80f62
Merge branch 'latest_release_doc_updates' into 1.0
2015-06-23 14:57:51 +01:00
Matthias Radestock
0e47cee661
remove references to dns, ipam and proxy docs from ToCs
...
Since they are now explained and referenced prominently from the main
Features documentation.
2015-06-23 14:53:49 +01:00
Adam Harrison
d6ab78ff03
Merge documentation from branch '1.0'
2015-06-23 14:36:04 +01:00
Adam Harrison
7e36dc01e8
Merge documentation from branch 'latest_release_doc_updates' into 1.0
2015-06-23 14:35:30 +01:00
Adam Harrison
d0a1514ab6
Removed redundant further reading section from feature docs
2015-06-23 14:33:33 +01:00
Adam Harrison
06c3a0cf2a
Add docker integration section to feature docs
2015-06-23 14:33:29 +01:00
Adam Harrison
dde5782625
Merge documentation from branch '1.0'
2015-06-23 14:21:05 +01:00
Adam Harrison
a1913130e7
Merge documentation from branch 'latest_release_doc_updates' into 1.0
2015-06-23 14:18:42 +01:00
Adam Harrison
19a3fc6b9e
Add naming and discovery section to features docs
2015-06-23 13:50:37 +01:00
Adam Harrison
043d15355c
Restore commit lost to force push
2015-06-23 11:53:22 +01:00
Matthias Radestock
cedf9bb82d
Merge branch '1.0'
2015-06-23 09:54:24 +01:00
Matthias Radestock
1b4f83c067
Merge branch 'latest_release_doc_updates' into 1.0
2015-06-23 09:53:44 +01:00
Matthias Radestock
90b9b3c1bf
'address allocation' is the feature
...
covering both automatic and manual allocation
2015-06-23 09:50:39 +01:00
Matthias Radestock
2a9f8a3d75
Merge branch '1.0'
2015-06-22 23:00:29 +01:00
Matthias Radestock
0a553d6630
Merge branch 'latest_release_doc_updates' into 1.0
2015-06-22 22:59:16 +01:00
Matthias Radestock
e51c240ea1
fix broken links
2015-06-22 22:57:48 +01:00
Adam Harrison
bda245bfdb
Merge pull request #968 from rade/954_show_attach_expose_addresses
...
show IP addresses in attach/expose/detach/hide
2015-06-22 14:49:41 +01:00
Bryan Boreham
c8032b6b25
Merge pull request #977 from bboreham/proxy-net-syntax
...
Change one IPAM proxy example to use a network
2015-06-22 14:24:24 +01:00
Bryan Boreham
68ca6ebe04
Change one IPAM proxy example to use the 'net:' syntax
2015-06-22 14:15:24 +01:00
Matthias Radestock
7cf0d59003
update docs
2015-06-22 12:34:32 +01:00
Adam Harrison
b86bae9c86
Fix incorrect address in service import/export examples
2015-06-22 12:00:57 +01:00
Adam Harrison
b1bd1d4d6a
Merge pull request #964 from awh/v1.0_use_proxy_doc_updates
...
Update documentation to leverage proxy
2015-06-22 10:46:00 +01:00
Adam Harrison
1e638be7ac
Remove weave run from how it works
2015-06-22 10:36:56 +01:00
Adam Harrison
acd2b9abeb
Reword proxy hyperlink text in index
2015-06-22 10:36:56 +01:00
Adam Harrison
6ddecfc764
Update proxy docs
2015-06-22 10:36:56 +01:00
Adam Harrison
f15ad71354
Update IPAM docs to use proxy
2015-06-22 10:36:56 +01:00
Adam Harrison
4d54af39b0
Update weaveDNS docs to use proxy
2015-06-22 10:36:56 +01:00
Adam Harrison
81d5a8f4f5
Update features docs to use proxy
2015-06-22 10:36:56 +01:00
Matthias Radestock
56c720b078
remove the -D proxy option from the docs
...
It doesn't do anything useful since the weave script needs to be able
to talk to docker on the standard unix socket.
Also remove dangling reference to 'localhost', and move note about
firwalls to where it is most pertinent.
Part fix to #972 .
2015-06-22 10:20:18 +01:00
Adam Harrison
617c3883c7
Merge pull request #948 from awh/v1.0_doc_updates
...
Update documentation to leverage IPAM and DNS
2015-06-18 10:38:32 +01:00
Adam Harrison
9e20a5256b
Rename example containers
2015-06-18 10:32:15 +01:00
Adam Harrison
aa8a86a0b9
Update service binding example
2015-06-17 17:34:15 +01:00
Adam Harrison
7238192150
Update service routing example
2015-06-17 17:34:15 +01:00
Adam Harrison
caa0e31be2
Update service import example
2015-06-17 17:34:15 +01:00
Adam Harrison
5a6cafc3da
Update service export example
2015-06-17 17:34:15 +01:00
Adam Harrison
1df52350fa
Update host network integration example
2015-06-17 17:34:15 +01:00
Adam Harrison
40323202f5
Update dynamic attachment example
2015-06-17 17:34:15 +01:00
Adam Harrison
0d83f24661
Prefer -ti to -t -i in updated examples
2015-06-17 17:34:15 +01:00
Adam Harrison
8550469c9f
Update subnet isolation example
2015-06-17 17:34:15 +01:00
Adam Harrison
e5679a787c
Update subnet isolation example
2015-06-17 17:34:15 +01:00
Adam Harrison
e37a4314b3
Add manual addressing to features
2015-06-17 17:34:10 +01:00
Adam Harrison
7b5ee8fb65
Update virtual ethernet switch example
2015-06-17 17:32:40 +01:00
Paul Bellamy
ca681bce13
[proxy] Add support for WEAVE_CIDR=none
...
Tells the proxy not to do anything with this container. We set it when
running weaveexec/weave/etc containers, so that the weave script works
through the proxy.
2015-06-17 14:51:12 +01:00
Matthias Radestock
215312bb5f
Merge pull request #946 from bboreham/758-expand-ipam-docs
...
Expand description of -initpeercount in docs
Closes #758 .
2015-06-17 12:06:04 +01:00
Bryan Boreham
40efc347b6
Cosmetic
2015-06-17 11:41:46 +01:00
Paul Bellamy
220c80c3ed
[proxy] --with-ipam -> --no-default-ipam
2015-06-17 11:31:33 +01:00
Adam Harrison