diff --git a/bin/swift-init b/bin/swift-init index 0fcbff5708..c8e0aef5c6 100755 --- a/bin/swift-init +++ b/bin/swift-init @@ -77,7 +77,7 @@ def main(): # SIGKILL daemon after kill_wait period parser.add_option('--kill-after-timeout', dest='kill_after_timeout', action='store_true', - help="Kill daemon and all childs after kill-wait " + help="Kill daemon and all children after kill-wait " "period.") options, args = parser.parse_args() diff --git a/bin/swift-reconciler-enqueue b/bin/swift-reconciler-enqueue index da653151c3..d707571d2e 100755 --- a/bin/swift-reconciler-enqueue +++ b/bin/swift-reconciler-enqueue @@ -25,7 +25,7 @@ from swift.container.reconciler import add_to_reconciler_queue """ This tool is primarily for debugging and development but can be used an example of how an operator could enqueue objects manually if a problem is discovered - -might be particularlly useful if you need to hack a fix into the reconciler +might be particularly useful if you need to hack a fix into the reconciler and re-run it. """ diff --git a/doc/manpages/swift-object-expirer.1 b/doc/manpages/swift-object-expirer.1 index 869b2ac2a6..3b5b1b10ba 100644 --- a/doc/manpages/swift-object-expirer.1 +++ b/doc/manpages/swift-object-expirer.1 @@ -14,31 +14,31 @@ .\" implied. .\" See the License for the specific language governing permissions and .\" limitations under the License. -.\" +.\" .TH swift-object-expirer 1 "3/15/2012" "Linux" "OpenStack Swift" -.SH NAME +.SH NAME .LP .B swift-object-expirer \- Openstack-swift object expirer .SH SYNOPSIS .LP -.B swift-object-expirer +.B swift-object-expirer [CONFIG] [-h|--help] [-v|--verbose] [-o|--once] -.SH DESCRIPTION +.SH DESCRIPTION .PP -The swift-object-expirer offers scheduled deletion of objects. The Swift client would -use the X-Delete-At or X-Delete-After headers during an object PUT or POST and the -cluster would automatically quit serving that object at the specified time and would +The swift-object-expirer offers scheduled deletion of objects. The Swift client would +use the X-Delete-At or X-Delete-After headers during an object PUT or POST and the +cluster would automatically quit serving that object at the specified time and would shortly thereafter remove the object from the system. -The X-Delete-At header takes a Unix Epoch timestamp, in integer form; for example: +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 +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 options are as follows: @@ -53,19 +53,19 @@ The options are as follows: .IP "-o" .IP "--once" .RS 4 -.IP "only run one pass of daemon" +.IP "only run one pass of daemon" .RE .PD .RE - - + + .SH DOCUMENTATION .LP -More in depth documentation in regards to +More in depth documentation in regards to .BI swift-object-expirer -can be foud at +can be found at .BI http://swift.openstack.org/overview_expiring_objects.html -and also about Openstack-Swift as a whole can be found at +and also about Openstack-Swift as a whole can be found at .BI http://swift.openstack.org/index.html diff --git a/doc/source/ops_runbook/diagnose.rst b/doc/source/ops_runbook/diagnose.rst index 9ecb0ffa62..9066112093 100644 --- a/doc/source/ops_runbook/diagnose.rst +++ b/doc/source/ops_runbook/diagnose.rst @@ -575,7 +575,7 @@ command-line wrong. Pick a ``source`` and ``target`` node. The source is often a proxy node and the target is often an object node. Using the same source proxy you can test communication to different object nodes in different AZs to -identity possible bottlekecks. +identity possible bottlenecks. Running tests ^^^^^^^^^^^^^