README.md in vocker-0.4.0 vs README.md in vocker-0.4.1

- old
+ new

@@ -1,14 +1,20 @@ # Vocker -An experimental plugin that introduces [Docker](http://docker.io) to [Vagrant](http://www.vagrantup.com/) +A plugin that introduces [Docker](http://docker.io) to [Vagrant](http://www.vagrantup.com/) as a [provisioner](http://docs.vagrantup.com/v2/plugins/provisioners.html) and as a command that allows you to interact with the guest machine Docker installation. It can also be used for building other Vagrant plugins that needs interaction with a Docker instance. +## DEPRECATION NOTICE +The plugin has been merged back into Vagrant core and will be deprecated once Vagrant +1.4 is out. I'll ship just one more version with the updates to align with the +changes introduced on the corresponding [pull request](https://github.com/mitchellh/vagrant/pull/2549). + + ## Installation Make sure you have Vagrant 1.2+ and run: ``` @@ -106,11 +112,11 @@ running at a time and you can run `vagrant provision` as many times as you want without leaving lots of unused containers behind. If you are interested on understanding how it works, have a look at [_DockerClient#run_](https://github.com/fgrehm/vocker/blob/master/lib/vocker/docker_client.rb#L22) -### `vagrant docker` command +### `vagrant docker` command (DEPRECATED) The command is basically a wrapper over `vagrant ssh -c` that allows you to run `docker` commands on the guest VM: ``` @@ -120,9 +126,11 @@ images, import, info, insert, inspect, kill, login, logs, port, top, ps, pull, push, restart, rm, rmi, run, search, start, stop, tag, version, wait -h, --help Print this help ``` + +_Please note that the support for the command will be dropped on the next version of the plugin_ ### _your-awesome-vagrant-plugin™_ In case you want to build a Vagrant plugin that needs to interact with Docker you