diff --git a/doc/common-rst/cli_nova_evacuate.rst b/doc/common-rst/cli_nova_evacuate.rst
index 3815ee1ec5..8c54a34c12 100644
--- a/doc/common-rst/cli_nova_evacuate.rst
+++ b/doc/common-rst/cli_nova_evacuate.rst
@@ -40,7 +40,7 @@ VM host is down; otherwise, the evacuation fails with an error.
 #. To preserve the user disk data on the evacuated server, deploy
    OpenStack Compute with a shared file system. To configure your
    system, see `Configure migrations
-   <http://docs.openstack.org/admin-guide-cloud/content/section_configuring-compute-migrations.html>`_
+   <http://docs.openstack.org/admin-guide-cloud/compute-configuring-migrations.html>`_
    in OpenStack Cloud Administrator Guide. In the following example,
    the password remains unchanged::
 
diff --git a/doc/common-rst/get_started_compute.rst b/doc/common-rst/get_started_compute.rst
index 7b796db7c2..b57e1c87a2 100644
--- a/doc/common-rst/get_started_compute.rst
+++ b/doc/common-rst/get_started_compute.rst
@@ -27,7 +27,7 @@ OpenStack Compute consists of the following areas and their components:
   Accepts metadata requests from instances. The nova-api-metadata
   service is generally used when you run in multi-host mode with
   nova-network installations. For details, see `Metadata
-  service <http://docs.openstack.org/admin-guide-cloud/content/section_metadata-service.html>`__
+  service <http://docs.openstack.org/admin-guide-cloud/compute-networking-nova.html#metadata-service>`__
   in the OpenStack Cloud Administrator Guide.
 
 .. TODO Fix the link above when the file is converted.
@@ -78,7 +78,7 @@ OpenStack Compute consists of the following areas and their components:
   for console proxies to work. You can run proxies of either type
   against a single nova-consoleauth service in a cluster
   configuration. For information, see `About
-  nova-consoleauth <http://docs.openstack.org/admin-guide-cloud/content/about-nova-consoleauth.html>`__.
+  nova-consoleauth <http://docs.openstack.org/admin-guide-cloud/compute-remote-console-access.html#about-nova-consoleauth>`__.
 
 ``nova-novncproxy`` daemon
   Provides a proxy for accessing running instances through a VNC
diff --git a/doc/common/section_cli_nova_evacuate.xml b/doc/common/section_cli_nova_evacuate.xml
index 7556dda861..48a728ebd2 100644
--- a/doc/common/section_cli_nova_evacuate.xml
+++ b/doc/common/section_cli_nova_evacuate.xml
@@ -35,7 +35,7 @@
         <step>
             <para>To preserve the user disk data on the evacuated server, deploy OpenStack Compute
                 with a shared file system. To configure your system, see <link
-                    xlink:href="http://docs.openstack.org/admin-guide-cloud/content/section_configuring-compute-migrations.html"
+                    xlink:href="http://docs.openstack.org/admin-guide-cloud/compute-configuring-migrations.html"
                     >Configure migrations</link> in <citetitle>OpenStack Cloud Administrator
                     Guide</citetitle>. In the following example, the password remains
                 unchanged:</para>
diff --git a/doc/common/section_compute-configure-vnc.xml b/doc/common/section_compute-configure-vnc.xml
index 2128b4a107..21a5a8d0d5 100644
--- a/doc/common/section_compute-configure-vnc.xml
+++ b/doc/common/section_compute-configure-vnc.xml
@@ -127,7 +127,7 @@
     <xi:include href="../common/tables/nova-vnc.xml"/>
     <note>
       <para>To support <link
-          xlink:href="http://docs.openstack.org/admin-guide-cloud/content/section_configuring-compute-migrations.html"
+          xlink:href="http://docs.openstack.org/admin-guide-cloud/compute-configuring-migrations.html"
           >live migration</link>, you cannot specify a specific IP
         address for <literal>vncserver_listen</literal>, because that
         IP address does not exist on the destination host.</para>
diff --git a/doc/common/section_getstart_compute.xml b/doc/common/section_getstart_compute.xml
index 8c6ee8686b..22b780796b 100644
--- a/doc/common/section_getstart_compute.xml
+++ b/doc/common/section_getstart_compute.xml
@@ -41,7 +41,7 @@
           service is generally used when you run in multi-host mode
           with <systemitem class="service">nova-network</systemitem>
           installations. For details, see <link
-            xlink:href="http://docs.openstack.org/admin-guide-cloud/content/section_metadata-service.html"
+            xlink:href="http://docs.openstack.org/admin-guide-cloud/compute-networking-nova.html#metadata-service"
             >Metadata service</link> in the <citetitle>OpenStack Cloud
             Administrator Guide</citetitle>.</para>
         <para>On Debian systems, it is included in the <systemitem
@@ -141,7 +141,7 @@
           run proxies of either type against a single <systemitem
             class="service">nova-consoleauth</systemitem> service in a
           cluster configuration. For information, see <link
-            xlink:href="http://docs.openstack.org/admin-guide-cloud/content/about-nova-consoleauth.html"
+            xlink:href="http://docs.openstack.org/admin-guide-cloud/compute-remote-console-access.html#about-nova-consoleauth"
             >About nova-consoleauth</link>.</para>
       </listitem>
     </varlistentry>