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 deb04a1bd6..08d034ec55 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-09-26 06:15+0000\n"
+"POT-Creation-Date: 2015-09-28 06:21+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"
@@ -1199,7 +1199,7 @@ msgstr ""
 msgid "*1085276160*"
 msgstr ""
 
-#: ../blockstorage_volume_backups.rst:118
+#: ../blockstorage_volume_backups.rst:125
 msgid ""
 "*MOUNT_OPTIONS* is a comma-separated string of NFS mount options as detailed "
 "in the NFS man page."
@@ -2620,7 +2620,7 @@ msgstr ""
 msgid "Alternatively, use the API directly:"
 msgstr ""
 
-#: ../blockstorage_volume_backups.rst:83
+#: ../blockstorage_volume_backups.rst:90
 msgid ""
 "Alternatively, you can export and save the metadata of selected volume "
 "backups. Doing so precludes the need to back up the entire Block Storage "
@@ -3352,7 +3352,7 @@ msgid ""
 "migration`."
 msgstr ""
 
-#: ../blockstorage_volume_backups.rst:78
+#: ../blockstorage_volume_backups.rst:85
 msgid ""
 "Because volume backups are dependent on the Block Storage database, you must "
 "also back up your Block Storage database regularly to ensure data recovery."
@@ -3670,7 +3670,7 @@ msgid ""
 "user to modify it."
 msgstr ""
 
-#: ../blockstorage_volume_backups.rst:95
+#: ../blockstorage_volume_backups.rst:102
 msgid "By default, the swift object store is used for the backup repository."
 msgstr ""
 
@@ -7347,7 +7347,7 @@ msgid ""
 "User Guide."
 msgstr ""
 
-#: ../blockstorage_volume_backups.rst:92
+#: ../blockstorage_volume_backups.rst:99
 msgid ""
 "For more information about how to export and import volume backup metadata, "
 "see the section called :ref:`volume_backups_export_import`."
@@ -7501,7 +7501,7 @@ msgid ""
 "reboots, set the following boolean value as the root user:"
 msgstr ""
 
-#: ../blockstorage_volume_backups.rst:107
+#: ../blockstorage_volume_backups.rst:114
 msgid ""
 "For the ``backup_share`` option, replace *HOST* with the DNS resolvable host "
 "name or the IP address of the storage server for the NFS share, and "
@@ -8172,7 +8172,7 @@ msgid ""
 "chain is also in PEM format."
 msgstr ""
 
-#: ../blockstorage_volume_backups.rst:97
+#: ../blockstorage_volume_backups.rst:104
 msgid ""
 "If instead you want to use an NFS export as the backup repository, add the "
 "following configuration options to the ``[DEFAULT]`` section of the :file:"
@@ -8558,7 +8558,7 @@ msgid ""
 "this error."
 msgstr ""
 
-#: ../blockstorage_volume_backups.rst:88
+#: ../blockstorage_volume_backups.rst:95
 msgid ""
 "If you specify a UUID encryption key when setting up the volume "
 "specifications, the backup metadata ensures that the key will remain valid "
@@ -16598,7 +16598,7 @@ msgid ""
 "that the default values work fine in most cases."
 msgstr ""
 
-#: ../blockstorage_volume_backups.rst:131
+#: ../blockstorage_volume_backups.rst:138
 msgid ""
 "The option ``backup_compression_algorithm`` can be set to ``bz2`` or "
 "``None``. The latter can be a useful setting when the server providing the "
@@ -16606,7 +16606,7 @@ msgid ""
 "on the backup data."
 msgstr ""
 
-#: ../blockstorage_volume_backups.rst:136
+#: ../blockstorage_volume_backups.rst:143
 msgid ""
 "The option ``backup_file_size`` must be a multiple of "
 "``backup_sha_block_size_bytes``. It is effectively the maximum file size to "
@@ -17564,7 +17564,7 @@ msgid ""
 "file:`cinder.conf`::"
 msgstr ""
 
-#: ../blockstorage_volume_backups.rst:121
+#: ../blockstorage_volume_backups.rst:128
 msgid ""
 "There are several other options whose default values may be overridden as "
 "appropriate for your environment:"
@@ -21293,6 +21293,15 @@ msgid ""
 "drives are used in a cluster."
 msgstr ""
 
+#: ../blockstorage_volume_backups.rst:78
+msgid ""
+"You can view a backup list with the :command:`cinder backup-list` command. "
+"Optional arguments to clarify the status of your backups include: running "
+"``--name``, ``--status``, and ``--volume-id`` to filter through backups by "
+"the specified name, status, or volume-id. Search with ``--all-tenants`` for "
+"details of the tenants associated with the listed backups."
+msgstr ""
+
 #: ../blockstorage_volume_backups_export_import.rst:20
 msgid ""
 "You can, however, export the metadata of a volume backup. To do so, run this "
diff --git a/doc/common-rst/source/locale/common-rst.pot b/doc/common-rst/source/locale/common-rst.pot
index 82dac049a2..44c7c7ee1f 100644
--- a/doc/common-rst/source/locale/common-rst.pot
+++ b/doc/common-rst/source/locale/common-rst.pot
@@ -50,7 +50,7 @@ msgstr ""
 msgid "**Figure: Admin tab**"
 msgstr ""
 
-#: ../common/log_in_dashboard.rst:68
+#: ../common/log_in_dashboard.rst:68 ../common/log_in_dashboard.rst:70
 msgid "**Figure: Project tab**"
 msgstr ""
 
@@ -170,10 +170,12 @@ msgid ":file:`ramdisk`"
 msgstr ""
 
 #: ../common/log_in_dashboard.rst:106 ../common/log_in_dashboard.rst:102
+#: ../common/log_in_dashboard.rst:104
 msgid ":guilabel:`API Access`: View API endpoints."
 msgstr ""
 
 #: ../common/log_in_dashboard.rst:96 ../common/log_in_dashboard.rst:92
+#: ../common/log_in_dashboard.rst:94
 msgid ""
 ":guilabel:`Access & Security`: Use the following tabs to complete these "
 "tasks:"
@@ -185,27 +187,31 @@ msgstr ""
 
 #: ../common/log_in_dashboard.rst:203 ../common/log_in_dashboard.rst:195
 #: ../common/log_in_dashboard.rst:201 ../common/log_in_dashboard.rst:200
+#: ../common/log_in_dashboard.rst:202
 msgid ""
 ":guilabel:`Block Storage Services`: View a list of all Block Storage "
 "services."
 msgstr ""
 
 #: ../common/log_in_dashboard.rst:219 ../common/log_in_dashboard.rst:225
-#: ../common/log_in_dashboard.rst:224
+#: ../common/log_in_dashboard.rst:224 ../common/log_in_dashboard.rst:228
 msgid ":guilabel:`Change Password`: Change the password of the user."
 msgstr ""
 
 #: ../common/log_in_dashboard.rst:191 ../common/log_in_dashboard.rst:194
 #: ../common/log_in_dashboard.rst:201 ../common/log_in_dashboard.rst:193
 #: ../common/log_in_dashboard.rst:199 ../common/log_in_dashboard.rst:198
+#: ../common/log_in_dashboard.rst:200
 msgid ":guilabel:`Compute Services`: View a list of all Compute services."
 msgstr ""
 
 #: ../common/log_in_dashboard.rst:78 ../common/log_in_dashboard.rst:74
+#: ../common/log_in_dashboard.rst:76
 msgid ":guilabel:`Compute` tab"
 msgstr ""
 
 #: ../common/log_in_dashboard.rst:122 ../common/log_in_dashboard.rst:118
+#: ../common/log_in_dashboard.rst:120
 msgid ":guilabel:`Containers`: Create and manage containers and objects."
 msgstr ""
 
@@ -222,6 +228,7 @@ msgstr ""
 
 #: ../common/log_in_dashboard.rst:189 ../common/log_in_dashboard.rst:181
 #: ../common/log_in_dashboard.rst:187 ../common/log_in_dashboard.rst:186
+#: ../common/log_in_dashboard.rst:188
 msgid ""
 ":guilabel:`Defaults`: View default quota values. Quotas are hard-coded in "
 "OpenStack Compute and define the maximum allowable size and number of "
@@ -230,12 +237,14 @@ msgstr ""
 
 #: ../common/log_in_dashboard.rst:176 ../common/log_in_dashboard.rst:179
 #: ../common/log_in_dashboard.rst:171 ../common/log_in_dashboard.rst:177
+#: ../common/log_in_dashboard.rst:178
 msgid ""
 ":guilabel:`Flavors`: View, create, edit, view extra specifications for, and "
 "delete flavors. A flavor is size of an instance."
 msgstr ""
 
 #: ../common/log_in_dashboard.rst:103 ../common/log_in_dashboard.rst:99
+#: ../common/log_in_dashboard.rst:101
 msgid ""
 ":guilabel:`Floating IPs`: Allocate an IP address to or release it from a "
 "project."
@@ -243,6 +252,7 @@ msgstr ""
 
 #: ../common/log_in_dashboard.rst:167 ../common/log_in_dashboard.rst:170
 #: ../common/log_in_dashboard.rst:162 ../common/log_in_dashboard.rst:161
+#: ../common/log_in_dashboard.rst:163
 msgid ""
 ":guilabel:`Host Aggregates`: View, create, and edit host aggregates. View "
 "the list of availability zones."
@@ -250,6 +260,7 @@ msgstr ""
 
 #: ../common/log_in_dashboard.rst:165 ../common/log_in_dashboard.rst:168
 #: ../common/log_in_dashboard.rst:160 ../common/log_in_dashboard.rst:159
+#: ../common/log_in_dashboard.rst:161
 msgid ":guilabel:`Hypervisors`: View the hypervisor summary."
 msgstr ""
 
@@ -259,6 +270,7 @@ msgid ":guilabel:`Identity Panel` tab"
 msgstr ""
 
 #: ../common/log_in_dashboard.rst:92 ../common/log_in_dashboard.rst:88
+#: ../common/log_in_dashboard.rst:90
 msgid ""
 ":guilabel:`Images`: View images and instance snapshots created by project "
 "users, plus any images that are publicly available. Create, edit, and delete "
@@ -267,12 +279,14 @@ msgstr ""
 
 #: ../common/log_in_dashboard.rst:179 ../common/log_in_dashboard.rst:182
 #: ../common/log_in_dashboard.rst:174 ../common/log_in_dashboard.rst:180
+#: ../common/log_in_dashboard.rst:181
 msgid ""
 ":guilabel:`Images`: View, create, edit properties for, and delete custom "
 "images."
 msgstr ""
 
 #: ../common/log_in_dashboard.rst:82 ../common/log_in_dashboard.rst:78
+#: ../common/log_in_dashboard.rst:80
 msgid ""
 ":guilabel:`Instances`: View, launch, create a snapshot from, stop, pause, or "
 "reboot instances, or connect to them through VNC."
@@ -280,6 +294,7 @@ msgstr ""
 
 #: ../common/log_in_dashboard.rst:170 ../common/log_in_dashboard.rst:173
 #: ../common/log_in_dashboard.rst:165 ../common/log_in_dashboard.rst:164
+#: ../common/log_in_dashboard.rst:166
 msgid ""
 ":guilabel:`Instances`: View, pause, resume, suspend, migrate, soft or hard "
 "reboot, and delete running instances that belong to users of some, but not "
@@ -288,12 +303,14 @@ msgid ""
 msgstr ""
 
 #: ../common/log_in_dashboard.rst:101 ../common/log_in_dashboard.rst:97
+#: ../common/log_in_dashboard.rst:99
 msgid ""
 ":guilabel:`Key Pairs`: View, create, edit, import, and delete key pairs."
 msgstr ""
 
 #: ../common/log_in_dashboard.rst:193 ../common/log_in_dashboard.rst:185
 #: ../common/log_in_dashboard.rst:191 ../common/log_in_dashboard.rst:190
+#: ../common/log_in_dashboard.rst:192
 msgid ""
 ":guilabel:`Metadata Definitions`: Import namespace and view the metadata "
 "information."
@@ -302,48 +319,58 @@ msgstr ""
 #: ../common/log_in_dashboard.rst:193 ../common/log_in_dashboard.rst:196
 #: ../common/log_in_dashboard.rst:206 ../common/log_in_dashboard.rst:198
 #: ../common/log_in_dashboard.rst:204 ../common/log_in_dashboard.rst:203
+#: ../common/log_in_dashboard.rst:205
 msgid ":guilabel:`Network Agents`: View the network agents."
 msgstr ""
 
 #: ../common/log_in_dashboard.rst:112 ../common/log_in_dashboard.rst:108
+#: ../common/log_in_dashboard.rst:110
 msgid ":guilabel:`Network Topology`: View the network topology."
 msgstr ""
 
 #: ../common/log_in_dashboard.rst:110 ../common/log_in_dashboard.rst:106
+#: ../common/log_in_dashboard.rst:108
 msgid ":guilabel:`Network` tab"
 msgstr ""
 
 #: ../common/log_in_dashboard.rst:114 ../common/log_in_dashboard.rst:110
+#: ../common/log_in_dashboard.rst:112
 msgid ":guilabel:`Networks`: Create and manage public and private networks."
 msgstr ""
 
 #: ../common/log_in_dashboard.rst:182 ../common/log_in_dashboard.rst:185
 #: ../common/log_in_dashboard.rst:177 ../common/log_in_dashboard.rst:183
+#: ../common/log_in_dashboard.rst:184
 msgid ""
 ":guilabel:`Networks`: View, create, edit properties for, and delete networks."
 msgstr ""
 
 #: ../common/log_in_dashboard.rst:120 ../common/log_in_dashboard.rst:116
+#: ../common/log_in_dashboard.rst:118
 msgid ":guilabel:`Object Store` tab"
 msgstr ""
 
 #: ../common/log_in_dashboard.rst:208 ../common/log_in_dashboard.rst:200
 #: ../common/log_in_dashboard.rst:206 ../common/log_in_dashboard.rst:205
+#: ../common/log_in_dashboard.rst:207
 msgid ""
 ":guilabel:`Orchestration Services`: View a list of all Orchestration "
 "services."
 msgstr ""
 
 #: ../common/log_in_dashboard.rst:126 ../common/log_in_dashboard.rst:122
+#: ../common/log_in_dashboard.rst:124
 msgid ":guilabel:`Orchestration` tab"
 msgstr ""
 
 #: ../common/log_in_dashboard.rst:156 ../common/log_in_dashboard.rst:159
 #: ../common/log_in_dashboard.rst:151 ../common/log_in_dashboard.rst:150
+#: ../common/log_in_dashboard.rst:152
 msgid ":guilabel:`Overview`: View basic reports."
 msgstr ""
 
 #: ../common/log_in_dashboard.rst:80 ../common/log_in_dashboard.rst:76
+#: ../common/log_in_dashboard.rst:78
 msgid ":guilabel:`Overview`: View reports for the project."
 msgstr ""
 
@@ -360,6 +387,7 @@ msgid ""
 msgstr ""
 
 #: ../common/log_in_dashboard.rst:131 ../common/log_in_dashboard.rst:127
+#: ../common/log_in_dashboard.rst:129
 msgid ""
 ":guilabel:`Resource Types`: Show a list of all the supported resource types "
 "for HOT templates."
@@ -367,12 +395,14 @@ msgstr ""
 
 #: ../common/log_in_dashboard.rst:158 ../common/log_in_dashboard.rst:161
 #: ../common/log_in_dashboard.rst:153 ../common/log_in_dashboard.rst:152
+#: ../common/log_in_dashboard.rst:154
 msgid ""
 ":guilabel:`Resource Usage`: Use the following tabs to view the following "
 "usages:"
 msgstr ""
 
 #: ../common/log_in_dashboard.rst:116 ../common/log_in_dashboard.rst:112
+#: ../common/log_in_dashboard.rst:114
 msgid ":guilabel:`Routers`: Create and manage routers."
 msgstr ""
 
@@ -382,11 +412,13 @@ msgstr ""
 
 #: ../common/log_in_dashboard.rst:184 ../common/log_in_dashboard.rst:187
 #: ../common/log_in_dashboard.rst:179 ../common/log_in_dashboard.rst:185
+#: ../common/log_in_dashboard.rst:186
 msgid ""
 ":guilabel:`Routers`: View, create, edit properties for, and delete routers."
 msgstr ""
 
 #: ../common/log_in_dashboard.rst:98 ../common/log_in_dashboard.rst:94
+#: ../common/log_in_dashboard.rst:96
 msgid ""
 ":guilabel:`Security Groups`: View, create, edit, and delete security groups "
 "and security group rules."
@@ -395,10 +427,12 @@ msgstr ""
 #: ../common/log_in_dashboard.rst:189 ../common/log_in_dashboard.rst:192
 #: ../common/log_in_dashboard.rst:199 ../common/log_in_dashboard.rst:191
 #: ../common/log_in_dashboard.rst:197 ../common/log_in_dashboard.rst:196
+#: ../common/log_in_dashboard.rst:198
 msgid ":guilabel:`Services`: View a list of the services."
 msgstr ""
 
 #: ../common/log_in_dashboard.rst:128 ../common/log_in_dashboard.rst:124
+#: ../common/log_in_dashboard.rst:126
 msgid ""
 ":guilabel:`Stacks`: Use the REST API to orchestrate multiple composite cloud "
 "applications."
@@ -406,6 +440,7 @@ msgstr ""
 
 #: ../common/log_in_dashboard.rst:163 ../common/log_in_dashboard.rst:166
 #: ../common/log_in_dashboard.rst:158 ../common/log_in_dashboard.rst:157
+#: ../common/log_in_dashboard.rst:159
 msgid ":guilabel:`Stats`: View the statistics of all resources."
 msgstr ""
 
@@ -417,7 +452,7 @@ msgstr ""
 
 #: ../common/log_in_dashboard.rst:189 ../common/log_in_dashboard.rst:196
 #: ../common/log_in_dashboard.rst:188 ../common/log_in_dashboard.rst:194
-#: ../common/log_in_dashboard.rst:193
+#: ../common/log_in_dashboard.rst:193 ../common/log_in_dashboard.rst:195
 msgid ""
 ":guilabel:`System Information`: Use the following tabs to view the service "
 "information:"
@@ -429,16 +464,17 @@ msgid ":guilabel:`System Panel` tab"
 msgstr ""
 
 #: ../common/log_in_dashboard.rst:149 ../common/log_in_dashboard.rst:148
+#: ../common/log_in_dashboard.rst:150
 msgid ":guilabel:`System` tab"
 msgstr ""
 
 #: ../common/log_in_dashboard.rst:164 ../common/log_in_dashboard.rst:156
-#: ../common/log_in_dashboard.rst:155
+#: ../common/log_in_dashboard.rst:155 ../common/log_in_dashboard.rst:157
 msgid ":guilabel:`Usage Report`: View the usage report."
 msgstr ""
 
 #: ../common/log_in_dashboard.rst:217 ../common/log_in_dashboard.rst:223
-#: ../common/log_in_dashboard.rst:222
+#: ../common/log_in_dashboard.rst:222 ../common/log_in_dashboard.rst:226
 msgid ":guilabel:`User Settings`: View and manage dashboard settings."
 msgstr ""
 
@@ -449,23 +485,27 @@ msgid ":guilabel:`Users`: View, create, enable, disable, and delete users."
 msgstr ""
 
 #: ../common/log_in_dashboard.rst:89 ../common/log_in_dashboard.rst:85
+#: ../common/log_in_dashboard.rst:87
 msgid ""
 ":guilabel:`Volume Snapshots`: View, create, edit, and delete volume "
 "snapshots."
 msgstr ""
 
 #: ../common/log_in_dashboard.rst:175 ../common/log_in_dashboard.rst:174
+#: ../common/log_in_dashboard.rst:176
 msgid ""
 ":guilabel:`Volume Snapshots`: View, manage, and delete volume snapshots."
 msgstr ""
 
 #: ../common/log_in_dashboard.rst:173 ../common/log_in_dashboard.rst:172
+#: ../common/log_in_dashboard.rst:174
 msgid ""
 ":guilabel:`Volume Types`: View, create, manage, and delete volume types."
 msgstr ""
 
 #: ../common/log_in_dashboard.rst:85 ../common/log_in_dashboard.rst:81
 #: ../common/log_in_dashboard.rst:169 ../common/log_in_dashboard.rst:168
+#: ../common/log_in_dashboard.rst:83 ../common/log_in_dashboard.rst:170
 msgid ":guilabel:`Volumes`: Use the following tabs to complete these tasks:"
 msgstr ""
 
@@ -476,10 +516,12 @@ msgid ""
 msgstr ""
 
 #: ../common/log_in_dashboard.rst:87 ../common/log_in_dashboard.rst:83
+#: ../common/log_in_dashboard.rst:85
 msgid ":guilabel:`Volumes`: View, create, edit, and delete volumes."
 msgstr ""
 
 #: ../common/log_in_dashboard.rst:171 ../common/log_in_dashboard.rst:170
+#: ../common/log_in_dashboard.rst:172
 msgid ":guilabel:`Volumes`: View, create, manage, and delete volumes."
 msgstr ""
 
@@ -1934,7 +1976,7 @@ msgid ""
 "quotas."
 msgstr ""
 
-#: ../common/log_in_dashboard.rst:135
+#: ../common/log_in_dashboard.rst:135 ../common/log_in_dashboard.rst:137
 msgid ""
 "Administrative users can use the :guilabel:`Admin` tab to view usage and to "
 "manage instances, volumes, flavors, images, services, and quotas."
@@ -3210,7 +3252,7 @@ msgid "Cisco neutron plug-in"
 msgstr ""
 
 #: ../common/log_in_dashboard.rst:214 ../common/log_in_dashboard.rst:220
-#: ../common/log_in_dashboard.rst:219
+#: ../common/log_in_dashboard.rst:219 ../common/log_in_dashboard.rst:223
 msgid ""
 "Click the 'Settings' button from the user drop down menu in the top right of "
 "any page, you will see the :guilabel:`Settings` tab."
@@ -4475,16 +4517,18 @@ msgid ""
 msgstr ""
 
 #: ../common/log_in_dashboard.rst:144 ../common/log_in_dashboard.rst:143
+#: ../common/log_in_dashboard.rst:145
 msgid ""
 "From the :guilabel:`Admin` tab, you can access the following category to "
 "complete these tasks:"
 msgstr ""
 
 #: ../common/log_in_dashboard.rst:74 ../common/log_in_dashboard.rst:70
+#: ../common/log_in_dashboard.rst:72
 msgid "From the :guilabel:`Project` tab, you can access the following tabs:"
 msgstr ""
 
-#: ../common/log_in_dashboard.rst:62
+#: ../common/log_in_dashboard.rst:62 ../common/log_in_dashboard.rst:64
 msgid ""
 "From the :guilabel:`Project` tab, you can view and manage the resources in a "
 "selected project, including instances and images. You select the project "
@@ -4854,6 +4898,14 @@ msgid ""
 "fails."
 msgstr ""
 
+#: ../common/log_in_dashboard.rst:49
+msgid ""
+"If you are logged in as an administrator, the :guilabel:`Project` tab (:ref:"
+"`dashboard-project-tab`) and :guilabel:`Admin` tab (:ref:`dashboard-admin-"
+"tab`) and :guilabel:`Identity` tab (:ref:`dashboard-identity-tab`) are "
+"displayed."
+msgstr ""
+
 #: ../common/log_in_dashboard.rst:48
 msgid ""
 "If you are logged in as an administrator, the :guilabel:`Project` tab (:ref:"
@@ -4861,6 +4913,13 @@ msgid ""
 "tab`) are displayed."
 msgstr ""
 
+#: ../common/log_in_dashboard.rst:45
+msgid ""
+"If you are logged in as an end user, the :guilabel:`Project` tab (:ref:"
+"`dashboard-project-tab`) and :guilabel:`Identity` tab (:ref:`dashboard-"
+"identity-tab`) are displayed."
+msgstr ""
+
 #: ../common/log_in_dashboard.rst:45
 msgid ""
 "If you are logged in as an end user, the :guilabel:`Project` tab is "
@@ -6258,21 +6317,21 @@ msgid "OpenStack dashboard"
 msgstr ""
 
 #: ../common/log_in_dashboard.rst:134 ../common/log_in_dashboard.rst:137
-#: ../common/log_in_dashboard.rst:133
+#: ../common/log_in_dashboard.rst:133 ../common/log_in_dashboard.rst:135
 msgid "OpenStack dashboard—:guilabel:`Admin` tab"
 msgstr ""
 
 #: ../common/log_in_dashboard.rst:204 ../common/log_in_dashboard.rst:210
-#: ../common/log_in_dashboard.rst:209
+#: ../common/log_in_dashboard.rst:209 ../common/log_in_dashboard.rst:213
 msgid "OpenStack dashboard—:guilabel:`Identity` tab"
 msgstr ""
 
-#: ../common/log_in_dashboard.rst:56
+#: ../common/log_in_dashboard.rst:56 ../common/log_in_dashboard.rst:58
 msgid "OpenStack dashboard—:guilabel:`Project` tab"
 msgstr ""
 
 #: ../common/log_in_dashboard.rst:212 ../common/log_in_dashboard.rst:218
-#: ../common/log_in_dashboard.rst:217
+#: ../common/log_in_dashboard.rst:217 ../common/log_in_dashboard.rst:221
 msgid "OpenStack dashboard—:guilabel:`Settings` tab"
 msgstr ""
 
@@ -6687,7 +6746,7 @@ msgstr ""
 msgid "Projects"
 msgstr ""
 
-#: ../common/log_in_dashboard.rst:58
+#: ../common/log_in_dashboard.rst:58 ../common/log_in_dashboard.rst:60
 msgid ""
 "Projects are organizational units in the cloud, and are also known as "
 "tenants or accounts. Each user is a member of one or more projects. Within a "
diff --git a/doc/config-reference/locale/config-reference.pot b/doc/config-reference/locale/config-reference.pot
index dd203a4304..8813b68097 100644
--- a/doc/config-reference/locale/config-reference.pot
+++ b/doc/config-reference/locale/config-reference.pot
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-09-26 06:16+0000\n"
+"POT-Creation-Date: 2015-09-28 06:22+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"
@@ -12698,7 +12698,7 @@ msgid "On openSUSE:"
 msgstr ""
 
 #: ./doc/config-reference/block-storage/drivers/emc-vmax-driver.xml:120(para)
-msgid "On Fedora:"
+msgid "On Red Hat Enterprise Linux, CentOS, and Fedora:"
 msgstr ""
 
 #: ./doc/config-reference/block-storage/drivers/emc-vmax-driver.xml:126(title)
diff --git a/doc/glossary/locale/ja.po b/doc/glossary/locale/ja.po
index fafcb2f512..6ee3878954 100644
--- a/doc/glossary/locale/ja.po
+++ b/doc/glossary/locale/ja.po
@@ -11,11 +11,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-09-23 13:58+0000\n"
+"POT-Creation-Date: 2015-09-27 09:38+0000\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2015-09-16 12:40+0000\n"
+"PO-Revision-Date: 2015-09-27 09:11+0000\n"
 "Last-Translator: KATO Tomoyuki <kato.tomoyuki@jp.fujitsu.com>\n"
 "Language-Team: Japanese (http://www.transifex.com/openstack/openstack-"
 "manuals-i18n/language/ja/)\n"
@@ -2765,6 +2765,9 @@ msgstr ""
 msgid "F"
 msgstr "F"
 
+msgid "FWaaS"
+msgstr "FWaaS"
+
 msgid ""
 "Facility in Compute that allows each virtual machine instance to have more "
 "than one VIF connected to it."
@@ -2844,6 +2847,13 @@ msgstr ""
 "が、アメリカ合衆国カリフォルニア州サンフランシスコで開催された。Folsom は近郊"
 "の都市である。"
 
+msgid ""
+"For IaaS, ability for a regular (non-privileged) account to manage a virtual "
+"infrastructure component such as networks without involving an administrator."
+msgstr ""
+"IaaS の場合、管理者が介することなく、通常の (特権を持たない) ユーザーがネット"
+"ワークなどの仮想インフラのコンポーネントを管理する機能。"
+
 msgid "FormPost"
 msgstr "FormPost"
 
@@ -3289,6 +3299,9 @@ msgstr "Kilo"
 msgid "L"
 msgstr "L"
 
+msgid "LBaaS"
+msgstr "LBaaS"
+
 msgid ""
 "LBaaS feature that provides availability monitoring using the <literal>ping</"
 "literal> command, TCP, and HTTP/HTTPS GET."
@@ -3493,6 +3506,12 @@ msgstr "MultiNic"
 msgid "N"
 msgstr "N"
 
+msgid "NAT"
+msgstr "NAT"
+
+msgid "NTP"
+msgstr "NTP"
+
 msgid "Name for the Compute component that manages VMs."
 msgstr "仮想マシンを管理する Compute のコンポーネントの名称。"
 
@@ -3505,12 +3524,26 @@ msgstr "NetApp ボリュームドライバー"
 msgid "Network Address Translation (NAT)"
 msgstr "ネットワークアドレス変換 (NAT)"
 
+msgid ""
+"Network Address Translation; Process of modifying IP address information "
+"while in transit. Supported by Compute and Networking."
+msgstr ""
+"ネットワークアドレス変換。IP アドレス情報を転送中に変更する処理。Compute と "
+"Networking によりサポートされる。"
+
 msgid "Network File System (NFS)"
 msgstr "Network File System (NFS)"
 
 msgid "Network Time Protocol (NTP)"
 msgstr "Network Time Protocol (NTP)"
 
+msgid ""
+"Network Time Protocol; Method of keeping a clock for a host or node correct "
+"via communication with a trusted, accurate time source."
+msgstr ""
+"ネットワーク時刻プロトコル。信頼された、正確な時刻源と通信することにより、ホ"
+"ストやノードの時刻を正確に保つ方法。"
+
 msgid ""
 "Network traffic between a user or client (north) and a server (south), or "
 "traffic into the cloud (south) and out of the cloud (north). See also east-"
@@ -5520,6 +5553,9 @@ msgstr "VMware NSX Neutron プラグイン"
 msgid "VNC proxy"
 msgstr "VNC プロキシ"
 
+msgid "VXLAN"
+msgstr "VXLAN"
+
 msgid "Virtual Central Processing Unit (vCPU)"
 msgstr "仮想CPU (vCPU)"
 
@@ -7097,6 +7133,9 @@ msgstr "分割オブジェクト"
 msgid "segmented objects"
 msgstr "分割オブジェクト"
 
+msgid "self-service"
+msgstr "セルフサービス"
+
 msgid "server"
 msgstr "サーバー"
 
diff --git a/doc/user-guide-admin/source/locale/ja/LC_MESSAGES/user-guide-admin.po b/doc/user-guide-admin/source/locale/ja/LC_MESSAGES/user-guide-admin.po
index 6cf30127e2..dc13ca9ab8 100644
--- a/doc/user-guide-admin/source/locale/ja/LC_MESSAGES/user-guide-admin.po
+++ b/doc/user-guide-admin/source/locale/ja/LC_MESSAGES/user-guide-admin.po
@@ -17,12 +17,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Admin User Guide 1.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-26 04:57+0000\n"
+"POT-Creation-Date: 2015-09-27 09:38+0000\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2015-09-18 06:58+0000\n"
-"Last-Translator: Akihiro Motoki <amotoki@gmail.com>\n"
+"PO-Revision-Date: 2015-09-28 01:07+0000\n"
+"Last-Translator: KATO Tomoyuki <kato.tomoyuki@jp.fujitsu.com>\n"
 "Language-Team: Japanese (http://www.transifex.com/openstack/openstack-"
 "manuals-i18n/language/ja/)\n"
 "Language: ja\n"
@@ -1329,6 +1329,13 @@ msgstr ""
 ":guilabel:`管理` タブで、:guilabel:`システムパネル` を開き、:guilabel:`フレー"
 "バー` カテゴリーをクリックします。"
 
+msgid ""
+"In the :guilabel:`Admin` tab, open the :guilabel:`System` tab and click the :"
+"guilabel:`Flavors` category."
+msgstr ""
+":guilabel:`管理` タブで、:guilabel:`システム` タブを開き、:guilabel:`フレー"
+"バー` カテゴリーをクリックします。"
+
 msgid ""
 "In the :guilabel:`Confirm Delete Flavors` window, click :guilabel:`Delete "
 "Flavors` to confirm the deletion. You cannot undo this action."
@@ -1774,15 +1781,11 @@ msgid "Obtain the tenant ID, as follows::"
 msgstr "テナント ID を取得します。"
 
 msgid ""
-"On the :guilabel:`Admin tab`, open the :guilabel:`System Panel` and click "
-"the :guilabel:`Images` category."
+"On the :guilabel:`Admin tab`, open the :guilabel:`System` tab and click the :"
+"guilabel:`Images` category."
 msgstr ""
-":guilabel:`管理` タブで、:guilabel:`システムパネル` を開き、:guilabel:`イメー"
-"ジ` カテゴリーをクリックします。"
-
-msgid "On the :guilabel:`Admin` tab, click the :guilabel:`Defaults` category."
-msgstr ""
-":guilabel:`管理` タブで、:guilabel:`デフォルト` カテゴリーをクリックします。"
+":guilabel:`管理` タブで、:guilabel:`システム` タブを開き、:guilabel:`イメージ"
+"` カテゴリーをクリックします。"
 
 msgid "On the :guilabel:`Admin` tab, click the :guilabel:`Instances` category."
 msgstr ""
@@ -1807,35 +1810,49 @@ msgstr ""
 "す。"
 
 msgid ""
-"On the :guilabel:`Admin` tab, open the :guilabel:`System Panel` and click "
-"the :guilabel:`Host Aggregates` category."
+"On the :guilabel:`Admin` tab, open the :guilabel:`System` tab and click the :"
+"guilabel:`Defaults` category."
 msgstr ""
-":guilabel:`管理` タブで、:guilabel:`システムパネル` を開き、:guilabel:`ホスト"
-"アグリゲート` カテゴリーをクリックします。"
+":guilabel:`管理` タブで、:guilabel:`システム` タブを開き、:guilabel:`デフォル"
+"ト` カテゴリーをクリックします。"
 
 msgid ""
-"On the :guilabel:`Admin` tab, open the :guilabel:`System Panel` and click "
-"the :guilabel:`Images` category."
+"On the :guilabel:`Admin` tab, open the :guilabel:`System` tab and click the :"
+"guilabel:`Host Aggregates` category."
 msgstr ""
-":guilabel:`管理` タブで、:guilabel:`システムパネル` を開き、:guilabel:`イメー"
-"ジ` カテゴリーをクリックします。"
+":guilabel:`管理` タブで、:guilabel:`システム` タブを開き、:guilabel:`ホストア"
+"グリゲート` カテゴリーをクリックします。"
 
 msgid ""
-"On the :guilabel:`Admin` tab, open the :guilabel:`System Panel` and click "
-"the :guilabel:`Images` category. The images that you can administer for "
-"cloud users appear on this page."
+"On the :guilabel:`Admin` tab, open the :guilabel:`System` tab and click the :"
+"guilabel:`Images` category."
 msgstr ""
-":guilabel:`管理` タブで、:guilabel:`システムパネル` を開き、:guilabel:`イメー"
-"ジ` カテゴリーをクリックします。あなたがクラウドユーザー向けに管理できるイ"
-"メージが、このページに表示されます。"
-
-msgid ""
-"On the :guilabel:`Admin` tab, open the System Panel and click the :guilabel:"
-"`Host Aggregates` category."
-msgstr ""
-":guilabel:`管理` タブで、システムパネルを開き、:guilabel:`ホストアグリゲート"
+":guilabel:`管理` タブで、:guilabel:`システム` タブを開き、:guilabel:`イメージ"
 "` カテゴリーをクリックします。"
 
+msgid ""
+"On the :guilabel:`Admin` tab, open the :guilabel:`System` tab and click the :"
+"guilabel:`Images` category. The images that you can administer for cloud "
+"users appear on this page."
+msgstr ""
+":guilabel:`管理` タブで、:guilabel:`システム` タブを開き、:guilabel:`イメージ"
+"` カテゴリーをクリックします。あなたがクラウドユーザー向けに管理できるイメー"
+"ジが、このページに表示されます。"
+
+msgid ""
+"On the :guilabel:`Admin` tab, open the :guilabel:`System` tab and click the :"
+"guilabel:`Instances` category."
+msgstr ""
+":guilabel:`管理` タブで、:guilabel:`システム` タブを開き、:guilabel:`インスタ"
+"ンス` カテゴリーをクリックします。"
+
+msgid ""
+"On the :guilabel:`Admin` tab, open the :guilabel:`System` tab and click the :"
+"guilabel:`Volumes` category."
+msgstr ""
+":guilabel:`管理` タブで、:guilabel:`システム` タブを開き、:guilabel:`ボリュー"
+"ム` カテゴリーをクリックします。"
+
 msgid ""
 "Once a volume type is updated by the :guilabel:`Create Encryption` option, "
 "the volume type cannot be deleted."
diff --git a/doc/user-guide-admin/source/locale/user-guide-admin.pot b/doc/user-guide-admin/source/locale/user-guide-admin.pot
index 6af501b0b2..fd1dca616a 100644
--- a/doc/user-guide-admin/source/locale/user-guide-admin.pot
+++ b/doc/user-guide-admin/source/locale/user-guide-admin.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Admin User Guide 1.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-26 06:16+0000\n"
+"POT-Creation-Date: 2015-09-28 06:23+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"
@@ -44,7 +44,7 @@ msgstr ""
 msgid "**Ephemeral Disk GB**"
 msgstr ""
 
-#: ../dashboard_manage_instances.rst:52
+#: ../dashboard_manage_instances.rst:54
 msgid "**Figure Dashboard—Instance Actions**"
 msgstr ""
 
@@ -635,7 +635,7 @@ msgstr ""
 msgid "Click :guilabel:`Create Image`."
 msgstr ""
 
-#: ../dashboard_manage_instances.rst:26
+#: ../dashboard_manage_instances.rst:27
 msgid ""
 "Click :guilabel:`Create Snapshot`. The dashboard shows the instance snapshot "
 "in the :guilabel:`Images & Snapshots` category."
@@ -671,7 +671,7 @@ msgstr ""
 msgid "Click :guilabel:`Delete Volumes` button."
 msgstr ""
 
-#: ../dashboard_manage_instances.rst:71
+#: ../dashboard_manage_instances.rst:73
 msgid "Click :guilabel:`Download CSV Summary` to download a CSV summary."
 msgstr ""
 
@@ -749,7 +749,7 @@ msgstr ""
 msgid "Control Location"
 msgstr ""
 
-#: ../dashboard_manage_instances.rst:34
+#: ../dashboard_manage_instances.rst:35
 msgid "Control the state of an instance"
 msgstr ""
 
@@ -917,7 +917,7 @@ msgstr ""
 msgid "Delete volumes"
 msgstr ""
 
-#: ../dashboard_manage_instances.rst:46
+#: ../dashboard_manage_instances.rst:48
 msgid ""
 "Depending on the current state of the instance, you can choose to pause, un-"
 "pause, suspend, resume, soft or hard reboot, or terminate an instance (items "
@@ -1319,13 +1319,19 @@ msgid ""
 "to an aggregate."
 msgstr ""
 
-#: ../dashboard_manage_flavors.rst:28 ../dashboard_manage_flavors.rst:78
-#: ../dashboard_manage_flavors.rst:93 ../dashboard_manage_flavors.rst:159
+#: ../dashboard_manage_flavors.rst:28
 msgid ""
 "In the :guilabel:`Admin` tab, open the :guilabel:`System Panel` and click "
 "the :guilabel:`Flavors` category."
 msgstr ""
 
+#: ../dashboard_manage_flavors.rst:78 ../dashboard_manage_flavors.rst:93
+#: ../dashboard_manage_flavors.rst:159
+msgid ""
+"In the :guilabel:`Admin` tab, open the :guilabel:`System` tab and click the :"
+"guilabel:`Flavors` category."
+msgstr ""
+
 #: ../dashboard_manage_flavors.rst:163
 msgid ""
 "In the :guilabel:`Confirm Delete Flavors` window, click :guilabel:`Delete "
@@ -1378,7 +1384,7 @@ msgstr ""
 msgid "In the :guilabel:`Create Role` window, enter a name for the role."
 msgstr ""
 
-#: ../dashboard_manage_instances.rst:24
+#: ../dashboard_manage_instances.rst:25
 msgid ""
 "In the :guilabel:`Create Snapshot` window, enter a name for the snapshot."
 msgstr ""
@@ -1402,7 +1408,7 @@ msgid ""
 "`Selected Projects` column."
 msgstr ""
 
-#: ../dashboard_manage_instances.rst:43
+#: ../dashboard_manage_instances.rst:45
 msgid ""
 "In the :guilabel:`More` drop-down list in the :guilabel:`Actions` column, "
 "select the state."
@@ -1624,13 +1630,13 @@ msgid ""
 "drop-down list at the top of the page."
 msgstr ""
 
-#: ../dashboard_manage_instances.rst:63
+#: ../dashboard_manage_instances.rst:65
 msgid ""
 "Log in to the dashboard and choose the admin project from the CURRENT "
 "PROJECT drop-down list."
 msgstr ""
 
-#: ../dashboard_manage_instances.rst:16 ../dashboard_manage_instances.rst:36
+#: ../dashboard_manage_instances.rst:16 ../dashboard_manage_instances.rst:37
 msgid ""
 "Log in to the dashboard and choose the admin project from the drop-down list "
 "at the top of the page."
@@ -1814,16 +1820,11 @@ msgstr ""
 
 #: ../dashboard_manage_images.rst:96
 msgid ""
-"On the :guilabel:`Admin tab`, open the :guilabel:`System Panel` and click "
-"the :guilabel:`Images` category."
+"On the :guilabel:`Admin tab`, open the :guilabel:`System` tab and click the :"
+"guilabel:`Images` category."
 msgstr ""
 
-#: ../dashboard_set_quotas.rst:81 ../dashboard_set_quotas.rst:97
-msgid "On the :guilabel:`Admin` tab, click the :guilabel:`Defaults` category."
-msgstr ""
-
-#: ../dashboard_manage_instances.rst:19 ../dashboard_manage_instances.rst:39
-#: ../dashboard_manage_instances.rst:66
+#: ../dashboard_manage_instances.rst:68
 msgid "On the :guilabel:`Admin` tab, click the :guilabel:`Instances` category."
 msgstr ""
 
@@ -1844,36 +1845,43 @@ msgid ""
 "category."
 msgstr ""
 
+#: ../dashboard_set_quotas.rst:81 ../dashboard_set_quotas.rst:97
+msgid ""
+"On the :guilabel:`Admin` tab, open the :guilabel:`System` tab and click the :"
+"guilabel:`Defaults` category."
+msgstr ""
+
+#: ../dashboard_manage_host_aggregates.rst:24
 #: ../dashboard_manage_host_aggregates.rst:60
 msgid ""
-"On the :guilabel:`Admin` tab, open the :guilabel:`System Panel` and click "
-"the :guilabel:`Host Aggregates` category."
+"On the :guilabel:`Admin` tab, open the :guilabel:`System` tab and click the :"
+"guilabel:`Host Aggregates` category."
 msgstr ""
 
 #: ../dashboard_manage_images.rst:79
 msgid ""
-"On the :guilabel:`Admin` tab, open the :guilabel:`System Panel` and click "
-"the :guilabel:`Images` category."
+"On the :guilabel:`Admin` tab, open the :guilabel:`System` tab and click the :"
+"guilabel:`Images` category."
 msgstr ""
 
 #: ../dashboard_manage_images.rst:27
 msgid ""
-"On the :guilabel:`Admin` tab, open the :guilabel:`System Panel` and click "
-"the :guilabel:`Images` category. The images that you can administer for "
-"cloud users appear on this page."
+"On the :guilabel:`Admin` tab, open the :guilabel:`System` tab and click the :"
+"guilabel:`Images` category. The images that you can administer for cloud "
+"users appear on this page."
+msgstr ""
+
+#: ../dashboard_manage_instances.rst:19 ../dashboard_manage_instances.rst:40
+msgid ""
+"On the :guilabel:`Admin` tab, open the :guilabel:`System` tab and click the :"
+"guilabel:`Instances` category."
 msgstr ""
 
 #: ../dashboard_manage_volumes.rst:24 ../dashboard_manage_volumes.rst:124
 #: ../dashboard_manage_volumes.rst:145
 msgid ""
-"On the :guilabel:`Admin` tab, open the :guilabel:`System Panel` and click "
-"the :guilabel:`Volumes` category."
-msgstr ""
-
-#: ../dashboard_manage_host_aggregates.rst:24
-msgid ""
-"On the :guilabel:`Admin` tab, open the System Panel and click the :guilabel:"
-"`Host Aggregates` category."
+"On the :guilabel:`Admin` tab, open the :guilabel:`System` tab and click the :"
+"guilabel:`Volumes` category."
 msgstr ""
 
 #: ../dashboard_manage_volumes.rst:58
@@ -2111,13 +2119,13 @@ msgstr ""
 msgid "See NIST reference below to see advantages*"
 msgstr ""
 
-#: ../dashboard_manage_instances.rst:68
+#: ../dashboard_manage_instances.rst:70
 msgid ""
 "Select a month and click :guilabel:`Submit` to query the instance usage for "
 "that month."
 msgstr ""
 
-#: ../dashboard_manage_instances.rst:21
+#: ../dashboard_manage_instances.rst:22
 msgid ""
 "Select an instance to create a snapshot from it. From the :guilabel:"
 "`Actions` drop-down list, select :guilabel:`Create Snapshot`."
@@ -2161,7 +2169,7 @@ msgstr ""
 msgid "Select the images that you want to edit. Click :guilabel:`Edit`."
 msgstr ""
 
-#: ../dashboard_manage_instances.rst:41
+#: ../dashboard_manage_instances.rst:43
 msgid "Select the instance for which you want to change the state."
 msgstr ""
 
@@ -2624,7 +2632,7 @@ msgstr ""
 msgid "To get details for a service, run this command::"
 msgstr ""
 
-#: ../dashboard_manage_instances.rst:29
+#: ../dashboard_manage_instances.rst:30
 msgid ""
 "To launch an instance from the snapshot, select the snapshot and click "
 "Launch. For information about launching instances, see the `OpenStack End "
@@ -2786,7 +2794,7 @@ msgid ""
 "list` command, as follows::"
 msgstr ""
 
-#: ../dashboard_manage_instances.rst:56
+#: ../dashboard_manage_instances.rst:58
 msgid "Track usage"
 msgstr ""
 
@@ -2875,7 +2883,7 @@ msgid ""
 "tenant::"
 msgstr ""
 
-#: ../dashboard_manage_instances.rst:58
+#: ../dashboard_manage_instances.rst:60
 msgid "Use the Overview category to track usage of instances for each project."
 msgstr ""
 
@@ -3175,7 +3183,7 @@ msgid ""
 "guilabel:`Limit` column headers."
 msgstr ""
 
-#: ../dashboard_manage_instances.rst:60
+#: ../dashboard_manage_instances.rst:62
 msgid ""
 "You can track costs per month by showing meters like number of VCPUs, disks, "
 "RAM, and uptime of all your instances."
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 f51642111c..46f21ef5ed 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
@@ -10,17 +10,18 @@
 # Tomoyuki KATO <tomo@dream.daynight.jp>, 2013-2015
 # yfukuda <fukuda.yuko@jp.fujitsu.com>, 2014
 # ykatabam <ykatabam@redhat.com>, 2014
+# KATO Tomoyuki <kato.tomoyuki@jp.fujitsu.com>, 2015. #zanata
 # OpenStack Infra <zanata@openstack.org>, 2015. #zanata
 msgid ""
 msgstr ""
 "Project-Id-Version: End User Guide 1.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-26 04:57+0000\n"
+"POT-Creation-Date: 2015-09-27 09:38+0000\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2015-08-31 01:12+0000\n"
-"Last-Translator: Tomoyuki KATO <tomo@dream.daynight.jp>\n"
+"PO-Revision-Date: 2015-09-28 01:08+0000\n"
+"Last-Translator: KATO Tomoyuki <kato.tomoyuki@jp.fujitsu.com>\n"
 "Language-Team: Japanese (http://www.transifex.com/openstack/openstack-"
 "manuals-i18n/language/ja/)\n"
 "Language: ja\n"
@@ -1603,6 +1604,15 @@ msgid "By default, when you reboot an instance, it is a soft reboot."
 msgstr ""
 "デフォルトでは、インスタンスをリブートする場合ソフトリブートとなっています。"
 
+msgid ""
+"By default, you cannot attach the configuration drive image as a CD drive "
+"instead of as a disk drive. To attach a CD drive, add the following line to "
+"the :file:`/etc/nova/nova.conf` file::"
+msgstr ""
+"デフォルトでは、ディスクドライブの代わりに CD ドライブとしてコンフィグドライ"
+"ブのイメージを接続することはできません。CD ドライブを接続する場合は、:file:`/"
+"etc/nova/nova.conf` の以下の行を追加します。 "
+
 msgid "Call ``print_server`` again to check the update server details:"
 msgstr "再び ``print_server`` を呼び出し、更新したサーバーの詳細を確認します。"
 
@@ -1719,7 +1729,7 @@ msgstr ":guilabel:`コンテナーの作成` をクリックします。"
 msgid "Click :guilabel:`Create Image`."
 msgstr ":guilabel:`イメージの作成` をクリックします。"
 
-msgid "Click :guilabel:`Create Keypair`."
+msgid "Click :guilabel:`Create Key Pair`."
 msgstr ":guilabel:`キーペアの作成` をクリックします。"
 
 msgid "Click :guilabel:`Create Network`."
@@ -1810,7 +1820,7 @@ msgstr ":guilabel:`ボリュームの編集` をクリックします。"
 msgid "Click :guilabel:`Extend Share`."
 msgstr ":guilabel:`共有の拡張` をクリックします。"
 
-msgid "Click :guilabel:`Import Keypair`."
+msgid "Click :guilabel:`Import Key Pair`."
 msgstr ":guilabel:`キーペアのインポート` をクリックします。"
 
 msgid "Click :guilabel:`Launch Instance`."
@@ -1872,7 +1882,7 @@ msgstr ""
 "Floating IP アドレスが表示されます。"
 
 msgid ""
-"Click the :guilabel:`Keypairs` tab, which shows the key pairs that are "
+"Click the :guilabel:`Key Pairs` tab, which shows the key pairs that are "
 "available for this project."
 msgstr ""
 ":guilabel:`キーペア` タブをクリックします。このプロジェクトに利用可能なキーペ"
@@ -2704,6 +2714,19 @@ msgstr ""
 "Administrator Guide <http://docs.openstack.org/admin-guide-cloud/"
 "networking_use.html#advanced-networking-operations>`__ を参照してください。"
 
+msgid ""
+"For legacy reasons, you can configure the configuration drive to use VFAT "
+"format instead of ISO 9660. It is unlikely that you would require VFAT "
+"format because ISO 9660 is widely supported across operating systems. "
+"However, to use the VFAT format, add the following line to the :file:`/etc/"
+"nova/nova.conf` file::"
+msgstr ""
+"レガシー関連の理由から、コンフィグドライブを ISO 9660 ではなく VFAT フォー"
+"マットを使用するように設定できます。ISO 9660 は様々なオペレーティングシステム"
+"で幅広くサポートされているため、VFAT フォーマットが必要になる可能性は低いはず"
+"です。ただし、VFAT フォーマットを使用する場合は :file:`/etc/nova/nova.conf` "
+"に以下の行を指定します。 "
+
 # #-#-#-#-#  cli_swift_archive_auto_extract.pot (End User Guide 1.0.0)
 # #-#-#-#-#
 # #-#-#-#-#  cli_swift_bulk_delete.pot (End User Guide 1.0.0)  #-#-#-#-#
@@ -2937,6 +2960,13 @@ msgstr ""
 msgid "Identity (keystone)"
 msgstr "Identity (keystone)"
 
+msgid ""
+"If a user passes the ``--config-drive true`` flag to the :command:`nova "
+"boot` command, an administrator cannot disable the configuration drive."
+msgstr ""
+"ユーザーが :command:`nova boot` コマンドに ``--config-drive true`` フラグを渡"
+"した場合、管理者はコンフィグドライブを無効化できません。"
+
 msgid ""
 "If an image does not have the cloud-init package installed, you must "
 "customize the image to run a script that mounts the configuration drive on "
@@ -3435,8 +3465,8 @@ msgstr ""
 "し、:guilabel:`コンテナーの作成` をクリックします。"
 
 msgid ""
-"In the :guilabel:`Create Keypair` dialog box, enter a name for your key "
-"pair, and click :guilabel:`Create Keypair`."
+"In the :guilabel:`Create Key Pair` dialog box, enter a name for your key "
+"pair, and click :guilabel:`Create Key Pair`."
 msgstr ""
 ":guilabel:`キーペアの作成` ダイアログボックスに、お使いのキーペアの名前を入力"
 "し、:guilabel:`キーペアの作成` をクリックします。"
@@ -3478,9 +3508,9 @@ msgstr ""
 ":guilabel:`Floating IP` 一覧にある :guilabel:`割り当て` をクリックします。"
 
 msgid ""
-"In the :guilabel:`Import Keypair` dialog box, enter the name of your key "
+"In the :guilabel:`Import Key Pair` dialog box, enter the name of your key "
 "pair, copy the public key into the :guilabel:`Public Key` box, and then "
-"click :guilabel:`Import Keypair`."
+"click :guilabel:`Import Key Pair`."
 msgstr ""
 ":guilabel:`キーペアのインポート` ダイアログボックスに、キーペアの名前を入力"
 "し、:guilabel:`公開鍵` ボックスに公開鍵をコピーして、:guilabel:`キーペアのイ"
@@ -4543,6 +4573,19 @@ msgid ""
 "Note the ID of the security group that you want to use for your instance::"
 msgstr "インスタンスに使用するセキュリティグループの ID をメモします。"
 
+msgid ""
+"Note the effect of the ``--file /etc/network/interfaces=/home/myuser/"
+"instance-interfaces`` argument that was passed to the :command:`nova boot` "
+"command. The contents of this file are contained in the :file:`openstack/"
+"content/0000` file on the configuration drive, and the path is specified as :"
+"file:`/etc/network/interfaces` in the :file:`meta_data.json` file."
+msgstr ""
+"``--file /etc/network/interfaces=/home/myuser/instance-interfaces`` 引数の効"
+"果は、オリジナルの :command:`nova boot` コマンドに渡される点に注意してくださ"
+"い。このファイルの内容は、コンフィグドライブの `openstack/content/0000`` ファ"
+"イルに含まれており、パスは :file:`meta_data.json` ファイルに :file:`/etc/"
+"network/interfaces` として指定されています。 "
+
 msgid ""
 "Nothing is written to the non-current version container when you initially "
 "``PUT`` an object in the ``current`` container. However, subsequent ``PUT`` "
@@ -4662,10 +4705,11 @@ msgstr ""
 ":guilabel:`プロジェクト` タブにある :guilabel:`ボリューム` をクリックします。"
 
 msgid ""
-"On the :guilabel:`Router Details` page, click :guilabel:`Add Interface`."
+"On the :guilabel:`Router Details` page, click the :guilabel:`Interfaces` "
+"tab, then click :guilabel:`Add Interface`."
 msgstr ""
-":guilabel:`ルーターの詳細` ページで、:guilabel:`インターフェースの追加` をク"
-"リックします。"
+":guilabel:`ルーターの詳細` ページで、:guilabel:`インターフェース` タブをク"
+"リックし、:guilabel:`インターフェースの追加` をクリックします。"
 
 msgid "On the :guilabel:`Routers` tab, click the name of the router."
 msgstr ":guilabel:`ルーター` タブでルーターの名前をクリックします。"
@@ -4791,11 +4835,11 @@ msgstr "OpenStack メタデータの形式"
 
 msgid ""
 "OpenStack supports booting instances using ISO images. But before you make "
-"such instances functional, use the nova :command:`boot` command with the "
+"such instances functional, use the :command:`nova boot` command with the "
 "following parameters to boot an instance::"
 msgstr ""
 "OpenStack は、ISO イメージを使用したインスタンスの起動をサポートします。ただ"
-"し、そのようなインスタンスを動作させる場合、nova :command:`boot` コマンドに以"
+"し、そのようなインスタンスを動作させる場合、:command:`nova boot` コマンドに以"
 "下のパラメーターを加えて、インスタンスを起動します。"
 
 msgid ""
@@ -5571,6 +5615,18 @@ msgstr ""
 "メージ ID が必要です。 イメージファイルの宛先ファイルシステムに十分な空き容量"
 "があることを確認します。"
 
+msgid ""
+"The :file:`openstack/2012-08-10/user_data`, :file:`openstack/latest/"
+"user_data`, :file:`ec2/2009-04-04/user-data`, and :file:`ec2/latest/user-"
+"data` file are present only if the ``--user-data`` flag and the contents of "
+"the user data file are passed to the :command:`nova boot` command."
+msgstr ""
+":file:`openstack/2012-08-10/user_data`、:file:`openstack/latest/user_data`、:"
+"file:`ec2/2009-04-04/user-data`、:file:`ec2/latest/user-data` のファイルは、"
+"``--user-data`` フラグを :command:`nova boot` コマンドに指定した場合のみ存在"
+"し、引数で指定したユーザーデータファイルの内容がこれらのファイルに含まれま"
+"す。 "
+
 msgid "The :guilabel:`Create An Image` dialog box appears."
 msgstr ":guilabel:`イメージの作成` ダイアログボックスが表示されます。"
 
@@ -6041,6 +6097,15 @@ msgstr ""
 "このデータベースは、``mysql`` データストア、``mysql-5.5`` という "
 "datastore_version をベースにしています。"
 
+msgid ""
+"The default format of the configuration drive as an ISO 9660 file system. To "
+"explicitly specify the ISO 9660 format, add the following line to the :file:"
+"`/etc/nova/nova.conf` file::"
+msgstr ""
+"コンフィグドライブのデフォルトのフォーマットは、ISO 9660 ファイルシステムで"
+"す。ISO 9660 フォーマットを明示的に指定する場合、以下の行を :file:`/etc/nova/"
+"nova.conf` に含めます。 "
+
 msgid "The deleted instance does not appear in the list."
 msgstr "この一覧には、削除したインスタンスの表示がなくなっています。"
 
@@ -6065,6 +6130,13 @@ msgstr ""
 "このセクションの例は ``print_values`` メソッドと ``print_values_server`` メ"
 "ソッドを使用します。"
 
+msgid ""
+"The files that appear on the configuration drive depend on the arguments "
+"that you pass to the :command:`nova boot` command."
+msgstr ""
+"コンフィグドライブに表示されるファイルは、:command:`nova boot` コマンドに渡し"
+"た引数に依存します。"
+
 msgid ""
 "The first step is to list flavors by using the nova ``flavor-list`` command."
 msgstr ""
@@ -6157,6 +6229,24 @@ msgstr ""
 "以下の例は、物理マシンアドレス ``1.2.3.4``、ユーザー名 ``ipmi``、パスワード "
 "``ipmi`` を持つノードを作成するコマンドと実行結果です。"
 
+msgid ""
+"The following example shows the contents of the :file:`ec2/2009-04-04/meta-"
+"data.json` and the :file:`ec2/latest/meta-data.json` files. These files are "
+"identical. The file contents are formatted to improve readability."
+msgstr ""
+":file:`ec2/2009-04-04/meta-data.json`、:file:`ec2/latest/meta-data.json` (こ"
+"れらのファイルは 2 つとも同じ内容です) の内容の例を以下に示しています。読みや"
+"すいようにフォーマットを少し改善しています。 "
+
+msgid ""
+"The following example shows the contents of the :file:`openstack/2012-08-10/"
+"meta_data.json` and :file:`openstack/latest/meta_data.json` files. These "
+"files are identical. The file contents are formatted for readability."
+msgstr ""
+":file:`openstack/2012-08-10/meta_data.json`、:file:`openstack/latest/"
+"meta_data.json` (これらのファイルは 2 つとも同じ内容です) の内容の例を以下に"
+"示しています。読みやすいようにフォーマットを少し改善しています。"
+
 msgid ""
 "The following example shows the failure response in ``application/json`` "
 "format."
@@ -6942,10 +7032,10 @@ msgid "To check the status of the object, run the following command:"
 msgstr "オブジェクトの状態を確認するために、以下のコマンドを実行します。"
 
 msgid ""
-"To complete these tasks, use these parameters on the nova :command:`boot` "
+"To complete these tasks, use these parameters on the :command:`nova boot` "
 "command:"
 msgstr ""
-"これらのパラメーターを nova :command:`boot` コマンドに使用して、以下の作業を"
+"これらのパラメーターを :command:`nova boot` コマンドに使用して、以下の作業を"
 "実行します。"
 
 msgid ""
@@ -7149,6 +7239,13 @@ msgstr ""
 "``allow_versions`` オプションを ``TRUE`` に設定するよう、クラウドプロバイダー"
 "に依頼します。"
 
+msgid ""
+"To enable the configuration drive, pass the ``--config-drive true`` "
+"parameter to the :command:`nova boot` command."
+msgstr ""
+":command:`nova boot` コマンドに ``--config-drive true`` パラメーターを付け、"
+"コンフィグドライブを有効化します。"
+
 msgid ""
 "To ensure that the key pair has been successfully imported, list key pairs "
 "as follows::"
@@ -7508,6 +7605,17 @@ msgstr ""
 "インスタンスに SSH 接続するために、ダウンロードしたキーペアファイルを使用しま"
 "す。"
 
+msgid ""
+"To use configuration drive with Hyper-V, you must set the ``mkisofs_cmd`` "
+"value to the full path to an ``mkisofs.exe`` installation. Additionally, you "
+"must set the ``qemu_img_cmd`` value in the ``hyperv`` configuration section "
+"to the full path to an :command:`qemu-img` command installation."
+msgstr ""
+"Hyper-V でコンフィグドライブを使用する場合、``mkisofs_cmd`` の値を ``mkisofs."
+"exe`` のインストレーションへの完全パスに設定する必要があります。さらに、"
+"``qemu-img`` コマンドのインストレーションへの完全パスに `hyperv`` 設定セク"
+"ションの :command:`qemu_img_cmd` フラグの値を設定する必要があります。"
+
 msgid ""
 "To use configuration drive with libvirt, XenServer, or VMware, you must "
 "first install the genisoimage package on each compute host. Otherwise, "
@@ -7719,6 +7827,13 @@ msgstr ""
 "ノードとインターフェースを表示します。ノードが使用中の場合、実行されているイ"
 "ンスタンスの UUID もステータスに含められます。"
 
+msgid ""
+"Use the :command:`nova baremetal-node-list` command to view the details for "
+"a bare-metal node:"
+msgstr ""
+":command:`nova baremetal-node-list` コマンドを使用して、全ベアメタルノードと"
+"インターフェースを表示します。"
+
 msgid ""
 "Use the :command:`nova floating-ip-*` commands to manage floating IP "
 "addresses."
@@ -8256,6 +8371,15 @@ msgid ""
 "You can also authenticate by explicitly specifying the endpoint and token:"
 msgstr "エンドポイントとトークンを明示的に指定して、認証することもできます。"
 
+msgid ""
+"You can also configure the Compute service to always create a configuration "
+"drive by setting the following option in the :file:`/etc/nova/nova.conf` "
+"file::"
+msgstr ""
+":file`/etc/nova/nova.conf` ファイルに以下のオプションを設定することにより、常"
+"にコンフィグドライブを作成するよう、Compute サービスを設定することもできま"
+"す。"
+
 msgid ""
 "You can also filter the image list by using ``grep`` to find a specific "
 "image, as follows::"
@@ -8628,6 +8752,15 @@ msgstr ""
 "スをリストアするために、バックアップを使用できます。リストア処理は、データ"
 "ベースインスタンスを作成します。"
 
+msgid ""
+"You can use the :command:`blkid` command to identify the block device that "
+"corresponds to the configuration drive. For example, when you boot the "
+"CirrOS image with the ``m1.tiny`` flavor, the device is ``/dev/vdb``:"
+msgstr ""
+"コンフィグドライブに対応するブロックデバイスを識別するために、:command:"
+"`blkid` コマンドを使用できます。たとえば、``m1.tiny`` フレーバーで CirrOS イ"
+"メージを起動するとき、このデバイスは ``/dev/vdb`` になります。"
+
 msgid ""
 "You can use your Object Storage account to create a static website. This "
 "static website is created with Static Web middleware and serves container "
diff --git a/doc/user-guide/source/locale/user-guide.pot b/doc/user-guide/source/locale/user-guide.pot
index 10131ec329..40618bce66 100644
--- a/doc/user-guide/source/locale/user-guide.pot
+++ b/doc/user-guide/source/locale/user-guide.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: End User Guide 1.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-26 06:16+0000\n"
+"POT-Creation-Date: 2015-09-28 06:23+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"
@@ -1700,7 +1700,7 @@ msgstr ""
 msgid "Clear the :guilabel:`Public` check box to make the image private."
 msgstr ""
 
-#: ../dashboard_create_networks.rst:98
+#: ../dashboard_create_networks.rst:99
 msgid "Click :guilabel:`Add Interface`."
 msgstr ""
 
@@ -1758,7 +1758,7 @@ msgid "Click :guilabel:`Create Image`."
 msgstr ""
 
 #: ../configure_access_and_security_for_instances.rst:98
-msgid "Click :guilabel:`Create Keypair`."
+msgid "Click :guilabel:`Create Key Pair`."
 msgstr ""
 
 #: ../dashboard_create_networks.rst:21
@@ -1869,7 +1869,7 @@ msgid "Click :guilabel:`Extend Share`."
 msgstr ""
 
 #: ../configure_access_and_security_for_instances.rst:116
-msgid "Click :guilabel:`Import Keypair`."
+msgid "Click :guilabel:`Import Key Pair`."
 msgstr ""
 
 #: ../dashboard_databases.rst:65
@@ -1941,7 +1941,7 @@ msgstr ""
 #: ../configure_access_and_security_for_instances.rst:95
 #: ../configure_access_and_security_for_instances.rst:113
 msgid ""
-"Click the :guilabel:`Keypairs` tab, which shows the key pairs that are "
+"Click the :guilabel:`Key Pairs` tab, which shows the key pairs that are "
 "available for this project."
 msgstr ""
 
@@ -3203,7 +3203,7 @@ msgstr ""
 msgid "If you choose VFAT, the configuration drive is 64 MB."
 msgstr ""
 
-#: ../dashboard_create_networks.rst:91
+#: ../dashboard_create_networks.rst:92
 msgid ""
 "If you choose not to set the :guilabel:`IP Address` value, then by default "
 "OpenStack Networking uses the first host IP address in the subnet."
@@ -3471,7 +3471,7 @@ msgid ""
 "guilabel:`Edit` from the list."
 msgstr ""
 
-#: ../dashboard_create_networks.rst:86
+#: ../dashboard_create_networks.rst:87
 msgid ""
 "In the :guilabel:`Add Interface` dialog box, select a :guilabel:`Subnet`."
 msgstr ""
@@ -3505,8 +3505,8 @@ msgstr ""
 
 #: ../configure_access_and_security_for_instances.rst:100
 msgid ""
-"In the :guilabel:`Create Keypair` dialog box, enter a name for your key "
-"pair, and click :guilabel:`Create Keypair`."
+"In the :guilabel:`Create Key Pair` dialog box, enter a name for your key "
+"pair, and click :guilabel:`Create Key Pair`."
 msgstr ""
 
 #: ../dashboard_create_networks.rst:23
@@ -3544,9 +3544,9 @@ msgstr ""
 
 #: ../configure_access_and_security_for_instances.rst:118
 msgid ""
-"In the :guilabel:`Import Keypair` dialog box, enter the name of your key "
+"In the :guilabel:`Import Key Pair` dialog box, enter the name of your key "
 "pair, copy the public key into the :guilabel:`Public Key` box, and then "
-"click :guilabel:`Import Keypair`."
+"click :guilabel:`Import Key Pair`."
 msgstr ""
 
 #: ../dashboard_databases.rst:67
@@ -4727,7 +4727,8 @@ msgstr ""
 
 #: ../dashboard_create_networks.rst:84
 msgid ""
-"On the :guilabel:`Router Details` page, click :guilabel:`Add Interface`."
+"On the :guilabel:`Router Details` page, click the :guilabel:`Interfaces` "
+"tab, then click :guilabel:`Add Interface`."
 msgstr ""
 
 #: ../dashboard_create_networks.rst:82
@@ -4836,7 +4837,7 @@ msgstr ""
 #: ../cli_nova_launch_instance_using_ISO_image.rst:10
 msgid ""
 "OpenStack supports booting instances using ISO images. But before you make "
-"such instances functional, use the nova :command:`boot` command with the "
+"such instances functional, use the :command:`nova boot` command with the "
 "following parameters to boot an instance::"
 msgstr ""
 
@@ -4854,7 +4855,7 @@ msgstr ""
 msgid "Optionally, a specific object prefix"
 msgstr ""
 
-#: ../dashboard_create_networks.rst:88
+#: ../dashboard_create_networks.rst:89
 msgid ""
 "Optionally, in the :guilabel:`Add Interface` dialog box, set an :guilabel:"
 "`IP Address` for the router interface for the selected subnet."
@@ -5205,7 +5206,7 @@ msgid "Select a volume from which to create a snapshot."
 msgstr ""
 
 #: ../dashboard_launch_instances.rst:42
-msgid "Select an image and click :guilabel:`Launch`."
+msgid "Select an image and click :guilabel:`Launch Instance`."
 msgstr ""
 
 #: ../dashboard_launch_instances.rst:220
@@ -5679,7 +5680,7 @@ msgid ""
 "public IP addresses, size, status, task, and power state."
 msgstr ""
 
-#: ../dashboard_create_networks.rst:95
+#: ../dashboard_create_networks.rst:96
 msgid ""
 "The :guilabel:`Router Name` and :guilabel:`Router ID` fields are "
 "automatically updated."
@@ -6898,7 +6899,7 @@ msgstr ""
 
 #: ../cli_nova_launch_instance_from_volume.rst:7
 msgid ""
-"To complete these tasks, use these parameters on the nova :command:`boot` "
+"To complete these tasks, use these parameters on the :command:`nova boot` "
 "command:"
 msgstr ""
 
@@ -8457,7 +8458,7 @@ msgstr ""
 msgid "You have successfully created a container."
 msgstr ""
 
-#: ../dashboard_create_networks.rst:100
+#: ../dashboard_create_networks.rst:101
 msgid ""
 "You have successfully created the router. You can view the new topology from "
 "the :guilabel:`Network Topology` tab."