From 0731d1a582b44a18e9bfdf0764d232b46218346b Mon Sep 17 00:00:00 2001
From: Thatcher Peskens <thatcher@dotcloud.com>
Date: Fri, 19 Apr 2013 20:59:43 -0700
Subject: [PATCH] Updated ubuntu install

---
 docs/sources/installation/ubuntulinux.rst | 88 ++++++++++-------------
 1 file changed, 37 insertions(+), 51 deletions(-)

diff --git a/docs/sources/installation/ubuntulinux.rst b/docs/sources/installation/ubuntulinux.rst
index bf83a5bc88..a822242cee 100644
--- a/docs/sources/installation/ubuntulinux.rst
+++ b/docs/sources/installation/ubuntulinux.rst
@@ -1,56 +1,42 @@
-.. _ubuntu_linux:
+Docker on Ubuntu
+================
 
-Ubuntu Linux
-============
+Docker is now available as a Ubuntu PPA (Personal Package Archive), which makes installing Docker on Ubuntu super easy!
 
-  **Please note this project is currently under heavy development. It should not be used in production.**
+**The Requirements**
+
+* Ubuntu 12.04 (LTS) or Ubuntu 12.10
+* **64-bit Operating system**
+
+
+Add the custom package sources to your apt sources list. Copy and paste both the following lines at once.
+
+.. code-block:: bash
+
+   sudo sh -c "echo 'deb http://ppa.launchpad.net/dotcloud/lxc-docker/ubuntu precise main' \
+   >> /etc/apt/sources.list"
+
+
+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.
+
+.. code-block:: bash
+
+   sudo apt-get install lxc-docker
+
+
+**Run!**
+
+.. code-block:: bash
+
+   docker
 
 
 
-Installing on Ubuntu 12.04 and 12.10
-
-Right now, the officially supported distributions are:
-
-Ubuntu 12.04 (precise LTS)
-Ubuntu 12.10 (quantal)
-Docker probably works on other distributions featuring a recent kernel, the AUFS patch, and up-to-date lxc. However this has not been tested.
-
-Install dependencies:
----------------------
-
-::
-
-    sudo apt-get install lxc wget bsdtar curl
-    sudo apt-get install linux-image-extra-`uname -r`
-
-The linux-image-extra package is needed on standard Ubuntu EC2 AMIs in order to install the aufs kernel module.
-
-Install the latest docker binary:
-
-::
-
-    wget http://get.docker.io/builds/$(uname -s)/$(uname -m)/docker-master.tgz
-    tar -xf docker-master.tgz
-
-Run your first container!
-
-::
-
-    cd docker-master
-
-::
-
-    sudo ./docker run -i -t base /bin/bash
-
-
-To run docker as a daemon, in the background, and allow non-root users to run ``docker`` start
-docker -d
-
-::
-
-    sudo ./docker -d &
-
-
-Consider adding docker to your PATH for simplicity.
-
-Continue with the :ref:`hello_world` example.
\ No newline at end of file
+Probably you would like to continue with the :ref:`hello_world` example.
\ No newline at end of file