Merge "Removes link to O'Reilly PDF; adds link to Current PDF"

www/.htaccess

@@ -108,6 +108,8 @@ redirect 301 /trunk/install-guide/install/apt-debian/content/object-storage-post
 redirect 301 /trunk/install-guide/install/zypper/content/object-storage-post-install.html /trunk/install-guide/install/zypper/content/verify-object-storage-installation.html
 redirect 301 /trunk/install-guide/install/yum/content/object-storage-post-install.html /trunk/install-guide/install/yum/content/verify-object-storage-installation.html
 
+# Redirect O'Reilly Operations Guide PDF to trunk version
+redirect 301 /trunk/openstack-ops/oreilly-openstack-ops-guide.pdf /trunk/openstack-ops/openstack-ops-manual-trunk.pdf
 
 # A doc generation bug resulted in Google indexing links containing "//", which cause
 # problems with linked content (images/css/etc).  This rule generates a 301 redirect

www/ops/index.html

@@ -142,11 +142,11 @@ function recordOutboundLink(link, category, action) {
 			in OpenStack cloud operations. You can read the <a href="/trunk/openstack-ops/content/" onClick="recordOutboundLink(this, 'Outbound Links', 'ops.html');return false;" >latest updates</a> or download the new O'Reilly published versions below.
 			</p>
 			<p><a href="/trunk/openstack-ops/content/" class="button" onClick="recordOutboundLink(this, 'Outbound Links', 'ops.html');return false;" >
-			Current</a>
+			Current .html</a>
+			<a href="/trunk/openstack-ops/openstack-ops-manual-trunk.pdf" class="button" onClick="recordOutboundLink(this, 'Outbound Links', 'ops.pdf');return false;" >
+			Current .pdf</a>
 			</p>
 			<p>
-            <a href="oreilly-openstack-ops-guide.pdf" class="button" onClick="recordOutboundLink(this, 'Outbound Links', 'ops.pdf');return false;" >
-			O'Reilly .pdf</a>
 			<a href="oreilly-openstack-ops-guide.mobi" class="button" onClick="recordOutboundLink(this, 'Outbound Links', 'ops.mobi');return false;" >
 			O'Reilly .mobi</a>
 			<a href="oreilly-openstack-ops-guide.epub" class="button" onClick="recordOutboundLink(this, 'Outbound Links', 'ops.epub');return false;" >