diff --git a/doc/admin-guide-cloud/source/objectstorage_components.rst b/doc/admin-guide-cloud/source/objectstorage_components.rst
index aa2ac15bf3..6b3fa95aa9 100644
--- a/doc/admin-guide-cloud/source/objectstorage_components.rst
+++ b/doc/admin-guide-cloud/source/objectstorage_components.rst
@@ -47,9 +47,9 @@ needed based on projected workloads. A minimum of two proxy servers
 should be deployed for redundancy. If one proxy server fails, the others
 take over.
 
-For more information concerning proxy server configuration, please see
-the `Configuration
-Reference <http://docs.openstack.org/trunk/config-reference/content/proxy-server-configuration.html>`__.
+For more information concerning proxy server configuration, please see the
+`Configuration Reference
+<http://docs.openstack.org/liberty/config-reference/content/proxy-server-configuration.html>`__.
 
 Rings
 -----
diff --git a/doc/config-reference/source/block-storage/drivers/vmware-vmdk-driver.rst b/doc/config-reference/source/block-storage/drivers/vmware-vmdk-driver.rst
index c1a8976405..1453b2365d 100644
--- a/doc/config-reference/source/block-storage/drivers/vmware-vmdk-driver.rst
+++ b/doc/config-reference/source/block-storage/drivers/vmware-vmdk-driver.rst
@@ -1,3 +1,5 @@
+.. _block_storage_vmdk_driver:
+
 ==================
 VMware VMDK driver
 ==================
diff --git a/doc/config-reference/source/compute/hypervisor-kvm.rst b/doc/config-reference/source/compute/hypervisor-kvm.rst
index f011cd5bf2..9168cf3ce9 100644
--- a/doc/config-reference/source/compute/hypervisor-kvm.rst
+++ b/doc/config-reference/source/compute/hypervisor-kvm.rst
@@ -132,9 +132,8 @@ this support on the system or find a system with this support.
    enter the system BIOS, and enable the VT option.
 
 If KVM acceleration is not supported, configure Compute to use a different
-hypervisor, such as `QEMU <http://docs.openstack.org/liberty/
-config-reference/content/qemu.html>`_ or `Xen <http://docs.openstack.org/
-liberty/config-reference/content/xen_libvirt.html>`_.
+hypervisor, such as ``QEMU`` or ``Xen``. See :ref:`compute_qemu` or
+:ref:`compute_xen_api` for details.
 
 These procedures help you load the kernel modules for Intel-based and
 AMD-based processors if they do not load automatically during KVM
diff --git a/doc/config-reference/source/compute/hypervisor-qemu.rst b/doc/config-reference/source/compute/hypervisor-qemu.rst
index 78cecac30c..6849b89c28 100644
--- a/doc/config-reference/source/compute/hypervisor-qemu.rst
+++ b/doc/config-reference/source/compute/hypervisor-qemu.rst
@@ -1,3 +1,5 @@
+.. _compute_qemu:
+
 ====
 QEMU
 ====
diff --git a/doc/config-reference/source/compute/hypervisor-vmware.rst b/doc/config-reference/source/compute/hypervisor-vmware.rst
index 8ecef261a2..d8a83fe426 100644
--- a/doc/config-reference/source/compute/hypervisor-vmware.rst
+++ b/doc/config-reference/source/compute/hypervisor-vmware.rst
@@ -765,12 +765,11 @@ Volumes with VMware vSphere
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 The VMware driver supports attaching volumes from the Block Storage service.
-The VMware VMDK driver for OpenStack Block Storage is recommended and should
-be used for managing volumes based on vSphere data stores. For more
-information about the VMware VMDK driver, see `VMware VMDK Driver <http://
-docs.openstack.org/trunk/config-reference/content/vmware-vmdk-driver.html>`_
-Also an iSCSI volume driver provides limited support and can be used only
-for attachments.
+The VMware VMDK driver for OpenStack Block Storage is recommended and should be
+used for managing volumes based on vSphere data stores. For more information
+about the VMware VMDK driver, see :ref:`block_storage_vmdk_driver`.  Also an
+iSCSI volume driver provides limited support and can be used only for
+attachments.
 
 .. _vmware-additional:
 
diff --git a/doc/config-reference/source/compute/hypervisor-xen-api.rst b/doc/config-reference/source/compute/hypervisor-xen-api.rst
index 6dcf29a7e1..c9ea507ca8 100644
--- a/doc/config-reference/source/compute/hypervisor-xen-api.rst
+++ b/doc/config-reference/source/compute/hypervisor-xen-api.rst
@@ -1,3 +1,5 @@
+.. _compute_xen_api:
+
 =============================================
 XenServer (and other XAPI based Xen variants)
 =============================================