Improve upgrade instructions

diff --git a/upgrading-samba4.txt b/upgrading-samba4.txt
index b84bbaba033b97811db4f09a42417c630d68d1d1..85e46990634ed071edcf1ae5a3b60e56f3dd12e8 100644 (file)
--- a/upgrading-samba4.txt
+++ b/upgrading-samba4.txt
@@ -1,24 +1,16 @@
 Upgrading from an older samba4 installation.
 
-For users of samba4 alpha 8 and after
-=====================================
-
 * Stop any samba process
 * Backup your samba4 provision:
   go in the directory where your samba4 provision is stored (/usr/local/samba by default)
   do tar cf $HOME/backup.tar private (it's also recommended to save the etc/smb.conf and var/sysvol dir aswell)
 * Go in the source4 dir
-* run ./scripting/bin/upgradeprovision
+* run ./scripting/bin/upgradeprovision -s <path to smb.conf in samba4 install>
 * do make install
 
-For users of samba4 alpha 8 and after
-=====================================
-
-* Stop any samba/smbd process
-* Backup your samba4 provision:
-  go in the directory where your samba4 provision is stored (/usr/local/samba by default)
-  do tar cf $HOME/backup.tar private (it's also recommended to save the etc/smb.conf and var/sysvol dir aswell)
-* Go in the source4 dir
-* run ./scripting/bin/upgradeprovision --full
-* do make install
+This will do the minimum (safest) upgrade of the data.  
 
+Runing upgradeprovision with --full will do a more comprehensive
+upgrade of the data (including schema and display specifiers).  This
+attempts to do a new provision, and to then copy existing data into
+that database.