From 4319dce2c770d6bc50e2e0df06817ce99406f229 Mon Sep 17 00:00:00 2001
From: Joseph Robinson <joseph.robinson@rackspace.com>
Date: Fri, 29 Aug 2014 17:17:53 +1000
Subject: [PATCH] Improving the Installation Guide: Basic Environment

Updating the file name, chapter title, and xrefs for the
basic environment section in the installation guide.

Change-Id: I89700ac61c08a7332c1dcf01a4018f26d92d9d5d
backport: none
Closes-Bug: #1362946
Implements: blueprint installation-guide-improvements
---
 doc/install-guide/bk-openstack-install-guide.xml             | 2 +-
 .../{ch_basics.xml => ch_basic_environment.xml}              | 4 ++--
 doc/install-guide/section_cinder-node.xml                    | 2 +-
 www/static/.htaccess                                         | 5 +++++
 4 files changed, 9 insertions(+), 4 deletions(-)
 rename doc/install-guide/{ch_basics.xml => ch_basic_environment.xml} (96%)

diff --git a/doc/install-guide/bk-openstack-install-guide.xml b/doc/install-guide/bk-openstack-install-guide.xml
index 5dc600d001..6174fb694b 100644
--- a/doc/install-guide/bk-openstack-install-guide.xml
+++ b/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"/>
diff --git a/doc/install-guide/ch_basics.xml b/doc/install-guide/ch_basic_environment.xml
similarity index 96%
rename from doc/install-guide/ch_basics.xml
rename to doc/install-guide/ch_basic_environment.xml
index bd701aaac9..6c691703b9 100644
--- a/doc/install-guide/ch_basics.xml
+++ b/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>
diff --git a/doc/install-guide/section_cinder-node.xml b/doc/install-guide/section_cinder-node.xml
index 9e738cb950..c41df9e4ac 100644
--- a/doc/install-guide/section_cinder-node.xml
+++ b/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>
diff --git a/www/static/.htaccess b/www/static/.htaccess
index 782c05181c..5c785c937d 100644
--- a/www/static/.htaccess
+++ b/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