Merge "Improving the Installation Guide: Basic Environment"

doc/install-guide/bk-openstack-install-guide.xml

@@ -207,7 +207,7 @@
          these types of statements. -->
     <xi:include href="../common/ch_preface.xml"/>
     <xi:include href="ch_overview.xml"/>
-    <xi:include href="ch_basics.xml"/>
+    <xi:include href="ch_basic_environment.xml"/>
     <xi:include href="ch_debconf.xml"/>
     <xi:include href="ch_keystone.xml"/>
     <xi:include href="ch_glance.xml"/>

doc/install-guide/ch_basic_environment.xml

@@ -3,9 +3,9 @@
   xmlns:xi="http://www.w3.org/2001/XInclude"
   xmlns:xlink="http://www.w3.org/1999/xlink"
   version="5.0"
-  xml:id="ch_basics">
+  xml:id="ch_basic_environment">
   <?dbhtml stop-chunking?>
-  <title>Basic environment configuration</title>
+  <title>Basic environment</title>
 
   <note>
     <para>

doc/install-guide/section_cinder-node.xml

@@ -13,7 +13,7 @@
     This example uses LVM.</para>
   <procedure>
     <step>
-      <para>Use the instructions in <xref linkend="ch_basics"/> to
+      <para>Use the instructions in <xref linkend="ch_basic_environment"/> to
         configure the system. Note the following differences from the
         installation instructions for the controller node:</para>
       <itemizedlist>

www/static/.htaccess

@@ -108,6 +108,11 @@ redirect 301 /trunk/install-guide/install/apt-debian/content/object-storage-post
 redirect 301 /trunk/install-guide/install/zypper/content/object-storage-post-install.html /trunk/install-guide/install/zypper/content/verify-object-storage-installation.html
 redirect 301 /trunk/install-guide/install/yum/content/object-storage-post-install.html /trunk/install-guide/install/yum/content/verify-object-storage-installation.html
 
+redirect 301 /trunk/install-guide/install/apt/content/ch_basics.html /trunk/install-guide/install/apt/content/ch_basic_environment.html
+redirect 301 /trunk/install-guide/install/apt-debian/content/ch_basics.html /trunk/install-guide/install/apt-debian/content/ch_basic_environment.html
+redirect 301 /trunk/install-guide/install/zypper/content/ch_basics.html /trunk/install-guide/install/zypper/content/ch_basic_environment.html
+redirect 301 /trunk/install-guide/install/yum/content/ch_basics.html /trunk/install-guide/install/yum/content/ch_basic_environment.html
+
 # Redirect O'Reilly Operations Guide PDF to trunk version
 redirect 301 /trunk/openstack-ops/oreilly-openstack-ops-guide.pdf /openstack-ops/openstack-ops-manual.pdf