From 902e5f29a92efacc9dd52070e30532eb40692c13 Mon Sep 17 00:00:00 2001
From: Andreas Jaeger <aj@suse.de>
Date: Sun, 29 Dec 2013 19:46:56 +0100
Subject: [PATCH] Publish training-guides at /training-guides

Publish at /training-guides instead of at /trunk/training-guides.
Add redirects to new location.

Change-Id: Ifad5c1cb77113d542ae82df83e5d9e77469a90db
---
 doc/local-files.html        | 2 +-
 doc/training-guides/pom.xml | 7 +++----
 www/.htaccess               | 6 ++++--
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/doc/local-files.html b/doc/local-files.html
index 9f79b622d5..6b6afd6a86 100644
--- a/doc/local-files.html
+++ b/doc/local-files.html
@@ -111,7 +111,7 @@
 				the OpenStack documentation page in
 				this form.
 				<dl>
-				  <dd><a href="training-guide/target/docbkx/webhelp/local/training-guides/content/index.html">
+				  <dd><a href="training-guides/target/docbkx/webhelp/training-guides/content/index.html">
 				      Training Guides</a>
 				  </dd>
 				  <dd><a href="glossary/target/docbkx/webhelp/glossary/content/index.html">
diff --git a/doc/training-guides/pom.xml b/doc/training-guides/pom.xml
index 081c843240..7393520a74 100644
--- a/doc/training-guides/pom.xml
+++ b/doc/training-guides/pom.xml
@@ -34,10 +34,9 @@
                         <configuration>
                             <includes>st-training-guides.xml</includes>
                             <sourceDirectory>.</sourceDirectory>
-                            <canonicalUrlBase>http://docs.openstack.org/${release.path.name}/training-guides/</canonicalUrlBase>
-                            <targetDirectory>${basedir}/target/docbkx/webhelp/${release.path.name}/training-guides</targetDirectory>
-                            <webhelpDirname>/</webhelpDirname>
-                            <pdfFilenameBase>training-guides-${release.path.name}</pdfFilenameBase>
+                            <targetDirectory>target/docbkx/webhelp/</targetDirectory>
+                            <webhelpDirname>training-guides</webhelpDirname>
+                            <pdfFilenameBase>training-guides</pdfFilenameBase>
                             <enableDisqus>${comments.enabled}</enableDisqus>
                             <enableGoogleAnalytics>1</enableGoogleAnalytics>
                             <googleAnalyticsId>UA-17511903-1</googleAnalyticsId>
diff --git a/www/.htaccess b/www/.htaccess
index 8307ba2b65..d18fca2c7f 100644
--- a/www/.htaccess
+++ b/www/.htaccess
@@ -93,5 +93,7 @@ redirectmatch /network-admin/admin/content/.*$ /admin-guide-cloud/content/
 redirect 301 /trunk/openstack-identity/admin/content/ /admin-guide-cloud/content/ch-identity-mgmt-config.html
 
 # Redirect training-manuals project to new location
-redirect 301 /trunk/openstack-training/ /trunk/training-guides/
-redirect 301 /trunk/training-guide/ /trunk/training-guides/
+redirect 301 /trunk/openstack-training/ /training-guides/
+redirect 301 /trunk/training-guide/ /training-guides/
+redirect 301 /trunk/training-guides/ /training-guides/
+