r13123: Some small doc updates.

(This used to be commit 9222fa359011e7bda02325785ee62d72e7d2a610)

diff --git a/NEWS b/NEWS
index 5316168c6bf93e0e680069f2935c9c46eef4beac..3e35a05ed89a699a26e5d267e6abf2fd54129439 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -242,7 +242,6 @@ The following parameters have been removed:
 - domain master
 - browse list
 - enhanced browsing
-- dns proxy
 - wins proxy
 - wins hook
 - wins partners

diff --git a/TODO b/TODO
index 9c36dd5bf915b360152c3d3d3ff22b3cb1293544..95a7eeab2b9297ff81857180c33e954f4b708cc5 100644 (file)
--- a/TODO
+++ b/TODO
@@ -3,6 +3,11 @@ source/lib/registry/TODO
 source/lib/tdr/TODO
 source/pidl/TODO
 
+upgrade process (from Samba3):
+ - Rename upgrade to upgrade3 (to avoid confusion with upgrades 
+   from earlier Samba4 releases in the future)
+ - Add support for reading WINS TDB files as well as WINS dat files.
+
 Configuration options
 =====================