From 94589915b019e2147792b7c9b917193c5b53ab64 Mon Sep 17 00:00:00 2001
From: Wojtek Porczyk <woju@invisiblethingslab.com>
Date: Wed, 20 Apr 2016 13:50:42 +0200
Subject: [PATCH] Fix documentation

---
 doc/qubes-tools/qmemmand.rst  |  8 ++++++++
 doc/qubes-tools/qvm_start.rst |  8 ++++++++
 doc/qubes-vm/hvm.rst          |  8 --------
 doc/qubes-vm/index.rst        | 13 ++-----------
 doc/qubes-vm/templatehvm.rst  |  8 --------
 qubes/tools/qvm_unpause.py    |  2 +-
 6 files changed, 19 insertions(+), 28 deletions(-)
 create mode 100644 doc/qubes-tools/qmemmand.rst
 create mode 100644 doc/qubes-tools/qvm_start.rst
 delete mode 100644 doc/qubes-vm/hvm.rst
 delete mode 100644 doc/qubes-vm/templatehvm.rst

diff --git a/doc/qubes-tools/qmemmand.rst b/doc/qubes-tools/qmemmand.rst
new file mode 100644
index 00000000..277044f9
--- /dev/null
+++ b/doc/qubes-tools/qmemmand.rst
@@ -0,0 +1,8 @@
+:py:mod:`qubes.tools.qmemmand` -- qmemman daemon
+================================================
+
+.. automodule:: qubes.tools.qmemmand
+   :members:
+   :show-inheritance:
+
+.. vim: ts=3 sw=3 et
diff --git a/doc/qubes-tools/qvm_start.rst b/doc/qubes-tools/qvm_start.rst
new file mode 100644
index 00000000..30d79107
--- /dev/null
+++ b/doc/qubes-tools/qvm_start.rst
@@ -0,0 +1,8 @@
+:py:mod:`qubes.tools.qvm_start` -- Start a domain
+=================================================
+
+.. automodule:: qubes.tools.qvm_start
+   :members:
+   :show-inheritance:
+
+.. vim: ts=3 sw=3 et
diff --git a/doc/qubes-vm/hvm.rst b/doc/qubes-vm/hvm.rst
deleted file mode 100644
index 3aaff0d3..00000000
--- a/doc/qubes-vm/hvm.rst
+++ /dev/null
@@ -1,8 +0,0 @@
-:py:mod:`qubes.vm.hvm` -- HVM
-=============================
-
-.. automodule:: qubes.vm.hvm
-   :members:
-   :show-inheritance:
-
-.. vim: ts=3 sw=3 et
diff --git a/doc/qubes-vm/index.rst b/doc/qubes-vm/index.rst
index 65cd8d6e..7c725f1a 100644
--- a/doc/qubes-vm/index.rst
+++ b/doc/qubes-vm/index.rst
@@ -59,11 +59,7 @@ Helper classes and functions
    :members:
    :show-inheritance:
 
-.. autoclass:: qubes.vm.DeviceCollection
-   :members:
-   :show-inheritance:
-
-.. autoclass:: qubes.vm.DeviceManager
+.. autoclass:: qubes.vm.Features
    :members:
    :show-inheritance:
 
@@ -87,11 +83,6 @@ Special VM types:
    dispvm
    adminvm
 
-HVMs:
-
-.. toctree::
-   :maxdepth: 1
-
-   hvm
+.. standalonevm
 
 .. vim: ts=3 sw=3 et
diff --git a/doc/qubes-vm/templatehvm.rst b/doc/qubes-vm/templatehvm.rst
deleted file mode 100644
index 81c1f2c7..00000000
--- a/doc/qubes-vm/templatehvm.rst
+++ /dev/null
@@ -1,8 +0,0 @@
-:py:mod:`qubes.vm.templatehvm` -- Template for HVM
-==================================================
-
-.. automodule:: qubes.vm.templatehvm
-   :members:
-   :show-inheritance:
-
-.. vim: ts=3 sw=3 et
diff --git a/qubes/tools/qvm_unpause.py b/qubes/tools/qvm_unpause.py
index 03df896a..c12611fb 100644
--- a/qubes/tools/qvm_unpause.py
+++ b/qubes/tools/qvm_unpause.py
@@ -22,7 +22,7 @@
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 
-'''qvm-unpause - Unause a domain'''
+'''qvm-unpause - Unpause a domain'''
 
 import sys
 import qubes