From ef1f1695e65f4a2fa2434e5cd76fb83a269d7cf0 Mon Sep 17 00:00:00 2001
From: annegentle <anne@openstack.org>
Date: Mon, 13 May 2013 08:05:49 -0500
Subject: [PATCH] Addresses additional wording for image storage.

fix bug 1179235

Cherry pick from https://review.openstack.org/#/c/28942/

Change-Id: I627588c0573173f5bc5c379fa44a9fd53fa389b6
---
 .../docbkx/openstack-ops/src/ch_arch_cloud_controller.xml | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/doc/src/docbkx/openstack-ops/src/ch_arch_cloud_controller.xml b/doc/src/docbkx/openstack-ops/src/ch_arch_cloud_controller.xml
index 5ddb8927c4..cf334513d3 100644
--- a/doc/src/docbkx/openstack-ops/src/ch_arch_cloud_controller.xml
+++ b/doc/src/docbkx/openstack-ops/src/ch_arch_cloud_controller.xml
@@ -362,11 +362,9 @@
                     mode.</para>
             </listitem>
         </itemizedlist>
-        <para>If you have an OpenStack Object Storage service, we
-            recommend using this as a scalable place to store your
-            images. Failing that, a file system with sufficient
-            performance is the only real option - unless you do not
-            need the ability to upload new images through
+        <para>If you have an OpenStack Object Storage service, we recommend using this as a scalable
+            place to store your images. You can also use a file system with sufficient performance
+            or Amazon S3 - unless you do not need the ability to upload new images through
             OpenStack.</para>
     </section>
     <section xml:id="dashboard">