diff --git a/doc/source/admin_guide.rst b/doc/source/admin_guide.rst index 67ddd958e4..497d22d180 100644 --- a/doc/source/admin_guide.rst +++ b/doc/source/admin_guide.rst @@ -1058,9 +1058,9 @@ Metric Name Description deletion. `container-sync.deletes.timing` Timing data for each container database row synchronization via deletion. -`container-sync.puts` Count of container database rows sync'ed by PUTing. +`container-sync.puts` Count of container database rows sync'ed by Putting. `container-sync.puts.timing` Timing data for each container database row - synchronization via PUTing. + synchronization via Putting. =============================== ==================================================== Metrics for `container-updater`: diff --git a/doc/source/deployment_guide.rst b/doc/source/deployment_guide.rst index 9f3659f267..554302f30f 100644 --- a/doc/source/deployment_guide.rst +++ b/doc/source/deployment_guide.rst @@ -668,7 +668,7 @@ eventlet_tpool_num_threads auto The number of threads in e occur in separate IO threads, managed by eventlet. The default value is auto, whose actual value - is dependant on the servers_per_port value. + is dependent on the servers_per_port value. If servers_per_port is zero then it uses eventlet's default (currently 20 threads). If the servers_per_port is nonzero then it'll diff --git a/etc/object-server.conf-sample b/etc/object-server.conf-sample index e9c434b2bd..bbe6a66148 100644 --- a/etc/object-server.conf-sample +++ b/etc/object-server.conf-sample @@ -129,7 +129,7 @@ use = egg:swift#object # in the object server's main thread, but certain "heavy" IO # operations will occur in separate IO threads, managed by eventlet. # -# The default value is auto, whose actual value is dependant on the +# The default value is auto, whose actual value is dependent on the # servers_per_port value: # # - When servers_per_port is zero, the default value of diff --git a/test/unit/container/test_server.py b/test/unit/container/test_server.py index 0ffe7a1f7c..760b1c6557 100644 --- a/test/unit/container/test_server.py +++ b/test/unit/container/test_server.py @@ -167,7 +167,7 @@ class TestContainerController(unittest.TestCase): self.assertTrue(response.status.startswith('204')) self.assertNotIn('x-container-read', response.headers) self.assertNotIn('x-container-write', response.headers) - # Ensure PUTing acls works + # Ensure PUT acls works req = Request.blank( '/sda1/p/a/c2', environ={'REQUEST_METHOD': 'PUT'}, headers={'X-Timestamp': '4', 'X-Container-Read': '.r:*',