Merge "Rename Savanna to Sahara"

doc/common/app_support.xml

@@ -290,8 +290,7 @@ and so on.</para>
                         >Bugs: Bare Metal (ironic)</link></para>
             </listitem>
             <listitem>
-              <!-- TODO: Link might need to be renamed in the future -->
+                <para><link xlink:href="https://bugs.launchpad.net/sahara"
-                <para><link xlink:href="https://bugs.launchpad.net/savanna"
                         >Bugs: Data Processing Service (sahara)</link></para>
             </listitem>
             <listitem>

www/developer/.htaccess

@@ -6,3 +6,6 @@ redirect 301 /developer/python-quantumclient/ /developer/python-neutronclient/
 
 # Redirect to api.openstack.org for nova's old api_ext doc
 redirect 301 /developer/nova/api_ext/ http://api.openstack.org/api-ref.html
+
+# Redirect for the rename of savanna to sahara
+redirect 301 /developer/savanna/ /developer/sahara/

www/developer/openstack-projects.html

@@ -130,7 +130,7 @@
 		</h4>
 		<h4><a href="http://docs.openstack.org/developer/horizon/">Dashboard Developer Documentation (horizon)</a>
 		</h4>
-		<h4><a href="http://docs.openstack.org/developer/savanna/">Data Processing Developer Documentation (savanna)</a>
+		<h4><a href="http://docs.openstack.org/developer/sahara/">Data Processing Developer Documentation (sahara)</a>
 		</h4>
 		<h4><a href="http://docs.openstack.org/developer/trove/">Database Service Developer Documentation (trove)</a>
 		</h4>