Index: branches/fc13-dev/server/doc/install-ldap
===================================================================
--- branches/fc13-dev/server/doc/install-ldap	(revision 1678)
+++ branches/fc13-dev/server/doc/install-ldap	(revision 1680)
@@ -1,9 +1,11 @@
 To set up a new LDAP server:
 
-- Install the RPM 389-ds-base with yum
+- Install the RPM 389-ds-base with yum (these are installed by kickstart
+  these days, so these two steps are probably not necessary)
   root# yum install -y 389-ds-base
+  root# yum install -y policycoreutils-python
+  root# yum install -y ldapvi
 - We want to run the directory server as its own user, so create fedora-ds
-  root# env NSS_NONLOCAL_IGNORE=1 useradd -r -d /var/lib/dirsrv fedora-ds
-- root# yum install -y policycoreutils-python
+  root# useradd -r -d /var/lib/dirsrv fedora-ds
 - Temporarily move away the existing slapd-scripts folder
   root# mv /etc/dirsrv/slapd-scripts{,.bak}
@@ -19,7 +21,5 @@
   root# cp -R /etc/dirsrv/slapd-scripts.bak/{.svn,*} /etc/dirsrv/slapd-scripts
   root# rm -Rf /etc/dirsrv/slapd-scripts.bak
-- yum install ldapvi
-- Check if dirsrv starts: /sbin/service dirsrv start
-  then turn it back off: service dirsrv stop
+- Turn dirsrv off: service dirsrv stop
 - Apply the following configuration changes.  If you're editing
   dse.ldif, you don't want dirsrv to be on, otherwise it will
@@ -173,5 +173,5 @@
        right now.
 
-        ldapvi -b cn=\"dc=scripts,dc=mit,dc=edu\",cn=mapping\ tree,cn=config 
+        ldapvi -b cn=\"dc=scripts,dc=mit,dc=edu\",cn=mapping\ tree,cn=config
 
     2. Configure the server $SLAVE (this server) to accept $MASTER
@@ -227,4 +227,7 @@
        it to replicate to $SLAVE.
 
+       The last line runs the replication.  This is perhaps the most
+       risky step of the process; see below for help debugging problems.
+
        WARNING: There is a known bug doing full updates from 1.2.6 to
        1.2.6, see https://bugzilla.redhat.com/show_bug.cgi?id=637852
@@ -239,14 +242,8 @@
 nsDS5ReplicaPort: 389
 nsDS5ReplicaTransportInfo: LDAP
-nsDS5ReplicaBindDN:
-uid=ldap/$MASTER,ou=People,dc=scripts,dc=mit,dc=edu
+nsDS5ReplicaBindDN: uid=ldap/$MASTER,ou=People,dc=scripts,dc=mit,dc=edu
 nsDS5ReplicaBindMethod: SASL/GSSAPI
 nsDS5ReplicaUpdateSchedule: "0000-2359 0123456"
 nsDS5ReplicaTimeout: 120
-
-    4. Run the replication.  This is perhaps the most risky step of
-    the process; see below for help debugging problems.
-
-# under cn="GSSAPI Replication to $SLAVE", cn=replica, cn="dc=scripts,dc=mit,dc=edu", cn=mapping tree, cn=config
 nsDS5BeginReplicaRefresh: start