diff --git a/doc/common/figures/SCH_5003_V00_NUAC-Network_mode_KVM_LDAP_OpenStack.svg b/doc/common/figures/SCH_5003_V00_NUAC-Network_mode_KVM_LDAP_OpenStack.svg
index 68fe2ddcd3..7753791aa4 100644
--- a/doc/common/figures/SCH_5003_V00_NUAC-Network_mode_KVM_LDAP_OpenStack.svg
+++ b/doc/common/figures/SCH_5003_V00_NUAC-Network_mode_KVM_LDAP_OpenStack.svg
@@ -1832,7 +1832,7 @@
 				<v:ud v:nameU="visIsConnected" v:prompt="" v:val="VT0(0):26"/>
 			</v:userDefs>
 			<title>Database server</title>
-			<desc>MySQL --sql_connection=mysql://$nova_db_user:$nova_db_pass@$n...</desc>
+			<desc>MySQL --sql_connection=mysql+pymysql://$nova_db_user:$nova_db_pass@$n...</desc>
 			<g id="shape172-883" v:mID="172" v:groupContext="shape">
 				<title>Sheet.172</title>
 				<path d="M43.52 582.21 L51.02 578.17 L51.02 534.92 L31.4 524.41 L0 541.52 L0.01 585.45 A33.0369 30.8521 -180 0 0
diff --git a/doc/common/figures/SCH_5004_V00_NUAC-Network_mode_KVM_Flat_OpenStack.svg b/doc/common/figures/SCH_5004_V00_NUAC-Network_mode_KVM_Flat_OpenStack.svg
index cb577f732b..079a56f92c 100644
--- a/doc/common/figures/SCH_5004_V00_NUAC-Network_mode_KVM_Flat_OpenStack.svg
+++ b/doc/common/figures/SCH_5004_V00_NUAC-Network_mode_KVM_Flat_OpenStack.svg
@@ -1548,7 +1548,7 @@
 				<v:ud v:nameU="visIsConnected" v:prompt="" v:val="VT0(0):26"/>
 			</v:userDefs>
 			<title>Database server</title>
-			<desc>MySQL --sql_connection=mysql://$nova_db_user:$nova_db_pass@$n...</desc>
+			<desc>MySQL --sql_connection=mysql+pymysql://$nova_db_user:$nova_db_pass@$n...</desc>
 			<g id="shape172-599" v:mID="172" v:groupContext="shape">
 				<title>Sheet.172</title>
 				<path d="M43.52 582.21 L51.02 578.17 L51.02 534.92 L31.4 524.41 L0 541.52 L0.01 585.45 A33.0369 30.8521 -180 0 0
diff --git a/doc/common/figures/SCH_5005_V00_NUAC-Network_mode_XEN_Flat_OpenStack.svg b/doc/common/figures/SCH_5005_V00_NUAC-Network_mode_XEN_Flat_OpenStack.svg
index 34b89dc387..73c27a2929 100644
--- a/doc/common/figures/SCH_5005_V00_NUAC-Network_mode_XEN_Flat_OpenStack.svg
+++ b/doc/common/figures/SCH_5005_V00_NUAC-Network_mode_XEN_Flat_OpenStack.svg
@@ -1170,7 +1170,7 @@
 				<v:ud v:nameU="visIsConnected" v:prompt="" v:val="VT0(0):26"/>
 			</v:userDefs>
 			<title>Database server</title>
-			<desc>MySQL --sql_connection=mysql://$nova_db_user:$nova_db_pass@$n...</desc>
+			<desc>MySQL --sql_connection=mysql+pymysql://$nova_db_user:$nova_db_pass@$n...</desc>
 			<g id="shape172-486" v:mID="172" v:groupContext="shape">
 				<title>Sheet.172</title>
 				<path d="M43.52 582.21 L51.02 578.17 L51.02 534.92 L31.4 524.41 L0 541.52 L0.01 585.45 A33.0369 30.8521 -180 0 0
diff --git a/doc/common/samples/cinder.conf b/doc/common/samples/cinder.conf
index 381d30c69b..57072eb57b 100644
--- a/doc/common/samples/cinder.conf
+++ b/doc/common/samples/cinder.conf
@@ -1,6 +1,6 @@
 [DEFAULT]
 rootwrap_config=/etc/cinder/rootwrap.conf
-sql_connection = mysql://cinder:openstack@192.168.127.130/cinder
+sql_connection = mysql+pymysql://cinder:openstack@192.168.127.130/cinder
 api_paste_config = /etc/cinder/api-paste.ini
 
 iscsi_helper=tgtadm
diff --git a/doc/common/samples/nova.conf b/doc/common/samples/nova.conf
index c4d5229611..d147ae5740 100644
--- a/doc/common/samples/nova.conf
+++ b/doc/common/samples/nova.conf
@@ -68,7 +68,7 @@ api_servers=192.168.206.130:9292
 
 # DATABASE
 [database]
-connection=mysql://nova:yourpassword@192.168.206.130/nova
+connection=mysql+pymysql://nova:yourpassword@192.168.206.130/nova
 
 # LIBVIRT
 [libvirt]
diff --git a/doc/common/samples/nova.conf-yum b/doc/common/samples/nova.conf-yum
index a791df62a1..01a45bfabe 100644
--- a/doc/common/samples/nova.conf-yum
+++ b/doc/common/samples/nova.conf-yum
@@ -71,4 +71,4 @@ api_servers=192.168.206.130:9292
 
 # DATABASE
 [database]
-connection=mysql://nova:yourpassword@192.168.206.130/nova
+connection=mysql+pymysql://nova:yourpassword@192.168.206.130/nova
diff --git a/doc/common/section_config_format.xml b/doc/common/section_config_format.xml
index b2bb8fb95c..2a059604d7 100644
--- a/doc/common/section_config_format.xml
+++ b/doc/common/section_config_format.xml
@@ -27,7 +27,7 @@ verbose = true
 [database]
 # The SQLAlchemy connection string used to connect to the
 # database (string value)
-connection = mysql://keystone:<replaceable>KEYSTONE_DBPASS</replaceable>@<replaceable>controller</replaceable>/keystone</programlisting>
+connection = mysql+pymysql://keystone:<replaceable>KEYSTONE_DBPASS</replaceable>@<replaceable>controller</replaceable>/keystone</programlisting>
 
 
   <para>
diff --git a/doc/config-reference/block-storage/drivers/windows-iscsi-volume-driver.xml b/doc/config-reference/block-storage/drivers/windows-iscsi-volume-driver.xml
index c26e09ee64..ee0f16c3eb 100644
--- a/doc/config-reference/block-storage/drivers/windows-iscsi-volume-driver.xml
+++ b/doc/config-reference/block-storage/drivers/windows-iscsi-volume-driver.xml
@@ -108,7 +108,7 @@ volume_driver = cinder.volume.drivers.windows.WindowsDriver
 glance_api_servers = <replaceable>IP_ADDRESS</replaceable>:9292
 rabbit_host = <replaceable>IP_ADDRESS</replaceable>
 rabbit_port = 5672
-sql_connection = mysql://root:Passw0rd@<replaceable>IP_ADDRESS</replaceable>/cinder
+sql_connection = mysql+pymysql://root:Passw0rd@<replaceable>IP_ADDRESS</replaceable>/cinder
 windows_iscsi_lun_path = C:\iSCSIVirtualDisks
 verbose = True
 rabbit_password = Passw0rd
diff --git a/doc/config-reference/compute/section_compute-config-samples.xml b/doc/config-reference/compute/section_compute-config-samples.xml
index 42962198ca..455717835f 100644
--- a/doc/config-reference/compute/section_compute-config-samples.xml
+++ b/doc/config-reference/compute/section_compute-config-samples.xml
@@ -69,7 +69,7 @@ ca_path=./nova/CA
 # Add the following to your conf file if you're running on Ubuntu Maverick
 xenapi_remap_vbd_dev=true
 [database]
-connection=mysql://root:&lt;password&gt;@127.0.0.1/nova</programlisting>
+connection=mysql+pymysql://root:&lt;password&gt;@127.0.0.1/nova</programlisting>
         <figure xml:id="Nova_conf_XEN_Flat">
             <title>KVM, Flat, MySQL, and Glance, OpenStack or EC2
                 API</title>
diff --git a/doc/config-reference/compute/section_hypervisor_hyper-v.xml b/doc/config-reference/compute/section_hypervisor_hyper-v.xml
index b3d91f5ec1..9685385857 100644
--- a/doc/config-reference/compute/section_hypervisor_hyper-v.xml
+++ b/doc/config-reference/compute/section_hypervisor_hyper-v.xml
@@ -240,7 +240,7 @@
                 </listitem>
                 </varlistentry>
                 <varlistentry>
-                    <term><package>MySQL-python</package></term>
+                    <term><package>PyMySQL</package></term>
                     <listitem>
                         <para><link xlink:href="http://codegood.com/download/10/">
                             http://codegood.com/download/10/</link></para>