Merge "Wrong usage of "a/an""

novaclient/exceptions.py

@@ -241,7 +241,7 @@ class InvalidUsage(RuntimeError):
 def from_response(response, body, url, method=None):
     """
     Return an instance of an ClientException or subclass
-    based on an requests response.
+    based on a requests response.
 
     Usage::
 

novaclient/v2/contrib/instance_action.py

@@ -35,7 +35,7 @@ class InstanceActionManager(base.ManagerWithFind):
 
     def list(self, server):
         """
-        Get a list of actions performed on an server.
+        Get a list of actions performed on a server.
         """
         return self._list('/servers/%s/os-instance-actions' %
                           base.getid(server), 'instanceActions')

novaclient/v2/servers.py

@@ -1222,7 +1222,7 @@ class ServerManager(base.BootingManagerWithFind):
 
     def delete_meta(self, server, keys):
         """
-        Delete metadata from an server
+        Delete metadata from a server
         :param server: The :class:`Server` to add metadata to
         :param keys: A list of metadata keys to delete from the server
         """

novaclient/v2/shell.py

@@ -3501,7 +3501,7 @@ def do_agent_modify(cs, args):
 
 
 def _find_aggregate(cs, aggregate):
-    """Get a aggregate by name or ID."""
+    """Get an aggregate by name or ID."""
     return utils.find_resource(cs.aggregates, aggregate)
 
 
@@ -4718,7 +4718,7 @@ def do_secgroup_delete_default_rule(cs, args):
 @cliutils.arg('name', metavar='<name>', help=_('Server group name.'))
 # NOTE(wingwj): The '--policy' way is still reserved here for preserving
 # the backwards compatibility of CLI, even if a user won't get this usage
-# in '--help' description. It will be deprecated after an suitable deprecation
+# in '--help' description. It will be deprecated after a suitable deprecation
 # period(probably 2 coordinated releases or so).
 #
 # Moreover, we imagine that a given user will use only positional parameters or