From 1d8e08a69cd2525b30c6940dbacc533867c62eed Mon Sep 17 00:00:00 2001
From: Andreas Jaeger <jaegerandi@gmail.com>
Date: Fri, 10 Jan 2014 12:07:33 +0000
Subject: [PATCH] Revert "Amended config instructions for cinder.config"

This reverts commit adfc7259f42f80588e138a3c210be0b53a89af8b
(not reverted: change of wording choosing -> choice)

The original text is correct for Icehouse. For Havana, connection in section DEFAULT is a deprecated setup.

Fix for cinder.conf file for Icehouse:
https://review.openstack.org/#/c/61736/

Change-Id: I001797be9b9421d6818ed902d494bd133bf41b79
---
 doc/install-guide/section_cinder-controller.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/install-guide/section_cinder-controller.xml b/doc/install-guide/section_cinder-controller.xml
index 7962b72761..c8a87e1025 100644
--- a/doc/install-guide/section_cinder-controller.xml
+++ b/doc/install-guide/section_cinder-controller.xml
@@ -42,12 +42,12 @@
   database connection mysql://cinder:<replaceable>CINDER_DBPASS</replaceable>@<replaceable>controller</replaceable>/cinder</userinput></screen>
       <para os="ubuntu">Edit
           <filename>/etc/cinder/cinder.conf</filename> and change the
-          <literal>[DEFAULT]</literal> section.</para>
+          <literal>[database]</literal> section.</para>
       <programlisting os="ubuntu" language="ini">[database]
 ...
 # The SQLAlchemy connection string used to connect to the
 # database (string value)
-sql_connection = mysql://cinder:CINDER_DBPASS@localhost/cinder
+connection = mysql://cinder:CINDER_DBPASS@localhost/cinder
 ...</programlisting>
     </step>
     <step os="rhel;centos;fedora;opensuse;sles">