diff --git a/doc/common/locale/ja.po b/doc/common/locale/ja.po
index 8bdf06f79b..9cfae84aa5 100644
--- a/doc/common/locale/ja.po
+++ b/doc/common/locale/ja.po
@@ -7,8 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: OpenStack Manuals\n"
-"POT-Creation-Date: 2014-06-04 20:34+0000\n"
-"PO-Revision-Date: 2014-06-05 04:20+0000\n"
+"POT-Creation-Date: 2014-06-08 08:46+0000\n"
+"PO-Revision-Date: 2014-06-09 01:00+0000\n"
 "Last-Translator: Tomoyuki KATO <tomo@dream.daynight.jp>\n"
 "Language-Team: Japanese (http://www.transifex.com/projects/p/openstack-manuals-i18n/language/ja/)\n"
 "MIME-Version: 1.0\n"
@@ -4830,11 +4830,11 @@ msgstr "インスタンスを起動する前に、以下のパラメーターの
 msgid ""
 "The <emphasis role=\"bold\">instance source</emphasis> can be an image, "
 "snapshot, or block storage volume that contains an image or snapshot."
-msgstr ""
+msgstr "<emphasis role=\"bold\">インスタンスのソース</emphasis>は、イメージやスナップショットを含む、イメージ、スナップショット、ブロックストレージです。"
 
 #: ./doc/common/section_cli_nova_boot.xml18(para)
 msgid "A <emphasis role=\"bold\">name</emphasis> for your instance."
-msgstr ""
+msgstr "お使いのインスタンスの<emphasis role=\"bold\">名前</emphasis>。"
 
 #: ./doc/common/section_cli_nova_boot.xml21(para)
 #: ./doc/common/section_dashboard_launch_instances_from_image.xml37(para)
@@ -4843,7 +4843,7 @@ msgid ""
 "defines the compute, memory, and storage capacity of nova computing "
 "instances. A flavor is an available hardware configuration for a server. It "
 "defines the size of a virtual server that can be launched."
-msgstr ""
+msgstr "インスタンスの<emphasis role=\"bold\">フレーバー</emphasis>。nova コンピューティングインスタンスのコンピュート、メモリー、ストレージ容量を定義します。フレーバーは、サーバーが使用可能なハードウェア設定で、起動可能な仮想サーバーのサイズを定義します。"
 
 #: ./doc/common/section_cli_nova_boot.xml29(para)
 msgid ""
@@ -4855,7 +4855,7 @@ msgid ""
 "system, which is an open-source package from Ubuntu that is available on "
 "various Linux distributions and that handles early initialization of a cloud"
 " instance."
-msgstr ""
+msgstr "任意の<emphasis role=\"bold\">ユーザーデータ</emphasis>。ユーザーデータファイルは、メタデータサービス内の特別キーで、ゲストインスタンスにあるクラウド対応アプリケーションがアクセス可能なファイルを保持します。例えば、ユーザーデータを使用するアプリケーションの 1 つは <link href=\"https://help.ubuntu.com/community/CloudInit\">cloud-init</link> システムです。これは、さまざまな Linux ディストリビューションで利用可能な Ubuntu 発祥のオープンソースパッケージです。クラウドインスタンスの初期設定を処理します。"
 
 #: ./doc/common/section_cli_nova_boot.xml42(para)
 #: ./doc/common/section_dashboard_launch_instances_from_image.xml45(para)
@@ -4873,7 +4873,7 @@ msgid ""
 " project. If you already have generated a key pair with an external tool, "
 "you can import it into OpenStack. You can use the key pair for multiple "
 "instances that belong to that project."
-msgstr ""
+msgstr "インスタンスの<emphasis role=\"bold\">キーペア</emphasis>。イメージ起動時にイメージに注入される SSH 認証情報です。キーペアを正常にインジェクトさせるためには、イメージに <literal>cloud-init</literal> パッケージがインストールされている必要があります。プロジェクトごとにキーペアを最低でも 1 つ作成します。すでに外部のツールでキーペアを生成している場合は、OpenStack にそのキーペアをインポートすることができます。プロジェクトに所属する複数のインスタンスに対して、キーペアを使用することができます。"
 
 #: ./doc/common/section_cli_nova_boot.xml60(para)
 msgid ""
@@ -4881,19 +4881,19 @@ msgid ""
 "incoming network traffic is forwarded to instances. Security groups hold a "
 "set of firewall policies, known as <emphasis role=\"italic\">security group "
 "rules</emphasis>."
-msgstr ""
+msgstr "<emphasis role=\"bold\">セキュリティグループ</emphasis>。どの受信ネットワークトラフィックがインスタンスに転送されるのかを定義します。セキュリティグループは、<emphasis role=\"italic\">セキュリティグループルール</emphasis>と呼ばれるファイアウォールポリシーを保持しています。"
 
 #: ./doc/common/section_cli_nova_boot.xml71(para)
 msgid ""
 "If needed, you can assign a <emphasis role=\"bold\">floating (public) IP "
 "address</emphasis> to a running instance."
-msgstr ""
+msgstr "必要に応じて、実行中のインスタンスに <emphasis role=\"bold\">Floating (パブリック) IP アドレス</emphasis>を割り当てられます。"
 
 #: ./doc/common/section_cli_nova_boot.xml76(para)
 msgid ""
 "You can also attach a block storage device, or <emphasis "
 "role=\"bold\">volume</emphasis>, for persistent storage."
-msgstr ""
+msgstr "永続ストレージ用に、ブロックストレージデバイス、<emphasis role=\"bold\">ボリューム</emphasis>を接続することもできます。"
 
 #: ./doc/common/section_cli_nova_boot.xml82(para)
 msgid ""
@@ -4918,7 +4918,7 @@ msgid ""
 " directly from one of the available OpenStack images or from an image that "
 "you have copied to a persistent volume. The OpenStack Image Service provides"
 " a pool of images that are accessible to members of different projects."
-msgstr ""
+msgstr "インスタンスを起動するために必要なパラメーターを収集した後、<link linkend=\"launch_from_image\">イメージ</link>や<link linkend=\"boot_from_volume\">ボリューム</link>から起動できます。\n利用可能な OpenStack イメージの 1 つまたは永続ボリュームにコピーしたイメージから直接インスタンスを起動することができます。OpenStack Image Service は、別のプロジェクトのメンバーがアクセスできるイメージのプールを提供します。"
 
 #: ./doc/common/section_cli_nova_boot.xml101(title)
 msgid "Gather parameters to launch an instance"
@@ -4926,7 +4926,7 @@ msgstr "インスタンスを起動するためのパラメーター情報の収
 
 #: ./doc/common/section_cli_nova_boot.xml103(para)
 msgid "Before you begin, source the OpenStack RC file."
-msgstr ""
+msgstr "開始前に OpenStack RC ファイルを読み込みます。"
 
 #: ./doc/common/section_cli_nova_boot.xml106(para)
 #: ./doc/common/section_cli_nova_boot_from_volume.xml169(para)
@@ -4935,7 +4935,7 @@ msgstr "利用可能なフレーバーを表示します。"
 
 #: ./doc/common/section_cli_nova_boot.xml108(para)
 msgid "Note the ID of the flavor that you want to use for your instance:"
-msgstr ""
+msgstr "インスタンスに使用するフレーバーの ID をメモします。"
 
 #: ./doc/common/section_cli_nova_boot.xml121(para)
 #: ./doc/common/section_cli_nova_boot_from_volume.xml155(para)
@@ -4944,13 +4944,13 @@ msgstr "利用可能なイメージを表示します。"
 
 #: ./doc/common/section_cli_nova_boot.xml123(para)
 msgid "Note the ID of the image from which you want to boot your instance:"
-msgstr ""
+msgstr "インスタンスを起動するイメージの ID をメモします。"
 
 #: ./doc/common/section_cli_nova_boot.xml131(para)
 msgid ""
 "You can also filter the image list by using <placeholder-1/> to find a "
 "specific image, as follows:"
-msgstr ""
+msgstr "以下のように、<placeholder-1/> を使用してイメージ一覧をフィルタリングして、特定のイメージを検索することができます。"
 
 #: ./doc/common/section_cli_nova_boot.xml138(para)
 msgid "List the available security groups:"
@@ -4960,12 +4960,12 @@ msgstr "利用可能なセキュリティグループを表示します。"
 msgid ""
 "If you are an admin user, specify the <option>--all-tenants</option> "
 "parameter to list groups for all tenants."
-msgstr ""
+msgstr "管理ユーザーの場合、<option>--all-tenants</option> パラメーターを指定してテナントすべてのグループを表示します。"
 
 #: ./doc/common/section_cli_nova_boot.xml145(para)
 msgid ""
 "Note the ID of the security group that you want to use for your instance:"
-msgstr ""
+msgstr "インスタンスに使用するセキュリティグループの ID をメモします。"
 
 #: ./doc/common/section_cli_nova_boot.xml151(para)
 msgid ""
@@ -4975,13 +4975,13 @@ msgstr "セキュリティグループを作成していない場合、Default 
 
 #: ./doc/common/section_cli_nova_boot.xml154(para)
 msgid "You can view rules for a specified security group:"
-msgstr ""
+msgstr "指定したセキュリティグループのルールを表示できます。"
 
 #: ./doc/common/section_cli_nova_boot.xml159(para)
 msgid ""
 "List the available key pairs and note the name of the key pair that you use "
 "for SSH access."
-msgstr ""
+msgstr "利用可能なキーペアを一覧表示し、SSH アクセスに使用するキーペアの名前を記録します。"
 
 #: ./doc/common/section_cli_nova_boot.xml168(title)
 #: ./doc/common/section_dashboard_launch_instances_from_image.xml6(title)
@@ -4992,7 +4992,7 @@ msgstr "イメージからのインスタンスの起動"
 msgid ""
 "After you gather required parameters, run the following command to launch an"
 " instance. Specify the server name, flavor ID, and image ID."
-msgstr ""
+msgstr "必要なパラメーターの収集後、インスタンスを起動するために、以下のコマンドを実行します。サーバー名、フレーバー ID、イメージ ID を指定します。"
 
 #: ./doc/common/section_cli_nova_boot.xml174(para)
 msgid ""
@@ -5000,14 +5000,14 @@ msgid ""
 "group for security. You can also include metadata key and value pairs. For "
 "example, you can add a description for your server by providing the "
 "<parameter>--meta description=\"My Server\"</parameter> parameter."
-msgstr ""
+msgstr "オプションで、セキュリティとしてアクセス制御やセキュリティグループのキー名を指定することができます。また、メタデータキーや値のペアを含めることも可能です。例えば、<parameter>--meta description=\"My Server\"</parameter> パラメーターを指定してサーバーの説明を追加します。"
 
 #: ./doc/common/section_cli_nova_boot.xml181(para)
 msgid ""
 "You can pass user data in a local file at instance launch by using the "
 "<parameter>--user-data <replaceable>USER-DATA-FILE</replaceable></parameter>"
 " parameter."
-msgstr ""
+msgstr "<parameter>--user-data <replaceable>USER-DATA-FILE</replaceable></parameter> パラメーターを使用して、インスタンスの起動時にローカルファイルのユーザーデータを指定することができます。"
 
 #: ./doc/common/section_cli_nova_boot.xml186(replaceable)
 msgid "FLAVOR_ID"
@@ -5024,7 +5024,7 @@ msgstr "KEY_NAME"
 
 #: ./doc/common/section_cli_nova_boot.xml187(replaceable)
 msgid "USER_DATA_FILE"
-msgstr ""
+msgstr "USER_DATA_FILE"
 
 #: ./doc/common/section_cli_nova_boot.xml187(replaceable)
 msgid "SEC_GROUP"
@@ -5051,7 +5051,7 @@ msgid ""
 "of <literal>397e713c-b95b-4186-ad46-6126863ea0a9</literal>), "
 "<literal>default</literal> security group, <literal>KeyPair01</literal> key,"
 " and a user data file called <filename>cloudinit.file</filename>:"
-msgstr ""
+msgstr "以下のコマンドは、<literal>MyCirrosServer</literal> インスタンスを、<literal>m1.small</literal> フレーバー (ID <literal>1</literal>)、<literal>cirros-0.3.2-x86_64-uec</literal> イメージ (ID <literal>397e713c-b95b-4186-ad46-6126863ea0a9</literal>)、<literal>default</literal> セキュリティグループ、<literal>KeyPair01</literal> キー、<filename>cloudinit.file</filename> という名前のユーザーデータファイルで起動します。"
 
 #: ./doc/common/section_cli_nova_boot.xml202(replaceable)
 msgid "myCirrosServer"
@@ -5084,7 +5084,7 @@ msgstr "出力の <literal>id</literal> フィールドからサーバー ID の
 msgid ""
 "Copy the administrative password value from the <literal>adminPass</literal>"
 " field. You use this value to log in to your server."
-msgstr ""
+msgstr "<literal>adminPass</literal> フィールドから管理者パスワードの値をコピーして、この値を使用してサーバーにログインします。"
 
 #: ./doc/common/section_cli_nova_boot.xml249(para)
 msgid ""
@@ -5095,7 +5095,7 @@ msgid ""
 "that you want to put on the instance rather than using the regular SSH key "
 "injection, you can use the <option>--file</option> option as shown in the "
 "following example:"
-msgstr ""
+msgstr "インスタンス作成時に <option>--file &lt;dst-path=src-path&gt;</option> オプションを用いて、任意のローカルファイルをインスタンスのファイルシステムの中に置けます。5 ファイルまで保存できます。例えば、ある理由により通常の SSH 鍵の注入ではなく、インスタンスに置きたい <filename>special_authorized_keysfile</filename> という名前の特別な認証済み鍵を持っていれば、以下の例で示したように <option>--file</option> オプションを使用できます。"
 
 #: ./doc/common/section_cli_nova_boot.xml266(para)
 msgid "Check if the instance is online:"
@@ -5105,7 +5105,7 @@ msgstr "インスタンスがオンラインになっているかどうかをチ
 msgid ""
 "The list shows the ID, name, status, and private (and if assigned, public) "
 "IP addresses for all instances in the project to which you belong:"
-msgstr ""
+msgstr "覧では、所属するプロジェクトの全インスタンスの ID、名前、状態、プライベート (割り当てられている場合パブリックも) IP アドレスが表示されます。"
 
 #: ./doc/common/section_cli_nova_boot.xml278(para)
 msgid "If the status for the instance is ACTIVE, the instance is online."
@@ -5122,7 +5122,7 @@ msgid ""
 "If you did not provide a key pair, security groups, or rules, you can access"
 " the instance only from inside the cloud through VNC. Even pinging the "
 "instance is not possible."
-msgstr ""
+msgstr "キーペア、セキュリティグループ、またはルールを指定しない場合、VNC 経由でクラウド内からしかインスタンスにアクセスすることができません。インスタンスの ping さえも不可となっています。"
 
 #: ./doc/common/section_user-data.xml6(title)
 msgid "Configure instances at boot"
@@ -18299,7 +18299,7 @@ msgstr ""
 
 #: ./doc/common/section_cli_nova_host_aggregates.xml207(replaceable)
 msgid "8192"
-msgstr ""
+msgstr "8192"
 
 #: ./doc/common/section_cli_nova_host_aggregates.xml207(replaceable)
 msgid "80"
@@ -19368,13 +19368,13 @@ msgstr "ボリュームからのインスタンスの起動"
 
 #: ./doc/common/section_cli_nova_boot_from_volume.xml11(para)
 msgid "You can boot instances from a volume instead of an image."
-msgstr ""
+msgstr "イメージの代わりに、ボリュームからインスタンスを起動できます。"
 
 #: ./doc/common/section_cli_nova_boot_from_volume.xml12(para)
 msgid ""
 "To complete these tasks, use these parameters on the nova <placeholder-1/> "
 "command:"
-msgstr ""
+msgstr "これらの作業を完了するために、nova <placeholder-1/> コマンドでこれらのパラメーターを使用します。"
 
 #: ./doc/common/section_cli_nova_boot_from_volume.xml20(th)
 msgid "Task"
@@ -19382,71 +19382,71 @@ msgstr "タスク"
 
 #: ./doc/common/section_cli_nova_boot_from_volume.xml21(th)
 msgid "nova boot parameter"
-msgstr ""
+msgstr "nova boot パラメーター"
 
 #: ./doc/common/section_cli_nova_boot_from_volume.xml22(th)
 msgid "See"
-msgstr ""
+msgstr "参照先"
 
 #: ./doc/common/section_cli_nova_boot_from_volume.xml27(td)
 msgid "Boot an instance from an image and attach a non-bootable volume."
-msgstr ""
+msgstr "イメージからインスタンスを起動し、ブート不可のボリュームを接続します。"
 
 #: ./doc/common/section_cli_nova_boot_from_volume.xml29(parameter)
 #: ./doc/common/section_cli_nova_boot_from_volume.xml35(parameter)
 #: ./doc/common/section_cli_nova_boot_from_volume.xml41(parameter)
 msgid "--block-device"
-msgstr ""
+msgstr "--block-device"
 
 #: ./doc/common/section_cli_nova_boot_from_volume.xml33(td)
 msgid "Create a volume from an image and boot an instance from that volume."
-msgstr ""
+msgstr "イメージからボリュームを作成し、そのボリュームからインスタンスを起動します。"
 
 #: ./doc/common/section_cli_nova_boot_from_volume.xml39(td)
 msgid "Boot from an existing source image, volume, or snapshot."
-msgstr ""
+msgstr "既存のソースイメージ、ボリューム、スナップショットから起動します。"
 
 #: ./doc/common/section_cli_nova_boot_from_volume.xml45(td)
 msgid "Attach a swap disk to an instance."
-msgstr ""
+msgstr "スワップディスクをインスタンスに接続します。"
 
 #: ./doc/common/section_cli_nova_boot_from_volume.xml47(parameter)
 msgid "--swap"
-msgstr ""
+msgstr "--swap"
 
 #: ./doc/common/section_cli_nova_boot_from_volume.xml51(td)
 msgid "Attach an ephemeral disk to an instance."
-msgstr ""
+msgstr "一時ディスクをインスタンスに接続します。"
 
 #: ./doc/common/section_cli_nova_boot_from_volume.xml52(parameter)
 msgid "--ephemeral"
-msgstr ""
+msgstr "--ephemeral"
 
 #: ./doc/common/section_cli_nova_boot_from_volume.xml58(para)
 msgid ""
 "To attach a volume to a running instance, see <xref "
 "linkend=\"cli_attach_volume\"/>."
-msgstr ""
+msgstr "実行中のインスタンスのボリュームを接続する場合、<xref linkend=\"cli_attach_volume\"/>を参照してください。"
 
 #: ./doc/common/section_cli_nova_boot_from_volume.xml62(title)
 msgid "Boot instance from image and attach non-bootable volume"
-msgstr ""
+msgstr "インスタンスをイメージから起動し、ブート不可のボリュームを接続します。"
 
 #: ./doc/common/section_cli_nova_boot_from_volume.xml64(para)
 msgid ""
 "Create a non-bootable volume and attach that volume to an instance that you "
 "boot from an image."
-msgstr ""
+msgstr "ブート不可ボリュームを作成し、イメージから起動するインスタンスにそのボリュームを接続します。"
 
 #: ./doc/common/section_cli_nova_boot_from_volume.xml66(para)
 msgid ""
 "To create a non-bootable volume, do not create it from an image. The volume "
 "must be entirely empty with no partition table and no file system."
-msgstr ""
+msgstr "ブート不可ボリュームを作成するために、イメージから作成しません。ボリュームは、パーティションテーブルとファイルシステムを持たない、全体を空白にする必要があります。"
 
 #: ./doc/common/section_cli_nova_boot_from_volume.xml71(para)
 msgid "Create a non-bootable volume:"
-msgstr ""
+msgstr "ブート不可ボリュームを作成します。"
 
 #: ./doc/common/section_cli_nova_boot_from_volume.xml98(para)
 #: ./doc/common/section_cli_cinder_manage_volumes.xml176(para)
@@ -19456,7 +19456,7 @@ msgstr "ボリュームを一覧表示します。"
 #: ./doc/common/section_cli_nova_boot_from_volume.xml107(para)
 msgid ""
 "Boot an instance from an image and attach the empty volume to the instance:"
-msgstr ""
+msgstr "インスタンスをイメージから起動し、空のボリュームをインスタンスに接続します。"
 
 #: ./doc/common/section_cli_nova_boot_from_volume.xml149(title)
 msgid "Create volume from image and boot instance"
@@ -19467,15 +19467,15 @@ msgid ""
 "You can create a volume from an existing image, volume, or snapshot. This "
 "procedure shows you how to create a volume from an image, and use the volume"
 " to boot an instance."
-msgstr ""
+msgstr "既存のイメージ、ボリューム、スナップショットからボリュームを作成できます。この手順は、イメージからボリュームを作成し、インスタンスを起動するためにそのボリュームを使用する方法を表します。"
 
 #: ./doc/common/section_cli_nova_boot_from_volume.xml165(para)
 msgid "Note the ID of the image that you want to use to create a volume."
-msgstr ""
+msgstr "ボリュームを作成するために使用したいイメージの ID を記録します。"
 
 #: ./doc/common/section_cli_nova_boot_from_volume.xml183(para)
 msgid "Note the ID of the flavor that you want to use to create a volume."
-msgstr ""
+msgstr "ボリュームを作成するために使用したいフレーバーの ID を記録します。"
 
 #: ./doc/common/section_cli_nova_boot_from_volume.xml187(para)
 msgid ""
@@ -19530,7 +19530,7 @@ msgstr "パラメーターは以下のとおりです。"
 msgid ""
 "<parameter>--flavor</parameter><replaceable>FLAVOR</replaceable>. The flavor"
 " ID or name."
-msgstr ""
+msgstr "<parameter>--flavor</parameter><replaceable>FLAVOR</replaceable>。フレーバー ID か名前。"
 
 #: ./doc/common/section_cli_nova_boot_from_volume.xml200(para)
 msgid ""
@@ -19540,64 +19540,64 @@ msgstr "<parameter>--block-device</parameter> source=<replaceable>SOURCE</replac
 
 #: ./doc/common/section_cli_nova_boot_from_volume.xml205(emphasis)
 msgid "source=<placeholder-1/>"
-msgstr ""
+msgstr "source=<placeholder-1/>"
 
 #: ./doc/common/section_cli_nova_boot_from_volume.xml207(para)
 msgid ""
 "The type of object used to create the block device. Valid values are "
 "<literal>volume</literal>, <literal>snapshot</literal>, "
 "<literal>image</literal>, and <literal>blank</literal>."
-msgstr ""
+msgstr "ブロックデバイスを作成するために使用するオブジェクトの種別。有効な値は、<literal>volume</literal>、<literal>snapshot</literal>、<literal>image</literal>、<literal>blank</literal> です。"
 
 #: ./doc/common/section_cli_nova_boot_from_volume.xml217(emphasis)
 msgid "id=<placeholder-1/>"
-msgstr ""
+msgstr "id=<placeholder-1/>"
 
 #: ./doc/common/section_cli_nova_boot_from_volume.xml219(para)
 msgid "The ID of the source object."
-msgstr ""
+msgstr "ソースオブジェクトの ID。"
 
 #: ./doc/common/section_cli_nova_boot_from_volume.xml224(emphasis)
 msgid "dest=<placeholder-1/>"
-msgstr ""
+msgstr "dest=<placeholder-1/>"
 
 #: ./doc/common/section_cli_nova_boot_from_volume.xml226(para)
 msgid ""
 "The type of the target virtual device. Valid values are "
 "<literal>volume</literal> and <literal>local</literal>."
-msgstr ""
+msgstr "ターゲット仮想デバイスの種別。有効な値は、<literal>volume</literal> と <literal>local</literal> です。"
 
 #: ./doc/common/section_cli_nova_boot_from_volume.xml233(emphasis)
 msgid "size=<placeholder-1/>"
-msgstr ""
+msgstr "size=<placeholder-1/>"
 
 #: ./doc/common/section_cli_nova_boot_from_volume.xml235(para)
 msgid "The size of the volume that is created."
-msgstr ""
+msgstr "作成されたボリュームの容量。"
 
 #: ./doc/common/section_cli_nova_boot_from_volume.xml240(emphasis)
 msgid "shutdown={preserve|remove}"
-msgstr ""
+msgstr "shutdown={preserve|remove}"
 
 #: ./doc/common/section_cli_nova_boot_from_volume.xml242(para)
 msgid ""
 "What to do with the volume when the instance is deleted. "
 "<literal>preserve</literal> does not delete the volume. "
 "<literal>remove</literal> deletes the volume."
-msgstr ""
+msgstr "インスタンスの削除時に、ボリュームをどのようにするか。<literal>preserve</literal> はボリュームを削除しません。<literal>remove</literal> はボリュームを削除します。"
 
 #: ./doc/common/section_cli_nova_boot_from_volume.xml250(emphasis)
 msgid "bootindex=<placeholder-1/>"
-msgstr ""
+msgstr "bootindex=<placeholder-1/>"
 
 #: ./doc/common/section_cli_nova_boot_from_volume.xml252(para)
 msgid ""
 "Orders the boot disks. Use <literal>0</literal> to boot from this volume."
-msgstr ""
+msgstr "起動ディスクの順番。このボリュームから起動する場合 <literal>0</literal> を使用します。"
 
 #: ./doc/common/section_cli_nova_boot_from_volume.xml260(para)
 msgid "<replaceable>NAME</replaceable>. The name for the server."
-msgstr ""
+msgstr "<replaceable>NAME</replaceable>。サーバーの名前。"
 
 #: ./doc/common/section_cli_nova_boot_from_volume.xml266(para)
 msgid ""
@@ -19622,11 +19622,11 @@ msgid ""
 "<placeholder-2/><parameter>--ephemeral</parameter> parameter to attach an "
 "ephemeral disk on boot. When you terminate the instance, both disks are "
 "deleted."
-msgstr ""
+msgstr "起動時にスワップディスクを接続するために nova <placeholder-1/><parameter>--swap</parameter> パラメーターを使用します。起動時に一時ディスクを接続するために nova <placeholder-2/><parameter>--ephemeral</parameter> パラメーターを使用します。インスタンスの終了時、どちらのディスクも削除されます。"
 
 #: ./doc/common/section_cli_nova_boot_from_volume.xml327(para)
 msgid "Boot an instance with a 512MB swap disk and 2GB ephemeral disk:"
-msgstr ""
+msgstr "512MB のスワップディスクと 2GB 一時ディスクを持つインスタンスを起動します。"
 
 #: ./doc/common/section_cli_nova_boot_from_volume.xml331(para)
 msgid ""
diff --git a/doc/user-guide-admin/locale/ja.po b/doc/user-guide-admin/locale/ja.po
index 1c867092e9..82c1504d38 100644
--- a/doc/user-guide-admin/locale/ja.po
+++ b/doc/user-guide-admin/locale/ja.po
@@ -4,8 +4,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: OpenStack Manuals\n"
-"POT-Creation-Date: 2014-06-03 23:53+0000\n"
-"PO-Revision-Date: 2014-06-04 04:40+0000\n"
+"POT-Creation-Date: 2014-06-08 08:46+0000\n"
+"PO-Revision-Date: 2014-06-08 10:50+0000\n"
 "Last-Translator: Tomoyuki KATO <tomo@dream.daynight.jp>\n"
 "Language-Team: Japanese (http://www.transifex.com/projects/p/openstack-manuals-i18n/language/ja/)\n"
 "MIME-Version: 1.0\n"
@@ -680,6 +680,7 @@ msgstr "フレーバーの名前。"
 #: ./doc/user-guide-admin/section_dashboard_admin_manage_flavors.xml172(guilabel)
 #: ./doc/user-guide-admin/section_dashboard_admin_set_quotas.xml135(para)
 #: ./doc/user-guide-admin/section_cli_nova_manage_flavors.xml35(term)
+#: ./doc/user-guide-admin/section_cli_nova_manage_flavors.xml84(th)
 msgid "VCPUs"
 msgstr "仮想 CPU"
 
@@ -760,7 +761,6 @@ msgid "The default flavors are:"
 msgstr "デフォルトのフレーバーは以下のとおりです。"
 
 #: ./doc/user-guide-admin/section_dashboard_admin_manage_flavors.xml106(para)
-#: ./doc/user-guide-admin/section_cli_nova_manage_flavors.xml77(para)
 msgid "m1.tiny (1 VCPU/0 GB Disk/512 MB RAM)"
 msgstr "m1.tiny (1 仮想CPU/0 GB ディスク/512 MB メモリ)"
 
@@ -2252,7 +2252,7 @@ msgstr "ROLE_ID"
 #: ./doc/user-guide-admin/section_cli_keystone_manage_projects_users_roles.xml350(replaceable)
 #: ./doc/user-guide-admin/section_cli_keystone_manage_projects_users_roles.xml370(replaceable)
 #: ./doc/user-guide-admin/section_cli_keystone_manage_projects_users_roles.xml375(replaceable)
-#: ./doc/user-guide-admin/section_cli_nova_manage_flavors.xml144(replaceable)
+#: ./doc/user-guide-admin/section_cli_nova_manage_flavors.xml211(replaceable)
 msgid "TENANT_ID"
 msgstr "TENANT_ID"
 
@@ -3154,73 +3154,139 @@ msgid ""
 "by default."
 msgstr "使用するスワップ容量。メガバイト単位。省略すると、デフォルトで 0 になります。"
 
-#: ./doc/user-guide-admin/section_cli_nova_manage_flavors.xml80(para)
-msgid "m1.smaller (1 VCPU/0 GB Disk/1024 MB RAM)"
-msgstr "m1.smaller (1 仮想CPU/0 GB ディスク/1024 MB メモリ)"
+#: ./doc/user-guide-admin/section_cli_nova_manage_flavors.xml83(th)
+msgid "Flavor"
+msgstr "フレーバー"
 
-#: ./doc/user-guide-admin/section_cli_nova_manage_flavors.xml83(para)
-msgid "m1.small (1 VCPU/10 GB Disk/2048 MB RAM)"
-msgstr "m1.small (1 仮想CPU/10 GB ディスク/2048 MB メモリ)"
+#: ./doc/user-guide-admin/section_cli_nova_manage_flavors.xml85(th)
+msgid "Disk (in GB)"
+msgstr "ディスク (GB 単位)"
 
-#: ./doc/user-guide-admin/section_cli_nova_manage_flavors.xml86(para)
-msgid "m1.medium (2 VCPU/10 GB Disk/3072 MB RAM)"
-msgstr "m1.medium (2 仮想CPU/10 GB ディスク/3072 MB メモリ)"
-
-#: ./doc/user-guide-admin/section_cli_nova_manage_flavors.xml89(para)
-msgid "m1.large (4 VCPU/10 GB Disk/8192 MB RAM)"
-msgstr "m1.large (4 仮想CPU/10 GB ディスク/8192 MB メモリ)"
+#: ./doc/user-guide-admin/section_cli_nova_manage_flavors.xml86(th)
+msgid "RAM (in MB)"
+msgstr "メモリー (MB 単位)"
 
 #: ./doc/user-guide-admin/section_cli_nova_manage_flavors.xml92(para)
-msgid "m1.xlarge (8 VCPU/10 GB Disk/8192 MB RAM)"
-msgstr "m1.xlarge (8 仮想CPU/10 GB ディスク/8192 MB メモリ)"
+msgid "m1.tiny"
+msgstr "m1.tiny"
 
 #: ./doc/user-guide-admin/section_cli_nova_manage_flavors.xml95(para)
+#: ./doc/user-guide-admin/section_cli_nova_manage_flavors.xml98(para)
+#: ./doc/user-guide-admin/section_cli_nova_manage_flavors.xml109(para)
+msgid "1"
+msgstr "1"
+
+#: ./doc/user-guide-admin/section_cli_nova_manage_flavors.xml101(para)
+msgid "512"
+msgstr "512"
+
+#: ./doc/user-guide-admin/section_cli_nova_manage_flavors.xml106(para)
+msgid "m1.small"
+msgstr "m1.small"
+
+#: ./doc/user-guide-admin/section_cli_nova_manage_flavors.xml112(para)
+msgid "20"
+msgstr "20"
+
+#: ./doc/user-guide-admin/section_cli_nova_manage_flavors.xml115(para)
+msgid "2048"
+msgstr "2048"
+
+#: ./doc/user-guide-admin/section_cli_nova_manage_flavors.xml120(para)
+msgid "m1.medium"
+msgstr "m1.medium"
+
+#: ./doc/user-guide-admin/section_cli_nova_manage_flavors.xml123(para)
+msgid "2"
+msgstr "2"
+
+#: ./doc/user-guide-admin/section_cli_nova_manage_flavors.xml126(para)
+msgid "40"
+msgstr "40"
+
+#: ./doc/user-guide-admin/section_cli_nova_manage_flavors.xml129(para)
+msgid "4096"
+msgstr "4096"
+
+#: ./doc/user-guide-admin/section_cli_nova_manage_flavors.xml134(para)
+msgid "m1.large"
+msgstr "m1.large"
+
+#: ./doc/user-guide-admin/section_cli_nova_manage_flavors.xml137(para)
+msgid "4"
+msgstr "4"
+
+#: ./doc/user-guide-admin/section_cli_nova_manage_flavors.xml140(para)
+msgid "80"
+msgstr "80"
+
+#: ./doc/user-guide-admin/section_cli_nova_manage_flavors.xml143(para)
+msgid "8192"
+msgstr "8192"
+
+#: ./doc/user-guide-admin/section_cli_nova_manage_flavors.xml148(para)
+msgid "m1.xlarge"
+msgstr "m1.xlarge"
+
+#: ./doc/user-guide-admin/section_cli_nova_manage_flavors.xml151(para)
+msgid "8"
+msgstr "8"
+
+#: ./doc/user-guide-admin/section_cli_nova_manage_flavors.xml154(para)
+msgid "160"
+msgstr "160"
+
+#: ./doc/user-guide-admin/section_cli_nova_manage_flavors.xml157(para)
+msgid "16384"
+msgstr "16384"
+
+#: ./doc/user-guide-admin/section_cli_nova_manage_flavors.xml162(para)
 msgid ""
 "You can create and manage flavors with the nova <placeholder-1/> commands "
 "provided by the <filename>python-novaclient</filename> package."
 msgstr "<filename>python-novaclient</filename> パッケージにより提供される nova <placeholder-1/> コマンドを用いて、フレーバーを作成、管理できます。"
 
-#: ./doc/user-guide-admin/section_cli_nova_manage_flavors.xml99(title)
+#: ./doc/user-guide-admin/section_cli_nova_manage_flavors.xml166(title)
 msgid "Create a flavor"
 msgstr "フレーバーの作成"
 
-#: ./doc/user-guide-admin/section_cli_nova_manage_flavors.xml102(para)
+#: ./doc/user-guide-admin/section_cli_nova_manage_flavors.xml169(para)
 msgid ""
 "List flavors to show the ID and name, the amount of memory, the amount of "
 "disk space for the root partition and for the ephemeral partition, the swap,"
 " and the number of virtual CPUs for each flavor."
 msgstr "各フレーバーの ID、名前、メモリ容量、ルートパーティション、一時パーティションのディスク容量、swap 容量、仮想 CPU 数を表示するために、フレーバーを一覧表示します。"
 
-#: ./doc/user-guide-admin/section_cli_nova_manage_flavors.xml111(para)
+#: ./doc/user-guide-admin/section_cli_nova_manage_flavors.xml178(para)
 msgid ""
 "To create a flavor, specify a name, ID, RAM size, disk size, and the number "
 "of VCPUs for the flavor, as follows:"
 msgstr "フレーバーを作成するために、以下のとおり、フレーバーの名前、ID、メモリ容量、ディスク容量、仮想 CPU 数を指定します。"
 
-#: ./doc/user-guide-admin/section_cli_nova_manage_flavors.xml114(replaceable)
+#: ./doc/user-guide-admin/section_cli_nova_manage_flavors.xml181(replaceable)
 msgid "FLAVOR_NAME"
 msgstr "FLAVOR_NAME"
 
-#: ./doc/user-guide-admin/section_cli_nova_manage_flavors.xml114(replaceable)
-#: ./doc/user-guide-admin/section_cli_nova_manage_flavors.xml153(replaceable)
+#: ./doc/user-guide-admin/section_cli_nova_manage_flavors.xml181(replaceable)
+#: ./doc/user-guide-admin/section_cli_nova_manage_flavors.xml220(replaceable)
 msgid "FLAVOR_ID"
 msgstr "FLAVOR_ID"
 
-#: ./doc/user-guide-admin/section_cli_nova_manage_flavors.xml114(replaceable)
+#: ./doc/user-guide-admin/section_cli_nova_manage_flavors.xml181(replaceable)
 msgid "RAM_IN_MB ROOT_DISK_IN_GB"
 msgstr "RAM_IN_MB ROOT_DISK_IN_GB"
 
-#: ./doc/user-guide-admin/section_cli_nova_manage_flavors.xml114(replaceable)
+#: ./doc/user-guide-admin/section_cli_nova_manage_flavors.xml181(replaceable)
 msgid "NUMBER_OF_VCPUS"
 msgstr "NUMBER_OF_VCPUS"
 
-#: ./doc/user-guide-admin/section_cli_nova_manage_flavors.xml116(para)
+#: ./doc/user-guide-admin/section_cli_nova_manage_flavors.xml183(para)
 msgid ""
 "The flavor ID is a number from 1 to 255 and cannot contain special "
 "characters or spaces."
 msgstr "フレーバー ID は 1 ～ 255 の数値です。特殊文字や空白は含められません。"
 
-#: ./doc/user-guide-admin/section_cli_nova_manage_flavors.xml120(para)
+#: ./doc/user-guide-admin/section_cli_nova_manage_flavors.xml187(para)
 msgid ""
 "Here is an example with additional optional parameters filled in that "
 "creates a public \"extra tiny\" flavor that automatically gets an ID "
@@ -3229,7 +3295,7 @@ msgid ""
 " (through the Virtual Interface (vif) creation in the hypervisor)."
 msgstr "これは、割り当て ID を自動取得し、256MB メモリ、ディスクなし、1 仮想 CPU を持つ、パブリックな「extra tiny」フレーバーを作成するために、追加のオプションパラメーターを用いた例です。rxtx-factor は、このフレーバーのインスタンスが (ハイパーバイザーでの仮想インターフェースの作成により) 使用できる帯域幅を意味します。"
 
-#: ./doc/user-guide-admin/section_cli_nova_manage_flavors.xml129(para)
+#: ./doc/user-guide-admin/section_cli_nova_manage_flavors.xml196(para)
 msgid ""
 "If an individual user or group of users needs a custom flavor that you do "
 "not want other tenants to have access to, you can change the flavor's access"
@@ -3238,25 +3304,25 @@ msgid ""
 "flavors.html\"> Private Flavors in the OpenStack Operations Guide </link>."
 msgstr "個々のユーザーやユーザーのグループが、他のプロジェクトがアクセス権を持たないカスタムフレーバーを必要とする場合、フレーバーをプライベートフレーバーにするために、アクセス権を変更できます。<link href=\"http://docs.openstack.org/trunk/openstack-ops/content/private-flavors.html\"> Private Flavors in the OpenStack Operations Guide </link> を参照してください。"
 
-#: ./doc/user-guide-admin/section_cli_nova_manage_flavors.xml136(para)
+#: ./doc/user-guide-admin/section_cli_nova_manage_flavors.xml203(para)
 msgid "For a list of optional parameters, run this command:"
 msgstr "オプションパラメーターの一覧は、このコマンドを実行します。"
 
-#: ./doc/user-guide-admin/section_cli_nova_manage_flavors.xml141(para)
+#: ./doc/user-guide-admin/section_cli_nova_manage_flavors.xml208(para)
 msgid ""
 "After you create a flavor, assign it to a project by specifying the flavor "
 "name or ID and the tenant ID:"
 msgstr "フレーバーの作成後、フレーバー名かフレーバー ID およびプロジェクト ID を指定することにより、フレーバーをプロジェクトに割り当てます。"
 
-#: ./doc/user-guide-admin/section_cli_nova_manage_flavors.xml144(replaceable)
+#: ./doc/user-guide-admin/section_cli_nova_manage_flavors.xml211(replaceable)
 msgid "FLAVOR"
 msgstr "FLAVOR"
 
-#: ./doc/user-guide-admin/section_cli_nova_manage_flavors.xml149(title)
+#: ./doc/user-guide-admin/section_cli_nova_manage_flavors.xml216(title)
 msgid "Delete a flavor"
 msgstr "フレーバーの削除"
 
-#: ./doc/user-guide-admin/section_cli_nova_manage_flavors.xml152(para)
+#: ./doc/user-guide-admin/section_cli_nova_manage_flavors.xml219(para)
 msgid "Delete a specified flavor, as follows:"
 msgstr "以下のように、指定したフレーバーを削除します。"
 
diff --git a/doc/user-guide-admin/locale/user-guide-admin.pot b/doc/user-guide-admin/locale/user-guide-admin.pot
index ac688f7f76..e4689ec255 100644
--- a/doc/user-guide-admin/locale/user-guide-admin.pot
+++ b/doc/user-guide-admin/locale/user-guide-admin.pot
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2014-06-04 06:07+0000\n"
+"POT-Creation-Date: 2014-06-09 06:07+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -493,7 +493,7 @@ msgstr ""
 msgid "The flavor name."
 msgstr ""
 
-#: ./doc/user-guide-admin/section_dashboard_admin_manage_flavors.xml:36(para) ./doc/user-guide-admin/section_dashboard_admin_manage_flavors.xml:172(guilabel) ./doc/user-guide-admin/section_dashboard_admin_set_quotas.xml:135(para) ./doc/user-guide-admin/section_cli_nova_manage_flavors.xml:35(term)
+#: ./doc/user-guide-admin/section_dashboard_admin_manage_flavors.xml:36(para) ./doc/user-guide-admin/section_dashboard_admin_manage_flavors.xml:172(guilabel) ./doc/user-guide-admin/section_dashboard_admin_set_quotas.xml:135(para) ./doc/user-guide-admin/section_cli_nova_manage_flavors.xml:35(term) ./doc/user-guide-admin/section_cli_nova_manage_flavors.xml:84(th)
 msgid "VCPUs"
 msgstr ""
 
@@ -557,7 +557,7 @@ msgstr ""
 msgid "The default flavors are:"
 msgstr ""
 
-#: ./doc/user-guide-admin/section_dashboard_admin_manage_flavors.xml:106(para) ./doc/user-guide-admin/section_cli_nova_manage_flavors.xml:77(para)
+#: ./doc/user-guide-admin/section_dashboard_admin_manage_flavors.xml:106(para)
 msgid "m1.tiny (1 VCPU/0 GB Disk/512 MB RAM)"
 msgstr ""
 
@@ -1683,7 +1683,7 @@ msgstr ""
 msgid "ROLE_ID"
 msgstr ""
 
-#: ./doc/user-guide-admin/section_cli_keystone_manage_projects_users_roles.xml:346(replaceable) ./doc/user-guide-admin/section_cli_keystone_manage_projects_users_roles.xml:350(replaceable) ./doc/user-guide-admin/section_cli_keystone_manage_projects_users_roles.xml:370(replaceable) ./doc/user-guide-admin/section_cli_keystone_manage_projects_users_roles.xml:375(replaceable) ./doc/user-guide-admin/section_cli_nova_manage_flavors.xml:144(replaceable)
+#: ./doc/user-guide-admin/section_cli_keystone_manage_projects_users_roles.xml:346(replaceable) ./doc/user-guide-admin/section_cli_keystone_manage_projects_users_roles.xml:350(replaceable) ./doc/user-guide-admin/section_cli_keystone_manage_projects_users_roles.xml:370(replaceable) ./doc/user-guide-admin/section_cli_keystone_manage_projects_users_roles.xml:375(replaceable) ./doc/user-guide-admin/section_cli_nova_manage_flavors.xml:211(replaceable)
 msgid "TENANT_ID"
 msgstr ""
 
@@ -2357,87 +2357,151 @@ msgstr ""
 msgid "Amount of swap space (in megabytes) to use. If unspecified, the value is 0 by default."
 msgstr ""
 
-#: ./doc/user-guide-admin/section_cli_nova_manage_flavors.xml:80(para)
-msgid "m1.smaller (1 VCPU/0 GB Disk/1024 MB RAM)"
+#: ./doc/user-guide-admin/section_cli_nova_manage_flavors.xml:83(th)
+msgid "Flavor"
 msgstr ""
 
-#: ./doc/user-guide-admin/section_cli_nova_manage_flavors.xml:83(para)
-msgid "m1.small (1 VCPU/10 GB Disk/2048 MB RAM)"
+#: ./doc/user-guide-admin/section_cli_nova_manage_flavors.xml:85(th)
+msgid "Disk (in GB)"
 msgstr ""
 
-#: ./doc/user-guide-admin/section_cli_nova_manage_flavors.xml:86(para)
-msgid "m1.medium (2 VCPU/10 GB Disk/3072 MB RAM)"
-msgstr ""
-
-#: ./doc/user-guide-admin/section_cli_nova_manage_flavors.xml:89(para)
-msgid "m1.large (4 VCPU/10 GB Disk/8192 MB RAM)"
+#: ./doc/user-guide-admin/section_cli_nova_manage_flavors.xml:86(th)
+msgid "RAM (in MB)"
 msgstr ""
 
 #: ./doc/user-guide-admin/section_cli_nova_manage_flavors.xml:92(para)
-msgid "m1.xlarge (8 VCPU/10 GB Disk/8192 MB RAM)"
+msgid "m1.tiny"
 msgstr ""
 
-#: ./doc/user-guide-admin/section_cli_nova_manage_flavors.xml:95(para)
-msgid "You can create and manage flavors with the nova <placeholder-1/> commands provided by the <filename>python-novaclient</filename> package."
+#: ./doc/user-guide-admin/section_cli_nova_manage_flavors.xml:95(para) ./doc/user-guide-admin/section_cli_nova_manage_flavors.xml:98(para) ./doc/user-guide-admin/section_cli_nova_manage_flavors.xml:109(para)
+msgid "1"
 msgstr ""
 
-#: ./doc/user-guide-admin/section_cli_nova_manage_flavors.xml:99(title)
-msgid "Create a flavor"
+#: ./doc/user-guide-admin/section_cli_nova_manage_flavors.xml:101(para)
+msgid "512"
 msgstr ""
 
-#: ./doc/user-guide-admin/section_cli_nova_manage_flavors.xml:102(para)
-msgid "List flavors to show the ID and name, the amount of memory, the amount of disk space for the root partition and for the ephemeral partition, the swap, and the number of virtual CPUs for each flavor."
+#: ./doc/user-guide-admin/section_cli_nova_manage_flavors.xml:106(para)
+msgid "m1.small"
 msgstr ""
 
-#: ./doc/user-guide-admin/section_cli_nova_manage_flavors.xml:111(para)
-msgid "To create a flavor, specify a name, ID, RAM size, disk size, and the number of VCPUs for the flavor, as follows:"
+#: ./doc/user-guide-admin/section_cli_nova_manage_flavors.xml:112(para)
+msgid "20"
 msgstr ""
 
-#: ./doc/user-guide-admin/section_cli_nova_manage_flavors.xml:114(replaceable)
-msgid "FLAVOR_NAME"
-msgstr ""
-
-#: ./doc/user-guide-admin/section_cli_nova_manage_flavors.xml:114(replaceable) ./doc/user-guide-admin/section_cli_nova_manage_flavors.xml:153(replaceable)
-msgid "FLAVOR_ID"
-msgstr ""
-
-#: ./doc/user-guide-admin/section_cli_nova_manage_flavors.xml:114(replaceable)
-msgid "RAM_IN_MB ROOT_DISK_IN_GB"
-msgstr ""
-
-#: ./doc/user-guide-admin/section_cli_nova_manage_flavors.xml:114(replaceable)
-msgid "NUMBER_OF_VCPUS"
-msgstr ""
-
-#: ./doc/user-guide-admin/section_cli_nova_manage_flavors.xml:116(para)
-msgid "The flavor ID is a number from 1 to 255 and cannot contain special characters or spaces."
+#: ./doc/user-guide-admin/section_cli_nova_manage_flavors.xml:115(para)
+msgid "2048"
 msgstr ""
 
 #: ./doc/user-guide-admin/section_cli_nova_manage_flavors.xml:120(para)
-msgid "Here is an example with additional optional parameters filled in that creates a public \"extra tiny\" flavor that automatically gets an ID assigned, with 256 MB memory, no disk space, and one VCPU. The rxtx-factor indicates the slice of bandwidth that the instances with this flavor can use (through the Virtual Interface (vif) creation in the hypervisor)."
+msgid "m1.medium"
+msgstr ""
+
+#: ./doc/user-guide-admin/section_cli_nova_manage_flavors.xml:123(para)
+msgid "2"
+msgstr ""
+
+#: ./doc/user-guide-admin/section_cli_nova_manage_flavors.xml:126(para)
+msgid "40"
 msgstr ""
 
 #: ./doc/user-guide-admin/section_cli_nova_manage_flavors.xml:129(para)
+msgid "4096"
+msgstr ""
+
+#: ./doc/user-guide-admin/section_cli_nova_manage_flavors.xml:134(para)
+msgid "m1.large"
+msgstr ""
+
+#: ./doc/user-guide-admin/section_cli_nova_manage_flavors.xml:137(para)
+msgid "4"
+msgstr ""
+
+#: ./doc/user-guide-admin/section_cli_nova_manage_flavors.xml:140(para)
+msgid "80"
+msgstr ""
+
+#: ./doc/user-guide-admin/section_cli_nova_manage_flavors.xml:143(para)
+msgid "8192"
+msgstr ""
+
+#: ./doc/user-guide-admin/section_cli_nova_manage_flavors.xml:148(para)
+msgid "m1.xlarge"
+msgstr ""
+
+#: ./doc/user-guide-admin/section_cli_nova_manage_flavors.xml:151(para)
+msgid "8"
+msgstr ""
+
+#: ./doc/user-guide-admin/section_cli_nova_manage_flavors.xml:154(para)
+msgid "160"
+msgstr ""
+
+#: ./doc/user-guide-admin/section_cli_nova_manage_flavors.xml:157(para)
+msgid "16384"
+msgstr ""
+
+#: ./doc/user-guide-admin/section_cli_nova_manage_flavors.xml:162(para)
+msgid "You can create and manage flavors with the nova <placeholder-1/> commands provided by the <filename>python-novaclient</filename> package."
+msgstr ""
+
+#: ./doc/user-guide-admin/section_cli_nova_manage_flavors.xml:166(title)
+msgid "Create a flavor"
+msgstr ""
+
+#: ./doc/user-guide-admin/section_cli_nova_manage_flavors.xml:169(para)
+msgid "List flavors to show the ID and name, the amount of memory, the amount of disk space for the root partition and for the ephemeral partition, the swap, and the number of virtual CPUs for each flavor."
+msgstr ""
+
+#: ./doc/user-guide-admin/section_cli_nova_manage_flavors.xml:178(para)
+msgid "To create a flavor, specify a name, ID, RAM size, disk size, and the number of VCPUs for the flavor, as follows:"
+msgstr ""
+
+#: ./doc/user-guide-admin/section_cli_nova_manage_flavors.xml:181(replaceable)
+msgid "FLAVOR_NAME"
+msgstr ""
+
+#: ./doc/user-guide-admin/section_cli_nova_manage_flavors.xml:181(replaceable) ./doc/user-guide-admin/section_cli_nova_manage_flavors.xml:220(replaceable)
+msgid "FLAVOR_ID"
+msgstr ""
+
+#: ./doc/user-guide-admin/section_cli_nova_manage_flavors.xml:181(replaceable)
+msgid "RAM_IN_MB ROOT_DISK_IN_GB"
+msgstr ""
+
+#: ./doc/user-guide-admin/section_cli_nova_manage_flavors.xml:181(replaceable)
+msgid "NUMBER_OF_VCPUS"
+msgstr ""
+
+#: ./doc/user-guide-admin/section_cli_nova_manage_flavors.xml:183(para)
+msgid "The flavor ID is a number from 1 to 255 and cannot contain special characters or spaces."
+msgstr ""
+
+#: ./doc/user-guide-admin/section_cli_nova_manage_flavors.xml:187(para)
+msgid "Here is an example with additional optional parameters filled in that creates a public \"extra tiny\" flavor that automatically gets an ID assigned, with 256 MB memory, no disk space, and one VCPU. The rxtx-factor indicates the slice of bandwidth that the instances with this flavor can use (through the Virtual Interface (vif) creation in the hypervisor)."
+msgstr ""
+
+#: ./doc/user-guide-admin/section_cli_nova_manage_flavors.xml:196(para)
 msgid "If an individual user or group of users needs a custom flavor that you do not want other tenants to have access to, you can change the flavor's access to make it a private flavor. See <link href=\"http://docs.openstack.org/trunk/openstack-ops/content/private-flavors.html\"> Private Flavors in the OpenStack Operations Guide </link>."
 msgstr ""
 
-#: ./doc/user-guide-admin/section_cli_nova_manage_flavors.xml:136(para)
+#: ./doc/user-guide-admin/section_cli_nova_manage_flavors.xml:203(para)
 msgid "For a list of optional parameters, run this command:"
 msgstr ""
 
-#: ./doc/user-guide-admin/section_cli_nova_manage_flavors.xml:141(para)
+#: ./doc/user-guide-admin/section_cli_nova_manage_flavors.xml:208(para)
 msgid "After you create a flavor, assign it to a project by specifying the flavor name or ID and the tenant ID:"
 msgstr ""
 
-#: ./doc/user-guide-admin/section_cli_nova_manage_flavors.xml:144(replaceable)
+#: ./doc/user-guide-admin/section_cli_nova_manage_flavors.xml:211(replaceable)
 msgid "FLAVOR"
 msgstr ""
 
-#: ./doc/user-guide-admin/section_cli_nova_manage_flavors.xml:149(title)
+#: ./doc/user-guide-admin/section_cli_nova_manage_flavors.xml:216(title)
 msgid "Delete a flavor"
 msgstr ""
 
-#: ./doc/user-guide-admin/section_cli_nova_manage_flavors.xml:152(para)
+#: ./doc/user-guide-admin/section_cli_nova_manage_flavors.xml:219(para)
 msgid "Delete a specified flavor, as follows:"
 msgstr ""
 
diff --git a/doc/user-guide/locale/ja.po b/doc/user-guide/locale/ja.po
index 15ee6a2202..16884fe6a7 100644
--- a/doc/user-guide/locale/ja.po
+++ b/doc/user-guide/locale/ja.po
@@ -7,9 +7,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: OpenStack Manuals\n"
-"POT-Creation-Date: 2014-06-06 20:13+0000\n"
-"PO-Revision-Date: 2014-06-06 07:30+0000\n"
-"Last-Translator: Tomoyuki KATO <tomo@dream.daynight.jp>\n"
+"POT-Creation-Date: 2014-06-08 08:46+0000\n"
+"PO-Revision-Date: 2014-06-08 09:01+0000\n"
+"Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Japanese (http://www.transifex.com/projects/p/openstack-manuals-i18n/language/ja/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -2505,8 +2505,8 @@ msgid ""
 msgstr "他のセキュリティグループからの IP アドレス (ソースグループ) のみが指定したポートにアクセスできるようにします。"
 
 #: ./doc/user-guide/section_cli_nova_configure_instances.xml208(title)
-msgid "Delete a security group"
-msgstr "セキュリティグループの削除"
+msgid "Delete a security group rule"
+msgstr "セキュリティグループのルールの削除"
 
 #: ./doc/user-guide/section_cli_nova_configure_instances.xml209(para)
 msgid ""
diff --git a/doc/user-guide/locale/user-guide.pot b/doc/user-guide/locale/user-guide.pot
index 06532d226d..78dac5f6bb 100644
--- a/doc/user-guide/locale/user-guide.pot
+++ b/doc/user-guide/locale/user-guide.pot
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2014-06-03 06:11+0000\n"
+"POT-Creation-Date: 2014-06-09 06:07+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -381,15 +381,15 @@ msgstr ""
 msgid "To list servers"
 msgstr ""
 
-#: ./doc/user-guide/section_sdk_nova.xml:42(para) ./doc/user-guide/section_sdk_nova.xml:85(para) ./doc/user-guide/section_sdk_nova.xml:162(para) ./doc/user-guide/section_sdk_nova.xml:253(para) ./doc/user-guide/section_sdk_nova.xml:340(para) ./doc/user-guide/section_sdk_nova.xml:401(para) ./doc/user-guide/section_sdk_nova.xml:464(para) ./doc/user-guide/section_sdk_neutron.xml:255(para) ./doc/user-guide/section_sdk_neutron.xml:340(para) ./doc/user-guide/section_sdk_neutron.xml:416(para) ./doc/user-guide/section_sdk_neutron.xml:468(para) ./doc/user-guide/section_sdk_neutron.xml:519(para)
+#: ./doc/user-guide/section_sdk_nova.xml:42(para) ./doc/user-guide/section_sdk_nova.xml:84(para) ./doc/user-guide/section_sdk_nova.xml:160(para) ./doc/user-guide/section_sdk_nova.xml:250(para) ./doc/user-guide/section_sdk_nova.xml:337(para) ./doc/user-guide/section_sdk_nova.xml:398(para) ./doc/user-guide/section_sdk_nova.xml:461(para) ./doc/user-guide/section_sdk_neutron.xml:245(para) ./doc/user-guide/section_sdk_neutron.xml:329(para) ./doc/user-guide/section_sdk_neutron.xml:404(para) ./doc/user-guide/section_sdk_neutron.xml:454(para) ./doc/user-guide/section_sdk_neutron.xml:503(para)
 msgid "Import the following modules:"
 msgstr ""
 
-#: ./doc/user-guide/section_sdk_nova.xml:47(para) ./doc/user-guide/section_sdk_nova.xml:168(para)
+#: ./doc/user-guide/section_sdk_nova.xml:47(para) ./doc/user-guide/section_sdk_nova.xml:166(para)
 msgid "Get Nova credentials. See <xref linkend=\"sdk_compute_get_openstack_credentials_v2\"/>."
 msgstr ""
 
-#: ./doc/user-guide/section_sdk_nova.xml:52(para) ./doc/user-guide/section_sdk_nova.xml:96(para) ./doc/user-guide/section_sdk_nova.xml:173(para) ./doc/user-guide/section_sdk_nova.xml:277(para) ./doc/user-guide/section_sdk_nova.xml:360(para) ./doc/user-guide/section_sdk_nova.xml:424(para) ./doc/user-guide/section_sdk_nova.xml:485(para) ./doc/user-guide/section_sdk_neutron.xml:268(para)
+#: ./doc/user-guide/section_sdk_nova.xml:52(para) ./doc/user-guide/section_sdk_nova.xml:95(para) ./doc/user-guide/section_sdk_nova.xml:171(para) ./doc/user-guide/section_sdk_nova.xml:274(para) ./doc/user-guide/section_sdk_nova.xml:357(para) ./doc/user-guide/section_sdk_nova.xml:421(para) ./doc/user-guide/section_sdk_nova.xml:482(para) ./doc/user-guide/section_sdk_neutron.xml:258(para)
 msgid "Instantiate the <literal>nova_client</literal> client object by using the <literal>credentials</literal> dictionary object:"
 msgstr ""
 
@@ -401,199 +401,199 @@ msgstr ""
 msgid "List servers code listing"
 msgstr ""
 
-#: ./doc/user-guide/section_sdk_nova.xml:79(title)
+#: ./doc/user-guide/section_sdk_nova.xml:78(title)
 msgid "Create server (API v2)"
 msgstr ""
 
-#: ./doc/user-guide/section_sdk_nova.xml:80(para)
+#: ./doc/user-guide/section_sdk_nova.xml:79(para)
 msgid "The following program creates a server (VM) by using the Compute API v2."
 msgstr ""
 
-#: ./doc/user-guide/section_sdk_nova.xml:83(title)
+#: ./doc/user-guide/section_sdk_nova.xml:82(title)
 msgid "To create a server"
 msgstr ""
 
-#: ./doc/user-guide/section_sdk_nova.xml:91(para) ./doc/user-guide/section_sdk_nova.xml:419(para) ./doc/user-guide/section_sdk_nova.xml:480(para)
+#: ./doc/user-guide/section_sdk_nova.xml:90(para) ./doc/user-guide/section_sdk_nova.xml:416(para) ./doc/user-guide/section_sdk_nova.xml:477(para)
 msgid "Get OpenStack credentials. See <xref linkend=\"sdk_compute_get_openstack_credentials_v2\"/>."
 msgstr ""
 
-#: ./doc/user-guide/section_sdk_nova.xml:103(para)
+#: ./doc/user-guide/section_sdk_nova.xml:102(para)
 msgid "Get the flavor and image to use to create a server. This code uses the <literal>cirros</literal> image, the <literal>m1.tiny</literal> flavor, and the <literal>private</literal> network:"
 msgstr ""
 
-#: ./doc/user-guide/section_sdk_nova.xml:113(para)
+#: ./doc/user-guide/section_sdk_nova.xml:112(para)
 msgid "To create the server, use the network, image, and flavor:"
 msgstr ""
 
-#: ./doc/user-guide/section_sdk_nova.xml:120(para)
+#: ./doc/user-guide/section_sdk_nova.xml:119(para)
 msgid "Sleep for five seconds and determine whether the server/vm was created by calling <literal>nova_client.servers.list()</literal>:"
 msgstr ""
 
-#: ./doc/user-guide/section_sdk_nova.xml:130(title)
+#: ./doc/user-guide/section_sdk_nova.xml:129(title)
 msgid "Create server code listing"
 msgstr ""
 
-#: ./doc/user-guide/section_sdk_nova.xml:156(title)
+#: ./doc/user-guide/section_sdk_nova.xml:154(title)
 msgid "Delete server (API v2)"
 msgstr ""
 
-#: ./doc/user-guide/section_sdk_nova.xml:157(para)
+#: ./doc/user-guide/section_sdk_nova.xml:155(para)
 msgid "The following program deletes a server (VM) by using the Compute API v2."
 msgstr ""
 
-#: ./doc/user-guide/section_sdk_nova.xml:160(title)
+#: ./doc/user-guide/section_sdk_nova.xml:158(title)
 msgid "To delete a server"
 msgstr ""
 
-#: ./doc/user-guide/section_sdk_nova.xml:180(para)
+#: ./doc/user-guide/section_sdk_nova.xml:178(para)
 msgid "Determine whether the <literal>vm1</literal> server exists:"
 msgstr ""
 
-#: ./doc/user-guide/section_sdk_nova.xml:184(para)
+#: ./doc/user-guide/section_sdk_nova.xml:182(para)
 msgid "List servers: <literal>servers_list</literal>."
 msgstr ""
 
-#: ./doc/user-guide/section_sdk_nova.xml:188(para)
+#: ./doc/user-guide/section_sdk_nova.xml:186(para)
 msgid "Iterate over <literal>servers_list</literal> and compare name with <literal>vm1</literal>."
 msgstr ""
 
-#: ./doc/user-guide/section_sdk_nova.xml:194(para)
+#: ./doc/user-guide/section_sdk_nova.xml:192(para)
 msgid "If true, set the variable name <literal>server_exists</literal> to <literal>True</literal> and break from the for loop:"
 msgstr ""
 
-#: ./doc/user-guide/section_sdk_nova.xml:211(para)
+#: ./doc/user-guide/section_sdk_nova.xml:209(para)
 msgid "If the server exists, run the <literal>delete</literal> method of the <literal>nova_client.servers</literal> object:"
 msgstr ""
 
-#: ./doc/user-guide/section_sdk_nova.xml:220(title)
+#: ./doc/user-guide/section_sdk_nova.xml:218(title)
 msgid "Delete server code listing"
 msgstr ""
 
-#: ./doc/user-guide/section_sdk_nova.xml:247(title)
+#: ./doc/user-guide/section_sdk_nova.xml:244(title)
 msgid "Update server (API v2)"
 msgstr ""
 
-#: ./doc/user-guide/section_sdk_nova.xml:248(para)
+#: ./doc/user-guide/section_sdk_nova.xml:245(para)
 msgid "The following program updates the name of a server (VM) by using the Compute API v2."
 msgstr ""
 
-#: ./doc/user-guide/section_sdk_nova.xml:251(title)
+#: ./doc/user-guide/section_sdk_nova.xml:248(title)
 msgid "To update a server"
 msgstr ""
 
-#: ./doc/user-guide/section_sdk_nova.xml:257(para)
+#: ./doc/user-guide/section_sdk_nova.xml:254(para)
 msgid "<literal>print_server</literal> is a method defined in <filename>utils.py</filename> and prints the server details as shown in the code listing below:"
 msgstr ""
 
-#: ./doc/user-guide/section_sdk_nova.xml:272(para)
+#: ./doc/user-guide/section_sdk_nova.xml:269(para)
 msgid "Get OpenStack Credentials. See <xref linkend=\"sdk_compute_get_openstack_credentials_v2\"/>."
 msgstr ""
 
-#: ./doc/user-guide/section_sdk_nova.xml:284(para)
+#: ./doc/user-guide/section_sdk_nova.xml:281(para)
 msgid "Get the server instance using <literal>server_id</literal> and print the details by calling <literal>print_server</literal> method:"
 msgstr ""
 
-#: ./doc/user-guide/section_sdk_nova.xml:294(para)
+#: ./doc/user-guide/section_sdk_nova.xml:291(para)
 msgid "Call <code>server.update</code> on the server object with the new value for <literal>name</literal> variable:"
 msgstr ""
 
-#: ./doc/user-guide/section_sdk_nova.xml:300(para)
+#: ./doc/user-guide/section_sdk_nova.xml:297(para)
 msgid "Get the updated instance of the server:"
 msgstr ""
 
-#: ./doc/user-guide/section_sdk_nova.xml:304(para)
+#: ./doc/user-guide/section_sdk_nova.xml:301(para)
 msgid "Call <literal>print_server</literal> again to check the update server details:"
 msgstr ""
 
-#: ./doc/user-guide/section_sdk_nova.xml:311(title)
+#: ./doc/user-guide/section_sdk_nova.xml:308(title)
 msgid "Update server code listing"
 msgstr ""
 
-#: ./doc/user-guide/section_sdk_nova.xml:334(title)
+#: ./doc/user-guide/section_sdk_nova.xml:331(title)
 msgid "List flavors (API v2)"
 msgstr ""
 
-#: ./doc/user-guide/section_sdk_nova.xml:335(para)
+#: ./doc/user-guide/section_sdk_nova.xml:332(para)
 msgid "The following program lists flavors and their details by using the Compute API v2."
 msgstr ""
 
-#: ./doc/user-guide/section_sdk_nova.xml:338(title)
+#: ./doc/user-guide/section_sdk_nova.xml:335(title)
 msgid "To list flavors"
 msgstr ""
 
-#: ./doc/user-guide/section_sdk_nova.xml:344(para)
+#: ./doc/user-guide/section_sdk_nova.xml:341(para)
 msgid "The <literal>print_flavors</literal> method is defined in <filename>utils.py</filename> and prints the flavor details:"
 msgstr ""
 
-#: ./doc/user-guide/section_sdk_nova.xml:355(para)
+#: ./doc/user-guide/section_sdk_nova.xml:352(para)
 msgid "Get openStack credentials. See <xref linkend=\"sdk_compute_get_openstack_credentials_v2\"/>."
 msgstr ""
 
-#: ./doc/user-guide/section_sdk_nova.xml:367(para)
+#: ./doc/user-guide/section_sdk_nova.xml:364(para)
 msgid "List flavors by calling <literal>list()</literal> on <literal>nova_client.flavors</literal> object:"
 msgstr ""
 
-#: ./doc/user-guide/section_sdk_nova.xml:374(para)
+#: ./doc/user-guide/section_sdk_nova.xml:371(para)
 msgid "Print the flavor details, id and name by calling <literal>print_flavors</literal>:"
 msgstr ""
 
-#: ./doc/user-guide/section_sdk_nova.xml:380(title)
+#: ./doc/user-guide/section_sdk_nova.xml:377(title)
 msgid "List flavors code listing"
 msgstr ""
 
-#: ./doc/user-guide/section_sdk_nova.xml:395(title)
+#: ./doc/user-guide/section_sdk_nova.xml:392(title)
 msgid "List floating IPs (API v2)"
 msgstr ""
 
-#: ./doc/user-guide/section_sdk_nova.xml:396(para)
+#: ./doc/user-guide/section_sdk_nova.xml:393(para)
 msgid "The following program lists the floating IPs and their details by using the Compute API v2."
 msgstr ""
 
-#: ./doc/user-guide/section_sdk_nova.xml:399(title)
+#: ./doc/user-guide/section_sdk_nova.xml:396(title)
 msgid "To list floating IPs"
 msgstr ""
 
-#: ./doc/user-guide/section_sdk_nova.xml:405(para)
+#: ./doc/user-guide/section_sdk_nova.xml:402(para)
 msgid "The <literal>print_values_ip</literal> method is defined in <filename>utils.py</filename> and prints the floating_ip object details:"
 msgstr ""
 
-#: ./doc/user-guide/section_sdk_nova.xml:431(para)
+#: ./doc/user-guide/section_sdk_nova.xml:428(para)
 msgid "List floating IPs by calling <literal>list()</literal> on <literal>nova_client.floating_ips</literal> object:"
 msgstr ""
 
-#: ./doc/user-guide/section_sdk_nova.xml:438(para)
+#: ./doc/user-guide/section_sdk_nova.xml:435(para)
 msgid "Print the floating IP object details by calling <literal>print_values_ip</literal>:"
 msgstr ""
 
-#: ./doc/user-guide/section_sdk_nova.xml:444(title)
+#: ./doc/user-guide/section_sdk_nova.xml:441(title)
 msgid "List floating IPs code listing"
 msgstr ""
 
-#: ./doc/user-guide/section_sdk_nova.xml:458(title)
+#: ./doc/user-guide/section_sdk_nova.xml:455(title)
 msgid "List hosts (API v2)"
 msgstr ""
 
-#: ./doc/user-guide/section_sdk_nova.xml:459(para)
+#: ./doc/user-guide/section_sdk_nova.xml:456(para)
 msgid "The following program lists the hosts by using the Compute API v2."
 msgstr ""
 
-#: ./doc/user-guide/section_sdk_nova.xml:462(title)
+#: ./doc/user-guide/section_sdk_nova.xml:459(title)
 msgid "To list hosts"
 msgstr ""
 
-#: ./doc/user-guide/section_sdk_nova.xml:468(para)
+#: ./doc/user-guide/section_sdk_nova.xml:465(para)
 msgid "The <literal>print_hosts</literal> method is defined in <filename>utils.py</filename> and prints the host object details:"
 msgstr ""
 
-#: ./doc/user-guide/section_sdk_nova.xml:492(para)
+#: ./doc/user-guide/section_sdk_nova.xml:489(para)
 msgid "List hosts by calling <literal>list()</literal> on <literal>nova_client.hosts</literal> object:"
 msgstr ""
 
-#: ./doc/user-guide/section_sdk_nova.xml:498(para)
+#: ./doc/user-guide/section_sdk_nova.xml:495(para)
 msgid "Print the host object details by calling <literal>print_hosts(host_list)</literal>:"
 msgstr ""
 
-#: ./doc/user-guide/section_sdk_nova.xml:504(title)
+#: ./doc/user-guide/section_sdk_nova.xml:501(title)
 msgid "List hosts code listing"
 msgstr ""
 
@@ -1914,7 +1914,7 @@ msgid "Allow only IP addresses from other security groups (source groups) to acc
 msgstr ""
 
 #: ./doc/user-guide/section_cli_nova_configure_instances.xml:208(title)
-msgid "Delete a security group"
+msgid "Delete a security group rule"
 msgstr ""
 
 #: ./doc/user-guide/section_cli_nova_configure_instances.xml:209(para)
@@ -2589,163 +2589,163 @@ msgstr ""
 msgid "The following program creates a network:"
 msgstr ""
 
-#: ./doc/user-guide/section_sdk_neutron.xml:127(title)
+#: ./doc/user-guide/section_sdk_neutron.xml:125(title)
 msgid "List networks"
 msgstr ""
 
-#: ./doc/user-guide/section_sdk_neutron.xml:128(para)
+#: ./doc/user-guide/section_sdk_neutron.xml:126(para)
 msgid "The following program lists networks:"
 msgstr ""
 
-#: ./doc/user-guide/section_sdk_neutron.xml:141(para) ./doc/user-guide/section_sdk_neutron.xml:204(para) ./doc/user-guide/section_sdk_neutron.xml:438(para)
+#: ./doc/user-guide/section_sdk_neutron.xml:137(para) ./doc/user-guide/section_sdk_neutron.xml:196(para) ./doc/user-guide/section_sdk_neutron.xml:426(para)
 msgid "For <code>print_values</code> see <xref linkend=\"sdk_neutron_print_values\"/>."
 msgstr ""
 
-#: ./doc/user-guide/section_sdk_neutron.xml:146(title)
+#: ./doc/user-guide/section_sdk_neutron.xml:142(title)
 msgid "Create ports"
 msgstr ""
 
-#: ./doc/user-guide/section_sdk_neutron.xml:147(para)
+#: ./doc/user-guide/section_sdk_neutron.xml:143(para)
 msgid "The following program creates a port:"
 msgstr ""
 
-#: ./doc/user-guide/section_sdk_neutron.xml:180(para)
+#: ./doc/user-guide/section_sdk_neutron.xml:174(para)
 msgid "For <code>get_nova_credentials</code> see <xref linkend=\"sdk_neutron_get_nova_credentials\"/>."
 msgstr ""
 
-#: ./doc/user-guide/section_sdk_neutron.xml:183(para) ./doc/user-guide/section_sdk_neutron.xml:201(para)
+#: ./doc/user-guide/section_sdk_neutron.xml:177(para) ./doc/user-guide/section_sdk_neutron.xml:193(para)
 msgid "For <code>get_credentials</code> see <xref linkend=\"sdk_neutron_get_credentials\"/>."
 msgstr ""
 
-#: ./doc/user-guide/section_sdk_neutron.xml:188(title)
+#: ./doc/user-guide/section_sdk_neutron.xml:182(title)
 msgid "List ports"
 msgstr ""
 
-#: ./doc/user-guide/section_sdk_neutron.xml:189(para)
+#: ./doc/user-guide/section_sdk_neutron.xml:183(para)
 msgid "The following program lists ports:"
 msgstr ""
 
-#: ./doc/user-guide/section_sdk_neutron.xml:209(title)
+#: ./doc/user-guide/section_sdk_neutron.xml:201(title)
 msgid "List server ports"
 msgstr ""
 
-#: ./doc/user-guide/section_sdk_neutron.xml:210(para)
+#: ./doc/user-guide/section_sdk_neutron.xml:202(para)
 msgid "The following program lists the ports for a server:"
 msgstr ""
 
-#: ./doc/user-guide/section_sdk_neutron.xml:248(title)
+#: ./doc/user-guide/section_sdk_neutron.xml:238(title)
 msgid "Create router and add port to subnet"
 msgstr ""
 
-#: ./doc/user-guide/section_sdk_neutron.xml:249(para)
+#: ./doc/user-guide/section_sdk_neutron.xml:239(para)
 msgid "This example queries OpenStack Networking to create a router and add a port to a subnet."
 msgstr ""
 
-#: ./doc/user-guide/section_sdk_neutron.xml:252(title)
+#: ./doc/user-guide/section_sdk_neutron.xml:242(title)
 msgid "To create a router and add a port to a subnet"
 msgstr ""
 
-#: ./doc/user-guide/section_sdk_neutron.xml:263(para)
+#: ./doc/user-guide/section_sdk_neutron.xml:253(para)
 msgid "Get Nova Credentials. See <xref linkend=\"sdk_neutron_get_nova_credentials\"/>."
 msgstr ""
 
-#: ./doc/user-guide/section_sdk_neutron.xml:275(para)
+#: ./doc/user-guide/section_sdk_neutron.xml:265(para)
 msgid "Create a router and add a port to the subnet:"
 msgstr ""
 
-#: ./doc/user-guide/section_sdk_neutron.xml:299(title)
+#: ./doc/user-guide/section_sdk_neutron.xml:289(title)
 msgid "Create router: complete code listing"
 msgstr ""
 
-#: ./doc/user-guide/section_sdk_neutron.xml:334(title)
+#: ./doc/user-guide/section_sdk_neutron.xml:323(title)
 msgid "Delete a network"
 msgstr ""
 
-#: ./doc/user-guide/section_sdk_neutron.xml:335(para)
+#: ./doc/user-guide/section_sdk_neutron.xml:324(para)
 msgid "This example queries OpenStack Networking to delete a network."
 msgstr ""
 
-#: ./doc/user-guide/section_sdk_neutron.xml:338(title)
+#: ./doc/user-guide/section_sdk_neutron.xml:327(title)
 msgid "To delete a network"
 msgstr ""
 
-#: ./doc/user-guide/section_sdk_neutron.xml:345(para) ./doc/user-guide/section_sdk_neutron.xml:422(para) ./doc/user-guide/section_sdk_neutron.xml:474(para) ./doc/user-guide/section_sdk_neutron.xml:525(para)
+#: ./doc/user-guide/section_sdk_neutron.xml:334(para) ./doc/user-guide/section_sdk_neutron.xml:410(para) ./doc/user-guide/section_sdk_neutron.xml:460(para) ./doc/user-guide/section_sdk_neutron.xml:509(para)
 msgid "Get credentials. See <xref linkend=\"sdk_neutron_get_credentials\"/>."
 msgstr ""
 
-#: ./doc/user-guide/section_sdk_neutron.xml:350(para) ./doc/user-guide/section_sdk_neutron.xml:427(para) ./doc/user-guide/section_sdk_neutron.xml:479(para) ./doc/user-guide/section_sdk_neutron.xml:530(para)
+#: ./doc/user-guide/section_sdk_neutron.xml:339(para) ./doc/user-guide/section_sdk_neutron.xml:415(para) ./doc/user-guide/section_sdk_neutron.xml:465(para) ./doc/user-guide/section_sdk_neutron.xml:514(para)
 msgid "Instantiate the <literal>neutron</literal> client object by using the <literal>credentials</literal> dictionary object:"
 msgstr ""
 
-#: ./doc/user-guide/section_sdk_neutron.xml:357(para)
+#: ./doc/user-guide/section_sdk_neutron.xml:346(para)
 msgid "Delete the network:"
 msgstr ""
 
-#: ./doc/user-guide/section_sdk_neutron.xml:379(title)
+#: ./doc/user-guide/section_sdk_neutron.xml:368(title)
 msgid "Delete network: complete code listing"
 msgstr ""
 
-#: ./doc/user-guide/section_sdk_neutron.xml:410(title)
+#: ./doc/user-guide/section_sdk_neutron.xml:398(title)
 msgid "List routers"
 msgstr ""
 
-#: ./doc/user-guide/section_sdk_neutron.xml:411(para)
+#: ./doc/user-guide/section_sdk_neutron.xml:399(para)
 msgid "This example queries OpenStack Networking to list all routers."
 msgstr ""
 
-#: ./doc/user-guide/section_sdk_neutron.xml:414(title)
+#: ./doc/user-guide/section_sdk_neutron.xml:402(title)
 msgid "To list routers"
 msgstr ""
 
-#: ./doc/user-guide/section_sdk_neutron.xml:434(para)
+#: ./doc/user-guide/section_sdk_neutron.xml:422(para)
 msgid "List the routers"
 msgstr ""
 
-#: ./doc/user-guide/section_sdk_neutron.xml:444(title)
+#: ./doc/user-guide/section_sdk_neutron.xml:432(title)
 msgid "List routers: complete code listing"
 msgstr ""
 
-#: ./doc/user-guide/section_sdk_neutron.xml:462(title)
+#: ./doc/user-guide/section_sdk_neutron.xml:448(title)
 msgid "List security groups"
 msgstr ""
 
-#: ./doc/user-guide/section_sdk_neutron.xml:463(para)
+#: ./doc/user-guide/section_sdk_neutron.xml:449(para)
 msgid "This example queries OpenStack Networking to list security groups."
 msgstr ""
 
-#: ./doc/user-guide/section_sdk_neutron.xml:466(title)
+#: ./doc/user-guide/section_sdk_neutron.xml:452(title)
 msgid "To list security groups"
 msgstr ""
 
-#: ./doc/user-guide/section_sdk_neutron.xml:486(para)
+#: ./doc/user-guide/section_sdk_neutron.xml:472(para)
 msgid "List Security groups"
 msgstr ""
 
-#: ./doc/user-guide/section_sdk_neutron.xml:492(title)
+#: ./doc/user-guide/section_sdk_neutron.xml:478(title)
 msgid "List security groups: complete code listing"
 msgstr ""
 
-#: ./doc/user-guide/section_sdk_neutron.xml:506(para)
+#: ./doc/user-guide/section_sdk_neutron.xml:490(para)
 msgid "OpenStack Networking security groups are case-sensitive while the <systemitem class=\"service\">nova-network</systemitem> security groups are case-insensitive."
 msgstr ""
 
-#: ./doc/user-guide/section_sdk_neutron.xml:513(title)
+#: ./doc/user-guide/section_sdk_neutron.xml:497(title)
 msgid "List subnets"
 msgstr ""
 
-#: ./doc/user-guide/section_sdk_neutron.xml:514(para)
+#: ./doc/user-guide/section_sdk_neutron.xml:498(para)
 msgid "This example queries OpenStack Networking to list subnets."
 msgstr ""
 
-#: ./doc/user-guide/section_sdk_neutron.xml:517(title)
+#: ./doc/user-guide/section_sdk_neutron.xml:501(title)
 msgid "To list subnets"
 msgstr ""
 
-#: ./doc/user-guide/section_sdk_neutron.xml:537(para)
+#: ./doc/user-guide/section_sdk_neutron.xml:521(para)
 msgid "List subnets:"
 msgstr ""
 
-#: ./doc/user-guide/section_sdk_neutron.xml:543(title)
+#: ./doc/user-guide/section_sdk_neutron.xml:527(title)
 msgid "List subnets: complete code listing"
 msgstr ""