From 597395cc3e80becd3db03682802286bfb9698b21 Mon Sep 17 00:00:00 2001
From: Dmitry Teselkin <dteselkin@mirantis.com>
Date: Wed, 25 Sep 2013 19:14:14 +0400
Subject: [PATCH] Documentation corrected.

Change-Id: Ib1f3a653f5f8efe3079a83bd6b15f5dd6037dde9
Fixes: MRN-1048
---
 .../src/docbkx/content/appendix.xml           | 22 ++++++++----------
 .../src/docbkx/content/installation-guide.xml | 23 +++++++++++++++----
 2 files changed, 29 insertions(+), 16 deletions(-)

diff --git a/src/administrators-guide/src/docbkx/content/appendix.xml b/src/administrators-guide/src/docbkx/content/appendix.xml
index 1d65ea9..1226130 100644
--- a/src/administrators-guide/src/docbkx/content/appendix.xml
+++ b/src/administrators-guide/src/docbkx/content/appendix.xml
@@ -106,31 +106,29 @@ deb http://archive.gplhost.com/debian grizzly-backports main
         automatically with setup scripts.
         <note>
             <para>
-                Some words about pip (python-pip) version. In order to have
-                proper versions of python dependency packages installed,
+                In order to have proper versions of python dependency packages installed,
                 pip version MUST be 1.4 or higher!
             </para>
         </note>
     </para>
-    <para>How-to determine python-pip version:</para>
+    <para>View version of pip on your system:</para>
     <programlisting>
 ># pip --version
     </programlisting>
-    <para>To upgrade pip to latest version use
+    <para>Upgrade pip to latest version if it is older than 1.4:
         <programlisting>
 ># pip install --upgrade pip
         </programlisting>
         <note>
             <para>
-                You should pay attention to python-pip after upgrade to
-                version 1.4, because its filesystem location can change
-                from /usr/bin/pip to /usr/local/bin/pip!
+                During upgrade the location of pip  executable could be changed.
+                If this is happened, you have to create a simlink pointing to the
+                new location:
+                    <programlisting>
+># rm /usr/bin/pip
+># ln -s /usr/local/bin/pip /usr/bin/pip
+                    </programlisting>
             </para>
         </note>
     </para>
-    <para>To handle this situation:</para>
-    <programlisting>
-># rm /usr/bin/pip
-># ln -s /usr/local/bin/pip /usr/bin/pip
-    </programlisting>
 </chapter>
\ No newline at end of file
diff --git a/src/administrators-guide/src/docbkx/content/installation-guide.xml b/src/administrators-guide/src/docbkx/content/installation-guide.xml
index 1efe2a7..834e1ec 100644
--- a/src/administrators-guide/src/docbkx/content/installation-guide.xml
+++ b/src/administrators-guide/src/docbkx/content/installation-guide.xml
@@ -429,10 +429,25 @@ rabbitmqctl set_permissions -p muranovhost muranouser ".*" ".*" ".*"
 
                             </listitem>
                             <listitem>
-                                <para>Another murano-api configuration file located at
-                                    <filename>/etc/murano-api/murano-api-paste.ini
-                                    </filename>
-                                    not requires any changes.
+                                <para>Update configuration in <filename>/etc/murano-api/murano-api-paste.ini
+                                    </filename>:
+                                    <programlisting>
+...
+[filter.authtoken]
+...
+# auth_host should point to the host where Keyston servive is installed
+auth_host = 
+...
+# For auth_protocol use 'http' in general and 'https' if Keystone supports SSL.
+auth_protocol = http
+# A name for OpenStack admin tenant name ('admin' by default)
+admin_tenant_name = admin
+# A name for OpenStack admin user ('admin' by default)
+admin_user = admin
+# A pasword for admin user
+admin_password = 
+...
+                                    </programlisting>
                                 </para>
                             </listitem>
                         </itemizedlist>