X-Git-Url: http://git.samba.org/samba.git/?p=kai%2Fsamba.git;a=blobdiff_plain;f=NEWS;h=86ce60c586f519185399e66ec705287e592e6f1f;hp=e189f54574d1115b2468f34dc7b7d0f14f2c7d31;hb=9836df0430a290813c93fc98b35b19e1fde2cd37;hpb=adddaa797c50d93d2168dc74fceaa88fe305956e

diff --git a/NEWS b/NEWS
index e189f54574d..86ce60c586f 100644
--- a/NEWS
+++ b/NEWS
@@ -22,8 +22,12 @@ Introduction of LDB
 Samba now stores most of its persistent data in a LDAP-like database 
 called LDB (see ldb(7) for more info). 
 
+Built-in LDAP server
+====================
+FIXME
+
 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,
@@ -37,7 +41,9 @@ 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