You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by jr...@apache.org on 2013/07/12 16:18:53 UTC
svn commit: r1502571 - in /qpid/site: docs/.htaccess input/.htaccess
Author: jross
Date: Fri Jul 12 14:18:53 2013
New Revision: 1502571
URL: http://svn.apache.org/r1502571
Log:
QPID-4987: Correct docbook url rewrites; add redirects for pdfs
Modified:
qpid/site/docs/.htaccess
qpid/site/input/.htaccess
Modified: qpid/site/docs/.htaccess
URL: http://svn.apache.org/viewvc/qpid/site/docs/.htaccess?rev=1502571&r1=1502570&r2=1502571&view=diff
==============================================================================
--- qpid/site/docs/.htaccess (original)
+++ qpid/site/docs/.htaccess Fri Jul 12 14:18:53 2013
@@ -31,15 +31,15 @@
RewriteRule ^apis/0.16/(.*)$ /releases/qpid-0.16/apis/$1 [R=301,L]
RewriteRule ^apis/0.18/(.*)$ /releases/qpid-0.18/apis/$1 [R=301,L]
- RewriteRule ^books/0.20/AMQP-Messaging-Broker-CPP-Book/(.*)$ /releases/qpid-0.20/cpp-broker/book/$1 [R=301,L]
- RewriteRule ^books/0.20/AMQP-Messaging-Broker-Java-Book/(.*)$ /releases/qpid-0.20/java-broker/book/$1 [R=301,L]
- RewriteRule ^books/0.20/Programming-In-Apache-Qpid/(.*)$ /releases/qpid-0.20/programming/book/$1 [R=301,L]
+ RewriteRule ^books/0.20/AMQP-Messaging-Broker-CPP-Book/html/(.*)$ /releases/qpid-0.20/cpp-broker/book/$1 [R=301,L]
+ RewriteRule ^books/0.20/AMQP-Messaging-Broker-Java-Book/html/(.*)$ /releases/qpid-0.20/java-broker/book/$1 [R=301,L]
+ RewriteRule ^books/0.20/Programming-In-Apache-Qpid/html/(.*)$ /releases/qpid-0.20/programming/book/$1 [R=301,L]
RewriteRule ^apis/0.20/cpp/html/(.*) /releases/qpid-0.20/messaging-api/cpp/api/$1 [R=301,L]
RewriteRule ^apis/0.20/python/html/(.*) /releases/qpid-0.20/messaging-api/python/api/$1 [R=301,L]
- RewriteRule ^books/0.22/AMQP-Messaging-Broker-CPP-Book/(.*)$ /releases/qpid-0.22/cpp-broker/book/$1 [R=301,L]
- RewriteRule ^books/0.22/AMQP-Messaging-Broker-Java-Book/(.*)$ /releases/qpid-0.22/java-broker/book/$1 [R=301,L]
- RewriteRule ^books/0.22/Programming-In-Apache-Qpid/(.*)$ /releases/qpid-0.22/programming/book/$1 [R=301,L]
+ RewriteRule ^books/0.22/AMQP-Messaging-Broker-CPP-Book/html/(.*)$ /releases/qpid-0.22/cpp-broker/book/$1 [R=301,L]
+ RewriteRule ^books/0.22/AMQP-Messaging-Broker-Java-Book/html/(.*)$ /releases/qpid-0.22/java-broker/book/$1 [R=301,L]
+ RewriteRule ^books/0.22/Programming-In-Apache-Qpid/html/(.*)$ /releases/qpid-0.22/programming/book/$1 [R=301,L]
RewriteRule ^apis/0.22/cpp/html/(.*) /releases/qpid-0.22/messaging-api/cpp/api/$1 [R=301,L]
RewriteRule ^apis/0.22/python/html/(.*) /releases/qpid-0.22/messaging-api/python/api/$1 [R=301,L]
</IfModule>
@@ -47,6 +47,7 @@
<IfModule mod_alias.c>
Redirect /download.cgi http://qpid.apache.org/download.html
Redirect /licence.html http://www.apache.org/licenses/
+
RedirectPermanent /acknowledgements.html http://qpid.apache.org/contributors.html
RedirectPermanent /compatibility.html http://qpid.apache.org/components/index.html
RedirectPermanent /getting_involved.html http://qpid.apache.org/get-involved.html
@@ -59,6 +60,14 @@
RedirectPermanent /release_notes_0.20.html http://qpid.apache.org/releases/qpid-0.20/release-notes.html
RedirectPermanent /release_notes_0.22.html http://qpid.apache.org/releases/qpid-0.22/release-notes.html
RedirectPermanent /source_repository.html http://qpid.apache.org/source-code.html
+
+ RedirectPermanent /books/0.20/AMQP-Messaging-Broker-CPP-Book/pdf/AMQP-Messaging-Broker-CPP-Book.pdf http://qpid.apache.org/releases/qpid-0.20/cpp-broker/cpp-broker-book.pdf
+ RedirectPermanent /books/0.20/AMQP-Messaging-Broker-Java-Book/pdf/AMQP-Messaging-Broker-Java-Book.pdf http://qpid.apache.org/releases/qpid-0.20/java-broker/java-broker-book.pdf
+ RedirectPermanent /books/0.20/Programming-In-Apache-Qpid/pdf/Programming-In-Apache-Qpid.pdf http://qpid.apache.org/releases/qpid-0.20/programming/programming-book.pdf
+
+ RedirectPermanent /books/0.22/AMQP-Messaging-Broker-CPP-Book/pdf/AMQP-Messaging-Broker-CPP-Book.pdf http://qpid.apache.org/releases/qpid-0.22/cpp-broker/cpp-broker-book.pdf
+ RedirectPermanent /books/0.22/AMQP-Messaging-Broker-Java-Book/pdf/AMQP-Messaging-Broker-Java-Book.pdf http://qpid.apache.org/releases/qpid-0.22/java-broker/java-broker-book.pdf
+ RedirectPermanent /books/0.22/Programming-In-Apache-Qpid/pdf/Programming-In-Apache-Qpid.pdf http://qpid.apache.org/releases/qpid-0.22/programming/programming-book.pdf
</IfModule>
<IfModule mod_deflate.c>
Modified: qpid/site/input/.htaccess
URL: http://svn.apache.org/viewvc/qpid/site/input/.htaccess?rev=1502571&r1=1502570&r2=1502571&view=diff
==============================================================================
--- qpid/site/input/.htaccess (original)
+++ qpid/site/input/.htaccess Fri Jul 12 14:18:53 2013
@@ -31,15 +31,15 @@
RewriteRule ^apis/0.16/(.*)$ /releases/qpid-0.16/apis/$1 [R=301,L]
RewriteRule ^apis/0.18/(.*)$ /releases/qpid-0.18/apis/$1 [R=301,L]
- RewriteRule ^books/0.20/AMQP-Messaging-Broker-CPP-Book/(.*)$ /releases/qpid-0.20/cpp-broker/book/$1 [R=301,L]
- RewriteRule ^books/0.20/AMQP-Messaging-Broker-Java-Book/(.*)$ /releases/qpid-0.20/java-broker/book/$1 [R=301,L]
- RewriteRule ^books/0.20/Programming-In-Apache-Qpid/(.*)$ /releases/qpid-0.20/programming/book/$1 [R=301,L]
+ RewriteRule ^books/0.20/AMQP-Messaging-Broker-CPP-Book/html/(.*)$ /releases/qpid-0.20/cpp-broker/book/$1 [R=301,L]
+ RewriteRule ^books/0.20/AMQP-Messaging-Broker-Java-Book/html/(.*)$ /releases/qpid-0.20/java-broker/book/$1 [R=301,L]
+ RewriteRule ^books/0.20/Programming-In-Apache-Qpid/html/(.*)$ /releases/qpid-0.20/programming/book/$1 [R=301,L]
RewriteRule ^apis/0.20/cpp/html/(.*) /releases/qpid-0.20/messaging-api/cpp/api/$1 [R=301,L]
RewriteRule ^apis/0.20/python/html/(.*) /releases/qpid-0.20/messaging-api/python/api/$1 [R=301,L]
- RewriteRule ^books/0.22/AMQP-Messaging-Broker-CPP-Book/(.*)$ /releases/qpid-0.22/cpp-broker/book/$1 [R=301,L]
- RewriteRule ^books/0.22/AMQP-Messaging-Broker-Java-Book/(.*)$ /releases/qpid-0.22/java-broker/book/$1 [R=301,L]
- RewriteRule ^books/0.22/Programming-In-Apache-Qpid/(.*)$ /releases/qpid-0.22/programming/book/$1 [R=301,L]
+ RewriteRule ^books/0.22/AMQP-Messaging-Broker-CPP-Book/html/(.*)$ /releases/qpid-0.22/cpp-broker/book/$1 [R=301,L]
+ RewriteRule ^books/0.22/AMQP-Messaging-Broker-Java-Book/html/(.*)$ /releases/qpid-0.22/java-broker/book/$1 [R=301,L]
+ RewriteRule ^books/0.22/Programming-In-Apache-Qpid/html/(.*)$ /releases/qpid-0.22/programming/book/$1 [R=301,L]
RewriteRule ^apis/0.22/cpp/html/(.*) /releases/qpid-0.22/messaging-api/cpp/api/$1 [R=301,L]
RewriteRule ^apis/0.22/python/html/(.*) /releases/qpid-0.22/messaging-api/python/api/$1 [R=301,L]
</IfModule>
@@ -47,6 +47,7 @@
<IfModule mod_alias.c>
Redirect /download.cgi http://qpid.apache.org/download.html
Redirect /licence.html http://www.apache.org/licenses/
+
RedirectPermanent /acknowledgements.html http://qpid.apache.org/contributors.html
RedirectPermanent /compatibility.html http://qpid.apache.org/components/index.html
RedirectPermanent /getting_involved.html http://qpid.apache.org/get-involved.html
@@ -59,6 +60,14 @@
RedirectPermanent /release_notes_0.20.html http://qpid.apache.org/releases/qpid-0.20/release-notes.html
RedirectPermanent /release_notes_0.22.html http://qpid.apache.org/releases/qpid-0.22/release-notes.html
RedirectPermanent /source_repository.html http://qpid.apache.org/source-code.html
+
+ RedirectPermanent /books/0.20/AMQP-Messaging-Broker-CPP-Book/pdf/AMQP-Messaging-Broker-CPP-Book.pdf http://qpid.apache.org/releases/qpid-0.20/cpp-broker/cpp-broker-book.pdf
+ RedirectPermanent /books/0.20/AMQP-Messaging-Broker-Java-Book/pdf/AMQP-Messaging-Broker-Java-Book.pdf http://qpid.apache.org/releases/qpid-0.20/java-broker/java-broker-book.pdf
+ RedirectPermanent /books/0.20/Programming-In-Apache-Qpid/pdf/Programming-In-Apache-Qpid.pdf http://qpid.apache.org/releases/qpid-0.20/programming/programming-book.pdf
+
+ RedirectPermanent /books/0.22/AMQP-Messaging-Broker-CPP-Book/pdf/AMQP-Messaging-Broker-CPP-Book.pdf http://qpid.apache.org/releases/qpid-0.22/cpp-broker/cpp-broker-book.pdf
+ RedirectPermanent /books/0.22/AMQP-Messaging-Broker-Java-Book/pdf/AMQP-Messaging-Broker-Java-Book.pdf http://qpid.apache.org/releases/qpid-0.22/java-broker/java-broker-book.pdf
+ RedirectPermanent /books/0.22/Programming-In-Apache-Qpid/pdf/Programming-In-Apache-Qpid.pdf http://qpid.apache.org/releases/qpid-0.22/programming/programming-book.pdf
</IfModule>
<IfModule mod_deflate.c>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org