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 63a6ec031f..e47bfb0f11 100644
--- a/doc/admin-guide-cloud/source/locale/admin-guide-cloud.pot
+++ b/doc/admin-guide-cloud/source/locale/admin-guide-cloud.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Cloud Administrator Guide 0.9\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-11 07:22+0000\n"
+"POT-Creation-Date: 2016-02-17 06:08+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1772,8 +1772,8 @@ msgstr ""
 # #-#-#-#-#  keystone_secure_identity_to_ldap_backend.pot (Cloud Administrator Guide 0.9)  #-#-#-#-#
 #: ../blockstorage_glusterfs_backend.rst:55
 #: ../blockstorage_glusterfs_backend.rst:107
-#: ../blockstorage_nfs_backend.rst:44 ../compute-flavors.rst:329
-#: ../compute-flavors.rst:350 ../identity_service_api_protection.rst:19
+#: ../blockstorage_nfs_backend.rst:44 ../compute-flavors.rst:334
+#: ../compute-flavors.rst:356 ../identity_service_api_protection.rst:19
 #: ../keystone_secure_identity_to_ldap_backend.rst:64
 msgid "Where:"
 msgstr ""
@@ -3852,24 +3852,24 @@ msgstr ""
 
 #: ../compute-flavors.rst:7
 msgid ""
-"Admin users can use the :command:`nova flavor-` commands to customize and "
-"manage flavors. To see the available flavor-related commands, run:"
+"Admin users can use the :command:`openstack flavor` command to customize and "
+"manage flavors. To see information for this command, run:"
 msgstr ""
 
-#: ../compute-flavors.rst:24
+#: ../compute-flavors.rst:23
 msgid ""
 "Configuration rights can be delegated to additional users by redefining the "
 "access controls for ``compute_extension:flavormanage`` in ``/etc/nova/policy."
 "json`` on the ``nova-api`` server."
 msgstr ""
 
-#: ../compute-flavors.rst:29
+#: ../compute-flavors.rst:28
 msgid ""
 "You can modify an existing flavor from the :guilabel:`Edit Flavor` button in "
 "the Dashboard."
 msgstr ""
 
-#: ../compute-flavors.rst:32
+#: ../compute-flavors.rst:31
 msgid "Flavors define these elements:"
 msgstr ""
 
@@ -3886,7 +3886,7 @@ msgstr ""
 # #-#-#-#-#  objectstorage-troubleshoot.pot (Cloud Administrator Guide 0.9)  #-#-#-#-#
 # #-#-#-#-#  shared_file_systems_crud_share.pot (Cloud Administrator Guide 0.9)  #-#-#-#-#
 # #-#-#-#-#  telemetry-measurements.pot (Cloud Administrator Guide 0.9)  #-#-#-#-#
-#: ../compute-flavors.rst:35 ../compute-manage-volumes.rst:14
+#: ../compute-flavors.rst:34 ../compute-manage-volumes.rst:14
 #: ../compute-networking-nova.rst:310 ../compute-networking-nova.rst:507
 #: ../compute-remote-console-access.rst:36
 #: ../compute-remote-console-access.rst:153 ../compute-security.rst:105
@@ -3900,11 +3900,11 @@ msgstr ""
 msgid "Description"
 msgstr ""
 
-#: ../compute-flavors.rst:35
+#: ../compute-flavors.rst:34
 msgid "Element"
 msgstr ""
 
-#: ../compute-flavors.rst:37
+#: ../compute-flavors.rst:36
 msgid ""
 "A descriptive name. XX.SIZE_NAME is typically not required, though some "
 "third party tools may rely on it."
@@ -3914,7 +3914,7 @@ msgstr ""
 # #-#-#-#-#  compute-live-migration-usage.pot (Cloud Administrator Guide 0.9)  #-#-#-#-#
 # #-#-#-#-#  telemetry-measurements.pot (Cloud Administrator Guide 0.9)  #-#-#-#-#
 # #-#-#-#-#  ts-eql-volume-size.pot (Cloud Administrator Guide 0.9)  #-#-#-#-#
-#: ../compute-flavors.rst:37 ../compute-live-migration-usage.rst:35
+#: ../compute-flavors.rst:36 ../compute-live-migration-usage.rst:35
 #: ../telemetry-measurements.rst:100 ../telemetry-measurements.rst:434
 #: ../telemetry-measurements.rst:489 ../telemetry-measurements.rst:533
 #: ../telemetry-measurements.rst:595 ../telemetry-measurements.rst:671
@@ -3928,19 +3928,19 @@ msgstr ""
 msgid "Name"
 msgstr ""
 
-#: ../compute-flavors.rst:40
+#: ../compute-flavors.rst:39
 msgid "Memory_MB"
 msgstr ""
 
-#: ../compute-flavors.rst:40
+#: ../compute-flavors.rst:39
 msgid "Virtual machine memory in megabytes."
 msgstr ""
 
-#: ../compute-flavors.rst:42
+#: ../compute-flavors.rst:41
 msgid "Disk"
 msgstr ""
 
-#: ../compute-flavors.rst:42
+#: ../compute-flavors.rst:41
 msgid ""
 "Virtual root disk size in gigabytes. This is an ephemeral di\\ sk that the "
 "base image is copied into. When booting from a p\\ ersistent volume it is "
@@ -3948,33 +3948,33 @@ msgid ""
 "image size as the size of the ephemeral root volume."
 msgstr ""
 
-#: ../compute-flavors.rst:48
+#: ../compute-flavors.rst:47
 msgid "Ephemeral"
 msgstr ""
 
-#: ../compute-flavors.rst:48
+#: ../compute-flavors.rst:47
 msgid ""
 "Specifies the size of a secondary ephemeral data disk. This is an empty, "
 "unformatted disk and exists only for the life o\\ f the instance."
 msgstr ""
 
-#: ../compute-flavors.rst:52
+#: ../compute-flavors.rst:51
 msgid "Optional swap space allocation for the instance."
 msgstr ""
 
-#: ../compute-flavors.rst:52
+#: ../compute-flavors.rst:51
 msgid "Swap"
 msgstr ""
 
-#: ../compute-flavors.rst:54
+#: ../compute-flavors.rst:53
 msgid "Number of virtual CPUs presented to the instance."
 msgstr ""
 
-#: ../compute-flavors.rst:54
+#: ../compute-flavors.rst:53
 msgid "VCPUs"
 msgstr ""
 
-#: ../compute-flavors.rst:56
+#: ../compute-flavors.rst:55
 msgid ""
 "Optional property allows created servers to have a different bandwidth cap "
 "than that defined in the network they are att\\ ached to. This factor is "
@@ -3983,21 +3983,21 @@ msgid ""
 "for Xen or NSX based systems."
 msgstr ""
 
-#: ../compute-flavors.rst:56
+#: ../compute-flavors.rst:55
 msgid "RXTX_Factor"
 msgstr ""
 
-#: ../compute-flavors.rst:63
+#: ../compute-flavors.rst:62
 msgid ""
 "Boolean value, whether flavor is available to all users or p\\ rivate to the "
 "tenant it was created in. Defaults to ``True``."
 msgstr ""
 
-#: ../compute-flavors.rst:63
+#: ../compute-flavors.rst:62
 msgid "Is_Public"
 msgstr ""
 
-#: ../compute-flavors.rst:66
+#: ../compute-flavors.rst:65
 msgid ""
 "Key and value pairs that define on which compute nodes a fla\\ vor can run. "
 "These pairs must match corresponding pairs on t\\ he compute nodes. Use to "
@@ -4005,11 +4005,11 @@ msgid ""
 "nodes with GPU hardware."
 msgstr ""
 
-#: ../compute-flavors.rst:66
+#: ../compute-flavors.rst:65
 msgid "extra_specs"
 msgstr ""
 
-#: ../compute-flavors.rst:74
+#: ../compute-flavors.rst:73
 msgid ""
 "Flavor customization can be limited by the hypervisor in use. For example "
 "the libvirt driver enables quotas on CPUs available to a VM, disk tuning, "
@@ -4017,7 +4017,7 @@ msgid ""
 "and instance VIF traffic control."
 msgstr ""
 
-#: ../compute-flavors.rst:80
+#: ../compute-flavors.rst:79
 msgid ""
 "You can configure the CPU limits with control parameters with the ``nova`` "
 "client. For example, to configure the I/O limit, use:"
@@ -4078,29 +4078,29 @@ msgid ""
 "the same speed. For example:"
 msgstr ""
 
-#: ../compute-flavors.rst:132
+#: ../compute-flavors.rst:133
 msgid ""
 "In this example, the instance of ``m1.low_cpu`` can only consume a maximum "
 "of 50% CPU of a physical CPU computing capability."
 msgstr ""
 
-#: ../compute-flavors.rst:133
+#: ../compute-flavors.rst:134
 msgid "CPU limits"
 msgstr ""
 
-#: ../compute-flavors.rst:136
+#: ../compute-flavors.rst:137
 msgid ""
 "For VMware, you can configure the memory limits with control parameters."
 msgstr ""
 
-#: ../compute-flavors.rst:138
+#: ../compute-flavors.rst:139
 msgid ""
 "Use these optional parameters to limit the memory allocation, guarantee "
 "minimum memory reservation, and to specify shares used in case of resource "
 "contention:"
 msgstr ""
 
-#: ../compute-flavors.rst:142
+#: ../compute-flavors.rst:143
 msgid ""
 "``memory_limit``: Specifies the upper limit for VMware machine memory "
 "allocation in MB. The utilization of a virtual machine will not exceed this "
@@ -4109,45 +4109,45 @@ msgid ""
 "resources."
 msgstr ""
 
-#: ../compute-flavors.rst:148
+#: ../compute-flavors.rst:149
 msgid ""
 "``memory_reservation``: Specifies the guaranteed minimum memory reservation "
 "in MB for VMware. This means the specified amount of memory will definitely "
 "be allocated to the machine."
 msgstr ""
 
-#: ../compute-flavors.rst:152
+#: ../compute-flavors.rst:153
 msgid ""
 "``memory_shares_level``: On VMware, specifies the allocation level. This can "
 "be ``custom``, ``high``, ``normal`` or ``low``. If you choose ``custom``, "
 "set the number of shares using ``memory_shares_share``."
 msgstr ""
 
-#: ../compute-flavors.rst:156
+#: ../compute-flavors.rst:157
 msgid ""
 "``memory_shares_share``: Specifies the number of shares allocated in the "
 "event that ``custom`` is used. There is no unit for this value. It is a "
 "relative measure based on the settings for other VMs. For example:"
 msgstr ""
 
-#: ../compute-flavors.rst:164
+#: ../compute-flavors.rst:166
 msgid "Memory limits"
 msgstr ""
 
-#: ../compute-flavors.rst:167
+#: ../compute-flavors.rst:169
 msgid ""
 "For VMware, you can configure the resource limits for disk with control "
 "parameters."
 msgstr ""
 
-#: ../compute-flavors.rst:170
+#: ../compute-flavors.rst:172
 msgid ""
 "Use these optional parameters to limit the disk utilization, guarantee disk "
 "allocation, and to specify shares used in case of resource contention. This "
 "allows the VMware driver to enable disk allocations for the running instance."
 msgstr ""
 
-#: ../compute-flavors.rst:175
+#: ../compute-flavors.rst:177
 msgid ""
 "``disk_io_limit``: Specifies the upper limit for disk utilization in I/O per "
 "second. The utilization of a virtual machine will not exceed this limit, "
@@ -4155,101 +4155,101 @@ msgid ""
 "indicates unlimited usage."
 msgstr ""
 
-#: ../compute-flavors.rst:181
+#: ../compute-flavors.rst:183
 msgid ""
 "``disk_io_reservation``: Specifies the guaranteed minimum disk allocation in "
 "terms of :term:`IOPS`."
 msgstr ""
 
-#: ../compute-flavors.rst:184
+#: ../compute-flavors.rst:186
 msgid ""
 "``disk_io_shares_level``: Specifies the allocation level. This can be "
 "``custom``, ``high``, ``normal`` or ``low``. If you choose custom, set the "
 "number of shares using ``disk_io_shares_share``."
 msgstr ""
 
-#: ../compute-flavors.rst:189
+#: ../compute-flavors.rst:191
 msgid ""
 "``disk_io_shares_share``: Specifies the number of shares allocated in the "
 "event that ``custom`` is used. When there is resource contention, this value "
 "is used to determine the resource allocation."
 msgstr ""
 
-#: ../compute-flavors.rst:194
+#: ../compute-flavors.rst:196
 msgid "The example below sets the ``disk_io_reservation`` to 2000 IOPS."
 msgstr ""
 
-#: ../compute-flavors.rst:198
+#: ../compute-flavors.rst:201
 msgid "Disk I/O limits"
 msgstr ""
 
-#: ../compute-flavors.rst:201
+#: ../compute-flavors.rst:204
 msgid ""
 "Using disk I/O quotas, you can set maximum disk write to 10 MB per second "
 "for a VM user. For example:"
 msgstr ""
 
-#: ../compute-flavors.rst:208
+#: ../compute-flavors.rst:212
 msgid "The disk I/O options are:"
 msgstr ""
 
-#: ../compute-flavors.rst:210
+#: ../compute-flavors.rst:214
 msgid "disk\\_read\\_bytes\\_sec"
 msgstr ""
 
-#: ../compute-flavors.rst:212
+#: ../compute-flavors.rst:216
 msgid "disk\\_read\\_iops\\_sec"
 msgstr ""
 
-#: ../compute-flavors.rst:214
+#: ../compute-flavors.rst:218
 msgid "disk\\_write\\_bytes\\_sec"
 msgstr ""
 
-#: ../compute-flavors.rst:216
+#: ../compute-flavors.rst:220
 msgid "disk\\_write\\_iops\\_sec"
 msgstr ""
 
-#: ../compute-flavors.rst:218
+#: ../compute-flavors.rst:222
 msgid "disk\\_total\\_bytes\\_sec"
 msgstr ""
 
-#: ../compute-flavors.rst:220
+#: ../compute-flavors.rst:224
 msgid "Disk tuning"
 msgstr ""
 
-#: ../compute-flavors.rst:220
+#: ../compute-flavors.rst:224
 msgid "disk\\_total\\_iops\\_sec"
 msgstr ""
 
-#: ../compute-flavors.rst:223
+#: ../compute-flavors.rst:227
 msgid "The vif I/O options are:"
 msgstr ""
 
-#: ../compute-flavors.rst:225
+#: ../compute-flavors.rst:229
 msgid "vif\\_inbound\\_ average"
 msgstr ""
 
-#: ../compute-flavors.rst:227
+#: ../compute-flavors.rst:231
 msgid "vif\\_inbound\\_burst"
 msgstr ""
 
-#: ../compute-flavors.rst:229
+#: ../compute-flavors.rst:233
 msgid "vif\\_inbound\\_peak"
 msgstr ""
 
-#: ../compute-flavors.rst:231
+#: ../compute-flavors.rst:235
 msgid "vif\\_outbound\\_ average"
 msgstr ""
 
-#: ../compute-flavors.rst:233
+#: ../compute-flavors.rst:237
 msgid "vif\\_outbound\\_burst"
 msgstr ""
 
-#: ../compute-flavors.rst:235
+#: ../compute-flavors.rst:239
 msgid "vif\\_outbound\\_peak"
 msgstr ""
 
-#: ../compute-flavors.rst:237
+#: ../compute-flavors.rst:241
 msgid ""
 "Incoming and outgoing traffic can be shaped independently. The bandwidth "
 "element can have at most, one inbound and at most, one outbound child "
@@ -4260,7 +4260,7 @@ msgid ""
 "rate on the interface being shaped."
 msgstr ""
 
-#: ../compute-flavors.rst:246
+#: ../compute-flavors.rst:250
 msgid ""
 "There are also two optional attributes (integer): ``peak``, which specifies "
 "the maximum rate at which a bridge can send data (kilobytes/second), and "
@@ -4268,43 +4268,43 @@ msgid ""
 "The rate is shared equally within domains connected to the network."
 msgstr ""
 
-#: ../compute-flavors.rst:252
+#: ../compute-flavors.rst:256
 msgid ""
 "The example below sets network traffic bandwidth limits for existing flavor "
 "as follows:"
 msgstr ""
 
-#: ../compute-flavors.rst:255
+#: ../compute-flavors.rst:259
 msgid "Outbound traffic:"
 msgstr ""
 
-#: ../compute-flavors.rst:257 ../compute-flavors.rst:265
+#: ../compute-flavors.rst:261 ../compute-flavors.rst:269
 msgid "average: 256 Mbps (32768 kilobytes/second)"
 msgstr ""
 
-#: ../compute-flavors.rst:259 ../compute-flavors.rst:267
+#: ../compute-flavors.rst:263 ../compute-flavors.rst:271
 msgid "peak: 512 Mbps (65536 kilobytes/second)"
 msgstr ""
 
-#: ../compute-flavors.rst:261 ../compute-flavors.rst:269
+#: ../compute-flavors.rst:265 ../compute-flavors.rst:273
 msgid "burst: 65536 kilobytes"
 msgstr ""
 
-#: ../compute-flavors.rst:263
+#: ../compute-flavors.rst:267
 msgid "Inbound traffic:"
 msgstr ""
 
-#: ../compute-flavors.rst:283
+#: ../compute-flavors.rst:287
 msgid ""
 "All the speed limit values in above example are specified in kilobytes/"
 "second. And burst values are in kilobytes."
 msgstr ""
 
-#: ../compute-flavors.rst:284
+#: ../compute-flavors.rst:288
 msgid "Bandwidth I/O"
 msgstr ""
 
-#: ../compute-flavors.rst:287
+#: ../compute-flavors.rst:291
 msgid ""
 "For the libvirt driver, you can enable and set the behavior of a virtual "
 "hardware watchdog device for each flavor. Watchdog devices keep an eye on "
@@ -4313,111 +4313,111 @@ msgid ""
 "``hw:watchdog_action`` is not specified, the watchdog is disabled."
 msgstr ""
 
-#: ../compute-flavors.rst:294
+#: ../compute-flavors.rst:298
 msgid "To set the behavior, use:"
 msgstr ""
 
-#: ../compute-flavors.rst:300
+#: ../compute-flavors.rst:304
 msgid "Valid ACTION values are:"
 msgstr ""
 
-#: ../compute-flavors.rst:302
+#: ../compute-flavors.rst:306
 msgid "``disabled``—(default) The device is not attached."
 msgstr ""
 
-#: ../compute-flavors.rst:304
+#: ../compute-flavors.rst:308
 msgid "``reset``—Forcefully reset the guest."
 msgstr ""
 
-#: ../compute-flavors.rst:306
+#: ../compute-flavors.rst:310
 msgid "``poweroff``—Forcefully power off the guest."
 msgstr ""
 
-#: ../compute-flavors.rst:308
+#: ../compute-flavors.rst:312
 msgid "``pause``—Pause the guest."
 msgstr ""
 
-#: ../compute-flavors.rst:310
+#: ../compute-flavors.rst:314
 msgid "``none``—Only enable the watchdog; do nothing if the server hangs."
 msgstr ""
 
-#: ../compute-flavors.rst:315
+#: ../compute-flavors.rst:319
 msgid ""
 "Watchdog behavior set using a specific image's properties will override "
 "behavior set using flavors."
 msgstr ""
 
-#: ../compute-flavors.rst:316
+#: ../compute-flavors.rst:320
 msgid "Watchdog behavior"
 msgstr ""
 
-#: ../compute-flavors.rst:319
+#: ../compute-flavors.rst:323
 msgid ""
 "If a random-number generator device has been added to the instance through "
 "its image properties, the device can be enabled and configured using:"
 msgstr ""
 
-#: ../compute-flavors.rst:331
+#: ../compute-flavors.rst:336
 msgid ""
 "RATE-BYTES—(Integer) Allowed amount of bytes that the guest can read from "
 "the host's entropy per period."
 msgstr ""
 
-#: ../compute-flavors.rst:334
+#: ../compute-flavors.rst:339
 msgid "RATE-PERIOD—(Integer) Duration of the read period in seconds."
 msgstr ""
 
-#: ../compute-flavors.rst:334
+#: ../compute-flavors.rst:339
 msgid "Random-number generator"
 msgstr ""
 
-#: ../compute-flavors.rst:337
+#: ../compute-flavors.rst:342
 msgid ""
 "For the libvirt driver, you can define the topology of the processors in the "
 "virtual machine using properties. The properties with ``max`` limit the "
 "number that can be selected by the user with image properties."
 msgstr ""
 
-#: ../compute-flavors.rst:352
+#: ../compute-flavors.rst:358
 msgid ""
 "FLAVOR-SOCKETS—(Integer) The number of sockets for the guest VM. By this is "
 "set to the number of vCPUs requested."
 msgstr ""
 
-#: ../compute-flavors.rst:355
+#: ../compute-flavors.rst:361
 msgid ""
 "FLAVOR-CORES—(Integer) The number of cores per socket for the guest VM. By "
 "this is set to 1."
 msgstr ""
 
-#: ../compute-flavors.rst:358
+#: ../compute-flavors.rst:364
 msgid ""
 "FLAVOR-THREADS—(Integer) The number of threads per core for the guest VM. By "
 "this is set to 1."
 msgstr ""
 
-#: ../compute-flavors.rst:359
+#: ../compute-flavors.rst:365
 msgid "CPU topology"
 msgstr ""
 
-#: ../compute-flavors.rst:362
+#: ../compute-flavors.rst:368
 msgid ""
 "VMs can be pinned to specific physical cores in the hypervisor to improve "
 "performance. This should only be done where there is no CPU overcommit "
 "(``cpu_allocation_ratio`` is 1.0)."
 msgstr ""
 
-#: ../compute-flavors.rst:370
+#: ../compute-flavors.rst:376
 msgid "Valid PIN-POLICY values are:"
 msgstr ""
 
-#: ../compute-flavors.rst:372
+#: ../compute-flavors.rst:378
 msgid ""
 "``shared``—(default) The guest vCPUs will be allowed to freely float across "
 "host pCPUs, albeit potentially constrained by NUMA policy."
 msgstr ""
 
-#: ../compute-flavors.rst:375
+#: ../compute-flavors.rst:381
 msgid ""
 "``dedicated``—the guest vCPUs will be strictly pinned to a set of host "
 "pCPUs. In the absence of an explicit vCPU topology request, the drivers "
@@ -4429,11 +4429,11 @@ msgid ""
 "socket, 1 core, 2 threads."
 msgstr ""
 
-#: ../compute-flavors.rst:382
+#: ../compute-flavors.rst:388
 msgid "Core pinning"
 msgstr ""
 
-#: ../compute-flavors.rst:385
+#: ../compute-flavors.rst:391
 msgid ""
 "Flavors can also be assigned to particular projects. By default, a flavor is "
 "public and available to all projects. Private flavors are only accessible to "
@@ -4441,7 +4441,7 @@ msgid ""
 "assign a private flavor to a project, run these commands:"
 msgstr ""
 
-#: ../compute-flavors.rst:393
+#: ../compute-flavors.rst:398
 msgid "Project private flavors"
 msgstr ""
 
@@ -22318,10 +22318,10 @@ msgstr ""
 
 #: ../support-compute.rst:38
 msgid ""
-"You have two options for logging for OpenStack Compute based on "
-"configuration settings. In ``nova.conf``, include the ``logfile`` option to "
-"enable logging. Alternatively you can set ``use_syslog = 1`` so that the "
-"nova daemon logs to syslog."
+"You have two logging options for OpenStack Compute based on configuration "
+"settings. In ``nova.conf``, include the ``logfile`` option to enable "
+"logging. Alternatively you can set ``use_syslog = 1`` so that the nova "
+"daemon logs to syslog."
 msgstr ""
 
 #: ../support-compute.rst:47
diff --git a/doc/common/source/locale/common.pot b/doc/common/source/locale/common.pot
index 5319d6ed69..fbc6f42fee 100644
--- a/doc/common/source/locale/common.pot
+++ b/doc/common/source/locale/common.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Common documents 1.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-11 07:23+0000\n"
+"POT-Creation-Date: 2016-02-17 06:08+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -3213,8 +3213,8 @@ msgid ""
 "describing a cloud application by running OpenStack API calls to generate "
 "running cloud applications. The software integrates other core components of "
 "OpenStack into a one-file template system. The templates allow you to create "
-"most OpenStack resource types, such as instances, floating IPs, volumes, "
-"security groups, and users. It also provides advanced functionality, such as "
+"most OpenStack resource types such as instances, floating IPs, volumes, "
+"security groups, and users. It also provides advanced functionality such as "
 "instance high availability, instance auto-scaling, and nested stacks. This "
 "enables OpenStack core projects to receive a larger user base."
 msgstr ""
diff --git a/doc/common/source/locale/ja/LC_MESSAGES/common.po b/doc/common/source/locale/ja/LC_MESSAGES/common.po
index 8e96e62831..e31d7f1364 100644
--- a/doc/common/source/locale/ja/LC_MESSAGES/common.po
+++ b/doc/common/source/locale/ja/LC_MESSAGES/common.po
@@ -14,11 +14,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Common documents 1.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-14 22:23+0000\n"
+"POT-Creation-Date: 2016-02-16 21:45+0000\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2016-02-14 10:15+0000\n"
+"PO-Revision-Date: 2016-02-17 12:48+0000\n"
 "Last-Translator: KATO Tomoyuki <kato.tomoyuki@jp.fujitsu.com>\n"
 "Language: ja\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
@@ -7363,8 +7363,8 @@ msgid ""
 "describing a cloud application by running OpenStack API calls to generate "
 "running cloud applications. The software integrates other core components of "
 "OpenStack into a one-file template system. The templates allow you to create "
-"most OpenStack resource types, such as instances, floating IPs, volumes, "
-"security groups, and users. It also provides advanced functionality, such as "
+"most OpenStack resource types such as instances, floating IPs, volumes, "
+"security groups, and users. It also provides advanced functionality such as "
 "instance high availability, instance auto-scaling, and nested stacks. This "
 "enables OpenStack core projects to receive a larger user base."
 msgstr ""
diff --git a/doc/config-reference/source/locale/config-reference.pot b/doc/config-reference/source/locale/config-reference.pot
index fc10d0191b..00c8bb35f2 100644
--- a/doc/config-reference/source/locale/config-reference.pot
+++ b/doc/config-reference/source/locale/config-reference.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Configuration Reference 0.9\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-13 06:07+0000\n"
+"POT-Creation-Date: 2016-02-17 06:08+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1033,7 +1033,7 @@ msgstr ""
 #: ../block-storage/drivers/dell-equallogic-driver.rst:9
 #: ../block-storage/drivers/dell-storagecenter-driver.rst:15
 #: ../block-storage/drivers/dothill-driver.rst:27
-#: ../block-storage/drivers/emc-scaleio-driver.rst:20
+#: ../block-storage/drivers/emc-scaleio-driver.rst:21
 #: ../block-storage/drivers/emc-vmax-driver.rst:31
 #: ../block-storage/drivers/emc-vnx-driver.rst:24
 #: ../block-storage/drivers/emc-xtremio-driver.rst:18
@@ -1062,19 +1062,19 @@ msgid "Supported operations"
 msgstr ""
 
 #: ../block-storage/drivers/blockbridge-eps-driver.rst:86
-#: ../block-storage/drivers/emc-scaleio-driver.rst:22
+#: ../block-storage/drivers/emc-scaleio-driver.rst:23
 #: ../block-storage/drivers/nimble-volume-driver.rst:14
 msgid "Create, delete, clone, attach, and detach volumes"
 msgstr ""
 
 #: ../block-storage/drivers/blockbridge-eps-driver.rst:88
-#: ../block-storage/drivers/emc-scaleio-driver.rst:24
+#: ../block-storage/drivers/emc-scaleio-driver.rst:25
 #: ../block-storage/drivers/nimble-volume-driver.rst:16
 msgid "Create and delete volume snapshots"
 msgstr ""
 
 #: ../block-storage/drivers/blockbridge-eps-driver.rst:90
-#: ../block-storage/drivers/emc-scaleio-driver.rst:26
+#: ../block-storage/drivers/emc-scaleio-driver.rst:27
 #: ../block-storage/drivers/huawei-storage-driver.rst:31
 #: ../block-storage/drivers/nimble-volume-driver.rst:18
 #: ../block-storage/drivers/quobyte-driver.rst:32
@@ -1082,28 +1082,28 @@ msgid "Create a volume from a snapshot"
 msgstr ""
 
 #: ../block-storage/drivers/blockbridge-eps-driver.rst:92
-#: ../block-storage/drivers/emc-scaleio-driver.rst:28
+#: ../block-storage/drivers/emc-scaleio-driver.rst:29
 #: ../block-storage/drivers/huawei-storage-driver.rst:27
 #: ../block-storage/drivers/nimble-volume-driver.rst:20
 msgid "Copy an image to a volume"
 msgstr ""
 
 #: ../block-storage/drivers/blockbridge-eps-driver.rst:94
-#: ../block-storage/drivers/emc-scaleio-driver.rst:30
+#: ../block-storage/drivers/emc-scaleio-driver.rst:31
 #: ../block-storage/drivers/huawei-storage-driver.rst:29
 #: ../block-storage/drivers/nimble-volume-driver.rst:22
 msgid "Copy a volume to an image"
 msgstr ""
 
 #: ../block-storage/drivers/blockbridge-eps-driver.rst:96
-#: ../block-storage/drivers/emc-scaleio-driver.rst:32
+#: ../block-storage/drivers/emc-scaleio-driver.rst:33
 #: ../block-storage/drivers/nimble-volume-driver.rst:24
 #: ../block-storage/drivers/quobyte-driver.rst:34
 msgid "Extend a volume"
 msgstr ""
 
 #: ../block-storage/drivers/blockbridge-eps-driver.rst:98
-#: ../block-storage/drivers/emc-scaleio-driver.rst:34
+#: ../block-storage/drivers/emc-scaleio-driver.rst:35
 #: ../block-storage/drivers/nimble-volume-driver.rst:26
 msgid "Get volume statistics"
 msgstr ""
@@ -1191,14 +1191,14 @@ msgid ""
 msgstr ""
 
 #: ../block-storage/drivers/blockbridge-eps-driver.rst:203
-#: ../block-storage/drivers/emc-scaleio-driver.rst:227
+#: ../block-storage/drivers/emc-scaleio-driver.rst:228
 #: ../block-storage/drivers/hds-hnas-driver.rst:0
 #: ../block-storage/drivers/nimble-volume-driver.rst:132
 msgid "Configuration options"
 msgstr ""
 
 #: ../block-storage/drivers/blockbridge-eps-driver.rst:210
-#: ../block-storage/drivers/emc-scaleio-driver.rst:204
+#: ../block-storage/drivers/emc-scaleio-driver.rst:205
 #: ../block-storage/drivers/emc-xtremio-driver.rst:178
 #: ../block-storage/drivers/fujitsu-eternus-dx-driver.rst:208
 msgid "Configuration example"
@@ -2260,96 +2260,100 @@ msgstr ""
 msgid "ScaleIO: Version 1.32"
 msgstr ""
 
-#: ../block-storage/drivers/emc-scaleio-driver.rst:36
+#: ../block-storage/drivers/emc-scaleio-driver.rst:18
+msgid "ScaleIO: Version 2.0"
+msgstr ""
+
+#: ../block-storage/drivers/emc-scaleio-driver.rst:37
 #: ../block-storage/drivers/nimble-volume-driver.rst:28
 msgid "Manage and unmanage a volume"
 msgstr ""
 
-#: ../block-storage/drivers/emc-scaleio-driver.rst:38
+#: ../block-storage/drivers/emc-scaleio-driver.rst:39
 msgid "Create, list, update, and delete consistency groups"
 msgstr ""
 
-#: ../block-storage/drivers/emc-scaleio-driver.rst:40
+#: ../block-storage/drivers/emc-scaleio-driver.rst:41
 msgid "Create, list, update, and delete consistency group snapshots"
 msgstr ""
 
-#: ../block-storage/drivers/emc-scaleio-driver.rst:43
+#: ../block-storage/drivers/emc-scaleio-driver.rst:44
 msgid "ScaleIO QoS support"
 msgstr ""
 
-#: ../block-storage/drivers/emc-scaleio-driver.rst:45
+#: ../block-storage/drivers/emc-scaleio-driver.rst:46
 msgid ""
 "QoS support for ScaleIO driver includes the ability to set the following "
 "capabilities in the Block Storate API ``cinder.api.contrib."
 "qos_specs_manage`` QoS specs extension module:"
 msgstr ""
 
-#: ../block-storage/drivers/emc-scaleio-driver.rst:49
+#: ../block-storage/drivers/emc-scaleio-driver.rst:50
 #: ../block-storage/drivers/hpe-3par-driver.rst:155
 #: ../block-storage/drivers/hpe-3par-driver.rst:191
 msgid "``minBWS``"
 msgstr ""
 
-#: ../block-storage/drivers/emc-scaleio-driver.rst:51
-#: ../block-storage/drivers/emc-scaleio-driver.rst:67
+#: ../block-storage/drivers/emc-scaleio-driver.rst:52
+#: ../block-storage/drivers/emc-scaleio-driver.rst:68
 #: ../block-storage/drivers/hpe-3par-driver.rst:157
 #: ../block-storage/drivers/hpe-3par-driver.rst:195
 msgid "``maxBWS``"
 msgstr ""
 
-#: ../block-storage/drivers/emc-scaleio-driver.rst:53
+#: ../block-storage/drivers/emc-scaleio-driver.rst:54
 msgid ""
 "The QoS keys above 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/emc-scaleio-driver.rst:66
+#: ../block-storage/drivers/emc-scaleio-driver.rst:67
 msgid ""
 "The QoS I/O issue bandwidth rate limit in KBs. If not set, the I/O issue "
 "bandwidth rate has no limit. Must have a granularity of 1024."
 msgstr ""
 
-#: ../block-storage/drivers/emc-scaleio-driver.rst:70
+#: ../block-storage/drivers/emc-scaleio-driver.rst:71
 msgid ""
 "The QoS I/O issue bandwidth rate limit in MBs. If not set, the I/O issue "
 "bandwidth rate has no limit. Must be larger than 10."
 msgstr ""
 
-#: ../block-storage/drivers/emc-scaleio-driver.rst:71
+#: ../block-storage/drivers/emc-scaleio-driver.rst:72
 #: ../block-storage/drivers/hpe-3par-driver.rst:161
 #: ../block-storage/drivers/hpe-3par-driver.rst:203
 msgid "``maxIOPS``"
 msgstr ""
 
-#: ../block-storage/drivers/emc-scaleio-driver.rst:73
+#: ../block-storage/drivers/emc-scaleio-driver.rst:74
 msgid ""
 "Since the limits are per SDC, they will be applied after the volume is "
 "attached to an instance and thus to a compute node/SDC."
 msgstr ""
 
-#: ../block-storage/drivers/emc-scaleio-driver.rst:77
+#: ../block-storage/drivers/emc-scaleio-driver.rst:78
 msgid "ScaleIO thin provisioning support"
 msgstr ""
 
-#: ../block-storage/drivers/emc-scaleio-driver.rst:79
+#: ../block-storage/drivers/emc-scaleio-driver.rst:80
 msgid ""
 "The Block Storage driver supports creation of thin-provisioned volumes, in "
 "addition to thick provisioning. The provisioning type settings should be "
 "added as an extra specification of the volume type, as follows:"
 msgstr ""
 
-#: ../block-storage/drivers/emc-scaleio-driver.rst:88
+#: ../block-storage/drivers/emc-scaleio-driver.rst:89
 msgid ""
 "If the provisioning type value is not specified, the default value of thick "
 "will be used."
 msgstr ""
 
-#: ../block-storage/drivers/emc-scaleio-driver.rst:92
+#: ../block-storage/drivers/emc-scaleio-driver.rst:93
 msgid "ScaleIO Block Storage driver configuration"
 msgstr ""
 
-#: ../block-storage/drivers/emc-scaleio-driver.rst:94
+#: ../block-storage/drivers/emc-scaleio-driver.rst:95
 msgid ""
 "Edit the ``cinder.conf`` file by adding the configuration below under the "
 "``[DEFAULT]`` section of the file in case of a single back end or under a "
@@ -2357,149 +2361,149 @@ msgid ""
 "configuration file is usually located at ``/etc/cinder/cinder.conf``."
 msgstr ""
 
-#: ../block-storage/drivers/emc-scaleio-driver.rst:100
+#: ../block-storage/drivers/emc-scaleio-driver.rst:101
 msgid ""
 "For a configuration example, refer to the :ref:`cinder.conf "
 "<cg_configuration_example_emc>` example."
 msgstr ""
 
-#: ../block-storage/drivers/emc-scaleio-driver.rst:104
+#: ../block-storage/drivers/emc-scaleio-driver.rst:105
 msgid "ScaleIO driver name"
 msgstr ""
 
-#: ../block-storage/drivers/emc-scaleio-driver.rst:106
+#: ../block-storage/drivers/emc-scaleio-driver.rst:107
 msgid "Configure the driver name by adding the following parameter:"
 msgstr ""
 
-#: ../block-storage/drivers/emc-scaleio-driver.rst:113
+#: ../block-storage/drivers/emc-scaleio-driver.rst:114
 msgid "ScaleIO MDM server IP"
 msgstr ""
 
-#: ../block-storage/drivers/emc-scaleio-driver.rst:115
+#: ../block-storage/drivers/emc-scaleio-driver.rst:116
 msgid ""
 "The ScaleIO Meta Data Manager monitors and maintains the available resources "
 "and permissions."
 msgstr ""
 
-#: ../block-storage/drivers/emc-scaleio-driver.rst:118
+#: ../block-storage/drivers/emc-scaleio-driver.rst:119
 msgid ""
 "To retrieve the MDM server IP, use the :command:`drv_cfg --query_mdms` "
 "command."
 msgstr ""
 
-#: ../block-storage/drivers/emc-scaleio-driver.rst:121
+#: ../block-storage/drivers/emc-scaleio-driver.rst:122
 msgid "Configure the MDM server IP by adding the following parameter:"
 msgstr ""
 
-#: ../block-storage/drivers/emc-scaleio-driver.rst:128
+#: ../block-storage/drivers/emc-scaleio-driver.rst:129
 msgid "ScaleIO Protection Domain name"
 msgstr ""
 
-#: ../block-storage/drivers/emc-scaleio-driver.rst:130
+#: ../block-storage/drivers/emc-scaleio-driver.rst:131
 msgid ""
 "ScaleIO allows multiple Protection Domains (groups of SDSs that provide "
 "backup for each other)."
 msgstr ""
 
-#: ../block-storage/drivers/emc-scaleio-driver.rst:133
+#: ../block-storage/drivers/emc-scaleio-driver.rst:134
 msgid ""
 "To retrieve the available Protection Domains, use the :command:`scli --"
 "query_all` command and search for the protection domains section."
 msgstr ""
 
-#: ../block-storage/drivers/emc-scaleio-driver.rst:137
+#: ../block-storage/drivers/emc-scaleio-driver.rst:138
 msgid ""
 "Configure the Protection Domain for newly created volumes by adding the "
 "following parameter:"
 msgstr ""
 
-#: ../block-storage/drivers/emc-scaleio-driver.rst:145
+#: ../block-storage/drivers/emc-scaleio-driver.rst:146
 msgid "ScaleIO Storage Pool name"
 msgstr ""
 
-#: ../block-storage/drivers/emc-scaleio-driver.rst:147
+#: ../block-storage/drivers/emc-scaleio-driver.rst:148
 msgid ""
 "A ScaleIO Storage Pool is a set of physical devices in a protection domain."
 msgstr ""
 
-#: ../block-storage/drivers/emc-scaleio-driver.rst:150
-#: ../block-storage/drivers/emc-scaleio-driver.rst:166
+#: ../block-storage/drivers/emc-scaleio-driver.rst:151
+#: ../block-storage/drivers/emc-scaleio-driver.rst:167
 msgid ""
 "To retrieve the available Storage Pools, use the :command:`scli --query_all` "
 "command and search for available Storage Pools."
 msgstr ""
 
-#: ../block-storage/drivers/emc-scaleio-driver.rst:153
+#: ../block-storage/drivers/emc-scaleio-driver.rst:154
 msgid ""
 "Configure the Storage Pool for newly created volumes by adding the following "
 "parameter:"
 msgstr ""
 
-#: ../block-storage/drivers/emc-scaleio-driver.rst:161
+#: ../block-storage/drivers/emc-scaleio-driver.rst:162
 msgid "ScaleIO Storage Pools"
 msgstr ""
 
-#: ../block-storage/drivers/emc-scaleio-driver.rst:163
+#: ../block-storage/drivers/emc-scaleio-driver.rst:164
 msgid ""
 "Multiple Storage Pools and Protection Domains can be listed for use by the "
 "virtual machines."
 msgstr ""
 
-#: ../block-storage/drivers/emc-scaleio-driver.rst:169
+#: ../block-storage/drivers/emc-scaleio-driver.rst:170
 msgid ""
 "Configure the available Storage Pools by adding the following parameter:"
 msgstr ""
 
-#: ../block-storage/drivers/emc-scaleio-driver.rst:176
+#: ../block-storage/drivers/emc-scaleio-driver.rst:177
 msgid "ScaleIO user credentials"
 msgstr ""
 
-#: ../block-storage/drivers/emc-scaleio-driver.rst:178
+#: ../block-storage/drivers/emc-scaleio-driver.rst:179
 msgid ""
 "Block Storage requires a ScaleIO user with administrative privileges. "
 "ScaleIO recommends creating a dedicated OpenStack user account that holds an "
 "administrative user role."
 msgstr ""
 
-#: ../block-storage/drivers/emc-scaleio-driver.rst:182
+#: ../block-storage/drivers/emc-scaleio-driver.rst:183
 msgid "Refer to the ScaleIO User Guide for details on user account management."
 msgstr ""
 
-#: ../block-storage/drivers/emc-scaleio-driver.rst:184
+#: ../block-storage/drivers/emc-scaleio-driver.rst:185
 #: ../block-storage/drivers/emc-xtremio-driver.rst:109
 msgid "Configure the user credentials by adding the following parameters:"
 msgstr ""
 
-#: ../block-storage/drivers/emc-scaleio-driver.rst:193
+#: ../block-storage/drivers/emc-scaleio-driver.rst:194
 #: ../block-storage/drivers/emc-xtremio-driver.rst:117
 msgid "Multiple back ends"
 msgstr ""
 
-#: ../block-storage/drivers/emc-scaleio-driver.rst:195
+#: ../block-storage/drivers/emc-scaleio-driver.rst:196
 msgid ""
 "Configuring multiple storage back ends enables you to create several back-"
 "end storage solutions that serve the same Compute resources."
 msgstr ""
 
-#: ../block-storage/drivers/emc-scaleio-driver.rst:198
+#: ../block-storage/drivers/emc-scaleio-driver.rst:199
 #: ../block-storage/drivers/emc-xtremio-driver.rst:122
 msgid ""
 "When a volume is created, the scheduler selects the appropriate back end to "
 "handle the request, according to the specified volume type."
 msgstr ""
 
-#: ../block-storage/drivers/emc-scaleio-driver.rst:206
+#: ../block-storage/drivers/emc-scaleio-driver.rst:207
 msgid "**cinder.conf example file**"
 msgstr ""
 
-#: ../block-storage/drivers/emc-scaleio-driver.rst:208
+#: ../block-storage/drivers/emc-scaleio-driver.rst:209
 #: ../block-storage/drivers/emc-xtremio-driver.rst:180
 msgid ""
 "You can update the ``cinder.conf`` file by editing the necessary parameters "
 "as follows:"
 msgstr ""
 
-#: ../block-storage/drivers/emc-scaleio-driver.rst:229
+#: ../block-storage/drivers/emc-scaleio-driver.rst:230
 msgid "The ScaleIO driver supports these configuration options:"
 msgstr ""
 
@@ -6144,7 +6148,7 @@ msgid "HPE 3PAR Operating System software version 3.2.1 MU2 or higher."
 msgstr ""
 
 #: ../block-storage/drivers/hpe-3par-driver.rst:31
-msgid "python-3parclient version 4.0.0 or newer."
+msgid "python-3parclient version 4.1.0 or newer."
 msgstr ""
 
 #: ../block-storage/drivers/hpe-3par-driver.rst:33
@@ -13748,37 +13752,53 @@ msgid ""
 msgstr ""
 
 #: ../compute/hypervisor-hyper-v.rst:412
-msgid "Run Compute with Hyper-V"
+msgid "Inject interfaces and routes"
 msgstr ""
 
 #: ../compute/hypervisor-hyper-v.rst:414
 msgid ""
+"The ``interfaces.template`` file describes the network interfaces and routes "
+"available on your system and how to activate them. You can specify the "
+"location of the file with the ``injected_network_template`` configuration "
+"option in ``/etc/nova/nova.conf``."
+msgstr ""
+
+#: ../compute/hypervisor-hyper-v.rst:423
+msgid "A default template exists in ``nova/virt/interfaces.template``."
+msgstr ""
+
+#: ../compute/hypervisor-hyper-v.rst:426
+msgid "Run Compute with Hyper-V"
+msgstr ""
+
+#: ../compute/hypervisor-hyper-v.rst:428
+msgid ""
 "To start the ``nova-compute`` service, run this command from a console in "
 "the Windows server:"
 msgstr ""
 
-#: ../compute/hypervisor-hyper-v.rst:422
+#: ../compute/hypervisor-hyper-v.rst:436
 msgid "Troubleshoot Hyper-V configuration"
 msgstr ""
 
-#: ../compute/hypervisor-hyper-v.rst:424
+#: ../compute/hypervisor-hyper-v.rst:438
 msgid ""
 "I ran the :command:`nova-manage service list` command from my controller; "
 "however, I'm not seeing smiley faces for Hyper-V compute nodes, what do I do?"
 msgstr ""
 
-#: ../compute/hypervisor-hyper-v.rst:428
+#: ../compute/hypervisor-hyper-v.rst:442
 msgid ""
 "Verify that you are synchronized with a network time source. For "
 "instructions about how to configure NTP on your Hyper-V compute node, see :"
 "ref:`configure-ntp-windows`."
 msgstr ""
 
-#: ../compute/hypervisor-hyper-v.rst:432
+#: ../compute/hypervisor-hyper-v.rst:446
 msgid "How do I restart the compute service?"
 msgstr ""
 
-#: ../compute/hypervisor-hyper-v.rst:438
+#: ../compute/hypervisor-hyper-v.rst:452
 msgid "How do I restart the iSCSI initiator service?"
 msgstr ""
 
diff --git a/doc/install-guide/source/locale/cs/LC_MESSAGES/install-guide.po b/doc/install-guide/source/locale/cs/LC_MESSAGES/install-guide.po
index 7b1451e233..c6ee9bb6e5 100644
--- a/doc/install-guide/source/locale/cs/LC_MESSAGES/install-guide.po
+++ b/doc/install-guide/source/locale/cs/LC_MESSAGES/install-guide.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Installation Guide 0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-14 22:23+0000\n"
+"POT-Creation-Date: 2016-02-16 21:46+0000\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -1177,19 +1177,6 @@ msgstr ""
 "Upravte soubory ``/etc/glance/glance-api.conf`` a ``/etc/glance/glance-"
 "registry.conf``a proveďte následující úkony:"
 
-msgid ""
-"Edit the ``/etc/glance/glance-api.conf`` file and complete the following "
-"actions:"
-msgstr ""
-"Upravte soubor ``/etc/glance/glance-api.conf`` a proveďte následující úkony:"
-
-msgid ""
-"Edit the ``/etc/glance/glance-registry.conf`` file and complete the "
-"following actions:"
-msgstr ""
-"Upravte soubor ``/etc/glance/glance-registry.conf`` a proveďte následující "
-"úkony:"
-
 msgid ""
 "Edit the ``/etc/heat/heat.conf`` file and complete the following actions:"
 msgstr "Upravte soubor ``/etc/heat/heat.conf`` a proveďte následující úkony:"
@@ -1780,21 +1767,6 @@ msgstr ""
 "V Debian balíček Keystone nabízí automatickou registraci Keystone v katalogu "
 "služeb. Toto je stejné jako provedení níže uvedených příkazů:"
 
-msgid ""
-"In Kilo and Liberty releases, the keystone project deprecates eventlet in "
-"favor of a separate web server with WSGI extensions. This guide uses the "
-"Apache HTTP server with ``mod_wsgi`` to serve Identity service requests on "
-"port 5000 and 35357. By default, the keystone service still listens on ports "
-"5000 and 35357. Therefore, this guide disables the keystone service. The "
-"keystone project plans to remove eventlet support in Mitaka."
-msgstr ""
-"Ve verzích Kilo a Liberty projekt Keystone označil eventlet za zastaralý a "
-"nahradill ho samostatným internetovým serverem s rozšířením WSGI. Tento "
-"režim využívá HTTP server Apache s ``mod_wsgi`` pro obsloužení žádosti "
-"služby identit na portech 5000 a 35357. Standardně služba Keystone stále "
-"poslouchá na stejných portech a proto v tomto průvodci je služba zakázána. "
-"Projekt má v plánu podporu eventlet odstranit ve verzi Mitaka."
-
 msgid ""
 "In ``debconf``, the higher the priority for a screen, the greater the chance "
 "that the user sees that screen. If a ``debconf`` screen has ``medium`` "
@@ -1836,13 +1808,6 @@ msgstr ""
 "V případě, že se služba fronty zpráv nespustí a vrátí chybu ``nodedown``, "
 "proveďte následující úkony:"
 
-msgid ""
-"In each client environment script, configure the Image service client to use "
-"API version 2.0:"
-msgstr ""
-"V každém skriptu prostředí klienta nastavte službu obrazů, aby používala API "
-"verze 2.0:"
-
 msgid ""
 "In the ``[DEFAULT]`` and ``[keystone_authtoken]`` sections, configure "
 "Identity service access:"
@@ -2100,12 +2065,6 @@ msgid ""
 "In the ``[service_credentials]`` section, configure service credentials:"
 msgstr "V části ``[service_credentials]``nastavte přihlašovací údaje služby:"
 
-msgid ""
-"In the ``[token]`` section, configure the UUID token provider and Memcached "
-"driver:"
-msgstr ""
-"V části ``[token]``nastavte UUID poskytovatele příznaků a ovladač Memcached:"
-
 msgid "In the ``[vxlan]`` section, disable VXLAN overlay networks:"
 msgstr "V  části ``[vxlan]`` zakažte překryvné sítě VXLAN:"
 
@@ -4208,17 +4167,6 @@ msgstr ""
 "Glance, na uzel kontroléru. Pro zjednodušení bude toto nastavení ukládat "
 "obrazy na místním systému souborů."
 
-msgid ""
-"This section describes how to install and configure the OpenStack Identity "
-"service, code-named keystone, on the controller node. For performance, this "
-"configuration deploys the Apache HTTP server to handle requests and "
-"Memcached to store tokens instead of an SQL database."
-msgstr ""
-"Tato část popisuje jak nainstalovat a nastavit službu identit, pojmenovanou "
-"Keystone, na uzel kontroléru. Vzhledem k výkonu toto nastavení používá HTTP "
-"server Apache pro obsloužení žádostí a Memchached pro uložení příznaků místo "
-"databáze SQL."
-
 msgid ""
 "This section describes how to install and configure the Orchestration "
 "service, code-named heat, on the controller node."
diff --git a/doc/install-guide/source/locale/install-guide.pot b/doc/install-guide/source/locale/install-guide.pot
index 6b3341737a..08fad3e13d 100644
--- a/doc/install-guide/source/locale/install-guide.pot
+++ b/doc/install-guide/source/locale/install-guide.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Installation Guide 0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-15 06:09+0000\n"
+"POT-Creation-Date: 2016-02-17 06:09+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"
@@ -210,7 +210,7 @@ msgstr ""
 #: ../environment-memcached.rst:11 ../environment-ntp-controller.rst:11
 #: ../environment-ntp-other.rst:12 ../environment-sql-database.rst:13
 #: ../glance-install.rst:157 ../glance-install.rst:165
-#: ../glance-install.rst:176 ../glance-install.rst:334 ../heat-install.rst:316
+#: ../glance-install.rst:173 ../glance-install.rst:272 ../heat-install.rst:316
 #: ../heat-install.rst:325 ../heat-install.rst:334 ../horizon-install.rst:31
 #: ../horizon-install.rst:39 ../horizon-install.rst:47
 #: ../horizon-install.rst:55 ../nova-compute-install.rst:31
@@ -238,8 +238,8 @@ msgstr ""
 # #-#-#-#-#  nova-controller-install.pot (Installation Guide 0.1)  #-#-#-#-#
 #: ../ceilometer-aodh.rst:208 ../ceilometer-install.rst:209
 #: ../cinder-controller-install.rst:263 ../cinder-storage-install.rst:163
-#: ../glance-install.rst:187 ../glance-install.rst:262 ../heat-install.rst:346
-#: ../keystone-install.rst:133 ../neutron-controller-install-option1.rst:111
+#: ../glance-install.rst:185 ../heat-install.rst:346
+#: ../keystone-install.rst:120 ../neutron-controller-install-option1.rst:111
 #: ../neutron-controller-install-option2.rst:69
 #: ../nova-controller-install.rst:218
 msgid "In the ``[database]`` section, configure database access:"
@@ -341,9 +341,9 @@ msgstr ""
 # #-#-#-#-#  nova-controller-install.pot (Installation Guide 0.1)  #-#-#-#-#
 #: ../ceilometer-aodh.rst:279 ../ceilometer-install.rst:292
 #: ../ceilometer-nova.rst:96 ../cinder-controller-install.rst:340
-#: ../cinder-storage-install.rst:294 ../glance-install.rst:250
-#: ../glance-install.rst:315 ../heat-install.rst:436
-#: ../keystone-install.rst:169 ../neutron-compute-install.rst:126
+#: ../cinder-storage-install.rst:294 ../glance-install.rst:249
+#: ../heat-install.rst:436 ../keystone-install.rst:146
+#: ../neutron-compute-install.rst:126
 #: ../neutron-controller-install-option1.rst:214
 #: ../neutron-controller-install-option1.rst:353
 #: ../neutron-controller-install-option2.rst:173
@@ -386,7 +386,7 @@ msgstr ""
 #: ../ceilometer-nova.rst:121 ../ceilometer-swift.rst:115
 #: ../cinder-controller-install.rst:369 ../cinder-storage-install.rst:304
 #: ../environment-memcached.rst:46 ../environment-nosql-database.rst:145
-#: ../environment-sql-database.rst:98 ../glance-install.rst:355
+#: ../environment-sql-database.rst:98 ../glance-install.rst:293
 #: ../heat-install.rst:477 ../horizon-install.rst:340
 #: ../neutron-compute-install.rst:175 ../neutron-controller-install.rst:265
 #: ../nova-compute-install.rst:238 ../nova-controller-install.rst:400
@@ -472,7 +472,9 @@ msgstr ""
 msgid "Configure the Image service to use Telemetry"
 msgstr ""
 
-#: ../ceilometer-glance.rst:10
+# #-#-#-#-#  ceilometer-glance.pot (Installation Guide 0.1)  #-#-#-#-#
+# #-#-#-#-#  glance-install.pot (Installation Guide 0.1)  #-#-#-#-#
+#: ../ceilometer-glance.rst:10 ../glance-install.rst:181
 msgid ""
 "Edit the ``/etc/glance/glance-api.conf`` and ``/etc/glance/glance-registry."
 "conf`` files and complete the following actions:"
@@ -876,7 +878,7 @@ msgstr ""
 # #-#-#-#-#  glance-install.pot (Installation Guide 0.1)  #-#-#-#-#
 # #-#-#-#-#  heat-install.pot (Installation Guide 0.1)  #-#-#-#-#
 # #-#-#-#-#  nova-controller-install.pot (Installation Guide 0.1)  #-#-#-#-#
-#: ../cinder-controller-install.rst:252 ../glance-install.rst:340
+#: ../cinder-controller-install.rst:252 ../glance-install.rst:278
 #: ../heat-install.rst:459 ../nova-controller-install.rst:193
 msgid ""
 "Respond to prompts for :doc:`database management <debconf/debconf-dbconfig-"
@@ -911,8 +913,7 @@ msgstr ""
 # #-#-#-#-#  nova-compute-install.pot (Installation Guide 0.1)  #-#-#-#-#
 # #-#-#-#-#  nova-controller-install.pot (Installation Guide 0.1)  #-#-#-#-#
 #: ../cinder-controller-install.rst:318 ../cinder-storage-install.rst:218
-#: ../glance-install.rst:224 ../glance-install.rst:299
-#: ../neutron-compute-install.rst:113
+#: ../glance-install.rst:222 ../neutron-compute-install.rst:113
 #: ../neutron-controller-install-option1.rst:176
 #: ../neutron-controller-install-option2.rst:135
 #: ../nova-compute-install.rst:111 ../nova-controller-install.rst:273
@@ -983,8 +984,8 @@ msgstr ""
 # #-#-#-#-#  neutron-controller-install.pot (Installation Guide 0.1)  #-#-#-#-#
 # #-#-#-#-#  nova-compute-install.pot (Installation Guide 0.1)  #-#-#-#-#
 # #-#-#-#-#  nova-controller-install.pot (Installation Guide 0.1)  #-#-#-#-#
-#: ../cinder-controller-install.rst:404 ../glance-install.rst:378
-#: ../heat-install.rst:503 ../keystone-install.rst:559
+#: ../cinder-controller-install.rst:404 ../glance-install.rst:316
+#: ../heat-install.rst:503 ../keystone-install.rst:541
 #: ../neutron-controller-install.rst:396 ../nova-compute-install.rst:307
 #: ../nova-controller-install.rst:449
 msgid "By default, the Ubuntu packages create an SQLite database."
@@ -997,8 +998,8 @@ msgstr ""
 # #-#-#-#-#  neutron-controller-install.pot (Installation Guide 0.1)  #-#-#-#-#
 # #-#-#-#-#  nova-compute-install.pot (Installation Guide 0.1)  #-#-#-#-#
 # #-#-#-#-#  nova-controller-install.pot (Installation Guide 0.1)  #-#-#-#-#
-#: ../cinder-controller-install.rst:406 ../glance-install.rst:380
-#: ../heat-install.rst:505 ../keystone-install.rst:561
+#: ../cinder-controller-install.rst:406 ../glance-install.rst:318
+#: ../heat-install.rst:505 ../keystone-install.rst:543
 #: ../neutron-controller-install.rst:398 ../nova-compute-install.rst:309
 #: ../nova-controller-install.rst:451
 msgid ""
@@ -1611,9 +1612,7 @@ msgstr ""
 msgid "Restart the Memcached service:"
 msgstr ""
 
-# #-#-#-#-#  environment-memcached.pot (Installation Guide 0.1)  #-#-#-#-#
-# #-#-#-#-#  keystone-install.pot (Installation Guide 0.1)  #-#-#-#-#
-#: ../environment-memcached.rst:58 ../keystone-install.rst:108
+#: ../environment-memcached.rst:58
 msgid ""
 "Start the Memcached service and configure it to start when the system boots:"
 msgstr ""
@@ -2403,7 +2402,7 @@ msgstr ""
 
 # #-#-#-#-#  environment-packages.pot (Installation Guide 0.1)  #-#-#-#-#
 # #-#-#-#-#  keystone-install.pot (Installation Guide 0.1)  #-#-#-#-#
-#: ../environment-packages.rst:160 ../keystone-install.rst:549
+#: ../environment-packages.rst:160 ../keystone-install.rst:531
 msgid "Finalize the installation"
 msgstr ""
 
@@ -2874,71 +2873,63 @@ msgstr ""
 msgid "Create the Image service API endpoints:"
 msgstr ""
 
-#: ../glance-install.rst:184
-msgid ""
-"Edit the ``/etc/glance/glance-api.conf`` file and complete the following "
-"actions:"
-msgstr ""
-
-#: ../glance-install.rst:195 ../glance-install.rst:270
+#: ../glance-install.rst:193
 msgid ""
 "Replace ``GLANCE_DBPASS`` with the password you chose for the Image service "
 "database."
 msgstr ""
 
-#: ../glance-install.rst:198 ../glance-install.rst:273
+#: ../glance-install.rst:196
 msgid ""
 "In the ``[keystone_authtoken]`` and ``[paste_deploy]`` sections, configure "
 "Identity service access:"
 msgstr ""
 
-#: ../glance-install.rst:219 ../glance-install.rst:294
+#: ../glance-install.rst:217
 msgid ""
 "Replace ``GLANCE_PASS`` with the password you chose for the ``glance`` user "
 "in the Identity service."
 msgstr ""
 
-#: ../glance-install.rst:227
+#: ../glance-install.rst:225
 msgid ""
 "In the ``[glance_store]`` section, configure the local file system store and "
 "location of image files:"
 msgstr ""
 
-#: ../glance-install.rst:237 ../glance-install.rst:302
+#: ../glance-install.rst:236
 msgid ""
 "In the ``[DEFAULT]`` section, configure the ``noop`` notification driver to "
 "disable notifications because they only pertain to the optional Telemetry "
 "service:"
 msgstr ""
 
-#: ../glance-install.rst:247 ../glance-install.rst:312
+#: ../glance-install.rst:246
 msgid ""
 "The Telemetry chapter provides an Image service configuration that enables "
 "notifications."
 msgstr ""
 
-#: ../glance-install.rst:259
-msgid ""
-"Edit the ``/etc/glance/glance-registry.conf`` file and complete the "
-"following actions:"
+#: ../glance-install.rst:260
+msgid "Both files contain the same configuration options."
 msgstr ""
 
-#: ../glance-install.rst:326
+#: ../glance-install.rst:264
 msgid "Populate the Image service database:"
 msgstr ""
 
-#: ../glance-install.rst:346
+#: ../glance-install.rst:284
 msgid ""
 "Select the ``keystone`` pipeline to configure the Image service to use the "
 "Identity service:"
 msgstr ""
 
-#: ../glance-install.rst:359
+#: ../glance-install.rst:297
 msgid ""
 "Start the Image services and configure them to start when the system boots:"
 msgstr ""
 
-#: ../glance-install.rst:371
+#: ../glance-install.rst:309
 msgid "Restart the Image services:"
 msgstr ""
 
@@ -2960,7 +2951,7 @@ msgstr ""
 #: ../glance-verify.rst:15
 msgid ""
 "In each client environment script, configure the Image service client to use "
-"API version 2.0:"
+"API version 2:"
 msgstr ""
 
 #: ../glance-verify.rst:30
@@ -3561,8 +3552,8 @@ msgstr ""
 msgid ""
 "This section describes how to install and configure the OpenStack Identity "
 "service, code-named keystone, on the controller node. For performance, this "
-"configuration deploys the Apache HTTP server to handle requests and "
-"Memcached to store tokens instead of an SQL database."
+"configuration deploys Fernet tokens and the Apache HTTP server to handle "
+"requests."
 msgstr ""
 
 #: ../keystone-install.rst:16
@@ -3587,7 +3578,7 @@ msgstr ""
 msgid "Replace ``KEYSTONE_DBPASS`` with a suitable password."
 msgstr ""
 
-#: ../keystone-install.rst:47 ../keystone-install.rst:214
+#: ../keystone-install.rst:47 ../keystone-install.rst:197
 msgid ""
 "Generate a random value to use as the administration token during initial "
 "configuration:"
@@ -3595,7 +3586,7 @@ msgstr ""
 
 #: ../keystone-install.rst:62
 msgid ""
-"In Kilo and Liberty releases, the keystone project deprecates eventlet in "
+"In Kilo and newer releases, the keystone project deprecates eventlet in "
 "favor of a separate web server with WSGI extensions. This guide uses the "
 "Apache HTTP server with ``mod_wsgi`` to serve Identity service requests on "
 "port 5000 and 35357. By default, the keystone service still listens on ports "
@@ -3608,91 +3599,89 @@ msgid ""
 "Disable the keystone service from starting automatically after installation:"
 msgstr ""
 
-#: ../keystone-install.rst:79 ../keystone-install.rst:90
-#: ../keystone-install.rst:191
+#: ../keystone-install.rst:79 ../keystone-install.rst:89
+#: ../keystone-install.rst:174
 msgid "Run the following command to install the packages:"
 msgstr ""
 
-#: ../keystone-install.rst:118
+#: ../keystone-install.rst:105
 msgid ""
 "Edit the ``/etc/keystone/keystone.conf`` file and complete the following "
 "actions:"
 msgstr ""
 
-#: ../keystone-install.rst:121
+#: ../keystone-install.rst:108
 msgid ""
 "In the ``[DEFAULT]`` section, define the value of the initial administration "
 "token:"
 msgstr ""
 
-#: ../keystone-install.rst:130
+#: ../keystone-install.rst:117
 msgid ""
 "Replace ``ADMIN_TOKEN`` with the random value that you generated in a "
 "previous step."
 msgstr ""
 
-#: ../keystone-install.rst:141
+#: ../keystone-install.rst:128
 msgid ""
 "Replace ``KEYSTONE_DBPASS`` with the password you chose for the database."
 msgstr ""
 
-#: ../keystone-install.rst:143
-msgid "In the ``[memcache]`` section, configure the Memcached service:"
+#: ../keystone-install.rst:130
+msgid "In the ``[token]`` section, configure the Fernet token provider:"
 msgstr ""
 
-#: ../keystone-install.rst:151
-msgid ""
-"In the ``[token]`` section, configure the UUID token provider and Memcached "
-"driver:"
-msgstr ""
-
-#: ../keystone-install.rst:161
+#: ../keystone-install.rst:138
 msgid "In the ``[revoke]`` section, configure the SQL revocation driver:"
 msgstr ""
 
-#: ../keystone-install.rst:180
+#: ../keystone-install.rst:157
 msgid "Populate the Identity service database:"
 msgstr ""
 
-#: ../keystone-install.rst:189
+#: ../keystone-install.rst:163
+msgid "Initialize Fernet keys:"
+msgstr ""
+
+#: ../keystone-install.rst:172
 msgid "Install and configure the components"
 msgstr ""
 
-#: ../keystone-install.rst:197
+#: ../keystone-install.rst:180
 msgid ""
 "Respond to prompts for :doc:`debconf/debconf-dbconfig-common`, which will "
 "fill the below database access directive."
 msgstr ""
 
-#: ../keystone-install.rst:206
+#: ../keystone-install.rst:189
 msgid ""
 "If you decide to not use ``dbconfig-common``, then you have to create the "
 "database and manage its access rights yourself, and run the following by "
 "hand."
 msgstr ""
 
-#: ../keystone-install.rst:221
+#: ../keystone-install.rst:204
 msgid "Configure the initial administration token:"
 msgstr ""
 
-#: ../keystone-install.rst:226
+#: ../keystone-install.rst:209
 msgid ""
 "Use the random value that you generated in a previous step. If you install "
 "using non-interactive mode or you do not specify this token, the "
 "configuration tool generates a random value."
 msgstr ""
 
-#: ../keystone-install.rst:230
+#: ../keystone-install.rst:213
 msgid ""
 "Later on, the package will configure the below directive with the value you "
 "entered:"
 msgstr ""
 
-#: ../keystone-install.rst:239
+#: ../keystone-install.rst:222
 msgid "Create the ``admin`` project and user:"
 msgstr ""
 
-#: ../keystone-install.rst:241
+#: ../keystone-install.rst:224
 msgid ""
 "During the final stage of the package installation, it is possible to "
 "automatically create an ``admin`` and ``service`` project, and an ``admin`` "
@@ -3700,71 +3689,71 @@ msgid ""
 "Identity service. This is the equivalent of running the below commands:"
 msgstr ""
 
-#: ../keystone-install.rst:304
+#: ../keystone-install.rst:287
 msgid ""
 "In Debian, the Keystone package offers automatic registration of Keystone in "
 "the service catalogue. This is equivalent of running the below commands:"
 msgstr ""
 
-#: ../keystone-install.rst:343
+#: ../keystone-install.rst:325
 msgid "Configure the Apache HTTP server"
 msgstr ""
 
-#: ../keystone-install.rst:347
+#: ../keystone-install.rst:329
 msgid ""
 "Edit the ``/etc/httpd/conf/httpd.conf`` file and configure the "
 "``ServerName`` option to reference the controller node:"
 msgstr ""
 
-#: ../keystone-install.rst:354
+#: ../keystone-install.rst:336
 msgid ""
 "Create the ``/etc/httpd/conf.d/wsgi-keystone.conf`` file with the following "
 "content:"
 msgstr ""
 
-#: ../keystone-install.rst:410
+#: ../keystone-install.rst:392
 msgid ""
 "Edit the ``/etc/apache2/apache2.conf`` file and configure the ``ServerName`` "
 "option to reference the controller node:"
 msgstr ""
 
-#: ../keystone-install.rst:417
+#: ../keystone-install.rst:399
 msgid ""
 "Create the ``/etc/apache2/sites-available/wsgi-keystone.conf`` file with the "
 "following content:"
 msgstr ""
 
-#: ../keystone-install.rst:471
+#: ../keystone-install.rst:453
 msgid "Enable the Identity service virtual hosts:"
 msgstr ""
 
-#: ../keystone-install.rst:479
+#: ../keystone-install.rst:461
 msgid ""
 "Edit the ``/etc/sysconfig/apache2`` file and configure the "
 "``APACHE_SERVERNAME`` option to reference the controller node:"
 msgstr ""
 
-#: ../keystone-install.rst:486
+#: ../keystone-install.rst:468
 msgid ""
 "Create the ``/etc/apache2/conf.d/wsgi-keystone.conf`` file with the "
 "following content:"
 msgstr ""
 
-#: ../keystone-install.rst:540
+#: ../keystone-install.rst:522
 msgid "Recursively change the ownership of the ``/etc/keystone`` directory:"
 msgstr ""
 
-#: ../keystone-install.rst:553
+#: ../keystone-install.rst:535
 msgid "Restart the Apache HTTP server:"
 msgstr ""
 
-#: ../keystone-install.rst:570 ../keystone-install.rst:585
+#: ../keystone-install.rst:552 ../keystone-install.rst:567
 msgid ""
 "Start the Apache HTTP service and configure it to start when the system "
 "boots:"
 msgstr ""
 
-#: ../keystone-install.rst:579
+#: ../keystone-install.rst:561
 msgid "Activate the Apache module ``mod_version``:"
 msgstr ""
 
@@ -3799,40 +3788,40 @@ msgstr ""
 msgid "Edit the ``admin-openrc.sh`` file and add the following content:"
 msgstr ""
 
-#: ../keystone-openrc.rst:33
+#: ../keystone-openrc.rst:32
 msgid ""
 "Replace ``ADMIN_PASS`` with the password you chose for the ``admin`` user in "
 "the Identity service."
 msgstr ""
 
-#: ../keystone-openrc.rst:36
+#: ../keystone-openrc.rst:35
 msgid "Edit the ``demo-openrc.sh`` file and add the following content:"
 msgstr ""
 
-#: ../keystone-openrc.rst:49
+#: ../keystone-openrc.rst:47
 msgid ""
 "Replace ``DEMO_PASS`` with the password you chose for the ``demo`` user in "
 "the Identity service."
 msgstr ""
 
-#: ../keystone-openrc.rst:53
+#: ../keystone-openrc.rst:51
 msgid "Using the scripts"
 msgstr ""
 
-#: ../keystone-openrc.rst:55
+#: ../keystone-openrc.rst:53
 msgid ""
 "To run clients as a specific project and user, you can simply load the "
 "associated client environment script prior to running them. For example:"
 msgstr ""
 
-#: ../keystone-openrc.rst:59
+#: ../keystone-openrc.rst:57
 msgid ""
 "Load the ``admin-openrc.sh`` file to populate environment variables with the "
 "location of the Identity service and the ``admin`` project and user "
 "credentials:"
 msgstr ""
 
-#: ../keystone-openrc.rst:67
+#: ../keystone-openrc.rst:65
 msgid "Request an authentication token:"
 msgstr ""
 
@@ -3945,10 +3934,6 @@ msgid ""
 "service entities and three API endpoint variants in the Identity service."
 msgstr ""
 
-#: ../keystone-services.rst:180
-msgid "Services can access the v3 API using the v2.0 URL."
-msgstr ""
-
 #: ../keystone-users.rst:2
 msgid "Create projects, users, and roles"
 msgstr ""
@@ -4066,15 +4051,15 @@ msgstr ""
 msgid "As the ``admin`` user, request an authentication token:"
 msgstr ""
 
-#: ../keystone-verify.rst:52
+#: ../keystone-verify.rst:54
 msgid "This command uses the password for the ``admin`` user."
 msgstr ""
 
-#: ../keystone-verify.rst:54
+#: ../keystone-verify.rst:56
 msgid "As the ``demo`` user, request an authentication token:"
 msgstr ""
 
-#: ../keystone-verify.rst:73
+#: ../keystone-verify.rst:77
 msgid ""
 "This command uses the password for the ``demo`` user and API port 5000 which "
 "only allows regular (non-admin) access to the Identity service API."
diff --git a/doc/install-guide/source/locale/ja/LC_MESSAGES/install-guide.po b/doc/install-guide/source/locale/ja/LC_MESSAGES/install-guide.po
index 4ecad6bc74..06932c1cd8 100644
--- a/doc/install-guide/source/locale/ja/LC_MESSAGES/install-guide.po
+++ b/doc/install-guide/source/locale/ja/LC_MESSAGES/install-guide.po
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Installation Guide 0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-14 22:23+0000\n"
+"POT-Creation-Date: 2016-02-16 21:46+0000\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -1558,20 +1558,6 @@ msgstr ""
 "``/etc/glance/glance-api.conf`` と ``/etc/glance/glance-registry.conf`` ファ"
 "イルを編集し、以下の作業をすべて行います。"
 
-msgid ""
-"Edit the ``/etc/glance/glance-api.conf`` file and complete the following "
-"actions:"
-msgstr ""
-"``/etc/glance/glance-api.conf`` ファイルを編集し、以下の作業をすべて行いま"
-"す。"
-
-msgid ""
-"Edit the ``/etc/glance/glance-registry.conf`` file and complete the "
-"following actions:"
-msgstr ""
-"``/etc/glance/glance-registry.conf`` ファイルを編集し、以下の作業をすべて行い"
-"ます。"
-
 msgid ""
 "Edit the ``/etc/heat/heat.conf`` file and complete the following actions:"
 msgstr "``/etc/heat/heat.conf`` ファイルを編集し、以下の作業をすべて行います。"
@@ -2384,22 +2370,6 @@ msgstr ""
 "Debian の場合、Keystone パッケージが自動的にサービスカタログに Keystone を登"
 "録します。以下のコマンドを実行するのと同等です。"
 
-msgid ""
-"In Kilo and Liberty releases, the keystone project deprecates eventlet in "
-"favor of a separate web server with WSGI extensions. This guide uses the "
-"Apache HTTP server with ``mod_wsgi`` to serve Identity service requests on "
-"port 5000 and 35357. By default, the keystone service still listens on ports "
-"5000 and 35357. Therefore, this guide disables the keystone service. The "
-"keystone project plans to remove eventlet support in Mitaka."
-msgstr ""
-"Kilo リリースと Liberty リリースでは、keystone プロジェクトは eventlet を非推"
-"奨扱いとしています。代わりに WSGI 拡張に対応した専用 Web サーバーの使用を推奨"
-"しています。このガイドでは、Apache HTTP server の ``mod_wsgi`` を使用して、"
-"5000 番ポートと 35357 番ポートで Identity サービスのリクエストを処理します。"
-"デフォルトでは、keystone サービスは、まだ 5000 番と 35357 番をリッスンしてい"
-"ます。そのため、このガイドでは、keystone サービスを無効化します。keystone プ"
-"ロジェクトは、Mitaka リリースで eventlet のサポートを削除する予定です。"
-
 msgid ""
 "In ``debconf``, the higher the priority for a screen, the greater the chance "
 "that the user sees that screen. If a ``debconf`` screen has ``medium`` "
@@ -2441,13 +2411,6 @@ msgstr ""
 "メッセージキューサービスが起動していない場合、以下の操作を実行すると "
 "``nodedown``  エラーが返ってきます。"
 
-msgid ""
-"In each client environment script, configure the Image service client to use "
-"API version 2.0:"
-msgstr ""
-"各クライアント環境スクリプトにおいて、API version 2.0 を使用するよう Image "
-"service クライアントを設定します。"
-
 msgid ""
 "In each client environment script, configure the Object Storage service "
 "client to use the Identity API version 3:"
@@ -2892,13 +2855,6 @@ msgstr ""
 "``[swift-hash]`` セクションに、ハッシュパスのプレフィックスとサフィックスをお"
 "使いの環境に合わせて設定します。"
 
-msgid ""
-"In the ``[token]`` section, configure the UUID token provider and Memcached "
-"driver:"
-msgstr ""
-"``[token]`` セクションで UUID トークンプロバイダーと memcached ドライバーを設"
-"定します。"
-
 msgid ""
 "In the ``[vnc]`` section, configure the VNC proxy to use the management "
 "interface IP address of the controller node:"
@@ -4468,9 +4424,6 @@ msgstr "サービス"
 msgid "Services and the [keystone_authtoken]"
 msgstr "サービスと [keystone_authtoken]"
 
-msgid "Services can access the v3 API using the v2.0 URL."
-msgstr "サービスは v2.0 API の URL を使って v3 API にアクセスできます。"
-
 msgid "Set a gateway on the public network on the router:"
 msgstr "ルーターにおいて、ゲートウェイをパブリックネットワークに設定します。"
 
@@ -5932,17 +5885,6 @@ msgstr ""
 "インストールして設定する方法を説明します。簡単のため、この設定ではイメージを"
 "ローカルファイルシステムに保存します。"
 
-msgid ""
-"This section describes how to install and configure the OpenStack Identity "
-"service, code-named keystone, on the controller node. For performance, this "
-"configuration deploys the Apache HTTP server to handle requests and "
-"Memcached to store tokens instead of an SQL database."
-msgstr ""
-"このセクションでは、コントローラーノードに OpenStack Identity サービス (コー"
-"ド名 keystone) をインストールして設定する方法を説明します。この設定では、パ"
-"フォーマンスを重視し、Apache HTTP サーバーを使ってリクエストを処理し、SQL "
-"データベースの代わりに Memcached を使ってトークンを保存するようにします。"
-
 msgid ""
 "This section describes how to install and configure the Orchestration "
 "service, code-named heat, on the controller node."
diff --git a/doc/networking-guide/source/locale/networking-guide.pot b/doc/networking-guide/source/locale/networking-guide.pot
index bca89ab998..6cde98e183 100644
--- a/doc/networking-guide/source/locale/networking-guide.pot
+++ b/doc/networking-guide/source/locale/networking-guide.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Networking Guide 0.9\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-12 06:12+0000\n"
+"POT-Creation-Date: 2016-02-17 06:09+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"
@@ -3832,7 +3832,7 @@ msgstr ""
 #: ../migration-classic-to-l3ha.rst:103
 msgid ""
 "To return to classic mode, turn down the router again, turning off L3 HA and "
-"starting the router again"
+"starting the router again."
 msgstr ""
 
 #: ../migration-classic-to-l3ha.rst:156
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 55303891b6..177e3714bc 100644
--- a/doc/user-guide/source/locale/ja/LC_MESSAGES/user-guide.po
+++ b/doc/user-guide/source/locale/ja/LC_MESSAGES/user-guide.po
@@ -20,11 +20,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: End User Guide 1.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-08 14:51+0000\n"
+"POT-Creation-Date: 2016-02-16 21:46+0000\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2016-02-01 03:46+0000\n"
+"PO-Revision-Date: 2016-02-17 12:50+0000\n"
 "Last-Translator: Akihiro Motoki <amotoki@gmail.com>\n"
 "Language: ja\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
@@ -1061,6 +1061,24 @@ msgstr ""
 "イメージが正常にアップロードされた後、新しいイメージを使用してインスタンスを"
 "起動できます。"
 
+msgid ""
+"After the instance is successfully launched, connect to the instance using a "
+"remote console and follow the instructions to install the system as using "
+"ISO images on regular computers. When the installation is finished and "
+"system is rebooted, the instance asks you again to install the operating "
+"system, which means your instance is not usable. If you have problems with "
+"image creation, please check the `Virtual Machine Image Guide <http://docs."
+"openstack.org/image-guide/create-images-manually.html>`_ for reference."
+msgstr ""
+"インスタンスの正常起動後、リモートコンソールを使用してインスタンスに接続しま"
+"す。以下の説明に沿って、通常のコンピューターにおいて ISO イメージを使用するの"
+"と同じように、システムをインストールします。インストールが完了し、システムが"
+"再起動した後、インスタンスに再びオペレーティングシステムをインストールするか"
+"どうかを確認されます。これは、インスタンスが利用できないことを意味します。イ"
+"メージの作成に問題があれば、リファレンスとして `Virtual Machine Image Guide "
+"<http://docs.openstack.org/ja/image-guide/create-images-manually.html>`_ を参"
+"照してください。"
+
 msgid ""
 "After the server is built, if you change the server name in the API or "
 "change the host name directly, the names are not updated in the dashboard."