clarify Kerberos option availability

[openldap] / doc / man / man1 / ldapmodify.1

diff --git a/doc/man/man1/ldapmodify.1 b/doc/man/man1/ldapmodify.1
index ac41baef9edf2d94a83a69093dec116e0ce3f6d3..80cb56f1be8d90fe1e7ea1ef6b4a5b9346d83b9e 100644 (file)
--- a/doc/man/man1/ldapmodify.1
+++ b/doc/man/man1/ldapmodify.1
@@ -35,6 +35,8 @@ ldapmodify, ldapadd \- LDAP modify entry and LDAP add entry tools
 [\c
 .BI \-w \ passwd\fR]
 [\c
+.BI \-H \ ldapuri\fR]
+[\c
 .BI \-h \ ldaphost\fR]
 [\c
 .BI \-p \ ldapport\fR]
@@ -65,6 +67,8 @@ ldapmodify, ldapadd \- LDAP modify entry and LDAP add entry tools
 [\c
 .BR \-c ]
 [\c
+.BR \-C ]
+[\c
 .BR \-r ]
 [\c
 .BR \-n ]
@@ -156,12 +160,12 @@ Use verbose mode, with many diagnostics written to standard output.
 .B \-k
 Use Kerberos authentication instead of simple authentication.  It is
 assumed that you already have a valid ticket granting ticket.  You must
-compile with KERBEROS defined for this option to have any effect.
+compile with Kerberos support for this option to have any effect.
 .TP
 .B \-K
-Same as \-k, but only does step 1 of the kerberos bind.  This is useful
+Same as \-k, but only does step 1 of the Kerberos bind.  This is useful
 when connecting to a slapd and there is no x500dsa.hostname principal
-registered with your kerberos servers.
+registered with your Kerberos servers.
 .TP
 .B \-F
 Force application of all changes regardless of the contents of input
@@ -197,11 +201,16 @@ This is used instead of specifying the password on the command line.
 .BI \-w \ passwd
 Use \fIpasswd\fP as the password for simple authentication.
 .TP
+.BI \-H \ ldapuri
+Specify URI(s) referring to the ldap server(s).
+.TP
 .BI \-h \ ldaphost
 Specify an alternate host on which the ldap server is running.
+Deprecated in favor of -H.
 .TP
 .BI \-p \ ldapport
 Specify an alternate TCP port where the ldap server is listening.
+Deprecated in favor of -H.
 .TP
 .BI \-P \ 2\fR\||\|\fI3
 Specify the LDAP protocol version to use.
@@ -312,7 +321,7 @@ Assuming that the file
 exists and has the contents:
 .LP
 .nf
-    dn: cn=Modify Me, dc=OpenLDAP, dc=Org
+    dn: cn=Modify Me, dc=example, dc=com
     changetype: modify
     replace: mail
     mail: modme@OpenLDAP.org
@@ -335,7 +344,7 @@ the command:
 .LP
 will replace the contents of the "Modify Me" entry's
 .I mail
-attribute with the value "modme@OpenLDAP.org", add a
+attribute with the value "modme@example.com", add a
 .I title
 of "Grand Poobah", and the contents of the file "/tmp/modme.jpeg"
 as a
@@ -345,11 +354,11 @@ and completely remove the
 attribute.
 The same modifications as above can be performed using the older
 .I ldapmodify
-inout format:
+input format:
 .LP
 .nf
-    cn=Modify Me, dc=OpenLDAP, dc=org
-    mail=modme@OpenLDAP.org
+    cn=Modify Me, dc=example, dc=com
+    mail=modme@example.com
     +title=Grand Poobah
     +jpegPhoto=/tmp/modme.jpeg
     -description
@@ -366,13 +375,13 @@ Assuming that the file
 exists and has the contents:
 .LP
 .nf
-    dn: cn=Barbara Jensen, dc=OpenLDAP, dc=org 
+    dn: cn=Barbara Jensen, dc=example, dc=com
     objectClass: person
     cn: Barbara Jensen
     cn: Babs Jensen
     sn: Jensen
     title: the world's most famous mythical manager
-    mail: bjensen@OpenLDAP.org
+    mail: bjensen@example.com
     uid: bjensen
 .LP
 the command:
@@ -390,7 +399,7 @@ Assuming that the file
 exists and has the contents:
 .LP
 .nf
-    dn: cn=Barbara Jensen, dc=OpenLDAP, dc=org
+    dn: cn=Barbara Jensen, dc=example, dc=com
     changetype: delete
 .LP
 the command:
@@ -401,8 +410,8 @@ the command:
 .LP
 will remove Babs Jensen's entry.
 .SH DIAGNOSTICS
-Exit status is 0 if no errors occur.  Errors result in a non-zero exit
-status and a diagnostic message being written to standard error.
+Exit status is zero if no errors occur.  Errors result in a non-zero
+exit status and a diagnostic message being written to standard error.
 .SH "SEE ALSO"
 .BR ldapadd (1),
 .BR ldapdelete (1),