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

Change-Id: Ic7d73f5845f99ffbcbc34396d64db6e95c536edb
author: diane fleming
---
 www/.htaccess  | 13 +++++++------
 www/index.html |  2 +-
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/www/.htaccess b/www/.htaccess
index dabf3d9b86..27f13b9362 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/ /user-guide/content/ 
+redirect 301 /cli/quick-start/content/ /grizzly/user-guide/content/ 
 
 # Redirecting cactus version
 redirect 301 /cactus/ /trunk/
@@ -28,11 +28,11 @@ redirect 301 /incubation/openstack-network/developer/quantum-api-1.0/content/ /a
 redirect 301 /trunk/openstack-compute/install/content /trunk/openstack-compute/install/yum/content
 
 # Redirecting old install files in the CLI Guide to new End User Guide
-redirect 301 /trunk/cli/quick-start/content/install_openstack_glance_cli.html /user-guide/content/ch_cli.html 
-redirect 301 /trunk/cli/quick-start/content/install_openstack_keystone_cli.html /user-guide/content/ch_cli.html 
-redirect 301 /trunk/cli/quick-start/content/install_openstack_nova_cli.html /user-guide/content/ch_cli.html
-redirect 301 /trunk/cli/quick-start/content/install_openstack_quantum_cli.html /user-guide/content/ch_cli.html
-redirect 301 /trunk/cli/quick-start/content/install_openstack_swift_cli.html /user-guide/content/ch_cli.html
+redirect 301 /trunk/cli/quick-start/content/install_openstack_glance_cli.html /user-guide/content/ 
+redirect 301 /trunk/cli/quick-start/content/install_openstack_keystone_cli.html /user-guide/content/ 
+redirect 301 /trunk/cli/quick-start/content/install_openstack_nova_cli.html /user-guide/content/
+redirect 301 /trunk/cli/quick-start/content/install_openstack_quantum_cli.html /user-guide/content/
+redirect 301 /trunk/cli/quick-start/content/install_openstack_swift_cli.html /user-guide/content/
 
 # Redirect docs.openstack.org index.html subpage pointers to main page
 redirect 301 /install/ /
@@ -40,3 +40,4 @@ redirect 301 /basic-install/ /
 redirect 301 /run/ /
 redirect 301 /api/index.html /
 redirect 301 /developer/index.html /
+redirect 301 /cli/ /
diff --git a/www/index.html b/www/index.html
index a9adacd74f..1736465a1f 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/"
+						href="http://docs.openstack.org/grizzly/user-guide/content/openstack_user_guide.html"
 							>End User Guide</a></dd>
 					<dd><a
 							href="http://api.openstack.org/api-ref.html"