Merge branch 'latest_release_doc_updates' into 1.0

This commit is contained in:
Matthias Radestock committed 2015-06-23 14:57:51 +01:00
commit cc4ab80f62
2 files changed
-6

No files matched your search

-3
View File
@@ -125,9 +125,6 @@ to each other.
* [Documentation homepage](http://docs.weave.works/weave/latest_release/)
* [Getting Started Guides](http://weave.works/guides/)
* [Features](http://docs.weave.works/weave/latest_release/features.html)
* [Automatic IP Address Management](http://docs.weave.works/weave/latest_release/ipam.html)
* [Automatic Discovery with WeaveDNS](http://docs.weave.works/weave/latest_release/weavedns.html)
* [Configuring the interaction with Docker](http://docs.weave.works/weave/latest_release/proxy.html)
* [Troubleshooting](http://docs.weave.works/weave/latest_release/troubleshooting.html)
* [Building](http://docs.weave.works/weave/latest_release/building.html)
* [How it works](http://docs.weave.works/weave/latest_release/how-it-works.html)
-3
View File
@@ -8,9 +8,6 @@ layout: default
* [Introduction, Installation and Example](https://github.com/weaveworks/weave#readme)
* [Getting Started Guides](http://weave.works/guides/)
* [Features](features.html)
* [Automatic IP Address Management](ipam.html)
* [Automatic Discovery with WeaveDNS](weavedns.html)
* [Configuring the interaction with Docker](proxy.html)
* [Troubleshooting](troubleshooting.html)
* [Building](building.html)
* [How it works](how-it-works.html)