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 62352889050d364367f2ae713d7b1e8d404df159..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,6 +8,7 @@ slapadd \- Add entries to a SLAPD database
 .B SBINDIR/slapadd
 .B [\-v]
 .B [\-c]
+.B [\-g]
 .B [\-u]
 .B [\-q]
 .B [\-w]
@@ -29,7 +30,7 @@ suffix and adds entries corresponding to the provided LDIF to
 the database.
 Databases configured as
 .B subordinate
-of this one are also updated.
+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
@@ -48,6 +49,16 @@ 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
@@ -95,7 +106,7 @@ and
 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 wll be made before trying to use the default
+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.