Merge "VMAX manila doc - use of correct VMAX tags"

doc/source/configuration/shared-file-systems/drivers/dell-emc-vmax-driver.rst

@@ -209,10 +209,10 @@ The following parameters need to be configured in the
    emc_nas_server = <IP address>
    emc_nas_password = <password>
    emc_nas_login = <user>
-   emc_nas_server_container = <Data Mover name>
-   emc_nas_pool_names = <Comma separated pool names>
-   share_driver = manila.share.drivers.emc.driver.EMCShareDriver
-   emc_interface_ports = <Comma separated ports list>
+   vmax_server_container = <Data Mover name>
+   vmax_share_data_pools = <Comma separated pool names>
+   share_driver = manila.share.drivers.dell_emc.driver.EMCShareDriver
+   vmax_ethernet_ports = <Comma separated ports list>
 
 - `emc_share_backend`
     The plug-in name. Set it to ``vmax`` for the VMAX driver.
@@ -224,10 +224,10 @@ The following parameters need to be configured in the
     The fields that are used to provide credentials to the
     VMAX system. Only local users of VMAX File is supported.
 
-- `emc_nas_server_container`
+- `vmax_server_container`
     Name of the Data Mover to serve the share service.
 
-- `emc_nas_pool_names`
+- `vmax_share_data_pools`
     Comma separated list specifying the name of the pools to be used
     by this back end. Do not set this option if all storage pools
     on the system can be used.
@@ -235,7 +235,7 @@ The following parameters need to be configured in the
 
     Examples: pool_1, pool_*, *
 
-- `emc_interface_ports`
+- `vmax_ethernet_ports`
     Comma-separated list specifying the ports (devices) of Data Mover
     that can be used for share server interface. Do not set this
     option if all ports on the Data Mover can be used.