From 0ec9ec339af3da65145132fb8dab1a726c22da11 Mon Sep 17 00:00:00 2001
From: Diane Fleming <diane.fleming@rackspace.com>
Date: Mon, 29 Jul 2013 11:41:51 -0500
Subject: [PATCH] Fix user guide on landing page

Change-Id: I732b9c04b520eba7a292abf41580da1604ac0a33
author: diane fleming
---
 doc/src/docbkx/openstack-user/pom.xml | 5 ++---
 www/.htaccess                         | 4 ++--
 www/index.html                        | 2 +-
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/doc/src/docbkx/openstack-user/pom.xml b/doc/src/docbkx/openstack-user/pom.xml
index 5a572d92e4..bf0d804331 100644
--- a/doc/src/docbkx/openstack-user/pom.xml
+++ b/doc/src/docbkx/openstack-user/pom.xml
@@ -36,8 +36,7 @@
               <enableDisqus>1</enableDisqus>
               <disqusShortname>os-userguide</disqusShortname>
               <enableGoogleAnalytics>1</enableGoogleAnalytics>
-              <googleAnalyticsId>UA-17511903-1</googleAnalyticsId>
-             
+              <googleAnalyticsId>UA-17511903-1</googleAnalyticsId>     
               <webhelpDirname>user-guide</webhelpDirname>
               <includeDateInPdfFilename>0</includeDateInPdfFilename>
               <pdfFilenameBase>user-guide</pdfFilenameBase>
@@ -89,7 +88,7 @@
           <formalFigures>0</formalFigures>
           <sectionLabelIncludesComponentLabel>0</sectionLabelIncludesComponentLabel>
           <!--<canonicalUrlBase>http://docs.openstack.org/cli/content/</canonicalUrlBase>-->
-          <targetDirectory>target/docbkx/webhelp/${release.path.name}</targetDirectory>
+          <targetDirectory>target/docbkx/webhelp/</targetDirectory>
           <webhelpDirname>user-guide</webhelpDirname>
           <pdfFilenameBase>user-guide-${release.path.name}</pdfFilenameBase>
           <profileSecurity>reviewer</profileSecurity>
diff --git a/www/.htaccess b/www/.htaccess
index 27f13b9362..3aeb37963a 100644
--- a/www/.htaccess
+++ b/www/.htaccess
@@ -12,7 +12,7 @@ redirect 301 /diablo/ /trunk/
 redirect 301 /trunk/openstack-compute/starter/ /trunk/
 
 # Redirect the Clients Guide to new End User Guide 
-redirect 301 /cli/quick-start/content/ /grizzly/user-guide/content/ 
+redirect 301 /cli/quick-start/content/ /user-guide/content/ 
 
 # Redirecting cactus version
 redirect 301 /cactus/ /trunk/
@@ -40,4 +40,4 @@ redirect 301 /basic-install/ /
 redirect 301 /run/ /
 redirect 301 /api/index.html /
 redirect 301 /developer/index.html /
-redirect 301 /cli/ /
+redirect 301 /cli/quick-start/ /user-guide/
diff --git a/www/index.html b/www/index.html
index 1736465a1f..0c560af626 100644
--- a/www/index.html
+++ b/www/index.html
@@ -225,7 +225,7 @@
 							>API Quick Start</a></dd>
 					
 					<dd><a
-						href="http://docs.openstack.org/grizzly/user-guide/content/openstack_user_guide.html"
+						href="http://docs.openstack.org/user-guide/content/"
 							>End User Guide</a></dd>
 					<dd><a
 							href="http://api.openstack.org/api-ref.html"