From 091fb892948abee1ad5451ee6c9d7dd540d88780 Mon Sep 17 00:00:00 2001 From: Thatcher Peskens Date: Fri, 23 Aug 2013 11:45:52 -0700 Subject: [PATCH 1/2] Added line on top of ubuntulinux announcing change in 0.6 Added lines on top of vagrant installs --- docs/sources/installation/ubuntulinux.rst | 5 ++++- docs/sources/installation/vagrant.rst | 2 ++ docs/sources/installation/windows.rst | 2 ++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/docs/sources/installation/ubuntulinux.rst b/docs/sources/installation/ubuntulinux.rst index 5a41f7cd40..916af225e1 100644 --- a/docs/sources/installation/ubuntulinux.rst +++ b/docs/sources/installation/ubuntulinux.rst @@ -4,10 +4,13 @@ .. _ubuntu_linux: +**These instructions have changed for 0.6. If you are upgrading from an earlier version, you will need to follow them again.** + Ubuntu Linux ============ - **Please note this project is currently under heavy development. It should not be used in production.** + **Please note this project is currently under heavy development. It should not be used in production.** + Right now, the officially supported distribution are: diff --git a/docs/sources/installation/vagrant.rst b/docs/sources/installation/vagrant.rst index 24a1e91354..4ae907ff93 100644 --- a/docs/sources/installation/vagrant.rst +++ b/docs/sources/installation/vagrant.rst @@ -4,6 +4,8 @@ .. _install_using_vagrant: +**Vagrant installation is temporarily out of date, it will be updated for 0.6 soon.** + Using Vagrant (Mac, Linux) ========================== diff --git a/docs/sources/installation/windows.rst b/docs/sources/installation/windows.rst index 7830106020..2c3a2cd722 100644 --- a/docs/sources/installation/windows.rst +++ b/docs/sources/installation/windows.rst @@ -4,6 +4,8 @@ .. _windows: +**Vagrant installation is temporarily out of date, it will be updated for 0.6 soon.** + Using Vagrant (Windows) ======================= From ebb9b5e85be296fd73f4d64e61dfc87fe0c3ae72 Mon Sep 17 00:00:00 2001 From: Thatcher Peskens Date: Fri, 23 Aug 2013 12:56:03 -0700 Subject: [PATCH 2/2] Added adding the gpg key --- docs/sources/installation/ubuntulinux.rst | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/docs/sources/installation/ubuntulinux.rst b/docs/sources/installation/ubuntulinux.rst index 916af225e1..338ecd64da 100644 --- a/docs/sources/installation/ubuntulinux.rst +++ b/docs/sources/installation/ubuntulinux.rst @@ -66,6 +66,9 @@ to follow them again.* .. code-block:: bash + # Add the Docker repository key to your local keychain + sudo sh -c "curl http://get.docker.io/gpg | apt-key add -" + # 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" @@ -116,6 +119,9 @@ to follow them again.* .. code-block:: bash + # Add the Docker repository key to your local keychain + sudo sh -c "curl http://get.docker.io/gpg | apt-key add -" + # 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"