Remove __contains__ from mock object for consistency with actual

[samba.git] / howto4.txt

diff --git a/howto4.txt b/howto4.txt
index 3ae5af18f307522e139d1f9b98dfcc272cdb0b0c..e33d0403249b3cb70d4ff56884cc0f448312c23a 100644 (file)
--- a/howto4.txt
+++ b/howto4.txt
@@ -70,12 +70,14 @@ configure above to change this.
  
   # make install
 
-
 Step 4: provision Samba4
 ------------------------
 
-The "provision" step sets up a basic user database. 
-Must be run as a user with permission to write to the install directory.
+The "provision" step sets up a basic user database. Be warned that this
+removes all preexisting database data (if any)!
+
+It must be run as a user with permission to write to the install directory
+(typically "root").
 
 ::
 
@@ -86,6 +88,14 @@ Must be run as a user with permission to write to the install directory.
 'YOURDOM' is the NT4 style domain name. 'YOUR.REALM' is your kerberos
 realm, which is typically your DNS domain name.
 
+If you provisioned a more recent Samba4 system already you should be able to
+use the procedures shown in "upgrading-samba4.txt" to upgrade it and keep all
+data.
+
+When you are using Samba3 at the moment you could try the experimental script
+"upgrade_from_s3" under the "setup" directory of the source
+distribution (it isn't included in binary distributions yet).
+
 Step 5: Create a simple smb.conf
 --------------------------------
 
@@ -97,7 +107,6 @@ example::
        path = /data/test
        read only = no
 
-
 Step 6: starting Samba4
 -----------------------
 
@@ -117,7 +126,6 @@ they need to be stopped before starting samba from Samba 4.
 Make sure you put the bin and sbin directories from your new install
 in your $PATH. Make sure you run the right version!
 
-
 Step 7: testing Samba4
 ----------------------