bump package versions

[pve-docs.git] / qm.adoc

diff --git a/qm.adoc b/qm.adoc
index 0b8aa925a4d8a4962deb665f7ad144a78364b829..14de2d14ce63bcfc38a35158fd3da5e89f0f2ff7 100644 (file)
--- a/qm.adoc
+++ b/qm.adoc
@@ -1,7 +1,7 @@
-include::attributes.txt[]
 ifdef::manvolnum[]
 PVE({manvolnum})
 ================
+include::attributes.txt[]
 
 NAME
 ----
@@ -21,6 +21,7 @@ endif::manvolnum[]
 ifndef::manvolnum[]
 Qemu/KVM Virtual Machines
 =========================
+include::attributes.txt[]
 endif::manvolnum[]
 
 
@@ -37,20 +38,21 @@ All configuration files consists of lines in the form
 
  PARAMETER: value
 
-See 'man vm.conf' for a complete list of options.
-
-Configuration files are stored inside the Proxmox configuration file
+Configuration files are stored inside the Proxmox cluster file
 system, and can be access at '/etc/pve/qemu-server/<VMID>.conf'.
 
-The default for option `keyboard` is read from
-'/etc/pve/datacenter.conf'.
+Options
+~~~~~~~
+
+include::qm.conf.5-opts.adoc[]
+
 
 Locks
 -----
 
-Online migration and backups ('vzdump') set a lock to prevent
-unintentional action on such VMs. Sometimes you need remove such lock
-manually (power failure).
+Online migrations and backups ('vzdump') set a lock to prevent incompatible
+concurrent actions on the affected VMs. Sometimes you need to remove such a
+lock manually (e.g., after a power failure).
 
  qm unlock <vmid>