diff --git a/doc/config-ref-rst/source/compute.rst b/doc/config-ref-rst/source/compute.rst
index cbf6252235..f52ee45b32 100644
--- a/doc/config-ref-rst/source/compute.rst
+++ b/doc/config-ref-rst/source/compute.rst
@@ -13,6 +13,7 @@ Compute
compute/rpc.rst
compute/api.rst
compute/ec2-api.rst
+ compute/hypervisors.rst
compute/scheduler.rst
compute/cells.rst
compute/conductor.rst
diff --git a/doc/config-ref-rst/source/compute/api.rst b/doc/config-ref-rst/source/compute/api.rst
index 04f58190bd..e6c6584000 100644
--- a/doc/config-ref-rst/source/compute/api.rst
+++ b/doc/config-ref-rst/source/compute/api.rst
@@ -63,7 +63,6 @@ Normally, you install OpenStack Compute with the following limits enabled:
.. list-table:: Default API rate limits
:header-rows: 1
- :class: config-ref-table
* - HTTP method
- API URI
diff --git a/doc/config-ref-rst/source/compute/hypervisor-basics.rst b/doc/config-ref-rst/source/compute/hypervisor-basics.rst
new file mode 100644
index 0000000000..ff90da4bc4
--- /dev/null
+++ b/doc/config-ref-rst/source/compute/hypervisor-basics.rst
@@ -0,0 +1,17 @@
+===============================
+Hypervisor configuration basics
+===============================
+
+The node where the ``nova-compute`` service is installed and
+operates on the same node that runs all of the virtual machines.
+This is referred to as the compute node in this guide.
+
+By default, the selected hypervisor is KVM. To change to another
+hypervisor, change the ``virt_type`` option in the ``[libvirt]``
+section of ``nova.conf`` and restart the ``nova-compute`` service.
+
+Here are the general ``nova.conf`` options that are used to
+configure the compute node's hypervisor: :ref:`nova-hypervisor`
+
+Specific options for particular hypervisors can be found in
+the following sections.
diff --git a/doc/config-ref-rst/source/compute/hypervisor-hyper-v.rst b/doc/config-ref-rst/source/compute/hypervisor-hyper-v.rst
new file mode 100644
index 0000000000..920bfd1c1e
--- /dev/null
+++ b/doc/config-ref-rst/source/compute/hypervisor-hyper-v.rst
@@ -0,0 +1,3 @@
+===============================
+Hyper-V virtualization platform
+===============================
diff --git a/doc/config-ref-rst/source/compute/hypervisor-kvm.rst b/doc/config-ref-rst/source/compute/hypervisor-kvm.rst
new file mode 100644
index 0000000000..57dd0c0866
--- /dev/null
+++ b/doc/config-ref-rst/source/compute/hypervisor-kvm.rst
@@ -0,0 +1,3 @@
+===
+KVM
+===
diff --git a/doc/config-ref-rst/source/compute/hypervisor-lxc.rst b/doc/config-ref-rst/source/compute/hypervisor-lxc.rst
new file mode 100644
index 0000000000..32c67f6b2a
--- /dev/null
+++ b/doc/config-ref-rst/source/compute/hypervisor-lxc.rst
@@ -0,0 +1,3 @@
+======================
+LXC (Linux containers)
+======================
diff --git a/doc/config-ref-rst/source/compute/hypervisor-qemu.rst b/doc/config-ref-rst/source/compute/hypervisor-qemu.rst
new file mode 100644
index 0000000000..e0690edb4e
--- /dev/null
+++ b/doc/config-ref-rst/source/compute/hypervisor-qemu.rst
@@ -0,0 +1,3 @@
+====
+QEMU
+====
diff --git a/doc/config-ref-rst/source/compute/hypervisor-vmware.rst b/doc/config-ref-rst/source/compute/hypervisor-vmware.rst
new file mode 100644
index 0000000000..7550206ce2
--- /dev/null
+++ b/doc/config-ref-rst/source/compute/hypervisor-vmware.rst
@@ -0,0 +1,3 @@
+==============
+VMware vSphere
+==============
diff --git a/doc/config-ref-rst/source/compute/hypervisor-xen-api.rst b/doc/config-ref-rst/source/compute/hypervisor-xen-api.rst
new file mode 100644
index 0000000000..f2d22d861c
--- /dev/null
+++ b/doc/config-ref-rst/source/compute/hypervisor-xen-api.rst
@@ -0,0 +1,3 @@
+=============================================
+XenServer (and other XAPI based Xen variants)
+=============================================
diff --git a/doc/config-ref-rst/source/compute/hypervisor-xen-libvirt.rst b/doc/config-ref-rst/source/compute/hypervisor-xen-libvirt.rst
new file mode 100644
index 0000000000..994d0009ad
--- /dev/null
+++ b/doc/config-ref-rst/source/compute/hypervisor-xen-libvirt.rst
@@ -0,0 +1,3 @@
+===============
+Xen via Libvirt
+===============
diff --git a/doc/config-ref-rst/source/compute/hypervisors.rst b/doc/config-ref-rst/source/compute/hypervisors.rst
new file mode 100644
index 0000000000..d5f176c0c6
--- /dev/null
+++ b/doc/config-ref-rst/source/compute/hypervisors.rst
@@ -0,0 +1,59 @@
+===========
+Hypervisors
+===========
+
+.. toctree::
+ :maxdepth: 1
+
+ hypervisor-basics.rst
+ hypervisor-kvm.rst
+ hypervisor-qemu.rst
+ hypervisor-xen-api.rst
+ hypervisor-xen-libvirt.rst
+ hypervisor-lxc.rst
+ hypervisor-vmware.rst
+ hypervisor-hyper-v.rst
+
+OpenStack Compute supports many hypervisors, which might make it difficult
+for you to choose one. Most installations use only one hypervisor.
+However, you can use :ref:`ComputeFilter` and :ref:`ImagePropertiesFilter`
+to schedule different hypervisors within the same installation.
+The following links help you choose a hypervisor.
+See http://docs.openstack.org/developer/nova/support-matrix.html
+for a detailed list of features and support across the hypervisors.
+
+The following hypervisors are supported:
+
+* `KVM <http://www.linux-kvm.org/page/Main_Page>`_ -
+ Kernel-based Virtual Machine. The virtual disk formats that it
+ supports is inherited from QEMU since it uses a modified QEMU
+ program to launch the virtual machine. The supported formats
+ include raw images, the qcow2, and VMware formats.
+
+* `LXC <http://lxc.sourceforge.net/>`_ - Linux Containers
+ (through libvirt), used to run Linux-based virtual machines.
+
+* `QEMU <http://wiki.qemu.org/Manual>`_ - Quick EMUlator,
+ generally only used for development purposes.
+
+* `UML <http://user-mode-linux.sourceforge.net/>`_ - User Mode Linux,
+ generally only used for development purposes.
+
+* `VMware vSphere
+ <http://www.vmware.com/products/vsphere-hypervisor/support.html>`_
+ 4.1 update 1 and newer, runs VMware-based Linux and Windows images
+ through a connection with a vCenter server or directly with an ESXi host.
+
+* `Xen (using libvirt) <http://www.xenproject.org>`_ - Xen Project
+ Hypervisor using libvirt as management interface into ``nova-compute``
+ to run Linux, Windows, FreeBSD and NetBSD virtual machines.
+
+* `XenServer <http://www.xenserver.org>`_ - XenServer,
+ Xen Cloud Platform (XCP) and other XAPI based Xen variants runs Linux
+ or Windows virtual machines. You must install the ``nova-compute``
+ service in a para-virtualized VM.
+
+* `Hyper-V <http://www.microsoft.com/en-us/server-cloud/windows-server/
+ server-virtualization-features.aspx>`_ - Server virtualization with
+ Microsoft Hyper-V, use to run Windows, Linux, and FreeBSD virtual machines.
+ Runs ``nova-compute`` natively on the Windows virtualization platform.
diff --git a/doc/config-ref-rst/source/compute/scheduler.rst b/doc/config-ref-rst/source/compute/scheduler.rst
index b495ff6691..8c3b080137 100644
--- a/doc/config-ref-rst/source/compute/scheduler.rst
+++ b/doc/config-ref-rst/source/compute/scheduler.rst
@@ -287,6 +287,8 @@ extra specs key as the key to be matched if no namespace is present;
this action is highly discouraged because it conflicts with
:ref:`AggregateInstanceExtraSpecsFilter` filter when you enable both filters.
+.. _ComputeFilter:
+
ComputeFilter
-------------
@@ -491,6 +493,8 @@ use the ``--hint`` flag. For example:
This filter should not be enabled at the same time as
:ref:`GroupAffinityFilter` or neither filter will work properly.
+.. _ImagePropertiesFilter:
+
ImagePropertiesFilter
---------------------