Merge branch '1.0'

README.md

@@ -133,9 +133,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)

site/index.md

@@ -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)