+samba-tool dbcheck
+------------------
+
+We now have an fsck-like tool for Samba's internal sam.ldb database.
+Run samba-tool dbcheck after installation to check your database for
+self-consistency. Any database created with a previous Samba4 alpha
+will have a very large number of consistency errors, which this tool
+can fix.
+
+See also the -H option to point dbcheck at a different database to the
+default, and the --fix and --yes options to make changes and to not
+prompt about those changes.
+
+After upgrading Samba, it is suggested that you do the following:
+
+ - stop samba
+ - take a backup copy of your sam.ldb and sam.ldb.d/* database files
+ - run samba-tool dbcheck --cross-ncs --fix
+ - use 'all' to say yes to fixing each type of error found
+ - after it has finished, run dbcheck again to ensure it reports no
+ errors
+
+There will be a lot of errors fixed, particularly related to
+bad/missing GUID values. This is due to a bug in previous releases
+that left many objects with bad GUID values. These can all be fixed
+using dbcheck with steps above.
+
+
+New default paths
+-----------------
+
+The configure options for paths have changed again, and the
+--enable-fhs option has been reinstated. Packagers should attempt to
+first package Samba using:
+
+./configure --enable-fhs --prefix=/usr --sysconfdir=/etc --localstatedir=/var
+
+and only after examining the location Samba uses with these options
+should further changes be made. Existing packaging scripts are not
+expected to work unmodified, instead the Samba Team's aim is to
+simplify such scripts for the long term.
+
+samba-tool domain samba3upgrade
+-------------------------------
+
+The new samba-tool domain samba3upgrade command is a supported upgrade route from Samba
+3.x domain controllers to Samba 4.0 AD domain controllers. This
+provides a one-time migration of all users, domain members, passwords,
+groups, group members and account polcies.
+
+This tool is still under development and may fail when presented with
+an inconsistant Samba3 database (such as many LDAP configurations).
+We hope to improve the error handling and recovery in these
+situations, so please provide feedback using the samba-technical
+mailing list.
+
+KNOWN ISSUES
+============
+
+- Installation on systems without a system iconv (and developer
+ headers at compile time) is known to cause errors when dealing with
+ non-ASCII characters.
+
+- In some situations, group members may not be upgraded by the
+ samba-tool domain upgrade_from_s3 script
+
+- The samba-tool domain join script will not join Windows 2000 domains.
+
+- Domain member support in the 'samba' binary is in it's infancy, and
+ is not comparable to the support found in winbindd. As such, do not
+ use the 'samba' binary (provided for the AD server) on a member
+ server.
+
+- There is no printing support in the 'samba' binary (use smbd instead)
+
+- There is no NetBIOS browsing support (network neighbourhood) in the
+ 'samba' binary (use nmbd and smbd instead)
+
+- Clock Synchronisation is critical. Many 'wrong password' errors are
+ actually due to Kerberos objecting to a clock skew between client
+ and server. (The NTP work in the previous alphas are partly to assist
+ with this problem).
+
+- The DRS replication code may fail. Please contact the team if you
+ experience issues with DRS replication, as we have fixed many issues
+ here in response to feedback from our production users.
+
+RUNNING Samba 4.0 as an AD DC
+=============================
+
+A short guide to setting up Samba 4 as an AD DC can be found on the wiki:
+
+ http://wiki.samba.org/index.php/Samba4/HOWTO
+
+#######################################