From be39d7be306bc8817c82c127bdd6ae73a09b7e81 Mon Sep 17 00:00:00 2001
From: Nikhil Manchanda <SlickNik@gmail.com>
Date: Tue, 3 Dec 2013 15:51:47 -0800
Subject: [PATCH] Fixed misspellings of common words

Fixed misspelling of common words found by the 'misspellings' tool.

Closes-Bug: #1257531
Change-Id: If317929be260c5efb0949921be1143d1ccd4e283
---
 doc/source/dev/design.rst    | 2 +-
 etc/trove/trove.conf.sample  | 2 +-
 trove/common/wsgi.py         | 2 +-
 trove/tests/api/instances.py | 2 +-
 trove/tests/fakes/nova.py    | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/doc/source/dev/design.rst b/doc/source/dev/design.rst
index 5b63dca431..9b45dcb486 100644
--- a/doc/source/dev/design.rst
+++ b/doc/source/dev/design.rst
@@ -94,7 +94,7 @@ bus and performs the requested operation.
 Trove-conductor
 ===============
 
-Conductor is a service that runs on the host, responsible for recieving
+Conductor is a service that runs on the host, responsible for receiving
 messages from guest instances to update information on the host.
 For example, instance statuses and the current status of a backup.
 With conductor, guest instances do not need a direct connection to the
diff --git a/etc/trove/trove.conf.sample b/etc/trove/trove.conf.sample
index 33e942e252..2af0eb79af 100644
--- a/etc/trove/trove.conf.sample
+++ b/etc/trove/trove.conf.sample
@@ -125,7 +125,7 @@ control_exchange = trove
 # ============ SSL configuration (and enablement) =============================
 # In order to enable SSL for the trove api server, uncomment
 # the cert_file and key_file - and of course have those files
-# accessible. The existance of those setting and files will
+# accessible. The existence of those setting and files will
 # enable SSL.
 
 [ssl]
diff --git a/trove/common/wsgi.py b/trove/common/wsgi.py
index 56e5d8a64f..16ab4ba334 100644
--- a/trove/common/wsgi.py
+++ b/trove/common/wsgi.py
@@ -273,7 +273,7 @@ class Request(openstack_wsgi.Request):
 
 
 class Result(object):
-    """A result whose serialization is compatable with JSON and XML.
+    """A result whose serialization is compatible with JSON and XML.
 
     This class is used by TroveResponseSerializer, which calls the
     data method to grab a JSON or XML specific dictionary which it then
diff --git a/trove/tests/api/instances.py b/trove/tests/api/instances.py
index 03668b20b1..2baf240656 100644
--- a/trove/tests/api/instances.py
+++ b/trove/tests/api/instances.py
@@ -1047,7 +1047,7 @@ class DeleteInstance(object):
         except exceptions.NotFound:
             pass
         except Exception as ex:
-            fail("A failure occured when trying to GET instance %s for the %d"
+            fail("A failure occurred when trying to GET instance %s for the %d"
                  " time: %s" % (str(instance_info.id), attempts, str(ex)))
 
     @time_out(30)
diff --git a/trove/tests/fakes/nova.py b/trove/tests/fakes/nova.py
index bdc459bc22..6976d4be17 100644
--- a/trove/tests/fakes/nova.py
+++ b/trove/tests/fakes/nova.py
@@ -291,7 +291,7 @@ class FakeServers(object):
         if block_device_mapping is not None:
             # block_device_mapping is a dictionary, where the key is the
             # device name on the compute instance and the mapping info is a
-            # set of fields in a string, seperated by colons.
+            # set of fields in a string, separated by colons.
             # For each device, find the volume, and record the mapping info
             # to another fake object and attach it to the volume
             # so that the fake API can later retrieve this.