openstack/swift
Code Issues Proposed changes

Merge "Fix a few English mistakes in man"

Browse Source
This commit is contained in:
Jenkins 2016-01-29 19:54:42 +00:00 committed by Gerrit Code Review
commit a507d686d2
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/manpages/object-server.conf.5
View File

@ -365,7 +365,7 @@ Depending on the method of deployment you may need to create this directory manu
and ensure that swift has read/write.The default is /var/cache/swift.
.IP "\fBhandoffs_first\fR"
The flag to replicate handoffs prior to canonical partitions.
It allows to force syncing and deleting handoffs quickly.
It allows one to force syncing and deleting handoffs quickly.
If set to a True value(e.g. "True" or "1"), partitions
that are not supposed to be on the node will be replicated first.
The default is false.
@ -425,7 +425,7 @@ Depending on the method of deployment you may need to create this directory manu
and ensure that swift has read/write.The default is /var/cache/swift.
.IP "\fBhandoffs_first\fR"
The flag to replicate handoffs prior to canonical partitions.
It allows to force syncing and deleting handoffs quickly.
It allows one to force syncing and deleting handoffs quickly.
If set to a True value(e.g. "True" or "1"), partitions
that are not supposed to be on the node will be replicated first.
The default is false.

2
doc/manpages/proxy-server.conf.5
View File

@ -950,7 +950,7 @@ chunk of data from the object servers while serving GET / HEAD requests.
Timeouts from these requests can be recovered from so setting this to
something lower than node_timeout would provide quicker error recovery
while allowing for a longer timeout for non-recoverable requests (PUTs).
Defaults to node_timeout, should be overriden if node_timeout is set to a
Defaults to node_timeout, should be overridden if node_timeout is set to a
high number to prevent client timeouts from firing before the proxy server
has a chance to retry.
.IP \fBconn_timeout\fR

2
doc/manpages/swift-init.1
View File

@ -111,7 +111,7 @@ allows one to use the keywords such as "all", "main" and "rest" for the <server>
.IP "-r RUN_DIR, --run-dir=RUN_DIR directory where the pids will be stored (default /var/run/swift)
.IP "--strict return non-zero status code if some config is missing. Default mode if server is explicitly named."
.IP "--non-strict return zero status code even if some config is missing. Default mode if server is one of aliases `all`, `main` or `rest`."
.IP "--kill-after-timeout kill daemon and all childs after kill-wait period."
.IP "--kill-after-timeout kill daemon and all children after kill-wait period."
.PD
.RE