r12820: Remove duplicate entry caused by merge.

[jelmer/samba4-debian.git] / NEWS

diff --git a/NEWS b/NEWS
index e189f54574d1115b2468f34dc7b7d0f14f2c7d31..c8903f7cf7091c45621a92122f89ac5e0ac069e0 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -23,7 +23,7 @@ Samba now stores most of its persistent data in a LDAP-like database
 called LDB (see ldb(7) for more info). 
 
 Much improved SWAT
-===============
+==================
 SWAT has had some rather large improvements and is now more then just a 
 direct editor for smb.conf. Its layout has been improved. SWAT can now also 
 be used for editing run-time data - maintaining user information, provisioning,
@@ -31,13 +31,25 @@ etc. TLS is supported out of the box.
 
 Built-in KDC
 ============
-FIXME
+Samba4 ships with an integrated KDC (Kerberos Key Distribution
+Center).  Backed directly onto our main internal database, and
+integrated with custom code to handle the PAC, Samba4's KDC is an
+integral part of our support for AD logon protocols.
+
+Built-in LDAP Server
+====================
+Like the situation with the KDC, Samba4 ships with it's own LDAP
+server, included to provide simple, built-in LDAP services in an AD
+(rather than distinctly standards) matching manner.  The database is
+LDB, and it shares that in common with the rest of Samba.
 
 Changed configuration options
 =============================
 Several configuration options have been removed in Samba4 while others have 
 been introduced. This section contains a summary of changes to smb.conf and 
-where these settings moved.
+where these settings moved. Configuration options that have disappeared may be 
+re-added later when the functionality that uses them gets reimplemented in 
+Samba 4.
 
 The 'security' parameter has been split up. It is now only used to choose 
 between the 'user' and 'share' security levels (the latter is not supported