add vxlan l3 routing

[pve-docs.git] / qm.adoc

diff --git a/qm.adoc b/qm.adoc
index 60cd1ddd8211c4d918bbfa8173219aef571ab6bf..06e88e3ae975b3ac0cbba4b3f257f358238c6ceb 100644 (file)
--- a/qm.adoc
+++ b/qm.adoc
@@ -418,7 +418,7 @@ For each VM you have the option to set a fixed size memory or asking
 host.
 
 .Fixed Memory Allocation
-[thumbnail="gui-create-vm-memory-fixed.png"]
+[thumbnail="gui-create-vm-memory.png"]
 
 When setting memory and minimum memory to the same amount
 {pve} will simply allocate what you specify to your VM.
@@ -435,10 +435,9 @@ it (e.g. for debugging purposes), simply uncheck
 in the configuration.
 
 .Automatic Memory Allocation
-[thumbnail="gui-create-vm-memory-dynamic.png", float="left"]
 
 // see autoballoon() in pvestatd.pm
-When setting the minimum memory lower that the memory, {pve} will make sure that the
+When setting the minimum memory lower than memory, {pve} will make sure that the
 minimum amount you specified is always available to the VM, and if RAM usage on
 the host is below 80%, will dynamically add memory to the guest up to the
 maximum memory specified.
@@ -885,7 +884,11 @@ Finally attach the unused disk to the SCSI controller of the VM:
 The VM is ready to be started.
 
 
+ifndef::wiki[]
 include::qm-cloud-init.adoc[]
+endif::wiki[]
+
+
 
 Managing Virtual Machines with `qm`
 ------------------------------------
@@ -1017,6 +1020,16 @@ CAUTION: Only do that if you are sure the action which set the lock is
 no longer running.
 
 
+ifdef::wiki[]
+
+See Also
+~~~~~~~~
+
+* link:/wiki/Cloud-Init_Support[Cloud-Init Support]
+
+endif::wiki[]
+
+
 ifdef::manvolnum[]
 
 Files