diff --git a/common/app_support.rst b/common/app_support.rst
index 79ca3ad36..541f1251b 100644
--- a/common/app_support.rst
+++ b/common/app_support.rst
@@ -172,7 +172,7 @@ The following Launchpad Bugs areas are available:
 
 *  `Bugs: Clustering service (senlin) <https://bugs.launchpad.net/senlin>`__
 
-*  `Bugs: Containers service (magnum) <https://bugs.launchpad.net/magnum>`__
+*  `Bugs: Container Infrastructure Management service (magnum) <https://bugs.launchpad.net/magnum>`__
 
 *  `Bugs: Data processing service
    (sahara) <https://bugs.launchpad.net/sahara>`__
diff --git a/common/glossary.rst b/common/glossary.rst
index 9b92061be..f202fe575 100644
--- a/common/glossary.rst
+++ b/common/glossary.rst
@@ -898,16 +898,15 @@ C
       its associated metadata, such as machine state, OS disk size, and so
       on.
 
+   Container Infrastructure Management service
+
+      To provide a set of services for provisioning, scaling, and managing
+      container orchestration engines.
+
    container server
 
       An Object Storage server that manages containers.
 
-   Containers service
-
-      OpenStack project that provides a set of services for
-      management of application containers in a multi-tenant cloud
-      environment. The code name of the project name is magnum.
-
    container service
 
       The Object Storage component that provides container services,
diff --git a/common/source/locale/ja/LC_MESSAGES/common.po b/common/source/locale/ja/LC_MESSAGES/common.po
index f61c9f689..3a81fcac7 100644
--- a/common/source/locale/ja/LC_MESSAGES/common.po
+++ b/common/source/locale/ja/LC_MESSAGES/common.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Common documents 1.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-09 15:40+0000\n"
+"POT-Creation-Date: 2016-05-13 16:48+0000\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -1784,9 +1784,6 @@ msgstr "Image service イメージレジストリの別名。"
 msgid "Alternative term for the Image service registry."
 msgstr "Image service レジストリの別名。"
 
-msgid "Alternatively, users can set ``os_distro`` to a URL:"
-msgstr "代わりに、ユーザーは ``os_distro`` を URL に設定できます。"
-
 msgid ""
 "Alternatively, you can create the ``PROJECT-openrc.sh`` file from scratch, "
 "if you cannot download the file from the dashboard."
@@ -8029,15 +8026,6 @@ msgstr "pip をインストールして、インストールするクライア
 msgid "Then you can install the packages:"
 msgstr "そして、パッケージをインストールします。"
 
-msgid ""
-"Theoretically, OpenStack Compute can support any database that SQL-Alchemy "
-"supports. Common databases are SQLite3 for test and development work, MySQL, "
-"and PostgreSQL."
-msgstr ""
-"理論的には、OpenStack Compute は SQL-Alchemy がサポートするデータベースをすべ"
-"てサポートします。一般的に使用されているデータベースは、テスト・開発用には "
-"SQLite3、それ以外では MySQL や PostgreSQL です。"
-
 msgid ""
 "There are also packaged versions of the clients available in `RDO <https://"
 "www.rdoproject.org/>`__ that enable yum to install the clients as described "
@@ -8546,13 +8534,6 @@ msgstr ""
 "的には、これらのアクセスはいずれも各種の OpenStack サービスへの REST API 呼び"
 "出しになります。"
 
-msgid ""
-"Users can set the operating system ID or a ``short-id`` by setting "
-"``os_distro`` in image properties. For example:"
-msgstr ""
-"ユーザーは、イメージのプロパティーの ``os_distro`` を設定することで、オペレー"
-"ティングシステム ID として短い ID を設定できます。"
-
 msgid ""
 "Users of Object Storage interact with the service through the proxy server, "
 "which in turn looks up the location of the requested data within the ring "