Merge remote-tracking branch 'origin/4.15'
diff --git a/source/adminguide/service_offerings.rst b/source/adminguide/service_offerings.rst
index be8fde5..391f856 100644
--- a/source/adminguide/service_offerings.rst
+++ b/source/adminguide/service_offerings.rst
@@ -344,6 +344,8 @@
only specific zones can be selected. One or more zones can be selected from
this list box by holding down the control key and clicking on the desired zones.
+ - **Storage Policy**: Name of the storage policy defined at vCenter, this is applicable only for VMware.
+ When a specific Zone is selected, one of the storage policies can be selected from the list box.
#. Click Add.
@@ -433,6 +435,9 @@
only specific zones can be selected. One or more zones can be selected from
this list box by holding down the control key and selecting the desired zones.
+ - **Storage Policy**: Name of the storage policy defined at vCenter, this is applicable only for VMware.
+ When a specific Zone is selected, one of the storage policies can be selected from the list box.
+
#. Click Add.
.. [2] These options are dependant on the capabilities of the hypervisor or the shared storage system which the VMs are on.
diff --git a/source/installguide/configuration.rst b/source/installguide/configuration.rst
index a6cab90..89123c3 100644
--- a/source/installguide/configuration.rst
+++ b/source/installguide/configuration.rst
@@ -1182,21 +1182,21 @@
- **Protocol.** For XenServer, choose either NFS, iSCSI, or
PreSetup. For KVM, choose NFS or SharedMountPoint. For vSphere
- choose either VMFS (iSCSI or FiberChannel) or NFS. For Hyper-V,
+ choose either NFS, PreSetup (VMFS, vSAN, vVols) or datastorecluster. For Hyper-V,
choose SMB.
- **Server (for NFS, iSCSI, or PreSetup).** The IP address or DNS
name of the storage device.
- - **Server (for VMFS).** The IP address or DNS name of the vCenter
+ - **Server (for PreSetup or datastorecluster).** The IP address or DNS name of the vCenter
server.
- **Path (for NFS).** In NFS this is the exported path from the
server.
- - **Path (for VMFS).** In vSphere this is a combination of the
- datacenter name and the datastore name. The format is "/"
- datacenter name "/" datastore name. For example,
+ - **Path (for PreSetup or datastorecluster).** In vSphere this is a combination of the
+ datacenter name and the datastore or datastore cluster name. The format is "/"
+ datacenter name "/" datastore or datastore cluster name. For example,
"/cloud.dc.VM/cluster1datastore".
- **Path (for SharedMountPoint).** With KVM this is the path on each
