From dd786eefbbf286ca57b52374a6905c1ac8b8bd60 Mon Sep 17 00:00:00 2001
From: Solomon Hykes <solomon@dotcloud.com>
Date: Thu, 16 Jan 2014 00:17:23 +0000
Subject: [PATCH] docs: instead of a top-level 'upgrading docker' doc, add an
 'upgrades' paragraph to each installation target

Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
---
 docs/sources/installation/binaries.rst    | 11 ++++
 docs/sources/installation/mac.rst         | 22 ++++++-
 docs/sources/installation/ubuntulinux.rst | 15 +++++
 docs/sources/installation/upgrading.rst   | 73 -----------------------
 4 files changed, 47 insertions(+), 74 deletions(-)
 delete mode 100644 docs/sources/installation/upgrading.rst

diff --git a/docs/sources/installation/binaries.rst b/docs/sources/installation/binaries.rst
index f06a8d6c5f..4da511b92c 100644
--- a/docs/sources/installation/binaries.rst
+++ b/docs/sources/installation/binaries.rst
@@ -43,6 +43,17 @@ Run the docker daemon
     # start the docker in daemon mode from the directory you unpacked
     sudo ./docker -d &
 
+Upgrades
+--------
+
+To upgrade your manual installation of Docker, first kill the docker daemon:
+
+.. code-block:: bash
+
+   killall docker
+
+Then follow the regular installation steps.
+
 
 Run your first container!
 -------------------------
diff --git a/docs/sources/installation/mac.rst b/docs/sources/installation/mac.rst
index 69c57380b0..569fa1f838 100644
--- a/docs/sources/installation/mac.rst
+++ b/docs/sources/installation/mac.rst
@@ -65,8 +65,28 @@ To access the VM and use Docker, Run ``vagrant ssh`` from the same directory as
 
    vagrant ssh
 
+
+Upgrades
+--------
+
+Since your local VM is based on Ubuntu, you can upgrade docker by logging in to the
+VM and calling ``apt-get``:
+
+
+.. code-block:: bash
+
+   # Log into the VM
+   vagrant ssh
+
+   # update your sources list
+   sudo apt-get update
+
+   # install the latest
+   sudo apt-get install lxc-docker
+
+
 Run
------
+---
 
 Now you are in the VM, run docker
 
diff --git a/docs/sources/installation/ubuntulinux.rst b/docs/sources/installation/ubuntulinux.rst
index 8480979099..17eee15e9a 100644
--- a/docs/sources/installation/ubuntulinux.rst
+++ b/docs/sources/installation/ubuntulinux.rst
@@ -167,6 +167,21 @@ Type ``exit`` to exit
 
 **Done!**, now continue with the :ref:`hello_world` example.
 
+Upgrades
+--------
+
+To install the latest version of docker, use the standard ``apt-get`` method:
+
+
+.. code-block:: bash
+
+   # update your sources list
+   sudo apt-get update
+
+   # install the latest
+   sudo apt-get install lxc-docker
+
+
 .. _ufw:
 
 Docker and UFW
diff --git a/docs/sources/installation/upgrading.rst b/docs/sources/installation/upgrading.rst
deleted file mode 100644
index c760115545..0000000000
--- a/docs/sources/installation/upgrading.rst
+++ /dev/null
@@ -1,73 +0,0 @@
-:title: Upgrading
-:description: These instructions are for upgrading Docker
-:keywords: Docker, Docker documentation, upgrading docker, upgrade
-
-.. _upgrading:
-
-Upgrading
-=========
-
-The technique for upgrading ``docker`` to a newer version depends on
-how you installed ``docker``.
-
-.. versionadded:: 0.5.3
-   You may wish to add a ``docker`` group to your system to avoid using sudo with ``docker``. (see :ref:`dockergroup`)
-
-
-After ``apt-get``
------------------
-
-If you installed Docker using ``apt-get`` or Vagrant, then you should
-use ``apt-get`` to upgrade.
-
-.. versionadded:: 0.6
-   Add Docker repository information to your system first.
-
-.. code-block:: bash
-
-   # Add the Docker repository key to your local keychain
-   sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 36A1D7869245C8950F966E92D8576A8BA88D21E9
-
-   # Add the Docker repository to your apt sources list.
-   sudo sh -c "echo deb https://get.docker.io/ubuntu docker main > /etc/apt/sources.list.d/docker.list"
-
-   # update your sources list
-   sudo apt-get update
-
-   # install the latest
-   sudo apt-get install lxc-docker
-
-
-After manual installation
--------------------------
-
-If you installed the Docker :ref:`binaries` then follow these steps:
-
-
-.. code-block:: bash
-
-   # kill the running docker daemon
-   killall docker
-
-
-.. code-block:: bash
-
-   # get the latest binary
-   wget http://get.docker.io/builds/Linux/x86_64/docker-latest -O docker
-   
-   # make it executable
-   chmod +x docker
-
-
-Start docker in daemon mode (``-d``) and disconnect, running the
-daemon in the background (``&``). Starting as ``./docker`` guarantees
-to run the version in your current directory rather than a version
-which might reside in your path.
-
-.. code-block:: bash
-
-   # start the new version
-   sudo ./docker -d &
-
-
-Alternatively you can replace the docker binary in ``/usr/local/bin``.