merging some fixes from the release branch; more to come later

(This used to be commit 7769a0d33c)

WHATSNEW.txt

@@ -905,11 +905,14 @@ Removed Parameters (order alphabetically):
   * domain guest group
   * force unknown acl user
   * hide local users
+  * mangled stack
   * nt smb support
   * postscript
   * printer driver
   * printer driver file
   * printer driver location
+  * read size
+  * source environment
   * status
   * strip dot
   * total print jobs
@@ -998,6 +1001,7 @@ New Parameters (new parameters have been grouped by function):
   * ldap idmap suffix
   * ldap machine suffix
   * ldap passwd sync
+  * ldap replication sleep
   * ldap user suffix
   
   General Configuration
@@ -1127,18 +1131,22 @@ New Schema
 ----------
   
 A new object class (sambaSamAccount) has been introduced to replace 
-the old sambaAccount.  This change aids us in the renaming of attributes 
-to prevent clashes with attributes from other vendors.  There is a 
-conversion script (examples/LDAP/convertSambaAccount) to modify and LDIF 
-file to the new schema.
+the old sambaAccount.  This change aids us in the renaming of 
+attributes to prevent clashes with attributes from other vendors.  
+There is a conversion script (examples/LDAP/convertSambaAccount) to 
+modify and LDIF file to the new schema.
   
 Example:
   
-	$ ldapsearch .... -b "ou=people,dc=..." > old.ldif
-	$ convertSambaAccount <DOM SID> old.ldif new.ldif
+  $ ldapsearch .... -b "ou=people,dc=..." > sambaAcct.ldif
+  $ convertSambaAccount --sid=<Domain SID> \
+    --input=sambaAcct.ldif --output=sambaSamAcct.ldif \
+    --changetype=[modify|add]
 	
-The <DOM SID> can be obtained by running 'net getlocalsid <DOMAINNAME>' 
-on the Samba PDC as root.
+The <DOM SID> can be obtained by running 'net getlocalsid 
+<DOMAINNAME>' on the Samba PDC as root.  The changetype determines 
+the format of the generated LDIF output--either create new entries 
+or modify existing entries.
     
 The old sambaAccount schema may still be used by specifying the 
 "ldapsam_compat" passdb backend.  However, the sambaAccount and