diff --git a/doc/manpages/swift-account-info.1 b/doc/manpages/swift-account-info.1
index 62a924d624..6ed781a5b7 100644
--- a/doc/manpages/swift-account-info.1
+++ b/doc/manpages/swift-account-info.1
@@ -14,7 +14,7 @@
 .\" See the License for the specific language governing permissions and
 .\" limitations under the License.
 .\"
-.TH swift-account-info 1 "3/22/2014" "Linux" "OpenStack Swift"
+.TH swift-account-info 1 "10/25/2016" "Linux" "OpenStack Swift"
 
 .SH NAME
 .LP
@@ -24,7 +24,7 @@
 .SH SYNOPSIS
 .LP
 .B swift-account-info
-[ACCOUNT_DB_FILE] [SWIFT_DIR]
+[ACCOUNT_DB_FILE] [options]
 
 .SH DESCRIPTION
 .PP
@@ -48,6 +48,15 @@ It will then return several information about that account such as;
 .IP  "- Ring Location"
 .PD
 
+.SH OPTIONS
+.TP
+\fB\-h, --help \fR
+Shows the help message and exit
+.TP
+\fB\-d SWIFT_DIR, --swift-dir=SWIFT_DIR\fR
+Pass location of swift configuration file if different from the default
+location /etc/swift
+
 .SH DOCUMENTATION
 .LP
 More documentation about OpenStack Swift can be found at
diff --git a/doc/manpages/swift-container-info.1 b/doc/manpages/swift-container-info.1
index 0f1ff49612..ee79519597 100644
--- a/doc/manpages/swift-container-info.1
+++ b/doc/manpages/swift-container-info.1
@@ -15,7 +15,7 @@
 .\" See the License for the specific language governing permissions and
 .\" limitations under the License.
 .\"
-.TH swift-container-info 1 "3/20/2013" "Linux" "OpenStack Swift"
+.TH swift-container-info 1 "10/25/2016" "Linux" "OpenStack Swift"
 
 .SH NAME
 .LP
@@ -25,7 +25,7 @@
 .SH SYNOPSIS
 .LP
 .B swift-container-info
-[CONTAINER_DB_FILE] [SWIFT_DIR]
+[CONTAINER_DB_FILE] [options]
 
 .SH DESCRIPTION
 .PP
@@ -55,6 +55,15 @@ It will then return several information about that container such as;
 .IP  "- Location on the ring "
 .PD
 
+.SH OPTIONS
+.TP
+\fB\-h, --help \fR
+Shows the help message and exit
+.TP
+\fB\-d SWIFT_DIR, --swift-dir=SWIFT_DIR\fR
+Pass location of swift configuration  file if different from the default
+location /etc/swift
+
 .SH DOCUMENTATION
 .LP
 More documentation about OpenStack Swift can be found at
diff --git a/doc/manpages/swift-get-nodes.1 b/doc/manpages/swift-get-nodes.1
index 4231788de5..535180d322 100644
--- a/doc/manpages/swift-get-nodes.1
+++ b/doc/manpages/swift-get-nodes.1
@@ -15,7 +15,7 @@
 .\" See the License for the specific language governing permissions and
 .\" limitations under the License.
 .\"
-.TH swift-get-nodes 1 "8/26/2011" "Linux" "OpenStack Swift"
+.TH swift-get-nodes 1 "10/25/2016" "Linux" "OpenStack Swift"
 
 .SH NAME
 .LP
@@ -25,7 +25,17 @@
 .SH SYNOPSIS
 .LP
 .B swift-get-nodes
-\ <ring.gz> <account> [<container> [<object>]]
+\ [options] <ring.gz> <account> [<container> [<object>]]
+
+Or
+
+.B swift-get-nodes
+[options] <ring.gz> -p <partition>
+
+Or
+
+.B swift-get-nodes
+\ [options] -P policy_name <account> <container> <object>
 
 .SH DESCRIPTION
 .PP
@@ -35,6 +45,24 @@ swift cluster nodes. For example, if you have the account hash and a container
 name that belongs to that account, you can use swift-get-nodes to lookup
 where the container resides by using the container ring.
 
+.SH OPTIONS
+.TP
+\fB\-h --help \fR
+Shows the help message and exit
+.TP
+\fB\-a, --all\fR
+Show all handoff nodes
+.TP
+\fB\-p PARTITION, --partition=PARTITION\fR
+Show nodes for a given partition
+.TP
+\fB\-P POLICY_NAME, --policy-name=POLICY_NAME \fR
+Specify storage policy name
+.TP
+\fB\-d SWIFT_DIR, --swift-dir=SWIFT_DIR\fR
+Pass location of swift configuration file if different from the default
+location /etc/swift
+
 .RS 0
 .IP "\fIExample:\fR"
 .RE
diff --git a/doc/manpages/swift-object-info.1 b/doc/manpages/swift-object-info.1
index 67860d59e4..f6f9a9533c 100644
--- a/doc/manpages/swift-object-info.1
+++ b/doc/manpages/swift-object-info.1
@@ -15,7 +15,7 @@
 .\" See the License for the specific language governing permissions and
 .\" limitations under the License.
 .\"
-.TH swift-object-info 1 "8/26/2011" "Linux" "OpenStack Swift"
+.TH swift-object-info 1 "10/25/2016" "Linux" "OpenStack Swift"
 
 .SH NAME
 .LP
@@ -25,7 +25,7 @@
 .SH SYNOPSIS
 .LP
 .B swift-object-info
-[OBJECT_FILE] [SWIFT_DIR]
+[OBJECT_FILE] [options]
 
 .SH DESCRIPTION
 .PP
@@ -46,6 +46,21 @@ It will then return several information about that object such as;
 .IP  "- Location on the ring "
 .PD
 
+.SH OPTIONS
+.TP
+\fB\-h --help \fR
+Shows the help message and exit
+.TP
+\fB\-n, --no-check-etag\fR
+Don't verify file contents against stored etag
+.TP
+\fB\-d SWIFT_DIR, --swift-dir=SWIFT_DIR\fR
+Pass location of swift configuration file if different from the default
+location /etc/swift
+.TP
+\fB\-P POLICY_NAME, --policy-name=POLICY_NAME \fR
+Specify storage policy name
+
 .SH DOCUMENTATION
 .LP
 More documentation about OpenStack Swift can be found at