qm: fix typos and improve wording in CPU Types section

[pve-docs.git] / pvesm.adoc

diff --git a/pvesm.adoc b/pvesm.adoc
index 35f1db8aee4db696d23a5c1621efddf597a02953..d250e0b507229d62bcb2b5ad4c57d76a3e3a8188 100644 (file)
--- a/pvesm.adoc
+++ b/pvesm.adoc
@@ -67,32 +67,36 @@ data to different nodes.
 .Available storage types
 [width="100%",cols="<2d,1*m,4*d",options="header"]
 |===========================================================
-|Description    |PVE type    |Level |Shared|Snapshots|Stable
-|ZFS (local)    |zfspool     |file  |no    |yes      |yes
-|Directory      |dir         |file  |no    |no^1^    |yes
-|NFS            |nfs         |file  |yes   |no^1^    |yes
-|CIFS           |cifs        |file  |yes   |no^1^    |yes
-|Proxmox Backup |pbs         |both  |yes   |n/a      |beta
-|GlusterFS      |glusterfs   |file  |yes   |no^1^    |yes
-|CephFS         |cephfs      |file  |yes   |yes      |yes
-|LVM            |lvm         |block |no^2^ |no       |yes
-|LVM-thin       |lvmthin     |block |no    |yes      |yes
-|iSCSI/kernel   |iscsi       |block |yes   |no       |yes
-|iSCSI/libiscsi |iscsidirect |block |yes   |no       |yes
-|Ceph/RBD       |rbd         |block |yes   |yes      |yes
-|ZFS over iSCSI |zfs         |block |yes   |yes      |yes
+|Description    |Plugin type |Level  |Shared|Snapshots|Stable
+|ZFS (local)    |zfspool     |both^1^|no    |yes      |yes
+|Directory      |dir         |file   |no    |no^2^    |yes
+|BTRFS          |btrfs       |file   |no    |yes      |technology preview
+|NFS            |nfs         |file   |yes   |no^2^    |yes
+|CIFS           |cifs        |file   |yes   |no^2^    |yes
+|Proxmox Backup |pbs         |both   |yes   |n/a      |yes
+|GlusterFS      |glusterfs   |file   |yes   |no^2^    |yes
+|CephFS         |cephfs      |file   |yes   |yes      |yes
+|LVM            |lvm         |block  |no^3^ |no       |yes
+|LVM-thin       |lvmthin     |block  |no    |yes      |yes
+|iSCSI/kernel   |iscsi       |block  |yes   |no       |yes
+|iSCSI/libiscsi |iscsidirect |block  |yes   |no       |yes
+|Ceph/RBD       |rbd         |block  |yes   |yes      |yes
+|ZFS over iSCSI |zfs         |block  |yes   |yes      |yes
 |===========================================================
 
-^1^: On file based storages, snapshots are possible with the 'qcow2' format.
+^1^: Disk images for VMs are stored in ZFS volume (zvol) datasets, which provide
+block device functionality.
 
-^2^: It is possible to use LVM on top of an iSCSI or FC-based storage.
-That way you get a `shared` LVM storage.
+^2^: On file based storages, snapshots are possible with the 'qcow2' format.
+
+^3^: It is possible to use LVM on top of an iSCSI or FC-based storage.
+That way you get a `shared` LVM storage
 
 
 Thin Provisioning
 ~~~~~~~~~~~~~~~~~
 
-A number of storages, and the Qemu image format `qcow2`, support 'thin
+A number of storages, and the QEMU image format `qcow2`, support 'thin
 provisioning'.  With thin provisioning activated, only the blocks that
 the guest system actually use will be written to the storage.
 
@@ -194,7 +198,7 @@ this property to select what this storage is used for.
 
 images:::
 
-KVM-Qemu VM images.
+QEMU/KVM VM images.
 
 rootdir:::
 
@@ -226,12 +230,24 @@ You can use this flag to disable the storage completely.
 
 maxfiles::
 
-Maximum number of backup files per VM. Use `0` for unlimited.
+Deprecated, please use `prune-backups` instead. Maximum number of backup files
+per VM. Use `0` for unlimited.
+
+prune-backups::
+
+Retention options for backups. For details, see
+xref:vzdump_retention[Backup Retention].
 
 format::
 
 Default image format (`raw|qcow2|vmdk`)
 
+preallocation::
+
+Preallocation mode (`off|metadata|falloc|full`) for `raw` and `qcow2` images on
+file-based storages. The default is `metadata`, which is treated like `off` for
+`raw` images. When using network storages in combination with large `qcow2`
+images, using `off` can help to avoid timeouts.
 
 WARNING: It is not advisable to use the same storage pool on different
 {pve} clusters. Some storage operation need exclusive access to the
@@ -387,7 +403,7 @@ See Also
 
 * link:/wiki/Storage:_CIFS[Storage: CIFS]
 
-* link:/wiki/Storage:_CIFS[Storage: Proxmox Backup Server]
+* link:/wiki/Storage:_Proxmox_Backup_Server[Storage: Proxmox Backup Server]
 
 * link:/wiki/Storage:_RBD[Storage: RBD]
 
@@ -427,6 +443,9 @@ include::pve-storage-rbd.adoc[]
 
 include::pve-storage-cephfs.adoc[]
 
+include::pve-storage-btrfs.adoc[]
+
+include::pve-storage-zfs.adoc[]
 
 
 ifdef::manvolnum[]