Publish OPS Guide to /openstack-ops

This depends on https://review.openstack.org/101993:
Publish OPS Guide to /openstack-ops and not anymore to
/trunk/openstack-ops.

Add redirects as needed and change all links.

Change-Id: Ib52bbbb1ec6e90ad3222ea6685039fd4d3fb366d

doc/admin-guide-cloud/ch_blockstorage.xml

@@ -23,7 +23,7 @@
             service in OpenStack. The bulk of the options come down to
             two choices, single node or multi-node install. You can
             read a longer discussion about storage decisions in <link
-                xlink:href="http://docs.openstack.org/trunk/openstack-ops/content/storage_decision.html"
+                xlink:href="http://docs.openstack.org/openstack-ops/content/storage_decision.html"
                 >Storage Decisions</link> in the <citetitle>OpenStack
                 Operations Guide</citetitle>.</para>
         <para>OpenStack Block Storage enables you to add extra

doc/admin-guide-cloud/compute/section_compute-images-instances.xml

@@ -37,7 +37,7 @@
                 </listitem>
                 <listitem>
                     <para>For more information about flavors, see <xref linkend="customize-flavors"/> or the <link
-                            xlink:href="http://docs.openstack.org/trunk/openstack-ops/content/flavors.html"
+                            xlink:href="http://docs.openstack.org/openstack-ops/content/flavors.html"
                             >Flavors</link> section in the <citetitle>OpenStack Operations
                             Guide</citetitle>.</para>
                 </listitem>

doc/admin-guide-cloud/compute/section_compute-networking-nova.xml

@@ -128,7 +128,7 @@
             cases, all traffic between VMs and the outer world flows through <systemitem
                 class="service">nova-network</systemitem>. Each mode has its pros and cons (see the
                 <citetitle>Network Topology</citetitle> section in the <link
-                    xlink:href="http://docs.openstack.org/trunk/openstack-ops/content/"
+                    xlink:href="http://docs.openstack.org/openstack-ops/content/"
                     ><citetitle>OpenStack Operations Guide</citetitle></link>.</para>
             <note>
                 <para>All networking options require network connectivity to be already set up

doc/common/section_cli_nova_images.xml

@@ -17,7 +17,7 @@
         <step>
             <para>Write any buffered data to disk.</para>
             <para>For more information, see the <link
-                    xlink:href="http://docs.openstack.org/trunk/openstack-ops/content/snapsnots.html"
+                    xlink:href="http://docs.openstack.org/openstack-ops/content/snapsnots.html"
                     >Taking Snapshots</link> in the
                     <citetitle>OpenStack Operations Guide</citetitle>.
            </para>

doc/common/section_cli_nova_manage_images.xml

@@ -15,7 +15,7 @@
     <procedure>
         <step>
             <para>Write any buffered data to disk.</para>
-            <para>For more information, see <link xlink:href="http://docs.openstack.org/trunk/openstack-ops/content/snapshots.html"
+            <para>For more information, see <link xlink:href="http://docs.openstack.org/openstack-ops/content/snapshots.html"
                     >Taking Snapshots</link> in the
                     <citetitle>OpenStack Operations
                 Guide</citetitle>.</para>

doc/security-guide/ch012_configuration-management.xml

@@ -278,7 +278,7 @@
         <listitem>
           <para><citetitle>OpenStack Operations Guide</citetitle> on
               <link
-              xlink:href="http://docs.openstack.org/trunk/openstack-ops/content/backup_and_recovery.html"
+              xlink:href="http://docs.openstack.org/openstack-ops/content/backup_and_recovery.html"
               >backup and recovery</link></para>
         </listitem>
         <listitem>

doc/user-guide-admin/section_cli_nova_manage_flavors.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <section xmlns="http://docbook.org/ns/docbook"
     xmlns:xi="http://www.w3.org/2001/XInclude"
     xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"
@@ -197,7 +197,7 @@
                     flavor that you do not want other tenants to have access to,
                 you can change the flavor's access to make it a private flavor.
                 See <link
-                    xlink:href="http://docs.openstack.org/trunk/openstack-ops/content/private-flavors.html">
+                    xlink:href="http://docs.openstack.org/openstack-ops/content/private-flavors.html">
                     Private Flavors in the OpenStack Operations Guide
                 </link>.</para>
                 <para>For a list of optional parameters, run this

www/.htaccess

@@ -109,7 +109,10 @@ redirect 301 /trunk/install-guide/install/zypper/content/object-storage-post-ins
 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
+redirect 301 /trunk/openstack-ops/oreilly-openstack-ops-guide.pdf /openstack-ops/openstack-ops-manual.pdf
+
+# Redirect Operations Guide to /openstack-ops
+redirect 301 /trunk/openstack-ops/ /openstack-ops/
 
 # 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

@@ -159,16 +159,16 @@ function recordOutboundLink(link, category, action) {
       in production for six months or longer. They've gathered their notes, shared their stories,
       and learned from each other in the room. We invite you to join in the quest for best practices
       in OpenStack cloud operations. You can read the
-     <a href="/trunk/openstack-ops/content/" onclick="recordOutboundLink(this, 'Outbound Links', 'ops.html');return false;">
+     <a href="/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 class="button" href="/trunk/openstack-ops/content/" onclick="recordOutboundLink(this, 'Outbound Links', 'ops.html');return false;">
+     <a class="button" href="/openstack-ops/content/" onclick="recordOutboundLink(this, 'Outbound Links', 'ops.html');return false;">
       Current .html
      </a>
-     <a class="button" href="/trunk/openstack-ops/openstack-ops-manual-trunk.pdf" onclick="recordOutboundLink(this, 'Outbound Links', 'ops.pdf');return false;">
+     <a class="button" href="/openstack-ops/openstack-ops-manual.pdf" onclick="recordOutboundLink(this, 'Outbound Links', 'ops.pdf');return false;">
       Current .pdf
      </a>
     </p>