@@ -8,7 +8,6 @@ def v10(config)

   # Install ubuntu packaging dependencies and create ubuntu packages

   config.vm.provision :shell, :inline => "echo 'deb http://ppa.launchpad.net/dotcloud/lxc-docker/ubuntu precise main' >>/etc/apt/sources.list"

   config.vm.provision :shell, :inline => 'export DEBIAN_FRONTEND=noninteractive; apt-get -qq update; apt-get install -qq -y --force-yes lxc-docker'

-

 end

 Vagrant::VERSION < "1.1.0" and Vagrant::Config.run do |config|

@@ -45,8 +44,8 @@ Vagrant::VERSION >= "1.1.0" and Vagrant.configure("2") do |config|

   end

   config.vm.provider :virtualbox do |vb|

-    config.vm.box = "quantal64_3.5.0-25"

-    config.vm.box_url = "http://get.docker.io/vbox/ubuntu/12.10/quantal64_3.5.0-25.box"

+    config.vm.box = 'precise64'

+    config.vm.box_url = 'http://files.vagrantup.com/precise64.box'

   end

 end

@@ -76,7 +75,8 @@ Vagrant::VERSION >= "1.2.0" and Vagrant.configure("2") do |config|

   end

   config.vm.provider :virtualbox do |vb|

-    config.vm.box = "quantal64_3.5.0-25"

-    config.vm.box_url = "http://get.docker.io/vbox/ubuntu/12.10/quantal64_3.5.0-25.box"

+    config.vm.box = 'precise64'

+    config.vm.box_url = 'http://files.vagrantup.com/precise64.box'

   end

+

 end

@@ -1,7 +1,9 @@

 Docker on Ubuntu

 ================

-Docker is now available as a Ubuntu PPA (Personal Package Archive), which makes installing Docker on Ubuntu super easy!

+Docker is now available as a Ubuntu PPA (Personal Package Archive),

+`hosted on launchpad  <https://launchpad.net/~dotcloud/+archive/lxc-docker>`_

+which makes installing Docker on Ubuntu very easy.

 **The Requirements**

@@ -17,14 +19,14 @@ Add the custom package sources to your apt sources list. Copy and paste both the

    >> /etc/apt/sources.list"

-Update your sources. You will see a warning that GPG signatures cannot be verified

+Update your sources. You will see a warning that GPG signatures cannot be verified.

 .. code-block:: bash

    sudo apt-get update

-Now install it, you will see another warning that the package cannot be authenticated.

+Now install it, you will see another warning that the package cannot be authenticated. Confirm install.

 .. code-block:: bash

@@ -3,7 +3,8 @@

 Upgrading

 ============

-   We assume you are upgrading from within the operating system which runs your docker daemon.

+These instructions are for upgrading your Docker binary for when you had a custom (non package manager) installation.

+If you istalled docker using apt-get, use that to upgrade.

 Get the latest docker binary:

@@ -4,32 +4,28 @@

 Install using Vagrant

 =====================

-  Please note this is a community contributed installation path. The only 'official' installation is using the :ref:`ubuntu_linux` installation path. This version

-  may be out of date because it depends on some binaries to be updated and published

+  Please note this is a community contributed installation path. The only 'official' installation is using the

+  :ref:`ubuntu_linux` installation path. This version may sometimes be out of date.

 **requirements**

-This guide will setup a new virtual machine on your computer. This works on most operating systems,

-including MacOX, Windows, Linux, FreeBSD and others. If you can

-install these and have at least 400Mb RAM to spare you should be good.

+This guide will setup a new virtual machine with docker installed on your computer. This works on most operating

+systems, including MacOX, Windows, Linux, FreeBSD and others. If you can install these and have at least 400Mb RAM

+to spare you should be good.

-Install Vagrant, Virtualbox and Git

-

-We currently rely on some Ubuntu-linux specific packages, this will change in the future, but for now we provide a

-streamlined path to install Virtualbox with a Ubuntu 12.10 image using Vagrant.

+Install Vagrant and Virtualbox

+------------------------------

 1. Install virtualbox from https://www.virtualbox.org/ (or use your package manager)

 2. Install vagrant from http://www.vagrantup.com/ (or use your package manager)

 3. Install git if you had not installed it before, check if it is installed by running

    ``git`` in a terminal window

-We recommend having at least about 2Gb of free disk space and 2Gb RAM (or more).

 Spin up your machine

 --------------------

-1. Fetch the docker sources

+1. Fetch the docker sources (this includes the instructions for machine setup).

 .. code-block:: bash

@@ -43,21 +39,16 @@ Spin up your machine

 Vagrant will:

-* Download the Quantal64 base ubuntu virtual machine image from get.docker.io/

+* Download the 'official' Precise64 base ubuntu virtual machine image from vagrantup.com

 * Boot this image in virtualbox

-

-Then it will use Puppet to perform an initial setup in this machine:

-

-* Download & untar the most recent docker binary tarball to vagrant homedir.

-* Debootstrap to /var/lib/docker/images/ubuntu.

-* Install & run dockerd as service.

-* Put docker in /usr/local/bin.

-* Put latest Go toolchain in /usr/local/go.

+* Add the `Docker PPA sources <https://launchpad.net/~dotcloud/+archive/lxc-docker>`_ to /etc/apt/sources.lst

+* Update your sources

+* Install lxc-docker

 You now have a Ubuntu Virtual Machine running with docker pre-installed.

 To access the VM and use Docker, Run ``vagrant ssh`` from the same directory as where you ran

-``vagrant up``. Vagrant will make sure to connect you to the correct VM.

+``vagrant up``. Vagrant will connect you to the correct VM.

 .. code-block:: bash

@@ -69,5 +60,4 @@ Now you are in the VM, run docker

     docker

-

 Continue with the :ref:`hello_world` example.