Merge "Fix misspellings in swift"

bin/swift-drive-audit

@@ -56,7 +56,7 @@ def get_devices(device_dir, logger):
 
 def get_errors(error_re, log_file_pattern, minutes):
     # Assuming log rotation is being used, we need to examine
-    # recently rotated files in case the rotation occured
+    # recently rotated files in case the rotation occurred
     # just before the script is being run - the data we are
     # looking for may have rotated.
     #

doc/manpages/object-server.conf.5

@@ -198,7 +198,7 @@ Max duration of a partition rsync. The default is 900 seconds.
 .IP \fBrsync_io_timeout\fR
 Passed to rsync for I/O OP timeout. The default is 30 seconds.
 .IP \fBrsync_bwlimit\fR
-Passed to rsync for bandwith limit in kB/s.  The default is 0 (unlimited)
+Passed to rsync for bandwidth limit in kB/s.  The default is 0 (unlimited).
 .IP \fBhttp_timeout\fR
 Max duration of an HTTP request. The default is 60 seconds.
 .IP \fBlockup_timeout\fR

doc/source/admin_guide.rst

@@ -892,7 +892,7 @@ Metric Name                              Description
 `object-server.PUT.timeouts`             Count of object PUTs which exceeded max_upload_time.
 `object-server.PUT.timing`               Timing data for each PUT request not resulting in an
                                          error.
-`object-server.PUT.<device>.timing`      Timing data per kB transfered (ms/kB) for each 
+`object-server.PUT.<device>.timing`      Timing data per kB transferred (ms/kB) for each
                                          non-zero-byte PUT request on each device. 
                                          Monitoring problematic devices, higher is bad. 
 `object-server.GET.errors.timing`        Timing data for GET request errors: bad request,

doc/source/crossdomain.rst

@@ -47,7 +47,7 @@ For continuation lines, put some whitespace before the continuation
 text. Ensure you put a completely blank line to terminate the
 cross_domain_policy value.
 
-The cross_domain_policy name/value is optional. If omited, the policy
+The cross_domain_policy name/value is optional. If omitted, the policy
 defaults as if you had specified::
 
     cross_domain_policy = <allow-access-from domain="*" secure="false" />

doc/source/deployment_guide.rst

@@ -478,7 +478,7 @@ handoffs_first      false              If set to True, partitions that are
                                        extreme situations.
 handoff_delete      auto               By default handoff partitions will be
                                        removed when it has successfully
-                                       replicated to all the cannonical nodes.
+                                       replicated to all the canonical nodes.
                                        If set to an integer n, it will remove
                                        the partition if it is successfully
                                        replicated to n nodes.  The default

doc/source/development_saio.rst

@@ -28,7 +28,7 @@ administrator (``root``) privileges; however, we assume that administrator logs
 in as an unprivileged user and can use ``sudo`` to run privileged commands.
 
 Swift processes also run under a separate user and group, set by configuration
-option, and refered as ``<your-user-name>:<your-group-name>``.  The default user
+option, and referenced as ``<your-user-name>:<your-group-name>``.  The default user
 is ``swift``, which may not exist on your system.  These instructions are
 intended to allow a developer to use his/her username for
 ``<your-user-name>:<your-group-name>``.

doc/source/overview_container_sync.rst

@@ -432,7 +432,7 @@ this seemingly-redundant work, any container-sync failure results in
 unsynchronized objects. Note that the container sync will persistently
 retry to sync any faulty object until success, while logging each failure.
 
-Once it's done with the fallback rows, and assuming no faults occured,
+Once it's done with the fallback rows, and assuming no faults occurred,
 SP2 is advanced to SP1. ::
 
                  SP2

doc/source/ratelimit.rst

@@ -90,7 +90,7 @@ bottleneck from causing a problem. There could also be a problem where a single
 account is just using too much of the cluster's resources.  In this case, the
 container ratelimits may not help because the customer could be doing thousands
 of reqs/sec to distributed containers each getting a small fraction of the
-total so those limits would never trigger. If a system adminstrator notices
+total so those limits would never trigger. If a system administrator notices
 this, he/she can set the X-Account-Sysmeta-Global-Write-Ratelimit on an account
 and that will limit the total number of write requests (PUT, POST, DELETE,
 COPY) that account can do for the whole account. This limit will be in addition

etc/object-server.conf-sample

@@ -150,15 +150,15 @@ use = egg:swift#recon
 # stats_interval = 300
 #
 # The sync method to use; default is rsync but you can use ssync to try the
-# EXPERIMENTAL all-swift-code-no-rsync-callouts method. Once verified as stable
+# EXPERIMENTAL all-swift-code-no-rsync-callouts method. Once ssync is verified
-# and nearly as efficient (or moreso) than rsync, we plan to deprecate rsync so
+# as having performance comparable to, or better than, rsync, we plan to
-# we can move on with more features for replication.
+# deprecate rsync so we can move on with more features for replication.
 # sync_method = rsync
 #
 # max duration of a partition rsync
 # rsync_timeout = 900
 #
-# bandwith limit for rsync in kB/s. 0 means unlimited
+# bandwidth limit for rsync in kB/s. 0 means unlimited
 # rsync_bwlimit = 0
 #
 # passed to rsync for io op timeout

swift/common/middleware/crossdomain.py

@@ -47,7 +47,7 @@ class CrossDomainMiddleware(object):
     text. Ensure you put a completely blank line to terminate the
     cross_domain_policy value.
 
-    The cross_domain_policy name/value is optional. If omited, the policy
+    The cross_domain_policy name/value is optional. If omitted, the policy
     defaults as if you had specified::
 
         cross_domain_policy = <allow-access-from domain="*" secure="false" />

test/unit/common/test_db.py

@@ -86,7 +86,7 @@ class TestChexor(unittest.TestCase):
 class TestGreenDBConnection(unittest.TestCase):
 
     def test_execute_when_locked(self):
-        # This test is dependant on the code under test calling execute and
+        # This test is dependent on the code under test calling execute and
         # commit as sqlite3.Cursor.execute in a subclass.
         class InterceptCursor(sqlite3.Cursor):
             pass
@@ -102,7 +102,7 @@ class TestGreenDBConnection(unittest.TestCase):
                                   InterceptCursor.execute.call_count))
 
     def text_commit_when_locked(self):
-        # This test is dependant on the code under test calling commit and
+        # This test is dependent on the code under test calling commit and
         # commit as sqlite3.Connection.commit in a subclass.
         class InterceptConnection(sqlite3.Connection):
             pass
@@ -129,7 +129,7 @@ class TestGetDBConnection(unittest.TestCase):
                           'invalid database path / name')
 
     def test_locked_db(self):
-        # This test is dependant on the code under test calling execute and
+        # This test is dependent on the code under test calling execute and
         # commit as sqlite3.Cursor.execute in a subclass.
         class InterceptCursor(sqlite3.Cursor):
             pass