diff --git a/glanceclient/common/http.py b/glanceclient/common/http.py index d1dc61de..89e921b5 100644 --- a/glanceclient/common/http.py +++ b/glanceclient/common/http.py @@ -363,9 +363,9 @@ class VerifiedHTTPSConnection(HTTPSConnection): @staticmethod def host_matches_cert(host, x509): """ - Verify that the the x509 certificate we have received + Verify that the x509 certificate we have received from 'host' correctly identifies the server we are - connecting to, ie that the certificate's Common Name + connecting to, i.e. that the certificate's Common Name or a Subject Alternative Name matches 'host'. """ def check_match(name): diff --git a/glanceclient/common/utils.py b/glanceclient/common/utils.py index 04350d56..42c869ab 100644 --- a/glanceclient/common/utils.py +++ b/glanceclient/common/utils.py @@ -277,7 +277,7 @@ def get_file_size(file_obj): except IOError as e: if e.errno == errno.ESPIPE: # Illegal seek. This means the file object - # is a pipe (e.g the user is trying + # is a pipe (e.g. the user is trying # to pipe image data to the client, # echo testdata | bin/glance add blah...), or # that file object is empty, or that a file-like diff --git a/glanceclient/v2/shell.py b/glanceclient/v2/shell.py index c769a8f7..3515bf37 100644 --- a/glanceclient/v2/shell.py +++ b/glanceclient/v2/shell.py @@ -102,7 +102,7 @@ def do_image_update(gc, args): @utils.arg('--checksum', metavar='', help='Displays images that match the checksum.') @utils.arg('--tag', metavar='', action='append', - help="Filter images by an user-defined tag.") + help="Filter images by a user-defined tag.") def do_image_list(gc, args): """List images you can access.""" filter_keys = ['visibility', 'member_status', 'owner', 'checksum', 'tag']