From b7de18eb4a535aaabec0a15d827706ee459b4be7 Mon Sep 17 00:00:00 2001
From: Valeriy Ponomaryov <vponomaryov@mirantis.com>
Date: Thu, 30 Oct 2014 11:07:50 +0200
Subject: [PATCH] Fix couple of nit picks

Fixed two nit picks:

1) in service_instance module was improper statement about amount of
external methods.

2) After commit merge
https://github.com/openstack/manila/commit/883e02f2

part of etc/manila/README.manila.conf info became outdated.

Change-Id: I68b9efc9bc1f701cb4ea8dbecf69ec58f7cb5df3
---
 etc/manila/README.manila.conf            | 4 ----
 manila/share/drivers/service_instance.py | 2 +-
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/etc/manila/README.manila.conf b/etc/manila/README.manila.conf
index 7bb52014a2..44be6af398 100644
--- a/etc/manila/README.manila.conf
+++ b/etc/manila/README.manila.conf
@@ -2,7 +2,3 @@ To generate the sample manila.conf file, run the following
 command from the top level of the manila directory:
 
 tox -egenconfig
-
-or run gen script directly:
-
-./tools/config/generate_sample.sh -o etc/manila
diff --git a/manila/share/drivers/service_instance.py b/manila/share/drivers/service_instance.py
index da82e1ee05..380913b624 100644
--- a/manila/share/drivers/service_instance.py
+++ b/manila/share/drivers/service_instance.py
@@ -102,7 +102,7 @@ lock = threading.Lock()
 class ServiceInstanceManager(object):
     """Manages nova instances for various share drivers.
 
-    This class provides two external methods:
+    This class provides following external methods:
 
     1. set_up_service_instance: creates instance and sets up share
        infrastructure.