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 6e2ac03b32..1bae8f758b 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: 2015-12-22 06:41+0000\n"
+"POT-Creation-Date: 2015-12-24 06:12+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"
@@ -1588,36 +1588,36 @@ msgstr ""
 msgid "First, get a list of the services:"
 msgstr ""
 
-#: ../blockstorage_get_capabilities.rst:44
+#: ../blockstorage_get_capabilities.rst:45
 msgid ""
 "With one of the listed hosts, pass that to ``get-capabilities``, then the "
 "administrator can obtain volume stats and also back end ``capabilities`` as "
 "listed below."
 msgstr ""
 
-#: ../blockstorage_get_capabilities.rst:78
+#: ../blockstorage_get_capabilities.rst:80
 msgid "Usage of REST API"
 msgstr ""
 
-#: ../blockstorage_get_capabilities.rst:80
+#: ../blockstorage_get_capabilities.rst:82
 msgid ""
 "New endpoint to ``get capabilities`` list for specific storage back end is "
 "also available. For more details, refer to the Block Storage API reference."
 msgstr ""
 
-#: ../blockstorage_get_capabilities.rst:83
+#: ../blockstorage_get_capabilities.rst:85
 msgid "API request:"
 msgstr ""
 
-#: ../blockstorage_get_capabilities.rst:89
+#: ../blockstorage_get_capabilities.rst:91
 msgid "Example of return value:"
 msgstr ""
 
-#: ../blockstorage_get_capabilities.rst:150
+#: ../blockstorage_get_capabilities.rst:152
 msgid "Usage of volume type access extension"
 msgstr ""
 
-#: ../blockstorage_get_capabilities.rst:151
+#: ../blockstorage_get_capabilities.rst:153
 msgid ""
 "Some volume types should be restricted only. For example, test volume types "
 "where you are testing a new technology or ultra high performance volumes "
@@ -1631,33 +1631,33 @@ msgid ""
 "without projects are only visible by users with the admin role/context."
 msgstr ""
 
-#: ../blockstorage_get_capabilities.rst:163
+#: ../blockstorage_get_capabilities.rst:165
 msgid "Create a public volume type by setting ``is_public`` field to ``True``:"
 msgstr ""
 
-#: ../blockstorage_get_capabilities.rst:174
+#: ../blockstorage_get_capabilities.rst:177
 msgid ""
 "Create a private volume type by setting ``is_public`` field to ``False``:"
 msgstr ""
 
-#: ../blockstorage_get_capabilities.rst:185
+#: ../blockstorage_get_capabilities.rst:189
 msgid "Get a list of the volume types:"
 msgstr ""
 
-#: ../blockstorage_get_capabilities.rst:198
+#: ../blockstorage_get_capabilities.rst:203
 msgid "Get a list of the projects:"
 msgstr ""
 
-#: ../blockstorage_get_capabilities.rst:213
+#: ../blockstorage_get_capabilities.rst:219
 msgid ""
 "Add volume type access for the given demo project, using its project-id:"
 msgstr ""
 
-#: ../blockstorage_get_capabilities.rst:219
+#: ../blockstorage_get_capabilities.rst:225
 msgid "List the access information about the given volume type:"
 msgstr ""
 
-#: ../blockstorage_get_capabilities.rst:230
+#: ../blockstorage_get_capabilities.rst:237
 msgid "Remove volume type access for the given project:"
 msgstr ""
 
@@ -3070,41 +3070,41 @@ msgstr ""
 msgid "First, list the available back-ends:"
 msgstr ""
 
-#: ../blockstorage_volume_migration.rst:60
+#: ../blockstorage_volume_migration.rst:58
 msgid "Only Block Storage V2 API supports :command:`get-pools`."
 msgstr ""
 
-#: ../blockstorage_volume_migration.rst:62
+#: ../blockstorage_volume_migration.rst:60
 msgid "You can also get available back-ends like following:"
 msgstr ""
 
-#: ../blockstorage_volume_migration.rst:70
+#: ../blockstorage_volume_migration.rst:68
 msgid ""
 "But it needs to add pool name in the end. For example, "
 "``server1@lvmstorage-1#zone1``."
 msgstr ""
 
-#: ../blockstorage_volume_migration.rst:73
+#: ../blockstorage_volume_migration.rst:71
 msgid ""
 "Next, as the admin user, you can see the current status of the volume "
 "(replace the example ID with your own):"
 msgstr ""
 
-#: ../blockstorage_volume_migration.rst:104
+#: ../blockstorage_volume_migration.rst:100
 msgid "Note these attributes:"
 msgstr ""
 
-#: ../blockstorage_volume_migration.rst:106
+#: ../blockstorage_volume_migration.rst:102
 msgid "``os-vol-host-attr:host`` - the volume's current back-end."
 msgstr ""
 
-#: ../blockstorage_volume_migration.rst:107
+#: ../blockstorage_volume_migration.rst:103
 msgid ""
 "``os-vol-mig-status-attr:migstat`` - the status of this volume's migration "
 "(None means that a migration is not currently in progress)."
 msgstr ""
 
-#: ../blockstorage_volume_migration.rst:109
+#: ../blockstorage_volume_migration.rst:105
 msgid ""
 "``os-vol-mig-status-attr:name_id`` - the volume ID that this volume's name "
 "on the back-end is based on. Before a volume is ever migrated, its name on "
@@ -3117,33 +3117,33 @@ msgid ""
 "original ID. This is exposed by the ``name_id`` attribute."
 msgstr ""
 
-#: ../blockstorage_volume_migration.rst:122
+#: ../blockstorage_volume_migration.rst:118
 msgid ""
 "If you plan to decommission a block storage node, you must stop the "
 "``cinder`` volume service on the node after performing the migration."
 msgstr ""
 
-#: ../blockstorage_volume_migration.rst:125
+#: ../blockstorage_volume_migration.rst:121
 msgid ""
 "On nodes that run CentOS, Fedora, openSUSE, Red Hat Enterprise Linux, or "
 "SUSE Linux Enterprise, run:"
 msgstr ""
 
-#: ../blockstorage_volume_migration.rst:133
+#: ../blockstorage_volume_migration.rst:129
 msgid "On nodes that run Ubuntu or Debian, run:"
 msgstr ""
 
-#: ../blockstorage_volume_migration.rst:140
+#: ../blockstorage_volume_migration.rst:136
 msgid ""
 "Stopping the cinder volume service will prevent volumes from being allocated "
 "to the node."
 msgstr ""
 
-#: ../blockstorage_volume_migration.rst:143
+#: ../blockstorage_volume_migration.rst:139
 msgid "Migrate this volume to the second LVM back-end:"
 msgstr ""
 
-#: ../blockstorage_volume_migration.rst:150
+#: ../blockstorage_volume_migration.rst:146
 msgid ""
 "You can use the :command:`cinder show` command to see the status of the "
 "migration. While migrating, the ``migstat`` attribute shows states such as "
@@ -3152,7 +3152,7 @@ msgid ""
 "the output looks like:"
 msgstr ""
 
-#: ../blockstorage_volume_migration.rst:180
+#: ../blockstorage_volume_migration.rst:176
 msgid ""
 "Note that ``migstat`` is None, host is the new host, and ``name_id`` holds "
 "the ID of the volume created by the migration. If you look at the second LVM "
@@ -3160,7 +3160,7 @@ msgid ""
 "d5217d851862``."
 msgstr ""
 
-#: ../blockstorage_volume_migration.rst:187
+#: ../blockstorage_volume_migration.rst:183
 msgid ""
 "The migration is not visible to non-admin users (for example, through the "
 "volume ``status``). However, some operations are not allowed while a "
@@ -3169,7 +3169,7 @@ msgid ""
 "returned."
 msgstr ""
 
-#: ../blockstorage_volume_migration.rst:195
+#: ../blockstorage_volume_migration.rst:191
 msgid "Migrating volumes that have snapshots are currently not allowed."
 msgstr ""
 
@@ -3902,7 +3902,7 @@ msgstr ""
 #: ../networking_introduction.rst:129 ../networking_multi-dhcp-agents.rst:40
 #: ../objectstorage-troubleshoot.rst:62
 #: ../shared_file_systems_crud_share.rst:43
-#: ../shared_file_systems_crud_share.rst:384 ../telemetry-measurements.rst:31
+#: ../shared_file_systems_crud_share.rst:393 ../telemetry-measurements.rst:31
 msgid "Description"
 msgstr ""
 
@@ -4995,7 +4995,7 @@ msgstr ""
 # #-#-#-#-#  ts-eql-volume-size.pot (Cloud Administrator Guide 0.9)  #-#-#-#-#
 #: ../compute-live-migration-usage.rst:36
 #: ../compute-live-migration-usage.rst:109
-#: ../shared_file_systems_crud_share.rst:384 ../ts-eql-volume-size.rst:109
+#: ../shared_file_systems_crud_share.rst:393 ../ts-eql-volume-size.rst:109
 msgid "Status"
 msgstr ""
 
@@ -5072,7 +5072,7 @@ msgstr ""
 # #-#-#-#-#  database.pot (Cloud Administrator Guide 0.9)  #-#-#-#-#
 # #-#-#-#-#  telemetry-data-collection.pot (Cloud Administrator Guide 0.9)  #-#-#-#-#
 #: ../compute-live-migration-usage.rst:71 ../database.rst:109
-#: ../telemetry-data-collection.rst:711
+#: ../telemetry-data-collection.rst:712
 msgid "name"
 msgstr ""
 
@@ -9657,7 +9657,7 @@ msgstr ""
 
 # #-#-#-#-#  database.pot (Cloud Administrator Guide 0.9)  #-#-#-#-#
 # #-#-#-#-#  telemetry-data-collection.pot (Cloud Administrator Guide 0.9)  #-#-#-#-#
-#: ../database.rst:5 ../telemetry-data-collection.rst:1098
+#: ../database.rst:5 ../telemetry-data-collection.rst:1099
 msgid "Database"
 msgstr ""
 
@@ -14000,8 +14000,8 @@ msgstr ""
 # #-#-#-#-#  networking_adv-features.pot (Cloud Administrator Guide 0.9)  #-#-#-#-#
 # #-#-#-#-#  telemetry-data-collection.pot (Cloud Administrator Guide 0.9)  #-#-#-#-#
 #: ../networking_adv-features.rst:713 ../networking_adv-features.rst:718
-#: ../networking_adv-features.rst:723 ../telemetry-data-collection.rst:1100
-#: ../telemetry-data-collection.rst:1104
+#: ../networking_adv-features.rst:723 ../telemetry-data-collection.rst:1101
+#: ../telemetry-data-collection.rst:1105
 msgid "Yes"
 msgstr ""
 
@@ -14044,8 +14044,8 @@ msgstr ""
 
 # #-#-#-#-#  networking_adv-features.pot (Cloud Administrator Guide 0.9)  #-#-#-#-#
 # #-#-#-#-#  telemetry-data-collection.pot (Cloud Administrator Guide 0.9)  #-#-#-#-#
-#: ../networking_adv-features.rst:728 ../telemetry-data-collection.rst:1108
-#: ../telemetry-data-collection.rst:1112
+#: ../networking_adv-features.rst:728 ../telemetry-data-collection.rst:1109
+#: ../telemetry-data-collection.rst:1113
 msgid "No"
 msgstr ""
 
@@ -16268,21 +16268,21 @@ msgstr ""
 msgid "To experiment, you need VMs and a neutron network:"
 msgstr ""
 
-#: ../networking_multi-dhcp-agents.rst:176
+#: ../networking_multi-dhcp-agents.rst:177
 msgid "**Manage agents in neutron deployment**"
 msgstr ""
 
-#: ../networking_multi-dhcp-agents.rst:178
+#: ../networking_multi-dhcp-agents.rst:179
 msgid ""
 "Every agent that supports these extensions will register itself with the "
 "neutron server when it starts up."
 msgstr ""
 
-#: ../networking_multi-dhcp-agents.rst:181
+#: ../networking_multi-dhcp-agents.rst:182
 msgid "List all agents:"
 msgstr ""
 
-#: ../networking_multi-dhcp-agents.rst:196
+#: ../networking_multi-dhcp-agents.rst:197
 msgid ""
 "The output shows information for four agents. The ``alive`` field shows "
 "``:-)`` if the agent reported its state within the period defined by the "
@@ -16290,11 +16290,11 @@ msgid ""
 "``alive`` is ``xxx``."
 msgstr ""
 
-#: ../networking_multi-dhcp-agents.rst:201
+#: ../networking_multi-dhcp-agents.rst:202
 msgid "List the DHCP agents that host a specified network:"
 msgstr ""
 
-#: ../networking_multi-dhcp-agents.rst:203
+#: ../networking_multi-dhcp-agents.rst:204
 msgid ""
 "In some deployments, one DHCP agent is not enough to hold all network data. "
 "In addition, you must have a backup for it even when the deployment is "
@@ -16302,27 +16302,27 @@ msgid ""
 "DHCP agent can host more than one network."
 msgstr ""
 
-#: ../networking_multi-dhcp-agents.rst:208
+#: ../networking_multi-dhcp-agents.rst:209
 msgid "List DHCP agents that host a specified network:"
 msgstr ""
 
-#: ../networking_multi-dhcp-agents.rst:220
+#: ../networking_multi-dhcp-agents.rst:221
 msgid "List the networks hosted by a given DHCP agent:"
 msgstr ""
 
-#: ../networking_multi-dhcp-agents.rst:222
+#: ../networking_multi-dhcp-agents.rst:223
 msgid "This command is to show which networks a given dhcp agent is managing."
 msgstr ""
 
-#: ../networking_multi-dhcp-agents.rst:236
+#: ../networking_multi-dhcp-agents.rst:237
 msgid "Show agent details."
 msgstr ""
 
-#: ../networking_multi-dhcp-agents.rst:238
+#: ../networking_multi-dhcp-agents.rst:239
 msgid "The :command:`agent-show` command shows details for a specified agent:"
 msgstr ""
 
-#: ../networking_multi-dhcp-agents.rst:268
+#: ../networking_multi-dhcp-agents.rst:269
 msgid ""
 "In this output, ``heartbeat_timestamp`` is the time on the neutron server. "
 "You do not need to synchronize all agents to this time for this extension to "
@@ -16331,34 +16331,34 @@ msgid ""
 "one subnet, and three ports."
 msgstr ""
 
-#: ../networking_multi-dhcp-agents.rst:274
+#: ../networking_multi-dhcp-agents.rst:275
 msgid ""
 "Different types of agents show different details. The following output shows "
 "information for a Linux bridge agent:"
 msgstr ""
 
-#: ../networking_multi-dhcp-agents.rst:302
+#: ../networking_multi-dhcp-agents.rst:303
 msgid ""
 "The output shows ``bridge-mapping`` and the number of virtual network "
 "devices on this L2 agent."
 msgstr ""
 
-#: ../networking_multi-dhcp-agents.rst:305
+#: ../networking_multi-dhcp-agents.rst:306
 msgid "**Manage assignment of networks to DHCP agent**"
 msgstr ""
 
-#: ../networking_multi-dhcp-agents.rst:307
+#: ../networking_multi-dhcp-agents.rst:308
 msgid ""
 "Now that you have run the :command:`net-list-on-dhcp-agent` and :command:"
 "`dhcp-agent-list-hosting-net` commands, you can add a network to a DHCP "
 "agent and remove one from it."
 msgstr ""
 
-#: ../networking_multi-dhcp-agents.rst:311
+#: ../networking_multi-dhcp-agents.rst:312
 msgid "Default scheduling."
 msgstr ""
 
-#: ../networking_multi-dhcp-agents.rst:313
+#: ../networking_multi-dhcp-agents.rst:314
 msgid ""
 "When you create a network with one port, you can schedule it to an active "
 "DHCP agent. If many active DHCP agents are running, select one randomly. You "
@@ -16366,7 +16366,7 @@ msgid ""
 "schedule later on."
 msgstr ""
 
-#: ../networking_multi-dhcp-agents.rst:331
+#: ../networking_multi-dhcp-agents.rst:332
 msgid ""
 "It is allocated to DHCP agent on HostA. If you want to validate the behavior "
 "through the :command:`dnsmasq` command, you must create a subnet for the "
@@ -16374,89 +16374,89 @@ msgid ""
 "DHCP."
 msgstr ""
 
-#: ../networking_multi-dhcp-agents.rst:336
+#: ../networking_multi-dhcp-agents.rst:337
 msgid "Assign a network to a given DHCP agent."
 msgstr ""
 
-#: ../networking_multi-dhcp-agents.rst:338
+#: ../networking_multi-dhcp-agents.rst:339
 msgid "To add another DHCP agent to host the network, run this command:"
 msgstr ""
 
-#: ../networking_multi-dhcp-agents.rst:355
+#: ../networking_multi-dhcp-agents.rst:356
 msgid "Remove a network from a specified DHCP agent."
 msgstr ""
 
-#: ../networking_multi-dhcp-agents.rst:357
+#: ../networking_multi-dhcp-agents.rst:358
 msgid ""
 "This command is the sibling command for the previous one. Remove ``net2`` "
 "from the DHCP agent for HostA:"
 msgstr ""
 
-#: ../networking_multi-dhcp-agents.rst:373
+#: ../networking_multi-dhcp-agents.rst:374
 msgid ""
 "You can see that only the DHCP agent for HostB is hosting the ``net2`` "
 "network."
 msgstr ""
 
-#: ../networking_multi-dhcp-agents.rst:376
+#: ../networking_multi-dhcp-agents.rst:377
 msgid "**HA of DHCP agents**"
 msgstr ""
 
-#: ../networking_multi-dhcp-agents.rst:378
+#: ../networking_multi-dhcp-agents.rst:379
 msgid ""
 "Boot a VM on net2. Let both DHCP agents host ``net2``. Fail the agents in "
 "turn to see if the VM can still get the desired IP."
 msgstr ""
 
-#: ../networking_multi-dhcp-agents.rst:381
+#: ../networking_multi-dhcp-agents.rst:382
 msgid "Boot a VM on net2:"
 msgstr ""
 
-#: ../networking_multi-dhcp-agents.rst:416
+#: ../networking_multi-dhcp-agents.rst:417
 msgid "Make sure both DHCP agents hosting ``net2``:"
 msgstr ""
 
-#: ../networking_multi-dhcp-agents.rst:418
+#: ../networking_multi-dhcp-agents.rst:419
 msgid "Use the previous commands to assign the network to agents."
 msgstr ""
 
-#: ../networking_multi-dhcp-agents.rst:431
+#: ../networking_multi-dhcp-agents.rst:432
 msgid "**Test the HA**"
 msgstr ""
 
-#: ../networking_multi-dhcp-agents.rst:433
+#: ../networking_multi-dhcp-agents.rst:434
 msgid ""
 "Log in to the ``myserver4`` VM, and run ``udhcpc``, ``dhclient`` or other "
 "DHCP client."
 msgstr ""
 
-#: ../networking_multi-dhcp-agents.rst:436
+#: ../networking_multi-dhcp-agents.rst:437
 msgid ""
 "Stop the DHCP agent on HostA. Besides stopping the ``neutron-dhcp-agent`` "
 "binary, you must stop the ``dnsmasq`` processes."
 msgstr ""
 
-#: ../networking_multi-dhcp-agents.rst:439
+#: ../networking_multi-dhcp-agents.rst:440
 msgid "Run a DHCP client in VM to see if it can get the wanted IP."
 msgstr ""
 
-#: ../networking_multi-dhcp-agents.rst:441
+#: ../networking_multi-dhcp-agents.rst:442
 msgid "Stop the DHCP agent on HostB too."
 msgstr ""
 
-#: ../networking_multi-dhcp-agents.rst:443
+#: ../networking_multi-dhcp-agents.rst:444
 msgid "Run ``udhcpc`` in the VM; it cannot get the wanted IP."
 msgstr ""
 
-#: ../networking_multi-dhcp-agents.rst:445
+#: ../networking_multi-dhcp-agents.rst:446
 msgid "Start DHCP agent on HostB. The VM gets the wanted IP again."
 msgstr ""
 
-#: ../networking_multi-dhcp-agents.rst:447
+#: ../networking_multi-dhcp-agents.rst:448
 msgid "**Disable and remove an agent**"
 msgstr ""
 
-#: ../networking_multi-dhcp-agents.rst:449
+#: ../networking_multi-dhcp-agents.rst:450
 msgid ""
 "An administrator might want to disable an agent if a system hardware or "
 "software upgrade is planned. Some agents that support scheduling also "
@@ -16466,11 +16466,11 @@ msgid ""
 "the resources on the agent before you delete the agent."
 msgstr ""
 
-#: ../networking_multi-dhcp-agents.rst:456
+#: ../networking_multi-dhcp-agents.rst:457
 msgid "To run the following commands, you must stop the DHCP agent on HostA."
 msgstr ""
 
-#: ../networking_multi-dhcp-agents.rst:487
+#: ../networking_multi-dhcp-agents.rst:488
 msgid ""
 "After deletion, if you restart the DHCP agent, it appears on the agent list "
 "again."
@@ -19279,32 +19279,32 @@ msgid ""
 "specifying two comma-separated share types:"
 msgstr ""
 
-#: ../shared_file_systems_cgroups.rst:65
+#: ../shared_file_systems_cgroups.rst:66
 msgid "Check that consistency group is in available status:"
 msgstr ""
 
-#: ../shared_file_systems_cgroups.rst:87
+#: ../shared_file_systems_cgroups.rst:89
 msgid ""
 "To add a share to the consistency group you need to create a share with a :"
 "option:`--consistency-group` option where you specify the ID of the "
 "consistency group in ``available`` status:"
 msgstr ""
 
-#: ../shared_file_systems_cgroups.rst:122
+#: ../shared_file_systems_cgroups.rst:125
 msgid ""
 "Admin can rename the consistency group or change its description using :"
 "command:`manila cg-update` command, or delete it by :command:`manila cg-"
 "delete` command."
 msgstr ""
 
-#: ../shared_file_systems_cgroups.rst:126
+#: ../shared_file_systems_cgroups.rst:129
 msgid ""
 "As an administrator, you can also reset the state of a consistency group and "
 "force-delete a specified consistency group in any state. Use the ``policy."
 "json`` file to grant permissions for these actions to other roles."
 msgstr ""
 
-#: ../shared_file_systems_cgroups.rst:130
+#: ../shared_file_systems_cgroups.rst:133
 msgid ""
 "Use :command:`manila cg-reset-state [--state <state>] <consistency_group>` "
 "to update the state of a consistency group explicitly. A valid value of a "
@@ -19312,30 +19312,30 @@ msgid ""
 "``error_deleting``. If no state is provided, available will be used."
 msgstr ""
 
-#: ../shared_file_systems_cgroups.rst:139
+#: ../shared_file_systems_cgroups.rst:142
 msgid ""
 "Use :command:`manila cg-delete <consistency_group> "
 "[<consistency_group> ...]` to soft-delete one or more consistency group."
 msgstr ""
 
-#: ../shared_file_systems_cgroups.rst:144
+#: ../shared_file_systems_cgroups.rst:147
 msgid ""
 "The consistency group can be deleted only if it has no dependent :ref:"
 "`shared_file_systems_cgsnapshots`."
 msgstr ""
 
-#: ../shared_file_systems_cgroups.rst:151
+#: ../shared_file_systems_cgroups.rst:154
 msgid ""
 "Use :command:`manila cg-delete --force <consistency_group> "
 "[<consistency_group> ...]` to force-delete a specified consistency group in "
 "any state."
 msgstr ""
 
-#: ../shared_file_systems_cgroups.rst:162
+#: ../shared_file_systems_cgroups.rst:165
 msgid "Consistency group snapshots"
 msgstr ""
 
-#: ../shared_file_systems_cgroups.rst:164
+#: ../shared_file_systems_cgroups.rst:167
 msgid ""
 "You can create snapshots of consistency groups. To create a snapshot, you "
 "specify the ID or name of the consistency group that you want to snapshot. "
@@ -19343,22 +19343,22 @@ msgid ""
 "group from it."
 msgstr ""
 
-#: ../shared_file_systems_cgroups.rst:169
+#: ../shared_file_systems_cgroups.rst:172
 msgid "Create a snapshot of consistency group ``cgroup1``:"
 msgstr ""
 
-#: ../shared_file_systems_cgroups.rst:186
+#: ../shared_file_systems_cgroups.rst:190
 msgid "Check the status of created consistency group snapshot:"
 msgstr ""
 
-#: ../shared_file_systems_cgroups.rst:203
+#: ../shared_file_systems_cgroups.rst:208
 msgid ""
 "Admin can rename the consistency group snapshot or change its description "
 "using :command:`cg-snapshot-update` command, or delete it by :command:`cg-"
 "snapshot-delete`."
 msgstr ""
 
-#: ../shared_file_systems_cgroups.rst:207
+#: ../shared_file_systems_cgroups.rst:212
 msgid ""
 "A consistency group snapshot can have ``members``. The consistency group "
 "snapshot members are the shares that belong to some consistency group. To "
@@ -19369,35 +19369,35 @@ msgid ""
 "you can quickly find which shares belong to a specified consistency group."
 msgstr ""
 
-#: ../shared_file_systems_cgroups.rst:215
+#: ../shared_file_systems_cgroups.rst:220
 msgid ""
 "You created the share ``Share2`` in ``cgroup1`` consistency group. Since you "
 "made a snapshot of it, you can see that the only member of the consistency "
 "group snapshot is ``Share2`` share:"
 msgstr ""
 
-#: ../shared_file_systems_cgroups.rst:228
+#: ../shared_file_systems_cgroups.rst:234
 msgid ""
 "After you create a consistency group snapshot, you can create a consistency "
 "group from it:"
 msgstr ""
 
-#: ../shared_file_systems_cgroups.rst:251
+#: ../shared_file_systems_cgroups.rst:258
 msgid "Check the list of consistency group. There are two groups now:"
 msgstr ""
 
-#: ../shared_file_systems_cgroups.rst:263
+#: ../shared_file_systems_cgroups.rst:271
 msgid ""
 "Check a list of the shares. New share with ``ba52454e-2ea3-47fa-"
 "a683-3176a01295e6`` ID was created when you created a consistency group "
 "``cgroup2`` from a snapshot with a member."
 msgstr ""
 
-#: ../shared_file_systems_cgroups.rst:277
+#: ../shared_file_systems_cgroups.rst:286
 msgid "Print detailed information about new share:"
 msgstr ""
 
-#: ../shared_file_systems_cgroups.rst:281
+#: ../shared_file_systems_cgroups.rst:290
 msgid ""
 "Pay attention on the ``source_cgsnapshot_member_id`` and "
 "``consistency_group_id`` fields in a new share. It has "
@@ -19406,7 +19406,7 @@ msgid ""
 "``cgroup2`` that was created from a snapshot."
 msgstr ""
 
-#: ../shared_file_systems_cgroups.rst:317
+#: ../shared_file_systems_cgroups.rst:327
 msgid ""
 "As an administrator, you can also reset the state of a consistency group "
 "snapshot with :command:`cg-snapshot-reset-state` and force-delete a "
@@ -19429,7 +19429,7 @@ msgstr ""
 
 #: ../shared_file_systems_crud_share.rst:12
 #: ../shared_file_systems_crud_share.rst:88
-#: ../shared_file_systems_crud_share.rst:201
+#: ../shared_file_systems_crud_share.rst:204
 msgid ""
 "To create a share, use :command:`manila create` command and specify the "
 "required arguments: the size of the share and the shared file system "
@@ -19443,7 +19443,7 @@ msgstr ""
 
 #: ../shared_file_systems_crud_share.rst:19
 #: ../shared_file_systems_crud_share.rst:110
-#: ../shared_file_systems_crud_share.rst:224
+#: ../shared_file_systems_crud_share.rst:227
 msgid ""
 "After the share becomes available, use the :command:`manila show` command to "
 "get the share export location."
@@ -19574,7 +19574,7 @@ msgid ""
 msgstr ""
 
 #: ../shared_file_systems_crud_share.rst:100
-#: ../shared_file_systems_crud_share.rst:212
+#: ../shared_file_systems_crud_share.rst:215
 msgid ""
 "The :command:`manila create` command creates a share. This command does the "
 "following things:"
@@ -19601,48 +19601,48 @@ msgid ""
 msgstr ""
 
 #: ../shared_file_systems_crud_share.rst:117
-#: ../shared_file_systems_crud_share.rst:237
+#: ../shared_file_systems_crud_share.rst:240
 msgid "Check share types that exist, run:"
 msgstr ""
 
-#: ../shared_file_systems_crud_share.rst:128
+#: ../shared_file_systems_crud_share.rst:129
 msgid ""
 "Create a private share with ``my_type`` share type, NFS shared file system "
 "protocol, and size 1 GB:"
 msgstr ""
 
-#: ../shared_file_systems_crud_share.rst:162
+#: ../shared_file_systems_crud_share.rst:164
 msgid "New share ``Share2`` should have a status ``available``:"
 msgstr ""
 
-#: ../shared_file_systems_crud_share.rst:197
+#: ../shared_file_systems_crud_share.rst:200
 msgid "Create a share in share servers mode"
 msgstr ""
 
-#: ../shared_file_systems_crud_share.rst:199
+#: ../shared_file_systems_crud_share.rst:202
 msgid "To create a file share in share servers mode, you need to:"
 msgstr ""
 
-#: ../shared_file_systems_crud_share.rst:206
+#: ../shared_file_systems_crud_share.rst:209
 msgid ""
 "You should specify the :ref:`share type <shared_file_systems_share_types>` "
 "with ``driver_handles_share_servers = True`` extra specification."
 msgstr ""
 
-#: ../shared_file_systems_crud_share.rst:209
+#: ../shared_file_systems_crud_share.rst:212
 msgid ""
 "You should specify the :ref:`share network "
 "<shared_file_systems_share_networks>`."
 msgstr ""
 
-#: ../shared_file_systems_crud_share.rst:215
+#: ../shared_file_systems_crud_share.rst:218
 msgid ""
 "The :ref:`manila-scheduler <shared_file_systems_scheduling>` service will "
 "find the back end with ``driver_handles_share_servers = True`` mode due to "
 "filtering the extra specifications of the share type."
 msgstr ""
 
-#: ../shared_file_systems_crud_share.rst:219
+#: ../shared_file_systems_crud_share.rst:222
 msgid ""
 "The share driver will create a share server with the share network. For "
 "details of creating the resources, see the `documentation <http://docs. "
@@ -19650,13 +19650,13 @@ msgid ""
 "specific share driver."
 msgstr ""
 
-#: ../shared_file_systems_crud_share.rst:227
+#: ../shared_file_systems_crud_share.rst:230
 msgid ""
 "In the example to create a share, the default share type and the already "
 "existing share network are used."
 msgstr ""
 
-#: ../shared_file_systems_crud_share.rst:232
+#: ../shared_file_systems_crud_share.rst:235
 msgid ""
 "There is no default share type just after you started manila as the "
 "administrator. See :ref:`shared_file_systems_share_types` to create the "
@@ -19664,203 +19664,203 @@ msgid ""
 "`shared_file_systems_share_networks`."
 msgstr ""
 
-#: ../shared_file_systems_crud_share.rst:248
+#: ../shared_file_systems_crud_share.rst:252
 msgid "Check share networks that exist, run:"
 msgstr ""
 
-#: ../shared_file_systems_crud_share.rst:259
+#: ../shared_file_systems_crud_share.rst:264
 msgid ""
 "Create a public share with ``my_share_net`` network, ``default`` share type, "
 "NFS shared file system protocol, and size 1 GB:"
 msgstr ""
 
-#: ../shared_file_systems_crud_share.rst:293
+#: ../shared_file_systems_crud_share.rst:299
 msgid ""
 "The share also can be created from a share snapshot. For details, see :ref:"
 "`shared_file_systems_snapshots`."
 msgstr ""
 
-#: ../shared_file_systems_crud_share.rst:296
+#: ../shared_file_systems_crud_share.rst:302
 msgid "See the share in a share list:"
 msgstr ""
 
-#: ../shared_file_systems_crud_share.rst:307
+#: ../shared_file_systems_crud_share.rst:314
 msgid ""
 "Check the share status and see the share export location. After ``creating`` "
 "status share should have status ``available``:"
 msgstr ""
 
-#: ../shared_file_systems_crud_share.rst:340
+#: ../shared_file_systems_crud_share.rst:348
 msgid ""
 "``is_public`` defines the level of visibility for the share: whether other "
 "tenants can or cannot see the share. By default, the share is private."
 msgstr ""
 
-#: ../shared_file_systems_crud_share.rst:344
+#: ../shared_file_systems_crud_share.rst:352
 msgid "Update share"
 msgstr ""
 
-#: ../shared_file_systems_crud_share.rst:346
+#: ../shared_file_systems_crud_share.rst:354
 msgid ""
 "Update the name, or description, or level of visibility for all tenants for "
 "the share if you need:"
 msgstr ""
 
-#: ../shared_file_systems_crud_share.rst:381
+#: ../shared_file_systems_crud_share.rst:390
 msgid "A share can have one of these status values:"
 msgstr ""
 
-#: ../shared_file_systems_crud_share.rst:386
+#: ../shared_file_systems_crud_share.rst:395
 msgid "The share is being created."
 msgstr ""
 
-#: ../shared_file_systems_crud_share.rst:386
+#: ../shared_file_systems_crud_share.rst:395
 msgid "creating"
 msgstr ""
 
-#: ../shared_file_systems_crud_share.rst:388
+#: ../shared_file_systems_crud_share.rst:397
 msgid "The share is being deleted."
 msgstr ""
 
-#: ../shared_file_systems_crud_share.rst:388
+#: ../shared_file_systems_crud_share.rst:397
 msgid "deleting"
 msgstr ""
 
-#: ../shared_file_systems_crud_share.rst:390
+#: ../shared_file_systems_crud_share.rst:399
 msgid "An error occurred during share creation."
 msgstr ""
 
-#: ../shared_file_systems_crud_share.rst:390
+#: ../shared_file_systems_crud_share.rst:399
 msgid "error"
 msgstr ""
 
-#: ../shared_file_systems_crud_share.rst:392
+#: ../shared_file_systems_crud_share.rst:401
 msgid "An error occurred during share deletion."
 msgstr ""
 
-#: ../shared_file_systems_crud_share.rst:392
+#: ../shared_file_systems_crud_share.rst:401
 msgid "error_deleting"
 msgstr ""
 
-#: ../shared_file_systems_crud_share.rst:394
+#: ../shared_file_systems_crud_share.rst:403
 msgid "The share is ready to use."
 msgstr ""
 
-#: ../shared_file_systems_crud_share.rst:394
+#: ../shared_file_systems_crud_share.rst:403
 msgid "available"
 msgstr ""
 
-#: ../shared_file_systems_crud_share.rst:396
+#: ../shared_file_systems_crud_share.rst:405
 msgid "Share manage started."
 msgstr ""
 
-#: ../shared_file_systems_crud_share.rst:396
+#: ../shared_file_systems_crud_share.rst:405
 msgid "manage_starting"
 msgstr ""
 
-#: ../shared_file_systems_crud_share.rst:398
+#: ../shared_file_systems_crud_share.rst:407
 msgid "Share manage failed."
 msgstr ""
 
-#: ../shared_file_systems_crud_share.rst:398
+#: ../shared_file_systems_crud_share.rst:407
 msgid "manage_error"
 msgstr ""
 
-#: ../shared_file_systems_crud_share.rst:400
+#: ../shared_file_systems_crud_share.rst:409
 msgid "Share unmanage started."
 msgstr ""
 
-#: ../shared_file_systems_crud_share.rst:400
+#: ../shared_file_systems_crud_share.rst:409
 msgid "unmanage_starting"
 msgstr ""
 
-#: ../shared_file_systems_crud_share.rst:402
+#: ../shared_file_systems_crud_share.rst:411
 msgid "Share cannot be unmanaged."
 msgstr ""
 
-#: ../shared_file_systems_crud_share.rst:402
+#: ../shared_file_systems_crud_share.rst:411
 msgid "unmanage_error"
 msgstr ""
 
-#: ../shared_file_systems_crud_share.rst:404
+#: ../shared_file_systems_crud_share.rst:413
 msgid "Share was unmanaged."
 msgstr ""
 
-#: ../shared_file_systems_crud_share.rst:404
+#: ../shared_file_systems_crud_share.rst:413
 msgid "unmanaged"
 msgstr ""
 
-#: ../shared_file_systems_crud_share.rst:406
+#: ../shared_file_systems_crud_share.rst:415
 msgid "The extend, or increase, share size request was issued successfully."
 msgstr ""
 
-#: ../shared_file_systems_crud_share.rst:406
+#: ../shared_file_systems_crud_share.rst:415
 msgid "extending"
 msgstr ""
 
-#: ../shared_file_systems_crud_share.rst:409
+#: ../shared_file_systems_crud_share.rst:418
 msgid "Extend share failed."
 msgstr ""
 
-#: ../shared_file_systems_crud_share.rst:409
+#: ../shared_file_systems_crud_share.rst:418
 msgid "extending_error"
 msgstr ""
 
-#: ../shared_file_systems_crud_share.rst:411
+#: ../shared_file_systems_crud_share.rst:420
 msgid "Share is being shrunk."
 msgstr ""
 
-#: ../shared_file_systems_crud_share.rst:411
+#: ../shared_file_systems_crud_share.rst:420
 msgid "shrinking"
 msgstr ""
 
-#: ../shared_file_systems_crud_share.rst:413
+#: ../shared_file_systems_crud_share.rst:422
 msgid "Failed to update quota on share shrinking."
 msgstr ""
 
-#: ../shared_file_systems_crud_share.rst:413
+#: ../shared_file_systems_crud_share.rst:422
 msgid "shrinking_error"
 msgstr ""
 
-#: ../shared_file_systems_crud_share.rst:416
+#: ../shared_file_systems_crud_share.rst:425
 msgid "Shrink share failed due to possible data loss."
 msgstr ""
 
-#: ../shared_file_systems_crud_share.rst:416
+#: ../shared_file_systems_crud_share.rst:425
 msgid "shrinking_possible_data_loss_error"
 msgstr ""
 
-#: ../shared_file_systems_crud_share.rst:423
+#: ../shared_file_systems_crud_share.rst:432
 msgid "Share metadata"
 msgstr ""
 
-#: ../shared_file_systems_crud_share.rst:425
+#: ../shared_file_systems_crud_share.rst:434
 msgid "If you want to set the metadata key-value pairs on the share, run:"
 msgstr ""
 
-#: ../shared_file_systems_crud_share.rst:431
+#: ../shared_file_systems_crud_share.rst:440
 msgid "Get all metadata key-value pairs of the share:"
 msgstr ""
 
-#: ../shared_file_systems_crud_share.rst:444
+#: ../shared_file_systems_crud_share.rst:454
 msgid "You can update the metadata:"
 msgstr ""
 
-#: ../shared_file_systems_crud_share.rst:455
+#: ../shared_file_systems_crud_share.rst:466
 msgid ""
 "You also can unset the metadata using **manila metadata <share_name> unset "
 "<metadata_key(s)>**."
 msgstr ""
 
-#: ../shared_file_systems_crud_share.rst:459
+#: ../shared_file_systems_crud_share.rst:470
 msgid "Reset share state"
 msgstr ""
 
-#: ../shared_file_systems_crud_share.rst:461
+#: ../shared_file_systems_crud_share.rst:472
 msgid "As administrator, you can reset the state of a share."
 msgstr ""
 
-#: ../shared_file_systems_crud_share.rst:463
+#: ../shared_file_systems_crud_share.rst:474
 msgid ""
 "Use **manila reset-state [--state <state>] <share>** command to reset share "
 "state, where ``state`` indicates which state to assign the share. Options "
@@ -19868,11 +19868,11 @@ msgid ""
 "``error_deleting`` states."
 msgstr ""
 
-#: ../shared_file_systems_crud_share.rst:502
+#: ../shared_file_systems_crud_share.rst:514
 msgid "Delete and force-delete share"
 msgstr ""
 
-#: ../shared_file_systems_crud_share.rst:504
+#: ../shared_file_systems_crud_share.rst:516
 msgid ""
 "You also can force-delete a share. The shares cannot be deleted in "
 "transitional states. The transitional states are ``creating``, ``deleting``, "
@@ -19881,80 +19881,80 @@ msgid ""
 "json`` file to grant permissions for this action to other roles."
 msgstr ""
 
-#: ../shared_file_systems_crud_share.rst:513
+#: ../shared_file_systems_crud_share.rst:525
 msgid ""
 "The configuration file ``policy.json`` may be used from different places. "
 "The path ``/etc/manila/policy.json`` is one of expected paths by default."
 msgstr ""
 
-#: ../shared_file_systems_crud_share.rst:516
+#: ../shared_file_systems_crud_share.rst:528
 msgid ""
 "Use **manila delete <share_name_or_ID>** command to delete a specified share:"
 msgstr ""
 
-#: ../shared_file_systems_crud_share.rst:524
+#: ../shared_file_systems_crud_share.rst:536
 msgid ""
 "If you specified :ref:`the consistency group <shared_file_systems_cgroups>` "
 "while creating a share, you should provide the :option:`--consistency-group` "
 "parameter to delete the share:"
 msgstr ""
 
-#: ../shared_file_systems_crud_share.rst:533
+#: ../shared_file_systems_crud_share.rst:545
 msgid ""
 "If you try to delete the share in one of the transitional state using soft-"
 "deletion you'll get an error:"
 msgstr ""
 
-#: ../shared_file_systems_crud_share.rst:542
+#: ../shared_file_systems_crud_share.rst:554
 msgid ""
 "A share cannot be deleted in a transitional status, that it why an error "
 "from ``python-manilaclient`` appeared."
 msgstr ""
 
-#: ../shared_file_systems_crud_share.rst:545
+#: ../shared_file_systems_crud_share.rst:557
 msgid "Print the list of all shares for all tenants:"
 msgstr ""
 
-#: ../shared_file_systems_crud_share.rst:557
+#: ../shared_file_systems_crud_share.rst:570
 msgid ""
 "Force-delete Share2 and check that it is absent in the list of shares, run:"
 msgstr ""
 
-#: ../shared_file_systems_crud_share.rst:574
+#: ../shared_file_systems_crud_share.rst:588
 msgid "Manage access to share"
 msgstr ""
 
-#: ../shared_file_systems_crud_share.rst:576
+#: ../shared_file_systems_crud_share.rst:590
 msgid ""
 "The Shared File Systems service allows to grant or deny access to a "
 "specified share, and list the permissions for a specified share."
 msgstr ""
 
-#: ../shared_file_systems_crud_share.rst:579
+#: ../shared_file_systems_crud_share.rst:593
 msgid ""
 "To grant or deny access to a share, specify one of these supported share "
 "access levels:"
 msgstr ""
 
-#: ../shared_file_systems_crud_share.rst:582
+#: ../shared_file_systems_crud_share.rst:596
 msgid "**rw**. Read and write (RW) access. This is the default value."
 msgstr ""
 
-#: ../shared_file_systems_crud_share.rst:584
+#: ../shared_file_systems_crud_share.rst:598
 msgid "**ro**. Read-only (RO) access."
 msgstr ""
 
-#: ../shared_file_systems_crud_share.rst:586
+#: ../shared_file_systems_crud_share.rst:600
 msgid "You must also specify one of these supported authentication methods:"
 msgstr ""
 
-#: ../shared_file_systems_crud_share.rst:588
+#: ../shared_file_systems_crud_share.rst:602
 msgid ""
 "**ip**. Authenticates an instance through its IP address. A valid format is "
 "``XX.XX.XX.XX`` or ``XX.XX.XX.XX/XX``. For example ``0.0.0.0/0``."
 msgstr ""
 
-#: ../shared_file_systems_crud_share.rst:591
+#: ../shared_file_systems_crud_share.rst:605
 msgid ""
 "**cert**. Authenticates an instance through a TLS certificate. Specify the "
 "TLS identity as the IDENTKEY. A valid value is any string up to 64 "
@@ -19962,54 +19962,54 @@ msgid ""
 "string depends on its interpretation."
 msgstr ""
 
-#: ../shared_file_systems_crud_share.rst:596
+#: ../shared_file_systems_crud_share.rst:610
 msgid ""
 "**user**. Authenticates by a specified user or group name. A valid value is "
 "an alphanumeric string that can contain some special characters and is from "
 "4 to 32 characters long."
 msgstr ""
 
-#: ../shared_file_systems_crud_share.rst:600
+#: ../shared_file_systems_crud_share.rst:614
 msgid ""
 "Try to mount NFS share with export path ``10.254.0.5:/shares/"
 "share-5789ddcf-35c9-4b64-a28a-7f6a4a574b6a`` on the node with IP address "
 "``10.254.0.4``:"
 msgstr ""
 
-#: ../shared_file_systems_crud_share.rst:612
+#: ../shared_file_systems_crud_share.rst:626
 msgid ""
 "An error message \"Permission denied\" appeared, so you are not allowed to "
 "mount a share without an access rule. Allow access to the share with ``ip`` "
 "access type and ``10.254.0.4`` IP address:"
 msgstr ""
 
-#: ../shared_file_systems_crud_share.rst:630
+#: ../shared_file_systems_crud_share.rst:645
 msgid "Try to mount a share again. This time it is mounted successfully:"
 msgstr ""
 
-#: ../shared_file_systems_crud_share.rst:636
+#: ../shared_file_systems_crud_share.rst:651
 msgid ""
 "Since it is allowed node on 10.254.0.4 read and write access, try to create "
 "a file on a mounted share:"
 msgstr ""
 
-#: ../shared_file_systems_crud_share.rst:646
+#: ../shared_file_systems_crud_share.rst:661
 msgid ""
 "Connect via SSH to the 10.254.0.5 node and check new file `my_file.txt` in "
 "the ``/shares/share-5789ddcf-35c9-4b64-a28a-7f6a4a574b6a`` directory:"
 msgstr ""
 
-#: ../shared_file_systems_crud_share.rst:659
+#: ../shared_file_systems_crud_share.rst:674
 msgid ""
 "You have successfully created a file from instance that was given access by "
 "its IP address."
 msgstr ""
 
-#: ../shared_file_systems_crud_share.rst:662
+#: ../shared_file_systems_crud_share.rst:677
 msgid "Allow access to the share with ``user`` access type:"
 msgstr ""
 
-#: ../shared_file_systems_crud_share.rst:680
+#: ../shared_file_systems_crud_share.rst:696
 msgid ""
 "Different share features are supported by different share drivers. For the "
 "example, the Generic driver with the Block Storage service as a back-end "
@@ -20019,13 +20019,13 @@ msgid ""
 "share_back_ends_feature_support_mapping.html>`_."
 msgstr ""
 
-#: ../shared_file_systems_crud_share.rst:687
+#: ../shared_file_systems_crud_share.rst:703
 msgid ""
 "To verify that the access rules (ACL) were configured correctly for a share, "
 "you list permissions for a share:"
 msgstr ""
 
-#: ../shared_file_systems_crud_share.rst:700
+#: ../shared_file_systems_crud_share.rst:717
 msgid ""
 "Deny access to the share and check that deleted access rule is absent in the "
 "access rule list:"
@@ -20302,7 +20302,7 @@ msgstr ""
 msgid "To manage share, run:"
 msgstr ""
 
-#: ../shared_file_systems_manage_and_unmanage_share.rst:109
+#: ../shared_file_systems_manage_and_unmanage_share.rst:110
 msgid "Check that the share is available:"
 msgstr ""
 
@@ -20687,24 +20687,24 @@ msgstr ""
 msgid "Create a ``ldap`` security service:"
 msgstr ""
 
-#: ../shared_file_systems_security_services.rst:63
+#: ../shared_file_systems_security_services.rst:64
 msgid "To create ``kerberos`` security service, run:"
 msgstr ""
 
-#: ../shared_file_systems_security_services.rst:86
+#: ../shared_file_systems_security_services.rst:88
 msgid ""
 "To see the list of created security service use :command:`manila security-"
 "service-list`:"
 msgstr ""
 
-#: ../shared_file_systems_security_services.rst:99
+#: ../shared_file_systems_security_services.rst:102
 msgid ""
 "You can add a security service to the existing :ref:`share network "
 "<shared_file_systems_share_networks>` that is not used yet (is not "
 "associated with a share)."
 msgstr ""
 
-#: ../shared_file_systems_security_services.rst:103
+#: ../shared_file_systems_security_services.rst:106
 msgid ""
 "Add a security service to the share network with ``share-network-security-"
 "service-add`` specifying share network, security service and print the "
@@ -20712,27 +20712,28 @@ msgid ""
 "``share_networks`` with associated share network ID."
 msgstr ""
 
-#: ../shared_file_systems_security_services.rst:132
+#: ../shared_file_systems_security_services.rst:136
 msgid ""
 "It is possible to see the list of security services associated with given "
 "share network. List security services for ``share_net2`` share network:"
 msgstr ""
 
-#: ../shared_file_systems_security_services.rst:144
+#: ../shared_file_systems_security_services.rst:149
 msgid ""
 "You also can dissociate a security service from the share network and see "
 "that a security service now has empty list of share networks:"
 msgstr ""
 
-#: ../shared_file_systems_security_services.rst:171
+#: ../shared_file_systems_security_services.rst:177
 msgid ""
 "Shared File Systems service allows you to update a security service fields "
 "using :command:`manila security-service-update` command with optional "
-"arguments such as ``--dns-ip``, ``--server``, ``--domain``, ``--user``, ``--"
-"password``, ``--name``, or ``--description``."
+"arguments such as :option:`--dns-ip`, :option:`--server`, :option:`--"
+"domain`, :option:`--user`, :option:`--password`, :option:`--name`, or :"
+"option:`--description`."
 msgstr ""
 
-#: ../shared_file_systems_security_services.rst:176
+#: ../shared_file_systems_security_services.rst:183
 msgid ""
 "To remove a security service, that is not associated with any share "
 "networks, run:"
@@ -20821,7 +20822,7 @@ msgstr ""
 msgid "List networks in a tenant, run:"
 msgstr ""
 
-#: ../shared_file_systems_share_networks.rst:29
+#: ../shared_file_systems_share_networks.rst:30
 msgid ""
 "A share network stores network information that share servers can use where "
 "shares are hosted. You can associate a share with a single share network. "
@@ -20829,70 +20830,70 @@ msgid ""
 "share network through which instances can access the share."
 msgstr ""
 
-#: ../shared_file_systems_share_networks.rst:34
+#: ../shared_file_systems_share_networks.rst:35
 msgid ""
 "When you create a share network, you can specify only one type of network:"
 msgstr ""
 
-#: ../shared_file_systems_share_networks.rst:36
+#: ../shared_file_systems_share_networks.rst:37
 msgid ""
 "OpenStack Networking (neutron). Specify a network ID and subnet ID. In this "
 "case ``manila.network.nova_network_plugin.NeutronNetworkPlugin`` will be "
 "used."
 msgstr ""
 
-#: ../shared_file_systems_share_networks.rst:40
+#: ../shared_file_systems_share_networks.rst:41
 msgid ""
 "Legacy networking (nova-network). Specify a network ID. In this case "
 "``manila.network.nova_network_plugin.NoveNetworkPlugin`` will be used."
 msgstr ""
 
-#: ../shared_file_systems_share_networks.rst:44
+#: ../shared_file_systems_share_networks.rst:45
 msgid ""
 "For more information about supported plug-ins for share networks, see :ref:"
 "`shared_file_systems_network_plugins`."
 msgstr ""
 
-#: ../shared_file_systems_share_networks.rst:47
+#: ../shared_file_systems_share_networks.rst:48
 msgid "A share network has these attributes:"
 msgstr ""
 
-#: ../shared_file_systems_share_networks.rst:49
+#: ../shared_file_systems_share_networks.rst:50
 msgid ""
 "The IP block in Classless Inter-Domain Routing (CIDR) notation from which to "
 "allocate the network."
 msgstr ""
 
-#: ../shared_file_systems_share_networks.rst:52
+#: ../shared_file_systems_share_networks.rst:53
 msgid "The IP version of the network."
 msgstr ""
 
-#: ../shared_file_systems_share_networks.rst:54
+#: ../shared_file_systems_share_networks.rst:55
 msgid "The network type, which is `vlan`, `vxlan`, `gre`, or `flat`."
 msgstr ""
 
-#: ../shared_file_systems_share_networks.rst:56
+#: ../shared_file_systems_share_networks.rst:57
 msgid ""
 "If the network uses segmentation, a segmentation identifier. For example, "
 "VLAN, VXLAN, and GRE networks use segmentation."
 msgstr ""
 
-#: ../shared_file_systems_share_networks.rst:59
+#: ../shared_file_systems_share_networks.rst:60
 msgid "To create a share network with private network and subnetwork, run:"
 msgstr ""
 
-#: ../shared_file_systems_share_networks.rst:82
+#: ../shared_file_systems_share_networks.rst:84
 msgid ""
 "The ``segmentation_id``, ``cidr``, ``ip_version``, and ``network_type`` "
 "share network attributes are automatically set to the values determined by "
 "the network provider."
 msgstr ""
 
-#: ../shared_file_systems_share_networks.rst:86
+#: ../shared_file_systems_share_networks.rst:88
 msgid "Check network list, run:"
 msgstr ""
 
-#: ../shared_file_systems_share_networks.rst:97
+#: ../shared_file_systems_share_networks.rst:100
 msgid ""
 "If you configured the Generic driver with ``driver_handles_share_servers = "
 "True`` (with the share servers) and had already some operations in the "
@@ -20901,13 +20902,13 @@ msgid ""
 "inner usage."
 msgstr ""
 
-#: ../shared_file_systems_share_networks.rst:115
+#: ../shared_file_systems_share_networks.rst:119
 msgid ""
 "You also can see detailed information about the share network including "
 "``network_type``, ``segmentation_id`` fields:"
 msgstr ""
 
-#: ../shared_file_systems_share_networks.rst:139
+#: ../shared_file_systems_share_networks.rst:144
 msgid ""
 "You also can add and remove the security services to the share network. For "
 "details, see :ref:`shared_file_systems_security_services`."
@@ -20943,7 +20944,7 @@ msgstr ""
 msgid "To extend the share and check the result, run:"
 msgstr ""
 
-#: ../shared_file_systems_share_resize.rst:54
+#: ../shared_file_systems_share_resize.rst:55
 msgid ""
 "While shrinking the share gets ``shrinking`` status that means that the "
 "decrease share size request was issued successfully. To shrink the share and "
@@ -21065,7 +21066,7 @@ msgid ""
 "type can be public."
 msgstr ""
 
-#: ../shared_file_systems_share_types.rst:95
+#: ../shared_file_systems_share_types.rst:96
 msgid ""
 "You can set or unset extra specifications for a share type using **manila "
 "type-key <share_type> set <key=value>** command. Since it is up to each "
@@ -21073,64 +21074,64 @@ msgid ""
 "specified driver."
 msgstr ""
 
-#: ../shared_file_systems_share_types.rst:104
+#: ../shared_file_systems_share_types.rst:105
 msgid ""
 "It is also possible for administrator to see a list of current share types "
 "and extra specifications:"
 msgstr ""
 
-#: ../shared_file_systems_share_types.rst:118
+#: ../shared_file_systems_share_types.rst:120
 msgid ""
 "Use :command:`manila type-key <share_type> unset <key>` to unset an extra "
 "specification."
 msgstr ""
 
-#: ../shared_file_systems_share_types.rst:121
+#: ../shared_file_systems_share_types.rst:123
 msgid ""
 "The public or private share type can be deleted by means of :command:`manila "
 "type-delete <share_type>` command."
 msgstr ""
 
-#: ../shared_file_systems_share_types.rst:127
+#: ../shared_file_systems_share_types.rst:129
 msgid "Share type access"
 msgstr ""
 
-#: ../shared_file_systems_share_types.rst:129
+#: ../shared_file_systems_share_types.rst:131
 msgid ""
 "You can manage the access to the private share type for the different "
 "projects: add access, remove access, and get information about access for a "
 "specified private share type."
 msgstr ""
 
-#: ../shared_file_systems_share_types.rst:133
+#: ../shared_file_systems_share_types.rst:135
 msgid "Create a private type:"
 msgstr ""
 
-#: ../shared_file_systems_share_types.rst:146
+#: ../shared_file_systems_share_types.rst:149
 msgid ""
 "If you run :command:`manila type-list` you see only public types. To see the "
 "private types also, run :command:`manila type-list` with :option:`-all` "
 "optional argument."
 msgstr ""
 
-#: ../shared_file_systems_share_types.rst:150
+#: ../shared_file_systems_share_types.rst:153
 msgid ""
 "Grant access to created private type for a demo and alt_demo projects by "
 "providing their IDs:"
 msgstr ""
 
-#: ../shared_file_systems_share_types.rst:158
+#: ../shared_file_systems_share_types.rst:161
 msgid "Get information about access for a private share type ``my_type1``:"
 msgstr ""
 
-#: ../shared_file_systems_share_types.rst:170
+#: ../shared_file_systems_share_types.rst:174
 msgid ""
 "After you granted the access to the share type users that belong to project "
 "with granted access can see the type in the list and create shares with "
 "allowed private share type."
 msgstr ""
 
-#: ../shared_file_systems_share_types.rst:174
+#: ../shared_file_systems_share_types.rst:178
 msgid ""
 "To deny access for a specified project, use :command:`manila type-access-"
 "remove <share_type> <project_id>` command."
@@ -21166,22 +21167,22 @@ msgstr ""
 msgid "Create a snapshot from the share:"
 msgstr ""
 
-#: ../shared_file_systems_snapshots.rst:39
+#: ../shared_file_systems_snapshots.rst:40
 msgid "Update name or description of a snapshot if it is needed:"
 msgstr ""
 
-#: ../shared_file_systems_snapshots.rst:45
+#: ../shared_file_systems_snapshots.rst:46
 msgid "Check that status of a snapshot is ``available``:"
 msgstr ""
 
-#: ../shared_file_systems_snapshots.rst:64
+#: ../shared_file_systems_snapshots.rst:66
 msgid ""
 "To restore your data from snapshot, use :command:`manila create` with key :"
 "option:`--snapshot-id`. This creates a new share from exiting snapshot. "
 "Create a share from a snapshot and check whether it is available:"
 msgstr ""
 
-#: ../shared_file_systems_snapshots.rst:127
+#: ../shared_file_systems_snapshots.rst:131
 msgid ""
 "You can soft-delete a snapshot using :command:`manila snapshot-delete "
 "<snapshot_name_or_ID>`. If a snapshot is in busy state and during deleting "
@@ -21192,7 +21193,7 @@ msgid ""
 "``error_deleting``. If no state is provided, available will be used."
 msgstr ""
 
-#: ../shared_file_systems_snapshots.rst:136
+#: ../shared_file_systems_snapshots.rst:140
 msgid ""
 "Use :command:`manila snapshot-force-delete <snapshot>` to force-delete a "
 "specified share snapshot in any state."
@@ -21952,91 +21953,91 @@ msgid ""
 "brevity):"
 msgstr ""
 
-#: ../telemetry-alarms.rst:240
+#: ../telemetry-alarms.rst:241
 msgid ""
 "In this case, the state is reported as ``insufficient data`` which could "
 "indicate that:"
 msgstr ""
 
-#: ../telemetry-alarms.rst:243
+#: ../telemetry-alarms.rst:244
 msgid ""
 "meters have not yet been gathered about this instance over the evaluation "
 "window into the recent past (for example a brand-new instance)"
 msgstr ""
 
-#: ../telemetry-alarms.rst:247
+#: ../telemetry-alarms.rst:248
 msgid ""
 "*or*, that the identified instance is not visible to the user/tenant owning "
 "the alarm"
 msgstr ""
 
-#: ../telemetry-alarms.rst:250
+#: ../telemetry-alarms.rst:251
 msgid ""
 "*or*, simply that an alarm evaluation cycle hasn't kicked off since the "
 "alarm was created (by default, alarms are evaluated once per minute)."
 msgstr ""
 
-#: ../telemetry-alarms.rst:256
+#: ../telemetry-alarms.rst:257
 msgid ""
 "The visibility of alarms depends on the role and project associated with the "
 "user issuing the query:"
 msgstr ""
 
-#: ../telemetry-alarms.rst:259
+#: ../telemetry-alarms.rst:260
 msgid "admin users see *all* alarms, regardless of the owner"
 msgstr ""
 
-#: ../telemetry-alarms.rst:261
+#: ../telemetry-alarms.rst:262
 msgid ""
 "on-admin users see only the alarms associated with their project (as per the "
 "normal tenant segregation in OpenStack)"
 msgstr ""
 
-#: ../telemetry-alarms.rst:265
+#: ../telemetry-alarms.rst:266
 msgid "Alarm update"
 msgstr ""
 
-#: ../telemetry-alarms.rst:267
+#: ../telemetry-alarms.rst:268
 msgid ""
 "Once the state of the alarm has settled down, we might decide that we set "
 "that bar too low with 70%, in which case the threshold (or most any other "
 "alarm attribute) can be updated thusly:"
 msgstr ""
 
-#: ../telemetry-alarms.rst:275
+#: ../telemetry-alarms.rst:276
 msgid ""
 "The change will take effect from the next evaluation cycle, which by default "
 "occurs every minute."
 msgstr ""
 
-#: ../telemetry-alarms.rst:278
+#: ../telemetry-alarms.rst:279
 msgid ""
 "Most alarm attributes can be changed in this way, but there is also a "
 "convenient short-cut for getting and setting the alarm state:"
 msgstr ""
 
-#: ../telemetry-alarms.rst:286
+#: ../telemetry-alarms.rst:287
 msgid ""
 "Over time the state of the alarm may change often, especially if the "
 "threshold is chosen to be close to the trending value of the statistic. You "
 "can follow the history of an alarm over its lifecycle via the audit API:"
 msgstr ""
 
-#: ../telemetry-alarms.rst:306
+#: ../telemetry-alarms.rst:308
 msgid "Alarm deletion"
 msgstr ""
 
-#: ../telemetry-alarms.rst:308
+#: ../telemetry-alarms.rst:310
 msgid ""
 "An alarm that is no longer required can be disabled so that it is no longer "
 "actively evaluated:"
 msgstr ""
 
-#: ../telemetry-alarms.rst:315
+#: ../telemetry-alarms.rst:317
 msgid "or even deleted permanently (an irreversible step):"
 msgstr ""
 
-#: ../telemetry-alarms.rst:323
+#: ../telemetry-alarms.rst:325
 msgid "By default, alarm history is retained for deleted alarms."
 msgstr ""
 
@@ -22320,7 +22321,7 @@ msgstr ""
 
 # #-#-#-#-#  telemetry-data-collection.pot (Cloud Administrator Guide 0.9)  #-#-#-#-#
 # #-#-#-#-#  telemetry-measurements.pot (Cloud Administrator Guide 0.9)  #-#-#-#-#
-#: ../telemetry-data-collection.rst:61 ../telemetry-data-collection.rst:1098
+#: ../telemetry-data-collection.rst:61 ../telemetry-data-collection.rst:1099
 #: ../telemetry-measurements.rst:100 ../telemetry-measurements.rst:434
 #: ../telemetry-measurements.rst:489 ../telemetry-measurements.rst:533
 #: ../telemetry-measurements.rst:595 ../telemetry-measurements.rst:671
@@ -23101,7 +23102,7 @@ msgstr ""
 
 # #-#-#-#-#  telemetry-data-collection.pot (Cloud Administrator Guide 0.9)  #-#-#-#-#
 # #-#-#-#-#  telemetry-measurements.pot (Cloud Administrator Guide 0.9)  #-#-#-#-#
-#: ../telemetry-data-collection.rst:504 ../telemetry-data-collection.rst:679
+#: ../telemetry-data-collection.rst:504 ../telemetry-data-collection.rst:680
 #: ../telemetry-measurements.rst:35 ../telemetry-measurements.rst:358
 #: ../telemetry-measurements.rst:683 ../telemetry-measurements.rst:686
 #: ../telemetry-measurements.rst:689 ../telemetry-measurements.rst:692
@@ -23167,11 +23168,11 @@ msgid ""
 "command should be invoked:"
 msgstr ""
 
-#: ../telemetry-data-collection.rst:538
+#: ../telemetry-data-collection.rst:539
 msgid "Data collection and processing"
 msgstr ""
 
-#: ../telemetry-data-collection.rst:540
+#: ../telemetry-data-collection.rst:541
 msgid ""
 "The mechanism by which data is collected and processed is called a pipeline. "
 "Pipelines, at the configuration level, describe a coupling between sources "
@@ -23179,21 +23180,21 @@ msgid ""
 "data."
 msgstr ""
 
-#: ../telemetry-data-collection.rst:545
+#: ../telemetry-data-collection.rst:546
 msgid ""
 "A source is a producer of data: ``samples`` or ``events``. In effect, it is "
 "a set of pollsters or notification handlers emitting datapoints for a set of "
 "matching meters and event types."
 msgstr ""
 
-#: ../telemetry-data-collection.rst:549
+#: ../telemetry-data-collection.rst:550
 msgid ""
 "Each source configuration encapsulates name matching, polling interval "
 "determination, optional resource enumeration or discovery, and mapping to "
 "one or more sinks for publication."
 msgstr ""
 
-#: ../telemetry-data-collection.rst:553
+#: ../telemetry-data-collection.rst:554
 msgid ""
 "Data gathered can be used for different purposes, which can impact how "
 "frequently it needs to be published. Typically, a meter published for "
@@ -23201,7 +23202,7 @@ msgid ""
 "may be needed for performance tuning every minute."
 msgstr ""
 
-#: ../telemetry-data-collection.rst:560
+#: ../telemetry-data-collection.rst:561
 msgid ""
 "Rapid polling cadences should be avoided, as it results in a huge amount of "
 "data in a short time frame, which may negatively affect the performance of "
@@ -23209,13 +23210,13 @@ msgid ""
 "recommend you do not use small granularity values like 10 seconds."
 msgstr ""
 
-#: ../telemetry-data-collection.rst:566
+#: ../telemetry-data-collection.rst:567
 msgid ""
 "A sink, on the other hand, is a consumer of data, providing logic for the "
 "transformation and publication of data emitted from related sources."
 msgstr ""
 
-#: ../telemetry-data-collection.rst:569
+#: ../telemetry-data-collection.rst:570
 msgid ""
 "In effect, a sink describes a chain of handlers. The chain starts with zero "
 "or more transformers and ends with one or more publishers. The first "
@@ -23225,11 +23226,11 @@ msgid ""
 "described in :ref:`telemetry-publishers`."
 msgstr ""
 
-#: ../telemetry-data-collection.rst:579
+#: ../telemetry-data-collection.rst:580
 msgid "Pipeline configuration"
 msgstr ""
 
-#: ../telemetry-data-collection.rst:580
+#: ../telemetry-data-collection.rst:581
 msgid ""
 "Pipeline configuration by default, is stored in separate configuration "
 "files, called ``pipeline.yaml`` and ``event_pipeline.yaml``, next to the "
@@ -23242,18 +23243,18 @@ msgid ""
 "can be defined in one pipeline configuration file."
 msgstr ""
 
-#: ../telemetry-data-collection.rst:590
+#: ../telemetry-data-collection.rst:591
 msgid "The meter pipeline definition looks like:"
 msgstr ""
 
-#: ../telemetry-data-collection.rst:610
+#: ../telemetry-data-collection.rst:611
 msgid ""
 "The interval parameter in the sources section should be defined in seconds. "
 "It determines the polling cadence of sample injection into the pipeline, "
 "where samples are produced under the direct control of an agent."
 msgstr ""
 
-#: ../telemetry-data-collection.rst:615
+#: ../telemetry-data-collection.rst:616
 msgid ""
 "There are several ways to define the list of meters for a pipeline source. "
 "The list of valid meters can be found in :ref:`telemetry-measurements`. "
@@ -23261,33 +23262,33 @@ msgid ""
 "excluded meters, with which a source should operate:"
 msgstr ""
 
-#: ../telemetry-data-collection.rst:620
+#: ../telemetry-data-collection.rst:621
 msgid ""
 "To include all meters, use the ``*`` wildcard symbol. It is highly advisable "
 "to select only the meters that you intend on using to avoid flooding the "
 "metering database with unused data."
 msgstr ""
 
-#: ../telemetry-data-collection.rst:624
+#: ../telemetry-data-collection.rst:625
 msgid "To define the list of meters, use either of the following:"
 msgstr ""
 
-#: ../telemetry-data-collection.rst:626
+#: ../telemetry-data-collection.rst:627
 msgid "To define the list of included meters, use the ``meter_name`` syntax."
 msgstr ""
 
-#: ../telemetry-data-collection.rst:629
+#: ../telemetry-data-collection.rst:630
 msgid "To define the list of excluded meters, use the ``!meter_name`` syntax."
 msgstr ""
 
-#: ../telemetry-data-collection.rst:632
+#: ../telemetry-data-collection.rst:633
 msgid ""
 "For meters, which have variants identified by a complex name field, use the "
 "wildcard symbol to select all, for example, for ``instance:m1.tiny``, use "
 "``instance:\\*``."
 msgstr ""
 
-#: ../telemetry-data-collection.rst:638
+#: ../telemetry-data-collection.rst:639
 msgid ""
 "Please be aware that we do not have any duplication check between pipelines "
 "and if you add a meter to multiple pipelines then it is assumed the "
@@ -23295,27 +23296,27 @@ msgid ""
 "specified sinks."
 msgstr ""
 
-#: ../telemetry-data-collection.rst:643
+#: ../telemetry-data-collection.rst:644
 msgid "The above definition methods can be used in the following combinations:"
 msgstr ""
 
-#: ../telemetry-data-collection.rst:645
+#: ../telemetry-data-collection.rst:646
 msgid "Use only the wildcard symbol."
 msgstr ""
 
-#: ../telemetry-data-collection.rst:647
+#: ../telemetry-data-collection.rst:648
 msgid "Use the list of included meters."
 msgstr ""
 
-#: ../telemetry-data-collection.rst:649
+#: ../telemetry-data-collection.rst:650
 msgid "Use the list of excluded meters."
 msgstr ""
 
-#: ../telemetry-data-collection.rst:651
+#: ../telemetry-data-collection.rst:652
 msgid "Use wildcard symbol with the list of excluded meters."
 msgstr ""
 
-#: ../telemetry-data-collection.rst:655
+#: ../telemetry-data-collection.rst:656
 msgid ""
 "At least one of the above variations should be included in the meters "
 "section. Included and excluded meters cannot co-exist in the same pipeline. "
@@ -23323,118 +23324,118 @@ msgid ""
 "section."
 msgstr ""
 
-#: ../telemetry-data-collection.rst:660
+#: ../telemetry-data-collection.rst:661
 msgid ""
 "The optional resources section of a pipeline source allows a static list of "
 "resource URLs to be configured for polling."
 msgstr ""
 
-#: ../telemetry-data-collection.rst:663
+#: ../telemetry-data-collection.rst:664
 msgid ""
 "The transformers section of a pipeline sink provides the possibility to add "
 "a list of transformer definitions. The available transformers are:"
 msgstr ""
 
-#: ../telemetry-data-collection.rst:667
+#: ../telemetry-data-collection.rst:668
 msgid "Name of transformer"
 msgstr ""
 
-#: ../telemetry-data-collection.rst:667
+#: ../telemetry-data-collection.rst:668
 msgid "Reference name for configuration"
 msgstr ""
 
-#: ../telemetry-data-collection.rst:669
+#: ../telemetry-data-collection.rst:670
 msgid "Accumulator"
 msgstr ""
 
-#: ../telemetry-data-collection.rst:669
+#: ../telemetry-data-collection.rst:670
 msgid "accumulator"
 msgstr ""
 
-#: ../telemetry-data-collection.rst:671
+#: ../telemetry-data-collection.rst:672
 msgid "Aggregator"
 msgstr ""
 
-#: ../telemetry-data-collection.rst:671
+#: ../telemetry-data-collection.rst:672
 msgid "aggregator"
 msgstr ""
 
-#: ../telemetry-data-collection.rst:673
+#: ../telemetry-data-collection.rst:674
 msgid "Arithmetic"
 msgstr ""
 
-#: ../telemetry-data-collection.rst:673
+#: ../telemetry-data-collection.rst:674
 msgid "arithmetic"
 msgstr ""
 
-#: ../telemetry-data-collection.rst:675
+#: ../telemetry-data-collection.rst:676
 msgid "Rate of change"
 msgstr ""
 
-#: ../telemetry-data-collection.rst:675
+#: ../telemetry-data-collection.rst:676
 msgid "rate\\_of\\_change"
 msgstr ""
 
-#: ../telemetry-data-collection.rst:677
+#: ../telemetry-data-collection.rst:678
 msgid "Unit conversion"
 msgstr ""
 
-#: ../telemetry-data-collection.rst:677
+#: ../telemetry-data-collection.rst:678
 msgid "unit\\_conversion"
 msgstr ""
 
-#: ../telemetry-data-collection.rst:679
+#: ../telemetry-data-collection.rst:680
 msgid "delta"
 msgstr ""
 
-#: ../telemetry-data-collection.rst:682
+#: ../telemetry-data-collection.rst:683
 msgid ""
 "The publishers section contains the list of publishers, where the samples "
 "data should be sent after the possible transformations."
 msgstr ""
 
-#: ../telemetry-data-collection.rst:685
+#: ../telemetry-data-collection.rst:686
 msgid "Similarly, the event pipeline definition looks like:"
 msgstr ""
 
-#: ../telemetry-data-collection.rst:701
+#: ../telemetry-data-collection.rst:702
 msgid "The event filter uses the same filtering logic as the meter pipeline."
 msgstr ""
 
-#: ../telemetry-data-collection.rst:706
+#: ../telemetry-data-collection.rst:707
 msgid "Transformers"
 msgstr ""
 
-#: ../telemetry-data-collection.rst:708
+#: ../telemetry-data-collection.rst:709
 msgid "The definition of transformers can contain the following fields:"
 msgstr ""
 
-#: ../telemetry-data-collection.rst:711
+#: ../telemetry-data-collection.rst:712
 msgid "Name of the transformer."
 msgstr ""
 
-#: ../telemetry-data-collection.rst:714
+#: ../telemetry-data-collection.rst:715
 msgid "Parameters of the transformer."
 msgstr ""
 
-#: ../telemetry-data-collection.rst:714
+#: ../telemetry-data-collection.rst:715
 msgid "parameters"
 msgstr ""
 
-#: ../telemetry-data-collection.rst:716
+#: ../telemetry-data-collection.rst:717
 msgid ""
 "The parameters section can contain transformer specific fields, like source "
 "and target fields with different subfields in case of the rate of change, "
 "which depends on the implementation of the transformer."
 msgstr ""
 
-#: ../telemetry-data-collection.rst:720
+#: ../telemetry-data-collection.rst:721
 msgid ""
 "In the case of the transformer that creates the ``cpu_util`` meter, the "
 "definition looks like:"
 msgstr ""
 
-#: ../telemetry-data-collection.rst:734
+#: ../telemetry-data-collection.rst:735
 msgid ""
 "The rate of change the transformer generates is the ``cpu_util`` meter from "
 "the sample values of the ``cpu`` counter, which represents cumulative CPU "
@@ -23444,49 +23445,49 @@ msgid ""
 "sequential values of the ``cpu`` meter."
 msgstr ""
 
-#: ../telemetry-data-collection.rst:741
+#: ../telemetry-data-collection.rst:742
 msgid ""
 "The definition for the disk I/O rate, which is also generated by the rate of "
 "change transformer:"
 msgstr ""
 
-#: ../telemetry-data-collection.rst:759
+#: ../telemetry-data-collection.rst:760
 msgid "**Unit conversion transformer**"
 msgstr ""
 
-#: ../telemetry-data-collection.rst:761
+#: ../telemetry-data-collection.rst:762
 msgid ""
 "Transformer to apply a unit conversion. It takes the volume of the meter and "
 "multiplies it with the given ``scale`` expression. Also supports "
 "``map_from`` and ``map_to`` like the rate of change transformer."
 msgstr ""
 
-#: ../telemetry-data-collection.rst:765
+#: ../telemetry-data-collection.rst:766
 msgid "Sample configuration:"
 msgstr ""
 
-#: ../telemetry-data-collection.rst:777
+#: ../telemetry-data-collection.rst:778
 msgid "With ``map_from`` and ``map_to``:"
 msgstr ""
 
-#: ../telemetry-data-collection.rst:793
+#: ../telemetry-data-collection.rst:794
 msgid "**Aggregator transformer**"
 msgstr ""
 
-#: ../telemetry-data-collection.rst:795
+#: ../telemetry-data-collection.rst:796
 msgid ""
 "A transformer that sums up the incoming samples until enough samples have "
 "come in or a timeout has been reached."
 msgstr ""
 
-#: ../telemetry-data-collection.rst:798
+#: ../telemetry-data-collection.rst:799
 msgid ""
 "Timeout can be specified with the ``retention_time`` option. If we want to "
 "flush the aggregation after a set number of samples have been aggregated, we "
 "can specify the size parameter."
 msgstr ""
 
-#: ../telemetry-data-collection.rst:802
+#: ../telemetry-data-collection.rst:803
 msgid ""
 "The volume of the created sample is the sum of the volumes of samples that "
 "came into the transformer. Samples can be aggregated by the attributes "
@@ -23497,40 +23498,40 @@ msgid ""
 "attribute)."
 msgstr ""
 
-#: ../telemetry-data-collection.rst:810
+#: ../telemetry-data-collection.rst:811
 msgid ""
 "To aggregate 60s worth of samples by ``resource_metadata`` and keep the "
 "``resource_metadata`` of the latest received sample:"
 msgstr ""
 
-#: ../telemetry-data-collection.rst:821
+#: ../telemetry-data-collection.rst:822
 msgid ""
 "To aggregate each 15 samples by ``user_id`` and ``resource_metadata`` and "
 "keep the ``user_id`` of the first received sample and drop the "
 "``resource_metadata``:"
 msgstr ""
 
-#: ../telemetry-data-collection.rst:834
+#: ../telemetry-data-collection.rst:835
 msgid "**Accumulator transformer**"
 msgstr ""
 
-#: ../telemetry-data-collection.rst:836
+#: ../telemetry-data-collection.rst:837
 msgid ""
 "This transformer simply caches the samples until enough samples have arrived "
 "and then flushes them all down the pipeline at once:"
 msgstr ""
 
-#: ../telemetry-data-collection.rst:846
+#: ../telemetry-data-collection.rst:847
 msgid "**Muli meter arithmetic transformer**"
 msgstr ""
 
-#: ../telemetry-data-collection.rst:848
+#: ../telemetry-data-collection.rst:849
 msgid ""
 "This transformer enables us to perform arithmetic calculations over one or "
 "more meters and/or their metadata, for example:"
 msgstr ""
 
-#: ../telemetry-data-collection.rst:855
+#: ../telemetry-data-collection.rst:856
 msgid ""
 "A new sample is created with the properties described in the ``target`` "
 "section of the transformer's configuration. The sample's volume is the "
@@ -23538,41 +23539,41 @@ msgid ""
 "from the same resource."
 msgstr ""
 
-#: ../telemetry-data-collection.rst:862
+#: ../telemetry-data-collection.rst:863
 msgid "The calculation is limited to meters with the same interval."
 msgstr ""
 
-#: ../telemetry-data-collection.rst:864 ../telemetry-data-collection.rst:901
+#: ../telemetry-data-collection.rst:865 ../telemetry-data-collection.rst:902
 msgid "Example configuration:"
 msgstr ""
 
-#: ../telemetry-data-collection.rst:877
+#: ../telemetry-data-collection.rst:878
 msgid ""
 "To demonstrate the use of metadata, here is the implementation of a silly "
 "meter that shows average CPU time per core:"
 msgstr ""
 
-#: ../telemetry-data-collection.rst:893
+#: ../telemetry-data-collection.rst:894
 msgid ""
 "Expression evaluation gracefully handles NaNs and exceptions. In such a case "
 "it does not create a new sample but only logs a warning."
 msgstr ""
 
-#: ../telemetry-data-collection.rst:896
+#: ../telemetry-data-collection.rst:897
 msgid "**Delta transformer**"
 msgstr ""
 
-#: ../telemetry-data-collection.rst:898
+#: ../telemetry-data-collection.rst:899
 msgid ""
 "This transformer calculates the change between two sample datapoints of a "
 "resource. It can be configured to capture only the positive growth deltas."
 msgstr ""
 
-#: ../telemetry-data-collection.rst:915
+#: ../telemetry-data-collection.rst:916
 msgid "Meter definitions"
 msgstr ""
 
-#: ../telemetry-data-collection.rst:916
+#: ../telemetry-data-collection.rst:917
 msgid ""
 "The Telemetry service collects a subset of the meters by filtering "
 "notifications emitted by other OpenStack services. Starting with the Liberty "
@@ -23582,18 +23583,18 @@ msgid ""
 "``meter.yaml`` file without any need for additional code changes."
 msgstr ""
 
-#: ../telemetry-data-collection.rst:925
+#: ../telemetry-data-collection.rst:926
 msgid ""
 "The ``meter.yaml`` file should be modified with care. Unless intended do not "
 "remove any existing meter definitions from the file. Also, the collected "
 "meters can differ in some cases from what is referenced in the documentation."
 msgstr ""
 
-#: ../telemetry-data-collection.rst:930
+#: ../telemetry-data-collection.rst:931
 msgid "A standard meter definition looks like:"
 msgstr ""
 
-#: ../telemetry-data-collection.rst:944
+#: ../telemetry-data-collection.rst:945
 msgid ""
 "The definition above shows a simple meter definition with some fields, from "
 "which ``name``, ``event_type``, ``type``, ``unit``, and ``volume`` are "
@@ -23601,7 +23602,7 @@ msgid ""
 "the meter."
 msgstr ""
 
-#: ../telemetry-data-collection.rst:949
+#: ../telemetry-data-collection.rst:950
 msgid ""
 "If you take a look at the ``meter.yaml`` file, it contains the sample "
 "definitions for all the meters that Telemetry is collecting from "
@@ -23614,48 +23615,48 @@ msgid ""
 "define it like ``$.payload.size``."
 msgstr ""
 
-#: ../telemetry-data-collection.rst:959
+#: ../telemetry-data-collection.rst:960
 msgid ""
 "A notification message may contain multiple meters. You can use ``*`` in the "
 "meter definition to capture all the meters and generate samples "
 "respectively. You can use wild cards as shown in the following example:"
 msgstr ""
 
-#: ../telemetry-data-collection.rst:976
+#: ../telemetry-data-collection.rst:977
 msgid ""
 "In the above example, the ``name`` field is a json path with matching a list "
 "of meter names defined in the notification message."
 msgstr ""
 
-#: ../telemetry-data-collection.rst:979
+#: ../telemetry-data-collection.rst:980
 msgid ""
 "You can even use complex operations on json paths. In the following example, "
 "``volume`` and ``resource_id`` fields perform an arithmetic and string "
 "concatenation:"
 msgstr ""
 
-#: ../telemetry-data-collection.rst:995
+#: ../telemetry-data-collection.rst:996
 msgid ""
 "You will find some existence meters in the ``meter.yaml``. These meters have "
 "a ``volume`` as ``1`` and are at the bottom of the yaml file with a note "
 "suggesting that these will be removed in Mitaka release."
 msgstr ""
 
-#: ../telemetry-data-collection.rst:999
+#: ../telemetry-data-collection.rst:1000
 msgid "For example, the meter definition for existence meters is as follows:"
 msgstr ""
 
-#: ../telemetry-data-collection.rst:1015
+#: ../telemetry-data-collection.rst:1016
 msgid ""
 "These meters are not loaded by default. To load these meters, flip the "
 "`disable_non_metric_meters` option in the ``ceilometer.conf`` file."
 msgstr ""
 
-#: ../telemetry-data-collection.rst:1020
+#: ../telemetry-data-collection.rst:1021
 msgid "Block Storage audit script setup to get notifications"
 msgstr ""
 
-#: ../telemetry-data-collection.rst:1022
+#: ../telemetry-data-collection.rst:1023
 msgid ""
 "If you want to collect OpenStack Block Storage notification on demand, you "
 "can use :command:`cinder-volume-usage-audit` from OpenStack Block Storage. "
@@ -23665,7 +23666,7 @@ msgid ""
 "following format:"
 msgstr ""
 
-#: ../telemetry-data-collection.rst:1034
+#: ../telemetry-data-collection.rst:1035
 msgid ""
 "This script outputs what volumes or snapshots were created, deleted, or "
 "exists in a given period of time and some information about these volumes or "
@@ -23674,17 +23675,17 @@ msgid ""
 "which is the recommended usage as it provides better indexing of data."
 msgstr ""
 
-#: ../telemetry-data-collection.rst:1041
+#: ../telemetry-data-collection.rst:1042
 msgid ""
 "Using this script via cron you can get notifications periodically, for "
 "example, every 5 minutes::"
 msgstr ""
 
-#: ../telemetry-data-collection.rst:1049
+#: ../telemetry-data-collection.rst:1050
 msgid "Storing samples"
 msgstr ""
 
-#: ../telemetry-data-collection.rst:1051
+#: ../telemetry-data-collection.rst:1052
 msgid ""
 "The Telemetry service has a separate service that is responsible for "
 "persisting the data that comes from the pollsters or is received as "
@@ -23694,7 +23695,7 @@ msgid ""
 "using an HTTP dispatcher."
 msgstr ""
 
-#: ../telemetry-data-collection.rst:1058
+#: ../telemetry-data-collection.rst:1059
 msgid ""
 "The ``ceilometer-collector`` service receives the data as messages from the "
 "message bus of the configured AMQP service. It sends these datapoints "
@@ -23702,11 +23703,11 @@ msgid ""
 "a host machine from which it has access to the configured dispatcher."
 msgstr ""
 
-#: ../telemetry-data-collection.rst:1066
+#: ../telemetry-data-collection.rst:1067
 msgid "Multiple dispatchers can be configured for Telemetry at one time."
 msgstr ""
 
-#: ../telemetry-data-collection.rst:1068
+#: ../telemetry-data-collection.rst:1069
 msgid ""
 "Multiple ``ceilometer-collector`` processes can be run at a time. It is also "
 "supported to start multiple worker threads per collector process. The "
@@ -23716,11 +23717,11 @@ msgid ""
 "conf`` configuration file."
 msgstr ""
 
-#: ../telemetry-data-collection.rst:1076
+#: ../telemetry-data-collection.rst:1077
 msgid "Database dispatcher"
 msgstr ""
 
-#: ../telemetry-data-collection.rst:1078
+#: ../telemetry-data-collection.rst:1079
 msgid ""
 "When the database dispatcher is configured as data store, you have the "
 "option to set a ``time_to_live`` option (ttl) for samples. By default the "
@@ -23728,7 +23729,7 @@ msgid ""
 "in the database forever."
 msgstr ""
 
-#: ../telemetry-data-collection.rst:1083
+#: ../telemetry-data-collection.rst:1084
 msgid ""
 "The time to live value is specified in seconds. Each sample has a time "
 "stamp, and the ``ttl`` value indicates that a sample will be deleted from "
@@ -23737,7 +23738,7 @@ msgid ""
 "samples older than 600 seconds will be purged from the database."
 msgstr ""
 
-#: ../telemetry-data-collection.rst:1090
+#: ../telemetry-data-collection.rst:1091
 msgid ""
 "Certain databases support native TTL expiration. In cases where this is not "
 "possible, a command-line script, which you can use for this purpose is "
@@ -23745,57 +23746,57 @@ msgid ""
 "your database in a consistent state."
 msgstr ""
 
-#: ../telemetry-data-collection.rst:1095
+#: ../telemetry-data-collection.rst:1096
 msgid "The level of support differs in case of the configured back end:"
 msgstr ""
 
-#: ../telemetry-data-collection.rst:1098
+#: ../telemetry-data-collection.rst:1099
 msgid "TTL value support"
 msgstr ""
 
-#: ../telemetry-data-collection.rst:1100
+#: ../telemetry-data-collection.rst:1101
 msgid "MongoDB"
 msgstr ""
 
-#: ../telemetry-data-collection.rst:1100
+#: ../telemetry-data-collection.rst:1101
 msgid ""
 "MongoDB has native TTL support for deleting samples that are older than the "
 "configured ttl value."
 msgstr ""
 
-#: ../telemetry-data-collection.rst:1104
+#: ../telemetry-data-collection.rst:1105
 msgid "SQL-based back ends"
 msgstr ""
 
-#: ../telemetry-data-collection.rst:1104
+#: ../telemetry-data-collection.rst:1105
 msgid ""
 "``ceilometer-expirer`` has to be used for deleting samples and its related "
 "data from the database."
 msgstr ""
 
-#: ../telemetry-data-collection.rst:1108
+#: ../telemetry-data-collection.rst:1109
 msgid "HBase"
 msgstr ""
 
-#: ../telemetry-data-collection.rst:1108
+#: ../telemetry-data-collection.rst:1109
 msgid ""
 "Telemetry's HBase support does not include native TTL nor ``ceilometer-"
 "expirer`` support."
 msgstr ""
 
-#: ../telemetry-data-collection.rst:1112
+#: ../telemetry-data-collection.rst:1113
 msgid "DB2 NoSQL"
 msgstr ""
 
-#: ../telemetry-data-collection.rst:1112
+#: ../telemetry-data-collection.rst:1113
 msgid "DB2 NoSQL does not have native TTL nor ``ceilometer-expirer`` support."
 msgstr ""
 
-#: ../telemetry-data-collection.rst:1118
+#: ../telemetry-data-collection.rst:1119
 msgid "HTTP dispatcher"
 msgstr ""
 
-#: ../telemetry-data-collection.rst:1120
+#: ../telemetry-data-collection.rst:1121
 msgid ""
 "The Telemetry service supports sending samples to an external HTTP target. "
 "The samples are sent without any modification. To set this option as the "
@@ -23806,11 +23807,11 @@ msgid ""
 "html>`__ in the OpenStack Configuration Reference."
 msgstr ""
 
-#: ../telemetry-data-collection.rst:1129
+#: ../telemetry-data-collection.rst:1130
 msgid "File dispatcher"
 msgstr ""
 
-#: ../telemetry-data-collection.rst:1131
+#: ../telemetry-data-collection.rst:1132
 msgid ""
 "You can store samples in a file by setting the ``dispatcher`` option in the "
 "``ceilometer.conf`` file. For the list of configuration options, see the "
@@ -23819,18 +23820,18 @@ msgid ""
 "Configuration Reference."
 msgstr ""
 
-#: ../telemetry-data-collection.rst:1138
+#: ../telemetry-data-collection.rst:1139
 msgid "Gnocchi dispatcher"
 msgstr ""
 
-#: ../telemetry-data-collection.rst:1140
+#: ../telemetry-data-collection.rst:1141
 msgid ""
 "The Telemetry service supports sending the metering data to Gnocchi back end "
 "through the gnocchi dispatcher. To set this option as the target, change the "
 "``dispatcher`` to ``gnocchi`` in the ``ceilometer.conf`` configuration file."
 msgstr ""
 
-#: ../telemetry-data-collection.rst:1145
+#: ../telemetry-data-collection.rst:1146
 msgid ""
 "For the list of options that you need to set, see the `dispatcher_gnocchi "
 "section <http://docs.openstack.org/liberty/config-reference/content/"
@@ -24190,7 +24191,7 @@ msgid ""
 "used:"
 msgstr ""
 
-#: ../telemetry-data-retrieval.rst:231
+#: ../telemetry-data-retrieval.rst:232
 msgid ""
 "The :command:`ceilometer` command was run with ``admin`` rights, which means "
 "that all the data is accessible in the database. For more information about "
@@ -24202,7 +24203,7 @@ msgid ""
 "meters per resource, in an ascending order based on the name of the meter."
 msgstr ""
 
-#: ../telemetry-data-retrieval.rst:240
+#: ../telemetry-data-retrieval.rst:241
 msgid ""
 "Samples are collected for each meter that is present in the list of meters, "
 "except in case of instances that are not running or deleted from the "
@@ -24215,19 +24216,19 @@ msgid ""
 "`telemetry-storing-samples`."
 msgstr ""
 
-#: ../telemetry-data-retrieval.rst:250
+#: ../telemetry-data-retrieval.rst:251
 msgid ""
 "The Telemetry API supports simple query on the meter endpoint. The query "
 "functionality has the following syntax:"
 msgstr ""
 
-#: ../telemetry-data-retrieval.rst:257
+#: ../telemetry-data-retrieval.rst:258
 msgid ""
 "The following command needs to be invoked to request the meters of one VM "
 "instance:"
 msgstr ""
 
-#: ../telemetry-data-retrieval.rst:284
+#: ../telemetry-data-retrieval.rst:286
 msgid ""
 "As it was described above, the whole set of samples can be retrieved that "
 "are stored for a meter or filtering the result set by using one of the "
@@ -24235,66 +24236,66 @@ msgid ""
 "without any additional filtering looks like the following:"
 msgstr ""
 
-#: ../telemetry-data-retrieval.rst:304
+#: ../telemetry-data-retrieval.rst:307
 msgid ""
 "The result set of the request contains the samples for both instances "
 "ordered by the timestamp field in the default descending order."
 msgstr ""
 
-#: ../telemetry-data-retrieval.rst:307
+#: ../telemetry-data-retrieval.rst:310
 msgid ""
 "The simple query makes it possible to retrieve only a subset of the "
 "collected samples. The following command can be executed to request the "
 "``cpu`` samples of only one of the VM instances:"
 msgstr ""
 
-#: ../telemetry-data-retrieval.rst:327
+#: ../telemetry-data-retrieval.rst:331
 msgid ""
 "As it can be seen on the output above, the result set contains samples for "
 "only one instance of the two."
 msgstr ""
 
-#: ../telemetry-data-retrieval.rst:330
+#: ../telemetry-data-retrieval.rst:334
 msgid ""
 "The :command:`ceilometer query-samples` command is used to execute rich "
 "queries. This command accepts the following parameters:"
 msgstr ""
 
-#: ../telemetry-data-retrieval.rst:334
+#: ../telemetry-data-retrieval.rst:338
 msgid ""
 "Contains the filter expression for the query in the form of: ``{complex_op: "
 "[{simple_op: {field_name: value}}]}``."
 msgstr ""
 
-#: ../telemetry-data-retrieval.rst:335
+#: ../telemetry-data-retrieval.rst:339
 msgid "``--filter``"
 msgstr ""
 
-#: ../telemetry-data-retrieval.rst:338
+#: ../telemetry-data-retrieval.rst:342
 msgid ""
 "Contains the list of ``orderby`` expressions in the form of: ``[{field_name: "
 "direction}, {field_name: direction}]``."
 msgstr ""
 
-#: ../telemetry-data-retrieval.rst:339
+#: ../telemetry-data-retrieval.rst:343
 msgid "``--orderby``"
 msgstr ""
 
-#: ../telemetry-data-retrieval.rst:342
+#: ../telemetry-data-retrieval.rst:346
 msgid "Specifies the maximum number of samples to return."
 msgstr ""
 
-#: ../telemetry-data-retrieval.rst:342
+#: ../telemetry-data-retrieval.rst:346
 msgid "``--limit``"
 msgstr ""
 
-#: ../telemetry-data-retrieval.rst:344
+#: ../telemetry-data-retrieval.rst:348
 msgid ""
 "For more information about complex queries see :ref:`Complex query <complex-"
 "query>`."
 msgstr ""
 
-#: ../telemetry-data-retrieval.rst:347
+#: ../telemetry-data-retrieval.rst:351
 msgid ""
 "As the complex query functionality provides the possibility of using complex "
 "operators, it is possible to retrieve a subset of samples for a given VM "
@@ -24302,20 +24303,20 @@ msgid ""
 "read.bytes`` meters, the following command should be invoked:"
 msgstr ""
 
-#: ../telemetry-data-retrieval.rst:368
+#: ../telemetry-data-retrieval.rst:373
 msgid ""
 "Ceilometer also captures data as events, which represents the state of a "
 "resource. Refer to ``/telemetry-events`` for more information regarding "
 "Events."
 msgstr ""
 
-#: ../telemetry-data-retrieval.rst:372
+#: ../telemetry-data-retrieval.rst:377
 msgid ""
 "To retrieve a list of recent events that occurred in the system, the "
 "following command can be executed:"
 msgstr ""
 
-#: ../telemetry-data-retrieval.rst:406
+#: ../telemetry-data-retrieval.rst:412
 msgid ""
 "In Liberty, the data returned corresponds to the role and user. Non-admin "
 "users will only return events that are scoped to them. Admin users will "
@@ -24323,13 +24324,13 @@ msgid ""
 "unscoped events."
 msgstr ""
 
-#: ../telemetry-data-retrieval.rst:411
+#: ../telemetry-data-retrieval.rst:417
 msgid ""
 "Similar to querying meters, additional filter parameters can be given to "
 "retrieve specific events:"
 msgstr ""
 
-#: ../telemetry-data-retrieval.rst:447
+#: ../telemetry-data-retrieval.rst:454
 msgid ""
 "As of the Liberty release, the number of items returned will be restricted "
 "to the value defined by ``default_api_return_limit`` in the ``ceilometer."
@@ -24337,44 +24338,44 @@ msgid ""
 "passing the ``limit`` option in the request."
 msgstr ""
 
-#: ../telemetry-data-retrieval.rst:454
+#: ../telemetry-data-retrieval.rst:461
 msgid "Telemetry Python bindings"
 msgstr ""
 
-#: ../telemetry-data-retrieval.rst:456
+#: ../telemetry-data-retrieval.rst:463
 msgid ""
 "The command-line client library provides python bindings in order to use the "
 "Telemetry Python API directly from python programs."
 msgstr ""
 
-#: ../telemetry-data-retrieval.rst:459
+#: ../telemetry-data-retrieval.rst:466
 msgid ""
 "The first step in setting up the client is to create a client instance with "
 "the proper credentials:"
 msgstr ""
 
-#: ../telemetry-data-retrieval.rst:467
+#: ../telemetry-data-retrieval.rst:474
 msgid ""
 "The ``VERSION`` parameter can be ``1`` or ``2``, specifying the API version "
 "to be used."
 msgstr ""
 
-#: ../telemetry-data-retrieval.rst:470
+#: ../telemetry-data-retrieval.rst:477
 msgid "The method calls look like the following:"
 msgstr ""
 
-#: ../telemetry-data-retrieval.rst:480
+#: ../telemetry-data-retrieval.rst:487
 msgid ""
 "For further details about the python-ceilometerclient package, see the "
 "`Python bindings to the OpenStack Ceilometer API <http://docs.openstack.org/"
 "developer/python-ceilometerclient/>`__ reference."
 msgstr ""
 
-#: ../telemetry-data-retrieval.rst:488
+#: ../telemetry-data-retrieval.rst:495
 msgid "Publishers"
 msgstr ""
 
-#: ../telemetry-data-retrieval.rst:490
+#: ../telemetry-data-retrieval.rst:497
 msgid ""
 "The Telemetry service provides several transport methods to forward the data "
 "collected to the ``ceilometer-collector`` service or to an external system. "
@@ -24384,14 +24385,14 @@ msgid ""
 "requirements of both kind of systems, as it is described below."
 msgstr ""
 
-#: ../telemetry-data-retrieval.rst:498
+#: ../telemetry-data-retrieval.rst:505
 msgid ""
 "The publisher component makes it possible to persist the data into storage "
 "through the message bus or to send it to one or more external consumers. One "
 "chain can contain multiple publishers."
 msgstr ""
 
-#: ../telemetry-data-retrieval.rst:502
+#: ../telemetry-data-retrieval.rst:509
 msgid ""
 "To solve the above mentioned problem, the notion of multi-publisher can be "
 "configured for each datapoint within the Telemetry service, allowing the "
@@ -24399,7 +24400,7 @@ msgid ""
 "destinations, each potentially using a different transport."
 msgstr ""
 
-#: ../telemetry-data-retrieval.rst:507
+#: ../telemetry-data-retrieval.rst:514
 msgid ""
 "Publishers can be specified in the ``publishers`` section for each pipeline "
 "(for further details about pipelines see :ref:`data-collection-and-"
@@ -24407,22 +24408,22 @@ msgid ""
 "org/cgit/openstack/ceilometer/plain/etc/ceilometer/pipeline.yaml>`__ file."
 msgstr ""
 
-#: ../telemetry-data-retrieval.rst:514
+#: ../telemetry-data-retrieval.rst:521
 msgid "The following publisher types are supported:"
 msgstr ""
 
-#: ../telemetry-data-retrieval.rst:517
+#: ../telemetry-data-retrieval.rst:524
 msgid ""
 "It can be specified in the form of ``notifier://?"
 "option1=value1&option2=value2``. It emits data over AMQP using oslo."
 "messaging. This is the recommended method of publishing."
 msgstr ""
 
-#: ../telemetry-data-retrieval.rst:520
+#: ../telemetry-data-retrieval.rst:527
 msgid "notifier"
 msgstr ""
 
-#: ../telemetry-data-retrieval.rst:523
+#: ../telemetry-data-retrieval.rst:530
 msgid ""
 "It can be specified in the form of ``rpc://?option1=value1&option2=value2``. "
 "It emits metering data over lossy AMQP. This method is synchronous and may "
@@ -24430,121 +24431,121 @@ msgid ""
 "favor of the notifier publisher."
 msgstr ""
 
-#: ../telemetry-data-retrieval.rst:527
+#: ../telemetry-data-retrieval.rst:534
 msgid "rpc"
 msgstr ""
 
-#: ../telemetry-data-retrieval.rst:530
+#: ../telemetry-data-retrieval.rst:537
 msgid ""
 "It can be specified in the form of ``udp://<host>:<port>/``. It emits "
 "metering data for over UDP."
 msgstr ""
 
-#: ../telemetry-data-retrieval.rst:531
+#: ../telemetry-data-retrieval.rst:538
 msgid "udp"
 msgstr ""
 
-#: ../telemetry-data-retrieval.rst:534
+#: ../telemetry-data-retrieval.rst:541
 msgid ""
 "It can be specified in the form of ``file://path?"
 "option1=value1&option2=value2``. This publisher records metering data into a "
 "file."
 msgstr ""
 
-#: ../telemetry-data-retrieval.rst:536
+#: ../telemetry-data-retrieval.rst:543
 msgid "file"
 msgstr ""
 
-#: ../telemetry-data-retrieval.rst:540
+#: ../telemetry-data-retrieval.rst:547
 msgid ""
 "If a file name and location is not specified, this publisher does not log "
 "any meters, instead it logs a warning message in the configured log file for "
 "Telemetry."
 msgstr ""
 
-#: ../telemetry-data-retrieval.rst:545
+#: ../telemetry-data-retrieval.rst:552
 msgid ""
 "It can be specified in the form of: ``kafka://kafka_broker_ip: "
 "kafka_broker_port?topic=kafka_topic &option1=value1``."
 msgstr ""
 
-#: ../telemetry-data-retrieval.rst:549
+#: ../telemetry-data-retrieval.rst:556
 msgid "This publisher sends metering data to a kafka broker."
 msgstr ""
 
-#: ../telemetry-data-retrieval.rst:549
+#: ../telemetry-data-retrieval.rst:556
 msgid "kafka"
 msgstr ""
 
-#: ../telemetry-data-retrieval.rst:553
+#: ../telemetry-data-retrieval.rst:560
 msgid ""
 "If the topic parameter is missing, this publisher brings out metering data "
 "under a topic name, ``ceilometer``. When the port number is not specified, "
 "this publisher uses 9092 as the broker's port."
 msgstr ""
 
-#: ../telemetry-data-retrieval.rst:558
+#: ../telemetry-data-retrieval.rst:565
 msgid ""
 "The following options are available for ``rpc`` and ``notifier``. The policy "
 "option can be used by ``kafka`` publisher:"
 msgstr ""
 
-#: ../telemetry-data-retrieval.rst:562
+#: ../telemetry-data-retrieval.rst:569
 msgid ""
 "The value of it is 1. It is used for publishing the samples on additional "
 "``metering_topic.sample_name`` topic queue besides the default "
 "``metering_topic`` queue."
 msgstr ""
 
-#: ../telemetry-data-retrieval.rst:564
+#: ../telemetry-data-retrieval.rst:571
 msgid "``per_meter_topic``"
 msgstr ""
 
-#: ../telemetry-data-retrieval.rst:567
+#: ../telemetry-data-retrieval.rst:574
 msgid ""
 "It is used for configuring the behavior for the case, when the publisher "
 "fails to send the samples, where the possible predefined values are the "
 "following:"
 msgstr ""
 
-#: ../telemetry-data-retrieval.rst:572
+#: ../telemetry-data-retrieval.rst:579
 msgid "Used for waiting and blocking until the samples have been sent."
 msgstr ""
 
-#: ../telemetry-data-retrieval.rst:572
+#: ../telemetry-data-retrieval.rst:579
 msgid "default"
 msgstr ""
 
-#: ../telemetry-data-retrieval.rst:575
+#: ../telemetry-data-retrieval.rst:582
 msgid "Used for dropping the samples which are failed to be sent."
 msgstr ""
 
-#: ../telemetry-data-retrieval.rst:575
+#: ../telemetry-data-retrieval.rst:582
 msgid "drop"
 msgstr ""
 
-#: ../telemetry-data-retrieval.rst:578
+#: ../telemetry-data-retrieval.rst:585
 msgid ""
 "Used for creating an in-memory queue and retrying to send the samples on the "
 "queue on the next samples publishing period (the queue length can be "
 "configured with ``max_queue_length``, where 1024 is the default value)."
 msgstr ""
 
-#: ../telemetry-data-retrieval.rst:581
+#: ../telemetry-data-retrieval.rst:588
 msgid "``policy``"
 msgstr ""
 
-#: ../telemetry-data-retrieval.rst:581
+#: ../telemetry-data-retrieval.rst:588
 msgid "queue"
 msgstr ""
 
-#: ../telemetry-data-retrieval.rst:583
+#: ../telemetry-data-retrieval.rst:590
 msgid ""
 "The following option is additionally available for the ``notifier`` "
 "publisher:"
 msgstr ""
 
-#: ../telemetry-data-retrieval.rst:586
+#: ../telemetry-data-retrieval.rst:593
 msgid ""
 "The topic name of queue to publish to. Setting this will override the "
 "default topic defined by ``metering_topic`` and ``event_topic`` options. "
@@ -24552,26 +24553,26 @@ msgid ""
 "feature was added in Kilo."
 msgstr ""
 
-#: ../telemetry-data-retrieval.rst:589
+#: ../telemetry-data-retrieval.rst:596
 msgid "``topic``"
 msgstr ""
 
-#: ../telemetry-data-retrieval.rst:591
+#: ../telemetry-data-retrieval.rst:598
 msgid "The following options are available for the ``file`` publisher:"
 msgstr ""
 
-#: ../telemetry-data-retrieval.rst:594
+#: ../telemetry-data-retrieval.rst:601
 msgid ""
 "When this option is greater than zero, it will cause a rollover. When the "
 "size is about to be exceeded, the file is closed and a new file is silently "
 "opened for output. If its value is zero, rollover never occurs."
 msgstr ""
 
-#: ../telemetry-data-retrieval.rst:597
+#: ../telemetry-data-retrieval.rst:604
 msgid "``max_bytes``"
 msgstr ""
 
-#: ../telemetry-data-retrieval.rst:600
+#: ../telemetry-data-retrieval.rst:607
 msgid ""
 "If this value is non-zero, an extension will be appended to the filename of "
 "the old log, as '.1', '.2', and so forth until the specified value is "
@@ -24579,11 +24580,11 @@ msgid ""
 "one that is specified without any extensions."
 msgstr ""
 
-#: ../telemetry-data-retrieval.rst:604
+#: ../telemetry-data-retrieval.rst:611
 msgid "``backup_count``"
 msgstr ""
 
-#: ../telemetry-data-retrieval.rst:606
+#: ../telemetry-data-retrieval.rst:613
 msgid ""
 "The default publisher is ``notifier``, without any additional options "
 "specified. A sample ``publishers`` section in the ``/etc/ceilometer/pipeline."
diff --git a/doc/common-rst/source/locale/ja/LC_MESSAGES/common-rst.po b/doc/common-rst/source/locale/ja/LC_MESSAGES/common-rst.po
index 18b305ff9d..af39bca460 100644
--- a/doc/common-rst/source/locale/ja/LC_MESSAGES/common-rst.po
+++ b/doc/common-rst/source/locale/ja/LC_MESSAGES/common-rst.po
@@ -17,11 +17,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Common documents 1.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-19 01:08+0000\n"
+"POT-Creation-Date: 2015-12-23 15:33+0000\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2015-12-16 04:56+0000\n"
+"PO-Revision-Date: 2015-12-24 04:42+0000\n"
 "Last-Translator: Akihiro Motoki <amotoki@gmail.com>\n"
 "Language: ja\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
@@ -697,6 +697,9 @@ msgstr ""
 msgid "A collector (``ceilometer-collector``)"
 msgstr "コレクター (``ceilometer-collector``)"
 
+msgid "A comment with additional information that explains a part of the text."
+msgstr "本文を補足する説明コメントです。"
+
 msgid ""
 "A community project may be elevated to this status and is then promoted to a "
 "core project."
@@ -4212,6 +4215,9 @@ msgstr "OpenStack 固有形式の Heat の入力データ。"
 msgid "Help URL"
 msgstr "ヘルプ URL"
 
+msgid "Helpful information that prevents the user from making mistakes."
+msgstr "ユーザーが間違いやすい箇所についてアドバイスです。"
+
 msgid ""
 "High-availability mode for legacy (nova) networking. Each compute node "
 "handles NAT and DHCP and acts as a gateway for all of the VMs on it. A "
diff --git a/doc/config-reference/source/locale/config-reference.pot b/doc/config-reference/source/locale/config-reference.pot
index 7a92852b6e..69fc51054e 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: 2015-12-22 06:41+0000\n"
+"POT-Creation-Date: 2015-12-24 06:13+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"
@@ -1032,7 +1032,7 @@ msgstr ""
 #: ../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
-#: ../block-storage/drivers/hpe-3par-driver.rst:58
+#: ../block-storage/drivers/hpe-3par-driver.rst:62
 #: ../block-storage/drivers/hpe-lefthand-driver.rst:42
 #: ../block-storage/drivers/ibm-flashsystem-volume-driver.rst:222
 #: ../block-storage/drivers/lenovo-driver.rst:26
@@ -1446,7 +1446,7 @@ msgstr ""
 #: ../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:60
+#: ../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
@@ -1468,7 +1468,7 @@ msgstr ""
 #: ../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
-#: ../block-storage/drivers/hpe-3par-driver.rst:62
+#: ../block-storage/drivers/hpe-3par-driver.rst:66
 #: ../block-storage/drivers/hpe-lefthand-driver.rst:46
 #: ../block-storage/drivers/ibm-flashsystem-volume-driver.rst:228
 #: ../block-storage/drivers/lenovo-driver.rst:30
@@ -1492,7 +1492,7 @@ msgstr ""
 #: ../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
-#: ../block-storage/drivers/hpe-3par-driver.rst:70
+#: ../block-storage/drivers/hpe-3par-driver.rst:74
 #: ../block-storage/drivers/hpe-lefthand-driver.rst:54
 #: ../block-storage/drivers/ibm-flashsystem-volume-driver.rst:236
 #: ../block-storage/drivers/lenovo-driver.rst:38
@@ -1748,7 +1748,7 @@ msgstr ""
 #: ../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:64
+#: ../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
@@ -1771,7 +1771,7 @@ msgstr ""
 #: ../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:66
+#: ../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
@@ -1793,7 +1793,7 @@ msgstr ""
 #: ../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:68
+#: ../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
@@ -1816,7 +1816,7 @@ msgstr ""
 #: ../block-storage/drivers/hds-hnas-driver.rst:20
 #: ../block-storage/drivers/hitachi-storage-volume-driver.rst:45
 #: ../block-storage/drivers/hp-msa-driver.rst:39
-#: ../block-storage/drivers/hpe-3par-driver.rst:72
+#: ../block-storage/drivers/hpe-3par-driver.rst:76
 #: ../block-storage/drivers/hpe-lefthand-driver.rst:56
 #: ../block-storage/drivers/ibm-flashsystem-volume-driver.rst:238
 #: ../block-storage/drivers/lenovo-driver.rst:40
@@ -1962,7 +1962,7 @@ msgstr ""
 
 #: ../block-storage/drivers/dothill-driver.rst:43
 #: ../block-storage/drivers/hp-msa-driver.rst:41
-#: ../block-storage/drivers/hpe-3par-driver.rst:74
+#: ../block-storage/drivers/hpe-3par-driver.rst:78
 #: ../block-storage/drivers/hpe-lefthand-driver.rst:60
 #: ../block-storage/drivers/lenovo-driver.rst:42
 msgid "Migrate a volume with back-end assistance."
@@ -1972,7 +1972,7 @@ msgstr ""
 #: ../block-storage/drivers/emc-vmax-driver.rst:41
 #: ../block-storage/drivers/emc-vnx-driver.rst:33
 #: ../block-storage/drivers/hp-msa-driver.rst:43
-#: ../block-storage/drivers/hpe-3par-driver.rst:76
+#: ../block-storage/drivers/hpe-3par-driver.rst:80
 #: ../block-storage/drivers/hpe-lefthand-driver.rst:62
 #: ../block-storage/drivers/lenovo-driver.rst:44
 #: ../block-storage/drivers/solidfire-volume-driver.rst:70
@@ -1983,7 +1983,7 @@ msgstr ""
 #: ../block-storage/drivers/emc-xtremio-driver.rst:32
 #: ../block-storage/drivers/hds-hnas-driver.rst:22
 #: ../block-storage/drivers/hp-msa-driver.rst:45
-#: ../block-storage/drivers/hpe-3par-driver.rst:78
+#: ../block-storage/drivers/hpe-3par-driver.rst:82
 #: ../block-storage/drivers/hpe-lefthand-driver.rst:64
 #: ../block-storage/drivers/lenovo-driver.rst:46
 #: ../block-storage/drivers/pure-storage-driver.rst:38
@@ -2898,7 +2898,7 @@ msgid "Back-end configuration"
 msgstr ""
 
 #: ../block-storage/drivers/emc-vnx-driver.rst:118
-#: ../block-storage/drivers/hpe-3par-driver.rst:273
+#: ../block-storage/drivers/hpe-3par-driver.rst:277
 #: ../block-storage/fc-zoning.rst:17
 msgid "Make the following changes in the ``/etc/cinder/cinder.conf`` file."
 msgstr ""
@@ -5706,61 +5706,68 @@ msgid ""
 msgstr ""
 
 #: ../block-storage/drivers/hpe-3par-driver.rst:49
-msgid "HPE 3PAR Web Services API Server must be enabled and running."
-msgstr ""
-
-#: ../block-storage/drivers/hpe-3par-driver.rst:51
-msgid "One Common Provisioning Group (CPG)."
+msgid ""
+"HPE 3PAR drivers will now check the licenses installed on the array and "
+"disable driver capabilities based on available licenses. This will apply to "
+"thin provisioning, QoS support and volume replication."
 msgstr ""
 
 #: ../block-storage/drivers/hpe-3par-driver.rst:53
+msgid "HPE 3PAR Web Services API Server must be enabled and running."
+msgstr ""
+
+#: ../block-storage/drivers/hpe-3par-driver.rst:55
+msgid "One Common Provisioning Group (CPG)."
+msgstr ""
+
+#: ../block-storage/drivers/hpe-3par-driver.rst:57
 msgid ""
 "Additionally, you must install the ``python-3parclient`` version 4.0.0 or "
 "newer from the Python standard library on the system with the enabled Block "
 "Storage service volume drivers."
 msgstr ""
 
-#: ../block-storage/drivers/hpe-3par-driver.rst:80
+#: ../block-storage/drivers/hpe-3par-driver.rst:84
 #: ../block-storage/drivers/pure-storage-driver.rst:40
 msgid "Manage and unmanage a snapshot."
 msgstr ""
 
-#: ../block-storage/drivers/hpe-3par-driver.rst:82
+#: ../block-storage/drivers/hpe-3par-driver.rst:86
 msgid ""
 "Volume type support for both HPE 3PAR drivers includes the ability to set "
 "the following capabilities in the OpenStack Block Storage API ``cinder.api."
 "contrib.types_extra_specs`` volume type extra specs extension module:"
 msgstr ""
 
-#: ../block-storage/drivers/hpe-3par-driver.rst:87
+#: ../block-storage/drivers/hpe-3par-driver.rst:91
 msgid "``hpe3par:snap_cpg``"
 msgstr ""
 
-#: ../block-storage/drivers/hpe-3par-driver.rst:89
+#: ../block-storage/drivers/hpe-3par-driver.rst:93
 msgid "``hpe3par:provisioning``"
 msgstr ""
 
-#: ../block-storage/drivers/hpe-3par-driver.rst:91
+#: ../block-storage/drivers/hpe-3par-driver.rst:95
 msgid "``hpe3par:persona``"
 msgstr ""
 
-#: ../block-storage/drivers/hpe-3par-driver.rst:93
-#: ../block-storage/drivers/hpe-3par-driver.rst:179
+#: ../block-storage/drivers/hpe-3par-driver.rst:97
+#: ../block-storage/drivers/hpe-3par-driver.rst:183
 msgid "``hpe3par:vvs``"
 msgstr ""
 
-#: ../block-storage/drivers/hpe-3par-driver.rst:95
+#: ../block-storage/drivers/hpe-3par-driver.rst:99
 msgid "``hpe3par:flash_cache``"
 msgstr ""
 
-#: ../block-storage/drivers/hpe-3par-driver.rst:97
+#: ../block-storage/drivers/hpe-3par-driver.rst:101
 msgid ""
 "To work with the default filter scheduler, the key values are case sensitive "
 "and scoped with ``hpe3par:``. For information about how to set the key-value "
 "pairs and associate them with a volume type, run the following command:"
 msgstr ""
 
-#: ../block-storage/drivers/hpe-3par-driver.rst:107
+#: ../block-storage/drivers/hpe-3par-driver.rst:111
 msgid ""
 "Volumes that are cloned only support the extra specs keys cpg, snap_cpg, "
 "provisioning and vvs. The others are ignored. In addition the comments "
@@ -5768,139 +5775,139 @@ msgid ""
 "populated."
 msgstr ""
 
-#: ../block-storage/drivers/hpe-3par-driver.rst:112
+#: ../block-storage/drivers/hpe-3par-driver.rst:116
 #: ../block-storage/drivers/hpe-lefthand-driver.rst:102
 msgid ""
 "If volume types are not used or a particular key is not set for a volume "
 "type, the following defaults are used:"
 msgstr ""
 
-#: ../block-storage/drivers/hpe-3par-driver.rst:115
+#: ../block-storage/drivers/hpe-3par-driver.rst:119
 msgid ""
 "``hpe3par:cpg`` - Defaults to the ``hpe3par_cpg`` setting in the ``cinder."
 "conf`` file."
 msgstr ""
 
-#: ../block-storage/drivers/hpe-3par-driver.rst:118
+#: ../block-storage/drivers/hpe-3par-driver.rst:122
 msgid ""
 "``hpe3par:snap_cpg`` - Defaults to the ``hpe3par_snap`` setting in the "
 "``cinder.conf`` file. If ``hpe3par_snap`` is not set, it defaults to the "
 "``hpe3par_cpg`` setting."
 msgstr ""
 
-#: ../block-storage/drivers/hpe-3par-driver.rst:122
+#: ../block-storage/drivers/hpe-3par-driver.rst:126
 msgid ""
 "``hpe3par:provisioning`` - Defaults to ``thin`` provisioning, the valid "
 "values are ``thin``, ``full``, and ``dedup``."
 msgstr ""
 
-#: ../block-storage/drivers/hpe-3par-driver.rst:125
+#: ../block-storage/drivers/hpe-3par-driver.rst:129
 msgid ""
 "``hpe3par:persona`` - Defaults to the ``2 - Generic-ALUA`` persona. The "
 "valid values are:"
 msgstr ""
 
-#: ../block-storage/drivers/hpe-3par-driver.rst:128
+#: ../block-storage/drivers/hpe-3par-driver.rst:132
 msgid "``1 - Generic``"
 msgstr ""
 
-#: ../block-storage/drivers/hpe-3par-driver.rst:129
+#: ../block-storage/drivers/hpe-3par-driver.rst:133
 msgid "``2 - Generic-ALUA``"
 msgstr ""
 
-#: ../block-storage/drivers/hpe-3par-driver.rst:130
+#: ../block-storage/drivers/hpe-3par-driver.rst:134
 msgid "``3 - Generic-legacy``"
 msgstr ""
 
-#: ../block-storage/drivers/hpe-3par-driver.rst:131
+#: ../block-storage/drivers/hpe-3par-driver.rst:135
 msgid "``4 - HPUX-legacy``"
 msgstr ""
 
-#: ../block-storage/drivers/hpe-3par-driver.rst:132
+#: ../block-storage/drivers/hpe-3par-driver.rst:136
 msgid "``5 - AIX-legacy``"
 msgstr ""
 
-#: ../block-storage/drivers/hpe-3par-driver.rst:133
+#: ../block-storage/drivers/hpe-3par-driver.rst:137
 msgid "``6 - EGENERA``"
 msgstr ""
 
-#: ../block-storage/drivers/hpe-3par-driver.rst:134
+#: ../block-storage/drivers/hpe-3par-driver.rst:138
 msgid "``7 - ONTAP-legacy``"
 msgstr ""
 
-#: ../block-storage/drivers/hpe-3par-driver.rst:135
+#: ../block-storage/drivers/hpe-3par-driver.rst:139
 msgid "``8 - VMware``"
 msgstr ""
 
-#: ../block-storage/drivers/hpe-3par-driver.rst:136
+#: ../block-storage/drivers/hpe-3par-driver.rst:140
 msgid "``9 - OpenVMS``"
 msgstr ""
 
-#: ../block-storage/drivers/hpe-3par-driver.rst:137
+#: ../block-storage/drivers/hpe-3par-driver.rst:141
 msgid "``10 - HPUX``"
 msgstr ""
 
-#: ../block-storage/drivers/hpe-3par-driver.rst:138
+#: ../block-storage/drivers/hpe-3par-driver.rst:142
 msgid "``11 - WindowsServer``"
 msgstr ""
 
-#: ../block-storage/drivers/hpe-3par-driver.rst:140
+#: ../block-storage/drivers/hpe-3par-driver.rst:144
 msgid ""
 "``hpe3par:flash_cache`` - Defaults to ``false``, the valid values are "
 "``true`` and ``false``."
 msgstr ""
 
-#: ../block-storage/drivers/hpe-3par-driver.rst:143
+#: ../block-storage/drivers/hpe-3par-driver.rst:147
 msgid ""
 "QoS support for both HPE 3PAR drivers includes the ability to set the "
 "following capabilities in the OpenStack Block Storage API ``cinder.api."
 "contrib.qos_specs_manage`` qos specs extension module:"
 msgstr ""
 
-#: ../block-storage/drivers/hpe-3par-driver.rst:147
-#: ../block-storage/drivers/hpe-3par-driver.rst:183
+#: ../block-storage/drivers/hpe-3par-driver.rst:151
+#: ../block-storage/drivers/hpe-3par-driver.rst:187
 msgid "``minBWS``"
 msgstr ""
 
-#: ../block-storage/drivers/hpe-3par-driver.rst:149
-#: ../block-storage/drivers/hpe-3par-driver.rst:187
+#: ../block-storage/drivers/hpe-3par-driver.rst:153
+#: ../block-storage/drivers/hpe-3par-driver.rst:191
 msgid "``maxBWS``"
 msgstr ""
 
-#: ../block-storage/drivers/hpe-3par-driver.rst:151
-#: ../block-storage/drivers/hpe-3par-driver.rst:191
+#: ../block-storage/drivers/hpe-3par-driver.rst:155
+#: ../block-storage/drivers/hpe-3par-driver.rst:195
 msgid "``minIOPS``"
 msgstr ""
 
-#: ../block-storage/drivers/hpe-3par-driver.rst:153
-#: ../block-storage/drivers/hpe-3par-driver.rst:195
+#: ../block-storage/drivers/hpe-3par-driver.rst:157
+#: ../block-storage/drivers/hpe-3par-driver.rst:199
 msgid "``maxIOPS``"
 msgstr ""
 
-#: ../block-storage/drivers/hpe-3par-driver.rst:155
-#: ../block-storage/drivers/hpe-3par-driver.rst:198
+#: ../block-storage/drivers/hpe-3par-driver.rst:159
+#: ../block-storage/drivers/hpe-3par-driver.rst:202
 msgid "``latency``"
 msgstr ""
 
-#: ../block-storage/drivers/hpe-3par-driver.rst:157
-#: ../block-storage/drivers/hpe-3par-driver.rst:202
+#: ../block-storage/drivers/hpe-3par-driver.rst:161
+#: ../block-storage/drivers/hpe-3par-driver.rst:206
 msgid "``priority``"
 msgstr ""
 
-#: ../block-storage/drivers/hpe-3par-driver.rst:159
+#: ../block-storage/drivers/hpe-3par-driver.rst:163
 msgid ""
 "The qos keys above no longer require to be scoped but must be created and "
 "associated to a volume type. For information about how to set the key-value "
 "pairs and associate them with a volume type, run the following commands:"
 msgstr ""
 
-#: ../block-storage/drivers/hpe-3par-driver.rst:172
+#: ../block-storage/drivers/hpe-3par-driver.rst:176
 msgid ""
 "The following keys require that the HPE 3PAR StoreServ storage array has a "
 "Priority Optimization license installed."
 msgstr ""
 
-#: ../block-storage/drivers/hpe-3par-driver.rst:176
+#: ../block-storage/drivers/hpe-3par-driver.rst:180
 msgid ""
 "The virtual volume set name that has been predefined by the Administrator "
 "with Quality of Service (QoS) rules associated to it. If you specify "
@@ -5908,124 +5915,124 @@ msgid ""
 "``minBWS``, and ``maxBWS`` settings are ignored."
 msgstr ""
 
-#: ../block-storage/drivers/hpe-3par-driver.rst:182
+#: ../block-storage/drivers/hpe-3par-driver.rst:186
 msgid ""
 "The QoS I/O issue bandwidth minimum goal in MBs. If not set, the I/O issue "
 "bandwidth rate has no minimum goal."
 msgstr ""
 
-#: ../block-storage/drivers/hpe-3par-driver.rst:186
+#: ../block-storage/drivers/hpe-3par-driver.rst:190
 msgid ""
 "The QoS I/O issue bandwidth rate limit in MBs. If not set, the I/O issue "
 "bandwidth rate has no limit."
 msgstr ""
 
-#: ../block-storage/drivers/hpe-3par-driver.rst:190
+#: ../block-storage/drivers/hpe-3par-driver.rst:194
 msgid ""
 "The QoS I/O issue count minimum goal. If not set, the I/O issue count has no "
 "minimum goal."
 msgstr ""
 
-#: ../block-storage/drivers/hpe-3par-driver.rst:194
+#: ../block-storage/drivers/hpe-3par-driver.rst:198
 msgid ""
 "The QoS I/O issue count rate limit. If not set, the I/O issue count rate has "
 "no limit."
 msgstr ""
 
-#: ../block-storage/drivers/hpe-3par-driver.rst:198
+#: ../block-storage/drivers/hpe-3par-driver.rst:202
 msgid "The latency goal in milliseconds."
 msgstr ""
 
-#: ../block-storage/drivers/hpe-3par-driver.rst:201
+#: ../block-storage/drivers/hpe-3par-driver.rst:205
 msgid ""
 "The priority of the QoS rule over other rules. If not set, the priority is "
 "``normal``, valid values are ``low``, ``normal`` and ``high``."
 msgstr ""
 
-#: ../block-storage/drivers/hpe-3par-driver.rst:206
+#: ../block-storage/drivers/hpe-3par-driver.rst:210
 msgid ""
 "Since the Icehouse release, minIOPS and maxIOPS must be used together to set "
 "I/O limits. Similarly, minBWS and maxBWS must be used together. If only one "
 "is set the other will be set to the same value."
 msgstr ""
 
-#: ../block-storage/drivers/hpe-3par-driver.rst:210
+#: ../block-storage/drivers/hpe-3par-driver.rst:214
 msgid ""
 "The following key requires that the HPE 3PAR StoreServ storage array has an "
 "Adaptive Flash Cache license installed."
 msgstr ""
 
-#: ../block-storage/drivers/hpe-3par-driver.rst:213
+#: ../block-storage/drivers/hpe-3par-driver.rst:217
 msgid ""
 "``hpe3par:flash_cache`` - The flash-cache policy, which can be turned on and "
 "off by setting the value to ``true`` or ``false``."
 msgstr ""
 
-#: ../block-storage/drivers/hpe-3par-driver.rst:217
+#: ../block-storage/drivers/hpe-3par-driver.rst:221
 msgid "Enable the HPE 3PAR Fibre Channel and iSCSI drivers"
 msgstr ""
 
-#: ../block-storage/drivers/hpe-3par-driver.rst:219
+#: ../block-storage/drivers/hpe-3par-driver.rst:223
 msgid ""
 "The ``HPE3PARFCDriver`` and ``HPE3PARISCSIDriver`` are installed with the "
 "OpenStack software."
 msgstr ""
 
-#: ../block-storage/drivers/hpe-3par-driver.rst:222
+#: ../block-storage/drivers/hpe-3par-driver.rst:226
 msgid ""
 "Install the ``python-3parclient`` Python package on the OpenStack Block "
 "Storage system."
 msgstr ""
 
-#: ../block-storage/drivers/hpe-3par-driver.rst:230
+#: ../block-storage/drivers/hpe-3par-driver.rst:234
 msgid ""
 "Verify that the HPE 3PAR Web Services API server is enabled and running on "
 "the HPE 3PAR storage system."
 msgstr ""
 
-#: ../block-storage/drivers/hpe-3par-driver.rst:233
+#: ../block-storage/drivers/hpe-3par-driver.rst:237
 msgid "Log onto the HP 3PAR storage system with administrator access."
 msgstr ""
 
-#: ../block-storage/drivers/hpe-3par-driver.rst:239
+#: ../block-storage/drivers/hpe-3par-driver.rst:243
 msgid "View the current state of the Web Services API Server."
 msgstr ""
 
-#: ../block-storage/drivers/hpe-3par-driver.rst:247
+#: ../block-storage/drivers/hpe-3par-driver.rst:251
 msgid "If the Web Services API Server is disabled, start it."
 msgstr ""
 
-#: ../block-storage/drivers/hpe-3par-driver.rst:253
+#: ../block-storage/drivers/hpe-3par-driver.rst:257
 msgid "If the HTTP or HTTPS state is disabled, enable one of them."
 msgstr ""
 
 # #-#-#-#-#  block-storage.pot (Configuration Reference 0.9)  #-#-#-#-#
 # #-#-#-#-#  compute.pot (Configuration Reference 0.9)  #-#-#-#-#
-#: ../block-storage/drivers/hpe-3par-driver.rst:259
+#: ../block-storage/drivers/hpe-3par-driver.rst:263
 #: ../compute/scheduler.rst:594
 msgid "or"
 msgstr ""
 
-#: ../block-storage/drivers/hpe-3par-driver.rst:267
+#: ../block-storage/drivers/hpe-3par-driver.rst:271
 msgid ""
 "To stop the Web Services API Server, use the :command:`stopwsapi` command. "
 "For other options run the :command:`setwsapi –h` command."
 msgstr ""
 
-#: ../block-storage/drivers/hpe-3par-driver.rst:270
+#: ../block-storage/drivers/hpe-3par-driver.rst:274
 msgid ""
 "If you are not using an existing CPG, create a CPG on the HPE 3PAR storage "
 "system to be used as the default location for creating volumes."
 msgstr ""
 
-#: ../block-storage/drivers/hpe-3par-driver.rst:340
+#: ../block-storage/drivers/hpe-3par-driver.rst:344
 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-3par-driver.rst:346
+#: ../block-storage/drivers/hpe-3par-driver.rst:350
 msgid ""
 "You can configure one or more iSCSI addresses by using the "
 "``hpe3par_iscsi_ips`` option. When you configure multiple addresses, the "
@@ -6037,20 +6044,20 @@ msgid ""
 "to ``hpe3par_iscsi_ips`` for single port iSCSI configuration."
 msgstr ""
 
-#: ../block-storage/drivers/hpe-3par-driver.rst:355
+#: ../block-storage/drivers/hpe-3par-driver.rst:359
 msgid ""
 "Save the changes to the ``cinder.conf`` file and restart the cinder-volume "
 "service."
 msgstr ""
 
-#: ../block-storage/drivers/hpe-3par-driver.rst:358
+#: ../block-storage/drivers/hpe-3par-driver.rst:362
 msgid ""
 "The HPE 3PAR Fibre Channel and iSCSI drivers are now enabled on your "
 "OpenStack system. If you experience problems, review the Block Storage "
 "service log files for errors."
 msgstr ""
 
-#: ../block-storage/drivers/hpe-3par-driver.rst:362
+#: ../block-storage/drivers/hpe-3par-driver.rst:366
 msgid ""
 "The following table contains all the configuration options supported by the "
 "HPE 3PAR Fibre Channel and iSCSI drivers."
diff --git a/doc/image-guide/source/locale/image-guide.pot b/doc/image-guide/source/locale/image-guide.pot
index 30cf818f8e..ad045433fd 100644
--- a/doc/image-guide/source/locale/image-guide.pot
+++ b/doc/image-guide/source/locale/image-guide.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Virtual Machine Image Guide 0.9\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-22 06:42+0000\n"
+"POT-Creation-Date: 2015-12-24 06:13+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"
@@ -594,6 +594,7 @@ msgid ""
 msgstr ""
 
 #: ../create-images-automatically.rst:18
+#: ../create-images-automatically.rst:207
 msgid "To build an image, call the following script:"
 msgstr ""
 
@@ -785,6 +786,28 @@ msgid ""
 "openSUSE as distributions."
 msgstr ""
 
+#: ../create-images-automatically.rst:199
+msgid "virt-builder"
+msgstr ""
+
+#: ../create-images-automatically.rst:201
+msgid ""
+"`Virt-builder <http://libguestfs.org/virt-builder.1.html>`_ is a tool for "
+"quickly building new virtual machines. You can build a variety of VMs for "
+"local or cloud use, usually within a few minutes or less. Virt-builder also "
+"has many ways to customize these VMs. Everything is run from the command "
+"line and nothing requires root privileges, so automation and scripting is "
+"simple."
+msgstr ""
+
+#: ../create-images-automatically.rst:214
+msgid "To list the operating systems available to install:"
+msgstr ""
+
+#: ../create-images-automatically.rst:220
+msgid "To import it into libvirt with :command:`virsh`:"
+msgstr ""
+
 #: ../create-images-manually.rst:3
 msgid "Create images manually"
 msgstr ""
@@ -1431,11 +1454,11 @@ msgid ""
 "`glance image-show` command. For example:"
 msgstr ""
 
-#: ../image-metadata.rst:83
+#: ../image-metadata.rst:84
 msgid "**Volume-from-Image properties**"
 msgstr ""
 
-#: ../image-metadata.rst:85
+#: ../image-metadata.rst:86
 msgid ""
 "When creating Block Storage volumes from images, also consider your "
 "configured image properties. If you alter the core image properties, you "
@@ -2104,7 +2127,7 @@ msgid ""
 "`virsh net-list` command and verify that the ``default`` network is active:"
 msgstr ""
 
-#: ../net-running.rst:24
+#: ../net-running.rst:25
 msgid "If the network is not active, start it by doing:"
 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 a05184e491..76fa63bafc 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
@@ -4,11 +4,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Virtual Machine Image Guide 0.9\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-22 23:08+0000\n"
+"POT-Creation-Date: 2015-12-23 15:33+0000\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2015-12-22 07:49+0000\n"
+"PO-Revision-Date: 2015-12-24 04:49+0000\n"
 "Last-Translator: Akihiro Motoki <amotoki@gmail.com>\n"
 "Language-Team: Japanese\n"
 "Language: ja\n"
@@ -2904,11 +2904,14 @@ msgid ""
 "blob/master/templates/centos60_x86_64.tdl>`_."
 msgstr ""
 "SSH 公開鍵を取得し、root アカウントに追加するために、 ``/etc/rc.local`` ファ"
-"イルを編集し、 ``touch /var/lock/subsys/local `` 行の前に以下の行を追加しま"
+"イルを編集し、 ``touch /var/lock/subsys/local`` 行の前に以下の行を追加しま"
 "す。このコードは `rackerjoe oz-image-build CentOS 6 template <https://github."
 "com/ rackerjoe/oz-image-build/blob/master/templates/centos60_x86_64.tdl>`_ か"
 "ら引用しました。"
 
+msgid "To import it into libvirt with :command:`virsh`:"
+msgstr "作成したイメージを :command:`virsh` で libvirt に取り込みます。"
+
 msgid ""
 "To install the operating system, complete the following steps inside the VM:"
 msgstr ""
@@ -2922,6 +2925,11 @@ msgstr ""
 "簡単のため、「仮想マシンイメージ」の代わりに「イメージ」という言葉をときどき"
 "使用します。"
 
+msgid "To list the operating systems available to install:"
+msgstr ""
+"インストール可能なオペレーティングシステムの一覧を表示するには、以下のように"
+"します。"
+
 msgid "To mount the second partition, as root:"
 msgstr "root として、2番目のパーティションをマウントします。"
 
@@ -3602,6 +3610,20 @@ msgstr ""
 "vagrantup.com>`_ ボックスを構築するのに使用されますが、KVM イメージを構築する"
 "ためにも使用できます。"
 
+msgid ""
+"`Virt-builder <http://libguestfs.org/virt-builder.1.html>`_ is a tool for "
+"quickly building new virtual machines. You can build a variety of VMs for "
+"local or cloud use, usually within a few minutes or less. Virt-builder also "
+"has many ways to customize these VMs. Everything is run from the command "
+"line and nothing requires root privileges, so automation and scripting is "
+"simple."
+msgstr ""
+"`virt-builder <http://libguestfs.org/virt-builder.1.html>`_ は、新規の仮想マ"
+"シンを素早く作成するためのツールです。ローカルやクラウドで使用するための様々"
+"な VM を、普通は数分で作成できます。virt-builder ではこれらの VM をカスタマイ"
+"ズする様々な方法が提供されています。すべてコマンドラインから実行でき、ルート"
+"権限が必要なものはないため、簡単に自動化やスクリプト化ができます。"
+
 msgid ""
 "``auto_disk_config=True`` is set as a property on the image in the image "
 "registry."
@@ -3794,5 +3816,8 @@ msgstr "vhd"
 msgid "virt-* tools"
 msgstr "virt-* ツール"
 
+msgid "virt-builder"
+msgstr "virt-builder"
+
 msgid "vmdk"
 msgstr "vmdk"
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 07ce3580e6..f12a2af83b 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
@@ -18,11 +18,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: End User Guide 1.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-22 23:08+0000\n"
+"POT-Creation-Date: 2015-12-23 15:34+0000\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2015-12-22 07:48+0000\n"
+"PO-Revision-Date: 2015-12-23 02:06+0000\n"
 "Last-Translator: Akihiro Motoki <amotoki@gmail.com>\n"
 "Language: ja\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
@@ -269,9 +269,10 @@ msgid ""
 "`cluster-show` command displays the IP address of the query router. This is "
 "the IP address your application uses to retrieve data from the database."
 msgstr ""
-"**この IP アドレスに接続するアプリケーション。 :command:`trove cluster-show` "
-"コマンドにより、クエリールーターの IP アドレスを表示します。これは、アプリ"
-"ケーションがデータベースからデータを取得するために使用する IP アドレスです。"
+"**この IP アドレスに接続するアプリケーション。** :command:`trove cluster-"
+"show` コマンドにより、クエリールーターの IP アドレスを表示します。これは、ア"
+"プリケーションがデータベースからデータを取得するために使用する IP アドレスで"
+"す。"
 
 msgid "**avg**. The average of sample volumes over each period."
 msgstr "**平均**。各期間の平均サンプルボリューム数。"
@@ -5735,7 +5736,7 @@ msgid ""
 "uploading the object."
 msgstr ""
 ":guilabel:`コンテナー <name> に擬似フォルダーを作成` ダイアログボックスが表示"
-"されます。 ``<name> `` は、オブジェクトをアップロードするコンテナーの名前で"
+"されます。 ``<name>`` は、オブジェクトをアップロードするコンテナーの名前で"
 "す。"
 
 msgid "The :guilabel:`Edit Object` dialog box is displayed."