backup: clarify that CLI means FS-level and highlight retention-note

[pve-docs.git] / pvesm.adoc

diff --git a/pvesm.adoc b/pvesm.adoc
index c2be9fedb58de28e66455bf40cc7e1cc079181ed..98c8c449802f0ca25ac4fb8f83715ac7e52d963f 100644 (file)
--- a/pvesm.adoc
+++ b/pvesm.adoc
@@ -65,13 +65,15 @@ data to different nodes.
 
 
 .Available storage types
-[width="100%",cols="<d,1*m,4*d",options="header"]
+[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
+|BTRFS          |btrfs       |file  |no    |yes      |technology preview
 |NFS            |nfs         |file  |yes   |no^1^    |yes
 |CIFS           |cifs        |file  |yes   |no^1^    |yes
+|Proxmox Backup |pbs         |both  |yes   |n/a      |yes
 |GlusterFS      |glusterfs   |file  |yes   |no^1^    |yes
 |CephFS         |cephfs      |file  |yes   |yes      |yes
 |LVM            |lvm         |block |no^2^ |no       |yes
@@ -80,12 +82,12 @@ data to different nodes.
 |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.
 
-^2^: It is possible to use LVM on top of an iSCSI storage. That way
-you get a `shared` LVM storage.
+^2^: 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
@@ -139,12 +141,13 @@ Each storage pool has a `<type>`, and is uniquely identified by its
 <type>: <STORAGE_ID>
        <property> <value>
        <property> <value>
+       <property>
        ...
 ----
 
 The `<type>: <STORAGE_ID>` line starts the pool definition, which is then
-followed by a list of properties. Most properties have values and some of
-them come with a reasonable default. In that case you can omit the value.
+followed by a list of properties. Most properties require a value. Some have
+reasonable defaults, in which case you can omit the value.
 
 To be more specific, take a look at the default storage configuration
 after installation. It contains one special local storage pool named
@@ -224,7 +227,13 @@ 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::
 
@@ -356,6 +365,14 @@ Show file system path for a volume
 
  pvesm path <VOLUME_ID>
 
+Exporting the volume `local:103/vm-103-disk-0.qcow2` to the file `target`.
+This is mostly used internally with `pvesm import`.
+The stream format qcow2+size is different to the qcow2 format.
+Consequently, the exported file cannot simply be attached to a VM.
+This also holds for the other formats.
+
+ pvesm export local:103/vm-103-disk-0.qcow2 qcow2+size target --with-snapshots 1
+
 ifdef::wiki[]
 
 See Also
@@ -377,6 +394,8 @@ See Also
 
 * link:/wiki/Storage:_CIFS[Storage: CIFS]
 
+* link:/wiki/Storage:_Proxmox_Backup_Server[Storage: Proxmox Backup Server]
+
 * link:/wiki/Storage:_RBD[Storage: RBD]
 
 * link:/wiki/Storage:_CephFS[Storage: CephFS]
@@ -397,6 +416,8 @@ include::pve-storage-nfs.adoc[]
 
 include::pve-storage-cifs.adoc[]
 
+include::pve-storage-pbs.adoc[]
+
 include::pve-storage-glusterfs.adoc[]
 
 include::pve-storage-zfspool.adoc[]
@@ -413,6 +434,9 @@ include::pve-storage-rbd.adoc[]
 
 include::pve-storage-cephfs.adoc[]
 
+include::pve-storage-btrfs.adoc[]
+
+include::pve-storage-zfs.adoc[]
 
 
 ifdef::manvolnum[]