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.