2 files changed, 5 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index 5316168c6b..3e35a05ed8 100644
--- 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 9c36dd5bf9..95a7eeab2b 100644
--- 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
 =====================