Fix typos in pvesm.adoc

[pve-docs.git] / pvesm.adoc

diff --git a/pvesm.adoc b/pvesm.adoc
index bc7a61ace5c3c44cbe26529c438279f747c3b055..c2be9fedb58de28e66455bf40cc7e1cc079181ed 100644 (file)
--- a/pvesm.adoc
+++ b/pvesm.adoc
@@ -40,7 +40,7 @@ copy VM image data, so live migration is very fast in that case.
 
 The storage library (package `libpve-storage-perl`) uses a flexible
 plugin system to provide a common interface to all storage types. This
-can be easily adopted to include further storage types in future.
+can be easily adopted to include further storage types in the future.
 
 
 Storage Types
@@ -48,21 +48,21 @@ Storage Types
 
 There are basically two different classes of storage types:
 
+File level storage::
+
+File level based storage technologies allow access to a fully 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
 other files (ISO, backups, ..) on such storage types. Most modern
 block level storage implementations support snapshots and clones.
-RADOS, Sheepdog and GlusterFS are distributed systems, replicating storage
+RADOS 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"]
@@ -71,13 +71,14 @@ snapshots and clones.
 |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
 |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
-|Sheepdog       |sheepdog    |block |yes   |yes      |beta
 |ZFS over iSCSI |zfs         |block |yes   |yes      |yes
 |=========================================================
 
@@ -107,7 +108,7 @@ All storage types which have the ``Snapshots'' feature also support thin
 provisioning.
 
 CAUTION: If a storage runs full, all guests using volumes on that
-storage receives IO error. This can cause file system inconsistencies
+storage receive IO errors. This can cause file system inconsistencies
 and may corrupt your data. So it is advisable to avoid
 over-provisioning of your storage resources, or carefully observe
 free space to avoid such conditions.
@@ -121,8 +122,8 @@ file at `/etc/pve/storage.cfg`. As this file is within `/etc/pve/`, it
 gets automatically distributed to all cluster nodes. So all nodes
 share the same storage configuration.
 
-Sharing storage configuration make perfect sense for shared storage,
-because the same ``shared'' storage is accessible from all nodes. But is
+Sharing storage configuration makes perfect sense for shared storage,
+because the same ``shared'' storage is accessible from all nodes. But it is
 also useful for local storage types. In this case such local storage
 is available on all nodes, but it is physically different and can have
 totally different content.
@@ -142,8 +143,8 @@ Each storage pool has a `<type>`, and is uniquely identified by its
 ----
 
 The `<type>: <STORAGE_ID>` line starts the pool definition, which is then
-followed by a list of properties. Most properties have values, but some of
-them come with reasonable default. In that case you can omit the value.
+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.
 
 To be more specific, take a look at the default storage configuration
 after installation. It contains one special local storage pool named
@@ -187,7 +188,7 @@ content::
 A storage can support several content types, for example virtual disk
 images, cdrom iso images, container templates or container root
 directories. Not all storage types support all content types. One can set
-this property to select for what this storage is used for.
+this property to select what this storage is used for.
 
 images:::
 
@@ -209,6 +210,10 @@ iso:::
 
 ISO images
 
+snippets:::
+
+Snippet files, for example guest hook scripts
+
 shared::
 
 Mark storage as shared.
@@ -370,8 +375,12 @@ See Also
 
 * link:/wiki/Storage:_NFS[Storage: NFS]
 
+* link:/wiki/Storage:_CIFS[Storage: CIFS]
+
 * link:/wiki/Storage:_RBD[Storage: RBD]
 
+* link:/wiki/Storage:_CephFS[Storage: CephFS]
+
 * link:/wiki/Storage:_ZFS[Storage: ZFS]
 
 * link:/wiki/Storage:_ZFS_over_iSCSI[Storage: ZFS over iSCSI]
@@ -386,6 +395,8 @@ include::pve-storage-dir.adoc[]
 
 include::pve-storage-nfs.adoc[]
 
+include::pve-storage-cifs.adoc[]
+
 include::pve-storage-glusterfs.adoc[]
 
 include::pve-storage-zfspool.adoc[]
@@ -400,6 +411,8 @@ include::pve-storage-iscsidirect.adoc[]
 
 include::pve-storage-rbd.adoc[]
 
+include::pve-storage-cephfs.adoc[]
+
 
 
 ifdef::manvolnum[]