From 9da7957d2432545ae5481691e9f5f7a56fba15f7 Mon Sep 17 00:00:00 2001
From: Gauvain Pocentek <gauvain.pocentek@objectif-libre.com>
Date: Sun, 8 Dec 2013 15:12:08 +0100
Subject: [PATCH] Use CirrOS 0.3.1 instead of 0.3.0 in all guides

Change-Id: I13fe817c33a281d68fbecf18fa6e5077e80fc93e
backport: none
---
 doc/image-guide/ch_obtaining_images.xml          | 4 ++--
 doc/user-guide/section_nova_cli_config-drive.xml | 5 ++---
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/doc/image-guide/ch_obtaining_images.xml b/doc/image-guide/ch_obtaining_images.xml
index 78edcd9266..d3efb73651 100644
--- a/doc/image-guide/ch_obtaining_images.xml
+++ b/doc/image-guide/ch_obtaining_images.xml
@@ -15,8 +15,8 @@
                 download page</link>.</para>
             <para>If your deployment uses QEMU or KVM, we recommend using the images in qcow2
             format. The most recent 64-bit qcow2 image as of this writing is <link
-                xlink:href="https://launchpad.net/cirros/trunk/0.3.0/+download/cirros-0.3.0-x86_64-disk.img"
-                >cirros-0.3.0-x86_64-disk.img</link>
+                xlink:href="http://download.cirros-cloud.net/0.3.1/cirros-0.3.1-x86_64-disk.img"
+                >cirros-0.3.1-x86_64-disk.img</link>
             <note>
                 <para>In a CirrOS image, the login account is <literal>cirros</literal>. The
                     password is <literal>cubswin:)</literal></para>
diff --git a/doc/user-guide/section_nova_cli_config-drive.xml b/doc/user-guide/section_nova_cli_config-drive.xml
index 0c8d16ba92..625ba600b2 100644
--- a/doc/user-guide/section_nova_cli_config-drive.xml
+++ b/doc/user-guide/section_nova_cli_config-drive.xml
@@ -154,9 +154,8 @@
                 <screen><prompt>#</prompt> <userinput>mkdir -p /mnt/config</userinput>
 <prompt>#</prompt> <userinput>mount /dev/disk/by-label/config-2 /mnt/config</userinput></screen>
                 <note>
-                    <para>The CirrOS 0.3.0 test image does not support
-                        the configuration drive. Support will be added
-                        in CirrOS 0.3.1.</para>
+                    <para>Make sure that you use at least version 0.3.1
+                        of CirrOS for configuration drive support.</para>
                 </note>
                 <para>If your guest operating system does not use
                         <literal>udev</literal>, the