document new "A" format for ber_scanf(3)

[openldap] / doc / man / man8 / slapadd.8

diff --git a/doc/man/man8/slapadd.8 b/doc/man/man8/slapadd.8
index 29efdec7845ab71ea68055b6431c0a8edb4dca25..f8ef62cd7e1f4d9fb82a694cde31d46d222a6adc 100644 (file)
--- a/doc/man/man8/slapadd.8
+++ b/doc/man/man8/slapadd.8
@@ -1,6 +1,6 @@
 .TH SLAPADD 8C "RELEASEDATE" "OpenLDAP LDVERSION"
 .\" $OpenLDAP$
-.\" Copyright 1998-2005 The OpenLDAP Foundation All Rights Reserved.
+.\" Copyright 1998-2006 The OpenLDAP Foundation All Rights Reserved.
 .\" Copying restrictions apply.  See COPYRIGHT/LICENSE.
 .SH NAME
 slapadd \- Add entries to a SLAPD database
@@ -8,12 +8,15 @@ slapadd \- Add entries to a SLAPD database
 .B SBINDIR/slapadd
 .B [\-v]
 .B [\-c]
+.B [\-g]
 .B [\-u]
+.B [\-q]
 .B [\-w]
 .B [\-d level]
 .B [\-b suffix]
 .B [\-n dbnum]
 .B [\-f slapd.conf]
+.B [\-F confdir]
 .B [\-l ldif-file]
 .SH DESCRIPTION
 .LP
@@ -24,8 +27,11 @@ is used to add entries specified in LDAP Directory Interchange Format
 database.
 It opens the given database determined by the database number or
 suffix and adds entries corresponding to the provided LDIF to
-the database.  The LDIF input is read from standard input or
-the specified file.
+the database.
+Databases configured as
+.B subordinate
+of this one are also updated, unless \fB-g\fP is specified.
+The LDIF input is read from standard input or the specified file.
 .LP
 As
 .B slapadd
@@ -43,9 +49,25 @@ enable verbose mode.
 .B \-c
 enable continue (ignore errors) mode.
 .TP
+.B \-g
+disable subordinate gluing.  Only the specified database will be
+processed, and not its glued subordinates (if any).
+.TP
+.B -s
+disable schema checking.  This option is intended to be used when loading
+databases containing special objects, such as fractional objects on a
+partial replica.  Loading normal objects which do not conform to
+schema may result in unexpected and ill behavior.
+.TP
 .B \-u
 enable dry-run (don't write to backend) mode.
 .TP
+.B \-q
+enable quick (fewer integrity checks) mode.  Does fewer consistency checks
+on the input data, and no consistency checks when writing the database.
+Improves the load time but if any errors or interruptions occur the resulting
+database will be unusable.
+.TP
 .BI \-w
 write syncrepl context information.
 After all entries are added, the contextCSN
@@ -75,6 +97,20 @@ specify an alternative
 .BR slapd.conf (5)
 file.
 .TP
+.BI \-F " confdir"
+specify a config directory.
+If both
+.B -f
+and
+.B -F
+are specified, the config file will be read and converted to
+config directory format and written to the specified directory.
+If neither option is specified, an attempt to read the
+default config directory will be made before trying to use the default
+config file. If a valid config directory exists then the
+default config file is ignored. If dryrun mode is also specified,
+no conversion will occur.
+.TP
 .BI \-l " ldif-file"
 Read LDIF from the specified file instead of standard input.
 .SH LIMITATIONS