From f8b3d3306742992462ce5ed30e2cd6223e883314 Mon Sep 17 00:00:00 2001
From: Serg Melikyan <smelikyan@mirantis.com>
Date: Mon, 18 Nov 2013 08:22:51 +0400
Subject: [PATCH] Corrected info about tagging images

We improved work with image tags in this release, and
more usefull tags as examples are provided.

Change-Id: I9c8ea7a7749c70cae9263f9019dd5094e5c5a2fb
---
 .../src/docbkx/content/image-bulder.xml       | 29 ++++---------------
 .../docbkx/content/setup_lab_environment.xml  |  2 +-
 2 files changed, 6 insertions(+), 25 deletions(-)

diff --git a/src/administrators-guide/src/docbkx/content/image-bulder.xml b/src/administrators-guide/src/docbkx/content/image-bulder.xml
index 88577d7..c20c46c 100644
--- a/src/administrators-guide/src/docbkx/content/image-bulder.xml
+++ b/src/administrators-guide/src/docbkx/content/image-bulder.xml
@@ -725,32 +725,14 @@
                         <para> Replace <emphasis role="bold">&lt;IMAGE_METADATA></emphasis> with the
                                 following property string
                                 <screen>
-murano_image_info='{"title": "Windows 2012 Core Edition", "type": "ws-2012-core"}'
+murano_image_info='{"title": "Windows 2012 Standart Edition", "type": "windows.2012"}'
 </screen>
                                 where <itemizedlist>
                                     <listitem>
-                                        <para> title - user-friendly description of the image
-                                        </para>
+                                        <para>title - user-friendly description of the image</para>
                                     </listitem>
                                     <listitem>
-                                        <para> type - one of possible image types <itemizedlist>
-                                                <listitem>
-                                                  <para> ws-2012-std - Windows Server 2012 Standart
-                                                  Edition </para>
-                                                </listitem>
-                                                <listitem>
-                                                  <para> ws-2012-core - Windows 2012 Core Edition
-                                                  </para>
-                                                </listitem>
-                                                <listitem>
-                                                  <para> ws-2008r2-std - Windows Server 2008R2
-                                                  Standart Edition </para>
-                                                </listitem>
-                                                <listitem>
-                                                  <para> ws-2008r2 - Windows Server 2012R2 </para>
-                                                </listitem>
-                                            </itemizedlist>
-                                        </para>
+                                        <para>type - is a image type, for example 'windows.2012'</para>
                                     </listitem>
                                 </itemizedlist>
                             </para>
@@ -772,7 +754,7 @@ murano_image_info='{"title": "Windows 2012 Core Edition", "type": "ws-2012-core"
                         <para> Replace <emphasis role="bold">&lt;IMAGE_METADATA></emphasis> with
                                 murano_image_info property, e.g.
                                 <screen>
-murano_image_info='{"title": "Windows 2012 Core Edition", "type": "ws-2012-core"}'
+murano_image_info='{"title": "Windows 2012 Standart Edition", "type": "windows.2012"}'
 </screen>
                             </para>
                     </listitem>
@@ -790,5 +772,4 @@ murano_image_info='{"title": "Windows 2012 Core Edition", "type": "ws-2012-core"
             After these steps desired image can be chosen in Murano dashboard and used for services platform.
         </para>
     </section>
-    </chapter>
-
+</chapter>
diff --git a/src/getting-started/src/docbkx/content/setup_lab_environment.xml b/src/getting-started/src/docbkx/content/setup_lab_environment.xml
index f9fd1f2..b621096 100644
--- a/src/getting-started/src/docbkx/content/setup_lab_environment.xml
+++ b/src/getting-started/src/docbkx/content/setup_lab_environment.xml
@@ -433,7 +433,7 @@
 >$ cd /opt/image-builder/share/images
 >$ glance image-create --name ws-2012-std --disk-format qcow2           \
     --container-format bare --file ws-2012-std.qcow2 --is-public true     \
-    --property murano_image_info='{"type":"ws-2012-std", "title":"Windows Server 2012 Standard"}'
+    --property murano_image_info='{"type":"windows.2012", "title":"Windows Server 2012 Standard"}'
             </programlisting>
             <warning>
                 <para>