From 68d4fea882db22fbb79cb99b595074f012eb9b32 Mon Sep 17 00:00:00 2001
From: Mark Craig <mark.craig@forgerock.com>
Date: Wed, 21 Mar 2012 17:03:27 +0000
Subject: [PATCH] Fix for OPENDJ-458: Man pages for common tools shouldn't be the same for tools in server and toolkit
---
opends/resource/man/man1/ldapmodify.1 | 25 ++++++++++++++++---------
1 files changed, 16 insertions(+), 9 deletions(-)
diff --git a/opends/resource/man/man1/ldapmodify.1 b/opends/resource/man/man1/ldapmodify.1
index 396054f..3c5297d 100644
--- a/opends/resource/man/man1/ldapmodify.1
+++ b/opends/resource/man/man1/ldapmodify.1
@@ -2,12 +2,12 @@
.\" Title: ldapmodify
.\" Author:
.\" Generator: DocBook XSL-NS Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\" Date: November\ \&21,\ \&2011
+.\" Date: 03/21/2012
.\" Manual: Tools Reference
.\" Source: OpenDJ 2.5.0
.\" Language: English
.\"
-.TH "LDAPMODIFY" "1" "November\ \&21,\ \&2011" "OpenDJ 2\&.5\&.0" "Tools Reference"
+.TH "LDAPMODIFY" "1" "03/21/2012" "OpenDJ 2\&.5\&.0" "Tools Reference"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
@@ -87,6 +87,13 @@
.RE
.SS "LDAP Connection Options"
.PP
+\fB\-\-connectTimeout {timeout}\fR
+.RS 4
+Maximum length of time (in milliseconds) that can be taken to establish a connection\&. Use \*(Aq0\*(Aq to specify no time out\&.
+.sp
+Default value: 30000
+.RE
+.PP
\fB\-D, \-\-bindDN {bindDN}\fR
.RS 4
DN to use to bind to the server
@@ -143,7 +150,12 @@
Use StartTLS to secure communication with the server
.RE
.PP
-\fB\-T, \-\-trustStorePassword {trustStorePassword}\fR
+\fB\-r, \-\-useSASLExternal\fR
+.RS 4
+Use the SASL EXTERNAL authentication mechanism
+.RE
+.PP
+\fB\-\-trustStorePassword {trustStorePassword}\fR
.RS 4
Certificate trust store PIN
.RE
@@ -158,11 +170,6 @@
Certificate trust store PIN file
.RE
.PP
-\fB\-\-usePasswordPolicyControl\fR
-.RS 4
-Use the password policy request control
-.RE
-.PP
\fB\-V, \-\-ldapVersion {version}\fR
.RS 4
LDAP protocol version number
@@ -365,5 +372,5 @@
.\}
.SH "COPYRIGHT"
.br
-Copyright \(co 2011 ForgeRock AS
+Copyright \(co 2011-2012 ForgeRock AS
.br
--
Gitblit v1.10.0