From 5f789c0afca16b865a350a43c409213310c08ebd Mon Sep 17 00:00:00 2001
From: Omkar Telee <omkar.telee@gmail.com>
Date: Wed, 17 May 2017 13:51:14 +0000
Subject: [PATCH] updated ways to install pip

The preferred way to install pip is via get-pip.py.
Hence removed references about 'easy_install' and
added instructions to download and install get-pip.py.
Added install pip link for easy access as per suggestion
on the bug.

Parted the section in options for easy understanding

Change-Id: I3eddffe86394c240b26397a9aedce827887d25f6
Closes-Bug: #1688370
---
 ...install-openstack-command-line-clients.rst | 24 +++++++++----------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/doc/common/cli-install-openstack-command-line-clients.rst b/doc/common/cli-install-openstack-command-line-clients.rst
index cb6eff7543..dc1035ef5a 100644
--- a/doc/common/cli-install-openstack-command-line-clients.rst
+++ b/doc/common/cli-install-openstack-command-line-clients.rst
@@ -54,26 +54,21 @@ command-line clients, and provides installation instructions as needed.
        the related Python development package for your operating system
        and distribution.
 
-       Install pip through the package manager for your system:
+       **Option 1:** Install pip using get-pip.py
 
-       **MacOS**
+       To install pip, securely download `get-pip.py
+       <https://bootstrap.pypa.io/get-pip.py>`__.
+       Then run the following:
 
        .. code-block:: console
 
-          # easy_install pip
+          # python get-pip.py
 
-       **Microsoft Windows**
+       For more details visit `install pip
+       <https://pip.pypa.io/en/stable/installing/>`__.
 
-       Ensure that the ``C:\Python27\Scripts`` directory is defined in the
-       ``PATH`` environment variable, and use the ``easy_install`` command
-       from the setuptools package:
+       **Option 2:** Install pip through the package manager for your system
 
-       .. code-block:: console
-
-          C:\>easy_install pip
-
-       Another option is to use the `unofficial binary installer provided by
-       Christoph Gohlke <http://www.lfd.uci.edu/~gohlke/pythonlibs/#pip>`_.
 
        **Ubuntu or Debian**
 
@@ -141,6 +136,9 @@ command-line clients, and provides installation instructions as needed.
        There are also packaged versions of the clients available that enable
        zypper to install the clients as described in Installing_from_packages_.
 
+       Another option for Microsoft Windows is to  use the `unofficial binary installer provided
+       by Christoph Gohlke <http://www.lfd.uci.edu/~gohlke/pythonlibs/#pip>`_.
+
 Install the OpenStack client
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~