Merge "Publish training-guides at /training-guides"

This commit is contained in:
Jenkins 2013-12-30 01:07:32 +00:00 committed by Gerrit Code Review
commit e8b41a064f
3 changed files with 8 additions and 7 deletions

View File

@ -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">

View File

@ -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>

View File

@ -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/