diff --git a/doc/source/admin/share_back_ends_feature_support_mapping.rst b/doc/source/admin/share_back_ends_feature_support_mapping.rst
index 40b5d8cf1e..8cbbe12267 100644
--- a/doc/source/admin/share_back_ends_feature_support_mapping.rst
+++ b/doc/source/admin/share_back_ends_feature_support_mapping.rst
@@ -106,7 +106,7 @@ Mapping of share drivers and share access rules support
 +----------------------------------------+--------------+--------------+----------------+------------+--------------+--------------+--------------+----------------+------------+------------+
 |       NetApp Clustered Data ONTAP      |    NFS (J)   |    NFS (Q)   |    CIFS (J)    |     \-     |      \-      |    NFS (K)   |    NFS (Q)   |    CIFS (M)    |     \-     |     \-     |
 +----------------------------------------+--------------+--------------+----------------+------------+--------------+--------------+--------------+----------------+------------+------------+
-|                EMC VMAX                |    NFS (O)   |      \-      |    CIFS (O)    |     \-     |      \-      |    NFS (O)   |      \-      |    CIFS (O)    |     \-     |     \-     |
+|                EMC VMAX                |    NFS (O)   |    NFS (R)   |    CIFS (O)    |     \-     |      \-      |    NFS (O)   |    NFS (R)   |    CIFS (O)    |     \-     |     \-     |
 +----------------------------------------+--------------+--------------+----------------+------------+--------------+--------------+--------------+----------------+------------+------------+
 |                 EMC VNX                |    NFS (J)   |    NFS (Q)   |    CIFS (J)    |     \-     |      \-      |    NFS (L)   |    NFS (Q)   |    CIFS (L)    |     \-     |     \-     |
 +----------------------------------------+--------------+--------------+----------------+------------+--------------+--------------+--------------+----------------+------------+------------+
@@ -234,7 +234,7 @@ More information: :ref:`capabilities_and_extra_specs`
 +----------------------------------------+-----------+------------+--------+-------------+-------------------+--------------------+-----+----------------------------+--------------------+--------------------+--------------+--------------+
 |       NetApp Clustered Data ONTAP      |     J     |      K     |   M    |      M      |         M         |          L         | P   |              J             |          O         |          \-        |       P      |       Q      |
 +----------------------------------------+-----------+------------+--------+-------------+-------------------+--------------------+-----+----------------------------+--------------------+--------------------+--------------+--------------+
-|                EMC VMAX                |     O     |      \-    |   \-   |      \-     |        \-         |          O         | \-  |              O             |          \-        |          \-        |       P      |      \-      |
+|                EMC VMAX                |     O     |      \-    |   \-   |      \-     |        \-         |          \-        | \-  |              O             |          \-        |          \-        |       P      |       R      |
 +----------------------------------------+-----------+------------+--------+-------------+-------------------+--------------------+-----+----------------------------+--------------------+--------------------+--------------+--------------+
 |                 EMC VNX                |     J     |      \-    |   \-   |      \-     |        \-         |          L         | \-  |              J             |          \-        |          \-        |       P      |       Q      |
 +----------------------------------------+-----------+------------+--------+-------------+-------------------+--------------------+-----+----------------------------+--------------------+--------------------+--------------+--------------+
diff --git a/doc/source/configuration/shared-file-systems/drivers/dell-emc-vmax-driver.rst b/doc/source/configuration/shared-file-systems/drivers/dell-emc-vmax-driver.rst
index b0b5ca420a..fa1fa9ae0e 100644
--- a/doc/source/configuration/shared-file-systems/drivers/dell-emc-vmax-driver.rst
+++ b/doc/source/configuration/shared-file-systems/drivers/dell-emc-vmax-driver.rst
@@ -248,6 +248,33 @@ Restart of the ``manila-share`` service is needed for the configuration
 changes to take effect.
 
 
+IPv6 support
+~~~~~~~~~~~~
+IPv6 support for VMAX Manila driver is introduced in Rocky release. The feature is
+divided into two parts:
+
+#. The driver is able to manage share or snapshot in the Neutron IPv6 network.
+#. The driver is able to connect VMAX management interface using its IPv6
+   address.
+
+Pre-Configurations for IPv6 support
+-----------------------------------
+
+The following parameters need to be configured in ``/etc/manila/manila.conf``
+for the VMAX driver:
+
+.. code-block:: ini
+
+   network_plugin_ipv6_enabled = True
+
+If you want to connect to the eNAS controller using IPv6 address specify the
+address in ``/etc/manila/manila.conf``:
+
+.. code-block:: ini
+
+   emc_nas_server = <IPv6 address>
+
+
 Restrictions
 ~~~~~~~~~~~~