Merge pull request #1066 from mikewurtz/master

Fix doc formatting and some comments

Author: allmightyspiff

SoftLayer/CLI/image/export.py

@@ -24,7 +24,7 @@ def cli(env, identifier, uri, ibm_api_key):
 
     The URI for an object storage object (.vhd/.iso file) of the format:
     swift://<objectStorageAccount>@<cluster>/<container>/<objectPath>
-    or cos://<clusterName>/<bucketName>/<objectPath> if using IBM Cloud
+    or cos://<regionName>/<bucketName>/<objectPath> if using IBM Cloud
     Object Storage
     """
 

SoftLayer/CLI/image/import.py

@@ -52,7 +52,7 @@ def cli(env, name, note, os_code, uri, ibm_api_key, root_key_id, wrapped_dek,
 
     The URI for an object storage object (.vhd/.iso file) of the format:
     swift://<objectStorageAccount>@<cluster>/<container>/<objectPath>
-    or cos://<clusterName>/<bucketName>/<objectPath> if using IBM Cloud
+    or cos://<regionName>/<bucketName>/<objectPath> if using IBM Cloud
     Object Storage
     """
 

SoftLayer/managers/image.py

@@ -131,15 +131,15 @@ def import_image_from_uri(self, name, uri, os_code=None, note=None,
             (.vhd/.iso file) of the format:
             swift://<objectStorageAccount>@<cluster>/<container>/<objectPath>
             or (.vhd/.iso/.raw file) of the format:
-            cos://<clusterName>/<bucketName>/<objectPath> if using IBM Cloud
+            cos://<regionName>/<bucketName>/<objectPath> if using IBM Cloud
             Object Storage
         :param string os_code: The reference code of the operating system
         :param string note: Note to add to the image
         :param string ibm_api_key: Ibm Api Key needed to communicate with ICOS
-        and Key Protect
+            and Key Protect
         :param string root_key_id: ID of the root key in Key Protect
         :param string wrapped_dek: Wrapped Data Encryption Key provided by
-        IBM KeyProtect
+            IBM KeyProtect
         :param string kp_id: ID of the IBM Key Protect Instance
         :param boolean cloud_init: Specifies if image is cloud-init
         :param boolean byol: Specifies if image is bring your own license
@@ -173,10 +173,10 @@ def export_image_to_uri(self, image_id, uri, ibm_api_key=None):
         :param int image_id: The ID of the image
         :param string uri: The URI for object storage of the format
             swift://<objectStorageAccount>@<cluster>/<container>/<objectPath>
-            or cos://<clusterName>/<bucketName>/<objectPath> if using IBM Cloud
+            or cos://<regionName>/<bucketName>/<objectPath> if using IBM Cloud
             Object Storage
         :param string ibm_api_key: Ibm Api Key needed to communicate with IBM
-        Cloud Object Storage
+            Cloud Object Storage
         """
         if 'cos://' in uri:
             return self.vgbdtg.copyToIcos({