followup: minor fixup and comment out "TODO"

[pve-docs.git] / pvesm.adoc

diff --git a/pvesm.adoc b/pvesm.adoc
index c5cd0bb1e2dda51f157631e246d695d5980a42ec..00f3d7ad9942ae788d8564df79c12d82d976d85f 100644 (file)
--- a/pvesm.adoc
+++ b/pvesm.adoc
@@ -48,6 +48,13 @@ Storage Types
 
 There are basically two different classes of storage types:
 
+File level storage::
+
+File level based storage technologies allow access to a full featured (POSIX)
+file system.  They are in general more flexible than any Block level storage
+(see below), and allow you to store content of any type. ZFS is probably the
+most advanced system, and it has full support for snapshots and clones.
+
 Block level storage::
 
 Allows to store large 'raw' images. It is usually not possible to store
@@ -56,13 +63,6 @@ block level storage implementations support snapshots and clones.
 RADOS, Sheepdog and GlusterFS are distributed systems, replicating storage
 data to different nodes.
 
-File level storage::
-
-They allow access to a full featured (POSIX) file system. They are
-more flexible, and allows you to store any content type. ZFS is
-probably the most advanced system, and it has full support for
-snapshots and clones.
-
 
 .Available storage types
 [width="100%",cols="<d,1*m,4*d",options="header"]
@@ -73,12 +73,12 @@ snapshots and clones.
 |NFS            |nfs         |file  |yes   |no^1^    |yes
 |CIFS           |cifs        |file  |yes   |no^1^    |yes
 |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
-|Ceph/CephFS    |cephfs      |file  |yes   |yes      |yes
 |Sheepdog       |sheepdog    |block |yes   |yes      |beta
 |ZFS over iSCSI |zfs         |block |yes   |yes      |yes
 |=========================================================
@@ -211,6 +211,10 @@ iso:::
 
 ISO images
 
+snippets:::
+
+Snippet files, for example guest hook scripts
+
 shared::
 
 Mark storage as shared.
@@ -376,7 +380,7 @@ See Also
 
 * link:/wiki/Storage:_RBD[Storage: RBD]
 
-* link:/wiki/Storage:_RBD[Storage: CephFS]
+* link:/wiki/Storage:_CephFS[Storage: CephFS]
 
 * link:/wiki/Storage:_ZFS[Storage: ZFS]