Grammar / spelling corrections

Change-Id: Id5b6665a2a40a9bd0830c1a3500b4ad98eec435b

11 files changed, 21 insertions, 20 deletions

diff --git a/Authors b/Authors
index 88285d971..3b2cfe0a6 100644
--- a/Authors
+++ b/Authors
@@ -138,6 +138,7 @@ Masanori Itoh <itoumsn@nttdata.co.jp>
 Matt Dietz <matt.dietz@rackspace.com>
 Matt Stephenson <mattstep@mattstep.net>
 Matthew Hooker <matt@cloudscaling.com>
+Matthew Joyce <matt.joyce@cloudscaling.com>
 Michael Basnight <mbasnigh@rackspace.com>
 Michael Gundlach <michael.gundlach@rackspace.com>
 Michael Still <mikal@stillhq.com>
diff --git a/bin/nova-manage b/bin/nova-manage
index a4eaf9d6b..60f9d44a9 100755
--- a/bin/nova-manage
+++ b/bin/nova-manage
@@ -463,7 +463,7 @@ class ProjectCommands(object):
     @args('--file', dest="filename", metavar='<filename>',
             help='File name(Default: novarc)')
     def environment(self, project_id, user_id, filename='novarc'):
-        """Exports environment variables to an sourcable file"""
+        """Exports environment variables to a sourceable file"""
         try:
             rc = self.manager.get_environment_rc(user_id, project_id)
         except (exception.UserNotFound, exception.ProjectNotFound) as ex:
diff --git a/nova/auth/nova_openldap.schema b/nova/auth/nova_openldap.schema
index 539a5c42d..c46a7c2ef 100644
--- a/nova/auth/nova_openldap.schema
+++ b/nova/auth/nova_openldap.schema
@@ -35,7 +35,7 @@ attributetype (
 attributetype (
     novaAttrs:4
     NAME 'isNovaAdmin'
-    DESC 'Is user an nova administrator?'
+    DESC 'Is user a nova administrator?'
     EQUALITY booleanMatch
     SYNTAX 1.3.6.1.4.1.1466.115.121.1.7
     SINGLE-VALUE
diff --git a/nova/db/api.py b/nova/db/api.py
index c43a48c19..bb5cdbe2b 100644
--- a/nova/db/api.py
+++ b/nova/db/api.py
@@ -141,7 +141,7 @@ def service_get_all_volume_sorted(context):
 
 
 def service_get_by_args(context, host, binary):
-    """Get the state of an service by node name and binary."""
+    """Get the state of a service by node name and binary."""
     return IMPL.service_get_by_args(context, host, binary)
 
 
@@ -151,7 +151,7 @@ def service_create(context, values):
 
 
 def service_update(context, service_id, values):
-    """Set the given properties on an service and update it.
+    """Set the given properties on a service and update it.
 
     Raises NotFound if service does not exist.
 
@@ -163,7 +163,7 @@ def service_update(context, service_id, values):
 
 
 def compute_node_get(context, compute_id):
-    """Get an computeNode or raise if it does not exist."""
+    """Get a computeNode or raise if it does not exist."""
     return IMPL.compute_node_get(context, compute_id)
 
 
@@ -178,7 +178,7 @@ def compute_node_create(context, values):
 
 
 def compute_node_update(context, compute_id, values, auto_adjust=True):
-    """Set the given properties on an computeNode and update it.
+    """Set the given properties on a computeNode and update it.
 
     Raises NotFound if computeNode does not exist.
     """
@@ -258,7 +258,7 @@ def floating_ip_count_by_project(context, project_id, session=None):
 
 
 def floating_ip_deallocate(context, address):
-    """Deallocate an floating ip by address."""
+    """Deallocate a floating ip by address."""
     return IMPL.floating_ip_deallocate(context, address)
 
 
@@ -268,7 +268,7 @@ def floating_ip_destroy(context, address):
 
 
 def floating_ip_disassociate(context, address):
-    """Disassociate an floating ip from a fixed ip by address.
+    """Disassociate a floating ip from a fixed ip by address.
 
     :returns: the address of the existing fixed ip.
 
@@ -278,7 +278,7 @@ def floating_ip_disassociate(context, address):
 
 def floating_ip_fixed_ip_associate(context, floating_address,
                                    fixed_address, host):
-    """Associate an floating ip to a fixed_ip by address."""
+    """Associate a floating ip to a fixed_ip by address."""
     return IMPL.floating_ip_fixed_ip_associate(context,
                                                floating_address,
                                                fixed_address,
@@ -769,7 +769,7 @@ def network_disassociate(context, network_id):
 
 
 def network_get(context, network_id):
-    """Get an network or raise if it does not exist."""
+    """Get a network or raise if it does not exist."""
     return IMPL.network_get(context, network_id)
 
 
@@ -837,7 +837,7 @@ def network_set_host(context, network_id, host_id):
 
 
 def network_update(context, network_id, values):
-    """Set the given properties on an network and update it.
+    """Set the given properties on a network and update it.
 
     Raises NotFound if network does not exist.
 
@@ -1113,7 +1113,7 @@ def volume_get_iscsi_target_num(context, volume_id):
 
 
 def volume_update(context, volume_id, values):
-    """Set the given properties on an volume and update it.
+    """Set the given properties on a volume and update it.
 
     Raises NotFound if volume does not exist.
 
@@ -1174,7 +1174,7 @@ def snapshot_get_all_for_volume(context, volume_id):
 
 
 def snapshot_update(context, snapshot_id, values):
-    """Set the given properties on an snapshot and update it.
+    """Set the given properties on a snapshot and update it.
 
     Raises NotFound if snapshot does not exist.
 
diff --git a/nova/image/fake.py b/nova/image/fake.py
index 41a68269a..996459081 100644
--- a/nova/image/fake.py
+++ b/nova/image/fake.py
@@ -15,7 +15,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-"""Implementation of an fake image service"""
+"""Implementation of a fake image service"""
 
 import copy
 import datetime
diff --git a/nova/openstack/common/cfg.py b/nova/openstack/common/cfg.py
index 1b1b45d63..f45136f76 100644
--- a/nova/openstack/common/cfg.py
+++ b/nova/openstack/common/cfg.py
@@ -473,7 +473,7 @@ class Opt(object):
       metavar:
         the name shown as the argument to a CLI option in --help output
       help:
-        an string explaining how the options value is used
+        a string explaining how the options value is used
     """
     multi = False
 
diff --git a/nova/tests/api/ec2/test_cloud.py b/nova/tests/api/ec2/test_cloud.py
index 08fad0988..3135364ec 100644
--- a/nova/tests/api/ec2/test_cloud.py
+++ b/nova/tests/api/ec2/test_cloud.py
@@ -1130,7 +1130,7 @@ class CloudTestCase(test.TestCase):
         result3 = describe_images(self.context, ['ami-00000001',
                                                  'ami-00000002'])
         self.assertEqual(2, len(result3['imagesSet']))
-        # provide an non-existing image_id
+        # provide a non-existing image_id
         self.stubs.UnsetAll()
         self.stubs.Set(fake._FakeImageService, 'show', fake_show_none)
         self.stubs.Set(fake._FakeImageService, 'show_by_name', fake_show_none)
diff --git a/nova/tests/scheduler/test_scheduler.py b/nova/tests/scheduler/test_scheduler.py
index b7915ed8e..938f60b46 100644
--- a/nova/tests/scheduler/test_scheduler.py
+++ b/nova/tests/scheduler/test_scheduler.py
@@ -228,7 +228,7 @@ class SchedulerManagerTestCase(test.TestCase):
                          *self.fake_args, **self.fake_kwargs)
 
     def test_run_instance_exception_puts_instance_in_error_state(self):
-        """Test that an NoValidHost exception for run_instance puts
+        """Test that a NoValidHost exception for run_instance puts
         the instance in ERROR state and eats the exception.
         """
 
diff --git a/nova/virt/libvirt/connection.py b/nova/virt/libvirt/connection.py
index 1622550ed..8a24c4e55 100644
--- a/nova/virt/libvirt/connection.py
+++ b/nova/virt/libvirt/connection.py
@@ -2037,7 +2037,7 @@ class LibvirtConnection(driver.ComputeDriver):
     def update_available_resource(self, ctxt, host):
         """Updates compute manager resource info on ComputeNode table.
 
-        This method is called as an periodic tasks and is used only
+        This method is called as a periodic task and is used only
         in live migration currently.
 
         :param ctxt: security context
diff --git a/nova/volume/api.py b/nova/volume/api.py
index ab9c70523..e03e78779 100644
--- a/nova/volume/api.py
+++ b/nova/volume/api.py
@@ -346,7 +346,7 @@ class API(base.Base):
 
     @wrap_check_policy
     def delete_volume_metadata(self, context, volume, key):
-        """Delete the given metadata item from an volume."""
+        """Delete the given metadata item from a volume."""
         self.db.volume_metadata_delete(context, volume['id'], key)
 
     @wrap_check_policy
diff --git a/smoketests/test_sysadmin.py b/smoketests/test_sysadmin.py
index d4dc2eaf3..5e599d15b 100644
--- a/smoketests/test_sysadmin.py
+++ b/smoketests/test_sysadmin.py
@@ -255,7 +255,7 @@ class VolumeTests(base.UserSmokeTestCase):
     def test_003_can_mount_volume(self):
         ip = self.data['instance'].private_ip_address
         conn = self.connect_ssh(ip, TEST_KEY)
-        # NOTE(vish): this will create an dev for images that don't have
+        # NOTE(vish): this will create a dev for images that don't have
         #             udev rules
         stdin, stdout, stderr = conn.exec_command(
                 'grep %s /proc/partitions | '