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

---
 opendj3/src/main/docbkx/shared/man-ldappasswordmodify.xml |   67 +++++++++++++++++++++------------
 1 files changed, 42 insertions(+), 25 deletions(-)

diff --git a/opendj3/src/main/docbkx/shared/man-ldappasswordmodify.xml b/opendj3/src/main/docbkx/shared/man-ldappasswordmodify.xml
index 2adac5a..3420fc4 100644
--- a/opendj3/src/main/docbkx/shared/man-ldappasswordmodify.xml
+++ b/opendj3/src/main/docbkx/shared/man-ldappasswordmodify.xml
@@ -34,7 +34,7 @@
  <refmeta>
   <refentrytitle>ldappasswordmodify</refentrytitle><manvolnum>1</manvolnum>
   <refmiscinfo class="software">OpenDJ</refmiscinfo>
-  <refmiscinfo class="version"><?eval ${docTargetVersion}?></refmiscinfo>
+  <refmiscinfo class="version"><?eval ${currentSDKversion}?></refmiscinfo>
  </refmeta>
  <refnamediv>
   <refname>ldappasswordmodify</refname>
@@ -89,6 +89,13 @@
     </listitem>
    </varlistentry>
    <varlistentry>
+    <term><option>-F, --newPasswordFile {file}</option></term>
+    <listitem>
+     <para>Path to a file containing the new password to provide for the
+     target user</para>
+    </listitem>
+   </varlistentry>
+   <varlistentry>
     <term><option>-J, --control {controloid[:criticality[:value|::b64value|:&lt;filePath]]}</option></term>
     <listitem>
      <para>Use a request control with the provided information</para>
@@ -100,32 +107,11 @@
      <para>New password to provide for the target user</para>
     </listitem>
    </varlistentry>
-   <varlistentry>
-    <term><option>-N, --newPasswordFile {file}</option></term>
-    <listitem>
-     <para>Path to a file containing the new password to provide for the
-     target user</para>
-    </listitem>
-   </varlistentry>
   </variablelist>
   <refsect2>
    <title>LDAP Connection Options</title>
    <variablelist>
     <varlistentry>
-     <term><option>--certNickname {nickname}</option></term>
-     <listitem>
-      <para>Nickname of certificate for SSL client authentication</para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><option>--connectTimeout {timeout}</option></term>
-     <listitem>
-      <para>Maximum length of time (in milliseconds) that can be taken to
-      establish a connection.  Use '0' to specify no time out.</para>
-      <para>Default: 30000</para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
      <term><option>-D, --bindDN {bindDN}</option></term>
      <listitem>
       <para>DN to use to bind to the server</para>
@@ -133,6 +119,12 @@
      </listitem>
     </varlistentry>
     <varlistentry>
+     <term><option>-E, --reportAuthzID</option></term>
+     <listitem>
+      <para>Use the authorization identity control</para>
+     </listitem>
+    </varlistentry>
+    <varlistentry>
      <term><option>-h, --hostname {host}</option></term>
      <listitem>
       <para>Directory server hostname or IP address</para>
@@ -152,6 +144,18 @@
      </listitem>
     </varlistentry>
     <varlistentry>
+     <term><option>-N, --certNickname {nickname}</option></term>
+     <listitem>
+      <para>Nickname of certificate for SSL client authentication</para>
+     </listitem>
+    </varlistentry>
+    <varlistentry>
+     <term><option>-o, --saslOption {name=value}</option></term>
+     <listitem>
+      <para>SASL bind options</para>
+     </listitem>
+    </varlistentry>
+    <varlistentry>
      <term><option>-p, --port {port}</option></term>
      <listitem>
       <para>Directory server port number</para>
@@ -171,7 +175,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><option>--trustStorePassword {trustStorePassword}</option></term>
+     <term><option>-T, --trustStorePassword {trustStorePassword}</option></term>
      <listitem>
       <para>Certificate trust store PIN</para>
      </listitem>
@@ -189,6 +193,19 @@
      </listitem>
     </varlistentry>
     <varlistentry>
+     <term><option>--usePasswordPolicyControl</option></term>
+     <listitem>
+      <para>Use the password policy request control</para>
+     </listitem>
+    </varlistentry>
+    <varlistentry>
+     <term><option>-V, --ldapVersion {version}</option></term>
+     <listitem>
+      <para>LDAP protocol version number</para>
+      <para>Default value: 3</para>
+     </listitem>
+    </varlistentry>
+    <varlistentry>
      <term><option>-w, --bindPassword {bindPassword}</option></term>
      <listitem>
       <para>Password to use to bind to the server</para>
@@ -238,9 +255,9 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><option>-V, --version</option></term>
+     <term><option>-v, --verbose</option></term>
      <listitem>
-      <para>Display directory server version information</para>
+      <para>Use verbose mode</para>
      </listitem>
     </varlistentry>
    </variablelist>

--
Gitblit v1.10.0