diff --git a/doc/guide/admin/dbtools.sdf b/doc/guide/admin/dbtools.sdf
index 4a6c0b7ec1..aa7af65e88 100644
--- a/doc/guide/admin/dbtools.sdf
+++ b/doc/guide/admin/dbtools.sdf
@@ -126,8 +126,16 @@ unacceptably long time to add using the LDAP method described above.
 These tools read the slapd configuration file and an input file
 containing a text representation of the entries to add. For database
 types which support the tools, they produce the database files
-directly (otherwise you must use the on-line method above). There
-are several important configuration options you will want to be
+directly (otherwise you must use the on-line method above). Also,
+the input file must be completely valid, as these tools do fewer
+consistency checks than the on-line method.
+
+Note: this Guide is not meant to provide exhaustive documentation
+on the software. The tool descriptions here only list a few of the
+available options for each command. Read the associated manpages for
+complete documentation on all of the available options.
+
+There are several important configuration options you will want to be
 sure and set in the config file database definition first:
 
 >	suffix <dn>
@@ -225,11 +233,12 @@ modifying {{slapd.conf}}(5)). This is possible using the {{slapindex}}(8)
 program.  {{slapindex}} is invoked like this
 
 >	slapindex -f <slapdconfigfile>
->		[-d <debuglevel>] [-n <databasenumber>|-b <suffix>]
+>		[-d <debuglevel>] [-n <databasenumber>|-b <suffix>] [attr...]
 
 Where the {{EX:-f}}, {{EX:-d}}, {{EX:-n}} and {{EX:-b}} options
-are the same as for the {{slapadd}}(1) program.  {{slapindex}}
-rebuilds all indices based upon the current database contents.
+are the same as for the {{slapadd}}(1) program.  If no specific
+attributes are listed, {{slapindex}} rebuilds all indices based
+upon the current database contents.
 
 
 H3: The {{EX:slapcat}} program
diff --git a/doc/guide/admin/replication.sdf b/doc/guide/admin/replication.sdf
index 1aa0e99842..9ba60df9a0 100644
--- a/doc/guide/admin/replication.sdf
+++ b/doc/guide/admin/replication.sdf
@@ -742,7 +742,8 @@ This sets up the config database:
 >     olcDatabase: {0}config
 >     olcRootPW: secret
 
-second and third servers will have a different olcServerID obviously:
+Each server must have a unique server ID ({{EX:SID}}), so
+second and third servers will have a different {{EX:olcServerID}} obviously:
 
 >     dn: cn=config
 >     objectClass: olcGlobal
@@ -832,6 +833,17 @@ directives are the URLs of the servers from which to replicate. These
 must exactly match the URLs {{slapd}} listens on ({{-h}} in {{SECT:Command-Line Options}}).
 Otherwise slapd may attempt to replicate from itself, causing a loop.
 
+Note: The {{entryCSN}} and {{contextCSN}} attributes are used
+to track changes to an entry and naming context, respectively. The
+{{EX:SID}} which must be unique for each replication provider is a
+component of these CSNs. If you're using {{slapadd}} to load a
+database and there are no entryCSNs already present in the input
+LDIF, {{slapadd}} will generate them with a {{SID}} of {{EX:000}}. This
+is not a valid {{SID}} for multi-provider replication, and you
+should use the {{EX:-S}} option of {{slapadd}} (8) to specify
+a valid {{SID}} for these generated CSNs. If there are existing
+entryCSNs in the input LDIF, {{slapadd}} will not change them.
+
 H3: Mirror mode
 
 Mirror mode configuration is actually very easy. If you have ever setup a normal