Merge remote-tracking branch 'upstream/weave_1.2_readme_updates' into…

… weave-1.2-readme-updates Conflicts: site/boot2docker.md
weaveworks · Oct 19, 2015 · 4839ed1 · 4839ed1
2 parents b7840f9 + 90aab4e
commit 4839ed1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 34 deletions.
diff --git a/README.md b/README.md
@@ -46,6 +46,11 @@ Ensure you are running Linux (kernel 3.8 or later) and have Docker
     sudo curl -L git.io/weave -o /usr/local/bin/weave
     sudo chmod a+x /usr/local/bin/weave
 
+For usage on OSX (with Docker Machine) you first need to make sure
+that a VM is running and configured, as shown in [the Docker Machine
+documentation](https://docs.docker.com/installation/mac/#from-your-shell).
+Then you can launch weave directly from the OSX host.
+
 CoreOS users see [here](https://github.com/fintanr/weave-gs/blob/master/coreos-simple/user-data) for an example of installing weave using cloud-config.
 
 Amazon ECS users see

diff --git a/site/boot2docker.md b/site/boot2docker.md