Grammar fixes.

Change-Id: Iff3f5765193e0bc98dfc377ee5a9b6f47ae11859

14 files changed, 25 insertions, 24 deletions

diff --git a/bin/nova-manage b/bin/nova-manage
index 60f9d44a9..f94497087 100755
--- a/bin/nova-manage
+++ b/bin/nova-manage
@@ -633,7 +633,7 @@ class FloatingIpCommands(object):
     @staticmethod
     def address_to_hosts(addresses):
         """
-        Iterate over hosts within a address range.
+        Iterate over hosts within an address range.
 
         If an explicit range specifier is missing, the parameter is
         interpreted as a specific individual address.
diff --git a/doc/source/devref/xensmvolume.rst b/doc/source/devref/xensmvolume.rst
index 8f14c06f8..c64f2be4a 100644
--- a/doc/source/devref/xensmvolume.rst
+++ b/doc/source/devref/xensmvolume.rst
@@ -10,7 +10,7 @@ The Xen Storage Manager (xensm) driver for Nova-Volume is based on XenAPI Storag
 -   LVHD over FC: SR plugin which represents disks as VHDs on Logical Volumes within a Volume Group created on an HBA LUN, e.g. hardware-based iSCSI or FC support
 -   iSCSI: Base ISCSI SR driver, provides a LUN-per-VDI. Does not support creation of VDIs but accesses existing LUNs on a target.
 -   LVHD over iSCSI: SR plugin which represents disks as Logical Volumes within a Volume Group created on an iSCSI LUN
--   EqualLogic: SR driver for mapping of LUNs to VDIs on a EQUALLOGIC array group, providing use of fast snapshot and clone features on the array 
+-   EqualLogic: SR driver for mapping of LUNs to VDIs on an EQUALLOGIC array group, providing use of fast snapshot and clone features on the array 
 
 Glossary
 =========
diff --git a/etc/nova/nova.conf.sample b/etc/nova/nova.conf.sample
index fd259c782..80496646e 100644
--- a/etc/nova/nova.conf.sample
+++ b/etc/nova/nova.conf.sample
@@ -49,7 +49,7 @@
 # debug=false
 ###### (StrOpt) Name of network to use to set access ips for instances
 # default_access_ip_network_name=<None>
-###### (StrOpt) The default format a ephemeral_volume will be formatted with on creation.
+###### (StrOpt) The default format an ephemeral_volume will be formatted with on creation.
 # default_ephemeral_format=<None>
 ###### (StrOpt) default image to use, testing only
 # default_image="ami-11111"
diff --git a/nova/db/api.py b/nova/db/api.py
index bb5cdbe2b..75739df8d 100644
--- a/nova/db/api.py
+++ b/nova/db/api.py
@@ -1093,7 +1093,7 @@ def volume_get_all_by_host(context, host):
 
 
 def volume_get_all_by_instance_uuid(context, instance_uuid):
-    """Get all volumes belonging to a instance."""
+    """Get all volumes belonging to an instance."""
     return IMPL.volume_get_all_by_instance_uuid(context, instance_uuid)
 
 
@@ -1202,7 +1202,7 @@ def block_device_mapping_update_or_create(context, values):
 
 
 def block_device_mapping_get_all_by_instance(context, instance_uuid):
-    """Get all block device mapping belonging to a instance"""
+    """Get all block device mapping belonging to an instance"""
     return IMPL.block_device_mapping_get_all_by_instance(context,
                                                          instance_uuid)
 
@@ -1532,7 +1532,7 @@ def instance_type_get_by_flavor_id(context, id):
 
 
 def instance_type_destroy(context, name):
-    """Delete a instance type."""
+    """Delete an instance type."""
     return IMPL.instance_type_destroy(context, name)
 
 
diff --git a/nova/db/sqlalchemy/models.py b/nova/db/sqlalchemy/models.py
index fa10356a6..317a8b1c6 100644
--- a/nova/db/sqlalchemy/models.py
+++ b/nova/db/sqlalchemy/models.py
@@ -247,7 +247,7 @@ class Instance(BASE, NovaBase):
     display_name = Column(String(255))
     display_description = Column(String(255))
 
-    # To remember on which host a instance booted.
+    # To remember on which host an instance booted.
     # An instance may have moved to another host by live migraiton.
     launched_on = Column(Text)
     locked = Column(Boolean)
@@ -716,7 +716,7 @@ class FixedIp(BASE, NovaBase):
     virtual_interface_id = Column(Integer, nullable=True)
     instance_id = Column(Integer, nullable=True)
     # associated means that a fixed_ip has its instance_id column set
-    # allocated means that a fixed_ip has a its virtual_interface_id column set
+    # allocated means that a fixed_ip has its virtual_interface_id column set
     allocated = Column(Boolean, default=False)
     # leased means dhcp bridge has leased the ip
     leased = Column(Boolean, default=False)
diff --git a/nova/flags.py b/nova/flags.py
index 337dc979c..cd1a26594 100644
--- a/nova/flags.py
+++ b/nova/flags.py
@@ -394,7 +394,7 @@ global_opts = [
                      'host rebooted'),
     cfg.StrOpt('default_ephemeral_format',
                default=None,
-               help='The default format a ephemeral_volume will be '
+               help='The default format an ephemeral_volume will be '
                     'formatted with on creation.'),
     cfg.StrOpt('root_helper',
                default='sudo',
diff --git a/nova/network/quantum/melange_ipam_lib.py b/nova/network/quantum/melange_ipam_lib.py
index fbb1dfad6..6ceabc8a4 100644
--- a/nova/network/quantum/melange_ipam_lib.py
+++ b/nova/network/quantum/melange_ipam_lib.py
@@ -50,7 +50,7 @@ class QuantumMelangeIPAMLib(object):
         """Contact Melange and create a subnet for any non-NULL
            IPv4 or IPv6 subnets.
 
-           Also create a entry in the Nova networks DB, but only
+           Also create an entry in the Nova networks DB, but only
            to store values not represented in Melange or to
            temporarily provide compatibility with Nova code that
            accesses IPAM data directly via the DB (e.g., nova-api)
diff --git a/nova/openstack/common/cfg.py b/nova/openstack/common/cfg.py
index f45136f76..2a2d2bae4 100644
--- a/nova/openstack/common/cfg.py
+++ b/nova/openstack/common/cfg.py
@@ -655,7 +655,7 @@ class IntOpt(Opt):
     """Int opt values are converted to integers using the int() builtin."""
 
     def _get_from_config_parser(self, cparser, section):
-        """Retrieve the opt value as a integer from ConfigParser."""
+        """Retrieve the opt value as an integer from ConfigParser."""
         return [int(v) for v in cparser.get(section, self.dest)]
 
     def _get_optparse_kwargs(self, group, **kwargs):
@@ -1289,7 +1289,7 @@ class ConfigOpts(collections.Mapping):
             return value
 
     def _get_group(self, group_or_name, autocreate=False):
-        """Looks up a OptGroup object.
+        """Looks up an OptGroup object.
 
         Helper function to return an OptGroup given a parameter which can
         either be the group's name or an OptGroup object.
diff --git a/nova/rpc/amqp.py b/nova/rpc/amqp.py
index 4850eb47e..93f18fb1b 100644
--- a/nova/rpc/amqp.py
+++ b/nova/rpc/amqp.py
@@ -75,13 +75,14 @@ def get_connection_pool(conf, connection_cls):
 
 class ConnectionContext(rpc_common.Connection):
     """The class that is actually returned to the caller of
-    create_connection().  This is a essentially a wrapper around
-    Connection that supports 'with' and can return a new Connection or
-    one from a pool.  It will also catch when an instance of this class
-    is to be deleted so that we can return Connections to the pool on
-    exceptions and so forth without making the caller be responsible for
-    catching all exceptions and making sure to return a connection to
-    the pool.
+    create_connection().  This is essentially a wrapper around
+    Connection that supports 'with'.  It can also return a new
+    Connection, or one from a pool.  The function will also catch
+    when an instance of this class is to be deleted.  With that
+    we can return Connections to the pool on exceptions and so
+    forth without making the caller be responsible for catching
+    them.  If possible the function makes sure to return a
+    connection to the pool.
     """
 
     def __init__(self, conf, connection_pool, pooled=True, server_params=None):
diff --git a/nova/utils.py b/nova/utils.py
index 46118a718..7bdae8deb 100644
--- a/nova/utils.py
+++ b/nova/utils.py
@@ -1137,7 +1137,7 @@ def generate_glance_url():
 
 
 def generate_image_url(image_ref):
-    """Generate a image URL from an image_ref."""
+    """Generate an image URL from an image_ref."""
     return "%s/images/%s" % (generate_glance_url(), image_ref)
 
 
diff --git a/nova/virt/connection.py b/nova/virt/connection.py
index 06399acbe..84f84744b 100644
--- a/nova/virt/connection.py
+++ b/nova/virt/connection.py
@@ -57,7 +57,7 @@ def get_connection(read_only=False):
 
     **Related flags**
 
-    :connection_type:  A string literal that falls through a if/elif structure
+    :connection_type:  A string literal that falls through an if/elif structure
                        to determine what virtualization mechanism to use.
                        Values may be
 
diff --git a/nova/virt/libvirt/firewall.py b/nova/virt/libvirt/firewall.py
index 9cc801cc8..4b7d8889d 100644
--- a/nova/virt/libvirt/firewall.py
+++ b/nova/virt/libvirt/firewall.py
@@ -160,7 +160,7 @@ class NWFilterFirewall(base_firewall.FirewallDriver):
             # in the thread pool no matter what.
             tpool.execute(self._conn.nwfilterDefineXML, xml)
         else:
-            # NOTE(maoy): self._conn is a eventlet.tpool.Proxy object
+            # NOTE(maoy): self._conn is an eventlet.tpool.Proxy object
             self._conn.nwfilterDefineXML(xml)
 
     def unfilter_instance(self, instance, network_info):
diff --git a/nova/volume/san.py b/nova/volume/san.py
index de30a36af..cfe9173c0 100644
--- a/nova/volume/san.py
+++ b/nova/volume/san.py
@@ -361,7 +361,7 @@ class SolarisISCSIDriver(SanISCSIDriver):
         iscsi_name = self._build_iscsi_target_name(volume)
         target_group_name = 'tg-%s' % volume['name']
 
-        # Create a iSCSI target, mapped to just this volume
+        # Create an iSCSI target, mapped to just this volume
         if force_create or not self._target_group_exists(target_group_name):
             self._execute('/usr/sbin/stmfadm', 'create-tg', target_group_name)
 
diff --git a/tools/hacking.py b/tools/hacking.py
index 485030f99..8e8391919 100755
--- a/tools/hacking.py
+++ b/tools/hacking.py
@@ -77,7 +77,7 @@ def nova_todo_format(physical_line):
     """
     pos = physical_line.find('TODO')
     pos1 = physical_line.find('TODO(')
-    pos2 = physical_line.find('#')  # make sure its a comment
+    pos2 = physical_line.find('#')  # make sure it's a comment
     if (pos != pos1 and pos2 >= 0 and pos2 < pos):
         return pos, "NOVA N101: Use TODO(NAME)"