From f074e983bd99a19509f96e235a2f35fbe1cab849 Mon Sep 17 00:00:00 2001
From: Ken Cochrane <KenCochrane@gmail.com>
Date: Sun, 12 May 2013 13:12:44 -0400
Subject: [PATCH] updated the rackspace docs to have more information, and
 fixed a couple of mistakes

---
 docs/sources/installation/rackspace.rst   | 36 ++++++++++++++++-------
 docs/sources/installation/ubuntulinux.rst |  3 +-
 2 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/docs/sources/installation/rackspace.rst b/docs/sources/installation/rackspace.rst
index 0ed7558a37..51f13f4732 100644
--- a/docs/sources/installation/rackspace.rst
+++ b/docs/sources/installation/rackspace.rst
@@ -37,17 +37,8 @@ Ubuntu 12.04
 
     .. code-block:: bash
         
-        # add the ppa to get the right kernel package
-        $ echo deb http://ppa.launchpad.net/ubuntu-x-swat/r-lts-backport/ubuntu precise main > /etc/apt/sources.list.d/xswat.list
-        
-        # add the key for the ppa
-        $ sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 3B22AB97AF1CDFA9
-        
-        # update packages again
-        $ apt-get update
-        
         # install the new kernel
-        $ apt-get install linux-image-3.8.0-19-generic
+        $ apt-get install linux-generic-lts-raring
         
         # update grub so it will use the new kernel after we reboot
         $ update-grub
@@ -89,6 +80,31 @@ Ubuntu 12.04
         $ docker run busybox /bin/echo hello world
         hello world
 
+Alternate install
+^^^^^^^^^^^^^^^^^
+If you don't want to run the get.docker.io script and want to use packages instead, you can use the docker PPA. Here is how you use it. Replace step 5 with the following 3 steps.
+
+1. Add the custom package sources to your apt sources list. Copy and paste 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"
+
+
+2. Update your sources. You will see a warning that GPG signatures cannot be verified.
+
+.. code-block:: bash
+
+   $ sudo apt-get update
+
+
+3. Now install it, you will see another warning that the package cannot be authenticated. Confirm install.
+
+.. code-block:: bash
+
+    $ apt-get install lxc-docker
+
+
 Ubuntu 12.10
 ------------
 
diff --git a/docs/sources/installation/ubuntulinux.rst b/docs/sources/installation/ubuntulinux.rst
index 955e8eb3b0..972844cc18 100644
--- a/docs/sources/installation/ubuntulinux.rst
+++ b/docs/sources/installation/ubuntulinux.rst
@@ -48,8 +48,7 @@ Now install it, you will see another warning that the package cannot be authenti
 
 .. code-block:: bash
 
-    curl get.docker.io | sudo sh -x
-
+    apt-get install lxc-docker
 
 Verify it worked