ITS#8215 Some more slapmodify manpage tweaks

doc/devel/toolargs

@@ -5,6 +5,7 @@ slapauth             F      M    R  U  X     d f        o      v
 slapcat              F H                  abcd fg    l no   s  v
 slapdn               F       N P             d f        o      v
 slapindex            F                     bcd fg      no q  t v
+slapmodify           F            S        bcd fg  j l no q s uvw
 slappasswd                         T        c    h          s uv
 slapschema	     F H                  abcd fg    l no   s  v
 slaptest             F          Q            d f       no     uv
@@ -17,11 +18,12 @@ slaptest             F          Q            d f       no     uv
 	-c continue mode
 	-d debug level
 	-f config file
+	-g disable subordinate gluing
 	-l LDIF file
 	-n database number
 	-o options
 	-q "quick" mode
-	-s subtree
+	-s disable schema checking (slapcat: subtree, slappasswd: secret)
 	-u dryrun (slappasswd: RFC2307 userPassword)
 	-v verbose
 

doc/guide/admin/aspell.en.pws

@@ -1672,3 +1672,4 @@ lmdb
 LMDB
 LMDB's
 MDB
+slapmodify

doc/man/man5/slapd-config.5

@@ -18,6 +18,7 @@ daemon.  This configuration information is also used by the SLAPD tools
 .BR slapcat (8),
 .BR slapdn (8),
 .BR slapindex (8),
+.BR slapmodify (8),
 and
 .BR slaptest (8).
 .LP
@@ -1720,6 +1721,7 @@ database context, so that only the superior context is visible.
 If the slap tools
 .BR slapcat (8),
 .BR slapadd (8),
+.BR slapmodify (8),
 or
 .BR slapindex (8)
 are used on the superior database, any glued subordinates that support
@@ -2155,6 +2157,7 @@ default slapd configuration directory
 .BR slapcat (8),
 .BR slapdn (8),
 .BR slapindex (8),
+.BR slapmodify (8),
 .BR slappasswd (8),
 .BR slaptest (8).
 .LP

doc/man/man5/slapd-mdb.5

@@ -222,6 +222,7 @@ configuration file
 .BR slapadd (8),
 .BR slapcat (8),
 .BR slapindex (8),
+.BR slapmodify (8),
 OpenLDAP LMDB documentation.
 .SH ACKNOWLEDGEMENTS
 .so ../Project

doc/man/man5/slapd-ndb.5

@@ -121,6 +121,7 @@ configuration file
 .BR slapadd (8),
 .BR slapcat (8),
 .BR slapindex (8),
+.BR slapmodify (8),
 MySQL Cluster documentation.
 .SH AUTHOR
 Howard Chu, with assistance from Johan Andersson et al @ MySQL.

doc/man/man5/slapd-wt.5

@@ -84,6 +84,7 @@ configuration file
 .BR slapadd (8),
 .BR slapcat (8),
 .BR slapindex (8),
+.BR slapmodify (8),
 WiredTiger documentation.
 .SH ACKNOWLEDGEMENTS
 .so ../Project

doc/man/man5/slapd.access.5

@@ -18,6 +18,7 @@ daemon. This configuration file is also used by the SLAPD tools
 .BR slapcat (8),
 .BR slapdn (8),
 .BR slapindex (8),
+.BR slapmodify (8),
 and
 .BR slaptest (8).
 .LP

doc/man/man5/slapd.conf.5

@@ -18,6 +18,7 @@ daemon.  This configuration file is also used by the SLAPD tools
 .BR slapcat (8),
 .BR slapdn (8),
 .BR slapindex (8),
+.BR slapmodify (8),
 and
 .BR slaptest (8).
 .LP
@@ -1724,6 +1725,7 @@ database context, so that only the superior context is visible.
 If the slap tools
 .BR slapcat (8),
 .BR slapadd (8),
+.BR slapmodify (8),
 or
 .BR slapindex (8)
 are used on the superior database, any glued subordinates that support
@@ -2109,6 +2111,7 @@ default slapd configuration file
 .BR slapcat (8),
 .BR slapdn (8),
 .BR slapindex (8),
+.BR slapmodify (8),
 .BR slappasswd (8),
 .BR slaptest (8).
 .LP

doc/man/man5/slapd.plugin.5

@@ -13,6 +13,7 @@ file contains configuration information for the
 daemon. This configuration file is also used by the SLAPD tools
 .BR slapadd (8),
 .BR slapcat (8),
+.BR slapmodify (8),
 and
 .BR slapindex (8).
 .LP

servers/slapd/slapcommon.c

@@ -91,6 +91,11 @@ usage( int tool, const char *progname )
 		options = " [-c]\n\t[-g] [-n databasenumber | -b suffix] [attr ...] [-q] [-t]\n";
 		break;
 
+	case SLAPMODIFY:
+		options = " [-c]\n\t[-g] [-n databasenumber | -b suffix]\n"
+			"\t[-l ldiffile] [-j linenumber] [-q] [-u] [-s] [-w]\n";
+		break;
+
 	case SLAPTEST:
 		options = " [-n databasenumber] [-u] [-Q]\n";
 		break;