Explorar o código

Merge pull request #1641 from dotcloud/docs-0.6-gpg-key

Docs 0.6 gpg key
Thatcher %!s(int64=12) %!d(string=hai) anos
pai
achega
e2594d162e

+ 10 - 1
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:
 
@@ -63,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"
 
@@ -113,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"
 

+ 2 - 0
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)
 ==========================
 

+ 2 - 0
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)
 =======================