summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
Diffstat (limited to 'doc')
-rw-r--r--doc/source/conf.py3
-rw-r--r--doc/source/configuration/block-storage/drivers/ibm-storwize-svc-driver.rst4
-rw-r--r--doc/source/configuration/block-storage/drivers/infinidat-volume-driver.rst1
3 files changed, 6 insertions, 2 deletions
diff --git a/doc/source/conf.py b/doc/source/conf.py
index c2ea48cf2..c311f4e91 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -73,6 +73,9 @@ config_generator_config_file = (
'../../tools/config/cinder-config-generator.conf')
sample_config_basename = '_static/cinder'
+# These are driver specific libraries that are not always present
+autodoc_mock_imports = ['nvmet']
+
policy_generator_config_file = (
'../../tools/config/cinder-policy-generator.conf')
sample_policy_basename = '_static/cinder'
diff --git a/doc/source/configuration/block-storage/drivers/ibm-storwize-svc-driver.rst b/doc/source/configuration/block-storage/drivers/ibm-storwize-svc-driver.rst
index c085262bb..ca10e85fc 100644
--- a/doc/source/configuration/block-storage/drivers/ibm-storwize-svc-driver.rst
+++ b/doc/source/configuration/block-storage/drivers/ibm-storwize-svc-driver.rst
@@ -5,11 +5,11 @@ IBM Spectrum Virtualize family volume driver
The volume management driver for Spectrum Virtualize family offers various
block storage services. It provides OpenStack Compute instances with access
to IBM Spectrum Virtualize family storage products. These products include the
-IBM SAN Volume Controller and IBM FlashSystem family members built with IBM
+SAN Volume Controller, Storwize and FlashSystem family members built with IBM
Spectrum Virtualize (including FlashSystem 5xxx, 7xxx, 9xxx).
For specific product publications, see `IBM Documentation
-<www.ibm.com/docs/en>`_.
+<https://www.ibm.com/docs/en>`_.
.. note::
IBM Spectrum Virtualize family is formerly known as IBM Storwize.
diff --git a/doc/source/configuration/block-storage/drivers/infinidat-volume-driver.rst b/doc/source/configuration/block-storage/drivers/infinidat-volume-driver.rst
index 65e58a946..3b730ee25 100644
--- a/doc/source/configuration/block-storage/drivers/infinidat-volume-driver.rst
+++ b/doc/source/configuration/block-storage/drivers/infinidat-volume-driver.rst
@@ -25,6 +25,7 @@ Supported operations
* Revert a volume to a snapshot.
* Manage and unmanage volumes and snapshots.
* List manageable volumes and snapshots.
+* Attach a volume to multiple instances at once (multi-attach).
External package installation
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~