Merge branch 'master' of ssh://github.com/dotcloud/docker

contrib/install.sh

@@ -36,9 +36,9 @@ else
 fi
 
 echo "Downloading docker binary and uncompressing into /usr/local/bin..."
-curl -s http://get.docker.io/builds/$(uname -s)/$(uname -m)/docker-master.tgz |
+curl -s http://get.docker.io/builds/$(uname -s)/$(uname -m)/docker-latest.tgz |
 tar -C /usr/local/bin --strip-components=1 -zxf- \
-docker-master/docker
+docker-latest/docker
 
 if [ -f /etc/init/dockerd.conf ]
 then

docs/sources/installation/binaries.rst

@@ -26,9 +26,9 @@ Install the docker binary:
 
 ::
 
-    wget http://get.docker.io/builds/Linux/x86_64/docker-master.tgz
-    tar -xf docker-master.tgz
-    sudo cp ./docker-master /usr/local/bin
+    wget http://get.docker.io/builds/Linux/x86_64/docker-latest.tgz
+    tar -xf docker-latest.tgz
+    sudo cp ./docker-latest/docker /usr/local/bin
 
 Note: docker currently only supports 64-bit Linux hosts.
 
@@ -50,4 +50,4 @@ Run your first container!
 
 
 
-Continue with the :ref:`hello_world` example.
+Continue with the :ref:`hello_world` example.

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 -s http://get.docker.io/builds/$(uname -s)/$(uname -m)/docker-master.tgz |  tar  -zxf- docker-master/docker
-    sudo cp docker-master/docker /usr/local/bin/docker
+    curl get.docker.io | sudo sh -x
 
 
 Verify it worked

docs/sources/installation/upgrading.rst

@@ -11,7 +11,7 @@ Get the latest docker binary:
 
 ::
 
-  wget http://get.docker.io/builds/$(uname -s)/$(uname -m)/docker-master.tgz
+  wget http://get.docker.io/builds/$(uname -s)/$(uname -m)/docker-latest.tgz
 
 
 
@@ -19,7 +19,7 @@ Unpack it to your current dir
 
 ::
 
-   tar -xf docker-master.tgz
+   tar -xf docker-latest.tgz
 
 
 Stop your current daemon. How you stop your daemon depends on how you started it.
@@ -38,4 +38,4 @@ Now start the daemon
    sudo ./docker -d &
 
 
-Alternatively you can replace the docker binary in ``/usr/local/bin``
+Alternatively you can replace the docker binary in ``/usr/local/bin``