diff --git a/doc/source/overview_auth.rst b/doc/source/overview_auth.rst
index eca7500371..229a9faa20 100644
--- a/doc/source/overview_auth.rst
+++ b/doc/source/overview_auth.rst
@@ -204,7 +204,7 @@ other users on containers, see the documentation on ACL here
 Users with the Keystone role defined in ``reseller_admin_role``
 (``ResellerAdmin`` by default) can operate on any account. The auth system
 sets the request environ reseller_request to True if a request is coming
-from an user with this role. This can be used by other middlewares.
+from a user with this role. This can be used by other middlewares.
 
 --------------
 Extending Auth
diff --git a/doc/source/overview_expiring_objects.rst b/doc/source/overview_expiring_objects.rst
index af10d57337..90cab8f862 100644
--- a/doc/source/overview_expiring_objects.rst
+++ b/doc/source/overview_expiring_objects.rst
@@ -6,7 +6,7 @@ The ``swift-object-expirer`` offers scheduled deletion of objects. The Swift cli
 
 The ``X-Delete-At`` header takes a Unix Epoch timestamp, in integer form; for example: ``1317070737`` represents ``Mon Sep 26 20:58:57 2011 UTC``.
 
-The ``X-Delete-After`` header takes a integer number of seconds. The proxy server that receives the request will convert this header into an ``X-Delete-At`` header using its current time plus the value given.
+The ``X-Delete-After`` header takes an integer number of seconds. The proxy server that receives the request will convert this header into an ``X-Delete-At`` header using its current time plus the value given.
 
 As expiring objects are added to the system, the object servers will record the expirations in a hidden ``.expiring_objects`` account for the ``swift-object-expirer`` to handle later.
 
diff --git a/swift/common/middleware/xprofile.py b/swift/common/middleware/xprofile.py
index 4ab30e2039..bff0bac8fe 100644
--- a/swift/common/middleware/xprofile.py
+++ b/swift/common/middleware/xprofile.py
@@ -16,7 +16,7 @@
 """
 Profiling middleware for Swift Servers.
 
-The current implementation is based on eventlet awared profiler.(For the
+The current implementation is based on eventlet aware profiler.(For the
 future, more profilers could be added in to collect more data for analysis.)
 Profiling all incoming requests and accumulating cpu timing statistics
 information for performance tuning and optimization. An mini web UI is also
diff --git a/swift/common/utils.py b/swift/common/utils.py
index be5cca3f63..d2d6348e0b 100644
--- a/swift/common/utils.py
+++ b/swift/common/utils.py
@@ -255,7 +255,7 @@ def config_auto_int_value(value, default):
     try:
         value = int(value)
     except (TypeError, ValueError):
-        raise ValueError('Config option must be a integer or the '
+        raise ValueError('Config option must be an integer or the '
                          'string "auto", not "%s".' % value)
     return value
 
diff --git a/test/functional/test_account.py b/test/functional/test_account.py
index ff4e440e57..3ee7fa2acb 100755
--- a/test/functional/test_account.py
+++ b/test/functional/test_account.py
@@ -306,7 +306,7 @@ class TestAccount(unittest.TestCase):
             conn.request('POST', parsed.path, '', new_headers)
             return check_response(conn)
 
-        # add a account metadata, and temp-url-key to account
+        # add an account metadata, and temp-url-key to account
         value = str(uuid4())
         headers = {
             'x-account-meta-temp-url-key': 'secret',
diff --git a/test/unit/common/test_manager.py b/test/unit/common/test_manager.py
index 0d575c6cef..37f8dbc6d6 100644
--- a/test/unit/common/test_manager.py
+++ b/test/unit/common/test_manager.py
@@ -414,7 +414,7 @@ class TestServer(unittest.TestCase):
             conf_files = server.conf_files(number=5)
             self.assertFalse(conf_files)
 
-        # test geting specific conf
+        # test getting specific conf
         conf_files = (
             'account-server/1.conf',
             'account-server/2.conf',