diff --git a/doc/admin-guide-cloud/source/locale/admin-guide-cloud.pot b/doc/admin-guide-cloud/source/locale/admin-guide-cloud.pot
index 690305db3a..d8b4d3035f 100644
--- a/doc/admin-guide-cloud/source/locale/admin-guide-cloud.pot
+++ b/doc/admin-guide-cloud/source/locale/admin-guide-cloud.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Cloud Administrator Guide 0.9\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-01 06:36+0000\n"
+"POT-Creation-Date: 2016-02-09 06:07+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -9686,13 +9686,12 @@ msgstr ""
 
 #: ../cross_project_cors.rst:48
 msgid ""
-"This method also enables you to define multiple origins. To express this in "
-"your configuration file, first begin with a ``[cors]`` group as above, into "
-"which you place your default configuration values. Then, add as many "
-"additional configuration groups as necessary, naming them ``[cors."
-"{something}]`` (each name must be unique). The purpose of the suffix to "
-"``cors.`` is legibility, we recommend using a reasonable human-readable "
-"string:"
+"Additional origins can be explicitly added. To express this in your "
+"configuration file, first begin with a ``[cors]`` group as above, into which "
+"you place your default configuration values. Then, add as many additional "
+"configuration groups as necessary, naming them ``[cors.{something}]`` (each "
+"name must be unique). The purpose of the suffix to ``cors.`` is legibility, "
+"we recommend using a reasonable human-readable string:"
 msgstr ""
 
 #: ../cross_project_cors.rst:75
@@ -9701,15 +9700,17 @@ msgstr ""
 
 #: ../cross_project_cors.rst:77
 msgid ""
-"In other services, CORS is configured via PasteDeploy. In this case, you "
-"must first make sure that OpenStack's ``oslo_middleware`` package (version "
-"2.4.0 or later) is available in the Python environment that is running the "
-"service. Then, add the following configuration block to your ``paste.ini`` "
-"file."
+"CORS can also be configured using PasteDeploy. First of all, ensure that "
+"OpenStack's ``oslo_middleware`` package (version 2.4.0 or later) is "
+"available in the Python environment that is running the service. Then, add "
+"the following configuration block to your ``paste.ini`` file."
 msgstr ""
 
-#: ../cross_project_cors.rst:95
-msgid "To add another domain, simply add another filter."
+#: ../cross_project_cors.rst:93
+msgid ""
+"To add an additional domain in oslo_middleware v2.4.0, add another filter. "
+"In v3.0.0 and after, you may add multiple domains in the above "
+"``allowed_origin`` field, separated by commas."
 msgstr ""
 
 #: ../cross_project_cors.rst:98
@@ -21297,7 +21298,7 @@ msgid ""
 "The Shared File Systems service can provide access to multiple file storage "
 "back ends. In general, the workflow with multiple back ends looks similar to "
 "the Block Storage service one, see :ref:`Configure multiple-storage back "
-"ends in Openstack Block Storage service <multi_backend>`."
+"ends in Block Storage service <multi_backend>`."
 msgstr ""
 
 #: ../shared_file_systems_multi_backend.rst:12
diff --git a/doc/config-reference/source/locale/config-reference.pot b/doc/config-reference/source/locale/config-reference.pot
index e6a1596c44..745278bb0d 100644
--- a/doc/config-reference/source/locale/config-reference.pot
+++ b/doc/config-reference/source/locale/config-reference.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Configuration Reference 0.9\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-01 06:36+0000\n"
+"POT-Creation-Date: 2016-02-09 06:07+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1027,6 +1027,7 @@ msgstr ""
 # #-#-#-#-#  block-storage.pot (Configuration Reference 0.9)  #-#-#-#-#
 # #-#-#-#-#  shared-file-systems.pot (Configuration Reference 0.9)  #-#-#-#-#
 #: ../block-storage/drivers/blockbridge-eps-driver.rst:84
+#: ../block-storage/drivers/coho-data-driver.rst:19
 #: ../block-storage/drivers/dell-equallogic-driver.rst:9
 #: ../block-storage/drivers/dell-storagecenter-driver.rst:15
 #: ../block-storage/drivers/dothill-driver.rst:27
@@ -1034,6 +1035,7 @@ msgstr ""
 #: ../block-storage/drivers/emc-vmax-driver.rst:31
 #: ../block-storage/drivers/emc-vnx-driver.rst:24
 #: ../block-storage/drivers/emc-xtremio-driver.rst:18
+#: ../block-storage/drivers/fujitsu-eternus-dx-driver.rst:34
 #: ../block-storage/drivers/hds-hnas-driver.rst:10
 #: ../block-storage/drivers/hitachi-storage-volume-driver.rst:37
 #: ../block-storage/drivers/hp-msa-driver.rst:25
@@ -1196,6 +1198,7 @@ msgstr ""
 #: ../block-storage/drivers/blockbridge-eps-driver.rst:210
 #: ../block-storage/drivers/emc-scaleio-driver.rst:204
 #: ../block-storage/drivers/emc-xtremio-driver.rst:178
+#: ../block-storage/drivers/fujitsu-eternus-dx-driver.rst:208
 msgid "Configuration example"
 msgstr ""
 
@@ -1429,46 +1432,42 @@ msgid ""
 "``image_conversion_dir``."
 msgstr ""
 
-#: ../block-storage/drivers/dell-equallogic-driver.rst:0
-msgid "Description of Dell EqualLogic volume driver configuration options"
+#: ../block-storage/drivers/coho-data-driver.rst:3
+msgid "Coho Data volume driver"
 msgstr ""
 
-#: ../block-storage/drivers/dell-equallogic-driver.rst:3
-msgid "Dell EqualLogic volume driver"
-msgstr ""
-
-#: ../block-storage/drivers/dell-equallogic-driver.rst:5
+#: ../block-storage/drivers/coho-data-driver.rst:5
 msgid ""
-"The Dell EqualLogic volume driver interacts with configured EqualLogic "
-"arrays and supports various operations."
+"The Coho DataStream Scale-Out Storage allows your Block Storage service to "
+"scale seamlessly. The architecture consists of commodity storage servers "
+"with SDN ToR switches. Leveraging an SDN OpenFlow controller allows you to "
+"scale storage horizontally, while avoiding storage and network bottlenecks "
+"by intelligent load-balancing and parallelized workloads. High-performance "
+"PCIe NVMe flash, paired with traditional hard disk drives (HDD) or solid-"
+"state drives (SSD), delivers low-latency performance even with highly mixed "
+"workloads in large scale environment."
 msgstr ""
 
-#: ../block-storage/drivers/dell-equallogic-driver.rst:11
-#: ../block-storage/drivers/dothill-driver.rst:29
-#: ../block-storage/drivers/emc-vmax-driver.rst:35
-#: ../block-storage/drivers/emc-vnx-driver.rst:26
-#: ../block-storage/drivers/hds-hnas-driver.rst:14
-#: ../block-storage/drivers/hitachi-storage-volume-driver.rst:39
-#: ../block-storage/drivers/hp-msa-driver.rst:27
-#: ../block-storage/drivers/hpe-3par-driver.rst:64
-#: ../block-storage/drivers/hpe-lefthand-driver.rst:44
-#: ../block-storage/drivers/ibm-flashsystem-volume-driver.rst:226
-#: ../block-storage/drivers/lenovo-driver.rst:28
-#: ../block-storage/drivers/prophetstor-dpl-driver.rst:18
-#: ../block-storage/drivers/sheepdog-driver.rst:22
-#: ../block-storage/drivers/solidfire-volume-driver.rst:56
-#: ../block-storage/drivers/violin-v7000-driver.rst:40
-#: ../block-storage/drivers/vmware-vmdk-driver.rst:210
-#: ../block-storage/drivers/zfssa-iscsi-driver.rst:22
-#: ../block-storage/drivers/zfssa-nfs-driver.rst:17
-msgid "Create, delete, attach, and detach volumes."
+#: ../block-storage/drivers/coho-data-driver.rst:14
+msgid ""
+"Coho Data's storage features include real-time instance level granularity "
+"performance and capacity reporting via API or UI, and single-IP storage "
+"endpoint access."
 msgstr ""
 
+#: ../block-storage/drivers/coho-data-driver.rst:21
+#: ../block-storage/drivers/pure-storage-driver.rst:28
+#: ../block-storage/drivers/xio-volume-driver.rst:21
+msgid "Create, delete, attach, detach, retype, clone, and extend volumes."
+msgstr ""
+
+#: ../block-storage/drivers/coho-data-driver.rst:23
 #: ../block-storage/drivers/dell-equallogic-driver.rst:12
 #: ../block-storage/drivers/dell-storagecenter-driver.rst:22
 #: ../block-storage/drivers/dothill-driver.rst:31
 #: ../block-storage/drivers/emc-vmax-driver.rst:36
 #: ../block-storage/drivers/emc-vnx-driver.rst:27
+#: ../block-storage/drivers/fujitsu-eternus-dx-driver.rst:37
 #: ../block-storage/drivers/hds-hnas-driver.rst:15
 #: ../block-storage/drivers/hitachi-storage-volume-driver.rst:40
 #: ../block-storage/drivers/hp-msa-driver.rst:29
@@ -1487,11 +1486,184 @@ msgstr ""
 msgid "Create, list, and delete volume snapshots."
 msgstr ""
 
+#: ../block-storage/drivers/coho-data-driver.rst:25
+#: ../block-storage/drivers/dell-storagecenter-driver.rst:23
+#: ../block-storage/drivers/dothill-driver.rst:33
+#: ../block-storage/drivers/emc-vmax-driver.rst:42
+#: ../block-storage/drivers/emc-vnx-driver.rst:28
+#: ../block-storage/drivers/emc-xtremio-driver.rst:24
+#: ../block-storage/drivers/fujitsu-eternus-dx-driver.rst:38
+#: ../block-storage/drivers/hds-hnas-driver.rst:16
+#: ../block-storage/drivers/hitachi-storage-volume-driver.rst:41
+#: ../block-storage/drivers/hp-msa-driver.rst:31
+#: ../block-storage/drivers/hpe-3par-driver.rst:68
+#: ../block-storage/drivers/hpe-lefthand-driver.rst:48
+#: ../block-storage/drivers/ibm-flashsystem-volume-driver.rst:230
+#: ../block-storage/drivers/lenovo-driver.rst:32
+#: ../block-storage/drivers/prophetstor-dpl-driver.rst:22
+#: ../block-storage/drivers/scality-sofs-driver.rst:23
+#: ../block-storage/drivers/sheepdog-driver.rst:26
+#: ../block-storage/drivers/solidfire-volume-driver.rst:60
+#: ../block-storage/drivers/violin-v7000-driver.rst:44
+#: ../block-storage/drivers/vmware-vmdk-driver.rst:225
+#: ../block-storage/drivers/zfssa-nfs-driver.rst:21
+msgid "Create a volume from a snapshot."
+msgstr ""
+
+#: ../block-storage/drivers/coho-data-driver.rst:27
+#: ../block-storage/drivers/dell-storagecenter-driver.rst:25
+#: ../block-storage/drivers/dothill-driver.rst:37
+#: ../block-storage/drivers/emc-vmax-driver.rst:38
+#: ../block-storage/drivers/emc-xtremio-driver.rst:28
+#: ../block-storage/drivers/fujitsu-eternus-dx-driver.rst:40
+#: ../block-storage/drivers/hds-hnas-driver.rst:18
+#: ../block-storage/drivers/hitachi-storage-volume-driver.rst:42
+#: ../block-storage/drivers/hp-msa-driver.rst:35
+#: ../block-storage/drivers/hpe-3par-driver.rst:72
+#: ../block-storage/drivers/hpe-lefthand-driver.rst:52
+#: ../block-storage/drivers/ibm-flashsystem-volume-driver.rst:234
+#: ../block-storage/drivers/lenovo-driver.rst:36
+#: ../block-storage/drivers/prophetstor-dpl-driver.rst:26
+#: ../block-storage/drivers/scality-sofs-driver.rst:27
+#: ../block-storage/drivers/sheepdog-driver.rst:30
+#: ../block-storage/drivers/solidfire-volume-driver.rst:64
+#: ../block-storage/drivers/violin-v7000-driver.rst:48
+#: ../block-storage/drivers/vmware-vmdk-driver.rst:235
+#: ../block-storage/drivers/zfssa-nfs-driver.rst:27
+msgid "Copy a volume to an image."
+msgstr ""
+
+#: ../block-storage/drivers/coho-data-driver.rst:29
+#: ../block-storage/drivers/dell-storagecenter-driver.rst:24
+#: ../block-storage/drivers/dothill-driver.rst:35
+#: ../block-storage/drivers/emc-vmax-driver.rst:37
+#: ../block-storage/drivers/emc-vnx-driver.rst:29
+#: ../block-storage/drivers/emc-xtremio-driver.rst:26
+#: ../block-storage/drivers/fujitsu-eternus-dx-driver.rst:39
+#: ../block-storage/drivers/hds-hnas-driver.rst:17
+#: ../block-storage/drivers/hitachi-storage-volume-driver.rst:43
+#: ../block-storage/drivers/hp-msa-driver.rst:33
+#: ../block-storage/drivers/hpe-3par-driver.rst:70
+#: ../block-storage/drivers/hpe-lefthand-driver.rst:50
+#: ../block-storage/drivers/ibm-flashsystem-volume-driver.rst:232
+#: ../block-storage/drivers/lenovo-driver.rst:34
+#: ../block-storage/drivers/prophetstor-dpl-driver.rst:24
+#: ../block-storage/drivers/scality-sofs-driver.rst:25
+#: ../block-storage/drivers/sheepdog-driver.rst:28
+#: ../block-storage/drivers/solidfire-volume-driver.rst:62
+#: ../block-storage/drivers/violin-v7000-driver.rst:46
+#: ../block-storage/drivers/vmware-vmdk-driver.rst:227
+#: ../block-storage/drivers/zfssa-nfs-driver.rst:25
+msgid "Copy an image to a volume."
+msgstr ""
+
+#: ../block-storage/drivers/coho-data-driver.rst:31
+#: ../block-storage/drivers/pure-storage-driver.rst:44
+#: ../block-storage/drivers/xio-volume-driver.rst:31
+msgid "Create a thin provisioned volume."
+msgstr ""
+
+#: ../block-storage/drivers/coho-data-driver.rst:33
+#: ../block-storage/drivers/emc-vnx-driver.rst:34
+#: ../block-storage/drivers/emc-xtremio-driver.rst:34
+#: ../block-storage/drivers/fujitsu-eternus-dx-driver.rst:43
+#: ../block-storage/drivers/hds-hnas-driver.rst:21
+#: ../block-storage/drivers/hitachi-storage-volume-driver.rst:46
+#: ../block-storage/drivers/hpe-lefthand-driver.rst:58
+#: ../block-storage/drivers/ibm-flashsystem-volume-driver.rst:240
+#: ../block-storage/drivers/pure-storage-driver.rst:42
+#: ../block-storage/drivers/xio-volume-driver.rst:29
+msgid "Get volume statistics."
+msgstr ""
+
+#: ../block-storage/drivers/coho-data-driver.rst:36
+#: ../block-storage/drivers/dothill-driver.rst:9
+#: ../block-storage/drivers/emc-vmax-driver.rst:22
+#: ../block-storage/drivers/emc-vnx-driver.rst:15
+#: ../block-storage/drivers/fujitsu-eternus-dx-driver.rst:16
+#: ../block-storage/drivers/hitachi-storage-volume-driver.rst:9
+#: ../block-storage/drivers/hp-msa-driver.rst:9
+#: ../block-storage/drivers/hpe-3par-driver.rst:15
+#: ../block-storage/drivers/hpe-lefthand-driver.rst:28
+#: ../block-storage/drivers/lenovo-driver.rst:10
+#: ../block-storage/drivers/violin-v7000-driver.rst:14
+#: ../block-storage/fc-zoning.rst:60 ../block-storage/fc-zoning.rst:107
+msgid "System requirements"
+msgstr ""
+
+#: ../block-storage/drivers/coho-data-driver.rst:38
+msgid "NFS client on the Block storage controller."
+msgstr ""
+
+#: ../block-storage/drivers/coho-data-driver.rst:41
+msgid "Coho Data Block Storage driver configuration"
+msgstr ""
+
+#: ../block-storage/drivers/coho-data-driver.rst:43
+msgid "Create cinder volume type."
+msgstr ""
+
+#: ../block-storage/drivers/coho-data-driver.rst:49
+msgid ""
+"Edit the OpenStack Block Storage service configuration file. The following "
+"sample, ``/etc/cinder/cinder.conf``, configuration lists the relevant "
+"settings for a typical Block Storage service using a single Coho Data "
+"storage:"
+msgstr ""
+
+#: ../block-storage/drivers/coho-data-driver.rst:66
+msgid ""
+"Add your list of Coho Datastream NFS addresses to the file you specified "
+"with the ``nfs_shares_config`` option. For example, if the value of this "
+"option was set to ``/etc/cinder/coho_shares``, then:"
+msgstr ""
+
+#: ../block-storage/drivers/coho-data-driver.rst:75
+msgid "Restart the ``cinder-volume`` service to enable Coho Data driver."
+msgstr ""
+
+#: ../block-storage/drivers/dell-equallogic-driver.rst:0
+msgid "Description of Dell EqualLogic volume driver configuration options"
+msgstr ""
+
+#: ../block-storage/drivers/dell-equallogic-driver.rst:3
+msgid "Dell EqualLogic volume driver"
+msgstr ""
+
+#: ../block-storage/drivers/dell-equallogic-driver.rst:5
+msgid ""
+"The Dell EqualLogic volume driver interacts with configured EqualLogic "
+"arrays and supports various operations."
+msgstr ""
+
+#: ../block-storage/drivers/dell-equallogic-driver.rst:11
+#: ../block-storage/drivers/dothill-driver.rst:29
+#: ../block-storage/drivers/emc-vmax-driver.rst:35
+#: ../block-storage/drivers/emc-vnx-driver.rst:26
+#: ../block-storage/drivers/fujitsu-eternus-dx-driver.rst:36
+#: ../block-storage/drivers/hds-hnas-driver.rst:14
+#: ../block-storage/drivers/hitachi-storage-volume-driver.rst:39
+#: ../block-storage/drivers/hp-msa-driver.rst:27
+#: ../block-storage/drivers/hpe-3par-driver.rst:64
+#: ../block-storage/drivers/hpe-lefthand-driver.rst:44
+#: ../block-storage/drivers/ibm-flashsystem-volume-driver.rst:226
+#: ../block-storage/drivers/lenovo-driver.rst:28
+#: ../block-storage/drivers/prophetstor-dpl-driver.rst:18
+#: ../block-storage/drivers/sheepdog-driver.rst:22
+#: ../block-storage/drivers/solidfire-volume-driver.rst:56
+#: ../block-storage/drivers/violin-v7000-driver.rst:40
+#: ../block-storage/drivers/vmware-vmdk-driver.rst:210
+#: ../block-storage/drivers/zfssa-iscsi-driver.rst:22
+#: ../block-storage/drivers/zfssa-nfs-driver.rst:17
+msgid "Create, delete, attach, and detach volumes."
+msgstr ""
+
 #: ../block-storage/drivers/dell-equallogic-driver.rst:13
 #: ../block-storage/drivers/dell-storagecenter-driver.rst:26
 #: ../block-storage/drivers/dothill-driver.rst:39
 #: ../block-storage/drivers/emc-vmax-driver.rst:39
 #: ../block-storage/drivers/emc-vnx-driver.rst:30
+#: ../block-storage/drivers/fujitsu-eternus-dx-driver.rst:41
 #: ../block-storage/drivers/hds-hnas-driver.rst:19
 #: ../block-storage/drivers/hitachi-storage-volume-driver.rst:44
 #: ../block-storage/drivers/hp-msa-driver.rst:37
@@ -1513,6 +1685,7 @@ msgstr ""
 # #-#-#-#-#  compute.pot (Configuration Reference 0.9)  #-#-#-#-#
 # #-#-#-#-#  shared-file-systems.pot (Configuration Reference 0.9)  #-#-#-#-#
 #: ../block-storage/drivers/dell-equallogic-driver.rst:16
+#: ../block-storage/drivers/fujitsu-eternus-dx-driver.rst:109
 #: ../block-storage/drivers/hitachi-storage-volume-driver.rst:49
 #: ../block-storage/drivers/quobyte-driver.rst:49
 #: ../block-storage/drivers/scality-sofs-driver.rst:38
@@ -1742,71 +1915,6 @@ msgstr ""
 msgid "Create, delete, attach (map), and detach (unmap) volumes."
 msgstr ""
 
-#: ../block-storage/drivers/dell-storagecenter-driver.rst:23
-#: ../block-storage/drivers/dothill-driver.rst:33
-#: ../block-storage/drivers/emc-vmax-driver.rst:42
-#: ../block-storage/drivers/emc-vnx-driver.rst:28
-#: ../block-storage/drivers/emc-xtremio-driver.rst:24
-#: ../block-storage/drivers/hds-hnas-driver.rst:16
-#: ../block-storage/drivers/hitachi-storage-volume-driver.rst:41
-#: ../block-storage/drivers/hp-msa-driver.rst:31
-#: ../block-storage/drivers/hpe-3par-driver.rst:68
-#: ../block-storage/drivers/hpe-lefthand-driver.rst:48
-#: ../block-storage/drivers/ibm-flashsystem-volume-driver.rst:230
-#: ../block-storage/drivers/lenovo-driver.rst:32
-#: ../block-storage/drivers/prophetstor-dpl-driver.rst:22
-#: ../block-storage/drivers/scality-sofs-driver.rst:23
-#: ../block-storage/drivers/sheepdog-driver.rst:26
-#: ../block-storage/drivers/solidfire-volume-driver.rst:60
-#: ../block-storage/drivers/violin-v7000-driver.rst:44
-#: ../block-storage/drivers/vmware-vmdk-driver.rst:225
-#: ../block-storage/drivers/zfssa-nfs-driver.rst:21
-msgid "Create a volume from a snapshot."
-msgstr ""
-
-#: ../block-storage/drivers/dell-storagecenter-driver.rst:24
-#: ../block-storage/drivers/dothill-driver.rst:35
-#: ../block-storage/drivers/emc-vmax-driver.rst:37
-#: ../block-storage/drivers/emc-vnx-driver.rst:29
-#: ../block-storage/drivers/emc-xtremio-driver.rst:26
-#: ../block-storage/drivers/hds-hnas-driver.rst:17
-#: ../block-storage/drivers/hitachi-storage-volume-driver.rst:43
-#: ../block-storage/drivers/hp-msa-driver.rst:33
-#: ../block-storage/drivers/hpe-3par-driver.rst:70
-#: ../block-storage/drivers/hpe-lefthand-driver.rst:50
-#: ../block-storage/drivers/ibm-flashsystem-volume-driver.rst:232
-#: ../block-storage/drivers/lenovo-driver.rst:34
-#: ../block-storage/drivers/prophetstor-dpl-driver.rst:24
-#: ../block-storage/drivers/scality-sofs-driver.rst:25
-#: ../block-storage/drivers/sheepdog-driver.rst:28
-#: ../block-storage/drivers/solidfire-volume-driver.rst:62
-#: ../block-storage/drivers/violin-v7000-driver.rst:46
-#: ../block-storage/drivers/vmware-vmdk-driver.rst:227
-#: ../block-storage/drivers/zfssa-nfs-driver.rst:25
-msgid "Copy an image to a volume."
-msgstr ""
-
-#: ../block-storage/drivers/dell-storagecenter-driver.rst:25
-#: ../block-storage/drivers/dothill-driver.rst:37
-#: ../block-storage/drivers/emc-vmax-driver.rst:38
-#: ../block-storage/drivers/emc-xtremio-driver.rst:28
-#: ../block-storage/drivers/hds-hnas-driver.rst:18
-#: ../block-storage/drivers/hitachi-storage-volume-driver.rst:42
-#: ../block-storage/drivers/hp-msa-driver.rst:35
-#: ../block-storage/drivers/hpe-3par-driver.rst:72
-#: ../block-storage/drivers/hpe-lefthand-driver.rst:52
-#: ../block-storage/drivers/ibm-flashsystem-volume-driver.rst:234
-#: ../block-storage/drivers/lenovo-driver.rst:36
-#: ../block-storage/drivers/prophetstor-dpl-driver.rst:26
-#: ../block-storage/drivers/scality-sofs-driver.rst:27
-#: ../block-storage/drivers/sheepdog-driver.rst:30
-#: ../block-storage/drivers/solidfire-volume-driver.rst:64
-#: ../block-storage/drivers/violin-v7000-driver.rst:48
-#: ../block-storage/drivers/vmware-vmdk-driver.rst:235
-#: ../block-storage/drivers/zfssa-nfs-driver.rst:27
-msgid "Copy a volume to an image."
-msgstr ""
-
 #: ../block-storage/drivers/dell-storagecenter-driver.rst:27
 #: ../block-storage/drivers/dothill-driver.rst:41
 #: ../block-storage/drivers/emc-vmax-driver.rst:40
@@ -1904,19 +2012,6 @@ msgid ""
 "Hill arrays to be used for block storage in OpenStack deployments."
 msgstr ""
 
-#: ../block-storage/drivers/dothill-driver.rst:9
-#: ../block-storage/drivers/emc-vmax-driver.rst:22
-#: ../block-storage/drivers/emc-vnx-driver.rst:15
-#: ../block-storage/drivers/hitachi-storage-volume-driver.rst:9
-#: ../block-storage/drivers/hp-msa-driver.rst:9
-#: ../block-storage/drivers/hpe-3par-driver.rst:15
-#: ../block-storage/drivers/hpe-lefthand-driver.rst:28
-#: ../block-storage/drivers/lenovo-driver.rst:10
-#: ../block-storage/drivers/violin-v7000-driver.rst:14
-#: ../block-storage/fc-zoning.rst:60 ../block-storage/fc-zoning.rst:107
-msgid "System requirements"
-msgstr ""
-
 #: ../block-storage/drivers/dothill-driver.rst:11
 msgid "To use the Dot Hill drivers, the following are required:"
 msgstr ""
@@ -2476,12 +2571,14 @@ msgid "Set up the VMAX drivers"
 msgstr ""
 
 #: ../block-storage/drivers/emc-vmax-driver.rst:53
+#: ../block-storage/drivers/fujitsu-eternus-dx-driver.rst:53
 msgid "Install the ``python-pywbem`` package for your distribution."
 msgstr ""
 
 # #-#-#-#-#  block-storage.pot (Configuration Reference 0.9)  #-#-#-#-#
 # #-#-#-#-#  compute.pot (Configuration Reference 0.9)  #-#-#-#-#
 #: ../block-storage/drivers/emc-vmax-driver.rst:55
+#: ../block-storage/drivers/fujitsu-eternus-dx-driver.rst:55
 #: ../compute/hypervisor-qemu.rst:34
 msgid "On Ubuntu:"
 msgstr ""
@@ -2489,11 +2586,13 @@ msgstr ""
 # #-#-#-#-#  block-storage.pot (Configuration Reference 0.9)  #-#-#-#-#
 # #-#-#-#-#  compute.pot (Configuration Reference 0.9)  #-#-#-#-#
 #: ../block-storage/drivers/emc-vmax-driver.rst:61
+#: ../block-storage/drivers/fujitsu-eternus-dx-driver.rst:61
 #: ../compute/hypervisor-qemu.rst:46
 msgid "On openSUSE:"
 msgstr ""
 
 #: ../block-storage/drivers/emc-vmax-driver.rst:67
+#: ../block-storage/drivers/fujitsu-eternus-dx-driver.rst:67
 msgid "On Red Hat Enterprise Linux, CentOS, and Fedora:"
 msgstr ""
 
@@ -2577,6 +2676,7 @@ msgid "Add the following lines to the XML file:"
 msgstr ""
 
 #: ../block-storage/drivers/emc-vmax-driver.rst:160
+#: ../block-storage/drivers/fujitsu-eternus-dx-driver.rst:171
 msgid "Where:"
 msgstr ""
 
@@ -2794,17 +2894,6 @@ msgstr ""
 msgid "Migrate a volume."
 msgstr ""
 
-#: ../block-storage/drivers/emc-vnx-driver.rst:34
-#: ../block-storage/drivers/emc-xtremio-driver.rst:34
-#: ../block-storage/drivers/hds-hnas-driver.rst:21
-#: ../block-storage/drivers/hitachi-storage-volume-driver.rst:46
-#: ../block-storage/drivers/hpe-lefthand-driver.rst:58
-#: ../block-storage/drivers/ibm-flashsystem-volume-driver.rst:240
-#: ../block-storage/drivers/pure-storage-driver.rst:42
-#: ../block-storage/drivers/xio-volume-driver.rst:29
-msgid "Get volume statistics."
-msgstr ""
-
 #: ../block-storage/drivers/emc-vnx-driver.rst:35
 msgid "Create and delete consistency groups."
 msgstr ""
@@ -2823,6 +2912,7 @@ msgid "Efficient non-disruptive volume backup."
 msgstr ""
 
 #: ../block-storage/drivers/emc-vnx-driver.rst:41
+#: ../block-storage/drivers/fujitsu-eternus-dx-driver.rst:48
 msgid "Preparation"
 msgstr ""
 
@@ -4275,6 +4365,299 @@ msgid ""
 "need to configure the initial CHAP credentials manually in XMS."
 msgstr ""
 
+#: ../block-storage/drivers/fujitsu-eternus-dx-driver.rst:3
+msgid "Fujitsu ETERNUS DX driver"
+msgstr ""
+
+#: ../block-storage/drivers/fujitsu-eternus-dx-driver.rst:5
+msgid ""
+"Fujitsu ETERNUS DX driver provides FC and iSCSI support for ETERNUS DX S3 "
+"series."
+msgstr ""
+
+#: ../block-storage/drivers/fujitsu-eternus-dx-driver.rst:8
+msgid ""
+"The driver performs volume operations by communicating with ETERNUS DX. It "
+"uses a CIM client in Python called PyWBEM to perform CIM operations over "
+"HTTP."
+msgstr ""
+
+#: ../block-storage/drivers/fujitsu-eternus-dx-driver.rst:12
+msgid ""
+"You can specify RAID Group and Thin Provisioning Pool (TPP) in ETERNUS DX as "
+"a storage pool."
+msgstr ""
+
+#: ../block-storage/drivers/fujitsu-eternus-dx-driver.rst:18
+#: ../block-storage/drivers/hitachi-storage-volume-driver.rst:11
+msgid "Supported storages:"
+msgstr ""
+
+#: ../block-storage/drivers/fujitsu-eternus-dx-driver.rst:20
+msgid "ETERNUS DX60 S3"
+msgstr ""
+
+#: ../block-storage/drivers/fujitsu-eternus-dx-driver.rst:21
+msgid "ETERNUS DX100 S3/DX200 S3"
+msgstr ""
+
+#: ../block-storage/drivers/fujitsu-eternus-dx-driver.rst:22
+msgid "ETERNUS DX500 S3/DX600 S3"
+msgstr ""
+
+#: ../block-storage/drivers/fujitsu-eternus-dx-driver.rst:23
+msgid "ETERNUS DX8700 S3/DX8900 S3"
+msgstr ""
+
+#: ../block-storage/drivers/fujitsu-eternus-dx-driver.rst:24
+msgid "ETERNUS DX200F"
+msgstr ""
+
+#: ../block-storage/drivers/fujitsu-eternus-dx-driver.rst:26
+msgid "Requirements:"
+msgstr ""
+
+#: ../block-storage/drivers/fujitsu-eternus-dx-driver.rst:28
+msgid "Firmware version V10L30 or later is required."
+msgstr ""
+
+#: ../block-storage/drivers/fujitsu-eternus-dx-driver.rst:29
+msgid "The multipath environment with ETERNUS Multipath Driver is unsupported."
+msgstr ""
+
+#: ../block-storage/drivers/fujitsu-eternus-dx-driver.rst:30
+msgid ""
+"An Advanced Copy Feature license is required to create a snapshot and a "
+"clone."
+msgstr ""
+
+#: ../block-storage/drivers/fujitsu-eternus-dx-driver.rst:42
+msgid "Extend a volume. (\\*1)"
+msgstr ""
+
+#: ../block-storage/drivers/fujitsu-eternus-dx-driver.rst:45
+msgid "(\\*1): It is executable only when you use TPP as a storage pool."
+msgstr ""
+
+#: ../block-storage/drivers/fujitsu-eternus-dx-driver.rst:51
+#: ../block-storage/drivers/hds-hnas-driver.rst:65
+msgid "Package installation"
+msgstr ""
+
+#: ../block-storage/drivers/fujitsu-eternus-dx-driver.rst:75
+msgid "ETERNUS DX setup"
+msgstr ""
+
+#: ../block-storage/drivers/fujitsu-eternus-dx-driver.rst:77
+msgid "Perform the following steps using ETERNUS Web GUI or ETERNUS CLI."
+msgstr ""
+
+#: ../block-storage/drivers/fujitsu-eternus-dx-driver.rst:80
+msgid ""
+"These following operations require an account that has the ``Admin`` role."
+msgstr ""
+
+#: ../block-storage/drivers/fujitsu-eternus-dx-driver.rst:81
+msgid ""
+"For detailed operations, refer to ETERNUS Web GUI User's Guide or ETERNUS "
+"CLI User's Guide for ETERNUS DX S3 series."
+msgstr ""
+
+#: ../block-storage/drivers/fujitsu-eternus-dx-driver.rst:84
+msgid "Create an account for communication with cinder controller."
+msgstr ""
+
+#: ../block-storage/drivers/fujitsu-eternus-dx-driver.rst:85
+msgid "Enable the SMI-S of ETERNUS DX."
+msgstr ""
+
+#: ../block-storage/drivers/fujitsu-eternus-dx-driver.rst:86
+msgid ""
+"Register an Advanced Copy Feature license and configure copy table size."
+msgstr ""
+
+#: ../block-storage/drivers/fujitsu-eternus-dx-driver.rst:87
+msgid "Create a storage pool for volumes."
+msgstr ""
+
+#: ../block-storage/drivers/fujitsu-eternus-dx-driver.rst:88
+msgid ""
+"(Optional) If you want to create snapshots on a different storage pool for "
+"volumes, create a storage pool for snapshots."
+msgstr ""
+
+#: ../block-storage/drivers/fujitsu-eternus-dx-driver.rst:91
+msgid ""
+"Create Snap Data Pool Volume (SDPV) to enable Snap Data Pool (SDP) for "
+"\"``create a snapshot``\"."
+msgstr ""
+
+#: ../block-storage/drivers/fujitsu-eternus-dx-driver.rst:93
+msgid "Configure storage ports used for OpenStack."
+msgstr ""
+
+#: ../block-storage/drivers/fujitsu-eternus-dx-driver.rst:95
+msgid "Set those storage ports to CA mode."
+msgstr ""
+
+#: ../block-storage/drivers/fujitsu-eternus-dx-driver.rst:96
+msgid "Enable the host-affinity settings of those storage ports."
+msgstr ""
+
+#: ../block-storage/drivers/fujitsu-eternus-dx-driver.rst:98
+msgid "(ETERNUS CLI command for enabling host-affinity settings):"
+msgstr ""
+
+#: ../block-storage/drivers/fujitsu-eternus-dx-driver.rst:104
+msgid ""
+"Ensure LAN connection between cinder controller and MNT port of ETERNUS DX "
+"and SAN connection between Compute nodes and CA ports of ETERNUS DX."
+msgstr ""
+
+#: ../block-storage/drivers/fujitsu-eternus-dx-driver.rst:110
+msgid "Edit ``cinder.conf``."
+msgstr ""
+
+#: ../block-storage/drivers/fujitsu-eternus-dx-driver.rst:112
+msgid "Add the following entries to ``/etc/cinder/cinder.conf``:"
+msgstr ""
+
+#: ../block-storage/drivers/fujitsu-eternus-dx-driver.rst:115
+msgid "FC entries:"
+msgstr ""
+
+#: ../block-storage/drivers/fujitsu-eternus-dx-driver.rst:122
+msgid "iSCSI entries:"
+msgstr ""
+
+#: ../block-storage/drivers/fujitsu-eternus-dx-driver.rst:129
+msgid "If there is no description about ``cinder_eternus_config_file``,"
+msgstr ""
+
+#: ../block-storage/drivers/fujitsu-eternus-dx-driver.rst:131
+msgid ""
+"then the parameter is set to default value ``/etc/cinder/"
+"cinder_fujitsu_eternus_dx.xml``."
+msgstr ""
+
+#: ../block-storage/drivers/fujitsu-eternus-dx-driver.rst:133
+msgid "Create a driver configuration file."
+msgstr ""
+
+#: ../block-storage/drivers/fujitsu-eternus-dx-driver.rst:135
+msgid ""
+"Create a driver configuration file in the file path specified as "
+"``cinder_eternus_config_file`` in ``cinder.conf``, and add parameters to the "
+"file as below:"
+msgstr ""
+
+#: ../block-storage/drivers/fujitsu-eternus-dx-driver.rst:139
+msgid "FC configuration:"
+msgstr ""
+
+#: ../block-storage/drivers/fujitsu-eternus-dx-driver.rst:153
+msgid "iSCSI configuration:"
+msgstr ""
+
+#: ../block-storage/drivers/fujitsu-eternus-dx-driver.rst:174
+msgid "IP address for the SMI-S connection of the ETRENUS DX."
+msgstr ""
+
+#: ../block-storage/drivers/fujitsu-eternus-dx-driver.rst:176
+msgid "Enter the IP address of MNT port of the ETERNUS DX."
+msgstr ""
+
+#: ../block-storage/drivers/fujitsu-eternus-dx-driver.rst:176
+msgid "``EternusIP``"
+msgstr ""
+
+#: ../block-storage/drivers/fujitsu-eternus-dx-driver.rst:179
+msgid "Port number for the SMI-S connection port of the ETERNUS DX."
+msgstr ""
+
+#: ../block-storage/drivers/fujitsu-eternus-dx-driver.rst:179
+msgid "``EternusPort``"
+msgstr ""
+
+#: ../block-storage/drivers/fujitsu-eternus-dx-driver.rst:182
+msgid "User name for the SMI-S connection of the ETERNUS DX."
+msgstr ""
+
+#: ../block-storage/drivers/fujitsu-eternus-dx-driver.rst:182
+msgid "``EternusUser``"
+msgstr ""
+
+#: ../block-storage/drivers/fujitsu-eternus-dx-driver.rst:185
+msgid "Password for the SMI-S connection of the ETERNUS DX."
+msgstr ""
+
+#: ../block-storage/drivers/fujitsu-eternus-dx-driver.rst:185
+msgid "``EternusPassword``"
+msgstr ""
+
+#: ../block-storage/drivers/fujitsu-eternus-dx-driver.rst:188
+msgid "Storage pool name for volumes."
+msgstr ""
+
+#: ../block-storage/drivers/fujitsu-eternus-dx-driver.rst:190
+msgid "Enter RAID Group name or TPP name in the ETERNUS DX."
+msgstr ""
+
+#: ../block-storage/drivers/fujitsu-eternus-dx-driver.rst:190
+msgid "``EternusPool``"
+msgstr ""
+
+#: ../block-storage/drivers/fujitsu-eternus-dx-driver.rst:193
+msgid "Storage pool name for snapshots."
+msgstr ""
+
+#: ../block-storage/drivers/fujitsu-eternus-dx-driver.rst:195
+msgid "Enter RAID Group name in the ETERNUS DX."
+msgstr ""
+
+#: ../block-storage/drivers/fujitsu-eternus-dx-driver.rst:195
+msgid "``EternusSnapPool``"
+msgstr ""
+
+#: ../block-storage/drivers/fujitsu-eternus-dx-driver.rst:198
+msgid "``EternusISCSIIP`` (Multiple setting allowed)"
+msgstr ""
+
+#: ../block-storage/drivers/fujitsu-eternus-dx-driver.rst:198
+msgid "iSCSI connection IP address of the ETERNUS DX."
+msgstr ""
+
+#: ../block-storage/drivers/fujitsu-eternus-dx-driver.rst:202
+msgid ""
+"For ``EternusSnapPool``, you can specify only RAID Group name and cannot "
+"specify TPP name."
+msgstr ""
+
+#: ../block-storage/drivers/fujitsu-eternus-dx-driver.rst:204
+msgid ""
+"You can specify the same RAID Group name for ``EternusPool`` and "
+"``EternusSnapPool`` if you create volumes and snapshots on a same storage "
+"pool."
+msgstr ""
+
+#: ../block-storage/drivers/fujitsu-eternus-dx-driver.rst:210
+msgid "Edit ``cinder.conf``:"
+msgstr ""
+
+#: ../block-storage/drivers/fujitsu-eternus-dx-driver.rst:227
+msgid "Create the driver configuration files ``fc.xml`` and ``iscsi.xml``."
+msgstr ""
+
+#: ../block-storage/drivers/fujitsu-eternus-dx-driver.rst:228
+msgid "Create a volume type and set extra specs to the type:"
+msgstr ""
+
+#: ../block-storage/drivers/fujitsu-eternus-dx-driver.rst:237
+msgid ""
+"By issuing these commands, the volume type ``DX_FC`` is associated with the "
+"``FC``, and the type ``DX_ISCSI`` is associated with the ``ISCSI``."
+msgstr ""
+
 #: ../block-storage/drivers/glusterfs-driver.rst:0
 msgid "Description of GlusterFS storage configuration options"
 msgstr ""
@@ -4414,10 +4797,6 @@ msgid ""
 "it can be manually copied from the SMU to the Block Storage host."
 msgstr ""
 
-#: ../block-storage/drivers/hds-hnas-driver.rst:65
-msgid "Package installation"
-msgstr ""
-
 #: ../block-storage/drivers/hds-hnas-driver.rst:67
 msgid ""
 "If you are installing the driver from an RPM or DEB package, follow the "
@@ -5398,10 +5777,6 @@ msgid ""
 "Hitachi storages."
 msgstr ""
 
-#: ../block-storage/drivers/hitachi-storage-volume-driver.rst:11
-msgid "Supported storages:"
-msgstr ""
-
 #: ../block-storage/drivers/hitachi-storage-volume-driver.rst:13
 msgid "Hitachi Virtual Storage Platform G1000 (VSP G1000)"
 msgstr ""
@@ -5823,10 +6198,12 @@ msgid "Manage and unmanage a snapshot."
 msgstr ""
 
 #: ../block-storage/drivers/hpe-3par-driver.rst:86
+#: ../block-storage/drivers/hpe-lefthand-driver.rst:66
 msgid "Replicate volumes to managed and unmanaged targets."
 msgstr ""
 
 #: ../block-storage/drivers/hpe-3par-driver.rst:88
+#: ../block-storage/drivers/hpe-lefthand-driver.rst:68
 msgid "Fail-over volumes to managed and unmanaged targets."
 msgstr ""
 
@@ -5874,7 +6251,7 @@ msgid ""
 msgstr ""
 
 #: ../block-storage/drivers/hpe-3par-driver.rst:120
-#: ../block-storage/drivers/hpe-lefthand-driver.rst:102
+#: ../block-storage/drivers/hpe-lefthand-driver.rst:106
 msgid ""
 "If volume types are not used or a particular key is not set for a volume "
 "type, the following defaults are used:"
@@ -6205,7 +6582,7 @@ msgid ""
 "Index on the system with the enabled Block Storage service volume drivers."
 msgstr ""
 
-#: ../block-storage/drivers/hpe-lefthand-driver.rst:66
+#: ../block-storage/drivers/hpe-lefthand-driver.rst:70
 msgid ""
 "When you use back end assisted volume migration, both source and destination "
 "clusters must be in the same HPE LeftHand/StoreVirtual management group. The "
@@ -6213,31 +6590,31 @@ msgid ""
 "volume. The volume cannot be attached or have snapshots to migrate."
 msgstr ""
 
-#: ../block-storage/drivers/hpe-lefthand-driver.rst:71
+#: ../block-storage/drivers/hpe-lefthand-driver.rst:75
 msgid ""
 "Volume type support for the driver includes the ability to set the following "
 "capabilities in the Block Storage API ``cinder.api.contrib."
 "types_extra_specs`` volume type extra specs extension module."
 msgstr ""
 
-#: ../block-storage/drivers/hpe-lefthand-driver.rst:76
-#: ../block-storage/drivers/hpe-lefthand-driver.rst:107
+#: ../block-storage/drivers/hpe-lefthand-driver.rst:80
+#: ../block-storage/drivers/hpe-lefthand-driver.rst:111
 msgid "``hpelh:provisioning``"
 msgstr ""
 
-#: ../block-storage/drivers/hpe-lefthand-driver.rst:78
-#: ../block-storage/drivers/hpe-lefthand-driver.rst:96
-#: ../block-storage/drivers/hpe-lefthand-driver.rst:110
+#: ../block-storage/drivers/hpe-lefthand-driver.rst:82
+#: ../block-storage/drivers/hpe-lefthand-driver.rst:100
+#: ../block-storage/drivers/hpe-lefthand-driver.rst:114
 msgid "``hpelh:ao``"
 msgstr ""
 
-#: ../block-storage/drivers/hpe-lefthand-driver.rst:80
-#: ../block-storage/drivers/hpe-lefthand-driver.rst:100
-#: ../block-storage/drivers/hpe-lefthand-driver.rst:125
+#: ../block-storage/drivers/hpe-lefthand-driver.rst:84
+#: ../block-storage/drivers/hpe-lefthand-driver.rst:104
+#: ../block-storage/drivers/hpe-lefthand-driver.rst:129
 msgid "``hpelh:data_pl``"
 msgstr ""
 
-#: ../block-storage/drivers/hpe-lefthand-driver.rst:82
+#: ../block-storage/drivers/hpe-lefthand-driver.rst:86
 msgid ""
 "To work with the default filter scheduler, the key-value pairs are case-"
 "sensitive and scoped with ``hpelh:``. For information about how to set the "
@@ -6245,95 +6622,95 @@ msgid ""
 "command:"
 msgstr ""
 
-#: ../block-storage/drivers/hpe-lefthand-driver.rst:91
+#: ../block-storage/drivers/hpe-lefthand-driver.rst:95
 msgid ""
 "The following keys require the HPE LeftHand/StoreVirtual storage array be "
 "configured for:"
 msgstr ""
 
-#: ../block-storage/drivers/hpe-lefthand-driver.rst:95
+#: ../block-storage/drivers/hpe-lefthand-driver.rst:99
 msgid ""
 "The HPE LeftHand/StoreVirtual storage array must be configured for Adaptive "
 "Optimization."
 msgstr ""
 
-#: ../block-storage/drivers/hpe-lefthand-driver.rst:99
+#: ../block-storage/drivers/hpe-lefthand-driver.rst:103
 msgid ""
 "The HPE LeftHand/StoreVirtual storage array must be able to support the Data "
 "Protection level specified by the extra spec."
 msgstr ""
 
-#: ../block-storage/drivers/hpe-lefthand-driver.rst:106
+#: ../block-storage/drivers/hpe-lefthand-driver.rst:110
 msgid ""
 "Defaults to ``thin`` provisioning, the valid values are, ``thin`` and "
 "``full``"
 msgstr ""
 
-#: ../block-storage/drivers/hpe-lefthand-driver.rst:110
+#: ../block-storage/drivers/hpe-lefthand-driver.rst:114
 msgid "Defaults to ``true``, the valid values are, ``true`` and ``false``."
 msgstr ""
 
-#: ../block-storage/drivers/hpe-lefthand-driver.rst:113
+#: ../block-storage/drivers/hpe-lefthand-driver.rst:117
 msgid "Defaults to ``r-0``, Network RAID-0 (None), the valid values are,"
 msgstr ""
 
-#: ../block-storage/drivers/hpe-lefthand-driver.rst:115
+#: ../block-storage/drivers/hpe-lefthand-driver.rst:119
 msgid "``r-0``, Network RAID-0 (None)"
 msgstr ""
 
-#: ../block-storage/drivers/hpe-lefthand-driver.rst:117
+#: ../block-storage/drivers/hpe-lefthand-driver.rst:121
 msgid "``r-5``, Network RAID-5 (Single Parity)"
 msgstr ""
 
-#: ../block-storage/drivers/hpe-lefthand-driver.rst:119
+#: ../block-storage/drivers/hpe-lefthand-driver.rst:123
 msgid "``r-10-2``, Network RAID-10 (2-Way Mirror)"
 msgstr ""
 
-#: ../block-storage/drivers/hpe-lefthand-driver.rst:121
+#: ../block-storage/drivers/hpe-lefthand-driver.rst:125
 msgid "``r-10-3``, Network RAID-10 (3-Way Mirror)"
 msgstr ""
 
-#: ../block-storage/drivers/hpe-lefthand-driver.rst:123
+#: ../block-storage/drivers/hpe-lefthand-driver.rst:127
 msgid "``r-10-4``, Network RAID-10 (4-Way Mirror)"
 msgstr ""
 
-#: ../block-storage/drivers/hpe-lefthand-driver.rst:125
+#: ../block-storage/drivers/hpe-lefthand-driver.rst:129
 msgid "``r-6``, Network RAID-6 (Dual Parity)"
 msgstr ""
 
-#: ../block-storage/drivers/hpe-lefthand-driver.rst:128
+#: ../block-storage/drivers/hpe-lefthand-driver.rst:132
 msgid "Enable the HPE LeftHand/StoreVirtual iSCSI driver"
 msgstr ""
 
-#: ../block-storage/drivers/hpe-lefthand-driver.rst:130
+#: ../block-storage/drivers/hpe-lefthand-driver.rst:134
 msgid ""
 "The ``HPELeftHandISCSIDriver`` is installed with the OpenStack software."
 msgstr ""
 
-#: ../block-storage/drivers/hpe-lefthand-driver.rst:132
+#: ../block-storage/drivers/hpe-lefthand-driver.rst:136
 msgid ""
 "Install the ``python-lefthandclient`` Python package on the OpenStack Block "
 "Storage system."
 msgstr ""
 
-#: ../block-storage/drivers/hpe-lefthand-driver.rst:139
+#: ../block-storage/drivers/hpe-lefthand-driver.rst:143
 msgid ""
 "If you are not using an existing cluster, create a cluster on the HPE "
 "LeftHand storage system to be used as the cluster for creating volumes."
 msgstr ""
 
-#: ../block-storage/drivers/hpe-lefthand-driver.rst:142
+#: ../block-storage/drivers/hpe-lefthand-driver.rst:146
 msgid "Make the following changes in the ``/etc/cinder/cinder.conf`` file:"
 msgstr ""
 
-#: ../block-storage/drivers/hpe-lefthand-driver.rst:175
+#: ../block-storage/drivers/hpe-lefthand-driver.rst:179
 msgid ""
 "You can enable only one driver on each cinder instance unless you enable "
 "multiple back end support. See the Cinder multiple back end support "
 "instructions to enable this feature."
 msgstr ""
 
-#: ../block-storage/drivers/hpe-lefthand-driver.rst:179
+#: ../block-storage/drivers/hpe-lefthand-driver.rst:183
 msgid ""
 "If the ``hpelefthand_iscsi_chap_enabled`` is set to ``true``, the driver "
 "will associate randomly-generated CHAP secrets with all hosts on the HPE "
@@ -6341,7 +6718,7 @@ msgid ""
 "creating iSCSI connections."
 msgstr ""
 
-#: ../block-storage/drivers/hpe-lefthand-driver.rst:186
+#: ../block-storage/drivers/hpe-lefthand-driver.rst:190
 #: ../block-storage/drivers/ibm-storwize-svc-driver.rst:74
 msgid ""
 "CHAP secrets are passed from OpenStack Block Storage to Compute in clear "
@@ -6349,7 +6726,7 @@ msgid ""
 "not discovered."
 msgstr ""
 
-#: ../block-storage/drivers/hpe-lefthand-driver.rst:192
+#: ../block-storage/drivers/hpe-lefthand-driver.rst:196
 #: ../block-storage/drivers/ibm-storwize-svc-driver.rst:63
 msgid ""
 "CHAP secrets are added to existing hosts as well as newly-created ones. If "
@@ -6357,20 +6734,20 @@ msgid ""
 "without the generated secrets."
 msgstr ""
 
-#: ../block-storage/drivers/hpe-lefthand-driver.rst:196
+#: ../block-storage/drivers/hpe-lefthand-driver.rst:200
 msgid ""
 "Save the changes to the ``cinder.conf`` file and restart the ``cinder-"
 "volume`` service."
 msgstr ""
 
-#: ../block-storage/drivers/hpe-lefthand-driver.rst:199
+#: ../block-storage/drivers/hpe-lefthand-driver.rst:203
 msgid ""
 "The HPE LeftHand/StoreVirtual driver is now enabled on your OpenStack "
 "system. If you experience problems, review the Block Storage service log "
 "files for errors."
 msgstr ""
 
-#: ../block-storage/drivers/hpe-lefthand-driver.rst:204
+#: ../block-storage/drivers/hpe-lefthand-driver.rst:208
 msgid ""
 "Previous versions implement a HPE LeftHand/StoreVirtual CLIQ driver that "
 "enable the Block Storage service driver configuration in legacy mode. This "
@@ -6424,7 +6801,7 @@ msgid "Volume Driver Version"
 msgstr ""
 
 #: ../block-storage/drivers/huawei-storage-driver.rst:23
-msgid "Create, delete, expand, attach, and detach volumes."
+msgid "Create, delete, expand, attach, detach, manage, and unmanage volumes."
 msgstr ""
 
 #: ../block-storage/drivers/huawei-storage-driver.rst:25
@@ -9297,11 +9674,6 @@ msgid ""
 "benefits."
 msgstr ""
 
-#: ../block-storage/drivers/pure-storage-driver.rst:28
-#: ../block-storage/drivers/xio-volume-driver.rst:21
-msgid "Create, delete, attach, detach, retype, clone, and extend volumes."
-msgstr ""
-
 #: ../block-storage/drivers/pure-storage-driver.rst:30
 #: ../block-storage/drivers/xio-volume-driver.rst:23
 msgid "Create a volume from snapshot."
@@ -9311,11 +9683,6 @@ msgstr ""
 msgid "Create, list, update, and delete consistency groups."
 msgstr ""
 
-#: ../block-storage/drivers/pure-storage-driver.rst:44
-#: ../block-storage/drivers/xio-volume-driver.rst:31
-msgid "Create a thin provisioned volume."
-msgstr ""
-
 #: ../block-storage/drivers/pure-storage-driver.rst:47
 msgid "Configure OpenStack and Purity"
 msgstr ""
@@ -9979,7 +10346,7 @@ msgstr ""
 # #-#-#-#-#  block-storage.pot (Configuration Reference 0.9)  #-#-#-#-#
 # #-#-#-#-#  compute.pot (Configuration Reference 0.9)  #-#-#-#-#
 #: ../block-storage/drivers/vmware-vmdk-driver.rst:62
-#: ../compute/hypervisor-vmware.rst:510
+#: ../compute/hypervisor-vmware.rst:511
 msgid "VMDK disk type"
 msgstr ""
 
@@ -10036,7 +10403,7 @@ msgstr ""
 # #-#-#-#-#  block-storage.pot (Configuration Reference 0.9)  #-#-#-#-#
 # #-#-#-#-#  compute.pot (Configuration Reference 0.9)  #-#-#-#-#
 #: ../block-storage/drivers/vmware-vmdk-driver.rst:90
-#: ../compute/hypervisor-vmware.rst:513
+#: ../compute/hypervisor-vmware.rst:514
 msgid "thin"
 msgstr ""
 
@@ -11441,7 +11808,7 @@ msgstr ""
 #: ../block-storage/nested-quota.rst:71
 msgid ""
 "This command returns the default values for resources. This is because the "
-"quotas for this project were not explictly set."
+"quotas for this project were not explicitly set."
 msgstr ""
 
 #: ../block-storage/nested-quota.rst:74
@@ -11541,13 +11908,13 @@ msgstr ""
 msgid "Volume drivers"
 msgstr ""
 
-#: ../block-storage/volume-drivers.rst:48
+#: ../block-storage/volume-drivers.rst:50
 msgid ""
 "To use different volume drivers for the cinder-volume service, use the "
 "parameters described in these sections."
 msgstr ""
 
-#: ../block-storage/volume-drivers.rst:51
+#: ../block-storage/volume-drivers.rst:53
 msgid ""
 "The volume drivers are included in the `Block Storage repository <https://"
 "git.openstack.org/cgit/openstack/cinder/>`_. To set a volume driver, use the "
@@ -12218,7 +12585,7 @@ msgstr ""
 msgid "The following example shows the default rate-limiting values:"
 msgstr ""
 
-#: ../compute/api.rst:136 ../compute/hypervisor-vmware.rst:968
+#: ../compute/api.rst:136 ../compute/hypervisor-vmware.rst:969
 #: ../compute/scheduler.rst:1162
 msgid "Configuration reference"
 msgstr ""
@@ -14490,19 +14857,17 @@ msgstr ""
 msgid ""
 "vSphere vCenter versions 5.0 and earlier: You must specify the location of "
 "the WSDL files by adding the ``wsdl_location=http://127.0.0.1:8080/vmware/"
-"SDK/wsdl/vim25/vimService.wsdl`` setting to the above configuration. For "
-"more information, see :ref:`vSphere 5.0 and earlier additional set up "
-"<vmware-additional>`."
+"SDK/wsdl/vim25/vimService.wsdl`` setting to the above configuration."
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:431
+#: ../compute/hypervisor-vmware.rst:430
 msgid ""
 "Clusters: The vCenter driver can support only a single cluster. Clusters and "
 "data stores used by the vCenter driver should not contain any VMs other than "
 "those created by the driver."
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:435
+#: ../compute/hypervisor-vmware.rst:434
 msgid ""
 "Data stores: The ``datastore_regex`` setting specifies the data stores to "
 "use with Compute.  For example, ``datastore_regex=\"nas.*\"`` selects all "
@@ -14512,7 +14877,7 @@ msgid ""
 "not intended for OpenStack."
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:442
+#: ../compute/hypervisor-vmware.rst:441
 msgid ""
 "Reserved host memory: The ``reserved_host_memory_mb`` option value is 512 MB "
 "by default. However, VMware recommends that you set this option to 0 MB "
@@ -14520,20 +14885,20 @@ msgid ""
 "virtual machines."
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:447
+#: ../compute/hypervisor-vmware.rst:446
 msgid ""
 "The vCenter driver generates instance name by instance ID. Instance name "
 "template is ignored."
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:450
+#: ../compute/hypervisor-vmware.rst:449
 msgid ""
 "The minimum supported vCenter version is 5.1.0. In OpenStack Liberty release "
 "this will be logged as a warning. In OpenStack Mitaka release this will be "
 "enforced."
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:454
+#: ../compute/hypervisor-vmware.rst:453
 msgid ""
 "A ``nova-compute`` service can control one or more clusters containing "
 "multiple ESXi hosts, making ``nova-compute`` a critical service from a high "
@@ -14542,23 +14907,25 @@ msgid ""
 "compute`` service against host failures."
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:462
+#: ../compute/hypervisor-vmware.rst:461
 msgid ""
 "Many ``nova.conf`` options are relevant to libvirt but do not apply to this "
 "driver."
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:465
+#: ../compute/hypervisor-vmware.rst:464
 msgid ""
 "You must complete additional configuration for environments that use vSphere "
-"5.0 and earlier. See :ref:`vmware-additional`."
+"5.0 and earlier. See `vSphere 5.0 and earlier additional set up <http://docs."
+"openstack.org/liberty/config-reference/content/vmware."
+"html#VMware_additional_config>`_ available in previous released documents."
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:471
+#: ../compute/hypervisor-vmware.rst:472
 msgid "Images with VMware vSphere"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:473
+#: ../compute/hypervisor-vmware.rst:474
 msgid ""
 "The vCenter driver supports images in the VMDK format. Disks in this format "
 "can be obtained from VMware Fusion or from an ESX environment. It is also "
@@ -14569,17 +14936,17 @@ msgid ""
 "commands used for conversion and upload."
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:482
+#: ../compute/hypervisor-vmware.rst:483
 msgid "Supported image types"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:484
+#: ../compute/hypervisor-vmware.rst:485
 msgid ""
 "Upload images to the OpenStack Image service in VMDK format. The following "
 "VMDK disk types are supported:"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:487
+#: ../compute/hypervisor-vmware.rst:488
 msgid ""
 "``VMFS Flat Disks`` (includes thin, thick, zeroedthick, and "
 "eagerzeroedthick). Note that once a VMFS thin disk is exported from VMFS to "
@@ -14589,7 +14956,7 @@ msgid ""
 "the thin disk, must be transferred."
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:494
+#: ../compute/hypervisor-vmware.rst:495
 msgid ""
 "``Monolithic Sparse disks``. Sparse disks get imported from the Image "
 "service into ESXi as thin provisioned disks. Monolithic Sparse disks can be "
@@ -14597,801 +14964,801 @@ msgid ""
 "virtual disk formats using the ``qemu-img`` utility."
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:499
+#: ../compute/hypervisor-vmware.rst:500
 msgid ""
 "``Stream-optimized disks``. Stream-optimized disks are compressed sparse "
 "disks. They can be obtained from VMware vCenter/ESXi when exporting vm to "
 "ovf/ova template."
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:503
+#: ../compute/hypervisor-vmware.rst:504
 msgid ""
 "The following table shows the ``vmware_disktype`` property that applies to "
 "each of the supported VMDK disk types:"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:509
+#: ../compute/hypervisor-vmware.rst:510
 msgid "vmware_disktype property"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:511
+#: ../compute/hypervisor-vmware.rst:512
 msgid "sparse"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:512
+#: ../compute/hypervisor-vmware.rst:513
 msgid "Monolithic Sparse"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:514
+#: ../compute/hypervisor-vmware.rst:515
 msgid "VMFS flat, thin provisioned"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:515
+#: ../compute/hypervisor-vmware.rst:516
 msgid "preallocated (default)"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:516
+#: ../compute/hypervisor-vmware.rst:517
 msgid "VMFS flat, thick/zeroedthick/eagerzeroedthick"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:517
+#: ../compute/hypervisor-vmware.rst:518
 msgid "Streamoptimized"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:518
+#: ../compute/hypervisor-vmware.rst:519
 msgid "Compressed Sparse"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:520
+#: ../compute/hypervisor-vmware.rst:521
 msgid ""
 "The ``vmware_disktype`` property is set when an image is loaded into the "
 "Image service. For example, the following command creates a Monolithic "
 "Sparse image by setting ``vmware_disktype`` to ``sparse``:"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:533
+#: ../compute/hypervisor-vmware.rst:534
 msgid ""
 "Specifying ``thin`` does not provide any advantage over ``preallocated`` "
 "with the current version of the driver. Future versions might restore the "
 "thin properties of the disk after it is downloaded to a vSphere data store."
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:538
+#: ../compute/hypervisor-vmware.rst:539
 msgid ""
 "The following table shows the ``vmware_ostype`` property that applies to "
 "each of the supported guest OS:"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:544
+#: ../compute/hypervisor-vmware.rst:545
 msgid "vmware_ostype property"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:545
+#: ../compute/hypervisor-vmware.rst:546
 msgid "Retail Name"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:546
+#: ../compute/hypervisor-vmware.rst:547
 msgid "asianux3_64Guest"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:547
+#: ../compute/hypervisor-vmware.rst:548
 msgid "Asianux Server 3 (64 bit)"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:548
+#: ../compute/hypervisor-vmware.rst:549
 msgid "asianux3Guest"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:549
+#: ../compute/hypervisor-vmware.rst:550
 msgid "Asianux Server 3"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:550
+#: ../compute/hypervisor-vmware.rst:551
 msgid "asianux4_64Guest"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:551
+#: ../compute/hypervisor-vmware.rst:552
 msgid "Asianux Server 4 (64 bit)"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:552
+#: ../compute/hypervisor-vmware.rst:553
 msgid "asianux4Guest"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:553
+#: ../compute/hypervisor-vmware.rst:554
 msgid "Asianux Server 4"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:554
+#: ../compute/hypervisor-vmware.rst:555
 msgid "darwin64Guest"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:555
+#: ../compute/hypervisor-vmware.rst:556
 msgid "Darwin 64 bit"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:556
+#: ../compute/hypervisor-vmware.rst:557
 msgid "darwinGuest"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:557
+#: ../compute/hypervisor-vmware.rst:558
 msgid "Darwin"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:558
+#: ../compute/hypervisor-vmware.rst:559
 msgid "debian4_64Guest"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:559
+#: ../compute/hypervisor-vmware.rst:560
 msgid "Debian GNU/Linux 4 (64 bit)"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:560
+#: ../compute/hypervisor-vmware.rst:561
 msgid "debian4Guest"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:561
+#: ../compute/hypervisor-vmware.rst:562
 msgid "Debian GNU/Linux 4"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:562
+#: ../compute/hypervisor-vmware.rst:563
 msgid "debian5_64Guest"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:563
+#: ../compute/hypervisor-vmware.rst:564
 msgid "Debian GNU/Linux 5 (64 bit)"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:564
+#: ../compute/hypervisor-vmware.rst:565
 msgid "debian5Guest"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:565
+#: ../compute/hypervisor-vmware.rst:566
 msgid "Debian GNU/Linux 5"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:566
+#: ../compute/hypervisor-vmware.rst:567
 msgid "dosGuest"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:567
+#: ../compute/hypervisor-vmware.rst:568
 msgid "MS-DOS"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:568
+#: ../compute/hypervisor-vmware.rst:569
 msgid "freebsd64Guest"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:569
+#: ../compute/hypervisor-vmware.rst:570
 msgid "FreeBSD x64"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:570
+#: ../compute/hypervisor-vmware.rst:571
 msgid "freebsdGuest"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:571
+#: ../compute/hypervisor-vmware.rst:572
 msgid "FreeBSD"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:572
+#: ../compute/hypervisor-vmware.rst:573
 msgid "mandrivaGuest"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:573
+#: ../compute/hypervisor-vmware.rst:574
 msgid "Mandriva Linux"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:574
+#: ../compute/hypervisor-vmware.rst:575
 msgid "netware4Guest"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:575
+#: ../compute/hypervisor-vmware.rst:576
 msgid "Novell NetWare 4"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:576
+#: ../compute/hypervisor-vmware.rst:577
 msgid "netware5Guest"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:577
+#: ../compute/hypervisor-vmware.rst:578
 msgid "Novell NetWare 5.1"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:578
+#: ../compute/hypervisor-vmware.rst:579
 msgid "netware6Guest"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:579
+#: ../compute/hypervisor-vmware.rst:580
 msgid "Novell NetWare 6.x"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:580
+#: ../compute/hypervisor-vmware.rst:581
 msgid "nld9Guest"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:581
+#: ../compute/hypervisor-vmware.rst:582
 msgid "Novell Linux Desktop 9"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:582
+#: ../compute/hypervisor-vmware.rst:583
 msgid "oesGuest"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:583
+#: ../compute/hypervisor-vmware.rst:584
 msgid "Open Enterprise Server"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:584
+#: ../compute/hypervisor-vmware.rst:585
 msgid "openServer5Guest"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:585
+#: ../compute/hypervisor-vmware.rst:586
 msgid "SCO OpenServer 5"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:586
+#: ../compute/hypervisor-vmware.rst:587
 msgid "openServer6Guest"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:587
+#: ../compute/hypervisor-vmware.rst:588
 msgid "SCO OpenServer 6"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:588
+#: ../compute/hypervisor-vmware.rst:589
 msgid "opensuse64Guest"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:589
+#: ../compute/hypervisor-vmware.rst:590
 msgid "openSUSE (64 bit)"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:590
+#: ../compute/hypervisor-vmware.rst:591
 msgid "opensuseGuest"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:591
+#: ../compute/hypervisor-vmware.rst:592
 msgid "openSUSE"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:592
+#: ../compute/hypervisor-vmware.rst:593
 msgid "os2Guest"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:593
+#: ../compute/hypervisor-vmware.rst:594
 msgid "OS/2"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:594
+#: ../compute/hypervisor-vmware.rst:595
 msgid "other24xLinux64Guest"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:595
+#: ../compute/hypervisor-vmware.rst:596
 msgid "Linux 2.4x Kernel (64 bit) (experimental)"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:596
+#: ../compute/hypervisor-vmware.rst:597
 msgid "other24xLinuxGuest"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:597
+#: ../compute/hypervisor-vmware.rst:598
 msgid "Linux 2.4x Kernel"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:598
+#: ../compute/hypervisor-vmware.rst:599
 msgid "other26xLinux64Guest"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:599
+#: ../compute/hypervisor-vmware.rst:600
 msgid "Linux 2.6x Kernel (64 bit) (experimental)"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:600
+#: ../compute/hypervisor-vmware.rst:601
 msgid "other26xLinuxGuest"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:601
+#: ../compute/hypervisor-vmware.rst:602
 msgid "Linux 2.6x Kernel (experimental)"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:602
+#: ../compute/hypervisor-vmware.rst:603
 msgid "otherGuest"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:603
+#: ../compute/hypervisor-vmware.rst:604
 msgid "Other Operating System"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:604
+#: ../compute/hypervisor-vmware.rst:605
 msgid "otherGuest64"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:605
+#: ../compute/hypervisor-vmware.rst:606
 msgid "Other Operating System (64 bit) (experimental)"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:606
+#: ../compute/hypervisor-vmware.rst:607
 msgid "otherLinux64Guest"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:607
+#: ../compute/hypervisor-vmware.rst:608
 msgid "Linux (64 bit) (experimental)"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:608
+#: ../compute/hypervisor-vmware.rst:609
 msgid "otherLinuxGuest"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:609
+#: ../compute/hypervisor-vmware.rst:610
 msgid "Other Linux"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:610
+#: ../compute/hypervisor-vmware.rst:611
 msgid "redhatGuest"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:611
+#: ../compute/hypervisor-vmware.rst:612
 msgid "Red Hat Linux 2.1"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:612
+#: ../compute/hypervisor-vmware.rst:613
 msgid "rhel2Guest"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:613
+#: ../compute/hypervisor-vmware.rst:614
 msgid "Red Hat Enterprise Linux 2"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:614
+#: ../compute/hypervisor-vmware.rst:615
 msgid "rhel3_64Guest"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:615
+#: ../compute/hypervisor-vmware.rst:616
 msgid "Red Hat Enterprise Linux 3 (64 bit)"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:616
+#: ../compute/hypervisor-vmware.rst:617
 msgid "rhel3Guest"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:617
+#: ../compute/hypervisor-vmware.rst:618
 msgid "Red Hat Enterprise Linux 3"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:618
+#: ../compute/hypervisor-vmware.rst:619
 msgid "rhel4_64Guest"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:619
+#: ../compute/hypervisor-vmware.rst:620
 msgid "Red Hat Enterprise Linux 4 (64 bit)"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:620
+#: ../compute/hypervisor-vmware.rst:621
 msgid "rhel4Guest"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:621
+#: ../compute/hypervisor-vmware.rst:622
 msgid "Red Hat Enterprise Linux 4"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:622
+#: ../compute/hypervisor-vmware.rst:623
 msgid "rhel5_64Guest"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:623
+#: ../compute/hypervisor-vmware.rst:624
 msgid "Red Hat Enterprise Linux 5 (64 bit) (experimental)"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:624
+#: ../compute/hypervisor-vmware.rst:625
 msgid "rhel5Guest"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:625
+#: ../compute/hypervisor-vmware.rst:626
 msgid "Red Hat Enterprise Linux 5"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:626
+#: ../compute/hypervisor-vmware.rst:627
 msgid "rhel6_64Guest"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:627
+#: ../compute/hypervisor-vmware.rst:628
 msgid "Red Hat Enterprise Linux 6 (64 bit)"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:628
+#: ../compute/hypervisor-vmware.rst:629
 msgid "rhel6Guest"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:629
+#: ../compute/hypervisor-vmware.rst:630
 msgid "Red Hat Enterprise Linux 6"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:630
+#: ../compute/hypervisor-vmware.rst:631
 msgid "sjdsGuest"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:631
+#: ../compute/hypervisor-vmware.rst:632
 msgid "Sun Java Desktop System"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:632
+#: ../compute/hypervisor-vmware.rst:633
 msgid "sles10_64Guest"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:633
+#: ../compute/hypervisor-vmware.rst:634
 msgid "SUSE Linux Enterprise Server 10 (64 bit) (experimental)"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:634
+#: ../compute/hypervisor-vmware.rst:635
 msgid "sles10Guest"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:635
+#: ../compute/hypervisor-vmware.rst:636
 msgid "SUSE Linux Enterprise Server 10"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:636
+#: ../compute/hypervisor-vmware.rst:637
 msgid "sles11_64Guest"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:637
+#: ../compute/hypervisor-vmware.rst:638
 msgid "SUSE Linux Enterprise Server 11 (64 bit)"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:638
+#: ../compute/hypervisor-vmware.rst:639
 msgid "sles11Guest"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:639
+#: ../compute/hypervisor-vmware.rst:640
 msgid "SUSE Linux Enterprise Server 11"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:640
+#: ../compute/hypervisor-vmware.rst:641
 msgid "sles64Guest"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:641
+#: ../compute/hypervisor-vmware.rst:642
 msgid "SUSE Linux Enterprise Server 9 (64 bit)"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:642
+#: ../compute/hypervisor-vmware.rst:643
 msgid "slesGuest"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:643
+#: ../compute/hypervisor-vmware.rst:644
 msgid "SUSE Linux Enterprise Server 9"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:644
+#: ../compute/hypervisor-vmware.rst:645
 msgid "solaris10_64Guest"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:645
+#: ../compute/hypervisor-vmware.rst:646
 msgid "Solaris 10 (64 bit) (experimental)"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:646
+#: ../compute/hypervisor-vmware.rst:647
 msgid "solaris10Guest"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:647
+#: ../compute/hypervisor-vmware.rst:648
 msgid "Solaris 10 (32 bit) (experimental)"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:648
+#: ../compute/hypervisor-vmware.rst:649
 msgid "solaris6Guest"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:649
+#: ../compute/hypervisor-vmware.rst:650
 msgid "Solaris 6"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:650
+#: ../compute/hypervisor-vmware.rst:651
 msgid "solaris7Guest"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:651
+#: ../compute/hypervisor-vmware.rst:652
 msgid "Solaris 7"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:652
+#: ../compute/hypervisor-vmware.rst:653
 msgid "solaris8Guest"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:653
+#: ../compute/hypervisor-vmware.rst:654
 msgid "Solaris 8"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:654
+#: ../compute/hypervisor-vmware.rst:655
 msgid "solaris9Guest"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:655
+#: ../compute/hypervisor-vmware.rst:656
 msgid "Solaris 9"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:656
+#: ../compute/hypervisor-vmware.rst:657
 msgid "suse64Guest"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:657
+#: ../compute/hypervisor-vmware.rst:658
 msgid "SUSE Linux (64 bit)"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:658
+#: ../compute/hypervisor-vmware.rst:659
 msgid "suseGuest"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:659
+#: ../compute/hypervisor-vmware.rst:660
 msgid "SUSE Linux"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:660
+#: ../compute/hypervisor-vmware.rst:661
 msgid "turboLinux64Guest"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:661
+#: ../compute/hypervisor-vmware.rst:662
 msgid "Turbolinux (64 bit)"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:662
+#: ../compute/hypervisor-vmware.rst:663
 msgid "turboLinuxGuest"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:663
+#: ../compute/hypervisor-vmware.rst:664
 msgid "Turbolinux"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:664
+#: ../compute/hypervisor-vmware.rst:665
 msgid "ubuntu64Guest"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:665
+#: ../compute/hypervisor-vmware.rst:666
 msgid "Ubuntu Linux (64 bit)"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:666
+#: ../compute/hypervisor-vmware.rst:667
 msgid "ubuntuGuest"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:667
+#: ../compute/hypervisor-vmware.rst:668
 msgid "Ubuntu Linux"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:668
+#: ../compute/hypervisor-vmware.rst:669
 msgid "unixWare7Guest"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:669
+#: ../compute/hypervisor-vmware.rst:670
 msgid "SCO UnixWare 7"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:670
+#: ../compute/hypervisor-vmware.rst:671
 msgid "win2000AdvServGuest"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:671
+#: ../compute/hypervisor-vmware.rst:672
 msgid "Windows 2000 Advanced Server"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:672
+#: ../compute/hypervisor-vmware.rst:673
 msgid "win2000ProGuest"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:673
+#: ../compute/hypervisor-vmware.rst:674
 msgid "Windows 2000 Professional"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:674
+#: ../compute/hypervisor-vmware.rst:675
 msgid "win2000ServGuest"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:675
+#: ../compute/hypervisor-vmware.rst:676
 msgid "Windows 2000 Server"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:676
+#: ../compute/hypervisor-vmware.rst:677
 msgid "win31Guest"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:677
+#: ../compute/hypervisor-vmware.rst:678
 msgid "Windows 3.1"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:678
+#: ../compute/hypervisor-vmware.rst:679
 msgid "win95Guest"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:679
+#: ../compute/hypervisor-vmware.rst:680
 msgid "Windows 95"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:680
+#: ../compute/hypervisor-vmware.rst:681
 msgid "win98Guest"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:681
+#: ../compute/hypervisor-vmware.rst:682
 msgid "Windows 98"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:682
+#: ../compute/hypervisor-vmware.rst:683
 msgid "windows7_64Guest"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:683
+#: ../compute/hypervisor-vmware.rst:684
 msgid "Windows 7 (64 bit)"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:684
+#: ../compute/hypervisor-vmware.rst:685
 msgid "windows7Guest"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:685
+#: ../compute/hypervisor-vmware.rst:686
 msgid "Windows 7"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:686
+#: ../compute/hypervisor-vmware.rst:687
 msgid "windows7Server64Guest"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:687
+#: ../compute/hypervisor-vmware.rst:688
 msgid "Windows Server 2008 R2 (64 bit)"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:688
+#: ../compute/hypervisor-vmware.rst:689
 msgid "winLonghorn64Guest"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:689
+#: ../compute/hypervisor-vmware.rst:690
 msgid "Windows Longhorn (64 bit) (experimental)"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:690
+#: ../compute/hypervisor-vmware.rst:691
 msgid "winLonghornGuest"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:691
+#: ../compute/hypervisor-vmware.rst:692
 msgid "Windows Longhorn (experimental)"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:692
+#: ../compute/hypervisor-vmware.rst:693
 msgid "winMeGuest"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:693
-msgid "Windows Millenium Edition"
-msgstr ""
-
 #: ../compute/hypervisor-vmware.rst:694
-msgid "winNetBusinessGuest"
+msgid "Windows Millennium Edition"
 msgstr ""
 
 #: ../compute/hypervisor-vmware.rst:695
-msgid "Windows Small Business Server 2003"
+msgid "winNetBusinessGuest"
 msgstr ""
 
 #: ../compute/hypervisor-vmware.rst:696
-msgid "winNetDatacenter64Guest"
+msgid "Windows Small Business Server 2003"
 msgstr ""
 
 #: ../compute/hypervisor-vmware.rst:697
-msgid "Windows Server 2003, Datacenter Edition (64 bit) (experimental)"
+msgid "winNetDatacenter64Guest"
 msgstr ""
 
 #: ../compute/hypervisor-vmware.rst:698
-msgid "winNetDatacenterGuest"
+msgid "Windows Server 2003, Datacenter Edition (64 bit) (experimental)"
 msgstr ""
 
 #: ../compute/hypervisor-vmware.rst:699
-msgid "Windows Server 2003, Datacenter Edition"
+msgid "winNetDatacenterGuest"
 msgstr ""
 
 #: ../compute/hypervisor-vmware.rst:700
-msgid "winNetEnterprise64Guest"
+msgid "Windows Server 2003, Datacenter Edition"
 msgstr ""
 
 #: ../compute/hypervisor-vmware.rst:701
+msgid "winNetEnterprise64Guest"
+msgstr ""
+
+#: ../compute/hypervisor-vmware.rst:702
 msgid "Windows Server 2003, Enterprise Edition (64 bit)"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:702 ../compute/hypervisor-vmware.rst:706
+#: ../compute/hypervisor-vmware.rst:703 ../compute/hypervisor-vmware.rst:707
 msgid "winNetEnterpriseGuest"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:703 ../compute/hypervisor-vmware.rst:707
+#: ../compute/hypervisor-vmware.rst:704 ../compute/hypervisor-vmware.rst:708
 msgid "Windows Server 2003, Enterprise Edition"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:704 ../compute/hypervisor-vmware.rst:708
+#: ../compute/hypervisor-vmware.rst:705 ../compute/hypervisor-vmware.rst:709
 msgid "winNetStandard64Guest"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:705 ../compute/hypervisor-vmware.rst:709
+#: ../compute/hypervisor-vmware.rst:706 ../compute/hypervisor-vmware.rst:710
 msgid "Windows Server 2003, Standard Edition (64 bit)"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:710
+#: ../compute/hypervisor-vmware.rst:711
 msgid "winNetStandardGuest"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:711
+#: ../compute/hypervisor-vmware.rst:712
 msgid "Windows Server 2003, Standard Edition"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:712
+#: ../compute/hypervisor-vmware.rst:713
 msgid "winNetWebGuest"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:713
+#: ../compute/hypervisor-vmware.rst:714
 msgid "Windows Server 2003, Web Edition"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:714
+#: ../compute/hypervisor-vmware.rst:715
 msgid "winNTGuest"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:715
+#: ../compute/hypervisor-vmware.rst:716
 msgid "Windows NT 4"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:716
+#: ../compute/hypervisor-vmware.rst:717
 msgid "winVista64Guest"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:717
+#: ../compute/hypervisor-vmware.rst:718
 msgid "Windows Vista (64 bit)"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:718
+#: ../compute/hypervisor-vmware.rst:719
 msgid "winVistaGuest"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:719
+#: ../compute/hypervisor-vmware.rst:720
 msgid "Windows Vista"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:720
+#: ../compute/hypervisor-vmware.rst:721
 msgid "winXPHomeGuest"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:721
+#: ../compute/hypervisor-vmware.rst:722
 msgid "Windows XP Home Edition"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:722
+#: ../compute/hypervisor-vmware.rst:723
 msgid "winXPPro64Guest"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:723
+#: ../compute/hypervisor-vmware.rst:724
 msgid "Windows XP Professional Edition (64 bit)"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:724
+#: ../compute/hypervisor-vmware.rst:725
 msgid "winXPProGuest"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:725
+#: ../compute/hypervisor-vmware.rst:726
 msgid "Windows XP Professional"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:728
+#: ../compute/hypervisor-vmware.rst:729
 msgid "Convert and load images"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:730
+#: ../compute/hypervisor-vmware.rst:731
 msgid ""
 "Using the ``qemu-img`` utility, disk images in several formats (such as, "
 "qcow2) can be converted to the VMDK format."
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:733
+#: ../compute/hypervisor-vmware.rst:734
 msgid ""
 "For example, the following command can be used to convert a `qcow2 Ubuntu "
 "Trusty cloud image <http://cloud-images.ubuntu.com/trusty/ current/trusty-"
 "server-cloudimg-amd64-disk1.img>`_:"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:742
+#: ../compute/hypervisor-vmware.rst:743
 msgid ""
 "VMDK disks converted through ``qemu-img`` are ``always`` monolithic sparse "
 "VMDK disks with an IDE adapter type. Using the previous example of the "
@@ -15399,13 +15766,13 @@ msgid ""
 "the VMDK disk should be something like:"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:755
+#: ../compute/hypervisor-vmware.rst:756
 msgid ""
 "Note that the ``vmware_disktype`` is set to ``sparse`` and the "
 "``vmware_adaptertype`` is set to ``ide`` in the previous command."
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:758
+#: ../compute/hypervisor-vmware.rst:759
 msgid ""
 "If the image did not come from the ``qemu-img`` utility, the "
 "``vmware_disktype`` and ``vmware_adaptertype`` might be different. To "
@@ -15413,13 +15780,13 @@ msgid ""
 "command and look for the ``ddb.adapterType=`` line:"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:767
+#: ../compute/hypervisor-vmware.rst:768
 msgid ""
 "Assuming a preallocated disk type and an iSCSI lsiLogic adapter type, the "
 "following command uploads the VMDK disk:"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:778
+#: ../compute/hypervisor-vmware.rst:779
 msgid ""
 "Currently, OS boot VMDK disks with an IDE adapter type cannot be attached to "
 "a virtual SCSI controller and likewise disks with one of the SCSI adapter "
@@ -15431,11 +15798,11 @@ msgid ""
 "type is lsiLogic."
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:788
+#: ../compute/hypervisor-vmware.rst:789
 msgid "Tag VMware images"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:790
+#: ../compute/hypervisor-vmware.rst:791
 msgid ""
 "In a mixed hypervisor environment, OpenStack Compute uses the "
 "``hypervisor_type`` tag to match images to the correct hypervisor type. For "
@@ -15444,11 +15811,11 @@ msgid ""
 "``xen``. Note that ``qemu`` is used for both QEMU and KVM hypervisor types."
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:807
+#: ../compute/hypervisor-vmware.rst:808
 msgid "Optimize images"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:809
+#: ../compute/hypervisor-vmware.rst:810
 msgid ""
 "Monolithic Sparse disks are considerably faster to download but have the "
 "overhead of an additional conversion step. When imported into ESX, sparse "
@@ -15458,39 +15825,39 @@ msgid ""
 "instances that use this disk image can simply use the cached version."
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:816
+#: ../compute/hypervisor-vmware.rst:817
 msgid ""
 "To avoid the conversion step (at the cost of longer download times) consider "
 "converting sparse disks to thin provisioned or preallocated disks before "
 "loading them into the Image service."
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:820
+#: ../compute/hypervisor-vmware.rst:821
 msgid "Use one of the following tools to pre-convert sparse disks."
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:823
+#: ../compute/hypervisor-vmware.rst:824
 msgid "Sometimes called the remote CLI or rCLI."
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:825
+#: ../compute/hypervisor-vmware.rst:826
 msgid ""
 "Assuming that the sparse disk is made available on a data store accessible "
 "by an ESX host, the following command converts it to preallocated format:"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:834
+#: ../compute/hypervisor-vmware.rst:835
 msgid ""
 "Note that the vifs tool from the same CLI package can be used to upload the "
 "disk to be converted. The vifs tool can also be used to download the "
 "converted disk if necessary."
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:836
+#: ../compute/hypervisor-vmware.rst:837
 msgid "vSphere CLI tools"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:839
+#: ../compute/hypervisor-vmware.rst:840
 msgid ""
 "If the SSH service is enabled on an ESX host, the sparse disk can be "
 "uploaded to the ESX data store through scp and the vmkfstools local to the "
@@ -15498,43 +15865,43 @@ msgid ""
 "host through ssh, run this command:"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:846
+#: ../compute/hypervisor-vmware.rst:847
 msgid "vmkfstools directly on the ESX host"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:849
+#: ../compute/hypervisor-vmware.rst:850
 msgid ""
 "``vmware-vdiskmanager`` is a utility that comes bundled with VMware Fusion "
 "and VMware Workstation. The following example converts a sparse disk to "
 "preallocated format:"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:855
+#: ../compute/hypervisor-vmware.rst:856
 msgid "vmware-vdiskmanager"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:857
+#: ../compute/hypervisor-vmware.rst:858
 msgid "In the previous cases, the converted vmdk is actually a pair of files:"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:859
+#: ../compute/hypervisor-vmware.rst:860
 msgid "The descriptor file ``converted.vmdk``."
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:860
+#: ../compute/hypervisor-vmware.rst:861
 msgid "The actual virtual disk data file ``converted-flat.vmdk``."
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:862
+#: ../compute/hypervisor-vmware.rst:863
 msgid ""
 "The file to be uploaded to the Image service is ``converted-flat.vmdk``."
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:865
+#: ../compute/hypervisor-vmware.rst:866
 msgid "Image handling"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:867
+#: ../compute/hypervisor-vmware.rst:868
 msgid ""
 "The ESX hypervisor requires a copy of the VMDK file in order to boot up a "
 "virtual machine. As a result, the vCenter OpenStack Compute driver must "
@@ -15546,7 +15913,7 @@ msgid ""
 "Image service."
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:876
+#: ../compute/hypervisor-vmware.rst:877
 msgid ""
 "Even with a cached VMDK, there is still a copy operation from the cache "
 "location to the hypervisor file directory in the shared data store. To avoid "
@@ -15554,20 +15921,20 @@ msgid ""
 "mode, see :ref:`vmware-config`."
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:883
+#: ../compute/hypervisor-vmware.rst:884
 msgid ""
 "You can also use the ``vmware_linked_clone`` property in the Image service "
 "to override the linked_clone mode on a per-image basis."
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:886
+#: ../compute/hypervisor-vmware.rst:887
 msgid ""
 "If spawning a virtual machine image from ISO with a VMDK disk, the image is "
 "created and attached to the virtual machine as a blank disk. In that case "
 "``vmware_linked_clone`` property for the image is just ignored."
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:890
+#: ../compute/hypervisor-vmware.rst:891
 msgid ""
 "If multiple compute nodes are running on the same host, or have a shared "
 "file system, you can enable them to use the same cache folder on the back-"
@@ -15576,20 +15943,20 @@ msgid ""
 "where cached images are stored."
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:898
+#: ../compute/hypervisor-vmware.rst:899
 msgid ""
 "This can take effect only if compute nodes are running on the same host, or "
 "have a shared file system."
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:901
+#: ../compute/hypervisor-vmware.rst:902
 msgid ""
 "You can automatically purge unused images after a specified period of time. "
 "To configure this action, set these options in the ``DEFAULT`` section in "
 "the ``nova.conf`` file:"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:906
+#: ../compute/hypervisor-vmware.rst:907
 msgid ""
 "Set this option to ``True`` to specify that unused images should be removed "
 "after the duration specified in the "
@@ -15597,32 +15964,32 @@ msgid ""
 "``True``."
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:909
+#: ../compute/hypervisor-vmware.rst:910
 msgid "remove_unused_base_images"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:912
+#: ../compute/hypervisor-vmware.rst:913
 msgid ""
 "Specifies the duration in seconds after which an unused image is purged from "
 "the cache. The default is ``86400`` (24 hours)."
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:913
+#: ../compute/hypervisor-vmware.rst:914
 msgid "remove_unused_original_minimum_age_seconds"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:918
+#: ../compute/hypervisor-vmware.rst:919
 msgid "Networking with VMware vSphere"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:920
+#: ../compute/hypervisor-vmware.rst:921
 msgid ""
 "The VMware driver supports networking with the ``nova-network`` service or "
 "the Networking Service. Depending on your installation, complete these "
 "configuration steps before you provision VMs:"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:924
+#: ../compute/hypervisor-vmware.rst:925
 msgid ""
 "**The nova-network service with the FlatManager or FlatDHCPManager**. Create "
 "a port group with the same name as the ``flat_network_bridge`` value in the "
@@ -15631,17 +15998,17 @@ msgid ""
 "Linux bridge naming conventions."
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:930
+#: ../compute/hypervisor-vmware.rst:931
 msgid "All VM NICs are attached to this port group."
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:932
+#: ../compute/hypervisor-vmware.rst:933
 msgid ""
 "Ensure that the flat interface of the node that runs the ``nova-network`` "
 "service has a path to this network."
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:937
+#: ../compute/hypervisor-vmware.rst:938
 msgid ""
 "When configuring the port binding for this port group in vCenter, specify "
 "``ephemeral`` for the port binding type. For more information, see `Choosing "
@@ -15650,18 +16017,18 @@ msgid ""
 "externalId=1022312>`_ in the VMware Knowledge Base."
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:943
+#: ../compute/hypervisor-vmware.rst:944
 msgid ""
 "**The nova-network service with the VlanManager**. Set the "
 "``vlan_interface`` configuration option to match the ESX host interface that "
 "handles VLAN-tagged VM traffic."
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:947
+#: ../compute/hypervisor-vmware.rst:948
 msgid "OpenStack Compute automatically creates the corresponding port groups."
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:949
+#: ../compute/hypervisor-vmware.rst:950
 msgid ""
 "If you are using the OpenStack Networking Service: Before provisioning VMs, "
 "create a port group with the same name as the ``vmware.integration_bridge`` "
@@ -15669,11 +16036,11 @@ msgid ""
 "this port group for management by the OpenStack Networking plug-in."
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:956
+#: ../compute/hypervisor-vmware.rst:957
 msgid "Volumes with VMware vSphere"
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:958
+#: ../compute/hypervisor-vmware.rst:959
 msgid ""
 "The VMware driver supports attaching volumes from the Block Storage service. "
 "The VMware VMDK driver for OpenStack Block Storage is recommended and should "
@@ -15683,7 +16050,7 @@ msgid ""
 "support and can be used only for attachments."
 msgstr ""
 
-#: ../compute/hypervisor-vmware.rst:970
+#: ../compute/hypervisor-vmware.rst:971
 msgid ""
 "To customize the VMware driver, use the configuration option settings "
 "documented in :ref:`nova-vmware`."
@@ -21065,7 +21432,7 @@ msgid ""
 "following tables detail the available options:"
 msgstr ""
 
-#: ../networking.rst:12
+#: ../networking.rst:13
 msgid ""
 "This chapter explains the OpenStack Networking configuration options. For "
 "installation prerequisites, steps, and use cases, see the OpenStack "
@@ -21810,6 +22177,52 @@ msgid ""
 "duplicated in any tenant."
 msgstr ""
 
+#: ../networking/sample-configuration-files-advanced.rst:3
+msgid "Networking advanced services configuration files"
+msgstr ""
+
+#: ../networking/sample-configuration-files-advanced.rst:5
+msgid ""
+"The Networking advanced services such as Load-Balancer-as-a-Service (LBaaS), "
+"Firewall-as-a-Service (FWaaS), and VPN-as-a-Service (VPNaaS) implement the "
+"automatic generation of configuration files. Here are the sample "
+"configuration files and you can generate the latest configuration files by "
+"running the ``generate_config_file_samples.sh`` script provided by each "
+"`LBaaS <https://git.openstack.org/cgit/openstack/neutron-lbaas/tree/tools/"
+"generate_config_file_samples.sh>`__, `FWaaS <https://git.openstack.org/cgit/"
+"openstack/neutron-fwaas/tree/tools/generate_config_file_samples.sh>`__, and "
+"`VPNaaS <https://git.openstack.org/cgit/openstack/neutron-vpnaas/tree/tools/"
+"generate_config_file_samples.sh>`__ services on their root directory."
+msgstr ""
+
+#: ../networking/sample-configuration-files-advanced.rst:19
+msgid "Load-Balancer-as-a-Service (LBaaS)"
+msgstr ""
+
+#: ../networking/sample-configuration-files-advanced.rst:22
+msgid "neutron_lbaas.conf"
+msgstr ""
+
+#: ../networking/sample-configuration-files-advanced.rst:28
+msgid "lbaas_agent.ini"
+msgstr ""
+
+#: ../networking/sample-configuration-files-advanced.rst:34
+msgid "services_lbaas.conf"
+msgstr ""
+
+#: ../networking/sample-configuration-files-advanced.rst:40
+msgid "VPN-as-a-Service (VPNaaS)"
+msgstr ""
+
+#: ../networking/sample-configuration-files-advanced.rst:43
+msgid "neutron_vpnaas.conf"
+msgstr ""
+
+#: ../networking/sample-configuration-files-advanced.rst:49
+msgid "vpn_agent.ini"
+msgstr ""
+
 #: ../networking/sample-configuration-files.rst:3
 msgid "Networking sample configuration files"
 msgstr ""
diff --git a/doc/image-guide/source/locale/ja/LC_MESSAGES/image-guide.po b/doc/image-guide/source/locale/ja/LC_MESSAGES/image-guide.po
index 2fa233ab76..72e13884e9 100644
--- a/doc/image-guide/source/locale/ja/LC_MESSAGES/image-guide.po
+++ b/doc/image-guide/source/locale/ja/LC_MESSAGES/image-guide.po
@@ -5,11 +5,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Virtual Machine Image Guide 0.9\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-01 02:55+0000\n"
+"POT-Creation-Date: 2016-02-08 14:51+0000\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2016-02-01 04:12+0000\n"
+"PO-Revision-Date: 2016-02-09 04:52+0000\n"
 "Last-Translator: KATO Tomoyuki <kato.tomoyuki@jp.fujitsu.com>\n"
 "Language-Team: Japanese\n"
 "Language: ja\n"
@@ -1663,6 +1663,9 @@ msgstr ""
 msgid "OVF"
 msgstr "OVF"
 
+msgid "Object"
+msgstr "オブジェクト"
+
 msgid "Official Debian images"
 msgstr "公式 Debian イメージ"
 
@@ -1851,6 +1854,9 @@ msgstr ""
 msgid "Resize the root volume file system."
 msgstr "ルートボリュームのファイルシステムをリサイズします。"
 
+msgid "Resource type association"
+msgstr "リソース種別の割り当て"
+
 msgid ""
 "Run the :command:`virt-install --os-variant list` command to see a range of "
 "allowed ``--os-variant`` options."
@@ -2215,6 +2221,14 @@ msgstr ""
 "トしません。不確かな場合、コンテナー形式として ``bare`` を指定すると安全で"
 "す。"
 
+msgid ""
+"The Image service has predefined namespaces for the metadata definitions "
+"catalog. To load files from this directory into the database:"
+msgstr ""
+"Image サービスは、メタデータ定義カタログのために、事前定義された名前空間を持"
+"ちます。データベースの中に、このディレクトリーからファイルをロードするため"
+"に、次を実行します。"
+
 msgid ""
 "The KVM hypervisor starts the virtual machine with the libvirt name, "
 "``centos-6.4``, with 1024 MB of RAM. The virtual machine also has a virtual "
diff --git a/doc/install-guide/source/locale/cs/LC_MESSAGES/install-guide.po b/doc/install-guide/source/locale/cs/LC_MESSAGES/install-guide.po
index 7e5535db24..450ee5244c 100644
--- a/doc/install-guide/source/locale/cs/LC_MESSAGES/install-guide.po
+++ b/doc/install-guide/source/locale/cs/LC_MESSAGES/install-guide.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Installation Guide 0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-01 02:55+0000\n"
+"POT-Creation-Date: 2016-02-08 14:51+0000\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -443,9 +443,6 @@ msgstr ""
 msgid "Attach the volume to an instance"
 msgstr "Připojení svazku k instanci"
 
-msgid "Authenticate using ``admin`` or ``demo`` user credentials."
-msgstr "Přihlaste se pomocí údajů uživatelů ``admin`` nebo ``demo``."
-
 msgid ""
 "Back-end names are arbitrary. As an example, this guide uses the name of the "
 "driver as the name of the back end."
@@ -635,13 +632,6 @@ msgstr "Zkontrolujte stav své instance:"
 msgid "Choose a suitable password for the database root account."
 msgstr "Zvolte si vhodné heslo pro účet root v databázi."
 
-msgid ""
-"Choose the same networking option that you chose for the controller node to "
-"configure services specific to it."
-msgstr ""
-"Zvolte stejnou volbu sítě,  kterou jste zvolili pro uzel kontroléru, pro "
-"nastavení služeb určených pro uzel výpočtu."
-
 msgid "Comment out any other session storage configuration."
 msgstr "Okomentujte všechny ostatní nastavení uložení sezení."
 
@@ -2575,15 +2565,6 @@ msgstr ""
 "zjednodušení tento průvodce používá síť pro správu u všech druhů koncových "
 "bodů a výchozí oblast ``RegionOne``."
 
-msgid ""
-"Option 2 augments option 1 with the layer-3 (routing) service and enables "
-"self-service (private) networks. If you want to use public (provider) and "
-"private (self-service) networks, choose option 2."
-msgstr ""
-"Volba 2 vylepšuje volbu 1 o layer-3 službu (přesměrování) a umožňuje "
-"samoobslužné (soukromé) sítě. Pokud chcete používat veřejné (od "
-"poskytovatele) a soukromé (samoobslužné) sítě, zvolte volbu 2."
-
 msgid "Optionally, configure the time zone:"
 msgstr "Můžete také nastavit časové pásmo:"
 
diff --git a/doc/install-guide/source/locale/install-guide.pot b/doc/install-guide/source/locale/install-guide.pot
index 131aafa9ed..39b2fcabb7 100644
--- a/doc/install-guide/source/locale/install-guide.pot
+++ b/doc/install-guide/source/locale/install-guide.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Installation Guide 0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-01 06:37+0000\n"
+"POT-Creation-Date: 2016-02-09 06:08+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -197,27 +197,28 @@ msgstr ""
 # #-#-#-#-#  swift-controller-install.pot (Installation Guide 0.1)  #-#-#-#-#
 # #-#-#-#-#  swift-storage-install.pot (Installation Guide 0.1)  #-#-#-#-#
 #: ../ceilometer-aodh.rst:177 ../ceilometer-aodh.rst:188
-#: ../ceilometer-install.rst:170 ../ceilometer-install.rst:181
-#: ../ceilometer-install.rst:191 ../ceilometer-nova.rst:12
-#: ../ceilometer-nova.rst:20 ../ceilometer-nova.rst:28
-#: ../ceilometer-swift.rst:50 ../cinder-controller-install.rst:228
-#: ../cinder-controller-install.rst:236 ../cinder-controller-install.rst:244
-#: ../cinder-storage-install.rst:138 ../cinder-storage-install.rst:146
-#: ../cinder-storage-install.rst:154 ../environment-ntp-controller.rst:11
-#: ../environment-ntp-other.rst:12 ../environment-sql-database.rst:13
-#: ../glance-install.rst:157 ../glance-install.rst:165
-#: ../glance-install.rst:176 ../glance-install.rst:352 ../heat-install.rst:316
-#: ../heat-install.rst:325 ../heat-install.rst:334 ../horizon-install.rst:31
-#: ../horizon-install.rst:39 ../horizon-install.rst:47
-#: ../horizon-install.rst:55 ../nova-compute-install.rst:31
-#: ../nova-compute-install.rst:39 ../nova-compute-install.rst:47
-#: ../nova-controller-install.rst:153 ../nova-controller-install.rst:164
-#: ../nova-controller-install.rst:175 ../nova-controller-install.rst:185
-#: ../swift-controller-install.rst:137 ../swift-storage-install.rst:147
+#: ../ceilometer-aodh.rst:199 ../ceilometer-install.rst:170
+#: ../ceilometer-install.rst:181 ../ceilometer-install.rst:191
+#: ../ceilometer-nova.rst:12 ../ceilometer-nova.rst:20
+#: ../ceilometer-nova.rst:28 ../ceilometer-swift.rst:50
+#: ../cinder-controller-install.rst:228 ../cinder-controller-install.rst:236
+#: ../cinder-controller-install.rst:244 ../cinder-storage-install.rst:138
+#: ../cinder-storage-install.rst:146 ../cinder-storage-install.rst:154
+#: ../environment-ntp-controller.rst:11 ../environment-ntp-other.rst:12
+#: ../environment-sql-database.rst:13 ../glance-install.rst:157
+#: ../glance-install.rst:165 ../glance-install.rst:176
+#: ../glance-install.rst:352 ../heat-install.rst:316 ../heat-install.rst:325
+#: ../heat-install.rst:334 ../horizon-install.rst:31 ../horizon-install.rst:39
+#: ../horizon-install.rst:47 ../horizon-install.rst:55
+#: ../nova-compute-install.rst:31 ../nova-compute-install.rst:39
+#: ../nova-compute-install.rst:47 ../nova-controller-install.rst:153
+#: ../nova-controller-install.rst:164 ../nova-controller-install.rst:175
+#: ../nova-controller-install.rst:185 ../swift-controller-install.rst:137
+#: ../swift-storage-install.rst:147
 msgid "Install the packages:"
 msgstr ""
 
-#: ../ceilometer-aodh.rst:195
+#: ../ceilometer-aodh.rst:206
 msgid ""
 "Edit the ``/etc/aodh/aodh.conf`` file and complete the following actions:"
 msgstr ""
@@ -232,7 +233,7 @@ msgstr ""
 # #-#-#-#-#  neutron-controller-install-option1.pot (Installation Guide 0.1)  #-#-#-#-#
 # #-#-#-#-#  neutron-controller-install-option2.pot (Installation Guide 0.1)  #-#-#-#-#
 # #-#-#-#-#  nova-controller-install.pot (Installation Guide 0.1)  #-#-#-#-#
-#: ../ceilometer-aodh.rst:197 ../ceilometer-install.rst:209
+#: ../ceilometer-aodh.rst:208 ../ceilometer-install.rst:209
 #: ../cinder-controller-install.rst:263 ../cinder-storage-install.rst:163
 #: ../glance-install.rst:187 ../glance-install.rst:271 ../heat-install.rst:346
 #: ../keystone-install.rst:133 ../neutron-controller-install-option1.rst:111
@@ -241,7 +242,7 @@ msgstr ""
 msgid "In the ``[database]`` section, configure database access:"
 msgstr ""
 
-#: ../ceilometer-aodh.rst:205
+#: ../ceilometer-aodh.rst:216
 msgid ""
 "Replace ``AODH_DBPASS`` with the password you chose for the Telemetry "
 "Alarming module database. You must escape special characters such as ':', "
@@ -256,7 +257,7 @@ msgstr ""
 # #-#-#-#-#  cinder-storage-install.pot (Installation Guide 0.1)  #-#-#-#-#
 # #-#-#-#-#  heat-install.pot (Installation Guide 0.1)  #-#-#-#-#
 # #-#-#-#-#  nova-controller-install.pot (Installation Guide 0.1)  #-#-#-#-#
-#: ../ceilometer-aodh.rst:210 ../ceilometer-install.rst:224
+#: ../ceilometer-aodh.rst:221 ../ceilometer-install.rst:224
 #: ../ceilometer-nova.rst:37 ../cinder-controller-install.rst:284
 #: ../cinder-storage-install.rst:184 ../heat-install.rst:367
 #: ../nova-controller-install.rst:239
@@ -275,7 +276,7 @@ msgstr ""
 # #-#-#-#-#  heat-install.pot (Installation Guide 0.1)  #-#-#-#-#
 # #-#-#-#-#  nova-compute-install.pot (Installation Guide 0.1)  #-#-#-#-#
 # #-#-#-#-#  nova-controller-install.pot (Installation Guide 0.1)  #-#-#-#-#
-#: ../ceilometer-aodh.rst:225 ../ceilometer-glance.rst:30
+#: ../ceilometer-aodh.rst:236 ../ceilometer-glance.rst:30
 #: ../ceilometer-install.rst:239 ../ceilometer-nova.rst:52
 #: ../ceilometer-swift.rst:111 ../cinder-controller-install.rst:299
 #: ../cinder-storage-install.rst:199 ../heat-install.rst:382
@@ -295,7 +296,7 @@ msgstr ""
 # #-#-#-#-#  neutron-controller-install-option2.pot (Installation Guide 0.1)  #-#-#-#-#
 # #-#-#-#-#  nova-compute-install.pot (Installation Guide 0.1)  #-#-#-#-#
 # #-#-#-#-#  nova-controller-install.pot (Installation Guide 0.1)  #-#-#-#-#
-#: ../ceilometer-aodh.rst:228 ../ceilometer-install.rst:242
+#: ../ceilometer-aodh.rst:239 ../ceilometer-install.rst:242
 #: ../ceilometer-nova.rst:55 ../cinder-controller-install.rst:302
 #: ../cinder-storage-install.rst:202 ../neutron-compute-install.rst:87
 #: ../neutron-controller-install-option1.rst:160
@@ -306,7 +307,7 @@ msgid ""
 "Identity service access:"
 msgstr ""
 
-#: ../ceilometer-aodh.rst:248 ../ceilometer-aodh.rst:264
+#: ../ceilometer-aodh.rst:259 ../ceilometer-aodh.rst:275
 msgid ""
 "Replace ``AODH_PASS`` with the password you chose for the ``aodh`` user in "
 "the Identity service."
@@ -315,7 +316,7 @@ msgstr ""
 # #-#-#-#-#  ceilometer-aodh.pot (Installation Guide 0.1)  #-#-#-#-#
 # #-#-#-#-#  ceilometer-install.pot (Installation Guide 0.1)  #-#-#-#-#
 # #-#-#-#-#  ceilometer-nova.pot (Installation Guide 0.1)  #-#-#-#-#
-#: ../ceilometer-aodh.rst:251 ../ceilometer-install.rst:265
+#: ../ceilometer-aodh.rst:262 ../ceilometer-install.rst:265
 #: ../ceilometer-nova.rst:78
 msgid ""
 "In the ``[service_credentials]`` section, configure service credentials:"
@@ -335,7 +336,7 @@ msgstr ""
 # #-#-#-#-#  neutron-controller-install.pot (Installation Guide 0.1)  #-#-#-#-#
 # #-#-#-#-#  nova-compute-install.pot (Installation Guide 0.1)  #-#-#-#-#
 # #-#-#-#-#  nova-controller-install.pot (Installation Guide 0.1)  #-#-#-#-#
-#: ../ceilometer-aodh.rst:267 ../ceilometer-install.rst:291
+#: ../ceilometer-aodh.rst:278 ../ceilometer-install.rst:291
 #: ../ceilometer-nova.rst:95 ../cinder-controller-install.rst:349
 #: ../cinder-storage-install.rst:303 ../glance-install.rst:259
 #: ../glance-install.rst:333 ../heat-install.rst:445
@@ -345,14 +346,14 @@ msgstr ""
 #: ../neutron-controller-install-option2.rst:182
 #: ../neutron-controller-install-option2.rst:347
 #: ../neutron-controller-install-option2.rst:376
-#: ../neutron-controller-install.rst:215 ../nova-compute-install.rst:216
+#: ../neutron-controller-install.rst:224 ../nova-compute-install.rst:216
 #: ../nova-controller-install.rst:383
 msgid ""
 "(Optional) To assist with troubleshooting, enable verbose logging in the "
 "``[DEFAULT]`` section:"
 msgstr ""
 
-#: ../ceilometer-aodh.rst:282
+#: ../ceilometer-aodh.rst:293
 msgid ""
 "Edit the ``/etc/aodh/api_paste.ini`` file and modify the ``[filter:"
 "authtoken]`` section as follows:"
@@ -376,25 +377,31 @@ msgstr ""
 # #-#-#-#-#  nova-compute-install.pot (Installation Guide 0.1)  #-#-#-#-#
 # #-#-#-#-#  nova-controller-install.pot (Installation Guide 0.1)  #-#-#-#-#
 # #-#-#-#-#  swift-finalize-installation.pot (Installation Guide 0.1)  #-#-#-#-#
-#: ../ceilometer-aodh.rst:292 ../ceilometer-cinder.rst:26
+#: ../ceilometer-aodh.rst:303 ../ceilometer-cinder.rst:26
 #: ../ceilometer-glance.rst:34 ../ceilometer-install.rst:301
 #: ../ceilometer-nova.rst:120 ../ceilometer-swift.rst:115
 #: ../cinder-controller-install.rst:378 ../cinder-storage-install.rst:313
 #: ../environment-nosql-database.rst:145 ../environment-sql-database.rst:114
 #: ../glance-install.rst:373 ../heat-install.rst:486
-#: ../horizon-install.rst:292 ../neutron-compute-install.rst:179
-#: ../neutron-controller-install.rst:256 ../nova-compute-install.rst:237
+#: ../horizon-install.rst:340 ../neutron-compute-install.rst:174
+#: ../neutron-controller-install.rst:265 ../nova-compute-install.rst:237
 #: ../nova-controller-install.rst:409 ../swift-finalize-installation.rst:2
 msgid "Finalize installation"
 msgstr ""
 
-#: ../ceilometer-aodh.rst:296
+#: ../ceilometer-aodh.rst:307
+msgid ""
+"Start the Telemetry Alarming services and configure them to start when the "
+"system boots:"
+msgstr ""
+
+#: ../ceilometer-aodh.rst:323
 msgid ""
 "Start the Alarming services and configure them to start when the system "
 "boots:"
 msgstr ""
 
-#: ../ceilometer-aodh.rst:312
+#: ../ceilometer-aodh.rst:339
 msgid "Restart the Alarming services:"
 msgstr ""
 
@@ -625,8 +632,8 @@ msgstr ""
 # #-#-#-#-#  neutron-compute-install.pot (Installation Guide 0.1)  #-#-#-#-#
 # #-#-#-#-#  nova-compute-install.pot (Installation Guide 0.1)  #-#-#-#-#
 #: ../ceilometer-nova.rst:142 ../ceilometer-nova.rst:156
-#: ../neutron-compute-install.rst:183 ../neutron-compute-install.rst:208
-#: ../neutron-compute-install.rst:224 ../nova-compute-install.rst:298
+#: ../neutron-compute-install.rst:178 ../neutron-compute-install.rst:203
+#: ../neutron-compute-install.rst:219 ../nova-compute-install.rst:298
 msgid "Restart the Compute service:"
 msgstr ""
 
@@ -949,8 +956,8 @@ msgstr ""
 # #-#-#-#-#  cinder-controller-install.pot (Installation Guide 0.1)  #-#-#-#-#
 # #-#-#-#-#  neutron-controller-install.pot (Installation Guide 0.1)  #-#-#-#-#
 #: ../cinder-controller-install.rst:382 ../cinder-controller-install.rst:398
-#: ../neutron-controller-install.rst:281 ../neutron-controller-install.rst:319
-#: ../neutron-controller-install.rst:362
+#: ../neutron-controller-install.rst:290 ../neutron-controller-install.rst:328
+#: ../neutron-controller-install.rst:371
 msgid "Restart the Compute API service:"
 msgstr ""
 
@@ -973,7 +980,7 @@ msgstr ""
 # #-#-#-#-#  nova-controller-install.pot (Installation Guide 0.1)  #-#-#-#-#
 #: ../cinder-controller-install.rst:413 ../glance-install.rst:396
 #: ../heat-install.rst:512 ../keystone-install.rst:569
-#: ../neutron-controller-install.rst:387 ../nova-compute-install.rst:306
+#: ../neutron-controller-install.rst:396 ../nova-compute-install.rst:306
 #: ../nova-controller-install.rst:458
 msgid "By default, the Ubuntu packages create an SQLite database."
 msgstr ""
@@ -987,7 +994,7 @@ msgstr ""
 # #-#-#-#-#  nova-controller-install.pot (Installation Guide 0.1)  #-#-#-#-#
 #: ../cinder-controller-install.rst:415 ../glance-install.rst:398
 #: ../heat-install.rst:514 ../keystone-install.rst:571
-#: ../neutron-controller-install.rst:389 ../nova-compute-install.rst:308
+#: ../neutron-controller-install.rst:398 ../nova-compute-install.rst:308
 #: ../nova-controller-install.rst:460
 msgid ""
 "Because this configuration uses an SQL database server, you can remove the "
@@ -3224,75 +3231,87 @@ msgid ""
 "local_settings.py`` file and complete the following actions:"
 msgstr ""
 
-#: ../horizon-install.rst:93 ../horizon-install.rst:161
-#: ../horizon-install.rst:229
+#: ../horizon-install.rst:93 ../horizon-install.rst:177
+#: ../horizon-install.rst:261
 msgid ""
 "Configure the dashboard to use OpenStack services on the ``controller`` node:"
 msgstr ""
 
-#: ../horizon-install.rst:100 ../horizon-install.rst:168
-#: ../horizon-install.rst:236
+#: ../horizon-install.rst:100 ../horizon-install.rst:184
+#: ../horizon-install.rst:268
 msgid "Allow all hosts to access the dashboard:"
 msgstr ""
 
-#: ../horizon-install.rst:106 ../horizon-install.rst:174
-#: ../horizon-install.rst:242
+#: ../horizon-install.rst:106 ../horizon-install.rst:190
+#: ../horizon-install.rst:274
 msgid "Configure the ``memcached`` session storage service:"
 msgstr ""
 
-#: ../horizon-install.rst:119 ../horizon-install.rst:187
-#: ../horizon-install.rst:255
+#: ../horizon-install.rst:119 ../horizon-install.rst:203
+#: ../horizon-install.rst:287
 msgid "Comment out any other session storage configuration."
 msgstr ""
 
-#: ../horizon-install.rst:121 ../horizon-install.rst:189
-#: ../horizon-install.rst:257
+#: ../horizon-install.rst:121 ../horizon-install.rst:205
+#: ../horizon-install.rst:289
 msgid ""
 "Configure ``user`` as the default role for users that you create via the "
 "dashboard:"
 msgstr ""
 
-#: ../horizon-install.rst:128 ../horizon-install.rst:196
-#: ../horizon-install.rst:264
+#: ../horizon-install.rst:128 ../horizon-install.rst:212
+#: ../horizon-install.rst:296
+msgid "Enable the multi-domain model:"
+msgstr ""
+
+#: ../horizon-install.rst:134 ../horizon-install.rst:218
+#: ../horizon-install.rst:302
+msgid ""
+"Configure the service API version so that you can log into the dashboard by "
+"the Keystone V3 API:"
+msgstr ""
+
+#: ../horizon-install.rst:144 ../horizon-install.rst:228
+#: ../horizon-install.rst:312
 msgid ""
 "If you chose networking option 1, disable support for layer-3 networking "
 "services:"
 msgstr ""
 
-#: ../horizon-install.rst:145 ../horizon-install.rst:213
-#: ../horizon-install.rst:281
+#: ../horizon-install.rst:161 ../horizon-install.rst:245
+#: ../horizon-install.rst:329
 msgid "Optionally, configure the time zone:"
 msgstr ""
 
-#: ../horizon-install.rst:151 ../horizon-install.rst:219
-#: ../horizon-install.rst:287
+#: ../horizon-install.rst:167 ../horizon-install.rst:251
+#: ../horizon-install.rst:335
 msgid ""
 "Replace ``TIME_ZONE`` with an appropriate time zone identifier. For more "
 "information, see the `list of time zones <http://en.wikipedia.org/wiki/"
 "List_of_tz_database_time_zones>`__."
 msgstr ""
 
-#: ../horizon-install.rst:157
+#: ../horizon-install.rst:173
 msgid ""
 "Edit the ``/etc/openstack-dashboard/local_settings`` file and complete the "
 "following actions:"
 msgstr ""
 
-#: ../horizon-install.rst:225
+#: ../horizon-install.rst:257
 msgid ""
 "Edit the ``/etc/openstack-dashboard/local_settings.py`` file and complete "
 "the following actions:"
 msgstr ""
 
-#: ../horizon-install.rst:296
+#: ../horizon-install.rst:344
 msgid "Reload the web server configuration:"
 msgstr ""
 
-#: ../horizon-install.rst:304 ../horizon-install.rst:317
+#: ../horizon-install.rst:352 ../horizon-install.rst:365
 msgid "Restart the web server and session storage service:"
 msgstr ""
 
-#: ../horizon-install.rst:312 ../horizon-install.rst:325
+#: ../horizon-install.rst:360 ../horizon-install.rst:373
 msgid ""
 "The ``systemctl restart`` command starts each service if not currently "
 "running."
@@ -3362,7 +3381,9 @@ msgid ""
 msgstr ""
 
 #: ../horizon-verify.rst:21
-msgid "Authenticate using ``admin`` or ``demo`` user credentials."
+msgid ""
+"Authenticate using ``admin`` or ``demo`` user and ``default`` domain "
+"credentials."
 msgstr ""
 
 #: ../horizon.rst:3
@@ -5043,10 +5064,10 @@ msgstr ""
 # #-#-#-#-#  neutron-controller-install-option1.pot (Installation Guide 0.1)  #-#-#-#-#
 # #-#-#-#-#  neutron-controller-install-option2.pot (Installation Guide 0.1)  #-#-#-#-#
 # #-#-#-#-#  neutron-controller-install.pot (Installation Guide 0.1)  #-#-#-#-#
-#: ../neutron-compute-install.rst:107 ../neutron-compute-install.rst:175
+#: ../neutron-compute-install.rst:107 ../neutron-compute-install.rst:170
 #: ../neutron-controller-install-option1.rst:180
 #: ../neutron-controller-install-option2.rst:139
-#: ../neutron-controller-install.rst:193 ../neutron-controller-install.rst:249
+#: ../neutron-controller-install.rst:202 ../neutron-controller-install.rst:258
 msgid ""
 "Replace ``NEUTRON_PASS`` with the password you chose for the ``neutron`` "
 "user in the Identity service."
@@ -5061,45 +5082,37 @@ msgstr ""
 #: ../neutron-compute-install.rst:137
 msgid ""
 "Choose the same networking option that you chose for the controller node to "
-"configure services specific to it."
+"configure services specific to it. Afterwards, return here and proceed to :"
+"ref:`neutron-compute-compute`."
 msgstr ""
 
 # #-#-#-#-#  neutron-compute-install.pot (Installation Guide 0.1)  #-#-#-#-#
 # #-#-#-#-#  neutron-controller-install.pot (Installation Guide 0.1)  #-#-#-#-#
-#: ../neutron-compute-install.rst:142 ../neutron-controller-install.rst:151
-msgid ""
-"Option 2 augments option 1 with the layer-3 (routing) service and enables "
-"self-service (private) networks. If you want to use public (provider) and "
-"private (self-service) networks, choose option 2."
-msgstr ""
-
-# #-#-#-#-#  neutron-compute-install.pot (Installation Guide 0.1)  #-#-#-#-#
-# #-#-#-#-#  neutron-controller-install.pot (Installation Guide 0.1)  #-#-#-#-#
-#: ../neutron-compute-install.rst:155 ../neutron-controller-install.rst:225
+#: ../neutron-compute-install.rst:150 ../neutron-controller-install.rst:234
 msgid "Configure Compute to use Networking"
 msgstr ""
 
 # #-#-#-#-#  neutron-compute-install.pot (Installation Guide 0.1)  #-#-#-#-#
 # #-#-#-#-#  nova-compute-install.pot (Installation Guide 0.1)  #-#-#-#-#
 # #-#-#-#-#  nova-controller-install.pot (Installation Guide 0.1)  #-#-#-#-#
-#: ../neutron-compute-install.rst:157 ../nova-compute-install.rst:62
+#: ../neutron-compute-install.rst:152 ../nova-compute-install.rst:62
 #: ../nova-controller-install.rst:213
 msgid ""
 "Edit the ``/etc/nova/nova.conf`` file and complete the following actions:"
 msgstr ""
 
-#: ../neutron-compute-install.rst:159
+#: ../neutron-compute-install.rst:154
 msgid "In the ``[neutron]`` section, configure access parameters:"
 msgstr ""
 
-#: ../neutron-compute-install.rst:189
+#: ../neutron-compute-install.rst:184
 msgid ""
 "Start the Linux bridge agent and configure it to start when the system boots:"
 msgstr ""
 
 # #-#-#-#-#  neutron-compute-install.pot (Installation Guide 0.1)  #-#-#-#-#
 # #-#-#-#-#  neutron-controller-install.pot (Installation Guide 0.1)  #-#-#-#-#
-#: ../neutron-compute-install.rst:199 ../neutron-controller-install.rst:310
+#: ../neutron-compute-install.rst:194 ../neutron-controller-install.rst:319
 msgid ""
 "The Networking service initialization scripts expect the variable "
 "``NEUTRON_PLUGIN_CONF`` in the ``/etc/sysconfig/neutron`` file to reference "
@@ -5107,12 +5120,12 @@ msgid ""
 "and add the following:"
 msgstr ""
 
-#: ../neutron-compute-install.rst:214
+#: ../neutron-compute-install.rst:209
 msgid ""
 "Start the Linux Bridge agent and configure it to start when the system boots:"
 msgstr ""
 
-#: ../neutron-compute-install.rst:230
+#: ../neutron-compute-install.rst:225
 msgid "Restart the Linux bridge agent:"
 msgstr ""
 
@@ -5529,68 +5542,91 @@ msgstr ""
 
 #: ../neutron-controller-install.rst:146
 msgid ""
-"Choose one of the following networking options to configure services "
-"specific to it."
+"You can deploy the Networking service using one of two architectures "
+"represented by options 1 and 2."
 msgstr ""
 
-#: ../neutron-controller-install.rst:155
+#: ../neutron-controller-install.rst:149
 msgid ""
-"Complete the procedure for your selected networking option by clicking one "
-"of the following links. After finishing that procedure, you will be directed "
-"back to this page to proceed with configuring the metadata agent."
+"Option 1 deploys the simplest possible architecture that only supports "
+"attaching instances to public (provider) networks. No self-service networks, "
+"routers, or floating IP addresses. Only the ``admin`` or other privileged "
+"user can manage provider networks."
 msgstr ""
 
-#: ../neutron-controller-install.rst:169
+#: ../neutron-controller-install.rst:154
+msgid ""
+"Option 2 augments option 1 with layer-3 services that support attaching "
+"instances to self-service (private) networks. The ``demo`` or other "
+"unprivileged user can manage self-service networks including routers that "
+"provide connectivity between self-service and provider networks. "
+"Additionally, floating IP addresses provide connectivity to instances using "
+"self-service networks from external networks such as the Internet."
+msgstr ""
+
+#: ../neutron-controller-install.rst:163
+msgid ""
+"Option 2 also supports attaching instances to public (provider) networks."
+msgstr ""
+
+#: ../neutron-controller-install.rst:165
+msgid ""
+"Choose one of the following networking options to configure services "
+"specific to it. Afterwards, return here and proceed to :ref:`neutron-"
+"controller-metadata-agent`."
+msgstr ""
+
+#: ../neutron-controller-install.rst:178
 msgid "Configure the metadata agent"
 msgstr ""
 
-#: ../neutron-controller-install.rst:171
+#: ../neutron-controller-install.rst:180
 msgid ""
 "The :term:`metadata agent <Metadata agent>` provides configuration "
 "information such as credentials to instances."
 msgstr ""
 
-#: ../neutron-controller-install.rst:174
+#: ../neutron-controller-install.rst:183
 msgid ""
 "Edit the ``/etc/neutron/metadata_agent.ini`` file and complete the following "
 "actions:"
 msgstr ""
 
-#: ../neutron-controller-install.rst:177
+#: ../neutron-controller-install.rst:186
 msgid "In the ``[DEFAULT]`` section, configure access parameters:"
 msgstr ""
 
-#: ../neutron-controller-install.rst:196
+#: ../neutron-controller-install.rst:205
 msgid "In the ``[DEFAULT]`` section, configure the metadata host:"
 msgstr ""
 
-#: ../neutron-controller-install.rst:204
-msgid ""
-"In the ``[DEFAULT]`` section, configure the metadata proxy shared secret:"
-msgstr ""
-
 #: ../neutron-controller-install.rst:213
 msgid ""
+"In the ``[DEFAULT]`` section, configure the metadata proxy shared secret:"
+msgstr ""
+
+#: ../neutron-controller-install.rst:222
+msgid ""
 "Replace ``METADATA_SECRET`` with a suitable secret for the metadata proxy."
 msgstr ""
 
-#: ../neutron-controller-install.rst:227
+#: ../neutron-controller-install.rst:236
 msgid ""
 "Edit the ``/etc/nova/nova.conf`` file and perform the following actions:"
 msgstr ""
 
-#: ../neutron-controller-install.rst:229
+#: ../neutron-controller-install.rst:238
 msgid ""
 "In the ``[neutron]`` section, configure access parameters, enable the "
 "metadata proxy, and configure the secret:"
 msgstr ""
 
-#: ../neutron-controller-install.rst:252
+#: ../neutron-controller-install.rst:261
 msgid ""
 "Replace ``METADATA_SECRET`` with the secret you chose for the metadata proxy."
 msgstr ""
 
-#: ../neutron-controller-install.rst:260
+#: ../neutron-controller-install.rst:269
 msgid ""
 "The Networking service initialization scripts expect a symbolic link ``/etc/"
 "neutron/plugin.ini`` pointing to the ML2 plug-in configuration file, ``/etc/"
@@ -5598,36 +5634,36 @@ msgid ""
 "create it using the following command:"
 msgstr ""
 
-#: ../neutron-controller-install.rst:269 ../neutron-controller-install.rst:350
+#: ../neutron-controller-install.rst:278 ../neutron-controller-install.rst:359
 msgid "Populate the database:"
 msgstr ""
 
-#: ../neutron-controller-install.rst:278 ../neutron-controller-install.rst:359
+#: ../neutron-controller-install.rst:287 ../neutron-controller-install.rst:368
 msgid ""
 "Database population occurs later for Networking because the script requires "
 "complete server and plug-in configuration files."
 msgstr ""
 
-#: ../neutron-controller-install.rst:287 ../neutron-controller-install.rst:325
+#: ../neutron-controller-install.rst:296 ../neutron-controller-install.rst:334
 msgid ""
 "Start the Networking services and configure them to start when the system "
 "boots."
 msgstr ""
 
-#: ../neutron-controller-install.rst:290 ../neutron-controller-install.rst:328
-#: ../neutron-controller-install.rst:370
+#: ../neutron-controller-install.rst:299 ../neutron-controller-install.rst:337
+#: ../neutron-controller-install.rst:379
 msgid "For both networking options:"
 msgstr ""
 
-#: ../neutron-controller-install.rst:301 ../neutron-controller-install.rst:341
+#: ../neutron-controller-install.rst:310 ../neutron-controller-install.rst:350
 msgid "For networking option 2, also enable and start the layer-3 service:"
 msgstr ""
 
-#: ../neutron-controller-install.rst:368
+#: ../neutron-controller-install.rst:377
 msgid "Restart the Networking services."
 msgstr ""
 
-#: ../neutron-controller-install.rst:379
+#: ../neutron-controller-install.rst:388
 msgid "For networking option 2, also restart the layer-3 service:"
 msgstr ""
 
diff --git a/doc/install-guide/source/locale/ja/LC_MESSAGES/install-guide.po b/doc/install-guide/source/locale/ja/LC_MESSAGES/install-guide.po
index 46ca948c23..bf2c248713 100644
--- a/doc/install-guide/source/locale/ja/LC_MESSAGES/install-guide.po
+++ b/doc/install-guide/source/locale/ja/LC_MESSAGES/install-guide.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Installation Guide 0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-01 02:55+0000\n"
+"POT-Creation-Date: 2016-02-08 14:51+0000\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -537,10 +537,6 @@ msgstr ""
 msgid "Attach the volume to an instance"
 msgstr "ボリュームのインスタンスへの接続"
 
-msgid "Authenticate using ``admin`` or ``demo`` user credentials."
-msgstr ""
-"``admin`` または ``demo`` ユーザーのクレデンシャルを用いて認証を行います。"
-
 msgid ""
 "Back-end names are arbitrary. As an example, this guide uses the name of the "
 "driver as the name of the back end."
@@ -804,23 +800,9 @@ msgstr "インスタンスの状態を確認します。"
 msgid "Choose a suitable password for the database root account."
 msgstr "データベースの root アカウントに適切なパスワードを選択します。"
 
-msgid ""
-"Choose one of the following networking options to configure services "
-"specific to it."
-msgstr ""
-"以下のネットワークオプションのいずれかを選択して、サービスをオプションに応じ"
-"て設定します。"
-
 msgid "Choose one of the following virtual networking options."
 msgstr "以下の仮想ネットワークの選択肢のいずれかを選択します。"
 
-msgid ""
-"Choose the same networking option that you chose for the controller node to "
-"configure services specific to it."
-msgstr ""
-"コントローラーノードに選択したものと同じネットワークの選択肢を選び、具体的な"
-"サービスを設定します。"
-
 msgid "Comment out any other session storage configuration."
 msgstr "それ以外のすべてのセッションストレージ設定をコメントアウトします。"
 
@@ -851,15 +833,6 @@ msgstr ""
 "完全な OpenStack 環境では、これらのいくつかのパッケージはすでにインストールさ"
 "れています。"
 
-msgid ""
-"Complete the procedure for your selected networking option by clicking one "
-"of the following links. After finishing that procedure, you will be directed "
-"back to this page to proceed with configuring the metadata agent."
-msgstr ""
-"以下のいずれかのリンクをクリックして、選択したネットワークオプションに応じた"
-"手順を行ってください。手順がすべて終わったら、このページに戻るように指示があ"
-"りますので、メタデータエージェントの設定に進んでください。"
-
 msgid "Compute"
 msgstr "Compute"
 
@@ -3607,16 +3580,6 @@ msgstr ""
 "イドでは、すべてのエンドポイントで管理ネットワークを使用し、デフォルトの "
 "``RegionOne`` リージョンを使用します。"
 
-msgid ""
-"Option 2 augments option 1 with the layer-3 (routing) service and enables "
-"self-service (private) networks. If you want to use public (provider) and "
-"private (self-service) networks, choose option 2."
-msgstr ""
-"オプション 2 は、オプション 1 に L3 (ルーティング) サービスを追加して、セルフ"
-"サービス (プライベート) ネットワークを有効にします。パブリック (プロバイ"
-"ダー) ネットワークとプライベート (セルフサービス) ネットワークを使用したい場"
-"合、オプション 2 を選択してください。"
-
 msgid "Optionally, configure the time zone:"
 msgstr "必要であれば、タイムゾーンを設定します。"
 
diff --git a/doc/networking-guide/source/locale/ja/LC_MESSAGES/networking-guide.po b/doc/networking-guide/source/locale/ja/LC_MESSAGES/networking-guide.po
index 3e696ffcca..11d3f4452d 100644
--- a/doc/networking-guide/source/locale/ja/LC_MESSAGES/networking-guide.po
+++ b/doc/networking-guide/source/locale/ja/LC_MESSAGES/networking-guide.po
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Networking Guide 0.9\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-01 02:55+0000\n"
+"POT-Creation-Date: 2016-02-08 14:51+0000\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -3624,12 +3624,6 @@ msgstr ""
 "応しましたが、その後のリリースで多くの新機能、機能向上、バグ修正が行われ、安"
 "定性が増して来ています。このページでは以下の内容を扱います。"
 
-msgid ""
-"OpenStack Networking integrates with various other OpenStack components:"
-msgstr ""
-"OpenStack Networking は、さまざまな他の OpenStack コンポーネントと統合されて"
-"います。"
-
 msgid ""
 "OpenStack Networking is entirely standalone and can be deployed to a "
 "dedicated host. If your deployment uses a controller host to run centralized "
diff --git a/doc/networking-guide/source/locale/networking-guide.pot b/doc/networking-guide/source/locale/networking-guide.pot
index a4448c0cd2..f7e525c95a 100644
--- a/doc/networking-guide/source/locale/networking-guide.pot
+++ b/doc/networking-guide/source/locale/networking-guide.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Networking Guide 0.9\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-01 06:37+0000\n"
+"POT-Creation-Date: 2016-02-09 06:08+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -3363,8 +3363,7 @@ msgid ""
 msgstr ""
 
 #: ../intro-networking.rst:24
-msgid ""
-"OpenStack Networking integrates with various other OpenStack components:"
+msgid "OpenStack Networking integrates with various OpenStack components:"
 msgstr ""
 
 #: ../intro-networking.rst:27
diff --git a/doc/user-guide-admin/source/locale/user-guide-admin.pot b/doc/user-guide-admin/source/locale/user-guide-admin.pot
index e08bb7c15e..1df19acef2 100644
--- a/doc/user-guide-admin/source/locale/user-guide-admin.pot
+++ b/doc/user-guide-admin/source/locale/user-guide-admin.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Admin User Guide 1.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-01 06:37+0000\n"
+"POT-Creation-Date: 2016-02-09 06:08+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1495,7 +1495,7 @@ msgstr ""
 
 # #-#-#-#-#  dashboard_admin_manage_roles.pot (Admin User Guide 1.0.0)  #-#-#-#-#
 # #-#-#-#-#  dashboard_manage_images.pot (Admin User Guide 1.0.0)  #-#-#-#-#
-#: ../dashboard_admin_manage_roles.rst:59 ../dashboard_manage_images.rst:116
+#: ../dashboard_admin_manage_roles.rst:59 ../dashboard_manage_images.rst:122
 msgid "You cannot undo this action."
 msgstr ""
 
@@ -2058,95 +2058,111 @@ msgid ""
 msgstr ""
 
 #: ../dashboard_manage_images.rst:59
-msgid ":guilabel:`Format`"
+msgid ":guilabel:`Kernel`"
 msgstr ""
 
 #: ../dashboard_manage_images.rst:59
+msgid "Select the kernel to boot an AMI-style image."
+msgstr ""
+
+#: ../dashboard_manage_images.rst:62
+msgid ":guilabel:`Ramdisk`"
+msgstr ""
+
+#: ../dashboard_manage_images.rst:62
+msgid "Select the ramdisk to boot an AMI-style image."
+msgstr ""
+
+#: ../dashboard_manage_images.rst:65
+msgid ":guilabel:`Format`"
+msgstr ""
+
+#: ../dashboard_manage_images.rst:65
 msgid "Select the image format."
 msgstr ""
 
-#: ../dashboard_manage_images.rst:61
+#: ../dashboard_manage_images.rst:67
 msgid ":guilabel:`Architecture`"
 msgstr ""
 
-#: ../dashboard_manage_images.rst:61
+#: ../dashboard_manage_images.rst:67
 msgid ""
 "Specify the architecture. For example, ``i386`` for a 32-bit architecture or "
 "``x86_64`` for a 64-bit architecture."
 msgstr ""
 
-#: ../dashboard_manage_images.rst:66
+#: ../dashboard_manage_images.rst:72
 msgid ":guilabel:`Minimum Disk (GB)`"
 msgstr ""
 
-#: ../dashboard_manage_images.rst:66 ../dashboard_manage_images.rst:68
+#: ../dashboard_manage_images.rst:72 ../dashboard_manage_images.rst:74
 msgid "Leave this field empty."
 msgstr ""
 
-#: ../dashboard_manage_images.rst:68
+#: ../dashboard_manage_images.rst:74
 msgid ":guilabel:`Minimum RAM (MB)`"
 msgstr ""
 
-#: ../dashboard_manage_images.rst:70
+#: ../dashboard_manage_images.rst:76
 msgid ":guilabel:`Copy Data`"
 msgstr ""
 
-#: ../dashboard_manage_images.rst:70
+#: ../dashboard_manage_images.rst:76
 msgid "Specify this option to copy image data to the Image service."
 msgstr ""
 
-#: ../dashboard_manage_images.rst:73
+#: ../dashboard_manage_images.rst:79
 msgid ":guilabel:`Public`"
 msgstr ""
 
-#: ../dashboard_manage_images.rst:73
+#: ../dashboard_manage_images.rst:79
 msgid "Select this option to make the image public to all users."
 msgstr ""
 
-#: ../dashboard_manage_images.rst:76
+#: ../dashboard_manage_images.rst:82
 msgid ":guilabel:`Protected`"
 msgstr ""
 
-#: ../dashboard_manage_images.rst:76
+#: ../dashboard_manage_images.rst:82
 msgid ""
 "Select this option to ensure that only users with permissions can delete it."
 msgstr ""
 
-#: ../dashboard_manage_images.rst:81
+#: ../dashboard_manage_images.rst:87
 msgid "Click :guilabel:`Create Image`."
 msgstr ""
 
-#: ../dashboard_manage_images.rst:83
+#: ../dashboard_manage_images.rst:89
 msgid ""
 "The image is queued to be uploaded. It might take several minutes before the "
 "status changes from ``Queued`` to ``Active``."
 msgstr ""
 
-#: ../dashboard_manage_images.rst:87
+#: ../dashboard_manage_images.rst:93
 msgid "Update images"
 msgstr ""
 
-#: ../dashboard_manage_images.rst:89 ../dashboard_manage_images.rst:106
+#: ../dashboard_manage_images.rst:95 ../dashboard_manage_images.rst:112
 msgid ""
 "Log in to the Dashboard. Choose the :guilabel:`admin` project from the drop-"
 "down list at the top of the page."
 msgstr ""
 
-#: ../dashboard_manage_images.rst:92
+#: ../dashboard_manage_images.rst:98
 msgid ""
 "On the :guilabel:`Admin` tab, open the :guilabel:`System` tab and click the :"
 "guilabel:`Images` category."
 msgstr ""
 
-#: ../dashboard_manage_images.rst:94
+#: ../dashboard_manage_images.rst:100
 msgid "Select the images that you want to edit. Click :guilabel:`Edit Image`."
 msgstr ""
 
-#: ../dashboard_manage_images.rst:95
+#: ../dashboard_manage_images.rst:101
 msgid "In the :guilabel:`Update Image` window, you can change the image name."
 msgstr ""
 
-#: ../dashboard_manage_images.rst:97
+#: ../dashboard_manage_images.rst:103
 msgid ""
 "Select the :guilabel:`Public` check box to make the image public. Clear this "
 "check box to make the image private. You cannot change the :guilabel:`Kernel "
@@ -2154,29 +2170,29 @@ msgid ""
 "image."
 msgstr ""
 
-#: ../dashboard_manage_images.rst:101
+#: ../dashboard_manage_images.rst:107
 msgid "Click :guilabel:`Update Image`."
 msgstr ""
 
-#: ../dashboard_manage_images.rst:104
+#: ../dashboard_manage_images.rst:110
 msgid "Delete images"
 msgstr ""
 
-#: ../dashboard_manage_images.rst:109
+#: ../dashboard_manage_images.rst:115
 msgid ""
 "On the :guilabel:`Admin tab`, open the :guilabel:`System` tab and click the :"
 "guilabel:`Images` category."
 msgstr ""
 
-#: ../dashboard_manage_images.rst:111
+#: ../dashboard_manage_images.rst:117
 msgid "Select the images that you want to delete."
 msgstr ""
 
-#: ../dashboard_manage_images.rst:112
+#: ../dashboard_manage_images.rst:118
 msgid "Click :guilabel:`Delete Images`."
 msgstr ""
 
-#: ../dashboard_manage_images.rst:113
+#: ../dashboard_manage_images.rst:119
 msgid ""
 "In the :guilabel:`Confirm Delete Images` window, click :guilabel:`Delete "
 "Images` to confirm the deletion."
diff --git a/doc/user-guide/source/locale/ja/LC_MESSAGES/user-guide.po b/doc/user-guide/source/locale/ja/LC_MESSAGES/user-guide.po
index 70c645be16..55303891b6 100644
--- a/doc/user-guide/source/locale/ja/LC_MESSAGES/user-guide.po
+++ b/doc/user-guide/source/locale/ja/LC_MESSAGES/user-guide.po
@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: End User Guide 1.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-01 02:55+0000\n"
+"POT-Creation-Date: 2016-02-08 14:51+0000\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -1061,24 +1061,6 @@ msgstr ""
 "イメージが正常にアップロードされた後、新しいイメージを使用してインスタンスを"
 "起動できます。"
 
-msgid ""
-"After the instance is successfully launched, connect to the instance using a "
-"remote console and follow the instructions to install the system as using "
-"ISO images on regular computers. When the installation is finished and "
-"system is rebooted, the instance asks you again to install the operating "
-"system, which means your instance is not usable. If you have problems with "
-"image creation, please check the `Virtual Machine Image Guide <http://docs."
-"openstack.org/image-guide/create_images_manually.html>`_ for reference."
-msgstr ""
-"インスタンスの正常起動後、リモートコンソールを使用してインスタンスに接続しま"
-"す。以下の説明に沿って、通常のコンピューターにおいて ISO イメージを使用するの"
-"と同じように、システムをインストールします。インストールが完了し、システムが"
-"再起動した後、インスタンスに再びオペレーティングシステムをインストールするか"
-"どうかを確認されます。これは、インスタンスが利用できないことを意味します。イ"
-"メージの作成に問題があれば、リファレンスとして `Virtual Machine Image Guide "
-"<http://docs.openstack.org/image-guide/create-images-manually.html>`_ を参照"
-"してください。"
-
 msgid ""
 "After the server is built, if you change the server name in the API or "
 "change the host name directly, the names are not updated in the dashboard."
diff --git a/doc/user-guide/source/locale/user-guide.pot b/doc/user-guide/source/locale/user-guide.pot
index ab9ee0921d..049fca4c00 100644
--- a/doc/user-guide/source/locale/user-guide.pot
+++ b/doc/user-guide/source/locale/user-guide.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: End User Guide 1.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-01 06:37+0000\n"
+"POT-Creation-Date: 2016-02-09 06:08+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -2826,55 +2826,55 @@ msgid ""
 "system is rebooted, the instance asks you again to install the operating "
 "system, which means your instance is not usable. If you have problems with "
 "image creation, please check the `Virtual Machine Image Guide <http://docs."
-"openstack.org/image-guide/create_images_manually.html>`_ for reference."
+"openstack.org/image-guide/create-images-manually.html>`_ for reference."
 msgstr ""
 
-#: ../cli_nova_launch_instance_using_ISO_image.rst:77
+#: ../cli_nova_launch_instance_using_ISO_image.rst:78
 msgid "Make the instances booted from ISO image functional"
 msgstr ""
 
-#: ../cli_nova_launch_instance_using_ISO_image.rst:79
+#: ../cli_nova_launch_instance_using_ISO_image.rst:80
 msgid ""
 "Now complete the following steps to make your instances created using ISO "
 "image actually functional."
 msgstr ""
 
-#: ../cli_nova_launch_instance_using_ISO_image.rst:82
+#: ../cli_nova_launch_instance_using_ISO_image.rst:83
 msgid "Delete the instance using the following command."
 msgstr ""
 
-#: ../cli_nova_launch_instance_using_ISO_image.rst:88
+#: ../cli_nova_launch_instance_using_ISO_image.rst:89
 msgid ""
 "After you delete the instance, the system you have just installed using your "
 "ISO image remains, because the parameter ``shutdown=preserve`` was set, so "
 "run the following command."
 msgstr ""
 
-#: ../cli_nova_launch_instance_using_ISO_image.rst:101
+#: ../cli_nova_launch_instance_using_ISO_image.rst:102
 msgid ""
 "You get a list with all the volumes in your system. In this list, you can "
 "find the volume that is attached to your ISO created instance, with the "
 "false bootable property."
 msgstr ""
 
-#: ../cli_nova_launch_instance_using_ISO_image.rst:105
+#: ../cli_nova_launch_instance_using_ISO_image.rst:106
 msgid "Upload the volume to glance."
 msgstr ""
 
-#: ../cli_nova_launch_instance_using_ISO_image.rst:117
+#: ../cli_nova_launch_instance_using_ISO_image.rst:118
 msgid ""
 "The ``VOLUME_UUID`` is the uuid of the volume that is attached to your ISO "
 "created instance, and the ``IMAGE_NAME`` is the name that you give to your "
 "new image."
 msgstr ""
 
-#: ../cli_nova_launch_instance_using_ISO_image.rst:121
+#: ../cli_nova_launch_instance_using_ISO_image.rst:122
 msgid ""
 "After the image is successfully uploaded, you can use the new image to boot "
 "instances."
 msgstr ""
 
-#: ../cli_nova_launch_instance_using_ISO_image.rst:124
+#: ../cli_nova_launch_instance_using_ISO_image.rst:125
 msgid ""
 "The instances launched using this image contain the system that you have "
 "just installed using the ISO image."
@@ -4691,32 +4691,32 @@ msgid ""
 "previous step:"
 msgstr ""
 
-#: ../cli_use_snapshots_to_migrate_instances.rst:104
+#: ../cli_use_snapshots_to_migrate_instances.rst:103
 msgid ""
 "The :command:`glance image-download` command requires the image ID and "
 "cannot use the image name. Check there is sufficient space on the "
 "destination file system for the image file."
 msgstr ""
 
-#: ../cli_use_snapshots_to_migrate_instances.rst:109
+#: ../cli_use_snapshots_to_migrate_instances.rst:108
 msgid ""
 "Make the image available to the new environment, either through HTTP or "
 "direct upload to a machine (``scp``)."
 msgstr ""
 
-#: ../cli_use_snapshots_to_migrate_instances.rst:115
+#: ../cli_use_snapshots_to_migrate_instances.rst:114
 msgid "Import the snapshot to the new environment"
 msgstr ""
 
-#: ../cli_use_snapshots_to_migrate_instances.rst:117
+#: ../cli_use_snapshots_to_migrate_instances.rst:116
 msgid "In the new project or cloud environment, import the snapshot:"
 msgstr ""
 
-#: ../cli_use_snapshots_to_migrate_instances.rst:126
+#: ../cli_use_snapshots_to_migrate_instances.rst:125
 msgid "Boot a new instance from the snapshot"
 msgstr ""
 
-#: ../cli_use_snapshots_to_migrate_instances.rst:128
+#: ../cli_use_snapshots_to_migrate_instances.rst:127
 msgid ""
 "In the new project or cloud environment, use the snapshot to create the new "
 "instance:"