diff --git a/doc/arch-design/ch_references.xml b/doc/arch-design/ch_references.xml
index e6bb0da80e..e396b04758 100644
--- a/doc/arch-design/ch_references.xml
+++ b/doc/arch-design/ch_references.xml
@@ -76,7 +76,7 @@
   </para>
   <para>
     <link
-    xlink:href="http://docs.openstack.org/high-availability-guide/content/">OpenStack
+    xlink:href="http://docs.openstack.org/ha-guide/">OpenStack
     High Availability Guide</link>: Information on how to provide
     redundancy for the OpenStack components.
   </para>
diff --git a/doc/arch-design/compute_focus/section_architecture_compute_focus.xml b/doc/arch-design/compute_focus/section_architecture_compute_focus.xml
index e8de95df1f..acbd5638c6 100644
--- a/doc/arch-design/compute_focus/section_architecture_compute_focus.xml
+++ b/doc/arch-design/compute_focus/section_architecture_compute_focus.xml
@@ -211,7 +211,7 @@
             for instances. There are many additional networking software packages
             that might be useful to manage the OpenStack components themselves.
             The <citetitle>OpenStack High Availability Guide</citetitle>
-            (<link xlink:href="http://docs.openstack.org/high-availability-guide/content">http://docs.openstack.org/high-availability-guide/content</link>)
+            (<link xlink:href="http://docs.openstack.org/ha-guide/">http://docs.openstack.org/ha-guide/</link>)
             describes some of these software packages in more detail.
           </para>
           <para>For a compute-focused OpenStack cloud, the OpenStack infrastructure
diff --git a/doc/arch-design/generalpurpose/section_architecture_general_purpose.xml b/doc/arch-design/generalpurpose/section_architecture_general_purpose.xml
index 1438503201..ae5797bb99 100644
--- a/doc/arch-design/generalpurpose/section_architecture_general_purpose.xml
+++ b/doc/arch-design/generalpurpose/section_architecture_general_purpose.xml
@@ -653,7 +653,7 @@
     <para>Some of these software packages are described
         in more detail in the <citetitle>OpenStack High Availability
         Guide</citetitle> (refer to the <link
-        xlink:href="http://docs.openstack.org/high-availability-guide/content/ch-network.html">Network
+        xlink:href="http://docs.openstack.org/ha-guide/networking-ha.html">Network
         controller cluster stack chapter</link> of the OpenStack High
         Availability Guide).</para>
     <para>For a general purpose OpenStack cloud, the OpenStack
diff --git a/doc/arch-design/generalpurpose/section_tech_considerations_general_purpose.xml b/doc/arch-design/generalpurpose/section_tech_considerations_general_purpose.xml
index 43d5f43053..cef86642e7 100644
--- a/doc/arch-design/generalpurpose/section_tech_considerations_general_purpose.xml
+++ b/doc/arch-design/generalpurpose/section_tech_considerations_general_purpose.xml
@@ -640,7 +640,7 @@
         storage or OpenStack Block storage to provide a level of
         guarantee to match service features.</para>
     <para>For more information on high availability in OpenStack, see the <link
-      xlink:href="http://docs.openstack.org/high-availability-guide"><citetitle>OpenStack
+      xlink:href="http://docs.openstack.org/ha-guide/"><citetitle>OpenStack
       High Availability Guide</citetitle></link>.
         </para>
     </section>
diff --git a/doc/arch-design/multi_site/section_user_requirements_multi_site.xml b/doc/arch-design/multi_site/section_user_requirements_multi_site.xml
index 5f2c96bb1d..7937d92e41 100644
--- a/doc/arch-design/multi_site/section_user_requirements_multi_site.xml
+++ b/doc/arch-design/multi_site/section_user_requirements_multi_site.xml
@@ -54,7 +54,7 @@
         of any single site should have minimal impact on the
         availability of the OpenStack services.</para>
     <para>The <link
-        xlink:href="http://docs.openstack.org/high-availability-guide/content/"><citetitle>OpenStack
+        xlink:href="http://docs.openstack.org/ha-guide/"><citetitle>OpenStack
         High Availability Guide</citetitle></link>
         contains more information on how to provide redundancy for the
         OpenStack components.</para>
diff --git a/doc/arch-design/storage_focus/section_architecture_storage_focus.xml b/doc/arch-design/storage_focus/section_architecture_storage_focus.xml
index 26418f1e70..29353e9e75 100644
--- a/doc/arch-design/storage_focus/section_architecture_storage_focus.xml
+++ b/doc/arch-design/storage_focus/section_architecture_storage_focus.xml
@@ -519,7 +519,7 @@
         Keepalived, and various routing daemons (like Quagga). The
         <citetitle>OpenStack High Availability Guide</citetitle> describes
         some of these software packages, HAProxy in particular. See the <link
-        xlink:href="http://docs.openstack.org/high-availability-guide/content/ch-network.html">Network
+        xlink:href="http://docs.openstack.org/ha-guide/networking-ha.html">Network
         controller cluster stack chapter</link> of the OpenStack High
         Availability Guide.</para>
     </section>
diff --git a/doc/common-rst/app_support.rst b/doc/common-rst/app_support.rst
index c6df3e2e78..b883809775 100644
--- a/doc/common-rst/app_support.rst
+++ b/doc/common-rst/app_support.rst
@@ -51,7 +51,7 @@ The following books explain how to configure and run an OpenStack cloud:
 -  `Networking Guide <http://docs.openstack.org/networking-guide>`__
 
 -  `High Availability
-   Guide <http://docs.openstack.org/high-availability-guide/content/>`__
+   Guide <http://docs.openstack.org/ha-guide/>`__
 
 -  `Security Guide <http://docs.openstack.org/sec/>`__
 
diff --git a/doc/common/app_support.xml b/doc/common/app_support.xml
index 88fb0b9abf..86adfb0759 100644
--- a/doc/common/app_support.xml
+++ b/doc/common/app_support.xml
@@ -89,7 +89,7 @@
             </listitem>
             <listitem>
                 <para><link
-                        xlink:href="http://docs.openstack.org/high-availability-guide/content/"
+                        xlink:href="http://docs.openstack.org/ha-guide/"
                             ><citetitle>High Availability
                             Guide</citetitle></link></para>
             </listitem>
diff --git a/doc/contributor-guide/source/content-specs.rst b/doc/contributor-guide/source/content-specs.rst
index 43879dba9d..1d9899d73a 100644
--- a/doc/contributor-guide/source/content-specs.rst
+++ b/doc/contributor-guide/source/content-specs.rst
@@ -161,7 +161,7 @@ This guide has a review in place to get a license indicator in output:
 
 .. _`OpenStack Architecture Design Guide`: http://docs.openstack.org/arch-design/content/
 .. _`OpenStack Cloud Administrator Guide`: http://docs.openstack.org/admin-guide-cloud/index.html
-.. _`OpenStack High Availability Guide`: http://docs.openstack.org/high-availability-guide/content/index.html
+.. _`OpenStack High Availability Guide`: http://docs.openstack.org/ha-guide/index.html
 .. _`OpenStack Security Guide`: http://docs.openstack.org/sec/
 .. _`Virtual Machine Image Guide`: http://docs.openstack.org/image-guide/content/
 
diff --git a/doc/contributor-guide/source/docs_builds.rst b/doc/contributor-guide/source/docs_builds.rst
index 4400ad0e18..a38d1fa91f 100644
--- a/doc/contributor-guide/source/docs_builds.rst
+++ b/doc/contributor-guide/source/docs_builds.rst
@@ -80,7 +80,7 @@ Guides for deployers and administrators
 
    * - High Availability Guide
      - http://git.openstack.org/cgit/openstack/ha-guide
-     - http://docs.openstack.org/high-availability-guide/content
+     - http://docs.openstack.org/ha-guide
 
    * - Operations Guide
      - http://git.openstack.org/cgit/openstack/operations-guide/